feat(bigtable): update legacy escape hatch to return V2 admin clients

Author: jinseopkim0

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

@@ -125,7 +125,7 @@
 public final class BigtableInstanceAdminClient implements AutoCloseable {
   private final String projectId;
   private final BigtableInstanceAdminStub stub;
-  private final BaseBigtableInstanceAdminClient baseClient;
+  private final BigtableInstanceAdminClientV2 baseClient;
 
   /** Constructs an instance of BigtableInstanceAdminClient with the given project ID. */
   public static BigtableInstanceAdminClient create(@Nonnull String projectId) throws IOException {
@@ -148,7 +148,7 @@ private BigtableInstanceAdminClient(
       @Nonnull String projectId, @Nonnull BigtableInstanceAdminStub stub) {
     this.projectId = projectId;
     this.stub = stub;
-    this.baseClient = BaseBigtableInstanceAdminClient.create(stub);
+    this.baseClient = BigtableInstanceAdminClientV2.create(stub);
   }
 
   /** Gets the project ID this client is associated with. */
@@ -157,10 +157,10 @@ public String getProjectId() {
   }
 
   /**
-   * Returns the modern autogenerated client. This provides access to the newest features and
+   * Returns the modern V2 client. This provides access to the newest features and
    * proto-based methods.
    */
-  public BaseBigtableInstanceAdminClient getBaseClient() {
+  public BigtableInstanceAdminClientV2 getBaseClient() {
     return baseClient;
   }
 

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

@@ -40,4 +40,9 @@ public static final BigtableInstanceAdminClientV2 create(
       BaseBigtableInstanceAdminSettings settings) throws IOException {
     return new BigtableInstanceAdminClientV2(settings);
   }
+
+  /** Constructs an instance of BigtableInstanceAdminClientV2 with the given stub. */
+  public static final BigtableInstanceAdminClientV2 create(BigtableInstanceAdminStub stub) {
+    return new BigtableInstanceAdminClientV2(stub);
+  }
 }

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

@@ -70,6 +70,7 @@
 import com.google.cloud.bigtable.admin.v2.models.UpdateBackupRequest;
 import com.google.cloud.bigtable.admin.v2.models.UpdateSchemaBundleRequest;
 import com.google.cloud.bigtable.admin.v2.models.UpdateTableRequest;
+import com.google.cloud.bigtable.admin.v2.stub.AwaitConsistencyCallableV2;
 import com.google.cloud.bigtable.admin.v2.stub.EnhancedBigtableTableAdminStub;
 import com.google.cloud.bigtable.data.v2.internal.TableAdminRequestContext;
 import com.google.common.base.Preconditions;
@@ -89,6 +90,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ExecutionException;
+import java.util.concurrent.ScheduledExecutorService;
 import javax.annotation.Nonnull;
 
 /**
@@ -169,7 +171,7 @@ public final class BigtableTableAdminClient implements AutoCloseable {
   private final EnhancedBigtableTableAdminStub stub;
   private final String projectId;
   private final String instanceId;
-  private final BaseBigtableTableAdminClient baseClient;
+  private final BigtableTableAdminClientV2 baseClient;
 
   /** Constructs an instance of BigtableTableAdminClient with the given project and instance IDs. */
   public static BigtableTableAdminClient create(
@@ -209,7 +211,22 @@ private BigtableTableAdminClient(
     this.projectId = projectId;
     this.instanceId = instanceId;
     this.stub = stub;
-    this.baseClient = BaseBigtableTableAdminClient.create(stub);
+
+    ScheduledExecutorService backgroundExecutor =
+        stub.getSettings().getBackgroundExecutorProvider().getExecutor();
+    boolean shouldAutoClose = stub.getSettings().getBackgroundExecutorProvider().shouldAutoClose();
+
+    AwaitConsistencyCallableV2 awaitConsistencyCallable =
+        BigtableTableAdminClientV2.createAwaitConsistencyCallable(
+            stub, stub.getSettings(), stub.getClientContext().getClock(), backgroundExecutor);
+
+    this.baseClient =
+        new BigtableTableAdminClientV2(
+            stub,
+            backgroundExecutor,
+            shouldAutoClose,
+            awaitConsistencyCallable,
+            stub.awaitOptimizeRestoredTableCallable());
   }
 
   /** Gets the project ID of the instance whose tables this client manages. */
@@ -223,10 +240,10 @@ public String getInstanceId() {
   }
 
   /**
-   * Returns the modern autogenerated client. This provides access to the newest features and
+   * Returns the modern V2 client. This provides access to the newest features and
    * proto-based methods.
    */
-  public BaseBigtableTableAdminClient getBaseClient() {
+  public BigtableTableAdminClientV2 getBaseClient() {
     return baseClient;
   }
 

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

@@ -36,6 +36,7 @@
 import com.google.bigtable.admin.v2.OptimizeRestoredTableMetadata;
 import com.google.bigtable.admin.v2.TableName;
 import com.google.cloud.bigtable.admin.v2.stub.AwaitConsistencyCallableV2;
+import com.google.cloud.bigtable.admin.v2.stub.BigtableTableAdminStub;
 import com.google.cloud.bigtable.admin.v2.stub.BigtableTableAdminStubSettings;
 import com.google.cloud.bigtable.admin.v2.stub.GrpcBigtableTableAdminStub;
 import com.google.common.base.Strings;
@@ -119,7 +120,7 @@ public static final BigtableTableAdminClientV2 create(BaseBigtableTableAdminSett
   }
 
   protected BigtableTableAdminClientV2(
-      GrpcBigtableTableAdminStub stub,
+      BigtableTableAdminStub stub,
       @Nullable ScheduledExecutorService backgroundExecutor,
       boolean shouldAutoClose,
       @Nullable AwaitConsistencyCallableV2 awaitConsistencyCallable,
@@ -133,8 +134,8 @@ protected BigtableTableAdminClientV2(
     this.optimizeRestoredTableOperationBaseCallable = optimizeRestoredTableOperationBaseCallable;
   }
 
-  private static AwaitConsistencyCallableV2 createAwaitConsistencyCallable(
-      GrpcBigtableTableAdminStub stub,
+  static AwaitConsistencyCallableV2 createAwaitConsistencyCallable(
+      BigtableTableAdminStub stub,
       BigtableTableAdminStubSettings settings,
       ApiClock clock,
       ScheduledExecutorService executor) {

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

@@ -245,4 +245,12 @@ public UnaryCallable<ConsistencyRequest, Void> awaitConsistencyCallable() {
       awaitOptimizeRestoredTableCallable() {
     return optimizeRestoredTableOperationBaseCallable;
   }
+
+  public BigtableTableAdminStubSettings getSettings() {
+    return settings;
+  }
+
+  public ClientContext getClientContext() {
+    return clientContext;
+  }
 }