Skip to content

Commit 72773c2

Browse files
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 (#933)
* 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 212d4e8 commit 72773c2

File tree

1 file changed

+9
-3
lines changed

1 file changed

+9
-3
lines changed

google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/stub/HttpJsonDatastoreAdminStub.java

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -97,12 +97,13 @@ public class HttpJsonDatastoreAdminStub extends DatastoreAdminStub {
9797
Map<String, List<String>> fields = new HashMap<>();
9898
ProtoRestSerializer<ExportEntitiesRequest> serializer =
9999
ProtoRestSerializer.create();
100+
serializer.putQueryParam(fields, "$alt", "json;enum-encoding=int");
100101
return fields;
101102
})
102103
.setRequestBodyExtractor(
103104
request ->
104105
ProtoRestSerializer.create()
105-
.toBody("*", request.toBuilder().clearProjectId().build(), false))
106+
.toBody("*", request.toBuilder().clearProjectId().build(), true))
106107
.build())
107108
.setResponseParser(
108109
ProtoMessageResponseParser.<Operation>newBuilder()
@@ -136,12 +137,13 @@ public class HttpJsonDatastoreAdminStub extends DatastoreAdminStub {
136137
Map<String, List<String>> fields = new HashMap<>();
137138
ProtoRestSerializer<ImportEntitiesRequest> serializer =
138139
ProtoRestSerializer.create();
140+
serializer.putQueryParam(fields, "$alt", "json;enum-encoding=int");
139141
return fields;
140142
})
141143
.setRequestBodyExtractor(
142144
request ->
143145
ProtoRestSerializer.create()
144-
.toBody("*", request.toBuilder().clearProjectId().build(), false))
146+
.toBody("*", request.toBuilder().clearProjectId().build(), true))
145147
.build())
146148
.setResponseParser(
147149
ProtoMessageResponseParser.<Operation>newBuilder()
@@ -175,12 +177,13 @@ public class HttpJsonDatastoreAdminStub extends DatastoreAdminStub {
175177
Map<String, List<String>> fields = new HashMap<>();
176178
ProtoRestSerializer<CreateIndexRequest> serializer =
177179
ProtoRestSerializer.create();
180+
serializer.putQueryParam(fields, "$alt", "json;enum-encoding=int");
178181
return fields;
179182
})
180183
.setRequestBodyExtractor(
181184
request ->
182185
ProtoRestSerializer.create()
183-
.toBody("index", request.getIndex(), false))
186+
.toBody("index", request.getIndex(), true))
184187
.build())
185188
.setResponseParser(
186189
ProtoMessageResponseParser.<Operation>newBuilder()
@@ -215,6 +218,7 @@ public class HttpJsonDatastoreAdminStub extends DatastoreAdminStub {
215218
Map<String, List<String>> fields = new HashMap<>();
216219
ProtoRestSerializer<DeleteIndexRequest> serializer =
217220
ProtoRestSerializer.create();
221+
serializer.putQueryParam(fields, "$alt", "json;enum-encoding=int");
218222
return fields;
219223
})
220224
.setRequestBodyExtractor(request -> null)
@@ -251,6 +255,7 @@ public class HttpJsonDatastoreAdminStub extends DatastoreAdminStub {
251255
Map<String, List<String>> fields = new HashMap<>();
252256
ProtoRestSerializer<GetIndexRequest> serializer =
253257
ProtoRestSerializer.create();
258+
serializer.putQueryParam(fields, "$alt", "json;enum-encoding=int");
254259
return fields;
255260
})
256261
.setRequestBodyExtractor(request -> null)
@@ -287,6 +292,7 @@ public class HttpJsonDatastoreAdminStub extends DatastoreAdminStub {
287292
serializer.putQueryParam(fields, "filter", request.getFilter());
288293
serializer.putQueryParam(fields, "pageSize", request.getPageSize());
289294
serializer.putQueryParam(fields, "pageToken", request.getPageToken());
295+
serializer.putQueryParam(fields, "$alt", "json;enum-encoding=int");
290296
return fields;
291297
})
292298
.setRequestBodyExtractor(request -> null)

0 commit comments

Comments
 (0)