Fix generics compiler 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/adece42b Tree: http://git-wip-us.apache.org/repos/asf/commons-dbcp/tree/adece42b Diff: http://git-wip-us.apache.org/repos/asf/commons-dbcp/diff/adece42b
Branch: refs/heads/release Commit: adece42b0228e45f0fd0b131db25080b9a926611 Parents: d815c27 Author: Gary Gregory <garydgreg...@gmail.com> Authored: Sun Jul 8 14:01:24 2018 -0600 Committer: Gary Gregory <garydgreg...@gmail.com> Committed: Sun Jul 8 14:01:24 2018 -0600 ---------------------------------------------------------------------- src/main/java/org/apache/commons/dbcp2/BasicDataSource.java | 6 +++--- .../org/apache/commons/dbcp2/PoolableConnectionFactory.java | 2 +- .../apache/commons/dbcp2/datasources/SharedPoolDataSource.java | 2 +- .../dbcp2/managed/PoolableManagedConnectionFactory.java | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/adece42b/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 dfd966c..dc1c71c 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 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); @@ -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 poolConfig, final AbandonedConfig abandonedConfig) { + final GenericObjectPoolConfig<PoolableConnection> 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/adece42b/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 427bd36..281170d 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/adece42b/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/adece42b/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 f1d6375..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);
