Merge branch 'main' of github.com:googleapis/java-bigtable

Change-Id: Idd1e0fb830a1f52bac26a45ab86b59596d29c0c3

Author: mutianf

google-cloud-bigtable/pom.xml

@@ -427,7 +427,7 @@
                 <compilerArgs>
                   <arg>-XDcompilePolicy=simple</arg>
                   <arg>--should-stop=ifError=FLOW</arg>
-                  <arg>-Xplugin:ErrorProne -XepExcludedPaths:.*/generated-sources/.*</arg>
+                  <arg>-Xplugin:ErrorProne -XepDisableWarningsInGeneratedCode -Xep:MissingSummary:OFF -Xep:InlineMeSuggester:OFF -Xep:AutoValueImmutableFields:OFF -Xep:ObjectEqualsForPrimitives:OFF -Xep:JavaDurationGetSecondsToToSeconds:OFF</arg>
 
                   <arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED</arg>
                   <arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED</arg>

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

@@ -1042,6 +1042,7 @@ public ApiFuture<Void> dropAllRowsAsync(String tableId) {
    * @throws com.google.api.gax.retrying.PollException when polling exceeds the total timeout
    */
   @ObsoleteApi("Use getBaseClient() to access the auto-generated proto-based methods instead.")
+  @Deprecated
   public void awaitReplication(String tableId) {
     // TODO(igorbernstein2): remove usage of typesafe names
     com.google.bigtable.admin.v2.TableName tableName =
@@ -1418,8 +1419,8 @@ public RestoredTableResult restoreTable(RestoreTableRequest request)
   }
 
   /**
-   * <p>This method is obsolete. For the recommended proto-based approach, please see
-   * {@link com.google.cloud.bigtable.admin.v2.BaseBigtableTableAdminClient#restoreTableAsync(com.google.bigtable.admin.v2.RestoreTableRequest)}.
+   * This method is obsolete. For the recommended proto-based approach, please see {@link
+   * com.google.cloud.bigtable.admin.v2.BaseBigtableTableAdminClient#restoreTableAsync(com.google.bigtable.admin.v2.RestoreTableRequest)}.
    *
    * <p>Restores a backup to a new table with the specified configuration asynchronously.
    *
@@ -1442,7 +1443,7 @@ public RestoredTableResult restoreTable(RestoreTableRequest request)
    *   },
    *   MoreExecutors.directExecutor()
    * );
-   * </pre>
+   * }</pre>
    */
   @ObsoleteApi("Use getBaseClient() to access the auto-generated proto-based methods instead.")
   public ApiFuture<RestoredTableResult> restoreTableAsync(RestoreTableRequest request) {
@@ -1667,6 +1668,7 @@ public Backup apply(com.google.bigtable.admin.v2.Backup backupProto) {
    */
   @SuppressWarnings("WeakerAccess")
   @ObsoleteApi("Use getBaseClient() to access the auto-generated proto-based methods instead.")
+  @Deprecated
   public ApiFuture<Void> awaitReplicationAsync(final String tableId) {
     // TODO(igorbernstein2): remove usage of typesafe names
     com.google.bigtable.admin.v2.TableName tableName =

google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/internal/NameUtil.java

@@ -16,6 +16,7 @@
 package com.google.cloud.bigtable.admin.v2.internal;
 
 import com.google.api.core.InternalApi;
+import com.google.cloud.bigtable.data.v2.models.TableId;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import javax.annotation.Nonnull;
@@ -53,6 +54,10 @@ public static String formatTableName(String projectId, String instanceId, String
     return formatInstanceName(projectId, instanceId) + "/tables/" + tableId;
   }
 
+  public static String formatTableName(String projectId, String instanceId, TableId tableId) {
+    return formatInstanceName(projectId, instanceId) + "/tables/" + tableId.getTableId();
+  }
+
   public static String formatMaterializedViewName(
       @Nonnull String projectId, @Nonnull String instanceId, @Nonnull String materializedViewId) {
     return formatInstanceName(projectId, instanceId) + "/materializedViews/" + materializedViewId;

google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/models/AppProfile.java

@@ -223,6 +223,7 @@ com.google.bigtable.admin.v2.AppProfile.SingleClusterRouting toProto() {
       return proto;
     }
 
+    @SuppressWarnings("EqualsGetClass")
     @Override
     public boolean equals(Object o) {
       if (this == o) {
@@ -320,6 +321,7 @@ MultiClusterRoutingUseAny toProto() {
       return proto;
     }
 
+    @SuppressWarnings("EqualsGetClass")
     @Override
     public boolean equals(Object o) {
       if (this == o) {
@@ -426,6 +428,7 @@ com.google.bigtable.admin.v2.AppProfile.StandardIsolation toProto() {
       return proto;
     }
 
+    @SuppressWarnings("EqualsGetClass")
     @Override
     public boolean equals(Object o) {
       if (this == o) {
@@ -527,6 +530,7 @@ public DataBoostIsolationReadOnly toProto() {
       return proto;
     }
 
+    @SuppressWarnings("EqualsGetClass")
     @Override
     public boolean equals(Object o) {
       if (this == o) {

google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/models/Backup.java

@@ -223,6 +223,7 @@ public EncryptionInfo getEncryptionInfo() {
     return EncryptionInfo.fromProto(proto.getEncryptionInfo());
   }
 
+  @SuppressWarnings("EqualsGetClass")
   @Override
   public boolean equals(Object o) {
     if (this == o) {

google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/models/Cluster.java

@@ -214,6 +214,7 @@ public String getKmsKeyName() {
     return null;
   }
 
+  @SuppressWarnings("EqualsGetClass")
   @Override
   public boolean equals(Object o) {
     if (this == o) {

google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/models/ClusterAutoscalingConfig.java

@@ -177,6 +177,7 @@ public com.google.bigtable.admin.v2.PartialUpdateClusterRequest toProto(String p
     return this.builder.build();
   }
 
+  @SuppressWarnings({"EqualsGetClass", "ObjectEqualsForPrimitives"})
   @Override
   public boolean equals(Object o) {
     if (this == o) {

google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/models/CreateInstanceRequest.java

@@ -16,7 +16,6 @@
 package com.google.cloud.bigtable.admin.v2.models;
 
 import com.google.api.core.InternalApi;
-import com.google.bigtable.admin.v2.Instance.Type;
 import com.google.cloud.bigtable.admin.v2.internal.NameUtil;
 import com.google.common.base.Preconditions;
 import com.google.common.collect.Lists;
@@ -74,7 +73,7 @@ private CreateInstanceRequest(@Nonnull String instanceId) {
 
     builder.setInstanceId(instanceId);
     builder.getInstanceBuilder().setDisplayName(instanceId);
-    builder.getInstanceBuilder().setType(Type.PRODUCTION);
+    builder.getInstanceBuilder().setType(com.google.bigtable.admin.v2.Instance.Type.PRODUCTION);
   }
 
   /**
@@ -156,7 +155,7 @@ public CreateInstanceRequest addCluster(
     CreateClusterRequest clusterRequest =
         CreateClusterRequest.of("ignored-instance-id", clusterId)
             .setZone(zone)
-            .setServeNodes(serveNodes)
+            .setScalingMode(StaticClusterSize.of(serveNodes))
             .setStorageType(storageType);
     clusterRequests.add(clusterRequest);
 
@@ -212,7 +211,7 @@ public CreateInstanceRequest addCmekCluster(
     CreateClusterRequest clusterRequest =
         CreateClusterRequest.of("ignored-instance-id", clusterId)
             .setZone(zone)
-            .setServeNodes(serveNodes)
+            .setScalingMode(StaticClusterSize.of(serveNodes))
             .setStorageType(storageType)
             .setKmsKeyName(kmsKeyName);
     clusterRequests.add(clusterRequest);

google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/models/SubsetView.java

@@ -105,6 +105,7 @@ public com.google.bigtable.admin.v2.AuthorizedView.SubsetView toProto() {
   }
 
   @Override
+  @SuppressWarnings("EqualsGetClass")
   public boolean equals(Object o) {
     if (this == o) {
       return true;

google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/models/Type.java

@@ -27,6 +27,7 @@
  * @see com.google.bigtable.admin.v2.Type
  */
 @BetaApi
+@SuppressWarnings("SameNameButDifferent")
 public interface Type {
   /**
    * These types are marker types that allow types to be used as the input to aggregate function.
@@ -51,8 +52,9 @@ static Type fromProto(com.google.bigtable.admin.v2.Type source) {
         return Aggregate.fromProto(source.getAggregateType());
       case KIND_NOT_SET:
         return Raw.create();
+      default:
+        throw new UnsupportedOperationException();
     }
-    throw new UnsupportedOperationException();
   }
 
   /** The raw type denotes the absence of a type. */
@@ -203,8 +205,9 @@ static Encoding fromProto(com.google.bigtable.admin.v2.Type.Int64.Encoding sourc
             return BigEndianBytes.create();
           case ENCODING_NOT_SET:
             return BigEndianBytes.create();
+          default:
+            throw new UnsupportedOperationException();
         }
-        throw new UnsupportedOperationException();
       }
 
       @AutoValue