chore: merge changes from master

googleapis · Oct 6, 2021 · d029941 · d029941
1 parent 39c7b9c
commit d029941
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/...om/google/api/generator/gapic/composer/common/AbstractServiceClientTestClassComposer.java b/...om/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/...java/com/google/api/generator/gapic/composer/common/AbstractServiceStubClassComposer.java b/...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/...n/java/com/google/api/generator/gapic/composer/rest/HttpJsonServiceStubClassComposer.java b/...n/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,