diff --git a/google-cloud-datastream/src/main/java/com/google/cloud/datastream/v1alpha1/DatastreamClient.java b/google-cloud-datastream/src/main/java/com/google/cloud/datastream/v1alpha1/DatastreamClient.java index c8048f8d..4babda3a 100644 --- a/google-cloud-datastream/src/main/java/com/google/cloud/datastream/v1alpha1/DatastreamClient.java +++ b/google-cloud-datastream/src/main/java/com/google/cloud/datastream/v1alpha1/DatastreamClient.java @@ -16,7 +16,6 @@ package com.google.cloud.datastream.v1alpha1; -import com.google.api.core.ApiFunction; import com.google.api.core.ApiFuture; import com.google.api.core.ApiFutures; import com.google.api.core.BetaApi; @@ -2802,12 +2801,7 @@ public static ApiFuture createAsync( ListConnectionProfilesPage.createEmptyPage().createPageAsync(context, futureResponse); return ApiFutures.transform( futurePage, - new ApiFunction() { - @Override - public ListConnectionProfilesPagedResponse apply(ListConnectionProfilesPage input) { - return new ListConnectionProfilesPagedResponse(input); - } - }, + input -> new ListConnectionProfilesPagedResponse(input), MoreExecutors.directExecutor()); } @@ -2892,14 +2886,7 @@ public static ApiFuture createAsync( ApiFuture futurePage = ListStreamsPage.createEmptyPage().createPageAsync(context, futureResponse); return ApiFutures.transform( - futurePage, - new ApiFunction() { - @Override - public ListStreamsPagedResponse apply(ListStreamsPage input) { - return new ListStreamsPagedResponse(input); - } - }, - MoreExecutors.directExecutor()); + futurePage, input -> new ListStreamsPagedResponse(input), MoreExecutors.directExecutor()); } private ListStreamsPagedResponse(ListStreamsPage page) { @@ -2973,12 +2960,7 @@ public static ApiFuture createAsync( FetchStaticIpsPage.createEmptyPage().createPageAsync(context, futureResponse); return ApiFutures.transform( futurePage, - new ApiFunction() { - @Override - public FetchStaticIpsPagedResponse apply(FetchStaticIpsPage input) { - return new FetchStaticIpsPagedResponse(input); - } - }, + input -> new FetchStaticIpsPagedResponse(input), MoreExecutors.directExecutor()); } @@ -3056,12 +3038,7 @@ public static ApiFuture createAsync( ListPrivateConnectionsPage.createEmptyPage().createPageAsync(context, futureResponse); return ApiFutures.transform( futurePage, - new ApiFunction() { - @Override - public ListPrivateConnectionsPagedResponse apply(ListPrivateConnectionsPage input) { - return new ListPrivateConnectionsPagedResponse(input); - } - }, + input -> new ListPrivateConnectionsPagedResponse(input), MoreExecutors.directExecutor()); } @@ -3146,14 +3123,7 @@ public static ApiFuture createAsync( ApiFuture futurePage = ListRoutesPage.createEmptyPage().createPageAsync(context, futureResponse); return ApiFutures.transform( - futurePage, - new ApiFunction() { - @Override - public ListRoutesPagedResponse apply(ListRoutesPage input) { - return new ListRoutesPagedResponse(input); - } - }, - MoreExecutors.directExecutor()); + futurePage, input -> new ListRoutesPagedResponse(input), MoreExecutors.directExecutor()); } private ListRoutesPagedResponse(ListRoutesPage page) { diff --git a/google-cloud-datastream/src/main/java/com/google/cloud/datastream/v1alpha1/DatastreamSettings.java b/google-cloud-datastream/src/main/java/com/google/cloud/datastream/v1alpha1/DatastreamSettings.java index ef9d9a9a..17b71807 100644 --- a/google-cloud-datastream/src/main/java/com/google/cloud/datastream/v1alpha1/DatastreamSettings.java +++ b/google-cloud-datastream/src/main/java/com/google/cloud/datastream/v1alpha1/DatastreamSettings.java @@ -351,14 +351,13 @@ public DatastreamStubSettings.Builder getStubSettingsBuilder() { return ((DatastreamStubSettings.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-datastream/src/main/java/com/google/cloud/datastream/v1alpha1/stub/DatastreamStubSettings.java b/google-cloud-datastream/src/main/java/com/google/cloud/datastream/v1alpha1/stub/DatastreamStubSettings.java index 920fb722..54f0b03f 100644 --- a/google-cloud-datastream/src/main/java/com/google/cloud/datastream/v1alpha1/stub/DatastreamStubSettings.java +++ b/google-cloud-datastream/src/main/java/com/google/cloud/datastream/v1alpha1/stub/DatastreamStubSettings.java @@ -1435,14 +1435,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-datastream/src/main/java/com/google/cloud/datastream/v1alpha1/stub/GrpcDatastreamStub.java b/google-cloud-datastream/src/main/java/com/google/cloud/datastream/v1alpha1/stub/GrpcDatastreamStub.java index 62687745..4e95111f 100644 --- a/google-cloud-datastream/src/main/java/com/google/cloud/datastream/v1alpha1/stub/GrpcDatastreamStub.java +++ b/google-cloud-datastream/src/main/java/com/google/cloud/datastream/v1alpha1/stub/GrpcDatastreamStub.java @@ -29,7 +29,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.datastream.v1alpha1.ConnectionProfile; import com.google.cloud.datastream.v1alpha1.CreateConnectionProfileRequest; @@ -71,7 +70,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; @@ -412,13 +410,10 @@ protected GrpcDatastreamStub( .newBuilder() .setMethodDescriptor(listConnectionProfilesMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(ListConnectionProfilesRequest 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 @@ -426,13 +421,10 @@ public Map extract(ListConnectionProfilesRequest request) { GrpcCallSettings.newBuilder() .setMethodDescriptor(getConnectionProfileMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(GetConnectionProfileRequest 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 @@ -440,13 +432,10 @@ public Map extract(GetConnectionProfileRequest request) { GrpcCallSettings.newBuilder() .setMethodDescriptor(createConnectionProfileMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(CreateConnectionProfileRequest 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 @@ -454,15 +443,12 @@ public Map extract(CreateConnectionProfileRequest request) { GrpcCallSettings.newBuilder() .setMethodDescriptor(updateConnectionProfileMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(UpdateConnectionProfileRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put( - "connection_profile.name", - String.valueOf(request.getConnectionProfile().getName())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put( + "connection_profile.name", + String.valueOf(request.getConnectionProfile().getName())); + return params.build(); }) .build(); GrpcCallSettings @@ -470,13 +456,10 @@ public Map extract(UpdateConnectionProfileRequest request) { GrpcCallSettings.newBuilder() .setMethodDescriptor(deleteConnectionProfileMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(DeleteConnectionProfileRequest 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 @@ -485,91 +468,70 @@ public Map extract(DeleteConnectionProfileRequest request) { .newBuilder() .setMethodDescriptor(discoverConnectionProfileMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(DiscoverConnectionProfileRequest 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 listStreamsTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(listStreamsMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(ListStreamsRequest 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 getStreamTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(getStreamMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(GetStreamRequest 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 createStreamTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(createStreamMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(CreateStreamRequest 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 updateStreamTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(updateStreamMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(UpdateStreamRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("stream.name", String.valueOf(request.getStream().getName())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("stream.name", String.valueOf(request.getStream().getName())); + return params.build(); }) .build(); GrpcCallSettings deleteStreamTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(deleteStreamMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(DeleteStreamRequest 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 fetchErrorsTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(fetchErrorsMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(FetchErrorsRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("stream", String.valueOf(request.getStream())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("stream", String.valueOf(request.getStream())); + return params.build(); }) .build(); GrpcCallSettings @@ -577,13 +539,10 @@ public Map extract(FetchErrorsRequest request) { GrpcCallSettings.newBuilder() .setMethodDescriptor(fetchStaticIpsMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(FetchStaticIpsRequest 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 @@ -591,13 +550,10 @@ public Map extract(FetchStaticIpsRequest request) { GrpcCallSettings.newBuilder() .setMethodDescriptor(createPrivateConnectionMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(CreatePrivateConnectionRequest 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 @@ -605,13 +561,10 @@ public Map extract(CreatePrivateConnectionRequest request) { GrpcCallSettings.newBuilder() .setMethodDescriptor(getPrivateConnectionMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(GetPrivateConnectionRequest 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 @@ -620,13 +573,10 @@ public Map extract(GetPrivateConnectionRequest request) { .newBuilder() .setMethodDescriptor(listPrivateConnectionsMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(ListPrivateConnectionsRequest 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 @@ -634,65 +584,50 @@ public Map extract(ListPrivateConnectionsRequest request) { GrpcCallSettings.newBuilder() .setMethodDescriptor(deletePrivateConnectionMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(DeletePrivateConnectionRequest 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 createRouteTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(createRouteMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(CreateRouteRequest 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 getRouteTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(getRouteMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(GetRouteRequest 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 listRoutesTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(listRoutesMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(ListRoutesRequest 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 deleteRouteTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(deleteRouteMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(DeleteRouteRequest 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(); @@ -1084,7 +1019,13 @@ public UnaryCallable deleteRouteCallable() { @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