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 <ebo...@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();
