chore: merge changes from master

vam-google · vam-google · commit d029941dc32e · 2021-10-05T19:06:24.000-07:00
diff --git a/src/main/java/com/google/api/generator/gapic/composer/common/AbstractServiceClientTestClassComposer.java b/src/main/java/com/google/api/generator/gapic/composer/common/AbstractServiceClientTestClassComposer.java
@@ -20,8 +20,12 @@
 import com.google.api.gax.rpc.BidiStreamingCallable;
 import com.google.api.gax.rpc.ClientStreamingCallable;
 import com.google.api.gax.rpc.InvalidArgumentException;
+import com.google.api.gax.rpc.PagedCallSettings;
+import com.google.api.gax.rpc.ServerStreamingCallSettings;
 import com.google.api.gax.rpc.ServerStreamingCallable;
 import com.google.api.gax.rpc.StatusCode;
+import com.google.api.gax.rpc.StreamingCallSettings;
+import com.google.api.gax.rpc.UnaryCallSettings;
 import com.google.api.generator.engine.ast.AnnotationNode;
 import com.google.api.generator.engine.ast.AssignmentExpr;
 import com.google.api.generator.engine.ast.ClassDefinition;
diff --git a/src/main/java/com/google/api/generator/gapic/composer/common/AbstractServiceStubClassComposer.java b/src/main/java/com/google/api/generator/gapic/composer/common/AbstractServiceStubClassComposer.java
@@ -253,7 +253,7 @@ private static List<MethodDefinition> createBackgroundResourceMethodOverrides()
   }
 
   private static TypeStore createTypes(Service service, Map<String, Message> messageTypes) {
-    List<Class> concreteClazzes =
+    List<Class<?>> concreteClazzes =
         Arrays.asList(
             BackgroundResource.class,
             BetaApi.class,
diff --git a/src/main/java/com/google/api/generator/gapic/composer/rest/HttpJsonServiceStubClassComposer.java b/src/main/java/com/google/api/generator/gapic/composer/rest/HttpJsonServiceStubClassComposer.java
@@ -118,11 +118,6 @@ protected boolean generateOperationsStubLogic(Service service) {
     return service.hasLroMethods();
   }
 
-  @Override
-  protected boolean generateOperationsStubLogic(Service service) {
-    return service.hasLroMethods();
-  }
-
   @Override
   protected Statement createMethodDescriptorVariableDecl(
       Service service,

Original file line number	Diff line number	Diff line change
`@@ -253,7 +253,7 @@ private static List<MethodDefinition> createBackgroundResourceMethodOverrides()`
`253`	`253`	`}`
`254`	`254`
`255`	`255`	`private static TypeStore createTypes(Service service, Map<String, Message> messageTypes) {`
`256`		`- List<Class> concreteClazzes =`
	`256`	`+ List<Class<?>> concreteClazzes =`
`257`	`257`	`Arrays.asList(`
`258`	`258`	`BackgroundResource.class,`
`259`	`259`	`BetaApi.class,`