Skip to content
This repository was archived by the owner on May 14, 2026. It is now read-only.

Commit 70cc38d

Browse files
mpeddada1mpeddada1
authored
ci(showcase): disable rest_numeric_enum for showcase testing (#1284)
* ci(showcase): disable rest_numeric_enum feature in showcase tests
1 parent b7ca95f commit 70cc38d

9 files changed

Lines changed: 33 additions & 92 deletions

File tree

‎showcase/BUILD.bazel‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,9 @@ java_gapic_library(
4949
srcs = [":showcase_proto_with_info"],
5050
gapic_yaml = None,
5151
grpc_service_config = "@com_google_gapic_showcase//schema/google/showcase/v1beta1:showcase_grpc_service_config.json",
52-
rest_numeric_enums = True,
52+
# TODO(#1285): Enable rest_numeric_enums once https://github.com/googleapis/gapic-showcase/issues/1255 is
53+
# fixed.
54+
rest_numeric_enums = False,
5355
service_yaml = "@com_google_gapic_showcase//schema/google/showcase/v1beta1:showcase_v1beta1.yaml",
5456
test_deps = [
5557
":showcase_java_grpc",

‎showcase/gapic-showcase/src/main/java/com/google/showcase/v1beta1/stub/HttpJsonComplianceStub.java‎

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -73,13 +73,12 @@ public class HttpJsonComplianceStub extends ComplianceStub {
7373
Map<String, List<String>> fields = new HashMap<>();
7474
ProtoRestSerializer<RepeatRequest> serializer =
7575
ProtoRestSerializer.create();
76-
serializer.putQueryParam(fields, "$alt", "json;enum-encoding=int");
7776
return fields;
7877
})
7978
.setRequestBodyExtractor(
8079
request ->
8180
ProtoRestSerializer.create()
82-
.toBody("*", request.toBuilder().build(), true))
81+
.toBody("*", request.toBuilder().build(), false))
8382
.build())
8483
.setResponseParser(
8584
ProtoMessageResponseParser.<RepeatResponse>newBuilder()
@@ -128,12 +127,11 @@ public class HttpJsonComplianceStub extends ComplianceStub {
128127
}
129128
serializer.putQueryParam(
130129
fields, "serverVerify", request.getServerVerify());
131-
serializer.putQueryParam(fields, "$alt", "json;enum-encoding=int");
132130
return fields;
133131
})
134132
.setRequestBodyExtractor(
135133
request ->
136-
ProtoRestSerializer.create().toBody("info", request.getInfo(), true))
134+
ProtoRestSerializer.create().toBody("info", request.getInfo(), false))
137135
.build())
138136
.setResponseParser(
139137
ProtoMessageResponseParser.<RepeatResponse>newBuilder()
@@ -183,7 +181,6 @@ public class HttpJsonComplianceStub extends ComplianceStub {
183181
}
184182
serializer.putQueryParam(
185183
fields, "serverVerify", request.getServerVerify());
186-
serializer.putQueryParam(fields, "$alt", "json;enum-encoding=int");
187184
return fields;
188185
})
189186
.setRequestBodyExtractor(request -> null)
@@ -246,7 +243,6 @@ public class HttpJsonComplianceStub extends ComplianceStub {
246243
}
247244
serializer.putQueryParam(
248245
fields, "serverVerify", request.getServerVerify());
249-
serializer.putQueryParam(fields, "$alt", "json;enum-encoding=int");
250246
return fields;
251247
})
252248
.setRequestBodyExtractor(request -> null)
@@ -309,7 +305,6 @@ public class HttpJsonComplianceStub extends ComplianceStub {
309305
}
310306
serializer.putQueryParam(
311307
fields, "serverVerify", request.getServerVerify());
312-
serializer.putQueryParam(fields, "$alt", "json;enum-encoding=int");
313308
return fields;
314309
})
315310
.setRequestBodyExtractor(request -> null)
@@ -369,7 +364,6 @@ public class HttpJsonComplianceStub extends ComplianceStub {
369364
}
370365
serializer.putQueryParam(
371366
fields, "serverVerify", request.getServerVerify());
372-
serializer.putQueryParam(fields, "$alt", "json;enum-encoding=int");
373367
return fields;
374368
})
375369
.setRequestBodyExtractor(request -> null)
@@ -402,13 +396,12 @@ public class HttpJsonComplianceStub extends ComplianceStub {
402396
Map<String, List<String>> fields = new HashMap<>();
403397
ProtoRestSerializer<RepeatRequest> serializer =
404398
ProtoRestSerializer.create();
405-
serializer.putQueryParam(fields, "$alt", "json;enum-encoding=int");
406399
return fields;
407400
})
408401
.setRequestBodyExtractor(
409402
request ->
410403
ProtoRestSerializer.create()
411-
.toBody("*", request.toBuilder().build(), true))
404+
.toBody("*", request.toBuilder().build(), false))
412405
.build())
413406
.setResponseParser(
414407
ProtoMessageResponseParser.<RepeatResponse>newBuilder()
@@ -438,13 +431,12 @@ public class HttpJsonComplianceStub extends ComplianceStub {
438431
Map<String, List<String>> fields = new HashMap<>();
439432
ProtoRestSerializer<RepeatRequest> serializer =
440433
ProtoRestSerializer.create();
441-
serializer.putQueryParam(fields, "$alt", "json;enum-encoding=int");
442434
return fields;
443435
})
444436
.setRequestBodyExtractor(
445437
request ->
446438
ProtoRestSerializer.create()
447-
.toBody("*", request.toBuilder().build(), true))
439+
.toBody("*", request.toBuilder().build(), false))
448440
.build())
449441
.setResponseParser(
450442
ProtoMessageResponseParser.<RepeatResponse>newBuilder()
@@ -472,7 +464,6 @@ public class HttpJsonComplianceStub extends ComplianceStub {
472464
Map<String, List<String>> fields = new HashMap<>();
473465
ProtoRestSerializer<EnumRequest> serializer = ProtoRestSerializer.create();
474466
serializer.putQueryParam(fields, "unknownEnum", request.getUnknownEnum());
475-
serializer.putQueryParam(fields, "$alt", "json;enum-encoding=int");
476467
return fields;
477468
})
478469
.setRequestBodyExtractor(request -> null)
@@ -504,7 +495,6 @@ public class HttpJsonComplianceStub extends ComplianceStub {
504495
ProtoRestSerializer<EnumResponse> serializer = ProtoRestSerializer.create();
505496
serializer.putQueryParam(fields, "continent", request.getContinentValue());
506497
serializer.putQueryParam(fields, "request", request.getRequest());
507-
serializer.putQueryParam(fields, "$alt", "json;enum-encoding=int");
508498
return fields;
509499
})
510500
.setRequestBodyExtractor(request -> null)

‎showcase/gapic-showcase/src/main/java/com/google/showcase/v1beta1/stub/HttpJsonEchoStub.java‎

Lines changed: 7 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -93,13 +93,12 @@ public class HttpJsonEchoStub extends EchoStub {
9393
request -> {
9494
Map<String, List<String>> fields = new HashMap<>();
9595
ProtoRestSerializer<EchoRequest> serializer = ProtoRestSerializer.create();
96-
serializer.putQueryParam(fields, "$alt", "json;enum-encoding=int");
9796
return fields;
9897
})
9998
.setRequestBodyExtractor(
10099
request ->
101100
ProtoRestSerializer.create()
102-
.toBody("*", request.toBuilder().build(), true))
101+
.toBody("*", request.toBuilder().build(), false))
103102
.build())
104103
.setResponseParser(
105104
ProtoMessageResponseParser.<EchoResponse>newBuilder()
@@ -128,13 +127,12 @@ public class HttpJsonEchoStub extends EchoStub {
128127
Map<String, List<String>> fields = new HashMap<>();
129128
ProtoRestSerializer<ExpandRequest> serializer =
130129
ProtoRestSerializer.create();
131-
serializer.putQueryParam(fields, "$alt", "json;enum-encoding=int");
132130
return fields;
133131
})
134132
.setRequestBodyExtractor(
135133
request ->
136134
ProtoRestSerializer.create()
137-
.toBody("*", request.toBuilder().build(), true))
135+
.toBody("*", request.toBuilder().build(), false))
138136
.build())
139137
.setResponseParser(
140138
ProtoMessageResponseParser.<EchoResponse>newBuilder()
@@ -164,13 +162,12 @@ public class HttpJsonEchoStub extends EchoStub {
164162
Map<String, List<String>> fields = new HashMap<>();
165163
ProtoRestSerializer<PagedExpandRequest> serializer =
166164
ProtoRestSerializer.create();
167-
serializer.putQueryParam(fields, "$alt", "json;enum-encoding=int");
168165
return fields;
169166
})
170167
.setRequestBodyExtractor(
171168
request ->
172169
ProtoRestSerializer.create()
173-
.toBody("*", request.toBuilder().build(), true))
170+
.toBody("*", request.toBuilder().build(), false))
174171
.build())
175172
.setResponseParser(
176173
ProtoMessageResponseParser.<PagedExpandResponse>newBuilder()
@@ -200,13 +197,12 @@ public class HttpJsonEchoStub extends EchoStub {
200197
Map<String, List<String>> fields = new HashMap<>();
201198
ProtoRestSerializer<PagedExpandLegacyRequest> serializer =
202199
ProtoRestSerializer.create();
203-
serializer.putQueryParam(fields, "$alt", "json;enum-encoding=int");
204200
return fields;
205201
})
206202
.setRequestBodyExtractor(
207203
request ->
208204
ProtoRestSerializer.create()
209-
.toBody("*", request.toBuilder().build(), true))
205+
.toBody("*", request.toBuilder().build(), false))
210206
.build())
211207
.setResponseParser(
212208
ProtoMessageResponseParser.<PagedExpandResponse>newBuilder()
@@ -236,13 +232,12 @@ public class HttpJsonEchoStub extends EchoStub {
236232
Map<String, List<String>> fields = new HashMap<>();
237233
ProtoRestSerializer<PagedExpandRequest> serializer =
238234
ProtoRestSerializer.create();
239-
serializer.putQueryParam(fields, "$alt", "json;enum-encoding=int");
240235
return fields;
241236
})
242237
.setRequestBodyExtractor(
243238
request ->
244239
ProtoRestSerializer.create()
245-
.toBody("*", request.toBuilder().build(), true))
240+
.toBody("*", request.toBuilder().build(), false))
246241
.build())
247242
.setResponseParser(
248243
ProtoMessageResponseParser.<PagedExpandLegacyMappedResponse>newBuilder()
@@ -269,13 +264,12 @@ public class HttpJsonEchoStub extends EchoStub {
269264
request -> {
270265
Map<String, List<String>> fields = new HashMap<>();
271266
ProtoRestSerializer<WaitRequest> serializer = ProtoRestSerializer.create();
272-
serializer.putQueryParam(fields, "$alt", "json;enum-encoding=int");
273267
return fields;
274268
})
275269
.setRequestBodyExtractor(
276270
request ->
277271
ProtoRestSerializer.create()
278-
.toBody("*", request.toBuilder().build(), true))
272+
.toBody("*", request.toBuilder().build(), false))
279273
.build())
280274
.setResponseParser(
281275
ProtoMessageResponseParser.<Operation>newBuilder()
@@ -305,13 +299,12 @@ public class HttpJsonEchoStub extends EchoStub {
305299
request -> {
306300
Map<String, List<String>> fields = new HashMap<>();
307301
ProtoRestSerializer<BlockRequest> serializer = ProtoRestSerializer.create();
308-
serializer.putQueryParam(fields, "$alt", "json;enum-encoding=int");
309302
return fields;
310303
})
311304
.setRequestBodyExtractor(
312305
request ->
313306
ProtoRestSerializer.create()
314-
.toBody("*", request.toBuilder().build(), true))
307+
.toBody("*", request.toBuilder().build(), false))
315308
.build())
316309
.setResponseParser(
317310
ProtoMessageResponseParser.<BlockResponse>newBuilder()

‎showcase/gapic-showcase/src/main/java/com/google/showcase/v1beta1/stub/HttpJsonIdentityStub.java‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -78,13 +78,12 @@ public class HttpJsonIdentityStub extends IdentityStub {
7878
Map<String, List<String>> fields = new HashMap<>();
7979
ProtoRestSerializer<CreateUserRequest> serializer =
8080
ProtoRestSerializer.create();
81-
serializer.putQueryParam(fields, "$alt", "json;enum-encoding=int");
8281
return fields;
8382
})
8483
.setRequestBodyExtractor(
8584
request ->
8685
ProtoRestSerializer.create()
87-
.toBody("*", request.toBuilder().build(), true))
86+
.toBody("*", request.toBuilder().build(), false))
8887
.build())
8988
.setResponseParser(
9089
ProtoMessageResponseParser.<User>newBuilder()
@@ -114,7 +113,6 @@ public class HttpJsonIdentityStub extends IdentityStub {
114113
Map<String, List<String>> fields = new HashMap<>();
115114
ProtoRestSerializer<GetUserRequest> serializer =
116115
ProtoRestSerializer.create();
117-
serializer.putQueryParam(fields, "$alt", "json;enum-encoding=int");
118116
return fields;
119117
})
120118
.setRequestBodyExtractor(request -> null)
@@ -148,12 +146,11 @@ public class HttpJsonIdentityStub extends IdentityStub {
148146
ProtoRestSerializer<UpdateUserRequest> serializer =
149147
ProtoRestSerializer.create();
150148
serializer.putQueryParam(fields, "updateMask", request.getUpdateMask());
151-
serializer.putQueryParam(fields, "$alt", "json;enum-encoding=int");
152149
return fields;
153150
})
154151
.setRequestBodyExtractor(
155152
request ->
156-
ProtoRestSerializer.create().toBody("user", request.getUser(), true))
153+
ProtoRestSerializer.create().toBody("user", request.getUser(), false))
157154
.build())
158155
.setResponseParser(
159156
ProtoMessageResponseParser.<User>newBuilder()
@@ -183,7 +180,6 @@ public class HttpJsonIdentityStub extends IdentityStub {
183180
Map<String, List<String>> fields = new HashMap<>();
184181
ProtoRestSerializer<DeleteUserRequest> serializer =
185182
ProtoRestSerializer.create();
186-
serializer.putQueryParam(fields, "$alt", "json;enum-encoding=int");
187183
return fields;
188184
})
189185
.setRequestBodyExtractor(request -> null)
@@ -218,7 +214,6 @@ public class HttpJsonIdentityStub extends IdentityStub {
218214
ProtoRestSerializer.create();
219215
serializer.putQueryParam(fields, "pageSize", request.getPageSize());
220216
serializer.putQueryParam(fields, "pageToken", request.getPageToken());
221-
serializer.putQueryParam(fields, "$alt", "json;enum-encoding=int");
222217
return fields;
223218
})
224219
.setRequestBodyExtractor(request -> null)

0 commit comments

Comments
 (0)