Skip to content

Commit 995f728

Browse files
feat: Enable REST transport for most of Java and Go clients (#883)
* 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 * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md Co-authored-by: Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com> Co-authored-by: Tomo Suzuki <[email protected]>
1 parent 843d690 commit 995f728

19 files changed

+2126
-15
lines changed

java-errorreporting/google-cloud-errorreporting/pom.xml

+16
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,10 @@
6363
<groupId>com.google.api</groupId>
6464
<artifactId>gax-grpc</artifactId>
6565
</dependency>
66+
<dependency>
67+
<groupId>com.google.api</groupId>
68+
<artifactId>gax-httpjson</artifactId>
69+
</dependency>
6670
<dependency>
6771
<groupId>org.threeten</groupId>
6872
<artifactId>threetenbp</artifactId>
@@ -81,12 +85,24 @@
8185
</dependency>
8286

8387
<!-- Need testing utility classes for generated gRPC clients tests -->
88+
<dependency>
89+
<groupId>com.google.api</groupId>
90+
<artifactId>gax</artifactId>
91+
<classifier>testlib</classifier>
92+
<scope>test</scope>
93+
</dependency>
8494
<dependency>
8595
<groupId>com.google.api</groupId>
8696
<artifactId>gax-grpc</artifactId>
8797
<classifier>testlib</classifier>
8898
<scope>test</scope>
8999
</dependency>
100+
<dependency>
101+
<groupId>com.google.api</groupId>
102+
<artifactId>gax-httpjson</artifactId>
103+
<classifier>testlib</classifier>
104+
<scope>test</scope>
105+
</dependency>
90106
</dependencies>
91107

92108
<profiles>

java-errorreporting/google-cloud-errorreporting/src/main/java/com/google/devtools/clouderrorreporting/v1beta1/ErrorGroupServiceClient.java

+15
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,21 @@
9292
* ErrorGroupServiceClient.create(errorGroupServiceSettings);
9393
* }</pre>
9494
*
95+
* <p>To use REST (HTTP1.1/JSON) transport (instead of gRPC) for sending and receiving requests over
96+
* the wire:
97+
*
98+
* <pre>{@code
99+
* // This snippet has been automatically generated for illustrative purposes only.
100+
* // It may require modifications to work in your environment.
101+
* ErrorGroupServiceSettings errorGroupServiceSettings =
102+
* ErrorGroupServiceSettings.newBuilder()
103+
* .setTransportChannelProvider(
104+
* ErrorGroupServiceSettings.defaultHttpJsonTransportProviderBuilder().build())
105+
* .build();
106+
* ErrorGroupServiceClient errorGroupServiceClient =
107+
* ErrorGroupServiceClient.create(errorGroupServiceSettings);
108+
* }</pre>
109+
*
95110
* <p>Please refer to the GitHub repository's samples for more quickstart code snippets.
96111
*/
97112
@BetaApi

java-errorreporting/google-cloud-errorreporting/src/main/java/com/google/devtools/clouderrorreporting/v1beta1/ErrorGroupServiceSettings.java

+21-2
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
import com.google.api.gax.core.GoogleCredentialsProvider;
2222
import com.google.api.gax.core.InstantiatingExecutorProvider;
2323
import com.google.api.gax.grpc.InstantiatingGrpcChannelProvider;
24+
import com.google.api.gax.httpjson.InstantiatingHttpJsonChannelProvider;
2425
import com.google.api.gax.rpc.ApiClientHeaderProvider;
2526
import com.google.api.gax.rpc.ClientContext;
2627
import com.google.api.gax.rpc.ClientSettings;
@@ -105,11 +106,18 @@ public static GoogleCredentialsProvider.Builder defaultCredentialsProviderBuilde
105106
return ErrorGroupServiceStubSettings.defaultCredentialsProviderBuilder();
106107
}
107108

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

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

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

135+
/** Returns a new REST builder for this class. */
136+
@BetaApi
137+
public static Builder newHttpJsonBuilder() {
138+
return Builder.createHttpJsonDefault();
139+
}
140+
127141
/** Returns a new builder for this class. */
128142
public static Builder newBuilder(ClientContext clientContext) {
129143
return new Builder(clientContext);
@@ -161,6 +175,11 @@ private static Builder createDefault() {
161175
return new Builder(ErrorGroupServiceStubSettings.newBuilder());
162176
}
163177

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

java-errorreporting/google-cloud-errorreporting/src/main/java/com/google/devtools/clouderrorreporting/v1beta1/ErrorStatsServiceClient.java

+15
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,21 @@
101101
* ErrorStatsServiceClient.create(errorStatsServiceSettings);
102102
* }</pre>
103103
*
104+
* <p>To use REST (HTTP1.1/JSON) transport (instead of gRPC) for sending and receiving requests over
105+
* the wire:
106+
*
107+
* <pre>{@code
108+
* // This snippet has been automatically generated for illustrative purposes only.
109+
* // It may require modifications to work in your environment.
110+
* ErrorStatsServiceSettings errorStatsServiceSettings =
111+
* ErrorStatsServiceSettings.newBuilder()
112+
* .setTransportChannelProvider(
113+
* ErrorStatsServiceSettings.defaultHttpJsonTransportProviderBuilder().build())
114+
* .build();
115+
* ErrorStatsServiceClient errorStatsServiceClient =
116+
* ErrorStatsServiceClient.create(errorStatsServiceSettings);
117+
* }</pre>
118+
*
104119
* <p>Please refer to the GitHub repository's samples for more quickstart code snippets.
105120
*/
106121
@BetaApi

java-errorreporting/google-cloud-errorreporting/src/main/java/com/google/devtools/clouderrorreporting/v1beta1/ErrorStatsServiceSettings.java

+21-2
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
import com.google.api.gax.core.GoogleCredentialsProvider;
2525
import com.google.api.gax.core.InstantiatingExecutorProvider;
2626
import com.google.api.gax.grpc.InstantiatingGrpcChannelProvider;
27+
import com.google.api.gax.httpjson.InstantiatingHttpJsonChannelProvider;
2728
import com.google.api.gax.rpc.ApiClientHeaderProvider;
2829
import com.google.api.gax.rpc.ClientContext;
2930
import com.google.api.gax.rpc.ClientSettings;
@@ -117,11 +118,18 @@ public static GoogleCredentialsProvider.Builder defaultCredentialsProviderBuilde
117118
return ErrorStatsServiceStubSettings.defaultCredentialsProviderBuilder();
118119
}
119120

120-
/** Returns a builder for the default ChannelProvider for this service. */
121+
/** Returns a builder for the default gRPC ChannelProvider for this service. */
121122
public static InstantiatingGrpcChannelProvider.Builder defaultGrpcTransportProviderBuilder() {
122123
return ErrorStatsServiceStubSettings.defaultGrpcTransportProviderBuilder();
123124
}
124125

126+
/** Returns a builder for the default REST ChannelProvider for this service. */
127+
@BetaApi
128+
public static InstantiatingHttpJsonChannelProvider.Builder
129+
defaultHttpJsonTransportProviderBuilder() {
130+
return ErrorStatsServiceStubSettings.defaultHttpJsonTransportProviderBuilder();
131+
}
132+
125133
public static TransportChannelProvider defaultTransportChannelProvider() {
126134
return ErrorStatsServiceStubSettings.defaultTransportChannelProvider();
127135
}
@@ -131,11 +139,17 @@ public static ApiClientHeaderProvider.Builder defaultApiClientHeaderProviderBuil
131139
return ErrorStatsServiceStubSettings.defaultApiClientHeaderProviderBuilder();
132140
}
133141

134-
/** Returns a new builder for this class. */
142+
/** Returns a new gRPC builder for this class. */
135143
public static Builder newBuilder() {
136144
return Builder.createDefault();
137145
}
138146

147+
/** Returns a new REST builder for this class. */
148+
@BetaApi
149+
public static Builder newHttpJsonBuilder() {
150+
return Builder.createHttpJsonDefault();
151+
}
152+
139153
/** Returns a new builder for this class. */
140154
public static Builder newBuilder(ClientContext clientContext) {
141155
return new Builder(clientContext);
@@ -173,6 +187,11 @@ private static Builder createDefault() {
173187
return new Builder(ErrorStatsServiceStubSettings.newBuilder());
174188
}
175189

190+
@BetaApi
191+
private static Builder createHttpJsonDefault() {
192+
return new Builder(ErrorStatsServiceStubSettings.newHttpJsonBuilder());
193+
}
194+
176195
public ErrorStatsServiceStubSettings.Builder getStubSettingsBuilder() {
177196
return ((ErrorStatsServiceStubSettings.Builder) getStubSettings());
178197
}

java-errorreporting/google-cloud-errorreporting/src/main/java/com/google/devtools/clouderrorreporting/v1beta1/ReportErrorsServiceClient.java

+15
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,21 @@
9494
* ReportErrorsServiceClient.create(reportErrorsServiceSettings);
9595
* }</pre>
9696
*
97+
* <p>To use REST (HTTP1.1/JSON) transport (instead of gRPC) for sending and receiving requests over
98+
* the wire:
99+
*
100+
* <pre>{@code
101+
* // This snippet has been automatically generated for illustrative purposes only.
102+
* // It may require modifications to work in your environment.
103+
* ReportErrorsServiceSettings reportErrorsServiceSettings =
104+
* ReportErrorsServiceSettings.newBuilder()
105+
* .setTransportChannelProvider(
106+
* ReportErrorsServiceSettings.defaultHttpJsonTransportProviderBuilder().build())
107+
* .build();
108+
* ReportErrorsServiceClient reportErrorsServiceClient =
109+
* ReportErrorsServiceClient.create(reportErrorsServiceSettings);
110+
* }</pre>
111+
*
97112
* <p>Please refer to the GitHub repository's samples for more quickstart code snippets.
98113
*/
99114
@BetaApi

java-errorreporting/google-cloud-errorreporting/src/main/java/com/google/devtools/clouderrorreporting/v1beta1/ReportErrorsServiceSettings.java

+21-2
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
import com.google.api.gax.core.GoogleCredentialsProvider;
2222
import com.google.api.gax.core.InstantiatingExecutorProvider;
2323
import com.google.api.gax.grpc.InstantiatingGrpcChannelProvider;
24+
import com.google.api.gax.httpjson.InstantiatingHttpJsonChannelProvider;
2425
import com.google.api.gax.rpc.ApiClientHeaderProvider;
2526
import com.google.api.gax.rpc.ClientContext;
2627
import com.google.api.gax.rpc.ClientSettings;
@@ -102,11 +103,18 @@ public static GoogleCredentialsProvider.Builder defaultCredentialsProviderBuilde
102103
return ReportErrorsServiceStubSettings.defaultCredentialsProviderBuilder();
103104
}
104105

105-
/** Returns a builder for the default ChannelProvider for this service. */
106+
/** Returns a builder for the default gRPC ChannelProvider for this service. */
106107
public static InstantiatingGrpcChannelProvider.Builder defaultGrpcTransportProviderBuilder() {
107108
return ReportErrorsServiceStubSettings.defaultGrpcTransportProviderBuilder();
108109
}
109110

111+
/** Returns a builder for the default REST ChannelProvider for this service. */
112+
@BetaApi
113+
public static InstantiatingHttpJsonChannelProvider.Builder
114+
defaultHttpJsonTransportProviderBuilder() {
115+
return ReportErrorsServiceStubSettings.defaultHttpJsonTransportProviderBuilder();
116+
}
117+
110118
public static TransportChannelProvider defaultTransportChannelProvider() {
111119
return ReportErrorsServiceStubSettings.defaultTransportChannelProvider();
112120
}
@@ -116,11 +124,17 @@ public static ApiClientHeaderProvider.Builder defaultApiClientHeaderProviderBuil
116124
return ReportErrorsServiceStubSettings.defaultApiClientHeaderProviderBuilder();
117125
}
118126

119-
/** Returns a new builder for this class. */
127+
/** Returns a new gRPC builder for this class. */
120128
public static Builder newBuilder() {
121129
return Builder.createDefault();
122130
}
123131

132+
/** Returns a new REST builder for this class. */
133+
@BetaApi
134+
public static Builder newHttpJsonBuilder() {
135+
return Builder.createHttpJsonDefault();
136+
}
137+
124138
/** Returns a new builder for this class. */
125139
public static Builder newBuilder(ClientContext clientContext) {
126140
return new Builder(clientContext);
@@ -158,6 +172,11 @@ private static Builder createDefault() {
158172
return new Builder(ReportErrorsServiceStubSettings.newBuilder());
159173
}
160174

175+
@BetaApi
176+
private static Builder createHttpJsonDefault() {
177+
return new Builder(ReportErrorsServiceStubSettings.newHttpJsonBuilder());
178+
}
179+
161180
public ReportErrorsServiceStubSettings.Builder getStubSettingsBuilder() {
162181
return ((ReportErrorsServiceStubSettings.Builder) getStubSettings());
163182
}

java-errorreporting/google-cloud-errorreporting/src/main/java/com/google/devtools/clouderrorreporting/v1beta1/stub/ErrorGroupServiceStubSettings.java

+50-3
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,9 @@
2424
import com.google.api.gax.grpc.GaxGrpcProperties;
2525
import com.google.api.gax.grpc.GrpcTransportChannel;
2626
import com.google.api.gax.grpc.InstantiatingGrpcChannelProvider;
27+
import com.google.api.gax.httpjson.GaxHttpJsonProperties;
28+
import com.google.api.gax.httpjson.HttpJsonTransportChannel;
29+
import com.google.api.gax.httpjson.InstantiatingHttpJsonChannelProvider;
2730
import com.google.api.gax.retrying.RetrySettings;
2831
import com.google.api.gax.rpc.ApiClientHeaderProvider;
2932
import com.google.api.gax.rpc.ClientContext;
@@ -105,6 +108,11 @@ public ErrorGroupServiceStub createStub() throws IOException {
105108
.equals(GrpcTransportChannel.getGrpcTransportName())) {
106109
return GrpcErrorGroupServiceStub.create(this);
107110
}
111+
if (getTransportChannelProvider()
112+
.getTransportName()
113+
.equals(HttpJsonTransportChannel.getHttpJsonTransportName())) {
114+
return HttpJsonErrorGroupServiceStub.create(this);
115+
}
108116
throw new UnsupportedOperationException(
109117
String.format(
110118
"Transport not supported: %s", getTransportChannelProvider().getTransportName()));
@@ -137,30 +145,56 @@ public static GoogleCredentialsProvider.Builder defaultCredentialsProviderBuilde
137145
.setUseJwtAccessWithScope(true);
138146
}
139147

140-
/** Returns a builder for the default ChannelProvider for this service. */
148+
/** Returns a builder for the default gRPC ChannelProvider for this service. */
141149
public static InstantiatingGrpcChannelProvider.Builder defaultGrpcTransportProviderBuilder() {
142150
return InstantiatingGrpcChannelProvider.newBuilder()
143151
.setMaxInboundMessageSize(Integer.MAX_VALUE);
144152
}
145153

154+
/** Returns a builder for the default REST ChannelProvider for this service. */
155+
@BetaApi
156+
public static InstantiatingHttpJsonChannelProvider.Builder
157+
defaultHttpJsonTransportProviderBuilder() {
158+
return InstantiatingHttpJsonChannelProvider.newBuilder();
159+
}
160+
146161
public static TransportChannelProvider defaultTransportChannelProvider() {
147162
return defaultGrpcTransportProviderBuilder().build();
148163
}
149164

150165
@BetaApi("The surface for customizing headers is not stable yet and may change in the future.")
151-
public static ApiClientHeaderProvider.Builder defaultApiClientHeaderProviderBuilder() {
166+
public static ApiClientHeaderProvider.Builder defaultGrpcApiClientHeaderProviderBuilder() {
152167
return ApiClientHeaderProvider.newBuilder()
153168
.setGeneratedLibToken(
154169
"gapic", GaxProperties.getLibraryVersion(ErrorGroupServiceStubSettings.class))
155170
.setTransportToken(
156171
GaxGrpcProperties.getGrpcTokenName(), GaxGrpcProperties.getGrpcVersion());
157172
}
158173

159-
/** Returns a new builder for this class. */
174+
@BetaApi("The surface for customizing headers is not stable yet and may change in the future.")
175+
public static ApiClientHeaderProvider.Builder defaultHttpJsonApiClientHeaderProviderBuilder() {
176+
return ApiClientHeaderProvider.newBuilder()
177+
.setGeneratedLibToken(
178+
"gapic", GaxProperties.getLibraryVersion(ErrorGroupServiceStubSettings.class))
179+
.setTransportToken(
180+
GaxHttpJsonProperties.getHttpJsonTokenName(),
181+
GaxHttpJsonProperties.getHttpJsonVersion());
182+
}
183+
184+
public static ApiClientHeaderProvider.Builder defaultApiClientHeaderProviderBuilder() {
185+
return ErrorGroupServiceStubSettings.defaultGrpcApiClientHeaderProviderBuilder();
186+
}
187+
188+
/** Returns a new gRPC builder for this class. */
160189
public static Builder newBuilder() {
161190
return Builder.createDefault();
162191
}
163192

193+
/** Returns a new REST builder for this class. */
194+
public static Builder newHttpJsonBuilder() {
195+
return Builder.createHttpJsonDefault();
196+
}
197+
164198
/** Returns a new builder for this class. */
165199
public static Builder newBuilder(ClientContext clientContext) {
166200
return new Builder(clientContext);
@@ -254,6 +288,19 @@ private static Builder createDefault() {
254288
return initDefaults(builder);
255289
}
256290

291+
private static Builder createHttpJsonDefault() {
292+
Builder builder = new Builder(((ClientContext) null));
293+
294+
builder.setTransportChannelProvider(defaultHttpJsonTransportProviderBuilder().build());
295+
builder.setCredentialsProvider(defaultCredentialsProviderBuilder().build());
296+
builder.setInternalHeaderProvider(defaultHttpJsonApiClientHeaderProviderBuilder().build());
297+
builder.setEndpoint(getDefaultEndpoint());
298+
builder.setMtlsEndpoint(getDefaultMtlsEndpoint());
299+
builder.setSwitchToMtlsEndpointAllowed(true);
300+
301+
return initDefaults(builder);
302+
}
303+
257304
private static Builder initDefaults(Builder builder) {
258305
builder
259306
.getGroupSettings()

0 commit comments

Comments
 (0)