You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by ma...@apache.org on 2018/06/19 09:15:43 UTC
commons-dbcp git commit: Fix generics warnings
Repository: commons-dbcp
Updated Branches:
refs/heads/master d7f3d4f5c -> 7a2d76735
Fix generics warnings
Project: http://git-wip-us.apache.org/repos/asf/commons-dbcp/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-dbcp/commit/7a2d7673
Tree: http://git-wip-us.apache.org/repos/asf/commons-dbcp/tree/7a2d7673
Diff: http://git-wip-us.apache.org/repos/asf/commons-dbcp/diff/7a2d7673
Branch: refs/heads/master
Commit: 7a2d76735fce33b815c9fd674b1c3e3eeb3aebf0
Parents: d7f3d4f
Author: Mark Thomas <ma...@apache.org>
Authored: Tue Jun 19 10:14:56 2018 +0100
Committer: Mark Thomas <ma...@apache.org>
Committed: Tue Jun 19 10:14:56 2018 +0100
----------------------------------------------------------------------
src/main/java/org/apache/commons/dbcp2/BasicDataSource.java | 6 +++---
.../org/apache/commons/dbcp2/PoolableConnectionFactory.java | 2 +-
src/main/java/org/apache/commons/dbcp2/PoolingConnection.java | 4 ++--
.../apache/commons/dbcp2/cpdsadapter/DriverAdapterCPDS.java | 2 +-
.../apache/commons/dbcp2/cpdsadapter/PooledConnectionImpl.java | 4 ++--
.../apache/commons/dbcp2/datasources/SharedPoolDataSource.java | 2 +-
.../dbcp2/managed/PoolableManagedConnectionFactory.java | 4 ++--
7 files changed, 12 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/7a2d7673/src/main/java/org/apache/commons/dbcp2/BasicDataSource.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/dbcp2/BasicDataSource.java b/src/main/java/org/apache/commons/dbcp2/BasicDataSource.java
index 8d08509..8c265cb 100644
--- a/src/main/java/org/apache/commons/dbcp2/BasicDataSource.java
+++ b/src/main/java/org/apache/commons/dbcp2/BasicDataSource.java
@@ -2250,7 +2250,7 @@ public class BasicDataSource implements DataSource, BasicDataSourceMXBean, MBean
*/
protected void createConnectionPool(final PoolableConnectionFactory factory) {
// Create an object pool to contain our active connections
- final GenericObjectPoolConfig config = new GenericObjectPoolConfig();
+ final GenericObjectPoolConfig<PoolableConnection> config = new GenericObjectPoolConfig<>();
updateJmxName(config);
// Disable JMX on the underlying pool if the DS is not registered:
config.setJmxEnabled(registeredJmxObjectName != null);
@@ -2285,7 +2285,7 @@ public class BasicDataSource implements DataSource, BasicDataSourceMXBean, MBean
* @return a non-null instance
*/
protected GenericObjectPool<PoolableConnection> createObjectPool(final PoolableConnectionFactory factory,
- final GenericObjectPoolConfig poolConfig, final AbandonedConfig abandonedConfig) {
+ final GenericObjectPoolConfig<PoolableConnection> poolConfig, final AbandonedConfig abandonedConfig) {
GenericObjectPool<PoolableConnection> gop;
if (abandonedConfig != null && (abandonedConfig.getRemoveAbandonedOnBorrow()
|| abandonedConfig.getRemoveAbandonedOnMaintenance())) {
@@ -2450,7 +2450,7 @@ public class BasicDataSource implements DataSource, BasicDataSourceMXBean, MBean
// NO-OP
}
- private void updateJmxName(final GenericObjectPoolConfig config) {
+ private void updateJmxName(final GenericObjectPoolConfig<?> config) {
if (registeredJmxObjectName == null) {
return;
}
http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/7a2d7673/src/main/java/org/apache/commons/dbcp2/PoolableConnectionFactory.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/dbcp2/PoolableConnectionFactory.java b/src/main/java/org/apache/commons/dbcp2/PoolableConnectionFactory.java
index 581d3ad..75cda96 100644
--- a/src/main/java/org/apache/commons/dbcp2/PoolableConnectionFactory.java
+++ b/src/main/java/org/apache/commons/dbcp2/PoolableConnectionFactory.java
@@ -309,7 +309,7 @@ public class PoolableConnectionFactory implements PooledObjectFactory<PoolableCo
if (poolStatements) {
conn = new PoolingConnection(conn);
- final GenericKeyedObjectPoolConfig config = new GenericKeyedObjectPoolConfig();
+ final GenericKeyedObjectPoolConfig<DelegatingPreparedStatement> config = new GenericKeyedObjectPoolConfig<>();
config.setMaxTotalPerKey(-1);
config.setBlockWhenExhausted(false);
config.setMaxWaitMillis(0);
http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/7a2d7673/src/main/java/org/apache/commons/dbcp2/PoolingConnection.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/dbcp2/PoolingConnection.java b/src/main/java/org/apache/commons/dbcp2/PoolingConnection.java
index 58c4b32..725e1b5 100644
--- a/src/main/java/org/apache/commons/dbcp2/PoolingConnection.java
+++ b/src/main/java/org/apache/commons/dbcp2/PoolingConnection.java
@@ -322,11 +322,11 @@ public class PoolingConnection extends DelegatingConnection<Connection>
final PreparedStatement statement = (PreparedStatement) key.createStatement(getDelegate());
@SuppressWarnings({"rawtypes", "unchecked" }) // Unable to find way to avoid this
final PoolablePreparedStatement pps = new PoolablePreparedStatement(statement, key, pstmtPool, this);
- return new DefaultPooledObject<DelegatingPreparedStatement>(pps);
+ return new DefaultPooledObject<>(pps);
}
final CallableStatement statement = (CallableStatement) key.createStatement(getDelegate());
final PoolableCallableStatement pcs = new PoolableCallableStatement(statement, key, pstmtPool, this);
- return new DefaultPooledObject<DelegatingPreparedStatement>(pcs);
+ return new DefaultPooledObject<>(pcs);
}
/**
http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/7a2d7673/src/main/java/org/apache/commons/dbcp2/cpdsadapter/DriverAdapterCPDS.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/dbcp2/cpdsadapter/DriverAdapterCPDS.java b/src/main/java/org/apache/commons/dbcp2/cpdsadapter/DriverAdapterCPDS.java
index 6c4479d..bbc8831 100644
--- a/src/main/java/org/apache/commons/dbcp2/cpdsadapter/DriverAdapterCPDS.java
+++ b/src/main/java/org/apache/commons/dbcp2/cpdsadapter/DriverAdapterCPDS.java
@@ -182,7 +182,7 @@ public class DriverAdapterCPDS implements ConnectionPoolDataSource, Referenceabl
}
KeyedObjectPool<PStmtKey, DelegatingPreparedStatement> stmtPool = null;
if (isPoolPreparedStatements()) {
- final GenericKeyedObjectPoolConfig config = new GenericKeyedObjectPoolConfig();
+ final GenericKeyedObjectPoolConfig<DelegatingPreparedStatement> config = new GenericKeyedObjectPoolConfig<>();
config.setMaxTotalPerKey(Integer.MAX_VALUE);
config.setBlockWhenExhausted(false);
config.setMaxWaitMillis(0);
http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/7a2d7673/src/main/java/org/apache/commons/dbcp2/cpdsadapter/PooledConnectionImpl.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/dbcp2/cpdsadapter/PooledConnectionImpl.java b/src/main/java/org/apache/commons/dbcp2/cpdsadapter/PooledConnectionImpl.java
index d3ebfe3..7771945 100644
--- a/src/main/java/org/apache/commons/dbcp2/cpdsadapter/PooledConnectionImpl.java
+++ b/src/main/java/org/apache/commons/dbcp2/cpdsadapter/PooledConnectionImpl.java
@@ -339,13 +339,13 @@ class PooledConnectionImpl
@SuppressWarnings({"rawtypes", "unchecked" }) // Unable to find way to avoid this
final PoolablePreparedStatement pps = new PoolablePreparedStatement(statement, key, pStmtPool,
delegatingConnection);
- return new DefaultPooledObject<DelegatingPreparedStatement>(pps);
+ return new DefaultPooledObject<>(pps);
}
final CallableStatement statement = (CallableStatement) key.createStatement(connection);
@SuppressWarnings("unchecked")
final PoolableCallableStatement pcs = new PoolableCallableStatement(statement, key, pStmtPool,
(DelegatingConnection<Connection>) delegatingConnection);
- return new DefaultPooledObject<DelegatingPreparedStatement>(pcs);
+ return new DefaultPooledObject<>(pcs);
}
/**
http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/7a2d7673/src/main/java/org/apache/commons/dbcp2/datasources/SharedPoolDataSource.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/dbcp2/datasources/SharedPoolDataSource.java b/src/main/java/org/apache/commons/dbcp2/datasources/SharedPoolDataSource.java
index cf3e556..485b43b 100644
--- a/src/main/java/org/apache/commons/dbcp2/datasources/SharedPoolDataSource.java
+++ b/src/main/java/org/apache/commons/dbcp2/datasources/SharedPoolDataSource.java
@@ -173,7 +173,7 @@ public class SharedPoolDataSource extends InstanceKeyDataSource {
isRollbackAfterValidation());
factory.setMaxConnLifetimeMillis(getMaxConnLifetimeMillis());
- final GenericKeyedObjectPoolConfig config = new GenericKeyedObjectPoolConfig();
+ final GenericKeyedObjectPoolConfig<PooledConnectionAndInfo> config = new GenericKeyedObjectPoolConfig<>();
config.setBlockWhenExhausted(getDefaultBlockWhenExhausted());
config.setEvictionPolicyClassName(getDefaultEvictionPolicyClassName());
config.setLifo(getDefaultLifo());
http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/7a2d7673/src/main/java/org/apache/commons/dbcp2/managed/PoolableManagedConnectionFactory.java
----------------------------------------------------------------------
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 1819362..5eb8b94 100644
--- a/src/main/java/org/apache/commons/dbcp2/managed/PoolableManagedConnectionFactory.java
+++ b/src/main/java/org/apache/commons/dbcp2/managed/PoolableManagedConnectionFactory.java
@@ -71,7 +71,7 @@ public class PoolableManagedConnectionFactory extends PoolableConnectionFactory
initializeConnection(conn);
if (getPoolStatements()) {
conn = new PoolingConnection(conn);
- final GenericKeyedObjectPoolConfig config = new GenericKeyedObjectPoolConfig();
+ final GenericKeyedObjectPoolConfig<DelegatingPreparedStatement> config = new GenericKeyedObjectPoolConfig<>();
config.setMaxTotalPerKey(-1);
config.setBlockWhenExhausted(false);
config.setMaxWaitMillis(0);
@@ -96,6 +96,6 @@ public class PoolableManagedConnectionFactory extends PoolableConnectionFactory
final PoolableManagedConnection pmc = new PoolableManagedConnection(transactionRegistry, conn, getPool(),
getDisconnectionSqlCodes(), isFastFailValidation());
pmc.setCacheState(getCacheState());
- return new DefaultPooledObject<PoolableConnection>(pmc);
+ return new DefaultPooledObject<>(pmc);
}
}