Skip to content

Commit e5988a0

Browse files
vam-googlevam-google
authored
fix: Remove HttpMethod compile time dependency from genrated HttpJson stubs (#1004)
1 parent 704ee11 commit e5988a0

File tree

5 files changed

+23
-33
lines changed

5 files changed

+23
-33
lines changed

‎src/main/java/com/google/api/generator/gapic/composer/rest/HttpJsonServiceStubClassComposer.java‎

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414

1515
package com.google.api.generator.gapic.composer.rest;
1616

17-
import com.google.api.client.http.HttpMethods;
1817
import com.google.api.core.InternalApi;
1918
import com.google.api.gax.httpjson.ApiMethodDescriptor;
2019
import com.google.api.gax.httpjson.ApiMethodDescriptor.MethodType;
@@ -991,14 +990,9 @@ private Expr createFieldsExtractorClassInstance(
991990
}
992991

993992
private List<Expr> getHttpMethodTypeExpr(Method protoMethod) {
994-
EnumRefExpr expr =
995-
EnumRefExpr.builder()
996-
.setName(protoMethod.httpBindings().httpVerb().toString())
997-
.setType(
998-
TypeNode.withReference(
999-
ConcreteReference.builder().setClazz(HttpMethods.class).build()))
1000-
.build();
1001-
return Collections.singletonList(expr);
993+
return Collections.singletonList(
994+
ValueExpr.withValue(
995+
StringObjectValue.withValue(protoMethod.httpBindings().httpVerb().toString())));
1002996
}
1003997

1004998
private List<Expr> getMethodTypeExpr(Method protoMethod) {

‎src/test/java/com/google/api/generator/gapic/composer/grpcrest/goldens/HttpJsonEchoStub.golden‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ package com.google.showcase.grpcrest.v1beta1.stub;
33
import static com.google.showcase.grpcrest.v1beta1.EchoClient.PagedExpandPagedResponse;
44
import static com.google.showcase.grpcrest.v1beta1.EchoClient.SimplePagedExpandPagedResponse;
55

6-
import com.google.api.client.http.HttpMethods;
76
import com.google.api.core.BetaApi;
87
import com.google.api.core.InternalApi;
98
import com.google.api.gax.core.BackgroundResource;
@@ -60,7 +59,7 @@ public class HttpJsonEchoStub extends EchoStub {
6059
private static final ApiMethodDescriptor<EchoRequest, EchoResponse> echoMethodDescriptor =
6160
ApiMethodDescriptor.<EchoRequest, EchoResponse>newBuilder()
6261
.setFullMethodName("google.showcase.grpcrest.v1beta1.Echo/Echo")
63-
.setHttpMethod(HttpMethods.POST)
62+
.setHttpMethod("POST")
6463
.setType(ApiMethodDescriptor.MethodType.UNARY)
6564
.setRequestFormatter(
6665
ProtoMessageRequestFormatter.<EchoRequest>newBuilder()
@@ -91,7 +90,7 @@ public class HttpJsonEchoStub extends EchoStub {
9190
private static final ApiMethodDescriptor<ExpandRequest, EchoResponse> expandMethodDescriptor =
9291
ApiMethodDescriptor.<ExpandRequest, EchoResponse>newBuilder()
9392
.setFullMethodName("google.showcase.grpcrest.v1beta1.Echo/Expand")
94-
.setHttpMethod(HttpMethods.POST)
93+
.setHttpMethod("POST")
9594
.setType(ApiMethodDescriptor.MethodType.SERVER_STREAMING)
9695
.setRequestFormatter(
9796
ProtoMessageRequestFormatter.<ExpandRequest>newBuilder()
@@ -126,7 +125,7 @@ public class HttpJsonEchoStub extends EchoStub {
126125
pagedExpandMethodDescriptor =
127126
ApiMethodDescriptor.<PagedExpandRequest, PagedExpandResponse>newBuilder()
128127
.setFullMethodName("google.showcase.grpcrest.v1beta1.Echo/PagedExpand")
129-
.setHttpMethod(HttpMethods.POST)
128+
.setHttpMethod("POST")
130129
.setType(ApiMethodDescriptor.MethodType.UNARY)
131130
.setRequestFormatter(
132131
ProtoMessageRequestFormatter.<PagedExpandRequest>newBuilder()
@@ -160,7 +159,7 @@ public class HttpJsonEchoStub extends EchoStub {
160159
simplePagedExpandMethodDescriptor =
161160
ApiMethodDescriptor.<PagedExpandRequest, PagedExpandResponse>newBuilder()
162161
.setFullMethodName("google.showcase.grpcrest.v1beta1.Echo/SimplePagedExpand")
163-
.setHttpMethod(HttpMethods.POST)
162+
.setHttpMethod("POST")
164163
.setType(ApiMethodDescriptor.MethodType.UNARY)
165164
.setRequestFormatter(
166165
ProtoMessageRequestFormatter.<PagedExpandRequest>newBuilder()
@@ -193,7 +192,7 @@ public class HttpJsonEchoStub extends EchoStub {
193192
private static final ApiMethodDescriptor<WaitRequest, Operation> waitMethodDescriptor =
194193
ApiMethodDescriptor.<WaitRequest, Operation>newBuilder()
195194
.setFullMethodName("google.showcase.grpcrest.v1beta1.Echo/Wait")
196-
.setHttpMethod(HttpMethods.POST)
195+
.setHttpMethod("POST")
197196
.setType(ApiMethodDescriptor.MethodType.UNARY)
198197
.setRequestFormatter(
199198
ProtoMessageRequestFormatter.<WaitRequest>newBuilder()
@@ -227,7 +226,7 @@ public class HttpJsonEchoStub extends EchoStub {
227226
private static final ApiMethodDescriptor<BlockRequest, BlockResponse> blockMethodDescriptor =
228227
ApiMethodDescriptor.<BlockRequest, BlockResponse>newBuilder()
229228
.setFullMethodName("google.showcase.grpcrest.v1beta1.Echo/Block")
230-
.setHttpMethod(HttpMethods.POST)
229+
.setHttpMethod("POST")
231230
.setType(ApiMethodDescriptor.MethodType.UNARY)
232231
.setRequestFormatter(
233232
ProtoMessageRequestFormatter.<BlockRequest>newBuilder()
@@ -258,7 +257,7 @@ public class HttpJsonEchoStub extends EchoStub {
258257
private static final ApiMethodDescriptor<EchoRequest, Object> collideNameMethodDescriptor =
259258
ApiMethodDescriptor.<EchoRequest, Object>newBuilder()
260259
.setFullMethodName("google.showcase.grpcrest.v1beta1.Echo/CollideName")
261-
.setHttpMethod(HttpMethods.POST)
260+
.setHttpMethod("POST")
262261
.setType(ApiMethodDescriptor.MethodType.UNARY)
263262
.setRequestFormatter(
264263
ProtoMessageRequestFormatter.<EchoRequest>newBuilder()
@@ -289,7 +288,7 @@ public class HttpJsonEchoStub extends EchoStub {
289288
private static final ApiMethodDescriptor<EchoRequest, Object> nestedBindingMethodDescriptor =
290289
ApiMethodDescriptor.<EchoRequest, Object>newBuilder()
291290
.setFullMethodName("google.showcase.grpcrest.v1beta1.Echo/NestedBinding")
292-
.setHttpMethod(HttpMethods.POST)
291+
.setHttpMethod("POST")
293292
.setType(ApiMethodDescriptor.MethodType.UNARY)
294293
.setRequestFormatter(
295294
ProtoMessageRequestFormatter.<EchoRequest>newBuilder()

‎src/test/java/com/google/api/generator/gapic/composer/rest/goldens/HttpJsonComplianceStub.golden‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package com.google.showcase.v1beta1.stub;
22

3-
import com.google.api.client.http.HttpMethods;
43
import com.google.api.core.BetaApi;
54
import com.google.api.core.InternalApi;
65
import com.google.api.gax.core.BackgroundResource;
@@ -39,7 +38,7 @@ public class HttpJsonComplianceStub extends ComplianceStub {
3938
repeatDataBodyMethodDescriptor =
4039
ApiMethodDescriptor.<RepeatRequest, RepeatResponse>newBuilder()
4140
.setFullMethodName("google.showcase.v1beta1.Compliance/RepeatDataBody")
42-
.setHttpMethod(HttpMethods.POST)
41+
.setHttpMethod("POST")
4342
.setType(ApiMethodDescriptor.MethodType.UNARY)
4443
.setRequestFormatter(
4544
ProtoMessageRequestFormatter.<RepeatRequest>newBuilder()
@@ -73,7 +72,7 @@ public class HttpJsonComplianceStub extends ComplianceStub {
7372
repeatDataBodyInfoMethodDescriptor =
7473
ApiMethodDescriptor.<RepeatRequest, RepeatResponse>newBuilder()
7574
.setFullMethodName("google.showcase.v1beta1.Compliance/RepeatDataBodyInfo")
76-
.setHttpMethod(HttpMethods.POST)
75+
.setHttpMethod("POST")
7776
.setType(ApiMethodDescriptor.MethodType.UNARY)
7877
.setRequestFormatter(
7978
ProtoMessageRequestFormatter.<RepeatRequest>newBuilder()
@@ -109,7 +108,7 @@ public class HttpJsonComplianceStub extends ComplianceStub {
109108
repeatDataQueryMethodDescriptor =
110109
ApiMethodDescriptor.<RepeatRequest, RepeatResponse>newBuilder()
111110
.setFullMethodName("google.showcase.v1beta1.Compliance/RepeatDataQuery")
112-
.setHttpMethod(HttpMethods.GET)
111+
.setHttpMethod("GET")
113112
.setType(ApiMethodDescriptor.MethodType.UNARY)
114113
.setRequestFormatter(
115114
ProtoMessageRequestFormatter.<RepeatRequest>newBuilder()
@@ -145,7 +144,7 @@ public class HttpJsonComplianceStub extends ComplianceStub {
145144
repeatDataSimplePathMethodDescriptor =
146145
ApiMethodDescriptor.<RepeatRequest, RepeatResponse>newBuilder()
147146
.setFullMethodName("google.showcase.v1beta1.Compliance/RepeatDataSimplePath")
148-
.setHttpMethod(HttpMethods.GET)
147+
.setHttpMethod("GET")
149148
.setType(ApiMethodDescriptor.MethodType.UNARY)
150149
.setRequestFormatter(
151150
ProtoMessageRequestFormatter.<RepeatRequest>newBuilder()
@@ -193,7 +192,7 @@ public class HttpJsonComplianceStub extends ComplianceStub {
193192
repeatDataPathResourceMethodDescriptor =
194193
ApiMethodDescriptor.<RepeatRequest, RepeatResponse>newBuilder()
195194
.setFullMethodName("google.showcase.v1beta1.Compliance/RepeatDataPathResource")
196-
.setHttpMethod(HttpMethods.GET)
195+
.setHttpMethod("GET")
197196
.setType(ApiMethodDescriptor.MethodType.UNARY)
198197
.setRequestFormatter(
199198
ProtoMessageRequestFormatter.<RepeatRequest>newBuilder()
@@ -240,7 +239,7 @@ public class HttpJsonComplianceStub extends ComplianceStub {
240239
ApiMethodDescriptor.<RepeatRequest, RepeatResponse>newBuilder()
241240
.setFullMethodName(
242241
"google.showcase.v1beta1.Compliance/RepeatDataPathTrailingResource")
243-
.setHttpMethod(HttpMethods.GET)
242+
.setHttpMethod("GET")
244243
.setType(ApiMethodDescriptor.MethodType.UNARY)
245244
.setRequestFormatter(
246245
ProtoMessageRequestFormatter.<RepeatRequest>newBuilder()

‎test/integration/goldens/compute/src/com/google/cloud/compute/v1small/stub/HttpJsonAddressesStub.java‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
import static com.google.cloud.compute.v1small.AddressesClient.AggregatedListPagedResponse;
2020
import static com.google.cloud.compute.v1small.AddressesClient.ListPagedResponse;
2121

22-
import com.google.api.client.http.HttpMethods;
2322
import com.google.api.core.BetaApi;
2423
import com.google.api.core.InternalApi;
2524
import com.google.api.gax.core.BackgroundResource;
@@ -68,7 +67,7 @@ public class HttpJsonAddressesStub extends AddressesStub {
6867
aggregatedListMethodDescriptor =
6968
ApiMethodDescriptor.<AggregatedListAddressesRequest, AddressAggregatedList>newBuilder()
7069
.setFullMethodName("google.cloud.compute.v1small.Addresses/AggregatedList")
71-
.setHttpMethod(HttpMethods.GET)
70+
.setHttpMethod("GET")
7271
.setType(ApiMethodDescriptor.MethodType.UNARY)
7372
.setRequestFormatter(
7473
ProtoMessageRequestFormatter.<AggregatedListAddressesRequest>newBuilder()
@@ -117,7 +116,7 @@ public class HttpJsonAddressesStub extends AddressesStub {
117116
private static final ApiMethodDescriptor<DeleteAddressRequest, Operation> deleteMethodDescriptor =
118117
ApiMethodDescriptor.<DeleteAddressRequest, Operation>newBuilder()
119118
.setFullMethodName("google.cloud.compute.v1small.Addresses/Delete")
120-
.setHttpMethod(HttpMethods.DELETE)
119+
.setHttpMethod("DELETE")
121120
.setType(ApiMethodDescriptor.MethodType.UNARY)
122121
.setRequestFormatter(
123122
ProtoMessageRequestFormatter.<DeleteAddressRequest>newBuilder()
@@ -167,7 +166,7 @@ public class HttpJsonAddressesStub extends AddressesStub {
167166
private static final ApiMethodDescriptor<InsertAddressRequest, Operation> insertMethodDescriptor =
168167
ApiMethodDescriptor.<InsertAddressRequest, Operation>newBuilder()
169168
.setFullMethodName("google.cloud.compute.v1small.Addresses/Insert")
170-
.setHttpMethod(HttpMethods.POST)
169+
.setHttpMethod("POST")
171170
.setType(ApiMethodDescriptor.MethodType.UNARY)
172171
.setRequestFormatter(
173172
ProtoMessageRequestFormatter.<InsertAddressRequest>newBuilder()
@@ -219,7 +218,7 @@ public class HttpJsonAddressesStub extends AddressesStub {
219218
private static final ApiMethodDescriptor<ListAddressesRequest, AddressList> listMethodDescriptor =
220219
ApiMethodDescriptor.<ListAddressesRequest, AddressList>newBuilder()
221220
.setFullMethodName("google.cloud.compute.v1small.Addresses/List")
222-
.setHttpMethod(HttpMethods.GET)
221+
.setHttpMethod("GET")
223222
.setType(ApiMethodDescriptor.MethodType.UNARY)
224223
.setRequestFormatter(
225224
ProtoMessageRequestFormatter.<ListAddressesRequest>newBuilder()

‎test/integration/goldens/compute/src/com/google/cloud/compute/v1small/stub/HttpJsonRegionOperationsStub.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616

1717
package com.google.cloud.compute.v1small.stub;
1818

19-
import com.google.api.client.http.HttpMethods;
2019
import com.google.api.core.BetaApi;
2120
import com.google.api.core.InternalApi;
2221
import com.google.api.gax.core.BackgroundResource;
@@ -62,7 +61,7 @@ public class HttpJsonRegionOperationsStub extends RegionOperationsStub {
6261
getMethodDescriptor =
6362
ApiMethodDescriptor.<GetRegionOperationRequest, Operation>newBuilder()
6463
.setFullMethodName("google.cloud.compute.v1small.RegionOperations/Get")
65-
.setHttpMethod(HttpMethods.GET)
64+
.setHttpMethod("GET")
6665
.setType(ApiMethodDescriptor.MethodType.UNARY)
6766
.setRequestFormatter(
6867
ProtoMessageRequestFormatter.<GetRegionOperationRequest>newBuilder()
@@ -117,7 +116,7 @@ public class HttpJsonRegionOperationsStub extends RegionOperationsStub {
117116
waitMethodDescriptor =
118117
ApiMethodDescriptor.<WaitRegionOperationRequest, Operation>newBuilder()
119118
.setFullMethodName("google.cloud.compute.v1small.RegionOperations/Wait")
120-
.setHttpMethod(HttpMethods.POST)
119+
.setHttpMethod("POST")
121120
.setType(ApiMethodDescriptor.MethodType.UNARY)
122121
.setRequestFormatter(
123122
ProtoMessageRequestFormatter.<WaitRegionOperationRequest>newBuilder()

0 commit comments

Comments
 (0)