Merge branch 'main' into PR #2663 to update

Author: lqiu96

google-cloud-bigtable/pom.xml

@@ -427,7 +427,7 @@
                 <compilerArgs>
                   <arg>-XDcompilePolicy=simple</arg>
                   <arg>--should-stop=ifError=FLOW</arg>
-                  <arg>-Xplugin:ErrorProne -XepDisableWarningsInGeneratedCode -Xep:MissingSummary:OFF -Xep:InlineMeSuggester:OFF -Xep:AutoValueImmutableFields:OFF -Xep:ObjectEqualsForPrimitives:OFF</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 =
@@ -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/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/Table.java

@@ -27,6 +27,7 @@
 import java.util.Map;
 import java.util.Map.Entry;
 import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 import org.threeten.bp.Duration;
 
 /** Wrapper for {@link Table} protocol buffer object */
@@ -111,6 +112,7 @@ public static class AutomatedBackupPolicy {
     @InternalApi
     public static AutomatedBackupPolicy fromProto(
         com.google.bigtable.admin.v2.Table.AutomatedBackupPolicy proto) {
+      Preconditions.checkNotNull(proto);
       return new AutomatedBackupPolicy(proto);
     }
 
@@ -143,7 +145,7 @@ public String viewConfig() {
 
   private final Duration changeStreamRetention;
   private final boolean deletionProtection;
-  private static AutomatedBackupPolicy automatedBackupPolicy;
+  @Nullable private final AutomatedBackupPolicy automatedBackupPolicy;
 
   @InternalApi
   public static Table fromProto(@Nonnull com.google.bigtable.admin.v2.Table proto) {
@@ -170,10 +172,9 @@ public static Table fromProto(@Nonnull com.google.bigtable.admin.v2.Table proto)
               proto.getChangeStreamConfig().getRetentionPeriod().getNanos());
     }
 
+    AutomatedBackupPolicy automatedBackupPolicy = null;
     if (proto.hasAutomatedBackupPolicy()) {
       automatedBackupPolicy = AutomatedBackupPolicy.fromProto(proto.getAutomatedBackupPolicy());
-    } else {
-      automatedBackupPolicy = null;
     }
 
     return new Table(
@@ -191,14 +192,14 @@ private Table(
       List<ColumnFamily> columnFamilies,
       Duration changeStreamRetention,
       boolean deletionProtection,
-      AutomatedBackupPolicy automatedBackupPolicy) {
+      @Nullable AutomatedBackupPolicy automatedBackupPolicy) {
     this.instanceId = tableName.getInstance();
     this.id = tableName.getTable();
     this.replicationStatesByClusterId = replicationStatesByClusterId;
     this.columnFamilies = columnFamilies;
     this.changeStreamRetention = changeStreamRetention;
     this.deletionProtection = deletionProtection;
-    Table.automatedBackupPolicy = automatedBackupPolicy;
+    this.automatedBackupPolicy = automatedBackupPolicy;
   }
 
   /** Gets the table's id. */
@@ -230,10 +231,11 @@ public boolean isDeletionProtected() {
 
   /** Returns whether this table has automated backups enabled. */
   public boolean isAutomatedBackupEnabled() {
-    return automatedBackupPolicy == null ? false : true;
+    return automatedBackupPolicy != null;
   }
 
   /** Returns the automated backup policy config. */
+  @Nullable
   public AutomatedBackupPolicy getAutomatedBackupPolicy() {
     return automatedBackupPolicy;
   }
@@ -253,7 +255,7 @@ public boolean equals(Object o) {
         && Objects.equal(columnFamilies, table.columnFamilies)
         && Objects.equal(changeStreamRetention, table.changeStreamRetention)
         && Objects.equal(deletionProtection, table.deletionProtection)
-        && Objects.equal(automatedBackupPolicy, Table.automatedBackupPolicy);
+        && Objects.equal(automatedBackupPolicy, table.automatedBackupPolicy);
   }
 
   @Override

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

@@ -52,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. */
@@ -204,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

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

@@ -21,9 +21,10 @@
 import com.google.api.core.ApiFutures;
 import com.google.api.gax.retrying.ExponentialPollAlgorithm;
 import com.google.api.gax.retrying.NonCancellableFuture;
-import com.google.api.gax.retrying.ResultRetryAlgorithm;
+import com.google.api.gax.retrying.ResultRetryAlgorithmWithContext;
 import com.google.api.gax.retrying.RetryAlgorithm;
 import com.google.api.gax.retrying.RetrySettings;
+import com.google.api.gax.retrying.RetryingContext;
 import com.google.api.gax.retrying.RetryingExecutor;
 import com.google.api.gax.retrying.RetryingFuture;
 import com.google.api.gax.retrying.ScheduledRetryingExecutor;
@@ -149,7 +150,7 @@ private static class AttemptCallable<RequestT, ResponseT> implements Callable<Re
     private final RequestT request;
 
     private volatile RetryingFuture<ResponseT> externalFuture;
-    private volatile ApiCallContext callContext;
+    private final ApiCallContext callContext;
 
     AttemptCallable(
         UnaryCallable<RequestT, ResponseT> callable, RequestT request, ApiCallContext callContext) {
@@ -186,7 +187,8 @@ public ResponseT call() {
    * handle this.
    */
   private static class PollResultAlgorithm
-      implements ResultRetryAlgorithm<CheckConsistencyResponse> {
+      implements ResultRetryAlgorithmWithContext<CheckConsistencyResponse> {
+
     @Override
     public TimedAttemptSettings createNextAttempt(
         Throwable prevThrowable,
@@ -195,6 +197,22 @@ public TimedAttemptSettings createNextAttempt(
       return null;
     }
 
+    @Override
+    public TimedAttemptSettings createNextAttempt(
+        RetryingContext context,
+        Throwable previousThrowable,
+        CheckConsistencyResponse previousResponse,
+        TimedAttemptSettings previousSettings) {
+      return null;
+    }
+
+    @Override
+    public boolean shouldRetry(
+        RetryingContext context, Throwable previousThrowable, CheckConsistencyResponse prevResponse)
+        throws CancellationException {
+      return prevResponse != null && !prevResponse.getConsistent();
+    }
+
     @Override
     public boolean shouldRetry(Throwable prevThrowable, CheckConsistencyResponse prevResponse)
         throws CancellationException {

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

@@ -28,7 +28,9 @@
  * <p>This callable wraps GenerateConsistencyToken and CheckConsistency RPCs. It will generate a
  * token then poll until isConsistent is true.
  */
-/** @deprecated Please use {@link AwaitConsistencyCallable instead. */
+/**
+ * @deprecated Please use {@link AwaitConsistencyCallable} instead.
+ */
 @Deprecated
 class AwaitReplicationCallable extends UnaryCallable<TableName, Void> {
   private final AwaitConsistencyCallable awaitConsistencyCallable;

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

@@ -56,7 +56,7 @@ public class EnhancedBigtableTableAdminStub extends GrpcBigtableTableAdminStub {
 
   private final TableAdminRequestContext requestContext;
 
-  private final AwaitReplicationCallable awaitReplicationCallable;
+  @Deprecated private final AwaitReplicationCallable awaitReplicationCallable;
 
   private final AwaitConsistencyCallable awaitConsistencyCallable;
   private final OperationCallable<Void, Empty, OptimizeRestoredTableMetadata>
@@ -85,6 +85,7 @@ private EnhancedBigtableTableAdminStub(
         createOptimizeRestoredTableOperationBaseCallable();
   }
 
+  @Deprecated
   private AwaitReplicationCallable createAwaitReplicationCallable() {
     return AwaitReplicationCallable.create(awaitConsistencyCallable);
   }
@@ -207,6 +208,7 @@ public Empty apply(OperationSnapshot input) {
         unusedInitialCallSettings, operationCallSettings, clientContext, getOperationsStub());
   }
 
+  @Deprecated
   public UnaryCallable<TableName, Void> awaitReplicationCallable() {
     return awaitReplicationCallable;
   }

google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/common/Type.java

@@ -306,6 +306,7 @@ public SqlType<?> getType(java.lang.String fieldName) {
     }
 
     @Override
+    @SuppressWarnings("EqualsGetClass")
     public boolean equals(Object obj) {
       if (this == obj) {
         return true;
@@ -457,12 +458,12 @@ public Code getCode() {
     }
 
     @Override
-    public java.lang.String toString() {
+    public final java.lang.String toString() {
       return getCode().name() + "{enum=" + getEnumName() + "}";
     }
 
     @Override
-    public boolean equals(Object o) {
+    public final boolean equals(Object o) {
       if (this == o) {
         return true;
       }
@@ -486,7 +487,7 @@ public boolean equals(Object o) {
     }
 
     @Override
-    public int hashCode() {
+    public final int hashCode() {
       T thisEnum = getForNumber().apply(0);
       if (thisEnum == null) {
         return getForNumber().hashCode();
@@ -561,6 +562,7 @@ public static SchemalessEnum create(
       return new AutoValue_Type_SchemalessEnum(enumName, schemaBundleId);
     }
 
+    @Override
     public abstract java.lang.String getEnumName();
 
     public abstract java.lang.String schemaBundleId();

google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/BigtableDataClient.java

@@ -2697,8 +2697,8 @@ public void readChangeStreamAsync(
    * Executes a SQL Query and returns a ResultSet to iterate over the results. The returned
    * ResultSet instance is not threadsafe, it can only be used from single thread.
    *
-   * <p> The {@link BoundStatement} must be built from a {@link PreparedStatement} created using
-   * the same instance and app profile.
+   * <p>The {@link BoundStatement} must be built from a {@link PreparedStatement} created using the
+   * same instance and app profile.
    *
    * <p>Sample code:
    *
@@ -2719,9 +2719,11 @@ public void readChangeStreamAsync(
    *    } catch (RuntimeException e) {
    *        e.printStackTrace();
    *   }
+   * }
    * }</pre>
    *
-   * @see {@link PreparedStatement} & {@link BoundStatement} for query options.
+   * @see PreparedStatement for query options.
+   * @see BoundStatement for query options.
    */
   public ResultSet executeQuery(BoundStatement boundStatement) {
     boundStatement.assertUsingSameStub(stub);