Minimum generator change. Mix location, iampolicy, lro into datamigration service

Author: cuiy0006

generator/CMakeLists.txt

@@ -96,6 +96,8 @@ add_library(
     internal/metadata_decorator_generator.h
     internal/metadata_decorator_rest_generator.cc
     internal/metadata_decorator_rest_generator.h
+    internal/mixin_utils.cc
+    internal/mixin_utils.h
     internal/mock_connection_generator.cc
     internal/mock_connection_generator.h
     internal/option_defaults_generator.cc

generator/google_cloud_cpp_generator.bzl

@@ -50,6 +50,7 @@ google_cloud_cpp_generator_hdrs = [
     "internal/make_generators.h",
     "internal/metadata_decorator_generator.h",
     "internal/metadata_decorator_rest_generator.h",
+    "internal/mixin_utils.h",
     "internal/mock_connection_generator.h",
     "internal/option_defaults_generator.h",
     "internal/options_generator.h",
@@ -108,6 +109,7 @@ google_cloud_cpp_generator_srcs = [
     "internal/make_generators.cc",
     "internal/metadata_decorator_generator.cc",
     "internal/metadata_decorator_rest_generator.cc",
+    "internal/mixin_utils.cc",
     "internal/mock_connection_generator.cc",
     "internal/option_defaults_generator.cc",
     "internal/options_generator.cc",

generator/integration_tests/golden/v1/internal/golden_kitchen_sink_stub.h

@@ -129,7 +129,7 @@ class DefaultGoldenKitchenSinkStub : public GoldenKitchenSinkStub {
  public:
   explicit DefaultGoldenKitchenSinkStub(
       std::unique_ptr<google::test::admin::database::v1::GoldenKitchenSink::StubInterface> grpc_stub)
-      : grpc_stub_(std::move(grpc_stub)) {}
+      : grpc_stub_(std::move(grpc_stub)){}
 
   StatusOr<google::test::admin::database::v1::GenerateAccessTokenResponse> GenerateAccessToken(
       grpc::ClientContext& context,

generator/integration_tests/golden/v1/internal/golden_thing_admin_stub.h

@@ -189,10 +189,10 @@ class GoldenThingAdminStub {
 class DefaultGoldenThingAdminStub : public GoldenThingAdminStub {
  public:
   DefaultGoldenThingAdminStub(
-      std::unique_ptr<google::test::admin::database::v1::GoldenThingAdmin::StubInterface> grpc_stub,
-      std::unique_ptr<google::longrunning::Operations::StubInterface> operations)
-      : grpc_stub_(std::move(grpc_stub)),
-        operations_(std::move(operations)) {}
+      std::unique_ptr<google::test::admin::database::v1::GoldenThingAdmin::StubInterface> grpc_stub
+      ,std::unique_ptr<google::longrunning::Operations::StubInterface> operations)
+      : grpc_stub_(std::move(grpc_stub))
+        , operations_(std::move(operations)) {}
 
   StatusOr<google::test::admin::database::v1::ListDatabasesResponse> ListDatabases(
       grpc::ClientContext& context,

generator/integration_tests/golden/v1/internal/request_id_stub.h

@@ -82,10 +82,10 @@ class RequestIdServiceStub {
 class DefaultRequestIdServiceStub : public RequestIdServiceStub {
  public:
   DefaultRequestIdServiceStub(
-      std::unique_ptr<google::test::requestid::v1::RequestIdService::StubInterface> grpc_stub,
-      std::unique_ptr<google::longrunning::Operations::StubInterface> operations)
-      : grpc_stub_(std::move(grpc_stub)),
-        operations_(std::move(operations)) {}
+      std::unique_ptr<google::test::requestid::v1::RequestIdService::StubInterface> grpc_stub
+      ,std::unique_ptr<google::longrunning::Operations::StubInterface> operations)
+      : grpc_stub_(std::move(grpc_stub))
+        , operations_(std::move(operations)) {}
 
   StatusOr<google::test::requestid::v1::Foo> CreateFoo(
       grpc::ClientContext& context,

generator/internal/auth_decorator_generator.cc

@@ -28,10 +28,11 @@ AuthDecoratorGenerator::AuthDecoratorGenerator(
     google::protobuf::ServiceDescriptor const* service_descriptor,
     VarsDictionary service_vars,
     std::map<std::string, VarsDictionary> service_method_vars,
-    google::protobuf::compiler::GeneratorContext* context)
+    google::protobuf::compiler::GeneratorContext* context,
+    std::vector<MixinMethod> const& mixin_methods)
     : StubGeneratorBase("auth_header_path", "auth_cc_path", service_descriptor,
                         std::move(service_vars), std::move(service_method_vars),
-                        context) {}
+                        context, mixin_methods) {}
 
 Status AuthDecoratorGenerator::GenerateHeader() {
   HeaderPrint(CopyrightLicenseFileHeader());

generator/internal/auth_decorator_generator.h

@@ -37,7 +37,8 @@ class AuthDecoratorGenerator : public StubGeneratorBase {
       google::protobuf::ServiceDescriptor const* service_descriptor,
       VarsDictionary service_vars,
       std::map<std::string, VarsDictionary> service_method_vars,
-      google::protobuf::compiler::GeneratorContext* context);
+      google::protobuf::compiler::GeneratorContext* context,
+      std::vector<MixinMethod> const& mixin_methods);
 
   ~AuthDecoratorGenerator() override = default;
 

generator/internal/client_generator.cc

@@ -32,10 +32,12 @@ ClientGenerator::ClientGenerator(
     google::protobuf::ServiceDescriptor const* service_descriptor,
     VarsDictionary service_vars,
     std::map<std::string, VarsDictionary> service_method_vars,
-    google::protobuf::compiler::GeneratorContext* context)
+    google::protobuf::compiler::GeneratorContext* context,
+    std::vector<MixinMethod> const& mixin_methods)
     : ServiceCodeGenerator("client_header_path", "client_cc_path",
                            service_descriptor, std::move(service_vars),
-                           std::move(service_method_vars), context) {
+                           std::move(service_method_vars), context,
+                           mixin_methods) {
   // Remember if there are methods from google.iam.v1.GetIamPolicyRequest and
   // google.iam.v1.SetIamPolicyRequest to google.iam.v1.Policy with signature
   // extensions. If so, we'll generate a "set" wrapper method to help prevent

generator/internal/client_generator.h

@@ -36,7 +36,8 @@ class ClientGenerator : public ServiceCodeGenerator {
   ClientGenerator(google::protobuf::ServiceDescriptor const* service_descriptor,
                   VarsDictionary service_vars,
                   std::map<std::string, VarsDictionary> service_method_vars,
-                  google::protobuf::compiler::GeneratorContext* context);
+                  google::protobuf::compiler::GeneratorContext* context,
+                  std::vector<MixinMethod> const& mixin_methods);
 
   ~ClientGenerator() override = default;
 

generator/internal/connection_generator.cc

@@ -19,6 +19,7 @@
 #include "generator/internal/pagination.h"
 #include "generator/internal/predicate_utils.h"
 #include "generator/internal/printer.h"
+#include "absl/strings/str_split.h"
 #include <google/protobuf/descriptor.h>
 
 namespace google {
@@ -29,10 +30,12 @@ ConnectionGenerator::ConnectionGenerator(
     google::protobuf::ServiceDescriptor const* service_descriptor,
     VarsDictionary service_vars,
     std::map<std::string, VarsDictionary> service_method_vars,
-    google::protobuf::compiler::GeneratorContext* context)
+    google::protobuf::compiler::GeneratorContext* context,
+    std::vector<MixinMethod> const& mixin_methods)
     : ServiceCodeGenerator("connection_header_path", "connection_cc_path",
                            service_descriptor, std::move(service_vars),
-                           std::move(service_method_vars), context) {}
+                           std::move(service_method_vars), context,
+                           mixin_methods) {}
 
 Status ConnectionGenerator::GenerateHeader() {
   HeaderPrint(CopyrightLicenseFileHeader());
@@ -68,11 +71,14 @@ Status ConnectionGenerator::GenerateHeader() {
            : "",
        IsExperimental() ? "google/cloud/experimental_tag.h" : "",
        "google/cloud/version.h"});
-  HeaderSystemIncludes(
-      {vars("proto_header_path"), vars("additional_pb_header_paths"),
-       HasGRPCLongrunningOperation() ? "google/longrunning/operations.grpc.pb.h"
-                                     : "",
-       "memory"});
+  std::vector<std::string> const additional_pb_header_paths =
+      absl::StrSplit(vars("additional_pb_header_paths"), absl::ByChar(','));
+  HeaderSystemIncludes(additional_pb_header_paths);
+  HeaderSystemIncludes({vars("proto_header_path"),
+                        HasGRPCLongrunningOperation()
+                            ? "google/longrunning/operations.grpc.pb.h"
+                            : "",
+                        "memory"});
   switch (endpoint_location_style) {
     case ServiceConfiguration::LOCATION_DEPENDENT:
     case ServiceConfiguration::LOCATION_DEPENDENT_COMPAT: