upgrade to commons-pool 2

src/main/java/redis/clients/util/Pool.java

@@ -1,82 +1,84 @@
 package redis.clients.util;
 
-import org.apache.commons.pool.PoolableObjectFactory;
-import org.apache.commons.pool.impl.GenericObjectPool;
+import org.apache.commons.pool2.PooledObjectFactory;
+import org.apache.commons.pool2.impl.GenericObjectPool;
+import org.apache.commons.pool2.impl.GenericObjectPoolConfig;
 
 import redis.clients.jedis.exceptions.JedisConnectionException;
 import redis.clients.jedis.exceptions.JedisException;
 
 public abstract class Pool<T> {
-    protected GenericObjectPool internalPool;
+    protected GenericObjectPool<T> internalPool;
 
     /**
-     * Using this constructor means you have to set
-     * and initialize the internalPool yourself.
+     * Using this constructor means you have to set and initialize the
+     * internalPool yourself.
      */
-    public Pool() {}
-    
-    public Pool(final GenericObjectPool.Config poolConfig,
-            PoolableObjectFactory factory) {
-        initPool(poolConfig, factory);
+    public Pool() {
     }
-    
-    public void initPool(final GenericObjectPool.Config poolConfig, PoolableObjectFactory factory) {
-    	
-    	if (this.internalPool != null) {
-    		try {
-    			closeInternalPool();
-    		} catch (Exception e) {    			
-    		}
-    	}
-    	
-    	this.internalPool = new GenericObjectPool(factory, poolConfig);
+
+    public Pool(final GenericObjectPoolConfig poolConfig,
+	    PooledObjectFactory<T> factory) {
+	initPool(poolConfig, factory);
     }
-    
-    @SuppressWarnings("unchecked")
+
+    public void initPool(final GenericObjectPoolConfig poolConfig,
+	    PooledObjectFactory<T> factory) {
+
+	if (this.internalPool != null) {
+	    try {
+		closeInternalPool();
+	    } catch (Exception e) {
+	    }
+	}
+
+	this.internalPool = new GenericObjectPool<T>(factory, poolConfig);
+    }
+
     public T getResource() {
-        try {
-            return (T) internalPool.borrowObject();
-        } catch (Exception e) {
-            throw new JedisConnectionException(
-                    "Could not get a resource from the pool", e);
-        }
+	try {
+	    return internalPool.borrowObject();
+	} catch (Exception e) {
+	    throw new JedisConnectionException(
+		    "Could not get a resource from the pool", e);
+	}
     }
-        
-    public void returnResourceObject(final Object resource) {
-        try {
-            internalPool.returnObject(resource);
-        } catch (Exception e) {
-            throw new JedisException(
-                    "Could not return the resource to the pool", e);
-        }
+
+    public void returnResourceObject(final T resource) {
+	try {
+	    internalPool.returnObject(resource);
+	} catch (Exception e) {
+	    throw new JedisException(
+		    "Could not return the resource to the pool", e);
+	}
     }
-    
+
     public void returnBrokenResource(final T resource) {
-    	returnBrokenResourceObject(resource);
+	returnBrokenResourceObject(resource);
     }
-    
+
     public void returnResource(final T resource) {
-    	returnResourceObject(resource);
+	returnResourceObject(resource);
     }
-    
+
     public void destroy() {
-    	closeInternalPool();
+	closeInternalPool();
     }
-    
-    protected void returnBrokenResourceObject(final Object resource) {
-        try {
-            internalPool.invalidateObject(resource);
-        } catch (Exception e) {
-            throw new JedisException(
-                    "Could not return the resource to the pool", e);
-        }
+
+    protected void returnBrokenResourceObject(final T resource) {
+	try {
+	    internalPool.invalidateObject(resource);
+	} catch (Exception e) {
+	    throw new JedisException(
+		    "Could not return the resource to the pool", e);
+	}
     }
 
     protected void closeInternalPool() {
-    	try {
-            internalPool.close();
-        } catch (Exception e) {
-            throw new JedisException("Could not destroy the pool", e);
-        }
+	try {
+	    internalPool.close();
+	} catch (Exception e) {
+	    throw new JedisException("Could not destroy the pool", e);
+	}
     }
 }