Add path_matcher_utility for registering HttpRule

Author: lizan

repositories.bzl

@@ -159,10 +159,22 @@ def googleapis_repositories(protobuf_repo="@protobuf_git//", bind=True):
 
 licenses(["notice"])
 
-load("@protobuf_git//:protobuf.bzl", "cc_proto_library")
+load("{0}:protobuf.bzl", "cc_proto_library")
 
 exports_files(glob(["google/**"]))
 
+cc_proto_library(
+    name = "http_api_protos",
+    srcs = [
+        "google/api/annotations.proto",
+        "google/api/http.proto",
+    ],
+    default_runtime = "//external:protobuf",
+    protoc = "//external:protoc",
+    visibility = ["//visibility:public"],
+    deps = ["{0}:cc_wkt_protos"],
+)
+
 cc_proto_library(
     name = "servicecontrol",
     srcs = [
@@ -190,7 +202,6 @@ cc_proto_library(
 cc_proto_library(
     name = "service_config",
     srcs = [
-        "google/api/annotations.proto",
         "google/api/auth.proto",
         "google/api/backend.proto",
         "google/api/billing.proto",
@@ -199,7 +210,6 @@ cc_proto_library(
         "google/api/control.proto",
         "google/api/documentation.proto",
         "google/api/endpoint.proto",
-        "google/api/http.proto",
         "google/api/label.proto",
         "google/api/log.proto",
         "google/api/logging.proto",
@@ -217,26 +227,12 @@ cc_proto_library(
     include = ".",
     visibility = ["//visibility:public"],
     deps = [
+        ":http_api_protos",
         "//external:cc_wkt_protos",
     ],
     protoc = "//external:protoc",
     default_runtime = "//external:protobuf",
 )
-
-cc_proto_library(
-    name = "cloud_trace",
-    srcs = [
-        "google/devtools/cloudtrace/v1/trace.proto",
-    ],
-    include = ".",
-    default_runtime = "//external:protobuf",
-    protoc = "//external:protoc",
-    visibility = ["//visibility:public"],
-    deps = [
-        ":service_config",
-        "//external:cc_wkt_protos",
-    ],
-)
 """.format(protobuf_repo)
 
     native.new_git_repository(
@@ -247,22 +243,12 @@ cc_proto_library(
     )
 
     if bind:
-        native.bind(
-            name = "servicecontrol",
-            actual = "@googleapis_git//:servicecontrol",
-        )
-
-        native.bind(
-            name = "servicecontrol_genproto",
-            actual = "@googleapis_git//:servicecontrol_genproto",
-        )
-
         native.bind(
             name = "service_config",
             actual = "@googleapis_git//:service_config",
         )
 
         native.bind(
-            name = "cloud_trace",
-            actual = "@googleapis_git//:cloud_trace",
+            name = "http_api_protos",
+            actual = "@googleapis_git//:http_api_protos",
         )

src/BUILD

@@ -131,6 +131,20 @@ cc_library(
     ],
 )
 
+cc_library(
+    name = "path_matcher_utility",
+    hdrs = [
+        "include/grpc_transcoding/path_matcher_utility.h",
+    ],
+    includes = [
+        "include/"
+    ],
+    deps = [
+        ":path_matcher",
+        "//external:http_api_protos",
+    ],
+)
+
 cc_library(
     name = "json_request_translator",
     srcs = [
@@ -208,6 +222,7 @@ cc_library(
     deps = [
         ":json_request_translator",
         ":message_stream",
+        ":path_matcher_utility",
         ":response_to_json_translator",
         ":type_helper",
         "//external:protobuf",

src/include/grpc_transcoding/path_matcher_utility.h

@@ -0,0 +1,92 @@
+/* Copyright 2017 Google Inc. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef GRPC_HTTPJSON_TRANSCODING_PATH_MATCHER_UTILITY_H
+#define GRPC_HTTPJSON_TRANSCODING_PATH_MATCHER_UTILITY_H
+
+#include "google/api/http.pb.h"
+#include "path_matcher.h"
+
+namespace google {
+namespace grpc {
+namespace transcoding {
+
+class PathMatcherUtility {
+ public:
+  template <class Method>
+  static bool RegisterByHttpRule(
+      PathMatcherBuilder<Method> &pmb, const google::api::HttpRule &http_rule,
+      const std::set<std::string> &system_query_parameter_names,
+      const Method &method);
+
+  template <class Method>
+  static bool RegisterByHttpRule(PathMatcherBuilder<Method> &pmb,
+                                 const google::api::HttpRule &http_rule,
+                                 const Method &method) {
+    return RegisterByHttpRule(pmb, http_rule, {}, method);
+  }
+};
+
+template <class Method>
+bool PathMatcherUtility::RegisterByHttpRule(
+    PathMatcherBuilder<Method> &pmb, const google::api::HttpRule &http_rule,
+    const std::set<std::string> &system_query_parameter_names,
+    const Method &method) {
+  bool ok = true;
+  switch (http_rule.pattern_case()) {
+    case ::google::api::HttpRule::kGet:
+      ok = pmb.Register("GET", http_rule.get(), http_rule.body(),
+                        system_query_parameter_names, method);
+      break;
+    case ::google::api::HttpRule::kPut:
+      ok = pmb.Register("PUT", http_rule.put(), http_rule.body(),
+                        system_query_parameter_names, method);
+      break;
+    case ::google::api::HttpRule::kPost:
+      ok = pmb.Register("POST", http_rule.post(), http_rule.body(),
+                        system_query_parameter_names, method);
+      break;
+    case ::google::api::HttpRule::kDelete:
+      ok = pmb.Register("DELETE", http_rule.delete_(), http_rule.body(),
+                        system_query_parameter_names, method);
+      break;
+    case ::google::api::HttpRule::kPatch:
+      ok = pmb.Register("PATCH", http_rule.patch(), http_rule.body(),
+                        system_query_parameter_names, method);
+      break;
+    case ::google::api::HttpRule::kCustom:
+      ok = pmb.Register(http_rule.custom().kind(), http_rule.custom().path(),
+                        http_rule.body(), system_query_parameter_names, method);
+      break;
+    default:  // ::google::api::HttpRule::PATTEN_NOT_SET
+      break;
+  }
+
+  for (const auto &additional_binding : http_rule.additional_bindings()) {
+    if (!ok) {
+      return ok;
+    }
+    ok = RegisterByHttpRule(pmb, additional_binding,
+                            system_query_parameter_names, method);
+  }
+
+  return ok;
+}
+
+}  // namespace transcoding
+}  // namespace grpc
+}  // namespace google
+
+#endif  // GRPC_HTTPJSON_TRANSCODING_PATH_MATCHER_UTILITY_H

test/BUILD

@@ -44,6 +44,19 @@ cc_test(
     ],
 )
 
+cc_test(
+    name = "path_matcher_utility_test",
+    size = "small",
+    srcs = [
+        "path_matcher_utility_test.cc",
+    ],
+    linkstatic = 1,
+    deps = [
+        "//external:googletest_main",
+        "//src:path_matcher_utility",
+    ],
+)
+
 cc_test(
     name = "prefix_writer_test",
     size = "small",