address PR feedback

googleapis · Jul 12, 2021 · 5db2998 · 5db2998
1 parent 7d1b833
commit 5db2998
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 20 deletions.
diff --git a/...ogle/api/generator/gapic/composer/common/AbstractServiceCallableFactoryClassComposer.java b/...ogle/api/generator/gapic/composer/common/AbstractServiceCallableFactoryClassComposer.java
@@ -137,8 +137,7 @@ protected MethodDefinition createUnaryCallableMethod(TypeStore typeStore) {
         /*callSettingsVariantName=*/ methodVariantName,
         /*callSettingsTemplateObjects=*/ methodTemplateNames.stream()
             .map(n -> (Object) n)
-            .collect(Collectors.toList()),
-        Collections.emptyList());
+            .collect(Collectors.toList()));
   }
 
   protected MethodDefinition createPagedCallableMethod(TypeStore typeStore) {
@@ -160,8 +159,7 @@ protected MethodDefinition createPagedCallableMethod(TypeStore typeStore) {
         /*callSettingsVariantName=*/ methodVariantName,
         /*callSettingsTemplateObjects=*/ methodTemplateNames.stream()
             .map(n -> (Object) n)
-            .collect(Collectors.toList()),
-        Collections.emptyList());
+            .collect(Collectors.toList()));
   }
 
   protected MethodDefinition createBatchingCallableMethod(TypeStore typeStore) {
@@ -181,12 +179,32 @@ protected MethodDefinition createBatchingCallableMethod(TypeStore typeStore) {
         /*callSettingsVariantName=*/ methodVariantName,
         /*callSettingsTemplateObjects=*/ methodTemplateNames.stream()
             .map(n -> (Object) n)
-            .collect(Collectors.toList()),
-        Collections.emptyList());
+            .collect(Collectors.toList()));
   }
 
   protected abstract MethodDefinition createOperationCallableMethod(TypeStore typeStore);
 
+  protected MethodDefinition createGenericCallableMethod(
+      TypeStore typeStore,
+      List<String> methodTemplateNames,
+      String returnCallableKindName,
+      List<String> returnCallableTemplateNames,
+      String methodVariantName,
+      List<Object> transportCallSettingsTemplateObjects,
+      String callSettingsVariantName,
+      List<Object> callSettingsTemplateObjects) {
+    return createGenericCallableMethod(
+        typeStore,
+        methodTemplateNames,
+        returnCallableKindName,
+        returnCallableTemplateNames,
+        methodVariantName,
+        transportCallSettingsTemplateObjects,
+        callSettingsVariantName,
+        callSettingsTemplateObjects,
+        Collections.emptyList());
+  }
+
   protected MethodDefinition createGenericCallableMethod(
       TypeStore typeStore,
       List<String> methodTemplateNames,

diff --git a/...com/google/api/generator/gapic/composer/grpc/GrpcServiceCallableFactoryClassComposer.java b/...com/google/api/generator/gapic/composer/grpc/GrpcServiceCallableFactoryClassComposer.java
@@ -22,7 +22,6 @@
 import com.google.longrunning.Operation;
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Collections;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -73,8 +72,7 @@ protected MethodDefinition createUnaryCallableMethod(TypeStore typeStore) {
         /*callSettingsVariantName=*/ methodVariantName,
         /*callSettingsTemplateObjects=*/ methodTemplateNames.stream()
             .map(n -> (Object) n)
-            .collect(Collectors.toList()),
-        Collections.emptyList());
+            .collect(Collectors.toList()));
   }
 
   protected MethodDefinition createPagedCallableMethod(TypeStore typeStore) {
@@ -96,8 +94,7 @@ protected MethodDefinition createPagedCallableMethod(TypeStore typeStore) {
         /*callSettingsVariantName=*/ methodVariantName,
         /*callSettingsTemplateObjects=*/ methodTemplateNames.stream()
             .map(n -> (Object) n)
-            .collect(Collectors.toList()),
-        Collections.emptyList());
+            .collect(Collectors.toList()));
   }
 
   @Override
@@ -117,8 +114,7 @@ protected MethodDefinition createOperationCallableMethod(TypeStore typeStore) {
         /*callSettingsVariantName=*/ methodVariantName,
         /*callSettingsTemplateObjects=*/ methodTemplateNames.stream()
             .map(n -> (Object) n)
-            .collect(Collectors.toList()),
-        Collections.emptyList());
+            .collect(Collectors.toList()));
   }
 
   private MethodDefinition createBidiStreamingCallableMethod(TypeStore typeStore) {
@@ -138,8 +134,7 @@ private MethodDefinition createBidiStreamingCallableMethod(TypeStore typeStore)
         /*callSettingsVariantName=*/ "Streaming",
         /*callSettingsTemplateObjects=*/ methodTemplateNames.stream()
             .map(n -> (Object) n)
-            .collect(Collectors.toList()),
-        Collections.emptyList());
+            .collect(Collectors.toList()));
   }
 
   private MethodDefinition createServerStreamingCallableMethod(TypeStore typeStore) {
@@ -159,8 +154,7 @@ private MethodDefinition createServerStreamingCallableMethod(TypeStore typeStore
         /*callSettingsVariantName=*/ methodVariantName,
         /*callSettingsTemplateObjects=*/ methodTemplateNames.stream()
             .map(n -> (Object) n)
-            .collect(Collectors.toList()),
-        Collections.emptyList());
+            .collect(Collectors.toList()));
   }
 
   private MethodDefinition createClientStreamingCallableMethod(TypeStore typeStore) {
@@ -180,7 +174,6 @@ private MethodDefinition createClientStreamingCallableMethod(TypeStore typeStore
         /*callSettingsVariantName=*/ "Streaming",
         /*callSettingsTemplateObjects=*/ methodTemplateNames.stream()
             .map(n -> (Object) n)
-            .collect(Collectors.toList()),
-        Collections.emptyList());
+            .collect(Collectors.toList()));
   }
 }
diff --git a/...google/api/generator/gapic/composer/rest/HttpJsonServiceCallableFactoryClassComposer.java b/...google/api/generator/gapic/composer/rest/HttpJsonServiceCallableFactoryClassComposer.java
@@ -52,6 +52,8 @@ protected List<AnnotationNode> createClassAnnotations(Service service, TypeStore
     // Always add @BetaApi annotation to the generated CallableFactory for now. It is a public class
     // for technical reasons, end users are not expected to interact with it, but it may change
     // when we add LRO support, that is why making it @BetaApi for now.
+    //
+    // Remove the @BetaApi annotation once the LRO feature is fully implemented and stabilized.
     if (annotations.stream().noneMatch(a -> a.type().equals(typeStore.get("BetaApi")))) {
       annotations.add(AnnotationNode.withType(typeStore.get("BetaApi")));
     }
@@ -78,8 +80,10 @@ protected MethodDefinition createOperationCallableMethod(TypeStore typeStore) {
     List<String> methodTemplateNames =
         Arrays.asList(requestTemplateName, responseTemplateName, "MetadataT");
 
-    // Always add @BetaApi annotation to the generated createOperationCallable()method for now,
+    // Always add @BetaApi annotation to the generated createOperationCallable() method for now,
     // until LRO is fully implemented.
+    //
+    // Remove the @BetaApi annotation once the LRO feature is fully implemented and stabilized.
     AnnotationNode betaAnnotation =
         AnnotationNode.withTypeAndDescription(
             typeStore.get("BetaApi"),