Skip to content

Commit 27836aa

Browse files
gcf-owl-bot[bot]gcf-owl-bot[bot]
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 (googleapis#1143)
* 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>
1 parent 5098ef3 commit 27836aa

2 files changed

Lines changed: 42 additions & 16 deletions

File tree

‎google-cloud-firestore-admin/src/main/java/com/google/cloud/firestore/v1/stub/HttpJsonFirestoreAdminStub.java‎

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -114,12 +114,13 @@ public class HttpJsonFirestoreAdminStub extends FirestoreAdminStub {
114114
Map<String, List<String>> fields = new HashMap<>();
115115
ProtoRestSerializer<CreateIndexRequest> serializer =
116116
ProtoRestSerializer.create();
117+
serializer.putQueryParam(fields, "$alt", "json;enum-encoding=int");
117118
return fields;
118119
})
119120
.setRequestBodyExtractor(
120121
request ->
121122
ProtoRestSerializer.create()
122-
.toBody("index", request.getIndex(), false))
123+
.toBody("index", request.getIndex(), true))
123124
.build())
124125
.setResponseParser(
125126
ProtoMessageResponseParser.<Operation>newBuilder()
@@ -156,6 +157,7 @@ public class HttpJsonFirestoreAdminStub extends FirestoreAdminStub {
156157
serializer.putQueryParam(fields, "filter", request.getFilter());
157158
serializer.putQueryParam(fields, "pageSize", request.getPageSize());
158159
serializer.putQueryParam(fields, "pageToken", request.getPageToken());
160+
serializer.putQueryParam(fields, "$alt", "json;enum-encoding=int");
159161
return fields;
160162
})
161163
.setRequestBodyExtractor(request -> null)
@@ -188,6 +190,7 @@ public class HttpJsonFirestoreAdminStub extends FirestoreAdminStub {
188190
Map<String, List<String>> fields = new HashMap<>();
189191
ProtoRestSerializer<GetIndexRequest> serializer =
190192
ProtoRestSerializer.create();
193+
serializer.putQueryParam(fields, "$alt", "json;enum-encoding=int");
191194
return fields;
192195
})
193196
.setRequestBodyExtractor(request -> null)
@@ -220,6 +223,7 @@ public class HttpJsonFirestoreAdminStub extends FirestoreAdminStub {
220223
Map<String, List<String>> fields = new HashMap<>();
221224
ProtoRestSerializer<DeleteIndexRequest> serializer =
222225
ProtoRestSerializer.create();
226+
serializer.putQueryParam(fields, "$alt", "json;enum-encoding=int");
223227
return fields;
224228
})
225229
.setRequestBodyExtractor(request -> null)
@@ -252,6 +256,7 @@ public class HttpJsonFirestoreAdminStub extends FirestoreAdminStub {
252256
Map<String, List<String>> fields = new HashMap<>();
253257
ProtoRestSerializer<GetFieldRequest> serializer =
254258
ProtoRestSerializer.create();
259+
serializer.putQueryParam(fields, "$alt", "json;enum-encoding=int");
255260
return fields;
256261
})
257262
.setRequestBodyExtractor(request -> null)
@@ -287,12 +292,13 @@ public class HttpJsonFirestoreAdminStub extends FirestoreAdminStub {
287292
ProtoRestSerializer<UpdateFieldRequest> serializer =
288293
ProtoRestSerializer.create();
289294
serializer.putQueryParam(fields, "updateMask", request.getUpdateMask());
295+
serializer.putQueryParam(fields, "$alt", "json;enum-encoding=int");
290296
return fields;
291297
})
292298
.setRequestBodyExtractor(
293299
request ->
294300
ProtoRestSerializer.create()
295-
.toBody("field", request.getField(), false))
301+
.toBody("field", request.getField(), true))
296302
.build())
297303
.setResponseParser(
298304
ProtoMessageResponseParser.<Operation>newBuilder()
@@ -329,6 +335,7 @@ public class HttpJsonFirestoreAdminStub extends FirestoreAdminStub {
329335
serializer.putQueryParam(fields, "filter", request.getFilter());
330336
serializer.putQueryParam(fields, "pageSize", request.getPageSize());
331337
serializer.putQueryParam(fields, "pageToken", request.getPageToken());
338+
serializer.putQueryParam(fields, "$alt", "json;enum-encoding=int");
332339
return fields;
333340
})
334341
.setRequestBodyExtractor(request -> null)
@@ -362,12 +369,13 @@ public class HttpJsonFirestoreAdminStub extends FirestoreAdminStub {
362369
Map<String, List<String>> fields = new HashMap<>();
363370
ProtoRestSerializer<ExportDocumentsRequest> serializer =
364371
ProtoRestSerializer.create();
372+
serializer.putQueryParam(fields, "$alt", "json;enum-encoding=int");
365373
return fields;
366374
})
367375
.setRequestBodyExtractor(
368376
request ->
369377
ProtoRestSerializer.create()
370-
.toBody("*", request.toBuilder().clearName().build(), false))
378+
.toBody("*", request.toBuilder().clearName().build(), true))
371379
.build())
372380
.setResponseParser(
373381
ProtoMessageResponseParser.<Operation>newBuilder()
@@ -401,12 +409,13 @@ public class HttpJsonFirestoreAdminStub extends FirestoreAdminStub {
401409
Map<String, List<String>> fields = new HashMap<>();
402410
ProtoRestSerializer<ImportDocumentsRequest> serializer =
403411
ProtoRestSerializer.create();
412+
serializer.putQueryParam(fields, "$alt", "json;enum-encoding=int");
404413
return fields;
405414
})
406415
.setRequestBodyExtractor(
407416
request ->
408417
ProtoRestSerializer.create()
409-
.toBody("*", request.toBuilder().clearName().build(), false))
418+
.toBody("*", request.toBuilder().clearName().build(), true))
410419
.build())
411420
.setResponseParser(
412421
ProtoMessageResponseParser.<Operation>newBuilder()
@@ -440,6 +449,7 @@ public class HttpJsonFirestoreAdminStub extends FirestoreAdminStub {
440449
Map<String, List<String>> fields = new HashMap<>();
441450
ProtoRestSerializer<GetDatabaseRequest> serializer =
442451
ProtoRestSerializer.create();
452+
serializer.putQueryParam(fields, "$alt", "json;enum-encoding=int");
443453
return fields;
444454
})
445455
.setRequestBodyExtractor(request -> null)
@@ -473,6 +483,7 @@ public class HttpJsonFirestoreAdminStub extends FirestoreAdminStub {
473483
Map<String, List<String>> fields = new HashMap<>();
474484
ProtoRestSerializer<ListDatabasesRequest> serializer =
475485
ProtoRestSerializer.create();
486+
serializer.putQueryParam(fields, "$alt", "json;enum-encoding=int");
476487
return fields;
477488
})
478489
.setRequestBodyExtractor(request -> null)
@@ -508,12 +519,13 @@ public class HttpJsonFirestoreAdminStub extends FirestoreAdminStub {
508519
ProtoRestSerializer<UpdateDatabaseRequest> serializer =
509520
ProtoRestSerializer.create();
510521
serializer.putQueryParam(fields, "updateMask", request.getUpdateMask());
522+
serializer.putQueryParam(fields, "$alt", "json;enum-encoding=int");
511523
return fields;
512524
})
513525
.setRequestBodyExtractor(
514526
request ->
515527
ProtoRestSerializer.create()
516-
.toBody("database", request.getDatabase(), false))
528+
.toBody("database", request.getDatabase(), true))
517529
.build())
518530
.setResponseParser(
519531
ProtoMessageResponseParser.<Operation>newBuilder()

0 commit comments

Comments
 (0)