Skip to content

Commit d8e488f

Browse files
mpeddada1lqiu96
mpeddada1
authored and
lqiu96
committed
ci(showcase): disable rest_numeric_enum for showcase testing (#1284)
* ci(showcase): disable rest_numeric_enum feature in showcase tests
1 parent 316621c commit d8e488f

File tree

9 files changed

+33
-92
lines changed

9 files changed

+33
-92
lines changed

‎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
@@ -94,13 +94,12 @@ public class HttpJsonEchoStub extends EchoStub {
9494
request -> {
9595
Map<String, List<String>> fields = new HashMap<>();
9696
ProtoRestSerializer<EchoRequest> serializer = ProtoRestSerializer.create();
97-
serializer.putQueryParam(fields, "$alt", "json;enum-encoding=int");
9897
return fields;
9998
})
10099
.setRequestBodyExtractor(
101100
request ->
102101
ProtoRestSerializer.create()
103-
.toBody("*", request.toBuilder().build(), true))
102+
.toBody("*", request.toBuilder().build(), false))
104103
.build())
105104
.setResponseParser(
106105
ProtoMessageResponseParser.<EchoResponse>newBuilder()
@@ -129,13 +128,12 @@ public class HttpJsonEchoStub extends EchoStub {
129128
Map<String, List<String>> fields = new HashMap<>();
130129
ProtoRestSerializer<ExpandRequest> serializer =
131130
ProtoRestSerializer.create();
132-
serializer.putQueryParam(fields, "$alt", "json;enum-encoding=int");
133131
return fields;
134132
})
135133
.setRequestBodyExtractor(
136134
request ->
137135
ProtoRestSerializer.create()
138-
.toBody("*", request.toBuilder().build(), true))
136+
.toBody("*", request.toBuilder().build(), false))
139137
.build())
140138
.setResponseParser(
141139
ProtoMessageResponseParser.<EchoResponse>newBuilder()
@@ -165,13 +163,12 @@ public class HttpJsonEchoStub extends EchoStub {
165163
Map<String, List<String>> fields = new HashMap<>();
166164
ProtoRestSerializer<PagedExpandRequest> serializer =
167165
ProtoRestSerializer.create();
168-
serializer.putQueryParam(fields, "$alt", "json;enum-encoding=int");
169166
return fields;
170167
})
171168
.setRequestBodyExtractor(
172169
request ->
173170
ProtoRestSerializer.create()
174-
.toBody("*", request.toBuilder().build(), true))
171+
.toBody("*", request.toBuilder().build(), false))
175172
.build())
176173
.setResponseParser(
177174
ProtoMessageResponseParser.<PagedExpandResponse>newBuilder()
@@ -201,13 +198,12 @@ public class HttpJsonEchoStub extends EchoStub {
201198
Map<String, List<String>> fields = new HashMap<>();
202199
ProtoRestSerializer<PagedExpandLegacyRequest> serializer =
203200
ProtoRestSerializer.create();
204-
serializer.putQueryParam(fields, "$alt", "json;enum-encoding=int");
205201
return fields;
206202
})
207203
.setRequestBodyExtractor(
208204
request ->
209205
ProtoRestSerializer.create()
210-
.toBody("*", request.toBuilder().build(), true))
206+
.toBody("*", request.toBuilder().build(), false))
211207
.build())
212208
.setResponseParser(
213209
ProtoMessageResponseParser.<PagedExpandResponse>newBuilder()
@@ -237,13 +233,12 @@ public class HttpJsonEchoStub extends EchoStub {
237233
Map<String, List<String>> fields = new HashMap<>();
238234
ProtoRestSerializer<PagedExpandRequest> serializer =
239235
ProtoRestSerializer.create();
240-
serializer.putQueryParam(fields, "$alt", "json;enum-encoding=int");
241236
return fields;
242237
})
243238
.setRequestBodyExtractor(
244239
request ->
245240
ProtoRestSerializer.create()
246-
.toBody("*", request.toBuilder().build(), true))
241+
.toBody("*", request.toBuilder().build(), false))
247242
.build())
248243
.setResponseParser(
249244
ProtoMessageResponseParser.<PagedExpandLegacyMappedResponse>newBuilder()
@@ -270,13 +265,12 @@ public class HttpJsonEchoStub extends EchoStub {
270265
request -> {
271266
Map<String, List<String>> fields = new HashMap<>();
272267
ProtoRestSerializer<WaitRequest> serializer = ProtoRestSerializer.create();
273-
serializer.putQueryParam(fields, "$alt", "json;enum-encoding=int");
274268
return fields;
275269
})
276270
.setRequestBodyExtractor(
277271
request ->
278272
ProtoRestSerializer.create()
279-
.toBody("*", request.toBuilder().build(), true))
273+
.toBody("*", request.toBuilder().build(), false))
280274
.build())
281275
.setResponseParser(
282276
ProtoMessageResponseParser.<Operation>newBuilder()
@@ -306,13 +300,12 @@ public class HttpJsonEchoStub extends EchoStub {
306300
request -> {
307301
Map<String, List<String>> fields = new HashMap<>();
308302
ProtoRestSerializer<BlockRequest> serializer = ProtoRestSerializer.create();
309-
serializer.putQueryParam(fields, "$alt", "json;enum-encoding=int");
310303
return fields;
311304
})
312305
.setRequestBodyExtractor(
313306
request ->
314307
ProtoRestSerializer.create()
315-
.toBody("*", request.toBuilder().build(), true))
308+
.toBody("*", request.toBuilder().build(), false))
316309
.build())
317310
.setResponseParser(
318311
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)