You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gg...@apache.org on 2021/05/31 14:46:01 UTC
[commons-dbcp] branch master updated: DBCP-575 - Remove redundant
initializer (#98)
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-dbcp.git
The following commit(s) were added to refs/heads/master by this push:
new 4131207 DBCP-575 - Remove redundant initializer (#98)
4131207 is described below
commit 4131207b03b5fb2bea7ee72895ec8cc7f0b242a5
Author: Arturo Bernal <ar...@gmail.com>
AuthorDate: Mon May 31 16:45:54 2021 +0200
DBCP-575 - Remove redundant initializer (#98)
---
src/main/java/org/apache/commons/dbcp2/AbandonedTrace.java | 2 +-
.../java/org/apache/commons/dbcp2/BasicDataSource.java | 14 +++++++-------
.../java/org/apache/commons/dbcp2/DelegatingStatement.java | 2 +-
.../java/org/apache/commons/dbcp2/PoolableConnection.java | 2 +-
.../apache/commons/dbcp2/PoolablePreparedStatement.java | 2 +-
.../java/org/apache/commons/dbcp2/PoolingConnection.java | 2 +-
.../java/org/apache/commons/dbcp2/PoolingDataSource.java | 2 +-
.../java/org/apache/commons/dbcp2/TestBasicDataSource.java | 2 +-
.../java/org/apache/commons/dbcp2/TestConnectionPool.java | 10 +++++-----
.../commons/dbcp2/TestDelegatingCallableStatement.java | 6 +++---
.../commons/dbcp2/TestDelegatingDatabaseMetaData.java | 6 +++---
.../commons/dbcp2/TestDelegatingPreparedStatement.java | 8 ++++----
src/test/java/org/apache/commons/dbcp2/TestJndi.java | 2 +-
.../commons/dbcp2/TestParallelCreationWithNoIdle.java | 2 +-
.../org/apache/commons/dbcp2/TestPoolableConnection.java | 2 +-
.../org/apache/commons/dbcp2/TestPoolingConnection.java | 2 +-
.../org/apache/commons/dbcp2/TestPoolingDataSource.java | 4 ++--
.../java/org/apache/commons/dbcp2/TestPoolingDriver.java | 2 +-
.../java/org/apache/commons/dbcp2/TesterConnection.java | 2 +-
.../org/apache/commons/dbcp2/TesterPreparedStatement.java | 8 ++++----
.../java/org/apache/commons/dbcp2/TesterResultSet.java | 6 +++---
.../commons/dbcp2/cpdsadapter/TestDriverAdapterCPDS.java | 2 +-
.../dbcp2/datasources/ConnectionPoolDataSourceProxy.java | 2 +-
.../commons/dbcp2/datasources/PooledConnectionProxy.java | 4 ++--
.../dbcp2/datasources/TestCPDSConnectionFactory.java | 2 +-
.../dbcp2/datasources/TestKeyedCPDSConnectionFactory.java | 2 +-
.../apache/commons/dbcp2/managed/TestLocalXaResource.java | 14 +++++++-------
.../commons/dbcp2/managed/TestManagedConnection.java | 4 ++--
.../commons/dbcp2/managed/TestManagedDataSource.java | 4 ++--
29 files changed, 61 insertions(+), 61 deletions(-)
diff --git a/src/main/java/org/apache/commons/dbcp2/AbandonedTrace.java b/src/main/java/org/apache/commons/dbcp2/AbandonedTrace.java
index 370c228..cd8b0fb 100644
--- a/src/main/java/org/apache/commons/dbcp2/AbandonedTrace.java
+++ b/src/main/java/org/apache/commons/dbcp2/AbandonedTrace.java
@@ -38,7 +38,7 @@ public class AbandonedTrace implements TrackedUse {
private final List<WeakReference<AbandonedTrace>> traceList = new ArrayList<>();
/** Last time this connection was used. */
- private volatile long lastUsedMillis = 0;
+ private volatile long lastUsedMillis;
/**
* Creates a new AbandonedTrace without config and without doing abandoned tracing.
diff --git a/src/main/java/org/apache/commons/dbcp2/BasicDataSource.java b/src/main/java/org/apache/commons/dbcp2/BasicDataSource.java
index 199078b..9f89837 100644
--- a/src/main/java/org/apache/commons/dbcp2/BasicDataSource.java
+++ b/src/main/java/org/apache/commons/dbcp2/BasicDataSource.java
@@ -198,7 +198,7 @@ public class BasicDataSource implements DataSource, BasicDataSourceMXBean, MBean
/**
* The initial number of connections that are created when the pool is started.
*/
- private int initialSize = 0;
+ private int initialSize;
/**
* The maximum number of milliseconds that the pool will wait (when there are no available connections) for a
@@ -210,9 +210,9 @@ public class BasicDataSource implements DataSource, BasicDataSourceMXBean, MBean
* Prepared statement pooling for this pool. When this property is set to <code>true</code> both PreparedStatements
* and CallableStatements are pooled.
*/
- private boolean poolPreparedStatements = false;
+ private boolean poolPreparedStatements;
- private boolean clearStatementPoolOnReturn = false;
+ private boolean clearStatementPoolOnReturn;
/**
* <p>
@@ -233,7 +233,7 @@ public class BasicDataSource implements DataSource, BasicDataSourceMXBean, MBean
* The indication of whether objects will be validated as soon as they have been created by the pool. If the object
* fails to validate, the borrow operation that triggered the creation will fail.
*/
- private boolean testOnCreate = false;
+ private boolean testOnCreate;
/**
* The indication of whether objects will be validated before being borrowed from the pool. If the object fails to
@@ -244,7 +244,7 @@ public class BasicDataSource implements DataSource, BasicDataSourceMXBean, MBean
/**
* The indication of whether objects will be validated before being returned to the pool.
*/
- private boolean testOnReturn = false;
+ private boolean testOnReturn;
/**
* The number of milliseconds to sleep between runs of the idle object evictor thread. When non-positive, no idle
@@ -277,7 +277,7 @@ public class BasicDataSource implements DataSource, BasicDataSourceMXBean, MBean
* The indication of whether objects will be validated by the idle object evictor (if any). If an object fails to
* validate, it will be dropped from the pool.
*/
- private boolean testWhileIdle = false;
+ private boolean testWhileIdle;
/**
* The connection password to be passed to our JDBC driver to establish a connection.
@@ -323,7 +323,7 @@ public class BasicDataSource implements DataSource, BasicDataSourceMXBean, MBean
/**
* Controls access to the underlying connection.
*/
- private boolean accessToUnderlyingConnectionAllowed = false;
+ private boolean accessToUnderlyingConnectionAllowed;
private long maxConnLifetimeMillis = -1;
diff --git a/src/main/java/org/apache/commons/dbcp2/DelegatingStatement.java b/src/main/java/org/apache/commons/dbcp2/DelegatingStatement.java
index 4810bcd..d9422e2 100644
--- a/src/main/java/org/apache/commons/dbcp2/DelegatingStatement.java
+++ b/src/main/java/org/apache/commons/dbcp2/DelegatingStatement.java
@@ -43,7 +43,7 @@ public class DelegatingStatement extends AbandonedTrace implements Statement {
/** The connection that created me. **/
private DelegatingConnection<?> connection;
- private boolean closed = false;
+ private boolean closed;
/**
* Create a wrapper for the Statement which traces this Statement to the Connection which created it and the code
diff --git a/src/main/java/org/apache/commons/dbcp2/PoolableConnection.java b/src/main/java/org/apache/commons/dbcp2/PoolableConnection.java
index e719dcc..9bd367b 100644
--- a/src/main/java/org/apache/commons/dbcp2/PoolableConnection.java
+++ b/src/main/java/org/apache/commons/dbcp2/PoolableConnection.java
@@ -64,7 +64,7 @@ public class PoolableConnection extends DelegatingConnection<Connection> impleme
* Indicate that unrecoverable SQLException was thrown when using this connection. Such a connection should be
* considered broken and not pass validation in the future.
*/
- private boolean fatalSqlExceptionThrown = false;
+ private boolean fatalSqlExceptionThrown;
/**
* SQL_STATE codes considered to signal fatal conditions. Overrides the defaults in
diff --git a/src/main/java/org/apache/commons/dbcp2/PoolablePreparedStatement.java b/src/main/java/org/apache/commons/dbcp2/PoolablePreparedStatement.java
index 93a8ef8..6d9f565 100644
--- a/src/main/java/org/apache/commons/dbcp2/PoolablePreparedStatement.java
+++ b/src/main/java/org/apache/commons/dbcp2/PoolablePreparedStatement.java
@@ -50,7 +50,7 @@ public class PoolablePreparedStatement<K> extends DelegatingPreparedStatement {
*/
private final K key;
- private volatile boolean batchAdded = false;
+ private volatile boolean batchAdded;
/**
* Constructor.
diff --git a/src/main/java/org/apache/commons/dbcp2/PoolingConnection.java b/src/main/java/org/apache/commons/dbcp2/PoolingConnection.java
index c629f87..0062963 100644
--- a/src/main/java/org/apache/commons/dbcp2/PoolingConnection.java
+++ b/src/main/java/org/apache/commons/dbcp2/PoolingConnection.java
@@ -65,7 +65,7 @@ public class PoolingConnection extends DelegatingConnection<Connection>
/** Pool of {@link PreparedStatement}s. and {@link CallableStatement}s */
private KeyedObjectPool<PStmtKey, DelegatingPreparedStatement> pstmtPool;
- private boolean clearStatementPoolOnReturn = false;
+ private boolean clearStatementPoolOnReturn;
/**
* Constructor.
diff --git a/src/main/java/org/apache/commons/dbcp2/PoolingDataSource.java b/src/main/java/org/apache/commons/dbcp2/PoolingDataSource.java
index 0169d9b..2e10799 100644
--- a/src/main/java/org/apache/commons/dbcp2/PoolingDataSource.java
+++ b/src/main/java/org/apache/commons/dbcp2/PoolingDataSource.java
@@ -204,7 +204,7 @@ public class PoolingDataSource<C extends Connection> implements DataSource, Auto
}
/** My log writer. */
- private PrintWriter logWriter = null;
+ private PrintWriter logWriter;
private final ObjectPool<C> pool;
diff --git a/src/test/java/org/apache/commons/dbcp2/TestBasicDataSource.java b/src/test/java/org/apache/commons/dbcp2/TestBasicDataSource.java
index d8964c4..092c3ee 100644
--- a/src/test/java/org/apache/commons/dbcp2/TestBasicDataSource.java
+++ b/src/test/java/org/apache/commons/dbcp2/TestBasicDataSource.java
@@ -62,7 +62,7 @@ public class TestBasicDataSource extends TestConnectionPool {
return ds.getConnection();
}
- protected BasicDataSource ds = null;
+ protected BasicDataSource ds;
private static final String CATALOG = "test catalog";
@BeforeAll
diff --git a/src/test/java/org/apache/commons/dbcp2/TestConnectionPool.java b/src/test/java/org/apache/commons/dbcp2/TestConnectionPool.java
index 4fb7811..393eafd 100644
--- a/src/test/java/org/apache/commons/dbcp2/TestConnectionPool.java
+++ b/src/test/java/org/apache/commons/dbcp2/TestConnectionPool.java
@@ -578,8 +578,8 @@ public abstract class TestConnectionPool {
class TestThread implements Runnable {
final java.util.Random _random = new java.util.Random();
- boolean _complete = false;
- boolean _failed = false;
+ boolean _complete;
+ boolean _failed;
int _iter = 100;
int _delay = 50;
@@ -850,7 +850,7 @@ public abstract class TestConnectionPool {
assertEquals(0, failed, "Did not expect any threads to fail");
}
}
- private static int currentThreadCount = 0;
+ private static int currentThreadCount;
private static final String DONE = "Done";
@@ -879,8 +879,8 @@ public abstract class TestConnectionPool {
private long preconnected; // just before connect
private long connected; // when thread last connected
private long postconnected; // when thread released connection
- private int loops = 0;
- private int connHash = 0; // Connection identity hashCode (to see which one is reused)
+ private int loops;
+ private int connHash; // Connection identity hashCode (to see which one is reused)
private final boolean stopOnException; // If true, don't rethrow Exception
diff --git a/src/test/java/org/apache/commons/dbcp2/TestDelegatingCallableStatement.java b/src/test/java/org/apache/commons/dbcp2/TestDelegatingCallableStatement.java
index d9c824b..5fda883 100644
--- a/src/test/java/org/apache/commons/dbcp2/TestDelegatingCallableStatement.java
+++ b/src/test/java/org/apache/commons/dbcp2/TestDelegatingCallableStatement.java
@@ -34,9 +34,9 @@ import org.junit.jupiter.api.Test;
@SuppressWarnings({ "deprecation", "unchecked", "rawtypes" }) // BigDecimal methods, and casting for mocks
public class TestDelegatingCallableStatement {
- private TesterConnection conn = null;
- private DelegatingCallableStatement delegate = null;
- private CallableStatement obj = null;
+ private TesterConnection conn;
+ private DelegatingCallableStatement delegate;
+ private CallableStatement obj;
@BeforeEach
public void setUp() throws Exception {
diff --git a/src/test/java/org/apache/commons/dbcp2/TestDelegatingDatabaseMetaData.java b/src/test/java/org/apache/commons/dbcp2/TestDelegatingDatabaseMetaData.java
index 653865a..9780cc5 100644
--- a/src/test/java/org/apache/commons/dbcp2/TestDelegatingDatabaseMetaData.java
+++ b/src/test/java/org/apache/commons/dbcp2/TestDelegatingDatabaseMetaData.java
@@ -38,9 +38,9 @@ import org.junit.jupiter.api.Test;
public class TestDelegatingDatabaseMetaData {
private TesterConnection testConn;
- private DelegatingConnection<?> conn = null;
- private DelegatingDatabaseMetaData delegate = null;
- private DatabaseMetaData obj = null;
+ private DelegatingConnection<?> conn;
+ private DelegatingDatabaseMetaData delegate;
+ private DatabaseMetaData obj;
@BeforeEach
public void setUp() throws Exception {
diff --git a/src/test/java/org/apache/commons/dbcp2/TestDelegatingPreparedStatement.java b/src/test/java/org/apache/commons/dbcp2/TestDelegatingPreparedStatement.java
index 5f842c2..3252857 100644
--- a/src/test/java/org/apache/commons/dbcp2/TestDelegatingPreparedStatement.java
+++ b/src/test/java/org/apache/commons/dbcp2/TestDelegatingPreparedStatement.java
@@ -33,10 +33,10 @@ import org.junit.jupiter.api.Test;
@SuppressWarnings({ "deprecation", "rawtypes" }) // BigDecimal methods, and casting for mocks
public class TestDelegatingPreparedStatement {
- private TesterConnection testerConn = null;
- private DelegatingConnection connection = null;
- private PreparedStatement obj = null;
- private DelegatingPreparedStatement delegate = null;
+ private TesterConnection testerConn;
+ private DelegatingConnection connection;
+ private PreparedStatement obj;
+ private DelegatingPreparedStatement delegate;
@BeforeEach
public void setUp() throws Exception {
diff --git a/src/test/java/org/apache/commons/dbcp2/TestJndi.java b/src/test/java/org/apache/commons/dbcp2/TestJndi.java
index 8121174..7c5aa5d 100644
--- a/src/test/java/org/apache/commons/dbcp2/TestJndi.java
+++ b/src/test/java/org/apache/commons/dbcp2/TestJndi.java
@@ -49,7 +49,7 @@ public class TestJndi {
+ "jndiTestDataSource";
/** JNDI context to use in tests **/
- protected Context context = null;
+ protected Context context;
/**
* Test BasicDatasource bind and lookup
diff --git a/src/test/java/org/apache/commons/dbcp2/TestParallelCreationWithNoIdle.java b/src/test/java/org/apache/commons/dbcp2/TestParallelCreationWithNoIdle.java
index 3eb2f19..e20922d 100644
--- a/src/test/java/org/apache/commons/dbcp2/TestParallelCreationWithNoIdle.java
+++ b/src/test/java/org/apache/commons/dbcp2/TestParallelCreationWithNoIdle.java
@@ -37,7 +37,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
public class TestParallelCreationWithNoIdle {
- protected BasicDataSource ds = null;
+ protected BasicDataSource ds;
private static final String CATALOG = "test catalog";
@BeforeAll
diff --git a/src/test/java/org/apache/commons/dbcp2/TestPoolableConnection.java b/src/test/java/org/apache/commons/dbcp2/TestPoolableConnection.java
index 42acc72..7219ccf 100644
--- a/src/test/java/org/apache/commons/dbcp2/TestPoolableConnection.java
+++ b/src/test/java/org/apache/commons/dbcp2/TestPoolableConnection.java
@@ -34,7 +34,7 @@ import org.junit.jupiter.api.Test;
*/
public class TestPoolableConnection {
- private GenericObjectPool<PoolableConnection> pool = null;
+ private GenericObjectPool<PoolableConnection> pool;
@BeforeEach
public void setUp() throws Exception {
diff --git a/src/test/java/org/apache/commons/dbcp2/TestPoolingConnection.java b/src/test/java/org/apache/commons/dbcp2/TestPoolingConnection.java
index c243248..2a46d37 100644
--- a/src/test/java/org/apache/commons/dbcp2/TestPoolingConnection.java
+++ b/src/test/java/org/apache/commons/dbcp2/TestPoolingConnection.java
@@ -28,7 +28,7 @@ import org.junit.jupiter.api.Test;
public class TestPoolingConnection {
- private PoolingConnection con = null;
+ private PoolingConnection con;
@BeforeEach
public void setUp() throws Exception {
diff --git a/src/test/java/org/apache/commons/dbcp2/TestPoolingDataSource.java b/src/test/java/org/apache/commons/dbcp2/TestPoolingDataSource.java
index d1dd49b..092aa76 100644
--- a/src/test/java/org/apache/commons/dbcp2/TestPoolingDataSource.java
+++ b/src/test/java/org/apache/commons/dbcp2/TestPoolingDataSource.java
@@ -41,8 +41,8 @@ public class TestPoolingDataSource extends TestConnectionPool {
return ds.getConnection();
}
- protected PoolingDataSource<PoolableConnection> ds = null;
- private GenericObjectPool<PoolableConnection> pool = null;
+ protected PoolingDataSource<PoolableConnection> ds;
+ private GenericObjectPool<PoolableConnection> pool;
@BeforeEach
public void setUp() throws Exception {
diff --git a/src/test/java/org/apache/commons/dbcp2/TestPoolingDriver.java b/src/test/java/org/apache/commons/dbcp2/TestPoolingDriver.java
index 6782eed..3835721 100644
--- a/src/test/java/org/apache/commons/dbcp2/TestPoolingDriver.java
+++ b/src/test/java/org/apache/commons/dbcp2/TestPoolingDriver.java
@@ -52,7 +52,7 @@ public class TestPoolingDriver extends TestConnectionPool {
return DriverManager.getConnection("jdbc:apache:commons:dbcp:test");
}
- private PoolingDriver driver = null;
+ private PoolingDriver driver;
@BeforeEach
public void setUp() throws Exception {
diff --git a/src/test/java/org/apache/commons/dbcp2/TesterConnection.java b/src/test/java/org/apache/commons/dbcp2/TesterConnection.java
index 1fe79af..f664f33 100644
--- a/src/test/java/org/apache/commons/dbcp2/TesterConnection.java
+++ b/src/test/java/org/apache/commons/dbcp2/TesterConnection.java
@@ -41,7 +41,7 @@ import java.util.concurrent.Executor;
public class TesterConnection extends AbandonedTrace implements Connection {
protected boolean _open = true;
- protected boolean _aborted = false;
+ protected boolean _aborted;
protected boolean _autoCommit = true;
protected int _transactionIsolation = 1;
protected final DatabaseMetaData _metaData = new TesterDatabaseMetaData();
diff --git a/src/test/java/org/apache/commons/dbcp2/TesterPreparedStatement.java b/src/test/java/org/apache/commons/dbcp2/TesterPreparedStatement.java
index a8a1bb5..4bffa0c 100644
--- a/src/test/java/org/apache/commons/dbcp2/TesterPreparedStatement.java
+++ b/src/test/java/org/apache/commons/dbcp2/TesterPreparedStatement.java
@@ -41,11 +41,11 @@ import java.sql.SQLXML;
public class TesterPreparedStatement extends TesterStatement implements PreparedStatement {
private final ResultSetMetaData _resultSetMetaData = null;
- private String _sql = null;
- private String _catalog = null;
+ private String _sql;
+ private String _catalog;
private int _autoGeneratedKeys = 1;
- private int[] _columnIndexes = null;
- private String[] _columnNames = null;
+ private int[] _columnIndexes;
+ private String[] _columnNames;
public TesterPreparedStatement(final Connection conn) {
super(conn);
diff --git a/src/test/java/org/apache/commons/dbcp2/TesterResultSet.java b/src/test/java/org/apache/commons/dbcp2/TesterResultSet.java
index 7dcba8d..fdfbc38 100644
--- a/src/test/java/org/apache/commons/dbcp2/TesterResultSet.java
+++ b/src/test/java/org/apache/commons/dbcp2/TesterResultSet.java
@@ -44,12 +44,12 @@ public class TesterResultSet extends AbandonedTrace implements ResultSet {
protected int _type = ResultSet.TYPE_FORWARD_ONLY;
protected int _concurrency = ResultSet.CONCUR_READ_ONLY;
- protected Object[][] _data = null;
+ protected Object[][] _data;
protected int _currentRow = -1;
- protected Statement _statement = null;
+ protected Statement _statement;
protected int _rowsLeft = 2;
protected boolean _open = true;
- protected boolean _sqlExceptionOnClose = false;
+ protected boolean _sqlExceptionOnClose;
public TesterResultSet(final Statement stmt) {
_statement = stmt;
diff --git a/src/test/java/org/apache/commons/dbcp2/cpdsadapter/TestDriverAdapterCPDS.java b/src/test/java/org/apache/commons/dbcp2/cpdsadapter/TestDriverAdapterCPDS.java
index 60b05ec..46573ca 100644
--- a/src/test/java/org/apache/commons/dbcp2/cpdsadapter/TestDriverAdapterCPDS.java
+++ b/src/test/java/org/apache/commons/dbcp2/cpdsadapter/TestDriverAdapterCPDS.java
@@ -279,7 +279,7 @@ public class TestDriverAdapterCPDS {
private final DataSource ds;
- private volatile boolean failed = false;
+ private volatile boolean failed;
public ThreadDbcp367(final DataSource ds) {
this.ds = ds;
diff --git a/src/test/java/org/apache/commons/dbcp2/datasources/ConnectionPoolDataSourceProxy.java b/src/test/java/org/apache/commons/dbcp2/datasources/ConnectionPoolDataSourceProxy.java
index d88367c..c0afedd 100644
--- a/src/test/java/org/apache/commons/dbcp2/datasources/ConnectionPoolDataSourceProxy.java
+++ b/src/test/java/org/apache/commons/dbcp2/datasources/ConnectionPoolDataSourceProxy.java
@@ -32,7 +32,7 @@ import org.apache.commons.dbcp2.Jdbc41Bridge;
*/
public class ConnectionPoolDataSourceProxy implements ConnectionPoolDataSource {
- protected ConnectionPoolDataSource delegate = null;
+ protected ConnectionPoolDataSource delegate;
public ConnectionPoolDataSourceProxy(final ConnectionPoolDataSource cpds) {
this.delegate = cpds;
diff --git a/src/test/java/org/apache/commons/dbcp2/datasources/PooledConnectionProxy.java b/src/test/java/org/apache/commons/dbcp2/datasources/PooledConnectionProxy.java
index 5481e9b..fe8d15a 100644
--- a/src/test/java/org/apache/commons/dbcp2/datasources/PooledConnectionProxy.java
+++ b/src/test/java/org/apache/commons/dbcp2/datasources/PooledConnectionProxy.java
@@ -36,7 +36,7 @@ import javax.sql.StatementEventListener;
public class PooledConnectionProxy implements PooledConnection,
ConnectionEventListener {
- protected PooledConnection delegate = null;
+ protected PooledConnection delegate;
/**
* ConnectionEventListeners
@@ -48,7 +48,7 @@ public class PooledConnectionProxy implements PooledConnection,
* ConnectionClosed event when this (i.e. the PooledConnection itself)
* is closed
*/
- private boolean notifyOnClose = false;
+ private boolean notifyOnClose;
public PooledConnectionProxy(final PooledConnection pooledConnection) {
this.delegate = pooledConnection;
diff --git a/src/test/java/org/apache/commons/dbcp2/datasources/TestCPDSConnectionFactory.java b/src/test/java/org/apache/commons/dbcp2/datasources/TestCPDSConnectionFactory.java
index c791be9..4ea2e17 100644
--- a/src/test/java/org/apache/commons/dbcp2/datasources/TestCPDSConnectionFactory.java
+++ b/src/test/java/org/apache/commons/dbcp2/datasources/TestCPDSConnectionFactory.java
@@ -35,7 +35,7 @@ import org.junit.jupiter.api.Test;
*/
public class TestCPDSConnectionFactory {
- protected ConnectionPoolDataSourceProxy cpds = null;
+ protected ConnectionPoolDataSourceProxy cpds;
@BeforeEach
public void setUp() throws Exception {
diff --git a/src/test/java/org/apache/commons/dbcp2/datasources/TestKeyedCPDSConnectionFactory.java b/src/test/java/org/apache/commons/dbcp2/datasources/TestKeyedCPDSConnectionFactory.java
index ae753bd..592850f 100644
--- a/src/test/java/org/apache/commons/dbcp2/datasources/TestKeyedCPDSConnectionFactory.java
+++ b/src/test/java/org/apache/commons/dbcp2/datasources/TestKeyedCPDSConnectionFactory.java
@@ -36,7 +36,7 @@ import org.junit.jupiter.api.Test;
*/
public class TestKeyedCPDSConnectionFactory {
- protected ConnectionPoolDataSourceProxy cpds = null;
+ protected ConnectionPoolDataSourceProxy cpds;
@BeforeEach
public void setUp() throws Exception {
diff --git a/src/test/java/org/apache/commons/dbcp2/managed/TestLocalXaResource.java b/src/test/java/org/apache/commons/dbcp2/managed/TestLocalXaResource.java
index 8b6f5af..4b3085a 100644
--- a/src/test/java/org/apache/commons/dbcp2/managed/TestLocalXaResource.java
+++ b/src/test/java/org/apache/commons/dbcp2/managed/TestLocalXaResource.java
@@ -293,13 +293,13 @@ public class TestLocalXaResource {
private static class TestConnection implements Connection {
- public boolean throwWhenGetAutoCommit = false;
- public boolean throwWhenSetAutoCommit = false;
- boolean autoCommit = false;
- boolean readOnly = false;
- public boolean committed = false;
- public boolean rolledback = false;
- public boolean closed = false;
+ public boolean throwWhenGetAutoCommit;
+ public boolean throwWhenSetAutoCommit;
+ boolean autoCommit;
+ boolean readOnly;
+ public boolean committed;
+ public boolean rolledback;
+ public boolean closed;
@Override
public <T> T unwrap(final Class<T> iface) throws SQLException {
diff --git a/src/test/java/org/apache/commons/dbcp2/managed/TestManagedConnection.java b/src/test/java/org/apache/commons/dbcp2/managed/TestManagedConnection.java
index 3080034..6042476 100644
--- a/src/test/java/org/apache/commons/dbcp2/managed/TestManagedConnection.java
+++ b/src/test/java/org/apache/commons/dbcp2/managed/TestManagedConnection.java
@@ -51,9 +51,9 @@ import org.junit.jupiter.api.Test;
*/
public class TestManagedConnection {
- protected PoolingDataSource<PoolableConnection> ds = null;
+ protected PoolingDataSource<PoolableConnection> ds;
- private GenericObjectPool<PoolableConnection> pool = null;
+ private GenericObjectPool<PoolableConnection> pool;
protected TransactionManager transactionManager;
diff --git a/src/test/java/org/apache/commons/dbcp2/managed/TestManagedDataSource.java b/src/test/java/org/apache/commons/dbcp2/managed/TestManagedDataSource.java
index 85af515..81c6231 100644
--- a/src/test/java/org/apache/commons/dbcp2/managed/TestManagedDataSource.java
+++ b/src/test/java/org/apache/commons/dbcp2/managed/TestManagedDataSource.java
@@ -54,8 +54,8 @@ public class TestManagedDataSource extends TestConnectionPool {
return ds.getConnection();
}
- protected PoolingDataSource<PoolableConnection> ds = null;
- protected GenericObjectPool<PoolableConnection> pool = null;
+ protected PoolingDataSource<PoolableConnection> ds;
+ protected GenericObjectPool<PoolableConnection> pool;
protected TransactionManager transactionManager;
@BeforeEach