remove legacy dependency

Author: jinseopkim0

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

@@ -209,7 +209,11 @@ private BigtableTableAdminClient(
     this.projectId = projectId;
     this.instanceId = instanceId;
     this.stub = stub;
-    this.baseClient = BigtableTableAdminClientV2.create(stub);
+    this.baseClient =
+        new BigtableTableAdminClientV2(
+            stub,
+            (com.google.cloud.bigtable.admin.v2.stub.AwaitConsistencyCallable) stub.awaitConsistencyCallable(),
+            stub.awaitOptimizeRestoredTableCallable());
   }
 
   /** Gets the project ID of the instance whose tables this client manages. */

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

@@ -35,10 +35,8 @@
 import com.google.cloud.bigtable.admin.v2.models.ConsistencyRequest;
 import com.google.cloud.bigtable.admin.v2.models.OptimizeRestoredTableOperationToken;
 import com.google.cloud.bigtable.admin.v2.models.RestoredTableResult;
-import com.google.cloud.bigtable.admin.v2.stub.AwaitConsistencyCallable;
 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.EnhancedBigtableTableAdminStub;
 import com.google.common.base.Strings;
 import com.google.longrunning.Operation;
 import com.google.protobuf.Empty;
@@ -58,7 +56,7 @@
  * generator cannot handle natively (e.g., chained Long Running Operations, Consistency Polling).
  */
 public class BigtableTableAdminClientV2 extends BaseBigtableTableAdminClient {
-  private final AwaitConsistencyCallable awaitConsistencyCallable;
+  private final com.google.cloud.bigtable.admin.v2.stub.AwaitConsistencyCallable awaitConsistencyCallable;
   private final OperationCallable<Void, Empty, OptimizeRestoredTableMetadata>
       optimizeRestoredTableOperationBaseCallable;
 
@@ -80,15 +78,15 @@ protected BigtableTableAdminClientV2(BigtableTableAdminStub stub) {
   @com.google.common.annotations.VisibleForTesting
   BigtableTableAdminClientV2(
       BigtableTableAdminStub stub,
-      AwaitConsistencyCallable awaitConsistencyCallable,
+      com.google.cloud.bigtable.admin.v2.stub.AwaitConsistencyCallable awaitConsistencyCallable,
       OperationCallable<Void, Empty, OptimizeRestoredTableMetadata>
           optimizeRestoredTableOperationBaseCallable) {
     super(stub);
     this.awaitConsistencyCallable = awaitConsistencyCallable;
     this.optimizeRestoredTableOperationBaseCallable = optimizeRestoredTableOperationBaseCallable;
   }
 
-  private AwaitConsistencyCallable createAwaitConsistencyCallable(
+  private com.google.cloud.bigtable.admin.v2.stub.AwaitConsistencyCallable createAwaitConsistencyCallable(
       BigtableTableAdminStubSettings settings) throws IOException {
     ClientContext clientContext = ClientContext.create(settings);
     // TODO(igorbernstein2): expose polling settings
@@ -104,7 +102,7 @@ private AwaitConsistencyCallable createAwaitConsistencyCallable(
             .setRpcTimeoutMultiplier(1.0)
             .build();
 
-    return AwaitConsistencyCallable.create(
+    return com.google.cloud.bigtable.admin.v2.stub.AwaitConsistencyCallable.create(
         getStub().generateConsistencyTokenCallable(),
         getStub().checkConsistencyCallable(),
         clientContext,
@@ -200,18 +198,6 @@ public static final BigtableTableAdminClientV2 create(BaseBigtableTableAdminSett
     return new BigtableTableAdminClientV2(settings);
   }
 
-  /** Constructs an instance of BigtableTableAdminClientV2 with the given stub. */
-  public static final BigtableTableAdminClientV2 create(BigtableTableAdminStub stub) {
-    if (stub instanceof EnhancedBigtableTableAdminStub) {
-      EnhancedBigtableTableAdminStub enhancedStub = (EnhancedBigtableTableAdminStub) stub;
-      return new BigtableTableAdminClientV2(
-          stub,
-          (AwaitConsistencyCallable) enhancedStub.awaitConsistencyCallable(),
-          enhancedStub.awaitOptimizeRestoredTableCallable());
-    }
-    return new BigtableTableAdminClientV2(stub);
-  }
-
   /**
    * Awaits the completion of the "Optimize Restored Table" operation.
    *
@@ -330,7 +316,7 @@ private UnaryCallable<ConsistencyRequest, Void> getAwaitConsistencyCallable() {
       return awaitConsistencyCallable;
     }
     throw new IllegalStateException(
-        "AwaitConsistencyCallable not initialized. BigtableTableAdminClientV2 must be "
+        "com.google.cloud.bigtable.admin.v2.stub.AwaitConsistencyCallable not initialized. BigtableTableAdminClientV2 must be "
             + "initialized via settings to use this functionality.");
   }