Skip to content
This repository was archived by the owner on Sep 16, 2023. It is now read-only.

Commit a9b4f58

Browse files
gcf-owl-bot[bot]gcf-owl-bot[bot]
authored
feat: Enable REST transport for most of Java and Go clients (#669)
- [ ] Regenerate this pull request now. PiperOrigin-RevId: 456641589 Source-Link: googleapis/googleapis@8a251f5 Source-Link: https://github.com/googleapis/googleapis-gen/commit/4ca52a529cf01308d9714950edffbea3560cfbdb Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiNGNhNTJhNTI5Y2YwMTMwOGQ5NzE0OTUwZWRmZmJlYTM1NjBjZmJkYiJ9
1 parent 060a9e1 commit a9b4f58

File tree

45 files changed

+3070
-10
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+3070
-10
lines changed

‎google-cloud-webrisk/pom.xml

+16
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,10 @@
6262
<groupId>com.google.api</groupId>
6363
<artifactId>gax-grpc</artifactId>
6464
</dependency>
65+
<dependency>
66+
<groupId>com.google.api</groupId>
67+
<artifactId>gax-httpjson</artifactId>
68+
</dependency>
6569
<dependency>
6670
<groupId>org.threeten</groupId>
6771
<artifactId>threetenbp</artifactId>
@@ -85,12 +89,24 @@
8589
<scope>test</scope>
8690
</dependency>
8791
<!-- Need testing utility classes for generated gRPC clients tests -->
92+
<dependency>
93+
<groupId>com.google.api</groupId>
94+
<artifactId>gax</artifactId>
95+
<classifier>testlib</classifier>
96+
<scope>test</scope>
97+
</dependency>
8898
<dependency>
8999
<groupId>com.google.api</groupId>
90100
<artifactId>gax-grpc</artifactId>
91101
<classifier>testlib</classifier>
92102
<scope>test</scope>
93103
</dependency>
104+
<dependency>
105+
<groupId>com.google.api</groupId>
106+
<artifactId>gax-httpjson</artifactId>
107+
<classifier>testlib</classifier>
108+
<scope>test</scope>
109+
</dependency>
94110
</dependencies>
95111

96112
<profiles>

‎google-cloud-webrisk/src/main/java/com/google/cloud/webrisk/v1/WebRiskServiceClient.java

+14
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,20 @@
105105
* WebRiskServiceClient webRiskServiceClient = WebRiskServiceClient.create(webRiskServiceSettings);
106106
* }</pre>
107107
*
108+
* <p>To use REST (HTTP1.1/JSON) transport (instead of gRPC) for sending and receiving requests over
109+
* the wire:
110+
*
111+
* <pre>{@code
112+
* // This snippet has been automatically generated for illustrative purposes only.
113+
* // It may require modifications to work in your environment.
114+
* WebRiskServiceSettings webRiskServiceSettings =
115+
* WebRiskServiceSettings.newBuilder()
116+
* .setTransportChannelProvider(
117+
* WebRiskServiceSettings.defaultHttpJsonTransportProviderBuilder().build())
118+
* .build();
119+
* WebRiskServiceClient webRiskServiceClient = WebRiskServiceClient.create(webRiskServiceSettings);
120+
* }</pre>
121+
*
108122
* <p>Please refer to the GitHub repository's samples for more quickstart code snippets.
109123
*/
110124
@Generated("by gapic-generator-java")

‎google-cloud-webrisk/src/main/java/com/google/cloud/webrisk/v1/WebRiskServiceSettings.java

+21-2
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
import com.google.api.gax.core.GoogleCredentialsProvider;
2222
import com.google.api.gax.core.InstantiatingExecutorProvider;
2323
import com.google.api.gax.grpc.InstantiatingGrpcChannelProvider;
24+
import com.google.api.gax.httpjson.InstantiatingHttpJsonChannelProvider;
2425
import com.google.api.gax.rpc.ApiClientHeaderProvider;
2526
import com.google.api.gax.rpc.ClientContext;
2627
import com.google.api.gax.rpc.ClientSettings;
@@ -122,11 +123,18 @@ public static GoogleCredentialsProvider.Builder defaultCredentialsProviderBuilde
122123
return WebRiskServiceStubSettings.defaultCredentialsProviderBuilder();
123124
}
124125

125-
/** Returns a builder for the default ChannelProvider for this service. */
126+
/** Returns a builder for the default gRPC ChannelProvider for this service. */
126127
public static InstantiatingGrpcChannelProvider.Builder defaultGrpcTransportProviderBuilder() {
127128
return WebRiskServiceStubSettings.defaultGrpcTransportProviderBuilder();
128129
}
129130

131+
/** Returns a builder for the default REST ChannelProvider for this service. */
132+
@BetaApi
133+
public static InstantiatingHttpJsonChannelProvider.Builder
134+
defaultHttpJsonTransportProviderBuilder() {
135+
return WebRiskServiceStubSettings.defaultHttpJsonTransportProviderBuilder();
136+
}
137+
130138
public static TransportChannelProvider defaultTransportChannelProvider() {
131139
return WebRiskServiceStubSettings.defaultTransportChannelProvider();
132140
}
@@ -136,11 +144,17 @@ public static ApiClientHeaderProvider.Builder defaultApiClientHeaderProviderBuil
136144
return WebRiskServiceStubSettings.defaultApiClientHeaderProviderBuilder();
137145
}
138146

139-
/** Returns a new builder for this class. */
147+
/** Returns a new gRPC builder for this class. */
140148
public static Builder newBuilder() {
141149
return Builder.createDefault();
142150
}
143151

152+
/** Returns a new REST builder for this class. */
153+
@BetaApi
154+
public static Builder newHttpJsonBuilder() {
155+
return Builder.createHttpJsonDefault();
156+
}
157+
144158
/** Returns a new builder for this class. */
145159
public static Builder newBuilder(ClientContext clientContext) {
146160
return new Builder(clientContext);
@@ -178,6 +192,11 @@ private static Builder createDefault() {
178192
return new Builder(WebRiskServiceStubSettings.newBuilder());
179193
}
180194

195+
@BetaApi
196+
private static Builder createHttpJsonDefault() {
197+
return new Builder(WebRiskServiceStubSettings.newHttpJsonBuilder());
198+
}
199+
181200
public WebRiskServiceStubSettings.Builder getStubSettingsBuilder() {
182201
return ((WebRiskServiceStubSettings.Builder) getStubSettings());
183202
}

‎google-cloud-webrisk/src/main/java/com/google/cloud/webrisk/v1/stub/HttpJsonWebRiskServiceCallableFactory.java

+105
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,105 @@
1+
/*
2+
* Copyright 2022 Google LLC
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* https://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
17+
package com.google.cloud.webrisk.v1.stub;
18+
19+
import com.google.api.core.BetaApi;
20+
import com.google.api.gax.httpjson.HttpJsonCallSettings;
21+
import com.google.api.gax.httpjson.HttpJsonCallableFactory;
22+
import com.google.api.gax.httpjson.HttpJsonOperationSnapshotCallable;
23+
import com.google.api.gax.httpjson.HttpJsonStubCallableFactory;
24+
import com.google.api.gax.httpjson.longrunning.stub.OperationsStub;
25+
import com.google.api.gax.rpc.BatchingCallSettings;
26+
import com.google.api.gax.rpc.ClientContext;
27+
import com.google.api.gax.rpc.OperationCallSettings;
28+
import com.google.api.gax.rpc.OperationCallable;
29+
import com.google.api.gax.rpc.PagedCallSettings;
30+
import com.google.api.gax.rpc.ServerStreamingCallSettings;
31+
import com.google.api.gax.rpc.ServerStreamingCallable;
32+
import com.google.api.gax.rpc.UnaryCallSettings;
33+
import com.google.api.gax.rpc.UnaryCallable;
34+
import com.google.longrunning.Operation;
35+
import javax.annotation.Generated;
36+
37+
// AUTO-GENERATED DOCUMENTATION AND CLASS.
38+
/**
39+
* REST callable factory implementation for the WebRiskService service API.
40+
*
41+
* <p>This class is for advanced usage.
42+
*/
43+
@Generated("by gapic-generator-java")
44+
@BetaApi
45+
public class HttpJsonWebRiskServiceCallableFactory
46+
implements HttpJsonStubCallableFactory<Operation, OperationsStub> {
47+
48+
@Override
49+
public <RequestT, ResponseT> UnaryCallable<RequestT, ResponseT> createUnaryCallable(
50+
HttpJsonCallSettings<RequestT, ResponseT> httpJsonCallSettings,
51+
UnaryCallSettings<RequestT, ResponseT> callSettings,
52+
ClientContext clientContext) {
53+
return HttpJsonCallableFactory.createUnaryCallable(
54+
httpJsonCallSettings, callSettings, clientContext);
55+
}
56+
57+
@Override
58+
public <RequestT, ResponseT, PagedListResponseT>
59+
UnaryCallable<RequestT, PagedListResponseT> createPagedCallable(
60+
HttpJsonCallSettings<RequestT, ResponseT> httpJsonCallSettings,
61+
PagedCallSettings<RequestT, ResponseT, PagedListResponseT> callSettings,
62+
ClientContext clientContext) {
63+
return HttpJsonCallableFactory.createPagedCallable(
64+
httpJsonCallSettings, callSettings, clientContext);
65+
}
66+
67+
@Override
68+
public <RequestT, ResponseT> UnaryCallable<RequestT, ResponseT> createBatchingCallable(
69+
HttpJsonCallSettings<RequestT, ResponseT> httpJsonCallSettings,
70+
BatchingCallSettings<RequestT, ResponseT> callSettings,
71+
ClientContext clientContext) {
72+
return HttpJsonCallableFactory.createBatchingCallable(
73+
httpJsonCallSettings, callSettings, clientContext);
74+
}
75+
76+
@BetaApi(
77+
"The surface for long-running operations is not stable yet and may change in the future.")
78+
@Override
79+
public <RequestT, ResponseT, MetadataT>
80+
OperationCallable<RequestT, ResponseT, MetadataT> createOperationCallable(
81+
HttpJsonCallSettings<RequestT, Operation> httpJsonCallSettings,
82+
OperationCallSettings<RequestT, ResponseT, MetadataT> callSettings,
83+
ClientContext clientContext,
84+
OperationsStub operationsStub) {
85+
UnaryCallable<RequestT, Operation> innerCallable =
86+
HttpJsonCallableFactory.createBaseUnaryCallable(
87+
httpJsonCallSettings, callSettings.getInitialCallSettings(), clientContext);
88+
HttpJsonOperationSnapshotCallable<RequestT, Operation> initialCallable =
89+
new HttpJsonOperationSnapshotCallable<RequestT, Operation>(
90+
innerCallable,
91+
httpJsonCallSettings.getMethodDescriptor().getOperationSnapshotFactory());
92+
return HttpJsonCallableFactory.createOperationCallable(
93+
callSettings, clientContext, operationsStub.longRunningClient(), initialCallable);
94+
}
95+
96+
@Override
97+
public <RequestT, ResponseT>
98+
ServerStreamingCallable<RequestT, ResponseT> createServerStreamingCallable(
99+
HttpJsonCallSettings<RequestT, ResponseT> httpJsonCallSettings,
100+
ServerStreamingCallSettings<RequestT, ResponseT> callSettings,
101+
ClientContext clientContext) {
102+
return HttpJsonCallableFactory.createServerStreamingCallable(
103+
httpJsonCallSettings, callSettings, clientContext);
104+
}
105+
}

0 commit comments

Comments
 (0)