Nullability refinements and related polishing

Author: jhoeller

spring-jdbc/src/main/java/org/springframework/jdbc/support/DatabaseStartupValidator.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -39,6 +39,7 @@
  * Particularly appropriate for waiting on a slowly starting Oracle database.
  *
  * @author Juergen Hoeller
+ * @author Marten Deinum
  * @since 18.12.2003
  */
 public class DatabaseStartupValidator implements InitializingBean {
@@ -59,12 +60,7 @@ public class DatabaseStartupValidator implements InitializingBean {
 	@Nullable
 	private DataSource dataSource;
 
-	/**
-	 * The query used to validate the connection
-	 * @deprecated in favor of JDBC 4.0 connection validation
-	 */
 	@Nullable
-	@Deprecated
 	private String validationQuery;
 
 	private int interval = DEFAULT_INTERVAL;
@@ -81,8 +77,7 @@ public void setDataSource(DataSource dataSource) {
 
 	/**
 	 * Set the SQL query string to use for validation.
-	 *
-	 * @deprecated in favor of the JDBC 4.0 connection validation
+	 * @deprecated as of 5.3, in favor of the JDBC 4.0 connection validation
 	 */
 	@Deprecated
 	public void setValidationQuery(String validationQuery) {
@@ -148,10 +143,9 @@ public void afterPropertiesSet() {
 							logger.debug("Validation query [" + this.validationQuery + "] threw exception", ex);
 						}
 						else {
-							logger.debug(" Validation threw exception", ex);
+							logger.debug("Validation check threw exception", ex);
 						}
 					}
-
 					if (logger.isInfoEnabled()) {
 						float rest = ((float) (deadLine - System.currentTimeMillis())) / 1000;
 						if (rest > this.interval) {

spring-r2dbc/src/main/java/org/springframework/r2dbc/connection/ConnectionFactoryUtils.java

@@ -80,7 +80,6 @@ private ConnectionFactoryUtils() {}
 	 * Translates exceptions into the Spring hierarchy of unchecked generic
 	 * data access exceptions, simplifying calling code and making any
 	 * exception that is thrown more meaningful.
-	 *
 	 * <p>Is aware of a corresponding Connection bound to the current
 	 * {@link TransactionSynchronizationManager}. Will bind a Connection to the
 	 * {@link TransactionSynchronizationManager} if transaction synchronization is active.
@@ -99,7 +98,6 @@ public static Mono<Connection> getConnection(ConnectionFactory connectionFactory
 	/**
 	 * Actually obtain a R2DBC Connection from the given {@link ConnectionFactory}.
 	 * Same as {@link #getConnection}, but preserving the original exceptions.
-	 *
 	 * <p>Is aware of a corresponding Connection bound to the current
 	 * {@link TransactionSynchronizationManager}. Will bind a Connection to the
 	 * {@link TransactionSynchronizationManager} if transaction synchronization is active
@@ -193,11 +191,9 @@ public static Mono<Void> releaseConnection(Connection con, ConnectionFactory con
 	 * @param connectionFactory the {@link ConnectionFactory} that the Connection was obtained from
 	 * @see #doGetConnection
 	 */
-	public static Mono<Void> doReleaseConnection(Connection connection,
-			ConnectionFactory connectionFactory) {
+	public static Mono<Void> doReleaseConnection(Connection connection, ConnectionFactory connectionFactory) {
 		return TransactionSynchronizationManager.forCurrentTransaction()
 				.flatMap(synchronizationManager -> {
-
 			ConnectionHolder conHolder = (ConnectionHolder) synchronizationManager.getResource(connectionFactory);
 			if (conHolder != null && connectionEquals(conHolder, connection)) {
 				// It's the transactional Connection: Don't close it.
@@ -235,7 +231,6 @@ public static Mono<ConnectionFactory> currentConnectionFactory(ConnectionFactory
 	 * @return the corresponding DataAccessException instance
 	 */
 	public static DataAccessException convertR2dbcException(String task, @Nullable String sql, R2dbcException ex) {
-
 		if (ex instanceof R2dbcTransientException) {
 			if (ex instanceof R2dbcTransientResourceException) {
 				return new TransientDataAccessResourceException(buildMessage(task, sql, ex), ex);
@@ -247,7 +242,6 @@ public static DataAccessException convertR2dbcException(String task, @Nullable S
 				return new QueryTimeoutException(buildMessage(task, sql, ex), ex);
 			}
 		}
-
 		if (ex instanceof R2dbcNonTransientException) {
 			if (ex instanceof R2dbcNonTransientResourceException) {
 				return new DataAccessResourceFailureException(buildMessage(task, sql, ex), ex);
@@ -262,7 +256,6 @@ public static DataAccessException convertR2dbcException(String task, @Nullable S
 				return new BadSqlGrammarException(task, (sql != null ? sql : ""), ex);
 			}
 		}
-
 		return new UncategorizedR2dbcException(buildMessage(task, sql, ex), sql, ex);
 	}
 
@@ -326,7 +319,6 @@ public static Connection getTargetConnection(Connection con) {
 	 * @see #CONNECTION_SYNCHRONIZATION_ORDER
 	 */
 	private static int getConnectionSynchronizationOrder(ConnectionFactory connectionFactory) {
-
 		int order = CONNECTION_SYNCHRONIZATION_ORDER;
 		ConnectionFactory current = connectionFactory;
 		while (current instanceof DelegatingConnectionFactory) {
@@ -336,6 +328,7 @@ private static int getConnectionSynchronizationOrder(ConnectionFactory connectio
 		return order;
 	}
 
+
 	/**
 	 * Callback for resource cleanup at the end of a non-native R2DBC transaction.
 	 */
@@ -355,7 +348,6 @@ private static class ConnectionSynchronization implements TransactionSynchroniza
 			this.order = getConnectionSynchronizationOrder(connectionFactory);
 		}
 
-
 		@Override
 		public int getOrder() {
 			return this.order;
@@ -387,7 +379,8 @@ public Mono<Void> suspend() {
 		public Mono<Void> resume() {
 			if (this.holderActive) {
 				return TransactionSynchronizationManager.forCurrentTransaction()
-						.doOnNext(synchronizationManager -> synchronizationManager.bindResource(this.connectionFactory, this.connectionHolder))
+						.doOnNext(synchronizationManager ->
+								synchronizationManager.bindResource(this.connectionFactory, this.connectionHolder))
 						.then();
 			}
 			return Mono.empty();
@@ -401,8 +394,7 @@ public Mono<Void> beforeCompletion() {
 			// to avoid issues with strict transaction implementations that expect
 			// the close call before transaction completion.
 			if (!this.connectionHolder.isOpen()) {
-				return TransactionSynchronizationManager.forCurrentTransaction()
-						.flatMap(synchronizationManager -> {
+				return TransactionSynchronizationManager.forCurrentTransaction().flatMap(synchronizationManager -> {
 					synchronizationManager.unbindResource(this.connectionFactory);
 					this.holderActive = false;
 					if (this.connectionHolder.hasConnection()) {
@@ -439,4 +431,5 @@ public Mono<Void> afterCompletion(int status) {
 			return Mono.empty();
 		}
 	}
+
 }

spring-r2dbc/src/main/java/org/springframework/r2dbc/connection/ConnectionHolder.java

@@ -65,7 +65,6 @@ public ConnectionHolder(Connection connection) {
 	 * in an ongoing transaction
 	 */
 	public ConnectionHolder(Connection connection, boolean transactionActive) {
-
 		this.currentConnection = connection;
 		this.transactionActive = transactionActive;
 	}
@@ -80,7 +79,6 @@ protected boolean hasConnection() {
 
 	/**
 	 * Set whether this holder represents an active, R2DBC-managed transaction.
-	 *
 	 * @see R2dbcTransactionManager
 	 */
 	protected void setTransactionActive(boolean transactionActive) {
@@ -111,7 +109,6 @@ protected void setConnection(@Nullable Connection connection) {
 	 * @see #released()
 	 */
 	public Connection getConnection() {
-
 		Assert.notNull(this.currentConnection, "Active Connection is required");
 		return this.currentConnection;
 	}