8000 fix: update gapic-generator-java with mock service generation fixes by gcf-owl-bot[bot] · Pull Request #118 · googleapis/java-deploy · GitHub
[go: up one dir, main page]
Skip to content
This repository was archived by the owner on Sep 16, 2023. It is now read-only.

fix: update gapic-generator-java with mock service generation fixes #118

Merged
pattishin merged 10 commits into from
Jun 30, 2022
Merged

fix: update gapic-generator-java with mock service generation fixes #118

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
abac189
chore(deps): upgrade gapic-generator-java to 2.8.0 and update gax-jav…
gcf-owl-bot[bot] May 24, 2022
354c0d9
🦉 Updates from OwlBot post-processor
gcf-owl-bot[bot] May 24, 2022
35e5d99
chore: Integrate new gapic-generator-java and rules_gapic
gcf-owl-bot[bot] Jun 10, 2022
8e61c9b
🦉 Updates from OwlBot post-processor
gcf-owl-bot[bot] Jun 10, 2022
31173b7
feat: Enable REST transport for most of Java and Go clients
gcf-owl-bot[bot] Jun 23, 2022
a7f2837
🦉 Updates from OwlBot post-processor
gcf-owl-bot[bot] Jun 23, 2022
bb5c49f
Update pom.xml
Neenu1995 Jun 23, 2022
d5953bd
Merge branch 'main' into owl-bot-copy
Neenu1995 Jun 24, 2022
25c8371
fix: update gapic-generator-java with mock service generation fixes
gcf-owl-bot[bot] Jun 27, 2022
2cf06b0
🦉 Updates from OwlBot post-processor
gcf-owl-bot[bot] Jun 27, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions google-cloud-deploy/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,10 @@
<groupId>com.google.api</groupId>
<artifactId>gax-grpc</artifactId>
</dependency>
<dependency>
<groupId>com.google.api</groupId>
<artifactId>gax-httpjson</artifactId>
</dependency>
<dependency>
<groupId>org.threeten</groupId>
<artifactId>threetenbp</artifactId>
Expand All @@ -77,12 +81,24 @@
<scope>test</scope>
</dependency>
<!-- Need testing utility classes for generated gRPC clients tests -->
<dependency>
<groupId>com.google.api</groupId>
<artifactId>gax</artifactId>
<classifier>testlib</classifier>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.google.api</groupId>
<artifactId>gax-grpc</artifactId>
<classifier>testlib</classifier>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.google.api</groupId>
<artifactId>gax-httpjson</artifactId>
<classifier>testlib</classifier>
<scope>test</scope>
</dependency>
</dependencies>

<profiles>
Expand Down
49 changes: 37 additions & 12 deletions google-cloud-deploy/src/main/java/com/google/cloud/deploy/v1/CloudDeployClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
import com.google.api.core.ApiFutures;
import com.google.api.core.BetaApi;
import com.google.api.gax.core.BackgroundResource;
import com.google.api.gax.httpjson.longrunning.OperationsClient;
import com.google.api.gax.longrunning.OperationFuture;
import com.google.api.gax.paging.AbstractFixedSizeCollection;
import com.google.api.gax.paging.AbstractPage;
Expand All @@ -31,7 +32,6 @@
import com.google.cloud.deploy.v1.stub.CloudDeployStubSettings;
import com.google.common.util.concurrent.MoreExecutors;
import com.google.longrunning.Operation;
import com.google.longrunning.OperationsClient;
import com.google.protobuf.Empty;
import com.google.protobuf.FieldMask;
import java.io.IOException;
Expand Down Expand Up @@ -105,13 +105,28 @@
* CloudDeployClient cloudDeployClient = CloudDeployClient.create(cloudDeploySettings);
* }</pre>
*
* <p>To use REST (HTTP1.1/JSON) transport (instead of gRPC) for sending and receiving requests over
* the wire:
*
* <pre>{@code
* // This snippet has been automatically generated for illustrative purposes only.
* // It may require modifications to work in your environment.
* CloudDeploySettings cloudDeploySettings =
* CloudDeploySettings.newBuilder()
* .setTransportChannelProvider(
* CloudDeploySettings.defaultHttpJsonTransportProviderBuilder().build())
* .build();
* CloudDeployClient cloudDeployClient = CloudDeployClient.create(cloudDeploySettings);
* }</pre>
*
* <p>Please refer to the GitHub repository's samples for more quickstart code snippets.
*/
@Generated("by gapic-generator-java")
public class CloudDeployClient implements BackgroundResource {
private final CloudDeploySettings settings;
private final CloudDeployStub stub;
private final OperationsClient operationsClient;
private final OperationsClient httpJsonOperationsClient;
private final com.google.longrunning.OperationsClient operationsClient;

/** Constructs an instance of CloudDeployClient with default settings. */
public static final CloudDeployClient create() throws IOException {
Expand All @@ -130,7 +145,6 @@ public static final CloudDeployClient create(CloudDeploySettings settings) throw
* Constructs an instance of CloudDeployClient, using the given stub for making calls. This is for
* advanced usage - prefer using create(CloudDeploySettings).
*/
@BetaApi("A restructuring of stub classes is planned, so this may break in the future")
public static final CloudDeployClient create(CloudDeployStub stub) {
return new CloudDeployClient(stub);
}
Expand All @@ -143,21 +157,23 @@ public static final CloudDeployClient create(CloudDeployStub stub) {
protected CloudDeployClient(CloudDeploySettings settings) throws IOException {
this.settings = settings;
this.stub = ((CloudDeployStubSettings) settings.getStubSettings()).createStub();
this.operationsClient = OperationsClient.create(this.stub.getOperationsStub());
this.operationsClient =
com.google.longrunning.OperationsClient.create(this.stub.getOperationsStub());
this.httpJsonOperationsClient = OperationsClient.create(this.stub.getHttpJsonOperationsStub());
}

@BetaApi("A restructuring of stub classes is planned, so this may break in the future")
protected CloudDeployClient(CloudDeployStub stub) {
this.settings = null;
this.stub = stub;
this.operationsClient = OperationsClient.create(this.stub.getOperationsStub());
this.operationsClient =
com.google.longrunning.OperationsClient.create(this.stub.getOperationsStub());
this.httpJsonOperationsClient = OperationsClient.create(this.stub.getHttpJsonOperationsStub());
}

public final CloudDeploySettings getSettings() {
return settings;
}

@BetaApi("A restructuring of stub classes is planned, so this may break in the future")
public CloudDeployStub getStub() {
return stub;
}
Expand All @@ -166,10 +182,19 @@ public CloudDeployStub getStub() {
* Returns the OperationsClient that can be used to query the status of a long-running operation
* returned by another API method call.
*/
public final OperationsClient getOperationsClient() {
public final com.google.longrunning.OperationsClient getOperationsClient() {
return operationsClient;
}

/**
* Returns the OperationsClient that can be used to query the status of a long-running operation
* returned by another API method call.
*/
@BetaApi
public final OperationsClient getHttpJsonOperationsClient() {
return httpJsonOperationsClient;
}

// AUTO-GENERATED DOCUMENTATION AND METHOD.
/**
* Lists DeliveryPipelines in a given project and location.
Expand Down Expand Up @@ -314,7 +339,7 @@ public final ListDeliveryPipelinesPagedResponse listDeliveryPipelines(
* while (true) {
* ListDeliveryPipelinesResponse response =
* cloudDeployClient.listDeliveryPipelinesCallable().call(request);
* for (DeliveryPipeline element : response.getResponsesList()) {
* for (DeliveryPipeline element : response.getDeliveryPipelinesList()) {
* // doThingsWith(element);
* }
* String nextPageToken = response.getNextPageToken();
Expand Down Expand Up @@ -1020,7 +1045,7 @@ public final ListTargetsPagedResponse listTargets(ListTargetsRequest request) {
* .build();
* while (true) {
* ListTargetsResponse response = cloudDeployClient.listTargetsCallable().call(request);
* for (Target element : response.getResponsesList()) {
* for (Target element : response.getTargetsList()) {
* // doThingsWith(element);
* }
* String nextPageToken = response.getNextPageToken();
Expand Down Expand Up @@ -1689,7 +1714,7 @@ public final ListReleasesPagedResponse listReleases(ListReleasesRequest request)
* .build();
* while (true) {
* ListReleasesResponse response = cloudDeployClient.listReleasesCallable().call(request);
* for (Release element : response.getResponsesList()) {
* for (Release element : response.getReleasesList()) {
* // doThingsWith(element);
* }
* String nextPageToken = response.getNextPageToken();
Expand Down Expand Up @@ -2241,7 +2266,7 @@ public final ListRolloutsPagedResponse listRollouts(ListRolloutsRequest request)
* .build();
* while (true) {
* ListRolloutsResponse response = cloudDeployClient.listRolloutsCallable().call(request);
* for (Rollout element : response.getResponsesList()) {
* for (Rollout element : response.getRolloutsList()) {
* // doThingsWith(element);
* }
* String nextPageToken = response.getNextPageToken();
Expand Down
23 changes: 21 additions & 2 deletions google-cloud-deploy/src/main/java/com/google/cloud/deploy/v1/CloudDeploySettings.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
import com.google.api.gax.core.GoogleCredentialsProvider;
import com.google.api.gax.core.InstantiatingExecutorProvider;
import com.google.api.gax.grpc.InstantiatingGrpcChannelProvider;
import com.google.api.gax.httpjson.InstantiatingHttpJsonChannelProvider;
import com.google.api.gax.rpc.ApiClientHeaderProvider;
import com.google.api.gax.rpc.ClientContext;
import com.google.api.gax.rpc.ClientSettings;
Expand Down Expand Up @@ -249,11 +250,18 @@ public static GoogleCredentialsProvider.Builder defaultCredentialsProviderBuilde
return CloudDeployStubSettings.defaultCredentialsProviderBuilder();
}

/** Returns a builder for the default ChannelProvider for this service. */
/** Returns a builder for the default gRPC ChannelProvider for this service. */
public static InstantiatingGrpcChannelProvider.Builder defaultGrpcTransportProviderBuilder() {
return CloudDeployStubSettings.defaultGrpcTransportProviderBuilder();
}

/** Returns a builder for the default REST ChannelProvider for this service. */
@BetaApi
public static InstantiatingHttpJsonChannelProvider.Builder
defaultHttpJsonTransportProviderBuilder() {
return CloudDeployStubSettings.defaultHttpJsonTransportProviderBuilder();
}

public static TransportChannelProvider defaultTransportChannelProvider() {
return CloudDeployStubSettings.defaultTransportChannelProvider();
}
Expand All @@ -263,11 +271,17 @@ public static ApiClientHeaderProvider.Builder defaultApiClientHeaderProviderBuil
return CloudDeployStubSettings.defaultApiClientHeaderProviderBuilder();
}

/** Returns a new builder for this class. */
/** Returns a new gRPC builder for this class. */
public static Builder newBuilder() {
return Builder.createDefault();
}

/** Returns a new REST builder for this class. */
@BetaApi
public static Builder newHttpJsonBuilder() {
return Builder.createHttpJsonDefault();
}

/** Returns a new builder for this class. */
public static Builder newBuilder(ClientContext clientContext) {
return new Builder(clientContext);
Expand Down Expand Up @@ -305,6 +319,11 @@ private static Builder createDefault() {
return new Builder(CloudDeployStubSettings.newBuilder());
}

@BetaApi
private static Builder createHttpJsonDefault() {
return new Builder(CloudDeployStubSettings.newHttpJsonBuilder());
}

public CloudDeployStubSettings.Builder getStubSettingsBuilder() {
return ((CloudDeployStubSettings.Builder) getStubSettings());
}
Expand Down
6 changes: 5 additions & 1 deletion google-cloud-deploy/src/main/java/com/google/cloud/deploy/v1/stub/CloudDeployStub.java
187E View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,11 @@
public abstract class CloudDeployStub implements BackgroundResource {

public OperationsStub getOperationsStub() {
throw new UnsupportedOperationException("Not implemented: getOperationsStub()");
return null;
}

public com.google.api.gax.httpjson.longrunning.stub.OperationsStub getHttpJsonOperationsStub() {
return null;
}

public UnaryCallable<ListDeliveryPipelinesRequest, ListDeliveryPipelinesPagedResponse>
Expand Down
54 changes: 50 additions & 4 deletions ...e-cloud-deploy/src/main/java/com/google/cloud/deploy/v1/stub/CloudDeployStubSettings.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,9 @@
import com.google.api.gax.grpc.GrpcTransportChannel;
import com.google.api.gax.grpc.InstantiatingGrpcChannelProvider;
import com.google.api.gax.grpc.ProtoOperationTransformers;
import com.google.api.gax.httpjson.GaxHttpJsonProperties;
import com.google.api.gax.httpjson.HttpJsonTransportChannel;
import com.google.api.gax.httpjson.InstantiatingHttpJsonChannelProvider;
import com.google.api.gax.longrunning.OperationSnapshot;
import com.google.api.gax.longrunning.OperationTimedPollAlgorithm;
import com.google.api.gax.retrying.RetrySettings;
Expand Down Expand Up @@ -551,13 +554,17 @@ public UnaryCallSettings<GetConfigRequest, Config> getConfigSettings() {
return getConfigSettings;
}

@BetaApi("A restructuring of stub classes is planned, so this may break in the future")
public CloudDeployStub createStub() throws IOException {
if (getTransportChannelProvider()
.getTransportName()
.equals(GrpcTransportChannel.getGrpcTransportName())) {
return GrpcCloudDeployStub.create(this);
}
if (getTransportChannelProvider()
.getTransportName()
.equals(HttpJsonTransportChannel.getHttpJsonTransportName())) {
return HttpJsonCloudDeployStub.create(this);
}
throw new UnsupportedOperationException(
String.format(
"Transport not supported: %s", getTransportChannelProvider().getTransportName()));
Expand Down Expand Up @@ -590,30 +597,56 @@ public static GoogleCredentialsProvider.Builder defaultCredentialsProviderBuilde
.setUseJwtAccessWithScope(true);
}

/** Returns a builder for the default ChannelProvider for this service. */
/** Returns a builder for the default gRPC ChannelProvider for this service. */
public static InstantiatingGrpcChannelProvider.Builder defaultGrpcTransportProviderBuilder() {
return InstantiatingGrpcChannelProvider.newBuilder()
.setMaxInboundMessageSize(Integer.MAX_VALUE);
}

/** Returns a builder for the default REST ChannelProvider for this service. */
@BetaApi
public static InstantiatingHttpJsonChannelProvider.Builder
defaultHttpJsonTransportProviderBuilder() {
return InstantiatingHttpJsonChannelProvider.newBuilder();
}

public static TransportChannelProvider defaultTransportChannelProvider() {
return defaultGrpcTransportProviderBuilder().build();
}

@BetaApi("The surface for customizing headers is not stable yet and may change in the future.")
public static ApiClientHeaderProvider.Builder defaultApiClientHeaderProviderBuilder() {
public static ApiClientHeaderProvider.Builder defaultGrpcApiClientHeaderProviderBuilder() {
return ApiClientHeaderProvider.newBuilder()
.setGeneratedLibToken(
"gapic", GaxProperties.getLibraryVersion(CloudDeployStubSettings.class))
.setTransportToken(
GaxGrpcProperties.getGrpcTokenName(), GaxGrpcProperties.getGrpcVersion());
}

/** Returns a new builder for this class. */
@BetaApi("The surface for customizing headers is not stable yet and may change in the future.")
public static ApiClientHeaderProvider.Builder defaultHttpJsonApiClientHeaderProviderBuilder() {
return ApiClientHeaderProvider.newBuilder()
.setGeneratedLibToken(
"gapic", GaxProperties.getLibraryVersion(CloudDeployStubSettings.class))
.setTransportToken(
GaxHttpJsonProperties.getHttpJsonTokenName(),
GaxHttpJsonProperties.getHttpJsonVersion());
}

public static ApiClientHeaderProvider.Builder defaultApiClientHeaderProviderBuilder() {
return CloudDeployStubSettings.defaultGrpcApiClientHeaderProviderBuilder();
}

/** Returns a new gRPC builder for this class. */
public static Builder newBuilder() {
return Builder.createDefault();
}

/** Returns a new REST builder for this class. */
public static Builder newHttpJsonBuilder() {
return Builder.createHttpJsonDefault();
}

/** Returns a new builder for this class. */
public static Builder newBuilder(ClientContext clientContext) {
return new Builder(clientContext);
Expand Down Expand Up @@ -880,6 +913,19 @@ private static Builder createDefault() {
return initDefaults(builder);
}

private static Builder createHttpJsonDefault() {
Builder builder = new Builder(((ClientContext) null));

builder.setTransportChannelProvider(defaultHttpJsonTransportProviderBuilder().build());
builder.setCredentialsProvider(defaultCredentialsProviderBuilder().build());
builder.setInternalHeaderProvider(defaultHttpJsonApiClientHeaderProviderBuilder().build());
builder.setEndpoint(getDefaultEndpoint());
builder.setMtlsEndpoint(getDefaultMtlsEndpoint());
builder.setSwitchToMtlsEndpointAllowed(true);

return initDefaults(builder);
}

private static Builder initDefaults(Builder builder) {
builder
.listDeliveryPipelinesSettings()
Expand Down
Loading
0