restore files

Author: jinseopkim0

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

@@ -43,11 +43,9 @@ public abstract class ConsistencyRequest {
   @Nullable
   public abstract String getConsistencyToken();
 
-  protected abstract boolean isFullyQualified();
-
   public static ConsistencyRequest forReplication(String tableId) {
     return new AutoValue_ConsistencyRequest(
-        tableId, CheckConsistencyRequest.ModeCase.STANDARD_READ_REMOTE_WRITES, null, false);
+        tableId, CheckConsistencyRequest.ModeCase.STANDARD_READ_REMOTE_WRITES, null);
   }
 
   /**
@@ -61,127 +59,37 @@ public static ConsistencyRequest forReplication(String tableId, String consisten
     Preconditions.checkNotNull(consistencyToken, "consistencyToken must not be null");
 
     return new AutoValue_ConsistencyRequest(
-        tableId,
-        CheckConsistencyRequest.ModeCase.STANDARD_READ_REMOTE_WRITES,
-        consistencyToken,
-        false);
+        tableId, CheckConsistencyRequest.ModeCase.STANDARD_READ_REMOTE_WRITES, consistencyToken);
   }
 
   public static ConsistencyRequest forDataBoost(String tableId) {
     return new AutoValue_ConsistencyRequest(
-        tableId, CheckConsistencyRequest.ModeCase.DATA_BOOST_READ_LOCAL_WRITES, null, false);
-  }
-
-  @InternalApi
-  public static ConsistencyRequest forReplicationFromTableName(String tableName) {
-    Preconditions.checkArgument(
-        TableName.isParsableFrom(tableName), "tableName must be a fully qualified table name");
-    return new AutoValue_ConsistencyRequest(
-        tableName, CheckConsistencyRequest.ModeCase.STANDARD_READ_REMOTE_WRITES, null, true);
+        tableId, CheckConsistencyRequest.ModeCase.DATA_BOOST_READ_LOCAL_WRITES, null);
   }
 
-  @InternalApi
-  public static ConsistencyRequest forReplicationFromTableName(
-      String tableName, String consistencyToken) {
-    Preconditions.checkArgument(
-        TableName.isParsableFrom(tableName), "tableName must be a fully qualified table name");
-    Preconditions.checkNotNull(consistencyToken, "consistencyToken must not be null");
-
-    return new AutoValue_ConsistencyRequest(
-        tableName,
-        CheckConsistencyRequest.ModeCase.STANDARD_READ_REMOTE_WRITES,
-        consistencyToken,
-        true);
-  }
-
-  private CheckConsistencyRequest.Builder buildBaseRequest(String name, String token) {
-    CheckConsistencyRequest.Builder builder = CheckConsistencyRequest.newBuilder();
-
-    if (getMode().equals(CheckConsistencyRequest.ModeCase.STANDARD_READ_REMOTE_WRITES)) {
-      builder.setStandardReadRemoteWrites(StandardReadRemoteWrites.newBuilder().build());
-    } else {
-      builder.setDataBoostReadLocalWrites(DataBoostReadLocalWrites.newBuilder().build());
-    }
-
-    return builder.setName(name).setConsistencyToken(token);
-  }
-
-  /**
-   * Creates a CheckConsistencyRequest proto. This variant is used when the ConsistencyRequest was
-   * initialized with a short table ID, relying on the TableAdminRequestContext to construct the
-   * fully qualified table name.
-   */
   @InternalApi
   public CheckConsistencyRequest toCheckConsistencyProto(
       TableAdminRequestContext requestContext, String token) {
-    Preconditions.checkState(
-        !isFullyQualified(),
-        "Use toCheckConsistencyProto(String token) for fully qualified table names.");
+    CheckConsistencyRequest.Builder builder = CheckConsistencyRequest.newBuilder();
     TableName tableName =
         TableName.of(requestContext.getProjectId(), requestContext.getInstanceId(), getTableId());
 
-    return buildBaseRequest(tableName.toString(), token).build();
-  }
-
-  /**
-   * Creates a CheckConsistencyRequest proto. This variant is used when the ConsistencyRequest was
-   * initialized with a fully qualified table name, eliminating the need for a request context.
-   */
-  @InternalApi
-  public CheckConsistencyRequest toCheckConsistencyProto(String token) {
-    Preconditions.checkState(
-        isFullyQualified(),
-        "Use toCheckConsistencyProto(TableAdminRequestContext, String) for non-qualified table"
-            + " names.");
-
-    return buildBaseRequest(getTableId(), token).build();
-  }
-
-  /**
-   * Creates a GenerateConsistencyTokenRequest proto. This variant is used when the
-   * ConsistencyRequest was initialized with a short table ID, relying on the
-   * TableAdminRequestContext to construct the fully qualified table name.
-   */
-  @InternalApi
-  public CheckConsistencyRequest toCheckConsistencyProto(String token) {
-    Preconditions.checkState(
-        isFullyQualified(),
-        "Use toCheckConsistencyProto(TableAdminRequestContext, String) for non-qualified table"
-            + " names.");
-    CheckConsistencyRequest.Builder builder = CheckConsistencyRequest.newBuilder();
-
     if (getMode().equals(CheckConsistencyRequest.ModeCase.STANDARD_READ_REMOTE_WRITES)) {
       builder.setStandardReadRemoteWrites(StandardReadRemoteWrites.newBuilder().build());
     } else {
       builder.setDataBoostReadLocalWrites(DataBoostReadLocalWrites.newBuilder().build());
     }
 
-    return builder.setName(getTableId()).setConsistencyToken(token).build();
+    return builder.setName(tableName.toString()).setConsistencyToken(token).build();
   }
 
   @InternalApi
   public GenerateConsistencyTokenRequest toGenerateTokenProto(
       TableAdminRequestContext requestContext) {
-    Preconditions.checkState(
-        !isFullyQualified(), "Use toGenerateTokenProto() for fully qualified table names.");
     GenerateConsistencyTokenRequest.Builder builder = GenerateConsistencyTokenRequest.newBuilder();
     TableName tableName =
         TableName.of(requestContext.getProjectId(), requestContext.getInstanceId(), getTableId());
 
     return builder.setName(tableName.toString()).build();
   }
-
-  /**
-   * Creates a GenerateConsistencyTokenRequest proto. This variant is used when the
-   * ConsistencyRequest was initialized with a fully qualified table name, eliminating the need for
-   * a request context.
-   */
-  @InternalApi
-  public GenerateConsistencyTokenRequest toGenerateTokenProto() {
-    Preconditions.checkState(
-        isFullyQualified(),
-        "Use toGenerateTokenProto(TableAdminRequestContext) for non-qualified table names.");
-    GenerateConsistencyTokenRequest.Builder builder = GenerateConsistencyTokenRequest.newBuilder();
-    return builder.setName(getTableId()).build();
-  }
 }

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

@@ -42,7 +42,6 @@
 import com.google.common.util.concurrent.MoreExecutors;
 import java.util.concurrent.Callable;
 import java.util.concurrent.CancellationException;
-import javax.annotation.Nullable;
 
 /**
  * Callable that waits until either replication or Data Boost has caught up to the point it was
@@ -51,21 +50,21 @@
  * <p>This callable wraps GenerateConsistencyToken and CheckConsistency RPCs. It will generate a
  * token then poll until isConsistent is true.
  */
-public class AwaitConsistencyCallable extends UnaryCallable<ConsistencyRequest, Void> {
+class AwaitConsistencyCallable extends UnaryCallable<ConsistencyRequest, Void> {
   private final UnaryCallable<GenerateConsistencyTokenRequest, GenerateConsistencyTokenResponse>
       generateCallable;
   private final UnaryCallable<CheckConsistencyRequest, CheckConsistencyResponse> checkCallable;
   private final RetryingExecutor<CheckConsistencyResponse> executor;
 
-  @Nullable private final TableAdminRequestContext requestContext;
+  private final TableAdminRequestContext requestContext;
 
-  public static AwaitConsistencyCallable create(
+  static AwaitConsistencyCallable create(
       UnaryCallable<GenerateConsistencyTokenRequest, GenerateConsistencyTokenResponse>
           generateCallable,
       UnaryCallable<CheckConsistencyRequest, CheckConsistencyResponse> checkCallable,
       ClientContext clientContext,
       RetrySettings pollingSettings,
-      @Nullable TableAdminRequestContext requestContext) {
+      TableAdminRequestContext requestContext) {
 
     RetryAlgorithm<CheckConsistencyResponse> retryAlgorithm =
         new RetryAlgorithm<>(
@@ -79,22 +78,13 @@ public static AwaitConsistencyCallable create(
         generateCallable, checkCallable, retryingExecutor, requestContext);
   }
 
-  static AwaitConsistencyCallable create(
-      UnaryCallable<GenerateConsistencyTokenRequest, GenerateConsistencyTokenResponse>
-          generateCallable,
-      UnaryCallable<CheckConsistencyRequest, CheckConsistencyResponse> checkCallable,
-      ClientContext clientContext,
-      RetrySettings pollingSettings) {
-    return create(generateCallable, checkCallable, clientContext, pollingSettings, null);
-  }
-
   @VisibleForTesting
   AwaitConsistencyCallable(
       UnaryCallable<GenerateConsistencyTokenRequest, GenerateConsistencyTokenResponse>
           generateCallable,
       UnaryCallable<CheckConsistencyRequest, CheckConsistencyResponse> checkCallable,
       RetryingExecutor<CheckConsistencyResponse> executor,
-      @Nullable TableAdminRequestContext requestContext) {
+      TableAdminRequestContext requestContext) {
     this.generateCallable = generateCallable;
     this.checkCallable = checkCallable;
     this.executor = executor;
@@ -108,30 +98,22 @@ public ApiFuture<Void> futureCall(
     // If the token is already provided, skip generation and poll directly.
     if (consistencyRequest.getConsistencyToken() != null) {
       CheckConsistencyRequest request =
-          requestContext == null
-              ? consistencyRequest.toCheckConsistencyProto(consistencyRequest.getConsistencyToken())
-              : consistencyRequest.toCheckConsistencyProto(
-                  requestContext, consistencyRequest.getConsistencyToken());
+          consistencyRequest.toCheckConsistencyProto(
+              requestContext, consistencyRequest.getConsistencyToken());
       return pollToken(request, apiCallContext);
     }
 
     ApiFuture<GenerateConsistencyTokenResponse> tokenFuture =
-        generateToken(
-            requestContext == null
-                ? consistencyRequest.toGenerateTokenProto()
-                : consistencyRequest.toGenerateTokenProto(requestContext),
-            apiCallContext);
+        generateToken(consistencyRequest.toGenerateTokenProto(requestContext), apiCallContext);
 
     return ApiFutures.transformAsync(
         tokenFuture,
         new ApiAsyncFunction<GenerateConsistencyTokenResponse, Void>() {
           @Override
           public ApiFuture<Void> apply(GenerateConsistencyTokenResponse input) {
             CheckConsistencyRequest request =
-                requestContext == null
-                    ? consistencyRequest.toCheckConsistencyProto(input.getConsistencyToken())
-                    : consistencyRequest.toCheckConsistencyProto(
-                        requestContext, input.getConsistencyToken());
+                consistencyRequest.toCheckConsistencyProto(
+                    requestContext, input.getConsistencyToken());
             return pollToken(request, apiCallContext);
           }
         },

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

@@ -54,43 +54,14 @@ public class EnhancedBigtableTableAdminStub extends GrpcBigtableTableAdminStub {
   private final BigtableTableAdminStubSettings settings;
   private final ClientContext clientContext;
 
-  @javax.annotation.Nullable private final TableAdminRequestContext requestContext;
+  private final TableAdminRequestContext requestContext;
 
   @Deprecated private final AwaitReplicationCallable awaitReplicationCallable;
 
   private final AwaitConsistencyCallable awaitConsistencyCallable;
   private final OperationCallable<Void, Empty, OptimizeRestoredTableMetadata>
       optimizeRestoredTableOperationBaseCallable;
 
-  /**
-   * Creates an instance of {@link EnhancedBigtableTableAdminStub} using the provided settings. This
-   * variant is used by the V2 client stack which relies on fully qualified table names and
-   * therefore does not require a {@link TableAdminRequestContext}.
-   *
-   * @param settings The settings used to configure the stub.
-   * @return A new instance of {@code EnhancedBigtableTableAdminStub}.
-   * @throws IOException If there are errors creating the underlying client context.
-   */
-  public static EnhancedBigtableTableAdminStub createEnhanced(
-      BigtableTableAdminStubSettings settings) throws IOException {
-    return new EnhancedBigtableTableAdminStub(settings, ClientContext.create(settings), null);
-  }
-
-  /**
-   * Creates an instance of {@link EnhancedBigtableTableAdminStub} using the provided settings. This
-   * variant is used by the legacy client stack which relies on short table IDs and requires a
-   * {@link TableAdminRequestContext} to construct fully qualified table names.
-   *
-   * @param settings The settings used to configure the stub.
-   * @param requestContext The context used to format short table IDs.
-   * @return A new instance of {@code EnhancedBigtableTableAdminStub}.
-   * @throws IOException If there are errors creating the underlying client context.
-   */
-  public static EnhancedBigtableTableAdminStub createEnhanced(
-      BigtableTableAdminStubSettings settings) throws IOException {
-    return new EnhancedBigtableTableAdminStub(settings, ClientContext.create(settings), null);
-  }
-
   public static EnhancedBigtableTableAdminStub createEnhanced(
       BigtableTableAdminStubSettings settings, TableAdminRequestContext requestContext)
       throws IOException {
@@ -101,7 +72,7 @@ public static EnhancedBigtableTableAdminStub createEnhanced(
   private EnhancedBigtableTableAdminStub(
       BigtableTableAdminStubSettings settings,
       ClientContext clientContext,
-      @javax.annotation.Nullable TableAdminRequestContext requestContext)
+      TableAdminRequestContext requestContext)
       throws IOException {
     super(settings, clientContext);