test(spanner): unflake java8-samples

java-spanner/google-cloud-spanner/src/main/java/com/google/cloud/spanner/SpannerApiFutures.java

@@ -30,9 +30,6 @@ public static <T> T getOrNull(ApiFuture<T> future) throws SpannerException {
     try {
       return future == null ? null : future.get();
     } catch (ExecutionException e) {
-      if (e.getCause() instanceof SpannerException) {
-        throw (SpannerException) e.getCause();
-      }
       throw SpannerExceptionFactory.asSpannerException(e.getCause());
     } catch (InterruptedException e) {
       throw SpannerExceptionFactory.propagateInterrupt(e);

java-spanner/google-cloud-spanner/src/test/java/com/google/cloud/spanner/AsyncResultSetImplStressTest.java

@@ -444,7 +444,7 @@ public void cancel() throws Exception {
           assertThat(list).containsExactlyElementsIn(createExpectedRows());
         } catch (ExecutionException e) {
           assertThat(e.getCause()).isInstanceOf(SpannerException.class);
-          SpannerException se = (SpannerException) e.getCause();
+          SpannerException se = SpannerExceptionFactory.asSpannerException(e.getCause());
           assertThat(se.getErrorCode()).isEqualTo(ErrorCode.CANCELLED);
           assertThat(cancelledIndexes).contains(index);
         }

java-spanner/google-cloud-spanner/src/test/java/com/google/cloud/spanner/AsyncResultSetImplTest.java

@@ -176,7 +176,7 @@ public void toListAsyncPropagatesError() {
               ExecutionException.class,
               () -> rs.toListAsync(ignored -> new Object(), executor).get());
       assertThat(e.getCause()).isInstanceOf(SpannerException.class);
-      SpannerException se = (SpannerException) e.getCause();
+      SpannerException se = SpannerExceptionFactory.asSpannerException(e.getCause());
       assertThat(se.getErrorCode()).isEqualTo(ErrorCode.INVALID_ARGUMENT);
       assertThat(se.getMessage()).contains("invalid query");
     }
@@ -505,7 +505,7 @@ public void callbackReturnsError() throws InterruptedException {
           });
       ExecutionException e = assertThrows(ExecutionException.class, () -> rs.getResult().get());
       assertThat(e.getCause()).isInstanceOf(SpannerException.class);
-      SpannerException se = (SpannerException) e.getCause();
+      SpannerException se = SpannerExceptionFactory.asSpannerException(e.getCause());
       assertThat(se.getErrorCode()).isEqualTo(ErrorCode.UNKNOWN);
       assertThat(se.getMessage()).contains("async test");
       assertThat(callbackCounter.get()).isEqualTo(1);
@@ -535,7 +535,7 @@ public void callbackReturnsErrorWhileBufferIsFull_shouldStopProducer() throws Ex
       ExecutionException e =
           assertThrows(ExecutionException.class, () -> result.get(30L, TimeUnit.SECONDS));
       assertThat(e.getCause()).isInstanceOf(SpannerException.class);
-      SpannerException se = (SpannerException) e.getCause();
+      SpannerException se = SpannerExceptionFactory.asSpannerException(e.getCause());
       assertThat(se.getErrorCode()).isEqualTo(ErrorCode.UNKNOWN);
       assertThat(se.getMessage()).contains("async test");
       // The producer should stop and release the underlying result set.

java-spanner/google-cloud-spanner/src/test/java/com/google/cloud/spanner/AsyncRunnerTest.java

@@ -139,7 +139,7 @@ public void asyncRunnerInvalidUpdate() throws Exception {
         runner.runAsync(txn -> txn.executeUpdateAsync(INVALID_UPDATE_STATEMENT), executor);
     ExecutionException e = assertThrows(ExecutionException.class, () -> updateCount.get());
     assertThat(e.getCause()).isInstanceOf(SpannerException.class);
-    SpannerException se = (SpannerException) e.getCause();
+    SpannerException se = SpannerExceptionFactory.asSpannerException(e.getCause());
     assertThat(se.getErrorCode()).isEqualTo(ErrorCode.INVALID_ARGUMENT);
     assertThat(se.getMessage()).contains("invalid statement");
   }
@@ -288,7 +288,7 @@ public void asyncRunnerCommitFails() throws Exception {
             executor);
     ExecutionException e = assertThrows(ExecutionException.class, () -> updateCount.get());
     assertThat(e.getCause()).isInstanceOf(SpannerException.class);
-    SpannerException se = (SpannerException) e.getCause();
+    SpannerException se = SpannerExceptionFactory.asSpannerException(e.getCause());
     assertThat(se.getErrorCode()).isEqualTo(ErrorCode.INVALID_ARGUMENT);
     assertThat(se.getMessage()).contains("mutation limit exceeded");
   }
@@ -358,7 +358,7 @@ public void asyncRunnerInvalidBatchUpdate() throws Exception {
             executor);
     ExecutionException e = assertThrows(ExecutionException.class, () -> updateCount.get());
     assertThat(e.getCause()).isInstanceOf(SpannerException.class);
-    SpannerException se = (SpannerException) e.getCause();
+    SpannerException se = SpannerExceptionFactory.asSpannerException(e.getCause());
     assertThat(se.getErrorCode()).isEqualTo(ErrorCode.INVALID_ARGUMENT);
     assertThat(se.getMessage()).contains("invalid statement");
   }
@@ -505,7 +505,7 @@ public void asyncRunnerWithBatchUpdateCommitFails() throws Exception {
             executor);
     ExecutionException e = assertThrows(ExecutionException.class, () -> updateCount.get());
     assertThat(e.getCause()).isInstanceOf(SpannerException.class);
-    SpannerException se = (SpannerException) e.getCause();
+    SpannerException se = SpannerExceptionFactory.asSpannerException(e.getCause());
     assertThat(se.getErrorCode()).isEqualTo(ErrorCode.INVALID_ARGUMENT);
     assertThat(se.getMessage()).contains("mutation limit exceeded");
   }

java-spanner/google-cloud-spanner/src/test/java/com/google/cloud/spanner/DatabaseClientImplTest.java

@@ -1628,7 +1628,7 @@ public void runAsyncWithException() throws Exception {
 
     ExecutionException e = assertThrows(ExecutionException.class, fut::get);
     assertThat(e.getCause()).isInstanceOf(SpannerException.class);
-    SpannerException se = (SpannerException) e.getCause();
+    SpannerException se = SpannerExceptionFactory.asSpannerException(e.getCause());
     assertThat(se.getErrorCode()).isEqualTo(ErrorCode.INVALID_ARGUMENT);
 
     executor.shutdown();

java-spanner/google-cloud-spanner/src/test/java/com/google/cloud/spanner/LazySpannerInitializerTest.java

@@ -180,7 +180,7 @@ protected boolean shouldCacheError(Exception e) {
         successCount++;
       } catch (ExecutionException e) {
         assertThat(e.getCause()).isInstanceOf(SpannerException.class);
-        assertThat(((SpannerException) e.getCause()).getErrorCode())
+        assertThat(SpannerExceptionFactory.asSpannerException(e.getCause()).getErrorCode())
             .isEqualTo(ErrorCode.UNAVAILABLE);
         failureCount++;
       }

java-spanner/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITAsyncAPITest.java

@@ -67,6 +67,7 @@
 import org.junit.experimental.categories.Category;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
+import com.google.cloud.spanner.SpannerExceptionFactory;
 
 /** Integration tests for asynchronous APIs. */
 @Category(ParallelIntegrationTest.class)
@@ -269,7 +270,7 @@ public void tableNotFound() throws Exception {
       row.get();
     } catch (ExecutionException e) {
       assertThat(e.getCause()).isInstanceOf(SpannerException.class);
-      SpannerException se = (SpannerException) e.getCause();
+      SpannerException se = SpannerExceptionFactory.asSpannerException(e.getCause());
       assertThat(se.getErrorCode()).isEqualTo(ErrorCode.NOT_FOUND);
       assertThat(se.getMessage()).contains("BadTableName");
     }
@@ -285,7 +286,7 @@ public void columnNotFound() throws Exception {
       row.get();
     } catch (ExecutionException e) {
       assertThat(e.getCause()).isInstanceOf(SpannerException.class);
-      SpannerException se = (SpannerException) e.getCause();
+      SpannerException se = SpannerExceptionFactory.asSpannerException(e.getCause());
       assertThat(se.getErrorCode()).isEqualTo(ErrorCode.NOT_FOUND);
       assertThat(se.getMessage()).contains("BadColumnName");
     }

java-spanner/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITAsyncExamplesTest.java

@@ -57,6 +57,7 @@
 import org.junit.experimental.categories.Category;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
+import com.google.cloud.spanner.SpannerExceptionFactory;
 
 /** Integration tests for asynchronous APIs. */
 @Category(ParallelIntegrationTest.class)
@@ -503,7 +504,7 @@ public void cancel() throws Exception {
       fail("missing expected exception");
     } catch (ExecutionException e) {
       assertThat(e.getCause()).isInstanceOf(SpannerException.class);
-      SpannerException se = (SpannerException) e.getCause();
+      SpannerException se = SpannerExceptionFactory.asSpannerException(e.getCause());
       assertThat(se.getErrorCode()).isEqualTo(ErrorCode.CANCELLED);
       assertThat(values).containsExactly("v0");
     }

java-spanner/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITCommitTimestampTest.java

@@ -51,6 +51,7 @@
 import org.junit.experimental.categories.Category;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
+import com.google.cloud.spanner.SpannerExceptionFactory;
 
 /** Integration test for commit timestamp of Cloud Spanner. */
 @Category(ParallelIntegrationTest.class)
@@ -172,8 +173,7 @@ public void schemaChangeTimestampInFuture() throws Exception {
           .get();
       fail("missing expected exception");
     } catch (ExecutionException e) {
-      assertThat(e.getCause()).isInstanceOf(SpannerException.class);
-      SpannerException se = (SpannerException) e.getCause();
+      SpannerException se = SpannerExceptionFactory.asSpannerException(e.getCause());
       assertThat(se.getErrorCode()).isEqualTo(ErrorCode.FAILED_PRECONDITION);
     }
   }
@@ -205,8 +205,7 @@ public void invalidColumnOption() throws Exception {
           .get();
       fail("missing expected exception");
     } catch (ExecutionException e) {
-      assertThat(e.getCause()).isInstanceOf(SpannerException.class);
-      SpannerException se = (SpannerException) e.getCause();
+      SpannerException se = SpannerExceptionFactory.asSpannerException(e.getCause());
       assertThat(se.getErrorCode()).isEqualTo(ErrorCode.INVALID_ARGUMENT);
     }
   }
@@ -221,8 +220,7 @@ public void invalidColumnOptionValue() throws Exception {
           .get();
       fail("missing expected exception");
     } catch (ExecutionException e) {
-      assertThat(e.getCause()).isInstanceOf(SpannerException.class);
-      SpannerException se = (SpannerException) e.getCause();
+      SpannerException se = SpannerExceptionFactory.asSpannerException(e.getCause());
       assertThat(se.getErrorCode()).isEqualTo(ErrorCode.INVALID_ARGUMENT);
     }
   }
@@ -240,8 +238,7 @@ public void invalidColumnType() throws Exception {
           .get();
       fail("missing expected exception");
     } catch (ExecutionException e) {
-      assertThat(e.getCause()).isInstanceOf(SpannerException.class);
-      SpannerException se = (SpannerException) e.getCause();
+      SpannerException se = SpannerExceptionFactory.asSpannerException(e.getCause());
       assertThat(se.getErrorCode()).isEqualTo(ErrorCode.FAILED_PRECONDITION);
     }
   }

java-spanner/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITDatabaseAdminTest.java

@@ -58,6 +58,7 @@
 import org.junit.experimental.categories.Category;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
+import com.google.cloud.spanner.SpannerExceptionFactory;
 
 /** Integration tests for {@link com.google.cloud.spanner.DatabaseAdminClient}. */
 @Category(ParallelIntegrationTest.class)
@@ -264,14 +265,10 @@ public void updateDatabaseInvalidFieldsToUpdate() {
     OperationFuture<Database, UpdateDatabaseMetadata> op =
         dbAdminClient.updateDatabase(databaseToUpdate);
 
-    try {
-      op.get(5, TimeUnit.MINUTES);
-      Assert.fail("No exception thrown");
-    } catch (ExecutionException | InterruptedException | TimeoutException e) {
-      Assert.assertTrue(e.getCause() instanceof SpannerException);
-      SpannerException exception = ((SpannerException) e.getCause());
-      assertEquals(ErrorCode.INVALID_ARGUMENT, exception.getErrorCode());
-    }
+    ExecutionException e = Assert.assertThrows(
+        ExecutionException.class, () -> op.get(5, TimeUnit.MINUTES));
+    SpannerException exception = SpannerExceptionFactory.asSpannerException(e.getCause());
+    assertEquals(ErrorCode.INVALID_ARGUMENT, exception.getErrorCode());
   }
 
   @Test

java-spanner/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITPitrCreateDatabaseTest.java

@@ -43,6 +43,8 @@
 import org.junit.experimental.categories.Category;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
+import com.google.cloud.spanner.SpannerExceptionFactory;
+import java.util.concurrent.ExecutionException;
 
 @Category(ParallelIntegrationTest.class)
 @RunWith(JUnit4.class)
@@ -112,7 +114,7 @@ public void returnsTheVersionRetentionPeriodSetThroughGetDatabase() throws Excep
   }
 
   @Test(expected = DatabaseNotFoundException.class)
-  public void returnsAnErrorWhenAnInvalidVersionRetentionPeriodIsGiven() {
+  public void returnsAnErrorWhenAnInvalidVersionRetentionPeriodIsGiven() throws Exception {
     final String instanceId = testHelper.getInstanceId().getInstance();
     final String databaseId = testHelper.getUniqueDatabaseId();
     final String extraStatement =
@@ -121,8 +123,8 @@ public void returnsAnErrorWhenAnInvalidVersionRetentionPeriodIsGiven() {
     try {
       createDatabase(instanceId, databaseId, extraStatement);
       fail("Expected invalid argument error when setting invalid version retention period");
-    } catch (Exception e) {
-      SpannerException spannerException = (SpannerException) e.getCause();
+    } catch (ExecutionException e) {
+      SpannerException spannerException = SpannerExceptionFactory.asSpannerException(e.getCause());
       assertThat(spannerException.getErrorCode()).isEqualTo(ErrorCode.INVALID_ARGUMENT);
     }
 

java-spanner/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITPitrUpdateDatabaseTest.java

@@ -46,6 +46,8 @@
 import org.junit.experimental.categories.Category;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
+import com.google.cloud.spanner.SpannerExceptionFactory;
+import java.util.concurrent.ExecutionException;
 
 @Category(ParallelIntegrationTest.class)
 @RunWith(JUnit4.class)
@@ -149,7 +151,7 @@ public void returnsTheVersionRetentionPeriodSetThroughInformationSchema() {
   }
 
   @Test
-  public void returnsAnErrorWhenAnInvalidRetentionPeriodIsGiven() {
+  public void returnsAnErrorWhenAnInvalidRetentionPeriodIsGiven() throws Exception {
     try {
       dbAdminClient
           .updateDatabaseDdl(
@@ -162,8 +164,8 @@ public void returnsAnErrorWhenAnInvalidRetentionPeriodIsGiven() {
               "op_invalid_retention_period_" + databaseId)
           .get(OPERATION_TIMEOUT.toNanos(), TimeUnit.NANOSECONDS);
       fail("Expected invalid argument error when setting invalid version retention period");
-    } catch (Exception e) {
-      SpannerException spannerException = (SpannerException) e.getCause();
+    } catch (ExecutionException e) {
+      SpannerException spannerException = SpannerExceptionFactory.asSpannerException(e.getCause());
       assertThat(spannerException.getErrorCode()).isEqualTo(ErrorCode.INVALID_ARGUMENT);
     }
 

java-spanner/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITTransactionManagerAsyncTest.java

@@ -57,6 +57,7 @@
 import org.junit.runners.Parameterized;
 import org.junit.runners.Parameterized.Parameter;
 import org.junit.runners.Parameterized.Parameters;
+import com.google.cloud.spanner.SpannerExceptionFactory;
 
 @RunWith(Parameterized.class)
 @Category(ParallelIntegrationTest.class)
@@ -160,7 +161,7 @@ public void testInvalidInsert() throws InterruptedException {
           txn = manager.resetForRetryAsync();
         } catch (ExecutionException e) {
           assertThat(e.getCause()).isInstanceOf(SpannerException.class);
-          SpannerException se = (SpannerException) e.getCause();
+          SpannerException se = SpannerExceptionFactory.asSpannerException(e.getCause());
           if (env.getTestHelper()
               .getOptions()
               .getSessionPoolOptions()

java-spanner/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/slow/ITBackupTest.java

@@ -103,6 +103,7 @@
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
 import org.junit.runners.MethodSorters;
+import com.google.cloud.spanner.SpannerExceptionFactory;
 
 /**
  * Integration tests creating, reading, updating and deleting backups. This test class combines
@@ -569,11 +570,7 @@ private <T> void getOrThrow(OperationFuture<T, ?> operation)
     try {
       operation.get();
     } catch (ExecutionException e) {
-      if (e.getCause() instanceof SpannerException) {
-        throw (SpannerException) e.getCause();
-      } else {
-        throw e;
-      }
+      throw SpannerExceptionFactory.asSpannerException(e.getCause());
     }
   }
 

java-spanner/samples/snippets/src/main/java/com/example/spanner/CopyBackupSample.java

@@ -73,7 +73,7 @@ static void copyBackup(
           BackupName.of(projectId, instanceId, sourceBackupId), expireTime.toProto()).get();
       System.out.println("Copied backup [" + destinationBackup.getName() + "]");
     } catch (ExecutionException e) {
-      throw (SpannerException) e.getCause();
+      throw SpannerExceptionFactory.asSpannerException(e.getCause());
     } catch (InterruptedException e) {
       throw SpannerExceptionFactory.propagateInterrupt(e);
     }

java-spanner/samples/snippets/src/main/java/com/example/spanner/CopyBackupWithMultiRegionEncryptionKey.java

@@ -99,7 +99,7 @@ static void copyBackupWithMultiRegionEncryptionKey(
       destinationBackup = databaseAdminClient.copyBackupAsync(request).get();
       System.out.println("Copied backup [" + destinationBackup.getName() + "]");
     } catch (ExecutionException e) {
-      throw (SpannerException) e.getCause();
+      throw SpannerExceptionFactory.asSpannerException(e.getCause());
     } catch (InterruptedException e) {
       throw SpannerExceptionFactory.propagateInterrupt(e);
     }

java-spanner/samples/snippets/src/main/java/com/example/spanner/CreateDatabaseWithDefaultLeaderSample.java

@@ -65,7 +65,7 @@ static void createDatabaseWithDefaultLeader(String instanceName, String database
       System.out.println("\tDefault leader: " + createdDatabase.getDefaultLeader());
     } catch (ExecutionException e) {
       // If the operation failed during execution, expose the cause.
-      throw (SpannerException) e.getCause();
+      throw SpannerExceptionFactory.asSpannerException(e.getCause());
     } catch (InterruptedException e) {
       // Throw when a thread is waiting, sleeping, or otherwise occupied,
       // and the thread is interrupted, either before or during the activity.

java-spanner/samples/snippets/src/main/java/com/example/spanner/CreateDatabaseWithVersionRetentionPeriodSample.java

@@ -61,7 +61,7 @@ static void createDatabaseWithVersionRetentionPeriod(String projectId,
       System.out.println("\tEarliest version time: " + database.getEarliestVersionTime());
     } catch (ExecutionException e) {
       // If the operation failed during execution, expose the cause.
-      throw (SpannerException) e.getCause();
+      throw SpannerExceptionFactory.asSpannerException(e.getCause());
     } catch (InterruptedException e) {
       // Throw when a thread is waiting, sleeping, or otherwise occupied,
       // and the thread is interrupted, either before or during the activity.

java-spanner/samples/snippets/src/main/java/com/example/spanner/DatabaseAddSplitPointsSample.java

@@ -29,6 +29,8 @@
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
+import com.google.cloud.spanner.SpannerExceptionFactory;
+import java.util.concurrent.ExecutionException;
 
 public class DatabaseAddSplitPointsSample {
 
@@ -110,11 +112,13 @@ static void addSplitPoints(String projectId, String instanceId, String databaseI
       splitPoints.add(splitPointForIndex);
       splitPoints.add(splitPointForIndexWitTableKey);
       databaseAdminClient.addSplitPoints(
-          DatabaseName.of(projectId, instanceId, databaseId), splitPoints);
+          DatabaseName.of(projectId, instanceId, databaseId), splitPoints).get();
 
-    } catch (Exception e) {
+    } catch (ExecutionException e) {
       // If the operation failed during execution, expose the cause.
-      throw (SpannerException) e.getCause();
+      throw SpannerExceptionFactory.asSpannerException(e.getCause());
+    } catch (InterruptedException e) {
+      throw SpannerExceptionFactory.propagateInterrupt(e);
     }
   }
 }