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

Commit 206caf1

Browse files
feat: Enable REST transport for most of Java and Go clients (#703)
- [ ] 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 fa2fbcd commit 206caf1

File tree

174 files changed

+13809
-15
lines changed

Some content is hidden

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

174 files changed

+13809
-15
lines changed

google-cloud-websecurityscanner/pom.xml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,10 @@
6666
<groupId>com.google.api</groupId>
6767
<artifactId>gax-grpc</artifactId>
6868
</dependency>
69+
<dependency>
70+
<groupId>com.google.api</groupId>
71+
<artifactId>gax-httpjson</artifactId>
72+
</dependency>
6973
<dependency>
7074
<groupId>org.threeten</groupId>
7175
<artifactId>threetenbp</artifactId>
@@ -103,12 +107,24 @@
103107
<scope>test</scope>
104108
</dependency>
105109
<!-- Need testing utility classes for generated gRPC clients tests -->
110+
<dependency>
111+
<groupId>com.google.api</groupId>
112+
<artifactId>gax</artifactId>
113+
<classifier>testlib</classifier>
114+
<scope>test</scope>
115+
</dependency>
106116
<dependency>
107117
<groupId>com.google.api</groupId>
108118
<artifactId>gax-grpc</artifactId>
109119
<classifier>testlib</classifier>
110120
<scope>test</scope>
111121
</dependency>
122+
<dependency>
123+
<groupId>com.google.api</groupId>
124+
<artifactId>gax-httpjson</artifactId>
125+
<classifier>testlib</classifier>
126+
<scope>test</scope>
127+
</dependency>
112128
</dependencies>
113129

114130
<profiles>

google-cloud-websecurityscanner/src/main/java/com/google/cloud/websecurityscanner/v1/WebSecurityScannerClient.java

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,21 @@
106106
* WebSecurityScannerClient.create(webSecurityScannerSettings);
107107
* }</pre>
108108
*
109+
* <p>To use REST (HTTP1.1/JSON) transport (instead of gRPC) for sending and receiving requests over
110+
* the wire:
111+
*
112+
* <pre>{@code
113+
* // This snippet has been automatically generated for illustrative purposes only.
114+
* // It may require modifications to work in your environment.
115+
* WebSecurityScannerSettings webSecurityScannerSettings =
116+
* WebSecurityScannerSettings.newBuilder()
117+
* .setTransportChannelProvider(
118+
* WebSecurityScannerSettings.defaultHttpJsonTransportProviderBuilder().build())
119+
* .build();
120+
* WebSecurityScannerClient webSecurityScannerClient =
121+
* WebSecurityScannerClient.create(webSecurityScannerSettings);
122+
* }</pre>
123+
*
109124
* <p>Please refer to the GitHub repository's samples for more quickstart code snippets.
110125
*/
111126
@Generated("by gapic-generator-java")

google-cloud-websecurityscanner/src/main/java/com/google/cloud/websecurityscanner/v1/WebSecurityScannerSettings.java

Lines changed: 21 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
import com.google.api.gax.core.GoogleCredentialsProvider;
2727
import com.google.api.gax.core.InstantiatingExecutorProvider;
2828
import com.google.api.gax.grpc.InstantiatingGrpcChannelProvider;
29+
import com.google.api.gax.httpjson.InstantiatingHttpJsonChannelProvider;
2930
import com.google.api.gax.rpc.ApiClientHeaderProvider;
3031
import com.google.api.gax.rpc.ClientContext;
3132
import com.google.api.gax.rpc.ClientSettings;
@@ -174,11 +175,18 @@ public static GoogleCredentialsProvider.Builder defaultCredentialsProviderBuilde
174175
return WebSecurityScannerStubSettings.defaultCredentialsProviderBuilder();
175176
}
176177

177-
/** Returns a builder for the default ChannelProvider for this service. */
178+
/** Returns a builder for the default gRPC ChannelProvider for this service. */
178179
public static InstantiatingGrpcChannelProvider.Builder defaultGrpcTransportProviderBuilder() {
179180
return WebSecurityScannerStubSettings.defaultGrpcTransportProviderBuilder();
180181
}
181182

183+
/** Returns a builder for the default REST ChannelProvider for this service. */
184+
@BetaApi
185+
public static InstantiatingHttpJsonChannelProvider.Builder
186+
defaultHttpJsonTransportProviderBuilder() {
187+
return WebSecurityScannerStubSettings.defaultHttpJsonTransportProviderBuilder();
188+
}
189+
182190
public static TransportChannelProvider defaultTransportChannelProvider() {
183191
return WebSecurityScannerStubSettings.defaultTransportChannelProvider();
184192
}
@@ -188,11 +196,17 @@ public static ApiClientHeaderProvider.Builder defaultApiClientHeaderProviderBuil
188196
return WebSecurityScannerStubSettings.defaultApiClientHeaderProviderBuilder();
189197
}
190198

191-
/** Returns a new builder for this class. */
199+
/** Returns a new gRPC builder for this class. */
192200
public static Builder newBuilder() {
193201
return Builder.createDefault();
194202
}
195203

204+
/** Returns a new REST builder for this class. */
205+
@BetaApi
206+
public static Builder newHttpJsonBuilder() {
207+
return Builder.createHttpJsonDefault();
208+
}
209+
196210
/** Returns a new builder for this class. */
197211
public static Builder newBuilder(ClientContext clientContext) {
198212
return new Builder(clientContext);
@@ -230,6 +244,11 @@ private static Builder createDefault() {
230244
return new Builder(WebSecurityScannerStubSettings.newBuilder());
231245
}
232246

247+
@BetaApi
248+
private static Builder createHttpJsonDefault() {
249+
return new Builder(WebSecurityScannerStubSettings.newHttpJsonBuilder());
250+
}
251+
233252
public WebSecurityScannerStubSettings.Builder getStubSettingsBuilder() {
234253
return ((WebSecurityScannerStubSettings.Builder) getStubSettings());
235254
}
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.websecurityscanner.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 WebSecurityScanner service API.
40+
*
41+
* <p>This class is for advanced usage.
42+
*/
43+
@Generated("by gapic-generator-java")
44+
@BetaApi
45+
public class HttpJsonWebSecurityScannerCallableFactory
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)