Skip to content

Commit b3507db

Browse files
gcf-owl-bot[bot]suztomo
gcf-owl-bot[bot]
and
suztomo
authored
feat: Enable REST transport for most of Java and Go clients (#131)
* feat: Enable REST transport for most of Java and Go clients PiperOrigin-RevId: 456641589 Source-Link: googleapis/googleapis@8a251f5 Source-Link: https://github.com/googleapis/googleapis-gen/commit/4ca52a529cf01308d9714950edffbea3560cfbdb Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiNGNhNTJhNTI5Y2YwMTMwOGQ5NzE0OTUwZWRmZmJlYTM1NjBjZmJkYiJ9 * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * deps: adding gax-httpjson Co-authored-by: Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com> Co-authored-by: Tomo Suzuki <[email protected]>
1 parent 53885d6 commit b3507db

13 files changed

+3064
-10
lines changed

‎java-bigquerymigration/google-cloud-bigquerymigration/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>
@@ -86,12 +90,24 @@
8690
<scope>test</scope>
8791
</dependency>
8892
<!-- Need testing utility classes for generated gRPC clients tests -->
93+
<dependency>
94+
<groupId>com.google.api</groupId>
95+
<artifactId>gax</artifactId>
96+
<classifier>testlib</classifier>
97+
<scope>test</scope>
98+
</dependency>
8999
<dependency>
90100
<groupId>com.google.api</groupId>
91101
<artifactId>gax-grpc</artifactId>
92102
<classifier>testlib</classifier>
93103
<scope>test</scope>
94104
</dependency>
105+
<dependency>
106+
<groupId>com.google.api</groupId>
107+
<artifactId>gax-httpjson</artifactId>
108+
<classifier>testlib</classifier>
109+
<scope>test</scope>
110+
</dependency>
95111
</dependencies>
96112

97113
<profiles>

‎java-bigquerymigration/google-cloud-bigquerymigration/src/main/java/com/google/cloud/bigquery/migration/v2/MigrationServiceClient.java

+15
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,21 @@
102102
* MigrationServiceClient.create(migrationServiceSettings);
103103
* }</pre>
104104
*
105+
* <p>To use REST (HTTP1.1/JSON) transport (instead of gRPC) for sending and receiving requests over
106+
* the wire:
107+
*
108+
* <pre>{@code
109+
* // This snippet has been automatically generated for illustrative purposes only.
110+
* // It may require modifications to work in your environment.
111+
* MigrationServiceSettings migrationServiceSettings =
112+
* MigrationServiceSettings.newBuilder()
113+
* .setTransportChannelProvider(
114+
* MigrationServiceSettings.defaultHttpJsonTransportProviderBuilder().build())
115+
* .build();
116+
* MigrationServiceClient migrationServiceClient =
117+
* MigrationServiceClient.create(migrationServiceSettings);
118+
* }</pre>
119+
*
105120
* <p>Please refer to the GitHub repository's samples for more quickstart code snippets.
106121
*/
107122
@Generated("by gapic-generator-java")

‎java-bigquerymigration/google-cloud-bigquerymigration/src/main/java/com/google/cloud/bigquery/migration/v2/MigrationServiceSettings.java

+21-2
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;
@@ -146,11 +147,18 @@ public static GoogleCredentialsProvider.Builder defaultCredentialsProviderBuilde
146147
return MigrationServiceStubSettings.defaultCredentialsProviderBuilder();
147148
}
148149

149-
/** Returns a builder for the default ChannelProvider for this service. */
150+
/** Returns a builder for the default gRPC ChannelProvider for this service. */
150151
public static InstantiatingGrpcChannelProvider.Builder defaultGrpcTransportProviderBuilder() {
151152
return MigrationServiceStubSettings.defaultGrpcTransportProviderBuilder();
152153
}
153154

155+
/** Returns a builder for the default REST ChannelProvider for this service. */
156+
@BetaApi
157+
public static InstantiatingHttpJsonChannelProvider.Builder
158+
defaultHttpJsonTransportProviderBuilder() {
159+
return MigrationServiceStubSettings.defaultHttpJsonTransportProviderBuilder();
160+
}
161+
154162
public static TransportChannelProvider defaultTransportChannelProvider() {
155163
return MigrationServiceStubSettings.defaultTransportChannelProvider();
156164
}
@@ -160,11 +168,17 @@ public static ApiClientHeaderProvider.Builder defaultApiClientHeaderProviderBuil
160168
return MigrationServiceStubSettings.defaultApiClientHeaderProviderBuilder();
161169
}
162170

163-
/** Returns a new builder for this class. */
171+
/** Returns a new gRPC builder for this class. */
164172
public static Builder newBuilder() {
165173
return Builder.createDefault();
166174
}
167175

176+
/** Returns a new REST builder for this class. */
177+
@BetaApi
178+
public static Builder newHttpJsonBuilder() {
179+
return Builder.createHttpJsonDefault();
180+
}
181+
168182
/** Returns a new builder for this class. */
169183
public static Builder newBuilder(ClientContext clientContext) {
170184
return new Builder(clientContext);
@@ -202,6 +216,11 @@ private static Builder createDefault() {
202216
return new Builder(MigrationServiceStubSettings.newBuilder());
203217
}
204218

219+
@BetaApi
220+
private static Builder createHttpJsonDefault() {
221+
return new Builder(MigrationServiceStubSettings.newHttpJsonBuilder());
222+
}
223+
205224
public MigrationServiceStubSettings.Builder getStubSettingsBuilder() {
206225
return ((MigrationServiceStubSettings.Builder) getStubSettings());
207226
}

‎java-bigquerymigration/google-cloud-bigquerymigration/src/main/java/com/google/cloud/bigquery/migration/v2/stub/HttpJsonMigrationServiceCallableFactory.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.bigquery.migration.v2.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 MigrationService service API.
40+
*
41+
* <p>This class is for advanced usage.
42+
*/
43+
@Generated("by gapic-generator-java")
44+
@BetaApi
45+
public class HttpJsonMigrationServiceCallableFactory
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)