Merge branch 'master' into fix/pubsub

miraleung · web-flow · commit 88fd2b247622 · 2021-05-26T12:24:46.000-07:00
diff --git a/src/test/java/com/google/api/generator/gapic/composer/goldens/GrpcTestingStub.golden b/src/test/java/com/google/api/generator/gapic/composer/goldens/GrpcTestingStub.golden
@@ -277,6 +277,7 @@ public class GrpcTestingStub extends TestingStub {
                     params.put("name", String.valueOf(request.getName()));
                     params.put(
                         "test_to_verify.name", String.valueOf(request.getTestToVerify().getName()));
+                    params.put("type", String.valueOf(request.getType()));
                     return params.build();
                   }
                 })
diff --git a/src/test/java/com/google/api/generator/gapic/composer/goldens/TestingClientTest.golden b/src/test/java/com/google/api/generator/gapic/composer/goldens/TestingClientTest.golden
@@ -481,6 +481,7 @@ public class TestingClientTest {
     Assert.assertEquals(request.getAnswersList(), actualRequest.getAnswersList());
     Assert.assertEquals(request.getFoo(), actualRequest.getFoo());
     Assert.assertEquals(request.getTestToVerify(), actualRequest.getTestToVerify());
+    Assert.assertEquals(request.getType(), actualRequest.getType());
     Assert.assertTrue(
         channelProvider.isHeaderSent(
             ApiClientHeaderProvider.getDefaultApiClientHeaderKey(),
diff --git a/src/test/java/com/google/api/generator/gapic/protoparser/HttpRuleParserTest.java b/src/test/java/com/google/api/generator/gapic/protoparser/HttpRuleParserTest.java
@@ -70,7 +70,7 @@ public void parseHttpAnnotation_multipleBindings() {
         HttpRuleParser.parseHttpBindings(rpcMethod, inputMessage, messages);
     assertTrue(httpBindingsOpt.isPresent());
     assertThat(httpBindingsOpt.get())
-        .containsExactly("answer", "foo", "name", "test_to_verify.name");
+        .containsExactly("answer", "foo", "name", "test_to_verify.name", "type");
   }
 
   @Test
diff --git a/src/test/java/com/google/api/generator/gapic/testdata/testing.proto b/src/test/java/com/google/api/generator/gapic/testdata/testing.proto
@@ -120,6 +120,8 @@ service Testing {
         post: "/v1beta1/{test_to_verify.name=sessions/*/tests/*}:check"
         body: "*"
       }
+      // Test enums in HTTP fields.
+      additional_bindings { post: "/v1beta1/{type}:check" body: "*" }
     };
   }
 }
@@ -410,6 +412,9 @@ message VerifyTestRequest {
   string foo = 4;
 
   Test test_to_verify = 5;
+
+  // For testing enums in HTTP fields.
+  Issue.Type type = 6;
 }
 
 message VerifyTestResponse {

Original file line number	Diff line number	Diff line change
`@@ -277,6 +277,7 @@ public class GrpcTestingStub extends TestingStub {`
`277`	`277`	`params.put("name", String.valueOf(request.getName()));`
`278`	`278`	`params.put(`
`279`	`279`	`"test_to_verify.name", String.valueOf(request.getTestToVerify().getName()));`
	`280`	`+ params.put("type", String.valueOf(request.getType()));`
`280`	`281`	`return params.build();`
`281`	`282`	`}`
`282`	`283`	`})`
Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@ public void parseHttpAnnotation_multipleBindings() {`
`70`	`70`	`HttpRuleParser.parseHttpBindings(rpcMethod, inputMessage, messages);`
`71`	`71`	`assertTrue(httpBindingsOpt.isPresent());`
`72`	`72`	`assertThat(httpBindingsOpt.get())`
`73`		`- .containsExactly("answer", "foo", "name", "test_to_verify.name");`
	`73`	`+ .containsExactly("answer", "foo", "name", "test_to_verify.name", "type");`
`74`	`74`	`}`
`75`	`75`
`76`	`76`	`@Test`
Original file line number	Diff line number	Diff line change
`@@ -120,6 +120,8 @@ service Testing {`
`120`	`120`	`post: "/v1beta1/{test_to_verify.name=sessions//tests/}:check"`
`121`	`121`	`body: "*"`
`122`	`122`	`}`
	`123`	`+ // Test enums in HTTP fields.`
	`124`	`+ additional_bindings { post: "/v1beta1/{type}:check" body: "*" }`
`123`	`125`	`};`
`124`	`126`	`}`
`125`	`127`	`}`
`@@ -410,6 +412,9 @@ message VerifyTestRequest {`
`410`	`412`	`string foo = 4;`
`411`	`413`
`412`	`414`	`Test test_to_verify = 5;`
	`415`	`+`
	`416`	`+ // For testing enums in HTTP fields.`
	`417`	`+ Issue.Type type = 6;`
`413`	`418`	`}`
`414`	`419`
`415`	`420`	`message VerifyTestResponse {`