Merge pull request #41 from qiwzhang/remove_pb

Use official cc_proto_library

Author: qiwzhang

repositories.bzl

@@ -109,7 +109,7 @@ def protobuf_repositories(bind=True):
     )
 
     http_archive(
-        name = "protobuf_git",
+        name = "com_google_protobuf",
         strip_prefix = "protobuf-" + PROTOBUF_COMMIT,
         url = "https://github.com/google/protobuf/archive/v" + PROTOBUF_COMMIT + ".tar.gz",
         sha256 = PROTOBUF_SHA256,
@@ -118,32 +118,32 @@ def protobuf_repositories(bind=True):
     if bind:
         native.bind(
             name = "protoc",
-            actual = "@protobuf_git//:protoc",
+            actual = "@com_google_protobuf//:protoc",
         )
 
         native.bind(
             name = "protobuf",
-            actual = "@protobuf_git//:protobuf",
+            actual = "@com_google_protobuf//:protobuf",
         )
 
         native.bind(
             name = "cc_wkt_protos",
-            actual = "@protobuf_git//:cc_wkt_protos",
+            actual = "@com_google_protobuf//:cc_wkt_protos",
         )
 
         native.bind(
             name = "cc_wkt_protos_genproto",
-            actual = "@protobuf_git//:cc_wkt_protos_genproto",
+            actual = "@com_google_protobuf//:cc_wkt_protos_genproto",
         )
 
         native.bind(
             name = "protobuf_compiler",
-            actual = "@protobuf_git//:protoc_lib",
+            actual = "@com_google_protobuf//:protoc_lib",
         )
 
         native.bind(
             name = "protobuf_clib",
-            actual = "@protobuf_git//:protoc_lib",
+            actual = "@com_google_protobuf//:protoc_lib",
         )
 
 GOOGLETEST_COMMIT = "43863938377a9ea1399c0596269e0890b5c5515a"
@@ -238,7 +238,7 @@ cc_library(
 GOOGLEAPIS_COMMIT = "32a10f69e2c9ce15bba13ab1ff928bacebb25160" # May 20, 2019
 GOOGLEAPIS_SHA256 = "6861efa8619579e06e70dd4765cdf6cef1ecad6a1a2026ad750541e99552bf71"
 
-def googleapis_repositories(protobuf_repo="@protobuf_git//", bind=True):
+def googleapis_repositories(protobuf_repo="@com_google_protobuf//", bind=True):
     BUILD = """
 # Copyright 2016 Google Inc. All Rights Reserved.
 #

src/request_message_translator.cc

@@ -24,8 +24,6 @@
 #include "grpc_transcoding/prefix_writer.h"
 #include "grpc_transcoding/request_weaver.h"
 
-namespace pb = ::google::protobuf;
-namespace pbutil = ::google::protobuf::util;
 namespace pbconv = ::google::protobuf::util::converter;
 
 namespace google {

src/type_helper.cc

@@ -25,7 +25,6 @@
 #include <string>
 #include <unordered_map>
 
-namespace pb = ::google::protobuf;
 namespace pbutil = ::google::protobuf::util;
 namespace pbconv = ::google::protobuf::util::converter;
 namespace pberr = ::google::protobuf::util::error;
@@ -41,21 +40,22 @@ class SimpleTypeResolver : public pbutil::TypeResolver {
  public:
   SimpleTypeResolver() : url_prefix_(DEFAULT_URL_PREFIX) {}
 
-  void AddType(const pb::Type& t) {
+  void AddType(const google::protobuf::Type& t) {
     type_map_.emplace(url_prefix_ + t.name(), &t);
     // A temporary workaround for service configs that use
     // "proto2.MessageOptions.*" options.
-    ReplaceProto2WithGoogleProtobufInOptionNames(const_cast<pb::Type*>(&t));
+    ReplaceProto2WithGoogleProtobufInOptionNames(
+        const_cast<google::protobuf::Type*>(&t));
   }
 
-  void AddEnum(const pb::Enum& e) {
+  void AddEnum(const google::protobuf::Enum& e) {
     enum_map_.emplace(url_prefix_ + e.name(), &e);
   }
 
   // TypeResolver implementation
   // Resolves a type url for a message type.
-  virtual pbutil::Status ResolveMessageType(const std::string& type_url,
-                                            pb::Type* type) override {
+  virtual pbutil::Status ResolveMessageType(
+      const std::string& type_url, google::protobuf::Type* type) override {
     auto i = type_map_.find(type_url);
     if (end(type_map_) != i) {
       if (nullptr != type) {
@@ -69,8 +69,8 @@ class SimpleTypeResolver : public pbutil::TypeResolver {
   }
 
   // Resolves a type url for an enum type.
-  virtual pbutil::Status ResolveEnumType(const std::string& type_url,
-                                         pb::Enum* enum_type) override {
+  virtual pbutil::Status ResolveEnumType(
+      const std::string& type_url, google::protobuf::Enum* enum_type) override {
     auto i = enum_map_.find(type_url);
     if (end(enum_map_) != i) {
       if (nullptr != enum_type) {
@@ -84,7 +84,8 @@ class SimpleTypeResolver : public pbutil::TypeResolver {
   }
 
  private:
-  void ReplaceProto2WithGoogleProtobufInOptionNames(pb::Type* type) {
+  void ReplaceProto2WithGoogleProtobufInOptionNames(
+      google::protobuf::Type* type) {
     // As a temporary workaround for service configs that use
     // "proto2.MessageOptions.*" options instead of
     // "google.protobuf.MessageOptions.*", we replace the option names to make
@@ -101,8 +102,8 @@ class SimpleTypeResolver : public pbutil::TypeResolver {
   }
 
   std::string url_prefix_;
-  std::unordered_map<std::string, const pb::Type*> type_map_;
-  std::unordered_map<std::string, const pb::Enum*> enum_map_;
+  std::unordered_map<std::string, const google::protobuf::Type*> type_map_;
+  std::unordered_map<std::string, const google::protobuf::Enum*> enum_map_;
 
   SimpleTypeResolver(const SimpleTypeResolver&) = delete;
   SimpleTypeResolver& operator=(const SimpleTypeResolver&) = delete;
@@ -126,32 +127,33 @@ void TypeHelper::Initialize() {
   type_info_.reset(pbconv::TypeInfo::NewTypeInfo(type_resolver_));
 }
 
-void TypeHelper::AddType(const pb::Type& t) {
+void TypeHelper::AddType(const google::protobuf::Type& t) {
   reinterpret_cast<SimpleTypeResolver*>(type_resolver_)->AddType(t);
 }
 
-void TypeHelper::AddEnum(const pb::Enum& e) {
+void TypeHelper::AddEnum(const google::protobuf::Enum& e) {
   reinterpret_cast<SimpleTypeResolver*>(type_resolver_)->AddEnum(e);
 }
 
 pbutil::Status TypeHelper::ResolveFieldPath(
-    const pb::Type& type, const std::string& field_path_str,
-    std::vector<const pb::Field*>* field_path_out) const {
+    const google::protobuf::Type& type, const std::string& field_path_str,
+    std::vector<const google::protobuf::Field*>* field_path_out) const {
   // Split the field names & call ResolveFieldPath()
   const std::vector<std::string> field_names =
       absl::StrSplit(field_path_str, '.', absl::SkipEmpty());
   return ResolveFieldPath(type, field_names, field_path_out);
 }
 
 pbutil::Status TypeHelper::ResolveFieldPath(
-    const pb::Type& type, const std::vector<std::string>& field_names,
-    std::vector<const pb::Field*>* field_path_out) const {
+    const google::protobuf::Type& type,
+    const std::vector<std::string>& field_names,
+    std::vector<const google::protobuf::Field*>* field_path_out) const {
   // The type of the current message being processed (initially the type of the
   // top level message)
   auto current_type = &type;
 
   // The resulting field path
-  std::vector<const pb::Field*> field_path;
+  std::vector<const google::protobuf::Field*> field_path;
 
   for (size_t i = 0; i < field_names.size(); ++i) {
     // Find the field by name in the current type
@@ -166,7 +168,7 @@ pbutil::Status TypeHelper::ResolveFieldPath(
 
     if (i < field_names.size() - 1) {
       // If this is not the last field in the path, it must be a message
-      if (pb::Field::TYPE_MESSAGE != field->kind()) {
+      if (google::protobuf::Field::TYPE_MESSAGE != field->kind()) {
         return pbutil::Status(
             pberr::INVALID_ARGUMENT,
             "Encountered a non-leaf field \"" + field->name() +

test/BUILD

@@ -14,9 +14,9 @@
 #
 ################################################################################
 #
-package(default_visibility = ["//visibility:public"])
+load("@com_google_protobuf//:protobuf.bzl", "py_proto_library")
 
-load("@protobuf_git//:protobuf.bzl", "cc_proto_library")
+package(default_visibility = ["//visibility:public"])
 
 cc_test(
     name = "http_template_test",
@@ -82,16 +82,16 @@ cc_test(
     ],
 )
 
-cc_proto_library(
-    name = "bookstore_test_proto",
+proto_library(
+    name = "bookstore_proto",
     testonly = 1,
     srcs = ["bookstore.proto"],
-    include = ".",
-    default_runtime = "//external:protobuf",
-    protoc = "//external:protoc",
-    deps = [
-        "//external:cc_wkt_protos",
-    ],
+)
+
+cc_proto_library(
+    name = "bookstore_cc_proto",
+    testonly = 1,
+    deps = [":bookstore_proto"],
 )
 
 cc_test(
@@ -136,7 +136,7 @@ cc_library(
         "request_translator_test_base.h",
     ],
     deps = [
-        ":bookstore_test_proto",
+        ":bookstore_cc_proto",
         ":test_common",
         "//external:googletest",
         "//external:protobuf",
@@ -156,7 +156,7 @@ cc_test(
         "testdata/bookstore_service.pb.txt",
     ],
     deps = [
-        ":bookstore_test_proto",
+        ":bookstore_cc_proto",
         ":request_translator_test_base",
         ":test_common",
         "//external:googletest_main",
@@ -174,7 +174,7 @@ cc_test(
         "testdata/bookstore_service.pb.txt",
     ],
     deps = [
-        ":bookstore_test_proto",
+        ":bookstore_cc_proto",
         ":request_translator_test_base",
         "//external:googletest_main",
         "//src:request_stream_translator",
@@ -191,7 +191,7 @@ cc_test(
         "testdata/bookstore_service.pb.txt",
     ],
     deps = [
-        ":bookstore_test_proto",
+        ":bookstore_cc_proto",
         ":request_translator_test_base",
         ":test_common",
         "//external:googletest_main",
@@ -222,7 +222,7 @@ cc_test(
         "testdata/bookstore_service.pb.txt",
     ],
     deps = [
-        ":bookstore_test_proto",
+        ":bookstore_cc_proto",
         ":test_common",
         "//external:googletest_main",
         "//src:message_reader",

test/json_request_translator_test.cc

@@ -20,11 +20,11 @@
 #include <string>
 #include <vector>
 
-#include "bookstore.pb.h"
 #include "google/protobuf/io/zero_copy_stream.h"
 #include "gtest/gtest.h"
 #include "proto_stream_tester.h"
 #include "request_translator_test_base.h"
+#include "test/bookstore.pb.h"
 #include "test_common.h"
 
 namespace google {

test/request_message_translator_test.cc

@@ -19,11 +19,11 @@
 #include <memory>
 #include <string>
 
-#include "bookstore.pb.h"
 #include "google/protobuf/struct.pb.h"
 #include "google/protobuf/type.pb.h"
 #include "gtest/gtest.h"
 #include "request_translator_test_base.h"
+#include "test/bookstore.pb.h"
 #include "test_common.h"
 
 namespace google {

test/request_stream_translator_test.cc

@@ -19,10 +19,10 @@
 #include <memory>
 #include <string>
 
-#include "bookstore.pb.h"
 #include "google/protobuf/type.pb.h"
 #include "gtest/gtest.h"
 #include "request_translator_test_base.h"
+#include "test/bookstore.pb.h"
 
 namespace google {
 namespace grpc {

test/response_to_json_translator_test.cc

@@ -21,11 +21,11 @@
 #include <string>
 #include <vector>
 
-#include "bookstore.pb.h"
 #include "google/protobuf/io/zero_copy_stream.h"
 #include "google/protobuf/text_format.h"
 #include "grpc_transcoding/type_helper.h"
 #include "gtest/gtest.h"
+#include "test/bookstore.pb.h"
 #include "test_common.h"
 
 namespace google {