Skip to content

Commit bfef783

Browse files
gcf-owl-bot[bot]gcf-owl-bot[bot]
authored
fix: update gapic-generator-java with mock service generation fixes (googleapis#755)
- [ ] Regenerate this pull request now. PiperOrigin-RevId: 457524730 Source-Link: googleapis/googleapis@917e7f2 Source-Link: https://github.com/googleapis/googleapis-gen/commit/2497f9a069d3f6b2d6810d5a4e239cda1e7e5a39 Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiMjQ5N2Y5YTA2OWQzZjZiMmQ2ODEwZDVhNGUyMzljZGExZTdlNWEzOSJ9 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
1 parent a29d786 commit bfef783

8 files changed

Lines changed: 3049 additions & 11 deletions

File tree

‎java-cloudbuild/google-cloud-build/pom.xml‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,10 @@
5959
<groupId>com.google.api</groupId>
6060
<artifactId>gax-grpc</artifactId>
6161
</dependency>
62+
<dependency>
63+
<groupId>com.google.api</groupId>
64+
<artifactId>gax-httpjson</artifactId>
65+
</dependency>
6266
<dependency>
6367
<groupId>org.threeten</groupId>
6468
<artifactId>threetenbp</artifactId>
@@ -76,12 +80,24 @@
7680
<scope>test</scope>
7781
</dependency>
7882
<!-- Need testing utility classes for generated gRPC clients tests -->
83+
<dependency>
84+
<groupId>com.google.api</groupId>
85+
<artifactId>gax</artifactId>
86+
<classifier>testlib</classifier>
87+
<scope>test</scope>
88+
</dependency>
7989
<dependency>
8090
<groupId>com.google.api</groupId>
8191
<artifactId>gax-grpc</artifactId>
8292
<classifier>testlib</classifier>
8393
<scope>test</scope>
8494
</dependency>
95+
<dependency>
96+
<groupId>com.google.api</groupId>
97+
<artifactId>gax-httpjson</artifactId>
98+
<classifier>testlib</classifier>
99+
<scope>test</scope>
100+
</dependency>
85101
</dependencies>
86102

87103
<profiles>

‎java-cloudbuild/google-cloud-build/src/main/java/com/google/cloud/devtools/cloudbuild/v1/CloudBuildClient.java‎

Lines changed: 34 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,9 @@
1818

1919
import com.google.api.core.ApiFuture;
2020
import com.google.api.core.ApiFutures;
21+
import com.google.api.core.BetaApi;
2122
import com.google.api.gax.core.BackgroundResource;
23+
import com.google.api.gax.httpjson.longrunning.OperationsClient;
2224
import com.google.api.gax.longrunning.OperationFuture;
2325
import com.google.api.gax.paging.AbstractFixedSizeCollection;
2426
import com.google.api.gax.paging.AbstractPage;
@@ -63,7 +65,6 @@
6365
import com.google.cloudbuild.v1.WorkerPoolName;
6466
import com.google.common.util.concurrent.MoreExecutors;
6567
import com.google.longrunning.Operation;
66-
import com.google.longrunning.OperationsClient;
6768
import com.google.protobuf.Empty;
6869
import com.google.protobuf.FieldMask;
6970
import java.io.IOException;
@@ -142,13 +143,28 @@
142143
* CloudBuildClient cloudBuildClient = CloudBuildClient.create(cloudBuildSettings);
143144
* }</pre>
144145
*
146+
* <p>To use REST (HTTP1.1/JSON) transport (instead of gRPC) for sending and receiving requests over
147+
* the wire:
148+
*
149+
* <pre>{@code
150+
* // This snippet has been automatically generated for illustrative purposes only.
151+
* // It may require modifications to work in your environment.
152+
* CloudBuildSettings cloudBuildSettings =
153+
* CloudBuildSettings.newBuilder()
154+
* .setTransportChannelProvider(
155+
* CloudBuildSettings.defaultHttpJsonTransportProviderBuilder().build())
156+
* .build();
157+
* CloudBuildClient cloudBuildClient = CloudBuildClient.create(cloudBuildSettings);
158+
* }</pre>
159+
*
145160
* <p>Please refer to the GitHub repository's samples for more quickstart code snippets.
146161
*/
147162
@Generated("by gapic-generator-java")
148163
public class CloudBuildClient implements BackgroundResource {
149164
private final CloudBuildSettings settings;
150165
private final CloudBuildStub stub;
151-
private final OperationsClient operationsClient;
166+
private final OperationsClient httpJsonOperationsClient;
167+
private final com.google.longrunning.OperationsClient operationsClient;
152168

153169
/** Constructs an instance of CloudBuildClient with default settings. */
154170
public static final CloudBuildClient create() throws IOException {
@@ -178,13 +194,17 @@ public static final CloudBuildClient create(CloudBuildStub stub) {
178194
protected CloudBuildClient(CloudBuildSettings settings) throws IOException {
179195
this.settings = settings;
180196
this.stub = ((CloudBuildStubSettings) settings.getStubSettings()).createStub();
181-
this.operationsClient = OperationsClient.create(this.stub.getOperationsStub());
197+
this.operationsClient =
198+
com.google.longrunning.OperationsClient.create(this.stub.getOperationsStub());
199+
this.httpJsonOperationsClient = OperationsClient.create(this.stub.getHttpJsonOperationsStub());
182200
}
183201

184202
protected CloudBuildClient(CloudBuildStub stub) {
185203
this.settings = null;
186204
this.stub = stub;
187-
this.operationsClient = OperationsClient.create(this.stub.getOperationsStub());
205+
this.operationsClient =
206+
com.google.longrunning.OperationsClient.create(this.stub.getOperationsStub());
207+
this.httpJsonOperationsClient = OperationsClient.create(this.stub.getHttpJsonOperationsStub());
188208
}
189209

190210
public final CloudBuildSettings getSettings() {
@@ -199,10 +219,19 @@ public CloudBuildStub getStub() {
199219
* Returns the OperationsClient that can be used to query the status of a long-running operation
200220
* returned by another API method call.
201221
*/
202-
public final OperationsClient getOperationsClient() {
222+
public final com.google.longrunning.OperationsClient getOperationsClient() {
203223
return operationsClient;
204224
}
205225

226+
/**
227+
* Returns the OperationsClient that can be used to query the status of a long-running operation
228+
* returned by another API method call.
229+
*/
230+
@BetaApi
231+
public final OperationsClient getHttpJsonOperationsClient() {
232+
return httpJsonOperationsClient;
233+
}
234+
206235
// AUTO-GENERATED DOCUMENTATION AND METHOD.
207236
/**
208237
* Starts a build with the specified configuration.

‎java-cloudbuild/google-cloud-build/src/main/java/com/google/cloud/devtools/cloudbuild/v1/CloudBuildSettings.java‎

Lines changed: 21 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
import com.google.api.gax.core.GoogleCredentialsProvider;
2626
import com.google.api.gax.core.InstantiatingExecutorProvider;
2727
import com.google.api.gax.grpc.InstantiatingGrpcChannelProvider;
28+
import com.google.api.gax.httpjson.InstantiatingHttpJsonChannelProvider;
2829
import com.google.api.gax.rpc.ApiClientHeaderProvider;
2930
import com.google.api.gax.rpc.ClientContext;
3031
import com.google.api.gax.rpc.ClientSettings;
@@ -268,11 +269,18 @@ public static GoogleCredentialsProvider.Builder defaultCredentialsProviderBuilde
268269
return CloudBuildStubSettings.defaultCredentialsProviderBuilder();
269270
}
270271

271-
/** Returns a builder for the default ChannelProvider for this service. */
272+
/** Returns a builder for the default gRPC ChannelProvider for this service. */
272273
public static InstantiatingGrpcChannelProvider.Builder defaultGrpcTransportProviderBuilder() {
273274
return CloudBuildStubSettings.defaultGrpcTransportProviderBuilder();
274275
}
275276

277+
/** Returns a builder for the default REST ChannelProvider for this service. */
278+
@BetaApi
279+
public static InstantiatingHttpJsonChannelProvider.Builder
280+
defaultHttpJsonTransportProviderBuilder() {
281+
return CloudBuildStubSettings.defaultHttpJsonTransportProviderBuilder();
282+
}
283+
276284
public static TransportChannelProvider defaultTransportChannelProvider() {
277285
return CloudBuildStubSettings.defaultTransportChannelProvider();
278286
}
@@ -282,11 +290,17 @@ public static ApiClientHeaderProvider.Builder defaultApiClientHeaderProviderBuil
282290
return CloudBuildStubSettings.defaultApiClientHeaderProviderBuilder();
283291
}
284292

285-
/** Returns a new builder for this class. */
293+
/** Returns a new gRPC builder for this class. */
286294
public static Builder newBuilder() {
287295
return Builder.createDefault();
288296
}
289297

298+
/** Returns a new REST builder for this class. */
299+
@BetaApi
300+
public static Builder newHttpJsonBuilder() {
301+
return Builder.createHttpJsonDefault();
302+
}
303+
290304
/** Returns a new builder for this class. */
291305
public static Builder newBuilder(ClientContext clientContext) {
292306
return new Builder(clientContext);
@@ -324,6 +338,11 @@ private static Builder createDefault() {
324338
return new Builder(CloudBuildStubSettings.newBuilder());
325339
}
326340

341+
@BetaApi
342+
private static Builder createHttpJsonDefault() {
343+
return new Builder(CloudBuildStubSettings.newHttpJsonBuilder());
344+
}
345+
327346
public CloudBuildStubSettings.Builder getStubSettingsBuilder() {
328347
return ((CloudBuildStubSettings.Builder) getStubSettings());
329348
}

‎java-cloudbuild/google-cloud-build/src/main/java/com/google/cloud/devtools/cloudbuild/v1/stub/CloudBuildStub.java‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,11 @@
6767
public abstract class CloudBuildStub implements BackgroundResource {
6868

6969
public OperationsStub getOperationsStub() {
70-
throw new UnsupportedOperationException("Not implemented: getOperationsStub()");
70+
return null;
71+
}
72+
73+
public com.google.api.gax.httpjson.longrunning.stub.OperationsStub getHttpJsonOperationsStub() {
74+
return null;
7175
}
7276

7377
public OperationCallable<CreateBuildRequest, Build, BuildOperationMetadata>

‎java-cloudbuild/google-cloud-build/src/main/java/com/google/cloud/devtools/cloudbuild/v1/stub/CloudBuildStubSettings.java‎

Lines changed: 50 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,9 @@
3030
import com.google.api.gax.grpc.GrpcTransportChannel;
3131
import com.google.api.gax.grpc.InstantiatingGrpcChannelProvider;
3232
import com.google.api.gax.grpc.ProtoOperationTransformers;
33+
import com.google.api.gax.httpjson.GaxHttpJsonProperties;
34+
import com.google.api.gax.httpjson.HttpJsonTransportChannel;
35+
import com.google.api.gax.httpjson.InstantiatingHttpJsonChannelProvider;
3336
import com.google.api.gax.longrunning.OperationSnapshot;
3437
import com.google.api.gax.longrunning.OperationTimedPollAlgorithm;
3538
import com.google.api.gax.retrying.RetrySettings;
@@ -485,6 +488,11 @@ public CloudBuildStub createStub() throws IOException {
485488
.equals(GrpcTransportChannel.getGrpcTransportName())) {
486489
return GrpcCloudBuildStub.create(this);
487490
}
491+
if (getTransportChannelProvider()
492+
.getTransportName()
493+
.equals(HttpJsonTransportChannel.getHttpJsonTransportName())) {
494+
return HttpJsonCloudBuildStub.create(this);
495+
}
488496
throw new UnsupportedOperationException(
489497
String.format(
490498
"Transport not supported: %s", getTransportChannelProvider().getTransportName()));
@@ -517,30 +525,56 @@ public static GoogleCredentialsProvider.Builder defaultCredentialsProviderBuilde
517525
.setUseJwtAccessWithScope(true);
518526
}
519527

520-
/** Returns a builder for the default ChannelProvider for this service. */
528+
/** Returns a builder for the default gRPC ChannelProvider for this service. */
521529
public static InstantiatingGrpcChannelProvider.Builder defaultGrpcTransportProviderBuilder() {
522530
return InstantiatingGrpcChannelProvider.newBuilder()
523531
.setMaxInboundMessageSize(Integer.MAX_VALUE);
524532
}
525533

534+
/** Returns a builder for the default REST ChannelProvider for this service. */
535+
@BetaApi
536+
public static InstantiatingHttpJsonChannelProvider.Builder
537+
defaultHttpJsonTransportProviderBuilder() {
538+
return InstantiatingHttpJsonChannelProvider.newBuilder();
539+
}
540+
526541
public static TransportChannelProvider defaultTransportChannelProvider() {
527542
return defaultGrpcTransportProviderBuilder().build();
528543
}
529544

530545
@BetaApi("The surface for customizing headers is not stable yet and may change in the future.")
531-
public static ApiClientHeaderProvider.Builder defaultApiClientHeaderProviderBuilder() {
546+
public static ApiClientHeaderProvider.Builder defaultGrpcApiClientHeaderProviderBuilder() {
532547
return ApiClientHeaderProvider.newBuilder()
533548
.setGeneratedLibToken(
534549
"gapic", GaxProperties.getLibraryVersion(CloudBuildStubSettings.class))
535550
.setTransportToken(
536551
GaxGrpcProperties.getGrpcTokenName(), GaxGrpcProperties.getGrpcVersion());
537552
}
538553

539-
/** Returns a new builder for this class. */
554+
@BetaApi("The surface for customizing headers is not stable yet and may change in the future.")
555+
public static ApiClientHeaderProvider.Builder defaultHttpJsonApiClientHeaderProviderBuilder() {
556+
return ApiClientHeaderProvider.newBuilder()
557+
.setGeneratedLibToken(
558+
"gapic", GaxProperties.getLibraryVersion(CloudBuildStubSettings.class))
559+
.setTransportToken(
560+
GaxHttpJsonProperties.getHttpJsonTokenName(),
561+
GaxHttpJsonProperties.getHttpJsonVersion());
562+
}
563+
564+
public static ApiClientHeaderProvider.Builder defaultApiClientHeaderProviderBuilder() {
565+
return CloudBuildStubSettings.defaultGrpcApiClientHeaderProviderBuilder();
566+
}
567+
568+
/** Returns a new gRPC builder for this class. */
540569
public static Builder newBuilder() {
541570
return Builder.createDefault();
542571
}
543572

573+
/** Returns a new REST builder for this class. */
574+
public static Builder newHttpJsonBuilder() {
575+
return Builder.createHttpJsonDefault();
576+
}
577+
544578
/** Returns a new builder for this class. */
545579
public static Builder newBuilder(ClientContext clientContext) {
546580
return new Builder(clientContext);
@@ -802,6 +836,19 @@ private static Builder createDefault() {
802836
return initDefaults(builder);
803837
}
804838

839+
private static Builder createHttpJsonDefault() {
840+
Builder builder = new Builder(((ClientContext) null));
841+
842+
builder.setTransportChannelProvider(defaultHttpJsonTransportProviderBuilder().build());
843+
builder.setCredentialsProvider(defaultCredentialsProviderBuilder().build());
844+
builder.setInternalHeaderProvider(defaultHttpJsonApiClientHeaderProviderBuilder().build());
845+
builder.setEndpoint(getDefaultEndpoint());
846+
builder.setMtlsEndpoint(getDefaultMtlsEndpoint());
847+
builder.setSwitchToMtlsEndpointAllowed(true);
848+
849+
return initDefaults(builder);
850+
}
851+
805852
private static Builder initDefaults(Builder builder) {
806853
builder
807854
.createBuildSettings()

0 commit comments

Comments
 (0)