Skip to content

Commit 1198ab2

Browse files
summer-ji-engsummer-ji-eng
committed
fix: add request with default value in regular paged callable method
1 parent 6f8ca38 commit 1198ab2

11 files changed

Lines changed: 147 additions & 13 deletions

File tree

‎src/main/java/com/google/api/generator/gapic/composer/samplecode/ServiceClientSampleCodeComposer.java‎

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -592,18 +592,15 @@ public static String composeRegularCallableMethodHeaderSampleCode(
592592
.setValueExpr(requestBuilderExpr)
593593
.build();
594594

595-
List<Expr> bodyExprs = new ArrayList<>();
596-
bodyExprs.add(requestAssignmentExpr);
597-
598595
List<Statement> bodyStatements = new ArrayList<>();
596+
bodyStatements.add(ExprStatement.withExpr(requestAssignmentExpr));
599597

600598
if (method.isPaged()) {
601599
bodyStatements.addAll(
602600
composePagedCallableBodyStatements(method, clientVarExpr, requestVarExpr, messageTypes));
603601
} else {
604602
bodyStatements.addAll(
605-
composeUnaryOrLroCallableBodyStatements(
606-
method, clientVarExpr, requestVarExpr, bodyExprs));
603+
composeUnaryOrLroCallableBodyStatements(method, clientVarExpr, requestVarExpr));
607604
}
608605

609606
return SampleCodeWriter.write(
@@ -1061,10 +1058,7 @@ private static List<Statement> composeStreamClientBodyStatements(
10611058
}
10621059

10631060
private static List<Statement> composeUnaryOrLroCallableBodyStatements(
1064-
Method method,
1065-
VariableExpr clientVarExpr,
1066-
VariableExpr requestVarExpr,
1067-
List<Expr> bodyExprs) {
1061+
Method method, VariableExpr clientVarExpr, VariableExpr requestVarExpr) {
10681062
List<Statement> bodyStatements = new ArrayList<>();
10691063
// Create api future variable expression, and assign it with a value by invoking callable
10701064
// method.
@@ -1098,10 +1092,7 @@ private static List<Statement> composeUnaryOrLroCallableBodyStatements(
10981092
.setVariableExpr(apiFutureVarExpr.toBuilder().setIsDecl(true).build())
10991093
.setValueExpr(callableMethodInvocationExpr)
11001094
.build();
1101-
bodyExprs.add(futureAssignmentExpr);
1102-
bodyStatements.addAll(
1103-
bodyExprs.stream().map(e -> ExprStatement.withExpr(e)).collect(Collectors.toList()));
1104-
bodyExprs.clear();
1095+
bodyStatements.add(ExprStatement.withExpr(futureAssignmentExpr));
11051096
bodyStatements.add(CommentStatement.withComment(LineComment.withComment("Do something.")));
11061097

11071098
MethodInvocationExpr getMethodInvocationExpr =

‎src/test/java/com/google/api/generator/gapic/composer/goldens/EchoClient.golden‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -516,6 +516,12 @@ public class EchoClient implements BackgroundResource {
516516
*
517517
* <pre>{@code
518518
* try (EchoClient echoClient = EchoClient.create()) {
519+
* PagedExpandRequest request =
520+
* PagedExpandRequest.newBuilder()
521+
* .setContent("content951530617")
522+
* .setPageSize(883849137)
523+
* .setPageToken("pageToken873572522")
524+
* .build();
519525
* while (true) {
520526
* PagedExpandResponse response = echoClient.pagedExpandCallable().call(request);
521527
* for (EchoResponse element : response.getResponsesList()) {
@@ -612,6 +618,12 @@ public class EchoClient implements BackgroundResource {
612618
*
613619
* <pre>{@code
614620
* try (EchoClient echoClient = EchoClient.create()) {
621+
* PagedExpandRequest request =
622+
* PagedExpandRequest.newBuilder()
623+
* .setContent("content951530617")
624+
* .setPageSize(883849137)
625+
* .setPageToken("pageToken873572522")
626+
* .build();
615627
* while (true) {
616628
* PagedExpandResponse response = echoClient.simplePagedExpandCallable().call(request);
617629
* for (EchoResponse element : response.getResponsesList()) {

‎src/test/java/com/google/api/generator/gapic/composer/goldens/IdentityClient.golden‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -580,6 +580,11 @@ public class IdentityClient implements BackgroundResource {
580580
*
581581
* <pre>{@code
582582
* try (IdentityClient identityClient = IdentityClient.create()) {
583+
* ListUsersRequest request =
584+
* ListUsersRequest.newBuilder()
585+
* .setPageSize(883849137)
586+
* .setPageToken("pageToken873572522")
587+
* .build();
583588
* while (true) {
584589
* ListUsersResponse response = identityClient.listUsersCallable().call(request);
585590
* for (User element : response.getResponsesList()) {

‎src/test/java/com/google/api/generator/gapic/composer/samplecode/ServiceClientSampleCodeComposerTest.java‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2452,6 +2452,12 @@ public void validComposeRegularCallableMethodHeaderSampleCode_pageRpc() {
24522452
String expected =
24532453
LineFormatter.lines(
24542454
"try (EchoClient echoClient = EchoClient.create()) {\n",
2455+
" PagedExpandRequest request =\n",
2456+
" PagedExpandRequest.newBuilder()\n",
2457+
" .setContent(\"content951530617\")\n",
2458+
" .setPageSize(883849137)\n",
2459+
" .setPageToken(\"pageToken873572522\")\n",
2460+
" .build();\n",
24552461
" while (true) {\n",
24562462
" PagedExpandResponse response = echoClient.pagedExpandCallable().call(request);\n",
24572463
" for (EchoResponse element : response.getResponsesList()) {\n",

‎test/integration/goldens/asset/AssetServiceClient.java‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -882,6 +882,15 @@ public final SearchAllResourcesPagedResponse searchAllResources(
882882
*
883883
* <pre>{@code
884884
* try (AssetServiceClient assetServiceClient = AssetServiceClient.create()) {
885+
* SearchAllResourcesRequest request =
886+
* SearchAllResourcesRequest.newBuilder()
887+
* .setScope("scope109264468")
888+
* .setQuery("query107944136")
889+
* .addAllAssetTypes(new ArrayList<String>())
890+
* .setPageSize(883849137)
891+
* .setPageToken("pageToken873572522")
892+
* .setOrderBy("orderBy-1207110587")
893+
* .build();
885894
* while (true) {
886895
* SearchAllResourcesResponse response =
887896
* assetServiceClient.searchAllResourcesCallable().call(request);
@@ -1039,6 +1048,13 @@ public final SearchAllIamPoliciesPagedResponse searchAllIamPolicies(
10391048
*
10401049
* <pre>{@code
10411050
* try (AssetServiceClient assetServiceClient = AssetServiceClient.create()) {
1051+
* SearchAllIamPoliciesRequest request =
1052+
* SearchAllIamPoliciesRequest.newBuilder()
1053+
* .setScope("scope109264468")
1054+
* .setQuery("query107944136")
1055+
* .setPageSize(883849137)
1056+
* .setPageToken("pageToken873572522")
1057+
* .build();
10421058
* while (true) {
10431059
* SearchAllIamPoliciesResponse response =
10441060
* assetServiceClient.searchAllIamPoliciesCallable().call(request);

‎test/integration/goldens/kms/KeyManagementServiceClient.java‎

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -295,6 +295,14 @@ public final ListKeyRingsPagedResponse listKeyRings(ListKeyRingsRequest request)
295295
* <pre>{@code
296296
* try (KeyManagementServiceClient keyManagementServiceClient =
297297
* KeyManagementServiceClient.create()) {
298+
* ListKeyRingsRequest request =
299+
* ListKeyRingsRequest.newBuilder()
300+
* .setParent(LocationName.of("[PROJECT]", "[LOCATION]").toString())
301+
* .setPageSize(883849137)
302+
* .setPageToken("pageToken873572522")
303+
* .setFilter("filter-1274492040")
304+
* .setOrderBy("orderBy-1207110587")
305+
* .build();
298306
* while (true) {
299307
* ListKeyRingsResponse response =
300308
* keyManagementServiceClient.listKeyRingsCallable().call(request);
@@ -438,6 +446,14 @@ public final ListCryptoKeysPagedResponse listCryptoKeys(ListCryptoKeysRequest re
438446
* <pre>{@code
439447
* try (KeyManagementServiceClient keyManagementServiceClient =
440448
* KeyManagementServiceClient.create()) {
449+
* ListCryptoKeysRequest request =
450+
* ListCryptoKeysRequest.newBuilder()
451+
* .setParent(KeyRingName.of("[PROJECT]", "[LOCATION]", "[KEY_RING]").toString())
452+
* .setPageSize(883849137)
453+
* .setPageToken("pageToken873572522")
454+
* .setFilter("filter-1274492040")
455+
* .setOrderBy("orderBy-1207110587")
456+
* .build();
441457
* while (true) {
442458
* ListCryptoKeysResponse response =
443459
* keyManagementServiceClient.listCryptoKeysCallable().call(request);
@@ -593,6 +609,16 @@ public final ListCryptoKeyVersionsPagedResponse listCryptoKeyVersions(
593609
* <pre>{@code
594610
* try (KeyManagementServiceClient keyManagementServiceClient =
595611
* KeyManagementServiceClient.create()) {
612+
* ListCryptoKeyVersionsRequest request =
613+
* ListCryptoKeyVersionsRequest.newBuilder()
614+
* .setParent(
615+
* CryptoKeyName.of("[PROJECT]", "[LOCATION]", "[KEY_RING]", "[CRYPTO_KEY]")
616+
* .toString())
617+
* .setPageSize(883849137)
618+
* .setPageToken("pageToken873572522")
619+
* .setFilter("filter-1274492040")
620+
* .setOrderBy("orderBy-1207110587")
621+
* .build();
596622
* while (true) {
597623
* ListCryptoKeyVersionsResponse response =
598624
* keyManagementServiceClient.listCryptoKeyVersionsCallable().call(request);
@@ -737,6 +763,14 @@ public final ListImportJobsPagedResponse listImportJobs(ListImportJobsRequest re
737763
* <pre>{@code
738764
* try (KeyManagementServiceClient keyManagementServiceClient =
739765
* KeyManagementServiceClient.create()) {
766+
* ListImportJobsRequest request =
767+
* ListImportJobsRequest.newBuilder()
768+
* .setParent(KeyRingName.of("[PROJECT]", "[LOCATION]", "[KEY_RING]").toString())
769+
* .setPageSize(883849137)
770+
* .setPageToken("pageToken873572522")
771+
* .setFilter("filter-1274492040")
772+
* .setOrderBy("orderBy-1207110587")
773+
* .build();
740774
* while (true) {
741775
* ListImportJobsResponse response =
742776
* keyManagementServiceClient.listImportJobsCallable().call(request);

‎test/integration/goldens/library/LibraryServiceClient.java‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -379,6 +379,11 @@ public final ListShelvesPagedResponse listShelves(ListShelvesRequest request) {
379379
*
380380
* <pre>{@code
381381
* try (LibraryServiceClient libraryServiceClient = LibraryServiceClient.create()) {
382+
* ListShelvesRequest request =
383+
* ListShelvesRequest.newBuilder()
384+
* .setPageSize(883849137)
385+
* .setPageToken("pageToken873572522")
386+
* .build();
382387
* while (true) {
383388
* ListShelvesResponse response = libraryServiceClient.listShelvesCallable().call(request);
384389
* for (Shelf element : response.getResponsesList()) {
@@ -959,6 +964,12 @@ public final UnaryCallable<ListBooksRequest, ListBooksPagedResponse> listBooksPa
959964
*
960965
* <pre>{@code
961966
* try (LibraryServiceClient libraryServiceClient = LibraryServiceClient.create()) {
967+
* ListBooksRequest request =
968+
* ListBooksRequest.newBuilder()
969+
* .setName("name3373707")
970+
* .setPageSize(883849137)
971+
* .setPageToken("pageToken873572522")
972+
* .build();
962973
* while (true) {
963974
* ListBooksResponse response = libraryServiceClient.listBooksCallable().call(request);
964975
* for (Book element : response.getResponsesList()) {

‎test/integration/goldens/logging/ConfigClient.java‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -419,6 +419,14 @@ public final ListBucketsPagedResponse listBuckets(ListBucketsRequest request) {
419419
*
420420
* <pre>{@code
421421
* try (ConfigClient configClient = ConfigClient.create()) {
422+
* ListBucketsRequest request =
423+
* ListBucketsRequest.newBuilder()
424+
* .setParent(
425+
* LogBucketName.ofProjectLocationBucketName("[PROJECT]", "[LOCATION]", "[BUCKET]")
426+
* .toString())
427+
* .setPageToken("pageToken873572522")
428+
* .setPageSize(883849137)
429+
* .build();
422430
* while (true) {
423431
* ListBucketsResponse response = configClient.listBucketsCallable().call(request);
424432
* for (LogBucket element : response.getResponsesList()) {
@@ -800,6 +808,12 @@ public final UnaryCallable<ListViewsRequest, ListViewsPagedResponse> listViewsPa
800808
*
801809
* <pre>{@code
802810
* try (ConfigClient configClient = ConfigClient.create()) {
811+
* ListViewsRequest request =
812+
* ListViewsRequest.newBuilder()
813+
* .setParent("parent-995424086")
814+
* .setPageToken("pageToken873572522")
815+
* .setPageSize(883849137)
816+
* .build();
803817
* while (true) {
804818
* ListViewsResponse response = configClient.listViewsCallable().call(request);
805819
* for (LogView element : response.getResponsesList()) {
@@ -1211,6 +1225,12 @@ public final UnaryCallable<ListSinksRequest, ListSinksPagedResponse> listSinksPa
12111225
*
12121226
* <pre>{@code
12131227
* try (ConfigClient configClient = ConfigClient.create()) {
1228+
* ListSinksRequest request =
1229+
* ListSinksRequest.newBuilder()
1230+
* .setParent(LogSinkName.ofProjectSinkName("[PROJECT]", "[SINK]").toString())
1231+
* .setPageToken("pageToken873572522")
1232+
* .setPageSize(883849137)
1233+
* .build();
12141234
* while (true) {
12151235
* ListSinksResponse response = configClient.listSinksCallable().call(request);
12161236
* for (LogSink element : response.getResponsesList()) {
@@ -2091,6 +2111,13 @@ public final ListExclusionsPagedResponse listExclusions(ListExclusionsRequest re
20912111
*
20922112
* <pre>{@code
20932113
* try (ConfigClient configClient = ConfigClient.create()) {
2114+
* ListExclusionsRequest request =
2115+
* ListExclusionsRequest.newBuilder()
2116+
* .setParent(
2117+
* LogExclusionName.ofProjectExclusionName("[PROJECT]", "[EXCLUSION]").toString())
2118+
* .setPageToken("pageToken873572522")
2119+
* .setPageSize(883849137)
2120+
* .build();
20942121
* while (true) {
20952122
* ListExclusionsResponse response = configClient.listExclusionsCallable().call(request);
20962123
* for (LogExclusion element : response.getResponsesList()) {

‎test/integration/goldens/logging/LoggingClient.java‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -613,6 +613,14 @@ public final ListLogEntriesPagedResponse listLogEntries(ListLogEntriesRequest re
613613
*
614614
* <pre>{@code
615615
* try (LoggingClient loggingClient = LoggingClient.create()) {
616+
* ListLogEntriesRequest request =
617+
* ListLogEntriesRequest.newBuilder()
618+
* .addAllResourceNames(new ArrayList<String>())
619+
* .setFilter("filter-1274492040")
620+
* .setOrderBy("orderBy-1207110587")
621+
* .setPageSize(883849137)
622+
* .setPageToken("pageToken873572522")
623+
* .build();
616624
* while (true) {
617625
* ListLogEntriesResponse response = loggingClient.listLogEntriesCallable().call(request);
618626
* for (LogEntry element : response.getResponsesList()) {
@@ -697,6 +705,11 @@ public final ListMonitoredResourceDescriptorsPagedResponse listMonitoredResource
697705
*
698706
* <pre>{@code
699707
* try (LoggingClient loggingClient = LoggingClient.create()) {
708+
* ListMonitoredResourceDescriptorsRequest request =
709+
* ListMonitoredResourceDescriptorsRequest.newBuilder()
710+
* .setPageSize(883849137)
711+
* .setPageToken("pageToken873572522")
712+
* .build();
700713
* while (true) {
701714
* ListMonitoredResourceDescriptorsResponse response =
702715
* loggingClient.listMonitoredResourceDescriptorsCallable().call(request);
@@ -919,6 +932,13 @@ public final UnaryCallable<ListLogsRequest, ListLogsPagedResponse> listLogsPaged
919932
*
920933
* <pre>{@code
921934
* try (LoggingClient loggingClient = LoggingClient.create()) {
935+
* ListLogsRequest request =
936+
* ListLogsRequest.newBuilder()
937+
* .setParent(LogName.ofProjectLogName("[PROJECT]", "[LOG]").toString())
938+
* .setPageSize(883849137)
939+
* .setPageToken("pageToken873572522")
940+
* .addAllResourceNames(new ArrayList<String>())
941+
* .build();
922942
* while (true) {
923943
* ListLogsResponse response = loggingClient.listLogsCallable().call(request);
924944
* for (String element : response.getResponsesList()) {

‎test/integration/goldens/logging/MetricsClient.java‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -267,6 +267,12 @@ public final ListLogMetricsPagedResponse listLogMetrics(ListLogMetricsRequest re
267267
*
268268
* <pre>{@code
269269
* try (MetricsClient metricsClient = MetricsClient.create()) {
270+
* ListLogMetricsRequest request =
271+
* ListLogMetricsRequest.newBuilder()
272+
* .setParent(ProjectName.of("[PROJECT]").toString())
273+
* .setPageToken("pageToken873572522")
274+
* .setPageSize(883849137)
275+
* .build();
270276
* while (true) {
271277
* ListLogMetricsResponse response = metricsClient.listLogMetricsCallable().call(request);
272278
* for (LogMetric element : response.getResponsesList()) {

0 commit comments

Comments
 (0)