Skip to content

Commit 1541cad

Browse files
gcf-owl-bot[bot]gcf-owl-bot[bot]
authored
feat!: release gapic-generator-java v2.0.0 (#308)
Committer: @miraleung PiperOrigin-RevId: 388535346 Source-Link: googleapis/googleapis@d9eaf41 Source-Link: https://github.com/googleapis/googleapis-gen/commit/976c5ab6f24b58c91fe04847ead1953f99d19e6a
1 parent 86cc52f commit 1541cad

8 files changed

Lines changed: 60 additions & 98 deletions

File tree

‎java-workflows/google-cloud-workflows/src/main/java/com/google/cloud/workflows/v1/WorkflowsClient.java‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616

1717
package com.google.cloud.workflows.v1;
1818

19-
import com.google.api.core.ApiFunction;
2019
import com.google.api.core.ApiFuture;
2120
import com.google.api.core.ApiFutures;
2221
import com.google.api.core.BetaApi;
@@ -837,12 +836,7 @@ public static ApiFuture<ListWorkflowsPagedResponse> createAsync(
837836
ListWorkflowsPage.createEmptyPage().createPageAsync(context, futureResponse);
838837
return ApiFutures.transform(
839838
futurePage,
840-
new ApiFunction<ListWorkflowsPage, ListWorkflowsPagedResponse>() {
841-
@Override
842-
public ListWorkflowsPagedResponse apply(ListWorkflowsPage input) {
843-
return new ListWorkflowsPagedResponse(input);
844-
}
845-
},
839+
input -> new ListWorkflowsPagedResponse(input),
846840
MoreExecutors.directExecutor());
847841
}
848842

‎java-workflows/google-cloud-workflows/src/main/java/com/google/cloud/workflows/v1/WorkflowsSettings.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -199,14 +199,13 @@ public WorkflowsStubSettings.Builder getStubSettingsBuilder() {
199199
return ((WorkflowsStubSettings.Builder) getStubSettings());
200200
}
201201

202-
// NEXT_MAJOR_VER: remove 'throws Exception'.
203202
/**
204203
* Applies the given settings updater function to all of the unary API methods in this service.
205204
*
206205
* <p>Note: This method does not support applying settings to streaming methods.
207206
*/
208207
public Builder applyToAllUnaryMethods(
209-
ApiFunction<UnaryCallSettings.Builder<?, ?>, Void> settingsUpdater) throws Exception {
208+
ApiFunction<UnaryCallSettings.Builder<?, ?>, Void> settingsUpdater) {
210209
super.applyToAllUnaryMethods(
211210
getStubSettingsBuilder().unaryMethodSettingsBuilders(), settingsUpdater);
212211
return this;

‎java-workflows/google-cloud-workflows/src/main/java/com/google/cloud/workflows/v1/stub/GrpcWorkflowsStub.java‎

Lines changed: 27 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
import com.google.api.gax.grpc.GrpcStubCallableFactory;
2525
import com.google.api.gax.rpc.ClientContext;
2626
import com.google.api.gax.rpc.OperationCallable;
27-
import com.google.api.gax.rpc.RequestParamsExtractor;
2827
import com.google.api.gax.rpc.UnaryCallable;
2928
import com.google.cloud.workflows.v1.CreateWorkflowRequest;
3029
import com.google.cloud.workflows.v1.DeleteWorkflowRequest;
@@ -41,7 +40,6 @@
4140
import io.grpc.MethodDescriptor;
4241
import io.grpc.protobuf.ProtoUtils;
4342
import java.io.IOException;
44-
import java.util.Map;
4543
import java.util.concurrent.TimeUnit;
4644
import javax.annotation.Generated;
4745

@@ -161,65 +159,50 @@ protected GrpcWorkflowsStub(
161159
GrpcCallSettings.<ListWorkflowsRequest, ListWorkflowsResponse>newBuilder()
162160
.setMethodDescriptor(listWorkflowsMethodDescriptor)
163161
.setParamsExtractor(
164-
new RequestParamsExtractor<ListWorkflowsRequest>() {
165-
@Override
166-
public Map<String, String> extract(ListWorkflowsRequest request) {
167-
ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
168-
params.put("parent", String.valueOf(request.getParent()));
169-
return params.build();
170-
}
162+
request -> {
163+
ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
164+
params.put("parent", String.valueOf(request.getParent()));
165+
return params.build();
171166
})
172167
.build();
173168
GrpcCallSettings<GetWorkflowRequest, Workflow> getWorkflowTransportSettings =
174169
GrpcCallSettings.<GetWorkflowRequest, Workflow>newBuilder()
175170
.setMethodDescriptor(getWorkflowMethodDescriptor)
176171
.setParamsExtractor(
177-
new RequestParamsExtractor<GetWorkflowRequest>() {
178-
@Override
179-
public Map<String, String> extract(GetWorkflowRequest request) {
180-
ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
181-
params.put("name", String.valueOf(request.getName()));
182-
return params.build();
183-
}
172+
request -> {
173+
ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
174+
params.put("name", String.valueOf(request.getName()));
175+
return params.build();
184176
})
185177
.build();
186178
GrpcCallSettings<CreateWorkflowRequest, Operation> createWorkflowTransportSettings =
187179
GrpcCallSettings.<CreateWorkflowRequest, Operation>newBuilder()
188180
.setMethodDescriptor(createWorkflowMethodDescriptor)
189181
.setParamsExtractor(
190-
new RequestParamsExtractor<CreateWorkflowRequest>() {
191-
@Override
192-
public Map<String, String> extract(CreateWorkflowRequest request) {
193-
ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
194-
params.put("parent", String.valueOf(request.getParent()));
195-
return params.build();
196-
}
182+
request -> {
183+
ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
184+
params.put("parent", String.valueOf(request.getParent()));
185+
return params.build();
197186
})
198187
.build();
199188
GrpcCallSettings<DeleteWorkflowRequest, Operation> deleteWorkflowTransportSettings =
200189
GrpcCallSettings.<DeleteWorkflowRequest, Operation>newBuilder()
201190
.setMethodDescriptor(deleteWorkflowMethodDescriptor)
202191
.setParamsExtractor(
203-
new RequestParamsExtractor<DeleteWorkflowRequest>() {
204-
@Override
205-
public Map<String, String> extract(DeleteWorkflowRequest request) {
206-
ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
207-
params.put("name", String.valueOf(request.getName()));
208-
return params.build();
209-
}
192+
request -> {
193+
ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
194+
params.put("name", String.valueOf(request.getName()));
195+
return params.build();
210196
})
211197
.build();
212198
GrpcCallSettings<UpdateWorkflowRequest, Operation> updateWorkflowTransportSettings =
213199
GrpcCallSettings.<UpdateWorkflowRequest, Operation>newBuilder()
214200
.setMethodDescriptor(updateWorkflowMethodDescriptor)
215201
.setParamsExtractor(
216-
new RequestParamsExtractor<UpdateWorkflowRequest>() {
217-
@Override
218-
public Map<String, String> extract(UpdateWorkflowRequest request) {
219-
ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
220-
params.put("workflow.name", String.valueOf(request.getWorkflow().getName()));
221-
return params.build();
222-
}
202+
request -> {
203+
ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
204+
params.put("workflow.name", String.valueOf(request.getWorkflow().getName()));
205+
return params.build();
223206
})
224207
.build();
225208

@@ -319,7 +302,13 @@ public UnaryCallable<UpdateWorkflowRequest, Operation> updateWorkflowCallable()
319302

320303
@Override
321304
public final void close() {
322-
shutdown();
305+
try {
306+
backgroundResources.close();
307+
} catch (RuntimeException e) {
308+
throw e;
309+
} catch (Exception e) {
310+
throw new IllegalStateException("Failed to close resource", e);
311+
}
323312
}
324313

325314
@Override

‎java-workflows/google-cloud-workflows/src/main/java/com/google/cloud/workflows/v1/stub/WorkflowsStubSettings.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -494,14 +494,13 @@ private static Builder initDefaults(Builder builder) {
494494
return builder;
495495
}
496496

497-
// NEXT_MAJOR_VER: remove 'throws Exception'.
498497
/**
499498
* Applies the given settings updater function to all of the unary API methods in this service.
500499
*
501500
* <p>Note: This method does not support applying settings to streaming methods.
502501
*/
503502
public Builder applyToAllUnaryMethods(
504-
ApiFunction<UnaryCallSettings.Builder<?, ?>, Void> settingsUpdater) throws Exception {
503+
ApiFunction<UnaryCallSettings.Builder<?, ?>, Void> settingsUpdater) {
505504
super.applyToAllUnaryMethods(unaryMethodSettingsBuilders, settingsUpdater);
506505
return this;
507506
}

‎java-workflows/google-cloud-workflows/src/main/java/com/google/cloud/workflows/v1beta/WorkflowsClient.java‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616

1717
package com.google.cloud.workflows.v1beta;
1818

19-
import com.google.api.core.ApiFunction;
2019
import com.google.api.core.ApiFuture;
2120
import com.google.api.core.ApiFutures;
2221
import com.google.api.core.BetaApi;
@@ -838,12 +837,7 @@ public static ApiFuture<ListWorkflowsPagedResponse> createAsync(
838837
ListWorkflowsPage.createEmptyPage().createPageAsync(context, futureResponse);
839838
return ApiFutures.transform(
840839
futurePage,
841-
new ApiFunction<ListWorkflowsPage, ListWorkflowsPagedResponse>() {
842-
@Override
843-
public ListWorkflowsPagedResponse apply(ListWorkflowsPage input) {
844-
return new ListWorkflowsPagedResponse(input);
845-
}
846-
},
840+
input -> new ListWorkflowsPagedResponse(input),
847841
MoreExecutors.directExecutor());
848842
}
849843

‎java-workflows/google-cloud-workflows/src/main/java/com/google/cloud/workflows/v1beta/WorkflowsSettings.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -200,14 +200,13 @@ public WorkflowsStubSettings.Builder getStubSettingsBuilder() {
200200
return ((WorkflowsStubSettings.Builder) getStubSettings());
201201
}
202202

203-
// NEXT_MAJOR_VER: remove 'throws Exception'.
204203
/**
205204
* Applies the given settings updater function to all of the unary API methods in this service.
206205
*
207206
* <p>Note: This method does not support applying settings to streaming methods.
208207
*/
209208
public Builder applyToAllUnaryMethods(
210-
ApiFunction<UnaryCallSettings.Builder<?, ?>, Void> settingsUpdater) throws Exception {
209+
ApiFunction<UnaryCallSettings.Builder<?, ?>, Void> settingsUpdater) {
211210
super.applyToAllUnaryMethods(
212211
getStubSettingsBuilder().unaryMethodSettingsBuilders(), settingsUpdater);
213212
return this;

‎java-workflows/google-cloud-workflows/src/main/java/com/google/cloud/workflows/v1beta/stub/GrpcWorkflowsStub.java‎

Lines changed: 27 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
import com.google.api.gax.grpc.GrpcStubCallableFactory;
2626
import com.google.api.gax.rpc.ClientContext;
2727
import com.google.api.gax.rpc.OperationCallable;
28-
import com.google.api.gax.rpc.RequestParamsExtractor;
2928
import com.google.api.gax.rpc.UnaryCallable;
3029
import com.google.cloud.workflows.v1beta.CreateWorkflowRequest;
3130
import com.google.cloud.workflows.v1beta.DeleteWorkflowRequest;
@@ -42,7 +41,6 @@
4241
import io.grpc.MethodDescriptor;
4342
import io.grpc.protobuf.ProtoUtils;
4443
import java.io.IOException;
45-
import java.util.Map;
4644
import java.util.concurrent.TimeUnit;
4745
import javax.annotation.Generated;
4846

@@ -163,65 +161,50 @@ protected GrpcWorkflowsStub(
163161
GrpcCallSettings.<ListWorkflowsRequest, ListWorkflowsResponse>newBuilder()
164162
.setMethodDescriptor(listWorkflowsMethodDescriptor)
165163
.setParamsExtractor(
166-
new RequestParamsExtractor<ListWorkflowsRequest>() {
167-
@Override
168-
public Map<String, String> extract(ListWorkflowsRequest request) {
169-
ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
170-
params.put("parent", String.valueOf(request.getParent()));
171-
return params.build();
172-
}
164+
request -> {
165+
ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
166+
params.put("parent", String.valueOf(request.getParent()));
167+
return params.build();
173168
})
174169
.build();
175170
GrpcCallSettings<GetWorkflowRequest, Workflow> getWorkflowTransportSettings =
176171
GrpcCallSettings.<GetWorkflowRequest, Workflow>newBuilder()
177172
.setMethodDescriptor(getWorkflowMethodDescriptor)
178173
.setParamsExtractor(
179-
new RequestParamsExtractor<GetWorkflowRequest>() {
180-
@Override
181-
public Map<String, String> extract(GetWorkflowRequest request) {
182-
ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
183-
params.put("name", String.valueOf(request.getName()));
184-
return params.build();
185-
}
174+
request -> {
175+
ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
176+
params.put("name", String.valueOf(request.getName()));
177+
return params.build();
186178
})
187179
.build();
188180
GrpcCallSettings<CreateWorkflowRequest, Operation> createWorkflowTransportSettings =
189181
GrpcCallSettings.<CreateWorkflowRequest, Operation>newBuilder()
190182
.setMethodDescriptor(createWorkflowMethodDescriptor)
191183
.setParamsExtractor(
192-
new RequestParamsExtractor<CreateWorkflowRequest>() {
193-
@Override
194-
public Map<String, String> extract(CreateWorkflowRequest request) {
195-
ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
196-
params.put("parent", String.valueOf(request.getParent()));
197-
return params.build();
198-
}
184+
request -> {
185+
ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
186+
params.put("parent", String.valueOf(request.getParent()));
187+
return params.build();
199188
})
200189
.build();
201190
GrpcCallSettings<DeleteWorkflowRequest, Operation> deleteWorkflowTransportSettings =
202191
GrpcCallSettings.<DeleteWorkflowRequest, Operation>newBuilder()
203192
.setMethodDescriptor(deleteWorkflowMethodDescriptor)
204193
.setParamsExtractor(
205-
new RequestParamsExtractor<DeleteWorkflowRequest>() {
206-
@Override
207-
public Map<String, String> extract(DeleteWorkflowRequest request) {
208-
ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
209-
params.put("name", String.valueOf(request.getName()));
210-
return params.build();
211-
}
194+
request -> {
195+
ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
196+
params.put("name", String.valueOf(request.getName()));
197+
return params.build();
212198
})
213199
.build();
214200
GrpcCallSettings<UpdateWorkflowRequest, Operation> updateWorkflowTransportSettings =
215201
GrpcCallSettings.<UpdateWorkflowRequest, Operation>newBuilder()
216202
.setMethodDescriptor(updateWorkflowMethodDescriptor)
217203
.setParamsExtractor(
218-
new RequestParamsExtractor<UpdateWorkflowRequest>() {
219-
@Override
220-
public Map<String, String> extract(UpdateWorkflowRequest request) {
221-
ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
222-
params.put("workflow.name", String.valueOf(request.getWorkflow().getName()));
223-
return params.build();
224-
}
204+
request -> {
205+
ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
206+
params.put("workflow.name", String.valueOf(request.getWorkflow().getName()));
207+
return params.build();
225208
})
226209
.build();
227210

@@ -321,7 +304,13 @@ public UnaryCallable<UpdateWorkflowRequest, Operation> updateWorkflowCallable()
321304

322305
@Override
323306
public final void close() {
324-
shutdown();
307+
try {
308+
backgroundResources.close();
309+
} catch (RuntimeException e) {
310+
throw e;
311+
} catch (Exception e) {
312+
throw new IllegalStateException("Failed to close resource", e);
313+
}
325314
}
326315

327316
@Override

‎java-workflows/google-cloud-workflows/src/main/java/com/google/cloud/workflows/v1beta/stub/WorkflowsStubSettings.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -495,14 +495,13 @@ private static Builder initDefaults(Builder builder) {
495495
return builder;
496496
}
497497

498-
// NEXT_MAJOR_VER: remove 'throws Exception'.
499498
/**
500499
* Applies the given settings updater function to all of the unary API methods in this service.
501500
*
502501
* <p>Note: This method does not support applying settings to streaming methods.
503502
*/
504503
public Builder applyToAllUnaryMethods(
505-
ApiFunction<UnaryCallSettings.Builder<?, ?>, Void> settingsUpdater) throws Exception {
504+
ApiFunction<UnaryCallSettings.Builder<?, ?>, Void> settingsUpdater) {
506505
super.applyToAllUnaryMethods(unaryMethodSettingsBuilders, settingsUpdater);
507506
return this;
508507
}

0 commit comments

Comments
 (0)