Feat: Implement DIREGAPIC LRO annotations

WORKSPACE

@@ -32,6 +32,7 @@ jvm_maven_import_external(
 # gapic-generator-java dependencies to match the order in googleapis repository,
 # which in its turn, prioritizes actual generated clients runtime dependencies
 # over the generator dependencies.
+
 _gax_java_version = "2.3.0"
 
 http_archive(

repositories.bzl

@@ -76,6 +76,15 @@ def gapic_generator_java_repositories():
         ],
     )
 
+    #    local(
+    #        http_archive,
+    #        name = "com_google_googleapis_discovery",
+    ##        strip_prefix = "googleapis-discovery-2872d382ff767518e63d59ececf5d6f9224b21b4",
+    ##        urls = [
+    ##            "https://github.com/vam-google/googleapis-discovery/archive/2872d382ff767518e63d59ececf5d6f9224b21b4.zip",
+    ##        ],
+    #    )
+
     _maybe(
         native.bind,
         name = "guava",

src/main/java/com/google/api/generator/gapic/composer/rest/HttpJsonServiceCallableFactoryClassComposer.java

@@ -15,7 +15,6 @@
 package com.google.api.generator.gapic.composer.rest;
 
 import com.google.api.gax.core.BackgroundResource;
-import com.google.api.gax.httpjson.ApiMessage;
 import com.google.api.gax.httpjson.HttpJsonCallableFactory;
 import com.google.api.gax.httpjson.HttpJsonOperationSnapshotCallable;
 import com.google.api.gax.rpc.OperationCallable;
@@ -47,7 +46,7 @@ public class HttpJsonServiceCallableFactoryClassComposer
       new HttpJsonServiceCallableFactoryClassComposer();
 
   private static final TypeNode MESSAGE_TYPE =
-      TypeNode.withReference(ConcreteReference.withClazz(ApiMessage.class));
+      TypeNode.withReference(ConcreteReference.withClazz(Operation.class));
   private static final TypeNode BACKGROUND_RESOURCE_TYPE =
       TypeNode.withReference(ConcreteReference.withClazz(BackgroundResource.class));
 
@@ -121,11 +120,21 @@ protected MethodDefinition createOperationCallableMethod(TypeStore typeStore) {
 
     List<Statement> createOperationCallableBody = new ArrayList<Statement>(2);
 
-    List<VariableExpr> arguments = method.arguments();
+    List<VariableExpr> arguments = new ArrayList<>(method.arguments());
+    // arguments.set(
+    //     0,
+    //     arguments
+    //         .get(0)
+    //         .toBuilder()
+    //         .setTemplateObjects(Arrays.asList(requestTemplateName, methodVariantName))
+    //         .build()); // httpJsonCallSettings);
+    // method = method.toBuilder().setArguments(arguments).build();
+
+    // arguments = method.arguments();
     Variable httpJsonCallSettingsVar = arguments.get(0).variable();
-    Variable callSettingsVar = arguments.get(1).variable();
+    Variable operationCallSettingsVar = arguments.get(1).variable();
     Variable clientContextVar = arguments.get(2).variable();
-    Variable operationsStub = arguments.get(3).variable();
+    Variable operationsStubVar = arguments.get(3).variable();
     // Generate innerCallable
     VariableExpr innerCallableVarExpr =
         VariableExpr.builder()
@@ -139,7 +148,7 @@ protected MethodDefinition createOperationCallableMethod(TypeStore typeStore) {
             .build();
     MethodInvocationExpr getInitialCallSettingsExpr =
         MethodInvocationExpr.builder()
-            .setExprReferenceExpr(VariableExpr.withVariable(callSettingsVar))
+            .setExprReferenceExpr(VariableExpr.withVariable(operationCallSettingsVar))
             .setMethodName("getInitialCallSettings")
             .build();
     MethodInvocationExpr createBaseUnaryCallableExpr =
@@ -209,7 +218,7 @@ protected MethodDefinition createOperationCallableMethod(TypeStore typeStore) {
     // Generate return statement
     MethodInvocationExpr longRunningClient =
         MethodInvocationExpr.builder()
-            .setExprReferenceExpr(VariableExpr.withVariable(operationsStub))
+            .setExprReferenceExpr(VariableExpr.withVariable(operationsStubVar))
             .setMethodName("longRunningClient")
             .build();
     MethodInvocationExpr createOperationCallable =
@@ -218,7 +227,7 @@ protected MethodDefinition createOperationCallableMethod(TypeStore typeStore) {
                 TypeNode.withReference(ConcreteReference.withClazz(HttpJsonCallableFactory.class)))
             .setMethodName("createOperationCallable")
             .setArguments(
-                VariableExpr.withVariable(callSettingsVar),
+                VariableExpr.withVariable(operationCallSettingsVar),
                 VariableExpr.withVariable(clientContextVar),
                 longRunningClient,
                 initialCallableVarExpr)