Skip to content

Commit 02973d3

Browse files
gcf-owl-bot[bot]lqiu96
gcf-owl-bot[bot]
and
lqiu96
authored
chore: Enable requesting numeric enums in "transport=rest" responses for services supporting this (Java, Go, Python, PHP, TypeScript, C#, and Ruby), even if they do not yet turn on REST transport (#2140)
* chore: Set `rest_numeric_enums = False` for all gapic rules explicitly PiperOrigin-RevId: 485623855 Source-Link: googleapis/googleapis@807125e Source-Link: https://github.com/googleapis/googleapis-gen/commit/c4ddd6d651da69658a4762c5eafff5cd8f0e25c5 Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiYzRkZGQ2ZDY1MWRhNjk2NThhNDc2MmM1ZWFmZmY1Y2Q4ZjBlMjVjNSJ9 * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * chore: Enable requesting numeric enums in "transport=rest" responses for services supporting this (Java, Go, Python, PHP, TypeScript, C#, and Ruby), even if they do not yet turn on REST transport chore: disallow "transport=rest" for services where numeric enums are not confirmed to be supported (except in PHP and Java) PiperOrigin-RevId: 493113566 Source-Link: googleapis/googleapis@758f0d1 Source-Link: https://github.com/googleapis/googleapis-gen/commit/78bd8f05e1276363eb14eae70e91fe4bc20703ab Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiNzhiZDhmMDVlMTI3NjM2M2ViMTRlYWU3MGU5MWZlNGJjMjA3MDNhYiJ9 * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md Co-authored-by: Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com> Co-authored-by: Lawrence Qiu <[email protected]>
1 parent 15f7194 commit 02973d3

File tree

6 files changed

+79
-41
lines changed

6 files changed

+79
-41
lines changed

‎google-cloud-spanner/src/main/java/com/google/cloud/spanner/admin/database/v1/DatabaseAdminClient.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -166,10 +166,7 @@
166166
* // - It may require specifying regional endpoints when creating the service client as shown in
167167
* // https://cloud.google.com/java/docs/setup#configure_endpoints_for_the_client_library
168168
* DatabaseAdminSettings databaseAdminSettings =
169-
* DatabaseAdminSettings.newBuilder()
170-
* .setTransportChannelProvider(
171-
* DatabaseAdminSettings.defaultHttpJsonTransportProviderBuilder().build())
172-
* .build();
169+
* DatabaseAdminSettings.newHttpJsonBuilder().build();
173170
* DatabaseAdminClient databaseAdminClient = DatabaseAdminClient.create(databaseAdminSettings);
174171
* }</pre>
175172
*

‎google-cloud-spanner/src/main/java/com/google/cloud/spanner/admin/database/v1/stub/HttpJsonDatabaseAdminStub.java

Lines changed: 28 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,7 @@ public class HttpJsonDatabaseAdminStub extends DatabaseAdminStub {
127127
ProtoRestSerializer.create();
128128
serializer.putQueryParam(fields, "pageSize", request.getPageSize());
129129
serializer.putQueryParam(fields, "pageToken", request.getPageToken());
130+
serializer.putQueryParam(fields, "$alt", "json;enum-encoding=int");
130131
return fields;
131132
})
132133
.setRequestBodyExtractor(request -> null)
@@ -160,12 +161,13 @@ public class HttpJsonDatabaseAdminStub extends DatabaseAdminStub {
160161
Map<String, List<String>> fields = new HashMap<>();
161162
ProtoRestSerializer<CreateDatabaseRequest> serializer =
162163
ProtoRestSerializer.create();
164+
serializer.putQueryParam(fields, "$alt", "json;enum-encoding=int");
163165
return fields;
164166
})
165167
.setRequestBodyExtractor(
166168
request ->
167169
ProtoRestSerializer.create()
168-
.toBody("*", request.toBuilder().clearParent().build(), false))
170+
.toBody("*", request.toBuilder().clearParent().build(), true))
169171
.build())
170172
.setResponseParser(
171173
ProtoMessageResponseParser.<Operation>newBuilder()
@@ -199,6 +201,7 @@ public class HttpJsonDatabaseAdminStub extends DatabaseAdminStub {
199201
Map<String, List<String>> fields = new HashMap<>();
200202
ProtoRestSerializer<GetDatabaseRequest> serializer =
201203
ProtoRestSerializer.create();
204+
serializer.putQueryParam(fields, "$alt", "json;enum-encoding=int");
202205
return fields;
203206
})
204207
.setRequestBodyExtractor(request -> null)
@@ -232,12 +235,13 @@ public class HttpJsonDatabaseAdminStub extends DatabaseAdminStub {
232235
Map<String, List<String>> fields = new HashMap<>();
233236
ProtoRestSerializer<UpdateDatabaseDdlRequest> serializer =
234237
ProtoRestSerializer.create();
238+
serializer.putQueryParam(fields, "$alt", "json;enum-encoding=int");
235239
return fields;
236240
})
237241
.setRequestBodyExtractor(
238242
request ->
239243
ProtoRestSerializer.create()
240-
.toBody("*", request.toBuilder().clearDatabase().build(), false))
244+
.toBody("*", request.toBuilder().clearDatabase().build(), true))
241245
.build())
242246
.setResponseParser(
243247
ProtoMessageResponseParser.<Operation>newBuilder()
@@ -271,6 +275,7 @@ public class HttpJsonDatabaseAdminStub extends DatabaseAdminStub {
271275
Map<String, List<String>> fields = new HashMap<>();
272276
ProtoRestSerializer<DropDatabaseRequest> serializer =
273277
ProtoRestSerializer.create();
278+
serializer.putQueryParam(fields, "$alt", "json;enum-encoding=int");
274279
return fields;
275280
})
276281
.setRequestBodyExtractor(request -> null)
@@ -304,6 +309,7 @@ public class HttpJsonDatabaseAdminStub extends DatabaseAdminStub {
304309
Map<String, List<String>> fields = new HashMap<>();
305310
ProtoRestSerializer<GetDatabaseDdlRequest> serializer =
306311
ProtoRestSerializer.create();
312+
serializer.putQueryParam(fields, "$alt", "json;enum-encoding=int");
307313
return fields;
308314
})
309315
.setRequestBodyExtractor(request -> null)
@@ -339,12 +345,13 @@ public class HttpJsonDatabaseAdminStub extends DatabaseAdminStub {
339345
Map<String, List<String>> fields = new HashMap<>();
340346
ProtoRestSerializer<SetIamPolicyRequest> serializer =
341347
ProtoRestSerializer.create();
348+
serializer.putQueryParam(fields, "$alt", "json;enum-encoding=int");
342349
return fields;
343350
})
344351
.setRequestBodyExtractor(
345352
request ->
346353
ProtoRestSerializer.create()
347-
.toBody("*", request.toBuilder().clearResource().build(), false))
354+
.toBody("*", request.toBuilder().clearResource().build(), true))
348355
.build())
349356
.setResponseParser(
350357
ProtoMessageResponseParser.<Policy>newBuilder()
@@ -377,12 +384,13 @@ public class HttpJsonDatabaseAdminStub extends DatabaseAdminStub {
377384
Map<String, List<String>> fields = new HashMap<>();
378385
ProtoRestSerializer<GetIamPolicyRequest> serializer =
379386
ProtoRestSerializer.create();
387+
serializer.putQueryParam(fields, "$alt", "json;enum-encoding=int");
380388
return fields;
381389
})
382390
.setRequestBodyExtractor(
383391
request ->
384392
ProtoRestSerializer.create()
385-
.toBody("*", request.toBuilder().clearResource().build(), false))
393+
.toBody("*", request.toBuilder().clearResource().build(), true))
386394
.build())
387395
.setResponseParser(
388396
ProtoMessageResponseParser.<Policy>newBuilder()
@@ -417,12 +425,13 @@ public class HttpJsonDatabaseAdminStub extends DatabaseAdminStub {
417425
Map<String, List<String>> fields = new HashMap<>();
418426
ProtoRestSerializer<TestIamPermissionsRequest> serializer =
419427
ProtoRestSerializer.create();
428+
serializer.putQueryParam(fields, "$alt", "json;enum-encoding=int");
420429
return fields;
421430
})
422431
.setRequestBodyExtractor(
423432
request ->
424433
ProtoRestSerializer.create()
425-
.toBody("*", request.toBuilder().clearResource().build(), false))
434+
.toBody("*", request.toBuilder().clearResource().build(), true))
426435
.build())
427436
.setResponseParser(
428437
ProtoMessageResponseParser.<TestIamPermissionsResponse>newBuilder()
@@ -456,12 +465,13 @@ public class HttpJsonDatabaseAdminStub extends DatabaseAdminStub {
456465
serializer.putQueryParam(fields, "backupId", request.getBackupId());
457466
serializer.putQueryParam(
458467
fields, "encryptionConfig", request.getEncryptionConfig());
468+
serializer.putQueryParam(fields, "$alt", "json;enum-encoding=int");
459469
return fields;
460470
})
461471
.setRequestBodyExtractor(
462472
request ->
463473
ProtoRestSerializer.create()
464-
.toBody("backup", request.getBackup(), false))
474+
.toBody("backup", request.getBackup(), true))
465475
.build())
466476
.setResponseParser(
467477
ProtoMessageResponseParser.<Operation>newBuilder()
@@ -495,12 +505,13 @@ public class HttpJsonDatabaseAdminStub extends DatabaseAdminStub {
495505
Map<String, List<String>> fields = new HashMap<>();
496506
ProtoRestSerializer<CopyBackupRequest> serializer =
497507
ProtoRestSerializer.create();
508+
serializer.putQueryParam(fields, "$alt", "json;enum-encoding=int");
498509
return fields;
499510
})
500511
.setRequestBodyExtractor(
501512
request ->
502513
ProtoRestSerializer.create()
503-
.toBody("*", request.toBuilder().clearParent().build(), false))
514+
.toBody("*", request.toBuilder().clearParent().build(), true))
504515
.build())
505516
.setResponseParser(
506517
ProtoMessageResponseParser.<Operation>newBuilder()
@@ -533,6 +544,7 @@ public class HttpJsonDatabaseAdminStub extends DatabaseAdminStub {
533544
Map<String, List<String>> fields = new HashMap<>();
534545
ProtoRestSerializer<GetBackupRequest> serializer =
535546
ProtoRestSerializer.create();
547+
serializer.putQueryParam(fields, "$alt", "json;enum-encoding=int");
536548
return fields;
537549
})
538550
.setRequestBodyExtractor(request -> null)
@@ -568,12 +580,13 @@ public class HttpJsonDatabaseAdminStub extends DatabaseAdminStub {
568580
ProtoRestSerializer<UpdateBackupRequest> serializer =
569581
ProtoRestSerializer.create();
570582
serializer.putQueryParam(fields, "updateMask", request.getUpdateMask());
583+
serializer.putQueryParam(fields, "$alt", "json;enum-encoding=int");
571584
return fields;
572585
})
573586
.setRequestBodyExtractor(
574587
request ->
575588
ProtoRestSerializer.create()
576-
.toBody("backup", request.getBackup(), false))
589+
.toBody("backup", request.getBackup(), true))
577590
.build())
578591
.setResponseParser(
579592
ProtoMessageResponseParser.<Backup>newBuilder()
@@ -604,6 +617,7 @@ public class HttpJsonDatabaseAdminStub extends DatabaseAdminStub {
604617
Map<String, List<String>> fields = new HashMap<>();
605618
ProtoRestSerializer<DeleteBackupRequest> serializer =
606619
ProtoRestSerializer.create();
620+
serializer.putQueryParam(fields, "$alt", "json;enum-encoding=int");
607621
return fields;
608622
})
609623
.setRequestBodyExtractor(request -> null)
@@ -640,6 +654,7 @@ public class HttpJsonDatabaseAdminStub extends DatabaseAdminStub {
640654
serializer.putQueryParam(fields, "filter", request.getFilter());
641655
serializer.putQueryParam(fields, "pageSize", request.getPageSize());
642656
serializer.putQueryParam(fields, "pageToken", request.getPageToken());
657+
serializer.putQueryParam(fields, "$alt", "json;enum-encoding=int");
643658
return fields;
644659
})
645660
.setRequestBodyExtractor(request -> null)
@@ -673,12 +688,13 @@ public class HttpJsonDatabaseAdminStub extends DatabaseAdminStub {
673688
Map<String, List<String>> fields = new HashMap<>();
674689
ProtoRestSerializer<RestoreDatabaseRequest> serializer =
675690
ProtoRestSerializer.create();
691+
serializer.putQueryParam(fields, "$alt", "json;enum-encoding=int");
676692
return fields;
677693
})
678694
.setRequestBodyExtractor(
679695
request ->
680696
ProtoRestSerializer.create()
681-
.toBody("*", request.toBuilder().clearParent().build(), false))
697+
.toBody("*", request.toBuilder().clearParent().build(), true))
682698
.build())
683699
.setResponseParser(
684700
ProtoMessageResponseParser.<Operation>newBuilder()
@@ -718,6 +734,7 @@ public class HttpJsonDatabaseAdminStub extends DatabaseAdminStub {
718734
serializer.putQueryParam(fields, "filter", request.getFilter());
719735
serializer.putQueryParam(fields, "pageSize", request.getPageSize());
720736
serializer.putQueryParam(fields, "pageToken", request.getPageToken());
737+
serializer.putQueryParam(fields, "$alt", "json;enum-encoding=int");
721738
return fields;
722739
})
723740
.setRequestBodyExtractor(request -> null)
@@ -757,6 +774,7 @@ public class HttpJsonDatabaseAdminStub extends DatabaseAdminStub {
757774
serializer.putQueryParam(fields, "filter", request.getFilter());
758775
serializer.putQueryParam(fields, "pageSize", request.getPageSize());
759776
serializer.putQueryParam(fields, "pageToken", request.getPageToken());
777+
serializer.putQueryParam(fields, "$alt", "json;enum-encoding=int");
760778
return fields;
761779
})
762780
.setRequestBodyExtractor(request -> null)
@@ -792,6 +810,7 @@ public class HttpJsonDatabaseAdminStub extends DatabaseAdminStub {
792810
ProtoRestSerializer.create();
793811
serializer.putQueryParam(fields, "pageSize", request.getPageSize());
794812
serializer.putQueryParam(fields, "pageToken", request.getPageToken());
813+
serializer.putQueryParam(fields, "$alt", "json;enum-encoding=int");
795814
return fields;
796815
})
797816
.setRequestBodyExtractor(request -> null)

‎google-cloud-spanner/src/main/java/com/google/cloud/spanner/admin/instance/v1/InstanceAdminClient.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -167,10 +167,7 @@
167167
* // - It may require specifying regional endpoints when creating the service client as shown in
168168
* // https://cloud.google.com/java/docs/setup#configure_endpoints_for_the_client_library
169169
* InstanceAdminSettings instanceAdminSettings =
170-
* InstanceAdminSettings.newBuilder()
171-
* .setTransportChannelProvider(
172-
* InstanceAdminSettings.defaultHttpJsonTransportProviderBuilder().build())
173-
* .build();
170+
* InstanceAdminSettings.newHttpJsonBuilder().build();
174171
* InstanceAdminClient instanceAdminClient = InstanceAdminClient.create(instanceAdminSettings);
175172
* }</pre>
176173
*

0 commit comments

Comments
 (0)