Merge branch 'refactor-consistency-request-2' into escape-hatch

Author: jinseopkim0

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

@@ -21,9 +21,8 @@
 /**
  * Modern Cloud Bigtable Instance Admin Client.
  *
- * <p>This client extends the auto-generated {@link BaseBigtableInstanceAdminClient} to provide
- * manual overrides and additional convenience methods for Critical User Journeys (CUJs) that the
- * GAPIC generator cannot handle natively.
+ * <p>This client extends the {@link BaseBigtableInstanceAdminClient} to provide a simplified and
+ * enhanced API surface for managing Cloud Bigtable instances and clusters.
  */
 public class BigtableInstanceAdminClientV2 extends BaseBigtableInstanceAdminClient {
 

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

@@ -45,15 +45,16 @@
 import io.grpc.MethodDescriptor.MethodType;
 import java.io.IOException;
 import java.io.InputStream;
+import java.time.Duration;
 import java.util.concurrent.ExecutionException;
-import org.threeten.bp.Duration;
 
 /**
  * Modern Cloud Bigtable Table Admin Client.
  *
- * <p>This client extends the auto-generated {@link BaseBigtableTableAdminClient} to provide manual
- * overrides and additional convenience methods for Critical User Journeys (CUJs) that the GAPIC
- * generator cannot handle natively (e.g., chained Long Running Operations, Consistency Polling).
+ * <p>This client extends the {@link BaseBigtableTableAdminClient} to provide enhanced convenience
+ * methods for table administration. It improves the user experience by handling chained Long
+ * Running Operations (such as seamlessly restoring and then optimizing a table) and provides
+ * built-in, automated polling for consistency tokens.
  */
 public class BigtableTableAdminClientV2 extends BaseBigtableTableAdminClient {
   private final com.google.cloud.bigtable.admin.v2.stub.AwaitConsistencyCallable
@@ -95,11 +96,11 @@ protected BigtableTableAdminClientV2(BigtableTableAdminStub stub) {
         RetrySettings.newBuilder()
             .setTotalTimeout(
                 settings.checkConsistencySettings().getRetrySettings().getTotalTimeout())
-            .setInitialRetryDelay(Duration.ofSeconds(10))
+            .setInitialRetryDelayDuration(Duration.ofSeconds(10))
             .setRetryDelayMultiplier(1.0)
-            .setMaxRetryDelay(Duration.ofSeconds(10))
-            .setInitialRpcTimeout(Duration.ZERO)
-            .setMaxRpcTimeout(Duration.ZERO)
+            .setMaxRetryDelayDuration(Duration.ofSeconds(10))
+            .setInitialRpcTimeoutDuration(Duration.ZERO)
+            .setMaxRpcTimeoutDuration(Duration.ZERO)
             .setRpcTimeoutMultiplier(1.0)
             .build();
 
@@ -157,7 +158,7 @@ public Operation parse(InputStream stream) {
         OperationCallSettings.<Void, Empty, OptimizeRestoredTableMetadata>newBuilder()
             .setInitialCallSettings(
                 UnaryCallSettings.<Void, OperationSnapshot>newUnaryCallSettingsBuilder()
-                    .setSimpleTimeoutNoRetries(Duration.ZERO)
+                    .setSimpleTimeoutNoRetriesDuration(Duration.ZERO)
                     .build())
             .setMetadataTransformer(
                 new ApiFunction<OperationSnapshot, OptimizeRestoredTableMetadata>() {
@@ -176,13 +177,13 @@ public Empty apply(OperationSnapshot input) {
             .setPollingAlgorithm(
                 OperationTimedPollAlgorithm.create(
                     RetrySettings.newBuilder()
-                        .setInitialRetryDelay(Duration.ofMillis(500L))
+                        .setInitialRetryDelayDuration(Duration.ofMillis(500L))
                         .setRetryDelayMultiplier(1.5)
-                        .setMaxRetryDelay(Duration.ofMillis(5000L))
-                        .setInitialRpcTimeout(Duration.ZERO)
+                        .setMaxRetryDelayDuration(Duration.ofMillis(5000L))
+                        .setInitialRpcTimeoutDuration(Duration.ZERO)
                         .setRpcTimeoutMultiplier(1.0)
-                        .setMaxRpcTimeout(Duration.ZERO)
-                        .setTotalTimeout(Duration.ofMillis(600000L))
+                        .setMaxRpcTimeoutDuration(Duration.ZERO)
+                        .setTotalTimeoutDuration(Duration.ofMillis(600000L))
                         .build()))
             .build();
 
@@ -317,9 +318,9 @@ private UnaryCallable<ConsistencyRequest, Void> getAwaitConsistencyCallable() {
       return awaitConsistencyCallable;
     }
     throw new IllegalStateException(
-        "com.google.cloud.bigtable.admin.v2.stub.AwaitConsistencyCallable not initialized."
-            + " BigtableTableAdminClientV2 must be initialized via settings to use this"
-            + " functionality.");
+        "AwaitConsistencyCallable not initialized. BigtableTableAdminClientV2 must be "
+            + "initialized via BigtableTableAdminClientV2.create(BaseBigtableTableAdminSettings) "
+            + "to use this functionality.");
   }
 
   private OperationCallable<Void, Empty, OptimizeRestoredTableMetadata>
@@ -329,6 +330,7 @@ private UnaryCallable<ConsistencyRequest, Void> getAwaitConsistencyCallable() {
     }
     throw new IllegalStateException(
         "OptimizeRestoredTableCallable not initialized. BigtableTableAdminClientV2 must be "
-            + "initialized via settings to use this functionality.");
+            + "initialized via BigtableTableAdminClientV2.create(BaseBigtableTableAdminSettings) "
+            + "to use this functionality.");
   }
 }

google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/admin/v2/BigtableTableAdminClientV2Test.java

@@ -152,4 +152,34 @@ public void testCreateClientWithSettings() throws Exception {
       assertThat(settingsClient.getStub()).isNotInstanceOf(EnhancedBigtableTableAdminStub.class);
     }
   }
+
+  @Test
+  public void testAwaitConsistency_ThrowsWhenNotInitialized() {
+    BigtableTableAdminClientV2 uninitializedClient = BigtableTableAdminClientV2.create(mockStub);
+
+    try {
+      uninitializedClient.waitForConsistency(TABLE_NAME, "token");
+      org.junit.Assert.fail("Expected IllegalStateException");
+    } catch (IllegalStateException e) {
+      assertThat(e.getMessage())
+          .contains("BigtableTableAdminClientV2.create(BaseBigtableTableAdminSettings)");
+    }
+  }
+
+  @Test
+  public void testOptimizeRestoredTable_ThrowsWhenNotInitialized() {
+    BigtableTableAdminClientV2 uninitializedClient = BigtableTableAdminClientV2.create(mockStub);
+
+    OptimizeRestoredTableOperationToken mockToken =
+        Mockito.mock(OptimizeRestoredTableOperationToken.class);
+    Mockito.when(mockToken.getOperationName()).thenReturn("op-name");
+
+    try {
+      uninitializedClient.awaitOptimizeRestoredTableAsync(mockToken);
+      org.junit.Assert.fail("Expected IllegalStateException");
+    } catch (IllegalStateException e) {
+      assertThat(e.getMessage())
+          .contains("BigtableTableAdminClientV2.create(BaseBigtableTableAdminSettings)");
+    }
+  }
 }