fix: Use bindings for resolving multi pattern resources

gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/defaultvalue/DefaultValueComposer.java

@@ -102,23 +102,25 @@ public static Expr createMethodArgValue(
     }
 
     if (methodArg.type().equals(methodArg.field().type())) {
-      return createValue(methodArg.field(), false, resourceNames, messageTypes, valuePatterns);
+      return createValue(
+          methodArg.field(), false, resourceNames, messageTypes, valuePatterns, bindings);
     }
 
     return createValue(Field.builder().setName(methodArg.name()).setType(methodArg.type()).build());
   }
 
   public static Expr createValue(Field field) {
     return createValue(
-        field, false, Collections.emptyMap(), Collections.emptyMap(), Collections.emptyMap());
+        field, false, Collections.emptyMap(), Collections.emptyMap(), Collections.emptyMap(), null);
   }
 
   public static Expr createValue(
       Field field,
       boolean useExplicitInitTypeInGenerics,
       Map<String, ResourceName> resourceNames,
       Map<String, Message> messageTypes,
-      Map<String, String> valuePatterns) {
+      Map<String, String> valuePatterns,
+      HttpBindings bindings) {
     if (field.isRepeated()) {
       ConcreteReference.Builder refBuilder =
           ConcreteReference.builder().setClazz(field.isMap() ? HashMap.class : ArrayList.class);
@@ -161,7 +163,7 @@ public static Expr createValue(
         Message nestedMessage = messageTypes.get(field.type().reference().fullName());
         if (nestedMessage != null) {
           return createSimpleMessageBuilderValue(
-              nestedMessage, resourceNames, messageTypes, nestedValuePatterns, null);
+              nestedMessage, resourceNames, messageTypes, nestedValuePatterns, bindings);
         }
       }
 
@@ -274,7 +276,7 @@ static Expr createResourceHelperValue(
         if (!resname.isOnlyWildcard()
             && (bindings == null || resname.getMatchingPattern(bindings) != null)) {
           return createResourceHelperValue(
-              resname, false, unexaminedResnames, fieldOrMessageName, null);
+              resname, false, unexaminedResnames, fieldOrMessageName, bindings);
         }
       }
 
@@ -420,7 +422,8 @@ public static Expr createSimpleMessageBuilderValue(
         }
 
         if (defaultExpr == null) {
-          defaultExpr = createValue(field, true, resourceNames, messageTypes, valuePatterns);
+          defaultExpr =
+              createValue(field, true, resourceNames, messageTypes, valuePatterns, bindings);
         }
       }
       builderExpr =

gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/defaultvalue/DefaultValueComposerTest.java

@@ -27,10 +27,12 @@
 import com.google.api.generator.gapic.model.ResourceName;
 import com.google.api.generator.gapic.protoparser.Parser;
 import com.google.api.generator.test.utils.LineFormatter;
+import com.google.common.collect.ImmutableList;
 import com.google.protobuf.ByteString;
 import com.google.protobuf.Descriptors.FileDescriptor;
 import com.google.protobuf.StructProto;
 import com.google.showcase.v1beta1.EchoOuterClass;
+import com.google.showcase.v1beta1.MessagingOuterClass;
 import com.google.testgapic.v1beta1.LockerProto;
 import java.util.Arrays;
 import java.util.Collections;
@@ -174,7 +176,7 @@ public void defaultValue_resourceNameWithOnePattern() {
   }
 
   @Test
-  public void defaultValue_resourceNameWithMultiplePatterns() {
+  public void defaultValue_resourceNameWithMultiplePatterns_noBindings() {
     FileDescriptor lockerServiceFileDescriptor = LockerProto.getDescriptor();
     Map<String, ResourceName> typeStringsToResourceNames =
         Parser.parseResourceNames(lockerServiceFileDescriptor);
@@ -188,10 +190,45 @@ public void defaultValue_resourceNameWithMultiplePatterns() {
             "ignored",
             null);
     expr.accept(writerVisitor);
+    /*
+    There are two patterns:
+      - pattern: "projects/{project}/folders/{folder}"
+      - pattern: "folders/{folder}"
+      It matches the first one given no bindings
+    */
     assertEquals(
         "FolderName.ofProjectFolderName(\"[PROJECT]\", \"[FOLDER]\")", writerVisitor.write());
   }
 
+  @Test
+  public void defaultValue_resourceNameWithMultiplePatterns_matchesBindings() {
+    FileDescriptor lockerServiceFileDescriptor = LockerProto.getDescriptor();
+    Map<String, ResourceName> typeStringsToResourceNames =
+        Parser.parseResourceNames(lockerServiceFileDescriptor);
+    ResourceName resourceName =
+        typeStringsToResourceNames.get("cloudresourcemanager.googleapis.com/Folder");
+    Expr expr =
+        DefaultValueComposer.createResourceHelperValue(
+            resourceName,
+            false,
+            typeStringsToResourceNames.values().stream().collect(Collectors.toList()),
+            "folder",
+            HttpBindings.builder()
+                .setHttpVerb(HttpVerb.POST)
+                .setPattern("/v1/{name=folders/*}")
+                .setAdditionalPatterns(ImmutableList.of())
+                .setIsAsteriskBody(true)
+                .build());
+    expr.accept(writerVisitor);
+    /*
+    There are two patterns:
+      - pattern: "projects/{project}/folders/{folder}"
+      - pattern: "folders/{folder}"
+      It attempts to match the correct HttpBinding
+    */
+    assertEquals("FolderName.ofFolderName(\"[FOLDER]\")", writerVisitor.write());
+  }
+
   @Test
   public void defaultValue_resourceNameWithWildcardPattern() {
     FileDescriptor lockerServiceFileDescriptor = LockerProto.getDescriptor();
@@ -374,6 +411,131 @@ public void defaultValue_resourceNameWithOnlyWildcards_allowAnonResourceNameClas
     assertEquals(expected, writerVisitor.write());
   }
 
+  @Test
+  public void createSimpleMessageBuilderValue_resourceNameMultiplePatterns_matchesHttpBinding() {
+    FileDescriptor messagingFileDescriptor = MessagingOuterClass.getDescriptor();
+    Map<String, Message> messageTypes = Parser.parseMessages(messagingFileDescriptor);
+    Map<String, ResourceName> typeStringsToResourceNames =
+        Parser.parseResourceNames(messagingFileDescriptor);
+    /*
+    Blurb Resource contains four patterns (in order of):
+      - pattern: "users/{user}/profile/blurbs/legacy/{legacy_user}~{blurb}"
+      - pattern: "users/{user}/profile/blurbs/{blurb}"
+      - pattern: "rooms/{room}/blurbs/{blurb}"
+      - pattern: "rooms/{room}/blurbs/legacy/{legacy_room}.{blurb}"
+    */
+    Message message = messageTypes.get("com.google.showcase.v1beta1.Blurb");
+
+    HttpBindings bindings =
+        HttpBindings.builder()
+            .setHttpVerb(HttpVerb.PATCH)
+            .setPattern("/v1beta1/{blurb.name=rooms/*/blurbs/*}")
+            .setAdditionalPatterns(
+                Collections.singletonList("/v1beta1/{blurb.name=users/*/profile/blurbs/*}"))
+            .setIsAsteriskBody(false)
+            .build();
+
+    Expr expr =
+        DefaultValueComposer.createSimpleMessageBuilderValue(
+            message, typeStringsToResourceNames, messageTypes, bindings);
+    expr.accept(writerVisitor);
+    // Matches with the default pattern in the HttpBindings and uses the variables in the pattern
+    assertEquals(
+        "Blurb.newBuilder().setName(BlurbName.ofRoomBlurbName(\"[ROOM]\", \"[BLURB]\").toString()).build()",
+        writerVisitor.write());
+  }
+
+  @Test
+  public void
+      createSimpleMessageBuilderValue_resourceNameMultiplePatterns_matchesAdditionalHttpBinding() {
+    FileDescriptor messagingFileDescriptor = MessagingOuterClass.getDescriptor();
+    Map<String, Message> messageTypes = Parser.parseMessages(messagingFileDescriptor);
+    Map<String, ResourceName> typeStringsToResourceNames =
+        Parser.parseResourceNames(messagingFileDescriptor);
+    /*
+    Blurb Resource contains four patterns (in order of):
+      - pattern: "users/{user}/profile/blurbs/legacy/{legacy_user}~{blurb}"
+      - pattern: "users/{user}/profile/blurbs/{blurb}"
+      - pattern: "rooms/{room}/blurbs/{blurb}"
+      - pattern: "rooms/{room}/blurbs/legacy/{legacy_room}.{blurb}"
+    */
+    Message message = messageTypes.get("com.google.showcase.v1beta1.Blurb");
+
+    HttpBindings bindings =
+        HttpBindings.builder()
+            .setHttpVerb(HttpVerb.PATCH)
+            .setPattern("/v1beta1/{blurb.name=invalid/pattern/*}")
+            .setAdditionalPatterns(
+                Collections.singletonList("/v1beta1/{blurb.name=users/*/profile/blurbs/*}"))
+            .setIsAsteriskBody(false)
+            .build();
+
+    Expr expr =
+        DefaultValueComposer.createSimpleMessageBuilderValue(
+            message, typeStringsToResourceNames, messageTypes, bindings);
+    expr.accept(writerVisitor);
+    // Because the default pattern does not match, it will attempt to match with patterns in the
+    // additional bindings and use variables for any pattern that matches
+    assertEquals(
+        "Blurb.newBuilder().setName(BlurbName.ofUserBlurbName(\"[USER]\", \"[BLURB]\").toString()).build()",
+        writerVisitor.write());
+  }
+
+  @Test
+  public void
+      createSimpleMessageBuilderValue_resourceNameMultiplePatterns_doesNotMatchHttpBinding() {
+    FileDescriptor messagingFileDescriptor = MessagingOuterClass.getDescriptor();
+    Map<String, Message> messageTypes = Parser.parseMessages(messagingFileDescriptor);
+    Map<String, ResourceName> typeStringsToResourceNames =
+        Parser.parseResourceNames(messagingFileDescriptor);
+    /*
+    Blurb Resource contains four patterns (in order of):
+      - pattern: "users/{user}/profile/blurbs/legacy/{legacy_user}~{blurb}"
+      - pattern: "users/{user}/profile/blurbs/{blurb}"
+      - pattern: "rooms/{room}/blurbs/{blurb}"
+      - pattern: "rooms/{room}/blurbs/legacy/{legacy_room}.{blurb}"
+    */
+    Message message = messageTypes.get("com.google.showcase.v1beta1.Blurb");
+
+    HttpBindings bindings =
+        HttpBindings.builder()
+            .setHttpVerb(HttpVerb.PATCH)
+            .setPattern("/v1beta1/{blurb.name=invalid/pattern/*}")
+            .setAdditionalPatterns(
+                Collections.singletonList("/v1beta1/{blurb.name=nothing/matches/*}"))
+            .setIsAsteriskBody(false)
+            .build();
+
+    Expr expr =
+        DefaultValueComposer.createSimpleMessageBuilderValue(
+            message, typeStringsToResourceNames, messageTypes, bindings);
+    expr.accept(writerVisitor);
+    // If no pattern matches (default and additional bindings), it will simply pick the first
+    // resource pattern in the resource definition.
+    assertEquals(
+        "Blurb.newBuilder().setName(BlurbName.ofUserLegacyUserBlurbName(\"[USER]\", \"[LEGACY_USER]\", \"[BLURB]\").toString()).build()",
+        writerVisitor.write());
+  }
+
+  @Test
+  public void defaultValue_resourceNameMultiplePatterns_noHttpBinding() {
+    FileDescriptor messagingFileDescriptor = MessagingOuterClass.getDescriptor();
+    Map<String, Message> messageTypes = Parser.parseMessages(messagingFileDescriptor);
+    Map<String, ResourceName> typeStringsToResourceNames =
+        Parser.parseResourceNames(messagingFileDescriptor);
+    Message message = messageTypes.get("com.google.showcase.v1beta1.Blurb");
+
+    Expr expr =
+        DefaultValueComposer.createSimpleMessageBuilderValue(
+            message, typeStringsToResourceNames, messageTypes, null);
+    expr.accept(writerVisitor);
+    // If no pattern matches (default and additional bindings), it will simply pick the first
+    // resource pattern in the resource definition.
+    assertEquals(
+        "Blurb.newBuilder().setName(BlurbName.ofUserLegacyUserBlurbName(\"[USER]\", \"[LEGACY_USER]\", \"[BLURB]\").toString()).build()",
+        writerVisitor.write());
+  }
+
   @Test
   public void createSimpleMessage_basicPrimitivesOnly() {
     FileDescriptor echoFileDescriptor = EchoOuterClass.getDescriptor();

showcase/gapic-showcase/samples/snippets/generated/src/main/java/com/google/showcase/v1beta1/compliance/getiampolicy/AsyncGetIamPolicy.java

@@ -39,9 +39,7 @@ public static void asyncGetIamPolicy() throws Exception {
     try (ComplianceClient complianceClient = ComplianceClient.create()) {
       GetIamPolicyRequest request =
           GetIamPolicyRequest.newBuilder()
-              .setResource(
-                  BlurbName.ofUserLegacyUserBlurbName("[USER]", "[LEGACY_USER]", "[BLURB]")
-                      .toString())
+              .setResource(BlurbName.ofRoomBlurbName("[ROOM]", "[BLURB]").toString())
               .setOptions(GetPolicyOptions.newBuilder().build())
               .build();
       ApiFuture<Policy> future = complianceClient.getIamPolicyCallable().futureCall(request);

showcase/gapic-showcase/samples/snippets/generated/src/main/java/com/google/showcase/v1beta1/compliance/getiampolicy/SyncGetIamPolicy.java

@@ -38,9 +38,7 @@ public static void syncGetIamPolicy() throws Exception {
     try (ComplianceClient complianceClient = ComplianceClient.create()) {
       GetIamPolicyRequest request =
           GetIamPolicyRequest.newBuilder()
-              .setResource(
-                  BlurbName.ofUserLegacyUserBlurbName("[USER]", "[LEGACY_USER]", "[BLURB]")
-                      .toString())
+              .setResource(BlurbName.ofRoomBlurbName("[ROOM]", "[BLURB]").toString())
               .setOptions(GetPolicyOptions.newBuilder().build())
               .build();
       Policy response = complianceClient.getIamPolicy(request);

showcase/gapic-showcase/samples/snippets/generated/src/main/java/com/google/showcase/v1beta1/compliance/setiampolicy/AsyncSetIamPolicy.java

@@ -39,9 +39,7 @@ public static void asyncSetIamPolicy() throws Exception {
     try (ComplianceClient complianceClient = ComplianceClient.create()) {
       SetIamPolicyRequest request =
           SetIamPolicyRequest.newBuilder()
-              .setResource(
-                  BlurbName.ofUserLegacyUserBlurbName("[USER]", "[LEGACY_USER]", "[BLURB]")
-                      .toString())
+              .setResource(BlurbName.ofRoomBlurbName("[ROOM]", "[BLURB]").toString())
               .setPolicy(Policy.newBuilder().build())
               .setUpdateMask(FieldMask.newBuilder().build())
               .build();

showcase/gapic-showcase/samples/snippets/generated/src/main/java/com/google/showcase/v1beta1/compliance/setiampolicy/SyncSetIamPolicy.java

@@ -38,9 +38,7 @@ public static void syncSetIamPolicy() throws Exception {
     try (ComplianceClient complianceClient = ComplianceClient.create()) {
       SetIamPolicyRequest request =
           SetIamPolicyRequest.newBuilder()
-              .setResource(
-                  BlurbName.ofUserLegacyUserBlurbName("[USER]", "[LEGACY_USER]", "[BLURB]")
-                      .toString())
+              .setResource(BlurbName.ofRoomBlurbName("[ROOM]", "[BLURB]").toString())
               .setPolicy(Policy.newBuilder().build())
               .setUpdateMask(FieldMask.newBuilder().build())
               .build();

showcase/gapic-showcase/samples/snippets/generated/src/main/java/com/google/showcase/v1beta1/compliance/testiampermissions/AsyncTestIamPermissions.java

@@ -39,9 +39,7 @@ public static void asyncTestIamPermissions() throws Exception {
     try (ComplianceClient complianceClient = ComplianceClient.create()) {
       TestIamPermissionsRequest request =
           TestIamPermissionsRequest.newBuilder()
-              .setResource(
-                  BlurbName.ofUserLegacyUserBlurbName("[USER]", "[LEGACY_USER]", "[BLURB]")
-                      .toString())
+              .setResource(BlurbName.ofRoomBlurbName("[ROOM]", "[BLURB]").toString())
               .addAllPermissions(new ArrayList<String>())
               .build();
       ApiFuture<TestIamPermissionsResponse> future =

showcase/gapic-showcase/samples/snippets/generated/src/main/java/com/google/showcase/v1beta1/compliance/testiampermissions/SyncTestIamPermissions.java

@@ -38,9 +38,7 @@ public static void syncTestIamPermissions() throws Exception {
     try (ComplianceClient complianceClient = ComplianceClient.create()) {
       TestIamPermissionsRequest request =
           TestIamPermissionsRequest.newBuilder()
-              .setResource(
-                  BlurbName.ofUserLegacyUserBlurbName("[USER]", "[LEGACY_USER]", "[BLURB]")
-                      .toString())
+              .setResource(BlurbName.ofRoomBlurbName("[ROOM]", "[BLURB]").toString())
               .addAllPermissions(new ArrayList<String>())
               .build();
       TestIamPermissionsResponse response = complianceClient.testIamPermissions(request);

showcase/gapic-showcase/samples/snippets/generated/src/main/java/com/google/showcase/v1beta1/echo/getiampolicy/AsyncGetIamPolicy.java

@@ -39,9 +39,7 @@ public static void asyncGetIamPolicy() throws Exception {
     try (EchoClient echoClient = EchoClient.create()) {
       GetIamPolicyRequest request =
           GetIamPolicyRequest.newBuilder()
-              .setResource(
-                  BlurbName.ofUserLegacyUserBlurbName("[USER]", "[LEGACY_USER]", "[BLURB]")
-                      .toString())
+              .setResource(BlurbName.ofRoomBlurbName("[ROOM]", "[BLURB]").toString())
               .setOptions(GetPolicyOptions.newBuilder().build())
               .build();
       ApiFuture<Policy> future = echoClient.getIamPolicyCallable().futureCall(request);

showcase/gapic-showcase/samples/snippets/generated/src/main/java/com/google/showcase/v1beta1/echo/getiampolicy/SyncGetIamPolicy.java

@@ -38,9 +38,7 @@ public static void syncGetIamPolicy() throws Exception {
     try (EchoClient echoClient = EchoClient.create()) {
       GetIamPolicyRequest request =
           GetIamPolicyRequest.newBuilder()
-              .setResource(
-                  BlurbName.ofUserLegacyUserBlurbName("[USER]", "[LEGACY_USER]", "[BLURB]")
-                      .toString())
+              .setResource(BlurbName.ofRoomBlurbName("[ROOM]", "[BLURB]").toString())
               .setOptions(GetPolicyOptions.newBuilder().build())
               .build();
       Policy response = echoClient.getIamPolicy(request);

showcase/gapic-showcase/samples/snippets/generated/src/main/java/com/google/showcase/v1beta1/echo/setiampolicy/AsyncSetIamPolicy.java

@@ -39,9 +39,7 @@ public static void asyncSetIamPolicy() throws Exception {
     try (EchoClient echoClient = EchoClient.create()) {
       SetIamPolicyRequest request =
           SetIamPolicyRequest.newBuilder()
-              .setResource(
-                  BlurbName.ofUserLegacyUserBlurbName("[USER]", "[LEGACY_USER]", "[BLURB]")
-                      .toString())
+              .setResource(BlurbName.ofRoomBlurbName("[ROOM]", "[BLURB]").toString())
               .setPolicy(Policy.newBuilder().build())
               .setUpdateMask(FieldMask.newBuilder().build())
               .build();

showcase/gapic-showcase/samples/snippets/generated/src/main/java/com/google/showcase/v1beta1/echo/setiampolicy/SyncSetIamPolicy.java

@@ -38,9 +38,7 @@ public static void syncSetIamPolicy() throws Exception {
     try (EchoClient echoClient = EchoClient.create()) {
       SetIamPolicyRequest request =
           SetIamPolicyRequest.newBuilder()
-              .setResource(
-                  BlurbName.ofUserLegacyUserBlurbName("[USER]", "[LEGACY_USER]", "[BLURB]")
-                      .toString())
+              .setResource(BlurbName.ofRoomBlurbName("[ROOM]", "[BLURB]").toString())
               .setPolicy(Policy.newBuilder().build())
               .setUpdateMask(FieldMask.newBuilder().build())
               .build();

showcase/gapic-showcase/samples/snippets/generated/src/main/java/com/google/showcase/v1beta1/echo/testiampermissions/AsyncTestIamPermissions.java

@@ -39,9 +39,7 @@ public static void asyncTestIamPermissions() throws Exception {
     try (EchoClient echoClient = EchoClient.create()) {
       TestIamPermissionsRequest request =
           TestIamPermissionsRequest.newBuilder()
-              .setResource(
-                  BlurbName.ofUserLegacyUserBlurbName("[USER]", "[LEGACY_USER]", "[BLURB]")
-                      .toString())
+              .setResource(BlurbName.ofRoomBlurbName("[ROOM]", "[BLURB]").toString())
               .addAllPermissions(new ArrayList<String>())
               .build();
       ApiFuture<TestIamPermissionsResponse> future =

showcase/gapic-showcase/samples/snippets/generated/src/main/java/com/google/showcase/v1beta1/echo/testiampermissions/SyncTestIamPermissions.java

@@ -38,9 +38,7 @@ public static void syncTestIamPermissions() throws Exception {
     try (EchoClient echoClient = EchoClient.create()) {
       TestIamPermissionsRequest request =
           TestIamPermissionsRequest.newBuilder()
-              .setResource(
-                  BlurbName.ofUserLegacyUserBlurbName("[USER]", "[LEGACY_USER]", "[BLURB]")
-                      .toString())
+              .setResource(BlurbName.ofRoomBlurbName("[ROOM]", "[BLURB]").toString())
               .addAllPermissions(new ArrayList<String>())
               .build();
       TestIamPermissionsResponse response = echoClient.testIamPermissions(request);

showcase/gapic-showcase/samples/snippets/generated/src/main/java/com/google/showcase/v1beta1/identity/getiampolicy/AsyncGetIamPolicy.java

@@ -39,9 +39,7 @@ public static void asyncGetIamPolicy() throws Exception {
     try (IdentityClient identityClient = IdentityClient.create()) {
       GetIamPolicyRequest request =
           GetIamPolicyRequest.newBuilder()
-              .setResource(
-                  BlurbName.ofUserLegacyUserBlurbName("[USER]", "[LEGACY_USER]", "[BLURB]")
-                      .toString())
+              .setResource(BlurbName.ofRoomBlurbName("[ROOM]", "[BLURB]").toString())
               .setOptions(GetPolicyOptions.newBuilder().build())
               .build();
       ApiFuture<Policy> future = identityClient.getIamPolicyCallable().futureCall(request);