svn commit: r1214435 - in /commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2: PoolableConnectionFactory.java cpdsadapter/DriverAdapterCPDS.java datasources/SharedPoolDataSource.java managed/PoolableManagedConnectionFactory.java

[sebb]

Author: sebb
Date: Wed Dec 14 20:02:19 2011
New Revision: 1214435

URL: http://svn.apache.org/viewvc?rev=1214435&view=rev
Log:
Config classes are no longer generic (POOL-201)

Modified:
    
commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/PoolableConnectionFactory.java
    
commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/cpdsadapter/DriverAdapterCPDS.java
    
commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/datasources/SharedPoolDataSource.java
    
commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/managed/PoolableManagedConnectionFactory.java

Modified: 
commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/PoolableConnectionFactory.java
URL: 
http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/PoolableConnectionFactory.java?rev=1214435&r1=1214434&r2=1214435&view=diff
==============================================================================
--- 
commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/PoolableConnectionFactory.java
 (original)
+++ 
commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/PoolableConnectionFactory.java
 Wed Dec 14 20:02:19 2011
@@ -183,8 +183,7 @@ public class PoolableConnectionFactory
         }
         if(poolStatements) {
             conn = new PoolingConnection(conn);
-            GenericKeyedObjectPoolConfig<PStmtKey,DelegatingPreparedStatement> 
config =
-                new 
GenericKeyedObjectPoolConfig<PStmtKey,DelegatingPreparedStatement>();
+            GenericKeyedObjectPoolConfig config = new 
GenericKeyedObjectPoolConfig();
             config.setMaxTotalPerKey(-1);
             config.setBlockWhenExhausted(false);
             config.setMaxWait(0);

Modified: 
commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/cpdsadapter/DriverAdapterCPDS.java
URL: 
http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/cpdsadapter/DriverAdapterCPDS.java?rev=1214435&r1=1214434&r2=1214435&view=diff
==============================================================================
--- 
commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/cpdsadapter/DriverAdapterCPDS.java
 (original)
+++ 
commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/cpdsadapter/DriverAdapterCPDS.java
 Wed Dec 14 20:02:19 2011
@@ -191,8 +191,7 @@ public class DriverAdapterCPDS
         }
         KeyedObjectPool<PStmtKeyCPDS, PoolablePreparedStatement<PStmtKeyCPDS, 
PoolablePreparedStatementStub>> stmtPool = null;
         if (isPoolPreparedStatements()) {
-            
GenericKeyedObjectPoolConfig<PStmtKeyCPDS,PoolablePreparedStatement<PStmtKeyCPDS,PoolablePreparedStatementStub>>
 config =
-                new 
GenericKeyedObjectPoolConfig<PStmtKeyCPDS,PoolablePreparedStatement<PStmtKeyCPDS,PoolablePreparedStatementStub>>();
+            GenericKeyedObjectPoolConfig config = new 
GenericKeyedObjectPoolConfig();
             config.setMaxTotalPerKey(Integer.MAX_VALUE);
             config.setBlockWhenExhausted(false);
             config.setMaxWait(0);

Modified: 
commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/datasources/SharedPoolDataSource.java
URL: 
http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/datasources/SharedPoolDataSource.java?rev=1214435&r1=1214434&r2=1214435&view=diff
==============================================================================
--- 
commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/datasources/SharedPoolDataSource.java
 (original)
+++ 
commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/datasources/SharedPoolDataSource.java
 Wed Dec 14 20:02:19 2011
@@ -216,7 +216,7 @@ public class SharedPoolDataSource
         // Create an object pool to contain our PooledConnections
         factory = new KeyedCPDSConnectionFactory(cpds, getValidationQuery(),
                 isRollbackAfterValidation());
-        GenericKeyedObjectPoolConfig config = new 
GenericKeyedObjectPoolConfig<UserPassKey,PooledConnectionAndInfo>();
+        GenericKeyedObjectPoolConfig config = new 
GenericKeyedObjectPoolConfig();
         config.setMaxTotalPerKey(getMaxTotal());
         config.setMaxIdlePerKey(getMaxIdle());
         config.setMaxWait(getMaxWait());

Modified: 
commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/managed/PoolableManagedConnectionFactory.java
URL: 
http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/managed/PoolableManagedConnectionFactory.java?rev=1214435&r1=1214434&r2=1214435&view=diff
==============================================================================
--- 
commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/managed/PoolableManagedConnectionFactory.java
 (original)
+++ 
commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/managed/PoolableManagedConnectionFactory.java
 Wed Dec 14 20:02:19 2011
@@ -63,8 +63,7 @@ public class PoolableManagedConnectionFa
         initializeConnection(conn);
         if(poolStatements) {
             conn = new PoolingConnection(conn);
-            GenericKeyedObjectPoolConfig<PStmtKey,DelegatingPreparedStatement> 
config =
-                new 
GenericKeyedObjectPoolConfig<PStmtKey,DelegatingPreparedStatement>();
+            GenericKeyedObjectPoolConfig config = new 
GenericKeyedObjectPoolConfig();
             config.setMaxTotalPerKey(-1);
             config.setBlockWhenExhausted(false);
             config.setMaxWait(0);