diff --git a/README.md b/README.md index 312ac859..27519849 100644 --- a/README.md +++ b/README.md @@ -19,20 +19,20 @@ If you are using Maven, add this to your pom.xml file: com.google.cloud google-cloud-appengine-admin - 1.0.0 + 1.0.1 ``` If you are using Gradle without BOM, add this to your dependencies ```Groovy -compile 'com.google.cloud:google-cloud-appengine-admin:1.0.0' +compile 'com.google.cloud:google-cloud-appengine-admin:1.0.1' ``` If you are using SBT, add this to your dependencies ```Scala -libraryDependencies += "com.google.cloud" % "google-cloud-appengine-admin" % "1.0.0" +libraryDependencies += "com.google.cloud" % "google-cloud-appengine-admin" % "1.0.1" ``` ## Authentication diff --git a/google-cloud-appengine-admin/src/main/java/com/google/appengine/v1/ApplicationsSettings.java b/google-cloud-appengine-admin/src/main/java/com/google/appengine/v1/ApplicationsSettings.java index 86e73b69..6952757d 100644 --- a/google-cloud-appengine-admin/src/main/java/com/google/appengine/v1/ApplicationsSettings.java +++ b/google-cloud-appengine-admin/src/main/java/com/google/appengine/v1/ApplicationsSettings.java @@ -190,14 +190,13 @@ public ApplicationsStubSettings.Builder getStubSettingsBuilder() { return ((ApplicationsStubSettings.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-appengine-admin/src/main/java/com/google/appengine/v1/AuthorizedCertificatesClient.java b/google-cloud-appengine-admin/src/main/java/com/google/appengine/v1/AuthorizedCertificatesClient.java index a29a93bd..a9f98893 100644 --- a/google-cloud-appengine-admin/src/main/java/com/google/appengine/v1/AuthorizedCertificatesClient.java +++ b/google-cloud-appengine-admin/src/main/java/com/google/appengine/v1/AuthorizedCertificatesClient.java @@ -16,7 +16,6 @@ package com.google.appengine.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; @@ -521,14 +520,7 @@ public static ApiFuture createAsync( ListAuthorizedCertificatesPage.createEmptyPage().createPageAsync(context, futureResponse); return ApiFutures.transform( futurePage, - new ApiFunction< - ListAuthorizedCertificatesPage, ListAuthorizedCertificatesPagedResponse>() { - @Override - public ListAuthorizedCertificatesPagedResponse apply( - ListAuthorizedCertificatesPage input) { - return new ListAuthorizedCertificatesPagedResponse(input); - } - }, + input -> new ListAuthorizedCertificatesPagedResponse(input), MoreExecutors.directExecutor()); } diff --git a/google-cloud-appengine-admin/src/main/java/com/google/appengine/v1/AuthorizedCertificatesSettings.java b/google-cloud-appengine-admin/src/main/java/com/google/appengine/v1/AuthorizedCertificatesSettings.java index 0c5e0618..11698915 100644 --- a/google-cloud-appengine-admin/src/main/java/com/google/appengine/v1/AuthorizedCertificatesSettings.java +++ b/google-cloud-appengine-admin/src/main/java/com/google/appengine/v1/AuthorizedCertificatesSettings.java @@ -195,14 +195,13 @@ public AuthorizedCertificatesStubSettings.Builder getStubSettingsBuilder() { return ((AuthorizedCertificatesStubSettings.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-appengine-admin/src/main/java/com/google/appengine/v1/AuthorizedDomainsClient.java b/google-cloud-appengine-admin/src/main/java/com/google/appengine/v1/AuthorizedDomainsClient.java index 1d517ed5..69d7772b 100644 --- a/google-cloud-appengine-admin/src/main/java/com/google/appengine/v1/AuthorizedDomainsClient.java +++ b/google-cloud-appengine-admin/src/main/java/com/google/appengine/v1/AuthorizedDomainsClient.java @@ -16,7 +16,6 @@ package com.google.appengine.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; @@ -298,12 +297,7 @@ public static ApiFuture createAsync( ListAuthorizedDomainsPage.createEmptyPage().createPageAsync(context, futureResponse); return ApiFutures.transform( futurePage, - new ApiFunction() { - @Override - public ListAuthorizedDomainsPagedResponse apply(ListAuthorizedDomainsPage input) { - return new ListAuthorizedDomainsPagedResponse(input); - } - }, + input -> new ListAuthorizedDomainsPagedResponse(input), MoreExecutors.directExecutor()); } diff --git a/google-cloud-appengine-admin/src/main/java/com/google/appengine/v1/AuthorizedDomainsSettings.java b/google-cloud-appengine-admin/src/main/java/com/google/appengine/v1/AuthorizedDomainsSettings.java index e236206b..73820891 100644 --- a/google-cloud-appengine-admin/src/main/java/com/google/appengine/v1/AuthorizedDomainsSettings.java +++ b/google-cloud-appengine-admin/src/main/java/com/google/appengine/v1/AuthorizedDomainsSettings.java @@ -163,14 +163,13 @@ public AuthorizedDomainsStubSettings.Builder getStubSettingsBuilder() { return ((AuthorizedDomainsStubSettings.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-appengine-admin/src/main/java/com/google/appengine/v1/DomainMappingsClient.java b/google-cloud-appengine-admin/src/main/java/com/google/appengine/v1/DomainMappingsClient.java index cf875dde..878ca4dd 100644 --- a/google-cloud-appengine-admin/src/main/java/com/google/appengine/v1/DomainMappingsClient.java +++ b/google-cloud-appengine-admin/src/main/java/com/google/appengine/v1/DomainMappingsClient.java @@ -16,7 +16,6 @@ package com.google.appengine.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; @@ -576,12 +575,7 @@ public static ApiFuture createAsync( ListDomainMappingsPage.createEmptyPage().createPageAsync(context, futureResponse); return ApiFutures.transform( futurePage, - new ApiFunction() { - @Override - public ListDomainMappingsPagedResponse apply(ListDomainMappingsPage input) { - return new ListDomainMappingsPagedResponse(input); - } - }, + input -> new ListDomainMappingsPagedResponse(input), MoreExecutors.directExecutor()); } diff --git a/google-cloud-appengine-admin/src/main/java/com/google/appengine/v1/DomainMappingsSettings.java b/google-cloud-appengine-admin/src/main/java/com/google/appengine/v1/DomainMappingsSettings.java index 9cd71889..205fd58e 100644 --- a/google-cloud-appengine-admin/src/main/java/com/google/appengine/v1/DomainMappingsSettings.java +++ b/google-cloud-appengine-admin/src/main/java/com/google/appengine/v1/DomainMappingsSettings.java @@ -202,14 +202,13 @@ public DomainMappingsStubSettings.Builder getStubSettingsBuilder() { return ((DomainMappingsStubSettings.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-appengine-admin/src/main/java/com/google/appengine/v1/FirewallClient.java b/google-cloud-appengine-admin/src/main/java/com/google/appengine/v1/FirewallClient.java index cd781c72..f7be218f 100644 --- a/google-cloud-appengine-admin/src/main/java/com/google/appengine/v1/FirewallClient.java +++ b/google-cloud-appengine-admin/src/main/java/com/google/appengine/v1/FirewallClient.java @@ -16,7 +16,6 @@ package com.google.appengine.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; @@ -534,12 +533,7 @@ public static ApiFuture createAsync( ListIngressRulesPage.createEmptyPage().createPageAsync(context, futureResponse); return ApiFutures.transform( futurePage, - new ApiFunction() { - @Override - public ListIngressRulesPagedResponse apply(ListIngressRulesPage input) { - return new ListIngressRulesPagedResponse(input); - } - }, + input -> new ListIngressRulesPagedResponse(input), MoreExecutors.directExecutor()); } diff --git a/google-cloud-appengine-admin/src/main/java/com/google/appengine/v1/FirewallSettings.java b/google-cloud-appengine-admin/src/main/java/com/google/appengine/v1/FirewallSettings.java index 3d0cbbfe..36d53a96 100644 --- a/google-cloud-appengine-admin/src/main/java/com/google/appengine/v1/FirewallSettings.java +++ b/google-cloud-appengine-admin/src/main/java/com/google/appengine/v1/FirewallSettings.java @@ -187,14 +187,13 @@ public FirewallStubSettings.Builder getStubSettingsBuilder() { return ((FirewallStubSettings.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-appengine-admin/src/main/java/com/google/appengine/v1/InstancesClient.java b/google-cloud-appengine-admin/src/main/java/com/google/appengine/v1/InstancesClient.java index 690d2cee..7f671fee 100644 --- a/google-cloud-appengine-admin/src/main/java/com/google/appengine/v1/InstancesClient.java +++ b/google-cloud-appengine-admin/src/main/java/com/google/appengine/v1/InstancesClient.java @@ -16,7 +16,6 @@ package com.google.appengine.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; @@ -529,12 +528,7 @@ public static ApiFuture createAsync( ListInstancesPage.createEmptyPage().createPageAsync(context, futureResponse); return ApiFutures.transform( futurePage, - new ApiFunction() { - @Override - public ListInstancesPagedResponse apply(ListInstancesPage input) { - return new ListInstancesPagedResponse(input); - } - }, + input -> new ListInstancesPagedResponse(input), MoreExecutors.directExecutor()); } diff --git a/google-cloud-appengine-admin/src/main/java/com/google/appengine/v1/InstancesSettings.java b/google-cloud-appengine-admin/src/main/java/com/google/appengine/v1/InstancesSettings.java index 25b7ee4d..2d57b69e 100644 --- a/google-cloud-appengine-admin/src/main/java/com/google/appengine/v1/InstancesSettings.java +++ b/google-cloud-appengine-admin/src/main/java/com/google/appengine/v1/InstancesSettings.java @@ -188,14 +188,13 @@ public InstancesStubSettings.Builder getStubSettingsBuilder() { return ((InstancesStubSettings.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-appengine-admin/src/main/java/com/google/appengine/v1/ServicesClient.java b/google-cloud-appengine-admin/src/main/java/com/google/appengine/v1/ServicesClient.java index 0623e7d0..b70684ef 100644 --- a/google-cloud-appengine-admin/src/main/java/com/google/appengine/v1/ServicesClient.java +++ b/google-cloud-appengine-admin/src/main/java/com/google/appengine/v1/ServicesClient.java @@ -16,7 +16,6 @@ package com.google.appengine.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; @@ -475,12 +474,7 @@ public static ApiFuture createAsync( ListServicesPage.createEmptyPage().createPageAsync(context, futureResponse); return ApiFutures.transform( futurePage, - new ApiFunction() { - @Override - public ListServicesPagedResponse apply(ListServicesPage input) { - return new ListServicesPagedResponse(input); - } - }, + input -> new ListServicesPagedResponse(input), MoreExecutors.directExecutor()); } diff --git a/google-cloud-appengine-admin/src/main/java/com/google/appengine/v1/ServicesSettings.java b/google-cloud-appengine-admin/src/main/java/com/google/appengine/v1/ServicesSettings.java index 830f5748..bbb0af0c 100644 --- a/google-cloud-appengine-admin/src/main/java/com/google/appengine/v1/ServicesSettings.java +++ b/google-cloud-appengine-admin/src/main/java/com/google/appengine/v1/ServicesSettings.java @@ -188,14 +188,13 @@ public ServicesStubSettings.Builder getStubSettingsBuilder() { return ((ServicesStubSettings.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-appengine-admin/src/main/java/com/google/appengine/v1/VersionsClient.java b/google-cloud-appengine-admin/src/main/java/com/google/appengine/v1/VersionsClient.java index 4c145eb2..cade424d 100644 --- a/google-cloud-appengine-admin/src/main/java/com/google/appengine/v1/VersionsClient.java +++ b/google-cloud-appengine-admin/src/main/java/com/google/appengine/v1/VersionsClient.java @@ -16,7 +16,6 @@ package com.google.appengine.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; @@ -700,12 +699,7 @@ public static ApiFuture createAsync( ListVersionsPage.createEmptyPage().createPageAsync(context, futureResponse); return ApiFutures.transform( futurePage, - new ApiFunction() { - @Override - public ListVersionsPagedResponse apply(ListVersionsPage input) { - return new ListVersionsPagedResponse(input); - } - }, + input -> new ListVersionsPagedResponse(input), MoreExecutors.directExecutor()); } diff --git a/google-cloud-appengine-admin/src/main/java/com/google/appengine/v1/VersionsSettings.java b/google-cloud-appengine-admin/src/main/java/com/google/appengine/v1/VersionsSettings.java index 174bdee7..5b08e1f7 100644 --- a/google-cloud-appengine-admin/src/main/java/com/google/appengine/v1/VersionsSettings.java +++ b/google-cloud-appengine-admin/src/main/java/com/google/appengine/v1/VersionsSettings.java @@ -199,14 +199,13 @@ public VersionsStubSettings.Builder getStubSettingsBuilder() { return ((VersionsStubSettings.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-appengine-admin/src/main/java/com/google/appengine/v1/stub/ApplicationsStubSettings.java b/google-cloud-appengine-admin/src/main/java/com/google/appengine/v1/stub/ApplicationsStubSettings.java index e65196fc..1804dcfa 100644 --- a/google-cloud-appengine-admin/src/main/java/com/google/appengine/v1/stub/ApplicationsStubSettings.java +++ b/google-cloud-appengine-admin/src/main/java/com/google/appengine/v1/stub/ApplicationsStubSettings.java @@ -427,14 +427,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-appengine-admin/src/main/java/com/google/appengine/v1/stub/AuthorizedCertificatesStubSettings.java b/google-cloud-appengine-admin/src/main/java/com/google/appengine/v1/stub/AuthorizedCertificatesStubSettings.java index 197031e7..fcf6e744 100644 --- a/google-cloud-appengine-admin/src/main/java/com/google/appengine/v1/stub/AuthorizedCertificatesStubSettings.java +++ b/google-cloud-appengine-admin/src/main/java/com/google/appengine/v1/stub/AuthorizedCertificatesStubSettings.java @@ -443,14 +443,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-appengine-admin/src/main/java/com/google/appengine/v1/stub/AuthorizedDomainsStubSettings.java b/google-cloud-appengine-admin/src/main/java/com/google/appengine/v1/stub/AuthorizedDomainsStubSettings.java index 42bb012a..eab6d6ad 100644 --- a/google-cloud-appengine-admin/src/main/java/com/google/appengine/v1/stub/AuthorizedDomainsStubSettings.java +++ b/google-cloud-appengine-admin/src/main/java/com/google/appengine/v1/stub/AuthorizedDomainsStubSettings.java @@ -333,14 +333,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-appengine-admin/src/main/java/com/google/appengine/v1/stub/DomainMappingsStubSettings.java b/google-cloud-appengine-admin/src/main/java/com/google/appengine/v1/stub/DomainMappingsStubSettings.java index cb29e08b..13c9728b 100644 --- a/google-cloud-appengine-admin/src/main/java/com/google/appengine/v1/stub/DomainMappingsStubSettings.java +++ b/google-cloud-appengine-admin/src/main/java/com/google/appengine/v1/stub/DomainMappingsStubSettings.java @@ -531,14 +531,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-appengine-admin/src/main/java/com/google/appengine/v1/stub/FirewallStubSettings.java b/google-cloud-appengine-admin/src/main/java/com/google/appengine/v1/stub/FirewallStubSettings.java index f505e247..26caac33 100644 --- a/google-cloud-appengine-admin/src/main/java/com/google/appengine/v1/stub/FirewallStubSettings.java +++ b/google-cloud-appengine-admin/src/main/java/com/google/appengine/v1/stub/FirewallStubSettings.java @@ -419,14 +419,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-appengine-admin/src/main/java/com/google/appengine/v1/stub/GrpcApplicationsStub.java b/google-cloud-appengine-admin/src/main/java/com/google/appengine/v1/stub/GrpcApplicationsStub.java index 0187a2df..6b8bfcc3 100644 --- a/google-cloud-appengine-admin/src/main/java/com/google/appengine/v1/stub/GrpcApplicationsStub.java +++ b/google-cloud-appengine-admin/src/main/java/com/google/appengine/v1/stub/GrpcApplicationsStub.java @@ -22,7 +22,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.appengine.v1.Application; import com.google.appengine.v1.CreateApplicationRequest; @@ -36,7 +35,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; @@ -145,13 +143,10 @@ protected GrpcApplicationsStub( GrpcCallSettings.newBuilder() .setMethodDescriptor(getApplicationMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(GetApplicationRequest 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 createApplicationTransportSettings = @@ -162,26 +157,20 @@ public Map extract(GetApplicationRequest request) { GrpcCallSettings.newBuilder() .setMethodDescriptor(updateApplicationMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(UpdateApplicationRequest 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 repairApplicationTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(repairApplicationMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(RepairApplicationRequest 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(); @@ -270,7 +259,13 @@ public UnaryCallable repairApplicationCalla @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-appengine-admin/src/main/java/com/google/appengine/v1/stub/GrpcAuthorizedCertificatesStub.java b/google-cloud-appengine-admin/src/main/java/com/google/appengine/v1/stub/GrpcAuthorizedCertificatesStub.java index 9ad013ff..545310b5 100644 --- a/google-cloud-appengine-admin/src/main/java/com/google/appengine/v1/stub/GrpcAuthorizedCertificatesStub.java +++ b/google-cloud-appengine-admin/src/main/java/com/google/appengine/v1/stub/GrpcAuthorizedCertificatesStub.java @@ -23,7 +23,6 @@ import com.google.api.gax.grpc.GrpcCallSettings; import com.google.api.gax.grpc.GrpcStubCallableFactory; import com.google.api.gax.rpc.ClientContext; -import com.google.api.gax.rpc.RequestParamsExtractor; import com.google.api.gax.rpc.UnaryCallable; import com.google.appengine.v1.AuthorizedCertificate; import com.google.appengine.v1.CreateAuthorizedCertificateRequest; @@ -38,7 +37,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; @@ -175,14 +173,10 @@ protected GrpcAuthorizedCertificatesStub( .newBuilder() .setMethodDescriptor(listAuthorizedCertificatesMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract( - ListAuthorizedCertificatesRequest 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 @@ -190,13 +184,10 @@ public Map extract( GrpcCallSettings.newBuilder() .setMethodDescriptor(getAuthorizedCertificateMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(GetAuthorizedCertificateRequest 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 @@ -204,14 +195,10 @@ public Map extract(GetAuthorizedCertificateRequest request) { GrpcCallSettings.newBuilder() .setMethodDescriptor(createAuthorizedCertificateMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract( - CreateAuthorizedCertificateRequest 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 @@ -219,14 +206,10 @@ public Map extract( GrpcCallSettings.newBuilder() .setMethodDescriptor(updateAuthorizedCertificateMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract( - UpdateAuthorizedCertificateRequest 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 @@ -234,14 +217,10 @@ public Map extract( GrpcCallSettings.newBuilder() .setMethodDescriptor(deleteAuthorizedCertificateMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract( - DeleteAuthorizedCertificateRequest 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(); @@ -322,7 +301,13 @@ public GrpcOperationsStub getOperationsStub() { @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-appengine-admin/src/main/java/com/google/appengine/v1/stub/GrpcAuthorizedDomainsStub.java b/google-cloud-appengine-admin/src/main/java/com/google/appengine/v1/stub/GrpcAuthorizedDomainsStub.java index cfa1bd25..19f56dba 100644 --- a/google-cloud-appengine-admin/src/main/java/com/google/appengine/v1/stub/GrpcAuthorizedDomainsStub.java +++ b/google-cloud-appengine-admin/src/main/java/com/google/appengine/v1/stub/GrpcAuthorizedDomainsStub.java @@ -23,7 +23,6 @@ import com.google.api.gax.grpc.GrpcCallSettings; import com.google.api.gax.grpc.GrpcStubCallableFactory; import com.google.api.gax.rpc.ClientContext; -import com.google.api.gax.rpc.RequestParamsExtractor; import com.google.api.gax.rpc.UnaryCallable; import com.google.appengine.v1.ListAuthorizedDomainsRequest; import com.google.appengine.v1.ListAuthorizedDomainsResponse; @@ -32,7 +31,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; @@ -110,13 +108,10 @@ protected GrpcAuthorizedDomainsStub( .newBuilder() .setMethodDescriptor(listAuthorizedDomainsMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(ListAuthorizedDomainsRequest 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(); @@ -153,7 +148,13 @@ public GrpcOperationsStub getOperationsStub() { @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-appengine-admin/src/main/java/com/google/appengine/v1/stub/GrpcDomainMappingsStub.java b/google-cloud-appengine-admin/src/main/java/com/google/appengine/v1/stub/GrpcDomainMappingsStub.java index 09099d20..b0493a33 100644 --- a/google-cloud-appengine-admin/src/main/java/com/google/appengine/v1/stub/GrpcDomainMappingsStub.java +++ b/google-cloud-appengine-admin/src/main/java/com/google/appengine/v1/stub/GrpcDomainMappingsStub.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.appengine.v1.CreateDomainMappingRequest; import com.google.appengine.v1.DeleteDomainMappingRequest; @@ -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; @@ -168,65 +166,50 @@ protected GrpcDomainMappingsStub( GrpcCallSettings.newBuilder() .setMethodDescriptor(listDomainMappingsMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(ListDomainMappingsRequest 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 getDomainMappingTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(getDomainMappingMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(GetDomainMappingRequest 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 createDomainMappingTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(createDomainMappingMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(CreateDomainMappingRequest 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 updateDomainMappingTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(updateDomainMappingMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(UpdateDomainMappingRequest 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 deleteDomainMappingTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(deleteDomainMappingMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(DeleteDomainMappingRequest 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(); @@ -337,7 +320,13 @@ public UnaryCallable deleteDomainMappingC @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-appengine-admin/src/main/java/com/google/appengine/v1/stub/GrpcFirewallStub.java b/google-cloud-appengine-admin/src/main/java/com/google/appengine/v1/stub/GrpcFirewallStub.java index e2eda2c8..ddc97de2 100644 --- a/google-cloud-appengine-admin/src/main/java/com/google/appengine/v1/stub/GrpcFirewallStub.java +++ b/google-cloud-appengine-admin/src/main/java/com/google/appengine/v1/stub/GrpcFirewallStub.java @@ -23,7 +23,6 @@ import com.google.api.gax.grpc.GrpcCallSettings; import com.google.api.gax.grpc.GrpcStubCallableFactory; import com.google.api.gax.rpc.ClientContext; -import com.google.api.gax.rpc.RequestParamsExtractor; import com.google.api.gax.rpc.UnaryCallable; import com.google.appengine.v1.BatchUpdateIngressRulesRequest; import com.google.appengine.v1.BatchUpdateIngressRulesResponse; @@ -40,7 +39,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; @@ -171,13 +169,10 @@ protected GrpcFirewallStub( GrpcCallSettings.newBuilder() .setMethodDescriptor(listIngressRulesMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(ListIngressRulesRequest 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 @@ -186,65 +181,50 @@ public Map extract(ListIngressRulesRequest request) { .newBuilder() .setMethodDescriptor(batchUpdateIngressRulesMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(BatchUpdateIngressRulesRequest 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 createIngressRuleTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(createIngressRuleMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(CreateIngressRuleRequest 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 getIngressRuleTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(getIngressRuleMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(GetIngressRuleRequest 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 updateIngressRuleTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(updateIngressRuleMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(UpdateIngressRuleRequest 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 deleteIngressRuleTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(deleteIngressRuleMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(DeleteIngressRuleRequest 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(); @@ -326,7 +306,13 @@ public UnaryCallable deleteIngressRuleCallable( @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-appengine-admin/src/main/java/com/google/appengine/v1/stub/GrpcInstancesStub.java b/google-cloud-appengine-admin/src/main/java/com/google/appengine/v1/stub/GrpcInstancesStub.java index 7761b29c..dbcbea78 100644 --- a/google-cloud-appengine-admin/src/main/java/com/google/appengine/v1/stub/GrpcInstancesStub.java +++ b/google-cloud-appengine-admin/src/main/java/com/google/appengine/v1/stub/GrpcInstancesStub.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.appengine.v1.DebugInstanceRequest; import com.google.appengine.v1.DeleteInstanceRequest; @@ -40,7 +39,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; @@ -147,52 +145,40 @@ protected GrpcInstancesStub( GrpcCallSettings.newBuilder() .setMethodDescriptor(listInstancesMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(ListInstancesRequest 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 getInstanceTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(getInstanceMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(GetInstanceRequest 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 deleteInstanceTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(deleteInstanceMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(DeleteInstanceRequest 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 debugInstanceTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(debugInstanceMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(DebugInstanceRequest 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(); @@ -272,7 +258,13 @@ public UnaryCallable debugInstanceCallable() { @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-appengine-admin/src/main/java/com/google/appengine/v1/stub/GrpcServicesStub.java b/google-cloud-appengine-admin/src/main/java/com/google/appengine/v1/stub/GrpcServicesStub.java index 6dac8486..c59d0af0 100644 --- a/google-cloud-appengine-admin/src/main/java/com/google/appengine/v1/stub/GrpcServicesStub.java +++ b/google-cloud-appengine-admin/src/main/java/com/google/appengine/v1/stub/GrpcServicesStub.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.appengine.v1.DeleteServiceRequest; import com.google.appengine.v1.GetServiceRequest; @@ -40,7 +39,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; @@ -144,52 +142,40 @@ protected GrpcServicesStub( GrpcCallSettings.newBuilder() .setMethodDescriptor(listServicesMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(ListServicesRequest 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 getServiceTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(getServiceMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(GetServiceRequest 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 updateServiceTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(updateServiceMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(UpdateServiceRequest 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 deleteServiceTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(deleteServiceMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(DeleteServiceRequest 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(); @@ -268,7 +254,13 @@ public UnaryCallable deleteServiceCallable() { @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-appengine-admin/src/main/java/com/google/appengine/v1/stub/GrpcVersionsStub.java b/google-cloud-appengine-admin/src/main/java/com/google/appengine/v1/stub/GrpcVersionsStub.java index c43d9928..876a08b8 100644 --- a/google-cloud-appengine-admin/src/main/java/com/google/appengine/v1/stub/GrpcVersionsStub.java +++ b/google-cloud-appengine-admin/src/main/java/com/google/appengine/v1/stub/GrpcVersionsStub.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.appengine.v1.CreateVersionMetadataV1; import com.google.appengine.v1.CreateVersionRequest; @@ -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; @@ -159,65 +157,50 @@ protected GrpcVersionsStub( GrpcCallSettings.newBuilder() .setMethodDescriptor(listVersionsMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(ListVersionsRequest 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 getVersionTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(getVersionMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(GetVersionRequest 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 createVersionTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(createVersionMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(CreateVersionRequest 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 updateVersionTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(updateVersionMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(UpdateVersionRequest 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 deleteVersionTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(deleteVersionMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(DeleteVersionRequest 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(); @@ -316,7 +299,13 @@ public UnaryCallable deleteVersionCallable() { @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-appengine-admin/src/main/java/com/google/appengine/v1/stub/InstancesStubSettings.java b/google-cloud-appengine-admin/src/main/java/com/google/appengine/v1/stub/InstancesStubSettings.java index ed979e60..835d67ac 100644 --- a/google-cloud-appengine-admin/src/main/java/com/google/appengine/v1/stub/InstancesStubSettings.java +++ b/google-cloud-appengine-admin/src/main/java/com/google/appengine/v1/stub/InstancesStubSettings.java @@ -448,14 +448,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-appengine-admin/src/main/java/com/google/appengine/v1/stub/ServicesStubSettings.java b/google-cloud-appengine-admin/src/main/java/com/google/appengine/v1/stub/ServicesStubSettings.java index f8a713a9..6b9943b8 100644 --- a/google-cloud-appengine-admin/src/main/java/com/google/appengine/v1/stub/ServicesStubSettings.java +++ b/google-cloud-appengine-admin/src/main/java/com/google/appengine/v1/stub/ServicesStubSettings.java @@ -447,14 +447,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-appengine-admin/src/main/java/com/google/appengine/v1/stub/VersionsStubSettings.java b/google-cloud-appengine-admin/src/main/java/com/google/appengine/v1/stub/VersionsStubSettings.java index d54a4fe6..a892a12f 100644 --- a/google-cloud-appengine-admin/src/main/java/com/google/appengine/v1/stub/VersionsStubSettings.java +++ b/google-cloud-appengine-admin/src/main/java/com/google/appengine/v1/stub/VersionsStubSettings.java @@ -504,14 +504,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-appengine-admin/src/test/java/com/google/appengine/v1/InstancesClientTest.java b/google-cloud-appengine-admin/src/test/java/com/google/appengine/v1/InstancesClientTest.java index ada4ede6..fc99e90b 100644 --- a/google-cloud-appengine-admin/src/test/java/com/google/appengine/v1/InstancesClientTest.java +++ b/google-cloud-appengine-admin/src/test/java/com/google/appengine/v1/InstancesClientTest.java @@ -144,7 +144,7 @@ public void listInstancesExceptionTest() throws Exception { public void getInstanceTest() throws Exception { Instance expectedResponse = Instance.newBuilder() - .setName(InstanceName.of("[APP]", "[SERVICE]", "[VERSION]", "[INSTANCE]").toString()) + .setName("name3373707") .setId("id3355") .setAppEngineRelease("appEngineRelease-1601369404") .setVmName("vmName-813643294") @@ -240,7 +240,7 @@ public void deleteInstanceExceptionTest() throws Exception { public void debugInstanceTest() throws Exception { Instance expectedResponse = Instance.newBuilder() - .setName(InstanceName.of("[APP]", "[SERVICE]", "[VERSION]", "[INSTANCE]").toString()) + .setName("name3373707") .setId("id3355") .setAppEngineRelease("appEngineRelease-1601369404") .setVmName("vmName-813643294") diff --git a/pom.xml b/pom.xml index e458d001..61484be2 100644 --- a/pom.xml +++ b/pom.xml @@ -14,7 +14,7 @@ com.google.cloud google-cloud-shared-config - 0.13.1 + 1.0.0 diff --git a/proto-google-cloud-appengine-admin-v1/clirr-ignored-differences.xml b/proto-google-cloud-appengine-admin-v1/clirr-ignored-differences.xml index ad53691e..c43f7b6c 100644 --- a/proto-google-cloud-appengine-admin-v1/clirr-ignored-differences.xml +++ b/proto-google-cloud-appengine-admin-v1/clirr-ignored-differences.xml @@ -30,4 +30,9 @@ com/google/appengine/v1/firewall/*OrBuilder boolean has*(*) + + 8001 + com/google/appengine/v1/Instance* + + diff --git a/proto-google-cloud-appengine-admin-v1/pom.xml b/proto-google-cloud-appengine-admin-v1/pom.xml index 1aa1b005..982958dc 100644 --- a/proto-google-cloud-appengine-admin-v1/pom.xml +++ b/proto-google-cloud-appengine-admin-v1/pom.xml @@ -21,14 +21,6 @@ com.google.api.grpc proto-google-common-protos - - com.google.api - api-common - - - com.google.guava - guava - diff --git a/proto-google-cloud-appengine-admin-v1/src/main/java/com/google/appengine/v1/InstanceName.java b/proto-google-cloud-appengine-admin-v1/src/main/java/com/google/appengine/v1/InstanceName.java deleted file mode 100644 index e9e2c782..00000000 --- a/proto-google-cloud-appengine-admin-v1/src/main/java/com/google/appengine/v1/InstanceName.java +++ /dev/null @@ -1,257 +0,0 @@ -/* - * Copyright 2021 Google LLC - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.google.appengine.v1; - -import com.google.api.pathtemplate.PathTemplate; -import com.google.api.resourcenames.ResourceName; -import com.google.common.base.Preconditions; -import com.google.common.collect.ImmutableMap; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; -import java.util.Objects; -import javax.annotation.Generated; - -// AUTO-GENERATED DOCUMENTATION AND CLASS. -@Generated("by gapic-generator-java") -public class InstanceName implements ResourceName { - private static final PathTemplate APP_SERVICE_VERSION_INSTANCE = - PathTemplate.createWithoutUrlEncoding( - "apps/{app}/services/{service}/versions/{version}/instances/{instance}"); - private volatile Map fieldValuesMap; - private final String app; - private final String service; - private final String version; - private final String instance; - - @Deprecated - protected InstanceName() { - app = null; - service = null; - version = null; - instance = null; - } - - private InstanceName(Builder builder) { - app = Preconditions.checkNotNull(builder.getApp()); - service = Preconditions.checkNotNull(builder.getService()); - version = Preconditions.checkNotNull(builder.getVersion()); - instance = Preconditions.checkNotNull(builder.getInstance()); - } - - public String getApp() { - return app; - } - - public String getService() { - return service; - } - - public String getVersion() { - return version; - } - - public String getInstance() { - return instance; - } - - public static Builder newBuilder() { - return new Builder(); - } - - public Builder toBuilder() { - return new Builder(this); - } - - public static InstanceName of(String app, String service, String version, String instance) { - return newBuilder() - .setApp(app) - .setService(service) - .setVersion(version) - .setInstance(instance) - .build(); - } - - public static String format(String app, String service, String version, String instance) { - return newBuilder() - .setApp(app) - .setService(service) - .setVersion(version) - .setInstance(instance) - .build() - .toString(); - } - - public static InstanceName parse(String formattedString) { - if (formattedString.isEmpty()) { - return null; - } - Map matchMap = - APP_SERVICE_VERSION_INSTANCE.validatedMatch( - formattedString, "InstanceName.parse: formattedString not in valid format"); - return of( - matchMap.get("app"), - matchMap.get("service"), - matchMap.get("version"), - matchMap.get("instance")); - } - - public static List parseList(List formattedStrings) { - List list = new ArrayList<>(formattedStrings.size()); - for (String formattedString : formattedStrings) { - list.add(parse(formattedString)); - } - return list; - } - - public static List toStringList(List values) { - List list = new ArrayList<>(values.size()); - for (InstanceName value : values) { - if (value == null) { - list.add(""); - } else { - list.add(value.toString()); - } - } - return list; - } - - public static boolean isParsableFrom(String formattedString) { - return APP_SERVICE_VERSION_INSTANCE.matches(formattedString); - } - - @Override - public Map getFieldValuesMap() { - if (fieldValuesMap == null) { - synchronized (this) { - if (fieldValuesMap == null) { - ImmutableMap.Builder fieldMapBuilder = ImmutableMap.builder(); - if (app != null) { - fieldMapBuilder.put("app", app); - } - if (service != null) { - fieldMapBuilder.put("service", service); - } - if (version != null) { - fieldMapBuilder.put("version", version); - } - if (instance != null) { - fieldMapBuilder.put("instance", instance); - } - fieldValuesMap = fieldMapBuilder.build(); - } - } - } - return fieldValuesMap; - } - - public String getFieldValue(String fieldName) { - return getFieldValuesMap().get(fieldName); - } - - @Override - public String toString() { - return APP_SERVICE_VERSION_INSTANCE.instantiate( - "app", app, "service", service, "version", version, "instance", instance); - } - - @Override - public boolean equals(Object o) { - if (o == this) { - return true; - } - if (o != null || getClass() == o.getClass()) { - InstanceName that = ((InstanceName) o); - return Objects.equals(this.app, that.app) - && Objects.equals(this.service, that.service) - && Objects.equals(this.version, that.version) - && Objects.equals(this.instance, that.instance); - } - return false; - } - - @Override - public int hashCode() { - int h = 1; - h *= 1000003; - h ^= Objects.hashCode(app); - h *= 1000003; - h ^= Objects.hashCode(service); - h *= 1000003; - h ^= Objects.hashCode(version); - h *= 1000003; - h ^= Objects.hashCode(instance); - return h; - } - - /** Builder for apps/{app}/services/{service}/versions/{version}/instances/{instance}. */ - public static class Builder { - private String app; - private String service; - private String version; - private String instance; - - protected Builder() {} - - public String getApp() { - return app; - } - - public String getService() { - return service; - } - - public String getVersion() { - return version; - } - - public String getInstance() { - return instance; - } - - public Builder setApp(String app) { - this.app = app; - return this; - } - - public Builder setService(String service) { - this.service = service; - return this; - } - - public Builder setVersion(String version) { - this.version = version; - return this; - } - - public Builder setInstance(String instance) { - this.instance = instance; - return this; - } - - private Builder(InstanceName instanceName) { - this.app = instanceName.app; - this.service = instanceName.service; - this.version = instanceName.version; - this.instance = instanceName.instance; - } - - public InstanceName build() { - return new InstanceName(this); - } - } -}