Repository: commons-dbcp Updated Branches: refs/heads/master ae228cbeb -> efedfb04f
No need to initialize instance and static variables to the default value the JVM gives them anyway, it just clutters up the code, and Java is verbose enough as it is. Project: http://git-wip-us.apache.org/repos/asf/commons-dbcp/repo Commit: http://git-wip-us.apache.org/repos/asf/commons-dbcp/commit/efedfb04 Tree: http://git-wip-us.apache.org/repos/asf/commons-dbcp/tree/efedfb04 Diff: http://git-wip-us.apache.org/repos/asf/commons-dbcp/diff/efedfb04 Branch: refs/heads/master Commit: efedfb04fc0756603de3763b10110beebed8b9ba Parents: ae228cb Author: Gary Gregory <[email protected]> Authored: Sun Jun 10 12:16:43 2018 -0600 Committer: Gary Gregory <[email protected]> Committed: Sun Jun 10 12:16:43 2018 -0600 ---------------------------------------------------------------------- .../commons/dbcp2/DelegatingStatement.java | 6 +++-- .../dbcp2/DriverManagerConnectionFactory.java | 8 +++---- .../commons/dbcp2/PoolableConnection.java | 6 ++--- .../dbcp2/PoolableConnectionFactory.java | 16 ++++++------- .../apache/commons/dbcp2/PoolingConnection.java | 2 +- .../apache/commons/dbcp2/PoolingDataSource.java | 2 +- .../dbcp2/cpdsadapter/DriverAdapterCPDS.java | 8 +++---- .../dbcp2/cpdsadapter/PooledConnectionImpl.java | 6 ++--- .../datasources/InstanceKeyDataSource.java | 24 ++++++++++---------- .../dbcp2/datasources/SharedPoolDataSource.java | 4 ++-- 10 files changed, 42 insertions(+), 40 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/efedfb04/src/main/java/org/apache/commons/dbcp2/DelegatingStatement.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/dbcp2/DelegatingStatement.java b/src/main/java/org/apache/commons/dbcp2/DelegatingStatement.java index 310bb01..3584159 100644 --- a/src/main/java/org/apache/commons/dbcp2/DelegatingStatement.java +++ b/src/main/java/org/apache/commons/dbcp2/DelegatingStatement.java @@ -43,10 +43,12 @@ import java.util.List; * @since 2.0 */ public class DelegatingStatement extends AbandonedTrace implements Statement { + /** My delegate. */ - private Statement statement = null; + private Statement statement; + /** The connection that created me. **/ - private DelegatingConnection<?> connection = null; + private DelegatingConnection<?> connection; /** * Create a wrapper for the Statement which traces this http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/efedfb04/src/main/java/org/apache/commons/dbcp2/DriverManagerConnectionFactory.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/dbcp2/DriverManagerConnectionFactory.java b/src/main/java/org/apache/commons/dbcp2/DriverManagerConnectionFactory.java index 562c017..9efa0c6 100644 --- a/src/main/java/org/apache/commons/dbcp2/DriverManagerConnectionFactory.java +++ b/src/main/java/org/apache/commons/dbcp2/DriverManagerConnectionFactory.java @@ -89,8 +89,8 @@ public class DriverManagerConnectionFactory implements ConnectionFactory { return DriverManager.getConnection(connectionUri, propeties); } - private String connectionUri = null; - private String userName = null; - private String userPassword = null; - private Properties propeties = null; + private String connectionUri; + private String userName; + private String userPassword; + private Properties propeties; } http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/efedfb04/src/main/java/org/apache/commons/dbcp2/PoolableConnection.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/dbcp2/PoolableConnection.java b/src/main/java/org/apache/commons/dbcp2/PoolableConnection.java index 8602413..fe082b8 100644 --- a/src/main/java/org/apache/commons/dbcp2/PoolableConnection.java +++ b/src/main/java/org/apache/commons/dbcp2/PoolableConnection.java @@ -42,7 +42,7 @@ import org.apache.commons.pool2.ObjectPool; */ public class PoolableConnection extends DelegatingConnection<Connection> implements PoolableConnectionMXBean { - private static MBeanServer MBEAN_SERVER = null; + private static MBeanServer MBEAN_SERVER; static { try { @@ -59,8 +59,8 @@ public class PoolableConnection extends DelegatingConnection<Connection> impleme // Use a prepared statement for validation, retaining the last used SQL to // check if the validation query has changed. - private PreparedStatement validationPreparedStatement = null; - private String lastValidationSql = null; + private PreparedStatement validationPreparedStatement; + private String lastValidationSql; /** * Indicate that unrecoverable SQLException was thrown when using this connection. Such a connection should be http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/efedfb04/src/main/java/org/apache/commons/dbcp2/PoolableConnectionFactory.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/dbcp2/PoolableConnectionFactory.java b/src/main/java/org/apache/commons/dbcp2/PoolableConnectionFactory.java index e366e6d..f69fd64 100644 --- a/src/main/java/org/apache/commons/dbcp2/PoolableConnectionFactory.java +++ b/src/main/java/org/apache/commons/dbcp2/PoolableConnectionFactory.java @@ -460,20 +460,20 @@ public class PoolableConnectionFactory private final ConnectionFactory connectionFactory; private final ObjectName dataSourceJmxName; - private volatile String validationQuery = null; + private volatile String validationQuery; private volatile int validationQueryTimeoutSeconds = -1; - private Collection<String> connectionInitSqls = null; - private Collection<String> disconnectionSqlCodes = null; - private boolean fastFailValidation = false; - private volatile ObjectPool<PoolableConnection> pool = null; - private Boolean defaultReadOnly = null; - private Boolean defaultAutoCommit = null; + private Collection<String> connectionInitSqls; + private Collection<String> disconnectionSqlCodes; + private boolean fastFailValidation; + private volatile ObjectPool<PoolableConnection> pool; + private Boolean defaultReadOnly; + private Boolean defaultAutoCommit; private boolean enableAutoCommitOnReturn = true; private boolean rollbackOnReturn = true; private int defaultTransactionIsolation = UNKNOWN_TRANSACTIONISOLATION; private String defaultCatalog; private boolean cacheState; - private boolean poolStatements = false; + private boolean poolStatements; private int maxOpenPreparedStatements = GenericKeyedObjectPoolConfig.DEFAULT_MAX_TOTAL_PER_KEY; private long maxConnLifetimeMillis = -1; http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/efedfb04/src/main/java/org/apache/commons/dbcp2/PoolingConnection.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/dbcp2/PoolingConnection.java b/src/main/java/org/apache/commons/dbcp2/PoolingConnection.java index 4987bed..78c9ad1 100644 --- a/src/main/java/org/apache/commons/dbcp2/PoolingConnection.java +++ b/src/main/java/org/apache/commons/dbcp2/PoolingConnection.java @@ -66,7 +66,7 @@ public class PoolingConnection extends DelegatingConnection<Connection> } /** Pool of {@link PreparedStatement}s. and {@link CallableStatement}s */ - private KeyedObjectPool<PStmtKey, DelegatingPreparedStatement> pstmtPool = null; + private KeyedObjectPool<PStmtKey, DelegatingPreparedStatement> pstmtPool; /** * Constructor. http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/efedfb04/src/main/java/org/apache/commons/dbcp2/PoolingDataSource.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/dbcp2/PoolingDataSource.java b/src/main/java/org/apache/commons/dbcp2/PoolingDataSource.java index 568c66e..fde6729 100644 --- a/src/main/java/org/apache/commons/dbcp2/PoolingDataSource.java +++ b/src/main/java/org/apache/commons/dbcp2/PoolingDataSource.java @@ -47,7 +47,7 @@ public class PoolingDataSource<C extends Connection> implements DataSource, Auto private static final Log log = LogFactory.getLog(PoolingDataSource.class); /** Controls access to the underlying connection */ - private boolean accessToUnderlyingConnectionAllowed = false; + private boolean accessToUnderlyingConnectionAllowed; public PoolingDataSource(final ObjectPool<C> pool) { if (null == pool) { http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/efedfb04/src/main/java/org/apache/commons/dbcp2/cpdsadapter/DriverAdapterCPDS.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/dbcp2/cpdsadapter/DriverAdapterCPDS.java b/src/main/java/org/apache/commons/dbcp2/cpdsadapter/DriverAdapterCPDS.java index 58a0749..676ff44 100644 --- a/src/main/java/org/apache/commons/dbcp2/cpdsadapter/DriverAdapterCPDS.java +++ b/src/main/java/org/apache/commons/dbcp2/cpdsadapter/DriverAdapterCPDS.java @@ -125,7 +125,7 @@ public class DriverAdapterCPDS private int loginTimeout; /** Log stream. NOT USED */ - private transient PrintWriter logWriter = null; + private transient PrintWriter logWriter; // PreparedStatement pool properties private boolean poolPreparedStatements; @@ -137,10 +137,10 @@ public class DriverAdapterCPDS private int maxPreparedStatements = -1; /** Whether or not getConnection has been called */ - private volatile boolean getConnectionCalled = false; + private volatile boolean getConnectionCalled; /** Connection properties passed to JDBC Driver */ - private Properties connectionProperties = null; + private Properties connectionProperties; static { // Attempt to prevent deadlocks - see DBCP - 272 @@ -150,7 +150,7 @@ public class DriverAdapterCPDS /** * Controls access to the underlying connection */ - private boolean accessToUnderlyingConnectionAllowed = false; + private boolean accessToUnderlyingConnectionAllowed; /** * Default no-arg constructor for Serialization http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/efedfb04/src/main/java/org/apache/commons/dbcp2/cpdsadapter/PooledConnectionImpl.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/dbcp2/cpdsadapter/PooledConnectionImpl.java b/src/main/java/org/apache/commons/dbcp2/cpdsadapter/PooledConnectionImpl.java index e09dd3a..138c1fc 100644 --- a/src/main/java/org/apache/commons/dbcp2/cpdsadapter/PooledConnectionImpl.java +++ b/src/main/java/org/apache/commons/dbcp2/cpdsadapter/PooledConnectionImpl.java @@ -54,7 +54,7 @@ class PooledConnectionImpl /** * The JDBC database connection that represents the physical db connection. */ - private Connection connection = null; + private Connection connection; /** * A DelegatingConnection used to create a PoolablePreparedStatementStub @@ -64,7 +64,7 @@ class PooledConnectionImpl /** * The JDBC database logical connection. */ - private Connection logicalConnection = null; + private Connection logicalConnection; /** * ConnectionEventListeners @@ -88,7 +88,7 @@ class PooledConnectionImpl /** * Controls access to the underlying connection */ - private boolean accessToUnderlyingConnectionAllowed = false; + private boolean accessToUnderlyingConnectionAllowed; /** * Wraps the real connection. http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/efedfb04/src/main/java/org/apache/commons/dbcp2/datasources/InstanceKeyDataSource.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/dbcp2/datasources/InstanceKeyDataSource.java b/src/main/java/org/apache/commons/dbcp2/datasources/InstanceKeyDataSource.java index 242d538..5576a7c 100644 --- a/src/main/java/org/apache/commons/dbcp2/datasources/InstanceKeyDataSource.java +++ b/src/main/java/org/apache/commons/dbcp2/datasources/InstanceKeyDataSource.java @@ -100,28 +100,28 @@ public abstract class InstanceKeyDataSource protected static final int UNKNOWN_TRANSACTIONISOLATION = -1; /** Guards property setters - once true, setters throw IllegalStateException */ - private volatile boolean getConnectionCalled = false; + private volatile boolean getConnectionCalled; /** Underlying source of PooledConnections */ - private ConnectionPoolDataSource dataSource = null; + private ConnectionPoolDataSource dataSource; /** DataSource Name used to find the ConnectionPoolDataSource */ - private String dataSourceName = null; + private String dataSourceName; /** Description */ - private String description = null; + private String description; /** Environment that may be used to set up a jndi initial context. */ - private Properties jndiEnvironment = null; + private Properties jndiEnvironment; /** Login TimeOut in seconds */ - private int loginTimeout = 0; + private int loginTimeout; /** Log stream */ - private PrintWriter logWriter = null; + private PrintWriter logWriter; /** Instance key */ - private String instanceKey = null; + private String instanceKey; // Pool properties private boolean defaultBlockWhenExhausted = @@ -155,15 +155,15 @@ public abstract class InstanceKeyDataSource BaseObjectPoolConfig.DEFAULT_TIME_BETWEEN_EVICTION_RUNS_MILLIS; // Connection factory properties - private String validationQuery = null; + private String validationQuery; private int validationQueryTimeout = -1; - private boolean rollbackAfterValidation = false; + private boolean rollbackAfterValidation; private long maxConnLifetimeMillis = -1; // Connection properties - private Boolean defaultAutoCommit = null; + private Boolean defaultAutoCommit; private int defaultTransactionIsolation = UNKNOWN_TRANSACTIONISOLATION; - private Boolean defaultReadOnly = null; + private Boolean defaultReadOnly; /** http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/efedfb04/src/main/java/org/apache/commons/dbcp2/datasources/SharedPoolDataSource.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/dbcp2/datasources/SharedPoolDataSource.java b/src/main/java/org/apache/commons/dbcp2/datasources/SharedPoolDataSource.java index 679852e..5873503 100644 --- a/src/main/java/org/apache/commons/dbcp2/datasources/SharedPoolDataSource.java +++ b/src/main/java/org/apache/commons/dbcp2/datasources/SharedPoolDataSource.java @@ -55,8 +55,8 @@ public class SharedPoolDataSource extends InstanceKeyDataSource { // Pool properties private int maxTotal = GenericKeyedObjectPoolConfig.DEFAULT_MAX_TOTAL; - private transient KeyedObjectPool<UserPassKey,PooledConnectionAndInfo> pool = null; - private transient KeyedCPDSConnectionFactory factory = null; + private transient KeyedObjectPool<UserPassKey,PooledConnectionAndInfo> pool; + private transient KeyedCPDSConnectionFactory factory; /** * Default no-argument constructor for Serialization
