From 9a9c2354c0ab3c76edf8277dc83158742bc96c26 Mon Sep 17 00:00:00 2001 From: suraj dhamecha Date: Wed, 24 Jun 2020 11:43:42 +0530 Subject: [PATCH] chore: remove unused throws from test --- .../spanner/connection/ChecksumResultSet.java | 3 +- .../AbstractStructReaderTypesTest.java | 6 +- .../cloud/spanner/BackendExhaustedTest.java | 4 +- .../com/google/cloud/spanner/BackupTest.java | 2 +- .../cloud/spanner/BatchClientImplTest.java | 2 +- .../spanner/BatchCreateSessionsTest.java | 8 +- .../spanner/DatabaseAdminClientImplTest.java | 2 +- .../spanner/DatabaseAdminClientTest.java | 17 ++-- .../cloud/spanner/DatabaseAdminGaxTest.java | 2 +- .../cloud/spanner/DatabaseClientImplTest.java | 36 ++++---- .../google/cloud/spanner/DatabaseTest.java | 2 +- .../cloud/spanner/GrpcResultSetTest.java | 4 +- .../cloud/spanner/InstanceAdminGaxTest.java | 2 +- .../google/cloud/spanner/KeyRangeTest.java | 2 +- .../com/google/cloud/spanner/KeySetTest.java | 2 +- .../com/google/cloud/spanner/KeyTest.java | 2 +- .../spanner/MockDatabaseAdminServiceImpl.java | 2 +- .../MockDatabaseAdminServiceImplTest.java | 2 +- .../google/cloud/spanner/MutationTest.java | 2 +- .../google/cloud/spanner/OperationTest.java | 4 +- .../RetryOnInvalidatedSessionTest.java | 35 ++++---- .../cloud/spanner/SessionClientTest.java | 12 +-- .../google/cloud/spanner/SessionImplTest.java | 4 +- .../spanner/SessionPoolIntegrationTest.java | 2 +- .../cloud/spanner/SessionPoolLeakTest.java | 8 +- .../spanner/SessionPoolMaintainerTest.java | 6 +- .../cloud/spanner/SessionPoolStressTest.java | 10 +-- .../google/cloud/spanner/SessionPoolTest.java | 90 +++++++++---------- .../com/google/cloud/spanner/SpanTest.java | 4 +- .../cloud/spanner/SpannerGaxRetryTest.java | 12 +-- .../google/cloud/spanner/SpannerImplTest.java | 4 +- .../cloud/spanner/SpannerRetryHelperTest.java | 18 ++-- .../google/cloud/spanner/StatementTest.java | 2 +- .../cloud/spanner/TimestampBoundTest.java | 2 +- .../TransactionManagerAbortedTest.java | 4 +- .../spanner/TransactionManagerImplTest.java | 7 +- .../spanner/TransactionRunnerImplTest.java | 23 +++-- .../com/google/cloud/spanner/ValueTest.java | 7 +- .../database/v1/DatabaseAdminClientTest.java | 2 +- .../instance/v1/InstanceAdminClientTest.java | 2 +- .../connection/ConnectionImplTest.java | 16 ++-- ...nnectionStatementWithNoParametersTest.java | 22 ++--- ...nnectionStatementWithOneParameterTest.java | 14 +-- .../connection/CredentialsServiceTest.java | 4 +- .../DirectExecuteResultSetTest.java | 3 +- .../connection/ITAbstractSpannerTest.java | 6 +- .../connection/ReadWriteTransactionTest.java | 7 +- .../ReplaceableForwardingResultSetTest.java | 3 +- .../connection/SingleUseTransactionTest.java | 2 +- .../spanner/connection/SpannerPoolTest.java | 13 ++- .../connection/StatementTimeoutTest.java | 7 +- .../connection/it/ITBulkConnectionTest.java | 2 +- .../connection/it/ITReadOnlySpannerTest.java | 6 +- .../it/ITReadWriteAutocommitSpannerTest.java | 4 +- .../google/cloud/spanner/it/ITBackupTest.java | 6 +- .../cloud/spanner/it/ITBatchDmlTest.java | 4 +- .../cloud/spanner/it/ITBatchReadTest.java | 2 +- .../cloud/spanner/it/ITClosedSessionTest.java | 6 +- .../spanner/it/ITCommitTimestampTest.java | 2 +- .../cloud/spanner/it/ITDatabaseAdminTest.java | 4 +- .../cloud/spanner/it/ITInstanceAdminTest.java | 2 +- .../cloud/spanner/it/ITQueryOptionsTest.java | 6 +- .../cloud/spanner/it/ITTransactionTest.java | 2 +- .../cloud/spanner/v1/SpannerClientTest.java | 2 +- 64 files changed, 242 insertions(+), 263 deletions(-) diff --git a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/connection/ChecksumResultSet.java b/google-cloud-spanner/src/main/java/com/google/cloud/spanner/connection/ChecksumResultSet.java index 0170a9f5726..d8e0e858444 100644 --- a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/connection/ChecksumResultSet.java +++ b/google-cloud-spanner/src/main/java/com/google/cloud/spanner/connection/ChecksumResultSet.java @@ -38,7 +38,6 @@ import com.google.common.hash.PrimitiveSink; import java.util.Objects; import java.util.concurrent.Callable; -import java.util.concurrent.ExecutionException; /** * {@link ResultSet} implementation that keeps a running checksum that can be used to determine @@ -117,7 +116,7 @@ public boolean next() { } @VisibleForTesting - HashCode getChecksum() throws InterruptedException, ExecutionException { + HashCode getChecksum() { // HashCode is immutable and can be safely returned. return checksumCalculator.getChecksum(); } diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/AbstractStructReaderTypesTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/AbstractStructReaderTypesTest.java index 3e6da2a2968..bde868fe552 100644 --- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/AbstractStructReaderTypesTest.java +++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/AbstractStructReaderTypesTest.java @@ -328,7 +328,7 @@ public void getter() throws Exception { } @Test - public void getterForIncorrectType() throws Exception { + public void getterForIncorrectType() { Mockito.when(reader.getType()).thenReturn(Type.struct(StructField.of("F1", type))); int columnIndex = 0; Mockito.when(reader.isNull(columnIndex)).thenReturn(false); @@ -367,7 +367,7 @@ public void getterForIncorrectType() throws Exception { } @Test - public void getterWhenNull() throws Exception { + public void getterWhenNull() { Mockito.when(reader.getType()).thenReturn(Type.struct(StructField.of("F1", type))); Mockito.when(reader.isNull(0)).thenReturn(true); try { @@ -379,7 +379,7 @@ public void getterWhenNull() throws Exception { } @Test - public void getterByNameWhenNull() throws Exception { + public void getterByNameWhenNull() { Mockito.when(reader.getType()).thenReturn(Type.struct(StructField.of("F1", type))); Mockito.when(reader.isNull(0)).thenReturn(true); try { diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/BackendExhaustedTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/BackendExhaustedTest.java index f7d6653fafc..cb1244f8e3e 100644 --- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/BackendExhaustedTest.java +++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/BackendExhaustedTest.java @@ -153,7 +153,7 @@ public void setUp() throws Exception { } @After - public void tearDown() throws Exception { + public void tearDown() { mockSpanner.reset(); mockSpanner.removeAllExecutionTimes(); // This test case force-closes the Spanner instance as it would otherwise wait @@ -209,7 +209,7 @@ public void run() { runner.run( new TransactionCallable() { @Override - public Long run(TransactionContext transaction) throws Exception { + public Long run(TransactionContext transaction) { return transaction.executeUpdate(UPDATE_STATEMENT); } }); diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/BackupTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/BackupTest.java index 50eaf1fd097..3bdc6738382 100644 --- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/BackupTest.java +++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/BackupTest.java @@ -56,7 +56,7 @@ public void setUp() { .thenAnswer( new Answer() { @Override - public Builder answer(InvocationOnMock invocation) throws Throwable { + public Builder answer(InvocationOnMock invocation) { return new Backup.Builder(dbClient, (BackupId) invocation.getArguments()[0]); } }); diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/BatchClientImplTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/BatchClientImplTest.java index 002a992b6f8..f53a3ac406b 100644 --- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/BatchClientImplTest.java +++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/BatchClientImplTest.java @@ -102,7 +102,7 @@ public void testBatchReadOnlyTxnWithBound() throws Exception { } @Test - public void testBatchReadOnlyTxnWithTxnId() throws Exception { + public void testBatchReadOnlyTxnWithTxnId() { when(txnID.getSessionId()).thenReturn(SESSION_NAME); when(txnID.getTransactionId()).thenReturn(TXN_ID); Timestamp t = Timestamp.parseTimestamp(TIMESTAMP); diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/BatchCreateSessionsTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/BatchCreateSessionsTest.java index 222b393113d..abac3bd1348 100644 --- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/BatchCreateSessionsTest.java +++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/BatchCreateSessionsTest.java @@ -102,7 +102,7 @@ public static void stopServer() throws InterruptedException { } @Before - public void setUp() throws IOException { + public void setUp() { mockSpanner.reset(); mockSpanner.removeAllExecutionTimes(); } @@ -237,7 +237,7 @@ public void testSpannerReturnsResourceExhausted() throws InterruptedException { } @Test - public void testPrepareSessionFailPropagatesToUser() throws InterruptedException { + public void testPrepareSessionFailPropagatesToUser() { // Do not create any sessions by default. // This also means that when a read/write session is requested, the session pool // will start preparing a read session at that time. Any errors that might occur @@ -256,7 +256,7 @@ public void testPrepareSessionFailPropagatesToUser() throws InterruptedException runner.run( new TransactionCallable() { @Override - public Void run(TransactionContext transaction) throws Exception { + public Void run(TransactionContext transaction) { return null; } }); @@ -297,7 +297,7 @@ public void testPrepareSessionFailDoesNotPropagateToUser() throws InterruptedExc runner.run( new TransactionCallable() { @Override - public Void run(TransactionContext transaction) throws Exception { + public Void run(TransactionContext transaction) { return null; } }); diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/DatabaseAdminClientImplTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/DatabaseAdminClientImplTest.java index e77fb384393..b2676473cf1 100644 --- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/DatabaseAdminClientImplTest.java +++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/DatabaseAdminClientImplTest.java @@ -338,7 +338,7 @@ public void listBackups() { } @Test - public void updateBackup() throws Exception { + public void updateBackup() { Timestamp t = Timestamp.ofTimeMicroseconds( TimeUnit.MILLISECONDS.toMicros(System.currentTimeMillis()) diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/DatabaseAdminClientTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/DatabaseAdminClientTest.java index ea695c36114..8b30df912d3 100644 --- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/DatabaseAdminClientTest.java +++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/DatabaseAdminClientTest.java @@ -48,7 +48,6 @@ import io.grpc.Server; import io.grpc.Status; import io.grpc.netty.shaded.io.grpc.netty.NettyServerBuilder; -import java.io.IOException; import java.net.InetSocketAddress; import java.util.Arrays; import java.util.Collections; @@ -110,7 +109,7 @@ public static void stopServer() throws Exception { @SuppressWarnings("rawtypes") @Before - public void setUp() throws IOException { + public void setUp() { mockDatabaseAdmin.reset(); mockOperations.reset(); SpannerOptions.Builder builder = SpannerOptions.newBuilder(); @@ -214,7 +213,7 @@ public ManagedChannelBuilder apply(ManagedChannelBuilder input) { } @After - public void tearDown() throws Exception { + public void tearDown() { mockDatabaseAdmin.reset(); mockDatabaseAdmin.removeAllExecutionTimes(); mockOperations.reset(); @@ -311,7 +310,7 @@ public void databaseBackup() throws InterruptedException, ExecutionException { } @Test - public void dbAdminCreateBackupAlreadyExists() throws InterruptedException, ExecutionException { + public void dbAdminCreateBackupAlreadyExists() throws InterruptedException { OperationFuture op = client.createBackup(INSTANCE_ID, BCK_ID, DB_ID, after7Days()); try { @@ -325,7 +324,7 @@ public void dbAdminCreateBackupAlreadyExists() throws InterruptedException, Exec } @Test - public void backupCreateAlreadyExists() throws InterruptedException, ExecutionException { + public void backupCreateAlreadyExists() throws InterruptedException { Backup backup = client .newBackupBuilder(BackupId.of(PROJECT_ID, INSTANCE_ID, BCK_ID)) @@ -343,7 +342,7 @@ public void backupCreateAlreadyExists() throws InterruptedException, ExecutionEx } @Test - public void databaseBackupAlreadyExists() throws InterruptedException, ExecutionException { + public void databaseBackupAlreadyExists() throws InterruptedException { Database db = client.getDatabase(INSTANCE_ID, DB_ID); OperationFuture op = db.backup( @@ -362,7 +361,7 @@ public void databaseBackupAlreadyExists() throws InterruptedException, Execution } @Test - public void dbAdminCreateBackupDbNotFound() throws InterruptedException, ExecutionException { + public void dbAdminCreateBackupDbNotFound() throws InterruptedException { final String backupId = "other-backup-id"; OperationFuture op = client.createBackup(INSTANCE_ID, backupId, "does-not-exist", after7Days()); @@ -376,7 +375,7 @@ public void dbAdminCreateBackupDbNotFound() throws InterruptedException, Executi } @Test - public void backupCreateDbNotFound() throws InterruptedException, ExecutionException { + public void backupCreateDbNotFound() throws InterruptedException { final String backupId = "other-backup-id"; Backup backup = client @@ -394,7 +393,7 @@ public void backupCreateDbNotFound() throws InterruptedException, ExecutionExcep } @Test - public void databaseBackupDbNotFound() throws InterruptedException, ExecutionException { + public void databaseBackupDbNotFound() throws InterruptedException { final String backupId = "other-backup-id"; Database db = new Database( diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/DatabaseAdminGaxTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/DatabaseAdminGaxTest.java index caeed50da62..7e4dfb699c7 100644 --- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/DatabaseAdminGaxTest.java +++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/DatabaseAdminGaxTest.java @@ -294,7 +294,7 @@ public Void apply(Builder input) { } @After - public void tearDown() throws Exception { + public void tearDown() { spanner.close(); } diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/DatabaseClientImplTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/DatabaseClientImplTest.java index ac57476c125..7bb05964fbd 100644 --- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/DatabaseClientImplTest.java +++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/DatabaseClientImplTest.java @@ -126,7 +126,7 @@ public static void stopServer() throws InterruptedException { } @Before - public void setUp() throws IOException { + public void setUp() { spanner = SpannerOptions.newBuilder() .setProjectId(TEST_PROJECT) @@ -137,7 +137,7 @@ public void setUp() throws IOException { } @After - public void tearDown() throws Exception { + public void tearDown() { spanner.close(); mockSpanner.reset(); mockSpanner.removeAllExecutionTimes(); @@ -185,7 +185,7 @@ public void testExecutePartitionedDmlWithException() { } @Test - public void testPartitionedDmlDoesNotTimeout() throws Exception { + public void testPartitionedDmlDoesNotTimeout() { mockSpanner.setExecuteSqlExecutionTime(SimulatedExecutionTime.ofMinimumAndRandomTime(10, 0)); final RetrySettings retrySettings = RetrySettings.newBuilder() @@ -218,7 +218,7 @@ public void testPartitionedDmlDoesNotTimeout() throws Exception { .run( new TransactionCallable() { @Override - public Void run(TransactionContext transaction) throws Exception { + public Void run(TransactionContext transaction) { transaction.executeUpdate(UPDATE_STATEMENT); return null; } @@ -233,7 +233,7 @@ public Void run(TransactionContext transaction) throws Exception { } @Test - public void testPartitionedDmlWithLowerTimeout() throws Exception { + public void testPartitionedDmlWithLowerTimeout() { mockSpanner.setExecuteSqlExecutionTime(SimulatedExecutionTime.ofMinimumAndRandomTime(1000, 0)); SpannerOptions.Builder builder = SpannerOptions.newBuilder() @@ -265,7 +265,7 @@ public void testPartitionedDmlWithLowerTimeout() throws Exception { .run( new TransactionCallable() { @Override - public Long run(TransactionContext transaction) throws Exception { + public Long run(TransactionContext transaction) { return transaction.executeUpdate(UPDATE_STATEMENT); } }); @@ -274,7 +274,7 @@ public Long run(TransactionContext transaction) throws Exception { } @Test - public void testPartitionedDmlWithHigherTimeout() throws Exception { + public void testPartitionedDmlWithHigherTimeout() { mockSpanner.setExecuteSqlExecutionTime(SimulatedExecutionTime.ofMinimumAndRandomTime(100, 0)); SpannerOptions.Builder builder = SpannerOptions.newBuilder() @@ -313,7 +313,7 @@ public void testPartitionedDmlWithHigherTimeout() throws Exception { .run( new TransactionCallable() { @Override - public Long run(TransactionContext transaction) throws Exception { + public Long run(TransactionContext transaction) { return transaction.executeUpdate(UPDATE_STATEMENT); } }); @@ -326,7 +326,7 @@ public Long run(TransactionContext transaction) throws Exception { } @Test - public void testPartitionedDmlRetriesOnUnavailable() throws Exception { + public void testPartitionedDmlRetriesOnUnavailable() { mockSpanner.setExecuteSqlExecutionTime( SimulatedExecutionTime.ofException(Status.UNAVAILABLE.asRuntimeException())); SpannerOptions.Builder builder = @@ -387,7 +387,7 @@ public void testDatabaseOrInstanceDoesNotExistOnPrepareSession() throws Exceptio .run( new TransactionCallable() { @Override - public Void run(TransactionContext transaction) throws Exception { + public Void run(TransactionContext transaction) { return null; } }); @@ -440,7 +440,7 @@ public void testDatabaseOrInstanceDoesNotExistOnInitialization() throws Exceptio } @Test - public void testDatabaseOrInstanceDoesNotExistOnCreate() throws Exception { + public void testDatabaseOrInstanceDoesNotExistOnCreate() { StatusRuntimeException[] exceptions = new StatusRuntimeException[] { SpannerExceptionFactoryTest.newStatusResourceNotFoundException( @@ -578,7 +578,7 @@ private void testExceptionOnPrepareSession(StatusRuntimeException exception) .run( new TransactionCallable() { @Override - public Void run(TransactionContext transaction) throws Exception { + public Void run(TransactionContext transaction) { return null; } }); @@ -594,7 +594,7 @@ public Void run(TransactionContext transaction) throws Exception { .run( new TransactionCallable() { @Override - public Void run(TransactionContext transaction) throws Exception { + public Void run(TransactionContext transaction) { return null; } }); @@ -665,7 +665,7 @@ public void testDatabaseOrInstanceIsDeletedAndThenRecreated() throws Exception { .run( new TransactionCallable() { @Override - public Void run(TransactionContext transaction) throws Exception { + public Void run(TransactionContext transaction) { return null; } }); @@ -690,7 +690,7 @@ public Void run(TransactionContext transaction) throws Exception { .run( new TransactionCallable() { @Override - public Void run(TransactionContext transaction) throws Exception { + public Void run(TransactionContext transaction) { return null; } }); @@ -737,7 +737,7 @@ public void testAllowNestedTransactions() throws InterruptedException { .run( new TransactionCallable() { @Override - public Long run(TransactionContext transaction) throws Exception { + public Long run(TransactionContext transaction) { assertThat(client.pool.getNumberOfSessionsInPool()).isEqualTo(minSessions - 1); return transaction.executeUpdate(UPDATE_STATEMENT); } @@ -772,7 +772,7 @@ public void testNestedTransactionsUsingTwoDatabases() throws InterruptedExceptio .run( new TransactionCallable() { @Override - public Long run(TransactionContext transaction) throws Exception { + public Long run(TransactionContext transaction) { // Client1 should have 1 session checked out. // Client2 should have 0 sessions checked out. assertThat(client1.pool.getNumberOfSessionsInPool()).isEqualTo(minSessions - 1); @@ -783,7 +783,7 @@ public Long run(TransactionContext transaction) throws Exception { .run( new TransactionCallable() { @Override - public Long run(TransactionContext transaction) throws Exception { + public Long run(TransactionContext transaction) { // Both clients should now have 1 session checked out. assertThat(client1.pool.getNumberOfSessionsInPool()) .isEqualTo(minSessions - 1); diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/DatabaseTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/DatabaseTest.java index 74703609d9e..95576150071 100644 --- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/DatabaseTest.java +++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/DatabaseTest.java @@ -51,7 +51,7 @@ public void setUp() { .thenAnswer( new Answer() { @Override - public Backup.Builder answer(InvocationOnMock invocation) throws Throwable { + public Backup.Builder answer(InvocationOnMock invocation) { return new Backup.Builder(dbClient, (BackupId) invocation.getArguments()[0]); } }); diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/GrpcResultSetTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/GrpcResultSetTest.java index 5bad5b5541d..2ee73e75d36 100644 --- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/GrpcResultSetTest.java +++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/GrpcResultSetTest.java @@ -564,7 +564,7 @@ private static ResultSetMetadata makeMetadata(Type rowType) { } @Test - public void serialization() throws Exception { + public void serialization() { Type structType = Type.struct( Arrays.asList( @@ -605,7 +605,7 @@ public void serialization() throws Exception { } @Test - public void nestedStructSerialization() throws Exception { + public void nestedStructSerialization() { Type structType = Type.struct( Arrays.asList( diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/InstanceAdminGaxTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/InstanceAdminGaxTest.java index 4041263a10c..5f3063bc7b2 100644 --- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/InstanceAdminGaxTest.java +++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/InstanceAdminGaxTest.java @@ -300,7 +300,7 @@ public Void apply(Builder input) { } @After - public void tearDown() throws Exception { + public void tearDown() { spanner.close(); } diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/KeyRangeTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/KeyRangeTest.java index 393138c604f..c89d08ef261 100644 --- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/KeyRangeTest.java +++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/KeyRangeTest.java @@ -130,7 +130,7 @@ public void testToString() { } @Test - public void serialization() throws Exception { + public void serialization() { reserializeAndAssert(KeyRange.closedOpen(Key.of(1), Key.of(2))); reserializeAndAssert(KeyRange.closedClosed(Key.of(1), Key.of(2))); reserializeAndAssert(KeyRange.openOpen(Key.of(1), Key.of(2))); diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/KeySetTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/KeySetTest.java index 2712c84613b..7ed74283f39 100644 --- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/KeySetTest.java +++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/KeySetTest.java @@ -264,7 +264,7 @@ public void serializationMultiWithAll() { } @Test - public void javaSerialization() throws Exception { + public void javaSerialization() { reserializeAndAssert( KeySet.all() .toBuilder() diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/KeyTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/KeyTest.java index 81f3957c286..a135e308887 100644 --- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/KeyTest.java +++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/KeyTest.java @@ -179,7 +179,7 @@ public void equalsAndHashCode() { } @Test - public void serialization() throws Exception { + public void serialization() { reserializeAndAssert(Key.of()); reserializeAndAssert(Key.of(new Object[] {null})); reserializeAndAssert(Key.of(true)); diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/MockDatabaseAdminServiceImpl.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/MockDatabaseAdminServiceImpl.java index ff0e7b482f7..832dccb14c0 100644 --- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/MockDatabaseAdminServiceImpl.java +++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/MockDatabaseAdminServiceImpl.java @@ -201,7 +201,7 @@ private CreateDatabaseCallable(String operationName, String name) { } @Override - public Database call() throws Exception { + public Database call() { MockDatabase db = databases.get(name); db.state = State.READY; Database proto = db.toProto(); diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/MockDatabaseAdminServiceImplTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/MockDatabaseAdminServiceImplTest.java index 4364bfe26ac..c73b79d6e61 100644 --- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/MockDatabaseAdminServiceImplTest.java +++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/MockDatabaseAdminServiceImplTest.java @@ -193,7 +193,7 @@ public void setUp() throws IOException { } @After - public void tearDown() throws Exception { + public void tearDown() { client.close(); } diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/MutationTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/MutationTest.java index a6f1049f080..12edae44798 100644 --- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/MutationTest.java +++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/MutationTest.java @@ -413,7 +413,7 @@ public void toProtoCoalescingDeleteChanges() { } @Test - public void javaSerialization() throws Exception { + public void javaSerialization() { reserializeAndAssert(appendAllTypes(Mutation.newInsertBuilder("test")).build()); reserializeAndAssert(appendAllTypes(Mutation.newUpdateBuilder("test")).build()); reserializeAndAssert(appendAllTypes(Mutation.newReplaceBuilder("test")).build()); diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/OperationTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/OperationTest.java index f958c853306..169bf481d0e 100644 --- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/OperationTest.java +++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/OperationTest.java @@ -149,7 +149,7 @@ public void reload() { } @Test - public void waitForCompletes() throws Exception { + public void waitForCompletes() { com.google.longrunning.Operation proto = newBuilder().setName("op1").setDone(false).build(); Operation op = Operation.create(rpc, proto, new ParserImpl()); com.google.spanner.admin.database.v1.Database db = @@ -174,7 +174,7 @@ public void waitForCompletes() throws Exception { } @Test - public void waitForTimesout() throws Exception { + public void waitForTimesout() { com.google.longrunning.Operation proto = newBuilder().setName("op1").setDone(false).build(); Operation op = Operation.create(rpc, proto, new ParserImpl(), clock); when(rpc.getOperation("op1")).thenReturn(proto); diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/RetryOnInvalidatedSessionTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/RetryOnInvalidatedSessionTest.java index d202f5d5eb7..29f442a7617 100644 --- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/RetryOnInvalidatedSessionTest.java +++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/RetryOnInvalidatedSessionTest.java @@ -176,7 +176,7 @@ public static void stopServer() throws InterruptedException { } @Before - public void setUp() throws IOException { + public void setUp() { mockSpanner.reset(); SessionPoolOptions.Builder builder = SessionPoolOptions.newBuilder().setWriteSessionsFraction(WRITE_SESSIONS_FRACTION); @@ -195,7 +195,7 @@ public void setUp() throws IOException { } @After - public void tearDown() throws Exception { + public void tearDown() { spanner.close(); } @@ -573,7 +573,7 @@ public void readWriteTransactionReadOnlySessionInPool() throws InterruptedExcept runner.run( new TransactionCallable() { @Override - public Integer run(TransactionContext transaction) throws Exception { + public Integer run(TransactionContext transaction) { int count = 0; try (ResultSet rs = transaction.executeQuery(SELECT1AND2)) { while (rs.next()) { @@ -596,7 +596,7 @@ public void readWriteTransactionSelect() throws InterruptedException { runner.run( new TransactionCallable() { @Override - public Integer run(TransactionContext transaction) throws Exception { + public Integer run(TransactionContext transaction) { int count = 0; try (ResultSet rs = transaction.executeQuery(SELECT1AND2)) { while (rs.next()) { @@ -623,7 +623,7 @@ public void readWriteTransactionRead() throws InterruptedException { runner.run( new TransactionCallable() { @Override - public Integer run(TransactionContext transaction) throws Exception { + public Integer run(TransactionContext transaction) { int count = 0; try (ResultSet rs = transaction.read("FOO", KeySet.all(), Arrays.asList("BAR"))) { while (rs.next()) { @@ -650,7 +650,7 @@ public void readWriteTransactionReadUsingIndex() throws InterruptedException { runner.run( new TransactionCallable() { @Override - public Integer run(TransactionContext transaction) throws Exception { + public Integer run(TransactionContext transaction) { int count = 0; try (ResultSet rs = transaction.readUsingIndex( @@ -679,7 +679,7 @@ public void readWriteTransactionReadRow() throws InterruptedException { runner.run( new TransactionCallable() { @Override - public Struct run(TransactionContext transaction) throws Exception { + public Struct run(TransactionContext transaction) { return transaction.readRow("FOO", Key.of(), Arrays.asList("BAR")); } }); @@ -700,7 +700,7 @@ public void readWriteTransactionReadRowUsingIndex() throws InterruptedException runner.run( new TransactionCallable() { @Override - public Struct run(TransactionContext transaction) throws Exception { + public Struct run(TransactionContext transaction) { return transaction.readRowUsingIndex( "FOO", "IDX", Key.of(), Arrays.asList("BAR")); } @@ -722,7 +722,7 @@ public void readWriteTransactionUpdate() throws InterruptedException { runner.run( new TransactionCallable() { @Override - public Long run(TransactionContext transaction) throws Exception { + public Long run(TransactionContext transaction) { return transaction.executeUpdate(UPDATE_STATEMENT); } }); @@ -743,7 +743,7 @@ public void readWriteTransactionBatchUpdate() throws InterruptedException { runner.run( new TransactionCallable() { @Override - public long[] run(TransactionContext transaction) throws Exception { + public long[] run(TransactionContext transaction) { return transaction.batchUpdate(Arrays.asList(UPDATE_STATEMENT)); } }); @@ -764,7 +764,7 @@ public void readWriteTransactionBuffer() throws InterruptedException { runner.run( new TransactionCallable() { @Override - public Void run(TransactionContext transaction) throws Exception { + public Void run(TransactionContext transaction) { transaction.buffer(Mutation.newInsertBuilder("FOO").set("BAR").to(1L).build()); return null; } @@ -777,7 +777,7 @@ public Void run(TransactionContext transaction) throws Exception { } @Test - public void readWriteTransactionSelectInvalidatedDuringTransaction() throws InterruptedException { + public void readWriteTransactionSelectInvalidatedDuringTransaction() { try { TransactionRunner runner = client.readWriteTransaction(); int attempts = @@ -814,7 +814,7 @@ public Integer run(TransactionContext transaction) throws Exception { } @Test - public void readWriteTransactionReadInvalidatedDuringTransaction() throws InterruptedException { + public void readWriteTransactionReadInvalidatedDuringTransaction() { try { TransactionRunner runner = client.readWriteTransaction(); int attempts = @@ -851,8 +851,7 @@ public Integer run(TransactionContext transaction) throws Exception { } @Test - public void readWriteTransactionReadUsingIndexInvalidatedDuringTransaction() - throws InterruptedException { + public void readWriteTransactionReadUsingIndexInvalidatedDuringTransaction() { try { TransactionRunner runner = client.readWriteTransaction(); int attempts = @@ -893,8 +892,7 @@ public Integer run(TransactionContext transaction) throws Exception { } @Test - public void readWriteTransactionReadRowInvalidatedDuringTransaction() - throws InterruptedException { + public void readWriteTransactionReadRowInvalidatedDuringTransaction() { try { TransactionRunner runner = client.readWriteTransaction(); int attempts = @@ -922,8 +920,7 @@ public Integer run(TransactionContext transaction) throws Exception { } @Test - public void readWriteTransactionReadRowUsingIndexInvalidatedDuringTransaction() - throws InterruptedException { + public void readWriteTransactionReadRowUsingIndexInvalidatedDuringTransaction() { try { TransactionRunner runner = client.readWriteTransaction(); int attempts = diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/SessionClientTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/SessionClientTest.java index fe680207051..39dfee6a3f1 100644 --- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/SessionClientTest.java +++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/SessionClientTest.java @@ -151,8 +151,7 @@ public void batchCreateAndCloseSessions() { .then( new Answer>() { @Override - public List answer(InvocationOnMock invocation) - throws Throwable { + public List answer(InvocationOnMock invocation) { Map options = invocation.getArgumentAt(3, Map.class); Long channelHint = (Long) options.get(SpannerRpc.Option.CHANNEL_HINT); usedChannels.add(channelHint); @@ -215,8 +214,7 @@ public void batchCreateSessionsDistributesMultipleRequestsOverChannels() { .then( new Answer>() { @Override - public List answer(InvocationOnMock invocation) - throws Throwable { + public List answer(InvocationOnMock invocation) { Map options = invocation.getArgumentAt(3, Map.class); Long channelHint = (Long) options.get(SpannerRpc.Option.CHANNEL_HINT); usedChannelHintss.add(channelHint); @@ -300,8 +298,7 @@ public void batchCreateSessionsWithExceptions() { .then( new Answer>() { @Override - public List answer(InvocationOnMock invocation) - throws Throwable { + public List answer(InvocationOnMock invocation) { Map options = invocation.getArgumentAt(3, Map.class); Long channelHint = (Long) options.get(SpannerRpc.Option.CHANNEL_HINT); if (errorOnChannels.contains(channelHint)) { @@ -368,8 +365,7 @@ public void batchCreateSessionsServerReturnsLessSessionsPerBatch() { .then( new Answer>() { @Override - public List answer(InvocationOnMock invocation) - throws Throwable { + public List answer(InvocationOnMock invocation) { int sessionCount = invocation.getArgumentAt(1, Integer.class); List res = new ArrayList<>(); for (int i = 1; i <= Math.min(MAX_SESSIONS_PER_BATCH, sessionCount); i++) { diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/SessionImplTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/SessionImplTest.java index fcc36d2b1b5..be4179f21bd 100644 --- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/SessionImplTest.java +++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/SessionImplTest.java @@ -124,7 +124,7 @@ public Void run(TransactionContext transaction) throws SpannerException { .run( new TransactionCallable() { @Override - public Void run(TransactionContext transaction) throws Exception { + public Void run(TransactionContext transaction) { return null; } }); @@ -428,7 +428,7 @@ private void mockRead(final PartialResultSet myResultSet) { .then( new Answer() { @Override - public SpannerRpc.StreamingCall answer(InvocationOnMock invocation) throws Throwable { + public SpannerRpc.StreamingCall answer(InvocationOnMock invocation) { consumer.getValue().onPartialResultSet(myResultSet); consumer.getValue().onCompleted(); return new NoOpStreamingCall(); diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/SessionPoolIntegrationTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/SessionPoolIntegrationTest.java index 353dbdfe46f..b7ddb19223c 100644 --- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/SessionPoolIntegrationTest.java +++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/SessionPoolIntegrationTest.java @@ -74,7 +74,7 @@ public static void setUpDatabase() { } @Before - public void setUp() throws Exception { + public void setUp() { SessionPoolOptions options = SessionPoolOptions.newBuilder().setMinSessions(1).setMaxSessions(2).build(); pool = diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/SessionPoolLeakTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/SessionPoolLeakTest.java index dbafb9dd017..2dc31bb28a9 100644 --- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/SessionPoolLeakTest.java +++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/SessionPoolLeakTest.java @@ -72,7 +72,7 @@ public static void stopServer() throws InterruptedException { } @Before - public void setUp() throws Exception { + public void setUp() { mockSpanner.reset(); mockSpanner.removeAllExecutionTimes(); SpannerOptions.Builder builder = @@ -95,7 +95,7 @@ public void setUp() throws Exception { } @After - public void tearDown() throws Exception { + public void tearDown() { spanner.close(); } @@ -135,7 +135,7 @@ private void readWriteTransactionTest( .run( new TransactionCallable() { @Override - public Void run(TransactionContext transaction) throws Exception { + public Void run(TransactionContext transaction) { return null; } }); @@ -161,7 +161,7 @@ public void run() { } @Test - public void testTransactionManagerExceptionOnBegin() throws Exception { + public void testTransactionManagerExceptionOnBegin() { transactionManagerTest( new Runnable() { @Override diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/SessionPoolMaintainerTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/SessionPoolMaintainerTest.java index 8d1b7804327..8007ce83858 100644 --- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/SessionPoolMaintainerTest.java +++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/SessionPoolMaintainerTest.java @@ -56,7 +56,7 @@ public class SessionPoolMaintainerTest extends BaseSessionPoolTest { private Map pingedSessions = new HashMap<>(); @Before - public void setUp() throws Exception { + public void setUp() { initMocks(this); when(client.getOptions()).thenReturn(spannerOptions); when(client.getSessionClient(db)).thenReturn(sessionClient); @@ -78,7 +78,7 @@ private void setupMockSessionCreation() { doAnswer( new Answer() { @Override - public Void answer(final InvocationOnMock invocation) throws Throwable { + public Void answer(final InvocationOnMock invocation) { executor.submit( new Runnable() { @Override @@ -107,7 +107,7 @@ private SessionImpl setupMockSession(final SessionImpl session) { .thenAnswer( new Answer() { @Override - public ResultSet answer(InvocationOnMock invocation) throws Throwable { + public ResultSet answer(InvocationOnMock invocation) { Integer currentValue = pingedSessions.get(session.getName()); if (currentValue == null) { currentValue = 0; diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/SessionPoolStressTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/SessionPoolStressTest.java index b059e4f8615..e5f5dff4638 100644 --- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/SessionPoolStressTest.java +++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/SessionPoolStressTest.java @@ -102,7 +102,7 @@ private void setupSpanner(DatabaseId db) { new Answer() { @Override - public Session answer(InvocationOnMock invocation) throws Throwable { + public Session answer(InvocationOnMock invocation) { synchronized (lock) { SessionImpl session = mockSession(); setupSession(session); @@ -118,7 +118,7 @@ public Session answer(InvocationOnMock invocation) throws Throwable { doAnswer( new Answer() { @Override - public Void answer(InvocationOnMock invocation) throws Throwable { + public Void answer(InvocationOnMock invocation) { int sessionCount = invocation.getArgumentAt(0, Integer.class); for (int s = 0; s < sessionCount; s++) { synchronized (lock) { @@ -151,7 +151,7 @@ private void setupSession(final SessionImpl session) { new Answer() { @Override - public ResultSet answer(InvocationOnMock invocation) throws Throwable { + public ResultSet answer(InvocationOnMock invocation) { resetTransaction(session); return mockResult; } @@ -161,7 +161,7 @@ public ResultSet answer(InvocationOnMock invocation) throws Throwable { new Answer>() { @Override - public ApiFuture answer(InvocationOnMock invocation) throws Throwable { + public ApiFuture answer(InvocationOnMock invocation) { synchronized (lock) { if (expiredSessions.contains(session.getName())) { return ApiFutures.immediateFailedFuture( @@ -184,7 +184,7 @@ public ApiFuture answer(InvocationOnMock invocation) throws Throwable { doAnswer( new Answer() { @Override - public Void answer(InvocationOnMock invocation) throws Throwable { + public Void answer(InvocationOnMock invocation) { if (random.nextInt(100) < 10) { expireSession(session); throw SpannerExceptionFactoryTest.newSessionNotFoundException(session.getName()); diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/SessionPoolTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/SessionPoolTest.java index 99cffbaec71..db56c8ff828 100644 --- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/SessionPoolTest.java +++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/SessionPoolTest.java @@ -132,7 +132,7 @@ private SessionPool createPool( } @Before - public void setUp() throws Exception { + public void setUp() { initMocks(this); when(client.getOptions()).thenReturn(spannerOptions); when(client.getSessionClient(db)).thenReturn(sessionClient); @@ -150,7 +150,7 @@ private void setupMockSessionCreation() { doAnswer( new Answer() { @Override - public Void answer(final InvocationOnMock invocation) throws Throwable { + public Void answer(final InvocationOnMock invocation) { executor.submit( new Runnable() { @Override @@ -241,7 +241,7 @@ public void poolClosureClosesLeakedSessions() throws Exception { doAnswer( new Answer() { @Override - public Void answer(final InvocationOnMock invocation) throws Throwable { + public Void answer(final InvocationOnMock invocation) { executor.submit( new Runnable() { @Override @@ -299,7 +299,7 @@ public void poolClosureFailsPendingReadWaiters() throws Exception { doAnswer( new Answer() { @Override - public Void answer(final InvocationOnMock invocation) throws Throwable { + public Void answer(final InvocationOnMock invocation) { executor.submit( new Runnable() { @Override @@ -315,7 +315,7 @@ public void run() { .doAnswer( new Answer() { @Override - public Void answer(final InvocationOnMock invocation) throws Throwable { + public Void answer(final InvocationOnMock invocation) { executor.submit( new Callable() { @Override @@ -357,7 +357,7 @@ public void poolClosureFailsPendingWriteWaiters() throws Exception { doAnswer( new Answer() { @Override - public Void answer(final InvocationOnMock invocation) throws Throwable { + public Void answer(final InvocationOnMock invocation) { executor.submit( new Runnable() { @Override @@ -373,7 +373,7 @@ public void run() { .doAnswer( new Answer() { @Override - public Void answer(final InvocationOnMock invocation) throws Throwable { + public Void answer(final InvocationOnMock invocation) { executor.submit( new Callable() { @Override @@ -413,7 +413,7 @@ public void poolClosesEvenIfCreationFails() throws Exception { doAnswer( new Answer() { @Override - public Void answer(final InvocationOnMock invocation) throws Throwable { + public Void answer(final InvocationOnMock invocation) { executor.submit( new Callable() { @Override @@ -449,7 +449,7 @@ public void poolClosesEvenIfPreparationFails() throws Exception { doAnswer( new Answer() { @Override - public Void answer(final InvocationOnMock invocation) throws Throwable { + public Void answer(final InvocationOnMock invocation) { executor.submit( new Runnable() { @Override @@ -489,12 +489,12 @@ public Session answer(InvocationOnMock invocation) throws Throwable { } @Test - public void poolClosureFailsNewRequests() throws Exception { + public void poolClosureFailsNewRequests() { final SessionImpl session = mockSession(); doAnswer( new Answer() { @Override - public Void answer(final InvocationOnMock invocation) throws Throwable { + public Void answer(final InvocationOnMock invocation) { executor.submit( new Runnable() { @Override @@ -543,11 +543,11 @@ public void creationExceptionPropagatesToReadSession() { doAnswer( new Answer() { @Override - public Void answer(final InvocationOnMock invocation) throws Throwable { + public Void answer(final InvocationOnMock invocation) { executor.submit( new Callable() { @Override - public Void call() throws Exception { + public Void call() { SessionConsumerImpl consumer = invocation.getArgumentAt(2, SessionConsumerImpl.class); consumer.onSessionCreateFailure( @@ -574,11 +574,11 @@ public void creationExceptionPropagatesToReadWriteSession() { doAnswer( new Answer() { @Override - public Void answer(final InvocationOnMock invocation) throws Throwable { + public Void answer(final InvocationOnMock invocation) { executor.submit( new Callable() { @Override - public Void call() throws Exception { + public Void call() { SessionConsumerImpl consumer = invocation.getArgumentAt(2, SessionConsumerImpl.class); consumer.onSessionCreateFailure( @@ -606,7 +606,7 @@ public void prepareExceptionPropagatesToReadWriteSession() { doAnswer( new Answer() { @Override - public Void answer(final InvocationOnMock invocation) throws Throwable { + public Void answer(final InvocationOnMock invocation) { executor.submit( new Runnable() { @Override @@ -639,7 +639,7 @@ public void getReadWriteSession() { doAnswer( new Answer() { @Override - public Void answer(final InvocationOnMock invocation) throws Throwable { + public Void answer(final InvocationOnMock invocation) { executor.submit( new Runnable() { @Override @@ -670,7 +670,7 @@ public void getMultipleReadWriteSessions() { doAnswer( new Answer() { @Override - public Void answer(final InvocationOnMock invocation) throws Throwable { + public Void answer(final InvocationOnMock invocation) { executor.submit( new Runnable() { @Override @@ -701,7 +701,7 @@ public void getMultipleConcurrentReadWriteSessions() { doAnswer( new Answer() { @Override - public Void answer(final InvocationOnMock invocation) throws Throwable { + public Void answer(final InvocationOnMock invocation) { executor.submit( new Runnable() { @Override @@ -735,7 +735,7 @@ public void sessionIsPrePrepared() { new Answer() { @Override - public Void answer(InvocationOnMock arg0) throws Throwable { + public Void answer(InvocationOnMock arg0) { prepareLatch.countDown(); return null; } @@ -746,7 +746,7 @@ public Void answer(InvocationOnMock arg0) throws Throwable { new Answer() { @Override - public Void answer(InvocationOnMock arg0) throws Throwable { + public Void answer(InvocationOnMock arg0) { prepareLatch.countDown(); return null; } @@ -756,7 +756,7 @@ public Void answer(InvocationOnMock arg0) throws Throwable { doAnswer( new Answer() { @Override - public Void answer(final InvocationOnMock invocation) throws Throwable { + public Void answer(final InvocationOnMock invocation) { executor.submit( new Runnable() { @Override @@ -797,7 +797,7 @@ public void getReadSessionFallsBackToWritePreparedSession() throws Exception { doAnswer( new Answer() { @Override - public Void answer(InvocationOnMock arg0) throws Throwable { + public Void answer(InvocationOnMock arg0) { prepareLatch.countDown(); return null; } @@ -807,7 +807,7 @@ public Void answer(InvocationOnMock arg0) throws Throwable { doAnswer( new Answer() { @Override - public Void answer(final InvocationOnMock invocation) throws Throwable { + public Void answer(final InvocationOnMock invocation) { executor.submit( new Runnable() { @Override @@ -847,7 +847,7 @@ public void failOnPoolExhaustion() { doAnswer( new Answer() { @Override - public Void answer(final InvocationOnMock invocation) throws Throwable { + public Void answer(final InvocationOnMock invocation) { executor.submit( new Runnable() { @Override @@ -888,7 +888,7 @@ public void poolWorksWhenSessionNotFound() { doAnswer( new Answer() { @Override - public Void answer(final InvocationOnMock invocation) throws Throwable { + public Void answer(final InvocationOnMock invocation) { executor.submit( new Runnable() { @Override @@ -924,7 +924,7 @@ public void idleSessionCleanup() throws Exception { doAnswer( new Answer() { @Override - public Void answer(final InvocationOnMock invocation) throws Throwable { + public Void answer(final InvocationOnMock invocation) { executor.submit( new Runnable() { @Override @@ -984,7 +984,7 @@ public void keepAlive() throws Exception { doAnswer( new Answer() { @Override - public Void answer(final InvocationOnMock invocation) throws Throwable { + public Void answer(final InvocationOnMock invocation) { executor.submit( new Runnable() { @Override @@ -1040,7 +1040,7 @@ public void testMaintainerKeepsWriteProportion() throws Exception { doAnswer( new Answer() { @Override - public Void answer(final InvocationOnMock invocation) throws Throwable { + public Void answer(final InvocationOnMock invocation) { executor.submit( new Runnable() { @Override @@ -1142,7 +1142,7 @@ public void blockAndTimeoutOnPoolExhaustion() throws Exception { executor.submit( new Callable() { @Override - public Void call() throws Exception { + public Void call() { Session session; latch.countDown(); if (finWrite) { @@ -1198,7 +1198,7 @@ public void testSessionNotFoundSingleUse() { doAnswer( new Answer() { @Override - public Void answer(final InvocationOnMock invocation) throws Throwable { + public Void answer(final InvocationOnMock invocation) { executor.submit( new Runnable() { @Override @@ -1214,7 +1214,7 @@ public void run() { .doAnswer( new Answer() { @Override - public Void answer(final InvocationOnMock invocation) throws Throwable { + public Void answer(final InvocationOnMock invocation) { executor.submit( new Runnable() { @Override @@ -1254,7 +1254,7 @@ public void testSessionNotFoundReadOnlyTransaction() { doAnswer( new Answer() { @Override - public Void answer(final InvocationOnMock invocation) throws Throwable { + public Void answer(final InvocationOnMock invocation) { executor.submit( new Runnable() { @Override @@ -1270,7 +1270,7 @@ public void run() { .doAnswer( new Answer() { @Override - public Void answer(final InvocationOnMock invocation) throws Throwable { + public Void answer(final InvocationOnMock invocation) { executor.submit( new Runnable() { @Override @@ -1376,7 +1376,7 @@ public void testSessionNotFoundReadWriteTransaction() { doAnswer( new Answer() { @Override - public Void answer(final InvocationOnMock invocation) throws Throwable { + public Void answer(final InvocationOnMock invocation) { executor.submit( new Runnable() { @Override @@ -1392,7 +1392,7 @@ public void run() { .doAnswer( new Answer() { @Override - public Void answer(final InvocationOnMock invocation) throws Throwable { + public Void answer(final InvocationOnMock invocation) { executor.submit( new Runnable() { @Override @@ -1430,7 +1430,7 @@ public void run() { private int callNumber = 0; @Override - public Integer run(TransactionContext transaction) throws Exception { + public Integer run(TransactionContext transaction) { callNumber++; if (hasPreparedTransaction) { // If the session had a prepared read/write transaction, that transaction will @@ -1512,7 +1512,7 @@ public void testSessionNotFoundOnPrepareTransaction() { doAnswer( new Answer() { @Override - public Void answer(final InvocationOnMock invocation) throws Throwable { + public Void answer(final InvocationOnMock invocation) { executor.submit( new Runnable() { @Override @@ -1528,7 +1528,7 @@ public void run() { .doAnswer( new Answer() { @Override - public Void answer(final InvocationOnMock invocation) throws Throwable { + public Void answer(final InvocationOnMock invocation) { executor.submit( new Runnable() { @Override @@ -1563,7 +1563,7 @@ public void testSessionNotFoundWrite() { doAnswer( new Answer() { @Override - public Void answer(final InvocationOnMock invocation) throws Throwable { + public Void answer(final InvocationOnMock invocation) { executor.submit( new Runnable() { @Override @@ -1579,7 +1579,7 @@ public void run() { .doAnswer( new Answer() { @Override - public Void answer(final InvocationOnMock invocation) throws Throwable { + public Void answer(final InvocationOnMock invocation) { executor.submit( new Runnable() { @Override @@ -1615,7 +1615,7 @@ public void testSessionNotFoundWriteAtLeastOnce() { doAnswer( new Answer() { @Override - public Void answer(final InvocationOnMock invocation) throws Throwable { + public Void answer(final InvocationOnMock invocation) { executor.submit( new Runnable() { @Override @@ -1631,7 +1631,7 @@ public void run() { .doAnswer( new Answer() { @Override - public Void answer(final InvocationOnMock invocation) throws Throwable { + public Void answer(final InvocationOnMock invocation) { executor.submit( new Runnable() { @Override @@ -1666,7 +1666,7 @@ public void testSessionNotFoundPartitionedUpdate() { doAnswer( new Answer() { @Override - public Void answer(final InvocationOnMock invocation) throws Throwable { + public Void answer(final InvocationOnMock invocation) { executor.submit( new Runnable() { @Override @@ -1682,7 +1682,7 @@ public void run() { .doAnswer( new Answer() { @Override - public Void answer(final InvocationOnMock invocation) throws Throwable { + public Void answer(final InvocationOnMock invocation) { executor.submit( new Runnable() { @Override diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/SpanTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/SpanTest.java index dc4652a1b44..9bbbdcea82c 100644 --- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/SpanTest.java +++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/SpanTest.java @@ -292,7 +292,7 @@ public void transactionRunner() { runner.run( new TransactionCallable() { @Override - public Void run(TransactionContext transaction) throws Exception { + public Void run(TransactionContext transaction) { transaction.executeUpdate(UPDATE_STATEMENT); return null; } @@ -313,7 +313,7 @@ public void transactionRunnerWithError() { runner.run( new TransactionCallable() { @Override - public Void run(TransactionContext transaction) throws Exception { + public Void run(TransactionContext transaction) { transaction.executeUpdate(INVALID_UPDATE_STATEMENT); return null; } diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/SpannerGaxRetryTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/SpannerGaxRetryTest.java index ad7ee39b357..05729d6f53a 100644 --- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/SpannerGaxRetryTest.java +++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/SpannerGaxRetryTest.java @@ -186,7 +186,7 @@ public Void apply(Builder input) { } @After - public void tearDown() throws Exception { + public void tearDown() { spannerWithTimeout.close(); spanner.close(); } @@ -201,7 +201,7 @@ private void warmUpSessionPool(DatabaseClient client) { runner.run( new TransactionCallable() { @Override - public Long run(TransactionContext transaction) throws Exception { + public Long run(TransactionContext transaction) { return transaction.executeUpdate(UPDATE_STATEMENT); } }); @@ -336,7 +336,7 @@ public void readWriteTransactionUnavailable() { runner.run( new TransactionCallable() { @Override - public Long run(TransactionContext transaction) throws Exception { + public Long run(TransactionContext transaction) { return transaction.executeUpdate(UPDATE_STATEMENT); } }); @@ -351,7 +351,7 @@ public void readWriteTransactionStatementAborted() { runner.run( new TransactionCallable() { @Override - public Long run(TransactionContext transaction) throws Exception { + public Long run(TransactionContext transaction) { if (attempts.getAndIncrement() == 0) { mockSpanner.abortTransaction(transaction); } @@ -370,7 +370,7 @@ public void readWriteTransactionCommitAborted() { runner.run( new TransactionCallable() { @Override - public Long run(TransactionContext transaction) throws Exception { + public Long run(TransactionContext transaction) { long res = transaction.executeUpdate(UPDATE_STATEMENT); if (attempts.getAndIncrement() == 0) { mockSpanner.abortTransaction(transaction); @@ -401,7 +401,7 @@ public void readWriteTransactionUncheckedException() { runner.run( new TransactionCallable() { @Override - public Long run(TransactionContext transaction) throws Exception { + public Long run(TransactionContext transaction) { transaction.executeUpdate(UPDATE_STATEMENT); throw SpannerExceptionFactory.newSpannerException(ErrorCode.INVALID_ARGUMENT, "test"); } diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/SpannerImplTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/SpannerImplTest.java index f2546f838d0..aafd88390c0 100644 --- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/SpannerImplTest.java +++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/SpannerImplTest.java @@ -168,7 +168,7 @@ public void getDbclientAfterCloseThrows() { } @Test - public void testSpannerClosed() throws InterruptedException { + public void testSpannerClosed() { SpannerOptions options = createSpannerOptions(); Spanner spanner1 = options.getService(); Spanner spanner2 = options.getService(); @@ -199,7 +199,7 @@ public void testSpannerClosed() throws InterruptedException { } @Test - public void testClientId() throws Exception { + public void testClientId() { // Create a unique database id to be sure it has not yet been used in the lifetime of this JVM. String dbName = String.format("projects/p1/instances/i1/databases/%s", UUID.randomUUID().toString()); diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/SpannerRetryHelperTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/SpannerRetryHelperTest.java index e5a427bff89..415145120f8 100644 --- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/SpannerRetryHelperTest.java +++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/SpannerRetryHelperTest.java @@ -50,7 +50,7 @@ public void testCancelledContext() { final Callable callable = new Callable() { @Override - public Integer call() throws Exception { + public Integer call() { latch.countDown(); throw SpannerExceptionFactory.newSpannerException(ErrorCode.ABORTED, "test"); } @@ -85,12 +85,12 @@ public void run() { } @Test - public void testTimedoutContext() throws InterruptedException { + public void testTimedoutContext() { ScheduledExecutorService service = Executors.newScheduledThreadPool(1); final Callable callable = new Callable() { @Override - public Integer call() throws Exception { + public Integer call() { throw SpannerExceptionFactory.newSpannerException(ErrorCode.ABORTED, "test"); } }; @@ -120,7 +120,7 @@ public void noException() { Callable callable = new Callable() { @Override - public Integer call() throws Exception { + public Integer call() { return 1 + 1; } }; @@ -132,7 +132,7 @@ public void propagateUncheckedException() { Callable callable = new Callable() { @Override - public Integer call() throws Exception { + public Integer call() { throw new IllegalStateException("test"); } }; @@ -145,7 +145,7 @@ public void retryOnAborted() { Callable callable = new Callable() { @Override - public Integer call() throws Exception { + public Integer call() { if (attempts.getAndIncrement() == 0) { throw abortedWithRetryInfo((int) TimeUnit.MILLISECONDS.toNanos(1L)); } @@ -161,7 +161,7 @@ public void retryMultipleTimesOnAborted() { Callable callable = new Callable() { @Override - public Integer call() throws Exception { + public Integer call() { if (attempts.getAndIncrement() < 2) { throw abortedWithRetryInfo((int) TimeUnit.MILLISECONDS.toNanos(1)); } @@ -177,7 +177,7 @@ public void retryOnAbortedAndThenPropagateUnchecked() { Callable callable = new Callable() { @Override - public Integer call() throws Exception { + public Integer call() { if (attempts.getAndIncrement() == 0) { throw abortedWithRetryInfo((int) TimeUnit.MILLISECONDS.toNanos(1L)); } @@ -227,7 +227,7 @@ public void run() { Callable callable = new Callable() { @Override - public Integer call() throws Exception { + public Integer call() { if (attempts.getAndIncrement() == 0) { throw e; } diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/StatementTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/StatementTest.java index f41a659df2a..4e39d1271d2 100644 --- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/StatementTest.java +++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/StatementTest.java @@ -43,7 +43,7 @@ public void basic() { } @Test - public void serialization() throws Exception { + public void serialization() { Statement stmt = Statement.newBuilder("SELECT * FROM table WHERE ") .append("bool_field = @bool_field ") diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/TimestampBoundTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/TimestampBoundTest.java index 1298e052923..955485da5de 100644 --- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/TimestampBoundTest.java +++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/TimestampBoundTest.java @@ -39,7 +39,7 @@ public class TimestampBoundTest { private static final String TEST_TIME_ISO = "2015-10-12T15:14:54Z"; @Test - public void serialization() throws Exception { + public void serialization() { reserializeAndAssert(TimestampBound.strong()); reserializeAndAssert(TimestampBound.ofExactStaleness(10, TimeUnit.NANOSECONDS)); reserializeAndAssert(TimestampBound.ofMaxStaleness(100, TimeUnit.DAYS)); diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/TransactionManagerAbortedTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/TransactionManagerAbortedTest.java index 8272ac4aa89..dec674bd6ca 100644 --- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/TransactionManagerAbortedTest.java +++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/TransactionManagerAbortedTest.java @@ -167,7 +167,7 @@ public static void stopServer() throws InterruptedException { } @Before - public void setUp() throws Exception { + public void setUp() { mockSpanner.reset(); mockSpanner.removeAllExecutionTimes(); SpannerOptions.Builder builder = @@ -179,7 +179,7 @@ public void setUp() throws Exception { } @After - public void tearDown() throws Exception { + public void tearDown() { spanner.close(); } diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/TransactionManagerImplTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/TransactionManagerImplTest.java index 85bb69181a6..ba569653c37 100644 --- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/TransactionManagerImplTest.java +++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/TransactionManagerImplTest.java @@ -236,8 +236,7 @@ public void usesPreparedTransaction() { .thenAnswer( new Answer>() { @Override - public List answer(InvocationOnMock invocation) - throws Throwable { + public List answer(InvocationOnMock invocation) { return Arrays.asList( com.google.spanner.v1.Session.newBuilder() .setName((String) invocation.getArguments()[0] + "/sessions/1") @@ -251,7 +250,7 @@ public List answer(InvocationOnMock invocation) .thenAnswer( new Answer() { @Override - public Transaction answer(InvocationOnMock invocation) throws Throwable { + public Transaction answer(InvocationOnMock invocation) { return Transaction.newBuilder() .setId(ByteString.copyFromUtf8(UUID.randomUUID().toString())) .build(); @@ -261,7 +260,7 @@ public Transaction answer(InvocationOnMock invocation) throws Throwable { .thenAnswer( new Answer() { @Override - public CommitResponse answer(InvocationOnMock invocation) throws Throwable { + public CommitResponse answer(InvocationOnMock invocation) { return CommitResponse.newBuilder() .setCommitTimestamp( com.google.protobuf.Timestamp.newBuilder() diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/TransactionRunnerImplTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/TransactionRunnerImplTest.java index c45f46fbd18..074f0a905c3 100644 --- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/TransactionRunnerImplTest.java +++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/TransactionRunnerImplTest.java @@ -90,7 +90,7 @@ public void release(ScheduledExecutorService exec) { private boolean firstRun; @Before - public void setUp() throws Exception { + public void setUp() { MockitoAnnotations.initMocks(this); firstRun = true; when(session.newTransaction()).thenReturn(txn); @@ -117,8 +117,7 @@ public void usesPreparedTransaction() { .thenAnswer( new Answer>() { @Override - public List answer(InvocationOnMock invocation) - throws Throwable { + public List answer(InvocationOnMock invocation) { return Arrays.asList( com.google.spanner.v1.Session.newBuilder() .setName((String) invocation.getArguments()[0] + "/sessions/1") @@ -131,7 +130,7 @@ public List answer(InvocationOnMock invocation) .thenAnswer( new Answer() { @Override - public Transaction answer(InvocationOnMock invocation) throws Throwable { + public Transaction answer(InvocationOnMock invocation) { return Transaction.newBuilder() .setId(ByteString.copyFromUtf8(UUID.randomUUID().toString())) .build(); @@ -141,7 +140,7 @@ public Transaction answer(InvocationOnMock invocation) throws Throwable { .thenAnswer( new Answer() { @Override - public CommitResponse answer(InvocationOnMock invocation) throws Throwable { + public CommitResponse answer(InvocationOnMock invocation) { return CommitResponse.newBuilder() .setCommitTimestamp( Timestamp.newBuilder().setSeconds(System.currentTimeMillis() * 1000)) @@ -156,7 +155,7 @@ public CommitResponse answer(InvocationOnMock invocation) throws Throwable { .run( new TransactionCallable() { @Override - public Void run(TransactionContext transaction) throws Exception { + public Void run(TransactionContext transaction) { return null; } }); @@ -171,7 +170,7 @@ public void commitSucceeds() { transactionRunner.run( new TransactionCallable() { @Override - public Void run(TransactionContext transaction) throws Exception { + public Void run(TransactionContext transaction) { numCalls.incrementAndGet(); return null; } @@ -197,7 +196,7 @@ public void commitAbort() { transactionRunner.run( new TransactionCallable() { @Override - public Void run(TransactionContext transaction) throws Exception { + public Void run(TransactionContext transaction) { numCalls.incrementAndGet(); return null; } @@ -217,7 +216,7 @@ public void commitFailsWithNonAbort() { transactionRunner.run( new TransactionCallable() { @Override - public Void run(TransactionContext transaction) throws Exception { + public Void run(TransactionContext transaction) { numCalls.incrementAndGet(); return null; } @@ -232,7 +231,7 @@ public Void run(TransactionContext transaction) throws Exception { } @Test - public void runResourceExhaustedNoRetry() throws Exception { + public void runResourceExhaustedNoRetry() { try { runTransaction( new StatusRuntimeException(Status.fromCodeValue(Status.Code.RESOURCE_EXHAUSTED.value()))); @@ -308,7 +307,7 @@ private long[] batchDmlException(int status) { runner.run( new TransactionCallable() { @Override - public long[] run(TransactionContext transaction) throws Exception { + public long[] run(TransactionContext transaction) { numCalls.incrementAndGet(); return transaction.batchUpdate(Arrays.asList(statement, statement)); } @@ -324,7 +323,7 @@ private void runTransaction(final Exception exception) { transactionRunner.run( new TransactionCallable() { @Override - public Void run(TransactionContext transaction) throws Exception { + public Void run(TransactionContext transaction) { if (firstRun) { firstRun = false; throw SpannerExceptionFactory.newSpannerException(exception); diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/ValueTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/ValueTest.java index dbc9c8ea618..a7b99d313e3 100644 --- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/ValueTest.java +++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/ValueTest.java @@ -28,7 +28,6 @@ import com.google.common.collect.ForwardingList; import com.google.common.collect.Lists; import com.google.common.testing.EqualsTester; -import java.io.IOException; import java.io.Serializable; import java.util.ArrayList; import java.util.Arrays; @@ -1008,13 +1007,11 @@ protected List delegate() { return delegate; } - private void readObject(@SuppressWarnings("unused") java.io.ObjectInputStream unusedStream) - throws IOException, ClassNotFoundException { + private void readObject(@SuppressWarnings("unused") java.io.ObjectInputStream unusedStream) { throw new IllegalStateException("Serialization disabled"); } - private void writeObject(@SuppressWarnings("unused") java.io.ObjectOutputStream unusedStream) - throws IOException { + private void writeObject(@SuppressWarnings("unused") java.io.ObjectOutputStream unusedStream) { throw new IllegalStateException("Serialization disabled"); } } diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/admin/database/v1/DatabaseAdminClientTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/admin/database/v1/DatabaseAdminClientTest.java index 78efb144665..a20872cc510 100644 --- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/admin/database/v1/DatabaseAdminClientTest.java +++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/admin/database/v1/DatabaseAdminClientTest.java @@ -115,7 +115,7 @@ public void setUp() throws IOException { } @After - public void tearDown() throws Exception { + public void tearDown() { client.close(); } diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/admin/instance/v1/InstanceAdminClientTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/admin/instance/v1/InstanceAdminClientTest.java index 406171d3aa5..72e9d59379f 100644 --- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/admin/instance/v1/InstanceAdminClientTest.java +++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/admin/instance/v1/InstanceAdminClientTest.java @@ -103,7 +103,7 @@ public void setUp() throws IOException { } @After - public void tearDown() throws Exception { + public void tearDown() { client.close(); } diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/ConnectionImplTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/ConnectionImplTest.java index e13e1d0c151..f5295ef96b9 100644 --- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/ConnectionImplTest.java +++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/ConnectionImplTest.java @@ -216,7 +216,7 @@ public static ConnectionImpl createConnection(ConnectionOptions options) { .thenAnswer( new Answer() { @Override - public ResultSet answer(InvocationOnMock invocation) throws Throwable { + public ResultSet answer(InvocationOnMock invocation) { if (select1ResultSet.nextCalled) { // create a new mock return new SimpleResultSet(createSelect1MockResultSet()); @@ -232,7 +232,7 @@ public ResultSet answer(InvocationOnMock invocation) throws Throwable { .then( new Answer() { @Override - public Timestamp answer(InvocationOnMock invocation) throws Throwable { + public Timestamp answer(InvocationOnMock invocation) { if (select1ResultSet.isNextCalled() || select1ResultSetWithStats.isNextCalled()) { return Timestamp.now(); } @@ -247,13 +247,13 @@ public Timestamp answer(InvocationOnMock invocation) throws Throwable { .thenAnswer( new Answer() { @Override - public TransactionManager answer(InvocationOnMock invocation) throws Throwable { + public TransactionManager answer(InvocationOnMock invocation) { TransactionContext txContext = mock(TransactionContext.class); when(txContext.executeQuery(Statement.of(SELECT))) .thenAnswer( new Answer() { @Override - public ResultSet answer(InvocationOnMock invocation) throws Throwable { + public ResultSet answer(InvocationOnMock invocation) { if (select1ResultSet.nextCalled) { // create a new mock return new SimpleResultSet(createSelect1MockResultSet()); @@ -274,13 +274,13 @@ public ResultSet answer(InvocationOnMock invocation) throws Throwable { .thenAnswer( new Answer() { @Override - public ReadOnlyTransaction answer(InvocationOnMock invocation) throws Throwable { + public ReadOnlyTransaction answer(InvocationOnMock invocation) { ReadOnlyTransaction tx = mock(ReadOnlyTransaction.class); when(tx.executeQuery(Statement.of(SELECT))) .thenAnswer( new Answer() { @Override - public ResultSet answer(InvocationOnMock invocation) throws Throwable { + public ResultSet answer(InvocationOnMock invocation) { if (select1ResultSet.nextCalled) { // create a new mock return new SimpleResultSet(createSelect1MockResultSet()); @@ -296,7 +296,7 @@ public ResultSet answer(InvocationOnMock invocation) throws Throwable { .then( new Answer() { @Override - public Timestamp answer(InvocationOnMock invocation) throws Throwable { + public Timestamp answer(InvocationOnMock invocation) { if (select1ResultSet.isNextCalled() || select1ResultSetWithStats.isNextCalled()) { return Timestamp.now(); @@ -314,7 +314,7 @@ public Timestamp answer(InvocationOnMock invocation) throws Throwable { .thenAnswer( new Answer() { @Override - public TransactionRunner answer(InvocationOnMock invocation) throws Throwable { + public TransactionRunner answer(InvocationOnMock invocation) { TransactionRunner runner = new TransactionRunner() { private Timestamp commitTimestamp; diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/ConnectionStatementWithNoParametersTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/ConnectionStatementWithNoParametersTest.java index 8012f255dcb..e3be3cfeae6 100644 --- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/ConnectionStatementWithNoParametersTest.java +++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/ConnectionStatementWithNoParametersTest.java @@ -32,7 +32,7 @@ public class ConnectionStatementWithNoParametersTest { private final StatementParser parser = StatementParser.INSTANCE; @Test - public void testExecuteGetAutocommit() throws Exception { + public void testExecuteGetAutocommit() { ParsedStatement statement = parser.parse(Statement.of("show variable autocommit")); ConnectionImpl connection = mock(ConnectionImpl.class); ConnectionStatementExecutorImpl executor = mock(ConnectionStatementExecutorImpl.class); @@ -43,7 +43,7 @@ public void testExecuteGetAutocommit() throws Exception { } @Test - public void testExecuteGetReadOnly() throws Exception { + public void testExecuteGetReadOnly() { ParsedStatement statement = parser.parse(Statement.of("show variable readonly")); ConnectionImpl connection = mock(ConnectionImpl.class); ConnectionStatementExecutorImpl executor = mock(ConnectionStatementExecutorImpl.class); @@ -54,7 +54,7 @@ public void testExecuteGetReadOnly() throws Exception { } @Test - public void testExecuteGetAutocommitDmlMode() throws Exception { + public void testExecuteGetAutocommitDmlMode() { ParsedStatement statement = parser.parse(Statement.of("show variable autocommit_dml_mode")); ConnectionImpl connection = mock(ConnectionImpl.class); ConnectionStatementExecutorImpl executor = mock(ConnectionStatementExecutorImpl.class); @@ -66,7 +66,7 @@ public void testExecuteGetAutocommitDmlMode() throws Exception { } @Test - public void testExecuteGetStatementTimeout() throws Exception { + public void testExecuteGetStatementTimeout() { ParsedStatement statement = parser.parse(Statement.of("show variable statement_timeout")); ConnectionImpl connection = mock(ConnectionImpl.class); ConnectionStatementExecutorImpl executor = mock(ConnectionStatementExecutorImpl.class); @@ -79,7 +79,7 @@ public void testExecuteGetStatementTimeout() throws Exception { } @Test - public void testExecuteGetReadTimestamp() throws Exception { + public void testExecuteGetReadTimestamp() { ParsedStatement statement = parser.parse(Statement.of("show variable read_timestamp")); ConnectionImpl connection = mock(ConnectionImpl.class); ConnectionStatementExecutorImpl executor = mock(ConnectionStatementExecutorImpl.class); @@ -91,7 +91,7 @@ public void testExecuteGetReadTimestamp() throws Exception { } @Test - public void testExecuteGetCommitTimestamp() throws Exception { + public void testExecuteGetCommitTimestamp() { ParsedStatement statement = parser.parse(Statement.of("show variable commit_timestamp")); ConnectionImpl connection = mock(ConnectionImpl.class); ConnectionStatementExecutorImpl executor = mock(ConnectionStatementExecutorImpl.class); @@ -103,7 +103,7 @@ public void testExecuteGetCommitTimestamp() throws Exception { } @Test - public void testExecuteGetReadOnlyStaleness() throws Exception { + public void testExecuteGetReadOnlyStaleness() { ParsedStatement statement = parser.parse(Statement.of("show variable read_only_staleness")); ConnectionImpl connection = mock(ConnectionImpl.class); ConnectionStatementExecutorImpl executor = mock(ConnectionStatementExecutorImpl.class); @@ -115,7 +115,7 @@ public void testExecuteGetReadOnlyStaleness() throws Exception { } @Test - public void testExecuteGetOptimizerVersion() throws Exception { + public void testExecuteGetOptimizerVersion() { ParsedStatement statement = parser.parse(Statement.of("show variable optimizer_version")); ConnectionImpl connection = mock(ConnectionImpl.class); ConnectionStatementExecutorImpl executor = mock(ConnectionStatementExecutorImpl.class); @@ -127,7 +127,7 @@ public void testExecuteGetOptimizerVersion() throws Exception { } @Test - public void testExecuteBegin() throws Exception { + public void testExecuteBegin() { ParsedStatement subject = parser.parse(Statement.of("begin")); for (String statement : subject.getClientSideStatement().getExampleStatements()) { ConnectionImpl connection = mock(ConnectionImpl.class); @@ -140,7 +140,7 @@ public void testExecuteBegin() throws Exception { } @Test - public void testExecuteCommit() throws Exception { + public void testExecuteCommit() { ParsedStatement subject = parser.parse(Statement.of("commit")); for (String statement : subject.getClientSideStatement().getExampleStatements()) { ConnectionImpl connection = mock(ConnectionImpl.class); @@ -153,7 +153,7 @@ public void testExecuteCommit() throws Exception { } @Test - public void testExecuteRollback() throws Exception { + public void testExecuteRollback() { ParsedStatement subject = parser.parse(Statement.of("rollback")); for (String statement : subject.getClientSideStatement().getExampleStatements()) { ConnectionImpl connection = mock(ConnectionImpl.class); diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/ConnectionStatementWithOneParameterTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/ConnectionStatementWithOneParameterTest.java index b07c308a0ed..56c5c689b0d 100644 --- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/ConnectionStatementWithOneParameterTest.java +++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/ConnectionStatementWithOneParameterTest.java @@ -34,7 +34,7 @@ public class ConnectionStatementWithOneParameterTest { private final StatementParser parser = StatementParser.INSTANCE; @Test - public void testExecuteSetAutcommit() throws Exception { + public void testExecuteSetAutcommit() { ParsedStatement subject = parser.parse(Statement.of("set autocommit = true")); ConnectionImpl connection = mock(ConnectionImpl.class); ConnectionStatementExecutorImpl executor = mock(ConnectionStatementExecutorImpl.class); @@ -49,7 +49,7 @@ public void testExecuteSetAutcommit() throws Exception { } @Test - public void testExecuteSetReadOnly() throws Exception { + public void testExecuteSetReadOnly() { ParsedStatement subject = parser.parse(Statement.of("set readonly = true")); ConnectionImpl connection = mock(ConnectionImpl.class); ConnectionStatementExecutorImpl executor = mock(ConnectionStatementExecutorImpl.class); @@ -64,7 +64,7 @@ public void testExecuteSetReadOnly() throws Exception { } @Test - public void testExecuteSetAutcommitDmlMode() throws Exception { + public void testExecuteSetAutcommitDmlMode() { ParsedStatement subject = parser.parse(Statement.of("set autocommit_dml_mode='foo'")); ConnectionImpl connection = mock(ConnectionImpl.class); ConnectionStatementExecutorImpl executor = mock(ConnectionStatementExecutorImpl.class); @@ -79,7 +79,7 @@ public void testExecuteSetAutcommitDmlMode() throws Exception { } @Test - public void testExecuteSetStatementTimeout() throws Exception { + public void testExecuteSetStatementTimeout() { ConnectionStatementExecutorImpl executor = mock(ConnectionStatementExecutorImpl.class); when(executor.statementSetStatementTimeout(any(Duration.class))).thenCallRealMethod(); ConnectionImpl connection = mock(ConnectionImpl.class); @@ -109,7 +109,7 @@ public void testExecuteSetStatementTimeout() throws Exception { } @Test - public void testExecuteSetReadOnlyStaleness() throws Exception { + public void testExecuteSetReadOnlyStaleness() { ParsedStatement subject = parser.parse(Statement.of("set read_only_staleness='foo'")); ConnectionImpl connection = mock(ConnectionImpl.class); ConnectionStatementExecutorImpl executor = mock(ConnectionStatementExecutorImpl.class); @@ -149,7 +149,7 @@ private String timestampBoundToString(TimestampBound staleness) { } @Test - public void testExecuteSetOptimizerVersion() throws Exception { + public void testExecuteSetOptimizerVersion() { ParsedStatement subject = parser.parse(Statement.of("set optimizer_version='foo'")); ConnectionImpl connection = mock(ConnectionImpl.class); ConnectionStatementExecutorImpl executor = mock(ConnectionStatementExecutorImpl.class); @@ -164,7 +164,7 @@ public void testExecuteSetOptimizerVersion() throws Exception { } @Test - public void testExecuteSetTransaction() throws Exception { + public void testExecuteSetTransaction() { ParsedStatement subject = parser.parse(Statement.of("set transaction read_only")); ConnectionImpl connection = mock(ConnectionImpl.class); ConnectionStatementExecutorImpl executor = mock(ConnectionStatementExecutorImpl.class); diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/CredentialsServiceTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/CredentialsServiceTest.java index 7a48c577c28..e8dc7a4f875 100644 --- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/CredentialsServiceTest.java +++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/CredentialsServiceTest.java @@ -54,14 +54,14 @@ GoogleCredentials internalGetApplicationDefault() throws IOException { }; @Test - public void testCreateCredentialsDefault() throws Exception { + public void testCreateCredentialsDefault() { ServiceAccountCredentials credentials = (ServiceAccountCredentials) service.createCredentials(null); assertThat(credentials.getProjectId(), is(equalTo(APP_DEFAULT_PROJECT_ID))); } @Test - public void testCreateCredentialsFile() throws IOException { + public void testCreateCredentialsFile() { ServiceAccountCredentials credentials = (ServiceAccountCredentials) service.createCredentials(FILE_TEST_PATH); assertThat(credentials.getProjectId(), is(equalTo(TEST_PROJECT_ID))); diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/DirectExecuteResultSetTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/DirectExecuteResultSetTest.java index 477c872179a..237c6af718b 100644 --- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/DirectExecuteResultSetTest.java +++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/DirectExecuteResultSetTest.java @@ -144,8 +144,7 @@ private void callMethods( } @Test - public void testValidMethodCall() - throws IllegalAccessException, IllegalArgumentException, InvocationTargetException { + public void testValidMethodCall() throws IllegalArgumentException { ResultSet delegate = mock(ResultSet.class); when(delegate.next()).thenReturn(true, true, false); DirectExecuteResultSet subject = DirectExecuteResultSet.ofResultSet(delegate); diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/ITAbstractSpannerTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/ITAbstractSpannerTest.java index a14b9aa4a7f..99fd3d7a102 100644 --- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/ITAbstractSpannerTest.java +++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/ITAbstractSpannerTest.java @@ -33,7 +33,6 @@ import com.google.cloud.spanner.connection.StatementParser.ParsedStatement; import com.google.common.base.Preconditions; import com.google.common.base.Strings; -import java.io.IOException; import java.lang.reflect.Field; import java.nio.file.Files; import java.nio.file.Paths; @@ -41,7 +40,6 @@ import java.util.Collections; import java.util.List; import java.util.Random; -import java.util.concurrent.ExecutionException; import org.junit.Before; import org.junit.BeforeClass; import org.junit.ClassRule; @@ -186,7 +184,7 @@ public static StringBuilder extractConnectionUrl(SpannerOptions options, Databas } @BeforeClass - public static void setup() throws IOException, InterruptedException, ExecutionException { + public static void setup() { database = env.getTestHelper().createTestDatabase(); } @@ -268,7 +266,7 @@ protected boolean doCreateDefaultTestTable() { } @Before - public void createTestTable() throws Exception { + public void createTestTable() { if (doCreateDefaultTestTable()) { try (Connection connection = createConnection()) { connection.setAutocommit(true); diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/ReadWriteTransactionTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/ReadWriteTransactionTest.java index f9a1e7afaba..e0cd8db9a68 100644 --- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/ReadWriteTransactionTest.java +++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/ReadWriteTransactionTest.java @@ -50,7 +50,6 @@ import com.google.spanner.v1.ResultSetStats; import java.util.Arrays; import java.util.Collections; -import java.util.concurrent.ExecutionException; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.JUnit4; @@ -145,7 +144,7 @@ private ReadWriteTransaction createSubject( .thenAnswer( new Answer() { @Override - public TransactionManager answer(InvocationOnMock invocation) throws Throwable { + public TransactionManager answer(InvocationOnMock invocation) { TransactionContext txContext = mock(TransactionContext.class); when(txContext.executeQuery(any(Statement.class))) .thenReturn(mock(ResultSet.class)); @@ -470,7 +469,7 @@ public void testRetry() { } @Test - public void testChecksumResultSet() throws InterruptedException, ExecutionException { + public void testChecksumResultSet() { DatabaseClient client = mock(DatabaseClient.class); ReadWriteTransaction transaction = ReadWriteTransaction.newBuilder() @@ -534,7 +533,7 @@ public void testChecksumResultSet() throws InterruptedException, ExecutionExcept } @Test - public void testChecksumResultSetWithArray() throws InterruptedException, ExecutionException { + public void testChecksumResultSetWithArray() { DatabaseClient client = mock(DatabaseClient.class); ReadWriteTransaction transaction = ReadWriteTransaction.newBuilder() diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/ReplaceableForwardingResultSetTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/ReplaceableForwardingResultSetTest.java index e95f23a8655..a30b15e6c21 100644 --- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/ReplaceableForwardingResultSetTest.java +++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/ReplaceableForwardingResultSetTest.java @@ -195,8 +195,7 @@ private void callMethods( } @Test - public void testValidMethodCall() - throws IllegalAccessException, IllegalArgumentException, InvocationTargetException { + public void testValidMethodCall() throws IllegalArgumentException { ResultSet delegate = mock(ResultSet.class); when(delegate.next()).thenReturn(true, true, false); try (ReplaceableForwardingResultSet subject = new ReplaceableForwardingResultSet(delegate)) { diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/SingleUseTransactionTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/SingleUseTransactionTest.java index 7286b426d49..27ee1903fa2 100644 --- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/SingleUseTransactionTest.java +++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/SingleUseTransactionTest.java @@ -346,7 +346,7 @@ public Long answer(InvocationOnMock invocation) throws Throwable { .thenAnswer( new Answer() { @Override - public TransactionRunner answer(InvocationOnMock invocation) throws Throwable { + public TransactionRunner answer(InvocationOnMock invocation) { TransactionRunner runner = new TransactionRunner() { private Timestamp commitTimestamp; diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/SpannerPoolTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/SpannerPoolTest.java index bfd413001b9..c0145203cec 100644 --- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/SpannerPoolTest.java +++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/SpannerPoolTest.java @@ -35,7 +35,6 @@ import com.google.cloud.spanner.connection.ConnectionImpl.LeakedConnectionException; import com.google.cloud.spanner.connection.SpannerPool.CheckAndCloseSpannersMode; import java.io.ByteArrayOutputStream; -import java.io.IOException; import java.io.OutputStream; import java.util.logging.Handler; import java.util.logging.Logger; @@ -174,13 +173,13 @@ private void attachLogCapturer() { log.addHandler(customLogHandler); } - public String getTestCapturedLog() throws IOException { + public String getTestCapturedLog() { customLogHandler.flush(); return logCapturingStream.toString(); } @Test - public void testRemoveConnectionOptionsNotRegistered() throws IOException { + public void testRemoveConnectionOptionsNotRegistered() { attachLogCapturer(); final String expectedLogPart = "There is no Spanner registered for ConnectionOptions"; SpannerPool pool = createSubjectAndMocks(); @@ -191,7 +190,7 @@ public void testRemoveConnectionOptionsNotRegistered() throws IOException { } @Test - public void testRemoveConnectionConnectionNotRegistered() throws IOException { + public void testRemoveConnectionConnectionNotRegistered() { attachLogCapturer(); final String expectedLogPart = "There are no connections registered for ConnectionOptions"; SpannerPool pool = createSubjectAndMocks(); @@ -202,7 +201,7 @@ public void testRemoveConnectionConnectionNotRegistered() throws IOException { } @Test - public void testRemoveConnectionConnectionAlreadyRemoved() throws IOException { + public void testRemoveConnectionConnectionAlreadyRemoved() { attachLogCapturer(); final String expectedLogPart = "There are no connections registered for ConnectionOptions"; SpannerPool pool = createSubjectAndMocks(); @@ -214,7 +213,7 @@ public void testRemoveConnectionConnectionAlreadyRemoved() throws IOException { } @Test - public void testCloseSpanner() throws IOException { + public void testCloseSpanner() { SpannerPool pool = createSubjectAndMocks(); Spanner spanner = pool.getSpanner(options1, connection1); // verify that closing is not possible until all connections have been removed @@ -246,7 +245,7 @@ public void testCloseSpanner() throws IOException { } @Test - public void testLeakedConnection() throws IOException { + public void testLeakedConnection() { ConnectionOptions options = ConnectionOptions.newBuilder() .setCredentials(NoCredentials.getInstance()) diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/StatementTimeoutTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/StatementTimeoutTest.java index ae527799123..e483a502792 100644 --- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/StatementTimeoutTest.java +++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/StatementTimeoutTest.java @@ -191,15 +191,14 @@ private ConnectionImpl createConnection( .thenAnswer( new Answer() { @Override - public TransactionManager answer(InvocationOnMock invocation) throws Throwable { + public TransactionManager answer(InvocationOnMock invocation) { TransactionManager txManager = mock(TransactionManager.class); when(txManager.getState()).thenReturn(null, TransactionState.STARTED); when(txManager.begin()) .thenAnswer( new Answer() { @Override - public TransactionContext answer(InvocationOnMock invocation) - throws Throwable { + public TransactionContext answer(InvocationOnMock invocation) { TransactionContext txContext = mock(TransactionContext.class); when(txContext.executeQuery(Statement.of(SLOW_SELECT))) .thenAnswer(new DelayedQueryExecution()); @@ -681,7 +680,7 @@ private void testInterruptedException(final ConnectionConsumer consumer) executor.submit( new Callable() { @Override - public Boolean call() throws Exception { + public Boolean call() { try (Connection connection = createConnection( ConnectionOptions.newBuilder() diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/it/ITBulkConnectionTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/it/ITBulkConnectionTest.java index fc868649291..7a8091e0d47 100644 --- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/it/ITBulkConnectionTest.java +++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/it/ITBulkConnectionTest.java @@ -68,7 +68,7 @@ public void testBulkCreateConnectionsMultiThreaded() throws InterruptedException executor.submit( new Callable() { @Override - public Void call() throws Exception { + public Void call() { try (ITConnection connection = createConnection()) { try (ResultSet rs = connection.executeQuery(Statement.of("select 1"))) { assertThat(rs.next(), is(true)); diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/it/ITReadOnlySpannerTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/it/ITReadOnlySpannerTest.java index 358bbadcd7e..ae94e9781b2 100644 --- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/it/ITReadOnlySpannerTest.java +++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/it/ITReadOnlySpannerTest.java @@ -105,7 +105,7 @@ public void testSqlScript() throws Exception { } @Test - public void testStatementTimeoutTransactional() throws Exception { + public void testStatementTimeoutTransactional() { try (ITConnection connection = createConnection()) { connection.beginTransaction(); connection.setStatementTimeout(1L, TimeUnit.MILLISECONDS); @@ -123,7 +123,7 @@ public void testStatementTimeoutTransactional() throws Exception { } @Test - public void testStatementTimeoutTransactionalMultipleStatements() throws Exception { + public void testStatementTimeoutTransactionalMultipleStatements() { long startTime = System.currentTimeMillis(); try (ITConnection connection = createConnection()) { connection.beginTransaction(); @@ -151,7 +151,7 @@ public void testStatementTimeoutTransactionalMultipleStatements() throws Excepti } @Test - public void testStatementTimeoutAutocommit() throws Exception { + public void testStatementTimeoutAutocommit() { try (ITConnection connection = createConnection()) { assertThat(connection.isAutocommit(), is(true)); connection.setStatementTimeout(1L, TimeUnit.MILLISECONDS); diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/it/ITReadWriteAutocommitSpannerTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/it/ITReadWriteAutocommitSpannerTest.java index 8870afdd95e..928fc8869f2 100644 --- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/it/ITReadWriteAutocommitSpannerTest.java +++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/it/ITReadWriteAutocommitSpannerTest.java @@ -63,7 +63,7 @@ public void test01_SqlScript() throws Exception { } @Test - public void test02_WriteMutation() throws Exception { + public void test02_WriteMutation() { try (ITConnection connection = createConnection()) { connection.write( Mutation.newInsertBuilder("TEST").set("ID").to(9999L).set("NAME").to("FOO").build()); @@ -72,7 +72,7 @@ public void test02_WriteMutation() throws Exception { } @Test - public void test03_MultipleStatements_WithTimeouts() throws InterruptedException { + public void test03_MultipleStatements_WithTimeouts() { try (ITConnection connection = createConnection()) { // do an insert that should succeed assertThat( diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITBackupTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITBackupTest.java index cb954006db8..2a35a170838 100644 --- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITBackupTest.java +++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITBackupTest.java @@ -97,7 +97,7 @@ public static void doNotRunOnEmulator() { } @Before - public void setUp() throws Exception { + public void setUp() { logger.info("Setting up tests"); testHelper = env.getTestHelper(); dbAdminClient = testHelper.getClient().getDatabaseAdminClient(); @@ -474,7 +474,7 @@ private void testGetBackup(Database db, String backupId, Timestamp expireTime) { assertThat(backup.getDatabase()).isEqualTo(db.getId()); } - private void testUpdateBackup(Backup backup) throws InterruptedException, ExecutionException { + private void testUpdateBackup(Backup backup) { // Update the expire time. Timestamp tomorrow = tomorrow(); backup = backup.toBuilder().setExpireTime(tomorrow).build(); @@ -525,7 +525,7 @@ private void testPagination(int expectedMinimumTotalBackups) { assertThat(numBackups).isAtLeast(expectedMinimumTotalBackups); } - private void testDelete(String backupId) throws InterruptedException, ExecutionException { + private void testDelete(String backupId) throws InterruptedException { waitForDbOperations(backupId); // Get the backup. logger.info(String.format("Fetching backup %s", backupId)); diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITBatchDmlTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITBatchDmlTest.java index f45fa2c427c..b2cf0214458 100644 --- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITBatchDmlTest.java +++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITBatchDmlTest.java @@ -108,7 +108,7 @@ public void batchDml() { final TransactionCallable callable = new TransactionCallable() { @Override - public long[] run(TransactionContext transaction) throws Exception { + public long[] run(TransactionContext transaction) { List stmts = new ArrayList<>(); stmts.add(Statement.of(INSERT_DML)); stmts.add(Statement.of(UPDATE_DML)); @@ -129,7 +129,7 @@ public void mixedBatchDmlAndDml() { final TransactionCallable callable = new TransactionCallable() { @Override - public long[] run(TransactionContext transaction) throws Exception { + public long[] run(TransactionContext transaction) { long rowCount = transaction.executeUpdate(Statement.of(INSERT_DML)); List stmts = new ArrayList<>(); stmts.add(Statement.of(UPDATE_DML)); diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITBatchReadTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITBatchReadTest.java index 9c3f11d3eeb..e682dd685ea 100644 --- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITBatchReadTest.java +++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITBatchReadTest.java @@ -173,7 +173,7 @@ public void readUsingIndex() { } @After - public void tearDown() throws Exception { + public void tearDown() { if (batchTxn != null) { batchTxn.close(); } diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITClosedSessionTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITClosedSessionTest.java index c249859f833..3031b0edd85 100644 --- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITClosedSessionTest.java +++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITClosedSessionTest.java @@ -207,7 +207,7 @@ public void testReadWriteTransaction() { txn.run( new TransactionCallable() { @Override - public Void run(TransactionContext transaction) throws Exception { + public Void run(TransactionContext transaction) { for (int i = 0; i < 2; i++) { try (ResultSet rs = transaction.executeQuery(Statement.of("SELECT 1"))) { assertThat(rs.next()).isTrue(); @@ -230,7 +230,7 @@ public void testReadWriteTransactionNoRecreation() { txn.run( new TransactionCallable() { @Override - public Void run(TransactionContext transaction) throws Exception { + public Void run(TransactionContext transaction) { try (ResultSet rs = transaction.executeQuery(Statement.of("SELECT 1"))) { rs.next(); fail("Expected exception"); @@ -271,7 +271,7 @@ public void testTransactionManager() throws InterruptedException { } @Test - public void testTransactionManagerNoRecreation() throws InterruptedException { + public void testTransactionManagerNoRecreation() { client.setAllowSessionReplacing(false); client.invalidateNextSession(); try (TransactionManager manager = client.transactionManager()) { diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITCommitTimestampTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITCommitTimestampTest.java index c2cba6cb54a..92d5aa3c6ed 100644 --- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITCommitTimestampTest.java +++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITCommitTimestampTest.java @@ -61,7 +61,7 @@ public class ITCommitTimestampTest { private static String databaseId; @BeforeClass - public static void setUp() throws Exception { + public static void setUp() { testHelper = env.getTestHelper(); db = testHelper.createTestDatabase( diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITDatabaseAdminTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITDatabaseAdminTest.java index 14421c86b4e..f66154d66c2 100644 --- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITDatabaseAdminTest.java +++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITDatabaseAdminTest.java @@ -77,13 +77,13 @@ public class ITDatabaseAdminTest { private List dbs = new ArrayList<>(); @Before - public void setUp() throws Exception { + public void setUp() { testHelper = env.getTestHelper(); dbAdminClient = testHelper.getClient().getDatabaseAdminClient(); } @After - public void tearDown() throws Exception { + public void tearDown() { for (Database db : dbs) { db.drop(); } diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITInstanceAdminTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITInstanceAdminTest.java index a3d35ee6c12..68e4e615a39 100644 --- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITInstanceAdminTest.java +++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITInstanceAdminTest.java @@ -64,7 +64,7 @@ public void instanceConfigOperations() { } @Test - public void listInstances() throws Exception { + public void listInstances() { Instance instance = Iterators.getOnlyElement( instanceClient diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITQueryOptionsTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITQueryOptionsTest.java index 71c7bcd47c0..30cfa80c458 100644 --- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITQueryOptionsTest.java +++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITQueryOptionsTest.java @@ -111,7 +111,7 @@ public void executeUpdate() { .run( new TransactionCallable() { @Override - public Long run(TransactionContext transaction) throws Exception { + public Long run(TransactionContext transaction) { return transaction.executeUpdate( Statement.newBuilder("INSERT INTO TEST (ID, NAME) VALUES (@id, @name)") .bind("id") @@ -132,7 +132,7 @@ public Long run(TransactionContext transaction) throws Exception { .run( new TransactionCallable() { @Override - public Long run(TransactionContext transaction) throws Exception { + public Long run(TransactionContext transaction) { return transaction.executeUpdate( Statement.newBuilder("INSERT INTO TEST (ID, NAME) VALUES (@id, @name)") .bind("id") @@ -153,7 +153,7 @@ public Long run(TransactionContext transaction) throws Exception { .run( new TransactionCallable() { @Override - public Long run(TransactionContext transaction) throws Exception { + public Long run(TransactionContext transaction) { return transaction.executeUpdate( Statement.newBuilder("INSERT INTO TEST (ID, NAME) VALUES (@id, @name)") .bind("id") diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITTransactionTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITTransactionTest.java index cc87023be03..a05029ad995 100644 --- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITTransactionTest.java +++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITTransactionTest.java @@ -397,7 +397,7 @@ public Void run(TransactionContext transaction) throws SpannerException { .run( new TransactionCallable() { @Override - public Void run(TransactionContext transaction) throws Exception { + public Void run(TransactionContext transaction) { return null; } }); diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/v1/SpannerClientTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/v1/SpannerClientTest.java index 1977873f96c..b0de897cf9c 100644 --- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/v1/SpannerClientTest.java +++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/v1/SpannerClientTest.java @@ -108,7 +108,7 @@ public void setUp() throws IOException { } @After - public void tearDown() throws Exception { + public void tearDown() { client.close(); }