From 7e3477ec6059e72c99282991cbe009a0e5551ace Mon Sep 17 00:00:00 2001 From: Wayne Zhang Date: Mon, 5 Dec 2016 00:09:53 -0800 Subject: [PATCH] Add contrib/endpoints prefix to all includes. --- contrib/endpoints/BUILD => BUILD | 0 contrib/endpoints/WORKSPACE => WORKSPACE | 0 contrib/endpoints/include/BUILD | 11 +++++----- .../include/api_manager/api_manager.h | 8 +++---- .../include/api_manager/env_interface.h | 6 ++--- .../include/api_manager/http_request.h | 2 +- .../include/api_manager/method_call_info.h | 2 +- .../include/api_manager/periodic_timer.h | 2 +- .../endpoints/include/api_manager/request.h | 4 ++-- .../api_manager/request_handler_interface.h | 8 +++---- .../endpoints/include/api_manager/response.h | 6 ++--- contrib/endpoints/src/api_manager/BUILD | 19 ++++++++-------- .../src/api_manager/api_manager_impl.cc | 6 ++--- .../src/api_manager/api_manager_impl.h | 6 ++--- .../src/api_manager/api_manager_test.cc | 4 ++-- contrib/endpoints/src/api_manager/auth/BUILD | 16 +++++++------- .../src/api_manager/auth/jwt_cache.cc | 2 +- .../src/api_manager/auth/jwt_cache.h | 2 +- .../src/api_manager/auth/jwt_cache_test.cc | 2 +- .../endpoints/src/api_manager/auth/lib/BUILD | 6 ++--- .../auth/lib/auth_jwt_validator.cc | 4 ++-- .../api_manager/auth/lib/auth_jwt_validator.h | 4 ++-- .../auth/lib/auth_jwt_validator_test.cc | 4 ++-- .../src/api_manager/auth/lib/auth_token.cc | 4 ++-- .../api_manager/auth/lib/auth_token_test.cc | 2 +- .../src/api_manager/auth/lib/base64.cc | 4 ++-- .../src/api_manager/auth/lib/base64_test.cc | 4 ++-- .../src/api_manager/auth/lib/json.cc | 4 ++-- .../endpoints/src/api_manager/auth/lib/json.h | 2 +- .../src/api_manager/auth/lib/json_test.cc | 2 +- .../src/api_manager/auth/lib/json_util.cc | 2 +- .../src/api_manager/auth/lib/json_util.h | 2 +- .../api_manager/auth/lib/json_util_test.cc | 2 +- .../api_manager/auth/service_account_token.cc | 4 ++-- .../api_manager/auth/service_account_token.h | 2 +- .../auth/service_account_token_test.cc | 4 ++-- .../endpoints/src/api_manager/check_auth.cc | 22 +++++++++---------- .../endpoints/src/api_manager/check_auth.h | 4 ++-- .../src/api_manager/check_auth_test.cc | 10 ++++----- .../src/api_manager/check_service_control.cc | 4 ++-- .../src/api_manager/check_service_control.h | 4 ++-- .../src/api_manager/check_workflow.cc | 8 +++---- .../src/api_manager/check_workflow.h | 4 ++-- .../src/api_manager/cloud_trace/BUILD | 9 ++++---- .../api_manager/cloud_trace/cloud_trace.cc | 6 ++--- .../src/api_manager/cloud_trace/cloud_trace.h | 6 ++--- .../cloud_trace/cloud_trace_test.cc | 4 ++-- .../api_manager/cloud_trace/sampler_test.cc | 2 +- contrib/endpoints/src/api_manager/config.cc | 8 +++---- contrib/endpoints/src/api_manager/config.h | 10 ++++----- .../endpoints/src/api_manager/config_test.cc | 4 ++-- .../endpoints/src/api_manager/context/BUILD | 16 +++++++------- .../api_manager/context/request_context.cc | 2 +- .../src/api_manager/context/request_context.h | 12 +++++----- .../api_manager/context/service_context.cc | 4 ++-- .../src/api_manager/context/service_context.h | 16 +++++++------- .../src/api_manager/fetch_metadata.cc | 6 ++--- .../src/api_manager/fetch_metadata.h | 4 ++-- .../src/api_manager/fetch_metadata_test.cc | 8 +++---- .../endpoints/src/api_manager/gce_metadata.cc | 4 ++-- .../endpoints/src/api_manager/gce_metadata.h | 2 +- .../src/api_manager/gce_metadata_test.cc | 2 +- .../src/api_manager/http_template.cc | 2 +- .../endpoints/src/api_manager/method_impl.cc | 4 ++-- .../endpoints/src/api_manager/method_impl.h | 4 ++-- .../endpoints/src/api_manager/method_test.cc | 2 +- .../mock_api_manager_environment.h | 2 +- .../src/api_manager/mock_method_info.h | 2 +- .../endpoints/src/api_manager/mock_request.h | 2 +- .../endpoints/src/api_manager/path_matcher.cc | 8 +++---- .../endpoints/src/api_manager/path_matcher.h | 8 +++---- .../src/api_manager/path_matcher_node.cc | 4 ++-- .../src/api_manager/path_matcher_node.h | 2 +- .../src/api_manager/path_matcher_test.cc | 10 ++++----- .../src/api_manager/request_handler.cc | 10 ++++----- .../src/api_manager/request_handler.h | 6 ++--- .../api_manager/server_config_proto_test.cc | 4 ++-- .../src/api_manager/service_control/BUILD | 15 +++++++------ .../api_manager/service_control/aggregated.cc | 4 ++-- .../api_manager/service_control/aggregated.h | 14 ++++++------ .../service_control/aggregated_test.cc | 8 +++---- .../service_control/check_response_test.cc | 4 ++-- .../src/api_manager/service_control/info.h | 8 +++---- .../api_manager/service_control/interface.h | 8 +++---- .../service_control/logs_metrics_loader.cc | 4 ++-- .../service_control/logs_metrics_loader.h | 2 +- .../logs_metrics_loader_test.cc | 2 +- .../src/api_manager/service_control/proto.cc | 10 ++++----- .../src/api_manager/service_control/proto.h | 4 ++-- .../api_manager/service_control/proto_test.cc | 8 +++---- .../src/api_manager/service_control/url.cc | 2 +- .../src/api_manager/service_control/url.h | 2 +- .../api_manager/service_control/url_test.cc | 6 ++--- contrib/endpoints/src/api_manager/utils/BUILD | 6 ++--- .../src/api_manager/utils/marshalling.cc | 2 +- .../src/api_manager/utils/marshalling.h | 2 +- .../src/api_manager/utils/marshalling_test.cc | 4 ++-- .../endpoints/src/api_manager/utils/status.cc | 4 ++-- .../src/api_manager/utils/status_test.cc | 4 ++-- .../src/api_manager/utils/url_util.cc | 2 +- .../src/api_manager/utils/url_util_test.cc | 2 +- .../BUILD.googleapis | 0 .../BUILD.googletest | 0 .../third_party => third_party}/BUILD.nanopb | 0 .../third_party => third_party}/BUILD.zlib | 0 105 files changed, 270 insertions(+), 270 deletions(-) rename contrib/endpoints/BUILD => BUILD (100%) rename contrib/endpoints/WORKSPACE => WORKSPACE (100%) rename {contrib/endpoints/third_party => third_party}/BUILD.googleapis (100%) rename {contrib/endpoints/third_party => third_party}/BUILD.googletest (100%) rename {contrib/endpoints/third_party => third_party}/BUILD.nanopb (100%) rename {contrib/endpoints/third_party => third_party}/BUILD.zlib (100%) diff --git a/contrib/endpoints/BUILD b/BUILD similarity index 100% rename from contrib/endpoints/BUILD rename to BUILD diff --git a/contrib/endpoints/WORKSPACE b/WORKSPACE similarity index 100% rename from contrib/endpoints/WORKSPACE rename to WORKSPACE diff --git a/contrib/endpoints/include/BUILD b/contrib/endpoints/include/BUILD index 6275f8aa11a..0f913966eda 100644 --- a/contrib/endpoints/include/BUILD +++ b/contrib/endpoints/include/BUILD @@ -14,16 +14,15 @@ # ################################################################################ # -exports_files(["version"]) -cc_inc_library( +cc_library( name = "api_manager", hdrs = [ ":headers", ], visibility = ["//visibility:public"], deps = [ - "//src/api_manager", + "//contrib/endpoints/src/api_manager", ], ) @@ -33,7 +32,7 @@ cc_library( ":headers", ], visibility = [ - "//src/api_manager:__subpackages__", + "//contrib/endpoints/src/api_manager:__subpackages__", ], ) @@ -65,8 +64,8 @@ genrule( outs = [ "api_manager/version.h", ], - cmd = "$(location //tools:create_version) $(location :version) > $@", + cmd = "$(location //contrib/endpoints/tools:create_version) $(location :version) > $@", tools = [ - "//tools:create_version", + "//contrib/endpoints/tools:create_version", ], ) diff --git a/contrib/endpoints/include/api_manager/api_manager.h b/contrib/endpoints/include/api_manager/api_manager.h index e535cc275c4..a336218e929 100644 --- a/contrib/endpoints/include/api_manager/api_manager.h +++ b/contrib/endpoints/include/api_manager/api_manager.h @@ -20,11 +20,11 @@ #include #include +#include "contrib/endpoints/include/api_manager/env_interface.h" +#include "contrib/endpoints/include/api_manager/request.h" +#include "contrib/endpoints/include/api_manager/request_handler_interface.h" +#include "contrib/endpoints/include/api_manager/service_control.h" #include "google/api/service.pb.h" -#include "include/api_manager/env_interface.h" -#include "include/api_manager/request.h" -#include "include/api_manager/request_handler_interface.h" -#include "include/api_manager/service_control.h" namespace google { namespace api_manager { diff --git a/contrib/endpoints/include/api_manager/env_interface.h b/contrib/endpoints/include/api_manager/env_interface.h index 8b6f048d855..6308acc6d44 100644 --- a/contrib/endpoints/include/api_manager/env_interface.h +++ b/contrib/endpoints/include/api_manager/env_interface.h @@ -21,9 +21,9 @@ #include #include -#include "include/api_manager/http_request.h" -#include "include/api_manager/periodic_timer.h" -#include "include/api_manager/utils/status.h" +#include "contrib/endpoints/include/api_manager/http_request.h" +#include "contrib/endpoints/include/api_manager/periodic_timer.h" +#include "contrib/endpoints/include/api_manager/utils/status.h" namespace google { namespace api_manager { diff --git a/contrib/endpoints/include/api_manager/http_request.h b/contrib/endpoints/include/api_manager/http_request.h index d33718501ca..bd395e5daf3 100644 --- a/contrib/endpoints/include/api_manager/http_request.h +++ b/contrib/endpoints/include/api_manager/http_request.h @@ -18,7 +18,7 @@ #include #include -#include "include/api_manager/utils/status.h" +#include "contrib/endpoints/include/api_manager/utils/status.h" namespace google { namespace api_manager { diff --git a/contrib/endpoints/include/api_manager/method_call_info.h b/contrib/endpoints/include/api_manager/method_call_info.h index 48f965ab8bd..605a6481cbb 100644 --- a/contrib/endpoints/include/api_manager/method_call_info.h +++ b/contrib/endpoints/include/api_manager/method_call_info.h @@ -18,7 +18,7 @@ #include #include -#include "include/api_manager/method.h" +#include "contrib/endpoints/include/api_manager/method.h" namespace google { namespace api_manager { diff --git a/contrib/endpoints/include/api_manager/periodic_timer.h b/contrib/endpoints/include/api_manager/periodic_timer.h index 547cba03c96..eb5006ba07a 100644 --- a/contrib/endpoints/include/api_manager/periodic_timer.h +++ b/contrib/endpoints/include/api_manager/periodic_timer.h @@ -15,7 +15,7 @@ #ifndef API_MANAGER_PERIODIC_TIMER_H_ #define API_MANAGER_PERIODIC_TIMER_H_ -#include "include/api_manager/utils/status.h" +#include "contrib/endpoints/include/api_manager/utils/status.h" namespace google { namespace api_manager { diff --git a/contrib/endpoints/include/api_manager/request.h b/contrib/endpoints/include/api_manager/request.h index 565b73d11f1..ad604b5a41b 100644 --- a/contrib/endpoints/include/api_manager/request.h +++ b/contrib/endpoints/include/api_manager/request.h @@ -18,8 +18,8 @@ #include #include -#include "include/api_manager/protocol.h" -#include "include/api_manager/utils/status.h" +#include "contrib/endpoints/include/api_manager/protocol.h" +#include "contrib/endpoints/include/api_manager/utils/status.h" namespace google { namespace api_manager { diff --git a/contrib/endpoints/include/api_manager/request_handler_interface.h b/contrib/endpoints/include/api_manager/request_handler_interface.h index cae86561887..5cd36741b7e 100644 --- a/contrib/endpoints/include/api_manager/request_handler_interface.h +++ b/contrib/endpoints/include/api_manager/request_handler_interface.h @@ -15,10 +15,10 @@ #ifndef API_MANAGER_REQUEST_HANDLER_INTERFACE_H_ #define API_MANAGER_REQUEST_HANDLER_INTERFACE_H_ -#include "include/api_manager/method.h" -#include "include/api_manager/method_call_info.h" -#include "include/api_manager/response.h" -#include "include/api_manager/utils/status.h" +#include "contrib/endpoints/include/api_manager/method.h" +#include "contrib/endpoints/include/api_manager/method_call_info.h" +#include "contrib/endpoints/include/api_manager/response.h" +#include "contrib/endpoints/include/api_manager/utils/status.h" namespace google { namespace api_manager { diff --git a/contrib/endpoints/include/api_manager/response.h b/contrib/endpoints/include/api_manager/response.h index 1845f9a0041..12a6cc0f05f 100644 --- a/contrib/endpoints/include/api_manager/response.h +++ b/contrib/endpoints/include/api_manager/response.h @@ -18,9 +18,9 @@ #include #include -#include "include/api_manager/protocol.h" -#include "include/api_manager/service_control.h" -#include "include/api_manager/utils/status.h" +#include "contrib/endpoints/include/api_manager/protocol.h" +#include "contrib/endpoints/include/api_manager/service_control.h" +#include "contrib/endpoints/include/api_manager/utils/status.h" namespace google { namespace api_manager { diff --git a/contrib/endpoints/src/api_manager/BUILD b/contrib/endpoints/src/api_manager/BUILD index 75a0428383c..e3d54b46eac 100644 --- a/contrib/endpoints/src/api_manager/BUILD +++ b/contrib/endpoints/src/api_manager/BUILD @@ -25,6 +25,7 @@ cc_proto_library( ], default_runtime = "//external:protobuf", protoc = "//external:protoc", + visibility = ["//visibility:public"], ) cc_proto_library( @@ -32,9 +33,9 @@ cc_proto_library( srcs = [ "proto/api_manager_status.proto", ], - include = ".", default_runtime = "//external:protobuf", protoc = "//external:protoc", + visibility = ["//visibility:public"], ) cc_library( @@ -57,7 +58,7 @@ cc_library( "request_handler.h", ], deps = [ - "//include:headers_only", + "//contrib/endpoints/include:headers_only", ], ) @@ -90,12 +91,17 @@ cc_library( ], }), visibility = [ - "//include:__subpackages__", + "//visibility:public", ], deps = [ ":auth_headers", ":impl_headers", ":server_config_proto", + "//contrib/endpoints/src/api_manager/auth", + "//contrib/endpoints/src/api_manager/cloud_trace", + "//contrib/endpoints/src/api_manager/context", + "//contrib/endpoints/src/api_manager/service_control", + "//contrib/endpoints/src/api_manager/utils", "//external:cc_wkt_protos", "//external:cloud_trace", "//external:googletest_prod", @@ -104,11 +110,6 @@ cc_library( "//external:service_config", "//external:servicecontrol", "//external:servicecontrol_client", - "//src/api_manager/auth", - "//src/api_manager/cloud_trace", - "//src/api_manager/context", - "//src/api_manager/service_control", - "//src/api_manager/utils", ], ) @@ -221,7 +222,7 @@ cc_test( ], ) -cc_inc_library( +cc_library( name = "mock_api_manager_environment", testonly = True, hdrs = [ diff --git a/contrib/endpoints/src/api_manager/api_manager_impl.cc b/contrib/endpoints/src/api_manager/api_manager_impl.cc index 40e108d8caa..dbceb523cdf 100644 --- a/contrib/endpoints/src/api_manager/api_manager_impl.cc +++ b/contrib/endpoints/src/api_manager/api_manager_impl.cc @@ -14,10 +14,10 @@ // //////////////////////////////////////////////////////////////////////////////// // -#include "src/api_manager/api_manager_impl.h" +#include "contrib/endpoints/src/api_manager/api_manager_impl.h" -#include "src/api_manager/check_workflow.h" -#include "src/api_manager/request_handler.h" +#include "contrib/endpoints/src/api_manager/check_workflow.h" +#include "contrib/endpoints/src/api_manager/request_handler.h" using ::google::api_manager::proto::ServerConfig; diff --git a/contrib/endpoints/src/api_manager/api_manager_impl.h b/contrib/endpoints/src/api_manager/api_manager_impl.h index 76480f82f19..60f0836ed87 100644 --- a/contrib/endpoints/src/api_manager/api_manager_impl.h +++ b/contrib/endpoints/src/api_manager/api_manager_impl.h @@ -15,9 +15,9 @@ #ifndef API_MANAGER_API_MANAGER_IMPL_H_ #define API_MANAGER_API_MANAGER_IMPL_H_ -#include "include/api_manager/api_manager.h" -#include "src/api_manager/context/service_context.h" -#include "src/api_manager/service_control/interface.h" +#include "contrib/endpoints/include/api_manager/api_manager.h" +#include "contrib/endpoints/src/api_manager/context/service_context.h" +#include "contrib/endpoints/src/api_manager/service_control/interface.h" namespace google { namespace api_manager { diff --git a/contrib/endpoints/src/api_manager/api_manager_test.cc b/contrib/endpoints/src/api_manager/api_manager_test.cc index 3a7d84fc63a..c87805351e2 100644 --- a/contrib/endpoints/src/api_manager/api_manager_test.cc +++ b/contrib/endpoints/src/api_manager/api_manager_test.cc @@ -14,9 +14,9 @@ // //////////////////////////////////////////////////////////////////////////////// // -#include "include/api_manager/api_manager.h" +#include "contrib/endpoints/include/api_manager/api_manager.h" +#include "contrib/endpoints/src/api_manager/mock_api_manager_environment.h" #include "gtest/gtest.h" -#include "src/api_manager/mock_api_manager_environment.h" #include diff --git a/contrib/endpoints/src/api_manager/auth/BUILD b/contrib/endpoints/src/api_manager/auth/BUILD index 8c0a0d0e00c..0bd0dea4b86 100644 --- a/contrib/endpoints/src/api_manager/auth/BUILD +++ b/contrib/endpoints/src/api_manager/auth/BUILD @@ -14,7 +14,7 @@ # ################################################################################ # -package(default_visibility = ["//src/api_manager:__subpackages__"]) +package(default_visibility = ["//contrib/endpoints/src/api_manager:__subpackages__"]) cc_library( name = "auth", @@ -33,11 +33,11 @@ cc_library( ], }), deps = [ + "//contrib/endpoints/src/api_manager:auth_headers", + "//contrib/endpoints/src/api_manager/auth/lib", + "//contrib/endpoints/src/api_manager/utils", "//external:googletest_prod", "//external:servicecontrol_client", - "//src/api_manager:auth_headers", - "//src/api_manager/auth/lib", - "//src/api_manager/utils", ], ) @@ -57,10 +57,10 @@ cc_library( ], }), deps = [ + "//contrib/endpoints/include:headers_only", + "//contrib/endpoints/src/api_manager/auth/lib", + "//contrib/endpoints/src/api_manager/utils", "//external:grpc++", - "//include:headers_only", - "//src/api_manager/auth/lib", - "//src/api_manager/utils", ], ) @@ -86,7 +86,7 @@ cc_test( linkstatic = 1, deps = [ ":service_account_token", + "//contrib/endpoints/src/api_manager:mock_api_manager_environment", "//external:googletest_main", - "//src/api_manager:mock_api_manager_environment", ], ) diff --git a/contrib/endpoints/src/api_manager/auth/jwt_cache.cc b/contrib/endpoints/src/api_manager/auth/jwt_cache.cc index 718cecd3544..5fc8b567f66 100644 --- a/contrib/endpoints/src/api_manager/auth/jwt_cache.cc +++ b/contrib/endpoints/src/api_manager/auth/jwt_cache.cc @@ -14,7 +14,7 @@ // //////////////////////////////////////////////////////////////////////////////// // -#include "src/api_manager/auth/jwt_cache.h" +#include "contrib/endpoints/src/api_manager/auth/jwt_cache.h" using ::google::service_control_client::SimpleLRUCache; using std::chrono::system_clock; diff --git a/contrib/endpoints/src/api_manager/auth/jwt_cache.h b/contrib/endpoints/src/api_manager/auth/jwt_cache.h index 6b06f58c28a..ceed4edbc9d 100644 --- a/contrib/endpoints/src/api_manager/auth/jwt_cache.h +++ b/contrib/endpoints/src/api_manager/auth/jwt_cache.h @@ -18,7 +18,7 @@ #include #include -#include "src/api_manager/auth.h" +#include "contrib/endpoints/src/api_manager/auth.h" #include "utils/simple_lru_cache_inl.h" namespace google { diff --git a/contrib/endpoints/src/api_manager/auth/jwt_cache_test.cc b/contrib/endpoints/src/api_manager/auth/jwt_cache_test.cc index 82cc4ed7d2d..e0b6bae8cae 100644 --- a/contrib/endpoints/src/api_manager/auth/jwt_cache_test.cc +++ b/contrib/endpoints/src/api_manager/auth/jwt_cache_test.cc @@ -14,7 +14,7 @@ // //////////////////////////////////////////////////////////////////////////////// // -#include "src/api_manager/auth/jwt_cache.h" +#include "contrib/endpoints/src/api_manager/auth/jwt_cache.h" #include #include "gtest/gtest.h" diff --git a/contrib/endpoints/src/api_manager/auth/lib/BUILD b/contrib/endpoints/src/api_manager/auth/lib/BUILD index 50796c7699a..4ff5be26262 100644 --- a/contrib/endpoints/src/api_manager/auth/lib/BUILD +++ b/contrib/endpoints/src/api_manager/auth/lib/BUILD @@ -33,11 +33,11 @@ cc_library( ], visibility = ["//visibility:public"], deps = [ + "//contrib/endpoints/include:headers_only", + "//contrib/endpoints/src/api_manager:auth_headers", + "//contrib/endpoints/src/api_manager/utils", "//external:grpc", "//external:protobuf", - "//include:headers_only", - "//src/api_manager:auth_headers", - "//src/api_manager/utils", ], ) diff --git a/contrib/endpoints/src/api_manager/auth/lib/auth_jwt_validator.cc b/contrib/endpoints/src/api_manager/auth/lib/auth_jwt_validator.cc index a245454269c..3ba8339b9c9 100644 --- a/contrib/endpoints/src/api_manager/auth/lib/auth_jwt_validator.cc +++ b/contrib/endpoints/src/api_manager/auth/lib/auth_jwt_validator.cc @@ -14,7 +14,7 @@ // //////////////////////////////////////////////////////////////////////////////// // -#include "src/api_manager/auth/lib/auth_jwt_validator.h" +#include "contrib/endpoints/src/api_manager/auth/lib/auth_jwt_validator.h" // Implementation of JWT token verification. @@ -66,7 +66,7 @@ extern "C" { #include #include -#include "src/api_manager/auth/lib/json_util.h" +#include "contrib/endpoints/src/api_manager/auth/lib/json_util.h" using std::string; using std::chrono::system_clock; diff --git a/contrib/endpoints/src/api_manager/auth/lib/auth_jwt_validator.h b/contrib/endpoints/src/api_manager/auth/lib/auth_jwt_validator.h index 5bc7d6df204..ae24a5f6170 100644 --- a/contrib/endpoints/src/api_manager/auth/lib/auth_jwt_validator.h +++ b/contrib/endpoints/src/api_manager/auth/lib/auth_jwt_validator.h @@ -19,8 +19,8 @@ #include #include -#include "include/api_manager/utils/status.h" -#include "src/api_manager/auth.h" +#include "contrib/endpoints/include/api_manager/utils/status.h" +#include "contrib/endpoints/src/api_manager/auth.h" using ::google::api_manager::utils::Status; diff --git a/contrib/endpoints/src/api_manager/auth/lib/auth_jwt_validator_test.cc b/contrib/endpoints/src/api_manager/auth/lib/auth_jwt_validator_test.cc index 9401a28ac83..ad2b132853f 100644 --- a/contrib/endpoints/src/api_manager/auth/lib/auth_jwt_validator_test.cc +++ b/contrib/endpoints/src/api_manager/auth/lib/auth_jwt_validator_test.cc @@ -14,10 +14,10 @@ // //////////////////////////////////////////////////////////////////////////////// // -#include "src/api_manager/auth/lib/auth_jwt_validator.h" +#include "contrib/endpoints/src/api_manager/auth/lib/auth_jwt_validator.h" +#include "contrib/endpoints/src/api_manager/auth/lib/auth_token.h" #include "gtest/gtest.h" -#include "src/api_manager/auth/lib/auth_token.h" #include diff --git a/contrib/endpoints/src/api_manager/auth/lib/auth_token.cc b/contrib/endpoints/src/api_manager/auth/lib/auth_token.cc index 36d9c264aad..72b53790158 100644 --- a/contrib/endpoints/src/api_manager/auth/lib/auth_token.cc +++ b/contrib/endpoints/src/api_manager/auth/lib/auth_token.cc @@ -14,8 +14,8 @@ // //////////////////////////////////////////////////////////////////////////////// // -#include "src/api_manager/auth/lib/auth_token.h" -#include "src/api_manager/auth/lib/json_util.h" +#include "contrib/endpoints/src/api_manager/auth/lib/auth_token.h" +#include "contrib/endpoints/src/api_manager/auth/lib/json_util.h" #include #include diff --git a/contrib/endpoints/src/api_manager/auth/lib/auth_token_test.cc b/contrib/endpoints/src/api_manager/auth/lib/auth_token_test.cc index a08d67133ec..fb0fcecc25c 100644 --- a/contrib/endpoints/src/api_manager/auth/lib/auth_token_test.cc +++ b/contrib/endpoints/src/api_manager/auth/lib/auth_token_test.cc @@ -14,7 +14,7 @@ // //////////////////////////////////////////////////////////////////////////////// // -#include "src/api_manager/auth/lib/auth_token.h" +#include "contrib/endpoints/src/api_manager/auth/lib/auth_token.h" #include "gtest/gtest.h" #include diff --git a/contrib/endpoints/src/api_manager/auth/lib/base64.cc b/contrib/endpoints/src/api_manager/auth/lib/base64.cc index 1b24d6ab830..d9346797677 100644 --- a/contrib/endpoints/src/api_manager/auth/lib/base64.cc +++ b/contrib/endpoints/src/api_manager/auth/lib/base64.cc @@ -14,12 +14,12 @@ // //////////////////////////////////////////////////////////////////////////////// // -#include "src/api_manager/auth/lib/base64.h" +#include "contrib/endpoints/src/api_manager/auth/lib/base64.h" #include #include -#include "src/api_manager/auth/lib/grpc_internals.h" +#include "contrib/endpoints/src/api_manager/auth/lib/grpc_internals.h" namespace google { namespace api_manager { diff --git a/contrib/endpoints/src/api_manager/auth/lib/base64_test.cc b/contrib/endpoints/src/api_manager/auth/lib/base64_test.cc index 0a889e94e80..e2a06c98a1e 100644 --- a/contrib/endpoints/src/api_manager/auth/lib/base64_test.cc +++ b/contrib/endpoints/src/api_manager/auth/lib/base64_test.cc @@ -14,9 +14,9 @@ // //////////////////////////////////////////////////////////////////////////////// // -#include "src/api_manager/auth/lib/base64.h" +#include "contrib/endpoints/src/api_manager/auth/lib/base64.h" +#include "contrib/endpoints/src/api_manager/auth/lib/auth_token.h" #include "gtest/gtest.h" -#include "src/api_manager/auth/lib/auth_token.h" namespace google { namespace api_manager { diff --git a/contrib/endpoints/src/api_manager/auth/lib/json.cc b/contrib/endpoints/src/api_manager/auth/lib/json.cc index c3805a7f50b..37c14a359e1 100644 --- a/contrib/endpoints/src/api_manager/auth/lib/json.cc +++ b/contrib/endpoints/src/api_manager/auth/lib/json.cc @@ -14,12 +14,12 @@ // //////////////////////////////////////////////////////////////////////////////// // -#include "src/api_manager/auth/lib/json.h" +#include "contrib/endpoints/src/api_manager/auth/lib/json.h" #include #include -#include "src/api_manager/auth/lib/json_util.h" +#include "contrib/endpoints/src/api_manager/auth/lib/json_util.h" namespace google { namespace api_manager { diff --git a/contrib/endpoints/src/api_manager/auth/lib/json.h b/contrib/endpoints/src/api_manager/auth/lib/json.h index e7020289e27..4632a1fb1ee 100644 --- a/contrib/endpoints/src/api_manager/auth/lib/json.h +++ b/contrib/endpoints/src/api_manager/auth/lib/json.h @@ -15,7 +15,7 @@ #ifndef API_MANAGER_AUTH_LIB_JSON_H_ #define API_MANAGER_AUTH_LIB_JSON_H_ -#include "src/api_manager/auth.h" +#include "contrib/endpoints/src/api_manager/auth.h" namespace google { namespace api_manager { diff --git a/contrib/endpoints/src/api_manager/auth/lib/json_test.cc b/contrib/endpoints/src/api_manager/auth/lib/json_test.cc index 5f0e3ac15e8..4fd667b91fd 100644 --- a/contrib/endpoints/src/api_manager/auth/lib/json_test.cc +++ b/contrib/endpoints/src/api_manager/auth/lib/json_test.cc @@ -14,7 +14,7 @@ // //////////////////////////////////////////////////////////////////////////////// // -#include "src/api_manager/auth/lib/json.h" +#include "contrib/endpoints/src/api_manager/auth/lib/json.h" #include "gtest/gtest.h" namespace google { diff --git a/contrib/endpoints/src/api_manager/auth/lib/json_util.cc b/contrib/endpoints/src/api_manager/auth/lib/json_util.cc index 5e7df14d7a0..ea273f089ab 100644 --- a/contrib/endpoints/src/api_manager/auth/lib/json_util.cc +++ b/contrib/endpoints/src/api_manager/auth/lib/json_util.cc @@ -14,7 +14,7 @@ // //////////////////////////////////////////////////////////////////////////////// // -#include "src/api_manager/auth/lib/json_util.h" +#include "contrib/endpoints/src/api_manager/auth/lib/json_util.h" #include #include diff --git a/contrib/endpoints/src/api_manager/auth/lib/json_util.h b/contrib/endpoints/src/api_manager/auth/lib/json_util.h index af202c133ec..66bf97210ba 100644 --- a/contrib/endpoints/src/api_manager/auth/lib/json_util.h +++ b/contrib/endpoints/src/api_manager/auth/lib/json_util.h @@ -19,7 +19,7 @@ // since it directly includes a grpc header file. // A public header file should not include any grpc header files. -#include "src/api_manager/auth/lib/grpc_internals.h" +#include "contrib/endpoints/src/api_manager/auth/lib/grpc_internals.h" namespace google { namespace api_manager { diff --git a/contrib/endpoints/src/api_manager/auth/lib/json_util_test.cc b/contrib/endpoints/src/api_manager/auth/lib/json_util_test.cc index 21d3d751eec..5003691d189 100644 --- a/contrib/endpoints/src/api_manager/auth/lib/json_util_test.cc +++ b/contrib/endpoints/src/api_manager/auth/lib/json_util_test.cc @@ -14,7 +14,7 @@ // //////////////////////////////////////////////////////////////////////////////// // -#include "src/api_manager/auth/lib/json_util.h" +#include "contrib/endpoints/src/api_manager/auth/lib/json_util.h" #include "gtest/gtest.h" #include diff --git a/contrib/endpoints/src/api_manager/auth/service_account_token.cc b/contrib/endpoints/src/api_manager/auth/service_account_token.cc index a2986893538..69f5e8b126e 100644 --- a/contrib/endpoints/src/api_manager/auth/service_account_token.cc +++ b/contrib/endpoints/src/api_manager/auth/service_account_token.cc @@ -14,10 +14,10 @@ // //////////////////////////////////////////////////////////////////////////////// // -#include "src/api_manager/auth/service_account_token.h" +#include "contrib/endpoints/src/api_manager/auth/service_account_token.h" +#include "contrib/endpoints/src/api_manager/auth/lib/auth_token.h" #include "google/protobuf/stubs/logging.h" -#include "src/api_manager/auth/lib/auth_token.h" using ::google::api_manager::utils::Status; using ::google::protobuf::util::error::Code; diff --git a/contrib/endpoints/src/api_manager/auth/service_account_token.h b/contrib/endpoints/src/api_manager/auth/service_account_token.h index b062d66bbd8..211377449f4 100644 --- a/contrib/endpoints/src/api_manager/auth/service_account_token.h +++ b/contrib/endpoints/src/api_manager/auth/service_account_token.h @@ -17,7 +17,7 @@ #include -#include "include/api_manager/env_interface.h" +#include "contrib/endpoints/include/api_manager/env_interface.h" namespace google { namespace api_manager { diff --git a/contrib/endpoints/src/api_manager/auth/service_account_token_test.cc b/contrib/endpoints/src/api_manager/auth/service_account_token_test.cc index 260a9d2cc18..2064bd238d3 100644 --- a/contrib/endpoints/src/api_manager/auth/service_account_token_test.cc +++ b/contrib/endpoints/src/api_manager/auth/service_account_token_test.cc @@ -14,10 +14,10 @@ // //////////////////////////////////////////////////////////////////////////////// // -#include "src/api_manager/auth/service_account_token.h" +#include "contrib/endpoints/src/api_manager/auth/service_account_token.h" +#include "contrib/endpoints/src/api_manager/mock_api_manager_environment.h" #include "gtest/gtest.h" -#include "src/api_manager/mock_api_manager_environment.h" using ::google::api_manager::utils::Status; using ::google::protobuf::util::error::Code; diff --git a/contrib/endpoints/src/api_manager/check_auth.cc b/contrib/endpoints/src/api_manager/check_auth.cc index cac05f7a3ea..ce9a2c159ff 100644 --- a/contrib/endpoints/src/api_manager/check_auth.cc +++ b/contrib/endpoints/src/api_manager/check_auth.cc @@ -13,21 +13,21 @@ // limitations under the License. // //////////////////////////////////////////////////////////////////////////////// -#include "src/api_manager/check_auth.h" +#include "contrib/endpoints/src/api_manager/check_auth.h" #include #include -#include "include/api_manager/api_manager.h" -#include "include/api_manager/request.h" -#include "src/api_manager/auth.h" -#include "src/api_manager/auth/lib/auth_jwt_validator.h" -#include "src/api_manager/auth/lib/auth_token.h" -#include "src/api_manager/auth/lib/base64.h" -#include "src/api_manager/auth/lib/json.h" -#include "src/api_manager/auth/lib/json_util.h" -#include "src/api_manager/cloud_trace/cloud_trace.h" -#include "src/api_manager/utils/url_util.h" +#include "contrib/endpoints/include/api_manager/api_manager.h" +#include "contrib/endpoints/include/api_manager/request.h" +#include "contrib/endpoints/src/api_manager/auth.h" +#include "contrib/endpoints/src/api_manager/auth/lib/auth_jwt_validator.h" +#include "contrib/endpoints/src/api_manager/auth/lib/auth_token.h" +#include "contrib/endpoints/src/api_manager/auth/lib/base64.h" +#include "contrib/endpoints/src/api_manager/auth/lib/json.h" +#include "contrib/endpoints/src/api_manager/auth/lib/json_util.h" +#include "contrib/endpoints/src/api_manager/cloud_trace/cloud_trace.h" +#include "contrib/endpoints/src/api_manager/utils/url_util.h" using ::google::api_manager::auth::Certs; using ::google::api_manager::auth::JwtCache; diff --git a/contrib/endpoints/src/api_manager/check_auth.h b/contrib/endpoints/src/api_manager/check_auth.h index 3374352a981..b74bb0c0bb6 100644 --- a/contrib/endpoints/src/api_manager/check_auth.h +++ b/contrib/endpoints/src/api_manager/check_auth.h @@ -15,8 +15,8 @@ #ifndef API_MANAGER_CHECK_AUTH_H_ #define API_MANAGER_CHECK_AUTH_H_ -#include "include/api_manager/utils/status.h" -#include "src/api_manager/context/request_context.h" +#include "contrib/endpoints/include/api_manager/utils/status.h" +#include "contrib/endpoints/src/api_manager/context/request_context.h" namespace google { namespace api_manager { diff --git a/contrib/endpoints/src/api_manager/check_auth_test.cc b/contrib/endpoints/src/api_manager/check_auth_test.cc index 85f7f3b7dd6..9cdb7887c89 100644 --- a/contrib/endpoints/src/api_manager/check_auth_test.cc +++ b/contrib/endpoints/src/api_manager/check_auth_test.cc @@ -14,12 +14,12 @@ // //////////////////////////////////////////////////////////////////////////////// // -#include "src/api_manager/check_auth.h" +#include "contrib/endpoints/src/api_manager/check_auth.h" -#include "src/api_manager/check_workflow.h" -#include "src/api_manager/context/service_context.h" -#include "src/api_manager/mock_api_manager_environment.h" -#include "src/api_manager/mock_request.h" +#include "contrib/endpoints/src/api_manager/check_workflow.h" +#include "contrib/endpoints/src/api_manager/context/service_context.h" +#include "contrib/endpoints/src/api_manager/mock_api_manager_environment.h" +#include "contrib/endpoints/src/api_manager/mock_request.h" using ::testing::_; using ::testing::AllOf; diff --git a/contrib/endpoints/src/api_manager/check_service_control.cc b/contrib/endpoints/src/api_manager/check_service_control.cc index 5838f5f5c7b..1ce06c0f455 100644 --- a/contrib/endpoints/src/api_manager/check_service_control.cc +++ b/contrib/endpoints/src/api_manager/check_service_control.cc @@ -14,9 +14,9 @@ // //////////////////////////////////////////////////////////////////////////////// // includes should be ordered. This seems like a bug in clang-format? -#include "src/api_manager/check_service_control.h" +#include "contrib/endpoints/src/api_manager/check_service_control.h" +#include "contrib/endpoints/src/api_manager/cloud_trace/cloud_trace.h" #include "google/protobuf/stubs/status.h" -#include "src/api_manager/cloud_trace/cloud_trace.h" using ::google::api_manager::utils::Status; using ::google::protobuf::util::error::Code; diff --git a/contrib/endpoints/src/api_manager/check_service_control.h b/contrib/endpoints/src/api_manager/check_service_control.h index f6c0344e801..4a2ad96a32c 100644 --- a/contrib/endpoints/src/api_manager/check_service_control.h +++ b/contrib/endpoints/src/api_manager/check_service_control.h @@ -15,8 +15,8 @@ #ifndef API_MANAGER_CHECK_SERVICE_CONTROL_H_ #define API_MANAGER_CHECK_SERVICE_CONTROL_H_ -#include "include/api_manager/utils/status.h" -#include "src/api_manager/context/request_context.h" +#include "contrib/endpoints/include/api_manager/utils/status.h" +#include "contrib/endpoints/src/api_manager/context/request_context.h" namespace google { namespace api_manager { diff --git a/contrib/endpoints/src/api_manager/check_workflow.cc b/contrib/endpoints/src/api_manager/check_workflow.cc index 2dc1b115985..8335d779142 100644 --- a/contrib/endpoints/src/api_manager/check_workflow.cc +++ b/contrib/endpoints/src/api_manager/check_workflow.cc @@ -14,10 +14,10 @@ // //////////////////////////////////////////////////////////////////////////////// -#include "src/api_manager/check_workflow.h" -#include "src/api_manager/check_auth.h" -#include "src/api_manager/check_service_control.h" -#include "src/api_manager/fetch_metadata.h" +#include "contrib/endpoints/src/api_manager/check_workflow.h" +#include "contrib/endpoints/src/api_manager/check_auth.h" +#include "contrib/endpoints/src/api_manager/check_service_control.h" +#include "contrib/endpoints/src/api_manager/fetch_metadata.h" using ::google::api_manager::utils::Status; diff --git a/contrib/endpoints/src/api_manager/check_workflow.h b/contrib/endpoints/src/api_manager/check_workflow.h index f4820fe2825..e521a87263b 100644 --- a/contrib/endpoints/src/api_manager/check_workflow.h +++ b/contrib/endpoints/src/api_manager/check_workflow.h @@ -15,8 +15,8 @@ #ifndef API_MANAGER_CHECK_WORKFLOW_H_ #define API_MANAGER_CHECK_WORKFLOW_H_ -#include "include/api_manager/utils/status.h" -#include "src/api_manager/context/request_context.h" +#include "contrib/endpoints/include/api_manager/utils/status.h" +#include "contrib/endpoints/src/api_manager/context/request_context.h" namespace google { namespace api_manager { diff --git a/contrib/endpoints/src/api_manager/cloud_trace/BUILD b/contrib/endpoints/src/api_manager/cloud_trace/BUILD index 79d95f7a32d..8106eec0249 100644 --- a/contrib/endpoints/src/api_manager/cloud_trace/BUILD +++ b/contrib/endpoints/src/api_manager/cloud_trace/BUILD @@ -14,7 +14,7 @@ # ################################################################################ # -package(default_visibility = ["//src/api_manager:__subpackages__"]) +package(default_visibility = ["//contrib/endpoints/src/api_manager:__subpackages__"]) cc_library( name = "cloud_trace", @@ -23,7 +23,8 @@ cc_library( "cloud_trace.h", ], deps = [ - "//src/api_manager/auth:service_account_token", + "//contrib/endpoints/include:headers_only", + "//contrib/endpoints/src/api_manager/auth:service_account_token", "//external:cloud_trace", ], ) @@ -37,9 +38,9 @@ cc_test( linkstatic = 1, deps = [ ":cloud_trace", - "//external:googletest_main", - "//src/api_manager:mock_api_manager_environment", + "//contrib/endpoints/src/api_manager:mock_api_manager_environment", "//external:cloud_trace", + "//external:googletest_main", ], ) diff --git a/contrib/endpoints/src/api_manager/cloud_trace/cloud_trace.cc b/contrib/endpoints/src/api_manager/cloud_trace/cloud_trace.cc index 97ea66aba74..0217d2cc8b7 100644 --- a/contrib/endpoints/src/api_manager/cloud_trace/cloud_trace.cc +++ b/contrib/endpoints/src/api_manager/cloud_trace/cloud_trace.cc @@ -22,10 +22,10 @@ #include #include #include +#include "contrib/endpoints/include/api_manager/utils/status.h" +#include "contrib/endpoints/include/api_manager/version.h" +#include "contrib/endpoints/src/api_manager/utils/marshalling.h" #include "google/protobuf/timestamp.pb.h" -#include "include/api_manager/utils/status.h" -#include "include/api_manager/version.h" -#include "src/api_manager/utils/marshalling.h" using google::api_manager::utils::Status; using google::devtools::cloudtrace::v1::Trace; diff --git a/contrib/endpoints/src/api_manager/cloud_trace/cloud_trace.h b/contrib/endpoints/src/api_manager/cloud_trace/cloud_trace.h index d5d0534e024..2f62e1add31 100644 --- a/contrib/endpoints/src/api_manager/cloud_trace/cloud_trace.h +++ b/contrib/endpoints/src/api_manager/cloud_trace/cloud_trace.h @@ -19,11 +19,11 @@ #include #include +#include "contrib/endpoints/include/api_manager/env_interface.h" +#include "contrib/endpoints/include/api_manager/periodic_timer.h" +#include "contrib/endpoints/src/api_manager/auth/service_account_token.h" #include "google/devtools/cloudtrace/v1/trace.pb.h" #include "google/protobuf/map.h" -#include "include/api_manager/env_interface.h" -#include "include/api_manager/periodic_timer.h" -#include "src/api_manager/auth/service_account_token.h" namespace google { namespace api_manager { diff --git a/contrib/endpoints/src/api_manager/cloud_trace/cloud_trace_test.cc b/contrib/endpoints/src/api_manager/cloud_trace/cloud_trace_test.cc index f9b4deb1d73..678cf0fb914 100644 --- a/contrib/endpoints/src/api_manager/cloud_trace/cloud_trace_test.cc +++ b/contrib/endpoints/src/api_manager/cloud_trace/cloud_trace_test.cc @@ -14,11 +14,11 @@ // //////////////////////////////////////////////////////////////////////////////// // -#include "src/api_manager/cloud_trace/cloud_trace.h" +#include "contrib/endpoints/src/api_manager/cloud_trace/cloud_trace.h" +#include "contrib/endpoints/src/api_manager/mock_api_manager_environment.h" #include "google/devtools/cloudtrace/v1/trace.pb.h" #include "gtest/gtest.h" -#include "src/api_manager/mock_api_manager_environment.h" using google::devtools::cloudtrace::v1::TraceSpan; diff --git a/contrib/endpoints/src/api_manager/cloud_trace/sampler_test.cc b/contrib/endpoints/src/api_manager/cloud_trace/sampler_test.cc index 015fab15cb7..ba2654cadef 100644 --- a/contrib/endpoints/src/api_manager/cloud_trace/sampler_test.cc +++ b/contrib/endpoints/src/api_manager/cloud_trace/sampler_test.cc @@ -14,7 +14,7 @@ // //////////////////////////////////////////////////////////////////////////////// // -#include "src/api_manager/cloud_trace/cloud_trace.h" +#include "contrib/endpoints/src/api_manager/cloud_trace/cloud_trace.h" #include #include diff --git a/contrib/endpoints/src/api_manager/config.cc b/contrib/endpoints/src/api_manager/config.cc index d6d7f8a56b1..9c9f4d10a1a 100644 --- a/contrib/endpoints/src/api_manager/config.cc +++ b/contrib/endpoints/src/api_manager/config.cc @@ -14,10 +14,10 @@ // //////////////////////////////////////////////////////////////////////////////// // -#include "src/api_manager/config.h" -#include "src/api_manager/utils/marshalling.h" -#include "src/api_manager/utils/stl_util.h" -#include "src/api_manager/utils/url_util.h" +#include "contrib/endpoints/src/api_manager/config.h" +#include "contrib/endpoints/src/api_manager/utils/marshalling.h" +#include "contrib/endpoints/src/api_manager/utils/stl_util.h" +#include "contrib/endpoints/src/api_manager/utils/url_util.h" #include #include diff --git a/contrib/endpoints/src/api_manager/config.h b/contrib/endpoints/src/api_manager/config.h index de8cab68c1e..9a56d16d745 100644 --- a/contrib/endpoints/src/api_manager/config.h +++ b/contrib/endpoints/src/api_manager/config.h @@ -20,12 +20,12 @@ #include #include +#include "contrib/endpoints/include/api_manager/env_interface.h" +#include "contrib/endpoints/include/api_manager/method_call_info.h" +#include "contrib/endpoints/src/api_manager/method_impl.h" +#include "contrib/endpoints/src/api_manager/path_matcher.h" +#include "contrib/endpoints/src/api_manager/proto/server_config.pb.h" #include "google/api/service.pb.h" -#include "include/api_manager/env_interface.h" -#include "include/api_manager/method_call_info.h" -#include "src/api_manager/method_impl.h" -#include "src/api_manager/path_matcher.h" -#include "src/api_manager/proto/server_config.pb.h" namespace google { namespace api_manager { diff --git a/contrib/endpoints/src/api_manager/config_test.cc b/contrib/endpoints/src/api_manager/config_test.cc index a5a871e9dc9..c072a2de3cb 100644 --- a/contrib/endpoints/src/api_manager/config_test.cc +++ b/contrib/endpoints/src/api_manager/config_test.cc @@ -14,9 +14,9 @@ // //////////////////////////////////////////////////////////////////////////////// // -#include "src/api_manager/config.h" +#include "contrib/endpoints/src/api_manager/config.h" +#include "contrib/endpoints/src/api_manager/mock_api_manager_environment.h" #include "gtest/gtest.h" -#include "src/api_manager/mock_api_manager_environment.h" namespace google { namespace api_manager { diff --git a/contrib/endpoints/src/api_manager/context/BUILD b/contrib/endpoints/src/api_manager/context/BUILD index da445c024c7..59365102318 100644 --- a/contrib/endpoints/src/api_manager/context/BUILD +++ b/contrib/endpoints/src/api_manager/context/BUILD @@ -14,7 +14,7 @@ # ################################################################################ # -package(default_visibility = ["//src/api_manager:__subpackages__"]) +package(default_visibility = ["//contrib/endpoints/src/api_manager:__subpackages__"]) cc_library( name = "context", @@ -34,6 +34,13 @@ cc_library( ], }), deps = [ + "//contrib/endpoints/src/api_manager:impl_headers", + "//contrib/endpoints/src/api_manager:server_config_proto", + "//contrib/endpoints/src/api_manager/auth", + "//contrib/endpoints/src/api_manager/auth:service_account_token", + "//contrib/endpoints/src/api_manager/cloud_trace", + "//contrib/endpoints/src/api_manager/service_control", + "//contrib/endpoints/src/api_manager/utils", "//external:cc_wkt_protos", "//external:cloud_trace", "//external:googletest_prod", @@ -42,12 +49,5 @@ cc_library( "//external:service_config", "//external:servicecontrol", "//external:servicecontrol_client", - "//src/api_manager:impl_headers", - "//src/api_manager:server_config_proto", - "//src/api_manager/auth", - "//src/api_manager/auth:service_account_token", - "//src/api_manager/cloud_trace", - "//src/api_manager/service_control", - "//src/api_manager/utils", ], ) diff --git a/contrib/endpoints/src/api_manager/context/request_context.cc b/contrib/endpoints/src/api_manager/context/request_context.cc index 28d37c99b86..57409c1ae58 100644 --- a/contrib/endpoints/src/api_manager/context/request_context.cc +++ b/contrib/endpoints/src/api_manager/context/request_context.cc @@ -15,7 +15,7 @@ //////////////////////////////////////////////////////////////////////////////// // -#include "src/api_manager/context/request_context.h" +#include "contrib/endpoints/src/api_manager/context/request_context.h" #include #include diff --git a/contrib/endpoints/src/api_manager/context/request_context.h b/contrib/endpoints/src/api_manager/context/request_context.h index 2ef0b391a87..5b29c271aad 100644 --- a/contrib/endpoints/src/api_manager/context/request_context.h +++ b/contrib/endpoints/src/api_manager/context/request_context.h @@ -19,12 +19,12 @@ #include #include -#include "include/api_manager/method.h" -#include "include/api_manager/request.h" -#include "include/api_manager/response.h" -#include "src/api_manager/cloud_trace/cloud_trace.h" -#include "src/api_manager/context/service_context.h" -#include "src/api_manager/service_control/info.h" +#include "contrib/endpoints/include/api_manager/method.h" +#include "contrib/endpoints/include/api_manager/request.h" +#include "contrib/endpoints/include/api_manager/response.h" +#include "contrib/endpoints/src/api_manager/cloud_trace/cloud_trace.h" +#include "contrib/endpoints/src/api_manager/context/service_context.h" +#include "contrib/endpoints/src/api_manager/service_control/info.h" namespace google { namespace api_manager { diff --git a/contrib/endpoints/src/api_manager/context/service_context.cc b/contrib/endpoints/src/api_manager/context/service_context.cc index a0b7f1e8150..c222a847af9 100644 --- a/contrib/endpoints/src/api_manager/context/service_context.cc +++ b/contrib/endpoints/src/api_manager/context/service_context.cc @@ -14,9 +14,9 @@ // //////////////////////////////////////////////////////////////////////////////// // -#include "src/api_manager/context/service_context.h" +#include "contrib/endpoints/src/api_manager/context/service_context.h" -#include "src/api_manager/service_control/aggregated.h" +#include "contrib/endpoints/src/api_manager/service_control/aggregated.h" namespace google { namespace api_manager { diff --git a/contrib/endpoints/src/api_manager/context/service_context.h b/contrib/endpoints/src/api_manager/context/service_context.h index efb7f1d4e3b..5633ca3dd88 100644 --- a/contrib/endpoints/src/api_manager/context/service_context.h +++ b/contrib/endpoints/src/api_manager/context/service_context.h @@ -15,14 +15,14 @@ #ifndef API_MANAGER_CONTEXT_SERVICE_CONTEXT_H_ #define API_MANAGER_CONTEXT_SERVICE_CONTEXT_H_ -#include "include/api_manager/method.h" -#include "src/api_manager/auth/certs.h" -#include "src/api_manager/auth/jwt_cache.h" -#include "src/api_manager/auth/service_account_token.h" -#include "src/api_manager/cloud_trace/cloud_trace.h" -#include "src/api_manager/config.h" -#include "src/api_manager/gce_metadata.h" -#include "src/api_manager/service_control/interface.h" +#include "contrib/endpoints/include/api_manager/method.h" +#include "contrib/endpoints/src/api_manager/auth/certs.h" +#include "contrib/endpoints/src/api_manager/auth/jwt_cache.h" +#include "contrib/endpoints/src/api_manager/auth/service_account_token.h" +#include "contrib/endpoints/src/api_manager/cloud_trace/cloud_trace.h" +#include "contrib/endpoints/src/api_manager/config.h" +#include "contrib/endpoints/src/api_manager/gce_metadata.h" +#include "contrib/endpoints/src/api_manager/service_control/interface.h" namespace google { namespace api_manager { diff --git a/contrib/endpoints/src/api_manager/fetch_metadata.cc b/contrib/endpoints/src/api_manager/fetch_metadata.cc index 2f81c9f6236..92fed3035cc 100644 --- a/contrib/endpoints/src/api_manager/fetch_metadata.cc +++ b/contrib/endpoints/src/api_manager/fetch_metadata.cc @@ -14,10 +14,10 @@ // //////////////////////////////////////////////////////////////////////////////// -#include "src/api_manager/fetch_metadata.h" +#include "contrib/endpoints/src/api_manager/fetch_metadata.h" -#include "include/api_manager/http_request.h" -#include "src/api_manager/auth/lib/auth_token.h" +#include "contrib/endpoints/include/api_manager/http_request.h" +#include "contrib/endpoints/src/api_manager/auth/lib/auth_token.h" using ::google::api_manager::utils::Status; using ::google::protobuf::util::error::Code; diff --git a/contrib/endpoints/src/api_manager/fetch_metadata.h b/contrib/endpoints/src/api_manager/fetch_metadata.h index 7f2e1b74614..22d99957895 100644 --- a/contrib/endpoints/src/api_manager/fetch_metadata.h +++ b/contrib/endpoints/src/api_manager/fetch_metadata.h @@ -15,8 +15,8 @@ #ifndef API_MANAGER_FETCH_METADATA_H_ #define API_MANAGER_FETCH_METADATA_H_ -#include "include/api_manager/utils/status.h" -#include "src/api_manager/context/request_context.h" +#include "contrib/endpoints/include/api_manager/utils/status.h" +#include "contrib/endpoints/src/api_manager/context/request_context.h" namespace google { namespace api_manager { diff --git a/contrib/endpoints/src/api_manager/fetch_metadata_test.cc b/contrib/endpoints/src/api_manager/fetch_metadata_test.cc index aa397e013f4..69de9dc8343 100644 --- a/contrib/endpoints/src/api_manager/fetch_metadata_test.cc +++ b/contrib/endpoints/src/api_manager/fetch_metadata_test.cc @@ -14,11 +14,11 @@ // //////////////////////////////////////////////////////////////////////////////// // -#include "src/api_manager/fetch_metadata.h" +#include "contrib/endpoints/src/api_manager/fetch_metadata.h" -#include "src/api_manager/context/service_context.h" -#include "src/api_manager/mock_api_manager_environment.h" -#include "src/api_manager/mock_request.h" +#include "contrib/endpoints/src/api_manager/context/service_context.h" +#include "contrib/endpoints/src/api_manager/mock_api_manager_environment.h" +#include "contrib/endpoints/src/api_manager/mock_request.h" using ::testing::_; using ::testing::Invoke; diff --git a/contrib/endpoints/src/api_manager/gce_metadata.cc b/contrib/endpoints/src/api_manager/gce_metadata.cc index 0ff0485421b..da6444b544e 100644 --- a/contrib/endpoints/src/api_manager/gce_metadata.cc +++ b/contrib/endpoints/src/api_manager/gce_metadata.cc @@ -14,10 +14,10 @@ // //////////////////////////////////////////////////////////////////////////////// // -#include "src/api_manager/gce_metadata.h" +#include "contrib/endpoints/src/api_manager/gce_metadata.h" +#include "contrib/endpoints/src/api_manager/auth/lib/json_util.h" #include "google/protobuf/stubs/status.h" -#include "src/api_manager/auth/lib/json_util.h" using ::google::api_manager::auth::GetProperty; using ::google::api_manager::auth::GetStringValue; diff --git a/contrib/endpoints/src/api_manager/gce_metadata.h b/contrib/endpoints/src/api_manager/gce_metadata.h index f4d2f033932..ccf68c60a8a 100644 --- a/contrib/endpoints/src/api_manager/gce_metadata.h +++ b/contrib/endpoints/src/api_manager/gce_metadata.h @@ -15,7 +15,7 @@ #ifndef API_MANAGER_GCE_METADATA_H_ #define API_MANAGER_GCE_METADATA_H_ -#include "include/api_manager/utils/status.h" +#include "contrib/endpoints/include/api_manager/utils/status.h" namespace google { namespace api_manager { diff --git a/contrib/endpoints/src/api_manager/gce_metadata_test.cc b/contrib/endpoints/src/api_manager/gce_metadata_test.cc index 1a102990846..dc5dae329a2 100644 --- a/contrib/endpoints/src/api_manager/gce_metadata_test.cc +++ b/contrib/endpoints/src/api_manager/gce_metadata_test.cc @@ -14,7 +14,7 @@ // //////////////////////////////////////////////////////////////////////////////// // -#include "src/api_manager/gce_metadata.h" +#include "contrib/endpoints/src/api_manager/gce_metadata.h" #include "gtest/gtest.h" using ::google::api_manager::utils::Status; diff --git a/contrib/endpoints/src/api_manager/http_template.cc b/contrib/endpoints/src/api_manager/http_template.cc index 24f49952ed3..8748ad336ff 100644 --- a/contrib/endpoints/src/api_manager/http_template.cc +++ b/contrib/endpoints/src/api_manager/http_template.cc @@ -18,7 +18,7 @@ #include #include -#include "src/api_manager/http_template.h" +#include "contrib/endpoints/src/api_manager/http_template.h" namespace google { namespace api_manager { diff --git a/contrib/endpoints/src/api_manager/method_impl.cc b/contrib/endpoints/src/api_manager/method_impl.cc index 72ae939168b..72e7f3515d4 100644 --- a/contrib/endpoints/src/api_manager/method_impl.cc +++ b/contrib/endpoints/src/api_manager/method_impl.cc @@ -14,8 +14,8 @@ // //////////////////////////////////////////////////////////////////////////////// // -#include "src/api_manager/method_impl.h" -#include "src/api_manager/utils/url_util.h" +#include "contrib/endpoints/src/api_manager/method_impl.h" +#include "contrib/endpoints/src/api_manager/utils/url_util.h" #include diff --git a/contrib/endpoints/src/api_manager/method_impl.h b/contrib/endpoints/src/api_manager/method_impl.h index c100c4ce166..e5739d639bc 100644 --- a/contrib/endpoints/src/api_manager/method_impl.h +++ b/contrib/endpoints/src/api_manager/method_impl.h @@ -19,8 +19,8 @@ #include #include -#include "include/api_manager/method.h" -#include "src/api_manager/utils/stl_util.h" +#include "contrib/endpoints/include/api_manager/method.h" +#include "contrib/endpoints/src/api_manager/utils/stl_util.h" namespace google { namespace api_manager { diff --git a/contrib/endpoints/src/api_manager/method_test.cc b/contrib/endpoints/src/api_manager/method_test.cc index eef4ad3839f..4972e87c027 100644 --- a/contrib/endpoints/src/api_manager/method_test.cc +++ b/contrib/endpoints/src/api_manager/method_test.cc @@ -14,8 +14,8 @@ // //////////////////////////////////////////////////////////////////////////////// // +#include "contrib/endpoints/src/api_manager/method_impl.h" #include "gtest/gtest.h" -#include "src/api_manager/method_impl.h" using std::string; diff --git a/contrib/endpoints/src/api_manager/mock_api_manager_environment.h b/contrib/endpoints/src/api_manager/mock_api_manager_environment.h index 9a84cd068d4..ae03eaa6f45 100644 --- a/contrib/endpoints/src/api_manager/mock_api_manager_environment.h +++ b/contrib/endpoints/src/api_manager/mock_api_manager_environment.h @@ -15,8 +15,8 @@ #ifndef API_MANAGER_MOCK_ESP_ENVIRONMENT_H_ #define API_MANAGER_MOCK_ESP_ENVIRONMENT_H_ +#include "contrib/endpoints/include/api_manager/api_manager.h" #include "gmock/gmock.h" -#include "include/api_manager/api_manager.h" namespace google { namespace api_manager { diff --git a/contrib/endpoints/src/api_manager/mock_method_info.h b/contrib/endpoints/src/api_manager/mock_method_info.h index 472cf887521..a7de28e3422 100644 --- a/contrib/endpoints/src/api_manager/mock_method_info.h +++ b/contrib/endpoints/src/api_manager/mock_method_info.h @@ -15,8 +15,8 @@ #ifndef API_MANAGER_MOCK_METHOD_INFO_H_ #define API_MANAGER_MOCK_METHOD_INFO_H_ +#include "contrib/endpoints/include/api_manager/method.h" #include "gmock/gmock.h" -#include "include/api_manager/method.h" namespace google { namespace api_manager { diff --git a/contrib/endpoints/src/api_manager/mock_request.h b/contrib/endpoints/src/api_manager/mock_request.h index 2e8e7ae3ca7..5b3bcb03962 100644 --- a/contrib/endpoints/src/api_manager/mock_request.h +++ b/contrib/endpoints/src/api_manager/mock_request.h @@ -15,8 +15,8 @@ #ifndef API_MANAGER_MOCK_REQUEST_H_ #define API_MANAGER_MOCK_REQUEST_H_ +#include "contrib/endpoints/include/api_manager/request.h" #include "gmock/gmock.h" -#include "include/api_manager/request.h" namespace google { namespace api_manager { diff --git a/contrib/endpoints/src/api_manager/path_matcher.cc b/contrib/endpoints/src/api_manager/path_matcher.cc index 6fa874f59ee..9be31cde8f7 100644 --- a/contrib/endpoints/src/api_manager/path_matcher.cc +++ b/contrib/endpoints/src/api_manager/path_matcher.cc @@ -14,11 +14,11 @@ // //////////////////////////////////////////////////////////////////////////////// // -#include "src/api_manager/path_matcher.h" +#include "contrib/endpoints/src/api_manager/path_matcher.h" -#include "include/api_manager/method.h" -#include "include/api_manager/method_call_info.h" -#include "src/api_manager/http_template.h" +#include "contrib/endpoints/include/api_manager/method.h" +#include "contrib/endpoints/include/api_manager/method_call_info.h" +#include "contrib/endpoints/src/api_manager/http_template.h" #include #include diff --git a/contrib/endpoints/src/api_manager/path_matcher.h b/contrib/endpoints/src/api_manager/path_matcher.h index 3ece80fb920..b36b29df4bd 100644 --- a/contrib/endpoints/src/api_manager/path_matcher.h +++ b/contrib/endpoints/src/api_manager/path_matcher.h @@ -21,10 +21,10 @@ #include #include -#include "include/api_manager/method.h" -#include "include/api_manager/method_call_info.h" -#include "src/api_manager/http_template.h" -#include "src/api_manager/path_matcher_node.h" +#include "contrib/endpoints/include/api_manager/method.h" +#include "contrib/endpoints/include/api_manager/method_call_info.h" +#include "contrib/endpoints/src/api_manager/http_template.h" +#include "contrib/endpoints/src/api_manager/path_matcher_node.h" namespace google { namespace api_manager { diff --git a/contrib/endpoints/src/api_manager/path_matcher_node.cc b/contrib/endpoints/src/api_manager/path_matcher_node.cc index 2bfc9afb352..0291ae17052 100644 --- a/contrib/endpoints/src/api_manager/path_matcher_node.cc +++ b/contrib/endpoints/src/api_manager/path_matcher_node.cc @@ -14,8 +14,8 @@ // //////////////////////////////////////////////////////////////////////////////// // -#include "src/api_manager/path_matcher_node.h" -#include "src/api_manager/http_template.h" +#include "contrib/endpoints/src/api_manager/path_matcher_node.h" +#include "contrib/endpoints/src/api_manager/http_template.h" #include #include diff --git a/contrib/endpoints/src/api_manager/path_matcher_node.h b/contrib/endpoints/src/api_manager/path_matcher_node.h index 90f961344fd..3ba548cfab5 100644 --- a/contrib/endpoints/src/api_manager/path_matcher_node.h +++ b/contrib/endpoints/src/api_manager/path_matcher_node.h @@ -21,7 +21,7 @@ #include #include -#include "src/api_manager/utils/stl_util.h" +#include "contrib/endpoints/src/api_manager/utils/stl_util.h" namespace google { namespace api_manager { diff --git a/contrib/endpoints/src/api_manager/path_matcher_test.cc b/contrib/endpoints/src/api_manager/path_matcher_test.cc index 51104397dcd..7d2dc451d8e 100644 --- a/contrib/endpoints/src/api_manager/path_matcher_test.cc +++ b/contrib/endpoints/src/api_manager/path_matcher_test.cc @@ -14,19 +14,19 @@ // //////////////////////////////////////////////////////////////////////////////// // -#include "src/api_manager/path_matcher.h" +#include "contrib/endpoints/src/api_manager/path_matcher.h" #include #include #include #include +#include "contrib/endpoints/include/api_manager/method.h" +#include "contrib/endpoints/include/api_manager/method_call_info.h" +#include "contrib/endpoints/src/api_manager/mock_method_info.h" +#include "contrib/endpoints/src/api_manager/utils/stl_util.h" #include "gmock/gmock.h" #include "gtest/gtest.h" -#include "include/api_manager/method.h" -#include "include/api_manager/method_call_info.h" -#include "src/api_manager/mock_method_info.h" -#include "src/api_manager/utils/stl_util.h" using ::testing::ReturnRef; diff --git a/contrib/endpoints/src/api_manager/request_handler.cc b/contrib/endpoints/src/api_manager/request_handler.cc index 47acaac7c80..ac56f02ce46 100644 --- a/contrib/endpoints/src/api_manager/request_handler.cc +++ b/contrib/endpoints/src/api_manager/request_handler.cc @@ -14,14 +14,14 @@ // //////////////////////////////////////////////////////////////////////////////// // -#include "src/api_manager/request_handler.h" +#include "contrib/endpoints/src/api_manager/request_handler.h" +#include "contrib/endpoints/src/api_manager/auth/service_account_token.h" +#include "contrib/endpoints/src/api_manager/check_workflow.h" +#include "contrib/endpoints/src/api_manager/cloud_trace/cloud_trace.h" +#include "contrib/endpoints/src/api_manager/utils/marshalling.h" #include "google/devtools/cloudtrace/v1/trace.pb.h" #include "google/protobuf/stubs/logging.h" -#include "src/api_manager/auth/service_account_token.h" -#include "src/api_manager/check_workflow.h" -#include "src/api_manager/cloud_trace/cloud_trace.h" -#include "src/api_manager/utils/marshalling.h" using ::google::api_manager::utils::Status; using google::devtools::cloudtrace::v1::Traces; diff --git a/contrib/endpoints/src/api_manager/request_handler.h b/contrib/endpoints/src/api_manager/request_handler.h index d2ecd19483f..96c18b4e1a5 100644 --- a/contrib/endpoints/src/api_manager/request_handler.h +++ b/contrib/endpoints/src/api_manager/request_handler.h @@ -16,9 +16,9 @@ #define API_MANAGER_REQUEST_HANDLER_H_ #include "check_workflow.h" -#include "include/api_manager/request_handler_interface.h" -#include "src/api_manager/api_manager_impl.h" -#include "src/api_manager/context/request_context.h" +#include "contrib/endpoints/include/api_manager/request_handler_interface.h" +#include "contrib/endpoints/src/api_manager/api_manager_impl.h" +#include "contrib/endpoints/src/api_manager/context/request_context.h" namespace google { namespace api_manager { diff --git a/contrib/endpoints/src/api_manager/server_config_proto_test.cc b/contrib/endpoints/src/api_manager/server_config_proto_test.cc index 669add63c62..ae99108ad8f 100644 --- a/contrib/endpoints/src/api_manager/server_config_proto_test.cc +++ b/contrib/endpoints/src/api_manager/server_config_proto_test.cc @@ -20,8 +20,8 @@ #include #include +#include "contrib/endpoints/src/api_manager/proto/server_config.pb.h" #include "google/protobuf/text_format.h" -#include "src/api_manager/proto/server_config.pb.h" using ::google::protobuf::TextFormat; @@ -125,7 +125,7 @@ TEST(ServerConfigProto, ServerConfigFromString) { TEST(ServerConfigProto, ValidateSampleServerConfig) { const char kSampleServerConfigPath[] = - "src/api_manager/proto/sample_server_config.pb.txt"; + "contrib/endpoints/src/api_manager/proto/sample_server_config.pb.txt"; std::ifstream ifs(kSampleServerConfigPath); ASSERT_TRUE(ifs) << "Failed to open the sample server config file." diff --git a/contrib/endpoints/src/api_manager/service_control/BUILD b/contrib/endpoints/src/api_manager/service_control/BUILD index 5dcfda50cc8..73b722b4808 100644 --- a/contrib/endpoints/src/api_manager/service_control/BUILD +++ b/contrib/endpoints/src/api_manager/service_control/BUILD @@ -14,7 +14,7 @@ # ################################################################################ # -package(default_visibility = ["//src/api_manager:__subpackages__"]) +package(default_visibility = ["//contrib/endpoints/src/api_manager:__subpackages__"]) cc_library( name = "service_control", @@ -40,6 +40,11 @@ cc_library( ], }), deps = [ + "//contrib/endpoints/include:headers_only", + "//contrib/endpoints/src/api_manager:impl_headers", + "//contrib/endpoints/src/api_manager:server_config_proto", + "//contrib/endpoints/src/api_manager/cloud_trace", + "//contrib/endpoints/src/api_manager/utils", "//external:cc_wkt_protos", "//external:googletest_prod", "//external:grpc++", @@ -47,10 +52,6 @@ cc_library( "//external:service_config", "//external:servicecontrol", "//external:servicecontrol_client", - "//src/api_manager:impl_headers", - "//src/api_manager:server_config_proto", - "//src/api_manager/cloud_trace", - "//src/api_manager/utils", ], ) @@ -90,8 +91,8 @@ cc_test( linkstatic = 1, deps = [ ":service_control", + "//contrib/endpoints/src/api_manager:mock_api_manager_environment", "//external:googletest_main", - "//src/api_manager:mock_api_manager_environment", ], ) @@ -104,8 +105,8 @@ cc_test( linkstatic = 1, deps = [ ":service_control", + "//contrib/endpoints/src/api_manager:mock_api_manager_environment", "//external:googletest_main", - "//src/api_manager:mock_api_manager_environment", ], ) diff --git a/contrib/endpoints/src/api_manager/service_control/aggregated.cc b/contrib/endpoints/src/api_manager/service_control/aggregated.cc index ec8d8e31e2c..d2754d69dbd 100644 --- a/contrib/endpoints/src/api_manager/service_control/aggregated.cc +++ b/contrib/endpoints/src/api_manager/service_control/aggregated.cc @@ -14,11 +14,11 @@ // //////////////////////////////////////////////////////////////////////////////// // -#include "src/api_manager/service_control/aggregated.h" +#include "contrib/endpoints/src/api_manager/service_control/aggregated.h" #include #include -#include "src/api_manager/service_control/logs_metrics_loader.h" +#include "contrib/endpoints/src/api_manager/service_control/logs_metrics_loader.h" using ::google::api::servicecontrol::v1::CheckRequest; using ::google::api::servicecontrol::v1::CheckResponse; diff --git a/contrib/endpoints/src/api_manager/service_control/aggregated.h b/contrib/endpoints/src/api_manager/service_control/aggregated.h index 00c4a8c5f58..27e42833dbe 100644 --- a/contrib/endpoints/src/api_manager/service_control/aggregated.h +++ b/contrib/endpoints/src/api_manager/service_control/aggregated.h @@ -15,16 +15,16 @@ #ifndef API_MANAGER_SERVICE_CONTROL_AGGREGATED_H_ #define API_MANAGER_SERVICE_CONTROL_AGGREGATED_H_ +#include "contrib/endpoints/include/api_manager/env_interface.h" +#include "contrib/endpoints/src/api_manager/auth/service_account_token.h" +#include "contrib/endpoints/src/api_manager/cloud_trace/cloud_trace.h" +#include "contrib/endpoints/src/api_manager/proto/server_config.pb.h" +#include "contrib/endpoints/src/api_manager/service_control/interface.h" +#include "contrib/endpoints/src/api_manager/service_control/proto.h" +#include "contrib/endpoints/src/api_manager/service_control/url.h" #include "google/api/service.pb.h" #include "google/api/servicecontrol/v1/service_controller.pb.h" -#include "include/api_manager/env_interface.h" #include "include/service_control_client.h" -#include "src/api_manager/auth/service_account_token.h" -#include "src/api_manager/cloud_trace/cloud_trace.h" -#include "src/api_manager/proto/server_config.pb.h" -#include "src/api_manager/service_control/interface.h" -#include "src/api_manager/service_control/proto.h" -#include "src/api_manager/service_control/url.h" #include #include diff --git a/contrib/endpoints/src/api_manager/service_control/aggregated_test.cc b/contrib/endpoints/src/api_manager/service_control/aggregated_test.cc index 51139c9b18c..5e9ca38a55d 100644 --- a/contrib/endpoints/src/api_manager/service_control/aggregated_test.cc +++ b/contrib/endpoints/src/api_manager/service_control/aggregated_test.cc @@ -14,12 +14,12 @@ // //////////////////////////////////////////////////////////////////////////////// // -#include "src/api_manager/service_control/aggregated.h" +#include "contrib/endpoints/src/api_manager/service_control/aggregated.h" +#include "contrib/endpoints/include/api_manager/utils/status.h" +#include "contrib/endpoints/src/api_manager/mock_api_manager_environment.h" +#include "contrib/endpoints/src/api_manager/service_control/proto.h" #include "gmock/gmock.h" #include "gtest/gtest.h" -#include "include/api_manager/utils/status.h" -#include "src/api_manager/mock_api_manager_environment.h" -#include "src/api_manager/service_control/proto.h" using ::google::api::servicecontrol::v1::CheckRequest; using ::google::api::servicecontrol::v1::CheckResponse; diff --git a/contrib/endpoints/src/api_manager/service_control/check_response_test.cc b/contrib/endpoints/src/api_manager/service_control/check_response_test.cc index 390fdd07cc0..7aaa13b72b3 100644 --- a/contrib/endpoints/src/api_manager/service_control/check_response_test.cc +++ b/contrib/endpoints/src/api_manager/service_control/check_response_test.cc @@ -14,9 +14,9 @@ // //////////////////////////////////////////////////////////////////////////////// // +#include "contrib/endpoints/include/api_manager/utils/status.h" +#include "contrib/endpoints/src/api_manager/service_control/proto.h" #include "gtest/gtest.h" -#include "include/api_manager/utils/status.h" -#include "src/api_manager/service_control/proto.h" namespace gasv1 = ::google::api::servicecontrol::v1; diff --git a/contrib/endpoints/src/api_manager/service_control/info.h b/contrib/endpoints/src/api_manager/service_control/info.h index 58a2016dc5b..15364ad58c6 100644 --- a/contrib/endpoints/src/api_manager/service_control/info.h +++ b/contrib/endpoints/src/api_manager/service_control/info.h @@ -23,10 +23,10 @@ #include #include -#include "include/api_manager/compute_platform.h" -#include "include/api_manager/protocol.h" -#include "include/api_manager/service_control.h" -#include "include/api_manager/utils/status.h" +#include "contrib/endpoints/include/api_manager/compute_platform.h" +#include "contrib/endpoints/include/api_manager/protocol.h" +#include "contrib/endpoints/include/api_manager/service_control.h" +#include "contrib/endpoints/include/api_manager/utils/status.h" namespace google { namespace api_manager { diff --git a/contrib/endpoints/src/api_manager/service_control/interface.h b/contrib/endpoints/src/api_manager/service_control/interface.h index 51d6c51e6af..708acc56a88 100644 --- a/contrib/endpoints/src/api_manager/service_control/interface.h +++ b/contrib/endpoints/src/api_manager/service_control/interface.h @@ -15,10 +15,10 @@ #ifndef API_MANAGER_SERVICE_CONTROL_INTERFACE_H_ #define API_MANAGER_SERVICE_CONTROL_INTERFACE_H_ -#include "include/api_manager/service_control.h" -#include "include/api_manager/utils/status.h" -#include "src/api_manager/cloud_trace/cloud_trace.h" -#include "src/api_manager/service_control/info.h" +#include "contrib/endpoints/include/api_manager/service_control.h" +#include "contrib/endpoints/include/api_manager/utils/status.h" +#include "contrib/endpoints/src/api_manager/cloud_trace/cloud_trace.h" +#include "contrib/endpoints/src/api_manager/service_control/info.h" namespace google { namespace api_manager { diff --git a/contrib/endpoints/src/api_manager/service_control/logs_metrics_loader.cc b/contrib/endpoints/src/api_manager/service_control/logs_metrics_loader.cc index 69cfafd6715..f5b71b2d738 100644 --- a/contrib/endpoints/src/api_manager/service_control/logs_metrics_loader.cc +++ b/contrib/endpoints/src/api_manager/service_control/logs_metrics_loader.cc @@ -14,11 +14,11 @@ // //////////////////////////////////////////////////////////////////////////////// // -#include "src/api_manager/service_control/logs_metrics_loader.h" +#include "contrib/endpoints/src/api_manager/service_control/logs_metrics_loader.h" #include -#include "src/api_manager/service_control/proto.h" +#include "contrib/endpoints/src/api_manager/service_control/proto.h" namespace google { namespace api_manager { diff --git a/contrib/endpoints/src/api_manager/service_control/logs_metrics_loader.h b/contrib/endpoints/src/api_manager/service_control/logs_metrics_loader.h index d25b67b7201..6bcac4ad76e 100644 --- a/contrib/endpoints/src/api_manager/service_control/logs_metrics_loader.h +++ b/contrib/endpoints/src/api_manager/service_control/logs_metrics_loader.h @@ -17,9 +17,9 @@ #include +#include "contrib/endpoints/include/api_manager/utils/status.h" #include "google/api/service.pb.h" #include "gtest/gtest_prod.h" -#include "include/api_manager/utils/status.h" namespace google { namespace api_manager { diff --git a/contrib/endpoints/src/api_manager/service_control/logs_metrics_loader_test.cc b/contrib/endpoints/src/api_manager/service_control/logs_metrics_loader_test.cc index bfaf63ef065..e021f702ff4 100644 --- a/contrib/endpoints/src/api_manager/service_control/logs_metrics_loader_test.cc +++ b/contrib/endpoints/src/api_manager/service_control/logs_metrics_loader_test.cc @@ -14,7 +14,7 @@ // //////////////////////////////////////////////////////////////////////////////// // -#include "src/api_manager/service_control/logs_metrics_loader.h" +#include "contrib/endpoints/src/api_manager/service_control/logs_metrics_loader.h" #include "google/protobuf/io/zero_copy_stream_impl_lite.h" #include "google/protobuf/text_format.h" diff --git a/contrib/endpoints/src/api_manager/service_control/proto.cc b/contrib/endpoints/src/api_manager/service_control/proto.cc index 1c6fceb4458..cf32415855c 100644 --- a/contrib/endpoints/src/api_manager/service_control/proto.cc +++ b/contrib/endpoints/src/api_manager/service_control/proto.cc @@ -14,19 +14,19 @@ // //////////////////////////////////////////////////////////////////////////////// // -#include "src/api_manager/service_control/proto.h" +#include "contrib/endpoints/src/api_manager/service_control/proto.h" #include #include #include +#include "contrib/endpoints/include/api_manager/service_control.h" +#include "contrib/endpoints/include/api_manager/version.h" +#include "contrib/endpoints/src/api_manager/auth/lib/auth_token.h" +#include "contrib/endpoints/src/api_manager/auth/lib/base64.h" #include "google/api/metric.pb.h" #include "google/protobuf/timestamp.pb.h" -#include "include/api_manager/service_control.h" -#include "include/api_manager/version.h" -#include "src/api_manager/auth/lib/auth_token.h" -#include "src/api_manager/auth/lib/base64.h" #include "utils/distribution_helper.h" using ::google::api::servicecontrol::v1::CheckError; diff --git a/contrib/endpoints/src/api_manager/service_control/proto.h b/contrib/endpoints/src/api_manager/service_control/proto.h index 321de44b861..bea2a948b63 100644 --- a/contrib/endpoints/src/api_manager/service_control/proto.h +++ b/contrib/endpoints/src/api_manager/service_control/proto.h @@ -15,11 +15,11 @@ #ifndef API_MANAGER_SERVICE_CONTROL_PROTO_H_ #define API_MANAGER_SERVICE_CONTROL_PROTO_H_ +#include "contrib/endpoints/include/api_manager/utils/status.h" +#include "contrib/endpoints/src/api_manager/service_control/info.h" #include "google/api/label.pb.h" #include "google/api/metric.pb.h" #include "google/api/servicecontrol/v1/service_controller.pb.h" -#include "include/api_manager/utils/status.h" -#include "src/api_manager/service_control/info.h" namespace google { namespace api_manager { diff --git a/contrib/endpoints/src/api_manager/service_control/proto_test.cc b/contrib/endpoints/src/api_manager/service_control/proto_test.cc index 0670f072ff4..7b0bb4f6271 100644 --- a/contrib/endpoints/src/api_manager/service_control/proto_test.cc +++ b/contrib/endpoints/src/api_manager/service_control/proto_test.cc @@ -14,18 +14,17 @@ // //////////////////////////////////////////////////////////////////////////////// // -#include "src/api_manager/service_control/proto.h" +#include "contrib/endpoints/src/api_manager/service_control/proto.h" #include "gtest/gtest.h" #include #include #include +#include "contrib/endpoints/include/api_manager/version.h" #include "google/protobuf/struct.pb.h" #include "google/protobuf/text_format.h" -#include "include/api_manager/version.h" - namespace gasv1 = ::google::api::servicecontrol::v1; using ::google::api_manager::utils::Status; using ::google::protobuf::util::error::Code; @@ -37,7 +36,8 @@ namespace service_control { namespace { -const char kTestdata[] = "src/api_manager/service_control/testdata/"; +const char kTestdata[] = + "contrib/endpoints/src/api_manager/service_control/testdata/"; std::string ReadTestBaseline(const char* input_file_name) { std::string file_name = std::string(kTestdata) + input_file_name; diff --git a/contrib/endpoints/src/api_manager/service_control/url.cc b/contrib/endpoints/src/api_manager/service_control/url.cc index cf02c06c6e9..d113d402d1f 100644 --- a/contrib/endpoints/src/api_manager/service_control/url.cc +++ b/contrib/endpoints/src/api_manager/service_control/url.cc @@ -14,7 +14,7 @@ // //////////////////////////////////////////////////////////////////////////////// // -#include "src/api_manager/service_control/url.h" +#include "contrib/endpoints/src/api_manager/service_control/url.h" namespace google { namespace api_manager { diff --git a/contrib/endpoints/src/api_manager/service_control/url.h b/contrib/endpoints/src/api_manager/service_control/url.h index 065f6ceaf5e..4615864bbdd 100644 --- a/contrib/endpoints/src/api_manager/service_control/url.h +++ b/contrib/endpoints/src/api_manager/service_control/url.h @@ -15,8 +15,8 @@ #ifndef API_MANAGER_SERVICE_CONTROL_URL_H_ #define API_MANAGER_SERVICE_CONTROL_URL_H_ +#include "contrib/endpoints/src/api_manager/proto/server_config.pb.h" #include "google/api/service.pb.h" -#include "src/api_manager/proto/server_config.pb.h" namespace google { namespace api_manager { diff --git a/contrib/endpoints/src/api_manager/service_control/url_test.cc b/contrib/endpoints/src/api_manager/service_control/url_test.cc index 933f084db5b..afbf48bd154 100644 --- a/contrib/endpoints/src/api_manager/service_control/url_test.cc +++ b/contrib/endpoints/src/api_manager/service_control/url_test.cc @@ -14,11 +14,11 @@ // //////////////////////////////////////////////////////////////////////////////// // -#include "src/api_manager/service_control/url.h" +#include "contrib/endpoints/src/api_manager/service_control/url.h" +#include "contrib/endpoints/src/api_manager/config.h" +#include "contrib/endpoints/src/api_manager/mock_api_manager_environment.h" #include "gtest/gtest.h" -#include "src/api_manager/config.h" -#include "src/api_manager/mock_api_manager_environment.h" using ::google::api_manager::utils::Status; using ::google::protobuf::util::error::Code; diff --git a/contrib/endpoints/src/api_manager/utils/BUILD b/contrib/endpoints/src/api_manager/utils/BUILD index 59078c9951e..70c94b9d2be 100644 --- a/contrib/endpoints/src/api_manager/utils/BUILD +++ b/contrib/endpoints/src/api_manager/utils/BUILD @@ -15,11 +15,9 @@ ################################################################################ # package(default_visibility = [ - "//src/api_manager:__subpackages__", + "//visibility:public", ]) -load("@protobuf_git//:protobuf.bzl", "cc_proto_library") - cc_library( name = "utils", srcs = [ @@ -40,10 +38,10 @@ cc_library( ], }), deps = [ + "//contrib/endpoints/include:headers_only", "//external:cc_wkt_protos", "//external:protobuf", "//external:servicecontrol", # for google/rpc/status.proto - "//include:headers_only", ], ) diff --git a/contrib/endpoints/src/api_manager/utils/marshalling.cc b/contrib/endpoints/src/api_manager/utils/marshalling.cc index f2d52b6f4e7..cc5537e65d6 100644 --- a/contrib/endpoints/src/api_manager/utils/marshalling.cc +++ b/contrib/endpoints/src/api_manager/utils/marshalling.cc @@ -14,7 +14,7 @@ // //////////////////////////////////////////////////////////////////////////////// // -#include "src/api_manager/utils/marshalling.h" +#include "contrib/endpoints/src/api_manager/utils/marshalling.h" #include "google/protobuf/io/zero_copy_stream_impl_lite.h" #include "google/protobuf/util/json_util.h" diff --git a/contrib/endpoints/src/api_manager/utils/marshalling.h b/contrib/endpoints/src/api_manager/utils/marshalling.h index b517673aadd..5a4264282de 100644 --- a/contrib/endpoints/src/api_manager/utils/marshalling.h +++ b/contrib/endpoints/src/api_manager/utils/marshalling.h @@ -17,8 +17,8 @@ #include +#include "contrib/endpoints/include/api_manager/utils/status.h" #include "google/protobuf/message.h" -#include "include/api_manager/utils/status.h" namespace google { namespace api_manager { diff --git a/contrib/endpoints/src/api_manager/utils/marshalling_test.cc b/contrib/endpoints/src/api_manager/utils/marshalling_test.cc index 48b567d95fe..d8bf236227a 100644 --- a/contrib/endpoints/src/api_manager/utils/marshalling_test.cc +++ b/contrib/endpoints/src/api_manager/utils/marshalling_test.cc @@ -14,14 +14,14 @@ // //////////////////////////////////////////////////////////////////////////////// // -#include "src/api_manager/utils/marshalling.h" +#include "contrib/endpoints/src/api_manager/utils/marshalling.h" +#include "contrib/endpoints/include/api_manager/utils/status.h" #include "google/protobuf/any.pb.h" #include "google/protobuf/io/zero_copy_stream_impl_lite.h" #include "google/protobuf/struct.pb.h" #include "google/rpc/error_details.pb.h" #include "gtest/gtest.h" -#include "include/api_manager/utils/status.h" using ::google::protobuf::util::error::Code; diff --git a/contrib/endpoints/src/api_manager/utils/status.cc b/contrib/endpoints/src/api_manager/utils/status.cc index 7b93d1bcaf7..b82545f13ea 100644 --- a/contrib/endpoints/src/api_manager/utils/status.cc +++ b/contrib/endpoints/src/api_manager/utils/status.cc @@ -14,11 +14,11 @@ // //////////////////////////////////////////////////////////////////////////////// // -#include "include/api_manager/utils/status.h" +#include "contrib/endpoints/include/api_manager/utils/status.h" #include -#include "src/api_manager/utils/marshalling.h" +#include "contrib/endpoints/src/api_manager/utils/marshalling.h" using ::google::protobuf::util::error::Code; diff --git a/contrib/endpoints/src/api_manager/utils/status_test.cc b/contrib/endpoints/src/api_manager/utils/status_test.cc index d9e1e36f349..a485b49d5ea 100644 --- a/contrib/endpoints/src/api_manager/utils/status_test.cc +++ b/contrib/endpoints/src/api_manager/utils/status_test.cc @@ -14,13 +14,13 @@ // //////////////////////////////////////////////////////////////////////////////// // -#include "include/api_manager/utils/status.h" +#include "contrib/endpoints/include/api_manager/utils/status.h" +#include "contrib/endpoints/src/api_manager/utils/marshalling.h" #include "google/protobuf/any.pb.h" #include "google/rpc/error_details.pb.h" #include "google/rpc/status.pb.h" #include "gtest/gtest.h" -#include "src/api_manager/utils/marshalling.h" namespace google { namespace api_manager { diff --git a/contrib/endpoints/src/api_manager/utils/url_util.cc b/contrib/endpoints/src/api_manager/utils/url_util.cc index 60eedc2ef4b..3d66ffa2910 100644 --- a/contrib/endpoints/src/api_manager/utils/url_util.cc +++ b/contrib/endpoints/src/api_manager/utils/url_util.cc @@ -14,7 +14,7 @@ // //////////////////////////////////////////////////////////////////////////////// -#include "src/api_manager/utils/url_util.h" +#include "contrib/endpoints/src/api_manager/utils/url_util.h" namespace google { namespace api_manager { diff --git a/contrib/endpoints/src/api_manager/utils/url_util_test.cc b/contrib/endpoints/src/api_manager/utils/url_util_test.cc index 07e3693d139..ef1c1d74436 100644 --- a/contrib/endpoints/src/api_manager/utils/url_util_test.cc +++ b/contrib/endpoints/src/api_manager/utils/url_util_test.cc @@ -14,7 +14,7 @@ // //////////////////////////////////////////////////////////////////////////////// // -#include "src/api_manager/utils/url_util.h" +#include "contrib/endpoints/src/api_manager/utils/url_util.h" #include "gtest/gtest.h" diff --git a/contrib/endpoints/third_party/BUILD.googleapis b/third_party/BUILD.googleapis similarity index 100% rename from contrib/endpoints/third_party/BUILD.googleapis rename to third_party/BUILD.googleapis diff --git a/contrib/endpoints/third_party/BUILD.googletest b/third_party/BUILD.googletest similarity index 100% rename from contrib/endpoints/third_party/BUILD.googletest rename to third_party/BUILD.googletest diff --git a/contrib/endpoints/third_party/BUILD.nanopb b/third_party/BUILD.nanopb similarity index 100% rename from contrib/endpoints/third_party/BUILD.nanopb rename to third_party/BUILD.nanopb diff --git a/contrib/endpoints/third_party/BUILD.zlib b/third_party/BUILD.zlib similarity index 100% rename from contrib/endpoints/third_party/BUILD.zlib rename to third_party/BUILD.zlib