rename ApiException

googleapis · Dec 19, 2023 · 06b3a18 · 06b3a18
1 parent cf00661
commit 06b3a18
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/google-cloud-bigtable/pom.xml b/google-cloud-bigtable/pom.xml
@@ -161,7 +161,10 @@
       <artifactId>grpc-alts</artifactId>
       <scope>runtime</scope>
     </dependency>
-    <!-- Runtime dependencies for credentials -->
+    <dependency>
+      <groupId>org.checkerframework</groupId>
+      <artifactId>checker-qual</artifactId>
+    </dependency><!-- Runtime dependencies for credentials -->
     <dependency>
       <groupId>com.google.http-client</groupId>
       <artifactId>google-http-client</artifactId>

diff --git a/...ain/java/com/google/cloud/bigtable/data/v2/stub/mutaterows/MutateRowsAttemptCallable.java b/...ain/java/com/google/cloud/bigtable/data/v2/stub/mutaterows/MutateRowsAttemptCallable.java
@@ -31,6 +31,7 @@
 import com.google.bigtable.v2.MutateRowsResponse.Entry;
 import com.google.cloud.bigtable.data.v2.models.MutateRowsException;
 import com.google.cloud.bigtable.data.v2.models.MutateRowsException.FailedMutation;
+import com.google.cloud.bigtable.gaxx.retrying.ApiExceptions;
 import com.google.cloud.bigtable.gaxx.retrying.NonCancellableFuture;
 import com.google.common.base.Preconditions;
 import com.google.common.collect.ImmutableList;
@@ -235,8 +236,7 @@ private void handleAttemptError(Throwable rpcError) {
       FailedMutation failedMutation = FailedMutation.create(origIndex, entryError);
       allFailures.add(failedMutation);
 
-      if (!com.google.cloud.bigtable.gaxx.retrying.ApiException.isRetryable2(
-              failedMutation.getError())
+      if (!ApiExceptions.isRetryable2(failedMutation.getError())
           && !failedMutation.getError().isRetryable()) {
         permanentFailures.add(failedMutation);
       } else {

diff --git a/.../bigtable/gaxx/retrying/ApiException.java → ...bigtable/gaxx/retrying/ApiExceptions.java b/.../bigtable/gaxx/retrying/ApiException.java → ...bigtable/gaxx/retrying/ApiExceptions.java
@@ -19,9 +19,9 @@
 
 // TODO: move this to gax later
 @InternalApi
-public class ApiException {
+public class ApiExceptions {
 
-  private ApiException() {}
+  private ApiExceptions() {}
 
   // TODO: this should replace the existing ApiException#isRetryable() method,
   //  but that cant be done in bigtable, so this lives here for now.