You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by eb...@apache.org on 2020/12/04 13:15:45 UTC
[commons-dbcp] branch master updated (93334d5 -> d9ee969)
This is an automated email from the ASF dual-hosted git repository.
ebourg pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/commons-dbcp.git.
from 93334d5 Use final.
new 18ae8ab Use String.contains() instead of indexOf()
new ec6321c Replace StringBuffer with StringBuilder
new 309e204 Use for-each loops
new 3cc5fa0 Replace explicit types with <>
new 7fb272a Collapse identical catch blocks
new a07eded Remove unused imports
new 35da734 Use Java-style array declarations
new 9ba653e Remove unnecessary conversions to String
new d9ee969 Use auto-boxing
The 9 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../commons/dbcp2/BasicDataSourceFactory.java | 34 +++++++++----------
.../apache/commons/dbcp2/DelegatingConnection.java | 31 ++++++++----------
.../apache/commons/dbcp2/DelegatingStatement.java | 8 ++---
.../java/org/apache/commons/dbcp2/PStmtKey.java | 38 ++++++++++------------
.../commons/dbcp2/PoolableCallableStatement.java | 4 +--
.../apache/commons/dbcp2/PoolableConnection.java | 4 +--
.../commons/dbcp2/PoolableConnectionFactory.java | 20 ++++++------
.../commons/dbcp2/PoolablePreparedStatement.java | 4 +--
.../apache/commons/dbcp2/PoolingConnection.java | 8 ++---
.../apache/commons/dbcp2/PoolingDataSource.java | 4 +--
.../org/apache/commons/dbcp2/PoolingDriver.java | 4 +--
.../commons/dbcp2/cpdsadapter/ConnectionImpl.java | 4 +--
.../dbcp2/cpdsadapter/DriverAdapterCPDS.java | 2 +-
.../commons/dbcp2/cpdsadapter/PStmtKeyCPDS.java | 4 +--
.../dbcp2/cpdsadapter/PooledConnectionImpl.java | 8 ++---
.../dbcp2/datasources/CPDSConnectionFactory.java | 7 ++--
.../dbcp2/datasources/InstanceKeyDataSource.java | 10 ++----
.../datasources/InstanceKeyDataSourceFactory.java | 26 ++++++---------
.../datasources/KeyedCPDSConnectionFactory.java | 7 ++--
.../dbcp2/datasources/PerUserPoolDataSource.java | 38 +++++++++++-----------
.../apache/commons/dbcp2/datasources/PoolKey.java | 2 +-
.../dbcp2/datasources/SharedPoolDataSource.java | 8 ++---
.../managed/PoolableManagedConnectionFactory.java | 2 +-
.../org/apache/commons/dbcp2/StackMessageLog.java | 2 +-
.../apache/commons/dbcp2/TestBasicDataSource.java | 11 +++----
.../apache/commons/dbcp2/TestConnectionPool.java | 2 +-
.../commons/dbcp2/TestDelegatingStatement.java | 1 -
.../commons/dbcp2/TestPoolingConnection.java | 2 +-
.../commons/dbcp2/TestPoolingDataSource.java | 2 +-
.../commons/dbcp2/TesterCallableStatement.java | 2 +-
.../org/apache/commons/dbcp2/TesterConnection.java | 4 +--
.../commons/dbcp2/TesterConnectionFactory.java | 3 +-
.../commons/dbcp2/TesterPreparedStatement.java | 18 +++++-----
.../org/apache/commons/dbcp2/TesterResultSet.java | 4 +--
.../org/apache/commons/dbcp2/TesterStatement.java | 8 ++---
.../datasources/TestCPDSConnectionFactory.java | 6 ++--
.../datasources/TestPerUserPoolDataSource.java | 18 +++++-----
.../dbcp2/managed/TestConnectionWithNarayana.java | 4 +--
.../managed/TestDataSourceXAConnectionFactory.java | 4 +--
.../dbcp2/managed/TestManagedDataSource.java | 2 +-
.../dbcp2/managed/TestSynchronizationOrder.java | 4 +--
.../dbcp2/managed/TesterBasicXAConnection.java | 6 ++--
42 files changed, 173 insertions(+), 207 deletions(-)
[commons-dbcp] 07/09: Use Java-style array declarations
Posted by eb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ebourg pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-dbcp.git
commit 35da73485fcb50ee7a2a05ff326493fbb279454b
Author: Emmanuel Bourg <eb...@apache.org>
AuthorDate: Fri Dec 4 13:40:35 2020 +0100
Use Java-style array declarations
---
.../org/apache/commons/dbcp2/DelegatingConnection.java | 4 ++--
.../org/apache/commons/dbcp2/DelegatingStatement.java | 8 ++++----
.../org/apache/commons/dbcp2/PoolingConnection.java | 8 ++++----
.../commons/dbcp2/cpdsadapter/ConnectionImpl.java | 4 ++--
.../apache/commons/dbcp2/cpdsadapter/PStmtKeyCPDS.java | 4 ++--
.../dbcp2/cpdsadapter/PooledConnectionImpl.java | 8 ++++----
.../apache/commons/dbcp2/TestPoolingConnection.java | 2 +-
.../apache/commons/dbcp2/TesterCallableStatement.java | 2 +-
.../org/apache/commons/dbcp2/TesterConnection.java | 4 ++--
.../apache/commons/dbcp2/TesterPreparedStatement.java | 18 +++++++++---------
.../java/org/apache/commons/dbcp2/TesterResultSet.java | 4 ++--
.../java/org/apache/commons/dbcp2/TesterStatement.java | 8 ++++----
12 files changed, 37 insertions(+), 37 deletions(-)
diff --git a/src/main/java/org/apache/commons/dbcp2/DelegatingConnection.java b/src/main/java/org/apache/commons/dbcp2/DelegatingConnection.java
index e7aeb61..fd163dc 100644
--- a/src/main/java/org/apache/commons/dbcp2/DelegatingConnection.java
+++ b/src/main/java/org/apache/commons/dbcp2/DelegatingConnection.java
@@ -767,7 +767,7 @@ public class DelegatingConnection<C extends Connection> extends AbandonedTrace i
}
@Override
- public PreparedStatement prepareStatement(final String sql, final int columnIndexes[]) throws SQLException {
+ public PreparedStatement prepareStatement(final String sql, final int[] columnIndexes) throws SQLException {
checkOpen();
try {
final DelegatingPreparedStatement dps = new DelegatingPreparedStatement(this,
@@ -781,7 +781,7 @@ public class DelegatingConnection<C extends Connection> extends AbandonedTrace i
}
@Override
- public PreparedStatement prepareStatement(final String sql, final String columnNames[]) throws SQLException {
+ public PreparedStatement prepareStatement(final String sql, final String[] columnNames) throws SQLException {
checkOpen();
try {
final DelegatingPreparedStatement dps = new DelegatingPreparedStatement(this,
diff --git a/src/main/java/org/apache/commons/dbcp2/DelegatingStatement.java b/src/main/java/org/apache/commons/dbcp2/DelegatingStatement.java
index 71d4cbc..a2976ba 100644
--- a/src/main/java/org/apache/commons/dbcp2/DelegatingStatement.java
+++ b/src/main/java/org/apache/commons/dbcp2/DelegatingStatement.java
@@ -211,7 +211,7 @@ public class DelegatingStatement extends AbandonedTrace implements Statement {
}
@Override
- public boolean execute(final String sql, final int columnIndexes[]) throws SQLException {
+ public boolean execute(final String sql, final int[] columnIndexes) throws SQLException {
checkOpen();
setLastUsedInParent();
try {
@@ -223,7 +223,7 @@ public class DelegatingStatement extends AbandonedTrace implements Statement {
}
@Override
- public boolean execute(final String sql, final String columnNames[]) throws SQLException {
+ public boolean execute(final String sql, final String[] columnNames) throws SQLException {
checkOpen();
setLastUsedInParent();
try {
@@ -358,7 +358,7 @@ public class DelegatingStatement extends AbandonedTrace implements Statement {
}
@Override
- public int executeUpdate(final String sql, final int columnIndexes[]) throws SQLException {
+ public int executeUpdate(final String sql, final int[] columnIndexes) throws SQLException {
checkOpen();
setLastUsedInParent();
try {
@@ -370,7 +370,7 @@ public class DelegatingStatement extends AbandonedTrace implements Statement {
}
@Override
- public int executeUpdate(final String sql, final String columnNames[]) throws SQLException {
+ public int executeUpdate(final String sql, final String[] columnNames) throws SQLException {
checkOpen();
setLastUsedInParent();
try {
diff --git a/src/main/java/org/apache/commons/dbcp2/PoolingConnection.java b/src/main/java/org/apache/commons/dbcp2/PoolingConnection.java
index 98a284b..c629f87 100644
--- a/src/main/java/org/apache/commons/dbcp2/PoolingConnection.java
+++ b/src/main/java/org/apache/commons/dbcp2/PoolingConnection.java
@@ -158,7 +158,7 @@ public class PoolingConnection extends DelegatingConnection<Connection>
*
* @return the PStmtKey created for the given arguments.
*/
- protected PStmtKey createKey(final String sql, final int columnIndexes[]) {
+ protected PStmtKey createKey(final String sql, final int[] columnIndexes) {
return new PStmtKey(normalizeSQL(sql), getCatalogOrNull(), getSchemaOrNull(), columnIndexes);
}
@@ -278,7 +278,7 @@ public class PoolingConnection extends DelegatingConnection<Connection>
*
* @return the PStmtKey created for the given arguments.
*/
- protected PStmtKey createKey(final String sql, final String columnNames[]) {
+ protected PStmtKey createKey(final String sql, final String[] columnNames) {
return new PStmtKey(normalizeSQL(sql), getCatalogOrNull(), getSchemaOrNull(), columnNames);
}
@@ -519,7 +519,7 @@ public class PoolingConnection extends DelegatingConnection<Connection>
*
*/
@Override
- public PreparedStatement prepareStatement(final String sql, final int columnIndexes[]) throws SQLException {
+ public PreparedStatement prepareStatement(final String sql, final int[] columnIndexes) throws SQLException {
return prepareStatement(createKey(sql, columnIndexes));
}
@@ -575,7 +575,7 @@ public class PoolingConnection extends DelegatingConnection<Connection>
* Wraps an underlying exception.
*/
@Override
- public PreparedStatement prepareStatement(final String sql, final String columnNames[]) throws SQLException {
+ public PreparedStatement prepareStatement(final String sql, final String[] columnNames) throws SQLException {
return prepareStatement(createKey(sql, columnNames));
}
diff --git a/src/main/java/org/apache/commons/dbcp2/cpdsadapter/ConnectionImpl.java b/src/main/java/org/apache/commons/dbcp2/cpdsadapter/ConnectionImpl.java
index 2226e8e..f997695 100644
--- a/src/main/java/org/apache/commons/dbcp2/cpdsadapter/ConnectionImpl.java
+++ b/src/main/java/org/apache/commons/dbcp2/cpdsadapter/ConnectionImpl.java
@@ -242,7 +242,7 @@ class ConnectionImpl extends DelegatingConnection<Connection> {
}
@Override
- public PreparedStatement prepareStatement(final String sql, final int columnIndexes[]) throws SQLException {
+ public PreparedStatement prepareStatement(final String sql, final int[] columnIndexes) throws SQLException {
checkOpen();
try {
return new DelegatingPreparedStatement(this, pooledConnection.prepareStatement(sql, columnIndexes));
@@ -253,7 +253,7 @@ class ConnectionImpl extends DelegatingConnection<Connection> {
}
@Override
- public PreparedStatement prepareStatement(final String sql, final String columnNames[]) throws SQLException {
+ public PreparedStatement prepareStatement(final String sql, final String[] columnNames) throws SQLException {
checkOpen();
try {
return new DelegatingPreparedStatement(this, pooledConnection.prepareStatement(sql, columnNames));
diff --git a/src/main/java/org/apache/commons/dbcp2/cpdsadapter/PStmtKeyCPDS.java b/src/main/java/org/apache/commons/dbcp2/cpdsadapter/PStmtKeyCPDS.java
index f314fca..8cbf966 100644
--- a/src/main/java/org/apache/commons/dbcp2/cpdsadapter/PStmtKeyCPDS.java
+++ b/src/main/java/org/apache/commons/dbcp2/cpdsadapter/PStmtKeyCPDS.java
@@ -95,7 +95,7 @@ public class PStmtKeyCPDS extends PStmtKey {
* An array of column indexes indicating the columns that should be returned from the inserted row or
* rows.
*/
- public PStmtKeyCPDS(final String sql, final int columnIndexes[]) {
+ public PStmtKeyCPDS(final String sql, final int[] columnIndexes) {
super(sql, null, columnIndexes);
}
@@ -107,7 +107,7 @@ public class PStmtKeyCPDS extends PStmtKey {
* @param columnNames
* An array of column names indicating the columns that should be returned from the inserted row or rows.
*/
- public PStmtKeyCPDS(final String sql, final String columnNames[]) {
+ public PStmtKeyCPDS(final String sql, final String[] columnNames) {
super(sql, null, columnNames);
}
}
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 1f74af4..fa02309 100644
--- a/src/main/java/org/apache/commons/dbcp2/cpdsadapter/PooledConnectionImpl.java
+++ b/src/main/java/org/apache/commons/dbcp2/cpdsadapter/PooledConnectionImpl.java
@@ -214,7 +214,7 @@ class PooledConnectionImpl
* rows.
* @return a key to uniquely identify a prepared statement.
*/
- protected PStmtKey createKey(final String sql, final int columnIndexes[]) {
+ protected PStmtKey createKey(final String sql, final int[] columnIndexes) {
return new PStmtKey(normalizeSQL(sql), getCatalogOrNull(), getSchemaOrNull(), columnIndexes);
}
@@ -327,7 +327,7 @@ class PooledConnectionImpl
* An array of column names indicating the columns that should be returned from the inserted row or rows.
* @return a key to uniquely identify a prepared statement.
*/
- protected PStmtKey createKey(final String sql, final String columnNames[]) {
+ protected PStmtKey createKey(final String sql, final String[] columnNames) {
return new PStmtKey(normalizeSQL(sql), getCatalogOrNull(), getSchemaOrNull(), columnNames);
}
@@ -615,7 +615,7 @@ class PooledConnectionImpl
}
}
- PreparedStatement prepareStatement(final String sql, final int columnIndexes[]) throws SQLException {
+ PreparedStatement prepareStatement(final String sql, final int[] columnIndexes) throws SQLException {
if (pStmtPool == null) {
return connection.prepareStatement(sql, columnIndexes);
}
@@ -672,7 +672,7 @@ class PooledConnectionImpl
}
}
- PreparedStatement prepareStatement(final String sql, final String columnNames[]) throws SQLException {
+ PreparedStatement prepareStatement(final String sql, final String[] columnNames) throws SQLException {
if (pStmtPool == null) {
return connection.prepareStatement(sql, columnNames);
}
diff --git a/src/test/java/org/apache/commons/dbcp2/TestPoolingConnection.java b/src/test/java/org/apache/commons/dbcp2/TestPoolingConnection.java
index a431f03..c243248 100644
--- a/src/test/java/org/apache/commons/dbcp2/TestPoolingConnection.java
+++ b/src/test/java/org/apache/commons/dbcp2/TestPoolingConnection.java
@@ -112,7 +112,7 @@ public class TestPoolingConnection {
@Test
public void testPrepareStatementWithColumnNames() throws Exception {
final String sql = "select 'a' from dual";
- final String columnNames[] = new String[]{"columnName1"};
+ final String[] columnNames = new String[]{"columnName1"};
final DelegatingPreparedStatement statement = (DelegatingPreparedStatement)con.prepareStatement(sql, columnNames);
final TesterPreparedStatement testStatement = (TesterPreparedStatement) statement.getInnermostDelegate();
// assert
diff --git a/src/test/java/org/apache/commons/dbcp2/TesterCallableStatement.java b/src/test/java/org/apache/commons/dbcp2/TesterCallableStatement.java
index d9abb92..36010ad 100644
--- a/src/test/java/org/apache/commons/dbcp2/TesterCallableStatement.java
+++ b/src/test/java/org/apache/commons/dbcp2/TesterCallableStatement.java
@@ -472,7 +472,7 @@ public class TesterCallableStatement extends TesterPreparedStatement implements
}
@Override
- public void setBytes(final String parameterName, final byte x[]) throws SQLException {
+ public void setBytes(final String parameterName, final byte[] x) throws SQLException {
}
@Override
diff --git a/src/test/java/org/apache/commons/dbcp2/TesterConnection.java b/src/test/java/org/apache/commons/dbcp2/TesterConnection.java
index acf8a99..f136377 100644
--- a/src/test/java/org/apache/commons/dbcp2/TesterConnection.java
+++ b/src/test/java/org/apache/commons/dbcp2/TesterConnection.java
@@ -292,7 +292,7 @@ public class TesterConnection extends AbandonedTrace implements Connection {
}
@Override
- public PreparedStatement prepareStatement(final String sql, final int columnIndexes[])
+ public PreparedStatement prepareStatement(final String sql, final int[] columnIndexes)
throws SQLException {
return new TesterPreparedStatement(this, sql, columnIndexes);
}
@@ -314,7 +314,7 @@ public class TesterConnection extends AbandonedTrace implements Connection {
@Override
- public PreparedStatement prepareStatement(final String sql, final String columnNames[])
+ public PreparedStatement prepareStatement(final String sql, final String[] columnNames)
throws SQLException {
return new TesterPreparedStatement(this, sql, columnNames);
}
diff --git a/src/test/java/org/apache/commons/dbcp2/TesterPreparedStatement.java b/src/test/java/org/apache/commons/dbcp2/TesterPreparedStatement.java
index be671b2..facec22 100644
--- a/src/test/java/org/apache/commons/dbcp2/TesterPreparedStatement.java
+++ b/src/test/java/org/apache/commons/dbcp2/TesterPreparedStatement.java
@@ -77,7 +77,7 @@ public class TesterPreparedStatement extends TesterStatement implements Prepared
}
}
- public TesterPreparedStatement(final Connection conn, final String sql, final int columnIndexes[]) {
+ public TesterPreparedStatement(final Connection conn, final String sql, final int[] columnIndexes) {
super(conn);
_sql = sql;
_columnIndexes = columnIndexes;
@@ -109,7 +109,7 @@ public class TesterPreparedStatement extends TesterStatement implements Prepared
}
}
- public TesterPreparedStatement(final Connection conn, final String sql, final String columnNames[]) {
+ public TesterPreparedStatement(final Connection conn, final String sql, final String[] columnNames) {
super(conn);
_sql = sql;
_columnNames = columnNames;
@@ -142,13 +142,13 @@ public class TesterPreparedStatement extends TesterStatement implements Prepared
}
@Override
- public boolean execute(final String sl, final int columnIndexes[]) throws SQLException {
+ public boolean execute(final String sl, final int[] columnIndexes) throws SQLException {
checkOpen();
return true;
}
@Override
- public boolean execute(final String sql, final String columnNames[]) throws SQLException {
+ public boolean execute(final String sql, final String[] columnNames) throws SQLException {
checkOpen();
return true;
}
@@ -172,13 +172,13 @@ public class TesterPreparedStatement extends TesterStatement implements Prepared
}
@Override
- public long executeLargeUpdate(final String sql, final int columnIndexes[]) throws SQLException {
+ public long executeLargeUpdate(final String sql, final int[] columnIndexes) throws SQLException {
checkOpen();
return 0;
}
@Override
- public long executeLargeUpdate(final String sql, final String columnNames[]) throws SQLException {
+ public long executeLargeUpdate(final String sql, final String[] columnNames) throws SQLException {
checkOpen();
return 0;
}
@@ -224,13 +224,13 @@ public class TesterPreparedStatement extends TesterStatement implements Prepared
}
@Override
- public int executeUpdate(final String sql, final int columnIndexes[]) throws SQLException {
+ public int executeUpdate(final String sql, final int[] columnIndexes) throws SQLException {
checkOpen();
return 0;
}
@Override
- public int executeUpdate(final String sql, final String columnNames[]) throws SQLException {
+ public int executeUpdate(final String sql, final String[] columnNames) throws SQLException {
checkOpen();
return 0;
}
@@ -344,7 +344,7 @@ public class TesterPreparedStatement extends TesterStatement implements Prepared
}
@Override
- public void setBytes(final int parameterIndex, final byte x[]) throws SQLException {
+ public void setBytes(final int parameterIndex, final byte[] x) throws SQLException {
checkOpen();
}
diff --git a/src/test/java/org/apache/commons/dbcp2/TesterResultSet.java b/src/test/java/org/apache/commons/dbcp2/TesterResultSet.java
index 3d90277..73b5545 100644
--- a/src/test/java/org/apache/commons/dbcp2/TesterResultSet.java
+++ b/src/test/java/org/apache/commons/dbcp2/TesterResultSet.java
@@ -879,12 +879,12 @@ public java.sql.Date getDate(final int columnIndex, final Calendar cal) throws S
}
@Override
- public void updateBytes(final int columnIndex, final byte x[]) throws SQLException {
+ public void updateBytes(final int columnIndex, final byte[] x) throws SQLException {
checkOpen();
}
@Override
- public void updateBytes(final String columnName, final byte x[]) throws SQLException {
+ public void updateBytes(final String columnName, final byte[] x) throws SQLException {
checkOpen();
}
diff --git a/src/test/java/org/apache/commons/dbcp2/TesterStatement.java b/src/test/java/org/apache/commons/dbcp2/TesterStatement.java
index 3032396..42878a0 100644
--- a/src/test/java/org/apache/commons/dbcp2/TesterStatement.java
+++ b/src/test/java/org/apache/commons/dbcp2/TesterStatement.java
@@ -128,13 +128,13 @@ public class TesterStatement extends AbandonedTrace implements Statement {
}
@Override
- public boolean execute(final String sql, final int columnIndexes[])
+ public boolean execute(final String sql, final int[] columnIndexes)
throws SQLException {
throw new SQLException("Not implemented.");
}
@Override
- public boolean execute(final String sql, final String columnNames[])
+ public boolean execute(final String sql, final String[] columnNames)
throws SQLException {
throw new SQLException("Not implemented.");
}
@@ -208,12 +208,12 @@ public class TesterStatement extends AbandonedTrace implements Statement {
}
@Override
- public int executeUpdate(final String sql, final int columnIndexes[]) throws SQLException {
+ public int executeUpdate(final String sql, final int[] columnIndexes) throws SQLException {
throw new SQLException("Not implemented.");
}
@Override
- public int executeUpdate(final String sql, final String columnNames[]) throws SQLException {
+ public int executeUpdate(final String sql, final String[] columnNames) throws SQLException {
throw new SQLException("Not implemented.");
}
[commons-dbcp] 05/09: Collapse identical catch blocks
Posted by eb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ebourg pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-dbcp.git
commit 7fb272a93f1331eb312f994acfb5a66053a2c7b7
Author: Emmanuel Bourg <eb...@apache.org>
AuthorDate: Fri Dec 4 13:36:33 2020 +0100
Collapse identical catch blocks
---
.../org/apache/commons/dbcp2/PoolableCallableStatement.java | 4 +---
src/main/java/org/apache/commons/dbcp2/PoolableConnection.java | 4 +---
.../org/apache/commons/dbcp2/PoolablePreparedStatement.java | 4 +---
src/main/java/org/apache/commons/dbcp2/PoolingDataSource.java | 4 +---
src/main/java/org/apache/commons/dbcp2/PoolingDriver.java | 4 +---
.../commons/dbcp2/datasources/InstanceKeyDataSource.java | 10 ++--------
6 files changed, 7 insertions(+), 23 deletions(-)
diff --git a/src/main/java/org/apache/commons/dbcp2/PoolableCallableStatement.java b/src/main/java/org/apache/commons/dbcp2/PoolableCallableStatement.java
index da7e6fe..d9e765d 100644
--- a/src/main/java/org/apache/commons/dbcp2/PoolableCallableStatement.java
+++ b/src/main/java/org/apache/commons/dbcp2/PoolableCallableStatement.java
@@ -80,9 +80,7 @@ public class PoolableCallableStatement extends DelegatingCallableStatement {
if (!isClosed()) {
try {
pool.returnObject(key, this);
- } catch (final SQLException e) {
- throw e;
- } catch (final RuntimeException e) {
+ } catch (final SQLException | RuntimeException e) {
throw e;
} catch (final Exception e) {
throw new SQLException("Cannot close CallableStatement (return to pool failed)", e);
diff --git a/src/main/java/org/apache/commons/dbcp2/PoolableConnection.java b/src/main/java/org/apache/commons/dbcp2/PoolableConnection.java
index 4365a21..0cd0ee0 100644
--- a/src/main/java/org/apache/commons/dbcp2/PoolableConnection.java
+++ b/src/main/java/org/apache/commons/dbcp2/PoolableConnection.java
@@ -205,9 +205,7 @@ public class PoolableConnection extends DelegatingConnection<Connection> impleme
// pool is closed, so close the connection
passivate();
getInnermostDelegate().close();
- } catch (final SQLException e) {
- throw e;
- } catch (final RuntimeException e) {
+ } catch (final SQLException | RuntimeException e) {
throw e;
} catch (final Exception e) {
throw new SQLException("Cannot close connection (return to pool failed)", e);
diff --git a/src/main/java/org/apache/commons/dbcp2/PoolablePreparedStatement.java b/src/main/java/org/apache/commons/dbcp2/PoolablePreparedStatement.java
index 382c56f..a2f11a3 100644
--- a/src/main/java/org/apache/commons/dbcp2/PoolablePreparedStatement.java
+++ b/src/main/java/org/apache/commons/dbcp2/PoolablePreparedStatement.java
@@ -102,9 +102,7 @@ public class PoolablePreparedStatement<K> extends DelegatingPreparedStatement {
if (!isClosed()) {
try {
pool.returnObject(key, this);
- } catch (final SQLException e) {
- throw e;
- } catch (final RuntimeException e) {
+ } catch (final SQLException | RuntimeException e) {
throw e;
} catch (final Exception e) {
throw new SQLException("Cannot close preparedstatement (return to pool failed)", e);
diff --git a/src/main/java/org/apache/commons/dbcp2/PoolingDataSource.java b/src/main/java/org/apache/commons/dbcp2/PoolingDataSource.java
index fc1965c..0169d9b 100644
--- a/src/main/java/org/apache/commons/dbcp2/PoolingDataSource.java
+++ b/src/main/java/org/apache/commons/dbcp2/PoolingDataSource.java
@@ -136,11 +136,9 @@ public class PoolingDataSource<C extends Connection> implements DataSource, Auto
return null;
}
return new PoolGuardConnectionWrapper<>(conn);
- } catch (final SQLException e) {
- throw e;
} catch (final NoSuchElementException e) {
throw new SQLException("Cannot get a connection, pool error " + e.getMessage(), e);
- } catch (final RuntimeException e) {
+ } catch (final SQLException | RuntimeException e) {
throw e;
} catch (final InterruptedException e) {
// Reset the interrupt status so it is visible to callers
diff --git a/src/main/java/org/apache/commons/dbcp2/PoolingDriver.java b/src/main/java/org/apache/commons/dbcp2/PoolingDriver.java
index 5ba3664..f531859 100644
--- a/src/main/java/org/apache/commons/dbcp2/PoolingDriver.java
+++ b/src/main/java/org/apache/commons/dbcp2/PoolingDriver.java
@@ -154,11 +154,9 @@ public class PoolingDriver implements Driver {
return null;
}
return new PoolGuardConnectionWrapper(pool, conn);
- } catch (final SQLException e) {
- throw e;
} catch (final NoSuchElementException e) {
throw new SQLException("Cannot get a connection, pool error: " + e.getMessage(), e);
- } catch (final RuntimeException e) {
+ } catch (final SQLException | RuntimeException e) {
throw e;
} catch (final Exception e) {
throw new SQLException("Cannot get a connection, general error: " + e.getMessage(), e);
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 1605d7c..96ab52b 100644
--- a/src/main/java/org/apache/commons/dbcp2/datasources/InstanceKeyDataSource.java
+++ b/src/main/java/org/apache/commons/dbcp2/datasources/InstanceKeyDataSource.java
@@ -916,10 +916,7 @@ public abstract class InstanceKeyDataSource implements DataSource, Referenceable
} catch (final NoSuchElementException e) {
closeDueToException(info);
throw new SQLException("Cannot borrow connection from pool", e);
- } catch (final RuntimeException e) {
- closeDueToException(info);
- throw e;
- } catch (final SQLException e) {
+ } catch (final RuntimeException | SQLException e) {
closeDueToException(info);
throw e;
} catch (final Exception e) {
@@ -956,10 +953,7 @@ public abstract class InstanceKeyDataSource implements DataSource, Referenceable
} catch (final NoSuchElementException e) {
closeDueToException(info);
throw new SQLException("Cannot borrow connection from pool", e);
- } catch (final RuntimeException e) {
- closeDueToException(info);
- throw e;
- } catch (final SQLException e) {
+ } catch (final RuntimeException | SQLException e) {
closeDueToException(info);
throw e;
} catch (final Exception e) {
[commons-dbcp] 06/09: Remove unused imports
Posted by eb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ebourg pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-dbcp.git
commit a07ededcaceb90dfea7e5ad4e85df2ad7dbd3883
Author: Emmanuel Bourg <eb...@apache.org>
AuthorDate: Fri Dec 4 13:38:32 2020 +0100
Remove unused imports
---
src/test/java/org/apache/commons/dbcp2/TestBasicDataSource.java | 2 --
src/test/java/org/apache/commons/dbcp2/TestDelegatingStatement.java | 1 -
2 files changed, 3 deletions(-)
diff --git a/src/test/java/org/apache/commons/dbcp2/TestBasicDataSource.java b/src/test/java/org/apache/commons/dbcp2/TestBasicDataSource.java
index 531d9f6..7acbd79 100644
--- a/src/test/java/org/apache/commons/dbcp2/TestBasicDataSource.java
+++ b/src/test/java/org/apache/commons/dbcp2/TestBasicDataSource.java
@@ -49,8 +49,6 @@ import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
-import net.bytebuddy.implementation.bind.annotation.IgnoreForBinding;
-
/**
* TestSuite for BasicDataSource
*/
diff --git a/src/test/java/org/apache/commons/dbcp2/TestDelegatingStatement.java b/src/test/java/org/apache/commons/dbcp2/TestDelegatingStatement.java
index 512848d..f2e49dc 100644
--- a/src/test/java/org/apache/commons/dbcp2/TestDelegatingStatement.java
+++ b/src/test/java/org/apache/commons/dbcp2/TestDelegatingStatement.java
@@ -28,7 +28,6 @@ import static org.mockito.Mockito.verify;
import java.lang.reflect.Proxy;
import java.sql.Connection;
-import java.sql.ResultSet;
import java.sql.SQLException;
import java.sql.Statement;
[commons-dbcp] 08/09: Remove unnecessary conversions to String
Posted by eb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ebourg pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-dbcp.git
commit 9ba653e8e3b92b930436d9ec4aaa0e9a4fb33675
Author: Emmanuel Bourg <eb...@apache.org>
AuthorDate: Fri Dec 4 13:42:22 2020 +0100
Remove unnecessary conversions to String
---
src/main/java/org/apache/commons/dbcp2/PoolableConnectionFactory.java | 2 +-
.../apache/commons/dbcp2/managed/PoolableManagedConnectionFactory.java | 2 +-
src/test/java/org/apache/commons/dbcp2/TesterConnectionFactory.java | 3 +--
.../org/apache/commons/dbcp2/managed/TestConnectionWithNarayana.java | 2 +-
4 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/src/main/java/org/apache/commons/dbcp2/PoolableConnectionFactory.java b/src/main/java/org/apache/commons/dbcp2/PoolableConnectionFactory.java
index 15c30ad..e70cac6 100644
--- a/src/main/java/org/apache/commons/dbcp2/PoolableConnectionFactory.java
+++ b/src/main/java/org/apache/commons/dbcp2/PoolableConnectionFactory.java
@@ -384,7 +384,7 @@ public class PoolableConnectionFactory implements PooledObjectFactory<PoolableCo
if (dataSourceJmxObjectName != null) {
final StringBuilder base = new StringBuilder(dataSourceJmxObjectName.toString());
base.append(Constants.JMX_CONNECTION_BASE_EXT);
- base.append(Long.toString(connIndex));
+ base.append(connIndex);
config.setJmxNameBase(base.toString());
config.setJmxNamePrefix(Constants.JMX_STATEMENT_POOL_PREFIX);
} else {
diff --git a/src/main/java/org/apache/commons/dbcp2/managed/PoolableManagedConnectionFactory.java b/src/main/java/org/apache/commons/dbcp2/managed/PoolableManagedConnectionFactory.java
index 7210f0c..f353e1c 100644
--- a/src/main/java/org/apache/commons/dbcp2/managed/PoolableManagedConnectionFactory.java
+++ b/src/main/java/org/apache/commons/dbcp2/managed/PoolableManagedConnectionFactory.java
@@ -90,7 +90,7 @@ public class PoolableManagedConnectionFactory extends PoolableConnectionFactory
if (dataSourceJmxName != null) {
final StringBuilder base = new StringBuilder(dataSourceJmxName.toString());
base.append(Constants.JMX_CONNECTION_BASE_EXT);
- base.append(Long.toString(connIndex));
+ base.append(connIndex);
config.setJmxNameBase(base.toString());
config.setJmxNamePrefix(Constants.JMX_STATEMENT_POOL_PREFIX);
} else {
diff --git a/src/test/java/org/apache/commons/dbcp2/TesterConnectionFactory.java b/src/test/java/org/apache/commons/dbcp2/TesterConnectionFactory.java
index 09ebd7f..6e36554 100644
--- a/src/test/java/org/apache/commons/dbcp2/TesterConnectionFactory.java
+++ b/src/test/java/org/apache/commons/dbcp2/TesterConnectionFactory.java
@@ -78,7 +78,6 @@ public class TesterConnectionFactory implements ConnectionFactory {
@Override
public String toString() {
- return this.getClass().getName() + " [" + String.valueOf(driver) + ";" + String.valueOf(connectionString) + ";"
- + String.valueOf(properties) + "]";
+ return this.getClass().getName() + " [" + driver + ";" + connectionString + ";" + properties + "]";
}
}
diff --git a/src/test/java/org/apache/commons/dbcp2/managed/TestConnectionWithNarayana.java b/src/test/java/org/apache/commons/dbcp2/managed/TestConnectionWithNarayana.java
index 2cdd0bf..5a01e62 100644
--- a/src/test/java/org/apache/commons/dbcp2/managed/TestConnectionWithNarayana.java
+++ b/src/test/java/org/apache/commons/dbcp2/managed/TestConnectionWithNarayana.java
@@ -52,7 +52,7 @@ public class TestConnectionWithNarayana {
sb.append("payload");
for (int i = 0; i < 10000; i++) {
sb.append("...");
- sb.append(String.valueOf(i));
+ sb.append(i);
}
sb.append("End");
sb.append("payload");
[commons-dbcp] 04/09: Replace explicit types with <>
Posted by eb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ebourg pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-dbcp.git
commit 3cc5fa03e5ef19f58a5e0bbe749a27cdacd5bf76
Author: Emmanuel Bourg <eb...@apache.org>
AuthorDate: Fri Dec 4 13:34:58 2020 +0100
Replace explicit types with <>
---
.../org/apache/commons/dbcp2/datasources/CPDSConnectionFactory.java | 3 +--
.../apache/commons/dbcp2/datasources/KeyedCPDSConnectionFactory.java | 3 +--
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/src/main/java/org/apache/commons/dbcp2/datasources/CPDSConnectionFactory.java b/src/main/java/org/apache/commons/dbcp2/datasources/CPDSConnectionFactory.java
index df27404..fa21d4e 100644
--- a/src/main/java/org/apache/commons/dbcp2/datasources/CPDSConnectionFactory.java
+++ b/src/main/java/org/apache/commons/dbcp2/datasources/CPDSConnectionFactory.java
@@ -58,8 +58,7 @@ class CPDSConnectionFactory
/**
* Map of PooledConnections for which close events are ignored. Connections are muted when they are being validated.
*/
- private final Set<PooledConnection> validatingSet = Collections
- .newSetFromMap(new ConcurrentHashMap<PooledConnection, Boolean>());
+ private final Set<PooledConnection> validatingSet = Collections.newSetFromMap(new ConcurrentHashMap<>());
/**
* Map of PooledConnectionAndInfo instances
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 4c44272..15c99a8 100644
--- a/src/main/java/org/apache/commons/dbcp2/datasources/KeyedCPDSConnectionFactory.java
+++ b/src/main/java/org/apache/commons/dbcp2/datasources/KeyedCPDSConnectionFactory.java
@@ -59,8 +59,7 @@ class KeyedCPDSConnectionFactory implements KeyedPooledObjectFactory<UserPassKey
/**
* Map of PooledConnections for which close events are ignored. Connections are muted when they are being validated.
*/
- private final Set<PooledConnection> validatingSet = Collections
- .newSetFromMap(new ConcurrentHashMap<PooledConnection, Boolean>());
+ private final Set<PooledConnection> validatingSet = Collections.newSetFromMap(new ConcurrentHashMap<>());
/**
* Map of PooledConnectionAndInfo instances
[commons-dbcp] 01/09: Use String.contains() instead of indexOf()
Posted by eb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ebourg pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-dbcp.git
commit 18ae8abf57c1f8b317e26b6546c32fc6b35b475a
Author: Emmanuel Bourg <eb...@apache.org>
AuthorDate: Fri Dec 4 13:29:49 2020 +0100
Use String.contains() instead of indexOf()
---
src/test/java/org/apache/commons/dbcp2/TestBasicDataSource.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/test/java/org/apache/commons/dbcp2/TestBasicDataSource.java b/src/test/java/org/apache/commons/dbcp2/TestBasicDataSource.java
index f74fc1b..531d9f6 100644
--- a/src/test/java/org/apache/commons/dbcp2/TestBasicDataSource.java
+++ b/src/test/java/org/apache/commons/dbcp2/TestBasicDataSource.java
@@ -276,7 +276,7 @@ public class TestBasicDataSource extends TestConnectionPool {
try (Connection c = ds.getConnection()) {
fail("expected SQLException");
} catch (final SQLException e) {
- if (e.toString().indexOf("invalid") < 0) {
+ if (!e.toString().contains("invalid")) {
fail("expected detailed error message");
}
}
@@ -289,7 +289,7 @@ public class TestBasicDataSource extends TestConnectionPool {
try (Connection c = ds.getConnection()) {
fail("expected SQLException");
} catch (final SQLException ex) {
- if (ex.toString().indexOf("timeout") < 0) {
+ if (!ex.toString().contains("timeout")) {
fail("expected timeout error message");
}
}
@@ -344,7 +344,7 @@ public class TestBasicDataSource extends TestConnectionPool {
fail("expected SQLException");
}
catch (final SQLException e) {
- if (e.toString().indexOf("invalid") < 0) {
+ if (!e.toString().contains("invalid")) {
fail("expected detailed error message");
}
}
[commons-dbcp] 09/09: Use auto-boxing
Posted by eb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ebourg pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-dbcp.git
commit d9ee969942fa0a67d4b25b7a03b877282241cd11
Author: Emmanuel Bourg <eb...@apache.org>
AuthorDate: Fri Dec 4 14:12:33 2020 +0100
Use auto-boxing
---
.../commons/dbcp2/BasicDataSourceFactory.java | 34 +++++++++----------
.../apache/commons/dbcp2/DelegatingConnection.java | 20 ++++++------
.../java/org/apache/commons/dbcp2/PStmtKey.java | 36 ++++++++++----------
.../commons/dbcp2/PoolableConnectionFactory.java | 18 +++++-----
.../dbcp2/cpdsadapter/DriverAdapterCPDS.java | 2 +-
.../dbcp2/datasources/CPDSConnectionFactory.java | 4 +--
.../datasources/InstanceKeyDataSourceFactory.java | 14 ++++----
.../datasources/KeyedCPDSConnectionFactory.java | 4 +--
.../dbcp2/datasources/PerUserPoolDataSource.java | 38 +++++++++++-----------
.../dbcp2/datasources/SharedPoolDataSource.java | 8 ++---
.../apache/commons/dbcp2/TestBasicDataSource.java | 3 +-
.../apache/commons/dbcp2/TestConnectionPool.java | 2 +-
.../commons/dbcp2/TestPoolingDataSource.java | 2 +-
.../datasources/TestCPDSConnectionFactory.java | 6 ++--
.../datasources/TestPerUserPoolDataSource.java | 18 +++++-----
.../managed/TestDataSourceXAConnectionFactory.java | 4 +--
.../dbcp2/managed/TestManagedDataSource.java | 2 +-
.../dbcp2/managed/TestSynchronizationOrder.java | 4 +--
.../dbcp2/managed/TesterBasicXAConnection.java | 6 ++--
19 files changed, 111 insertions(+), 114 deletions(-)
diff --git a/src/main/java/org/apache/commons/dbcp2/BasicDataSourceFactory.java b/src/main/java/org/apache/commons/dbcp2/BasicDataSourceFactory.java
index f811bef..0dcf907 100644
--- a/src/main/java/org/apache/commons/dbcp2/BasicDataSourceFactory.java
+++ b/src/main/java/org/apache/commons/dbcp2/BasicDataSourceFactory.java
@@ -347,7 +347,7 @@ public class BasicDataSourceFactory implements ObjectFactory {
value = properties.getProperty(PROP_CACHE_STATE);
if (value != null) {
- dataSource.setCacheState(Boolean.valueOf(value).booleanValue());
+ dataSource.setCacheState(Boolean.parseBoolean(value));
}
value = properties.getProperty(PROP_DRIVER_CLASS_NAME);
@@ -357,7 +357,7 @@ public class BasicDataSourceFactory implements ObjectFactory {
value = properties.getProperty(PROP_LIFO);
if (value != null) {
- dataSource.setLifo(Boolean.valueOf(value).booleanValue());
+ dataSource.setLifo(Boolean.parseBoolean(value));
}
value = properties.getProperty(PROP_MAX_TOTAL);
@@ -387,17 +387,17 @@ public class BasicDataSourceFactory implements ObjectFactory {
value = properties.getProperty(PROP_TEST_ON_CREATE);
if (value != null) {
- dataSource.setTestOnCreate(Boolean.valueOf(value).booleanValue());
+ dataSource.setTestOnCreate(Boolean.parseBoolean(value));
}
value = properties.getProperty(PROP_TEST_ON_BORROW);
if (value != null) {
- dataSource.setTestOnBorrow(Boolean.valueOf(value).booleanValue());
+ dataSource.setTestOnBorrow(Boolean.parseBoolean(value));
}
value = properties.getProperty(PROP_TEST_ON_RETURN);
if (value != null) {
- dataSource.setTestOnReturn(Boolean.valueOf(value).booleanValue());
+ dataSource.setTestOnReturn(Boolean.parseBoolean(value));
}
value = properties.getProperty(PROP_TIME_BETWEEN_EVICTION_RUNS_MILLIS);
@@ -427,7 +427,7 @@ public class BasicDataSourceFactory implements ObjectFactory {
value = properties.getProperty(PROP_TEST_WHILE_IDLE);
if (value != null) {
- dataSource.setTestWhileIdle(Boolean.valueOf(value).booleanValue());
+ dataSource.setTestWhileIdle(Boolean.parseBoolean(value));
}
value = properties.getProperty(PROP_PASSWORD);
@@ -457,17 +457,17 @@ public class BasicDataSourceFactory implements ObjectFactory {
value = properties.getProperty(PROP_ACCESS_TO_UNDERLYING_CONNECTION_ALLOWED);
if (value != null) {
- dataSource.setAccessToUnderlyingConnectionAllowed(Boolean.valueOf(value).booleanValue());
+ dataSource.setAccessToUnderlyingConnectionAllowed(Boolean.parseBoolean(value));
}
value = properties.getProperty(PROP_REMOVE_ABANDONED_ON_BORROW);
if (value != null) {
- dataSource.setRemoveAbandonedOnBorrow(Boolean.valueOf(value).booleanValue());
+ dataSource.setRemoveAbandonedOnBorrow(Boolean.parseBoolean(value));
}
value = properties.getProperty(PROP_REMOVE_ABANDONED_ON_MAINTENANCE);
if (value != null) {
- dataSource.setRemoveAbandonedOnMaintenance(Boolean.valueOf(value).booleanValue());
+ dataSource.setRemoveAbandonedOnMaintenance(Boolean.parseBoolean(value));
}
value = properties.getProperty(PROP_REMOVE_ABANDONED_TIMEOUT);
@@ -477,22 +477,22 @@ public class BasicDataSourceFactory implements ObjectFactory {
value = properties.getProperty(PROP_LOG_ABANDONED);
if (value != null) {
- dataSource.setLogAbandoned(Boolean.valueOf(value).booleanValue());
+ dataSource.setLogAbandoned(Boolean.parseBoolean(value));
}
value = properties.getProperty(PROP_ABANDONED_USAGE_TRACKING);
if (value != null) {
- dataSource.setAbandonedUsageTracking(Boolean.valueOf(value).booleanValue());
+ dataSource.setAbandonedUsageTracking(Boolean.parseBoolean(value));
}
value = properties.getProperty(PROP_POOL_PREPARED_STATEMENTS);
if (value != null) {
- dataSource.setPoolPreparedStatements(Boolean.valueOf(value).booleanValue());
+ dataSource.setPoolPreparedStatements(Boolean.parseBoolean(value));
}
value = properties.getProperty(PROP_CLEAR_STATEMENT_POOL_ON_RETURN);
if (value != null) {
- dataSource.setClearStatementPoolOnReturn(Boolean.valueOf(value).booleanValue());
+ dataSource.setClearStatementPoolOnReturn(Boolean.parseBoolean(value));
}
value = properties.getProperty(PROP_MAX_OPEN_PREPARED_STATEMENTS);
@@ -522,7 +522,7 @@ public class BasicDataSourceFactory implements ObjectFactory {
value = properties.getProperty(PROP_LOG_EXPIRED_CONNECTIONS);
if (value != null) {
- dataSource.setLogExpiredConnections(Boolean.valueOf(value).booleanValue());
+ dataSource.setLogExpiredConnections(Boolean.parseBoolean(value));
}
value = properties.getProperty(PROP_JMX_NAME);
@@ -532,12 +532,12 @@ public class BasicDataSourceFactory implements ObjectFactory {
value = properties.getProperty(PROP_ENABLE_AUTO_COMMIT_ON_RETURN);
if (value != null) {
- dataSource.setAutoCommitOnReturn(Boolean.valueOf(value).booleanValue());
+ dataSource.setAutoCommitOnReturn(Boolean.parseBoolean(value));
}
value = properties.getProperty(PROP_ROLLBACK_ON_RETURN);
if (value != null) {
- dataSource.setRollbackOnReturn(Boolean.valueOf(value).booleanValue());
+ dataSource.setRollbackOnReturn(Boolean.parseBoolean(value));
}
value = properties.getProperty(PROP_DEFAULT_QUERY_TIMEOUT);
@@ -547,7 +547,7 @@ public class BasicDataSourceFactory implements ObjectFactory {
value = properties.getProperty(PROP_FAST_FAIL_VALIDATION);
if (value != null) {
- dataSource.setFastFailValidation(Boolean.valueOf(value).booleanValue());
+ dataSource.setFastFailValidation(Boolean.parseBoolean(value));
}
value = properties.getProperty(PROP_DISCONNECTION_SQL_CODES);
diff --git a/src/main/java/org/apache/commons/dbcp2/DelegatingConnection.java b/src/main/java/org/apache/commons/dbcp2/DelegatingConnection.java
index fd163dc..3f6d46b 100644
--- a/src/main/java/org/apache/commons/dbcp2/DelegatingConnection.java
+++ b/src/main/java/org/apache/commons/dbcp2/DelegatingConnection.java
@@ -259,8 +259,8 @@ public class DelegatingConnection<C extends Connection> extends AbandonedTrace i
}
private void initializeStatement(final DelegatingStatement ds) throws SQLException {
- if (defaultQueryTimeoutSeconds != null && defaultQueryTimeoutSeconds.intValue() != ds.getQueryTimeout()) {
- ds.setQueryTimeout(defaultQueryTimeoutSeconds.intValue());
+ if (defaultQueryTimeoutSeconds != null && defaultQueryTimeoutSeconds != ds.getQueryTimeout()) {
+ ds.setQueryTimeout(defaultQueryTimeoutSeconds);
}
}
@@ -381,11 +381,11 @@ public class DelegatingConnection<C extends Connection> extends AbandonedTrace i
public boolean getAutoCommit() throws SQLException {
checkOpen();
if (cacheState && autoCommitCached != null) {
- return autoCommitCached.booleanValue();
+ return autoCommitCached;
}
try {
- autoCommitCached = Boolean.valueOf(connection.getAutoCommit());
- return autoCommitCached.booleanValue();
+ autoCommitCached = connection.getAutoCommit();
+ return autoCommitCached;
} catch (final SQLException e) {
handleException(e);
return false;
@@ -451,11 +451,11 @@ public class DelegatingConnection<C extends Connection> extends AbandonedTrace i
public boolean isReadOnly() throws SQLException {
checkOpen();
if (cacheState && readOnlyCached != null) {
- return readOnlyCached.booleanValue();
+ return readOnlyCached;
}
try {
- readOnlyCached = Boolean.valueOf(connection.isReadOnly());
- return readOnlyCached.booleanValue();
+ readOnlyCached = connection.isReadOnly();
+ return readOnlyCached;
} catch (final SQLException e) {
handleException(e);
return false;
@@ -532,7 +532,7 @@ public class DelegatingConnection<C extends Connection> extends AbandonedTrace i
try {
connection.setAutoCommit(autoCommit);
if (cacheState) {
- autoCommitCached = Boolean.valueOf(connection.getAutoCommit());
+ autoCommitCached = connection.getAutoCommit();
}
} catch (final SQLException e) {
autoCommitCached = null;
@@ -556,7 +556,7 @@ public class DelegatingConnection<C extends Connection> extends AbandonedTrace i
try {
connection.setReadOnly(readOnly);
if (cacheState) {
- readOnlyCached = Boolean.valueOf(connection.isReadOnly());
+ readOnlyCached = connection.isReadOnly();
}
} catch (final SQLException e) {
readOnlyCached = null;
diff --git a/src/main/java/org/apache/commons/dbcp2/PStmtKey.java b/src/main/java/org/apache/commons/dbcp2/PStmtKey.java
index b6aea70..188476d 100644
--- a/src/main/java/org/apache/commons/dbcp2/PStmtKey.java
+++ b/src/main/java/org/apache/commons/dbcp2/PStmtKey.java
@@ -47,7 +47,7 @@ public class PStmtKey {
private class PreparedCallWithResultSetConcurrency implements StatementBuilder {
@Override
public Statement createStatement(final Connection connection) throws SQLException {
- return connection.prepareCall(sql, resultSetType.intValue(), resultSetConcurrency.intValue());
+ return connection.prepareCall(sql, resultSetType, resultSetConcurrency);
}
}
@@ -57,8 +57,7 @@ public class PStmtKey {
private class PreparedCallWithResultSetHoldability implements StatementBuilder {
@Override
public Statement createStatement(final Connection connection) throws SQLException {
- return connection.prepareCall(sql, resultSetType.intValue(), resultSetConcurrency.intValue(),
- resultSetHoldability.intValue());
+ return connection.prepareCall(sql, resultSetType, resultSetConcurrency, resultSetHoldability);
}
}
@@ -78,7 +77,7 @@ public class PStmtKey {
private class PreparedStatementWithAutoGeneratedKeys implements StatementBuilder {
@Override
public Statement createStatement(final Connection connection) throws SQLException {
- return connection.prepareStatement(sql, autoGeneratedKeys.intValue());
+ return connection.prepareStatement(sql, autoGeneratedKeys);
}
}
@@ -108,7 +107,7 @@ public class PStmtKey {
private class PreparedStatementWithResultSetConcurrency implements StatementBuilder {
@Override
public Statement createStatement(final Connection connection) throws SQLException {
- return connection.prepareStatement(sql, resultSetType.intValue(), resultSetConcurrency.intValue());
+ return connection.prepareStatement(sql, resultSetType, resultSetConcurrency);
}
}
@@ -118,8 +117,7 @@ public class PStmtKey {
private class PreparedStatementWithResultSetHoldability implements StatementBuilder {
@Override
public Statement createStatement(final Connection connection) throws SQLException {
- return connection.prepareStatement(sql, resultSetType.intValue(), resultSetConcurrency.intValue(),
- resultSetHoldability.intValue());
+ return connection.prepareStatement(sql, resultSetType, resultSetConcurrency, resultSetHoldability);
}
}
@@ -241,7 +239,7 @@ public class PStmtKey {
*/
@Deprecated
public PStmtKey(final String sql, final String catalog, final int autoGeneratedKeys) {
- this(sql, catalog, StatementType.PREPARED_STATEMENT, Integer.valueOf(autoGeneratedKeys));
+ this(sql, catalog, StatementType.PREPARED_STATEMENT, autoGeneratedKeys);
}
/**
@@ -314,9 +312,9 @@ public class PStmtKey {
this.sql = sql;
this.catalog = catalog;
this.schema = null;
- this.resultSetType = Integer.valueOf(resultSetType);
- this.resultSetConcurrency = Integer.valueOf(resultSetConcurrency);
- this.resultSetHoldability = Integer.valueOf(resultSetHoldability);
+ this.resultSetType = resultSetType;
+ this.resultSetConcurrency = resultSetConcurrency;
+ this.resultSetHoldability = resultSetHoldability;
this.statementType = statementType;
this.autoGeneratedKeys = null;
this.columnIndexes = null;
@@ -352,8 +350,8 @@ public class PStmtKey {
this.sql = sql;
this.catalog = catalog;
this.schema = null;
- this.resultSetType = Integer.valueOf(resultSetType);
- this.resultSetConcurrency = Integer.valueOf(resultSetConcurrency);
+ this.resultSetType = resultSetType;
+ this.resultSetConcurrency = resultSetConcurrency;
this.resultSetHoldability = null;
this.statementType = statementType;
this.autoGeneratedKeys = null;
@@ -491,7 +489,7 @@ public class PStmtKey {
* @since 2.5.0
*/
public PStmtKey(final String sql, final String catalog, final String schema, final int autoGeneratedKeys) {
- this(sql, catalog, schema, StatementType.PREPARED_STATEMENT, Integer.valueOf(autoGeneratedKeys));
+ this(sql, catalog, schema, StatementType.PREPARED_STATEMENT, autoGeneratedKeys);
}
/**
@@ -566,9 +564,9 @@ public class PStmtKey {
this.sql = sql;
this.catalog = catalog;
this.schema = schema;
- this.resultSetType = Integer.valueOf(resultSetType);
- this.resultSetConcurrency = Integer.valueOf(resultSetConcurrency);
- this.resultSetHoldability = Integer.valueOf(resultSetHoldability);
+ this.resultSetType = resultSetType;
+ this.resultSetConcurrency = resultSetConcurrency;
+ this.resultSetHoldability = resultSetHoldability;
this.statementType = statementType;
this.autoGeneratedKeys = null;
this.columnIndexes = null;
@@ -605,8 +603,8 @@ public class PStmtKey {
this.sql = sql;
this.catalog = catalog;
this.schema = schema;
- this.resultSetType = Integer.valueOf(resultSetType);
- this.resultSetConcurrency = Integer.valueOf(resultSetConcurrency);
+ this.resultSetType = resultSetType;
+ this.resultSetConcurrency = resultSetConcurrency;
this.resultSetHoldability = null;
this.statementType = statementType;
this.autoGeneratedKeys = null;
diff --git a/src/main/java/org/apache/commons/dbcp2/PoolableConnectionFactory.java b/src/main/java/org/apache/commons/dbcp2/PoolableConnectionFactory.java
index e70cac6..8d47df1 100644
--- a/src/main/java/org/apache/commons/dbcp2/PoolableConnectionFactory.java
+++ b/src/main/java/org/apache/commons/dbcp2/PoolableConnectionFactory.java
@@ -115,15 +115,15 @@ public class PoolableConnectionFactory implements PooledObjectFactory<PoolableCo
final PoolableConnection conn = p.getObject();
conn.activate();
- if (defaultAutoCommit != null && conn.getAutoCommit() != defaultAutoCommit.booleanValue()) {
- conn.setAutoCommit(defaultAutoCommit.booleanValue());
+ if (defaultAutoCommit != null && conn.getAutoCommit() != defaultAutoCommit) {
+ conn.setAutoCommit(defaultAutoCommit);
}
if (defaultTransactionIsolation != UNKNOWN_TRANSACTION_ISOLATION
&& conn.getTransactionIsolation() != defaultTransactionIsolation) {
conn.setTransactionIsolation(defaultTransactionIsolation);
}
- if (defaultReadOnly != null && conn.isReadOnly() != defaultReadOnly.booleanValue()) {
- conn.setReadOnly(defaultReadOnly.booleanValue());
+ if (defaultReadOnly != null && conn.isReadOnly() != defaultReadOnly) {
+ conn.setReadOnly(defaultReadOnly);
}
if (defaultCatalog != null && !defaultCatalog.equals(conn.getCatalog())) {
conn.setCatalog(defaultCatalog);
@@ -422,8 +422,8 @@ public class PoolableConnectionFactory implements PooledObjectFactory<PoolableCo
final PoolableConnection conn = p.getObject();
Boolean connAutoCommit = null;
if (rollbackOnReturn) {
- connAutoCommit = Boolean.valueOf(conn.getAutoCommit());
- if (!connAutoCommit.booleanValue() && !conn.isReadOnly()) {
+ connAutoCommit = conn.getAutoCommit();
+ if (!connAutoCommit && !conn.isReadOnly()) {
conn.rollback();
}
}
@@ -434,9 +434,9 @@ public class PoolableConnectionFactory implements PooledObjectFactory<PoolableCo
// have autoCommit enabled
if (autoCommitOnReturn) {
if (connAutoCommit == null) {
- connAutoCommit = Boolean.valueOf(conn.getAutoCommit());
+ connAutoCommit = conn.getAutoCommit();
}
- if (!connAutoCommit.booleanValue()) {
+ if (!connAutoCommit) {
conn.setAutoCommit(true);
}
}
@@ -649,7 +649,7 @@ public class PoolableConnectionFactory implements PooledObjectFactory<PoolableCo
final long lifetime = System.currentTimeMillis() - p.getCreateTime();
if (lifetime > maxConnLifetimeMillis) {
throw new LifetimeExceededException(Utils.getMessage("connectionFactory.lifetimeExceeded",
- Long.valueOf(lifetime), Long.valueOf(maxConnLifetimeMillis)));
+ lifetime, maxConnLifetimeMillis));
}
}
}
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 f5e87a7..2dcd9f5 100644
--- a/src/main/java/org/apache/commons/dbcp2/cpdsadapter/DriverAdapterCPDS.java
+++ b/src/main/java/org/apache/commons/dbcp2/cpdsadapter/DriverAdapterCPDS.java
@@ -148,7 +148,7 @@ public class DriverAdapterCPDS implements ConnectionPoolDataSource, Referenceabl
}
private boolean getBooleanContentString(final RefAddr ra) {
- return Boolean.valueOf(getStringContent(ra)).booleanValue();
+ return Boolean.parseBoolean(getStringContent(ra));
}
/**
diff --git a/src/main/java/org/apache/commons/dbcp2/datasources/CPDSConnectionFactory.java b/src/main/java/org/apache/commons/dbcp2/datasources/CPDSConnectionFactory.java
index fa21d4e..f5d2442 100644
--- a/src/main/java/org/apache/commons/dbcp2/datasources/CPDSConnectionFactory.java
+++ b/src/main/java/org/apache/commons/dbcp2/datasources/CPDSConnectionFactory.java
@@ -390,8 +390,8 @@ class CPDSConnectionFactory
if (maxConnLifetimeMillis > 0) {
final long lifetime = System.currentTimeMillis() - p.getCreateTime();
if (lifetime > maxConnLifetimeMillis) {
- throw new Exception(Utils.getMessage("connectionFactory.lifetimeExceeded", Long.valueOf(lifetime),
- Long.valueOf(maxConnLifetimeMillis)));
+ throw new Exception(Utils.getMessage("connectionFactory.lifetimeExceeded", lifetime,
+ maxConnLifetimeMillis));
}
}
}
diff --git a/src/main/java/org/apache/commons/dbcp2/datasources/InstanceKeyDataSourceFactory.java b/src/main/java/org/apache/commons/dbcp2/datasources/InstanceKeyDataSourceFactory.java
index 8be3df3..48ebf8a 100644
--- a/src/main/java/org/apache/commons/dbcp2/datasources/InstanceKeyDataSourceFactory.java
+++ b/src/main/java/org/apache/commons/dbcp2/datasources/InstanceKeyDataSourceFactory.java
@@ -166,7 +166,7 @@ abstract class InstanceKeyDataSourceFactory implements ObjectFactory {
// Pool properties
refAddr = ref.get("blockWhenExhausted");
if (refAddr != null && refAddr.getContent() != null) {
- ikds.setDefaultBlockWhenExhausted(Boolean.valueOf(refAddr.getContent().toString()).booleanValue());
+ ikds.setDefaultBlockWhenExhausted(Boolean.parseBoolean(refAddr.getContent().toString()));
}
refAddr = ref.get("evictionPolicyClassName");
@@ -177,7 +177,7 @@ abstract class InstanceKeyDataSourceFactory implements ObjectFactory {
// Pool properties
refAddr = ref.get("lifo");
if (refAddr != null && refAddr.getContent() != null) {
- ikds.setDefaultLifo(Boolean.valueOf(refAddr.getContent().toString()).booleanValue());
+ ikds.setDefaultLifo(Boolean.parseBoolean(refAddr.getContent().toString()));
}
refAddr = ref.get("maxIdlePerKey");
@@ -217,22 +217,22 @@ abstract class InstanceKeyDataSourceFactory implements ObjectFactory {
refAddr = ref.get("testOnCreate");
if (refAddr != null && refAddr.getContent() != null) {
- ikds.setDefaultTestOnCreate(Boolean.valueOf(refAddr.getContent().toString()).booleanValue());
+ ikds.setDefaultTestOnCreate(Boolean.parseBoolean(refAddr.getContent().toString()));
}
refAddr = ref.get("testOnBorrow");
if (refAddr != null && refAddr.getContent() != null) {
- ikds.setDefaultTestOnBorrow(Boolean.valueOf(refAddr.getContent().toString()).booleanValue());
+ ikds.setDefaultTestOnBorrow(Boolean.parseBoolean(refAddr.getContent().toString()));
}
refAddr = ref.get("testOnReturn");
if (refAddr != null && refAddr.getContent() != null) {
- ikds.setDefaultTestOnReturn(Boolean.valueOf(refAddr.getContent().toString()).booleanValue());
+ ikds.setDefaultTestOnReturn(Boolean.parseBoolean(refAddr.getContent().toString()));
}
refAddr = ref.get("testWhileIdle");
if (refAddr != null && refAddr.getContent() != null) {
- ikds.setDefaultTestWhileIdle(Boolean.valueOf(refAddr.getContent().toString()).booleanValue());
+ ikds.setDefaultTestWhileIdle(Boolean.parseBoolean(refAddr.getContent().toString()));
}
refAddr = ref.get("timeBetweenEvictionRunsMillis");
@@ -254,7 +254,7 @@ abstract class InstanceKeyDataSourceFactory implements ObjectFactory {
refAddr = ref.get("rollbackAfterValidation");
if (refAddr != null && refAddr.getContent() != null) {
- ikds.setRollbackAfterValidation(Boolean.valueOf(refAddr.getContent().toString()).booleanValue());
+ ikds.setRollbackAfterValidation(Boolean.parseBoolean(refAddr.getContent().toString()));
}
refAddr = ref.get("maxConnLifetimeMillis");
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 15c99a8..2fa878c 100644
--- a/src/main/java/org/apache/commons/dbcp2/datasources/KeyedCPDSConnectionFactory.java
+++ b/src/main/java/org/apache/commons/dbcp2/datasources/KeyedCPDSConnectionFactory.java
@@ -340,8 +340,8 @@ class KeyedCPDSConnectionFactory implements KeyedPooledObjectFactory<UserPassKey
if (maxConnLifetimeMillis > 0) {
final long lifetime = System.currentTimeMillis() - p.getCreateTime();
if (lifetime > maxConnLifetimeMillis) {
- throw new Exception(Utils.getMessage("connectionFactory.lifetimeExceeded", Long.valueOf(lifetime),
- Long.valueOf(maxConnLifetimeMillis)));
+ throw new Exception(Utils.getMessage("connectionFactory.lifetimeExceeded", lifetime,
+ maxConnLifetimeMillis));
}
}
}
diff --git a/src/main/java/org/apache/commons/dbcp2/datasources/PerUserPoolDataSource.java b/src/main/java/org/apache/commons/dbcp2/datasources/PerUserPoolDataSource.java
index 1087b37..9f5df69 100644
--- a/src/main/java/org/apache/commons/dbcp2/datasources/PerUserPoolDataSource.java
+++ b/src/main/java/org/apache/commons/dbcp2/datasources/PerUserPoolDataSource.java
@@ -201,7 +201,7 @@ public class PerUserPoolDataSource extends InstanceKeyDataSource {
if (value == null) {
return getDefaultBlockWhenExhausted();
}
- return value.booleanValue();
+ return value;
}
/**
@@ -285,7 +285,7 @@ public class PerUserPoolDataSource extends InstanceKeyDataSource {
if (value == null) {
return getDefaultLifo();
}
- return value.booleanValue();
+ return value;
}
/**
@@ -304,7 +304,7 @@ public class PerUserPoolDataSource extends InstanceKeyDataSource {
if (value == null) {
return getDefaultMaxIdle();
}
- return value.intValue();
+ return value;
}
/**
@@ -323,7 +323,7 @@ public class PerUserPoolDataSource extends InstanceKeyDataSource {
if (value == null) {
return getDefaultMaxTotal();
}
- return value.intValue();
+ return value;
}
/**
@@ -342,7 +342,7 @@ public class PerUserPoolDataSource extends InstanceKeyDataSource {
if (value == null) {
return getDefaultMaxWaitMillis();
}
- return value.longValue();
+ return value;
}
/**
@@ -361,7 +361,7 @@ public class PerUserPoolDataSource extends InstanceKeyDataSource {
if (value == null) {
return getDefaultMinEvictableIdleTimeMillis();
}
- return value.longValue();
+ return value;
}
/**
@@ -380,7 +380,7 @@ public class PerUserPoolDataSource extends InstanceKeyDataSource {
if (value == null) {
return getDefaultMinIdle();
}
- return value.intValue();
+ return value;
}
/**
@@ -399,7 +399,7 @@ public class PerUserPoolDataSource extends InstanceKeyDataSource {
if (value == null) {
return getDefaultNumTestsPerEvictionRun();
}
- return value.intValue();
+ return value;
}
/**
@@ -418,7 +418,7 @@ public class PerUserPoolDataSource extends InstanceKeyDataSource {
if (value == null) {
return getDefaultSoftMinEvictableIdleTimeMillis();
}
- return value.longValue();
+ return value;
}
/**
@@ -437,7 +437,7 @@ public class PerUserPoolDataSource extends InstanceKeyDataSource {
if (value == null) {
return getDefaultTestOnBorrow();
}
- return value.booleanValue();
+ return value;
}
/**
@@ -456,7 +456,7 @@ public class PerUserPoolDataSource extends InstanceKeyDataSource {
if (value == null) {
return getDefaultTestOnCreate();
}
- return value.booleanValue();
+ return value;
}
/**
@@ -475,7 +475,7 @@ public class PerUserPoolDataSource extends InstanceKeyDataSource {
if (value == null) {
return getDefaultTestOnReturn();
}
- return value.booleanValue();
+ return value;
}
/**
@@ -494,7 +494,7 @@ public class PerUserPoolDataSource extends InstanceKeyDataSource {
if (value == null) {
return getDefaultTestWhileIdle();
}
- return value.booleanValue();
+ return value;
}
/**
@@ -513,7 +513,7 @@ public class PerUserPoolDataSource extends InstanceKeyDataSource {
if (value == null) {
return getDefaultTimeBetweenEvictionRunsMillis();
}
- return value.longValue();
+ return value;
}
/**
@@ -1157,20 +1157,20 @@ public class PerUserPoolDataSource extends InstanceKeyDataSource {
if (userName != null) {
final Integer userMax = getPerUserDefaultTransactionIsolation(userName);
if (userMax != null) {
- defaultTransactionIsolation = userMax.intValue();
+ defaultTransactionIsolation = userMax;
}
}
- if (defaultAutoCommit != null && con.getAutoCommit() != defaultAutoCommit.booleanValue()) {
- con.setAutoCommit(defaultAutoCommit.booleanValue());
+ if (defaultAutoCommit != null && con.getAutoCommit() != defaultAutoCommit) {
+ con.setAutoCommit(defaultAutoCommit);
}
if (defaultTransactionIsolation != UNKNOWN_TRANSACTIONISOLATION) {
con.setTransactionIsolation(defaultTransactionIsolation);
}
- if (defaultReadOnly != null && con.isReadOnly() != defaultReadOnly.booleanValue()) {
- con.setReadOnly(defaultReadOnly.booleanValue());
+ if (defaultReadOnly != null && con.isReadOnly() != defaultReadOnly) {
+ con.setReadOnly(defaultReadOnly);
}
}
}
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 fd1b1ec..d015f71 100644
--- a/src/main/java/org/apache/commons/dbcp2/datasources/SharedPoolDataSource.java
+++ b/src/main/java/org/apache/commons/dbcp2/datasources/SharedPoolDataSource.java
@@ -200,8 +200,8 @@ public class SharedPoolDataSource extends InstanceKeyDataSource {
@Override
protected void setupDefaults(final Connection connection, final String userName) throws SQLException {
final Boolean defaultAutoCommit = isDefaultAutoCommit();
- if (defaultAutoCommit != null && connection.getAutoCommit() != defaultAutoCommit.booleanValue()) {
- connection.setAutoCommit(defaultAutoCommit.booleanValue());
+ if (defaultAutoCommit != null && connection.getAutoCommit() != defaultAutoCommit) {
+ connection.setAutoCommit(defaultAutoCommit);
}
final int defaultTransactionIsolation = getDefaultTransactionIsolation();
@@ -210,8 +210,8 @@ public class SharedPoolDataSource extends InstanceKeyDataSource {
}
final Boolean defaultReadOnly = isDefaultReadOnly();
- if (defaultReadOnly != null && connection.isReadOnly() != defaultReadOnly.booleanValue()) {
- connection.setReadOnly(defaultReadOnly.booleanValue());
+ if (defaultReadOnly != null && connection.isReadOnly() != defaultReadOnly) {
+ connection.setReadOnly(defaultReadOnly);
}
}
diff --git a/src/test/java/org/apache/commons/dbcp2/TestBasicDataSource.java b/src/test/java/org/apache/commons/dbcp2/TestBasicDataSource.java
index 7acbd79..8bae049 100644
--- a/src/test/java/org/apache/commons/dbcp2/TestBasicDataSource.java
+++ b/src/test/java/org/apache/commons/dbcp2/TestBasicDataSource.java
@@ -879,8 +879,7 @@ public class TestBasicDataSource extends TestConnectionPool {
final BasicDataSource ds = BasicDataSourceFactory.createDataSource(properties);
final boolean original = ds.getConnectionPool().getLogAbandoned();
ds.setLogAbandoned(!original);
- Assertions.assertNotEquals(Boolean.valueOf(original),
- Boolean.valueOf(ds.getConnectionPool().getLogAbandoned()));
+ Assertions.assertNotEquals(original, ds.getConnectionPool().getLogAbandoned());
}
/**
diff --git a/src/test/java/org/apache/commons/dbcp2/TestConnectionPool.java b/src/test/java/org/apache/commons/dbcp2/TestConnectionPool.java
index 97252f0..6d9ddfb 100644
--- a/src/test/java/org/apache/commons/dbcp2/TestConnectionPool.java
+++ b/src/test/java/org/apache/commons/dbcp2/TestConnectionPool.java
@@ -708,7 +708,7 @@ public abstract class TestConnectionPool {
}
private static final boolean DISPLAY_THREAD_DETAILS=
- Boolean.valueOf(System.getProperty("TestConnectionPool.display.thread.details", "false")).booleanValue();
+ Boolean.parseBoolean(System.getProperty("TestConnectionPool.display.thread.details", "false"));
// To pass this to a Maven test, use:
// mvn test -DargLine="-DTestConnectionPool.display.thread.details=true"
// @see https://issues.apache.org/jira/browse/SUREFIRE-121
diff --git a/src/test/java/org/apache/commons/dbcp2/TestPoolingDataSource.java b/src/test/java/org/apache/commons/dbcp2/TestPoolingDataSource.java
index b826ab8..d1dd49b 100644
--- a/src/test/java/org/apache/commons/dbcp2/TestPoolingDataSource.java
+++ b/src/test/java/org/apache/commons/dbcp2/TestPoolingDataSource.java
@@ -127,7 +127,7 @@ public class TestPoolingDataSource extends TestConnectionPool {
@Test
public void testPoolGuardConnectionWrapperEqualsType() throws Exception {
final Connection con1 = ds.getConnection();
- final Integer con2 = Integer.valueOf(0);
+ final Integer con2 = 0;
assertFalse(con1.equals(con2));
con1.close();
}
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 cf63e45..c791be9 100644
--- a/src/test/java/org/apache/commons/dbcp2/datasources/TestCPDSConnectionFactory.java
+++ b/src/test/java/org/apache/commons/dbcp2/datasources/TestCPDSConnectionFactory.java
@@ -58,9 +58,9 @@ public class TestCPDSConnectionFactory {
public void testSharedPoolDSDestroyOnReturn() throws Exception {
final PerUserPoolDataSource ds = new PerUserPoolDataSource();
ds.setConnectionPoolDataSource(cpds);
- ds.setPerUserMaxTotal("userName", Integer.valueOf(10));
- ds.setPerUserMaxWaitMillis("userName", Long.valueOf(50));
- ds.setPerUserMaxIdle("userName", Integer.valueOf(2));
+ ds.setPerUserMaxTotal("userName", 10);
+ ds.setPerUserMaxWaitMillis("userName", 50L);
+ ds.setPerUserMaxIdle("userName", 2);
final Connection conn1 = ds.getConnection("userName", "password");
final Connection conn2 = ds.getConnection("userName", "password");
final Connection conn3 = ds.getConnection("userName", "password");
diff --git a/src/test/java/org/apache/commons/dbcp2/datasources/TestPerUserPoolDataSource.java b/src/test/java/org/apache/commons/dbcp2/datasources/TestPerUserPoolDataSource.java
index 4d18293..036456c 100644
--- a/src/test/java/org/apache/commons/dbcp2/datasources/TestPerUserPoolDataSource.java
+++ b/src/test/java/org/apache/commons/dbcp2/datasources/TestPerUserPoolDataSource.java
@@ -70,8 +70,8 @@ public class TestPerUserPoolDataSource extends TestConnectionPool {
tds.setConnectionPoolDataSource(pcds);
tds.setDefaultMaxTotal(getMaxTotal());
tds.setDefaultMaxWaitMillis((int)getMaxWaitMillis());
- tds.setPerUserMaxTotal(user, Integer.valueOf(getMaxTotal()));
- tds.setPerUserMaxWaitMillis(user, Long.valueOf(getMaxWaitMillis()));
+ tds.setPerUserMaxTotal(user, getMaxTotal());
+ tds.setPerUserMaxWaitMillis(user, getMaxWaitMillis());
tds.setDefaultTransactionIsolation(
Connection.TRANSACTION_READ_COMMITTED);
tds.setDefaultAutoCommit(Boolean.TRUE);
@@ -318,7 +318,7 @@ public class TestPerUserPoolDataSource extends TestConnectionPool {
public void testMaxWaitMillisZero() throws Exception {
final PerUserPoolDataSource tds = (PerUserPoolDataSource) ds;
tds.setDefaultMaxWaitMillis(0);
- tds.setPerUserMaxTotal("u1", Integer.valueOf(1));
+ tds.setPerUserMaxTotal("u1", 1);
final Connection conn = tds.getConnection("u1", "p1");
try (Connection c2 = tds.getConnection("u1", "p1")){
fail("Expecting Pool Exhausted exception");
@@ -333,8 +333,8 @@ public class TestPerUserPoolDataSource extends TestConnectionPool {
final PerUserPoolDataSource tds = (PerUserPoolDataSource) ds;
// you need to set per user maxTotal otherwise there is no accounting
- tds.setPerUserMaxTotal("u1", Integer.valueOf(5));
- tds.setPerUserMaxTotal("u2", Integer.valueOf(5));
+ tds.setPerUserMaxTotal("u1", 5);
+ tds.setPerUserMaxTotal("u2", 5);
assertEquals(0, tds.getNumActive());
assertEquals(0, tds.getNumActive("u1"));
@@ -384,7 +384,7 @@ public class TestPerUserPoolDataSource extends TestConnectionPool {
// some JVMs, e.g. Windows.
final int defaultMaxWaitMillis = 430;
((PerUserPoolDataSource) ds).setDefaultMaxWaitMillis(defaultMaxWaitMillis);
- ((PerUserPoolDataSource) ds).setPerUserMaxWaitMillis(user,new Long(defaultMaxWaitMillis));
+ ((PerUserPoolDataSource) ds).setPerUserMaxWaitMillis(user, (long) defaultMaxWaitMillis);
multipleThreads(1, false, false, defaultMaxWaitMillis);
}
@@ -392,7 +392,7 @@ public class TestPerUserPoolDataSource extends TestConnectionPool {
public void testMultipleThreads2() throws Exception {
final int defaultMaxWaitMillis = 500;
((PerUserPoolDataSource) ds).setDefaultMaxWaitMillis(defaultMaxWaitMillis);
- ((PerUserPoolDataSource) ds).setPerUserMaxWaitMillis(user,new Long(defaultMaxWaitMillis));
+ ((PerUserPoolDataSource) ds).setPerUserMaxWaitMillis(user, (long) defaultMaxWaitMillis);
multipleThreads(2 * defaultMaxWaitMillis, true, true, defaultMaxWaitMillis);
}
@@ -477,7 +477,7 @@ public class TestPerUserPoolDataSource extends TestConnectionPool {
TesterDriver.addUser("jsmith", "password");
final PerUserPoolDataSource puds = (PerUserPoolDataSource) ds;
- puds.setPerUserMaxTotal("jsmith", Integer.valueOf(2));
+ puds.setPerUserMaxTotal("jsmith", 2);
final String[] users = {"mkh", "hanafey", "jsmith"};
final String password = "password";
final Connection[] c = new Connection[users.length];
@@ -498,7 +498,7 @@ public class TestPerUserPoolDataSource extends TestConnectionPool {
TesterDriver.addUser("jsmith", "password");
final PerUserPoolDataSource puds = (PerUserPoolDataSource) ds;
- puds.setPerUserMaxTotal("jsmith", Integer.valueOf(2));
+ puds.setPerUserMaxTotal("jsmith", 2);
final String[] users = {"jsmith", "hanafey", "mkh"};
final String password = "password";
final Connection[] c = new Connection[users.length];
diff --git a/src/test/java/org/apache/commons/dbcp2/managed/TestDataSourceXAConnectionFactory.java b/src/test/java/org/apache/commons/dbcp2/managed/TestDataSourceXAConnectionFactory.java
index 71944fb..0119938 100644
--- a/src/test/java/org/apache/commons/dbcp2/managed/TestDataSourceXAConnectionFactory.java
+++ b/src/test/java/org/apache/commons/dbcp2/managed/TestDataSourceXAConnectionFactory.java
@@ -70,10 +70,10 @@ public class TestDataSourceXAConnectionFactory extends TestBasicDataSource {
throws Throwable {
final String methodName = method.getName();
if (methodName.equals("hashCode")) {
- return Integer.valueOf(System.identityHashCode(proxy));
+ return System.identityHashCode(proxy);
}
if (methodName.equals("equals")) {
- return Boolean.valueOf(proxy == args[0]);
+ return proxy == args[0];
}
if (methodName.equals("getXAConnection")) {
// both zero and 2-arg signatures
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 067b3f6..ae12afc 100644
--- a/src/test/java/org/apache/commons/dbcp2/managed/TestManagedDataSource.java
+++ b/src/test/java/org/apache/commons/dbcp2/managed/TestManagedDataSource.java
@@ -224,7 +224,7 @@ public class TestManagedDataSource extends TestConnectionPool {
@Test
public void testManagedConnectionEqualsType() throws Exception {
final Connection con1 = ds.getConnection();
- final Integer con2 = Integer.valueOf(0);
+ final Integer con2 = 0;
assertFalse(con1.equals(con2));
con1.close();
}
diff --git a/src/test/java/org/apache/commons/dbcp2/managed/TestSynchronizationOrder.java b/src/test/java/org/apache/commons/dbcp2/managed/TestSynchronizationOrder.java
index ea89ca8..9e840f4 100644
--- a/src/test/java/org/apache/commons/dbcp2/managed/TestSynchronizationOrder.java
+++ b/src/test/java/org/apache/commons/dbcp2/managed/TestSynchronizationOrder.java
@@ -282,10 +282,10 @@ public class TestSynchronizationOrder {
throws Throwable {
final String methodName = method.getName();
if (methodName.equals("hashCode")) {
- return Integer.valueOf(System.identityHashCode(proxy));
+ return System.identityHashCode(proxy);
}
if (methodName.equals("equals")) {
- return Boolean.valueOf(proxy == args[0]);
+ return proxy == args[0];
}
if (methodName.equals("getXAConnection")) {
// both zero and 2-arg signatures
diff --git a/src/test/java/org/apache/commons/dbcp2/managed/TesterBasicXAConnection.java b/src/test/java/org/apache/commons/dbcp2/managed/TesterBasicXAConnection.java
index 28f9f82..e8183ad 100644
--- a/src/test/java/org/apache/commons/dbcp2/managed/TesterBasicXAConnection.java
+++ b/src/test/java/org/apache/commons/dbcp2/managed/TesterBasicXAConnection.java
@@ -175,13 +175,13 @@ public class TesterBasicXAConnection implements XAConnection {
throws Throwable {
final String methodName = method.getName();
if (methodName.equals("hashCode")) {
- return Integer.valueOf(System.identityHashCode(proxy));
+ return System.identityHashCode(proxy);
}
if (methodName.equals("equals")) {
- return Boolean.valueOf(proxy == args[0]);
+ return proxy == args[0];
}
if (methodName.equals("isClosed")) {
- return Boolean.valueOf(conn == null);
+ return conn == null;
}
if (methodName.equals("close")) {
return close();
[commons-dbcp] 02/09: Replace StringBuffer with StringBuilder
Posted by eb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ebourg pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-dbcp.git
commit ec6321c7b73c81dc24293710931dc6ce7c3220a4
Author: Emmanuel Bourg <eb...@apache.org>
AuthorDate: Fri Dec 4 13:31:15 2020 +0100
Replace StringBuffer with StringBuilder
---
src/main/java/org/apache/commons/dbcp2/DelegatingConnection.java | 2 +-
src/main/java/org/apache/commons/dbcp2/PStmtKey.java | 2 +-
src/main/java/org/apache/commons/dbcp2/datasources/PoolKey.java | 2 +-
src/test/java/org/apache/commons/dbcp2/StackMessageLog.java | 2 +-
.../org/apache/commons/dbcp2/managed/TestConnectionWithNarayana.java | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/main/java/org/apache/commons/dbcp2/DelegatingConnection.java b/src/main/java/org/apache/commons/dbcp2/DelegatingConnection.java
index 2075be3..bdceb41 100644
--- a/src/main/java/org/apache/commons/dbcp2/DelegatingConnection.java
+++ b/src/main/java/org/apache/commons/dbcp2/DelegatingConnection.java
@@ -98,7 +98,7 @@ public class DelegatingConnection<C extends Connection> extends AbandonedTrace i
if (conn.isClosed()) {
str = "connection is closed";
} else {
- final StringBuffer sb = new StringBuffer();
+ final StringBuilder sb = new StringBuilder();
sb.append(hashCode());
final DatabaseMetaData meta = conn.getMetaData();
if (meta != null) {
diff --git a/src/main/java/org/apache/commons/dbcp2/PStmtKey.java b/src/main/java/org/apache/commons/dbcp2/PStmtKey.java
index 9a39557..b6aea70 100644
--- a/src/main/java/org/apache/commons/dbcp2/PStmtKey.java
+++ b/src/main/java/org/apache/commons/dbcp2/PStmtKey.java
@@ -934,7 +934,7 @@ public class PStmtKey {
@Override
public String toString() {
- final StringBuffer buf = new StringBuffer();
+ final StringBuilder buf = new StringBuilder();
buf.append("PStmtKey: sql=");
buf.append(sql);
buf.append(", catalog=");
diff --git a/src/main/java/org/apache/commons/dbcp2/datasources/PoolKey.java b/src/main/java/org/apache/commons/dbcp2/datasources/PoolKey.java
index 441e24c..4f9bc4f 100644
--- a/src/main/java/org/apache/commons/dbcp2/datasources/PoolKey.java
+++ b/src/main/java/org/apache/commons/dbcp2/datasources/PoolKey.java
@@ -62,7 +62,7 @@ class PoolKey implements Serializable {
@Override
public String toString() {
- final StringBuffer sb = new StringBuffer(50);
+ final StringBuilder sb = new StringBuilder(50);
sb.append("PoolKey(");
sb.append("UserName").append(", ").append(dataSourceName);
sb.append(')');
diff --git a/src/test/java/org/apache/commons/dbcp2/StackMessageLog.java b/src/test/java/org/apache/commons/dbcp2/StackMessageLog.java
index b450de2..f2a3e67 100644
--- a/src/test/java/org/apache/commons/dbcp2/StackMessageLog.java
+++ b/src/test/java/org/apache/commons/dbcp2/StackMessageLog.java
@@ -48,7 +48,7 @@ public class StackMessageLog extends SimpleLog {
protected void log(final int type, final Object message, final Throwable t) {
lock.lock();
try {
- final StringBuffer buf = new StringBuffer();
+ final StringBuilder buf = new StringBuilder();
buf.append(message.toString());
if(t != null) {
buf.append(" <");
diff --git a/src/test/java/org/apache/commons/dbcp2/managed/TestConnectionWithNarayana.java b/src/test/java/org/apache/commons/dbcp2/managed/TestConnectionWithNarayana.java
index 248efcb..2cdd0bf 100644
--- a/src/test/java/org/apache/commons/dbcp2/managed/TestConnectionWithNarayana.java
+++ b/src/test/java/org/apache/commons/dbcp2/managed/TestConnectionWithNarayana.java
@@ -47,7 +47,7 @@ public class TestConnectionWithNarayana {
private static final String DROP_STMT = "DROP TABLE TEST_DATA";
static {
- final StringBuffer sb = new StringBuffer();
+ final StringBuilder sb = new StringBuilder();
sb.append("Start");
sb.append("payload");
for (int i = 0; i < 10000; i++) {
Re: [commons-dbcp] 03/09: Use for-each loops
Posted by Phil Steitz <ph...@gmail.com>.
First, many thanks for the cleanup work.
One thing to bear in mind for the loop changes is that in some cases the
underlying collections may be changing as the loops progress. In theory,
unit tests should pick up any problems introduced, but we should look
carefully at this.
Phil
On 12/4/20 6:15 AM, ebourg@apache.org wrote:
> This is an automated email from the ASF dual-hosted git repository.
>
> ebourg pushed a commit to branch master
> in repository https://gitbox.apache.org/repos/asf/commons-dbcp.git
>
> commit 309e204345a7b5181c883b6aa2d8497313f625ef
> Author: Emmanuel Bourg <eb...@apache.org>
> AuthorDate: Fri Dec 4 13:32:19 2020 +0100
>
> Use for-each loops
> ---
> .../java/org/apache/commons/dbcp2/DelegatingConnection.java | 5 +----
> .../dbcp2/datasources/InstanceKeyDataSourceFactory.java | 12 +++---------
> 2 files changed, 4 insertions(+), 13 deletions(-)
>
> diff --git a/src/main/java/org/apache/commons/dbcp2/DelegatingConnection.java b/src/main/java/org/apache/commons/dbcp2/DelegatingConnection.java
> index bdceb41..e7aeb61 100644
> --- a/src/main/java/org/apache/commons/dbcp2/DelegatingConnection.java
> +++ b/src/main/java/org/apache/commons/dbcp2/DelegatingConnection.java
> @@ -36,7 +36,6 @@ import java.sql.Statement;
> import java.sql.Struct;
> import java.util.ArrayList;
> import java.util.Collections;
> -import java.util.Iterator;
> import java.util.List;
> import java.util.Map;
> import java.util.Properties;
> @@ -620,9 +619,7 @@ public class DelegatingConnection<C extends Connection> extends AbandonedTrace i
> final List<AbandonedTrace> traces = getTrace();
> if (traces != null && !traces.isEmpty()) {
> final List<Exception> thrownList = new ArrayList<>();
> - final Iterator<AbandonedTrace> traceIter = traces.iterator();
> - while (traceIter.hasNext()) {
> - final Object trace = traceIter.next();
> + for (Object trace : traces) {
> if (trace instanceof Statement) {
> try {
> ((Statement) trace).close();
> diff --git a/src/main/java/org/apache/commons/dbcp2/datasources/InstanceKeyDataSourceFactory.java b/src/main/java/org/apache/commons/dbcp2/datasources/InstanceKeyDataSourceFactory.java
> index f6ee923..8be3df3 100644
> --- a/src/main/java/org/apache/commons/dbcp2/datasources/InstanceKeyDataSourceFactory.java
> +++ b/src/main/java/org/apache/commons/dbcp2/datasources/InstanceKeyDataSourceFactory.java
> @@ -21,7 +21,6 @@ import java.io.IOException;
> import java.io.ObjectInputStream;
> import java.util.ArrayList;
> import java.util.Hashtable;
> -import java.util.Iterator;
> import java.util.List;
> import java.util.Map;
> import java.util.Map.Entry;
> @@ -47,9 +46,7 @@ abstract class InstanceKeyDataSourceFactory implements ObjectFactory {
>
> static synchronized String registerNewInstance(final InstanceKeyDataSource ds) {
> int max = 0;
> - final Iterator<String> iterator = instanceMap.keySet().iterator();
> - while (iterator.hasNext()) {
> - final String s = iterator.next();
> + for (String s : instanceMap.keySet()) {
> if (s != null) {
> try {
> max = Math.max(max, Integer.parseInt(s));
> @@ -84,13 +81,10 @@ abstract class InstanceKeyDataSourceFactory implements ObjectFactory {
> public static void closeAll() throws Exception {
> // Get iterator to loop over all instances of this data source.
> final List<Throwable> exceptionList = new ArrayList<>(instanceMap.size());
> - final Iterator<Entry<String, InstanceKeyDataSource>> instanceIterator = instanceMap.entrySet().iterator();
> - while (instanceIterator.hasNext()) {
> + for (Entry<String, InstanceKeyDataSource> next : instanceMap.entrySet()) {
> // Bullet-proof to avoid anything else but problems from InstanceKeyDataSource#close().
> - final Entry<String, InstanceKeyDataSource> next = instanceIterator.next();
> if (next != null) {
> - @SuppressWarnings("resource")
> - final InstanceKeyDataSource value = next.getValue();
> + @SuppressWarnings("resource") final InstanceKeyDataSource value = next.getValue();
> if (value != null) {
> try {
> value.close();
>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@commons.apache.org
For additional commands, e-mail: dev-help@commons.apache.org
[commons-dbcp] 03/09: Use for-each loops
Posted by eb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ebourg pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-dbcp.git
commit 309e204345a7b5181c883b6aa2d8497313f625ef
Author: Emmanuel Bourg <eb...@apache.org>
AuthorDate: Fri Dec 4 13:32:19 2020 +0100
Use for-each loops
---
.../java/org/apache/commons/dbcp2/DelegatingConnection.java | 5 +----
.../dbcp2/datasources/InstanceKeyDataSourceFactory.java | 12 +++---------
2 files changed, 4 insertions(+), 13 deletions(-)
diff --git a/src/main/java/org/apache/commons/dbcp2/DelegatingConnection.java b/src/main/java/org/apache/commons/dbcp2/DelegatingConnection.java
index bdceb41..e7aeb61 100644
--- a/src/main/java/org/apache/commons/dbcp2/DelegatingConnection.java
+++ b/src/main/java/org/apache/commons/dbcp2/DelegatingConnection.java
@@ -36,7 +36,6 @@ import java.sql.Statement;
import java.sql.Struct;
import java.util.ArrayList;
import java.util.Collections;
-import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Properties;
@@ -620,9 +619,7 @@ public class DelegatingConnection<C extends Connection> extends AbandonedTrace i
final List<AbandonedTrace> traces = getTrace();
if (traces != null && !traces.isEmpty()) {
final List<Exception> thrownList = new ArrayList<>();
- final Iterator<AbandonedTrace> traceIter = traces.iterator();
- while (traceIter.hasNext()) {
- final Object trace = traceIter.next();
+ for (Object trace : traces) {
if (trace instanceof Statement) {
try {
((Statement) trace).close();
diff --git a/src/main/java/org/apache/commons/dbcp2/datasources/InstanceKeyDataSourceFactory.java b/src/main/java/org/apache/commons/dbcp2/datasources/InstanceKeyDataSourceFactory.java
index f6ee923..8be3df3 100644
--- a/src/main/java/org/apache/commons/dbcp2/datasources/InstanceKeyDataSourceFactory.java
+++ b/src/main/java/org/apache/commons/dbcp2/datasources/InstanceKeyDataSourceFactory.java
@@ -21,7 +21,6 @@ import java.io.IOException;
import java.io.ObjectInputStream;
import java.util.ArrayList;
import java.util.Hashtable;
-import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
@@ -47,9 +46,7 @@ abstract class InstanceKeyDataSourceFactory implements ObjectFactory {
static synchronized String registerNewInstance(final InstanceKeyDataSource ds) {
int max = 0;
- final Iterator<String> iterator = instanceMap.keySet().iterator();
- while (iterator.hasNext()) {
- final String s = iterator.next();
+ for (String s : instanceMap.keySet()) {
if (s != null) {
try {
max = Math.max(max, Integer.parseInt(s));
@@ -84,13 +81,10 @@ abstract class InstanceKeyDataSourceFactory implements ObjectFactory {
public static void closeAll() throws Exception {
// Get iterator to loop over all instances of this data source.
final List<Throwable> exceptionList = new ArrayList<>(instanceMap.size());
- final Iterator<Entry<String, InstanceKeyDataSource>> instanceIterator = instanceMap.entrySet().iterator();
- while (instanceIterator.hasNext()) {
+ for (Entry<String, InstanceKeyDataSource> next : instanceMap.entrySet()) {
// Bullet-proof to avoid anything else but problems from InstanceKeyDataSource#close().
- final Entry<String, InstanceKeyDataSource> next = instanceIterator.next();
if (next != null) {
- @SuppressWarnings("resource")
- final InstanceKeyDataSource value = next.getValue();
+ @SuppressWarnings("resource") final InstanceKeyDataSource value = next.getValue();
if (value != null) {
try {
value.close();