svn commit: r1153782 - in /commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2: PoolablePreparedStatement.java cpdsadapter/PoolablePreparedStatementStub.java cpdsadapter/PooledConnectionImpl.java

[ma...@apache.org]

Author: markt
Date: Thu Aug  4 08:37:57 2011
New Revision: 1153782

URL: http://svn.apache.org/viewvc?rev=1153782&view=rev
Log:
Generics

Modified:
    commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/PoolablePreparedStatement.java
    commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/cpdsadapter/PoolablePreparedStatementStub.java
    commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/cpdsadapter/PooledConnectionImpl.java

Modified: commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/PoolablePreparedStatement.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/PoolablePreparedStatement.java?rev=1153782&r1=1153781&r2=1153782&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/PoolablePreparedStatement.java (original)
+++ commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/PoolablePreparedStatement.java Thu Aug  4 08:37:57 2011
@@ -42,7 +42,7 @@ public class PoolablePreparedStatement e
     /**
      * The {@link KeyedObjectPool} from which I was obtained.
      */
-    protected KeyedObjectPool _pool = null;
+    protected KeyedObjectPool<PStmtKey, DelegatingPreparedStatement> _pool = null;
 
     /**
      * My "key" as used by {@link KeyedObjectPool}.
@@ -59,7 +59,8 @@ public class PoolablePreparedStatement e
      * @param conn the {@link Connection} from which I was created
      */
     public PoolablePreparedStatement(PreparedStatement stmt, PStmtKey key,
-            KeyedObjectPool pool, Connection conn) {
+            KeyedObjectPool<PStmtKey, DelegatingPreparedStatement> pool,
+            Connection conn) {
         super((DelegatingConnection) conn, stmt);
         _pool = pool;
         _key = key;

Modified: commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/cpdsadapter/PoolablePreparedStatementStub.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/cpdsadapter/PoolablePreparedStatementStub.java?rev=1153782&r1=1153781&r2=1153782&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/cpdsadapter/PoolablePreparedStatementStub.java (original)
+++ commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/cpdsadapter/PoolablePreparedStatementStub.java Thu Aug  4 08:37:57 2011
@@ -21,6 +21,8 @@ import java.sql.PreparedStatement;
 import java.sql.Connection;
 import java.sql.SQLException;
 import org.apache.commons.pool2.KeyedObjectPool;
+import org.apache.commons.dbcp2.DelegatingPreparedStatement;
+import org.apache.commons.dbcp2.PStmtKey;
 import org.apache.commons.dbcp2.PoolablePreparedStatement;
 
 /**
@@ -41,7 +43,9 @@ class PoolablePreparedStatementStub exte
      * @param conn the {@link Connection} from which I was created
      */
     public PoolablePreparedStatementStub(PreparedStatement stmt,
-            PStmtKeyCPDS key, KeyedObjectPool pool, Connection conn) {
+            PStmtKey key,
+            KeyedObjectPool<PStmtKey,DelegatingPreparedStatement> pool,
+            Connection conn) {
         super(stmt, key, pool, conn);
     }
 

Modified: commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/cpdsadapter/PooledConnectionImpl.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/cpdsadapter/PooledConnectionImpl.java?rev=1153782&r1=1153781&r2=1153782&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/cpdsadapter/PooledConnectionImpl.java (original)
+++ commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/cpdsadapter/PooledConnectionImpl.java Thu Aug  4 08:37:57 2011
@@ -30,6 +30,8 @@ import javax.sql.StatementEventListener;
 /* JDBC_4_ANT_KEY_END */
 
 import org.apache.commons.dbcp2.DelegatingConnection;
+import org.apache.commons.dbcp2.DelegatingPreparedStatement;
+import org.apache.commons.dbcp2.PStmtKey;
 import org.apache.commons.pool2.KeyedObjectPool;
 import org.apache.commons.pool2.KeyedPoolableObjectFactory;
 
@@ -79,7 +81,7 @@ class PooledConnectionImpl implements Po
 
     /** My pool of {*link PreparedStatement}s. */
     // TODO - make final?
-    protected KeyedObjectPool<PStmtKeyCPDS,PoolablePreparedStatementStub> pstmtPool = null;
+    protected KeyedObjectPool<PStmtKey,DelegatingPreparedStatement> pstmtPool = null;
 
     /** 
      * Controls access to the underlying connection 
@@ -103,7 +105,7 @@ class PooledConnectionImpl implements Po
     }
     
     public void setStatementPool(
-            KeyedObjectPool<PStmtKeyCPDS,PoolablePreparedStatementStub> statementPool) {
+            KeyedObjectPool<PStmtKey,DelegatingPreparedStatement> statementPool) {
         pstmtPool = statementPool;
     }