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

Commit a3f0a99

Browse files
feat: Enable REST transport for most of Java and Go clients (#103)
- [ ] 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 723c636 commit a3f0a99

File tree

211 files changed

+17053
-11
lines changed

Some content is hidden

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

211 files changed

+17053
-11
lines changed

google-cloud-vmmigration/pom.xml

+16
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,10 @@
5858
<groupId>com.google.api</groupId>
5959
<artifactId>gax-grpc</artifactId>
6060
</dependency>
61+
<dependency>
62+
<groupId>com.google.api</groupId>
63+
<artifactId>gax-httpjson</artifactId>
64+
</dependency>
6165
<dependency>
6266
<groupId>org.threeten</groupId>
6367
<artifactId>threetenbp</artifactId>
@@ -77,12 +81,24 @@
7781
<scope>test</scope>
7882
</dependency>
7983
<!-- Need testing utility classes for generated gRPC clients tests -->
84+
<dependency>
85+
<groupId>com.google.api</groupId>
86+
<artifactId>gax</artifactId>
87+
<classifier>testlib</classifier>
88+
<scope>test</scope>
89+
</dependency>
8090
<dependency>
8191
<groupId>com.google.api</groupId>
8292
<artifactId>gax-grpc</artifactId>
8393
<classifier>testlib</classifier>
8494
<scope>test</scope>
8595
</dependency>
96+
<dependency>
97+
<groupId>com.google.api</groupId>
98+
<artifactId>gax-httpjson</artifactId>
99+
<classifier>testlib</classifier>
100+
<scope>test</scope>
101+
</dependency>
86102
</dependencies>
87103

88104
<profiles>

google-cloud-vmmigration/src/main/java/com/google/cloud/vmmigration/v1/VmMigrationClient.java

+32-5
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
import com.google.api.core.ApiFuture;
2020
import com.google.api.core.ApiFutures;
2121
import com.google.api.gax.core.BackgroundResource;
22+
import com.google.api.gax.httpjson.longrunning.OperationsClient;
2223
import com.google.api.gax.longrunning.OperationFuture;
2324
import com.google.api.gax.paging.AbstractFixedSizeCollection;
2425
import com.google.api.gax.paging.AbstractPage;
@@ -30,7 +31,6 @@
3031
import com.google.cloud.vmmigration.v1.stub.VmMigrationStubSettings;
3132
import com.google.common.util.concurrent.MoreExecutors;
3233
import com.google.longrunning.Operation;
33-
import com.google.longrunning.OperationsClient;
3434
import com.google.protobuf.Empty;
3535
import com.google.protobuf.FieldMask;
3636
import java.io.IOException;
@@ -102,13 +102,28 @@
102102
* VmMigrationClient vmMigrationClient = VmMigrationClient.create(vmMigrationSettings);
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+
* VmMigrationSettings vmMigrationSettings =
112+
* VmMigrationSettings.newBuilder()
113+
* .setTransportChannelProvider(
114+
* VmMigrationSettings.defaultHttpJsonTransportProviderBuilder().build())
115+
* .build();
116+
* VmMigrationClient vmMigrationClient = VmMigrationClient.create(vmMigrationSettings);
117+
* }</pre>
118+
*
105119
* <p>Please refer to the GitHub repository's samples for more quickstart code snippets.
106120
*/
107121
@Generated("by gapic-generator-java")
108122
public class VmMigrationClient implements BackgroundResource {
109123
private final VmMigrationSettings settings;
110124
private final VmMigrationStub stub;
111-
private final OperationsClient operationsClient;
125+
private final OperationsClient httpJsonOperationsClient;
126+
private final com.google.longrunning.OperationsClient operationsClient;
112127

113128
/** Constructs an instance of VmMigrationClient with default settings. */
114129
public static final VmMigrationClient create() throws IOException {
@@ -139,13 +154,17 @@ public static final VmMigrationClient create(VmMigrationStub stub) {
139154
protected VmMigrationClient(VmMigrationSettings settings) throws IOException {
140155
this.settings = settings;
141156
this.stub = ((VmMigrationStubSettings) settings.getStubSettings()).createStub();
142-
this.operationsClient = OperationsClient.create(this.stub.getOperationsStub());
157+
this.operationsClient =
158+
com.google.longrunning.OperationsClient.create(this.stub.getOperationsStub());
159+
this.httpJsonOperationsClient = OperationsClient.create(this.stub.getHttpJsonOperationsStub());
143160
}
144161

145162
protected VmMigrationClient(VmMigrationStub stub) {
146163
this.settings = null;
147164
this.stub = stub;
148-
this.operationsClient = OperationsClient.create(this.stub.getOperationsStub());
165+
this.operationsClient =
166+
com.google.longrunning.OperationsClient.create(this.stub.getOperationsStub());
167+
this.httpJsonOperationsClient = OperationsClient.create(this.stub.getHttpJsonOperationsStub());
149168
}
150169

151170
public final VmMigrationSettings getSettings() {
@@ -160,10 +179,18 @@ public VmMigrationStub getStub() {
160179
* Returns the OperationsClient that can be used to query the status of a long-running operation
161180
* returned by another API method call.
162181
*/
163-
public final OperationsClient getOperationsClient() {
182+
public final com.google.longrunning.OperationsClient getOperationsClient() {
164183
return operationsClient;
165184
}
166185

186+
/**
187+
* Returns the OperationsClient that can be used to query the status of a long-running operation
188+
* returned by another API method call.
189+
*/
190+
public final OperationsClient getHttpJsonOperationsClient() {
191+
return httpJsonOperationsClient;
192+
}
193+
167194
// AUTO-GENERATED DOCUMENTATION AND METHOD.
168195
/**
169196
* Lists Sources in a given project and location.

google-cloud-vmmigration/src/main/java/com/google/cloud/vmmigration/v1/VmMigrationSettings.java

+21-2
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
import com.google.api.gax.core.GoogleCredentialsProvider;
3131
import com.google.api.gax.core.InstantiatingExecutorProvider;
3232
import com.google.api.gax.grpc.InstantiatingGrpcChannelProvider;
33+
import com.google.api.gax.httpjson.InstantiatingHttpJsonChannelProvider;
3334
import com.google.api.gax.rpc.ApiClientHeaderProvider;
3435
import com.google.api.gax.rpc.ClientContext;
3536
import com.google.api.gax.rpc.ClientSettings;
@@ -504,11 +505,18 @@ public static GoogleCredentialsProvider.Builder defaultCredentialsProviderBuilde
504505
return VmMigrationStubSettings.defaultCredentialsProviderBuilder();
505506
}
506507

507-
/** Returns a builder for the default ChannelProvider for this service. */
508+
/** Returns a builder for the default gRPC ChannelProvider for this service. */
508509
public static InstantiatingGrpcChannelProvider.Builder defaultGrpcTransportProviderBuilder() {
509510
return VmMigrationStubSettings.defaultGrpcTransportProviderBuilder();
510511
}
511512

513+
/** Returns a builder for the default REST ChannelProvider for this service. */
514+
@BetaApi
515+
public static InstantiatingHttpJsonChannelProvider.Builder
516+
defaultHttpJsonTransportProviderBuilder() {
517+
return VmMigrationStubSettings.defaultHttpJsonTransportProviderBuilder();
518+
}
519+
512520
public static TransportChannelProvider defaultTransportChannelProvider() {
513521
return VmMigrationStubSettings.defaultTransportChannelProvider();
514522
}
@@ -518,11 +526,17 @@ public static ApiClientHeaderProvider.Builder defaultApiClientHeaderProviderBuil
518526
return VmMigrationStubSettings.defaultApiClientHeaderProviderBuilder();
519527
}
520528

521-
/** Returns a new builder for this class. */
529+
/** Returns a new gRPC builder for this class. */
522530
public static Builder newBuilder() {
523531
return Builder.createDefault();
524532
}
525533

534+
/** Returns a new REST builder for this class. */
535+
@BetaApi
536+
public static Builder newHttpJsonBuilder() {
537+
return Builder.createHttpJsonDefault();
538+
}
539+
526540
/** Returns a new builder for this class. */
527541
public static Builder newBuilder(ClientContext clientContext) {
528542
return new Builder(clientContext);
@@ -560,6 +574,11 @@ private static Builder createDefault() {
560574
return new Builder(VmMigrationStubSettings.newBuilder());
561575
}
562576

577+
@BetaApi
578+
private static Builder createHttpJsonDefault() {
579+
return new Builder(VmMigrationStubSettings.newHttpJsonBuilder());
580+
}
581+
563582
public VmMigrationStubSettings.Builder getStubSettingsBuilder() {
564583
return ((VmMigrationStubSettings.Builder) getStubSettings());
565584
}
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.vmmigration.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 VmMigration service API.
40+
*
41+
* <p>This class is for advanced usage.
42+
*/
43+
@Generated("by gapic-generator-java")
44+
@BetaApi
45+
public class HttpJsonVmMigrationCallableFactory
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)