Skip to content

Commit a86f67e

Browse files
gcf-owl-bot[bot]gcf-owl-bot[bot]
authored
feat: new parameters in FlexTemplateRuntimeEnvironment fix: added google.api.http annotations to RPCs (googleapis#122)
- [ ] Regenerate this pull request now. Committer: @alexander-fenster PiperOrigin-RevId: 425662603 Source-Link: googleapis/googleapis@9d0fe54 Source-Link: https://github.com/googleapis/googleapis-gen/commit/f427d78e78dcbc2bd7991af2833108f1dd2bc13e Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiZjQyN2Q3OGU3OGRjYmMyYmQ3OTkxYWYyODMzMTA4ZjFkZDJiYzEzZSJ9
1 parent 6c939fb commit a86f67e

30 files changed

Lines changed: 1698 additions & 527 deletions

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,9 @@
1515
*/
1616

1717
/**
18-
* The interfaces provided are listed below, along with usage samples.
18+
* A client to Dataflow API
19+
*
20+
* <p>The interfaces provided are listed below, along with usage samples.
1921
*
2022
* <p>======================= JobsV1Beta3Client =======================
2123
*

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
import com.google.api.gax.grpc.GrpcStubCallableFactory;
2424
import com.google.api.gax.rpc.ClientContext;
2525
import com.google.api.gax.rpc.UnaryCallable;
26+
import com.google.common.collect.ImmutableMap;
2627
import com.google.dataflow.v1beta3.LaunchFlexTemplateRequest;
2728
import com.google.dataflow.v1beta3.LaunchFlexTemplateResponse;
2829
import com.google.longrunning.stub.GrpcOperationsStub;
@@ -103,6 +104,13 @@ protected GrpcFlexTemplatesServiceStub(
103104
launchFlexTemplateTransportSettings =
104105
GrpcCallSettings.<LaunchFlexTemplateRequest, LaunchFlexTemplateResponse>newBuilder()
105106
.setMethodDescriptor(launchFlexTemplateMethodDescriptor)
107+
.setParamsExtractor(
108+
request -> {
109+
ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
110+
params.put("location", String.valueOf(request.getLocation()));
111+
params.put("project_id", String.valueOf(request.getProjectId()));
112+
return params.build();
113+
})
106114
.build();
107115

108116
this.launchFlexTemplateCallable =

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

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
import com.google.api.gax.grpc.GrpcStubCallableFactory;
2727
import com.google.api.gax.rpc.ClientContext;
2828
import com.google.api.gax.rpc.UnaryCallable;
29+
import com.google.common.collect.ImmutableMap;
2930
import com.google.dataflow.v1beta3.CheckActiveJobsRequest;
3031
import com.google.dataflow.v1beta3.CheckActiveJobsResponse;
3132
import com.google.dataflow.v1beta3.CreateJobRequest;
@@ -170,22 +171,58 @@ protected GrpcJobsV1Beta3Stub(
170171
GrpcCallSettings<CreateJobRequest, Job> createJobTransportSettings =
171172
GrpcCallSettings.<CreateJobRequest, Job>newBuilder()
172173
.setMethodDescriptor(createJobMethodDescriptor)
174+
.setParamsExtractor(
175+
request -> {
176+
ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
177+
params.put("location", String.valueOf(request.getLocation()));
178+
params.put("project_id", String.valueOf(request.getProjectId()));
179+
return params.build();
180+
})
173181
.build();
174182
GrpcCallSettings<GetJobRequest, Job> getJobTransportSettings =
175183
GrpcCallSettings.<GetJobRequest, Job>newBuilder()
176184
.setMethodDescriptor(getJobMethodDescriptor)
185+
.setParamsExtractor(
186+
request -> {
187+
ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
188+
params.put("job_id", String.valueOf(request.getJobId()));
189+
params.put("location", String.valueOf(request.getLocation()));
190+
params.put("project_id", String.valueOf(request.getProjectId()));
191+
return params.build();
192+
})
177193
.build();
178194
GrpcCallSettings<UpdateJobRequest, Job> updateJobTransportSettings =
179195
GrpcCallSettings.<UpdateJobRequest, Job>newBuilder()
180196
.setMethodDescriptor(updateJobMethodDescriptor)
197+
.setParamsExtractor(
198+
request -> {
199+
ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
200+
params.put("job_id", String.valueOf(request.getJobId()));
201+
params.put("location", String.valueOf(request.getLocation()));
202+
params.put("project_id", String.valueOf(request.getProjectId()));
203+
return params.build();
204+
})
181205
.build();
182206
GrpcCallSettings<ListJobsRequest, ListJobsResponse> listJobsTransportSettings =
183207
GrpcCallSettings.<ListJobsRequest, ListJobsResponse>newBuilder()
184208
.setMethodDescriptor(listJobsMethodDescriptor)
209+
.setParamsExtractor(
210+
request -> {
211+
ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
212+
params.put("location", String.valueOf(request.getLocation()));
213+
params.put("project_id", String.valueOf(request.getProjectId()));
214+
return params.build();
215+
})
185216
.build();
186217
GrpcCallSettings<ListJobsRequest, ListJobsResponse> aggregatedListJobsTransportSettings =
187218
GrpcCallSettings.<ListJobsRequest, ListJobsResponse>newBuilder()
188219
.setMethodDescriptor(aggregatedListJobsMethodDescriptor)
220+
.setParamsExtractor(
221+
request -> {
222+
ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
223+
params.put("project_id", String.valueOf(request.getProjectId()));
224+
return params.build();
225+
})
189226
.build();
190227
GrpcCallSettings<CheckActiveJobsRequest, CheckActiveJobsResponse>
191228
checkActiveJobsTransportSettings =
@@ -195,6 +232,14 @@ protected GrpcJobsV1Beta3Stub(
195232
GrpcCallSettings<SnapshotJobRequest, Snapshot> snapshotJobTransportSettings =
196233
GrpcCallSettings.<SnapshotJobRequest, Snapshot>newBuilder()
197234
.setMethodDescriptor(snapshotJobMethodDescriptor)
235+
.setParamsExtractor(
236+
request -> {
237+
ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
238+
params.put("job_id", String.valueOf(request.getJobId()));
239+
params.put("location", String.valueOf(request.getLocation()));
240+
params.put("project_id", String.valueOf(request.getProjectId()));
241+
return params.build();
242+
})
198243
.build();
199244

200245
this.createJobCallable =

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

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
import com.google.api.gax.grpc.GrpcStubCallableFactory;
2626
import com.google.api.gax.rpc.ClientContext;
2727
import com.google.api.gax.rpc.UnaryCallable;
28+
import com.google.common.collect.ImmutableMap;
2829
import com.google.dataflow.v1beta3.ListJobMessagesRequest;
2930
import com.google.dataflow.v1beta3.ListJobMessagesResponse;
3031
import com.google.longrunning.stub.GrpcOperationsStub;
@@ -107,6 +108,14 @@ protected GrpcMessagesV1Beta3Stub(
107108
listJobMessagesTransportSettings =
108109
GrpcCallSettings.<ListJobMessagesRequest, ListJobMessagesResponse>newBuilder()
109110
.setMethodDescriptor(listJobMessagesMethodDescriptor)
111+
.setParamsExtractor(
112+
request -> {
113+
ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
114+
params.put("job_id", String.valueOf(request.getJobId()));
115+
params.put("location", String.valueOf(request.getLocation()));
116+
params.put("project_id", String.valueOf(request.getProjectId()));
117+
return params.build();
118+
})
110119
.build();
111120

112121
this.listJobMessagesCallable =

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

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
import com.google.api.gax.grpc.GrpcStubCallableFactory;
2727
import com.google.api.gax.rpc.ClientContext;
2828
import com.google.api.gax.rpc.UnaryCallable;
29+
import com.google.common.collect.ImmutableMap;
2930
import com.google.dataflow.v1beta3.GetJobExecutionDetailsRequest;
3031
import com.google.dataflow.v1beta3.GetJobMetricsRequest;
3132
import com.google.dataflow.v1beta3.GetStageExecutionDetailsRequest;
@@ -138,16 +139,41 @@ protected GrpcMetricsV1Beta3Stub(
138139
GrpcCallSettings<GetJobMetricsRequest, JobMetrics> getJobMetricsTransportSettings =
139140
GrpcCallSettings.<GetJobMetricsRequest, JobMetrics>newBuilder()
140141
.setMethodDescriptor(getJobMetricsMethodDescriptor)
142+
.setParamsExtractor(
143+
request -> {
144+
ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
145+
params.put("job_id", String.valueOf(request.getJobId()));
146+
params.put("location", String.valueOf(request.getLocation()));
147+
params.put("project_id", String.valueOf(request.getProjectId()));
148+
return params.build();
149+
})
141150
.build();
142151
GrpcCallSettings<GetJobExecutionDetailsRequest, JobExecutionDetails>
143152
getJobExecutionDetailsTransportSettings =
144153
GrpcCallSettings.<GetJobExecutionDetailsRequest, JobExecutionDetails>newBuilder()
145154
.setMethodDescriptor(getJobExecutionDetailsMethodDescriptor)
155+
.setParamsExtractor(
156+
request -> {
157+
ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
158+
params.put("job_id", String.valueOf(request.getJobId()));
159+
params.put("location", String.valueOf(request.getLocation()));
160+
params.put("project_id", String.valueOf(request.getProjectId()));
161+
return params.build();
162+
})
146163
.build();
147164
GrpcCallSettings<GetStageExecutionDetailsRequest, StageExecutionDetails>
148165
getStageExecutionDetailsTransportSettings =
149166
GrpcCallSettings.<GetStageExecutionDetailsRequest, StageExecutionDetails>newBuilder()
150167
.setMethodDescriptor(getStageExecutionDetailsMethodDescriptor)
168+
.setParamsExtractor(
169+
request -> {
170+
ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
171+
params.put("job_id", String.valueOf(request.getJobId()));
172+
params.put("location", String.valueOf(request.getLocation()));
173+
params.put("project_id", String.valueOf(request.getProjectId()));
174+
params.put("stage_id", String.valueOf(request.getStageId()));
175+
return params.build();
176+
})
151177
.build();
152178

153179
this.getJobMetricsCallable =

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

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
import com.google.api.gax.grpc.GrpcStubCallableFactory;
2424
import com.google.api.gax.rpc.ClientContext;
2525
import com.google.api.gax.rpc.UnaryCallable;
26+
import com.google.common.collect.ImmutableMap;
2627
import com.google.dataflow.v1beta3.DeleteSnapshotRequest;
2728
import com.google.dataflow.v1beta3.DeleteSnapshotResponse;
2829
import com.google.dataflow.v1beta3.GetSnapshotRequest;
@@ -126,15 +127,39 @@ protected GrpcSnapshotsV1Beta3Stub(
126127
GrpcCallSettings<GetSnapshotRequest, Snapshot> getSnapshotTransportSettings =
127128
GrpcCallSettings.<GetSnapshotRequest, Snapshot>newBuilder()
128129
.setMethodDescriptor(getSnapshotMethodDescriptor)
130+
.setParamsExtractor(
131+
request -> {
132+
ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
133+
params.put("location", String.valueOf(request.getLocation()));
134+
params.put("project_id", String.valueOf(request.getProjectId()));
135+
params.put("snapshot_id", String.valueOf(request.getSnapshotId()));
136+
return params.build();
137+
})
129138
.build();
130139
GrpcCallSettings<DeleteSnapshotRequest, DeleteSnapshotResponse>
131140
deleteSnapshotTransportSettings =
132141
GrpcCallSettings.<DeleteSnapshotRequest, DeleteSnapshotResponse>newBuilder()
133142
.setMethodDescriptor(deleteSnapshotMethodDescriptor)
143+
.setParamsExtractor(
144+
request -> {
145+
ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
146+
params.put("location", String.valueOf(request.getLocation()));
147+
params.put("project_id", String.valueOf(request.getProjectId()));
148+
params.put("snapshot_id", String.valueOf(request.getSnapshotId()));
149+
return params.build();
150+
})
134151
.build();
135152
GrpcCallSettings<ListSnapshotsRequest, ListSnapshotsResponse> listSnapshotsTransportSettings =
136153
GrpcCallSettings.<ListSnapshotsRequest, ListSnapshotsResponse>newBuilder()
137154
.setMethodDescriptor(listSnapshotsMethodDescriptor)
155+
.setParamsExtractor(
156+
request -> {
157+
ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
158+
params.put("job_id", String.valueOf(request.getJobId()));
159+
params.put("location", String.valueOf(request.getLocation()));
160+
params.put("project_id", String.valueOf(request.getProjectId()));
161+
return params.build();
162+
})
138163
.build();
139164

140165
this.getSnapshotCallable =

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

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
import com.google.api.gax.grpc.GrpcStubCallableFactory;
2424
import com.google.api.gax.rpc.ClientContext;
2525
import com.google.api.gax.rpc.UnaryCallable;
26+
import com.google.common.collect.ImmutableMap;
2627
import com.google.dataflow.v1beta3.CreateJobFromTemplateRequest;
2728
import com.google.dataflow.v1beta3.GetTemplateRequest;
2829
import com.google.dataflow.v1beta3.GetTemplateResponse;
@@ -127,15 +128,36 @@ protected GrpcTemplatesServiceStub(
127128
GrpcCallSettings<CreateJobFromTemplateRequest, Job> createJobFromTemplateTransportSettings =
128129
GrpcCallSettings.<CreateJobFromTemplateRequest, Job>newBuilder()
129130
.setMethodDescriptor(createJobFromTemplateMethodDescriptor)
131+
.setParamsExtractor(
132+
request -> {
133+
ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
134+
params.put("location", String.valueOf(request.getLocation()));
135+
params.put("project_id", String.valueOf(request.getProjectId()));
136+
return params.build();
137+
})
130138
.build();
131139
GrpcCallSettings<LaunchTemplateRequest, LaunchTemplateResponse>
132140
launchTemplateTransportSettings =
133141
GrpcCallSettings.<LaunchTemplateRequest, LaunchTemplateResponse>newBuilder()
134142
.setMethodDescriptor(launchTemplateMethodDescriptor)
143+
.setParamsExtractor(
144+
request -> {
145+
ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
146+
params.put("location", String.valueOf(request.getLocation()));
147+
params.put("project_id", String.valueOf(request.getProjectId()));
148+
return params.build();
149+
})
135150
.build();
136151
GrpcCallSettings<GetTemplateRequest, GetTemplateResponse> getTemplateTransportSettings =
137152
GrpcCallSettings.<GetTemplateRequest, GetTemplateResponse>newBuilder()
138153
.setMethodDescriptor(getTemplateMethodDescriptor)
154+
.setParamsExtractor(
155+
request -> {
156+
ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
157+
params.put("location", String.valueOf(request.getLocation()));
158+
params.put("project_id", String.valueOf(request.getProjectId()));
159+
return params.build();
160+
})
139161
.build();
140162

141163
this.createJobFromTemplateCallable =

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

Lines changed: 7 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -567,8 +567,7 @@ public com.google.protobuf.TimestampOrBuilder getTimeOrBuilder() {
567567
*
568568
*
569569
* <pre>
570-
* A short and friendly name for the worker pool this event refers to,
571-
* populated from the value of PoolStageRelation::user_pool_name.
570+
* A short and friendly name for the worker pool this event refers to.
572571
* </pre>
573572
*
574573
* <code>string worker_pool = 7;</code>
@@ -591,8 +590,7 @@ public java.lang.String getWorkerPool() {
591590
*
592591
*
593592
* <pre>
594-
* A short and friendly name for the worker pool this event refers to,
595-
* populated from the value of PoolStageRelation::user_pool_name.
593+
* A short and friendly name for the worker pool this event refers to.
596594
* </pre>
597595
*
598596
* <code>string worker_pool = 7;</code>
@@ -1628,8 +1626,7 @@ public com.google.protobuf.TimestampOrBuilder getTimeOrBuilder() {
16281626
*
16291627
*
16301628
* <pre>
1631-
* A short and friendly name for the worker pool this event refers to,
1632-
* populated from the value of PoolStageRelation::user_pool_name.
1629+
* A short and friendly name for the worker pool this event refers to.
16331630
* </pre>
16341631
*
16351632
* <code>string worker_pool = 7;</code>
@@ -1651,8 +1648,7 @@ public java.lang.String getWorkerPool() {
16511648
*
16521649
*
16531650
* <pre>
1654-
* A short and friendly name for the worker pool this event refers to,
1655-
* populated from the value of PoolStageRelation::user_pool_name.
1651+
* A short and friendly name for the worker pool this event refers to.
16561652
* </pre>
16571653
*
16581654
* <code>string worker_pool = 7;</code>
@@ -1674,8 +1670,7 @@ public com.google.protobuf.ByteString getWorkerPoolBytes() {
16741670
*
16751671
*
16761672
* <pre>
1677-
* A short and friendly name for the worker pool this event refers to,
1678-
* populated from the value of PoolStageRelation::user_pool_name.
1673+
* A short and friendly name for the worker pool this event refers to.
16791674
* </pre>
16801675
*
16811676
* <code>string worker_pool = 7;</code>
@@ -1696,8 +1691,7 @@ public Builder setWorkerPool(java.lang.String value) {
16961691
*
16971692
*
16981693
* <pre>
1699-
* A short and friendly name for the worker pool this event refers to,
1700-
* populated from the value of PoolStageRelation::user_pool_name.
1694+
* A short and friendly name for the worker pool this event refers to.
17011695
* </pre>
17021696
*
17031697
* <code>string worker_pool = 7;</code>
@@ -1714,8 +1708,7 @@ public Builder clearWorkerPool() {
17141708
*
17151709
*
17161710
* <pre>
1717-
* A short and friendly name for the worker pool this event refers to,
1718-
* populated from the value of PoolStageRelation::user_pool_name.
1711+
* A short and friendly name for the worker pool this event refers to.
17191712
* </pre>
17201713
*
17211714
* <code>string worker_pool = 7;</code>

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -157,8 +157,7 @@ public interface AutoscalingEventOrBuilder
157157
*
158158
*
159159
* <pre>
160-
* A short and friendly name for the worker pool this event refers to,
161-
* populated from the value of PoolStageRelation::user_pool_name.
160+
* A short and friendly name for the worker pool this event refers to.
162161
* </pre>
163162
*
164163
* <code>string worker_pool = 7;</code>
@@ -170,8 +169,7 @@ public interface AutoscalingEventOrBuilder
170169
*
171170
*
172171
* <pre>
173-
* A short and friendly name for the worker pool this event refers to,
174-
* populated from the value of PoolStageRelation::user_pool_name.
172+
* A short and friendly name for the worker pool this event refers to.
175173
* </pre>
176174
*
177175
* <code>string worker_pool = 7;</code>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
*
2323
*
2424
* <pre>
25-
* Metadata for a Cloud BigTable connector used by the job.
25+
* Metadata for a Cloud Bigtable connector used by the job.
2626
* </pre>
2727
*
2828
* Protobuf type {@code google.dataflow.v1beta3.BigTableIODetails}
@@ -455,7 +455,7 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
455455
*
456456
*
457457
* <pre>
458-
* Metadata for a Cloud BigTable connector used by the job.
458+
* Metadata for a Cloud Bigtable connector used by the job.
459459
* </pre>
460460
*
461461
* Protobuf type {@code google.dataflow.v1beta3.BigTableIODetails}

0 commit comments

Comments
 (0)