fix(generator): use json_name when available

sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/rest/HttpJsonServiceStubClassComposer.java

@@ -827,7 +827,7 @@
         .build();
   }
 
   private Expr createFieldsExtractorClassInstance(
       Method method,
       TypeNode extractorReturnType,
       Set<HttpBinding> httpBindingFieldNames,
@@ -926,7 +926,9 @@
       paramsPutArgs.add(
           ValueExpr.withValue(
               StringObjectValue.withValue(
-                  JavaStyle.toLowerCamelCase(httpBindingFieldName.name()))));
+                  (httpBindingFieldName.jsonName() != null)
+                      ? httpBindingFieldName.jsonName()
+                      : JavaStyle.toLowerCamelCase(httpBindingFieldName.name()))));
       paramsPutArgs.add(requestBuilderExpr);
 
       Expr paramsPutExpr =

sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/model/Field.java

@@ -31,6 +31,9 @@ public abstract class Field {
   // resolution behavior. For more context, please see the invocation site of the setter method.
   public abstract String originalName();
 
+  @Nullable
+  public abstract String jsonName();
+
   public abstract TypeNode type();
 
   // If the field is annotated with google.api.field_behavior = REQUIRED, then this is true. This is
@@ -92,6 +95,7 @@ public boolean equals(Object o) {
     Field other = (Field) o;
     return name().equals(other.name())
         && originalName().equals(other.originalName())
+        && Objects.equals(jsonName(), other.jsonName())
         && type().equals(other.type())
         && isRequired() == other.isRequired()
         && fieldInfoFormat() == other.fieldInfoFormat()
@@ -109,6 +113,7 @@ && isProto3Optional() == other.isProto3Optional()
   public int hashCode() {
     return 17 * name().hashCode()
         + 31 * originalName().hashCode()
+        + (jsonName() == null ? 0 : jsonName().hashCode())
         + 19 * type().hashCode()
         + (isMessage() ? 1 : 0) * 23
         + (isEnum() ? 1 : 0) * 29
@@ -141,6 +146,8 @@ public abstract static class Builder {
 
     public abstract Builder setOriginalName(String originalName);
 
+    public abstract Builder setJsonName(String jsonName);
+
     public abstract Builder setType(TypeNode type);
 
     public abstract Builder setIsRequired(boolean isRequired);

sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/model/HttpBindings.java

@@ -42,6 +42,11 @@ public abstract static class HttpBinding implements Comparable<HttpBinding> {
 
     abstract String lowerCamelName();
 
+    // The dot-separated json_name of the field.
+    // e.g. parent.iceberg-catalog-id
+    @Nullable
+    public abstract String jsonName();
+
     // An object that contains all info of the leaf level field
     @Nullable
     public abstract Field field();
@@ -70,6 +75,8 @@ public abstract static class Builder {
 
       public abstract HttpBindings.HttpBinding.Builder setName(String name);
 
+      public abstract HttpBindings.HttpBinding.Builder setJsonName(String jsonName);
+
       public abstract HttpBindings.HttpBinding.Builder setField(Field field);
 
       abstract HttpBindings.HttpBinding.Builder setLowerCamelName(String lowerCamelName);

sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/protoparser/HttpRuleParser.java

@@ -21,6 +21,7 @@
 import com.google.api.generator.gapic.model.HttpBindings;
 import com.google.api.generator.gapic.model.HttpBindings.HttpBinding;
 import com.google.api.generator.gapic.model.Message;
+import com.google.api.generator.gapic.utils.JavaStyle;
 import com.google.api.pathtemplate.PathTemplate;
 import com.google.common.base.Preconditions;
 import com.google.common.base.Strings;
@@ -29,8 +30,10 @@
 import com.google.common.collect.Sets;
 import com.google.protobuf.DescriptorProtos.MethodOptions;
 import com.google.protobuf.Descriptors.MethodDescriptor;
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 import java.util.Set;
@@ -126,7 +129,7 @@
         .build();
   }
 
   private static Set<HttpBinding> validateAndConstructHttpBindings(
       Set<String> paramNames,
       Message inputMessage,
       Map<String, Message> messageTypes,
@@ -144,10 +147,24 @@
         continue;
       }
       Message nestedMessage = inputMessage;
+      List<String> jsonNameParts = new ArrayList<>();
       for (int i = 0; i < subFields.length; i++) {
         String subFieldName = subFields[i];
+        Field field = nestedMessage.fieldMap().get(subFieldName);
+        Preconditions.checkState(
+            field != null,
+            "Expected message %s to contain field %s but none found",
+            nestedMessage.name(),
+            subFieldName);
+
+        // Each component of the JSON name uses the json_name annotation of the field,
+        // or default to the field name
+        jsonNameParts.add(
+            !Strings.isNullOrEmpty(field.jsonName())
+                ? field.jsonName()
+                : JavaStyle.toLowerCamelCase(field.name()));
+
         if (i < subFields.length - 1) {
-          Field field = nestedMessage.fieldMap().get(subFieldName);
           nestedMessage = messageTypes.get(field.type().reference().fullName());
           Preconditions.checkNotNull(
               nestedMessage,
@@ -160,9 +177,12 @@
             checkHttpFieldIsValid(subFieldName, nestedMessage, false);
             patternSampleValue = patternSampleValues.get(paramName);
           }
-          Field field = nestedMessage.fieldMap().get(subFieldName);
           httpBindings.add(
-              httpBindingBuilder.setValuePattern(patternSampleValue).setField(field).build());
+              httpBindingBuilder
+                  .setValuePattern(patternSampleValue)
+                  .setField(field)
+                  .setJsonName(String.join(".", jsonNameParts))
+                  .build());
         }
       }
     }

sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/protoparser/Parser.java

@@ -1181,6 +1181,7 @@ private static Field parseField(
     return fieldBuilder
         .setName(actualFieldName)
         .setOriginalName(fieldDescriptor.getName())
+        .setJsonName(fieldDescriptor.getJsonName())
         .setType(TypeParser.parseType(fieldDescriptor))
         .setIsMessage(fieldDescriptor.getJavaType() == FieldDescriptor.JavaType.MESSAGE)
         .setIsEnum(fieldDescriptor.getJavaType() == FieldDescriptor.JavaType.ENUM)

sdk-platform-java/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/rest/goldens/ComplianceClientTest.golden

@@ -66,6 +66,7 @@ public class ComplianceClientTest {
             .setName("name3373707")
             .setInfo(ComplianceData.newBuilder().build())
             .setServerVerify(true)
+            .setCustomKebabName("customKebabName-2062111197")
             .build();
 
     RepeatResponse actualResponse = client.repeatDataBody(request);
@@ -99,6 +100,7 @@ public class ComplianceClientTest {
               .setName("name3373707")
               .setInfo(ComplianceData.newBuilder().build())
               .setServerVerify(true)
+              .setCustomKebabName("customKebabName-2062111197")
               .build();
       client.repeatDataBody(request);
       Assert.fail("No exception raised");
@@ -118,6 +120,7 @@ public class ComplianceClientTest {
             .setName("name3373707")
             .setInfo(ComplianceData.newBuilder().build())
             .setServerVerify(true)
+            .setCustomKebabName("customKebabName-2062111197")
             .build();
 
     RepeatResponse actualResponse = client.repeatDataBodyInfo(request);
@@ -151,6 +154,7 @@ public class ComplianceClientTest {
               .setName("name3373707")
               .setInfo(ComplianceData.newBuilder().build())
               .setServerVerify(true)
+              .setCustomKebabName("customKebabName-2062111197")
               .build();
       client.repeatDataBodyInfo(request);
       Assert.fail("No exception raised");
@@ -170,6 +174,7 @@ public class ComplianceClientTest {
             .setName("name3373707")
             .setInfo(ComplianceData.newBuilder().build())
             .setServerVerify(true)
+            .setCustomKebabName("customKebabName-2062111197")
             .build();
 
     RepeatResponse actualResponse = client.repeatDataQuery(request);
@@ -203,6 +208,7 @@ public class ComplianceClientTest {
               .setName("name3373707")
               .setInfo(ComplianceData.newBuilder().build())
               .setServerVerify(true)
+              .setCustomKebabName("customKebabName-2062111197")
               .build();
       client.repeatDataQuery(request);
       Assert.fail("No exception raised");
@@ -245,6 +251,7 @@ public class ComplianceClientTest {
                     .setPChild(ComplianceDataChild.newBuilder().build())
                     .build())
             .setServerVerify(true)
+            .setCustomKebabName("customKebabName-2062111197")
             .build();
 
     RepeatResponse actualResponse = client.repeatDataSimplePath(request);
@@ -301,6 +308,7 @@ public class ComplianceClientTest {
                       .setPChild(ComplianceDataChild.newBuilder().build())
                       .build())
               .setServerVerify(true)
+              .setCustomKebabName("customKebabName-2062111197")
               .build();
       client.repeatDataSimplePath(request);
       Assert.fail("No exception raised");
@@ -357,6 +365,7 @@ public class ComplianceClientTest {
                     .setPChild(ComplianceDataChild.newBuilder().build())
                     .build())
             .setServerVerify(true)
+            .setCustomKebabName("customKebabName-2062111197")
             .build();
 
     RepeatResponse actualResponse = client.repeatDataPathResource(request);
@@ -427,6 +436,7 @@ public class ComplianceClientTest {
                       .setPChild(ComplianceDataChild.newBuilder().build())
                       .build())
               .setServerVerify(true)
+              .setCustomKebabName("customKebabName-2062111197")
               .build();
       client.repeatDataPathResource(request);
       Assert.fail("No exception raised");
@@ -483,6 +493,7 @@ public class ComplianceClientTest {
                     .setPChild(ComplianceDataChild.newBuilder().build())
                     .build())
             .setServerVerify(true)
+            .setCustomKebabName("customKebabName-2062111197")
             .build();
 
     RepeatResponse actualResponse = client.repeatDataPathTrailingResource(request);
@@ -553,6 +564,7 @@ public class ComplianceClientTest {
                       .setPChild(ComplianceDataChild.newBuilder().build())
                       .build())
               .setServerVerify(true)
+              .setCustomKebabName("customKebabName-2062111197")
               .build();
       client.repeatDataPathTrailingResource(request);
       Assert.fail("No exception raised");

sdk-platform-java/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/rest/goldens/HttpJsonComplianceStub.golden

@@ -94,6 +94,8 @@ public class HttpJsonComplianceStub extends ComplianceStub {
                             Map<String, List<String>> fields = new HashMap<>();
                             ProtoRestSerializer<RepeatRequest> serializer =
                                 ProtoRestSerializer.create();
+                            serializer.putQueryParam(
+                                fields, "custom-kebab-name", request.getCustomKebabName());
                             serializer.putQueryParam(fields, "name", request.getName());
                             serializer.putQueryParam(
                                 fields, "serverVerify", request.getServerVerify());
@@ -132,6 +134,8 @@ public class HttpJsonComplianceStub extends ComplianceStub {
                             Map<String, List<String>> fields = new HashMap<>();
                             ProtoRestSerializer<RepeatRequest> serializer =
                                 ProtoRestSerializer.create();
+                            serializer.putQueryParam(
+                                fields, "custom-kebab-name", request.getCustomKebabName());
                             serializer.putQueryParam(fields, "info", request.getInfo());
                             serializer.putQueryParam(fields, "name", request.getName());
                             serializer.putQueryParam(
@@ -181,6 +185,8 @@ public class HttpJsonComplianceStub extends ComplianceStub {
                             Map<String, List<String>> fields = new HashMap<>();
                             ProtoRestSerializer<RepeatRequest> serializer =
                                 ProtoRestSerializer.create();
+                            serializer.putQueryParam(
+                                fields, "custom-kebab-name", request.getCustomKebabName());
                             serializer.putQueryParam(fields, "info", request.getInfo());
                             serializer.putQueryParam(fields, "name", request.getName());
                             serializer.putQueryParam(
@@ -228,6 +234,8 @@ public class HttpJsonComplianceStub extends ComplianceStub {
                             Map<String, List<String>> fields = new HashMap<>();
                             ProtoRestSerializer<RepeatRequest> serializer =
                                 ProtoRestSerializer.create();
+                            serializer.putQueryParam(
+                                fields, "custom-kebab-name", request.getCustomKebabName());
                             serializer.putQueryParam(fields, "info", request.getInfo());
                             serializer.putQueryParam(fields, "name", request.getName());
                             serializer.putQueryParam(
@@ -272,6 +280,8 @@ public class HttpJsonComplianceStub extends ComplianceStub {
                             Map<String, List<String>> fields = new HashMap<>();
                             ProtoRestSerializer<RepeatRequest> serializer =
                                 ProtoRestSerializer.create();
+                            serializer.putQueryParam(
+                                fields, "custom-kebab-name", request.getCustomKebabName());
                             serializer.putQueryParam(fields, "info", request.getInfo());
                             serializer.putQueryParam(fields, "name", request.getName());
                             serializer.putQueryParam(

sdk-platform-java/gapic-generator-java/src/test/java/com/google/api/generator/gapic/model/HttpBindingsTest.java

@@ -96,4 +96,12 @@ void isEnum_shouldReturnTrueIfFieldExistsAndIsEnumIsTue() {
 
     Truth.assertThat(httpBinding.isEnum()).isTrue();
   }
+
+  @Test
+  void builder_preservesLiteralJsonName() {
+    final String jsonName = "iceberg-catalog-id";
+    HttpBinding binding =
+        HttpBinding.builder().setName("doesNotMatter").setJsonName(jsonName).build();
+    Truth.assertThat(binding.jsonName()).isEqualTo(jsonName);
+  }
 }

sdk-platform-java/gapic-generator-java/src/test/java/com/google/api/generator/gapic/protoparser/HttpRuleParserTest.java

@@ -114,10 +114,15 @@ void parseHttpAnnotation_shouldPutAllFieldsIntoQueryParamsIfPathParamAndBodyAreN
     HttpBindings actual = HttpRuleParser.parse(rpcMethod, inputMessage, messages);
 
     HttpBinding expected1 =
-        HttpBinding.builder().setName("name").setField(inputMessage.fieldMap().get("name")).build();
+        HttpBinding.builder()
+            .setName("name")
+            .setJsonName("name")
+            .setField(inputMessage.fieldMap().get("name"))
+            .build();
     HttpBinding expected2 =
         HttpBinding.builder()
             .setName("nested_object")
+            .setJsonName("nestedObject")
             .setField(inputMessage.fieldMap().get("nested_object"))
             .build();
     Truth.assertThat(new HashSet<>(actual.queryParameters())).containsExactly(expected1, expected2);
@@ -173,4 +178,32 @@ void parseHttpAnnotation_shouldExcludeFieldsFromQueryParamsIfPathParamsAreConfig
     Truth.assertThat(new HashSet<>(actual.queryParameters())).containsExactly(expected1, expected2);
     Truth.assertThat(new HashSet<>(actual.pathParameters())).containsExactly(expectedPathParam);
   }
+
+  @Test
+  void parseHttpAnnotation_respectsJsonNameWithDashes() {
+    FileDescriptor complianceFileDescriptor =
+        com.google.showcase.v1beta1.ComplianceOuterClass.getDescriptor();
+    ServiceDescriptor complianceService = complianceFileDescriptor.getServices().get(0);
+    assertEquals("Compliance", complianceService.getName());
+
+    Map<String, Message> messages = Parser.parseMessages(complianceFileDescriptor);
+
+    MethodDescriptor rpcMethod =
+        complianceService.getMethods().stream()
+            .filter(m -> m.getName().equals("RepeatDataQuery"))
+            .findAny()
+            .get();
+
+    Message inputMessage = messages.get("com.google.showcase.v1beta1.RepeatRequest");
+    HttpBindings httpBindings = HttpRuleParser.parse(rpcMethod, inputMessage, messages);
+
+    HttpBinding customBinding =
+        httpBindings.queryParameters().stream()
+            .filter(b -> b.name().equals("custom_kebab_name"))
+            .findAny()
+            .orElse(null);
+
+    Truth.assertThat(customBinding).isNotNull();
+    assertEquals("custom-kebab-name", customBinding.jsonName());
+  }
 }

sdk-platform-java/gapic-generator-java/src/test/java/com/google/api/generator/gapic/protoparser/ParserTest.java

@@ -102,10 +102,11 @@ void parseMessages_basic() {
 
     String echoResponseName = "EchoResponse";
     Field echoResponseContentField =
-        Field.builder().setName("content").setType(TypeNode.STRING).build();
+        Field.builder().setName("content").setJsonName("content").setType(TypeNode.STRING).build();
     Field echoResponseSeverityField =
         Field.builder()
             .setName("severity")
+            .setJsonName("severity")
             .setType(
                 TypeNode.withReference(
                     VaporReference.builder().setName("Severity").setPakkage(ECHO_PACKAGE).build()))

sdk-platform-java/gapic-generator-java/src/test/proto/compliance.proto

@@ -127,6 +127,9 @@ message RepeatRequest {
   // If true, the server will verify that the received request matches
   // the request with the same name in the compliance test suite.
   bool server_verify = 3;
+
+  // New field for testing json_name with dashes
+  string custom_kebab_name = 4 [json_name = "custom-kebab-name"];
 }
 
 message RepeatResponse {