You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by ps...@apache.org on 2013/08/09 07:20:37 UTC
svn commit: r1512140 [2/2] - in /commons/proper/pool/trunk/src:
main/java/org/apache/commons/pool2/ main/java/org/apache/commons/pool2/impl/
test/java/org/apache/commons/pool2/ test/java/org/apache/commons/pool2/impl/
test/java/org/apache/commons/pool2...
Modified: commons/proper/pool/trunk/src/test/java/org/apache/commons/pool2/WaiterFactory.java
URL: http://svn.apache.org/viewvc/commons/proper/pool/trunk/src/test/java/org/apache/commons/pool2/WaiterFactory.java?rev=1512140&r1=1512139&r2=1512140&view=diff
==============================================================================
--- commons/proper/pool/trunk/src/test/java/org/apache/commons/pool2/WaiterFactory.java (original)
+++ commons/proper/pool/trunk/src/test/java/org/apache/commons/pool2/WaiterFactory.java Fri Aug 9 05:20:37 2013
@@ -21,8 +21,7 @@ import java.util.HashMap;
import java.util.Map;
import java.util.Iterator;
-import org.apache.commons.pool2.KeyedPoolableObjectFactory;
-import org.apache.commons.pool2.PoolableObjectFactory;
+import org.apache.commons.pool2.impl.DefaultPooledObject;
/**
* Object factory with configurable latencies for object lifecycle methods.
@@ -32,8 +31,8 @@ import org.apache.commons.pool2.Poolable
* (per key) exceeds the configured max.
*
*/
-public class WaiterFactory<K> implements PoolableObjectFactory<Waiter>,
-KeyedPoolableObjectFactory<K,Waiter> {
+public class WaiterFactory<K> implements PooledObjectFactory<Waiter>,
+KeyedPooledObjectFactory<K,Waiter> {
/** Latency of activateObject */
private final long activateLatency;
@@ -98,16 +97,16 @@ KeyedPoolableObjectFactory<K,Waiter> {
}
@Override
- public void activateObject(Waiter obj) throws Exception {
+ public void activateObject(PooledObject<Waiter> obj) throws Exception {
doWait(activateLatency);
- obj.setActive(true);
+ obj.getObject().setActive(true);
}
@Override
- public void destroyObject(Waiter obj) throws Exception {
+ public void destroyObject(PooledObject<Waiter> obj) throws Exception {
doWait(destroyLatency);
- obj.setValid(false);
- obj.setActive(false);
+ obj.getObject().setValid(false);
+ obj.getObject().setActive(false);
// Decrement *after* destroy
synchronized (this) {
activeCount--;
@@ -115,7 +114,7 @@ KeyedPoolableObjectFactory<K,Waiter> {
}
@Override
- public Waiter makeObject() throws Exception {
+ public PooledObject<Waiter> makeObject() throws Exception {
// Increment and test *before* make
synchronized (this) {
if (activeCount >= maxActive) {
@@ -126,22 +125,22 @@ KeyedPoolableObjectFactory<K,Waiter> {
}
}
doWait(makeLatency);
- return new Waiter(false, true, waiterLatency);
+ return new DefaultPooledObject<Waiter>(new Waiter(false, true, waiterLatency));
}
@Override
- public void passivateObject(Waiter arg0) throws Exception {
- arg0.setActive(false);
+ public void passivateObject(PooledObject<Waiter> obj) throws Exception {
+ obj.getObject().setActive(false);
doWait(passivateLatency);
if (Math.random() < passivateInvalidationProbability) {
- arg0.setValid(false);
+ obj.getObject().setValid(false);
}
}
@Override
- public boolean validateObject(Waiter arg0) {
+ public boolean validateObject(PooledObject<Waiter> obj) {
doWait(validateLatency);
- return arg0.isValid();
+ return obj.getObject().isValid();
}
protected void doWait(long latency) {
@@ -174,12 +173,12 @@ KeyedPoolableObjectFactory<K,Waiter> {
// KeyedPoolableObjectFactory methods
@Override
- public void activateObject(K key, Waiter obj) throws Exception {
+ public void activateObject(K key, PooledObject<Waiter> obj) throws Exception {
activateObject(obj);
}
@Override
- public void destroyObject(K key, Waiter obj) throws Exception {
+ public void destroyObject(K key,PooledObject<Waiter> obj) throws Exception {
destroyObject(obj);
synchronized (this) {
Integer count = activeCounts.get(key);
@@ -188,7 +187,7 @@ KeyedPoolableObjectFactory<K,Waiter> {
}
@Override
- public Waiter makeObject(K key) throws Exception {
+ public PooledObject<Waiter> makeObject(K key) throws Exception {
synchronized (this) {
Integer count = activeCounts.get(key);
if (count == null) {
@@ -209,12 +208,12 @@ KeyedPoolableObjectFactory<K,Waiter> {
}
@Override
- public void passivateObject(K key, Waiter obj) throws Exception {
+ public void passivateObject(K key, PooledObject<Waiter> obj) throws Exception {
passivateObject(obj);
}
@Override
- public boolean validateObject(K key, Waiter obj) {
+ public boolean validateObject(K key, PooledObject<Waiter> obj) {
return validateObject(obj);
}
Modified: commons/proper/pool/trunk/src/test/java/org/apache/commons/pool2/impl/TestAbandonedObjectPool.java
URL: http://svn.apache.org/viewvc/commons/proper/pool/trunk/src/test/java/org/apache/commons/pool2/impl/TestAbandonedObjectPool.java?rev=1512140&r1=1512139&r2=1512140&view=diff
==============================================================================
--- commons/proper/pool/trunk/src/test/java/org/apache/commons/pool2/impl/TestAbandonedObjectPool.java (original)
+++ commons/proper/pool/trunk/src/test/java/org/apache/commons/pool2/impl/TestAbandonedObjectPool.java Fri Aug 9 05:20:37 2013
@@ -27,7 +27,8 @@ import javax.management.ObjectName;
import junit.framework.TestCase;
-import org.apache.commons.pool2.PoolableObjectFactory;
+import org.apache.commons.pool2.PooledObject;
+import org.apache.commons.pool2.PooledObjectFactory;
import org.apache.commons.pool2.TrackedUse;
import org.junit.Assert;
@@ -50,7 +51,7 @@ public class TestAbandonedObjectPool ext
abandonedConfig.setRemoveAbandonedOnBorrow(true);
abandonedConfig.setRemoveAbandonedTimeout(1);
pool = new GenericObjectPool<PooledTestObject>(
- PoolImplUtils.poolableToPooledObjectFactory(new SimpleFactory()),
+ new SimpleFactory(),
new GenericObjectPoolConfig(),
abandonedConfig);
}
@@ -139,7 +140,7 @@ public class TestAbandonedObjectPool ext
abandonedConfig.setRemoveAbandonedTimeout(1);
pool.close(); // Unregister pool created by setup
pool = new GenericObjectPool<PooledTestObject>(
- PoolImplUtils.poolableToPooledObjectFactory(new SimpleFactory(200, 0)),
+ new SimpleFactory(200, 0),
new GenericObjectPoolConfig(), abandonedConfig);
final int n = 10;
pool.setMaxTotal(n);
@@ -148,7 +149,6 @@ public class TestAbandonedObjectPool ext
for (int i = 0; i < n - 2; i++) {
obj = pool.borrowObject();
}
- @SuppressWarnings("null") // obj can't be null here
final int deadMansHash = obj.hashCode();
ConcurrentReturner returner = new ConcurrentReturner(obj);
Thread.sleep(2000); // abandon checked out instances
@@ -172,7 +172,7 @@ public class TestAbandonedObjectPool ext
pool.close(); // Unregister pool created by setup
pool = new GenericObjectPool<PooledTestObject>(
// destroys take 200 ms
- PoolImplUtils.poolableToPooledObjectFactory(new SimpleFactory(200, 0)),
+ new SimpleFactory(200, 0),
new GenericObjectPoolConfig(), abandonedConfig);
final int n = 10;
pool.setMaxTotal(n);
@@ -200,7 +200,7 @@ public class TestAbandonedObjectPool ext
pool.close(); // Unregister pool created by setup
pool = new GenericObjectPool<PooledTestObject>(
// validate takes 1 second
- PoolImplUtils.poolableToPooledObjectFactory(new SimpleFactory(0, 1000)),
+ new SimpleFactory(0, 1000),
new GenericObjectPoolConfig(), abandonedConfig);
final int n = 10;
pool.setMaxTotal(n);
@@ -251,7 +251,7 @@ public class TestAbandonedObjectPool ext
}
}
- class SimpleFactory implements PoolableObjectFactory<PooledTestObject> {
+ class SimpleFactory implements PooledObjectFactory<PooledTestObject> {
private final long destroyLatency;
private final long validateLatency;
@@ -267,12 +267,12 @@ public class TestAbandonedObjectPool ext
}
@Override
- public PooledTestObject makeObject() {
- return new PooledTestObject();
+ public PooledObject<PooledTestObject> makeObject() {
+ return new DefaultPooledObject<PooledTestObject>(new PooledTestObject());
}
@Override
- public boolean validateObject(PooledTestObject obj) {
+ public boolean validateObject(PooledObject<PooledTestObject> obj) {
try {
Thread.sleep(validateLatency);
} catch (Exception ex) {
@@ -282,25 +282,25 @@ public class TestAbandonedObjectPool ext
}
@Override
- public void activateObject(PooledTestObject obj) {
- obj.setActive(true);
+ public void activateObject(PooledObject<PooledTestObject> obj) {
+ obj.getObject().setActive(true);
}
@Override
- public void passivateObject(PooledTestObject obj) {
- obj.setActive(false);
+ public void passivateObject(PooledObject<PooledTestObject> obj) {
+ obj.getObject().setActive(false);
}
@Override
- public void destroyObject(PooledTestObject obj) throws Exception {
- obj.setActive(false);
+ public void destroyObject(PooledObject<PooledTestObject> obj) throws Exception {
+ obj.getObject().setActive(false);
// while destroying instances, yield control to other threads
// helps simulate threading errors
Thread.yield();
if (destroyLatency != 0) {
Thread.sleep(destroyLatency);
}
- obj.destroy();
+ obj.getObject().destroy();
}
}
}
Modified: commons/proper/pool/trunk/src/test/java/org/apache/commons/pool2/impl/TestGenericKeyedObjectPool.java
URL: http://svn.apache.org/viewvc/commons/proper/pool/trunk/src/test/java/org/apache/commons/pool2/impl/TestGenericKeyedObjectPool.java?rev=1512140&r1=1512139&r2=1512140&view=diff
==============================================================================
--- commons/proper/pool/trunk/src/test/java/org/apache/commons/pool2/impl/TestGenericKeyedObjectPool.java (original)
+++ commons/proper/pool/trunk/src/test/java/org/apache/commons/pool2/impl/TestGenericKeyedObjectPool.java Fri Aug 9 05:20:37 2013
@@ -37,9 +37,10 @@ import java.util.concurrent.atomic.Atomi
import javax.management.MBeanServer;
import javax.management.ObjectName;
-import org.apache.commons.pool2.BaseKeyedPoolableObjectFactory;
+import org.apache.commons.pool2.BaseKeyedPooledObjectFactory;
import org.apache.commons.pool2.KeyedObjectPool;
-import org.apache.commons.pool2.KeyedPoolableObjectFactory;
+import org.apache.commons.pool2.KeyedPooledObjectFactory;
+import org.apache.commons.pool2.PooledObject;
import org.apache.commons.pool2.TestKeyedObjectPool;
import org.apache.commons.pool2.VisitTracker;
import org.apache.commons.pool2.VisitTrackerFactory;
@@ -58,11 +59,11 @@ public class TestGenericKeyedObjectPool
@Override
protected KeyedObjectPool<Object,Object> makeEmptyPool(int mincapacity) {
- KeyedPoolableObjectFactory<Object,Object> factory =
- new KeyedPoolableObjectFactory<Object,Object>() {
+ KeyedPooledObjectFactory<Object,Object> factory =
+ new KeyedPooledObjectFactory<Object,Object>() {
ConcurrentHashMap<Object,AtomicInteger> map = new ConcurrentHashMap<Object,AtomicInteger>();
@Override
- public Object makeObject(Object key) {
+ public PooledObject<Object> makeObject(Object key) {
int counter = 0;
AtomicInteger Counter = map.get(key);
if(null != Counter) {
@@ -71,31 +72,29 @@ public class TestGenericKeyedObjectPool
map.put(key, new AtomicInteger(0));
counter = 0;
}
- return String.valueOf(key) + String.valueOf(counter);
+ return new DefaultPooledObject<Object>(String.valueOf(key) + String.valueOf(counter));
}
@Override
- public void destroyObject(Object key, Object obj) { }
+ public void destroyObject(Object key, PooledObject<Object> obj) { }
@Override
- public boolean validateObject(Object key, Object obj) { return true; }
+ public boolean validateObject(Object key, PooledObject<Object> obj) { return true; }
@Override
- public void activateObject(Object key, Object obj) { }
+ public void activateObject(Object key,PooledObject<Object> obj) { }
@Override
- public void passivateObject(Object key, Object obj) { }
+ public void passivateObject(Object key, PooledObject<Object> obj) { }
};
GenericKeyedObjectPool<Object,Object> pool =
- new GenericKeyedObjectPool<Object,Object>(
- PoolImplUtils.poolableToKeyedPooledObjectFactory(factory));
+ new GenericKeyedObjectPool<Object,Object>(factory);
pool.setMaxTotalPerKey(mincapacity);
pool.setMaxIdlePerKey(mincapacity);
return pool;
}
@Override
- protected KeyedObjectPool<Object,Object> makeEmptyPool(KeyedPoolableObjectFactory<Object,Object> factory) {
+ protected KeyedObjectPool<Object,Object> makeEmptyPool(KeyedPooledObjectFactory<Object,Object> factory) {
GenericKeyedObjectPool<Object,Object> pool =
- new GenericKeyedObjectPool<Object,Object>(
- PoolImplUtils.poolableToKeyedPooledObjectFactory(factory));
+ new GenericKeyedObjectPool<Object,Object>(factory);
return pool;
}
@@ -118,8 +117,7 @@ public class TestGenericKeyedObjectPool
@Before
public void setUp() throws Exception {
factory = new SimpleFactory<String>();
- pool = new GenericKeyedObjectPool<String,String>(
- PoolImplUtils.poolableToKeyedPooledObjectFactory(factory));
+ pool = new GenericKeyedObjectPool<String,String>(factory);
}
@Override
@@ -746,8 +744,7 @@ public class TestGenericKeyedObjectPool
private void checkEvictionOrder(boolean lifo) throws Exception {
SimpleFactory<Integer> factory = new SimpleFactory<Integer>();
GenericKeyedObjectPool<Integer,String> pool =
- new GenericKeyedObjectPool<Integer,String>(
- PoolImplUtils.poolableToKeyedPooledObjectFactory(factory));
+ new GenericKeyedObjectPool<Integer,String>(factory);
pool.setNumTestsPerEvictionRun(2);
pool.setMinEvictableIdleTimeMillis(100);
pool.setLifo(lifo);
@@ -871,8 +868,7 @@ public class TestGenericKeyedObjectPool
private void checkEvictorVisiting(boolean lifo) throws Exception {
VisitTrackerFactory<Integer> factory = new VisitTrackerFactory<Integer>();
GenericKeyedObjectPool<Integer,VisitTracker<Integer>> pool =
- new GenericKeyedObjectPool<Integer,VisitTracker<Integer>>(
- PoolImplUtils.poolableToKeyedPooledObjectFactory(factory));
+ new GenericKeyedObjectPool<Integer,VisitTracker<Integer>>(factory);
pool.setNumTestsPerEvictionRun(2);
pool.setMinEvictableIdleTimeMillis(-1);
pool.setTestWhileIdle(true);
@@ -960,8 +956,7 @@ public class TestGenericKeyedObjectPool
// Can't use clear as some objects are still active so create
// a new pool
factory = new VisitTrackerFactory<Integer>();
- pool = new GenericKeyedObjectPool<Integer,VisitTracker<Integer>>(
- PoolImplUtils.poolableToKeyedPooledObjectFactory(factory));
+ pool = new GenericKeyedObjectPool<Integer,VisitTracker<Integer>>(factory);
pool.setMaxIdlePerKey(-1);
pool.setMaxTotalPerKey(-1);
pool.setNumTestsPerEvictionRun(smallPrimes[i]);
@@ -1056,16 +1051,15 @@ public class TestGenericKeyedObjectPool
long timeBetweenEvictionRunsMillis = 8;
boolean blockWhenExhausted = false;
boolean lifo = false;
- KeyedPoolableObjectFactory<Object,Object> factory = new BaseKeyedPoolableObjectFactory<Object,Object>() {
+ KeyedPooledObjectFactory<Object,Object> factory = new BaseKeyedPooledObjectFactory<Object,Object>() {
@Override
- public Object makeObject(Object key) throws Exception {
+ public Object create(Object key) throws Exception {
return null;
}
};
GenericKeyedObjectPool<Object,Object> pool =
- new GenericKeyedObjectPool<Object,Object>(
- PoolImplUtils.poolableToKeyedPooledObjectFactory(factory));
+ new GenericKeyedObjectPool<Object,Object>(factory);
assertEquals(GenericKeyedObjectPoolConfig.DEFAULT_MAX_TOTAL_PER_KEY, pool.getMaxTotalPerKey());
assertEquals(GenericKeyedObjectPoolConfig.DEFAULT_MAX_IDLE_PER_KEY, pool.getMaxIdlePerKey());
assertEquals(GenericKeyedObjectPoolConfig.DEFAULT_MAX_WAIT_MILLIS, pool.getMaxWaitMillis());
@@ -1103,8 +1097,7 @@ public class TestGenericKeyedObjectPool
config.setTestWhileIdle(testWhileIdle);
config.setTimeBetweenEvictionRunsMillis(timeBetweenEvictionRunsMillis);
config.setBlockWhenExhausted(blockWhenExhausted);
- pool = new GenericKeyedObjectPool<Object,Object>(
- PoolImplUtils.poolableToKeyedPooledObjectFactory(factory), config);
+ pool = new GenericKeyedObjectPool<Object,Object>(factory, config);
assertEquals(maxTotalPerKey, pool.getMaxTotalPerKey());
assertEquals(maxIdle, pool.getMaxIdlePerKey());
assertEquals(maxWait, pool.getMaxWaitMillis());
@@ -1135,8 +1128,7 @@ public class TestGenericKeyedObjectPool
public void testExceptionOnPassivateDuringReturn() throws Exception {
SimpleFactory<String> factory = new SimpleFactory<String>();
GenericKeyedObjectPool<String,String> pool =
- new GenericKeyedObjectPool<String,String>(
- PoolImplUtils.poolableToKeyedPooledObjectFactory(factory));
+ new GenericKeyedObjectPool<String,String>(factory);
String obj = pool.borrowObject("one");
factory.setThrowExceptionOnPassivate(true);
pool.returnObject("one", obj);
@@ -1308,8 +1300,7 @@ public class TestGenericKeyedObjectPool
// TODO Fix this. Can't use local pool since runTestThreads uses the
// protected pool field
GenericKeyedObjectPool<String,Waiter> pool =
- new GenericKeyedObjectPool<String,Waiter>(
- PoolImplUtils.poolableToKeyedPooledObjectFactory(factory));
+ new GenericKeyedObjectPool<String,Waiter>(factory);
pool.setMaxTotalPerKey(5);
pool.setMaxTotal(8);
pool.setTestOnBorrow(true);
@@ -1327,8 +1318,7 @@ public class TestGenericKeyedObjectPool
// Make destroy have some latency so clearOldest takes some time
WaiterFactory<String> factory = new WaiterFactory<String>(0, 20, 0, 0, 0, 0, 50, 5, 0);
GenericKeyedObjectPool<String,Waiter> pool =
- new GenericKeyedObjectPool<String,Waiter>(
- PoolImplUtils.poolableToKeyedPooledObjectFactory(factory));
+ new GenericKeyedObjectPool<String,Waiter>(factory);
pool.setMaxTotalPerKey(5);
pool.setMaxTotal(50);
pool.setLifo(false);
@@ -1387,8 +1377,7 @@ public class TestGenericKeyedObjectPool
public void testClear() throws Exception {
SimpleFactory<String> factory = new SimpleFactory<String>();
GenericKeyedObjectPool<String,String> pool =
- new GenericKeyedObjectPool<String,String>(
- PoolImplUtils.poolableToKeyedPooledObjectFactory(factory));
+ new GenericKeyedObjectPool<String,String>(factory);
pool.setMaxTotal(2);
pool.setMaxTotalPerKey(2);
pool.setBlockWhenExhausted(false);
@@ -1417,8 +1406,7 @@ public class TestGenericKeyedObjectPool
public void testWhenExhaustedBlockClosePool() throws Exception {
SimpleFactory<String> factory = new SimpleFactory<String>();
GenericKeyedObjectPool<String,String> pool =
- new GenericKeyedObjectPool<String,String>(
- PoolImplUtils.poolableToKeyedPooledObjectFactory(factory));
+ new GenericKeyedObjectPool<String,String>(factory);
pool.setMaxTotalPerKey(1);
pool.setBlockWhenExhausted(true);
pool.setMaxWaitMillis(-1);
@@ -1663,7 +1651,7 @@ public class TestGenericKeyedObjectPool
}
}
- static class SimpleFactory<K> implements KeyedPoolableObjectFactory<K,String> {
+ static class SimpleFactory<K> implements KeyedPooledObjectFactory<K,String> {
public SimpleFactory() {
this(true);
}
@@ -1671,7 +1659,7 @@ public class TestGenericKeyedObjectPool
this.valid = valid;
}
@Override
- public String makeObject(K key) {
+ public PooledObject<String> makeObject(K key) {
String out = null;
synchronized(this) {
activeCount++;
@@ -1681,10 +1669,10 @@ public class TestGenericKeyedObjectPool
}
out = String.valueOf(key) + String.valueOf(counter++);
}
- return out;
+ return new DefaultPooledObject<String>(out);
}
@Override
- public void destroyObject(K key, String obj) throws Exception {
+ public void destroyObject(K key, PooledObject<String> obj) throws Exception {
doWait(destroyLatency);
synchronized(this) {
activeCount--;
@@ -1694,7 +1682,7 @@ public class TestGenericKeyedObjectPool
}
}
@Override
- public boolean validateObject(K key, String obj) {
+ public boolean validateObject(K key, PooledObject<String> obj) {
if (enableValidation) {
return validateCounter++%2 == 0 ? evenValid : oddValid;
} else {
@@ -1702,7 +1690,7 @@ public class TestGenericKeyedObjectPool
}
}
@Override
- public void activateObject(K key, String obj) throws Exception {
+ public void activateObject(K key, PooledObject<String> obj) throws Exception {
if (exceptionOnActivate) {
if (!(validateCounter++%2 == 0 ? evenValid : oddValid)) {
throw new Exception();
@@ -1710,7 +1698,7 @@ public class TestGenericKeyedObjectPool
}
}
@Override
- public void passivateObject(K key, String obj) throws Exception {
+ public void passivateObject(K key, PooledObject<String> obj) throws Exception {
if (exceptionOnPassivate) {
throw new Exception();
}
Modified: commons/proper/pool/trunk/src/test/java/org/apache/commons/pool2/impl/TestGenericObjectPool.java
URL: http://svn.apache.org/viewvc/commons/proper/pool/trunk/src/test/java/org/apache/commons/pool2/impl/TestGenericObjectPool.java?rev=1512140&r1=1512139&r2=1512140&view=diff
==============================================================================
--- commons/proper/pool/trunk/src/test/java/org/apache/commons/pool2/impl/TestGenericObjectPool.java (original)
+++ commons/proper/pool/trunk/src/test/java/org/apache/commons/pool2/impl/TestGenericObjectPool.java Fri Aug 9 05:20:37 2013
@@ -33,8 +33,8 @@ import java.util.concurrent.atomic.Atomi
import javax.management.MBeanServer;
import javax.management.ObjectName;
-import org.apache.commons.pool2.BasePoolableObjectFactory;
-import org.apache.commons.pool2.PoolableObjectFactory;
+import org.apache.commons.pool2.BasePooledObjectFactory;
+import org.apache.commons.pool2.PooledObjectFactory;
import org.apache.commons.pool2.ObjectPool;
import org.apache.commons.pool2.PoolUtils;
import org.apache.commons.pool2.PooledObject;
@@ -54,9 +54,7 @@ public class TestGenericObjectPool exten
@Override
protected ObjectPool<Object> makeEmptyPool(int mincap) {
GenericObjectPool<Object> pool =
- new GenericObjectPool<Object>(
- PoolImplUtils.poolableToPooledObjectFactory(
- new SimpleFactory()));
+ new GenericObjectPool<Object>(new SimpleFactory());
pool.setMaxTotal(mincap);
pool.setMaxIdle(mincap);
return pool;
@@ -64,9 +62,9 @@ public class TestGenericObjectPool exten
@Override
protected ObjectPool<Object> makeEmptyPool(
- final PoolableObjectFactory<Object> factory) {
- GenericObjectPool<Object> pool = new GenericObjectPool<Object>(
- PoolImplUtils.poolableToPooledObjectFactory(factory));
+ final PooledObjectFactory<Object> factory) {
+ GenericObjectPool<Object> pool =
+ new GenericObjectPool<Object>(factory);
return pool;
}
@@ -78,8 +76,7 @@ public class TestGenericObjectPool exten
@Before
public void setUp() throws Exception {
factory = new SimpleFactory();
- pool = new GenericObjectPool<Object>(
- PoolImplUtils.poolableToPooledObjectFactory(factory));
+ pool = new GenericObjectPool<Object>(factory);
}
@After
@@ -133,16 +130,15 @@ public class TestGenericObjectPool exten
long timeBetweenEvictionRunsMillis = 8;
boolean blockWhenExhausted = false;
boolean lifo = false;
- PoolableObjectFactory<Object> factory = new BasePoolableObjectFactory<Object>() {
+ PooledObjectFactory<Object> factory = new BasePooledObjectFactory<Object>() {
@Override
- public Object makeObject() throws Exception {
+ public Object create() throws Exception {
return null;
}
};
GenericObjectPool<Object> pool =
- new GenericObjectPool<Object>(
- PoolImplUtils.poolableToPooledObjectFactory(factory));
+ new GenericObjectPool<Object>(factory);
assertEquals(GenericObjectPoolConfig.DEFAULT_MAX_IDLE, pool.getMaxIdle());
assertEquals(GenericObjectPoolConfig.DEFAULT_MAX_WAIT_MILLIS, pool.getMaxWaitMillis());
assertEquals(GenericObjectPoolConfig.DEFAULT_MIN_IDLE, pool.getMinIdle());
@@ -178,8 +174,7 @@ public class TestGenericObjectPool exten
config.setTestWhileIdle(testWhileIdle);
config.setTimeBetweenEvictionRunsMillis(timeBetweenEvictionRunsMillis);
config.setBlockWhenExhausted(blockWhenExhausted);
- pool = new GenericObjectPool<Object>(
- PoolImplUtils.poolableToPooledObjectFactory(factory), config);
+ pool = new GenericObjectPool<Object>(factory, config);
assertEquals(maxIdle, pool.getMaxIdle());
assertEquals(maxWait, pool.getMaxWaitMillis());
assertEquals(minIdle, pool.getMinIdle());
@@ -401,8 +396,7 @@ public class TestGenericObjectPool exten
private void checkEvictorVisiting(boolean lifo) throws Exception {
VisitTrackerFactory<Object> factory = new VisitTrackerFactory<Object>();
GenericObjectPool<VisitTracker<Object>> pool =
- new GenericObjectPool<VisitTracker<Object>>(
- PoolImplUtils.poolableToPooledObjectFactory(factory));
+ new GenericObjectPool<VisitTracker<Object>>(factory);
pool.setNumTestsPerEvictionRun(2);
pool.setMinEvictableIdleTimeMillis(-1);
pool.setTestWhileIdle(true);
@@ -435,8 +429,7 @@ public class TestGenericObjectPool exten
pool.close();
factory = new VisitTrackerFactory<Object>();
- pool = new GenericObjectPool<VisitTracker<Object>>(
- PoolImplUtils.poolableToPooledObjectFactory(factory));
+ pool = new GenericObjectPool<VisitTracker<Object>>(factory);
pool.setNumTestsPerEvictionRun(3);
pool.setMinEvictableIdleTimeMillis(-1);
pool.setTestWhileIdle(true);
@@ -481,8 +474,7 @@ public class TestGenericObjectPool exten
random.setSeed(System.currentTimeMillis());
for (int i = 0; i < 4; i++) {
for (int j = 0; j < 5; j++) {
- pool = new GenericObjectPool<VisitTracker<Object>>(
- PoolImplUtils.poolableToPooledObjectFactory(factory));
+ pool = new GenericObjectPool<VisitTracker<Object>>(factory);
pool.setNumTestsPerEvictionRun(smallPrimes[i]);
pool.setMinEvictableIdleTimeMillis(-1);
pool.setTestWhileIdle(true);
@@ -996,13 +988,13 @@ public class TestGenericObjectPool exten
@Test(timeout=60000)
public void testEvictionSoftMinIdle() throws Exception {
- class TimeTest extends BasePoolableObjectFactory<TimeTest> {
+ class TimeTest extends BasePooledObjectFactory<TimeTest> {
private final long createTime;
public TimeTest() {
createTime = System.currentTimeMillis();
}
@Override
- public TimeTest makeObject() throws Exception {
+ public TimeTest create() throws Exception {
return new TimeTest();
}
public long getCreateTime() {
@@ -1011,9 +1003,7 @@ public class TestGenericObjectPool exten
}
GenericObjectPool<TimeTest> pool =
- new GenericObjectPool<TimeTest>(
- PoolImplUtils.poolableToPooledObjectFactory(
- new TimeTest()));
+ new GenericObjectPool<TimeTest>(new TimeTest());
pool.setMaxIdle(5);
pool.setMaxTotal(5);
@@ -1047,15 +1037,15 @@ public class TestGenericObjectPool exten
@Test(timeout=60000)
public void testEvictionInvalid() throws Exception {
- class InvalidFactory extends BasePoolableObjectFactory<Object> {
+ class InvalidFactory extends BasePooledObjectFactory<Object> {
@Override
- public Object makeObject() throws Exception {
+ public Object create() throws Exception {
return new Object();
}
@Override
- public boolean validateObject(Object obj) {
+ public boolean validateObject(PooledObject<Object> obj) {
try {
Thread.sleep(1000);
} catch (InterruptedException e) {
@@ -1066,9 +1056,7 @@ public class TestGenericObjectPool exten
}
final GenericObjectPool<Object> pool =
- new GenericObjectPool<Object>(
- PoolImplUtils.poolableToPooledObjectFactory(
- new InvalidFactory()));
+ new GenericObjectPool<Object>(new InvalidFactory());
pool.setMaxIdle(1);
pool.setMaxTotal(1);
@@ -1559,7 +1547,7 @@ public class TestGenericObjectPool exten
assertEquals("timeBetweenEvictionRunsMillis",expected.getTimeBetweenEvictionRunsMillis(),actual.getTimeBetweenEvictionRunsMillis());
}
- public static class SimpleFactory implements PoolableObjectFactory<Object> {
+ public static class SimpleFactory implements PooledObjectFactory<Object> {
public SimpleFactory() {
this(true);
}
@@ -1596,7 +1584,7 @@ public class TestGenericObjectPool exten
this.validateLatency = validateLatency;
}
@Override
- public Object makeObject() {
+ public PooledObject<Object> makeObject() {
final long waitLatency;
synchronized(this) {
activeCount++;
@@ -1613,10 +1601,10 @@ public class TestGenericObjectPool exten
synchronized(this) {
counter = makeCounter++;
}
- return String.valueOf(counter);
+ return new DefaultPooledObject<Object>(String.valueOf(counter));
}
@Override
- public void destroyObject(Object obj) throws Exception {
+ public void destroyObject(PooledObject<Object> obj) throws Exception {
final long waitLatency;
final boolean hurl;
synchronized(this) {
@@ -1634,7 +1622,7 @@ public class TestGenericObjectPool exten
}
}
@Override
- public boolean validateObject(Object obj) {
+ public boolean validateObject(PooledObject<Object> obj) {
final boolean validate;
final boolean evenTest;
final boolean oddTest;
@@ -1658,7 +1646,7 @@ public class TestGenericObjectPool exten
}
}
@Override
- public void activateObject(Object obj) throws Exception {
+ public void activateObject(PooledObject<Object> obj) throws Exception {
final boolean hurl;
final boolean evenTest;
final boolean oddTest;
@@ -1676,7 +1664,7 @@ public class TestGenericObjectPool exten
}
}
@Override
- public void passivateObject(Object obj) throws Exception {
+ public void passivateObject(PooledObject<Object> obj) throws Exception {
final boolean hurl;
synchronized(this) {
hurl = exceptionOnPassivate;
Modified: commons/proper/pool/trunk/src/test/java/org/apache/commons/pool2/impl/TestGenericObjectPoolClassLoaders.java
URL: http://svn.apache.org/viewvc/commons/proper/pool/trunk/src/test/java/org/apache/commons/pool2/impl/TestGenericObjectPoolClassLoaders.java?rev=1512140&r1=1512139&r2=1512140&view=diff
==============================================================================
--- commons/proper/pool/trunk/src/test/java/org/apache/commons/pool2/impl/TestGenericObjectPoolClassLoaders.java (original)
+++ commons/proper/pool/trunk/src/test/java/org/apache/commons/pool2/impl/TestGenericObjectPoolClassLoaders.java Fri Aug 9 05:20:37 2013
@@ -21,7 +21,7 @@ import java.net.URLClassLoader;
import junit.framework.TestCase;
-import org.apache.commons.pool2.BasePoolableObjectFactory;
+import org.apache.commons.pool2.BasePooledObjectFactory;
public class TestGenericObjectPoolClassLoaders extends TestCase {
@@ -39,9 +39,7 @@ public class TestGenericObjectPoolClassL
Thread.currentThread().setContextClassLoader(cl1);
CustomClassLoaderObjectFactory factory1 =
new CustomClassLoaderObjectFactory(1);
- GenericObjectPool<URL> pool1 =
- new GenericObjectPool<URL>(
- PoolImplUtils.poolableToPooledObjectFactory(factory1));
+ GenericObjectPool<URL> pool1 = new GenericObjectPool<URL>(factory1);
pool1.setMinIdle(1);
pool1.setTimeBetweenEvictionRunsMillis(100);
int counter = 0;
@@ -58,8 +56,7 @@ public class TestGenericObjectPoolClassL
CustomClassLoaderObjectFactory factory2 =
new CustomClassLoaderObjectFactory(2);
GenericObjectPool<URL> pool2 =
- new GenericObjectPool<URL>(
- PoolImplUtils.poolableToPooledObjectFactory(factory2));
+ new GenericObjectPool<URL>(factory2);
pool2.setMinIdle(1);
pool2.addObject();
@@ -85,7 +82,7 @@ public class TestGenericObjectPoolClassL
}
private static class CustomClassLoaderObjectFactory extends
- BasePoolableObjectFactory<URL> {
+ BasePooledObjectFactory<URL> {
private int n;
CustomClassLoaderObjectFactory(int n) {
@@ -93,7 +90,7 @@ public class TestGenericObjectPoolClassL
}
@Override
- public URL makeObject() throws Exception {
+ public URL create() throws Exception {
URL url = Thread.currentThread().getContextClassLoader()
.getResource("test" + n);
if (url == null) {
Modified: commons/proper/pool/trunk/src/test/java/org/apache/commons/pool2/impl/TestSoftRefOutOfMemory.java
URL: http://svn.apache.org/viewvc/commons/proper/pool/trunk/src/test/java/org/apache/commons/pool2/impl/TestSoftRefOutOfMemory.java?rev=1512140&r1=1512139&r2=1512140&view=diff
==============================================================================
--- commons/proper/pool/trunk/src/test/java/org/apache/commons/pool2/impl/TestSoftRefOutOfMemory.java (original)
+++ commons/proper/pool/trunk/src/test/java/org/apache/commons/pool2/impl/TestSoftRefOutOfMemory.java Fri Aug 9 05:20:37 2013
@@ -25,8 +25,8 @@ import java.util.Arrays;
import java.util.LinkedList;
import java.util.List;
-import org.apache.commons.pool2.BasePoolableObjectFactory;
-import org.apache.commons.pool2.PoolableObjectFactory;
+import org.apache.commons.pool2.BasePooledObjectFactory;
+import org.apache.commons.pool2.PooledObject;
import org.junit.After;
import org.junit.Test;
@@ -162,9 +162,9 @@ public class TestSoftRefOutOfMemory {
*/
@Test
public void testOutOfMemoryError() throws Exception {
- pool = new SoftReferenceObjectPool<String>(new BasePoolableObjectFactory<String>() {
+ pool = new SoftReferenceObjectPool<String>(new BasePooledObjectFactory<String>() {
@Override
- public String makeObject() throws Exception {
+ public String create() throws Exception {
throw new OutOfMemoryError();
}
});
@@ -178,14 +178,14 @@ public class TestSoftRefOutOfMemory {
}
pool.close();
- pool = new SoftReferenceObjectPool<String>(new BasePoolableObjectFactory<String>() {
+ pool = new SoftReferenceObjectPool<String>(new BasePooledObjectFactory<String>() {
@Override
- public String makeObject() throws Exception {
+ public String create() throws Exception {
return new String();
}
@Override
- public boolean validateObject(String obj) {
+ public boolean validateObject(PooledObject<String> obj) {
throw new OutOfMemoryError();
}
});
@@ -199,19 +199,19 @@ public class TestSoftRefOutOfMemory {
}
pool.close();
- pool = new SoftReferenceObjectPool<String>(new BasePoolableObjectFactory<String>() {
+ pool = new SoftReferenceObjectPool<String>(new BasePooledObjectFactory<String>() {
@Override
- public String makeObject() throws Exception {
+ public String create() throws Exception {
return new String();
}
@Override
- public boolean validateObject(String obj) {
+ public boolean validateObject(PooledObject<String> obj) {
throw new IllegalAccessError();
}
@Override
- public void destroyObject(String obj) throws Exception {
+ public void destroyObject(PooledObject<String> obj) throws Exception {
throw new OutOfMemoryError();
}
});
@@ -228,11 +228,11 @@ public class TestSoftRefOutOfMemory {
}
- public static class SmallPoolableObjectFactory implements PoolableObjectFactory<String> {
+ public static class SmallPoolableObjectFactory extends BasePooledObjectFactory<String> {
private int counter = 0;
@Override
- public String makeObject() {
+ public String create() {
counter++;
// It seems that as of Java 1.4 String.valueOf may return an
// intern()'ed String this may cause problems when the tests
@@ -241,19 +241,9 @@ public class TestSoftRefOutOfMemory {
// is returned eliminated false failures.
return new String(String.valueOf(counter));
}
- @Override
- public boolean validateObject(String obj) {
- return true;
- }
- @Override
- public void activateObject(String obj) { }
- @Override
- public void passivateObject(String obj) { }
- @Override
- public void destroyObject(String obj) { }
}
- public static class LargePoolableObjectFactory implements PoolableObjectFactory<String> {
+ public static class LargePoolableObjectFactory extends BasePooledObjectFactory<String> {
private String buffer;
private int counter = 0;
@@ -264,19 +254,9 @@ public class TestSoftRefOutOfMemory {
}
@Override
- public String makeObject() {
+ public String create() {
counter++;
return String.valueOf(counter) + buffer;
}
- @Override
- public boolean validateObject(String obj) {
- return true;
- }
- @Override
- public void activateObject(String obj) { }
- @Override
- public void passivateObject(String obj) { }
- @Override
- public void destroyObject(String obj) { }
}
}
\ No newline at end of file
Modified: commons/proper/pool/trunk/src/test/java/org/apache/commons/pool2/impl/TestSoftReferenceObjectPool.java
URL: http://svn.apache.org/viewvc/commons/proper/pool/trunk/src/test/java/org/apache/commons/pool2/impl/TestSoftReferenceObjectPool.java?rev=1512140&r1=1512139&r2=1512140&view=diff
==============================================================================
--- commons/proper/pool/trunk/src/test/java/org/apache/commons/pool2/impl/TestSoftReferenceObjectPool.java (original)
+++ commons/proper/pool/trunk/src/test/java/org/apache/commons/pool2/impl/TestSoftReferenceObjectPool.java Fri Aug 9 05:20:37 2013
@@ -18,7 +18,8 @@
package org.apache.commons.pool2.impl;
import org.apache.commons.pool2.ObjectPool;
-import org.apache.commons.pool2.PoolableObjectFactory;
+import org.apache.commons.pool2.PooledObject;
+import org.apache.commons.pool2.PooledObjectFactory;
import org.apache.commons.pool2.TestBaseObjectPool;
/**
@@ -29,24 +30,24 @@ public class TestSoftReferenceObjectPool
@Override
protected ObjectPool<Object> makeEmptyPool(int cap) {
return new SoftReferenceObjectPool<Object>(
- new PoolableObjectFactory<Object>() {
+ new PooledObjectFactory<Object>() {
int counter = 0;
@Override
- public Object makeObject() { return String.valueOf(counter++); }
+ public PooledObject<Object> makeObject() { return new DefaultPooledObject<Object>(String.valueOf(counter++)); }
@Override
- public void destroyObject(Object obj) { }
+ public void destroyObject(PooledObject<Object> obj) { }
@Override
- public boolean validateObject(Object obj) { return true; }
+ public boolean validateObject(PooledObject<Object> obj) { return true; }
@Override
- public void activateObject(Object obj) { }
+ public void activateObject(PooledObject<Object> obj) { }
@Override
- public void passivateObject(Object obj) { }
+ public void passivateObject(PooledObject<Object> obj) { }
}
);
}
@Override
- protected ObjectPool<Object> makeEmptyPool(final PoolableObjectFactory<Object> factory) {
+ protected ObjectPool<Object> makeEmptyPool(final PooledObjectFactory<Object> factory) {
return new SoftReferenceObjectPool<Object>(factory);
}
Modified: commons/proper/pool/trunk/src/test/java/org/apache/commons/pool2/performance/PerformanceTest.java
URL: http://svn.apache.org/viewvc/commons/proper/pool/trunk/src/test/java/org/apache/commons/pool2/performance/PerformanceTest.java?rev=1512140&r1=1512139&r2=1512140&view=diff
==============================================================================
--- commons/proper/pool/trunk/src/test/java/org/apache/commons/pool2/performance/PerformanceTest.java (original)
+++ commons/proper/pool/trunk/src/test/java/org/apache/commons/pool2/performance/PerformanceTest.java Fri Aug 9 05:20:37 2013
@@ -115,8 +115,7 @@ public class PerformanceTest {
SleepingObjectFactory factory = new SleepingObjectFactory();
if (logLevel >= 4) { factory.setDebug(true); }
- pool = new GenericObjectPool<Integer>(
- PoolImplUtils.poolableToPooledObjectFactory(factory));
+ pool = new GenericObjectPool<Integer>(factory);
pool.setMaxTotal(maxTotal);
pool.setMaxIdle(maxIdle);
pool.setTestOnBorrow(true);
Modified: commons/proper/pool/trunk/src/test/java/org/apache/commons/pool2/performance/SleepingObjectFactory.java
URL: http://svn.apache.org/viewvc/commons/proper/pool/trunk/src/test/java/org/apache/commons/pool2/performance/SleepingObjectFactory.java?rev=1512140&r1=1512139&r2=1512140&view=diff
==============================================================================
--- commons/proper/pool/trunk/src/test/java/org/apache/commons/pool2/performance/SleepingObjectFactory.java (original)
+++ commons/proper/pool/trunk/src/test/java/org/apache/commons/pool2/performance/SleepingObjectFactory.java Fri Aug 9 05:20:37 2013
@@ -17,47 +17,49 @@
package org.apache.commons.pool2.performance;
-import org.apache.commons.pool2.PoolableObjectFactory;
+import org.apache.commons.pool2.PooledObject;
+import org.apache.commons.pool2.PooledObjectFactory;
+import org.apache.commons.pool2.impl.DefaultPooledObject;
/**
* Sleepy ObjectFactory (everything takes a while longer)
*
* @version $Revision$
*/
-public class SleepingObjectFactory implements PoolableObjectFactory<Integer> {
+public class SleepingObjectFactory implements PooledObjectFactory<Integer> {
private int counter = 0;
private boolean debug = false;
@Override
- public Integer makeObject() throws Exception {
+ public PooledObject<Integer> makeObject() throws Exception {
Integer obj = new Integer(counter++);
debug("makeObject", obj);
sleep(500);
- return obj;
+ return new DefaultPooledObject<Integer>(obj);
}
@Override
- public void destroyObject(Integer obj) throws Exception {
+ public void destroyObject(PooledObject<Integer> obj) throws Exception {
debug("destroyObject", obj);
sleep(250);
}
@Override
- public boolean validateObject(Integer obj) {
+ public boolean validateObject(PooledObject<Integer> obj) {
debug("validateObject", obj);
sleep(30);
return true;
}
@Override
- public void activateObject(Integer obj) throws Exception {
+ public void activateObject(PooledObject<Integer> obj) throws Exception {
debug("activateObject", obj);
sleep(10);
}
@Override
- public void passivateObject(Integer obj) throws Exception {
+ public void passivateObject(PooledObject<Integer> obj) throws Exception {
debug("passivateObject", obj);
sleep(10);
}