impl(mixin): add mixin support in code generators (#14738)

* code changes and generate code for datamigration

* remove code generated for datamigration

* recover quickstart

* recover quickstart

* recover quickstart

* fix

* fix

* fix following comments

Author: cuiy0006

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:

generator/internal/connection_generator.h

@@ -38,7 +38,8 @@ class ConnectionGenerator : public ServiceCodeGenerator {
       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);
 
   ~ConnectionGenerator() override = default;
 

generator/internal/connection_impl_generator.cc

@@ -38,11 +38,12 @@ ConnectionImplGenerator::ConnectionImplGenerator(
     google::protobuf::ServiceDescriptor const* service_descriptor,
     VarsDictionary service_vars,
     std::map<std::string, VarsDictionary> service_method_vars,
-    google::protobuf::compiler::GeneratorContext* context)
-    : ServiceCodeGenerator("connection_impl_header_path",
-                           "connection_impl_cc_path", service_descriptor,
-                           std::move(service_vars),
-                           std::move(service_method_vars), context) {}
+    google::protobuf::compiler::GeneratorContext* context,
+    std::vector<MixinMethod> const& mixin_methods)
+    : ServiceCodeGenerator(
+          "connection_impl_header_path", "connection_impl_cc_path",
+          service_descriptor, std::move(service_vars),
+          std::move(service_method_vars), context, mixin_methods) {}
 
 Status ConnectionImplGenerator::GenerateHeader() {
   HeaderPrint(CopyrightLicenseFileHeader());

generator/internal/connection_impl_generator.h

@@ -38,7 +38,8 @@ class ConnectionImplGenerator : public ServiceCodeGenerator {
       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);
 
   ~ConnectionImplGenerator() override = default;
 

generator/internal/connection_impl_rest_generator.cc

@@ -30,11 +30,12 @@ ConnectionImplRestGenerator::ConnectionImplRestGenerator(
     google::protobuf::ServiceDescriptor const* service_descriptor,
     VarsDictionary service_vars,
     std::map<std::string, VarsDictionary> service_method_vars,
-    google::protobuf::compiler::GeneratorContext* context)
-    : ServiceCodeGenerator("connection_impl_rest_header_path",
-                           "connection_impl_rest_cc_path", service_descriptor,
-                           std::move(service_vars),
-                           std::move(service_method_vars), context) {}
+    google::protobuf::compiler::GeneratorContext* context,
+    std::vector<MixinMethod> const& mixin_methods)
+    : ServiceCodeGenerator(
+          "connection_impl_rest_header_path", "connection_impl_rest_cc_path",
+          service_descriptor, std::move(service_vars),
+          std::move(service_method_vars), context, mixin_methods) {}
 
 Status ConnectionImplRestGenerator::GenerateHeader() {
   HeaderPrint(CopyrightLicenseFileHeader());

generator/internal/connection_impl_rest_generator.h

@@ -38,7 +38,8 @@ class ConnectionImplRestGenerator : public ServiceCodeGenerator {
       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);
 
   ~ConnectionImplRestGenerator() override = default;