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 8ddf6db Use final.
8ddf6db is described below
commit 8ddf6dbcccec8f40358296c32b0daf7edfe4ebeb
Author: Gary Gregory <gardgreg...@gmail.com>
AuthorDate: Fri Nov 20 22:09:14 2020 -0500
Use final.
---
.../java/org/apache/commons/dbcp2/BasicDataSource.java | 4 ++--
.../org/apache/commons/dbcp2/DelegatingConnection.java | 4 ++--
.../org/apache/commons/dbcp2/DelegatingStatement.java | 4 ++--
.../java/org/apache/commons/dbcp2/DriverFactory.java | 6 +++---
.../org/apache/commons/dbcp2/PoolingConnection.java | 2 +-
.../org/apache/commons/dbcp2/SQLExceptionList.java | 2 +-
src/main/java/org/apache/commons/dbcp2/Utils.java | 2 +-
.../commons/dbcp2/cpdsadapter/DriverAdapterCPDS.java | 6 +++---
.../dbcp2/datasources/KeyedCPDSConnectionFactory.java | 2 +-
.../org/apache/commons/dbcp2/TestBasicDataSource.java | 6 +++---
.../apache/commons/dbcp2/TestDelegatingConnection.java | 18 +++++++++---------
.../commons/dbcp2/TestPStmtPoolingBasicDataSource.java | 2 +-
.../org/apache/commons/dbcp2/TesterConnection.java | 2 +-
.../apache/commons/dbcp2/TesterConnectionFactory.java | 4 ++--
.../dbcp2/datasources/TestSharedPoolDataSource.java | 2 +-
.../dbcp2/managed/TestBasicManagedDataSource.java | 2 +-
.../commons/dbcp2/managed/TestManagedDataSource.java | 4 ++--
17 files changed, 36 insertions(+), 36 deletions(-)
diff --git a/src/main/java/org/apache/commons/dbcp2/BasicDataSource.java
b/src/main/java/org/apache/commons/dbcp2/BasicDataSource.java
index b6423d1..5fdbb2c 100644
--- a/src/main/java/org/apache/commons/dbcp2/BasicDataSource.java
+++ b/src/main/java/org/apache/commons/dbcp2/BasicDataSource.java
@@ -1462,7 +1462,7 @@ public class BasicDataSource implements DataSource,
BasicDataSourceMXBean, MBean
* @param value the string to test, may be null.
* @return boolean false if value is null, otherwise {@link
String#isEmpty()}.
*/
- private boolean isEmpty(String value) {
+ private boolean isEmpty(final String value) {
return value == null ? true : value.trim().isEmpty();
}
@@ -1511,7 +1511,7 @@ public class BasicDataSource implements DataSource,
BasicDataSourceMXBean, MBean
*
* @since 2.7.0
*/
- protected void log(String message, Throwable throwable) {
+ protected void log(final String message, final Throwable throwable) {
if (logWriter != null) {
logWriter.println(message);
throwable.printStackTrace(logWriter);
diff --git a/src/main/java/org/apache/commons/dbcp2/DelegatingConnection.java
b/src/main/java/org/apache/commons/dbcp2/DelegatingConnection.java
index bbadd59..2075be3 100644
--- a/src/main/java/org/apache/commons/dbcp2/DelegatingConnection.java
+++ b/src/main/java/org/apache/commons/dbcp2/DelegatingConnection.java
@@ -626,7 +626,7 @@ public class DelegatingConnection<C extends Connection>
extends AbandonedTrace i
if (trace instanceof Statement) {
try {
((Statement) trace).close();
- } catch (Exception e) {
+ } catch (final Exception e) {
thrownList.add(e);
}
} else if (trace instanceof ResultSet) {
@@ -634,7 +634,7 @@ public class DelegatingConnection<C extends Connection>
extends AbandonedTrace i
// generated via DatabaseMetaData
try {
((ResultSet) trace).close();
- } catch (Exception e) {
+ } catch (final Exception e) {
thrownList.add(e);
}
}
diff --git a/src/main/java/org/apache/commons/dbcp2/DelegatingStatement.java
b/src/main/java/org/apache/commons/dbcp2/DelegatingStatement.java
index 257659a..71d4cbc 100644
--- a/src/main/java/org/apache/commons/dbcp2/DelegatingStatement.java
+++ b/src/main/java/org/apache/commons/dbcp2/DelegatingStatement.java
@@ -145,7 +145,7 @@ public class DelegatingStatement extends AbandonedTrace
implements Statement {
if (resultSet != null) {
try {
resultSet.close();
- } catch (Exception e) {
+ } catch (final Exception e) {
if (connection != null) {
// Does not rethrow e.
connection.handleExceptionNoThrow(e);
@@ -159,7 +159,7 @@ public class DelegatingStatement extends AbandonedTrace
implements Statement {
if (statement != null) {
try {
statement.close();
- } catch (Exception e) {
+ } catch (final Exception e) {
if (connection != null) {
// Does not rethrow e.
connection.handleExceptionNoThrow(e);
diff --git a/src/main/java/org/apache/commons/dbcp2/DriverFactory.java
b/src/main/java/org/apache/commons/dbcp2/DriverFactory.java
index 0b1e92f..3c2df3f 100644
--- a/src/main/java/org/apache/commons/dbcp2/DriverFactory.java
+++ b/src/main/java/org/apache/commons/dbcp2/DriverFactory.java
@@ -31,9 +31,9 @@ class DriverFactory {
static Driver createDriver(final BasicDataSource basicDataSource) throws
SQLException {
// Load the JDBC driver class
Driver driverToUse = basicDataSource.getDriver();
- String driverClassName = basicDataSource.getDriverClassName();
- ClassLoader driverClassLoader = basicDataSource.getDriverClassLoader();
- String url = basicDataSource.getUrl();
+ final String driverClassName = basicDataSource.getDriverClassName();
+ final ClassLoader driverClassLoader =
basicDataSource.getDriverClassLoader();
+ final String url = basicDataSource.getUrl();
if (driverToUse == null) {
Class<?> driverFromCCL = null;
diff --git a/src/main/java/org/apache/commons/dbcp2/PoolingConnection.java
b/src/main/java/org/apache/commons/dbcp2/PoolingConnection.java
index 4b856ff..98a284b 100644
--- a/src/main/java/org/apache/commons/dbcp2/PoolingConnection.java
+++ b/src/main/java/org/apache/commons/dbcp2/PoolingConnection.java
@@ -129,7 +129,7 @@ public class PoolingConnection extends
DelegatingConnection<Connection>
if (pstmtPool != null && clearStatementPoolOnReturn) {
try {
pstmtPool.clear();
- } catch (Exception e) {
+ } catch (final Exception e) {
throw new SQLException("Error clearing statement pool", e);
}
}
diff --git a/src/main/java/org/apache/commons/dbcp2/SQLExceptionList.java
b/src/main/java/org/apache/commons/dbcp2/SQLExceptionList.java
index ec43988..fc2b7a5 100644
--- a/src/main/java/org/apache/commons/dbcp2/SQLExceptionList.java
+++ b/src/main/java/org/apache/commons/dbcp2/SQLExceptionList.java
@@ -39,7 +39,7 @@ public class SQLExceptionList extends SQLException {
*
* @param causeList a list of cause exceptions.
*/
- public SQLExceptionList(List<? extends Throwable> causeList) {
+ public SQLExceptionList(final List<? extends Throwable> causeList) {
super(String.format("%,d exceptions: %s", causeList == null ? 0 :
causeList.size(), causeList),
causeList == null ? null : causeList.get(0));
this.causeList = causeList;
diff --git a/src/main/java/org/apache/commons/dbcp2/Utils.java
b/src/main/java/org/apache/commons/dbcp2/Utils.java
index 61c4ded..e417581 100644
--- a/src/main/java/org/apache/commons/dbcp2/Utils.java
+++ b/src/main/java/org/apache/commons/dbcp2/Utils.java
@@ -87,7 +87,7 @@ public final class Utils {
*/
public static Properties cloneWithoutCredentials(final Properties
properties) {
if (properties != null) {
- Properties temp = (Properties) properties.clone();
+ final Properties temp = (Properties) properties.clone();
temp.remove("user");
temp.remove("password");
return temp;
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 da10b3c..f5e87a7 100644
--- a/src/main/java/org/apache/commons/dbcp2/cpdsadapter/DriverAdapterCPDS.java
+++ b/src/main/java/org/apache/commons/dbcp2/cpdsadapter/DriverAdapterCPDS.java
@@ -147,7 +147,7 @@ public class DriverAdapterCPDS implements
ConnectionPoolDataSource, Referenceabl
}
}
- private boolean getBooleanContentString(RefAddr ra) {
+ private boolean getBooleanContentString(final RefAddr ra) {
return Boolean.valueOf(getStringContent(ra)).booleanValue();
}
@@ -436,7 +436,7 @@ public class DriverAdapterCPDS implements
ConnectionPoolDataSource, Referenceabl
return ref;
}
- private String getStringContent(RefAddr ra) {
+ private String getStringContent(final RefAddr ra) {
return ra.getContent().toString();
}
@@ -478,7 +478,7 @@ public class DriverAdapterCPDS implements
ConnectionPoolDataSource, Referenceabl
return this.accessToUnderlyingConnectionAllowed;
}
- private boolean isNotEmpty(RefAddr ra) {
+ private boolean isNotEmpty(final RefAddr ra) {
return ra != null && ra.getContent() != null;
}
diff --git
a/src/main/java/org/apache/commons/dbcp2/datasources/KeyedCPDSConnectionFactory.java
b/src/main/java/org/apache/commons/dbcp2/datasources/KeyedCPDSConnectionFactory.java
index 750c4f7..4c44272 100644
---
a/src/main/java/org/apache/commons/dbcp2/datasources/KeyedCPDSConnectionFactory.java
+++
b/src/main/java/org/apache/commons/dbcp2/datasources/KeyedCPDSConnectionFactory.java
@@ -129,7 +129,7 @@ class KeyedCPDSConnectionFactory implements
KeyedPooledObjectFactory<UserPassKey
// should we add this object as a listener or the pool.
// consider the validateObject method in decision
pc.addConnectionEventListener(this);
- PooledConnectionAndInfo pci = new PooledConnectionAndInfo(pc,
userName, upkey.getPasswordCharArray());
+ final PooledConnectionAndInfo pci = new PooledConnectionAndInfo(pc,
userName, upkey.getPasswordCharArray());
pcMap.put(pc, pci);
return new DefaultPooledObject<>(pci);
diff --git a/src/test/java/org/apache/commons/dbcp2/TestBasicDataSource.java
b/src/test/java/org/apache/commons/dbcp2/TestBasicDataSource.java
index 9147992..f74fc1b 100644
--- a/src/test/java/org/apache/commons/dbcp2/TestBasicDataSource.java
+++ b/src/test/java/org/apache/commons/dbcp2/TestBasicDataSource.java
@@ -924,7 +924,7 @@ public class TestBasicDataSource extends TestConnectionPool
{
@Test
@Disabled
public void testEvict() throws Exception {
- long delay = 1000;
+ final long delay = 1000;
ds.setInitialSize(10);
ds.setMaxIdle(10);
@@ -935,10 +935,10 @@ public class TestBasicDataSource extends
TestConnectionPool {
ds.setTimeBetweenEvictionRunsMillis(delay);
ds.setPoolPreparedStatements(true);
- Connection conn = ds.getConnection();
+ final Connection conn = ds.getConnection();
conn.close();
- ThreadMXBean threadBean = ManagementFactory.getThreadMXBean();
+ final ThreadMXBean threadBean = ManagementFactory.getThreadMXBean();
while
(Arrays.stream(threadBean.getThreadInfo(threadBean.getAllThreadIds()))
.anyMatch(t ->
t.getThreadName().equals("commons-pool-evictor-thread"))) {
if (ds.getNumIdle() <= ds.getMinIdle()) {
diff --git
a/src/test/java/org/apache/commons/dbcp2/TestDelegatingConnection.java
b/src/test/java/org/apache/commons/dbcp2/TestDelegatingConnection.java
index 0e54e27..449bf58 100644
--- a/src/test/java/org/apache/commons/dbcp2/TestDelegatingConnection.java
+++ b/src/test/java/org/apache/commons/dbcp2/TestDelegatingConnection.java
@@ -67,7 +67,7 @@ public class TestDelegatingConnection {
}
@Override
- public void setReadOnly(boolean readOnly) {
+ public void setReadOnly(final boolean readOnly) {
// Do nothing
}
@@ -77,7 +77,7 @@ public class TestDelegatingConnection {
}
@Override
- public void setAutoCommit(boolean autoCommit) {
+ public void setAutoCommit(final boolean autoCommit) {
// Do nothing
}
@@ -193,7 +193,7 @@ public class TestDelegatingConnection {
delegatingConnection.addTrace(testerResultSet);
delegatingConnection.passivate();
Assertions.fail("Expected SQLExceptionList");
- } catch (SQLException e) {
+ } catch (final SQLException e) {
Assertions.assertTrue(e instanceof SQLExceptionList);
Assertions.assertEquals(1, ((SQLExceptionList)
e).getCauseList().size());
} finally {
@@ -210,7 +210,7 @@ public class TestDelegatingConnection {
delegatingConnection.addTrace(testerResultSet);
delegatingConnection.passivate();
Assertions.fail("Expected SQLExceptionList");
- } catch (SQLException e) {
+ } catch (final SQLException e) {
Assertions.assertTrue(e instanceof SQLExceptionList);
Assertions.assertEquals(2, ((SQLExceptionList)
e).getCauseList().size());
} finally {
@@ -226,7 +226,7 @@ public class TestDelegatingConnection {
delegatingConnection.addTrace(testerStatement);
delegatingConnection.passivate();
Assertions.fail("Expected SQLExceptionList");
- } catch (SQLException e) {
+ } catch (final SQLException e) {
Assertions.assertTrue(e instanceof SQLExceptionList);
Assertions.assertEquals(1, ((SQLExceptionList)
e).getCauseList().size());
} finally {
@@ -236,8 +236,8 @@ public class TestDelegatingConnection {
@Test
public void testReadOnlyCaching() throws SQLException {
- Connection con = new NoReadOnlyOrAutoCommitConnection();
- DelegatingConnection<Connection> delCon = new
DelegatingConnection<>(con);
+ final Connection con = new NoReadOnlyOrAutoCommitConnection();
+ final DelegatingConnection<Connection> delCon = new
DelegatingConnection<>(con);
delCon.setReadOnly(true);
@@ -247,8 +247,8 @@ public class TestDelegatingConnection {
@Test
public void testAutoCommitCaching() throws SQLException {
- Connection con = new NoReadOnlyOrAutoCommitConnection();
- DelegatingConnection<Connection> delCon = new
DelegatingConnection<>(con);
+ final Connection con = new NoReadOnlyOrAutoCommitConnection();
+ final DelegatingConnection<Connection> delCon = new
DelegatingConnection<>(con);
delCon.setAutoCommit(true);
diff --git
a/src/test/java/org/apache/commons/dbcp2/TestPStmtPoolingBasicDataSource.java
b/src/test/java/org/apache/commons/dbcp2/TestPStmtPoolingBasicDataSource.java
index a153df2..2aa70ba 100644
---
a/src/test/java/org/apache/commons/dbcp2/TestPStmtPoolingBasicDataSource.java
+++
b/src/test/java/org/apache/commons/dbcp2/TestPStmtPoolingBasicDataSource.java
@@ -70,7 +70,7 @@ public class TestPStmtPoolingBasicDataSource extends
TestBasicDataSource {
stmt2.close();
// test cleanup the 'b' statement
- PreparedStatement stmt3 = conn.prepareStatement("select 'c' from
dual");
+ final PreparedStatement stmt3 = conn.prepareStatement("select 'c' from
dual");
assertNotNull(stmt3);
assertTrue(stmt3 != stmt1);
assertTrue(stmt3 != stmt2);
diff --git a/src/test/java/org/apache/commons/dbcp2/TesterConnection.java
b/src/test/java/org/apache/commons/dbcp2/TesterConnection.java
index 2180b1a..acf8a99 100644
--- a/src/test/java/org/apache/commons/dbcp2/TesterConnection.java
+++ b/src/test/java/org/apache/commons/dbcp2/TesterConnection.java
@@ -396,7 +396,7 @@ public class TesterConnection extends AbandonedTrace
implements Connection {
this.schema= schema;
}
- public void setSqlExceptionOnClose(boolean sqlExceptionOnClose) {
+ public void setSqlExceptionOnClose(final boolean sqlExceptionOnClose) {
this.sqlExceptionOnClose = sqlExceptionOnClose;
}
diff --git
a/src/test/java/org/apache/commons/dbcp2/TesterConnectionFactory.java
b/src/test/java/org/apache/commons/dbcp2/TesterConnectionFactory.java
index f21da7a..09ebd7f 100644
--- a/src/test/java/org/apache/commons/dbcp2/TesterConnectionFactory.java
+++ b/src/test/java/org/apache/commons/dbcp2/TesterConnectionFactory.java
@@ -46,12 +46,12 @@ public class TesterConnectionFactory implements
ConnectionFactory {
@Override
public Connection createConnection() throws SQLException {
- Connection conn = driver.connect(connectionString, properties);
+ final Connection conn = driver.connect(connectionString, properties);
doSomething(conn);
return conn;
}
- private void doSomething(Connection conn) {
+ private void doSomething(final Connection conn) {
// do something
}
diff --git
a/src/test/java/org/apache/commons/dbcp2/datasources/TestSharedPoolDataSource.java
b/src/test/java/org/apache/commons/dbcp2/datasources/TestSharedPoolDataSource.java
index 2c98f87..f64ae20 100644
---
a/src/test/java/org/apache/commons/dbcp2/datasources/TestSharedPoolDataSource.java
+++
b/src/test/java/org/apache/commons/dbcp2/datasources/TestSharedPoolDataSource.java
@@ -526,7 +526,7 @@ public class TestSharedPoolDataSource extends
TestConnectionPool {
spDs.setDefaultTransactionIsolation(
Connection.TRANSACTION_READ_COMMITTED);
- DataSource myDs = spDs;
+ final DataSource myDs = spDs;
Connection conn = ds.getConnection();
callBack.setConnection(conn);
diff --git
a/src/test/java/org/apache/commons/dbcp2/managed/TestBasicManagedDataSource.java
b/src/test/java/org/apache/commons/dbcp2/managed/TestBasicManagedDataSource.java
index 64de034..f1c83d3 100644
---
a/src/test/java/org/apache/commons/dbcp2/managed/TestBasicManagedDataSource.java
+++
b/src/test/java/org/apache/commons/dbcp2/managed/TestBasicManagedDataSource.java
@@ -48,7 +48,7 @@ public class TestBasicManagedDataSource extends
TestBasicDataSource {
@Override
protected BasicDataSource createDataSource() throws Exception {
final BasicManagedDataSource basicManagedDataSource = new
BasicManagedDataSource();
- TransactionManagerImpl transactionManager = new
TransactionManagerImpl();
+ final TransactionManagerImpl transactionManager = new
TransactionManagerImpl();
basicManagedDataSource.setTransactionManager(transactionManager);
basicManagedDataSource.setTransactionSynchronizationRegistry(transactionManager);
return basicManagedDataSource;
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 96797e6..067b3f6 100644
--- a/src/test/java/org/apache/commons/dbcp2/managed/TestManagedDataSource.java
+++ b/src/test/java/org/apache/commons/dbcp2/managed/TestManagedDataSource.java
@@ -246,8 +246,8 @@ public class TestManagedDataSource extends
TestConnectionPool {
public void testNestedConnections() throws Exception {
transactionManager.begin();
- Connection c1 = newConnection();
- Connection c2 = newConnection();
+ final Connection c1 = newConnection();
+ final Connection c2 = newConnection();
transactionManager.commit();
