.

Author: cuiy0006

generator/internal/make_generators.cc

@@ -69,6 +69,8 @@ std::vector<std::unique_ptr<GeneratorInterface>> MakeGenerators(
       absl::optional<std::string> body = mixin_method.method_override.http_body;
 
       std::cout << mixin_method.method.get().full_name() << " "
+                << mixin_method.grpc_stub_fqn << " "
+                << mixin_method.grpc_stub_name << " "
                 << mixin_method.method_override.http_verb << " "
                 << mixin_method.method_override.http_path << " "
                 << (body.has_value() ? *body : "") << std::endl;

generator/internal/mixin_utils.cc

@@ -1,5 +1,7 @@
 #include "generator/internal/mixin_utils.h"
+#include "generator/internal/codegen_utils.h"
 #include "google/cloud/log.h"
+#include "absl/strings/ascii.h"
 #include "absl/types/optional.h"
 #include <google/protobuf/compiler/code_generator.h>
 #include <yaml-cpp/yaml.h>
@@ -133,7 +135,9 @@ std::vector<MixinMethod> GetMixinMethods(YAML::Node const& service_config,
             mixin_method_overrides.end())
           continue;
         mixin_methods.push_back(
-            {*mixin_method, mixin_method_overrides[mixin_method_full_name]});
+            {absl::AsciiStrToLower(mixin_service->name()) + "_stub",
+             ProtoNameToCppName(mixin_service->full_name()), *mixin_method,
+             mixin_method_overrides[mixin_method_full_name]});
       }
     }
   }

generator/internal/mixin_utils.h

@@ -32,6 +32,8 @@ struct MixinMethodOverride {
 };
 
 struct MixinMethod {
+  std::string grpc_stub_name;
+  std::string grpc_stub_fqn;
   std::reference_wrapper<google::protobuf::MethodDescriptor const> method;
   MixinMethodOverride method_override;
 };

generator/internal/stub_factory_generator.cc

@@ -90,7 +90,7 @@ Status StubFactoryGenerator::GenerateCc() {
   std::vector<std::string> headers =
       absl::StrSplit(vars("mixin_proto_grpc_header_paths"), ",");
   headers.insert(headers.end(),
-                 {vars("proto_grpc_header_path"), "memory", "utility"});  
+                 {vars("proto_grpc_header_path"), "memory", "utility"});
   CcSystemIncludes(headers);
 
   auto result = CcOpenNamespaces(NamespaceType::kInternal);

generator/internal/stub_generator.cc

@@ -35,7 +35,8 @@ StubGenerator::StubGenerator(
     std::vector<MixinMethod> const& mixin_methods)
     : StubGeneratorBase("stub_header_path", "stub_cc_path", service_descriptor,
                         std::move(service_vars), std::move(service_method_vars),
-                        context, mixin_methods) {}
+                        context, mixin_methods),
+      mixin_methods_(mixin_methods) {}
 
 Status StubGenerator::GenerateHeader() {
   HeaderPrint(CopyrightLicenseFileHeader());
@@ -236,6 +237,10 @@ Status StubGenerator::GenerateHeader() {
     "\n"
     "class Default$stub_class_name$ : public $stub_class_name$ {\n"
     " public:");
+  // std::string mixin_stub = "";
+  // for (auto const& mixin_method : mixin_methods_) {
+  //   mixin_stub += ",\n        " + mixin_method.grpc_stub_name + "_(std::move"
+  // }
   if (HasLongrunningMethod()) {
     HeaderPrint(  // clang-format off
     "\n"

generator/internal/stub_generator.h

@@ -51,6 +51,7 @@ class StubGenerator : public StubGeneratorBase {
  private:
   Status GenerateHeader() override;
   Status GenerateCc() override;
+  std::vector<MixinMethod> mixin_methods_;
 };
 
 }  // namespace generator_internal