googleapis
diff --git a/‎.github/workflows/ci-maven.yaml‎
Lines changed: 0 additions & 1 deletion b/‎.github/workflows/ci-maven.yaml‎
Lines changed: 0 additions & 1 deletion
diff --git a/‎DEVELOPMENT.md‎
Lines changed: 1 addition & 1 deletion b/‎DEVELOPMENT.md‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/common/AbstractTransportServiceStubClassComposer.java‎
Lines changed: 2 additions & 0 deletions b/‎gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/common/AbstractTransportServiceStubClassComposer.java‎
Lines changed: 2 additions & 0 deletions
diff --git a/‎gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/rest/HttpJsonServiceStubClassComposer.java‎
Lines changed: 115 additions & 1 deletion b/‎gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/rest/HttpJsonServiceStubClassComposer.java‎
Lines changed: 115 additions & 1 deletion
diff --git a/‎gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpcrest/GrpcRestTestProtoLoader.java‎
Lines changed: 11 additions & 1 deletion b/‎gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpcrest/GrpcRestTestProtoLoader.java‎
Lines changed: 11 additions & 1 deletion
diff --git a/‎gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpcrest/goldens/HttpJsonEchoStub.golden‎
Lines changed: 52 additions & 1 deletion b/‎gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpcrest/goldens/HttpJsonEchoStub.golden‎
Lines changed: 52 additions & 1 deletion
@@ -106,7 +106,6 @@ jobs:
         with:
           java-version: 8
           distribution: temurin
-          cache: maven
       - run: java -version
       - name: Run tests in Java 8 with the source compiled in Java 11 for gapic-generator-java
         shell: bash
 
@@ -38,4 +38,4 @@ for gapic-generator-java's Bazel build.
 
     ```sh
     mvn fmt:format
-    ```
+    ```
@@ -649,6 +649,7 @@ protected List<MethodDefinition> createConstructorMethods(
     if (generateOperationsStubLogic(service)) {
       secondCtorExprs.addAll(
           createOperationsStubInitExpr(
+              context,
               service,
               thisExpr,
               operationsStubClassVarExpr,
@@ -758,6 +759,7 @@ protected List<MethodDefinition> createConstructorMethods(
   }
 
   protected List<Expr> createOperationsStubInitExpr(
+      GapicContext context,
       Service service,
       Expr thisExpr,
       VariableExpr operationsStubClassVarExpr,
 
@@ -14,6 +14,7 @@
 
 package com.google.api.generator.gapic.composer.rest;
 
+import com.google.api.HttpRule;
 import com.google.api.core.InternalApi;
 import com.google.api.gax.httpjson.ApiMethodDescriptor;
 import com.google.api.gax.httpjson.ApiMethodDescriptor.MethodType;
@@ -63,6 +64,7 @@
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.BiMap;
 import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
 import com.google.protobuf.TypeRegistry;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -73,10 +75,10 @@
 import java.util.Set;
 import java.util.function.BiFunction;
 import java.util.function.Function;
+import java.util.function.Predicate;
 import java.util.stream.Collectors;
 
 public class HttpJsonServiceStubClassComposer extends AbstractTransportServiceStubClassComposer {
-
   private static final HttpJsonServiceStubClassComposer INSTANCE =
       new HttpJsonServiceStubClassComposer();
 
@@ -89,6 +91,7 @@ public class HttpJsonServiceStubClassComposer extends AbstractTransportServiceSt
                   .setType(FIXED_REST_TYPESTORE.get(TypeRegistry.class.getSimpleName()))
                   .build())
           .build();
+  private static final String LRO_NAME_PREFIX = "google.longrunning.Operations";
 
   protected HttpJsonServiceStubClassComposer() {
     super(RestContext.instance());
@@ -109,7 +112,9 @@ private static TypeStore createStaticTypes() {
             HttpJsonCallSettings.class,
             HttpJsonOperationSnapshot.class,
             HttpJsonStubCallableFactory.class,
+            HttpRule.class,
             Map.class,
+            ImmutableMap.class,
             ProtoMessageRequestFormatter.class,
             ProtoMessageResponseParser.class,
             ProtoRestSerializer.class,
@@ -1075,6 +1080,7 @@ private List<Expr> getMethodTypeExpr(Method protoMethod) {
 
   @Override
   protected List<Expr> createOperationsStubInitExpr(
+      GapicContext context,
       Service service,
       Expr thisExpr,
       VariableExpr operationsStubClassVarExpr,
@@ -1089,6 +1095,47 @@ protected List<Expr> createOperationsStubInitExpr(
       arguments.add(TYPE_REGISTRY_VAR_EXPR);
     }
 
+    // If the Service contains custom HttpRules for Operations, we pass a map of the custom rules to
+    // the Operations Client
+    Map<String, HttpRule> operationCustomHttpRules = parseOperationsCustomHttpRules(context);
+    if (operationCustomHttpRules.size() > 0) {
+      Expr operationCustomHttpBindingsBuilderExpr =
+          MethodInvocationExpr.builder()
+              .setStaticReferenceType(FIXED_REST_TYPESTORE.get(ImmutableMap.class.getSimpleName()))
+              .setMethodName("builder")
+              .setGenerics(
+                  Arrays.asList(
+                      TypeNode.STRING.reference(),
+                      FIXED_REST_TYPESTORE.get(HttpRule.class.getSimpleName()).reference()))
+              .build();
+
+      // Sorting is done to ensure consistent ordering of the entries in the Custom HttpRule Map
+      for (String selector :
+          operationCustomHttpRules.keySet().stream().sorted().collect(Collectors.toList())) {
+        HttpRule httpRule = operationCustomHttpRules.get(selector);
+        Expr httpRuleBuilderExpr = createHttpRuleExpr(httpRule, true);
+
+        operationCustomHttpBindingsBuilderExpr =
+            MethodInvocationExpr.builder()
+                .setExprReferenceExpr(operationCustomHttpBindingsBuilderExpr)
+                .setMethodName("put")
+                .setArguments(
+                    Arrays.asList(
+                        ValueExpr.withValue(StringObjectValue.withValue(selector)),
+                        httpRuleBuilderExpr))
+                .build();
+      }
+
+      operationCustomHttpBindingsBuilderExpr =
+          MethodInvocationExpr.builder()
+              .setExprReferenceExpr(operationCustomHttpBindingsBuilderExpr)
+              .setMethodName("build")
+              .setReturnType(FIXED_REST_TYPESTORE.get(ImmutableMap.class.getSimpleName()))
+              .build();
+
+      arguments.add(operationCustomHttpBindingsBuilderExpr);
+    }
+
     return Collections.singletonList(
         AssignmentExpr.builder()
             .setVariableExpr(
@@ -1103,6 +1150,73 @@ protected List<Expr> createOperationsStubInitExpr(
             .build());
   }
 
+  /* Build an Expr that creates an HttpRule. Creates a builder and adds the http verb, custom path, and any additional bindings. `additional_bindings` can only be nested one layer deep, so we only check once */
+  private Expr createHttpRuleExpr(HttpRule httpRule, boolean checkAdditionalBindings) {
+    Expr httpRuleBuilderExpr =
+        MethodInvocationExpr.builder()
+            .setStaticReferenceType(FIXED_REST_TYPESTORE.get(HttpRule.class.getSimpleName()))
+            .setMethodName("newBuilder")
+            .build();
+
+    httpRuleBuilderExpr =
+        MethodInvocationExpr.builder()
+            .setExprReferenceExpr(httpRuleBuilderExpr)
+            // toLowerCase as the PatternCase result is all uppercase
+            .setMethodName(setMethodFormat(httpRule.getPatternCase().toString().toLowerCase()))
+            .setArguments(
+                ValueExpr.withValue(
+                    StringObjectValue.withValue(getOperationsURIValueFromHttpRule(httpRule))))
+            .setReturnType(FIXED_REST_TYPESTORE.get(HttpRule.class.getSimpleName()))
+            .build();
+
+    if (checkAdditionalBindings) {
+      for (HttpRule additionalBindings : httpRule.getAdditionalBindingsList()) {
+        httpRuleBuilderExpr =
+            MethodInvocationExpr.builder()
+                .setExprReferenceExpr(httpRuleBuilderExpr)
+                .setMethodName("addAdditionalBindings")
+                .setArguments(Arrays.asList(createHttpRuleExpr(additionalBindings, false)))
+                .build();
+      }
+    }
+
+    httpRuleBuilderExpr =
+        MethodInvocationExpr.builder()
+            .setExprReferenceExpr(httpRuleBuilderExpr)
+            .setMethodName("build")
+            .setReturnType(FIXED_REST_TYPESTORE.get(HttpRule.class.getSimpleName()))
+            .build();
+    return httpRuleBuilderExpr;
+  }
+
+  /* Parses the Service Yaml file's for custom HttpRules. Filter the HttpRules for ones that match Operations */
+  Map<String, HttpRule> parseOperationsCustomHttpRules(GapicContext context) {
+    Predicate<HttpRule> predicate = x -> x.getSelector().contains(LRO_NAME_PREFIX);
+    com.google.api.Service service = context.serviceYamlProto();
+    if (service == null || service.getHttp() == null) {
+      return ImmutableMap.of();
+    }
+    return service.getHttp().getRulesList().stream()
+        .filter(predicate)
+        .collect(Collectors.toMap(HttpRule::getSelector, x -> x));
+  }
+
+  /* This is meant to be used for the OperationsClient Mixin OperationsClient's RPCs are mapped to GET/POST/DELETE and this function only expects those HttpVerbs to be used */
+  String getOperationsURIValueFromHttpRule(HttpRule httpRule) {
+    switch (httpRule.getPatternCase().getNumber()) {
+      case 2:
+        return httpRule.getGet();
+      case 4:
+        return httpRule.getPost();
+      case 5:
+        return httpRule.getDelete();
+      default:
+        throw new IllegalArgumentException(
+            "Operations HttpRule should only contain GET/POST/DELETE. Invalid: "
+                + httpRule.getSelector());
+    }
+  }
+
   @Override
   protected List<Statement> createLongRunningClient(Service service, TypeStore typeStore) {
     Method pollingMethod = service.operationPollingMethod();
 
@@ -14,6 +14,7 @@
 
 package com.google.api.generator.gapic.composer.grpcrest;
 
+import static com.google.common.truth.Truth.assertThat;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
@@ -26,6 +27,7 @@
 import com.google.api.generator.gapic.model.Transport;
 import com.google.api.generator.gapic.protoparser.Parser;
 import com.google.api.generator.gapic.protoparser.ServiceConfigParser;
+import com.google.api.generator.gapic.protoparser.ServiceYamlParser;
 import com.google.longrunning.OperationsProto;
 import com.google.protobuf.Descriptors.FileDescriptor;
 import com.google.protobuf.Descriptors.ServiceDescriptor;
@@ -58,6 +60,13 @@ public GapicContext parseShowcaseEcho() {
     ServiceDescriptor echoServiceDescriptor = echoFileDescriptor.getServices().get(0);
     assertEquals("Echo", echoServiceDescriptor.getName());
 
+    String serviceYamlFileName = "echo_v1beta1.yaml";
+    Path serviceYamlPath = Paths.get(getTestFilesDirectory(), serviceYamlFileName);
+    Optional<com.google.api.Service> serviceYamlOpt =
+        ServiceYamlParser.parse(serviceYamlPath.toString());
+    assertThat(serviceYamlOpt.isPresent()).isTrue();
+    com.google.api.Service service = serviceYamlOpt.get();
+
     Map<String, Message> messageTypes = Parser.parseMessages(echoFileDescriptor);
     messageTypes.putAll(Parser.parseMessages(OperationsProto.getDescriptor()));
     messageTypes.putAll(Parser.parseMessages(StructProto.getDescriptor()));
@@ -66,7 +75,7 @@ public GapicContext parseShowcaseEcho() {
     Set<ResourceName> outputResourceNames = new HashSet<>();
     List<Service> services =
         Parser.parseService(
-            echoFileDescriptor, messageTypes, resourceNames, Optional.empty(), outputResourceNames);
+            echoFileDescriptor, messageTypes, resourceNames, serviceYamlOpt, outputResourceNames);
 
     String jsonFilename = "showcase_grpc_service_config.json";
     Path jsonPath = Paths.get(getTestFilesDirectory(), jsonFilename);
@@ -79,6 +88,7 @@ public GapicContext parseShowcaseEcho() {
         .setResourceNames(resourceNames)
         .setServices(services)
         .setServiceConfig(config)
+        .setServiceYamlProto(service)
         .setHelperResourceNames(outputResourceNames)
         .setTransport(getTransport())
         .build();
 
@@ -3,6 +3,7 @@ package com.google.showcase.grpcrest.v1beta1.stub;
 import static com.google.showcase.grpcrest.v1beta1.EchoClient.PagedExpandPagedResponse;
 import static com.google.showcase.grpcrest.v1beta1.EchoClient.SimplePagedExpandPagedResponse;
 
+import com.google.api.HttpRule;
 import com.google.api.core.BetaApi;
 import com.google.api.core.InternalApi;
 import com.google.api.gax.core.BackgroundResource;
@@ -21,6 +22,7 @@ import com.google.api.gax.rpc.ClientContext;
 import com.google.api.gax.rpc.OperationCallable;
 import com.google.api.gax.rpc.ServerStreamingCallable;
 import com.google.api.gax.rpc.UnaryCallable;
+import com.google.common.collect.ImmutableMap;
 import com.google.longrunning.Operation;
 import com.google.protobuf.TypeRegistry;
 import com.google.showcase.grpcrest.v1beta1.BlockRequest;
@@ -382,7 +384,56 @@ public class HttpJsonEchoStub extends EchoStub {
       throws IOException {
     this.callableFactory = callableFactory;
     this.httpJsonOperationsStub =
-        HttpJsonOperationsStub.create(clientContext, callableFactory, typeRegistry);
+        HttpJsonOperationsStub.create(
+            clientContext,
+            callableFactory,
+            typeRegistry,
+            ImmutableMap.<String, HttpRule>builder()
+                .put(
+                    "google.longrunning.Operations.CancelOperation",
+                    HttpRule.newBuilder()
+                        .setPost("/v1beta1/{name=operations/**}:cancel")
+                        .addAdditionalBindings(
+                            HttpRule.newBuilder()
+                                .setPost("/v1beta2/{name=operations/**}:cancel")
+                                .build())
+                        .addAdditionalBindings(
+                            HttpRule.newBuilder()
+                                .setPost("/v1beta3/{name=operations/**}:cancel")
+                                .build())
+                        .build())
+                .put(
+                    "google.longrunning.Operations.DeleteOperation",
+                    HttpRule.newBuilder()
+                        .setDelete("/v1beta1/{name=operations/**}")
+                        .addAdditionalBindings(
+                            HttpRule.newBuilder()
+                                .setDelete("/v1beta2/{name=operations/**}")
+                                .build())
+                        .addAdditionalBindings(
+                            HttpRule.newBuilder()
+                                .setDelete("/v1beta3/{name=operations/**}")
+                                .build())
+                        .build())
+                .put(
+                    "google.longrunning.Operations.GetOperation",
+                    HttpRule.newBuilder()
+                        .setGet("/v1beta1/{name=operations/**}")
+                        .addAdditionalBindings(
+                            HttpRule.newBuilder().setGet("/v1beta2/{name=operations/**}").build())
+                        .addAdditionalBindings(
+                            HttpRule.newBuilder().setGet("/v1beta3/{name=operations/**}").build())
+                        .build())
+                .put(
+                    "google.longrunning.Operations.ListOperations",
+                    HttpRule.newBuilder()
+                        .setGet("/v1beta1/operations")
+                        .addAdditionalBindings(
+                            HttpRule.newBuilder().setGet("/v1beta2/operations").build())
+                        .addAdditionalBindings(
+                            HttpRule.newBuilder().setGet("/v1beta3/operations").build())
+                        .build())
+                .build());
 
     HttpJsonCallSettings<EchoRequest, EchoResponse> echoTransportSettings =
         HttpJsonCallSettings.<EchoRequest, EchoResponse>newBuilder()
-Original file line number
+Diff line change
     ```sh
     mvn fmt:format
 -    ```
 +    ```