Revert premature generics changes that won't be required until DBCP depends on Pool 2.6.0 or later.
Project: http://git-wip-us.apache.org/repos/asf/commons-dbcp/repo Commit: http://git-wip-us.apache.org/repos/asf/commons-dbcp/commit/ea82ea44 Tree: http://git-wip-us.apache.org/repos/asf/commons-dbcp/tree/ea82ea44 Diff: http://git-wip-us.apache.org/repos/asf/commons-dbcp/diff/ea82ea44 Branch: refs/heads/release Commit: ea82ea44b4d9e1578d479a5ba5bbd539e15f8d54 Parents: ac93477 Author: Mark Thomas <ma...@apache.org> Authored: Tue Jun 19 16:16:17 2018 +0100 Committer: Mark Thomas <ma...@apache.org> Committed: Tue Jun 19 16:16:17 2018 +0100 ---------------------------------------------------------------------- src/main/java/org/apache/commons/dbcp2/BasicDataSource.java | 6 +++--- .../org/apache/commons/dbcp2/PoolableConnectionFactory.java | 2 +- .../apache/commons/dbcp2/cpdsadapter/DriverAdapterCPDS.java | 2 +- .../apache/commons/dbcp2/datasources/SharedPoolDataSource.java | 2 +- .../dbcp2/managed/PoolableManagedConnectionFactory.java | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/ea82ea44/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 dc1c71c..dfd966c 100644 --- a/src/main/java/org/apache/commons/dbcp2/BasicDataSource.java +++ b/src/main/java/org/apache/commons/dbcp2/BasicDataSource.java @@ -2259,7 +2259,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<PoolableConnection> config = new GenericObjectPoolConfig<>(); + final GenericObjectPoolConfig config = new GenericObjectPoolConfig(); updateJmxName(config); // Disable JMX on the underlying pool if the DS is not registered: config.setJmxEnabled(registeredJmxObjectName != null); @@ -2294,7 +2294,7 @@ public class BasicDataSource implements DataSource, BasicDataSourceMXBean, MBean * @return a non-null instance */ protected GenericObjectPool<PoolableConnection> createObjectPool(final PoolableConnectionFactory factory, - final GenericObjectPoolConfig<PoolableConnection> poolConfig, final AbandonedConfig abandonedConfig) { + final GenericObjectPoolConfig poolConfig, final AbandonedConfig abandonedConfig) { GenericObjectPool<PoolableConnection> gop; if (abandonedConfig != null && (abandonedConfig.getRemoveAbandonedOnBorrow() || abandonedConfig.getRemoveAbandonedOnMaintenance())) { @@ -2463,7 +2463,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/ea82ea44/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 75cda96..581d3ad 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<DelegatingPreparedStatement> config = new GenericKeyedObjectPoolConfig<>(); + final GenericKeyedObjectPoolConfig config = new GenericKeyedObjectPoolConfig(); config.setMaxTotalPerKey(-1); config.setBlockWhenExhausted(false); config.setMaxWaitMillis(0); http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/ea82ea44/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 bbc8831..6c4479d 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<DelegatingPreparedStatement> config = new GenericKeyedObjectPoolConfig<>(); + final GenericKeyedObjectPoolConfig 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/ea82ea44/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 485b43b..cf3e556 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<PooledConnectionAndInfo> config = new GenericKeyedObjectPoolConfig<>(); + final GenericKeyedObjectPoolConfig config = new GenericKeyedObjectPoolConfig(); config.setBlockWhenExhausted(getDefaultBlockWhenExhausted()); config.setEvictionPolicyClassName(getDefaultEvictionPolicyClassName()); config.setLifo(getDefaultLifo()); http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/ea82ea44/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 5eb8b94..f1d6375 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<DelegatingPreparedStatement> config = new GenericKeyedObjectPoolConfig<>(); + final GenericKeyedObjectPoolConfig config = new GenericKeyedObjectPoolConfig(); config.setMaxTotalPerKey(-1); config.setBlockWhenExhausted(false); config.setMaxWaitMillis(0);
