Skip to content

Commit 9638a0d

Browse files
feat: Enable REST transport for most of Java and Go clients (googleapis#537)
* 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 <suztomo@google.com>
1 parent 861b7de commit 9638a0d

File tree

114 files changed

+8502
-32
lines changed

Some content is hidden

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

114 files changed

+8502
-32
lines changed

java-recommendations-ai/google-cloud-recommendations-ai/pom.xml

Lines changed: 16 additions & 0 deletions
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>
@@ -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-recommendations-ai/google-cloud-recommendations-ai/src/main/java/com/google/cloud/recommendationengine/v1beta1/CatalogServiceClient.java

Lines changed: 32 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
import com.google.api.core.ApiFutures;
2121
import com.google.api.core.BetaApi;
2222
import com.google.api.gax.core.BackgroundResource;
23+
import com.google.api.gax.httpjson.longrunning.OperationsClient;
2324
import com.google.api.gax.longrunning.OperationFuture;
2425
import com.google.api.gax.paging.AbstractFixedSizeCollection;
2526
import com.google.api.gax.paging.AbstractPage;
@@ -31,7 +32,6 @@
3132
import com.google.cloud.recommendationengine.v1beta1.stub.CatalogServiceStubSettings;
3233
import com.google.common.util.concurrent.MoreExecutors;
3334
import com.google.longrunning.Operation;
34-
import com.google.longrunning.OperationsClient;
3535
import com.google.protobuf.Empty;
3636
import com.google.protobuf.FieldMask;
3737
import java.io.IOException;
@@ -104,14 +104,29 @@
104104
* CatalogServiceClient catalogServiceClient = CatalogServiceClient.create(catalogServiceSettings);
105105
* }</pre>
106106
*
107+
* <p>To use REST (HTTP1.1/JSON) transport (instead of gRPC) for sending and receiving requests over
108+
* the wire:
109+
*
110+
* <pre>{@code
111+
* // This snippet has been automatically generated for illustrative purposes only.
112+
* // It may require modifications to work in your environment.
113+
* CatalogServiceSettings catalogServiceSettings =
114+
* CatalogServiceSettings.newBuilder()
115+
* .setTransportChannelProvider(
116+
* CatalogServiceSettings.defaultHttpJsonTransportProviderBuilder().build())
117+
* .build();
118+
* CatalogServiceClient catalogServiceClient = CatalogServiceClient.create(catalogServiceSettings);
119+
* }</pre>
120+
*
107121
* <p>Please refer to the GitHub repository's samples for more quickstart code snippets.
108122
*/
109123
@BetaApi
110124
@Generated("by gapic-generator-java")
111125
public class CatalogServiceClient implements BackgroundResource {
112126
private final CatalogServiceSettings settings;
113127
private final CatalogServiceStub stub;
114-
private final OperationsClient operationsClient;
128+
private final OperationsClient httpJsonOperationsClient;
129+
private final com.google.longrunning.OperationsClient operationsClient;
115130

116131
/** Constructs an instance of CatalogServiceClient with default settings. */
117132
public static final CatalogServiceClient create() throws IOException {
@@ -143,13 +158,17 @@ public static final CatalogServiceClient create(CatalogServiceStub stub) {
143158
protected CatalogServiceClient(CatalogServiceSettings settings) throws IOException {
144159
this.settings = settings;
145160
this.stub = ((CatalogServiceStubSettings) settings.getStubSettings()).createStub();
146-
this.operationsClient = OperationsClient.create(this.stub.getOperationsStub());
161+
this.operationsClient =
162+
com.google.longrunning.OperationsClient.create(this.stub.getOperationsStub());
163+
this.httpJsonOperationsClient = OperationsClient.create(this.stub.getHttpJsonOperationsStub());
147164
}
148165

149166
protected CatalogServiceClient(CatalogServiceStub stub) {
150167
this.settings = null;
151168
this.stub = stub;
152-
this.operationsClient = OperationsClient.create(this.stub.getOperationsStub());
169+
this.operationsClient =
170+
com.google.longrunning.OperationsClient.create(this.stub.getOperationsStub());
171+
this.httpJsonOperationsClient = OperationsClient.create(this.stub.getHttpJsonOperationsStub());
153172
}
154173

155174
public final CatalogServiceSettings getSettings() {
@@ -164,10 +183,18 @@ public CatalogServiceStub getStub() {
164183
* Returns the OperationsClient that can be used to query the status of a long-running operation
165184
* returned by another API method call.
166185
*/
167-
public final OperationsClient getOperationsClient() {
186+
public final com.google.longrunning.OperationsClient getOperationsClient() {
168187
return operationsClient;
169188
}
170189

190+
/**
191+
* Returns the OperationsClient that can be used to query the status of a long-running operation
192+
* returned by another API method call.
193+
*/
194+
public final OperationsClient getHttpJsonOperationsClient() {
195+
return httpJsonOperationsClient;
196+
}
197+
171198
// AUTO-GENERATED DOCUMENTATION AND METHOD.
172199
/**
173200
* Creates a catalog item.

java-recommendations-ai/google-cloud-recommendations-ai/src/main/java/com/google/cloud/recommendationengine/v1beta1/CatalogServiceSettings.java

Lines changed: 21 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
import com.google.api.gax.core.GoogleCredentialsProvider;
2424
import com.google.api.gax.core.InstantiatingExecutorProvider;
2525
import com.google.api.gax.grpc.InstantiatingGrpcChannelProvider;
26+
import com.google.api.gax.httpjson.InstantiatingHttpJsonChannelProvider;
2627
import com.google.api.gax.rpc.ApiClientHeaderProvider;
2728
import com.google.api.gax.rpc.ClientContext;
2829
import com.google.api.gax.rpc.ClientSettings;
@@ -140,11 +141,18 @@ public static GoogleCredentialsProvider.Builder defaultCredentialsProviderBuilde
140141
return CatalogServiceStubSettings.defaultCredentialsProviderBuilder();
141142
}
142143

143-
/** Returns a builder for the default ChannelProvider for this service. */
144+
/** Returns a builder for the default gRPC ChannelProvider for this service. */
144145
public static InstantiatingGrpcChannelProvider.Builder defaultGrpcTransportProviderBuilder() {
145146
return CatalogServiceStubSettings.defaultGrpcTransportProviderBuilder();
146147
}
147148

149+
/** Returns a builder for the default REST ChannelProvider for this service. */
150+
@BetaApi
151+
public static InstantiatingHttpJsonChannelProvider.Builder
152+
defaultHttpJsonTransportProviderBuilder() {
153+
return CatalogServiceStubSettings.defaultHttpJsonTransportProviderBuilder();
154+
}
155+
148156
public static TransportChannelProvider defaultTransportChannelProvider() {
149157
return CatalogServiceStubSettings.defaultTransportChannelProvider();
150158
}
@@ -154,11 +162,17 @@ public static ApiClientHeaderProvider.Builder defaultApiClientHeaderProviderBuil
154162
return CatalogServiceStubSettings.defaultApiClientHeaderProviderBuilder();
155163
}
156164

157-
/** Returns a new builder for this class. */
165+
/** Returns a new gRPC builder for this class. */
158166
public static Builder newBuilder() {
159167
return Builder.createDefault();
160168
}
161169

170+
/** Returns a new REST builder for this class. */
171+
@BetaApi
172+
public static Builder newHttpJsonBuilder() {
173+
return Builder.createHttpJsonDefault();
174+
}
175+
162176
/** Returns a new builder for this class. */
163177
public static Builder newBuilder(ClientContext clientContext) {
164178
return new Builder(clientContext);
@@ -196,6 +210,11 @@ private static Builder createDefault() {
196210
return new Builder(CatalogServiceStubSettings.newBuilder());
197211
}
198212

213+
@BetaApi
214+
private static Builder createHttpJsonDefault() {
215+
return new Builder(CatalogServiceStubSettings.newHttpJsonBuilder());
216+
}
217+
199218
public CatalogServiceStubSettings.Builder getStubSettingsBuilder() {
200219
return ((CatalogServiceStubSettings.Builder) getStubSettings());
201220
}

java-recommendations-ai/google-cloud-recommendations-ai/src/main/java/com/google/cloud/recommendationengine/v1beta1/PredictionApiKeyRegistryClient.java

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,21 @@
110110
* PredictionApiKeyRegistryClient.create(predictionApiKeyRegistrySettings);
111111
* }</pre>
112112
*
113+
* <p>To use REST (HTTP1.1/JSON) transport (instead of gRPC) for sending and receiving requests over
114+
* the wire:
115+
*
116+
* <pre>{@code
117+
* // This snippet has been automatically generated for illustrative purposes only.
118+
* // It may require modifications to work in your environment.
119+
* PredictionApiKeyRegistrySettings predictionApiKeyRegistrySettings =
120+
* PredictionApiKeyRegistrySettings.newBuilder()
121+
* .setTransportChannelProvider(
122+
* PredictionApiKeyRegistrySettings.defaultHttpJsonTransportProviderBuilder().build())
123+
* .build();
124+
* PredictionApiKeyRegistryClient predictionApiKeyRegistryClient =
125+
* PredictionApiKeyRegistryClient.create(predictionApiKeyRegistrySettings);
126+
* }</pre>
127+
*
113128
* <p>Please refer to the GitHub repository's samples for more quickstart code snippets.
114129
*/
115130
@BetaApi

java-recommendations-ai/google-cloud-recommendations-ai/src/main/java/com/google/cloud/recommendationengine/v1beta1/PredictionApiKeyRegistrySettings.java

Lines changed: 21 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
import com.google.api.gax.core.GoogleCredentialsProvider;
2424
import com.google.api.gax.core.InstantiatingExecutorProvider;
2525
import com.google.api.gax.grpc.InstantiatingGrpcChannelProvider;
26+
import com.google.api.gax.httpjson.InstantiatingHttpJsonChannelProvider;
2627
import com.google.api.gax.rpc.ApiClientHeaderProvider;
2728
import com.google.api.gax.rpc.ClientContext;
2829
import com.google.api.gax.rpc.ClientSettings;
@@ -125,11 +126,18 @@ public static GoogleCredentialsProvider.Builder defaultCredentialsProviderBuilde
125126
return PredictionApiKeyRegistryStubSettings.defaultCredentialsProviderBuilder();
126127
}
127128

128-
/** Returns a builder for the default ChannelProvider for this service. */
129+
/** Returns a builder for the default gRPC ChannelProvider for this service. */
129130
public static InstantiatingGrpcChannelProvider.Builder defaultGrpcTransportProviderBuilder() {
130131
return PredictionApiKeyRegistryStubSettings.defaultGrpcTransportProviderBuilder();
131132
}
132133

134+
/** Returns a builder for the default REST ChannelProvider for this service. */
135+
@BetaApi
136+
public static InstantiatingHttpJsonChannelProvider.Builder
137+
defaultHttpJsonTransportProviderBuilder() {
138+
return PredictionApiKeyRegistryStubSettings.defaultHttpJsonTransportProviderBuilder();
139+
}
140+
133141
public static TransportChannelProvider defaultTransportChannelProvider() {
134142
return PredictionApiKeyRegistryStubSettings.defaultTransportChannelProvider();
135143
}
@@ -139,11 +147,17 @@ public static ApiClientHeaderProvider.Builder defaultApiClientHeaderProviderBuil
139147
return PredictionApiKeyRegistryStubSettings.defaultApiClientHeaderProviderBuilder();
140148
}
141149

142-
/** Returns a new builder for this class. */
150+
/** Returns a new gRPC builder for this class. */
143151
public static Builder newBuilder() {
144152
return Builder.createDefault();
145153
}
146154

155+
/** Returns a new REST builder for this class. */
156+
@BetaApi
157+
public static Builder newHttpJsonBuilder() {
158+
return Builder.createHttpJsonDefault();
159+
}
160+
147161
/** Returns a new builder for this class. */
148162
public static Builder newBuilder(ClientContext clientContext) {
149163
return new Builder(clientContext);
@@ -182,6 +196,11 @@ private static Builder createDefault() {
182196
return new Builder(PredictionApiKeyRegistryStubSettings.newBuilder());
183197
}
184198

199+
@BetaApi
200+
private static Builder createHttpJsonDefault() {
201+
return new Builder(PredictionApiKeyRegistryStubSettings.newHttpJsonBuilder());
202+
}
203+
185204
public PredictionApiKeyRegistryStubSettings.Builder getStubSettingsBuilder() {
186205
return ((PredictionApiKeyRegistryStubSettings.Builder) getStubSettings());
187206
}

java-recommendations-ai/google-cloud-recommendations-ai/src/main/java/com/google/cloud/recommendationengine/v1beta1/PredictionServiceClient.java

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,21 @@
107107
* PredictionServiceClient.create(predictionServiceSettings);
108108
* }</pre>
109109
*
110+
* <p>To use REST (HTTP1.1/JSON) transport (instead of gRPC) for sending and receiving requests over
111+
* the wire:
112+
*
113+
* <pre>{@code
114+
* // This snippet has been automatically generated for illustrative purposes only.
115+
* // It may require modifications to work in your environment.
116+
* PredictionServiceSettings predictionServiceSettings =
117+
* PredictionServiceSettings.newBuilder()
118+
* .setTransportChannelProvider(
119+
* PredictionServiceSettings.defaultHttpJsonTransportProviderBuilder().build())
120+
* .build();
121+
* PredictionServiceClient predictionServiceClient =
122+
* PredictionServiceClient.create(predictionServiceSettings);
123+
* }</pre>
124+
*
110125
* <p>Please refer to the GitHub repository's samples for more quickstart code snippets.
111126
*/
112127
@BetaApi

java-recommendations-ai/google-cloud-recommendations-ai/src/main/java/com/google/cloud/recommendationengine/v1beta1/PredictionServiceSettings.java

Lines changed: 21 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
import com.google.api.gax.core.GoogleCredentialsProvider;
2424
import com.google.api.gax.core.InstantiatingExecutorProvider;
2525
import com.google.api.gax.grpc.InstantiatingGrpcChannelProvider;
26+
import com.google.api.gax.httpjson.InstantiatingHttpJsonChannelProvider;
2627
import com.google.api.gax.rpc.ApiClientHeaderProvider;
2728
import com.google.api.gax.rpc.ClientContext;
2829
import com.google.api.gax.rpc.ClientSettings;
@@ -104,11 +105,18 @@ public static GoogleCredentialsProvider.Builder defaultCredentialsProviderBuilde
104105
return PredictionServiceStubSettings.defaultCredentialsProviderBuilder();
105106
}
106107

107-
/** Returns a builder for the default ChannelProvider for this service. */
108+
/** Returns a builder for the default gRPC ChannelProvider for this service. */
108109
public static InstantiatingGrpcChannelProvider.Builder defaultGrpcTransportProviderBuilder() {
109110
return PredictionServiceStubSettings.defaultGrpcTransportProviderBuilder();
110111
}
111112

113+
/** Returns a builder for the default REST ChannelProvider for this service. */
114+
@BetaApi
115+
public static InstantiatingHttpJsonChannelProvider.Builder
116+
defaultHttpJsonTransportProviderBuilder() {
117+
return PredictionServiceStubSettings.defaultHttpJsonTransportProviderBuilder();
118+
}
119+
112120
public static TransportChannelProvider defaultTransportChannelProvider() {
113121
return PredictionServiceStubSettings.defaultTransportChannelProvider();
114122
}
@@ -118,11 +126,17 @@ public static ApiClientHeaderProvider.Builder defaultApiClientHeaderProviderBuil
118126
return PredictionServiceStubSettings.defaultApiClientHeaderProviderBuilder();
119127
}
120128

121-
/** Returns a new builder for this class. */
129+
/** Returns a new gRPC builder for this class. */
122130
public static Builder newBuilder() {
123131
return Builder.createDefault();
124132
}
125133

134+
/** Returns a new REST builder for this class. */
135+
@BetaApi
136+
public static Builder newHttpJsonBuilder() {
137+
return Builder.createHttpJsonDefault();
138+
}
139+
126140
/** Returns a new builder for this class. */
127141
public static Builder newBuilder(ClientContext clientContext) {
128142
return new Builder(clientContext);
@@ -160,6 +174,11 @@ private static Builder createDefault() {
160174
return new Builder(PredictionServiceStubSettings.newBuilder());
161175
}
162176

177+
@BetaApi
178+
private static Builder createHttpJsonDefault() {
179+
return new Builder(PredictionServiceStubSettings.newHttpJsonBuilder());
180+
}
181+
163182
public PredictionServiceStubSettings.Builder getStubSettingsBuilder() {
164183
return ((PredictionServiceStubSettings.Builder) getStubSettings());
165184
}

0 commit comments

Comments
 (0)