transcoding: Remove MethodInfo (istio#359)

* transcoding: Remove MethodInfo

* fix test lib path

* fix test

Author: lizan

contrib/endpoints/src/grpc/transcoding/BUILD

@@ -39,12 +39,12 @@ cc_test(
         "transcoder_test.cc",
     ],
     data = [
-        "@httpjson_transcoding//src:testdata/bookstore_service.pb.txt",
+        "@httpjson_transcoding//test:testdata/bookstore_service.pb.txt",
     ],
     deps = [
         ":transcoding_endpoints",
-        "@httpjson_transcoding//src:bookstore_test_proto",
-        "@httpjson_transcoding//src:test_common",
+        "@httpjson_transcoding//test:bookstore_test_proto",
+        "@httpjson_transcoding//test:test_common",
         "//external:googletest_main",
     ],
 )

contrib/endpoints/src/grpc/transcoding/transcoder_test.cc

@@ -19,17 +19,17 @@
 #include <string>
 #include <vector>
 
+#include "bookstore.pb.h"
 #include "contrib/endpoints/include/api_manager/method.h"
 #include "contrib/endpoints/include/api_manager/method_call_info.h"
 #include "contrib/endpoints/src/grpc/transcoding/transcoder_factory.h"
 #include "google/protobuf/io/zero_copy_stream.h"
 #include "google/protobuf/stubs/strutil.h"
 #include "google/protobuf/util/message_differencer.h"
 #include "gtest/gtest.h"
-#include "src/bookstore.pb.h"
 #include "src/message_reader.h"
-#include "src/test_common.h"
 #include "src/transcoder.h"
+#include "test/test_common.h"
 
 namespace google {
 namespace api_manager {
@@ -127,7 +127,7 @@ class TranscoderTest : public ::testing::Test {
   // in a test.
   bool LoadService(const std::string &config_pb_txt_file) {
     if (!::google::grpc::transcoding::testing::LoadService(
-            config_pb_txt_file, "external/httpjson_transcoding/src/testdata/",
+            config_pb_txt_file, "external/httpjson_transcoding/test/testdata/",
             &service_)) {
       return false;
     }

repositories.bzl

@@ -160,7 +160,7 @@ cc_library(
 def transcoding_repositories(bind=True):
     native.git_repository(
         name = "httpjson_transcoding",
-        commit = "d91a0fae8f9248c6b317abfa55b773fd62873818",
+        commit = "193aa283914ba701c12cfdfa5967c1c4210468e3",
         remote = "https://github.com/grpc-ecosystem/grpc-httpjson-transcoding.git",
     )
 

src/envoy/transcoding/config.cc

@@ -92,7 +92,9 @@ Config::Config(const Json::Object& config) {
     }
   }
 
-  google::grpc::transcoding::PathMatcherBuilder<MethodInfo*> pmb;
+  google::grpc::transcoding::PathMatcherBuilder<
+      const google::protobuf::MethodDescriptor*>
+      pmb;
 
   for (const auto& service_name : config.getStringArray("services")) {
     auto service = descriptor_pool_.FindServiceByName(service_name);
@@ -103,34 +105,30 @@ Config::Config(const Json::Object& config) {
     for (int i = 0; i < service->method_count(); ++i) {
       auto method = service->method(i);
 
-      auto method_info = new MethodInfo(method);
-      methods_.emplace_back(method_info);
       auto http_rule = method->options().GetExtension(google::api::http);
 
       log().debug("/" + service->full_name() + "/" + method->name());
       log().debug(http_rule.DebugString());
 
       switch (http_rule.pattern_case()) {
         case ::google::api::HttpRule::kGet:
-          pmb.Register("GET", http_rule.get(), http_rule.body(), method_info);
+          pmb.Register("GET", http_rule.get(), http_rule.body(), method);
           break;
         case ::google::api::HttpRule::kPut:
-          pmb.Register("PUT", http_rule.put(), http_rule.body(), method_info);
+          pmb.Register("PUT", http_rule.put(), http_rule.body(), method);
           break;
         case ::google::api::HttpRule::kPost:
-          pmb.Register("POST", http_rule.post(), http_rule.body(), method_info);
+          pmb.Register("POST", http_rule.post(), http_rule.body(), method);
           break;
         case ::google::api::HttpRule::kDelete:
-          pmb.Register("DELETE", http_rule.delete_(), http_rule.body(),
-                       method_info);
+          pmb.Register("DELETE", http_rule.delete_(), http_rule.body(), method);
           break;
         case ::google::api::HttpRule::kPatch:
-          pmb.Register("PATCH", http_rule.patch(), http_rule.body(),
-                       method_info);
+          pmb.Register("PATCH", http_rule.patch(), http_rule.body(), method);
           break;
         case ::google::api::HttpRule::kCustom:
           pmb.Register(http_rule.custom().kind(), http_rule.custom().path(),
-                       http_rule.body(), method_info);
+                       http_rule.body(), method);
           break;
         default:
           break;
@@ -164,14 +162,13 @@ Status Config::CreateTranscoder(
 
   RequestInfo request_info;
   std::vector<VariableBinding> variable_bidings;
-  auto method_info = path_matcher_->Lookup(
+  method_descriptor = path_matcher_->Lookup(
       method, path, args, &variable_bidings, &request_info.body_field_path);
-  if (!method_info) {
+  if (!method_descriptor) {
     return Status(Code::NOT_FOUND,
                   "Could not resolve " + path + " to a method");
   }
 
-  method_descriptor = method_info->method();
   auto status = MethodToRequestInfo(method_descriptor, &request_info);
   if (!status.ok()) {
     return status;

src/envoy/transcoding/config.h

@@ -33,19 +33,6 @@ namespace Transcoding {
 
 class Instance;
 
-class MethodInfo {
- public:
-  MethodInfo(const google::protobuf::MethodDescriptor* method)
-      : method_(method) {}
-  const std::set<std::string> system_query_parameter_names() const {
-    return std::set<std::string>();
-  }
-  const google::protobuf::MethodDescriptor* method() const { return method_; }
-
- private:
-  const google::protobuf::MethodDescriptor* method_;
-};
-
 // VariableBinding specifies a value for a single field in the request message.
 // When transcoding HTTP/REST/JSON to gRPC/proto the request message is
 // constructed using the HTTP body and the variable bindings (specified through
@@ -76,8 +63,9 @@ class Config : public Logger::Loggable<Logger::Id::config> {
 
  private:
   google::protobuf::DescriptorPool descriptor_pool_;
-  google::grpc::transcoding::PathMatcherPtr<MethodInfo*> path_matcher_;
-  std::vector<std::unique_ptr<MethodInfo>> methods_;
+  google::grpc::transcoding::PathMatcherPtr<
+      const google::protobuf::MethodDescriptor*>
+      path_matcher_;
   std::unique_ptr<google::grpc::transcoding::TypeHelper> type_helper_;
 };