{@code
* try (DatabaseAdminClient databaseAdminClient = DatabaseAdminClient.create()) {
- * ResourceName resource =
- * CryptoKeyVersionName.of(
- * "[PROJECT]", "[LOCATION]", "[KEY_RING]", "[CRYPTO_KEY]", "[CRYPTO_KEY_VERSION]");
+ * ResourceName resource = BackupName.of("[PROJECT]", "[INSTANCE]", "[BACKUP]");
* Policy policy = Policy.newBuilder().build();
* Policy response = databaseAdminClient.setIamPolicy(resource, policy);
* }
@@ -1017,10 +1014,7 @@ public final Policy setIamPolicy(ResourceName resource, Policy policy) {
*
* {@code
* try (DatabaseAdminClient databaseAdminClient = DatabaseAdminClient.create()) {
- * String resource =
- * CryptoKeyVersionName.of(
- * "[PROJECT]", "[LOCATION]", "[KEY_RING]", "[CRYPTO_KEY]", "[CRYPTO_KEY_VERSION]")
- * .toString();
+ * String resource = BackupName.of("[PROJECT]", "[INSTANCE]", "[BACKUP]").toString();
* Policy policy = Policy.newBuilder().build();
* Policy response = databaseAdminClient.setIamPolicy(resource, policy);
* }
@@ -1054,14 +1048,7 @@ public final Policy setIamPolicy(String resource, Policy policy) {
* try (DatabaseAdminClient databaseAdminClient = DatabaseAdminClient.create()) {
* SetIamPolicyRequest request =
* SetIamPolicyRequest.newBuilder()
- * .setResource(
- * CryptoKeyVersionName.of(
- * "[PROJECT]",
- * "[LOCATION]",
- * "[KEY_RING]",
- * "[CRYPTO_KEY]",
- * "[CRYPTO_KEY_VERSION]")
- * .toString())
+ * .setResource(BackupName.of("[PROJECT]", "[INSTANCE]", "[BACKUP]").toString())
* .setPolicy(Policy.newBuilder().build())
* .build();
* Policy response = databaseAdminClient.setIamPolicy(request);
@@ -1090,14 +1077,7 @@ public final Policy setIamPolicy(SetIamPolicyRequest request) {
* try (DatabaseAdminClient databaseAdminClient = DatabaseAdminClient.create()) {
* SetIamPolicyRequest request =
* SetIamPolicyRequest.newBuilder()
- * .setResource(
- * CryptoKeyVersionName.of(
- * "[PROJECT]",
- * "[LOCATION]",
- * "[KEY_RING]",
- * "[CRYPTO_KEY]",
- * "[CRYPTO_KEY_VERSION]")
- * .toString())
+ * .setResource(BackupName.of("[PROJECT]", "[INSTANCE]", "[BACKUP]").toString())
* .setPolicy(Policy.newBuilder().build())
* .build();
* ApiFuture future = databaseAdminClient.setIamPolicyCallable().futureCall(request);
@@ -1124,9 +1104,7 @@ public final UnaryCallable setIamPolicyCallable() {
*
* {@code
* try (DatabaseAdminClient databaseAdminClient = DatabaseAdminClient.create()) {
- * ResourceName resource =
- * CryptoKeyVersionName.of(
- * "[PROJECT]", "[LOCATION]", "[KEY_RING]", "[CRYPTO_KEY]", "[CRYPTO_KEY_VERSION]");
+ * ResourceName resource = BackupName.of("[PROJECT]", "[INSTANCE]", "[BACKUP]");
* Policy response = databaseAdminClient.getIamPolicy(resource);
* }
* }
@@ -1157,10 +1135,7 @@ public final Policy getIamPolicy(ResourceName resource) {
*
* {@code
* try (DatabaseAdminClient databaseAdminClient = DatabaseAdminClient.create()) {
- * String resource =
- * CryptoKeyVersionName.of(
- * "[PROJECT]", "[LOCATION]", "[KEY_RING]", "[CRYPTO_KEY]", "[CRYPTO_KEY_VERSION]")
- * .toString();
+ * String resource = BackupName.of("[PROJECT]", "[INSTANCE]", "[BACKUP]").toString();
* Policy response = databaseAdminClient.getIamPolicy(resource);
* }
* }
@@ -1190,14 +1165,7 @@ public final Policy getIamPolicy(String resource) {
* try (DatabaseAdminClient databaseAdminClient = DatabaseAdminClient.create()) {
* GetIamPolicyRequest request =
* GetIamPolicyRequest.newBuilder()
- * .setResource(
- * CryptoKeyVersionName.of(
- * "[PROJECT]",
- * "[LOCATION]",
- * "[KEY_RING]",
- * "[CRYPTO_KEY]",
- * "[CRYPTO_KEY_VERSION]")
- * .toString())
+ * .setResource(BackupName.of("[PROJECT]", "[INSTANCE]", "[BACKUP]").toString())
* .setOptions(GetPolicyOptions.newBuilder().build())
* .build();
* Policy response = databaseAdminClient.getIamPolicy(request);
@@ -1227,14 +1195,7 @@ public final Policy getIamPolicy(GetIamPolicyRequest request) {
* try (DatabaseAdminClient databaseAdminClient = DatabaseAdminClient.create()) {
* GetIamPolicyRequest request =
* GetIamPolicyRequest.newBuilder()
- * .setResource(
- * CryptoKeyVersionName.of(
- * "[PROJECT]",
- * "[LOCATION]",
- * "[KEY_RING]",
- * "[CRYPTO_KEY]",
- * "[CRYPTO_KEY_VERSION]")
- * .toString())
+ * .setResource(BackupName.of("[PROJECT]", "[INSTANCE]", "[BACKUP]").toString())
* .setOptions(GetPolicyOptions.newBuilder().build())
* .build();
* ApiFuture future = databaseAdminClient.getIamPolicyCallable().futureCall(request);
@@ -1261,9 +1222,7 @@ public final UnaryCallable getIamPolicyCallable() {
*
* {@code
* try (DatabaseAdminClient databaseAdminClient = DatabaseAdminClient.create()) {
- * ResourceName resource =
- * CryptoKeyVersionName.of(
- * "[PROJECT]", "[LOCATION]", "[KEY_RING]", "[CRYPTO_KEY]", "[CRYPTO_KEY_VERSION]");
+ * ResourceName resource = BackupName.of("[PROJECT]", "[INSTANCE]", "[BACKUP]");
* List permissions = new ArrayList<>();
* TestIamPermissionsResponse response =
* databaseAdminClient.testIamPermissions(resource, permissions);
@@ -1301,10 +1260,7 @@ public final TestIamPermissionsResponse testIamPermissions(
*
* {@code
* try (DatabaseAdminClient databaseAdminClient = DatabaseAdminClient.create()) {
- * String resource =
- * CryptoKeyVersionName.of(
- * "[PROJECT]", "[LOCATION]", "[KEY_RING]", "[CRYPTO_KEY]", "[CRYPTO_KEY_VERSION]")
- * .toString();
+ * String resource = BackupName.of("[PROJECT]", "[INSTANCE]", "[BACKUP]").toString();
* List permissions = new ArrayList<>();
* TestIamPermissionsResponse response =
* databaseAdminClient.testIamPermissions(resource, permissions);
@@ -1344,14 +1300,7 @@ public final TestIamPermissionsResponse testIamPermissions(
* try (DatabaseAdminClient databaseAdminClient = DatabaseAdminClient.create()) {
* TestIamPermissionsRequest request =
* TestIamPermissionsRequest.newBuilder()
- * .setResource(
- * CryptoKeyVersionName.of(
- * "[PROJECT]",
- * "[LOCATION]",
- * "[KEY_RING]",
- * "[CRYPTO_KEY]",
- * "[CRYPTO_KEY_VERSION]")
- * .toString())
+ * .setResource(BackupName.of("[PROJECT]", "[INSTANCE]", "[BACKUP]").toString())
* .addAllPermissions(new ArrayList())
* .build();
* TestIamPermissionsResponse response = databaseAdminClient.testIamPermissions(request);
@@ -1381,14 +1330,7 @@ public final TestIamPermissionsResponse testIamPermissions(TestIamPermissionsReq
* try (DatabaseAdminClient databaseAdminClient = DatabaseAdminClient.create()) {
* TestIamPermissionsRequest request =
* TestIamPermissionsRequest.newBuilder()
- * .setResource(
- * CryptoKeyVersionName.of(
- * "[PROJECT]",
- * "[LOCATION]",
- * "[KEY_RING]",
- * "[CRYPTO_KEY]",
- * "[CRYPTO_KEY_VERSION]")
- * .toString())
+ * .setResource(BackupName.of("[PROJECT]", "[INSTANCE]", "[BACKUP]").toString())
* .addAllPermissions(new ArrayList())
* .build();
* ApiFuture future =
@@ -2722,12 +2664,7 @@ public static ApiFuture createAsync(
ListDatabasesPage.createEmptyPage().createPageAsync(context, futureResponse);
return ApiFutures.transform(
futurePage,
- new ApiFunction() {
- @Override
- public ListDatabasesPagedResponse apply(ListDatabasesPage input) {
- return new ListDatabasesPagedResponse(input);
- }
- },
+ input -> new ListDatabasesPagedResponse(input),
MoreExecutors.directExecutor());
}
@@ -2802,14 +2739,7 @@ public static ApiFuture createAsync(
ApiFuture futurePage =
ListBackupsPage.createEmptyPage().createPageAsync(context, futureResponse);
return ApiFutures.transform(
- futurePage,
- new ApiFunction() {
- @Override
- public ListBackupsPagedResponse apply(ListBackupsPage input) {
- return new ListBackupsPagedResponse(input);
- }
- },
- MoreExecutors.directExecutor());
+ futurePage, input -> new ListBackupsPagedResponse(input), MoreExecutors.directExecutor());
}
private ListBackupsPagedResponse(ListBackupsPage page) {
@@ -2884,12 +2814,7 @@ public static ApiFuture createAsync(
ListDatabaseOperationsPage.createEmptyPage().createPageAsync(context, futureResponse);
return ApiFutures.transform(
futurePage,
- new ApiFunction() {
- @Override
- public ListDatabaseOperationsPagedResponse apply(ListDatabaseOperationsPage input) {
- return new ListDatabaseOperationsPagedResponse(input);
- }
- },
+ input -> new ListDatabaseOperationsPagedResponse(input),
MoreExecutors.directExecutor());
}
@@ -2972,12 +2897,7 @@ public static ApiFuture createAsync(
ListBackupOperationsPage.createEmptyPage().createPageAsync(context, futureResponse);
return ApiFutures.transform(
futurePage,
- new ApiFunction() {
- @Override
- public ListBackupOperationsPagedResponse apply(ListBackupOperationsPage input) {
- return new ListBackupOperationsPagedResponse(input);
- }
- },
+ input -> new ListBackupOperationsPagedResponse(input),
MoreExecutors.directExecutor());
}
diff --git a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/admin/database/v1/DatabaseAdminSettings.java b/google-cloud-spanner/src/main/java/com/google/cloud/spanner/admin/database/v1/DatabaseAdminSettings.java
index e73aaf466dd..358be3bde42 100644
--- a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/admin/database/v1/DatabaseAdminSettings.java
+++ b/google-cloud-spanner/src/main/java/com/google/cloud/spanner/admin/database/v1/DatabaseAdminSettings.java
@@ -309,14 +309,13 @@ public DatabaseAdminStubSettings.Builder getStubSettingsBuilder() {
return ((DatabaseAdminStubSettings.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-spanner/src/main/java/com/google/cloud/spanner/admin/database/v1/stub/DatabaseAdminStubSettings.java b/google-cloud-spanner/src/main/java/com/google/cloud/spanner/admin/database/v1/stub/DatabaseAdminStubSettings.java
index d66f4af1c04..d1dbb494594 100644
--- a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/admin/database/v1/stub/DatabaseAdminStubSettings.java
+++ b/google-cloud-spanner/src/main/java/com/google/cloud/spanner/admin/database/v1/stub/DatabaseAdminStubSettings.java
@@ -1036,14 +1036,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-spanner/src/main/java/com/google/cloud/spanner/admin/database/v1/stub/GrpcDatabaseAdminStub.java b/google-cloud-spanner/src/main/java/com/google/cloud/spanner/admin/database/v1/stub/GrpcDatabaseAdminStub.java
index 27fa17e6184..46cdccdbbcc 100644
--- a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/admin/database/v1/stub/GrpcDatabaseAdminStub.java
+++ b/google-cloud-spanner/src/main/java/com/google/cloud/spanner/admin/database/v1/stub/GrpcDatabaseAdminStub.java
@@ -27,7 +27,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.common.collect.ImmutableMap;
import com.google.iam.v1.GetIamPolicyRequest;
@@ -66,7 +65,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;
@@ -326,65 +324,50 @@ protected GrpcDatabaseAdminStub(
GrpcCallSettings.newBuilder()
.setMethodDescriptor(listDatabasesMethodDescriptor)
.setParamsExtractor(
- new RequestParamsExtractor() {
- @Override
- public Map extract(ListDatabasesRequest 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 createDatabaseTransportSettings =
GrpcCallSettings.newBuilder()
.setMethodDescriptor(createDatabaseMethodDescriptor)
.setParamsExtractor(
- new RequestParamsExtractor() {
- @Override
- public Map extract(CreateDatabaseRequest 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 getDatabaseTransportSettings =
GrpcCallSettings.newBuilder()
.setMethodDescriptor(getDatabaseMethodDescriptor)
.setParamsExtractor(
- new RequestParamsExtractor() {
- @Override
- public Map extract(GetDatabaseRequest 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 updateDatabaseDdlTransportSettings =
GrpcCallSettings.newBuilder()
.setMethodDescriptor(updateDatabaseDdlMethodDescriptor)
.setParamsExtractor(
- new RequestParamsExtractor() {
- @Override
- public Map extract(UpdateDatabaseDdlRequest request) {
- ImmutableMap.Builder params = ImmutableMap.builder();
- params.put("database", String.valueOf(request.getDatabase()));
- return params.build();
- }
+ request -> {
+ ImmutableMap.Builder params = ImmutableMap.builder();
+ params.put("database", String.valueOf(request.getDatabase()));
+ return params.build();
})
.build();
GrpcCallSettings dropDatabaseTransportSettings =
GrpcCallSettings.newBuilder()
.setMethodDescriptor(dropDatabaseMethodDescriptor)
.setParamsExtractor(
- new RequestParamsExtractor() {
- @Override
- public Map extract(DropDatabaseRequest request) {
- ImmutableMap.Builder params = ImmutableMap.builder();
- params.put("database", String.valueOf(request.getDatabase()));
- return params.build();
- }
+ request -> {
+ ImmutableMap.Builder params = ImmutableMap.builder();
+ params.put("database", String.valueOf(request.getDatabase()));
+ return params.build();
})
.build();
GrpcCallSettings
@@ -392,39 +375,30 @@ public Map extract(DropDatabaseRequest request) {
GrpcCallSettings.newBuilder()
.setMethodDescriptor(getDatabaseDdlMethodDescriptor)
.setParamsExtractor(
- new RequestParamsExtractor() {
- @Override
- public Map extract(GetDatabaseDdlRequest request) {
- ImmutableMap.Builder params = ImmutableMap.builder();
- params.put("database", String.valueOf(request.getDatabase()));
- return params.build();
- }
+ request -> {
+ ImmutableMap.Builder params = ImmutableMap.builder();
+ params.put("database", String.valueOf(request.getDatabase()));
+ return params.build();
})
.build();
GrpcCallSettings setIamPolicyTransportSettings =
GrpcCallSettings.newBuilder()
.setMethodDescriptor(setIamPolicyMethodDescriptor)
.setParamsExtractor(
- new RequestParamsExtractor() {
- @Override
- public Map extract(SetIamPolicyRequest request) {
- ImmutableMap.Builder params = ImmutableMap.builder();
- params.put("resource", String.valueOf(request.getResource()));
- return params.build();
- }
+ request -> {
+ ImmutableMap.Builder params = ImmutableMap.builder();
+ params.put("resource", String.valueOf(request.getResource()));
+ return params.build();
})
.build();
GrpcCallSettings getIamPolicyTransportSettings =
GrpcCallSettings.newBuilder()
.setMethodDescriptor(getIamPolicyMethodDescriptor)
.setParamsExtractor(
- new RequestParamsExtractor() {
- @Override
- public Map extract(GetIamPolicyRequest request) {
- ImmutableMap.Builder params = ImmutableMap.builder();
- params.put("resource", String.valueOf(request.getResource()));
- return params.build();
- }
+ request -> {
+ ImmutableMap.Builder params = ImmutableMap.builder();
+ params.put("resource", String.valueOf(request.getResource()));
+ return params.build();
})
.build();
GrpcCallSettings
@@ -432,91 +406,70 @@ public Map extract(GetIamPolicyRequest request) {
GrpcCallSettings.newBuilder()
.setMethodDescriptor(testIamPermissionsMethodDescriptor)
.setParamsExtractor(
- new RequestParamsExtractor() {
- @Override
- public Map extract(TestIamPermissionsRequest request) {
- ImmutableMap.Builder params = ImmutableMap.builder();
- params.put("resource", String.valueOf(request.getResource()));
- return params.build();
- }
+ request -> {
+ ImmutableMap.Builder params = ImmutableMap.builder();
+ params.put("resource", String.valueOf(request.getResource()));
+ return params.build();
})
.build();
GrpcCallSettings createBackupTransportSettings =
GrpcCallSettings.newBuilder()
.setMethodDescriptor(createBackupMethodDescriptor)
.setParamsExtractor(
- new RequestParamsExtractor() {
- @Override
- public Map extract(CreateBackupRequest 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 getBackupTransportSettings =
GrpcCallSettings.newBuilder()
.setMethodDescriptor(getBackupMethodDescriptor)
.setParamsExtractor(
- new RequestParamsExtractor() {
- @Override
- public Map extract(GetBackupRequest 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 updateBackupTransportSettings =
GrpcCallSettings.newBuilder()
.setMethodDescriptor(updateBackupMethodDescriptor)
.setParamsExtractor(
- new RequestParamsExtractor() {
- @Override
- public Map extract(UpdateBackupRequest request) {
- ImmutableMap.Builder params = ImmutableMap.builder();
- params.put("backup.name", String.valueOf(request.getBackup().getName()));
- return params.build();
- }
+ request -> {
+ ImmutableMap.Builder params = ImmutableMap.builder();
+ params.put("backup.name", String.valueOf(request.getBackup().getName()));
+ return params.build();
})
.build();
GrpcCallSettings deleteBackupTransportSettings =
GrpcCallSettings.newBuilder()
.setMethodDescriptor(deleteBackupMethodDescriptor)
.setParamsExtractor(
- new RequestParamsExtractor() {
- @Override
- public Map extract(DeleteBackupRequest 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 listBackupsTransportSettings =
GrpcCallSettings.newBuilder()
.setMethodDescriptor(listBackupsMethodDescriptor)
.setParamsExtractor(
- new RequestParamsExtractor() {
- @Override
- public Map extract(ListBackupsRequest 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 restoreDatabaseTransportSettings =
GrpcCallSettings.newBuilder()
.setMethodDescriptor(restoreDatabaseMethodDescriptor)
.setParamsExtractor(
- new RequestParamsExtractor() {
- @Override
- public Map extract(RestoreDatabaseRequest 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
@@ -525,13 +478,10 @@ public Map extract(RestoreDatabaseRequest request) {
.newBuilder()
.setMethodDescriptor(listDatabaseOperationsMethodDescriptor)
.setParamsExtractor(
- new RequestParamsExtractor() {
- @Override
- public Map extract(ListDatabaseOperationsRequest 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
@@ -539,13 +489,10 @@ public Map extract(ListDatabaseOperationsRequest request) {
GrpcCallSettings.newBuilder()
.setMethodDescriptor(listBackupOperationsMethodDescriptor)
.setParamsExtractor(
- new RequestParamsExtractor() {
- @Override
- public Map extract(ListBackupOperationsRequest 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();
@@ -794,7 +741,13 @@ public UnaryCallable restoreDatabaseCallable(
@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-spanner/src/main/java/com/google/cloud/spanner/admin/instance/v1/InstanceAdminClient.java b/google-cloud-spanner/src/main/java/com/google/cloud/spanner/admin/instance/v1/InstanceAdminClient.java
index 689e861638f..745c9229431 100644
--- a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/admin/instance/v1/InstanceAdminClient.java
+++ b/google-cloud-spanner/src/main/java/com/google/cloud/spanner/admin/instance/v1/InstanceAdminClient.java
@@ -16,7 +16,6 @@
package com.google.cloud.spanner.admin.instance.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;
@@ -1720,12 +1719,7 @@ public static ApiFuture createAsync(
ListInstanceConfigsPage.createEmptyPage().createPageAsync(context, futureResponse);
return ApiFutures.transform(
futurePage,
- new ApiFunction() {
- @Override
- public ListInstanceConfigsPagedResponse apply(ListInstanceConfigsPage input) {
- return new ListInstanceConfigsPagedResponse(input);
- }
- },
+ input -> new ListInstanceConfigsPagedResponse(input),
MoreExecutors.directExecutor());
}
@@ -1808,12 +1802,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-spanner/src/main/java/com/google/cloud/spanner/admin/instance/v1/InstanceAdminSettings.java b/google-cloud-spanner/src/main/java/com/google/cloud/spanner/admin/instance/v1/InstanceAdminSettings.java
index 4e6ab7ea356..13cce892bec 100644
--- a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/admin/instance/v1/InstanceAdminSettings.java
+++ b/google-cloud-spanner/src/main/java/com/google/cloud/spanner/admin/instance/v1/InstanceAdminSettings.java
@@ -241,14 +241,13 @@ public InstanceAdminStubSettings.Builder getStubSettingsBuilder() {
return ((InstanceAdminStubSettings.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-spanner/src/main/java/com/google/cloud/spanner/admin/instance/v1/stub/GrpcInstanceAdminStub.java b/google-cloud-spanner/src/main/java/com/google/cloud/spanner/admin/instance/v1/stub/GrpcInstanceAdminStub.java
index d22c2f3caeb..1f6a7cb6b73 100644
--- a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/admin/instance/v1/stub/GrpcInstanceAdminStub.java
+++ b/google-cloud-spanner/src/main/java/com/google/cloud/spanner/admin/instance/v1/stub/GrpcInstanceAdminStub.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.common.collect.ImmutableMap;
import com.google.iam.v1.GetIamPolicyRequest;
@@ -52,7 +51,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;
@@ -231,117 +229,90 @@ protected GrpcInstanceAdminStub(
GrpcCallSettings.newBuilder()
.setMethodDescriptor(listInstanceConfigsMethodDescriptor)
.setParamsExtractor(
- new RequestParamsExtractor() {
- @Override
- public Map extract(ListInstanceConfigsRequest 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 getInstanceConfigTransportSettings =
GrpcCallSettings.newBuilder()
.setMethodDescriptor(getInstanceConfigMethodDescriptor)
.setParamsExtractor(
- new RequestParamsExtractor() {
- @Override
- public Map extract(GetInstanceConfigRequest 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 listInstancesTransportSettings =
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 createInstanceTransportSettings =
GrpcCallSettings.newBuilder()
.setMethodDescriptor(createInstanceMethodDescriptor)
.setParamsExtractor(
- new RequestParamsExtractor() {
- @Override
- public Map extract(CreateInstanceRequest 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 updateInstanceTransportSettings =
GrpcCallSettings.newBuilder()
.setMethodDescriptor(updateInstanceMethodDescriptor)
.setParamsExtractor(
- new RequestParamsExtractor() {
- @Override
- public Map extract(UpdateInstanceRequest request) {
- ImmutableMap.Builder params = ImmutableMap.builder();
- params.put("instance.name", String.valueOf(request.getInstance().getName()));
- return params.build();
- }
+ request -> {
+ ImmutableMap.Builder params = ImmutableMap.builder();
+ params.put("instance.name", String.valueOf(request.getInstance().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 setIamPolicyTransportSettings =
GrpcCallSettings.newBuilder()
.setMethodDescriptor(setIamPolicyMethodDescriptor)
.setParamsExtractor(
- new RequestParamsExtractor() {
- @Override
- public Map extract(SetIamPolicyRequest request) {
- ImmutableMap.Builder params = ImmutableMap.builder();
- params.put("resource", String.valueOf(request.getResource()));
- return params.build();
- }
+ request -> {
+ ImmutableMap.Builder params = ImmutableMap.builder();
+ params.put("resource", String.valueOf(request.getResource()));
+ return params.build();
})
.build();
GrpcCallSettings getIamPolicyTransportSettings =
GrpcCallSettings.newBuilder()
.setMethodDescriptor(getIamPolicyMethodDescriptor)
.setParamsExtractor(
- new RequestParamsExtractor() {
- @Override
- public Map extract(GetIamPolicyRequest request) {
- ImmutableMap.Builder params = ImmutableMap.builder();
- params.put("resource", String.valueOf(request.getResource()));
- return params.build();
- }
+ request -> {
+ ImmutableMap.Builder params = ImmutableMap.builder();
+ params.put("resource", String.valueOf(request.getResource()));
+ return params.build();
})
.build();
GrpcCallSettings
@@ -349,13 +320,10 @@ public Map extract(GetIamPolicyRequest request) {
GrpcCallSettings.newBuilder()
.setMethodDescriptor(testIamPermissionsMethodDescriptor)
.setParamsExtractor(
- new RequestParamsExtractor() {
- @Override
- public Map extract(TestIamPermissionsRequest request) {
- ImmutableMap.Builder params = ImmutableMap.builder();
- params.put("resource", String.valueOf(request.getResource()));
- return params.build();
- }
+ request -> {
+ ImmutableMap.Builder params = ImmutableMap.builder();
+ params.put("resource", String.valueOf(request.getResource()));
+ return params.build();
})
.build();
@@ -502,7 +470,13 @@ public UnaryCallable getIamPolicyCallable() {
@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-spanner/src/main/java/com/google/cloud/spanner/admin/instance/v1/stub/InstanceAdminStubSettings.java b/google-cloud-spanner/src/main/java/com/google/cloud/spanner/admin/instance/v1/stub/InstanceAdminStubSettings.java
index 1329194af92..556fa9a1b12 100644
--- a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/admin/instance/v1/stub/InstanceAdminStubSettings.java
+++ b/google-cloud-spanner/src/main/java/com/google/cloud/spanner/admin/instance/v1/stub/InstanceAdminStubSettings.java
@@ -683,14 +683,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-spanner/src/main/java/com/google/cloud/spanner/spi/v1/GapicSpannerRpc.java b/google-cloud-spanner/src/main/java/com/google/cloud/spanner/spi/v1/GapicSpannerRpc.java
index 0f97898a40a..4558559faa2 100644
--- a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/spi/v1/GapicSpannerRpc.java
+++ b/google-cloud-spanner/src/main/java/com/google/cloud/spanner/spi/v1/GapicSpannerRpc.java
@@ -343,7 +343,7 @@ public GapicSpannerRpc(final SpannerOptions options) {
new ManagedInstantiatingExecutorProvider(
new ThreadFactoryBuilder()
.setDaemon(true)
- .setNameFormat("Cloud-Spanner-TransportChannel-%d")
+ .setNameFormat(options.getTransportChannelExecutorThreadNameFormat())
.build());
// First check if SpannerOptions provides a TransportChannelProvider. Create one
// with information gathered from SpannerOptions if none is provided
diff --git a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/v1/SpannerClient.java b/google-cloud-spanner/src/main/java/com/google/cloud/spanner/v1/SpannerClient.java
index 6c592e17ac6..f9ea725bb4d 100644
--- a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/v1/SpannerClient.java
+++ b/google-cloud-spanner/src/main/java/com/google/cloud/spanner/v1/SpannerClient.java
@@ -16,7 +16,6 @@
package com.google.cloud.spanner.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;
@@ -1792,12 +1791,7 @@ public static ApiFuture createAsync(
ListSessionsPage.createEmptyPage().createPageAsync(context, futureResponse);
return ApiFutures.transform(
futurePage,
- new ApiFunction() {
- @Override
- public ListSessionsPagedResponse apply(ListSessionsPage input) {
- return new ListSessionsPagedResponse(input);
- }
- },
+ input -> new ListSessionsPagedResponse(input),
MoreExecutors.directExecutor());
}
diff --git a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/v1/SpannerSettings.java b/google-cloud-spanner/src/main/java/com/google/cloud/spanner/v1/SpannerSettings.java
index 08f20695888..7954ce7fd63 100644
--- a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/v1/SpannerSettings.java
+++ b/google-cloud-spanner/src/main/java/com/google/cloud/spanner/v1/SpannerSettings.java
@@ -255,14 +255,13 @@ public SpannerStubSettings.Builder getStubSettingsBuilder() {
return ((SpannerStubSettings.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-spanner/src/main/java/com/google/cloud/spanner/v1/stub/GrpcSpannerStub.java b/google-cloud-spanner/src/main/java/com/google/cloud/spanner/v1/stub/GrpcSpannerStub.java
index 2ee4e8d4981..5983a3a9c59 100644
--- a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/v1/stub/GrpcSpannerStub.java
+++ b/google-cloud-spanner/src/main/java/com/google/cloud/spanner/v1/stub/GrpcSpannerStub.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.ServerStreamingCallable;
import com.google.api.gax.rpc.UnaryCallable;
import com.google.common.collect.ImmutableMap;
@@ -54,7 +53,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;
@@ -268,13 +266,10 @@ protected GrpcSpannerStub(
GrpcCallSettings.newBuilder()
.setMethodDescriptor(createSessionMethodDescriptor)
.setParamsExtractor(
- new RequestParamsExtractor() {
- @Override
- public Map extract(CreateSessionRequest request) {
- ImmutableMap.Builder params = ImmutableMap.builder();
- params.put("database", String.valueOf(request.getDatabase()));
- return params.build();
- }
+ request -> {
+ ImmutableMap.Builder params = ImmutableMap.builder();
+ params.put("database", String.valueOf(request.getDatabase()));
+ return params.build();
})
.build();
GrpcCallSettings
@@ -282,78 +277,60 @@ public Map extract(CreateSessionRequest request) {
GrpcCallSettings.newBuilder()
.setMethodDescriptor(batchCreateSessionsMethodDescriptor)
.setParamsExtractor(
- new RequestParamsExtractor() {
- @Override
- public Map extract(BatchCreateSessionsRequest request) {
- ImmutableMap.Builder params = ImmutableMap.builder();
- params.put("database", String.valueOf(request.getDatabase()));
- return params.build();
- }
+ request -> {
+ ImmutableMap.Builder params = ImmutableMap.builder();
+ params.put("database", String.valueOf(request.getDatabase()));
+ return params.build();
})
.build();
GrpcCallSettings getSessionTransportSettings =
GrpcCallSettings.newBuilder()
.setMethodDescriptor(getSessionMethodDescriptor)
.setParamsExtractor(
- new RequestParamsExtractor() {
- @Override
- public Map extract(GetSessionRequest 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 listSessionsTransportSettings =
GrpcCallSettings.newBuilder()
.setMethodDescriptor(listSessionsMethodDescriptor)
.setParamsExtractor(
- new RequestParamsExtractor() {
- @Override
- public Map extract(ListSessionsRequest request) {
- ImmutableMap.Builder params = ImmutableMap.builder();
- params.put("database", String.valueOf(request.getDatabase()));
- return params.build();
- }
+ request -> {
+ ImmutableMap.Builder params = ImmutableMap.builder();
+ params.put("database", String.valueOf(request.getDatabase()));
+ return params.build();
})
.build();
GrpcCallSettings deleteSessionTransportSettings =
GrpcCallSettings.newBuilder()
.setMethodDescriptor(deleteSessionMethodDescriptor)
.setParamsExtractor(
- new RequestParamsExtractor() {
- @Override
- public Map extract(DeleteSessionRequest 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 executeSqlTransportSettings =
GrpcCallSettings.newBuilder()
.setMethodDescriptor(executeSqlMethodDescriptor)
.setParamsExtractor(
- new RequestParamsExtractor() {
- @Override
- public Map extract(ExecuteSqlRequest request) {
- ImmutableMap.Builder params = ImmutableMap.builder();
- params.put("session", String.valueOf(request.getSession()));
- return params.build();
- }
+ request -> {
+ ImmutableMap.Builder params = ImmutableMap.builder();
+ params.put("session", String.valueOf(request.getSession()));
+ return params.build();
})
.build();
GrpcCallSettings executeStreamingSqlTransportSettings =
GrpcCallSettings.newBuilder()
.setMethodDescriptor(executeStreamingSqlMethodDescriptor)
.setParamsExtractor(
- new RequestParamsExtractor() {
- @Override
- public Map extract(ExecuteSqlRequest request) {
- ImmutableMap.Builder