Bigtable: clean up the public surface

google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/BaseBigtableInstanceAdminClient.java

@@ -19,6 +19,7 @@
 import com.google.api.core.ApiFuture;
 import com.google.api.core.ApiFutures;
 import com.google.api.core.BetaApi;
+import com.google.api.core.InternalApi;
 import com.google.api.gax.core.BackgroundResource;
 import com.google.api.gax.longrunning.OperationFuture;
 import com.google.api.gax.paging.AbstractFixedSizeCollection;
@@ -75,76 +76,9 @@
 import javax.annotation.Generated;
 
 // AUTO-GENERATED DOCUMENTATION AND SERVICE
-/**
- * Service Description: Service for creating, configuring, and deleting Cloud Bigtable Instances and
- * Clusters. Provides access to the Instance and Cluster schemas only, not the tables' metadata or
- * data stored in those tables.
- *
- * <p>This class provides the ability to make remote calls to the backing service through method
- * calls that map to API methods. Sample code to get started:
- *
- * <pre>
- * <code>
- * try (BaseBigtableInstanceAdminClient baseBigtableInstanceAdminClient = BaseBigtableInstanceAdminClient.create()) {
- *   InstanceName name = InstanceName.of("[PROJECT]", "[INSTANCE]");
- *   Instance response = baseBigtableInstanceAdminClient.getInstance(name);
- * }
- * </code>
- * </pre>
- *
- * <p>Note: close() needs to be called on the baseBigtableInstanceAdminClient object to clean up
- * resources such as threads. In the example above, try-with-resources is used, which automatically
- * calls close().
- *
- * <p>The surface of this class includes several types of Java methods for each of the API's
- * methods:
- *
- * <ol>
- *   <li>A "flattened" method. With this type of method, the fields of the request type have been
- *       converted into function parameters. It may be the case that not all fields are available as
- *       parameters, and not every API method will have a flattened method entry point.
- *   <li>A "request object" method. This type of method only takes one parameter, a request object,
- *       which must be constructed before the call. Not every API method will have a request object
- *       method.
- *   <li>A "callable" method. This type of method takes no parameters and returns an immutable API
- *       callable object, which can be used to initiate calls to the service.
- * </ol>
- *
- * <p>See the individual methods for example code.
- *
- * <p>Many parameters require resource names to be formatted in a particular way. To assist with
- * these names, this class includes a format method for each type of name, and additionally a parse
- * method to extract the individual identifiers contained within names that are returned.
- *
- * <p>This class can be customized by passing in a custom instance of
- * BaseBigtableInstanceAdminSettings to create(). For example:
- *
- * <p>To customize credentials:
- *
- * <pre>
- * <code>
- * BaseBigtableInstanceAdminSettings baseBigtableInstanceAdminSettings =
- *     BaseBigtableInstanceAdminSettings.newBuilder()
- *         .setCredentialsProvider(FixedCredentialsProvider.create(myCredentials))
- *         .build();
- * BaseBigtableInstanceAdminClient baseBigtableInstanceAdminClient =
- *     BaseBigtableInstanceAdminClient.create(baseBigtableInstanceAdminSettings);
- * </code>
- * </pre>
- *
- * To customize the endpoint:
- *
- * <pre>
- * <code>
- * BaseBigtableInstanceAdminSettings baseBigtableInstanceAdminSettings =
- *     BaseBigtableInstanceAdminSettings.newBuilder().setEndpoint(myEndpoint).build();
- * BaseBigtableInstanceAdminClient baseBigtableInstanceAdminClient =
- *     BaseBigtableInstanceAdminClient.create(baseBigtableInstanceAdminSettings);
- * </code>
- * </pre>
- */
+/** For internal use only. */
 @Generated("by gapic-generator")
-@BetaApi
+@InternalApi
 public class BaseBigtableInstanceAdminClient implements BackgroundResource {
   private final BaseBigtableInstanceAdminSettings settings;
   private final BigtableInstanceAdminStub stub;

google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/BaseBigtableInstanceAdminSettings.java

@@ -19,6 +19,7 @@
 
 import com.google.api.core.ApiFunction;
 import com.google.api.core.BetaApi;
+import com.google.api.core.InternalApi;
 import com.google.api.gax.core.GoogleCredentialsProvider;
 import com.google.api.gax.core.InstantiatingExecutorProvider;
 import com.google.api.gax.grpc.InstantiatingGrpcChannelProvider;
@@ -67,33 +68,9 @@
 import javax.annotation.Generated;
 
 // AUTO-GENERATED DOCUMENTATION AND CLASS
-/**
- * Settings class to configure an instance of {@link BaseBigtableInstanceAdminClient}.
- *
- * <p>The default instance has everything set to sensible defaults:
- *
- * <ul>
- *   <li>The default service address (bigtableadmin.googleapis.com) and default port (443) are used.
- *   <li>Credentials are acquired automatically through Application Default Credentials.
- *   <li>Retries are configured for idempotent methods but not for non-idempotent methods.
- * </ul>
- *
- * <p>The builder of this class is recursive, so contained classes are themselves builders. When
- * build() is called, the tree of builders is called to create the complete settings object. For
- * example, to set the total timeout of getInstance to 30 seconds:
- *
- * <pre>
- * <code>
- * BaseBigtableInstanceAdminSettings.Builder baseBigtableInstanceAdminSettingsBuilder =
- *     BaseBigtableInstanceAdminSettings.newBuilder();
- * baseBigtableInstanceAdminSettingsBuilder.getInstanceSettings().getRetrySettings().toBuilder()
- *     .setTotalTimeout(Duration.ofSeconds(30));
- * BaseBigtableInstanceAdminSettings baseBigtableInstanceAdminSettings = baseBigtableInstanceAdminSettingsBuilder.build();
- * </code>
- * </pre>
- */
+/** For internal use only. */
 @Generated("by gapic-generator")
-@BetaApi
+@InternalApi
 public class BaseBigtableInstanceAdminSettings
     extends ClientSettings<BaseBigtableInstanceAdminSettings> {
   /** Returns the object with the settings used for calls to createInstance. */

google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/BaseBigtableTableAdminClient.java

@@ -19,6 +19,7 @@
 import com.google.api.core.ApiFuture;
 import com.google.api.core.ApiFutures;
 import com.google.api.core.BetaApi;
+import com.google.api.core.InternalApi;
 import com.google.api.gax.core.BackgroundResource;
 import com.google.api.gax.longrunning.OperationFuture;
 import com.google.api.gax.paging.AbstractFixedSizeCollection;
@@ -64,78 +65,9 @@
 import javax.annotation.Generated;
 
 // AUTO-GENERATED DOCUMENTATION AND SERVICE
-/**
- * Service Description: Service for creating, configuring, and deleting Cloud Bigtable tables.
- *
- * <p>Provides access to the table schemas only, not the data stored within the tables.
- *
- * <p>This class provides the ability to make remote calls to the backing service through method
- * calls that map to API methods. Sample code to get started:
- *
- * <pre>
- * <code>
- * try (BaseBigtableTableAdminClient baseBigtableTableAdminClient = BaseBigtableTableAdminClient.create()) {
- *   InstanceName parent = InstanceName.of("[PROJECT]", "[INSTANCE]");
- *   String tableId = "";
- *   Table table = Table.newBuilder().build();
- *   Table response = baseBigtableTableAdminClient.createTable(parent, tableId, table);
- * }
- * </code>
- * </pre>
- *
- * <p>Note: close() needs to be called on the baseBigtableTableAdminClient object to clean up
- * resources such as threads. In the example above, try-with-resources is used, which automatically
- * calls close().
- *
- * <p>The surface of this class includes several types of Java methods for each of the API's
- * methods:
- *
- * <ol>
- *   <li>A "flattened" method. With this type of method, the fields of the request type have been
- *       converted into function parameters. It may be the case that not all fields are available as
- *       parameters, and not every API method will have a flattened method entry point.
- *   <li>A "request object" method. This type of method only takes one parameter, a request object,
- *       which must be constructed before the call. Not every API method will have a request object
- *       method.
- *   <li>A "callable" method. This type of method takes no parameters and returns an immutable API
- *       callable object, which can be used to initiate calls to the service.
- * </ol>
- *
- * <p>See the individual methods for example code.
- *
- * <p>Many parameters require resource names to be formatted in a particular way. To assist with
- * these names, this class includes a format method for each type of name, and additionally a parse
- * method to extract the individual identifiers contained within names that are returned.
- *
- * <p>This class can be customized by passing in a custom instance of BaseBigtableTableAdminSettings
- * to create(). For example:
- *
- * <p>To customize credentials:
- *
- * <pre>
- * <code>
- * BaseBigtableTableAdminSettings baseBigtableTableAdminSettings =
- *     BaseBigtableTableAdminSettings.newBuilder()
- *         .setCredentialsProvider(FixedCredentialsProvider.create(myCredentials))
- *         .build();
- * BaseBigtableTableAdminClient baseBigtableTableAdminClient =
- *     BaseBigtableTableAdminClient.create(baseBigtableTableAdminSettings);
- * </code>
- * </pre>
- *
- * To customize the endpoint:
- *
- * <pre>
- * <code>
- * BaseBigtableTableAdminSettings baseBigtableTableAdminSettings =
- *     BaseBigtableTableAdminSettings.newBuilder().setEndpoint(myEndpoint).build();
- * BaseBigtableTableAdminClient baseBigtableTableAdminClient =
- *     BaseBigtableTableAdminClient.create(baseBigtableTableAdminSettings);
- * </code>
- * </pre>
- */
+/** For internal use only. */
 @Generated("by gapic-generator")
-@BetaApi
+@InternalApi
 public class BaseBigtableTableAdminClient implements BackgroundResource {
   private final BaseBigtableTableAdminSettings settings;
   private final BigtableTableAdminStub stub;

google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/BaseBigtableTableAdminSettings.java

@@ -20,6 +20,7 @@
 
 import com.google.api.core.ApiFunction;
 import com.google.api.core.BetaApi;
+import com.google.api.core.InternalApi;
 import com.google.api.gax.core.GoogleCredentialsProvider;
 import com.google.api.gax.core.InstantiatingExecutorProvider;
 import com.google.api.gax.grpc.InstantiatingGrpcChannelProvider;
@@ -59,33 +60,9 @@
 import javax.annotation.Generated;
 
 // AUTO-GENERATED DOCUMENTATION AND CLASS
-/**
- * Settings class to configure an instance of {@link BaseBigtableTableAdminClient}.
- *
- * <p>The default instance has everything set to sensible defaults:
- *
- * <ul>
- *   <li>The default service address (bigtableadmin.googleapis.com) and default port (443) are used.
- *   <li>Credentials are acquired automatically through Application Default Credentials.
- *   <li>Retries are configured for idempotent methods but not for non-idempotent methods.
- * </ul>
- *
- * <p>The builder of this class is recursive, so contained classes are themselves builders. When
- * build() is called, the tree of builders is called to create the complete settings object. For
- * example, to set the total timeout of createTable to 30 seconds:
- *
- * <pre>
- * <code>
- * BaseBigtableTableAdminSettings.Builder baseBigtableTableAdminSettingsBuilder =
- *     BaseBigtableTableAdminSettings.newBuilder();
- * baseBigtableTableAdminSettingsBuilder.createTableSettings().getRetrySettings().toBuilder()
- *     .setTotalTimeout(Duration.ofSeconds(30));
- * BaseBigtableTableAdminSettings baseBigtableTableAdminSettings = baseBigtableTableAdminSettingsBuilder.build();
- * </code>
- * </pre>
- */
+/** For internal use only. */
 @Generated("by gapic-generator")
-@BetaApi
+@InternalApi
 public class BaseBigtableTableAdminSettings extends ClientSettings<BaseBigtableTableAdminSettings> {
   /** Returns the object with the settings used for calls to createTable. */
   public UnaryCallSettings<CreateTableRequest, Table> createTableSettings() {

google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/package-info.java

@@ -15,45 +15,11 @@
  */
 
 /**
- * A client to Cloud Bigtable Admin API.
+ * Clients for the Cloud Bigtable admin API.
  *
- * <p>The interfaces provided are listed below, along with usage samples.
+ * <p>These APIs allow callers to create and manage Cloud Bigtable resources.
  *
- * <p>=============================== BaseBigtableInstanceAdminClient
- * ===============================
- *
- * <p>Service Description: Service for creating, configuring, and deleting Cloud Bigtable Instances
- * and Clusters. Provides access to the Instance and Cluster schemas only, not the tables' metadata
- * or data stored in those tables.
- *
- * <p>Sample for BaseBigtableInstanceAdminClient:
- *
- * <pre>
- * <code>
- * try (BaseBigtableInstanceAdminClient baseBigtableInstanceAdminClient = BaseBigtableInstanceAdminClient.create()) {
- *   InstanceName name = InstanceName.of("[PROJECT]", "[INSTANCE]");
- *   Instance response = baseBigtableInstanceAdminClient.getInstance(name);
- * }
- * </code>
- * </pre>
- *
- * ============================ BaseBigtableTableAdminClient ============================
- *
- * <p>Service Description: Service for creating, configuring, and deleting Cloud Bigtable tables.
- *
- * <p>Provides access to the table schemas only, not the data stored within the tables.
- *
- * <p>Sample for BaseBigtableTableAdminClient:
- *
- * <pre>
- * <code>
- * try (BaseBigtableTableAdminClient baseBigtableTableAdminClient = BaseBigtableTableAdminClient.create()) {
- *   InstanceName parent = InstanceName.of("[PROJECT]", "[INSTANCE]");
- *   String tableId = "";
- *   Table table = Table.newBuilder().build();
- *   Table response = baseBigtableTableAdminClient.createTable(parent, tableId, table);
- * }
- * </code>
- * </pre>
+ * @see com.google.cloud.bigtable.admin.v2.BigtableInstanceAdminClient for instance level API.
+ * @see com.google.cloud.bigtable.admin.v2.BigtableTableAdminClient for table level API.
  */
 package com.google.cloud.bigtable.admin.v2;

google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/stub/BigtableInstanceAdminStub.java

@@ -18,6 +18,7 @@
 import static com.google.cloud.bigtable.admin.v2.BaseBigtableInstanceAdminClient.ListAppProfilesPagedResponse;
 
 import com.google.api.core.BetaApi;
+import com.google.api.core.InternalApi;
 import com.google.api.gax.core.BackgroundResource;
 import com.google.api.gax.rpc.OperationCallable;
 import com.google.api.gax.rpc.UnaryCallable;
@@ -57,13 +58,9 @@
 import javax.annotation.Generated;
 
 // AUTO-GENERATED DOCUMENTATION AND CLASS
-/**
- * Base stub class for Cloud Bigtable Admin API.
- *
- * <p>This class is for advanced usage and reflects the underlying API directly.
- */
+/** For internal use only. */
 @Generated("by gapic-generator")
-@BetaApi("A restructuring of stub classes is planned, so this may break in the future")
+@InternalApi
 public abstract class BigtableInstanceAdminStub implements BackgroundResource {
 
   @BetaApi("The surface for use by generated code is not stable yet and may change in the future.")

google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/stub/BigtableTableAdminStub.java

@@ -19,6 +19,7 @@
 import static com.google.cloud.bigtable.admin.v2.BaseBigtableTableAdminClient.ListTablesPagedResponse;
 
 import com.google.api.core.BetaApi;
+import com.google.api.core.InternalApi;
 import com.google.api.gax.core.BackgroundResource;
 import com.google.api.gax.rpc.OperationCallable;
 import com.google.api.gax.rpc.UnaryCallable;
@@ -49,13 +50,9 @@
 import javax.annotation.Generated;
 
 // AUTO-GENERATED DOCUMENTATION AND CLASS
-/**
- * Base stub class for Cloud Bigtable Admin API.
- *
- * <p>This class is for advanced usage and reflects the underlying API directly.
- */
+/** For internal use only. */
 @Generated("by gapic-generator")
-@BetaApi("A restructuring of stub classes is planned, so this may break in the future")
+@InternalApi
 public abstract class BigtableTableAdminStub implements BackgroundResource {
 
   @BetaApi("The surface for use by generated code is not stable yet and may change in the future.")

google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/stub/GrpcBigtableInstanceAdminCallableFactory.java

@@ -16,6 +16,7 @@
 package com.google.cloud.bigtable.admin.v2.stub;
 
 import com.google.api.core.BetaApi;
+import com.google.api.core.InternalApi;
 import com.google.api.gax.grpc.GrpcCallSettings;
 import com.google.api.gax.grpc.GrpcCallableFactory;
 import com.google.api.gax.grpc.GrpcStubCallableFactory;
@@ -35,13 +36,9 @@
 import javax.annotation.Generated;
 
 // AUTO-GENERATED DOCUMENTATION AND CLASS
-/**
- * gRPC callable factory implementation for Cloud Bigtable Admin API.
- *
- * <p>This class is for advanced usage.
- */
+/** For internal use only. */
 @Generated("by gapic-generator")
-@BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
+@InternalApi
 public class GrpcBigtableInstanceAdminCallableFactory implements GrpcStubCallableFactory {
   @Override
   public <RequestT, ResponseT> UnaryCallable<RequestT, ResponseT> createUnaryCallable(