@@ -16,7 +16,6 @@
 
 package com.google.cloud.spanner.admin.database.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;
@@ -980,7 +979,7 @@ public final GetDatabaseDdlResponse getDatabaseDdl(GetDatabaseDdlRequest request
 *
 * <pre>{@code
 * try (DatabaseAdminClient databaseAdminClient = DatabaseAdminClient.create()) {
-* ResourceName resource = DatabaseName.of("[PROJECT]", "[INSTANCE]", "[DATABASE]");
+* ResourceName resource = BackupName.of("[PROJECT]", "[INSTANCE]", "[BACKUP]");
 * Policy policy = Policy.newBuilder().build();
 * Policy response = databaseAdminClient.setIamPolicy(resource, policy);
 * }
@@ -1015,7 +1014,7 @@ public final Policy setIamPolicy(ResourceName resource, Policy policy) {
 *
 * <pre>{@code
 * try (DatabaseAdminClient databaseAdminClient = DatabaseAdminClient.create()) {
-* String resource = DatabaseName.of("[PROJECT]", "[INSTANCE]", "[DATABASE]").toString();
+* String resource = BackupName.of("[PROJECT]", "[INSTANCE]", "[BACKUP]").toString();
 * Policy policy = Policy.newBuilder().build();
 * Policy response = databaseAdminClient.setIamPolicy(resource, policy);
 * }
@@ -1049,7 +1048,7 @@ public final Policy setIamPolicy(String resource, Policy policy) {
 * try (DatabaseAdminClient databaseAdminClient = DatabaseAdminClient.create()) {
 * SetIamPolicyRequest request =
 * SetIamPolicyRequest.newBuilder()
-* .setResource(DatabaseName.of("[PROJECT]", "[INSTANCE]", "[DATABASE]").toString())
+* .setResource(BackupName.of("[PROJECT]", "[INSTANCE]", "[BACKUP]").toString())
 * .setPolicy(Policy.newBuilder().build())
 * .build();
 * Policy response = databaseAdminClient.setIamPolicy(request);
@@ -1078,7 +1077,7 @@ public final Policy setIamPolicy(SetIamPolicyRequest request) {
 * try (DatabaseAdminClient databaseAdminClient = DatabaseAdminClient.create()) {
 * SetIamPolicyRequest request =
 * SetIamPolicyRequest.newBuilder()
-* .setResource(DatabaseName.of("[PROJECT]", "[INSTANCE]", "[DATABASE]").toString())
+* .setResource(BackupName.of("[PROJECT]", "[INSTANCE]", "[BACKUP]").toString())
 * .setPolicy(Policy.newBuilder().build())
 * .build();
 * ApiFuture<Policy> future = databaseAdminClient.setIamPolicyCallable().futureCall(request);
@@ -1105,7 +1104,7 @@ public final UnaryCallable<SetIamPolicyRequest, Policy> setIamPolicyCallable() {
 *
 * <pre>{@code
 * try (DatabaseAdminClient databaseAdminClient = DatabaseAdminClient.create()) {
-* ResourceName resource = DatabaseName.of("[PROJECT]", "[INSTANCE]", "[DATABASE]");
+* ResourceName resource = BackupName.of("[PROJECT]", "[INSTANCE]", "[BACKUP]");
 * Policy response = databaseAdminClient.getIamPolicy(resource);
 * }
 * }</pre>
@@ -1136,7 +1135,7 @@ public final Policy getIamPolicy(ResourceName resource) {
 *
 * <pre>{@code
 * try (DatabaseAdminClient databaseAdminClient = DatabaseAdminClient.create()) {
-* String resource = DatabaseName.of("[PROJECT]", "[INSTANCE]", "[DATABASE]").toString();
+* String resource = BackupName.of("[PROJECT]", "[INSTANCE]", "[BACKUP]").toString();
 * Policy response = databaseAdminClient.getIamPolicy(resource);
 * }
 * }</pre>
@@ -1166,7 +1165,7 @@ public final Policy getIamPolicy(String resource) {
 * try (DatabaseAdminClient databaseAdminClient = DatabaseAdminClient.create()) {
 * GetIamPolicyRequest request =
 * GetIamPolicyRequest.newBuilder()
-* .setResource(DatabaseName.of("[PROJECT]", "[INSTANCE]", "[DATABASE]").toString())
+* .setResource(BackupName.of("[PROJECT]", "[INSTANCE]", "[BACKUP]").toString())
 * .setOptions(GetPolicyOptions.newBuilder().build())
 * .build();
 * Policy response = databaseAdminClient.getIamPolicy(request);
@@ -1196,7 +1195,7 @@ public final Policy getIamPolicy(GetIamPolicyRequest request) {
 * try (DatabaseAdminClient databaseAdminClient = DatabaseAdminClient.create()) {
 * GetIamPolicyRequest request =
 * GetIamPolicyRequest.newBuilder()
-* .setResource(DatabaseName.of("[PROJECT]", "[INSTANCE]", "[DATABASE]").toString())
+* .setResource(BackupName.of("[PROJECT]", "[INSTANCE]", "[BACKUP]").toString())
 * .setOptions(GetPolicyOptions.newBuilder().build())
 * .build();
 * ApiFuture<Policy> future = databaseAdminClient.getIamPolicyCallable().futureCall(request);
@@ -1223,7 +1222,7 @@ public final UnaryCallable<GetIamPolicyRequest, Policy> getIamPolicyCallable() {
 *
 * <pre>{@code
 * try (DatabaseAdminClient databaseAdminClient = DatabaseAdminClient.create()) {
-* ResourceName resource = DatabaseName.of("[PROJECT]", "[INSTANCE]", "[DATABASE]");
+* ResourceName resource = BackupName.of("[PROJECT]", "[INSTANCE]", "[BACKUP]");
 * List<String> permissions = new ArrayList<>();
 * TestIamPermissionsResponse response =
 * databaseAdminClient.testIamPermissions(resource, permissions);
@@ -1261,7 +1260,7 @@ public final TestIamPermissionsResponse testIamPermissions(
 *
 * <pre>{@code
 * try (DatabaseAdminClient databaseAdminClient = DatabaseAdminClient.create()) {
-* String resource = DatabaseName.of("[PROJECT]", "[INSTANCE]", "[DATABASE]").toString();
+* String resource = BackupName.of("[PROJECT]", "[INSTANCE]", "[BACKUP]").toString();
 * List<String> permissions = new ArrayList<>();
 * TestIamPermissionsResponse response =
 * databaseAdminClient.testIamPermissions(resource, permissions);
@@ -1301,7 +1300,7 @@ public final TestIamPermissionsResponse testIamPermissions(
 * try (DatabaseAdminClient databaseAdminClient = DatabaseAdminClient.create()) {
 * TestIamPermissionsRequest request =
 * TestIamPermissionsRequest.newBuilder()
-* .setResource(DatabaseName.of("[PROJECT]", "[INSTANCE]", "[DATABASE]").toString())
+* .setResource(BackupName.of("[PROJECT]", "[INSTANCE]", "[BACKUP]").toString())
 * .addAllPermissions(new ArrayList<String>())
 * .build();
 * TestIamPermissionsResponse response = databaseAdminClient.testIamPermissions(request);
@@ -1331,7 +1330,7 @@ public final TestIamPermissionsResponse testIamPermissions(TestIamPermissionsReq
 * try (DatabaseAdminClient databaseAdminClient = DatabaseAdminClient.create()) {
 * TestIamPermissionsRequest request =
 * TestIamPermissionsRequest.newBuilder()
-* .setResource(DatabaseName.of("[PROJECT]", "[INSTANCE]", "[DATABASE]").toString())
+* .setResource(BackupName.of("[PROJECT]", "[INSTANCE]", "[BACKUP]").toString())
 * .addAllPermissions(new ArrayList<String>())
 * .build();
 * ApiFuture<TestIamPermissionsResponse> future =
@@ -2665,12 +2664,7 @@ public static ApiFuture<ListDatabasesPagedResponse> createAsync(
 ListDatabasesPage.createEmptyPage().createPageAsync(context, futureResponse);
 return ApiFutures.transform(
 futurePage,
-new ApiFunction<ListDatabasesPage, ListDatabasesPagedResponse>() {
-@Override
-public ListDatabasesPagedResponse apply(ListDatabasesPage input) {
-return new ListDatabasesPagedResponse(input);
-}
-},
+input -> new ListDatabasesPagedResponse(input),
 MoreExecutors.directExecutor());
 }
 
@@ -2745,14 +2739,7 @@ public static ApiFuture<ListBackupsPagedResponse> createAsync(
 ApiFuture<ListBackupsPage> futurePage =
 ListBackupsPage.createEmptyPage().createPageAsync(context, futureResponse);
 return ApiFutures.transform(
-futurePage,
-new ApiFunction<ListBackupsPage, ListBackupsPagedResponse>() {
-@Override
-public ListBackupsPagedResponse apply(ListBackupsPage input) {
-return new ListBackupsPagedResponse(input);
-}
-},
-MoreExecutors.directExecutor());
+futurePage, input -> new ListBackupsPagedResponse(input), MoreExecutors.directExecutor());
 }
 
 private ListBackupsPagedResponse(ListBackupsPage page) {
@@ -2827,12 +2814,7 @@ public static ApiFuture<ListDatabaseOperationsPagedResponse> createAsync(
 ListDatabaseOperationsPage.createEmptyPage().createPageAsync(context, futureResponse);
 return ApiFutures.transform(
 futurePage,
-new ApiFunction<ListDatabaseOperationsPage, ListDatabaseOperationsPagedResponse>() {
-@Override
-public ListDatabaseOperationsPagedResponse apply(ListDatabaseOperationsPage input) {
-return new ListDatabaseOperationsPagedResponse(input);
-}
-},
+input -> new ListDatabaseOperationsPagedResponse(input),
 MoreExecutors.directExecutor());
 }
 
@@ -2915,12 +2897,7 @@ public static ApiFuture<ListBackupOperationsPagedResponse> createAsync(
 ListBackupOperationsPage.createEmptyPage().createPageAsync(context, futureResponse);
 return ApiFutures.transform(
 futurePage,
-new ApiFunction<ListBackupOperationsPage, ListBackupOperationsPagedResponse>() {
-@Override
-public ListBackupOperationsPagedResponse apply(ListBackupOperationsPage input) {
-return new ListBackupOperationsPagedResponse(input);
-}
-},
+input -> new ListBackupOperationsPagedResponse(input),
 MoreExecutors.directExecutor());
 }
 

@@ -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.
 *
 * <p>Note: This method does not support applying settings to methods.
 */
 public Builder applyToAllUnaryMethods(
-ApiFunction<UnaryCallSettings.Builder<?, ?>, Void> settingsUpdater) throws Exception {
+ApiFunction<UnaryCallSettings.Builder<?, ?>, Void> settingsUpdater) {
 super.applyToAllUnaryMethods(
 getStubSettingsBuilder().unaryMethodSettingsBuilders(), settingsUpdater);
 return this;

@@ -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.
 *
 * <p>Note: This method does not support applying settings to methods.
 */
 public Builder applyToAllUnaryMethods(
-ApiFunction<UnaryCallSettings.Builder<?, ?>, Void> settingsUpdater) throws Exception {
+ApiFunction<UnaryCallSettings.Builder<?, ?>, Void> settingsUpdater) {
 super.applyToAllUnaryMethods(unaryMethodSettingsBuilders, settingsUpdater);
 return this;
 }