From 4b2b88e57de4fd2068a02bccd5e052a6e74f765c Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Wed, 4 Aug 2021 23:22:39 +0000 Subject: [PATCH] feat!: release gapic-generator-java v2.0.0 (#308) Committer: @miraleung PiperOrigin-RevId: 388535346 Source-Link: https://github.com/googleapis/googleapis/commit/d9eaf41de44d953458b18712a3f240bb4c564e48 Source-Link: https://github.com/googleapis/googleapis-gen/commit/976c5ab6f24b58c91fe04847ead1953f99d19e6a --- .../cloud/workflows/v1/WorkflowsClient.java | 8 +-- .../cloud/workflows/v1/WorkflowsSettings.java | 3 +- .../workflows/v1/stub/GrpcWorkflowsStub.java | 65 ++++++++----------- .../v1/stub/WorkflowsStubSettings.java | 3 +- .../workflows/v1beta/WorkflowsClient.java | 8 +-- .../workflows/v1beta/WorkflowsSettings.java | 3 +- .../v1beta/stub/GrpcWorkflowsStub.java | 65 ++++++++----------- .../v1beta/stub/WorkflowsStubSettings.java | 3 +- 8 files changed, 60 insertions(+), 98 deletions(-) diff --git a/google-cloud-workflows/src/main/java/com/google/cloud/workflows/v1/WorkflowsClient.java b/google-cloud-workflows/src/main/java/com/google/cloud/workflows/v1/WorkflowsClient.java index e016c671..8677cf9e 100644 --- a/google-cloud-workflows/src/main/java/com/google/cloud/workflows/v1/WorkflowsClient.java +++ b/google-cloud-workflows/src/main/java/com/google/cloud/workflows/v1/WorkflowsClient.java @@ -16,7 +16,6 @@ package com.google.cloud.workflows.v1; -import com.google.api.core.ApiFunction; import com.google.api.core.ApiFuture; import com.google.api.core.ApiFutures; import com.google.api.core.BetaApi; @@ -837,12 +836,7 @@ public static ApiFuture createAsync( ListWorkflowsPage.createEmptyPage().createPageAsync(context, futureResponse); return ApiFutures.transform( futurePage, - new ApiFunction() { - @Override - public ListWorkflowsPagedResponse apply(ListWorkflowsPage input) { - return new ListWorkflowsPagedResponse(input); - } - }, + input -> new ListWorkflowsPagedResponse(input), MoreExecutors.directExecutor()); } diff --git a/google-cloud-workflows/src/main/java/com/google/cloud/workflows/v1/WorkflowsSettings.java b/google-cloud-workflows/src/main/java/com/google/cloud/workflows/v1/WorkflowsSettings.java index bfe8c338..8feb68f9 100644 --- a/google-cloud-workflows/src/main/java/com/google/cloud/workflows/v1/WorkflowsSettings.java +++ b/google-cloud-workflows/src/main/java/com/google/cloud/workflows/v1/WorkflowsSettings.java @@ -199,14 +199,13 @@ public WorkflowsStubSettings.Builder getStubSettingsBuilder() { return ((WorkflowsStubSettings.Builder) getStubSettings()); } - // NEXT_MAJOR_VER: remove 'throws Exception'. /** * Applies the given settings updater function to all of the unary API methods in this service. * *

Note: This method does not support applying settings to streaming methods. */ public Builder applyToAllUnaryMethods( - ApiFunction, Void> settingsUpdater) throws Exception { + ApiFunction, Void> settingsUpdater) { super.applyToAllUnaryMethods( getStubSettingsBuilder().unaryMethodSettingsBuilders(), settingsUpdater); return this; diff --git a/google-cloud-workflows/src/main/java/com/google/cloud/workflows/v1/stub/GrpcWorkflowsStub.java b/google-cloud-workflows/src/main/java/com/google/cloud/workflows/v1/stub/GrpcWorkflowsStub.java index 09419387..f15178cf 100644 --- a/google-cloud-workflows/src/main/java/com/google/cloud/workflows/v1/stub/GrpcWorkflowsStub.java +++ b/google-cloud-workflows/src/main/java/com/google/cloud/workflows/v1/stub/GrpcWorkflowsStub.java @@ -24,7 +24,6 @@ import com.google.api.gax.grpc.GrpcStubCallableFactory; import com.google.api.gax.rpc.ClientContext; import com.google.api.gax.rpc.OperationCallable; -import com.google.api.gax.rpc.RequestParamsExtractor; import com.google.api.gax.rpc.UnaryCallable; import com.google.cloud.workflows.v1.CreateWorkflowRequest; import com.google.cloud.workflows.v1.DeleteWorkflowRequest; @@ -41,7 +40,6 @@ import io.grpc.MethodDescriptor; import io.grpc.protobuf.ProtoUtils; import java.io.IOException; -import java.util.Map; import java.util.concurrent.TimeUnit; import javax.annotation.Generated; @@ -161,65 +159,50 @@ protected GrpcWorkflowsStub( GrpcCallSettings.newBuilder() .setMethodDescriptor(listWorkflowsMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(ListWorkflowsRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("parent", String.valueOf(request.getParent())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("parent", String.valueOf(request.getParent())); + return params.build(); }) .build(); GrpcCallSettings getWorkflowTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(getWorkflowMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(GetWorkflowRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("name", String.valueOf(request.getName())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("name", String.valueOf(request.getName())); + return params.build(); }) .build(); GrpcCallSettings createWorkflowTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(createWorkflowMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(CreateWorkflowRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("parent", String.valueOf(request.getParent())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("parent", String.valueOf(request.getParent())); + return params.build(); }) .build(); GrpcCallSettings deleteWorkflowTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(deleteWorkflowMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(DeleteWorkflowRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("name", String.valueOf(request.getName())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("name", String.valueOf(request.getName())); + return params.build(); }) .build(); GrpcCallSettings updateWorkflowTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(updateWorkflowMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(UpdateWorkflowRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("workflow.name", String.valueOf(request.getWorkflow().getName())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("workflow.name", String.valueOf(request.getWorkflow().getName())); + return params.build(); }) .build(); @@ -319,7 +302,13 @@ public UnaryCallable updateWorkflowCallable() @Override public final void close() { - shutdown(); + try { + backgroundResources.close(); + } catch (RuntimeException e) { + throw e; + } catch (Exception e) { + throw new IllegalStateException("Failed to close resource", e); + } } @Override diff --git a/google-cloud-workflows/src/main/java/com/google/cloud/workflows/v1/stub/WorkflowsStubSettings.java b/google-cloud-workflows/src/main/java/com/google/cloud/workflows/v1/stub/WorkflowsStubSettings.java index 0ea47370..51b168a2 100644 --- a/google-cloud-workflows/src/main/java/com/google/cloud/workflows/v1/stub/WorkflowsStubSettings.java +++ b/google-cloud-workflows/src/main/java/com/google/cloud/workflows/v1/stub/WorkflowsStubSettings.java @@ -494,14 +494,13 @@ private static Builder initDefaults(Builder builder) { return builder; } - // NEXT_MAJOR_VER: remove 'throws Exception'. /** * Applies the given settings updater function to all of the unary API methods in this service. * *

Note: This method does not support applying settings to streaming methods. */ public Builder applyToAllUnaryMethods( - ApiFunction, Void> settingsUpdater) throws Exception { + ApiFunction, Void> settingsUpdater) { super.applyToAllUnaryMethods(unaryMethodSettingsBuilders, settingsUpdater); return this; } diff --git a/google-cloud-workflows/src/main/java/com/google/cloud/workflows/v1beta/WorkflowsClient.java b/google-cloud-workflows/src/main/java/com/google/cloud/workflows/v1beta/WorkflowsClient.java index 7cef1c25..0cb8c949 100644 --- a/google-cloud-workflows/src/main/java/com/google/cloud/workflows/v1beta/WorkflowsClient.java +++ b/google-cloud-workflows/src/main/java/com/google/cloud/workflows/v1beta/WorkflowsClient.java @@ -16,7 +16,6 @@ package com.google.cloud.workflows.v1beta; -import com.google.api.core.ApiFunction; import com.google.api.core.ApiFuture; import com.google.api.core.ApiFutures; import com.google.api.core.BetaApi; @@ -838,12 +837,7 @@ public static ApiFuture createAsync( ListWorkflowsPage.createEmptyPage().createPageAsync(context, futureResponse); return ApiFutures.transform( futurePage, - new ApiFunction() { - @Override - public ListWorkflowsPagedResponse apply(ListWorkflowsPage input) { - return new ListWorkflowsPagedResponse(input); - } - }, + input -> new ListWorkflowsPagedResponse(input), MoreExecutors.directExecutor()); } diff --git a/google-cloud-workflows/src/main/java/com/google/cloud/workflows/v1beta/WorkflowsSettings.java b/google-cloud-workflows/src/main/java/com/google/cloud/workflows/v1beta/WorkflowsSettings.java index f4b870f7..56baa219 100644 --- a/google-cloud-workflows/src/main/java/com/google/cloud/workflows/v1beta/WorkflowsSettings.java +++ b/google-cloud-workflows/src/main/java/com/google/cloud/workflows/v1beta/WorkflowsSettings.java @@ -200,14 +200,13 @@ public WorkflowsStubSettings.Builder getStubSettingsBuilder() { return ((WorkflowsStubSettings.Builder) getStubSettings()); } - // NEXT_MAJOR_VER: remove 'throws Exception'. /** * Applies the given settings updater function to all of the unary API methods in this service. * *

Note: This method does not support applying settings to streaming methods. */ public Builder applyToAllUnaryMethods( - ApiFunction, Void> settingsUpdater) throws Exception { + ApiFunction, Void> settingsUpdater) { super.applyToAllUnaryMethods( getStubSettingsBuilder().unaryMethodSettingsBuilders(), settingsUpdater); return this; diff --git a/google-cloud-workflows/src/main/java/com/google/cloud/workflows/v1beta/stub/GrpcWorkflowsStub.java b/google-cloud-workflows/src/main/java/com/google/cloud/workflows/v1beta/stub/GrpcWorkflowsStub.java index 25d7b12d..0d77245e 100644 --- a/google-cloud-workflows/src/main/java/com/google/cloud/workflows/v1beta/stub/GrpcWorkflowsStub.java +++ b/google-cloud-workflows/src/main/java/com/google/cloud/workflows/v1beta/stub/GrpcWorkflowsStub.java @@ -25,7 +25,6 @@ import com.google.api.gax.grpc.GrpcStubCallableFactory; import com.google.api.gax.rpc.ClientContext; import com.google.api.gax.rpc.OperationCallable; -import com.google.api.gax.rpc.RequestParamsExtractor; import com.google.api.gax.rpc.UnaryCallable; import com.google.cloud.workflows.v1beta.CreateWorkflowRequest; import com.google.cloud.workflows.v1beta.DeleteWorkflowRequest; @@ -42,7 +41,6 @@ import io.grpc.MethodDescriptor; import io.grpc.protobuf.ProtoUtils; import java.io.IOException; -import java.util.Map; import java.util.concurrent.TimeUnit; import javax.annotation.Generated; @@ -163,65 +161,50 @@ protected GrpcWorkflowsStub( GrpcCallSettings.newBuilder() .setMethodDescriptor(listWorkflowsMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(ListWorkflowsRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("parent", String.valueOf(request.getParent())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("parent", String.valueOf(request.getParent())); + return params.build(); }) .build(); GrpcCallSettings getWorkflowTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(getWorkflowMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(GetWorkflowRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("name", String.valueOf(request.getName())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("name", String.valueOf(request.getName())); + return params.build(); }) .build(); GrpcCallSettings createWorkflowTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(createWorkflowMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(CreateWorkflowRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("parent", String.valueOf(request.getParent())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("parent", String.valueOf(request.getParent())); + return params.build(); }) .build(); GrpcCallSettings deleteWorkflowTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(deleteWorkflowMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(DeleteWorkflowRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("name", String.valueOf(request.getName())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("name", String.valueOf(request.getName())); + return params.build(); }) .build(); GrpcCallSettings updateWorkflowTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(updateWorkflowMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(UpdateWorkflowRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("workflow.name", String.valueOf(request.getWorkflow().getName())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("workflow.name", String.valueOf(request.getWorkflow().getName())); + return params.build(); }) .build(); @@ -321,7 +304,13 @@ public UnaryCallable updateWorkflowCallable() @Override public final void close() { - shutdown(); + try { + backgroundResources.close(); + } catch (RuntimeException e) { + throw e; + } catch (Exception e) { + throw new IllegalStateException("Failed to close resource", e); + } } @Override diff --git a/google-cloud-workflows/src/main/java/com/google/cloud/workflows/v1beta/stub/WorkflowsStubSettings.java b/google-cloud-workflows/src/main/java/com/google/cloud/workflows/v1beta/stub/WorkflowsStubSettings.java index 1af73fb8..9b552096 100644 --- a/google-cloud-workflows/src/main/java/com/google/cloud/workflows/v1beta/stub/WorkflowsStubSettings.java +++ b/google-cloud-workflows/src/main/java/com/google/cloud/workflows/v1beta/stub/WorkflowsStubSettings.java @@ -495,14 +495,13 @@ private static Builder initDefaults(Builder builder) { return builder; } - // NEXT_MAJOR_VER: remove 'throws Exception'. /** * Applies the given settings updater function to all of the unary API methods in this service. * *

Note: This method does not support applying settings to streaming methods. */ public Builder applyToAllUnaryMethods( - ApiFunction, Void> settingsUpdater) throws Exception { + ApiFunction, Void> settingsUpdater) { super.applyToAllUnaryMethods(unaryMethodSettingsBuilders, settingsUpdater); return this; }