Suppress warnings, remove unused code, etc.

2020-06-20 16:42:36 +02:00
parent 2f0970b184
commit 9d5881e0ad
53 changed files with 418 additions and 449 deletions
--- a/spring-r2dbc/src/test/java/org/springframework/r2dbc/connection/DelegatingConnectionFactoryUnitTests.java
+++ b/spring-r2dbc/src/test/java/org/springframework/r2dbc/connection/DelegatingConnectionFactoryUnitTests.java
@@ -30,18 +30,18 @@ import static org.mockito.BDDMockito.when;
 *
 * @author Mark Paluch
 */
-public class DelegatingConnectionFactoryUnitTests {
+class DelegatingConnectionFactoryUnitTests {

 	ConnectionFactory delegate = mock(ConnectionFactory.class);

 	Connection connectionMock = mock(Connection.class);

-	DelegatingConnectionFactory connectionFactory = new ExampleConnectionFactory(
-			delegate);
+	DelegatingConnectionFactory connectionFactory = new ExampleConnectionFactory(delegate);
+

 	@Test
-	public void shouldDelegateGetConnection() {
-
+	@SuppressWarnings({ "rawtypes", "unchecked" })
+	void shouldDelegateGetConnection() {
 		Mono<Connection> connectionMono = Mono.just(connectionMock);
 		when(delegate.create()).thenReturn((Mono) connectionMono);

@@ -49,7 +49,7 @@ public class DelegatingConnectionFactoryUnitTests {
 	}

 	@Test
-	public void shouldDelegateUnwrapWithoutImplementing() {
+	void shouldDelegateUnwrapWithoutImplementing() {
 		assertThat(connectionFactory.unwrap()).isSameAs(delegate);
 	}

--- a/spring-r2dbc/src/test/java/org/springframework/r2dbc/connection/R2dbcTransactionManagerUnitTests.java
+++ b/spring-r2dbc/src/test/java/org/springframework/r2dbc/connection/R2dbcTransactionManagerUnitTests.java
@@ -53,7 +53,7 @@ import static org.mockito.BDDMockito.when;
 *
 * @author Mark Paluch
 */
-public class R2dbcTransactionManagerUnitTests {
+class R2dbcTransactionManagerUnitTests {

 	ConnectionFactory connectionFactoryMock = mock(ConnectionFactory.class);

@@ -62,8 +62,8 @@ public class R2dbcTransactionManagerUnitTests {
 	private R2dbcTransactionManager tm;

 	@BeforeEach
-	public void before() {
-
+	@SuppressWarnings({ "unchecked", "rawtypes" })
+	void before() {
 		when(connectionFactoryMock.create()).thenReturn((Mono) Mono.just(connectionMock));
 		when(connectionMock.beginTransaction()).thenReturn(Mono.empty());
 		when(connectionMock.close()).thenReturn(Mono.empty());
@@ -71,7 +71,7 @@ public class R2dbcTransactionManagerUnitTests {
 	}

 	@Test
-	public void testSimpleTransaction() {
+	void testSimpleTransaction() {
 		TestTransactionSynchronization sync = new TestTransactionSynchronization(
 				TransactionSynchronization.STATUS_COMMITTED);
 		AtomicInteger commits = new AtomicInteger();
@@ -103,7 +103,7 @@ public class R2dbcTransactionManagerUnitTests {
 	}

 	@Test
-	public void testBeginFails() {
+	void testBeginFails() {
 		reset(connectionFactoryMock);
 		when(connectionFactoryMock.create()).thenReturn(
 				Mono.error(new R2dbcBadGrammarException("fail")));
@@ -125,7 +125,7 @@ public class R2dbcTransactionManagerUnitTests {
 	}

 	@Test
-	public void appliesIsolationLevel() {
+	void appliesIsolationLevel() {
 		when(connectionMock.commitTransaction()).thenReturn(Mono.empty());
 		when(connectionMock.getTransactionIsolationLevel()).thenReturn(
 				IsolationLevel.READ_COMMITTED);
@@ -151,7 +151,7 @@ public class R2dbcTransactionManagerUnitTests {
 	}

 	@Test
-	public void doesNotSetIsolationLevelIfMatch() {
+	void doesNotSetIsolationLevelIfMatch() {
 		when(connectionMock.getTransactionIsolationLevel()).thenReturn(
 				IsolationLevel.READ_COMMITTED);
 		when(connectionMock.commitTransaction()).thenReturn(Mono.empty());
@@ -173,7 +173,7 @@ public class R2dbcTransactionManagerUnitTests {
 	}

 	@Test
-	public void doesNotSetAutoCommitDisabled() {
+	void doesNotSetAutoCommitDisabled() {
 		when(connectionMock.isAutoCommit()).thenReturn(false);
 		when(connectionMock.commitTransaction()).thenReturn(Mono.empty());

@@ -193,7 +193,7 @@ public class R2dbcTransactionManagerUnitTests {
 	}

 	@Test
-	public void restoresAutoCommit() {
+	void restoresAutoCommit() {
 		when(connectionMock.isAutoCommit()).thenReturn(true);
 		when(connectionMock.setAutoCommit(anyBoolean())).thenReturn(Mono.empty());
 		when(connectionMock.commitTransaction()).thenReturn(Mono.empty());
@@ -216,7 +216,7 @@ public class R2dbcTransactionManagerUnitTests {
 	}

 	@Test
-	public void appliesReadOnly() {
+	void appliesReadOnly() {
 		when(connectionMock.commitTransaction()).thenReturn(Mono.empty());
 		when(connectionMock.setTransactionIsolationLevel(any())).thenReturn(Mono.empty());
 		Statement statement = mock(Statement.class);
@@ -244,7 +244,7 @@ public class R2dbcTransactionManagerUnitTests {
 	}

 	@Test
-	public void testCommitFails() {
+	void testCommitFails() {
 		when(connectionMock.commitTransaction()).thenReturn(Mono.defer(() -> Mono.error(new R2dbcBadGrammarException("Commit should fail"))));

 		when(connectionMock.rollbackTransaction()).thenReturn(Mono.empty());
@@ -266,7 +266,7 @@ public class R2dbcTransactionManagerUnitTests {
 	}

 	@Test
-	public void testRollback() {
+	void testRollback() {

 		AtomicInteger commits = new AtomicInteger();
 		when(connectionMock.commitTransaction()).thenReturn(
@@ -295,7 +295,8 @@ public class R2dbcTransactionManagerUnitTests {
 	}

 	@Test
-	public void testRollbackFails() {
+	@SuppressWarnings("unchecked")
+	void testRollbackFails() {
 		when(connectionMock.rollbackTransaction()).thenReturn(Mono.defer(() -> Mono.error(new R2dbcBadGrammarException("Commit should fail"))), Mono.empty());

 		TransactionalOperator operator = TransactionalOperator.create(tm);
@@ -319,7 +320,7 @@ public class R2dbcTransactionManagerUnitTests {
 	}

 	@Test
-	public void testTransactionSetRollbackOnly() {
+	void testTransactionSetRollbackOnly() {
 		when(connectionMock.rollbackTransaction()).thenReturn(Mono.empty());
 		TestTransactionSynchronization sync = new TestTransactionSynchronization(
 				TransactionSynchronization.STATUS_ROLLED_BACK);
@@ -352,7 +353,7 @@ public class R2dbcTransactionManagerUnitTests {
 	}

 	@Test
-	public void testPropagationNeverWithExistingTransaction() {
+	void testPropagationNeverWithExistingTransaction() {
 		when(connectionMock.rollbackTransaction()).thenReturn(Mono.empty());

 		DefaultTransactionDefinition definition = new DefaultTransactionDefinition();
@@ -377,7 +378,7 @@ public class R2dbcTransactionManagerUnitTests {
 	}

 	@Test
-	public void testPropagationSupportsAndRequiresNew() {
+	void testPropagationSupportsAndRequiresNew() {
 		when(connectionMock.commitTransaction()).thenReturn(Mono.empty());

 		DefaultTransactionDefinition definition = new DefaultTransactionDefinition();
@@ -419,9 +420,7 @@ public class R2dbcTransactionManagerUnitTests {

 		public boolean afterCompletionCalled;

-		public Throwable afterCompletionException;
-
-		public TestTransactionSynchronization(int status) {
+		TestTransactionSynchronization(int status) {
 			this.status = status;
 		}

@@ -471,7 +470,7 @@ public class R2dbcTransactionManagerUnitTests {
 				return Mono.fromRunnable(() -> doAfterCompletion(status));
 			}
 			catch (Throwable ex) {
-				this.afterCompletionException = ex;
+				// ignore
 			}

 			return Mono.empty();
--- a/spring-r2dbc/src/test/java/org/springframework/r2dbc/connection/SingleConnectionFactoryUnitTests.java
+++ b/spring-r2dbc/src/test/java/org/springframework/r2dbc/connection/SingleConnectionFactoryUnitTests.java
@@ -37,12 +37,11 @@ import static org.mockito.BDDMockito.when;
 *
 * @author Mark Paluch
 */
-public class SingleConnectionFactoryUnitTests {
+class SingleConnectionFactoryUnitTests {

 	@Test
-	public void shouldAllocateSameConnection() {
-		SingleConnectionFactory factory = new SingleConnectionFactory(
-				"r2dbc:h2:mem:///foo", false);
+	void shouldAllocateSameConnection() {
+		SingleConnectionFactory factory = new SingleConnectionFactory("r2dbc:h2:mem:///foo", false);

 		Mono<? extends Connection> cf1 = factory.create();
 		Mono<? extends Connection> cf2 = factory.create();
@@ -55,9 +54,8 @@ public class SingleConnectionFactoryUnitTests {
 	}

 	@Test
-	public void shouldApplyAutoCommit() {
-		SingleConnectionFactory factory = new SingleConnectionFactory(
-				"r2dbc:h2:mem:///foo", false);
+	void shouldApplyAutoCommit() {
+		SingleConnectionFactory factory = new SingleConnectionFactory("r2dbc:h2:mem:///foo", false);
 		factory.setAutoCommit(false);

 		factory.create().as(StepVerifier::create)
@@ -74,9 +72,9 @@ public class SingleConnectionFactoryUnitTests {
 	}

 	@Test
-	public void shouldSuppressClose() {
-		SingleConnectionFactory factory = new SingleConnectionFactory(
-				"r2dbc:h2:mem:///foo", true);
+	@SuppressWarnings("rawtypes")
+	void shouldSuppressClose() {
+		SingleConnectionFactory factory = new SingleConnectionFactory("r2dbc:h2:mem:///foo", true);

 		Connection connection = factory.create().block();

@@ -91,27 +89,24 @@ public class SingleConnectionFactoryUnitTests {
 	}

 	@Test
-	public void shouldNotSuppressClose() {
-		SingleConnectionFactory factory = new SingleConnectionFactory(
-				"r2dbc:h2:mem:///foo", false);
+	void shouldNotSuppressClose() {
+		SingleConnectionFactory factory = new SingleConnectionFactory("r2dbc:h2:mem:///foo", false);

 		Connection connection = factory.create().block();

 		StepVerifier.create(connection.close()).verifyComplete();

-		StepVerifier.create(connection.setTransactionIsolationLevel(
-				IsolationLevel.READ_COMMITTED)).verifyError(
-						R2dbcNonTransientResourceException.class);
+		StepVerifier.create(connection.setTransactionIsolationLevel(IsolationLevel.READ_COMMITTED))
+			.verifyError(R2dbcNonTransientResourceException.class);
 		factory.destroy();
 	}

 	@Test
-	public void releaseConnectionShouldNotCloseConnection() {
+	void releaseConnectionShouldNotCloseConnection() {
 		Connection connectionMock = mock(Connection.class);
 		ConnectionFactoryMetadata metadata = mock(ConnectionFactoryMetadata.class);

-		SingleConnectionFactory factory = new SingleConnectionFactory(
-				connectionMock, metadata, true);
+		SingleConnectionFactory factory = new SingleConnectionFactory(connectionMock, metadata, true);

 		Connection connection = factory.create().block();

@@ -123,14 +118,13 @@ public class SingleConnectionFactoryUnitTests {
 	}

 	@Test
-	public void releaseConnectionShouldCloseUnrelatedConnection() {
+	void releaseConnectionShouldCloseUnrelatedConnection() {
 		Connection connectionMock = mock(Connection.class);
 		Connection otherConnection = mock(Connection.class);
 		ConnectionFactoryMetadata metadata = mock(ConnectionFactoryMetadata.class);
 		when(otherConnection.close()).thenReturn(Mono.empty());

-		SingleConnectionFactory factory = new SingleConnectionFactory(
-				connectionMock, metadata, false);
+		SingleConnectionFactory factory = new SingleConnectionFactory(connectionMock, metadata, false);

 		factory.create().as(StepVerifier::create).expectNextCount(1).verifyComplete();

--- a/spring-r2dbc/src/test/java/org/springframework/r2dbc/connection/TransactionAwareConnectionFactoryProxyUnitTests.java
+++ b/spring-r2dbc/src/test/java/org/springframework/r2dbc/connection/TransactionAwareConnectionFactoryProxyUnitTests.java
@@ -42,7 +42,7 @@ import static org.mockito.BDDMockito.when;
 * @author Mark Paluch
 * @author Christoph Strobl
 */
-public class TransactionAwareConnectionFactoryProxyUnitTests {
+class TransactionAwareConnectionFactoryProxyUnitTests {

 	ConnectionFactory connectionFactoryMock = mock(ConnectionFactory.class);

@@ -55,14 +55,15 @@ public class TransactionAwareConnectionFactoryProxyUnitTests {
 	R2dbcTransactionManager tm;

 	@BeforeEach
-	public void before() {
+	@SuppressWarnings({ "rawtypes", "unchecked" })
+	void before() {
 		when(connectionFactoryMock.create()).thenReturn((Mono) Mono.just(connectionMock1),
 				(Mono) Mono.just(connectionMock2), (Mono) Mono.just(connectionMock3));
 		tm = new R2dbcTransactionManager(connectionFactoryMock);
 	}

 	@Test
-	public void createShouldWrapConnection() {
+	void createShouldWrapConnection() {
 		new TransactionAwareConnectionFactoryProxy(connectionFactoryMock).create()
 				.as(StepVerifier::create)
 				.consumeNextWith(connection -> assertThat(connection).isInstanceOf(Wrapped.class))
@@ -70,7 +71,7 @@ public class TransactionAwareConnectionFactoryProxyUnitTests {
 	}

 	@Test
-	public void unwrapShouldReturnTargetConnection() {
+	void unwrapShouldReturnTargetConnection() {
 		new TransactionAwareConnectionFactoryProxy(connectionFactoryMock).create()
 				.map(Wrapped.class::cast).as(StepVerifier::create)
 				.consumeNextWith(wrapped -> assertThat(wrapped.unwrap()).isEqualTo(connectionMock1))
@@ -78,7 +79,7 @@ public class TransactionAwareConnectionFactoryProxyUnitTests {
 	}

 	@Test
-	public void unwrapShouldReturnTargetConnectionEvenWhenClosed() {
+	void unwrapShouldReturnTargetConnectionEvenWhenClosed() {
 		when(connectionMock1.close()).thenReturn(Mono.empty());

 		new TransactionAwareConnectionFactoryProxy(connectionFactoryMock).create()
@@ -90,7 +91,7 @@ public class TransactionAwareConnectionFactoryProxyUnitTests {
 	}

 	@Test
-	public void getTargetConnectionShouldReturnTargetConnection() {
+	void getTargetConnectionShouldReturnTargetConnection() {
 		new TransactionAwareConnectionFactoryProxy(connectionFactoryMock).create()
 				.map(Wrapped.class::cast).as(StepVerifier::create)
 				.consumeNextWith(wrapped -> assertThat(wrapped.unwrap()).isEqualTo(connectionMock1))
@@ -98,7 +99,7 @@ public class TransactionAwareConnectionFactoryProxyUnitTests {
 	}

 	@Test
-	public void getMetadataShouldThrowsErrorEvenWhenClosed() {
+	void getMetadataShouldThrowsErrorEvenWhenClosed() {
 		when(connectionMock1.close()).thenReturn(Mono.empty());

 		new TransactionAwareConnectionFactoryProxy(connectionFactoryMock).create()
@@ -110,7 +111,7 @@ public class TransactionAwareConnectionFactoryProxyUnitTests {
 	}

 	@Test
-	public void hashCodeShouldReturnProxyHash() {
+	void hashCodeShouldReturnProxyHash() {
 		new TransactionAwareConnectionFactoryProxy(connectionFactoryMock).create()
 				.map(Connection.class::cast).as(StepVerifier::create)
 				.consumeNextWith(connection -> assertThat(connection.hashCode()).isEqualTo(
@@ -118,7 +119,7 @@ public class TransactionAwareConnectionFactoryProxyUnitTests {
 	}

 	@Test
-	public void equalsShouldCompareCorrectly() {
+	void equalsShouldCompareCorrectly() {
 		new TransactionAwareConnectionFactoryProxy(connectionFactoryMock).create()
 				.map(Connection.class::cast).as(StepVerifier::create)
 				.consumeNextWith(connection -> {
@@ -128,7 +129,7 @@ public class TransactionAwareConnectionFactoryProxyUnitTests {
 	}

 	@Test
-	public void shouldEmitBoundConnection() {
+	void shouldEmitBoundConnection() {
 		when(connectionMock1.beginTransaction()).thenReturn(Mono.empty());
 		when(connectionMock1.commitTransaction()).thenReturn(Mono.empty());
 		when(connectionMock1.close()).thenReturn(Mono.empty());
--- a/spring-r2dbc/src/test/java/org/springframework/r2dbc/core/DefaultDatabaseClientUnitTests.java
+++ b/spring-r2dbc/src/test/java/org/springframework/r2dbc/core/DefaultDatabaseClientUnitTests.java
@@ -66,7 +66,7 @@ import static org.mockito.BDDMockito.when;
 */
@ExtendWith(MockitoExtension.class)
@MockitoSettings(strictness = Strictness.LENIENT)
-public class DefaultDatabaseClientUnitTests {
+class DefaultDatabaseClientUnitTests {

 	@Mock
 	Connection connection;
@@ -74,7 +74,8 @@ public class DefaultDatabaseClientUnitTests {
 	private DatabaseClient.Builder databaseClientBuilder;

 	@BeforeEach
-	public void before() {
+	@SuppressWarnings({ "rawtypes", "unchecked" })
+	void before() {
 		ConnectionFactory connectionFactory = mock(ConnectionFactory.class);

 		when(connectionFactory.create()).thenReturn((Publisher) Mono.just(connection));
@@ -85,7 +86,7 @@ public class DefaultDatabaseClientUnitTests {
 	}

 	@Test
-	public void shouldCloseConnectionOnlyOnce() {
+	void shouldCloseConnectionOnlyOnce() {
 		DefaultDatabaseClient databaseClient = (DefaultDatabaseClient) databaseClientBuilder.build();

 		Flux<Object> flux = databaseClient.inConnectionMany(connection -> Flux.empty());
@@ -118,7 +119,7 @@ public class DefaultDatabaseClientUnitTests {
 	}

 	@Test
-	public void executeShouldBindNullValues() {
+	void executeShouldBindNullValues() {
 		Statement statement = mockStatementFor("SELECT * FROM table WHERE key = $1");

 		DatabaseClient databaseClient = databaseClientBuilder.namedParameters(false).build();
@@ -135,7 +136,7 @@ public class DefaultDatabaseClientUnitTests {
 	}

 	@Test
-	public void executeShouldBindSettableValues() {
+	void executeShouldBindSettableValues() {
 		Statement statement = mockStatementFor("SELECT * FROM table WHERE key = $1");

 		DatabaseClient databaseClient = databaseClientBuilder.namedParameters(false).build();
@@ -154,7 +155,7 @@ public class DefaultDatabaseClientUnitTests {
 	}

 	@Test
-	public void executeShouldBindNamedNullValues() {
+	void executeShouldBindNamedNullValues() {

 		Statement statement = mockStatementFor("SELECT * FROM table WHERE key = $1");
 		DatabaseClient databaseClient = databaseClientBuilder.build();
@@ -166,7 +167,7 @@ public class DefaultDatabaseClientUnitTests {
 	}

 	@Test
-	public void executeShouldBindNamedValuesFromIndexes() {
+	void executeShouldBindNamedValuesFromIndexes() {
 		Statement statement = mockStatementFor(
 				"SELECT id, name, manual FROM legoset WHERE name IN ($1, $2, $3)");

@@ -185,7 +186,7 @@ public class DefaultDatabaseClientUnitTests {
 	}

 	@Test
-	public void executeShouldBindValues() {
+	void executeShouldBindValues() {
 		Statement statement = mockStatementFor("SELECT * FROM table WHERE key = $1");

 		DatabaseClient databaseClient = databaseClientBuilder.build();
@@ -202,7 +203,7 @@ public class DefaultDatabaseClientUnitTests {
 	}

 	@Test
-	public void executeShouldBindNamedValuesByIndex() {
+	void executeShouldBindNamedValuesByIndex() {

 		Statement statement = mockStatementFor("SELECT * FROM table WHERE key = $1");
 		DatabaseClient databaseClient = databaseClientBuilder.build();
@@ -214,11 +215,11 @@ public class DefaultDatabaseClientUnitTests {
 	}

 	@Test
-	public void rowsUpdatedShouldEmitSingleValue() {
+	@SuppressWarnings("unchecked")
+	void rowsUpdatedShouldEmitSingleValue() {

 		Result result = mock(Result.class);
-		when(result.getRowsUpdated()).thenReturn(Mono.empty(), Mono.just(2),
-				Flux.just(1, 2, 3));
+		when(result.getRowsUpdated()).thenReturn(Mono.empty(), Mono.just(2), Flux.just(1, 2, 3));
 		mockStatementFor("DROP TABLE tab;", result);

 		DatabaseClient databaseClient = databaseClientBuilder.build();
@@ -234,7 +235,7 @@ public class DefaultDatabaseClientUnitTests {
 	}

 	@Test
-	public void selectShouldEmitFirstValue() {
+	void selectShouldEmitFirstValue() {
 		MockRowMetadata metadata = MockRowMetadata.builder().columnMetadata(
 				MockColumnMetadata.builder().name("name").build()).build();

@@ -254,7 +255,7 @@ public class DefaultDatabaseClientUnitTests {
 	}

 	@Test
-	public void selectShouldEmitAllValues() {
+	void selectShouldEmitAllValues() {
 		MockRowMetadata metadata = MockRowMetadata.builder().columnMetadata(
 				MockColumnMetadata.builder().name("name").build()).build();

@@ -275,7 +276,7 @@ public class DefaultDatabaseClientUnitTests {
 	}

 	@Test
-	public void selectOneShouldFailWithException() {
+	void selectOneShouldFailWithException() {

 		MockRowMetadata metadata = MockRowMetadata.builder().columnMetadata(
 				MockColumnMetadata.builder().name("name").build()).build();
@@ -295,7 +296,7 @@ public class DefaultDatabaseClientUnitTests {
 	}

 	@Test
-	public void shouldApplyExecuteFunction() {
+	void shouldApplyExecuteFunction() {

 		Statement statement = mockStatement();
 		MockResult result = mockSingleColumnResult(
@@ -311,7 +312,7 @@ public class DefaultDatabaseClientUnitTests {
 	}

 	@Test
-	public void shouldApplyPreparedOperation() {
+	void shouldApplyPreparedOperation() {

 		MockResult result = mockSingleColumnResult(
 				MockRow.builder().identified(0, Object.class, "Walter"));
@@ -342,7 +343,7 @@ public class DefaultDatabaseClientUnitTests {
 	}

 	@Test
-	public void shouldApplyStatementFilterFunctions() {
+	void shouldApplyStatementFilterFunctions() {

 		MockRowMetadata metadata = MockRowMetadata.builder().columnMetadata(
 				MockColumnMetadata.builder().name("name").build()).build();
@@ -366,7 +367,7 @@ public class DefaultDatabaseClientUnitTests {
 	}

 	@Test
-	public void shouldApplySimpleStatementFilterFunctions() {
+	void shouldApplySimpleStatementFilterFunctions() {

 		MockResult result = mockSingleColumnEmptyResult();