You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by ma...@apache.org on 2012/02/10 12:20:24 UTC
svn commit: r1242744 - in /commons/proper/pool/trunk/src:
java/org/apache/commons/pool2/ java/org/apache/commons/pool2/impl/
test/org/apache/commons/pool2/ test/org/apache/commons/pool2/impl/
test/org/apache/commons/pool2/performance/
Author: markt
Date: Fri Feb 10 11:20:23 2012
New Revision: 1242744
URL: http://svn.apache.org/viewvc?rev=1242744&view=rev
Log:
Add @Override markers required by Java 6
Modified:
commons/proper/pool/trunk/src/java/org/apache/commons/pool2/BaseKeyedPoolableObjectFactory.java
commons/proper/pool/trunk/src/java/org/apache/commons/pool2/BaseObjectPool.java
commons/proper/pool/trunk/src/java/org/apache/commons/pool2/BasePoolableObjectFactory.java
commons/proper/pool/trunk/src/java/org/apache/commons/pool2/PoolUtils.java
commons/proper/pool/trunk/src/java/org/apache/commons/pool2/impl/DefaultEvictionPolicy.java
commons/proper/pool/trunk/src/java/org/apache/commons/pool2/impl/EvictionTimer.java
commons/proper/pool/trunk/src/java/org/apache/commons/pool2/impl/GenericKeyedObjectPool.java
commons/proper/pool/trunk/src/java/org/apache/commons/pool2/impl/GenericObjectPool.java
commons/proper/pool/trunk/src/java/org/apache/commons/pool2/impl/LinkedBlockingDeque.java
commons/proper/pool/trunk/src/java/org/apache/commons/pool2/impl/PooledObject.java
commons/proper/pool/trunk/src/test/org/apache/commons/pool2/MethodCallPoolableObjectFactory.java
commons/proper/pool/trunk/src/test/org/apache/commons/pool2/TestKeyedObjectPool.java
commons/proper/pool/trunk/src/test/org/apache/commons/pool2/TestKeyedObjectPoolFactory.java
commons/proper/pool/trunk/src/test/org/apache/commons/pool2/TestPoolUtils.java
commons/proper/pool/trunk/src/test/org/apache/commons/pool2/VisitTrackerFactory.java
commons/proper/pool/trunk/src/test/org/apache/commons/pool2/WaiterFactory.java
commons/proper/pool/trunk/src/test/org/apache/commons/pool2/impl/TestGenericKeyedObjectPool.java
commons/proper/pool/trunk/src/test/org/apache/commons/pool2/impl/TestGenericObjectPool.java
commons/proper/pool/trunk/src/test/org/apache/commons/pool2/impl/TestSoftRefOutOfMemory.java
commons/proper/pool/trunk/src/test/org/apache/commons/pool2/impl/TestSoftReferenceObjectPool.java
commons/proper/pool/trunk/src/test/org/apache/commons/pool2/performance/PerformanceTest.java
commons/proper/pool/trunk/src/test/org/apache/commons/pool2/performance/SleepingObjectFactory.java
Modified: commons/proper/pool/trunk/src/java/org/apache/commons/pool2/BaseKeyedPoolableObjectFactory.java
URL: http://svn.apache.org/viewvc/commons/proper/pool/trunk/src/java/org/apache/commons/pool2/BaseKeyedPoolableObjectFactory.java?rev=1242744&r1=1242743&r2=1242744&view=diff
==============================================================================
--- commons/proper/pool/trunk/src/java/org/apache/commons/pool2/BaseKeyedPoolableObjectFactory.java (original)
+++ commons/proper/pool/trunk/src/java/org/apache/commons/pool2/BaseKeyedPoolableObjectFactory.java Fri Feb 10 11:20:23 2012
@@ -39,6 +39,7 @@ public abstract class BaseKeyedPoolableO
* @param key the key used when constructing the object
* @return an instance that can be served by the pool
*/
+ @Override
public abstract V makeObject(K key)
throws Exception;
@@ -51,6 +52,7 @@ public abstract class BaseKeyedPoolableO
* @param key the key used when selecting the instance
* @param obj the instance to be destroyed
*/
+ @Override
public void destroyObject(K key, V obj)
throws Exception {
}
@@ -65,6 +67,7 @@ public abstract class BaseKeyedPoolableO
* @param obj the instance to be validated
* @return always <code>true</code> in the default implementation
*/
+ @Override
public boolean validateObject(K key, V obj) {
return true;
}
@@ -78,6 +81,7 @@ public abstract class BaseKeyedPoolableO
* @param key the key used when selecting the object
* @param obj the instance to be activated
*/
+ @Override
public void activateObject(K key, V obj)
throws Exception {
}
@@ -91,6 +95,7 @@ public abstract class BaseKeyedPoolableO
* @param key the key used when selecting the object
* @param obj the instance to be passivated
*/
+ @Override
public void passivateObject(K key, V obj)
throws Exception {
}
Modified: commons/proper/pool/trunk/src/java/org/apache/commons/pool2/BaseObjectPool.java
URL: http://svn.apache.org/viewvc/commons/proper/pool/trunk/src/java/org/apache/commons/pool2/BaseObjectPool.java?rev=1242744&r1=1242743&r2=1242744&view=diff
==============================================================================
--- commons/proper/pool/trunk/src/java/org/apache/commons/pool2/BaseObjectPool.java (original)
+++ commons/proper/pool/trunk/src/java/org/apache/commons/pool2/BaseObjectPool.java Fri Feb 10 11:20:23 2012
@@ -38,6 +38,7 @@ public abstract class BaseObjectPool<T>
* @return an instance from the pool
* @throws Exception if an instance cannot be obtained from the pool
*/
+ @Override
public abstract T borrowObject() throws Exception;
/**
@@ -45,6 +46,7 @@ public abstract class BaseObjectPool<T>
*
* @param obj instance to return to the pool
*/
+ @Override
public abstract void returnObject(T obj) throws Exception;
/**
@@ -59,6 +61,7 @@ public abstract class BaseObjectPool<T>
* @param obj a {@link #borrowObject borrowed} instance to be disposed.
* @throws Exception
*/
+ @Override
public abstract void invalidateObject(T obj) throws Exception;
/**
@@ -67,6 +70,7 @@ public abstract class BaseObjectPool<T>
*
* @throws UnsupportedOperationException
*/
+ @Override
public int getNumIdle() throws UnsupportedOperationException {
return -1;
}
@@ -77,6 +81,7 @@ public abstract class BaseObjectPool<T>
*
* @throws UnsupportedOperationException
*/
+ @Override
public int getNumActive() throws UnsupportedOperationException {
return -1;
}
@@ -86,6 +91,7 @@ public abstract class BaseObjectPool<T>
*
* @throws UnsupportedOperationException
*/
+ @Override
public void clear() throws Exception, UnsupportedOperationException {
throw new UnsupportedOperationException();
}
@@ -97,6 +103,7 @@ public abstract class BaseObjectPool<T>
*
* @throws UnsupportedOperationException
*/
+ @Override
public void addObject() throws Exception, UnsupportedOperationException {
throw new UnsupportedOperationException();
}
@@ -105,6 +112,7 @@ public abstract class BaseObjectPool<T>
* Close this pool.
* This affects the behavior of <code>isClosed</code> and <code>assertOpen</code>.
*/
+ @Override
public void close() throws Exception {
closed = true;
}
Modified: commons/proper/pool/trunk/src/java/org/apache/commons/pool2/BasePoolableObjectFactory.java
URL: http://svn.apache.org/viewvc/commons/proper/pool/trunk/src/java/org/apache/commons/pool2/BasePoolableObjectFactory.java?rev=1242744&r1=1242743&r2=1242744&view=diff
==============================================================================
--- commons/proper/pool/trunk/src/java/org/apache/commons/pool2/BasePoolableObjectFactory.java (original)
+++ commons/proper/pool/trunk/src/java/org/apache/commons/pool2/BasePoolableObjectFactory.java Fri Feb 10 11:20:23 2012
@@ -37,6 +37,7 @@ public abstract class BasePoolableObject
/**
* {@inheritDoc}
*/
+ @Override
public abstract T makeObject() throws Exception;
/**
@@ -44,6 +45,7 @@ public abstract class BasePoolableObject
*
* @param obj ignored
*/
+ @Override
public void destroyObject(T obj)
throws Exception {
}
@@ -54,6 +56,7 @@ public abstract class BasePoolableObject
* @param obj ignored
* @return <tt>true</tt>
*/
+ @Override
public boolean validateObject(T obj) {
return true;
}
@@ -63,6 +66,7 @@ public abstract class BasePoolableObject
*
* @param obj ignored
*/
+ @Override
public void activateObject(T obj) throws Exception {
}
@@ -71,6 +75,7 @@ public abstract class BasePoolableObject
*
* @param obj ignored
*/
+ @Override
public void passivateObject(T obj)
throws Exception {
}
Modified: commons/proper/pool/trunk/src/java/org/apache/commons/pool2/PoolUtils.java
URL: http://svn.apache.org/viewvc/commons/proper/pool/trunk/src/java/org/apache/commons/pool2/PoolUtils.java?rev=1242744&r1=1242743&r2=1242744&view=diff
==============================================================================
--- commons/proper/pool/trunk/src/java/org/apache/commons/pool2/PoolUtils.java (original)
+++ commons/proper/pool/trunk/src/java/org/apache/commons/pool2/PoolUtils.java Fri Feb 10 11:20:23 2012
@@ -620,6 +620,7 @@ public final class PoolUtils {
/**
* {@inheritDoc}
*/
+ @Override
public T borrowObject() throws Exception, NoSuchElementException, IllegalStateException {
WriteLock writeLock = readWriteLock.writeLock();
writeLock.tryLock();
@@ -633,6 +634,7 @@ public final class PoolUtils {
/**
* {@inheritDoc}
*/
+ @Override
public void returnObject(final T obj) {
WriteLock writeLock = readWriteLock.writeLock();
writeLock.tryLock();
@@ -648,6 +650,7 @@ public final class PoolUtils {
/**
* {@inheritDoc}
*/
+ @Override
public void invalidateObject(final T obj) {
WriteLock writeLock = readWriteLock.writeLock();
writeLock.tryLock();
@@ -663,6 +666,7 @@ public final class PoolUtils {
/**
* {@inheritDoc}
*/
+ @Override
public void addObject() throws Exception, IllegalStateException, UnsupportedOperationException {
WriteLock writeLock = readWriteLock.writeLock();
writeLock.tryLock();
@@ -676,6 +680,7 @@ public final class PoolUtils {
/**
* {@inheritDoc}
*/
+ @Override
public int getNumIdle() throws UnsupportedOperationException {
ReadLock readLock = readWriteLock.readLock();
readLock.tryLock();
@@ -689,6 +694,7 @@ public final class PoolUtils {
/**
* {@inheritDoc}
*/
+ @Override
public int getNumActive() throws UnsupportedOperationException {
ReadLock readLock = readWriteLock.readLock();
readLock.tryLock();
@@ -702,6 +708,7 @@ public final class PoolUtils {
/**
* {@inheritDoc}
*/
+ @Override
public void clear() throws Exception, UnsupportedOperationException {
WriteLock writeLock = readWriteLock.writeLock();
writeLock.tryLock();
@@ -715,6 +722,7 @@ public final class PoolUtils {
/**
* {@inheritDoc}
*/
+ @Override
public void close() {
WriteLock writeLock = readWriteLock.writeLock();
writeLock.tryLock();
@@ -774,6 +782,7 @@ public final class PoolUtils {
/**
* {@inheritDoc}
*/
+ @Override
public V borrowObject(final K key) throws Exception, NoSuchElementException, IllegalStateException {
WriteLock writeLock = readWriteLock.writeLock();
writeLock.tryLock();
@@ -787,6 +796,7 @@ public final class PoolUtils {
/**
* {@inheritDoc}
*/
+ @Override
public void returnObject(final K key, final V obj) {
WriteLock writeLock = readWriteLock.writeLock();
writeLock.tryLock();
@@ -802,6 +812,7 @@ public final class PoolUtils {
/**
* {@inheritDoc}
*/
+ @Override
public void invalidateObject(final K key, final V obj) {
WriteLock writeLock = readWriteLock.writeLock();
writeLock.tryLock();
@@ -817,6 +828,7 @@ public final class PoolUtils {
/**
* {@inheritDoc}
*/
+ @Override
public void addObject(final K key) throws Exception, IllegalStateException, UnsupportedOperationException {
WriteLock writeLock = readWriteLock.writeLock();
writeLock.tryLock();
@@ -830,6 +842,7 @@ public final class PoolUtils {
/**
* {@inheritDoc}
*/
+ @Override
public int getNumIdle(final K key) throws UnsupportedOperationException {
ReadLock readLock = readWriteLock.readLock();
readLock.tryLock();
@@ -843,6 +856,7 @@ public final class PoolUtils {
/**
* {@inheritDoc}
*/
+ @Override
public int getNumActive(final K key) throws UnsupportedOperationException {
ReadLock readLock = readWriteLock.readLock();
readLock.tryLock();
@@ -856,6 +870,7 @@ public final class PoolUtils {
/**
* {@inheritDoc}
*/
+ @Override
public int getNumIdle() throws UnsupportedOperationException {
ReadLock readLock = readWriteLock.readLock();
readLock.tryLock();
@@ -869,6 +884,7 @@ public final class PoolUtils {
/**
* {@inheritDoc}
*/
+ @Override
public int getNumActive() throws UnsupportedOperationException {
ReadLock readLock = readWriteLock.readLock();
readLock.tryLock();
@@ -882,6 +898,7 @@ public final class PoolUtils {
/**
* {@inheritDoc}
*/
+ @Override
public void clear() throws Exception, UnsupportedOperationException {
WriteLock writeLock = readWriteLock.writeLock();
writeLock.tryLock();
@@ -895,6 +912,7 @@ public final class PoolUtils {
/**
* {@inheritDoc}
*/
+ @Override
public void clear(final K key) throws Exception, UnsupportedOperationException {
WriteLock writeLock = readWriteLock.writeLock();
writeLock.tryLock();
@@ -908,6 +926,7 @@ public final class PoolUtils {
/**
* {@inheritDoc}
*/
+ @Override
public void close() {
WriteLock writeLock = readWriteLock.writeLock();
writeLock.tryLock();
@@ -964,6 +983,7 @@ public final class PoolUtils {
/**
* {@inheritDoc}
*/
+ @Override
public T makeObject() throws Exception {
writeLock.tryLock();
try {
@@ -976,6 +996,7 @@ public final class PoolUtils {
/**
* {@inheritDoc}
*/
+ @Override
public void destroyObject(final T obj) throws Exception {
writeLock.tryLock();
try {
@@ -988,6 +1009,7 @@ public final class PoolUtils {
/**
* {@inheritDoc}
*/
+ @Override
public boolean validateObject(final T obj) {
writeLock.tryLock();
try {
@@ -1000,6 +1022,7 @@ public final class PoolUtils {
/**
* {@inheritDoc}
*/
+ @Override
public void activateObject(final T obj) throws Exception {
writeLock.tryLock();
try {
@@ -1012,6 +1035,7 @@ public final class PoolUtils {
/**
* {@inheritDoc}
*/
+ @Override
public void passivateObject(final T obj) throws Exception {
writeLock.tryLock();
try {
@@ -1065,6 +1089,7 @@ public final class PoolUtils {
/**
* {@inheritDoc}
*/
+ @Override
public V makeObject(final K key) throws Exception {
writeLock.tryLock();
try {
@@ -1077,6 +1102,7 @@ public final class PoolUtils {
/**
* {@inheritDoc}
*/
+ @Override
public void destroyObject(final K key, final V obj) throws Exception {
writeLock.tryLock();
try {
@@ -1089,6 +1115,7 @@ public final class PoolUtils {
/**
* {@inheritDoc}
*/
+ @Override
public boolean validateObject(final K key, final V obj) {
writeLock.tryLock();
try {
@@ -1101,6 +1128,7 @@ public final class PoolUtils {
/**
* {@inheritDoc}
*/
+ @Override
public void activateObject(final K key, final V obj) throws Exception {
writeLock.tryLock();
try {
@@ -1113,6 +1141,7 @@ public final class PoolUtils {
/**
* {@inheritDoc}
*/
+ @Override
public void passivateObject(final K key, final V obj) throws Exception {
writeLock.tryLock();
try {
@@ -1228,6 +1257,7 @@ public final class PoolUtils {
/**
* {@inheritDoc}
*/
+ @Override
public T borrowObject() throws Exception, NoSuchElementException, IllegalStateException {
return pool.borrowObject();
}
@@ -1241,6 +1271,7 @@ public final class PoolUtils {
* @param obj object to return or invalidate
* @see #factor
*/
+ @Override
public void returnObject(final T obj) {
boolean discard = false;
final long now = System.currentTimeMillis();
@@ -1268,6 +1299,7 @@ public final class PoolUtils {
/**
* {@inheritDoc}
*/
+ @Override
public void invalidateObject(final T obj) {
try {
pool.invalidateObject(obj);
@@ -1279,6 +1311,7 @@ public final class PoolUtils {
/**
* {@inheritDoc}
*/
+ @Override
public void addObject() throws Exception, IllegalStateException, UnsupportedOperationException {
pool.addObject();
}
@@ -1286,6 +1319,7 @@ public final class PoolUtils {
/**
* {@inheritDoc}
*/
+ @Override
public int getNumIdle() throws UnsupportedOperationException {
return pool.getNumIdle();
}
@@ -1293,6 +1327,7 @@ public final class PoolUtils {
/**
* {@inheritDoc}
*/
+ @Override
public int getNumActive() throws UnsupportedOperationException {
return pool.getNumActive();
}
@@ -1300,6 +1335,7 @@ public final class PoolUtils {
/**
* {@inheritDoc}
*/
+ @Override
public void clear() throws Exception, UnsupportedOperationException {
pool.clear();
}
@@ -1307,6 +1343,7 @@ public final class PoolUtils {
/**
* {@inheritDoc}
*/
+ @Override
public void close() {
try {
pool.close();
@@ -1369,6 +1406,7 @@ public final class PoolUtils {
/**
* {@inheritDoc}
*/
+ @Override
public V borrowObject(final K key) throws Exception, NoSuchElementException, IllegalStateException {
return keyedPool.borrowObject(key);
}
@@ -1383,6 +1421,7 @@ public final class PoolUtils {
* @param key key
* @see #erodingFactor
*/
+ @Override
public void returnObject(final K key, final V obj) throws Exception {
boolean discard = false;
final long now = System.currentTimeMillis();
@@ -1420,6 +1459,7 @@ public final class PoolUtils {
/**
* {@inheritDoc}
*/
+ @Override
public void invalidateObject(final K key, final V obj) {
try {
keyedPool.invalidateObject(key, obj);
@@ -1431,6 +1471,7 @@ public final class PoolUtils {
/**
* {@inheritDoc}
*/
+ @Override
public void addObject(final K key) throws Exception, IllegalStateException, UnsupportedOperationException {
keyedPool.addObject(key);
}
@@ -1438,6 +1479,7 @@ public final class PoolUtils {
/**
* {@inheritDoc}
*/
+ @Override
public int getNumIdle() throws UnsupportedOperationException {
return keyedPool.getNumIdle();
}
@@ -1445,6 +1487,7 @@ public final class PoolUtils {
/**
* {@inheritDoc}
*/
+ @Override
public int getNumIdle(final K key) throws UnsupportedOperationException {
return keyedPool.getNumIdle(key);
}
@@ -1452,6 +1495,7 @@ public final class PoolUtils {
/**
* {@inheritDoc}
*/
+ @Override
public int getNumActive() throws UnsupportedOperationException {
return keyedPool.getNumActive();
}
@@ -1459,6 +1503,7 @@ public final class PoolUtils {
/**
* {@inheritDoc}
*/
+ @Override
public int getNumActive(final K key) throws UnsupportedOperationException {
return keyedPool.getNumActive(key);
}
@@ -1466,6 +1511,7 @@ public final class PoolUtils {
/**
* {@inheritDoc}
*/
+ @Override
public void clear() throws Exception, UnsupportedOperationException {
keyedPool.clear();
}
@@ -1473,6 +1519,7 @@ public final class PoolUtils {
/**
* {@inheritDoc}
*/
+ @Override
public void clear(final K key) throws Exception, UnsupportedOperationException {
keyedPool.clear(key);
}
@@ -1480,6 +1527,7 @@ public final class PoolUtils {
/**
* {@inheritDoc}
*/
+ @Override
public void close() {
try {
keyedPool.close();
Modified: commons/proper/pool/trunk/src/java/org/apache/commons/pool2/impl/DefaultEvictionPolicy.java
URL: http://svn.apache.org/viewvc/commons/proper/pool/trunk/src/java/org/apache/commons/pool2/impl/DefaultEvictionPolicy.java?rev=1242744&r1=1242743&r2=1242744&view=diff
==============================================================================
--- commons/proper/pool/trunk/src/java/org/apache/commons/pool2/impl/DefaultEvictionPolicy.java (original)
+++ commons/proper/pool/trunk/src/java/org/apache/commons/pool2/impl/DefaultEvictionPolicy.java Fri Feb 10 11:20:23 2012
@@ -29,6 +29,7 @@ package org.apache.commons.pool2.impl;
*/
public class DefaultEvictionPolicy<T> implements EvictionPolicy<T> {
+ @Override
public boolean evict(EvictionConfig config, PooledObject<T> underTest,
int idleCount) {
Modified: commons/proper/pool/trunk/src/java/org/apache/commons/pool2/impl/EvictionTimer.java
URL: http://svn.apache.org/viewvc/commons/proper/pool/trunk/src/java/org/apache/commons/pool2/impl/EvictionTimer.java?rev=1242744&r1=1242743&r2=1242744&view=diff
==============================================================================
--- commons/proper/pool/trunk/src/java/org/apache/commons/pool2/impl/EvictionTimer.java (original)
+++ commons/proper/pool/trunk/src/java/org/apache/commons/pool2/impl/EvictionTimer.java Fri Feb 10 11:20:23 2012
@@ -99,6 +99,7 @@ class EvictionTimer {
/**
* {@inheritDoc}
*/
+ @Override
public ClassLoader run() {
return Thread.currentThread().getContextClassLoader();
}
@@ -123,6 +124,7 @@ class EvictionTimer {
/**
* {@inheritDoc}
*/
+ @Override
public Void run() {
Thread.currentThread().setContextClassLoader(cl);
return null;
Modified: commons/proper/pool/trunk/src/java/org/apache/commons/pool2/impl/GenericKeyedObjectPool.java
URL: http://svn.apache.org/viewvc/commons/proper/pool/trunk/src/java/org/apache/commons/pool2/impl/GenericKeyedObjectPool.java?rev=1242744&r1=1242743&r2=1242744&view=diff
==============================================================================
--- commons/proper/pool/trunk/src/java/org/apache/commons/pool2/impl/GenericKeyedObjectPool.java (original)
+++ commons/proper/pool/trunk/src/java/org/apache/commons/pool2/impl/GenericKeyedObjectPool.java Fri Feb 10 11:20:23 2012
@@ -292,6 +292,7 @@ public class GenericKeyedObjectPool<K,T>
* @return the cap on the number of active instances per key.
* @see #setMaxTotalPerKey
*/
+ @Override
public int getMaxTotalPerKey() {
return maxTotalPerKey;
}
@@ -313,6 +314,7 @@ public class GenericKeyedObjectPool<K,T>
* @return the maximum number of instances in circulation at one time.
* @see #setMaxTotal
*/
+ @Override
public int getMaxTotal() {
return maxTotal;
}
@@ -341,6 +343,7 @@ public class GenericKeyedObjectPool<K,T>
* @return true if the pool should block
* @see #setBlockWhenExhausted
*/
+ @Override
public boolean getBlockWhenExhausted() {
return blockWhenExhausted;
}
@@ -371,6 +374,7 @@ public class GenericKeyedObjectPool<K,T>
* @see #setMaxWait
* @see #setBlockWhenExhausted
*/
+ @Override
public long getMaxWait() {
return maxWait;
}
@@ -398,6 +402,7 @@ public class GenericKeyedObjectPool<K,T>
* in a given keyed pool.
* @see #setMaxIdlePerKey
*/
+ @Override
public int getMaxIdlePerKey() {
return maxIdlePerKey;
}
@@ -444,6 +449,7 @@ public class GenericKeyedObjectPool<K,T>
* @since Pool 1.3
* @see #setTimeBetweenEvictionRunsMillis
*/
+ @Override
public int getMinIdlePerKey() {
return minIdlePerKey;
}
@@ -459,6 +465,7 @@ public class GenericKeyedObjectPool<K,T>
* @return <code>true</code> if objects are validated before being borrowed.
* @see #setTestOnBorrow
*/
+ @Override
public boolean getTestOnBorrow() {
return testOnBorrow;
}
@@ -487,6 +494,7 @@ public class GenericKeyedObjectPool<K,T>
* @return <code>true</code> when objects will be validated before being returned.
* @see #setTestOnReturn
*/
+ @Override
public boolean getTestOnReturn() {
return testOnReturn;
}
@@ -513,6 +521,7 @@ public class GenericKeyedObjectPool<K,T>
* @return milliseconds to sleep between evictor runs.
* @see #setTimeBetweenEvictionRunsMillis
*/
+ @Override
public long getTimeBetweenEvictionRunsMillis() {
return timeBetweenEvictionRunsMillis;
}
@@ -539,6 +548,7 @@ public class GenericKeyedObjectPool<K,T>
* @see #setNumTestsPerEvictionRun
* @see #setTimeBetweenEvictionRunsMillis
*/
+ @Override
public int getNumTestsPerEvictionRun() {
return numTestsPerEvictionRun;
}
@@ -571,6 +581,7 @@ public class GenericKeyedObjectPool<K,T>
* @see #setMinEvictableIdleTimeMillis
* @see #setTimeBetweenEvictionRunsMillis
*/
+ @Override
public long getMinEvictableIdleTimeMillis() {
return minEvictableIdleTimeMillis;
}
@@ -666,6 +677,7 @@ public class GenericKeyedObjectPool<K,T>
* @see #setTestWhileIdle
* @see #setTimeBetweenEvictionRunsMillis
*/
+ @Override
public boolean getTestWhileIdle() {
return testWhileIdle;
}
@@ -719,7 +731,8 @@ public class GenericKeyedObjectPool<K,T>
* @return <code>true</code> if the pools are configured to act as LIFO queues
* @since 1.4
*/
- public boolean getLifo() {
+ @Override
+ public boolean getLifo() {
return lifo;
}
@@ -781,6 +794,7 @@ public class GenericKeyedObjectPool<K,T>
* @return object instance from the keyed pool
* @throws NoSuchElementException if a keyed object instance cannot be returned.
*/
+ @Override
public T borrowObject(K key) throws Exception {
return borrowObject(key, getMaxWait());
}
@@ -936,7 +950,8 @@ public class GenericKeyedObjectPool<K,T>
* @param t instance to return to the keyed pool
* @throws Exception
*/
- public void returnObject(K key, T t) throws Exception {
+ @Override
+ public void returnObject(K key, T t) throws Exception {
ObjectDeque<T> objectDeque = poolMap.get(key);
@@ -1024,7 +1039,8 @@ public class GenericKeyedObjectPool<K,T>
* @throws IllegalStateException if obj does not belong to the pool
* under the given key
*/
- public void invalidateObject(K key, T obj) throws Exception {
+ @Override
+ public void invalidateObject(K key, T obj) throws Exception {
ObjectDeque<T> objectDeque = poolMap.get(key);
@@ -1052,7 +1068,8 @@ public class GenericKeyedObjectPool<K,T>
* while removed items are being destroyed.</li>
* <li>Exceptions encountered destroying idle instances are swallowed.</li></ul></p>
*/
- public void clear() {
+ @Override
+ public void clear() {
Iterator<K> iter = poolMap.keySet().iterator();
while (iter.hasNext()) {
@@ -1067,7 +1084,8 @@ public class GenericKeyedObjectPool<K,T>
*
* @param key the key to clear
*/
- public void clear(K key) {
+ @Override
+ public void clear(K key) {
ObjectDeque<T> objectDeque = register(key);
@@ -1096,7 +1114,8 @@ public class GenericKeyedObjectPool<K,T>
*
* @return the total number of instances currently borrowed from this pool
*/
- public int getNumActive() {
+ @Override
+ public int getNumActive() {
return numTotal.get() - getNumIdle();
}
@@ -1105,7 +1124,8 @@ public class GenericKeyedObjectPool<K,T>
*
* @return the total number of instances currently idle in this pool
*/
- public int getNumIdle() {
+ @Override
+ public int getNumIdle() {
Iterator<ObjectDeque<T>> iter = poolMap.values().iterator();
int result = 0;
@@ -1123,7 +1143,8 @@ public class GenericKeyedObjectPool<K,T>
* @param key the key to query
* @return the number of instances corresponding to the given <code>key</code> currently borrowed in this pool
*/
- public int getNumActive(K key) {
+ @Override
+ public int getNumActive(K key) {
final ObjectDeque<T> objectDeque = poolMap.get(key);
if (objectDeque != null) {
return objectDeque.getAllObjects().size() -
@@ -1139,7 +1160,8 @@ public class GenericKeyedObjectPool<K,T>
* @param key the key to query
* @return the number of instances corresponding to the given <code>key</code> currently idle in this pool
*/
- public int getNumIdle(K key) {
+ @Override
+ public int getNumIdle(K key) {
final ObjectDeque<T> objectDeque = poolMap.get(key);
return objectDeque != null ? objectDeque.getIdleObjects().size() : 0;
}
@@ -1155,7 +1177,8 @@ public class GenericKeyedObjectPool<K,T>
*
* @throws Exception
*/
- public void close() throws Exception {
+ @Override
+ public void close() throws Exception {
if (isClosed()) {
return;
}
@@ -1184,7 +1207,8 @@ public class GenericKeyedObjectPool<K,T>
* @return <code>true</code> when this pool has been closed.
* @since Pool 1.4
*/
- public boolean isClosed() {
+ @Override
+ public boolean isClosed() {
return closed;
}
@@ -1708,6 +1732,7 @@ public class GenericKeyedObjectPool<K,T>
* @throws IllegalStateException when no factory has been set or after {@link #close} has been
* called on this pool.
*/
+ @Override
public void addObject(K key) throws Exception {
assertOpen();
if (factory == null) {
@@ -1862,6 +1887,7 @@ public class GenericKeyedObjectPool<K,T>
return (long) result;
}
+ @Override
public Map<String,Integer> getNumActivePerKey() {
HashMap<String,Integer> result = new HashMap<String,Integer>();
@@ -1881,42 +1907,52 @@ public class GenericKeyedObjectPool<K,T>
return result;
}
+ @Override
public long getBorrowedCount() {
return borrowedCount.get();
}
+ @Override
public long getReturnedCount() {
return returnedCount.get();
}
+ @Override
public long getCreatedCount() {
return createdCount.get();
}
+ @Override
public long getDestroyedCount() {
return destroyedCount.get();
}
+ @Override
public long getDestroyedByEvictorCount() {
return destroyedByEvictorCount.get();
}
+ @Override
public long getDestroyedByBorrowValidationCount() {
return destroyedByBorrowValidationCount.get();
}
+ @Override
public long getMeanActiveTimeMillis() {
return getMeanFromStatsCache(activeTimes);
}
+ @Override
public long getMeanIdleTimeMillis() {
return getMeanFromStatsCache(idleTimes);
}
+ @Override
public long getMeanBorrowWaitTimeMillis() {
return getMeanFromStatsCache(waitTimes);
}
+ @Override
public long getMaxBorrowWaitTimeMillis() {
return maxBorrowWaitTimeMillis;
}
Modified: commons/proper/pool/trunk/src/java/org/apache/commons/pool2/impl/GenericObjectPool.java
URL: http://svn.apache.org/viewvc/commons/proper/pool/trunk/src/java/org/apache/commons/pool2/impl/GenericObjectPool.java?rev=1242744&r1=1242743&r2=1242744&view=diff
==============================================================================
--- commons/proper/pool/trunk/src/java/org/apache/commons/pool2/impl/GenericObjectPool.java (original)
+++ commons/proper/pool/trunk/src/java/org/apache/commons/pool2/impl/GenericObjectPool.java Fri Feb 10 11:20:23 2012
@@ -250,6 +250,7 @@ public class GenericObjectPool<T> extend
* pool.
* @see #setMaxTotal
*/
+ @Override
public int getMaxTotal() {
return maxTotal;
}
@@ -277,6 +278,7 @@ public class GenericObjectPool<T> extend
* @return true if should block when the pool is exhuasted
* @see #setBlockWhenExhausted
*/
+ @Override
public boolean getBlockWhenExhausted() {
return blockWhenExhausted;
}
@@ -303,6 +305,7 @@ public class GenericObjectPool<T> extend
* @see #setMaxWait
* @see #setBlockWhenExhausted
*/
+ @Override
public long getMaxWait() {
return maxWait;
}
@@ -329,6 +332,7 @@ public class GenericObjectPool<T> extend
* @return the cap on the number of "idle" instances in the pool.
* @see #setMaxIdle
*/
+ @Override
public int getMaxIdle() {
return maxIdle;
}
@@ -376,6 +380,7 @@ public class GenericObjectPool<T> extend
* @return The minimum number of objects.
* @see #setMinIdle
*/
+ @Override
public int getMinIdle() {
return minIdle;
}
@@ -390,6 +395,7 @@ public class GenericObjectPool<T> extend
* @return <code>true</code> if objects are validated before being borrowed.
* @see #setTestOnBorrow
*/
+ @Override
public boolean getTestOnBorrow() {
return testOnBorrow;
}
@@ -419,6 +425,7 @@ public class GenericObjectPool<T> extend
* to {@link #returnObject}.
* @see #setTestOnReturn
*/
+ @Override
public boolean getTestOnReturn() {
return testOnReturn;
}
@@ -445,6 +452,7 @@ public class GenericObjectPool<T> extend
* @return number of milliseconds to sleep between evictor runs.
* @see #setTimeBetweenEvictionRunsMillis
*/
+ @Override
public long getTimeBetweenEvictionRunsMillis() {
return timeBetweenEvictionRunsMillis;
}
@@ -472,6 +480,7 @@ public class GenericObjectPool<T> extend
* @see #setNumTestsPerEvictionRun
* @see #setTimeBetweenEvictionRunsMillis
*/
+ @Override
public int getNumTestsPerEvictionRun() {
return numTestsPerEvictionRun;
}
@@ -505,6 +514,7 @@ public class GenericObjectPool<T> extend
* @see #setMinEvictableIdleTimeMillis
* @see #setTimeBetweenEvictionRunsMillis
*/
+ @Override
public long getMinEvictableIdleTimeMillis() {
return minEvictableIdleTimeMillis;
}
@@ -600,6 +610,7 @@ public class GenericObjectPool<T> extend
* @see #setTestWhileIdle
* @see #setTimeBetweenEvictionRunsMillis
*/
+ @Override
public boolean getTestWhileIdle() {
return testWhileIdle;
}
@@ -629,6 +640,7 @@ public class GenericObjectPool<T> extend
* @return <code>true</true> if the pool is configured to act as a LIFO queue
* @since 1.4
*/
+ @Override
public boolean getLifo() {
return lifo;
}
@@ -1328,42 +1340,52 @@ public class GenericObjectPool<T> extend
return (long) result;
}
+ @Override
public long getBorrowedCount() {
return borrowedCount.get();
}
+ @Override
public long getReturnedCount() {
return returnedCount.get();
}
+ @Override
public long getCreatedCount() {
return createdCount.get();
}
+ @Override
public long getDestroyedCount() {
return destroyedCount.get();
}
+ @Override
public long getDestroyedByEvictorCount() {
return destroyedByEvictorCount.get();
}
+ @Override
public long getDestroyedByBorrowValidationCount() {
return destroyedByBorrowValidationCount.get();
}
+ @Override
public long getMeanActiveTimeMillis() {
return getMeanFromStatsCache(activeTimes);
}
+ @Override
public long getMeanIdleTimeMillis() {
return getMeanFromStatsCache(idleTimes);
}
+ @Override
public long getMeanBorrowWaitTimeMillis() {
return getMeanFromStatsCache(waitTimes);
}
+ @Override
public long getMaxBorrowWaitTimeMillis() {
return maxBorrowWaitTimeMillis;
}
Modified: commons/proper/pool/trunk/src/java/org/apache/commons/pool2/impl/LinkedBlockingDeque.java
URL: http://svn.apache.org/viewvc/commons/proper/pool/trunk/src/java/org/apache/commons/pool2/impl/LinkedBlockingDeque.java?rev=1242744&r1=1242743&r2=1242744&view=diff
==============================================================================
--- commons/proper/pool/trunk/src/java/org/apache/commons/pool2/impl/LinkedBlockingDeque.java (original)
+++ commons/proper/pool/trunk/src/java/org/apache/commons/pool2/impl/LinkedBlockingDeque.java Fri Feb 10 11:20:23 2012
@@ -616,6 +616,7 @@ public class LinkedBlockingDeque<E>
/**
* @throws NullPointerException if the specified element is null
*/
+ @Override
public boolean offer(E e) {
return offerLast(e);
}
@@ -652,6 +653,7 @@ public class LinkedBlockingDeque<E>
return removeFirst();
}
+ @Override
public E poll() {
return pollFirst();
}
@@ -679,6 +681,7 @@ public class LinkedBlockingDeque<E>
return getFirst();
}
+ @Override
public E peek() {
return peekFirst();
}
@@ -1071,10 +1074,12 @@ public class LinkedBlockingDeque<E>
}
}
+ @Override
public boolean hasNext() {
return next != null;
}
+ @Override
public E next() {
if (next == null)
throw new NoSuchElementException();
@@ -1084,6 +1089,7 @@ public class LinkedBlockingDeque<E>
return x;
}
+ @Override
public void remove() {
Node<E> n = lastRet;
if (n == null)
Modified: commons/proper/pool/trunk/src/java/org/apache/commons/pool2/impl/PooledObject.java
URL: http://svn.apache.org/viewvc/commons/proper/pool/trunk/src/java/org/apache/commons/pool2/impl/PooledObject.java?rev=1242744&r1=1242743&r2=1242744&view=diff
==============================================================================
--- commons/proper/pool/trunk/src/java/org/apache/commons/pool2/impl/PooledObject.java (original)
+++ commons/proper/pool/trunk/src/java/org/apache/commons/pool2/impl/PooledObject.java Fri Feb 10 11:20:23 2012
@@ -85,6 +85,7 @@ public class PooledObject<T> implements
return lastReturnTime;
}
+ @Override
public int compareTo(PooledObject<T> other) {
final long lastActiveDiff =
this.getLastReturnTime() - other.getLastReturnTime();
Modified: commons/proper/pool/trunk/src/test/org/apache/commons/pool2/MethodCallPoolableObjectFactory.java
URL: http://svn.apache.org/viewvc/commons/proper/pool/trunk/src/test/org/apache/commons/pool2/MethodCallPoolableObjectFactory.java?rev=1242744&r1=1242743&r2=1242744&view=diff
==============================================================================
--- commons/proper/pool/trunk/src/test/org/apache/commons/pool2/MethodCallPoolableObjectFactory.java (original)
+++ commons/proper/pool/trunk/src/test/org/apache/commons/pool2/MethodCallPoolableObjectFactory.java Fri Feb 10 11:20:23 2012
@@ -110,6 +110,7 @@ public class MethodCallPoolableObjectFac
this.passivateObjectFail = passivateObjectFail;
}
+ @Override
public Object makeObject() throws Exception {
final MethodCall call = new MethodCall("makeObject");
methodCalls.add(call);
@@ -122,6 +123,7 @@ public class MethodCallPoolableObjectFac
return obj;
}
+ @Override
public void activateObject(final Object obj) throws Exception {
methodCalls.add(new MethodCall("activateObject", obj));
if (activateObjectFail) {
@@ -129,6 +131,7 @@ public class MethodCallPoolableObjectFac
}
}
+ @Override
public boolean validateObject(final Object obj) {
final MethodCall call = new MethodCall("validateObject", obj);
methodCalls.add(call);
@@ -140,6 +143,7 @@ public class MethodCallPoolableObjectFac
return r;
}
+ @Override
public void passivateObject(final Object obj) throws Exception {
methodCalls.add(new MethodCall("passivateObject", obj));
if (passivateObjectFail) {
@@ -147,6 +151,7 @@ public class MethodCallPoolableObjectFac
}
}
+ @Override
public void destroyObject(final Object obj) throws Exception {
methodCalls.add(new MethodCall("destroyObject", obj));
if (destroyObjectFail) {
Modified: commons/proper/pool/trunk/src/test/org/apache/commons/pool2/TestKeyedObjectPool.java
URL: http://svn.apache.org/viewvc/commons/proper/pool/trunk/src/test/org/apache/commons/pool2/TestKeyedObjectPool.java?rev=1242744&r1=1242743&r2=1242744&view=diff
==============================================================================
--- commons/proper/pool/trunk/src/test/org/apache/commons/pool2/TestKeyedObjectPool.java (original)
+++ commons/proper/pool/trunk/src/test/org/apache/commons/pool2/TestKeyedObjectPool.java Fri Feb 10 11:20:23 2012
@@ -720,6 +720,7 @@ public abstract class TestKeyedObjectPoo
this.passivateObjectFail = passivateObjectFail;
}
+ @Override
public Object makeObject(final Object key) throws Exception {
final MethodCall call = new MethodCall("makeObject", key);
methodCalls.add(call);
@@ -732,6 +733,7 @@ public abstract class TestKeyedObjectPoo
return obj;
}
+ @Override
public void activateObject(final Object key, final Object obj) throws Exception {
methodCalls.add(new MethodCall("activateObject", key, obj));
if (activateObjectFail) {
@@ -739,6 +741,7 @@ public abstract class TestKeyedObjectPoo
}
}
+ @Override
public boolean validateObject(final Object key, final Object obj) {
final MethodCall call = new MethodCall("validateObject", key, obj);
methodCalls.add(call);
@@ -750,6 +753,7 @@ public abstract class TestKeyedObjectPoo
return r;
}
+ @Override
public void passivateObject(final Object key, final Object obj) throws Exception {
methodCalls.add(new MethodCall("passivateObject", key, obj));
if (passivateObjectFail) {
@@ -757,6 +761,7 @@ public abstract class TestKeyedObjectPoo
}
}
+ @Override
public void destroyObject(final Object key, final Object obj) throws Exception {
methodCalls.add(new MethodCall("destroyObject", key, obj));
if (destroyObjectFail) {
Modified: commons/proper/pool/trunk/src/test/org/apache/commons/pool2/TestKeyedObjectPoolFactory.java
URL: http://svn.apache.org/viewvc/commons/proper/pool/trunk/src/test/org/apache/commons/pool2/TestKeyedObjectPoolFactory.java?rev=1242744&r1=1242743&r2=1242744&view=diff
==============================================================================
--- commons/proper/pool/trunk/src/test/org/apache/commons/pool2/TestKeyedObjectPoolFactory.java (original)
+++ commons/proper/pool/trunk/src/test/org/apache/commons/pool2/TestKeyedObjectPoolFactory.java Fri Feb 10 11:20:23 2012
@@ -44,22 +44,27 @@ public abstract class TestKeyedObjectPoo
private final MethodCallPoolableObjectFactory wrapped = new MethodCallPoolableObjectFactory();
+ @Override
public Object makeObject(Object key) throws Exception {
return this.wrapped.makeObject();
}
+ @Override
public void destroyObject(Object key, Object obj) throws Exception {
this.wrapped.destroyObject(obj);
}
+ @Override
public boolean validateObject(Object key, Object obj) {
return this.wrapped.validateObject(obj);
}
+ @Override
public void activateObject(Object key, Object obj) throws Exception {
this.wrapped.activateObject(obj);
}
+ @Override
public void passivateObject(Object key, Object obj) throws Exception {
this.wrapped.passivateObject(obj);
}
Modified: commons/proper/pool/trunk/src/test/org/apache/commons/pool2/TestPoolUtils.java
URL: http://svn.apache.org/viewvc/commons/proper/pool/trunk/src/test/org/apache/commons/pool2/TestPoolUtils.java?rev=1242744&r1=1242743&r2=1242744&view=diff
==============================================================================
--- commons/proper/pool/trunk/src/test/org/apache/commons/pool2/TestPoolUtils.java (original)
+++ commons/proper/pool/trunk/src/test/org/apache/commons/pool2/TestPoolUtils.java Fri Feb 10 11:20:23 2012
@@ -772,6 +772,7 @@ public class TestPoolUtils {
this.calledMethods = calledMethods;
}
+ @Override
public Object invoke(final Object proxy, final Method method, final Object[] args) throws Throwable {
calledMethods.add(method.getName());
if (boolean.class.equals(method.getReturnType())) {
Modified: commons/proper/pool/trunk/src/test/org/apache/commons/pool2/VisitTrackerFactory.java
URL: http://svn.apache.org/viewvc/commons/proper/pool/trunk/src/test/org/apache/commons/pool2/VisitTrackerFactory.java?rev=1242744&r1=1242743&r2=1242744&view=diff
==============================================================================
--- commons/proper/pool/trunk/src/test/org/apache/commons/pool2/VisitTrackerFactory.java (original)
+++ commons/proper/pool/trunk/src/test/org/apache/commons/pool2/VisitTrackerFactory.java Fri Feb 10 11:20:23 2012
@@ -31,33 +31,43 @@ public class VisitTrackerFactory<K> impl
public VisitTrackerFactory() {
super();
}
+ @Override
public VisitTracker<K> makeObject() {
return new VisitTracker<K>(nextId++);
}
+ @Override
public VisitTracker<K> makeObject(K key) {
return new VisitTracker<K>(nextId++, key);
}
+ @Override
public void destroyObject(VisitTracker<K> obj) {
obj.destroy();
}
+ @Override
public void destroyObject(K key, VisitTracker<K> obj) {
obj.destroy();
}
+ @Override
public boolean validateObject(VisitTracker<K> obj) {
return obj.validate();
}
+ @Override
public boolean validateObject(K key, VisitTracker<K> obj) {
return obj.validate();
}
+ @Override
public void activateObject(VisitTracker<K> obj) throws Exception {
obj.activate();
}
+ @Override
public void activateObject(K key, VisitTracker<K> obj) throws Exception {
obj.activate();
}
+ @Override
public void passivateObject(VisitTracker<K> obj) throws Exception {
obj.passivate();
}
+ @Override
public void passivateObject(K key, VisitTracker<K> obj) throws Exception {
obj.passivate();
}
Modified: commons/proper/pool/trunk/src/test/org/apache/commons/pool2/WaiterFactory.java
URL: http://svn.apache.org/viewvc/commons/proper/pool/trunk/src/test/org/apache/commons/pool2/WaiterFactory.java?rev=1242744&r1=1242743&r2=1242744&view=diff
==============================================================================
--- commons/proper/pool/trunk/src/test/org/apache/commons/pool2/WaiterFactory.java (original)
+++ commons/proper/pool/trunk/src/test/org/apache/commons/pool2/WaiterFactory.java Fri Feb 10 11:20:23 2012
@@ -97,11 +97,13 @@ KeyedPoolableObjectFactory<K,Waiter> {
validateLatency, waiterLatency, maxActive, Long.MAX_VALUE, 0);
}
+ @Override
public void activateObject(Waiter obj) throws Exception {
doWait(activateLatency);
obj.setActive(true);
}
+ @Override
public void destroyObject(Waiter obj) throws Exception {
doWait(destroyLatency);
obj.setValid(false);
@@ -112,6 +114,7 @@ KeyedPoolableObjectFactory<K,Waiter> {
}
}
+ @Override
public Waiter makeObject() throws Exception {
// Increment and test *before* make
synchronized (this) {
@@ -126,6 +129,7 @@ KeyedPoolableObjectFactory<K,Waiter> {
return new Waiter(false, true, waiterLatency);
}
+ @Override
public void passivateObject(Waiter arg0) throws Exception {
arg0.setActive(false);
doWait(passivateLatency);
@@ -134,6 +138,7 @@ KeyedPoolableObjectFactory<K,Waiter> {
}
}
+ @Override
public boolean validateObject(Waiter arg0) {
doWait(validateLatency);
return arg0.isValid();
@@ -168,10 +173,12 @@ KeyedPoolableObjectFactory<K,Waiter> {
// KeyedPoolableObjectFactory methods
+ @Override
public void activateObject(K key, Waiter obj) throws Exception {
activateObject(obj);
}
+ @Override
public void destroyObject(K key, Waiter obj) throws Exception {
destroyObject(obj);
synchronized (this) {
@@ -180,6 +187,7 @@ KeyedPoolableObjectFactory<K,Waiter> {
}
}
+ @Override
public Waiter makeObject(K key) throws Exception {
synchronized (this) {
Integer count = activeCounts.get(key);
@@ -200,10 +208,12 @@ KeyedPoolableObjectFactory<K,Waiter> {
return makeObject();
}
+ @Override
public void passivateObject(K key, Waiter obj) throws Exception {
passivateObject(obj);
}
+ @Override
public boolean validateObject(K key, Waiter obj) {
return validateObject(obj);
}
Modified: commons/proper/pool/trunk/src/test/org/apache/commons/pool2/impl/TestGenericKeyedObjectPool.java
URL: http://svn.apache.org/viewvc/commons/proper/pool/trunk/src/test/org/apache/commons/pool2/impl/TestGenericKeyedObjectPool.java?rev=1242744&r1=1242743&r2=1242744&view=diff
==============================================================================
--- commons/proper/pool/trunk/src/test/org/apache/commons/pool2/impl/TestGenericKeyedObjectPool.java (original)
+++ commons/proper/pool/trunk/src/test/org/apache/commons/pool2/impl/TestGenericKeyedObjectPool.java Fri Feb 10 11:20:23 2012
@@ -55,6 +55,7 @@ public class TestGenericKeyedObjectPool
KeyedPoolableObjectFactory<Object,Object> factory =
new KeyedPoolableObjectFactory<Object,Object>() {
ConcurrentHashMap<Object,AtomicInteger> map = new ConcurrentHashMap<Object,AtomicInteger>();
+ @Override
public Object makeObject(Object key) {
int counter = 0;
AtomicInteger Counter = map.get(key);
@@ -66,9 +67,13 @@ public class TestGenericKeyedObjectPool
}
return String.valueOf(key) + String.valueOf(counter);
}
+ @Override
public void destroyObject(Object key, Object obj) { }
+ @Override
public boolean validateObject(Object key, Object obj) { return true; }
+ @Override
public void activateObject(Object key, Object obj) { }
+ @Override
public void passivateObject(Object key, Object obj) { }
};
@@ -1411,6 +1416,7 @@ public class TestGenericKeyedObjectPool
_key = key;
}
+ @Override
public void run() {
try {
T obj = _pool.borrowObject(_key);
@@ -1496,6 +1502,7 @@ public class TestGenericKeyedObjectPool
return _failed;
}
+ @Override
public void run() {
for(int i=0;i<_iter;i++) {
String key = String.valueOf(_random.nextInt(3));
@@ -1539,6 +1546,7 @@ public class TestGenericKeyedObjectPool
public SimpleFactory(boolean valid) {
this.valid = valid;
}
+ @Override
public String makeObject(K key) {
String out = null;
synchronized(this) {
@@ -1551,6 +1559,7 @@ public class TestGenericKeyedObjectPool
}
return out;
}
+ @Override
public void destroyObject(K key, String obj) throws Exception {
doWait(destroyLatency);
synchronized(this) {
@@ -1560,6 +1569,7 @@ public class TestGenericKeyedObjectPool
throw new Exception();
}
}
+ @Override
public boolean validateObject(K key, String obj) {
if (enableValidation) {
return validateCounter++%2 == 0 ? evenValid : oddValid;
@@ -1567,6 +1577,7 @@ public class TestGenericKeyedObjectPool
return valid;
}
}
+ @Override
public void activateObject(K key, String obj) throws Exception {
if (exceptionOnActivate) {
if (!(validateCounter++%2 == 0 ? evenValid : oddValid)) {
@@ -1574,6 +1585,7 @@ public class TestGenericKeyedObjectPool
}
}
}
+ @Override
public void passivateObject(K key, String obj) throws Exception {
if (exceptionOnPassivate) {
throw new Exception();
Modified: commons/proper/pool/trunk/src/test/org/apache/commons/pool2/impl/TestGenericObjectPool.java
URL: http://svn.apache.org/viewvc/commons/proper/pool/trunk/src/test/org/apache/commons/pool2/impl/TestGenericObjectPool.java?rev=1242744&r1=1242743&r2=1242744&view=diff
==============================================================================
--- commons/proper/pool/trunk/src/test/org/apache/commons/pool2/impl/TestGenericObjectPool.java (original)
+++ commons/proper/pool/trunk/src/test/org/apache/commons/pool2/impl/TestGenericObjectPool.java Fri Feb 10 11:20:23 2012
@@ -858,6 +858,7 @@ public class TestGenericObjectPool exten
private AtomicInteger callCount = new AtomicInteger(0);
+ @Override
public boolean evict(EvictionConfig config, PooledObject<T> underTest,
int idleCount) {
if (callCount.incrementAndGet() > 1500) {
@@ -1264,6 +1265,7 @@ public class TestGenericObjectPool exten
return _failed;
}
+ @Override
public void run() {
for(int i=0;i<_iter;i++) {
long delay =
@@ -1407,6 +1409,7 @@ public class TestGenericObjectPool exten
public synchronized void setValidateLatency(long validateLatency) {
this.validateLatency = validateLatency;
}
+ @Override
public Object makeObject() {
final long waitLatency;
synchronized(this) {
@@ -1426,6 +1429,7 @@ public class TestGenericObjectPool exten
}
return String.valueOf(counter);
}
+ @Override
public void destroyObject(Object obj) throws Exception {
final long waitLatency;
final boolean hurl;
@@ -1443,6 +1447,7 @@ public class TestGenericObjectPool exten
throw new Exception();
}
}
+ @Override
public boolean validateObject(Object obj) {
final boolean validate;
final boolean evenTest;
@@ -1466,6 +1471,7 @@ public class TestGenericObjectPool exten
return true;
}
}
+ @Override
public void activateObject(Object obj) throws Exception {
final boolean hurl;
final boolean evenTest;
@@ -1483,6 +1489,7 @@ public class TestGenericObjectPool exten
}
}
}
+ @Override
public void passivateObject(Object obj) throws Exception {
final boolean hurl;
synchronized(this) {
Modified: commons/proper/pool/trunk/src/test/org/apache/commons/pool2/impl/TestSoftRefOutOfMemory.java
URL: http://svn.apache.org/viewvc/commons/proper/pool/trunk/src/test/org/apache/commons/pool2/impl/TestSoftRefOutOfMemory.java?rev=1242744&r1=1242743&r2=1242744&view=diff
==============================================================================
--- commons/proper/pool/trunk/src/test/org/apache/commons/pool2/impl/TestSoftRefOutOfMemory.java (original)
+++ commons/proper/pool/trunk/src/test/org/apache/commons/pool2/impl/TestSoftRefOutOfMemory.java Fri Feb 10 11:20:23 2012
@@ -233,6 +233,7 @@ public class TestSoftRefOutOfMemory {
public static class SmallPoolableObjectFactory implements PoolableObjectFactory<String> {
private int counter = 0;
+ @Override
public String makeObject() {
counter++;
// It seems that as of Java 1.4 String.valueOf may return an
@@ -242,11 +243,15 @@ 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) { }
}
@@ -260,15 +265,20 @@ public class TestSoftRefOutOfMemory {
buffer = new String(data);
}
+ @Override
public String makeObject() {
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/org/apache/commons/pool2/impl/TestSoftReferenceObjectPool.java
URL: http://svn.apache.org/viewvc/commons/proper/pool/trunk/src/test/org/apache/commons/pool2/impl/TestSoftReferenceObjectPool.java?rev=1242744&r1=1242743&r2=1242744&view=diff
==============================================================================
--- commons/proper/pool/trunk/src/test/org/apache/commons/pool2/impl/TestSoftReferenceObjectPool.java (original)
+++ commons/proper/pool/trunk/src/test/org/apache/commons/pool2/impl/TestSoftReferenceObjectPool.java Fri Feb 10 11:20:23 2012
@@ -33,10 +33,15 @@ public class TestSoftReferenceObjectPool
return new SoftReferenceObjectPool<Object>(
new PoolableObjectFactory<Object>() {
int counter = 0;
+ @Override
public Object makeObject() { return String.valueOf(counter++); }
+ @Override
public void destroyObject(Object obj) { }
+ @Override
public boolean validateObject(Object obj) { return true; }
+ @Override
public void activateObject(Object obj) { }
+ @Override
public void passivateObject(Object obj) { }
}
);
Modified: commons/proper/pool/trunk/src/test/org/apache/commons/pool2/performance/PerformanceTest.java
URL: http://svn.apache.org/viewvc/commons/proper/pool/trunk/src/test/org/apache/commons/pool2/performance/PerformanceTest.java?rev=1242744&r1=1242743&r2=1242744&view=diff
==============================================================================
--- commons/proper/pool/trunk/src/test/org/apache/commons/pool2/performance/PerformanceTest.java (original)
+++ commons/proper/pool/trunk/src/test/org/apache/commons/pool2/performance/PerformanceTest.java Fri Feb 10 11:20:23 2012
@@ -89,7 +89,8 @@ public class PerformanceTest {
}
}
- public TaskStats call() throws Exception {
+ @Override
+ public TaskStats call() throws Exception {
runOnce(); // warmup
for (int i = 0; i < nrIterations; i++) {
runOnce();
Modified: commons/proper/pool/trunk/src/test/org/apache/commons/pool2/performance/SleepingObjectFactory.java
URL: http://svn.apache.org/viewvc/commons/proper/pool/trunk/src/test/org/apache/commons/pool2/performance/SleepingObjectFactory.java?rev=1242744&r1=1242743&r2=1242744&view=diff
==============================================================================
--- commons/proper/pool/trunk/src/test/org/apache/commons/pool2/performance/SleepingObjectFactory.java (original)
+++ commons/proper/pool/trunk/src/test/org/apache/commons/pool2/performance/SleepingObjectFactory.java Fri Feb 10 11:20:23 2012
@@ -30,6 +30,7 @@ public class SleepingObjectFactory imple
private int counter = 0;
private boolean debug = false;
+ @Override
public Integer makeObject() throws Exception {
Integer obj = new Integer(counter++);
debug("makeObject", obj);
@@ -37,22 +38,26 @@ public class SleepingObjectFactory imple
return obj;
}
+ @Override
public void destroyObject(Integer obj) throws Exception {
debug("destroyObject", obj);
sleep(250);
}
+ @Override
public boolean validateObject(Integer obj) {
debug("validateObject", obj);
sleep(30);
return true;
}
+ @Override
public void activateObject(Integer obj) throws Exception {
debug("activateObject", obj);
sleep(10);
}
+ @Override
public void passivateObject(Integer obj) throws Exception {
debug("passivateObject", obj);
sleep(10);