Skip to content
This repository was archived by the owner on Sep 16, 2023. It is now read-only.

Commit 5a7f987

Browse files
gcf-owl-bot[bot]gcf-owl-bot[bot]
authored
feat: Enable REST transport for most of Java and Go clients (#182)
- [ ] Regenerate this pull request now. PiperOrigin-RevId: 456641589 Source-Link: googleapis/googleapis@8a251f5 Source-Link: https://github.com/googleapis/googleapis-gen/commit/4ca52a529cf01308d9714950edffbea3560cfbdb Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiNGNhNTJhNTI5Y2YwMTMwOGQ5NzE0OTUwZWRmZmJlYTM1NjBjZmJkYiJ9
1 parent d7d6721 commit 5a7f987

38 files changed

+4628
-32
lines changed

‎README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,13 @@ If you are using Maven, add this to your pom.xml file:
3030
If you are using Gradle without BOM, add this to your dependencies
3131

3232
```Groovy
33-
implementation 'com.google.cloud:google-cloud-dataflow:0.6.0'
33+
implementation 'com.google.cloud:google-cloud-dataflow:0.6.1'
3434
```
3535

3636
If you are using SBT, add this to your dependencies
3737

3838
```Scala
39-
libraryDependencies += "com.google.cloud" % "google-cloud-dataflow" % "0.6.0"
39+
libraryDependencies += "com.google.cloud" % "google-cloud-dataflow" % "0.6.1"
4040
```
4141

4242
## Authentication

‎google-cloud-dataflow/pom.xml

+16
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>
@@ -77,12 +81,24 @@
7781
<scope>test</scope>
7882
</dependency>
7983
<!-- Need testing utility classes for generated gRPC clients tests -->
84+
<dependency>
85+
<groupId>com.google.api</groupId>
86+
<artifactId>gax</artifactId>
87+
<classifier>testlib</classifier>
88+
<scope>test</scope>
89+
</dependency>
8090
<dependency>
8191
<groupId>com.google.api</groupId>
8292
<artifactId>gax-grpc</artifactId>
8393
<classifier>testlib</classifier>
8494
<scope>test</scope>
8595
</dependency>
96+
<dependency>
97+
<groupId>com.google.api</groupId>
98+
<artifactId>gax-httpjson</artifactId>
99+
<classifier>testlib</classifier>
100+
<scope>test</scope>
101+
</dependency>
86102
</dependencies>
87103

88104
<profiles>

‎google-cloud-dataflow/src/main/java/com/google/dataflow/v1beta3/FlexTemplatesServiceClient.java

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

‎google-cloud-dataflow/src/main/java/com/google/dataflow/v1beta3/FlexTemplatesServiceSettings.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;
@@ -101,11 +102,18 @@ public static GoogleCredentialsProvider.Builder defaultCredentialsProviderBuilde
101102
return FlexTemplatesServiceStubSettings.defaultCredentialsProviderBuilder();
102103
}
103104

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

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

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

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

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

‎google-cloud-dataflow/src/main/java/com/google/dataflow/v1beta3/JobsV1Beta3Client.java

+14
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,20 @@
105105
* JobsV1Beta3Client jobsV1Beta3Client = JobsV1Beta3Client.create(jobsV1Beta3Settings);
106106
* }</pre>
107107
*
108+
* <p>To use REST (HTTP1.1/JSON) transport (instead of gRPC) for sending and receiving requests over
109+
* the wire:
110+
*
111+
* <pre>{@code
112+
* // This snippet has been automatically generated for illustrative purposes only.
113+
* // It may require modifications to work in your environment.
114+
* JobsV1Beta3Settings jobsV1Beta3Settings =
115+
* JobsV1Beta3Settings.newBuilder()
116+
* .setTransportChannelProvider(
117+
* JobsV1Beta3Settings.defaultHttpJsonTransportProviderBuilder().build())
118+
* .build();
119+
* JobsV1Beta3Client jobsV1Beta3Client = JobsV1Beta3Client.create(jobsV1Beta3Settings);
120+
* }</pre>
121+
*
108122
* <p>Please refer to the GitHub repository's samples for more quickstart code snippets.
109123
*/
110124
@BetaApi

‎google-cloud-dataflow/src/main/java/com/google/dataflow/v1beta3/JobsV1Beta3Settings.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;
@@ -134,11 +135,18 @@ public static GoogleCredentialsProvider.Builder defaultCredentialsProviderBuilde
134135
return JobsV1Beta3StubSettings.defaultCredentialsProviderBuilder();
135136
}
136137

137-
/** Returns a builder for the default ChannelProvider for this service. */
138+
/** Returns a builder for the default gRPC ChannelProvider for this service. */
138139
public static InstantiatingGrpcChannelProvider.Builder defaultGrpcTransportProviderBuilder() {
139140
return JobsV1Beta3StubSettings.defaultGrpcTransportProviderBuilder();
140141
}
141142

143+
/** Returns a builder for the default REST ChannelProvider for this service. */
144+
@BetaApi
145+
public static InstantiatingHttpJsonChannelProvider.Builder
146+
defaultHttpJsonTransportProviderBuilder() {
147+
return JobsV1Beta3StubSettings.defaultHttpJsonTransportProviderBuilder();
148+
}
149+
142150
public static TransportChannelProvider defaultTransportChannelProvider() {
143151
return JobsV1Beta3StubSettings.defaultTransportChannelProvider();
144152
}
@@ -148,11 +156,17 @@ public static ApiClientHeaderProvider.Builder defaultApiClientHeaderProviderBuil
148156
return JobsV1Beta3StubSettings.defaultApiClientHeaderProviderBuilder();
149157
}
150158

151-
/** Returns a new builder for this class. */
159+
/** Returns a new gRPC builder for this class. */
152160
public static Builder newBuilder() {
153161
return Builder.createDefault();
154162
}
155163

164+
/** Returns a new REST builder for this class. */
165+
@BetaApi
166+
public static Builder newHttpJsonBuilder() {
167+
return Builder.createHttpJsonDefault();
168+
}
169+
156170
/** Returns a new builder for this class. */
157171
public static Builder newBuilder(ClientContext clientContext) {
158172
return new Builder(clientContext);
@@ -190,6 +204,11 @@ private static Builder createDefault() {
190204
return new Builder(JobsV1Beta3StubSettings.newBuilder());
191205
}
192206

207+
@BetaApi
208+
private static Builder createHttpJsonDefault() {
209+
return new Builder(JobsV1Beta3StubSettings.newHttpJsonBuilder());
210+
}
211+
193212
public JobsV1Beta3StubSettings.Builder getStubSettingsBuilder() {
194213
return ((JobsV1Beta3StubSettings.Builder) getStubSettings());
195214
}

‎google-cloud-dataflow/src/main/java/com/google/dataflow/v1beta3/MessagesV1Beta3Client.java

+15
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,21 @@
113113
* MessagesV1Beta3Client.create(messagesV1Beta3Settings);
114114
* }</pre>
115115
*
116+
* <p>To use REST (HTTP1.1/JSON) transport (instead of gRPC) for sending and receiving requests over
117+
* the wire:
118+
*
119+
* <pre>{@code
120+
* // This snippet has been automatically generated for illustrative purposes only.
121+
* // It may require modifications to work in your environment.
122+
* MessagesV1Beta3Settings messagesV1Beta3Settings =
123+
* MessagesV1Beta3Settings.newBuilder()
124+
* .setTransportChannelProvider(
125+
* MessagesV1Beta3Settings.defaultHttpJsonTransportProviderBuilder().build())
126+
* .build();
127+
* MessagesV1Beta3Client messagesV1Beta3Client =
128+
* MessagesV1Beta3Client.create(messagesV1Beta3Settings);
129+
* }</pre>
130+
*
116131
* <p>Please refer to the GitHub repository's samples for more quickstart code snippets.
117132
*/
118133
@BetaApi

‎google-cloud-dataflow/src/main/java/com/google/dataflow/v1beta3/MessagesV1Beta3Settings.java

+21-2
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 MessagesV1Beta3StubSettings.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 MessagesV1Beta3StubSettings.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 MessagesV1Beta3StubSettings.defaultHttpJsonTransportProviderBuilder();
118+
}
119+
112120
public static TransportChannelProvider defaultTransportChannelProvider() {
113121
return MessagesV1Beta3StubSettings.defaultTransportChannelProvider();
114122
}
@@ -118,11 +126,17 @@ public static ApiClientHeaderProvider.Builder defaultApiClientHeaderProviderBuil
118126
return MessagesV1Beta3StubSettings.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(MessagesV1Beta3StubSettings.newBuilder());
161175
}
162176

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

‎google-cloud-dataflow/src/main/java/com/google/dataflow/v1beta3/MetricsV1Beta3Client.java

+14
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,20 @@
103103
* MetricsV1Beta3Client metricsV1Beta3Client = MetricsV1Beta3Client.create(metricsV1Beta3Settings);
104104
* }</pre>
105105
*
106+
* <p>To use REST (HTTP1.1/JSON) transport (instead of gRPC) for sending and receiving requests over
107+
* the wire:
108+
*
109+
* <pre>{@code
110+
* // This snippet has been automatically generated for illustrative purposes only.
111+
* // It may require modifications to work in your environment.
112+
* MetricsV1Beta3Settings metricsV1Beta3Settings =
113+
* MetricsV1Beta3Settings.newBuilder()
114+
* .setTransportChannelProvider(
115+
* MetricsV1Beta3Settings.defaultHttpJsonTransportProviderBuilder().build())
116+
* .build();
117+
* MetricsV1Beta3Client metricsV1Beta3Client = MetricsV1Beta3Client.create(metricsV1Beta3Settings);
118+
* }</pre>
119+
*
106120
* <p>Please refer to the GitHub repository's samples for more quickstart code snippets.
107121
*/
108122
@BetaApi

‎google-cloud-dataflow/src/main/java/com/google/dataflow/v1beta3/MetricsV1Beta3Settings.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;
@@ -119,11 +120,18 @@ public static GoogleCredentialsProvider.Builder defaultCredentialsProviderBuilde
119120
return MetricsV1Beta3StubSettings.defaultCredentialsProviderBuilder();
120121
}
121122

122-
/** Returns a builder for the default ChannelProvider for this service. */
123+
/** Returns a builder for the default gRPC ChannelProvider for this service. */
123124
public static InstantiatingGrpcChannelProvider.Builder defaultGrpcTransportProviderBuilder() {
124125
return MetricsV1Beta3StubSettings.defaultGrpcTransportProviderBuilder();
125126
}
126127

128+
/** Returns a builder for the default REST ChannelProvider for this service. */
129+
@BetaApi
130+
public static InstantiatingHttpJsonChannelProvider.Builder
131+
defaultHttpJsonTransportProviderBuilder() {
132+
return MetricsV1Beta3StubSettings.defaultHttpJsonTransportProviderBuilder();
133+
}
134+
127135
public static TransportChannelProvider defaultTransportChannelProvider() {
128136
return MetricsV1Beta3StubSettings.defaultTransportChannelProvider();
129137
}
@@ -133,11 +141,17 @@ public static ApiClientHeaderProvider.Builder defaultApiClientHeaderProviderBuil
133141
return MetricsV1Beta3StubSettings.defaultApiClientHeaderProviderBuilder();
134142
}
135143

136-
/** Returns a new builder for this class. */
144+
/** Returns a new gRPC builder for this class. */
137145
public static Builder newBuilder() {
138146
return Builder.createDefault();
139147
}
140148

149+
/** Returns a new REST builder for this class. */
150+
@BetaApi
151+
public static Builder newHttpJsonBuilder() {
152+
return Builder.createHttpJsonDefault();
153+
}
154+
141155
/** Returns a new builder for this class. */
142156
public static Builder newBuilder(ClientContext clientContext) {
143157
return new Builder(clientContext);
@@ -175,6 +189,11 @@ private static Builder createDefault() {
175189
return new Builder(MetricsV1Beta3StubSettings.newBuilder());
176190
}
177191

192+
@BetaApi
193+
private static Builder createHttpJsonDefault() {
194+
return new Builder(MetricsV1Beta3StubSettings.newHttpJsonBuilder());
195+
}
196+
178197
public MetricsV1Beta3StubSettings.Builder getStubSettingsBuilder() {
179198
return ((MetricsV1Beta3StubSettings.Builder) getStubSettings());
180199
}

‎google-cloud-dataflow/src/main/java/com/google/dataflow/v1beta3/SnapshotsV1Beta3Client.java

+15
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,21 @@
9797
* SnapshotsV1Beta3Client.create(snapshotsV1Beta3Settings);
9898
* }</pre>
9999
*
100+
* <p>To use REST (HTTP1.1/JSON) transport (instead of gRPC) for sending and receiving requests over
101+
* the wire:
102+
*
103+
* <pre>{@code
104+
* // This snippet has been automatically generated for illustrative purposes only.
105+
* // It may require modifications to work in your environment.
106+
* SnapshotsV1Beta3Settings snapshotsV1Beta3Settings =
107+
* SnapshotsV1Beta3Settings.newBuilder()
108+
* .setTransportChannelProvider(
109+
* SnapshotsV1Beta3Settings.defaultHttpJsonTransportProviderBuilder().build())
110+
* .build();
111+
* SnapshotsV1Beta3Client snapshotsV1Beta3Client =
112+
* SnapshotsV1Beta3Client.create(snapshotsV1Beta3Settings);
113+
* }</pre>
114+
*
100115
* <p>Please refer to the GitHub repository's samples for more quickstart code snippets.
101116
*/
102117
@BetaApi

0 commit comments

Comments
 (0)