Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings
This repository was archived by the owner on Sep 16, 2023. It is now read-only.
/java-redisPublic archive

Commit05d53ca

Browse files
feat: Enable REST transport for most of Java and Go clients (#656)
- [ ] Regenerate this pull request now.PiperOrigin-RevId: 456641589Source-Link:googleapis/googleapis@8a251f5Source-Link:https://github.com/googleapis/googleapis-gen/commit/4ca52a529cf01308d9714950edffbea3560cfbdbCopy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiNGNhNTJhNTI5Y2YwMTMwOGQ5NzE0OTUwZWRmZmJlYTM1NjBjZmJkYiJ9
1 parentb1df9cb commit05d53ca

File tree

125 files changed

+9908
-22
lines changed

Some content is hidden

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

125 files changed

+9908
-22
lines changed

‎google-cloud-redis/pom.xml‎

Lines changed: 16 additions & 0 deletions
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>
@@ -89,12 +93,24 @@
8993
<scope>test</scope>
9094
</dependency>
9195
<!-- Need testing utility classes for generated gRPC clients tests-->
96+
<dependency>
97+
<groupId>com.google.api</groupId>
98+
<artifactId>gax</artifactId>
99+
<classifier>testlib</classifier>
100+
<scope>test</scope>
101+
</dependency>
92102
<dependency>
93103
<groupId>com.google.api</groupId>
94104
<artifactId>gax-grpc</artifactId>
95105
<classifier>testlib</classifier>
96106
<scope>test</scope>
97107
</dependency>
108+
<dependency>
109+
<groupId>com.google.api</groupId>
110+
<artifactId>gax-httpjson</artifactId>
111+
<classifier>testlib</classifier>
112+
<scope>test</scope>
113+
</dependency>
98114
</dependencies>
99115

100116
<profiles>

‎google-cloud-redis/src/main/java/com/google/cloud/redis/v1/CloudRedisClient.java‎

Lines changed: 32 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
importcom.google.api.core.ApiFuture;
2020
importcom.google.api.core.ApiFutures;
2121
importcom.google.api.gax.core.BackgroundResource;
22+
importcom.google.api.gax.httpjson.longrunning.OperationsClient;
2223
importcom.google.api.gax.longrunning.OperationFuture;
2324
importcom.google.api.gax.paging.AbstractFixedSizeCollection;
2425
importcom.google.api.gax.paging.AbstractPage;
@@ -30,7 +31,6 @@
3031
importcom.google.cloud.redis.v1.stub.CloudRedisStubSettings;
3132
importcom.google.common.util.concurrent.MoreExecutors;
3233
importcom.google.longrunning.Operation;
33-
importcom.google.longrunning.OperationsClient;
3434
importcom.google.protobuf.Empty;
3535
importcom.google.protobuf.FieldMask;
3636
importcom.google.protobuf.Timestamp;
@@ -122,13 +122,28 @@
122122
* CloudRedisClient cloudRedisClient = CloudRedisClient.create(cloudRedisSettings);
123123
* }</pre>
124124
*
125+
* <p>To use REST (HTTP1.1/JSON) transport (instead of gRPC) for sending and receiving requests over
126+
* the wire:
127+
*
128+
* <pre>{@code
129+
* // This snippet has been automatically generated for illustrative purposes only.
130+
* // It may require modifications to work in your environment.
131+
* CloudRedisSettings cloudRedisSettings =
132+
* CloudRedisSettings.newBuilder()
133+
* .setTransportChannelProvider(
134+
* CloudRedisSettings.defaultHttpJsonTransportProviderBuilder().build())
135+
* .build();
136+
* CloudRedisClient cloudRedisClient = CloudRedisClient.create(cloudRedisSettings);
137+
* }</pre>
138+
*
125139
* <p>Please refer to the GitHub repository's samples for more quickstart code snippets.
126140
*/
127141
@Generated("by gapic-generator-java")
128142
publicclassCloudRedisClientimplementsBackgroundResource {
129143
privatefinalCloudRedisSettingssettings;
130144
privatefinalCloudRedisStubstub;
131-
privatefinalOperationsClientoperationsClient;
145+
privatefinalOperationsClienthttpJsonOperationsClient;
146+
privatefinalcom.google.longrunning.OperationsClientoperationsClient;
132147

133148
/** Constructs an instance of CloudRedisClient with default settings. */
134149
publicstaticfinalCloudRedisClientcreate()throwsIOException {
@@ -158,13 +173,17 @@ public static final CloudRedisClient create(CloudRedisStub stub) {
158173
protectedCloudRedisClient(CloudRedisSettingssettings)throwsIOException {
159174
this.settings =settings;
160175
this.stub = ((CloudRedisStubSettings)settings.getStubSettings()).createStub();
161-
this.operationsClient =OperationsClient.create(this.stub.getOperationsStub());
176+
this.operationsClient =
177+
com.google.longrunning.OperationsClient.create(this.stub.getOperationsStub());
178+
this.httpJsonOperationsClient =OperationsClient.create(this.stub.getHttpJsonOperationsStub());
162179
}
163180

164181
protectedCloudRedisClient(CloudRedisStubstub) {
165182
this.settings =null;
166183
this.stub =stub;
167-
this.operationsClient =OperationsClient.create(this.stub.getOperationsStub());
184+
this.operationsClient =
185+
com.google.longrunning.OperationsClient.create(this.stub.getOperationsStub());
186+
this.httpJsonOperationsClient =OperationsClient.create(this.stub.getHttpJsonOperationsStub());
168187
}
169188

170189
publicfinalCloudRedisSettingsgetSettings() {
@@ -179,10 +198,18 @@ public CloudRedisStub getStub() {
179198
* Returns the OperationsClient that can be used to query the status of a long-running operation
180199
* returned by another API method call.
181200
*/
182-
publicfinalOperationsClientgetOperationsClient() {
201+
publicfinalcom.google.longrunning.OperationsClientgetOperationsClient() {
183202
returnoperationsClient;
184203
}
185204

205+
/**
206+
* Returns the OperationsClient that can be used to query the status of a long-running operation
207+
* returned by another API method call.
208+
*/
209+
publicfinalOperationsClientgetHttpJsonOperationsClient() {
210+
returnhttpJsonOperationsClient;
211+
}
212+
186213
// AUTO-GENERATED DOCUMENTATION AND METHOD.
187214
/**
188215
* Lists all Redis instances owned by a project in either the specified location (region) or all

‎google-cloud-redis/src/main/java/com/google/cloud/redis/v1/CloudRedisSettings.java‎

Lines changed: 21 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
importcom.google.api.gax.core.GoogleCredentialsProvider;
2424
importcom.google.api.gax.core.InstantiatingExecutorProvider;
2525
importcom.google.api.gax.grpc.InstantiatingGrpcChannelProvider;
26+
importcom.google.api.gax.httpjson.InstantiatingHttpJsonChannelProvider;
2627
importcom.google.api.gax.rpc.ApiClientHeaderProvider;
2728
importcom.google.api.gax.rpc.ClientContext;
2829
importcom.google.api.gax.rpc.ClientSettings;
@@ -203,11 +204,18 @@ public static GoogleCredentialsProvider.Builder defaultCredentialsProviderBuilde
203204
returnCloudRedisStubSettings.defaultCredentialsProviderBuilder();
204205
}
205206

206-
/** Returns a builder for the default ChannelProvider for this service. */
207+
/** Returns a builder for the defaultgRPCChannelProvider for this service. */
207208
publicstaticInstantiatingGrpcChannelProvider.BuilderdefaultGrpcTransportProviderBuilder() {
208209
returnCloudRedisStubSettings.defaultGrpcTransportProviderBuilder();
209210
}
210211

212+
/** Returns a builder for the default REST ChannelProvider for this service. */
213+
@BetaApi
214+
publicstaticInstantiatingHttpJsonChannelProvider.Builder
215+
defaultHttpJsonTransportProviderBuilder() {
216+
returnCloudRedisStubSettings.defaultHttpJsonTransportProviderBuilder();
217+
}
218+
211219
publicstaticTransportChannelProviderdefaultTransportChannelProvider() {
212220
returnCloudRedisStubSettings.defaultTransportChannelProvider();
213221
}
@@ -217,11 +225,17 @@ public static ApiClientHeaderProvider.Builder defaultApiClientHeaderProviderBuil
217225
returnCloudRedisStubSettings.defaultApiClientHeaderProviderBuilder();
218226
}
219227

220-
/** Returns a new builder for this class. */
228+
/** Returns a newgRPCbuilder for this class. */
221229
publicstaticBuildernewBuilder() {
222230
returnBuilder.createDefault();
223231
}
224232

233+
/** Returns a new REST builder for this class. */
234+
@BetaApi
235+
publicstaticBuildernewHttpJsonBuilder() {
236+
returnBuilder.createHttpJsonDefault();
237+
}
238+
225239
/** Returns a new builder for this class. */
226240
publicstaticBuildernewBuilder(ClientContextclientContext) {
227241
returnnewBuilder(clientContext);
@@ -259,6 +273,11 @@ private static Builder createDefault() {
259273
returnnewBuilder(CloudRedisStubSettings.newBuilder());
260274
}
261275

276+
@BetaApi
277+
privatestaticBuildercreateHttpJsonDefault() {
278+
returnnewBuilder(CloudRedisStubSettings.newHttpJsonBuilder());
279+
}
280+
262281
publicCloudRedisStubSettings.BuildergetStubSettingsBuilder() {
263282
return ((CloudRedisStubSettings.Builder)getStubSettings());
264283
}

‎google-cloud-redis/src/main/java/com/google/cloud/redis/v1/stub/CloudRedisStub.java‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,11 @@
5151
publicabstractclassCloudRedisStubimplementsBackgroundResource {
5252

5353
publicOperationsStubgetOperationsStub() {
54-
thrownewUnsupportedOperationException("Not implemented: getOperationsStub()");
54+
returnnull;
55+
}
56+
57+
publiccom.google.api.gax.httpjson.longrunning.stub.OperationsStubgetHttpJsonOperationsStub() {
58+
returnnull;
5559
}
5660

5761
publicUnaryCallable<ListInstancesRequest,ListInstancesPagedResponse>

‎google-cloud-redis/src/main/java/com/google/cloud/redis/v1/stub/CloudRedisStubSettings.java‎

Lines changed: 50 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,9 @@
2828
importcom.google.api.gax.grpc.GrpcTransportChannel;
2929
importcom.google.api.gax.grpc.InstantiatingGrpcChannelProvider;
3030
importcom.google.api.gax.grpc.ProtoOperationTransformers;
31+
importcom.google.api.gax.httpjson.GaxHttpJsonProperties;
32+
importcom.google.api.gax.httpjson.HttpJsonTransportChannel;
33+
importcom.google.api.gax.httpjson.InstantiatingHttpJsonChannelProvider;
3134
importcom.google.api.gax.longrunning.OperationSnapshot;
3235
importcom.google.api.gax.longrunning.OperationTimedPollAlgorithm;
3336
importcom.google.api.gax.retrying.RetrySettings;
@@ -306,6 +309,11 @@ public CloudRedisStub createStub() throws IOException {
306309
.equals(GrpcTransportChannel.getGrpcTransportName())) {
307310
returnGrpcCloudRedisStub.create(this);
308311
}
312+
if (getTransportChannelProvider()
313+
.getTransportName()
314+
.equals(HttpJsonTransportChannel.getHttpJsonTransportName())) {
315+
returnHttpJsonCloudRedisStub.create(this);
316+
}
309317
thrownewUnsupportedOperationException(
310318
String.format(
311319
"Transport not supported: %s",getTransportChannelProvider().getTransportName()));
@@ -338,30 +346,56 @@ public static GoogleCredentialsProvider.Builder defaultCredentialsProviderBuilde
338346
.setUseJwtAccessWithScope(true);
339347
}
340348

341-
/** Returns a builder for the default ChannelProvider for this service. */
349+
/** Returns a builder for the defaultgRPCChannelProvider for this service. */
342350
publicstaticInstantiatingGrpcChannelProvider.BuilderdefaultGrpcTransportProviderBuilder() {
343351
returnInstantiatingGrpcChannelProvider.newBuilder()
344352
.setMaxInboundMessageSize(Integer.MAX_VALUE);
345353
}
346354

355+
/** Returns a builder for the default REST ChannelProvider for this service. */
356+
@BetaApi
357+
publicstaticInstantiatingHttpJsonChannelProvider.Builder
358+
defaultHttpJsonTransportProviderBuilder() {
359+
returnInstantiatingHttpJsonChannelProvider.newBuilder();
360+
}
361+
347362
publicstaticTransportChannelProviderdefaultTransportChannelProvider() {
348363
returndefaultGrpcTransportProviderBuilder().build();
349364
}
350365

351366
@BetaApi("The surface for customizing headers is not stable yet and may change in the future.")
352-
publicstaticApiClientHeaderProvider.BuilderdefaultApiClientHeaderProviderBuilder() {
367+
publicstaticApiClientHeaderProvider.BuilderdefaultGrpcApiClientHeaderProviderBuilder() {
353368
returnApiClientHeaderProvider.newBuilder()
354369
.setGeneratedLibToken(
355370
"gapic",GaxProperties.getLibraryVersion(CloudRedisStubSettings.class))
356371
.setTransportToken(
357372
GaxGrpcProperties.getGrpcTokenName(),GaxGrpcProperties.getGrpcVersion());
358373
}
359374

360-
/** Returns a new builder for this class. */
375+
@BetaApi("The surface for customizing headers is not stable yet and may change in the future.")
376+
publicstaticApiClientHeaderProvider.BuilderdefaultHttpJsonApiClientHeaderProviderBuilder() {
377+
returnApiClientHeaderProvider.newBuilder()
378+
.setGeneratedLibToken(
379+
"gapic",GaxProperties.getLibraryVersion(CloudRedisStubSettings.class))
380+
.setTransportToken(
381+
GaxHttpJsonProperties.getHttpJsonTokenName(),
382+
GaxHttpJsonProperties.getHttpJsonVersion());
383+
}
384+
385+
publicstaticApiClientHeaderProvider.BuilderdefaultApiClientHeaderProviderBuilder() {
386+
returnCloudRedisStubSettings.defaultGrpcApiClientHeaderProviderBuilder();
387+
}
388+
389+
/** Returns a new gRPC builder for this class. */
361390
publicstaticBuildernewBuilder() {
362391
returnBuilder.createDefault();
363392
}
364393

394+
/** Returns a new REST builder for this class. */
395+
publicstaticBuildernewHttpJsonBuilder() {
396+
returnBuilder.createHttpJsonDefault();
397+
}
398+
365399
/** Returns a new builder for this class. */
366400
publicstaticBuildernewBuilder(ClientContextclientContext) {
367401
returnnewBuilder(clientContext);
@@ -562,6 +596,19 @@ private static Builder createDefault() {
562596
returninitDefaults(builder);
563597
}
564598

599+
privatestaticBuildercreateHttpJsonDefault() {
600+
Builderbuilder =newBuilder(((ClientContext)null));
601+
602+
builder.setTransportChannelProvider(defaultHttpJsonTransportProviderBuilder().build());
603+
builder.setCredentialsProvider(defaultCredentialsProviderBuilder().build());
604+
builder.setInternalHeaderProvider(defaultHttpJsonApiClientHeaderProviderBuilder().build());
605+
builder.setEndpoint(getDefaultEndpoint());
606+
builder.setMtlsEndpoint(getDefaultMtlsEndpoint());
607+
builder.setSwitchToMtlsEndpointAllowed(true);
608+
609+
returninitDefaults(builder);
610+
}
611+
565612
privatestaticBuilderinitDefaults(Builderbuilder) {
566613
builder
567614
.listInstancesSettings()

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp