@@ -5,14 +5,15 @@
 * 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
+* 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.cloud.spanner.admin.database.v1;
 
 import static com.google.cloud.spanner.admin.database.v1.DatabaseAdminClient.ListBackupOperationsPagedResponse;
@@ -69,7 +70,7 @@
 import java.util.List;
 import javax.annotation.Generated;
 
-// AUTO-GENERATED DOCUMENTATION AND CLASS
+// AUTO-GENERATED DOCUMENTATION AND CLASS.
 /**
 * Settings class to configure an instance of {@link DatabaseAdminClient}.
 *
@@ -86,86 +87,56 @@
 *
 * <p>For example, to set the total timeout of getDatabase to 30 seconds:
 *
-* <pre>
-* <code>
-* DatabaseAdminSettings.Builder databaseAdminSettingsBuilder =
-* DatabaseAdminSettings.newBuilder();
+* <pre>{@code
+* DatabaseAdminSettings.Builder databaseAdminSettingsBuilder = DatabaseAdminSettings.newBuilder();
 * databaseAdminSettingsBuilder
 * .getDatabaseSettings()
 * .setRetrySettings(
-* databaseAdminSettingsBuilder.getDatabaseSettings().getRetrySettings().toBuilder()
+* databaseAdminSettingsBuilder
+* .getDatabaseSettings()
+* .getRetrySettings()
+* .toBuilder()
 * .setTotalTimeout(Duration.ofSeconds(30))
 * .build());
 * DatabaseAdminSettings databaseAdminSettings = databaseAdminSettingsBuilder.build();
-* </code>
-* </pre>
+* }</pre>
 */
-@Generated("by gapic-generator")
-@BetaApi
+@Generated("by gapic-generator-java")
 public class DatabaseAdminSettings extends ClientSettings<DatabaseAdminSettings> {
+
+/** Returns the object with the settings used for calls to listDatabases. */
+public PagedCallSettings<ListDatabasesRequest, ListDatabasesResponse, ListDatabasesPagedResponse>
+listDatabasesSettings() {
+return ((DatabaseAdminStubSettings) getStubSettings()).listDatabasesSettings();
+}
+
 /** Returns the object with the settings used for calls to createDatabase. */
 public UnaryCallSettings<CreateDatabaseRequest, Operation> createDatabaseSettings() {
 return ((DatabaseAdminStubSettings) getStubSettings()).createDatabaseSettings();
 }
 
 /** Returns the object with the settings used for calls to createDatabase. */
-@BetaApi(
-"The surface for long-running operations is not stable yet and may change in the future.")
 public OperationCallSettings<CreateDatabaseRequest, Database, CreateDatabaseMetadata>
 createDatabaseOperationSettings() {
 return ((DatabaseAdminStubSettings) getStubSettings()).createDatabaseOperationSettings();
 }
 
+/** Returns the object with the settings used for calls to getDatabase. */
+public UnaryCallSettings<GetDatabaseRequest, Database> getDatabaseSettings() {
+return ((DatabaseAdminStubSettings) getStubSettings()).getDatabaseSettings();
+}
+
 /** Returns the object with the settings used for calls to updateDatabaseDdl. */
 public UnaryCallSettings<UpdateDatabaseDdlRequest, Operation> updateDatabaseDdlSettings() {
 return ((DatabaseAdminStubSettings) getStubSettings()).updateDatabaseDdlSettings();
 }
 
 /** Returns the object with the settings used for calls to updateDatabaseDdl. */
-@BetaApi(
-"The surface for long-running operations is not stable yet and may change in the future.")
 public OperationCallSettings<UpdateDatabaseDdlRequest, Empty, UpdateDatabaseDdlMetadata>
 updateDatabaseDdlOperationSettings() {
 return ((DatabaseAdminStubSettings) getStubSettings()).updateDatabaseDdlOperationSettings();
 }
 
-/** Returns the object with the settings used for calls to createBackup. */
-public UnaryCallSettings<CreateBackupRequest, Operation> createBackupSettings() {
-return ((DatabaseAdminStubSettings) getStubSettings()).createBackupSettings();
-}
-
-/** Returns the object with the settings used for calls to createBackup. */
-@BetaApi(
-"The surface for long-running operations is not stable yet and may change in the future.")
-public OperationCallSettings<CreateBackupRequest, Backup, CreateBackupMetadata>
-createBackupOperationSettings() {
-return ((DatabaseAdminStubSettings) getStubSettings()).createBackupOperationSettings();
-}
-
-/** Returns the object with the settings used for calls to restoreDatabase. */
-public UnaryCallSettings<RestoreDatabaseRequest, Operation> restoreDatabaseSettings() {
-return ((DatabaseAdminStubSettings) getStubSettings()).restoreDatabaseSettings();
-}
-
-/** Returns the object with the settings used for calls to restoreDatabase. */
-@BetaApi(
-"The surface for long-running operations is not stable yet and may change in the future.")
-public OperationCallSettings<RestoreDatabaseRequest, Database, RestoreDatabaseMetadata>
-restoreDatabaseOperationSettings() {
-return ((DatabaseAdminStubSettings) getStubSettings()).restoreDatabaseOperationSettings();
-}
-
-/** Returns the object with the settings used for calls to listDatabases. */
-public PagedCallSettings<ListDatabasesRequest, ListDatabasesResponse, ListDatabasesPagedResponse>
-listDatabasesSettings() {
-return ((DatabaseAdminStubSettings) getStubSettings()).listDatabasesSettings();
-}
-
-/** Returns the object with the settings used for calls to getDatabase. */
-public UnaryCallSettings<GetDatabaseRequest, Database> getDatabaseSettings() {
-return ((DatabaseAdminStubSettings) getStubSettings()).getDatabaseSettings();
-}
-
 /** Returns the object with the settings used for calls to dropDatabase. */
 public UnaryCallSettings<DropDatabaseRequest, Empty> dropDatabaseSettings() {
 return ((DatabaseAdminStubSettings) getStubSettings()).dropDatabaseSettings();
@@ -192,6 +163,17 @@ public UnaryCallSettings<GetIamPolicyRequest, Policy> getIamPolicySettings() {
 return ((DatabaseAdminStubSettings) getStubSettings()).testIamPermissionsSettings();
 }
 
+/** Returns the object with the settings used for calls to createBackup. */
+public UnaryCallSettings<CreateBackupRequest, Operation> createBackupSettings() {
+return ((DatabaseAdminStubSettings) getStubSettings()).createBackupSettings();
+}
+
+/** Returns the object with the settings used for calls to createBackup. */
+public OperationCallSettings<CreateBackupRequest, Backup, CreateBackupMetadata>
+createBackupOperationSettings() {
+return ((DatabaseAdminStubSettings) getStubSettings()).createBackupOperationSettings();
+}
+
 /** Returns the object with the settings used for calls to getBackup. */
 public UnaryCallSettings<GetBackupRequest, Backup> getBackupSettings() {
 return ((DatabaseAdminStubSettings) getStubSettings()).getBackupSettings();
@@ -213,6 +195,17 @@ public UnaryCallSettings<DeleteBackupRequest, Empty> deleteBackupSettings() {
 return ((DatabaseAdminStubSettings) getStubSettings()).listBackupsSettings();
 }
 
+/** Returns the object with the settings used for calls to restoreDatabase. */
+public UnaryCallSettings<RestoreDatabaseRequest, Operation> restoreDatabaseSettings() {
+return ((DatabaseAdminStubSettings) getStubSettings()).restoreDatabaseSettings();
+}
+
+/** Returns the object with the settings used for calls to restoreDatabase. */
+public OperationCallSettings<RestoreDatabaseRequest, Database, RestoreDatabaseMetadata>
+restoreDatabaseOperationSettings() {
+return ((DatabaseAdminStubSettings) getStubSettings()).restoreDatabaseOperationSettings();
+}
+
 /** Returns the object with the settings used for calls to listDatabaseOperations. */
 public PagedCallSettings<
 ListDatabaseOperationsRequest,
@@ -291,18 +284,15 @@ protected DatabaseAdminSettings(Builder settingsBuilder) throws IOException {
 
 /** Builder for DatabaseAdminSettings. */
 public static class Builder extends ClientSettings.Builder<DatabaseAdminSettings, Builder> {
+
 protected Builder() throws IOException {
-this((ClientContext) null);
+this(((ClientContext) null));
 }
 
 protected Builder(ClientContext clientContext) {
 super(DatabaseAdminStubSettings.newBuilder(clientContext));
 }
 
-private static Builder createDefault() {
-return new Builder(DatabaseAdminStubSettings.newBuilder());
-}
-
 protected Builder(DatabaseAdminSettings settings) {
 super(settings.getStubSettings().toBuilder());
 }
@@ -311,11 +301,15 @@ protected Builder(DatabaseAdminStubSettings.Builder stubSettings) {
 super(stubSettings);
 }
 
+private static Builder createDefault() {
+return new Builder(DatabaseAdminStubSettings.newBuilder());
+}
+
 public DatabaseAdminStubSettings.Builder getStubSettingsBuilder() {
 return ((DatabaseAdminStubSettings.Builder) getStubSettings());
 }
 
-// NEXT_MAJOR_VER: remove 'throws Exception'
+// NEXT_MAJOR_VER: remove 'throws Exception'.
 /**
 * Applies the given settings updater function to all of the unary API methods in this service.
 *
@@ -328,71 +322,41 @@ public Builder applyToAllUnaryMethods(
 return this;
 }
 
+/** Returns the builder for the settings used for calls to listDatabases. */
+public PagedCallSettings.Builder<
+ListDatabasesRequest, ListDatabasesResponse, ListDatabasesPagedResponse>
+listDatabasesSettings() {
+return getStubSettingsBuilder().listDatabasesSettings();
+}
+
 /** Returns the builder for the settings used for calls to createDatabase. */
 public UnaryCallSettings.Builder<CreateDatabaseRequest, Operation> createDatabaseSettings() {
 return getStubSettingsBuilder().createDatabaseSettings();
 }
 
 /** Returns the builder for the settings used for calls to createDatabase. */
-@BetaApi(
-"The surface for long-running operations is not stable yet and may change in the future.")
 public OperationCallSettings.Builder<CreateDatabaseRequest, Database, CreateDatabaseMetadata>
 createDatabaseOperationSettings() {
 return getStubSettingsBuilder().createDatabaseOperationSettings();
 }
 
+/** Returns the builder for the settings used for calls to getDatabase. */
+public UnaryCallSettings.Builder<GetDatabaseRequest, Database> getDatabaseSettings() {
+return getStubSettingsBuilder().getDatabaseSettings();
+}
+
 /** Returns the builder for the settings used for calls to updateDatabaseDdl. */
 public UnaryCallSettings.Builder<UpdateDatabaseDdlRequest, Operation>
 updateDatabaseDdlSettings() {
 return getStubSettingsBuilder().updateDatabaseDdlSettings();
 }
 
 /** Returns the builder for the settings used for calls to updateDatabaseDdl. */
-@BetaApi(
-"The surface for long-running operations is not stable yet and may change in the future.")
 public OperationCallSettings.Builder<UpdateDatabaseDdlRequest, Empty, UpdateDatabaseDdlMetadata>
 updateDatabaseDdlOperationSettings() {
 return getStubSettingsBuilder().updateDatabaseDdlOperationSettings();
 }
 
-/** Returns the builder for the settings used for calls to createBackup. */
-public UnaryCallSettings.Builder<CreateBackupRequest, Operation> createBackupSettings() {
-return getStubSettingsBuilder().createBackupSettings();
-}
-
-/** Returns the builder for the settings used for calls to createBackup. */
-@BetaApi(
-"The surface for long-running operations is not stable yet and may change in the future.")
-public OperationCallSettings.Builder<CreateBackupRequest, Backup, CreateBackupMetadata>
-createBackupOperationSettings() {
-return getStubSettingsBuilder().createBackupOperationSettings();
-}
-
-/** Returns the builder for the settings used for calls to restoreDatabase. */
-public UnaryCallSettings.Builder<RestoreDatabaseRequest, Operation> restoreDatabaseSettings() {
-return getStubSettingsBuilder().restoreDatabaseSettings();
-}
-
-/** Returns the builder for the settings used for calls to restoreDatabase. */
-@BetaApi(
-"The surface for long-running operations is not stable yet and may change in the future.")
-public OperationCallSettings.Builder<RestoreDatabaseRequest, Database, RestoreDatabaseMetadata>
-restoreDatabaseOperationSettings() {
-return getStubSettingsBuilder().restoreDatabaseOperationSettings();
-}
-
-/** Returns the builder for the settings used for calls to listDatabases. */
-public PagedCallSettings.Builder<
-ListDatabasesRequest, ListDatabasesResponse, ListDatabasesPagedResponse>
-listDatabasesSettings() {
-return getStubSettingsBuilder().listDatabasesSettings();
-}
-
-/** Returns the builder for the settings used for calls to getDatabase. */
-public UnaryCallSettings.Builder<GetDatabaseRequest, Database> getDatabaseSettings() {
-return getStubSettingsBuilder().getDatabaseSettings();
-}
-
 /** Returns the builder for the settings used for calls to dropDatabase. */
 public UnaryCallSettings.Builder<DropDatabaseRequest, Empty> dropDatabaseSettings() {
 return getStubSettingsBuilder().dropDatabaseSettings();
@@ -420,6 +384,17 @@ public UnaryCallSettings.Builder<GetIamPolicyRequest, Policy> getIamPolicySettin
 return getStubSettingsBuilder().testIamPermissionsSettings();
 }
 
+/** Returns the builder for the settings used for calls to createBackup. */
+public UnaryCallSettings.Builder<CreateBackupRequest, Operation> createBackupSettings() {
+return getStubSettingsBuilder().createBackupSettings();
+}
+
+/** Returns the builder for the settings used for calls to createBackup. */
+public OperationCallSettings.Builder<CreateBackupRequest, Backup, CreateBackupMetadata>
+createBackupOperationSettings() {
+return getStubSettingsBuilder().createBackupOperationSettings();
+}
+
 /** Returns the builder for the settings used for calls to getBackup. */
 public UnaryCallSettings.Builder<GetBackupRequest, Backup> getBackupSettings() {
 return getStubSettingsBuilder().getBackupSettings();
@@ -442,6 +417,17 @@ public UnaryCallSettings.Builder<DeleteBackupRequest, Empty> deleteBackupSetting
 return getStubSettingsBuilder().listBackupsSettings();
 }
 
+/** Returns the builder for the settings used for calls to restoreDatabase. */
+public UnaryCallSettings.Builder<RestoreDatabaseRequest, Operation> restoreDatabaseSettings() {
+return getStubSettingsBuilder().restoreDatabaseSettings();
+}
+
+/** Returns the builder for the settings used for calls to restoreDatabase. */
+public OperationCallSettings.Builder<RestoreDatabaseRequest, Database, RestoreDatabaseMetadata>
+restoreDatabaseOperationSettings() {
+return getStubSettingsBuilder().restoreDatabaseOperationSettings();
+}
+
 /** Returns the builder for the settings used for calls to listDatabaseOperations. */
 public PagedCallSettings.Builder<
 ListDatabaseOperationsRequest,

@@ -5,7 +5,7 @@
 * 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
+* 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,
@@ -15,11 +15,9 @@
 */
 
 /**
-* A client to Cloud Spanner Database Admin API.
+* The interfaces provided are listed below, along with usage samples.
 *
-* <p>The interfaces provided are listed below, along with usage samples.
-*
-* <p>=================== DatabaseAdminClient ===================
+* <p>======================= DatabaseAdminClient =======================
 *
 * <p>Service Description: Cloud Spanner Database Admin API
 *
@@ -28,17 +26,8 @@
 * list backups for a database and to restore from an existing backup.
 *
 * <p>Sample for DatabaseAdminClient:
-*
-* <pre>
-* <code>
-* try (DatabaseAdminClient databaseAdminClient = DatabaseAdminClient.create()) {
-* DatabaseName name = DatabaseName.of("[PROJECT]", "[INSTANCE]", "[DATABASE]");
-* Database response = databaseAdminClient.getDatabase(name);
-* }
-* </code>
-* </pre>
 */
-@Generated("by gapic-generator")
+@Generated("by gapic-generator-java")
 package com.google.cloud.spanner.admin.database.v1;
 
 import javax.annotation.Generated;