Author: markt
Date: Sat Jul 30 16:36:12 2011
New Revision: 1152492
URL: http://svn.apache.org/viewvc?rev=1152492&view=rev
Log:
Generics
Modified:
commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/BasicDataSource.java
commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/PoolingDriver.java
Modified:
commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/BasicDataSource.java
URL:
http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/BasicDataSource.java?rev=1152492&r1=1152491&r2=1152492&view=diff
==============================================================================
---
commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/BasicDataSource.java
(original)
+++
commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/BasicDataSource.java
Sat Jul 30 16:36:12 2011
@@ -1787,7 +1787,7 @@ public class BasicDataSource implements
protected static void validateConnectionFactory(PoolableConnectionFactory
connectionFactory) throws Exception {
Connection conn = null;
try {
- conn = (Connection) connectionFactory.makeObject();
+ conn = connectionFactory.makeObject();
connectionFactory.activateObject(conn);
connectionFactory.validateConnection(conn);
connectionFactory.passivateObject(conn);
Modified:
commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/PoolingDriver.java
URL:
http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/PoolingDriver.java?rev=1152492&r1=1152491&r2=1152492&view=diff
==============================================================================
---
commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/PoolingDriver.java
(original)
+++
commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/PoolingDriver.java
Sat Jul 30 16:36:12 2011
@@ -55,7 +55,8 @@ public class PoolingDriver implements Dr
}
/** The map of registered pools. */
- protected static final HashMap _pools = new HashMap();
+ protected static final HashMap<String,ObjectPool<Connection>> _pools =
+ new HashMap<String,ObjectPool<Connection>>();
/** Controls access to the underlying connection */
private static boolean accessToUnderlyingConnectionAllowed = false;
@@ -83,20 +84,22 @@ public class PoolingDriver implements Dr
accessToUnderlyingConnectionAllowed = allow;
}
- public synchronized ObjectPool getConnectionPool(String name) throws
SQLException {
- ObjectPool pool = (ObjectPool)(_pools.get(name));
+ public synchronized ObjectPool<Connection> getConnectionPool(String name)
+ throws SQLException {
+ ObjectPool<Connection> pool = _pools.get(name);
if (null == pool) {
throw new SQLException("Pool not registered.");
}
return pool;
}
- public synchronized void registerPool(String name, ObjectPool pool) {
+ public synchronized void registerPool(String name,
+ ObjectPool<Connection> pool) {
_pools.put(name,pool);
}
public synchronized void closePool(String name) throws SQLException {
- ObjectPool pool = (ObjectPool) _pools.get(name);
+ ObjectPool<Connection> pool = _pools.get(name);
if (pool != null) {
_pools.remove(name);
try {
@@ -109,8 +112,8 @@ public class PoolingDriver implements Dr
}
public synchronized String[] getPoolNames(){
- Set names = _pools.keySet();
- return (String[]) names.toArray(new String[names.size()]);
+ Set<String> names = _pools.keySet();
+ return names.toArray(new String[names.size()]);
}
@Override
@@ -125,12 +128,13 @@ public class PoolingDriver implements Dr
@Override
public Connection connect(String url, Properties info) throws SQLException
{
if(acceptsURL(url)) {
- ObjectPool pool = getConnectionPool(url.substring(URL_PREFIX_LEN));
+ ObjectPool<Connection> pool =
+ getConnectionPool(url.substring(URL_PREFIX_LEN));
if(null == pool) {
throw new SQLException("No pool found for " + url + ".");
} else {
try {
- Connection conn = (Connection)(pool.borrowObject());
+ Connection conn = pool.borrowObject();
if (conn != null) {
conn = new PoolGuardConnectionWrapper(pool, conn);
}
@@ -162,7 +166,7 @@ public class PoolingDriver implements Dr
public void invalidateConnection(Connection conn) throws SQLException {
if (conn instanceof PoolGuardConnectionWrapper) { // normal case
PoolGuardConnectionWrapper pgconn = (PoolGuardConnectionWrapper)
conn;
- ObjectPool pool = pgconn.pool;
+ ObjectPool<Connection> pool = pgconn.pool;
Connection delegate = pgconn.delegate;
try {
pool.invalidateObject(delegate);
@@ -210,10 +214,11 @@ public class PoolingDriver implements Dr
*/
static private class PoolGuardConnectionWrapper extends
DelegatingConnection {
- private final ObjectPool pool;
+ private final ObjectPool<Connection> pool;
private Connection delegate;
- PoolGuardConnectionWrapper(ObjectPool pool, Connection delegate) {
+ PoolGuardConnectionWrapper(ObjectPool<Connection> pool,
+ Connection delegate) {
super(delegate);
this.pool = pool;
this.delegate = delegate;
@@ -301,7 +306,7 @@ public class PoolingDriver implements Dr
}
@Override
- public Map getTypeMap() throws SQLException {
+ public Map<String,Class<?>> getTypeMap() throws SQLException {
checkOpen();
return delegate.getTypeMap();
}
@@ -387,7 +392,7 @@ public class PoolingDriver implements Dr
}
@Override
- public void setTypeMap(Map map) throws SQLException {
+ public void setTypeMap(Map<String,Class<?>> map) throws SQLException {
checkOpen();
delegate.setTypeMap(map);
}
