summer-ji-eng · Nov 16, 2020 · Nov 16, 2020 · Nov 16, 2020 · Nov 17, 2020 · Nov 17, 2020
diff --git a/src/main/java/com/google/api/generator/gapic/composer/BUILD.bazel b/src/main/java/com/google/api/generator/gapic/composer/BUILD.bazel
@@ -15,9 +15,11 @@ java_library(
     deps = [
         "//:service_config_java_proto",
         "//src/main/java/com/google/api/generator/engine/ast",
+        "//src/main/java/com/google/api/generator/engine/writer",
         "//src/main/java/com/google/api/generator/gapic:status_java_proto",
         "//src/main/java/com/google/api/generator/gapic/model",
         "//src/main/java/com/google/api/generator/gapic/utils",
+        "//src/main/java/com/google/api/generator/gapic/composer/samplecode",
         "@com_google_api_api_common//jar",
         "@com_google_api_gax_java//gax",
         "@com_google_api_gax_java//gax-grpc:gax_grpc",

diff --git a/src/main/java/com/google/api/generator/gapic/composer/ClassComposer.java b/src/main/java/com/google/api/generator/gapic/composer/ClassComposer.java
@@ -16,9 +16,11 @@
 
 import com.google.api.generator.gapic.model.GapicClass;
 import com.google.api.generator.gapic.model.Message;
+import com.google.api.generator.gapic.model.ResourceName;
 import com.google.api.generator.gapic.model.Service;
 import java.util.Map;
 
 public interface ClassComposer {
-  GapicClass generate(Service service, Map<String, Message> messageTypes);
+  GapicClass generate(
+      Service service, Map<String, ResourceName> resourceNames, Map<String, Message> messageTypes);
 }
diff --git a/src/main/java/com/google/api/generator/gapic/composer/Composer.java b/src/main/java/com/google/api/generator/gapic/composer/Composer.java
@@ -60,8 +60,8 @@ public static List<GapicClass> generateServiceClasses(
       @Nonnull Map<String, ResourceName> resourceNames,
       @Nonnull Map<String, Message> messageTypes) {
     List<GapicClass> clazzes = new ArrayList<>();
-    clazzes.addAll(generateStubClasses(service, serviceConfig, messageTypes));
-    clazzes.addAll(generateClientSettingsClasses(service, messageTypes));
+    clazzes.addAll(generateStubClasses(service, serviceConfig, messageTypes, resourceNames));
+    clazzes.addAll(generateClientSettingsClasses(service, messageTypes, resourceNames));
     clazzes.addAll(generateMocksAndTestClasses(service, resourceNames, messageTypes));
     // TODO(miraleung): Generate test classes.
     return clazzes;
@@ -76,29 +76,38 @@ public static List<GapicClass> generateResourceNameHelperClasses(
   }
 
   public static List<GapicClass> generateStubClasses(
-      Service service, GapicServiceConfig serviceConfig, Map<String, Message> messageTypes) {
+      Service service,
+      GapicServiceConfig serviceConfig,
+      Map<String, Message> messageTypes,
+      Map<String, ResourceName> resourceNames) {
     List<GapicClass> clazzes = new ArrayList<>();
-    clazzes.add(ServiceStubClassComposer.instance().generate(service, messageTypes));
+    clazzes.add(ServiceStubClassComposer.instance().generate(service, resourceNames, messageTypes));
     clazzes.add(
         ServiceStubSettingsClassComposer.instance().generate(service, serviceConfig, messageTypes));
-    clazzes.add(GrpcServiceCallableFactoryClassComposer.instance().generate(service, messageTypes));
-    clazzes.add(GrpcServiceStubClassComposer.instance().generate(service, messageTypes));
+    clazzes.add(
+        GrpcServiceCallableFactoryClassComposer.instance()
+            .generate(service, resourceNames, messageTypes));
+    clazzes.add(
+        GrpcServiceStubClassComposer.instance().generate(service, resourceNames, messageTypes));
     return clazzes;
   }
 
   public static List<GapicClass> generateClientSettingsClasses(
-      Service service, Map<String, Message> messageTypes) {
+      Service service, Map<String, Message> messageTypes, Map<String, ResourceName> resourceNames) {
     List<GapicClass> clazzes = new ArrayList<>();
-    clazzes.add(ServiceClientClassComposer.instance().generate(service, messageTypes));
-    clazzes.add(ServiceSettingsClassComposer.instance().generate(service, messageTypes));
+    clazzes.add(
+        ServiceClientClassComposer.instance().generate(service, resourceNames, messageTypes));
+    clazzes.add(
+        ServiceSettingsClassComposer.instance().generate(service, resourceNames, messageTypes));
     return clazzes;
   }
 
   public static List<GapicClass> generateMocksAndTestClasses(
       Service service, Map<String, ResourceName> resourceNames, Map<String, Message> messageTypes) {
     List<GapicClass> clazzes = new ArrayList<>();
-    clazzes.add(MockServiceClassComposer.instance().generate(service, messageTypes));
-    clazzes.add(MockServiceImplClassComposer.instance().generate(service, messageTypes));
+    clazzes.add(MockServiceClassComposer.instance().generate(service, resourceNames, messageTypes));
+    clazzes.add(
+        MockServiceImplClassComposer.instance().generate(service, resourceNames, messageTypes));
     clazzes.add(
         ServiceClientTestClassComposer.instance().generate(service, resourceNames, messageTypes));
     return clazzes;

diff --git a/...java/com/google/api/generator/gapic/composer/GrpcServiceCallableFactoryClassComposer.java b/...java/com/google/api/generator/gapic/composer/GrpcServiceCallableFactoryClassComposer.java
@@ -42,6 +42,7 @@
 import com.google.api.generator.gapic.model.GapicClass;
 import com.google.api.generator.gapic.model.GapicClass.Kind;
 import com.google.api.generator.gapic.model.Message;
+import com.google.api.generator.gapic.model.ResourceName;
 import com.google.api.generator.gapic.model.Service;
 import com.google.common.base.Preconditions;
 import com.google.longrunning.Operation;
@@ -64,7 +65,8 @@ public static GrpcServiceCallableFactoryClassComposer instance() {
   }
 
   @Override
-  public GapicClass generate(Service service, Map<String, Message> ignore) {
+  public GapicClass generate(
+      Service service, Map<String, ResourceName> resourceNames, Map<String, Message> ignore) {
     Map<String, TypeNode> types = createTypes(service);
     String className = String.format("Grpc%sCallableFactory", service.name());
     GapicClass.Kind kind = Kind.STUB;

diff --git a/src/main/java/com/google/api/generator/gapic/composer/GrpcServiceStubClassComposer.java b/src/main/java/com/google/api/generator/gapic/composer/GrpcServiceStubClassComposer.java
@@ -51,6 +51,7 @@
 import com.google.api.generator.gapic.model.GapicClass.Kind;
 import com.google.api.generator.gapic.model.Message;
 import com.google.api.generator.gapic.model.Method;
+import com.google.api.generator.gapic.model.ResourceName;
 import com.google.api.generator.gapic.model.Service;
 import com.google.api.generator.gapic.utils.JavaStyle;
 import com.google.common.base.Preconditions;
@@ -112,7 +113,8 @@ public static GrpcServiceStubClassComposer instance() {
   }
 
   @Override
-  public GapicClass generate(Service service, Map<String, Message> ignore) {
+  public GapicClass generate(
+      Service service, Map<String, ResourceName> resourceNames, Map<String, Message> ignore) {
     String pakkage = service.pakkage() + ".stub";
     Map<String, TypeNode> types = createDynamicTypes(service, pakkage);
     String className = getThisClassName(service.name());

diff --git a/src/main/java/com/google/api/generator/gapic/composer/MockServiceClassComposer.java b/src/main/java/com/google/api/generator/gapic/composer/MockServiceClassComposer.java
@@ -33,6 +33,7 @@
 import com.google.api.generator.gapic.model.GapicClass;
 import com.google.api.generator.gapic.model.GapicClass.Kind;
 import com.google.api.generator.gapic.model.Message;
+import com.google.api.generator.gapic.model.ResourceName;
 import com.google.api.generator.gapic.model.Service;
 import com.google.protobuf.AbstractMessage;
 import io.grpc.ServerServiceDefinition;
@@ -55,7 +56,8 @@ public static MockServiceClassComposer instance() {
   }
 
   @Override
-  public GapicClass generate(Service service, Map<String, Message> ignore) {
+  public GapicClass generate(
+      Service service, Map<String, ResourceName> resourceNames, Map<String, Message> ignore) {
     Map<String, TypeNode> types = createTypes(service);
     String className = String.format(MOCK_SERVICE_NAME_PATTERN, service.name());
     GapicClass.Kind kind = Kind.TEST;

diff --git a/src/main/java/com/google/api/generator/gapic/composer/MockServiceImplClassComposer.java b/src/main/java/com/google/api/generator/gapic/composer/MockServiceImplClassComposer.java
@@ -42,6 +42,7 @@
 import com.google.api.generator.gapic.model.Message;
 import com.google.api.generator.gapic.model.Method;
 import com.google.api.generator.gapic.model.Method.Stream;
+import com.google.api.generator.gapic.model.ResourceName;
 import com.google.api.generator.gapic.model.Service;
 import com.google.api.generator.gapic.utils.JavaStyle;
 import com.google.longrunning.Operation;
@@ -94,7 +95,8 @@ public static MockServiceImplClassComposer instance() {
   }
 
   @Override
-  public GapicClass generate(Service service, Map<String, Message> ignore) {
+  public GapicClass generate(
+      Service service, Map<String, ResourceName> resourceNames, Map<String, Message> ignore) {
     Map<String, TypeNode> types = createDynamicTypes(service);
     String className = String.format(MOCK_SERVICE_IMPL_NAME_PATTERN, service.name());
     GapicClass.Kind kind = Kind.TEST;