deps: remove client-core dependency from bigtable-hbase-2.x (#3620)

Author: kolea2

bigtable-hbase-2.x-parent/bigtable-hbase-2.x/pom.xml

@@ -63,12 +63,6 @@ limitations under the License.
       <version>2.2.1-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
     </dependency>
 
-    <dependency>
-      <groupId>com.google.cloud.bigtable</groupId>
-      <artifactId>bigtable-client-core</artifactId>
-      <version>${bigtable-client-core.version}</version>
-    </dependency>
-
     <dependency>
       <groupId>com.google.cloud.bigtable</groupId>
       <artifactId>bigtable-metrics-api</artifactId>

bigtable-hbase-2.x-parent/bigtable-hbase-2.x/src/main/java/com/google/cloud/bigtable/hbase2_x/BigtableAsyncAdmin.java

@@ -25,8 +25,6 @@
 import com.google.cloud.bigtable.admin.v2.models.CreateTableRequest;
 import com.google.cloud.bigtable.admin.v2.models.RestoreTableRequest;
 import com.google.cloud.bigtable.admin.v2.models.Table;
-import com.google.cloud.bigtable.grpc.BigtableClusterName;
-import com.google.cloud.bigtable.grpc.BigtableInstanceName;
 import com.google.cloud.bigtable.hbase.BigtableOptionsFactory;
 import com.google.cloud.bigtable.hbase.util.Logger;
 import com.google.cloud.bigtable.hbase.util.ModifyTableBuilder;
@@ -86,7 +84,7 @@ public abstract class BigtableAsyncAdmin implements AsyncAdmin {
   private final BigtableHBaseSettings settings;
   private final CommonConnection asyncConnection;
   private final String bigtableInstanceName;
-  private BigtableClusterName bigtableSnapshotClusterName;
+  private String snapshotClusterId;
   private final int ttlSeconds;
 
   public BigtableAsyncAdmin(CommonConnection asyncConnection) throws IOException {
@@ -98,15 +96,9 @@ public BigtableAsyncAdmin(CommonConnection asyncConnection) throws IOException {
     this.asyncConnection = asyncConnection;
 
     Configuration configuration = asyncConnection.getConfiguration();
-    String clusterId =
-        configuration.get(BigtableOptionsFactory.BIGTABLE_SNAPSHOT_CLUSTER_ID_KEY, null);
-    if (clusterId != null) {
-      BigtableInstanceName bigtableInstanceName =
-          new BigtableInstanceName(
-              asyncConnection.getBigtableSettings().getProjectId(),
-              asyncConnection.getBigtableSettings().getInstanceId());
-      bigtableSnapshotClusterName = bigtableInstanceName.toClusterName(clusterId);
-    }
+
+    snapshotClusterId = configuration.get(BigtableOptionsFactory.BIGTABLE_SNAPSHOT_CLUSTER_ID_KEY);
+
     this.ttlSeconds =
         configuration.getInt(
             BigtableOptionsFactory.BIGTABLE_SNAPSHOT_DEFAULT_TTL_SECS_KEY,
@@ -335,8 +327,7 @@ public CompletableFuture<TableDescriptor> getDescriptor(TableName tableName) {
   @Override
   public CompletableFuture<Void> deleteSnapshot(String snapshotId) {
     return toCompletableFuture(
-        bigtableTableAdminClient.deleteBackupAsync(
-            getBackupClusterName().getClusterId(), snapshotId));
+        bigtableTableAdminClient.deleteBackupAsync(getBackupClusterId(), snapshotId));
   }
 
   @Override
@@ -464,7 +455,7 @@ public CompletableFuture<Void> snapshot(String snapshotId, TableName tableName)
 
     return toCompletableFuture(
             bigtableTableAdminClient.createBackupAsync(
-                CreateBackupRequest.of(getBackupClusterName().getClusterId(), snapshotId)
+                CreateBackupRequest.of(getBackupClusterId(), snapshotId)
                     .setExpireTime(expireTime)
                     .setSourceTableId(tableName.getNameAsString())))
         .thenAccept(backup -> {});
@@ -474,7 +465,7 @@ public CompletableFuture<Void> snapshot(String snapshotId, TableName tableName)
   public CompletableFuture<Void> cloneSnapshot(String snapshotId, TableName tableName) {
     return toCompletableFuture(
             bigtableTableAdminClient.restoreTableAsync(
-                RestoreTableRequest.of(getBackupClusterName().getClusterId(), snapshotId)
+                RestoreTableRequest.of(getBackupClusterId(), snapshotId)
                     .setTableId(tableName.getNameAsString())))
         .thenAccept(backup -> {});
   }
@@ -487,7 +478,7 @@ public CompletableFuture<Void> cloneSnapshot(
 
   @Override
   public CompletableFuture<List<SnapshotDescription>> listSnapshots() {
-    return CompletableFuture.supplyAsync(() -> getBackupClusterName().getClusterId())
+    return CompletableFuture.supplyAsync(this::getBackupClusterId)
         .thenCompose(
             c ->
                 toCompletableFuture(bigtableTableAdminClient.listBackupsAsync(c))
@@ -517,8 +508,8 @@ private static <T> List<T> filter(Collection<T> r, Predicate<T> predicate) {
     return r.stream().filter(predicate).collect(Collectors.toList());
   }
 
-  private synchronized BigtableClusterName getBackupClusterName() {
-    if (this.bigtableSnapshotClusterName == null) {
+  private synchronized String getBackupClusterId() {
+    if (this.snapshotClusterId == null) {
       List<Cluster> clusters =
           asyncConnection
               .getBigtableApi()
@@ -531,14 +522,9 @@ private synchronized BigtableClusterName getBackupClusterName() {
               asyncConnection.getBigtableSettings().getProjectId(),
               asyncConnection.getBigtableSettings().getInstanceId(),
               clusters.size()));
-      String clusterName =
-          NameUtil.formatClusterName(
-              asyncConnection.getBigtableSettings().getProjectId(),
-              asyncConnection.getBigtableSettings().getInstanceId(),
-              clusters.get(0).getId());
-      bigtableSnapshotClusterName = new BigtableClusterName(clusterName);
+      snapshotClusterId = clusters.get(0).getId();
     }
-    return bigtableSnapshotClusterName;
+    return snapshotClusterId;
   }
 
   @Override

bigtable-hbase-2.x-parent/bigtable-hbase-2.x/src/main/java/org/apache/hadoop/hbase/client/BigtableAsyncConnection.java

@@ -17,7 +17,6 @@
 
 import com.google.api.core.InternalApi;
 import com.google.bigtable.v2.SampleRowKeysRequest;
-import com.google.cloud.bigtable.config.BigtableOptions;
 import com.google.cloud.bigtable.data.v2.internal.NameUtil;
 import com.google.cloud.bigtable.data.v2.models.KeyOffset;
 import com.google.cloud.bigtable.hbase.adapters.Adapters;
@@ -109,10 +108,6 @@ public BigtableApi getBigtableApi() {
     return bigtableApi;
   }
 
-  public BigtableOptions getOptions() {
-    throw new UnsupportedOperationException("veneer client does not support BigtableOptions");
-  }
-
   @Override
   public BigtableHBaseSettings getBigtableSettings() {
     return this.settings;