8000 feat: Enable REST transport for most of Java and Go clients by gcf-owl-bot[bot] · Pull Request #190 · googleapis/java-debugger-client · 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.

feat: Enable REST transport for most of Java and Go clients #190

Merged
gcf-merge-on-green merged 9 commits into from
Jun 24, 2022
Merged

feat: Enable REST transport for most of Java and Go clients #190

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
4d9ee74
chore: remove unused imports
gcf-owl-bot[bot] May 23, 2022
618cdae
🦉 Updates from OwlBot post-processor
gcf-owl-bot[bot] May 23, 2022
59e4669
chore(deps): upgrade gapic-generator-java to 2.8.0 and update gax-jav…
gcf-owl-bot[bot] May 24, 2022
bed111f
🦉 Updates from OwlBot post-processor
gcf-owl-bot[bot] May 24, 2022
87ed158
feat: Enable REST transport for most of Java and Go clients
gcf-owl-bot[bot] Jun 23, 2022
995a0db
🦉 Updates from OwlBot post-processor
gcf-owl-bot[bot] Jun 23, 2022
a1895ff
Merge branch 'main' into owl-bot-copy
Neenu1995 Jun 24, 2022
f265612
chore: fix deps
Neenu1995 Jun 24, 2022
7ec6d46
chore: remove unused dependency
Neenu1995 Jun 24, 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-debugger-client/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
18 changes: 14 additions & 4 deletions ...e-cloud-debugger-client/src/main/java/com/google/cloud/debugger/v2/Controller2Client.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@

package com.google.cloud.debugger.v2;

import com.google.api.core.BetaApi;
import com.google.api.gax.core.BackgroundResource;
import com.google.api.gax.rpc.UnaryCallable;
import com.google.cloud.debugger.v2.stub.Controller2Stub;
Expand Down Expand Up @@ -113,6 +112,20 @@
* Controller2Client controller2Client = Controller2Client.create(controller2Settings);
* }</pre>
*
* <p>To use REST (HTTP1.1/JSON 10BC0 ) 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.
* Controller2Settings controller2Settings =
* Controller2Settings.newBuilder()
* .setTransportChannelProvider(
* Controller2Settings.defaultHttpJsonTransportProviderBuilder().build())
* .build();
* Controller2Client controller2Client = Controller2Client.create(controller2Settings);
* }</pre>
*
* <p>Please refer to the GitHub repository's samples for more quickstart code snippets.
*/
@Generated("by gapic-generator-java")
Expand All @@ -137,7 +150,6 @@ public static final Controller2Client create(Controller2Settings settings) throw
* Constructs an instance of Controller2Client, using the given stub for making calls. This is for
* advanced usage - prefer using create(Controller2Settings).
*/
@BetaApi("A restructuring of stub classes is planned, so this may break in the future")
public static final Controller2Client create(Controller2Stub stub) {
return new Controller2Client(stub);
}
Expand All @@ -152,7 +164,6 @@ protected Controller2Client(Controller2Settings settings) throws IOException {
this.stub = ((Controller2StubSettings) settings.getStubSettings()).createStub();
}

@BetaApi("A restructuring of stub classes is planned, so this may break in the future")
protected Controller2Client(Controller2Stub stub) {
this.settings = null;
this.stub = stub;
Expand All @@ -162,7 +173,6 @@ public final Controller2Settings getSettings() {
return settings;
}

@BetaApi("A restructuring of stub classes is planned, so this may break in the future")
public Controller2Stub getStub() {
return stub;
}
Expand Down
23 changes: 21 additions & 2 deletions ...cloud-debugger-client/src/main/java/com/google/cloud/debugger/v2/Controller2Settings.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,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 @@ -115,11 +116,18 @@ public static GoogleCredentialsProvider.Builder defaultCredentialsProviderBuilde
return Controller2StubSettings.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 Controller2StubSettings.defaultGrpcTransportProviderBuilder();
}

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

public static TransportChannelProvider defaultTransportChannelProvider() {
return Controller2StubSettings.defaultTransportChannelProvider();
}
Expand All @@ -129,11 +137,17 @@ public static ApiClientHeaderProvider.Builder defaultApiClientHeaderProviderBuil
return Controller2StubSettings.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 @@ -171,6 +185,11 @@ private static Builder createDefault() {
return new Builder(Controller2StubSettings.newBuilder());
}

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

public Controller2StubSettings.Builder getStubSettingsBuilder() {
return ((Controller2StubSettings.Builder) getStubSettings());
}
Expand Down
18 changes: 14 additions & 4 deletions google-cloud-debugger-client/src/main/java/com/google/cloud/debugger/v2/Debugger2Client.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@

package com.google.cloud.debugger.v2;

import com.google.api.core.BetaApi;
import com.google.api.gax.core.BackgroundResource;
import com.google.api.gax.rpc.UnaryCallable;
import com.google.cloud.debugger.v2.stub.Debugger2Stub;
Expand Down Expand Up @@ -113,6 +112,20 @@
* Debugger2Client debugger2Client = Debugger2Client.create(debugger2Settings);
* }</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.
* Debugger2Settings debugger2Settings =
* Debugger2Settings.newBuilder()
* .setTransportChannelProvider(
* Debugger2Settings.defaultHttpJsonTransportProviderBuilder().build())
* .build();
* Debugger2Client debugger2Client = Debugger2Client.create(debugger2Settings);
* }</pre>
*
* <p>Please refer to the GitHub repository's samples for more quickstart code snippets.
*/
@Generated("by gapic-generator-java")
Expand All @@ -137,7 +150,6 @@ public static final Debugger2Client create(Debugger2Settings settings) throws IO
* Constructs an instance of Debugger2Client, using the given stub for making calls. This is for
* advanced usage - prefer using create(Debugger2Settings).
*/
@BetaApi("A restructuring of stub classes is planned, so this may break in the future")
public static final Debugger2Client create(Debugger2Stub stub) {
return new Debugger2Client(stub);
}
Expand All @@ -151,7 +163,6 @@ protected Debugger2Client(Debugger2Settings settings) throws IOException {
this.stub = ((Debugger2StubSettings) settings.getStubSettings()).createStub();
}

@BetaApi("A restructuring of stub classes is planned, so this may break in the future")
protected Debugger2Client(Debugger2Stub stub) {
this.settings = null;
this.stub = stub;
Expand All @@ -161,7 +172,6 @@ public final Debugger2Settings getSettings() {
return settings;
}

@BetaApi("A restructuring of stub classes is planned, so this may break in the future")
public Debugger2Stub getStub() {
return stub;
}
Expand Down
23 changes: 21 additions & 2 deletions ...e-cloud-debugger-client/src/main/java/com/google/cloud/debugger/v2/Debugger2Settings.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,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 @@ -127,11 +128,18 @@ public static GoogleCredentialsProvider.Builder defaultCredentialsProviderBuilde
return Debugger2StubSettings.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 Debugger2StubSettings.defaultGrpcTransportProviderBuilder();
}

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

public static TransportChannelProvider defaultTransportChannelProvider() {
return Debugger2StubSettings.defaultTransportChannelProvider();
}
Expand All @@ -141,11 +149,17 @@ public static ApiClientHeaderProvider.Builder defaultApiClientHeaderProviderBuil
return Debugger2StubSettings.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 @@ -183,6 +197,11 @@ private static Builder createDefault() {
return new Builder(Debugger2StubSettings.newBuilder());
}

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

public Debugger2StubSettings.Builder getStubSettingsBuilder() {
return ((Debugger2StubSettings.Builder) getStubSettings());
}
Expand Down
54 changes: 50 additions & 4 deletions ...ugger-client/src/main/java/com/google/cloud/debugger/v2/stub/Controller2StubSettings.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,9 @@
import com.google.api.gax.grpc.GaxGrpcProperties;
import com.google.api.gax.grpc.GrpcTransportChannel;
import com.google.api.gax.grpc.InstantiatingGrpcChannelProvider;
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.retrying.RetrySettings;
import com.google.api.gax.rpc.ApiClientHeaderProvider;
import com.google.api.gax.rpc.ClientContext;
Expand Down Expand Up @@ -114,13 +117,17 @@ public class Controller2StubSettings extends StubSettings<Controller2StubSetting
return updateActiveBreakpointSettings;
}

@BetaApi("A restructuring of stub classes is planned, so this may break in the future")
public Controller2Stub createStub() throws IOException {
if (getTransportChannelProvider()
.getTransportName()
.equals(GrpcTransportChannel.getGrpcTransportName())) {
return GrpcController2Stub.create(this);
}
if (getTransportChannelProvider()
.getTransportName()
.equals(HttpJsonTransportChannel.getHttpJsonTransportName())) {
return HttpJsonController2Stub.create(this);
}
throw new UnsupportedOperationException(
String.format(
"Transport not supported: %s&qu BE25 ot;, getTransportChannelProvider().getTransportName()));
Expand Down Expand Up @@ -153,30 +160,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(Controller2StubSettings.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(Controller2StubSettings.class))
.setTransportToken(
GaxHttpJsonProperties.getHttpJsonTokenName(),
GaxHttpJsonProperties.getHttpJsonVersion());
}

public static ApiClientHeaderProvider.Builder defaultApiClientHeaderProviderBuilder() {
return Controller2StubSettings.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 @@ -295,6 +328,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
.registerDebuggeeSettings()
Expand Down
Loading
0