Skip to content

Commit d41cd58

Browse files
feat: Enable REST transport for most of Java and Go clients (googleapis#790)
- [ ] 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 6591df5 commit d41cd58

File tree

67 files changed

+5314
-5
lines changed

Some content is hidden

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

67 files changed

+5314
-5
lines changed

java-secretmanager/google-cloud-secretmanager/pom.xml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,10 @@
6565
<groupId>com.google.api</groupId>
6666
<artifactId>gax-grpc</artifactId>
6767
</dependency>
68+
<dependency>
69+
<groupId>com.google.api</groupId>
70+
<artifactId>gax-httpjson</artifactId>
71+
</dependency>
6872
<dependency>
6973
<groupId>org.threeten</groupId>
7074
<artifactId>threetenbp</artifactId>
@@ -92,12 +96,24 @@
9296
<scope>test</scope>
9397
</dependency>
9498
<!-- Need testing utility classes for generated gRPC clients tests -->
99+
<dependency>
100+
<groupId>com.google.api</groupId>
101+
<artifactId>gax</artifactId>
102+
<classifier>testlib</classifier>
103+
<scope>test</scope>
104+
</dependency>
95105
<dependency>
96106
<groupId>com.google.api</groupId>
97107
<artifactId>gax-grpc</artifactId>
98108
<classifier>testlib</classifier>
99109
<scope>test</scope>
100110
</dependency>
111+
<dependency>
112+
<groupId>com.google.api</groupId>
113+
<artifactId>gax-httpjson</artifactId>
114+
<classifier>testlib</classifier>
115+
<scope>test</scope>
116+
</dependency>
101117
</dependencies>
102118

103119
<profiles>

java-secretmanager/google-cloud-secretmanager/src/main/java/com/google/cloud/secretmanager/v1/SecretManagerServiceClient.java

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,21 @@
117117
* SecretManagerServiceClient.create(secretManagerServiceSettings);
118118
* }</pre>
119119
*
120+
* <p>To use REST (HTTP1.1/JSON) transport (instead of gRPC) for sending and receiving requests over
121+
* the wire:
122+
*
123+
* <pre>{@code
124+
* // This snippet has been automatically generated for illustrative purposes only.
125+
* // It may require modifications to work in your environment.
126+
* SecretManagerServiceSettings secretManagerServiceSettings =
127+
* SecretManagerServiceSettings.newBuilder()
128+
* .setTransportChannelProvider(
129+
* SecretManagerServiceSettings.defaultHttpJsonTransportProviderBuilder().build())
130+
* .build();
131+
* SecretManagerServiceClient secretManagerServiceClient =
132+
* SecretManagerServiceClient.create(secretManagerServiceSettings);
133+
* }</pre>
134+
*
120135
* <p>Please refer to the GitHub repository's samples for more quickstart code snippets.
121136
*/
122137
@Generated("by gapic-generator-java")

java-secretmanager/google-cloud-secretmanager/src/main/java/com/google/cloud/secretmanager/v1/SecretManagerServiceSettings.java

Lines changed: 21 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
import com.google.api.gax.core.GoogleCredentialsProvider;
2525
import com.google.api.gax.core.InstantiatingExecutorProvider;
2626
import com.google.api.gax.grpc.InstantiatingGrpcChannelProvider;
27+
import com.google.api.gax.httpjson.InstantiatingHttpJsonChannelProvider;
2728
import com.google.api.gax.rpc.ApiClientHeaderProvider;
2829
import com.google.api.gax.rpc.ClientContext;
2930
import com.google.api.gax.rpc.ClientSettings;
@@ -187,11 +188,18 @@ public static GoogleCredentialsProvider.Builder defaultCredentialsProviderBuilde
187188
return SecretManagerServiceStubSettings.defaultCredentialsProviderBuilder();
188189
}
189190

190-
/** Returns a builder for the default ChannelProvider for this service. */
191+
/** Returns a builder for the default gRPC ChannelProvider for this service. */
191192
public static InstantiatingGrpcChannelProvider.Builder defaultGrpcTransportProviderBuilder() {
192193
return SecretManagerServiceStubSettings.defaultGrpcTransportProviderBuilder();
193194
}
194195

196+
/** Returns a builder for the default REST ChannelProvider for this service. */
197+
@BetaApi
198+
public static InstantiatingHttpJsonChannelProvider.Builder
199+
defaultHttpJsonTransportProviderBuilder() {
200+
return SecretManagerServiceStubSettings.defaultHttpJsonTransportProviderBuilder();
201+
}
202+
195203
public static TransportChannelProvider defaultTransportChannelProvider() {
196204
return SecretManagerServiceStubSettings.defaultTransportChannelProvider();
197205
}
@@ -201,11 +209,17 @@ public static ApiClientHeaderProvider.Builder defaultApiClientHeaderProviderBuil
201209
return SecretManagerServiceStubSettings.defaultApiClientHeaderProviderBuilder();
202210
}
203211

204-
/** Returns a new builder for this class. */
212+
/** Returns a new gRPC builder for this class. */
205213
public static Builder newBuilder() {
206214
return Builder.createDefault();
207215
}
208216

217+
/** Returns a new REST builder for this class. */
218+
@BetaApi
219+
public static Builder newHttpJsonBuilder() {
220+
return Builder.createHttpJsonDefault();
221+
}
222+
209223
/** Returns a new builder for this class. */
210224
public static Builder newBuilder(ClientContext clientContext) {
211225
return new Builder(clientContext);
@@ -244,6 +258,11 @@ private static Builder createDefault() {
244258
return new Builder(SecretManagerServiceStubSettings.newBuilder());
245259
}
246260

261+
@BetaApi
262+
private static Builder createHttpJsonDefault() {
263+
return new Builder(SecretManagerServiceStubSettings.newHttpJsonBuilder());
264+
}
265+
247266
public SecretManagerServiceStubSettings.Builder getStubSettingsBuilder() {
248267
return ((SecretManagerServiceStubSettings.Builder) getStubSettings());
249268
}
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.secretmanager.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 SecretManagerService service API.
40+
*
41+
* <p>This class is for advanced usage.
42+
*/
43+
@Generated("by gapic-generator-java")
44+
@BetaApi
45+
public class HttpJsonSecretManagerServiceCallableFactory
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)