Skip to content

Commit 4ec4743

Browse files
committed
chore: cleanup
1 parent 78c5a45 commit 4ec4743

5 files changed

Lines changed: 10 additions & 20 deletions

File tree

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

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -925,10 +925,7 @@ private Expr createFieldsExtractorClassInstance(
925925

926926
paramsPutArgs.add(
927927
ValueExpr.withValue(
928-
StringObjectValue.withValue(
929-
(httpBindingFieldName.jsonName() != null)
930-
? httpBindingFieldName.jsonName()
931-
: JavaStyle.toLowerCamelCase(httpBindingFieldName.name()))));
928+
StringObjectValue.withValue(httpBindingFieldName.jsonName())));
932929
paramsPutArgs.add(requestBuilderExpr);
933930

934931
Expr paramsPutExpr =

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ private static Set<HttpBinding> validateAndConstructHttpBindings(
147147
continue;
148148
}
149149
Message nestedMessage = inputMessage;
150-
List<String> jsonNameParts = new ArrayList();
150+
List<String> jsonNameParts = new ArrayList<>();
151151
for (int i = 0; i < subFields.length; i++) {
152152
String subFieldName = subFields[i];
153153
Field field = nestedMessage.fieldMap().get(subFieldName);

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@ public class ComplianceClientTest {
6666
.setName("name3373707")
6767
.setInfo(ComplianceData.newBuilder().build())
6868
.setServerVerify(true)
69+
.setCustomKebabName("customKebabName-2062111197")
6970
.build();
7071

7172
RepeatResponse actualResponse = client.repeatDataBody(request);
@@ -99,6 +100,7 @@ public class ComplianceClientTest {
99100
.setName("name3373707")
100101
.setInfo(ComplianceData.newBuilder().build())
101102
.setServerVerify(true)
103+
.setCustomKebabName("customKebabName-2062111197")
102104
.build();
103105
client.repeatDataBody(request);
104106
Assert.fail("No exception raised");

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

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -80,21 +80,7 @@ void parseHttpAnnotation_multipleBindings() {
8080
.containsExactly("answer", "foo", "name", "test_to_verify.name", "type");
8181
}
8282

83-
@Test
84-
void parseHttpAnnotation_missingFieldFromMessage() {
85-
FileDescriptor testingFileDescriptor = TestingOuterClass.getDescriptor();
86-
ServiceDescriptor testingService = testingFileDescriptor.getServices().get(0);
87-
assertEquals("Testing", testingService.getName());
88-
89-
Map<String, Message> messages = Parser.parseMessages(testingFileDescriptor);
9083

91-
// VerityTest method.
92-
MethodDescriptor rpcMethod =
93-
testingService.getMethods().get(testingService.getMethods().size() - 1);
94-
Message inputMessage = messages.get("com.google.showcase.v1beta1.CreateSessionRequest");
95-
assertThrows(
96-
IllegalStateException.class, () -> HttpRuleParser.parse(rpcMethod, inputMessage, messages));
97-
}
9884

9985
@Test
10086
void parseHttpAnnotation_shouldPutAllFieldsIntoQueryParamsIfPathParamAndBodyAreNotConfigured() {

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

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,10 +102,15 @@ void parseMessages_basic() {
102102

103103
String echoResponseName = "EchoResponse";
104104
Field echoResponseContentField =
105-
Field.builder().setName("content").setType(TypeNode.STRING).build();
105+
Field.builder()
106+
.setName("content")
107+
.setJsonName("content")
108+
.setType(TypeNode.STRING)
109+
.build();
106110
Field echoResponseSeverityField =
107111
Field.builder()
108112
.setName("severity")
113+
.setJsonName("severity")
109114
.setType(
110115
TypeNode.withReference(
111116
VaporReference.builder().setName("Severity").setPakkage(ECHO_PACKAGE).build()))

0 commit comments

Comments
 (0)