Cleanup type aliases, imports, and comments (#105)

Author: asedeno

src/BUILD

@@ -16,20 +16,6 @@
 #
 package(default_visibility = ["//visibility:public"])
 
-cc_library(
-    name = "protobuf",
-    hdrs = [
-        "include/grpc_transcoding/internal/protobuf_types.h",
-    ],
-    includes = [
-        "include/",
-    ],
-    deps = [
-        "@com_google_protobuf//:protobuf",
-        "@com_google_protoconverter//:all",
-    ],
-)
-
 cc_library(
     name = "prefix_writer",
     srcs = [
@@ -42,8 +28,9 @@ cc_library(
         "include/",
     ],
     deps = [
-        ":protobuf",
         "@com_google_absl//absl/strings",
+        "@com_google_protobuf//:protobuf",
+        "@com_google_protoconverter//:all",
     ],
 )
 
@@ -59,10 +46,11 @@ cc_library(
         "include/",
     ],
     deps = [
-        ":protobuf",
         ":status_error_listener",
         "@com_google_absl//absl/strings",
         "@com_google_absl//absl/strings:str_format",
+        "@com_google_protobuf//:protobuf",
+        "@com_google_protoconverter//:all",
     ],
 )
 
@@ -98,8 +86,10 @@ cc_library(
     deps = [
         ":message_stream",
         ":prefix_writer",
-        ":protobuf",
         ":request_weaver",
+        "@com_google_absl//absl/strings",
+        "@com_google_protobuf//:protobuf",
+        "@com_google_protoconverter//:all",
     ],
 )
 
@@ -192,6 +182,7 @@ cc_library(
     deps = [
         ":request_message_translator",
         ":request_stream_translator",
+        "@com_google_absl//absl/strings",
         "@com_google_protobuf//:protobuf",
     ],
 )
@@ -294,9 +285,10 @@ cc_library(
         "include/",
     ],
     deps = [
-        ":protobuf",
         "@com_google_absl//absl/status",
         "@com_google_absl//absl/strings",
         "@com_google_absl//absl/strings:str_format",
+        "@com_google_protobuf//:protobuf",
+        "@com_google_protoconverter//:all",
     ],
 )

src/http_template.cc

@@ -16,7 +16,6 @@
 //
 #include "grpc_transcoding/http_template.h"
 
-#include <cassert>
 #include <string>
 #include <vector>
 

src/include/grpc_transcoding/internal/protobuf_types.h

@@ -15,11 +15,12 @@
 #ifndef GRPC_TRANSCODING_PREFIX_WRITER_H_
 #define GRPC_TRANSCODING_PREFIX_WRITER_H_
 
+#include <cstdint>
 #include <string>
 #include <vector>
 
+#include "absl/strings/string_view.h"
 #include "google/protobuf/util/converter/object_writer.h"
-#include "grpc_transcoding/internal/protobuf_types.h"
 
 namespace google {
 namespace grpc {
@@ -63,30 +64,24 @@ class PrefixWriter : public google::protobuf::util::converter::ObjectWriter {
                google::protobuf::util::converter::ObjectWriter* ow);
 
   // ObjectWriter methods.
-  PrefixWriter* StartObject(internal::string_view name);
+  PrefixWriter* StartObject(absl::string_view name);
   PrefixWriter* EndObject();
-  PrefixWriter* StartList(internal::string_view name);
+  PrefixWriter* StartList(absl::string_view name);
   PrefixWriter* EndList();
-  PrefixWriter* RenderBool(internal::string_view name, bool value);
-  PrefixWriter* RenderInt32(internal::string_view name,
-                            google::protobuf::int32 value);
-  PrefixWriter* RenderUint32(internal::string_view name,
-                             google::protobuf::uint32 value);
-  PrefixWriter* RenderInt64(internal::string_view name,
-                            google::protobuf::int64 value);
-  PrefixWriter* RenderUint64(internal::string_view name,
-                             google::protobuf::uint64 value);
-  PrefixWriter* RenderDouble(internal::string_view name, double value);
-  PrefixWriter* RenderFloat(internal::string_view name, float value);
-  PrefixWriter* RenderString(internal::string_view name,
-                             internal::string_view value);
-  PrefixWriter* RenderBytes(internal::string_view name,
-                            internal::string_view value);
-  PrefixWriter* RenderNull(internal::string_view name);
+  PrefixWriter* RenderBool(absl::string_view name, bool value);
+  PrefixWriter* RenderInt32(absl::string_view name, int32_t value);
+  PrefixWriter* RenderUint32(absl::string_view name, uint32_t value);
+  PrefixWriter* RenderInt64(absl::string_view name, int64_t value);
+  PrefixWriter* RenderUint64(absl::string_view name, uint64_t value);
+  PrefixWriter* RenderDouble(absl::string_view name, double value);
+  PrefixWriter* RenderFloat(absl::string_view name, float value);
+  PrefixWriter* RenderString(absl::string_view name, absl::string_view value);
+  PrefixWriter* RenderBytes(absl::string_view name, absl::string_view value);
+  PrefixWriter* RenderNull(absl::string_view name);
 
  private:
   // Helper method to start the prefix and return the name to use for the value.
-  internal::string_view StartPrefix(internal::string_view name);
+  absl::string_view StartPrefix(absl::string_view name);
 
   // Helper method to end the prefix.
   void EndPrefix();

src/include/grpc_transcoding/prefix_writer.h

@@ -18,12 +18,12 @@
 #include <memory>
 #include <string>
 
+#include "absl/strings/string_view.h"
 #include "google/protobuf/stubs/bytestream.h"
 #include "google/protobuf/type.pb.h"
 #include "google/protobuf/util/converter/error_listener.h"
 #include "google/protobuf/util/converter/protostream_objectwriter.h"
 #include "google/protobuf/util/type_resolver.h"
-#include "grpc_transcoding/internal/protobuf_types.h"
 #include "message_stream.h"
 #include "prefix_writer.h"
 #include "request_weaver.h"

src/include/grpc_transcoding/request_message_translator.h

@@ -15,13 +15,14 @@
 #ifndef GRPC_TRANSCODING_REQUEST_STREAM_TRANSLATOR_H_
 #define GRPC_TRANSCODING_REQUEST_STREAM_TRANSLATOR_H_
 
+#include <cstdint>
 #include <deque>
 #include <functional>
 #include <memory>
 
+#include "absl/strings/string_view.h"
 #include "google/protobuf/util/converter/object_writer.h"
 #include "google/protobuf/util/type_resolver.h"
-#include "grpc_transcoding/internal/protobuf_types.h"
 #include "message_stream.h"
 #include "request_message_translator.h"
 
@@ -75,27 +76,22 @@ class RequestStreamTranslator
 
  private:
   // ObjectWriter methods.
-  RequestStreamTranslator* StartObject(internal::string_view name);
+  RequestStreamTranslator* StartObject(absl::string_view name);
   RequestStreamTranslator* EndObject();
-  RequestStreamTranslator* StartList(internal::string_view name);
+  RequestStreamTranslator* StartList(absl::string_view name);
   RequestStreamTranslator* EndList();
-  RequestStreamTranslator* RenderBool(internal::string_view name, bool value);
-  RequestStreamTranslator* RenderInt32(internal::string_view name,
-                                       google::protobuf::int32 value);
-  RequestStreamTranslator* RenderUint32(internal::string_view name,
-                                        google::protobuf::uint32 value);
-  RequestStreamTranslator* RenderInt64(internal::string_view name,
-                                       google::protobuf::int64 value);
-  RequestStreamTranslator* RenderUint64(internal::string_view name,
-                                        google::protobuf::uint64 value);
-  RequestStreamTranslator* RenderDouble(internal::string_view name,
-                                        double value);
-  RequestStreamTranslator* RenderFloat(internal::string_view name, float value);
-  RequestStreamTranslator* RenderString(internal::string_view name,
-                                        internal::string_view value);
-  RequestStreamTranslator* RenderBytes(internal::string_view name,
-                                       internal::string_view value);
-  RequestStreamTranslator* RenderNull(internal::string_view name);
+  RequestStreamTranslator* RenderBool(absl::string_view name, bool value);
+  RequestStreamTranslator* RenderInt32(absl::string_view name, int32_t value);
+  RequestStreamTranslator* RenderUint32(absl::string_view name, uint32_t value);
+  RequestStreamTranslator* RenderInt64(absl::string_view name, int64_t value);
+  RequestStreamTranslator* RenderUint64(absl::string_view name, uint64_t value);
+  RequestStreamTranslator* RenderDouble(absl::string_view name, double value);
+  RequestStreamTranslator* RenderFloat(absl::string_view name, float value);
+  RequestStreamTranslator* RenderString(absl::string_view name,
+                                        absl::string_view value);
+  RequestStreamTranslator* RenderBytes(absl::string_view name,
+                                       absl::string_view value);
+  RequestStreamTranslator* RenderNull(absl::string_view name);
 
   // Sets up the ProtoMessageHelper to handle writing data.
   void StartMessageTranslator();
@@ -104,7 +100,7 @@ class RequestStreamTranslator
   void EndMessageTranslator();
 
   // Helper method to render a single piece of data, to reuse code.
-  void RenderData(internal::string_view name, std::function<void()> renderer);
+  void RenderData(absl::string_view name, std::function<void()> renderer);
 
   // TypeResolver to be passed to the RequestMessageTranslator
   google::protobuf::util::TypeResolver& type_resolver_;

src/include/grpc_transcoding/request_stream_translator.h

@@ -15,14 +15,15 @@
 #ifndef GRPC_TRANSCODING_REQUEST_WEAVER_H_
 #define GRPC_TRANSCODING_REQUEST_WEAVER_H_
 
+#include <cstdint>
 #include <list>
 #include <stack>
 #include <string>
 #include <vector>
 
+#include "absl/strings/string_view.h"
 #include "google/protobuf/type.pb.h"
 #include "google/protobuf/util/converter/object_writer.h"
-#include "grpc_transcoding/internal/protobuf_types.h"
 #include "grpc_transcoding/status_error_listener.h"
 
 namespace google {
@@ -81,26 +82,20 @@ class RequestWeaver : public google::protobuf::util::converter::ObjectWriter {
   absl::Status Status() { return error_listener_->status(); }
 
   // ObjectWriter methods
-  RequestWeaver* StartObject(internal::string_view name);
+  RequestWeaver* StartObject(absl::string_view name);
   RequestWeaver* EndObject();
-  RequestWeaver* StartList(internal::string_view name);
+  RequestWeaver* StartList(absl::string_view name);
   RequestWeaver* EndList();
-  RequestWeaver* RenderBool(internal::string_view name, bool value);
-  RequestWeaver* RenderInt32(internal::string_view name,
-                             google::protobuf::int32 value);
-  RequestWeaver* RenderUint32(internal::string_view name,
-                              google::protobuf::uint32 value);
-  RequestWeaver* RenderInt64(internal::string_view name,
-                             google::protobuf::int64 value);
-  RequestWeaver* RenderUint64(internal::string_view name,
-                              google::protobuf::uint64 value);
-  RequestWeaver* RenderDouble(internal::string_view name, double value);
-  RequestWeaver* RenderFloat(internal::string_view name, float value);
-  RequestWeaver* RenderString(internal::string_view name,
-                              internal::string_view value);
-  RequestWeaver* RenderNull(internal::string_view name);
-  RequestWeaver* RenderBytes(internal::string_view name,
-                             internal::string_view value);
+  RequestWeaver* RenderBool(absl::string_view name, bool value);
+  RequestWeaver* RenderInt32(absl::string_view name, int32_t value);
+  RequestWeaver* RenderUint32(absl::string_view name, uint32_t value);
+  RequestWeaver* RenderInt64(absl::string_view name, int64_t value);
+  RequestWeaver* RenderUint64(absl::string_view name, uint64_t value);
+  RequestWeaver* RenderDouble(absl::string_view name, double value);
+  RequestWeaver* RenderFloat(absl::string_view name, float value);
+  RequestWeaver* RenderString(absl::string_view name, absl::string_view value);
+  RequestWeaver* RenderNull(absl::string_view name);
+  RequestWeaver* RenderBytes(absl::string_view name, absl::string_view value);
 
  private:
   // Container for information to be weaved.
@@ -114,7 +109,7 @@ class RequestWeaver : public google::protobuf::util::converter::ObjectWriter {
     std::list<std::pair<const google::protobuf::Field*, std::string>> bindings;
 
     // Find the entry for the speciied field in messages list .
-    WeaveInfo* FindWeaveMsg(internal::string_view field_name);
+    WeaveInfo* FindWeaveMsg(absl::string_view field_name);
 
     // Create an entry in messages for the given field. The caller must make
     // sure that there is no existing entry for the same field before calling.
@@ -134,7 +129,7 @@ class RequestWeaver : public google::protobuf::util::converter::ObjectWriter {
   // Checks if any repeated fields with the same field name are in the current
   // node of the weave tree. Output them if there are any.
   void CollisionCheck(
-      internal::string_view name,
+      absl::string_view name,
       const ::google::protobuf::util::converter::DataPiece& value);
 
   // All the headers, variable bindings and parameter bindings to be weaved in.

src/include/grpc_transcoding/request_weaver.h

@@ -2,8 +2,8 @@
 #define GRPC_TRANSCODING_STATUS_ERROR_LISTENER_H_
 
 #include "absl/status/status.h"
+#include "absl/strings/string_view.h"
 #include "google/protobuf/util/converter/error_listener.h"
-#include "grpc_transcoding/internal/protobuf_types.h"
 
 namespace google {
 namespace grpc {
@@ -22,13 +22,13 @@ class StatusErrorListener
   // ErrorListener implementation
   void InvalidName(
       const ::google::protobuf::util::converter::LocationTrackerInterface& loc,
-      internal::string_view unknown_name, internal::string_view message);
+      absl::string_view unknown_name, absl::string_view message);
   void InvalidValue(
       const ::google::protobuf::util::converter::LocationTrackerInterface& loc,
-      internal::string_view type_name, internal::string_view value);
+      absl::string_view type_name, absl::string_view value);
   void MissingField(
       const ::google::protobuf::util::converter::LocationTrackerInterface& loc,
-      internal::string_view missing_name);
+      absl::string_view missing_name);
 
   void set_status(absl::Status status) { status_ = status; }
 

src/include/grpc_transcoding/status_error_listener.h

@@ -18,10 +18,10 @@
 
 #include <string>
 
+#include "absl/strings/string_view.h"
 #include "google/protobuf/io/zero_copy_stream.h"
 #include "google/protobuf/util/converter/json_stream_parser.h"
 #include "google/protobuf/util/converter/object_writer.h"
-#include "grpc_transcoding/internal/protobuf_types.h"
 #include "grpc_transcoding/message_stream.h"
 #include "grpc_transcoding/request_message_translator.h"
 #include "grpc_transcoding/request_stream_translator.h"
@@ -102,7 +102,7 @@ class LazyRequestTranslator : public MessageStream {
 
     // Feed the chunk to the parser & check the status.
     return CheckParsingStatus(json_parser_->Parse(
-        internal::string_view(reinterpret_cast<const char*>(data), size)));
+        absl::string_view(reinterpret_cast<const char*>(data), size)));
   }
 
   // If parsing status fails, return false.