Introduce absl, not using protobuf strutil (#22)

* Introduce absl, not using protobuf strutil

Signed-off-by: Lizan Zhou <[email protected]>

Author: lizan

WORKSPACE

@@ -17,11 +17,14 @@
 
 load(
     "//:repositories.bzl",
+    "absl_repositories",
     "protobuf_repositories",
     "googletest_repositories",
     "googleapis_repositories",
 )
 
+absl_repositories()
+
 protobuf_repositories()
 
 googletest_repositories()

repositories.bzl

@@ -14,6 +14,13 @@
 #
 ################################################################################
 #
+def absl_repositories(bind=True):
+    native.git_repository(
+        name = "com_google_absl",
+        commit = "99477fa9f1e89a7d8253c8aeee331864710d080c",
+        remote = "https://github.com/abseil/abseil-cpp",
+    )
+
 def protobuf_repositories(bind=True):
     native.git_repository(
         name = "protobuf_git",

src/BUILD

@@ -42,6 +42,7 @@ cc_library(
     ],
     deps = [
         ":protobuf",
+        "@com_google_absl//absl/strings",
     ],
 )
 
@@ -255,5 +256,6 @@ cc_library(
     ],
     deps = [
         "//external:protobuf",
+        "@com_google_absl//absl/strings",
     ],
 )

src/prefix_writer.cc

@@ -18,8 +18,7 @@
 
 #include <string>
 
-#include "google/protobuf/stubs/stringpiece.h"
-#include "google/protobuf/stubs/strutil.h"
+#include "absl/strings/str_split.h"
 #include "google/protobuf/util/internal/object_writer.h"
 
 namespace google {
@@ -29,7 +28,7 @@ namespace transcoding {
 
 PrefixWriter::PrefixWriter(const std::string& prefix,
                            google::protobuf::util::converter::ObjectWriter* ow)
-    : prefix_(google::protobuf::Split(prefix, ".")),
+    : prefix_(absl::StrSplit(prefix, ".", absl::SkipEmpty())),
       non_actionable_depth_(0),
       writer_(ow) {}
 

src/type_helper.cc

@@ -16,7 +16,8 @@
 //
 #include "grpc_transcoding/type_helper.h"
 
-#include "google/protobuf/stubs/strutil.h"
+#include "absl/strings/str_split.h"
+
 #include "google/protobuf/type.pb.h"
 #include "google/protobuf/util/internal/type_info.h"
 #include "google/protobuf/util/type_resolver.h"
@@ -54,7 +55,7 @@ class SimpleTypeResolver : public pbutil::TypeResolver {
   // TypeResolver implementation
   // Resolves a type url for a message type.
   virtual pbutil::Status ResolveMessageType(const std::string& type_url,
-                                            pb::Type* type) {
+                                            pb::Type* type) override {
     auto i = type_map_.find(type_url);
     if (end(type_map_) != i) {
       if (nullptr != type) {
@@ -137,7 +138,8 @@ pbutil::Status TypeHelper::ResolveFieldPath(
     const pb::Type& type, const std::string& field_path_str,
     std::vector<const pb::Field*>* field_path_out) const {
   // Split the field names & call ResolveFieldPath()
-  const std::vector<std::string> field_names = pb::Split(field_path_str, ".");
+  const std::vector<std::string> field_names =
+      absl::StrSplit(field_path_str, ".", absl::SkipEmpty());
   return ResolveFieldPath(type, field_names, field_path_out);
 }
 

test/BUILD

@@ -78,6 +78,7 @@ cc_test(
     deps = [
         "//external:googletest_main",
         "//src:request_weaver",
+        "@com_google_absl//absl/strings",
     ],
 )
 

test/request_translator_test_base.cc

@@ -22,8 +22,9 @@
 #include <string>
 #include <vector>
 
+#include "absl/strings/str_split.h"
+
 #include "google/api/service.pb.h"
-#include "google/protobuf/stubs/strutil.h"
 #include "google/protobuf/text_format.h"
 #include "google/protobuf/type.pb.h"
 #include "google/protobuf/util/internal/type_info.h"
@@ -45,7 +46,8 @@ std::vector<const google::protobuf::Field*> ParseFieldPath(
     google::protobuf::util::converter::TypeInfo& type_info,
     const std::string& field_path_str) {
   // First, split the field names
-  auto field_names = google::protobuf::Split(field_path_str, ".");
+  std::vector<std::string> field_names =
+      absl::StrSplit(field_path_str, ".", absl::SkipEmpty());
 
   auto current_type = &type;
   std::vector<const google::protobuf::Field*> field_path;

test/request_weaver_test.cc

@@ -20,7 +20,10 @@
 #include <string>
 #include <vector>
 
-#include "google/protobuf/stubs/strutil.h"
+#include "absl/strings/match.h"
+#include "absl/strings/str_split.h"
+#include "absl/strings/string_view.h"
+
 #include "google/protobuf/type.pb.h"
 #include "google/protobuf/util/internal/expecting_objectwriter.h"
 #include "gtest/gtest.h"
@@ -40,7 +43,8 @@ class RequestWeaverTest : public ::testing::Test {
   RequestWeaverTest() : mock_(), expect_(&mock_) {}
 
   void Bind(std::string field_path_str, std::string value) {
-    auto field_names = google::protobuf::Split(field_path_str, ".");
+    std::vector<std::string> field_names =
+        absl::StrSplit(field_path_str, ".", absl::SkipEmpty());
     std::vector<const Field*> field_path;
     for (const auto& n : field_names) {
       fields_.emplace_back(CreateField(n));
@@ -63,12 +67,12 @@ class RequestWeaverTest : public ::testing::Test {
   std::vector<RequestWeaver::BindingInfo> bindings_;
   std::list<Field> fields_;
 
-  Field CreateField(internal::string_view name) {
+  Field CreateField(std::string name) {
     Field::Cardinality card;
-    if (name.ends_with("*")) {
+    if (absl::EndsWith(name, "*")) {
       // we use "*" at the end of the field name to denote a repeated field.
       card = Field::CARDINALITY_REPEATED;
-      name.remove_suffix(1);
+      name.pop_back();
     } else {
       card = Field::CARDINALITY_OPTIONAL;
     }