Author: ggregory
Date: Mon Feb 8 21:47:12 2016
New Revision: 1729268
URL: http://svn.apache.org/viewvc?rev=1729268&view=rev
Log:
Add final modifier to method parameters.
Modified:
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/BaseKeyedPooledObjectFactory.java
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/BaseObject.java
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/BaseObjectPool.java
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/BasePooledObjectFactory.java
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/PoolUtils.java
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/AbandonedConfig.java
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/BaseGenericObjectPool.java
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/BaseObjectPoolConfig.java
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/DefaultEvictionPolicy.java
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/DefaultPooledObject.java
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/DefaultPooledObjectInfo.java
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/EvictionConfig.java
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/EvictionTimer.java
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/GenericKeyedObjectPool.java
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/GenericKeyedObjectPoolConfig.java
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/GenericObjectPool.java
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/GenericObjectPoolConfig.java
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/InterruptibleReentrantLock.java
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/LinkedBlockingDeque.java
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/PoolImplUtils.java
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/PooledSoftReference.java
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/SoftReferenceObjectPool.java
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/proxy/BaseProxyHandler.java
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/proxy/CglibProxyHandler.java
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/proxy/CglibProxySource.java
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/proxy/JdkProxyHandler.java
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/proxy/JdkProxySource.java
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/proxy/ProxiedKeyedObjectPool.java
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/proxy/ProxiedObjectPool.java
commons/proper/pool/trunk/src/test/java/org/apache/commons/pool2/MethodCall.java
commons/proper/pool/trunk/src/test/java/org/apache/commons/pool2/TestBaseKeyedPoolableObjectFactory.java
commons/proper/pool/trunk/src/test/java/org/apache/commons/pool2/TestBaseObjectPool.java
commons/proper/pool/trunk/src/test/java/org/apache/commons/pool2/TestBasePoolableObjectFactory.java
commons/proper/pool/trunk/src/test/java/org/apache/commons/pool2/TestKeyedObjectPool.java
commons/proper/pool/trunk/src/test/java/org/apache/commons/pool2/TestObjectPool.java
commons/proper/pool/trunk/src/test/java/org/apache/commons/pool2/TestPoolUtils.java
commons/proper/pool/trunk/src/test/java/org/apache/commons/pool2/VisitTracker.java
commons/proper/pool/trunk/src/test/java/org/apache/commons/pool2/VisitTrackerFactory.java
commons/proper/pool/trunk/src/test/java/org/apache/commons/pool2/Waiter.java
commons/proper/pool/trunk/src/test/java/org/apache/commons/pool2/WaiterFactory.java
commons/proper/pool/trunk/src/test/java/org/apache/commons/pool2/impl/TestAbandonedObjectPool.java
commons/proper/pool/trunk/src/test/java/org/apache/commons/pool2/impl/TestGenericKeyedObjectPool.java
commons/proper/pool/trunk/src/test/java/org/apache/commons/pool2/impl/TestGenericObjectPool.java
commons/proper/pool/trunk/src/test/java/org/apache/commons/pool2/impl/TestGenericObjectPoolClassLoaders.java
commons/proper/pool/trunk/src/test/java/org/apache/commons/pool2/impl/TestPoolImplUtils.java
commons/proper/pool/trunk/src/test/java/org/apache/commons/pool2/impl/TestSoftRefOutOfMemory.java
commons/proper/pool/trunk/src/test/java/org/apache/commons/pool2/impl/TestSoftReferenceObjectPool.java
commons/proper/pool/trunk/src/test/java/org/apache/commons/pool2/performance/PerformanceTest.java
commons/proper/pool/trunk/src/test/java/org/apache/commons/pool2/performance/SleepingObjectFactory.java
commons/proper/pool/trunk/src/test/java/org/apache/commons/pool2/proxy/BaseTestProxiedKeyedObjectPool.java
commons/proper/pool/trunk/src/test/java/org/apache/commons/pool2/proxy/BaseTestProxiedObjectPool.java
Modified:
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/BaseKeyedPooledObjectFactory.java
URL:
http://svn.apache.org/viewvc/commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/BaseKeyedPooledObjectFactory.java?rev=1729268&r1=1729267&r2=1729268&view=diff
==============================================================================
---
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/BaseKeyedPooledObjectFactory.java
(original)
+++
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/BaseKeyedPooledObjectFactory.java
Mon Feb 8 21:47:12 2016
@@ -58,7 +58,7 @@ public abstract class BaseKeyedPooledObj
public abstract PooledObject<V> wrap(V value);
@Override
- public PooledObject<V> makeObject(K key) throws Exception {
+ public PooledObject<V> makeObject(final K key) throws Exception {
return wrap(create(key));
}
@@ -71,7 +71,7 @@ public abstract class BaseKeyedPooledObj
* @param p a {@code PooledObject} wrapping the the instance to be
destroyed
*/
@Override
- public void destroyObject(K key, PooledObject<V> p)
+ public void destroyObject(final K key, final PooledObject<V> p)
throws Exception {
}
@@ -85,7 +85,7 @@ public abstract class BaseKeyedPooledObj
* @return always <code>true</code> in the default implementation
*/
@Override
- public boolean validateObject(K key, PooledObject<V> p) {
+ public boolean validateObject(final K key, final PooledObject<V> p) {
return true;
}
@@ -98,7 +98,7 @@ public abstract class BaseKeyedPooledObj
* @param p a {@code PooledObject} wrapping the the instance to be
activated
*/
@Override
- public void activateObject(K key, PooledObject<V> p)
+ public void activateObject(final K key, final PooledObject<V> p)
throws Exception {
}
@@ -111,7 +111,7 @@ public abstract class BaseKeyedPooledObj
* @param p a {@code PooledObject} wrapping the the instance to be
passivated
*/
@Override
- public void passivateObject(K key, PooledObject<V> p)
+ public void passivateObject(final K key, final PooledObject<V> p)
throws Exception {
}
}
Modified:
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/BaseObject.java
URL:
http://svn.apache.org/viewvc/commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/BaseObject.java?rev=1729268&r1=1729267&r2=1729268&view=diff
==============================================================================
---
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/BaseObject.java
(original)
+++
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/BaseObject.java
Mon Feb 8 21:47:12 2016
@@ -33,7 +33,7 @@ public abstract class BaseObject {
return builder.toString();
}
- protected void toStringAppendFields(StringBuilder builder) {
+ protected void toStringAppendFields(final StringBuilder builder) {
// do nothing by default, needed for b/w compatibility.
}
Modified:
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/BaseObjectPool.java
URL:
http://svn.apache.org/viewvc/commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/BaseObjectPool.java?rev=1729268&r1=1729267&r2=1729268&view=diff
==============================================================================
---
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/BaseObjectPool.java
(original)
+++
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/BaseObjectPool.java
Mon Feb 8 21:47:12 2016
@@ -119,7 +119,7 @@ public abstract class BaseObjectPool<T>
private volatile boolean closed = false;
- protected void toStringAppendFields(StringBuilder builder) {
+ protected void toStringAppendFields(final StringBuilder builder) {
builder.append("closed=");
builder.append(closed);
}
Modified:
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/BasePooledObjectFactory.java
URL:
http://svn.apache.org/viewvc/commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/BasePooledObjectFactory.java?rev=1729268&r1=1729267&r2=1729268&view=diff
==============================================================================
---
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/BasePooledObjectFactory.java
(original)
+++
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/BasePooledObjectFactory.java
Mon Feb 8 21:47:12 2016
@@ -66,7 +66,7 @@ public abstract class BasePooledObjectFa
* @param p ignored
*/
@Override
- public void destroyObject(PooledObject<T> p)
+ public void destroyObject(final PooledObject<T> p)
throws Exception {
}
@@ -78,7 +78,7 @@ public abstract class BasePooledObjectFa
* @return {@code true}
*/
@Override
- public boolean validateObject(PooledObject<T> p) {
+ public boolean validateObject(final PooledObject<T> p) {
return true;
}
@@ -88,7 +88,7 @@ public abstract class BasePooledObjectFa
* @param p ignored
*/
@Override
- public void activateObject(PooledObject<T> p) throws Exception {
+ public void activateObject(final PooledObject<T> p) throws Exception {
}
/**
@@ -97,7 +97,7 @@ public abstract class BasePooledObjectFa
* @param p ignored
*/
@Override
- public void passivateObject(PooledObject<T> p)
+ public void passivateObject(final PooledObject<T> p)
throws Exception {
}
}
Modified:
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/PoolUtils.java
URL:
http://svn.apache.org/viewvc/commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/PoolUtils.java?rev=1729268&r1=1729267&r2=1729268&view=diff
==============================================================================
---
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/PoolUtils.java
(original)
+++
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/PoolUtils.java
Mon Feb 8 21:47:12 2016
@@ -68,7 +68,7 @@ public final class PoolUtils {
* @throws VirtualMachineError
* if that is passed in
*/
- public static void checkRethrow(Throwable t) {
+ public static void checkRethrow(final Throwable t) {
if (t instanceof ThreadDeath) {
throw (ThreadDeath) t;
}
Modified:
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/AbandonedConfig.java
URL:
http://svn.apache.org/viewvc/commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/AbandonedConfig.java?rev=1729268&r1=1729267&r2=1729268&view=diff
==============================================================================
---
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/AbandonedConfig.java
(original)
+++
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/AbandonedConfig.java
Mon Feb 8 21:47:12 2016
@@ -60,7 +60,7 @@ public class AbandonedConfig {
* removed by borrowObject
* @see #getRemoveAbandonedOnBorrow()
*/
- public void setRemoveAbandonedOnBorrow(boolean removeAbandonedOnBorrow) {
+ public void setRemoveAbandonedOnBorrow(final boolean
removeAbandonedOnBorrow) {
this.removeAbandonedOnBorrow = removeAbandonedOnBorrow;
}
@@ -97,7 +97,7 @@ public class AbandonedConfig {
* removed by pool maintenance
* @see #getRemoveAbandonedOnMaintenance
*/
- public void setRemoveAbandonedOnMaintenance(boolean
removeAbandonedOnMaintenance) {
+ public void setRemoveAbandonedOnMaintenance(final boolean
removeAbandonedOnMaintenance) {
this.removeAbandonedOnMaintenance = removeAbandonedOnMaintenance;
}
@@ -133,7 +133,7 @@ public class AbandonedConfig {
* @param removeAbandonedTimeout new abandoned timeout in seconds
* @see #getRemoveAbandonedTimeout()
*/
- public void setRemoveAbandonedTimeout(int removeAbandonedTimeout) {
+ public void setRemoveAbandonedTimeout(final int removeAbandonedTimeout) {
this.removeAbandonedTimeout = removeAbandonedTimeout;
}
@@ -167,7 +167,7 @@ public class AbandonedConfig {
* @see #getLogAbandoned()
*
*/
- public void setLogAbandoned(boolean logAbandoned) {
+ public void setLogAbandoned(final boolean logAbandoned) {
this.logAbandoned = logAbandoned;
}
@@ -194,7 +194,7 @@ public class AbandonedConfig {
*
* @param logWriter The new log writer
*/
- public void setLogWriter(PrintWriter logWriter) {
+ public void setLogWriter(final PrintWriter logWriter) {
this.logWriter = logWriter;
}
@@ -226,7 +226,7 @@ public class AbandonedConfig {
* the recording of a stack trace on every use
* of a pooled object
*/
- public void setUseUsageTracking(boolean useUsageTracking) {
+ public void setUseUsageTracking(final boolean useUsageTracking) {
this.useUsageTracking = useUsageTracking;
}
Modified:
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/BaseGenericObjectPool.java
URL:
http://svn.apache.org/viewvc/commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/BaseGenericObjectPool.java?rev=1729268&r1=1729267&r2=1729268&view=diff
==============================================================================
---
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/BaseGenericObjectPool.java
(original)
+++
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/BaseGenericObjectPool.java
Mon Feb 8 21:47:12 2016
@@ -129,8 +129,8 @@ public abstract class BaseGenericObjectP
* overridden by the config
* @param jmxNamePrefix Prefix to be used for JMX name for the new pool
*/
- public BaseGenericObjectPool(BaseObjectPoolConfig config,
- String jmxNameBase, String jmxNamePrefix) {
+ public BaseGenericObjectPool(final BaseObjectPoolConfig config,
+ final String jmxNameBase, final String jmxNamePrefix) {
if (config.getJmxEnabled()) {
this.oname = jmxRegister(config, jmxNameBase, jmxNamePrefix);
} else {
@@ -178,7 +178,7 @@ public abstract class BaseGenericObjectP
*
* @see #getMaxTotal
*/
- public final void setMaxTotal(int maxTotal) {
+ public final void setMaxTotal(final int maxTotal) {
this.maxTotal = maxTotal;
}
@@ -207,7 +207,7 @@ public abstract class BaseGenericObjectP
*
* @see #getBlockWhenExhausted
*/
- public final void setBlockWhenExhausted(boolean blockWhenExhausted) {
+ public final void setBlockWhenExhausted(final boolean blockWhenExhausted) {
this.blockWhenExhausted = blockWhenExhausted;
}
@@ -242,7 +242,7 @@ public abstract class BaseGenericObjectP
* @see #getMaxWaitMillis
* @see #setBlockWhenExhausted
*/
- public final void setMaxWaitMillis(long maxWaitMillis) {
+ public final void setMaxWaitMillis(final long maxWaitMillis) {
this.maxWaitMillis = maxWaitMillis;
}
@@ -285,7 +285,7 @@ public abstract class BaseGenericObjectP
*
* @see #getLifo()
*/
- public final void setLifo(boolean lifo) {
+ public final void setLifo(final boolean lifo) {
this.lifo = lifo;
}
@@ -322,7 +322,7 @@ public abstract class BaseGenericObjectP
*
* @since 2.2
*/
- public final void setTestOnCreate(boolean testOnCreate) {
+ public final void setTestOnCreate(final boolean testOnCreate) {
this.testOnCreate = testOnCreate;
}
@@ -357,7 +357,7 @@ public abstract class BaseGenericObjectP
*
* @see #getTestOnBorrow
*/
- public final void setTestOnBorrow(boolean testOnBorrow) {
+ public final void setTestOnBorrow(final boolean testOnBorrow) {
this.testOnBorrow = testOnBorrow;
}
@@ -390,7 +390,7 @@ public abstract class BaseGenericObjectP
*
* @see #getTestOnReturn
*/
- public final void setTestOnReturn(boolean testOnReturn) {
+ public final void setTestOnReturn(final boolean testOnReturn) {
this.testOnReturn = testOnReturn;
}
@@ -427,7 +427,7 @@ public abstract class BaseGenericObjectP
* @see #getTestWhileIdle
* @see #setTimeBetweenEvictionRunsMillis
*/
- public final void setTestWhileIdle(boolean testWhileIdle) {
+ public final void setTestWhileIdle(final boolean testWhileIdle) {
this.testWhileIdle = testWhileIdle;
}
@@ -455,7 +455,7 @@ public abstract class BaseGenericObjectP
* @see #getTimeBetweenEvictionRunsMillis
*/
public final void setTimeBetweenEvictionRunsMillis(
- long timeBetweenEvictionRunsMillis) {
+ final long timeBetweenEvictionRunsMillis) {
this.timeBetweenEvictionRunsMillis = timeBetweenEvictionRunsMillis;
startEvictor(timeBetweenEvictionRunsMillis);
}
@@ -495,7 +495,7 @@ public abstract class BaseGenericObjectP
* @see #getNumTestsPerEvictionRun
* @see #setTimeBetweenEvictionRunsMillis
*/
- public final void setNumTestsPerEvictionRun(int numTestsPerEvictionRun) {
+ public final void setNumTestsPerEvictionRun(final int
numTestsPerEvictionRun) {
this.numTestsPerEvictionRun = numTestsPerEvictionRun;
}
@@ -529,7 +529,7 @@ public abstract class BaseGenericObjectP
* @see #setTimeBetweenEvictionRunsMillis
*/
public final void setMinEvictableIdleTimeMillis(
- long minEvictableIdleTimeMillis) {
+ final long minEvictableIdleTimeMillis) {
this.minEvictableIdleTimeMillis = minEvictableIdleTimeMillis;
}
@@ -570,7 +570,7 @@ public abstract class BaseGenericObjectP
* @see #getSoftMinEvictableIdleTimeMillis
*/
public final void setSoftMinEvictableIdleTimeMillis(
- long softMinEvictableIdleTimeMillis) {
+ final long softMinEvictableIdleTimeMillis) {
this.softMinEvictableIdleTimeMillis = softMinEvictableIdleTimeMillis;
}
@@ -598,7 +598,7 @@ public abstract class BaseGenericObjectP
* @see #getEvictionPolicyClassName()
*/
public final void setEvictionPolicyClassName(
- String evictionPolicyClassName) {
+ final String evictionPolicyClassName) {
try {
Class<?> clazz;
try {
@@ -686,7 +686,7 @@ public abstract class BaseGenericObjectP
*
* @param delay time in milliseconds before start and between eviction runs
*/
- final void startEvictor(long delay) {
+ final void startEvictor(final long delay) {
synchronized (evictionLock) {
if (null != evictor) {
EvictionTimer.cancel(evictor);
@@ -850,7 +850,7 @@ public abstract class BaseGenericObjectP
* for no listener
*/
public final void setSwallowedExceptionListener(
- SwallowedExceptionListener swallowedExceptionListener) {
+ final SwallowedExceptionListener swallowedExceptionListener) {
this.swallowedExceptionListener = swallowedExceptionListener;
}
@@ -860,7 +860,7 @@ public abstract class BaseGenericObjectP
*
* @param e exception to be swallowed
*/
- final void swallowException(Exception e) {
+ final void swallowException(final Exception e) {
final SwallowedExceptionListener listener =
getSwallowedExceptionListener();
if (listener == null) {
@@ -883,7 +883,7 @@ public abstract class BaseGenericObjectP
* @param p object borrowed from the pool
* @param waitTime time (in milliseconds) that the borrowing thread had to
wait
*/
- final void updateStatsBorrow(PooledObject<T> p, long waitTime) {
+ final void updateStatsBorrow(final PooledObject<T> p, final long waitTime)
{
borrowedCount.incrementAndGet();
idleTimes.add(p.getIdleTimeMillis());
waitTimes.add(waitTime);
@@ -903,7 +903,7 @@ public abstract class BaseGenericObjectP
* @param activeTime the amount of time (in milliseconds) that the
returning
* object was checked out
*/
- final void updateStatsReturn(long activeTime) {
+ final void updateStatsReturn(final long activeTime) {
returnedCount.incrementAndGet();
activeTimes.add(activeTime);
}
@@ -937,8 +937,8 @@ public abstract class BaseGenericObjectP
* @param jmxNamePrefix name prefix
* @return registered ObjectName, null if registration fails
*/
- private ObjectName jmxRegister(BaseObjectPoolConfig config,
- String jmxNameBase, String jmxNamePrefix) {
+ private ObjectName jmxRegister(final BaseObjectPoolConfig config,
+ final String jmxNameBase, String jmxNamePrefix) {
ObjectName objectName = null;
final MBeanServer mbs = ManagementFactory.getPlatformMBeanServer();
int i = 1;
@@ -990,7 +990,7 @@ public abstract class BaseGenericObjectP
* @param e exception to trace
* @return exception stack trace as a string
*/
- private String getStackTrace(Exception e) {
+ private String getStackTrace(final Exception e) {
// Need the exception in string form to prevent the retention of
// references to classes in the stack trace that could trigger a memory
// leak in a container environment.
@@ -1072,7 +1072,7 @@ public abstract class BaseGenericObjectP
*
* @param size number of values to maintain in the cache.
*/
- public StatsStore(int size) {
+ public StatsStore(final int size) {
this.size = size;
values = new AtomicLong[size];
for (int i = 0; i < size; i++) {
@@ -1086,7 +1086,7 @@ public abstract class BaseGenericObjectP
*
* @param value new value to add to the cache.
*/
- public synchronized void add(long value) {
+ public synchronized void add(final long value) {
values[index].set(value);
index++;
if (index == size) {
@@ -1195,7 +1195,7 @@ public abstract class BaseGenericObjectP
*
* @param instance object to wrap
*/
- public IdentityWrapper(T instance) {
+ public IdentityWrapper(final T instance) {
this.instance = instance;
}
@@ -1206,7 +1206,7 @@ public abstract class BaseGenericObjectP
@Override
@SuppressWarnings("rawtypes")
- public boolean equals(Object other) {
+ public boolean equals(final Object other) {
return ((IdentityWrapper) other).instance == instance;
}
@@ -1227,7 +1227,7 @@ public abstract class BaseGenericObjectP
}
}
- protected void toStringAppendFields(StringBuilder builder) {
+ protected void toStringAppendFields(final StringBuilder builder) {
builder.append("maxTotal=");
builder.append(maxTotal);
builder.append(", blockWhenExhausted=");
Modified:
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/BaseObjectPoolConfig.java
URL:
http://svn.apache.org/viewvc/commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/BaseObjectPoolConfig.java?rev=1729268&r1=1729267&r2=1729268&view=diff
==============================================================================
---
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/BaseObjectPoolConfig.java
(original)
+++
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/BaseObjectPoolConfig.java
Mon Feb 8 21:47:12 2016
@@ -232,7 +232,7 @@ public abstract class BaseObjectPoolConf
* @see GenericObjectPool#getLifo()
* @see GenericKeyedObjectPool#getLifo()
*/
- public void setLifo(boolean lifo) {
+ public void setLifo(final boolean lifo) {
this.lifo = lifo;
}
@@ -246,7 +246,7 @@ public abstract class BaseObjectPoolConf
* @see GenericObjectPool#getFairness()
* @see GenericKeyedObjectPool#getFairness()
*/
- public void setFairness(boolean fairness) {
+ public void setFairness(final boolean fairness) {
this.fairness = fairness;
}
@@ -274,7 +274,7 @@ public abstract class BaseObjectPoolConf
* @see GenericObjectPool#getMaxWaitMillis()
* @see GenericKeyedObjectPool#getMaxWaitMillis()
*/
- public void setMaxWaitMillis(long maxWaitMillis) {
+ public void setMaxWaitMillis(final long maxWaitMillis) {
this.maxWaitMillis = maxWaitMillis;
}
@@ -302,7 +302,7 @@ public abstract class BaseObjectPoolConf
* @see GenericObjectPool#getMinEvictableIdleTimeMillis()
* @see GenericKeyedObjectPool#getMinEvictableIdleTimeMillis()
*/
- public void setMinEvictableIdleTimeMillis(long minEvictableIdleTimeMillis)
{
+ public void setMinEvictableIdleTimeMillis(final long
minEvictableIdleTimeMillis) {
this.minEvictableIdleTimeMillis = minEvictableIdleTimeMillis;
}
@@ -334,7 +334,7 @@ public abstract class BaseObjectPoolConf
* @see GenericKeyedObjectPool#getSoftMinEvictableIdleTimeMillis()
*/
public void setSoftMinEvictableIdleTimeMillis(
- long softMinEvictableIdleTimeMillis) {
+ final long softMinEvictableIdleTimeMillis) {
this.softMinEvictableIdleTimeMillis = softMinEvictableIdleTimeMillis;
}
@@ -362,7 +362,7 @@ public abstract class BaseObjectPoolConf
* @see GenericObjectPool#getNumTestsPerEvictionRun()
* @see GenericKeyedObjectPool#getNumTestsPerEvictionRun()
*/
- public void setNumTestsPerEvictionRun(int numTestsPerEvictionRun) {
+ public void setNumTestsPerEvictionRun(final int numTestsPerEvictionRun) {
this.numTestsPerEvictionRun = numTestsPerEvictionRun;
}
@@ -394,7 +394,7 @@ public abstract class BaseObjectPoolConf
*
* @since 2.2
*/
- public void setTestOnCreate(boolean testOnCreate) {
+ public void setTestOnCreate(final boolean testOnCreate) {
this.testOnCreate = testOnCreate;
}
@@ -422,7 +422,7 @@ public abstract class BaseObjectPoolConf
* @see GenericObjectPool#getTestOnBorrow()
* @see GenericKeyedObjectPool#getTestOnBorrow()
*/
- public void setTestOnBorrow(boolean testOnBorrow) {
+ public void setTestOnBorrow(final boolean testOnBorrow) {
this.testOnBorrow = testOnBorrow;
}
@@ -450,7 +450,7 @@ public abstract class BaseObjectPoolConf
* @see GenericObjectPool#getTestOnReturn()
* @see GenericKeyedObjectPool#getTestOnReturn()
*/
- public void setTestOnReturn(boolean testOnReturn) {
+ public void setTestOnReturn(final boolean testOnReturn) {
this.testOnReturn = testOnReturn;
}
@@ -478,7 +478,7 @@ public abstract class BaseObjectPoolConf
* @see GenericObjectPool#getTestWhileIdle()
* @see GenericKeyedObjectPool#getTestWhileIdle()
*/
- public void setTestWhileIdle(boolean testWhileIdle) {
+ public void setTestWhileIdle(final boolean testWhileIdle) {
this.testWhileIdle = testWhileIdle;
}
@@ -508,7 +508,7 @@ public abstract class BaseObjectPoolConf
* @see GenericKeyedObjectPool#getTimeBetweenEvictionRunsMillis()
*/
public void setTimeBetweenEvictionRunsMillis(
- long timeBetweenEvictionRunsMillis) {
+ final long timeBetweenEvictionRunsMillis) {
this.timeBetweenEvictionRunsMillis = timeBetweenEvictionRunsMillis;
}
@@ -536,7 +536,7 @@ public abstract class BaseObjectPoolConf
* @see GenericObjectPool#getEvictionPolicyClassName()
* @see GenericKeyedObjectPool#getEvictionPolicyClassName()
*/
- public void setEvictionPolicyClassName(String evictionPolicyClassName) {
+ public void setEvictionPolicyClassName(final String
evictionPolicyClassName) {
this.evictionPolicyClassName = evictionPolicyClassName;
}
@@ -564,7 +564,7 @@ public abstract class BaseObjectPoolConf
* @see GenericObjectPool#getBlockWhenExhausted()
* @see GenericKeyedObjectPool#getBlockWhenExhausted()
*/
- public void setBlockWhenExhausted(boolean blockWhenExhausted) {
+ public void setBlockWhenExhausted(final boolean blockWhenExhausted) {
this.blockWhenExhausted = blockWhenExhausted;
}
@@ -586,7 +586,7 @@ public abstract class BaseObjectPoolConf
* @param jmxEnabled The new setting of {@code jmxEnabled}
* for this configuration instance
*/
- public void setJmxEnabled(boolean jmxEnabled) {
+ public void setJmxEnabled(final boolean jmxEnabled) {
this.jmxEnabled = jmxEnabled;
}
@@ -612,7 +612,7 @@ public abstract class BaseObjectPoolConf
* @param jmxNameBase The new setting of {@code jmxNameBase}
* for this configuration instance
*/
- public void setJmxNameBase(String jmxNameBase) {
+ public void setJmxNameBase(final String jmxNameBase) {
this.jmxNameBase = jmxNameBase;
}
@@ -636,11 +636,11 @@ public abstract class BaseObjectPoolConf
* @param jmxNamePrefix The new setting of {@code jmxNamePrefix}
* for this configuration instance
*/
- public void setJmxNamePrefix(String jmxNamePrefix) {
+ public void setJmxNamePrefix(final String jmxNamePrefix) {
this.jmxNamePrefix = jmxNamePrefix;
}
- protected void toStringAppendFields(StringBuilder builder) {
+ protected void toStringAppendFields(final StringBuilder builder) {
builder.append("lifo=");
builder.append(lifo);
builder.append(", fairness=");
Modified:
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/DefaultEvictionPolicy.java
URL:
http://svn.apache.org/viewvc/commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/DefaultEvictionPolicy.java?rev=1729268&r1=1729267&r2=1729268&view=diff
==============================================================================
---
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/DefaultEvictionPolicy.java
(original)
+++
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/DefaultEvictionPolicy.java
Mon Feb 8 21:47:12 2016
@@ -42,8 +42,8 @@ import org.apache.commons.pool2.PooledOb
public class DefaultEvictionPolicy<T> implements EvictionPolicy<T> {
@Override
- public boolean evict(EvictionConfig config, PooledObject<T> underTest,
- int idleCount) {
+ public boolean evict(final EvictionConfig config, final PooledObject<T>
underTest,
+ final int idleCount) {
if ((config.getIdleSoftEvictTime() < underTest.getIdleTimeMillis() &&
config.getMinIdle() < idleCount) ||
Modified:
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/DefaultPooledObject.java
URL:
http://svn.apache.org/viewvc/commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/DefaultPooledObject.java?rev=1729268&r1=1729267&r2=1729268&view=diff
==============================================================================
---
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/DefaultPooledObject.java
(original)
+++
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/DefaultPooledObject.java
Mon Feb 8 21:47:12 2016
@@ -56,7 +56,7 @@ public class DefaultPooledObject<T> impl
*
* @param object The object to wrap
*/
- public DefaultPooledObject(T object) {
+ public DefaultPooledObject(final T object) {
this.object = object;
}
@@ -128,7 +128,7 @@ public class DefaultPooledObject<T> impl
}
@Override
- public int compareTo(PooledObject<T> other) {
+ public int compareTo(final PooledObject<T> other) {
final long lastActiveDiff = this.getLastReturnTime() -
other.getLastReturnTime();
if (lastActiveDiff == 0) {
// Make sure the natural ordering is broadly consistent with equals
@@ -166,7 +166,7 @@ public class DefaultPooledObject<T> impl
@Override
public synchronized boolean endEvictionTest(
- Deque<PooledObject<T>> idleQueue) {
+ final Deque<PooledObject<T>> idleQueue) {
if (state == PooledObjectState.EVICTION) {
state = PooledObjectState.IDLE;
return true;
@@ -240,7 +240,7 @@ public class DefaultPooledObject<T> impl
}
@Override
- public void printStackTrace(PrintWriter writer) {
+ public void printStackTrace(final PrintWriter writer) {
boolean written = false;
final Exception borrowedByCopy = this.borrowedBy;
if (borrowedByCopy != null) {
@@ -283,7 +283,7 @@ public class DefaultPooledObject<T> impl
}
@Override
- public void setLogAbandoned(boolean logAbandoned) {
+ public void setLogAbandoned(final boolean logAbandoned) {
this.logAbandoned = logAbandoned;
}
Modified:
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/DefaultPooledObjectInfo.java
URL:
http://svn.apache.org/viewvc/commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/DefaultPooledObjectInfo.java?rev=1729268&r1=1729267&r2=1729268&view=diff
==============================================================================
---
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/DefaultPooledObjectInfo.java
(original)
+++
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/DefaultPooledObjectInfo.java
Mon Feb 8 21:47:12 2016
@@ -37,7 +37,7 @@ public class DefaultPooledObjectInfo imp
*
* @param pooledObject The pooled object that this instance will represent
*/
- public DefaultPooledObjectInfo(PooledObject<?> pooledObject) {
+ public DefaultPooledObjectInfo(final PooledObject<?> pooledObject) {
this.pooledObject = pooledObject;
}
Modified:
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/EvictionConfig.java
URL:
http://svn.apache.org/viewvc/commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/EvictionConfig.java?rev=1729268&r1=1729267&r2=1729268&view=diff
==============================================================================
---
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/EvictionConfig.java
(original)
+++
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/EvictionConfig.java
Mon Feb 8 21:47:12 2016
@@ -45,8 +45,8 @@ public class EvictionConfig {
* {@link GenericObjectPool#getMinIdle()} or
* {@link GenericKeyedObjectPool#getMinIdlePerKey()}
*/
- public EvictionConfig(long poolIdleEvictTime, long poolIdleSoftEvictTime,
- int minIdle) {
+ public EvictionConfig(final long poolIdleEvictTime, final long
poolIdleSoftEvictTime,
+ final int minIdle) {
if (poolIdleEvictTime > 0) {
idleEvictTime = poolIdleEvictTime;
} else {
Modified:
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/EvictionTimer.java
URL:
http://svn.apache.org/viewvc/commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/EvictionTimer.java?rev=1729268&r1=1729267&r2=1729268&view=diff
==============================================================================
---
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/EvictionTimer.java
(original)
+++
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/EvictionTimer.java
Mon Feb 8 21:47:12 2016
@@ -58,7 +58,7 @@ class EvictionTimer {
* @param delay Delay in milliseconds before task is executed
* @param period Time in milliseconds between executions
*/
- static synchronized void schedule(TimerTask task, long delay, long period)
{
+ static synchronized void schedule(final TimerTask task, final long delay,
final long period) {
if (null == _timer) {
// Force the new Timer thread to be created with a context class
// loader set to the class loader that loaded this library
@@ -80,7 +80,7 @@ class EvictionTimer {
* Remove the specified eviction task from the timer.
* @param task Task to be scheduled
*/
- static synchronized void cancel(TimerTask task) {
+ static synchronized void cancel(final TimerTask task) {
task.cancel();
_usageCount--;
if (_usageCount == 0) {
@@ -115,7 +115,7 @@ class EvictionTimer {
* Create a new PrivilegedSetTccl using the given classloader
* @param classLoader ClassLoader to use
*/
- PrivilegedSetTccl(ClassLoader cl) {
+ PrivilegedSetTccl(final ClassLoader cl) {
this.classLoader = cl;
}
Modified:
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/GenericKeyedObjectPool.java
URL:
http://svn.apache.org/viewvc/commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/GenericKeyedObjectPool.java?rev=1729268&r1=1729267&r2=1729268&view=diff
==============================================================================
---
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/GenericKeyedObjectPool.java
(original)
+++
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/GenericKeyedObjectPool.java
Mon Feb 8 21:47:12 2016
@@ -83,7 +83,7 @@ public class GenericKeyedObjectPool<K,T>
* {@link GenericKeyedObjectPoolConfig}.
* @param factory the factory to be used to create entries
*/
- public GenericKeyedObjectPool(KeyedPooledObjectFactory<K,T> factory) {
+ public GenericKeyedObjectPool(final KeyedPooledObjectFactory<K,T> factory)
{
this(factory, new GenericKeyedObjectPoolConfig());
}
@@ -97,8 +97,8 @@ public class GenericKeyedObjectPool<K,T>
* the configuration object will not be reflected in the
* pool.
*/
- public GenericKeyedObjectPool(KeyedPooledObjectFactory<K,T> factory,
- GenericKeyedObjectPoolConfig config) {
+ public GenericKeyedObjectPool(final KeyedPooledObjectFactory<K,T> factory,
+ final GenericKeyedObjectPoolConfig config) {
super(config, ONAME_BASE, config.getJmxNamePrefix());
@@ -137,7 +137,7 @@ public class GenericKeyedObjectPool<K,T>
*
* @see #getMaxTotalPerKey
*/
- public void setMaxTotalPerKey(int maxTotalPerKey) {
+ public void setMaxTotalPerKey(final int maxTotalPerKey) {
this.maxTotalPerKey = maxTotalPerKey;
}
@@ -178,7 +178,7 @@ public class GenericKeyedObjectPool<K,T>
*
* @see #getMaxIdlePerKey
*/
- public void setMaxIdlePerKey(int maxIdlePerKey) {
+ public void setMaxIdlePerKey(final int maxIdlePerKey) {
this.maxIdlePerKey = maxIdlePerKey;
}
@@ -200,7 +200,7 @@ public class GenericKeyedObjectPool<K,T>
* @see #getMaxIdlePerKey()
* @see #setTimeBetweenEvictionRunsMillis
*/
- public void setMinIdlePerKey(int minIdlePerKey) {
+ public void setMinIdlePerKey(final int minIdlePerKey) {
this.minIdlePerKey = minIdlePerKey;
}
@@ -236,7 +236,7 @@ public class GenericKeyedObjectPool<K,T>
*
* @see GenericKeyedObjectPoolConfig
*/
- public void setConfig(GenericKeyedObjectPoolConfig conf) {
+ public void setConfig(final GenericKeyedObjectPoolConfig conf) {
setLifo(conf.getLifo());
setMaxIdlePerKey(conf.getMaxIdlePerKey());
setMaxTotalPerKey(conf.getMaxTotalPerKey());
@@ -274,7 +274,7 @@ public class GenericKeyedObjectPool<K,T>
* {@inheritDoc}
*/
@Override
- public T borrowObject(K key) throws Exception {
+ public T borrowObject(final K key) throws Exception {
return borrowObject(key, getMaxWaitMillis());
}
@@ -334,7 +334,7 @@ public class GenericKeyedObjectPool<K,T>
* @throws Exception if a keyed object instance cannot be returned due to
an
* error
*/
- public T borrowObject(K key, long borrowMaxWaitMillis) throws Exception {
+ public T borrowObject(final K key, final long borrowMaxWaitMillis) throws
Exception {
assertOpen();
PooledObject<T> p = null;
@@ -466,7 +466,7 @@ public class GenericKeyedObjectPool<K,T>
* returned to the pool multiple times
*/
@Override
- public void returnObject(K key, T obj) {
+ public void returnObject(final K key, final T obj) {
final ObjectDeque<T> objectDeque = poolMap.get(key);
@@ -579,7 +579,7 @@ public class GenericKeyedObjectPool<K,T>
* under the given key
*/
@Override
- public void invalidateObject(K key, T obj) throws Exception {
+ public void invalidateObject(final K key, final T obj) throws Exception {
final ObjectDeque<T> objectDeque = poolMap.get(key);
@@ -636,7 +636,7 @@ public class GenericKeyedObjectPool<K,T>
* @param key the key to clear
*/
@Override
- public void clear(K key) {
+ public void clear(final K key) {
final ObjectDeque<T> objectDeque = register(key);
@@ -680,7 +680,7 @@ public class GenericKeyedObjectPool<K,T>
@Override
- public int getNumActive(K key) {
+ public int getNumActive(final K key) {
final ObjectDeque<T> objectDeque = poolMap.get(key);
if (objectDeque != null) {
return objectDeque.getAllObjects().size() -
@@ -691,7 +691,7 @@ public class GenericKeyedObjectPool<K,T>
@Override
- public int getNumIdle(K key) {
+ public int getNumIdle(final K key) {
final ObjectDeque<T> objectDeque = poolMap.get(key);
return objectDeque != null ? objectDeque.getIdleObjects().size() : 0;
}
@@ -1000,7 +1000,7 @@ public class GenericKeyedObjectPool<K,T>
*
* @throws Exception If the objection creation fails
*/
- private PooledObject<T> create(K key) throws Exception {
+ private PooledObject<T> create(final K key) throws Exception {
final int maxTotalPerKeySave = getMaxTotalPerKey(); // Per key
final int maxTotal = getMaxTotal(); // All keys
@@ -1056,7 +1056,7 @@ public class GenericKeyedObjectPool<K,T>
* @return {@code true} if the object was destroyed, otherwise {@code
false}
* @throws Exception If the object destruction failed
*/
- private boolean destroy(K key, PooledObject<T> toDestroy, boolean always)
+ private boolean destroy(final K key, final PooledObject<T> toDestroy,
final boolean always)
throws Exception {
final ObjectDeque<T> objectDeque = register(key);
@@ -1095,7 +1095,7 @@ public class GenericKeyedObjectPool<K,T>
* method returns without throwing an exception then it will never
* return null.
*/
- private ObjectDeque<T> register(K k) {
+ private ObjectDeque<T> register(final K k) {
Lock lock = keyLock.readLock();
ObjectDeque<T> objectDeque = null;
try {
@@ -1134,7 +1134,7 @@ public class GenericKeyedObjectPool<K,T>
*
* @param k The key to de-register
*/
- private void deregister(K k) {
+ private void deregister(final K k) {
ObjectDeque<T> objectDeque;
objectDeque = poolMap.get(k);
@@ -1178,7 +1178,7 @@ public class GenericKeyedObjectPool<K,T>
*
* @throws Exception If a new object is required and cannot be created
*/
- private void ensureMinIdle(K key) throws Exception {
+ private void ensureMinIdle(final K key) throws Exception {
// Calculate current pool objects
final ObjectDeque<T> objectDeque = poolMap.get(key);
@@ -1209,7 +1209,7 @@ public class GenericKeyedObjectPool<K,T>
* fails.
*/
@Override
- public void addObject(K key) throws Exception {
+ public void addObject(final K key) throws Exception {
assertOpen();
register(key);
try {
@@ -1228,7 +1228,7 @@ public class GenericKeyedObjectPool<K,T>
*
* @throws Exception If the associated factory fails to passivate the
object
*/
- private void addIdleObject(K key, PooledObject<T> p) throws Exception {
+ private void addIdleObject(final K key, final PooledObject<T> p) throws
Exception {
if (p != null) {
factory.passivateObject(key, p);
@@ -1250,7 +1250,7 @@ public class GenericKeyedObjectPool<K,T>
*
* @throws Exception If the associated factory throws an exception
*/
- public void preparePool(K key) throws Exception {
+ public void preparePool(final K key) throws Exception {
final int minIdlePerKeySave = getMinIdlePerKey();
if (minIdlePerKeySave < 1) {
return;
@@ -1282,7 +1282,7 @@ public class GenericKeyedObjectPool<K,T>
*
* @return The number of new objects to create
*/
- private int calculateDeficit(ObjectDeque<T> objectDeque) {
+ private int calculateDeficit(final ObjectDeque<T> objectDeque) {
if (objectDeque == null) {
return getMinIdlePerKey();
@@ -1451,7 +1451,7 @@ public class GenericKeyedObjectPool<K,T>
* @param fairness true means client threads waiting to borrow /
return instances
* will be served as if waiting in a FIFO queue.
*/
- public ObjectDeque(boolean fairness) {
+ public ObjectDeque(final boolean fairness) {
idleObjects = new LinkedBlockingDeque<PooledObject<S>>(fairness);
}
@@ -1552,7 +1552,7 @@ public class GenericKeyedObjectPool<K,T>
"org.apache.commons.pool2:type=GenericKeyedObjectPool,name=";
@Override
- protected void toStringAppendFields(StringBuilder builder) {
+ protected void toStringAppendFields(final StringBuilder builder) {
super.toStringAppendFields(builder);
builder.append(", maxIdlePerKey=");
builder.append(maxIdlePerKey);
Modified:
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/GenericKeyedObjectPoolConfig.java
URL:
http://svn.apache.org/viewvc/commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/GenericKeyedObjectPoolConfig.java?rev=1729268&r1=1729267&r2=1729268&view=diff
==============================================================================
---
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/GenericKeyedObjectPoolConfig.java
(original)
+++
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/GenericKeyedObjectPoolConfig.java
Mon Feb 8 21:47:12 2016
@@ -91,7 +91,7 @@ public class GenericKeyedObjectPoolConfi
*
* @see GenericKeyedObjectPool#setMaxTotal(int)
*/
- public void setMaxTotal(int maxTotal) {
+ public void setMaxTotal(final int maxTotal) {
this.maxTotal = maxTotal;
}
@@ -117,7 +117,7 @@ public class GenericKeyedObjectPoolConfi
*
* @see GenericKeyedObjectPool#setMaxTotalPerKey(int)
*/
- public void setMaxTotalPerKey(int maxTotalPerKey) {
+ public void setMaxTotalPerKey(final int maxTotalPerKey) {
this.maxTotalPerKey = maxTotalPerKey;
}
@@ -143,7 +143,7 @@ public class GenericKeyedObjectPoolConfi
*
* @see GenericKeyedObjectPool#setMinIdlePerKey(int)
*/
- public void setMinIdlePerKey(int minIdlePerKey) {
+ public void setMinIdlePerKey(final int minIdlePerKey) {
this.minIdlePerKey = minIdlePerKey;
}
@@ -169,7 +169,7 @@ public class GenericKeyedObjectPoolConfi
*
* @see GenericKeyedObjectPool#setMaxIdlePerKey(int)
*/
- public void setMaxIdlePerKey(int maxIdlePerKey) {
+ public void setMaxIdlePerKey(final int maxIdlePerKey) {
this.maxIdlePerKey = maxIdlePerKey;
}
@@ -182,7 +182,7 @@ public class GenericKeyedObjectPoolConfi
}
}
- protected void toStringAppendFields(StringBuilder builder) {
+ protected void toStringAppendFields(final StringBuilder builder) {
super.toStringAppendFields(builder);
builder.append(", minIdlePerKey=");
builder.append(minIdlePerKey);
Modified:
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/GenericObjectPool.java
URL:
http://svn.apache.org/viewvc/commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/GenericObjectPool.java?rev=1729268&r1=1729267&r2=1729268&view=diff
==============================================================================
---
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/GenericObjectPool.java
(original)
+++
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/GenericObjectPool.java
Mon Feb 8 21:47:12 2016
@@ -86,7 +86,7 @@ public class GenericObjectPool<T> extend
* @param factory The object factory to be used to create object instances
* used by this pool
*/
- public GenericObjectPool(PooledObjectFactory<T> factory) {
+ public GenericObjectPool(final PooledObjectFactory<T> factory) {
this(factory, new GenericObjectPoolConfig());
}
@@ -101,8 +101,8 @@ public class GenericObjectPool<T> extend
* the configuration object will not be reflected in the
* pool.
*/
- public GenericObjectPool(PooledObjectFactory<T> factory,
- GenericObjectPoolConfig config) {
+ public GenericObjectPool(final PooledObjectFactory<T> factory,
+ final GenericObjectPoolConfig config) {
super(config, ONAME_BASE, config.getJmxNamePrefix());
@@ -132,8 +132,8 @@ public class GenericObjectPool<T> extend
* @param abandonedConfig Configuration for abandoned object
identification
* and removal. The configuration is used by
value.
*/
- public GenericObjectPool(PooledObjectFactory<T> factory,
- GenericObjectPoolConfig config, AbandonedConfig abandonedConfig) {
+ public GenericObjectPool(final PooledObjectFactory<T> factory,
+ final GenericObjectPoolConfig config, final AbandonedConfig
abandonedConfig) {
this(factory, config);
setAbandonedConfig(abandonedConfig);
}
@@ -173,7 +173,7 @@ public class GenericObjectPool<T> extend
*
* @see #getMaxIdle
*/
- public void setMaxIdle(int maxIdle) {
+ public void setMaxIdle(final int maxIdle) {
this.maxIdle = maxIdle;
}
@@ -194,7 +194,7 @@ public class GenericObjectPool<T> extend
* @see #getMaxIdle()
* @see #getTimeBetweenEvictionRunsMillis()
*/
- public void setMinIdle(int minIdle) {
+ public void setMinIdle(final int minIdle) {
this.minIdle = minIdle;
}
@@ -300,7 +300,7 @@ public class GenericObjectPool<T> extend
*
* @see GenericObjectPoolConfig
*/
- public void setConfig(GenericObjectPoolConfig conf) {
+ public void setConfig(final GenericObjectPoolConfig conf) {
setLifo(conf.getLifo());
setMaxIdle(conf.getMaxIdle());
setMinIdle(conf.getMinIdle());
@@ -327,7 +327,7 @@ public class GenericObjectPool<T> extend
*
* @see AbandonedConfig
*/
- public void setAbandonedConfig(AbandonedConfig abandonedConfig) {
+ public void setAbandonedConfig(final AbandonedConfig abandonedConfig) {
if (abandonedConfig == null) {
this.abandonedConfig = null;
} else {
@@ -407,7 +407,7 @@ public class GenericObjectPool<T> extend
* @throws Exception if an object instance cannot be returned due to an
* error
*/
- public T borrowObject(long borrowMaxWaitMillis) throws Exception {
+ public T borrowObject(final long borrowMaxWaitMillis) throws Exception {
assertOpen();
final AbandonedConfig ac = this.abandonedConfig;
@@ -532,7 +532,7 @@ public class GenericObjectPool<T> extend
* but notified via a {@link SwallowedExceptionListener}.
*/
@Override
- public void returnObject(T obj) {
+ public void returnObject(final T obj) {
final PooledObject<T> p = allObjects.get(new IdentityWrapper<T>(obj));
if (p == null) {
@@ -628,7 +628,7 @@ public class GenericObjectPool<T> extend
* @throws IllegalStateException if obj does not belong to this pool
*/
@Override
- public void invalidateObject(T obj) throws Exception {
+ public void invalidateObject(final T obj) throws Exception {
final PooledObject<T> p = allObjects.get(new IdentityWrapper<T>(obj));
if (p == null) {
if (isAbandonedConfig()) {
@@ -885,7 +885,7 @@ public class GenericObjectPool<T> extend
* @throws Exception If the factory fails to destroy the pooled object
* cleanly
*/
- private void destroy(PooledObject<T> toDestory) throws Exception {
+ private void destroy(final PooledObject<T> toDestory) throws Exception {
toDestory.invalidate();
idleObjects.remove(toDestory);
allObjects.remove(new IdentityWrapper<T>(toDestory.getObject()));
@@ -914,7 +914,7 @@ public class GenericObjectPool<T> extend
* @param always true means create instances even if the pool has no
threads waiting
* @throws Exception if the factory's makeObject throws
*/
- private void ensureIdle(int idleCount, boolean always) throws Exception {
+ private void ensureIdle(final int idleCount, final boolean always) throws
Exception {
if (idleCount < 1 || isClosed() || (!always &&
!idleObjects.hasTakeWaiters())) {
return;
}
@@ -967,7 +967,7 @@ public class GenericObjectPool<T> extend
*
* @throws Exception If the factory fails to passivate the object
*/
- private void addIdleObject(PooledObject<T> p) throws Exception {
+ private void addIdleObject(final PooledObject<T> p) throws Exception {
if (p != null) {
factory.passivateObject(p);
if (getLifo()) {
@@ -999,7 +999,7 @@ public class GenericObjectPool<T> extend
*
* @param ac The configuration to use to identify abandoned objects
*/
- private void removeAbandoned(AbandonedConfig ac) {
+ private void removeAbandoned(final AbandonedConfig ac) {
// Generate a list of abandoned objects to remove
final long now = System.currentTimeMillis();
final long timeout =
@@ -1036,7 +1036,7 @@ public class GenericObjectPool<T> extend
//--- Usage tracking support
-----------------------------------------------
@Override
- public void use(T pooledObject) {
+ public void use(final T pooledObject) {
final AbandonedConfig ac = this.abandonedConfig;
if (ac != null && ac.getUseUsageTracking()) {
final PooledObject<T> wrapper = allObjects.get(new
IdentityWrapper<T>(pooledObject));
@@ -1144,7 +1144,7 @@ public class GenericObjectPool<T> extend
private volatile AbandonedConfig abandonedConfig = null;
@Override
- protected void toStringAppendFields(StringBuilder builder) {
+ protected void toStringAppendFields(final StringBuilder builder) {
super.toStringAppendFields(builder);
builder.append(", factoryType=");
builder.append(factoryType);
Modified:
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/GenericObjectPoolConfig.java
URL:
http://svn.apache.org/viewvc/commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/GenericObjectPoolConfig.java?rev=1729268&r1=1729267&r2=1729268&view=diff
==============================================================================
---
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/GenericObjectPoolConfig.java
(original)
+++
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/GenericObjectPoolConfig.java
Mon Feb 8 21:47:12 2016
@@ -77,7 +77,7 @@ public class GenericObjectPoolConfig ext
*
* @see GenericObjectPool#setMaxTotal(int)
*/
- public void setMaxTotal(int maxTotal) {
+ public void setMaxTotal(final int maxTotal) {
this.maxTotal = maxTotal;
}
@@ -104,7 +104,7 @@ public class GenericObjectPoolConfig ext
*
* @see GenericObjectPool#setMaxIdle(int)
*/
- public void setMaxIdle(int maxIdle) {
+ public void setMaxIdle(final int maxIdle) {
this.maxIdle = maxIdle;
}
@@ -131,7 +131,7 @@ public class GenericObjectPoolConfig ext
*
* @see GenericObjectPool#setMinIdle(int)
*/
- public void setMinIdle(int minIdle) {
+ public void setMinIdle(final int minIdle) {
this.minIdle = minIdle;
}
@@ -145,7 +145,7 @@ public class GenericObjectPoolConfig ext
}
@Override
- protected void toStringAppendFields(StringBuilder builder) {
+ protected void toStringAppendFields(final StringBuilder builder) {
super.toStringAppendFields(builder);
builder.append(", maxTotal=");
builder.append(maxTotal);
Modified:
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/InterruptibleReentrantLock.java
URL:
http://svn.apache.org/viewvc/commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/InterruptibleReentrantLock.java?rev=1729268&r1=1729267&r2=1729268&view=diff
==============================================================================
---
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/InterruptibleReentrantLock.java
(original)
+++
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/InterruptibleReentrantLock.java
Mon Feb 8 21:47:12 2016
@@ -39,7 +39,7 @@ class InterruptibleReentrantLock extends
* @param fairness true means threads should acquire contended locks as if
* waiting in a FIFO queue
*/
- public InterruptibleReentrantLock(boolean fairness) {
+ public InterruptibleReentrantLock(final boolean fairness) {
super(fairness);
}
@@ -48,7 +48,7 @@ class InterruptibleReentrantLock extends
*
* @param condition the condition on which the threads are waiting.
*/
- public void interruptWaiters(Condition condition) {
+ public void interruptWaiters(final Condition condition) {
final Collection<Thread> threads = getWaitingThreads(condition);
for (final Thread thread : threads) {
thread.interrupt();
Modified:
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/LinkedBlockingDeque.java
URL:
http://svn.apache.org/viewvc/commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/LinkedBlockingDeque.java?rev=1729268&r1=1729267&r2=1729268&view=diff
==============================================================================
---
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/LinkedBlockingDeque.java
(original)
+++
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/LinkedBlockingDeque.java
Mon Feb 8 21:47:12 2016
@@ -119,7 +119,7 @@ class LinkedBlockingDeque<E> extends Abs
* @param p Previous item
* @param n Next item
*/
- Node(E x, Node<E> p, Node<E> n) {
+ Node(final E x, final Node<E> p, final Node<E> n) {
item = x;
prev = p;
next = n;
@@ -169,7 +169,7 @@ class LinkedBlockingDeque<E> extends Abs
* @param fairness true means threads waiting on the deque should be served
* as if waiting in a FIFO request queue
*/
- public LinkedBlockingDeque(boolean fairness) {
+ public LinkedBlockingDeque(final boolean fairness) {
this(Integer.MAX_VALUE, fairness);
}
@@ -179,7 +179,7 @@ class LinkedBlockingDeque<E> extends Abs
* @param capacity the capacity of this deque
* @throws IllegalArgumentException if {@code capacity} is less than 1
*/
- public LinkedBlockingDeque(int capacity) {
+ public LinkedBlockingDeque(final int capacity) {
this(capacity, false);
}
@@ -192,7 +192,7 @@ class LinkedBlockingDeque<E> extends Abs
* as if waiting in a FIFO request queue
* @throws IllegalArgumentException if {@code capacity} is less than 1
*/
- public LinkedBlockingDeque(int capacity, boolean fairness) {
+ public LinkedBlockingDeque(final int capacity, final boolean fairness) {
if (capacity <= 0) {
throw new IllegalArgumentException();
}
@@ -212,7 +212,7 @@ class LinkedBlockingDeque<E> extends Abs
* @throws NullPointerException if the specified collection or any
* of its elements are null
*/
- public LinkedBlockingDeque(Collection<? extends E> c) {
+ public LinkedBlockingDeque(final Collection<? extends E> c) {
this(Integer.MAX_VALUE);
lock.lock(); // Never contended, but necessary for visibility
try {
@@ -239,7 +239,7 @@ class LinkedBlockingDeque<E> extends Abs
*
* @return {@code true} if successful, otherwise {@code false}
*/
- private boolean linkFirst(E e) {
+ private boolean linkFirst(final E e) {
// assert lock.isHeldByCurrentThread();
if (count >= capacity) {
return false;
@@ -264,7 +264,7 @@ class LinkedBlockingDeque<E> extends Abs
*
* @return {@code true} if successful, otherwise {@code false}
*/
- private boolean linkLast(E e) {
+ private boolean linkLast(final E e) {
// assert lock.isHeldByCurrentThread();
if (count >= capacity) {
return false;
@@ -339,7 +339,7 @@ class LinkedBlockingDeque<E> extends Abs
*
* @param x The node to unlink
*/
- private void unlink(Node<E> x) {
+ private void unlink(final Node<E> x) {
// assert lock.isHeldByCurrentThread();
final Node<E> p = x.prev;
final Node<E> n = x.next;
@@ -364,7 +364,7 @@ class LinkedBlockingDeque<E> extends Abs
* {@inheritDoc}
*/
@Override
- public void addFirst(E e) {
+ public void addFirst(final E e) {
if (!offerFirst(e)) {
throw new IllegalStateException("Deque full");
}
@@ -374,7 +374,7 @@ class LinkedBlockingDeque<E> extends Abs
* {@inheritDoc}
*/
@Override
- public void addLast(E e) {
+ public void addLast(final E e) {
if (!offerLast(e)) {
throw new IllegalStateException("Deque full");
}
@@ -384,7 +384,7 @@ class LinkedBlockingDeque<E> extends Abs
* {@inheritDoc}
*/
@Override
- public boolean offerFirst(E e) {
+ public boolean offerFirst(final E e) {
if (e == null) {
throw new NullPointerException();
}
@@ -400,7 +400,7 @@ class LinkedBlockingDeque<E> extends Abs
* {@inheritDoc}
*/
@Override
- public boolean offerLast(E e) {
+ public boolean offerLast(final E e) {
if (e == null) {
throw new NullPointerException();
}
@@ -422,7 +422,7 @@ class LinkedBlockingDeque<E> extends Abs
* @throws InterruptedException if the thread is interrupted whilst waiting
* for space
*/
- public void putFirst(E e) throws InterruptedException {
+ public void putFirst(final E e) throws InterruptedException {
if (e == null) {
throw new NullPointerException();
}
@@ -446,7 +446,7 @@ class LinkedBlockingDeque<E> extends Abs
* @throws InterruptedException if the thread is interrupted whilst waiting
* for space
*/
- public void putLast(E e) throws InterruptedException {
+ public void putLast(final E e) throws InterruptedException {
if (e == null) {
throw new NullPointerException();
}
@@ -474,7 +474,7 @@ class LinkedBlockingDeque<E> extends Abs
* @throws InterruptedException if the thread is interrupted whilst waiting
* for space
*/
- public boolean offerFirst(E e, long timeout, TimeUnit unit)
+ public boolean offerFirst(final E e, final long timeout, final TimeUnit
unit)
throws InterruptedException {
if (e == null) {
throw new NullPointerException();
@@ -508,7 +508,7 @@ class LinkedBlockingDeque<E> extends Abs
* @throws InterruptedException if the thread is interrupted whist waiting
* for space
*/
- public boolean offerLast(E e, long timeout, TimeUnit unit)
+ public boolean offerLast(final E e, final long timeout, final TimeUnit
unit)
throws InterruptedException {
if (e == null) {
throw new NullPointerException();
@@ -622,7 +622,7 @@ class LinkedBlockingDeque<E> extends Abs
* @return the unlinked element
* @throws InterruptedException if the current thread is interrupted
*/
- public E pollFirst(long timeout, TimeUnit unit)
+ public E pollFirst(final long timeout, final TimeUnit unit)
throws InterruptedException {
long nanos = unit.toNanos(timeout);
lock.lockInterruptibly();
@@ -650,7 +650,7 @@ class LinkedBlockingDeque<E> extends Abs
* @return the unlinked element
* @throws InterruptedException if the current thread is interrupted
*/
- public E pollLast(long timeout, TimeUnit unit)
+ public E pollLast(final long timeout, final TimeUnit unit)
throws InterruptedException {
long nanos = unit.toNanos(timeout);
lock.lockInterruptibly();
@@ -713,7 +713,7 @@ class LinkedBlockingDeque<E> extends Abs
}
@Override
- public boolean removeFirstOccurrence(Object o) {
+ public boolean removeFirstOccurrence(final Object o) {
if (o == null) {
return false;
}
@@ -732,7 +732,7 @@ class LinkedBlockingDeque<E> extends Abs
}
@Override
- public boolean removeLastOccurrence(Object o) {
+ public boolean removeLastOccurrence(final Object o) {
if (o == null) {
return false;
}
@@ -756,7 +756,7 @@ class LinkedBlockingDeque<E> extends Abs
* {@inheritDoc}
*/
@Override
- public boolean add(E e) {
+ public boolean add(final E e) {
addLast(e);
return true;
}
@@ -765,7 +765,7 @@ class LinkedBlockingDeque<E> extends Abs
* {@inheritDoc}
*/
@Override
- public boolean offer(E e) {
+ public boolean offer(final E e) {
return offerLast(e);
}
@@ -781,7 +781,7 @@ class LinkedBlockingDeque<E> extends Abs
* @throws InterruptedException if the thread is interrupted whilst waiting
* for space
*/
- public void put(E e) throws InterruptedException {
+ public void put(final E e) throws InterruptedException {
putLast(e);
}
@@ -801,7 +801,7 @@ class LinkedBlockingDeque<E> extends Abs
* @throws InterruptedException if the thread is interrupted whilst waiting
* for space
*/
- public boolean offer(E e, long timeout, TimeUnit unit)
+ public boolean offer(final E e, final long timeout, final TimeUnit unit)
throws InterruptedException {
return offerLast(e, timeout, unit);
}
@@ -851,7 +851,7 @@ class LinkedBlockingDeque<E> extends Abs
* @return the unlinked element
* @throws InterruptedException if the current thread is interrupted
*/
- public E poll(long timeout, TimeUnit unit) throws InterruptedException {
+ public E poll(final long timeout, final TimeUnit unit) throws
InterruptedException {
return pollFirst(timeout, unit);
}
@@ -912,7 +912,7 @@ class LinkedBlockingDeque<E> extends Abs
* @throws NullPointerException if c is null
* @throws IllegalArgumentException if c is this instance
*/
- public int drainTo(Collection<? super E> c) {
+ public int drainTo(final Collection<? super E> c) {
return drainTo(c, Integer.MAX_VALUE);
}
@@ -932,7 +932,7 @@ class LinkedBlockingDeque<E> extends Abs
* @throws NullPointerException if c is null
* @throws IllegalArgumentException if c is this instance
*/
- public int drainTo(Collection<? super E> c, int maxElements) {
+ public int drainTo(final Collection<? super E> c, final int maxElements) {
if (c == null) {
throw new NullPointerException();
}
@@ -958,7 +958,7 @@ class LinkedBlockingDeque<E> extends Abs
* {@inheritDoc}
*/
@Override
- public void push(E e) {
+ public void push(final E e) {
addFirst(e);
}
@@ -987,7 +987,7 @@ class LinkedBlockingDeque<E> extends Abs
* @return {@code true} if this deque changed as a result of the call
*/
@Override
- public boolean remove(Object o) {
+ public boolean remove(final Object o) {
return removeFirstOccurrence(o);
}
@@ -1015,7 +1015,7 @@ class LinkedBlockingDeque<E> extends Abs
* @return {@code true} if this deque contains the specified element
*/
@Override
- public boolean contains(Object o) {
+ public boolean contains(final Object o) {
if (o == null) {
return false;
}
@@ -1314,7 +1314,7 @@ class LinkedBlockingDeque<E> extends Abs
@Override
Node<E> firstNode() { return first; }
@Override
- Node<E> nextNode(Node<E> n) { return n.next; }
+ Node<E> nextNode(final Node<E> n) { return n.next; }
}
/** Descending iterator */
@@ -1322,7 +1322,7 @@ class LinkedBlockingDeque<E> extends Abs
@Override
Node<E> firstNode() { return last; }
@Override
- Node<E> nextNode(Node<E> n) { return n.prev; }
+ Node<E> nextNode(final Node<E> n) { return n.prev; }
}
/**
@@ -1332,7 +1332,7 @@ class LinkedBlockingDeque<E> extends Abs
* {@code Object}) in the proper order, followed by a null
* @param s the stream
*/
- private void writeObject(java.io.ObjectOutputStream s)
+ private void writeObject(final java.io.ObjectOutputStream s)
throws java.io.IOException {
lock.lock();
try {
@@ -1354,7 +1354,7 @@ class LinkedBlockingDeque<E> extends Abs
* deserialize it).
* @param s the stream
*/
- private void readObject(java.io.ObjectInputStream s)
+ private void readObject(final java.io.ObjectInputStream s)
throws java.io.IOException, ClassNotFoundException {
s.defaultReadObject();
count = 0;
Modified:
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/PoolImplUtils.java
URL:
http://svn.apache.org/viewvc/commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/PoolImplUtils.java?rev=1729268&r1=1729267&r2=1729268&view=diff
==============================================================================
---
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/PoolImplUtils.java
(original)
+++
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/PoolImplUtils.java
Mon Feb 8 21:47:12 2016
@@ -37,7 +37,7 @@ class PoolImplUtils {
* @return the type of object the factory creates
*/
@SuppressWarnings("rawtypes")
- static Class<?> getFactoryType(Class<? extends PooledObjectFactory>
factory) {
+ static Class<?> getFactoryType(final Class<? extends PooledObjectFactory>
factory) {
return (Class<?>) getGenericType(PooledObjectFactory.class, factory);
}
@@ -52,8 +52,8 @@ class PoolImplUtils {
*
* @return concrete type used by the implementation
*/
- private static <T> Object getGenericType(Class<T> type,
- Class<? extends T> clazz) {
+ private static <T> Object getGenericType(final Class<T> type,
+ final Class<? extends T> clazz) {
// Look to see if this class implements the generic interface
@@ -111,7 +111,7 @@ class PoolImplUtils {
* type parameter or an instance of {@link Integer} representing
* the index for the type in the definition of the defining class
*/
- private static Object getTypeParameter(Class<?> clazz, Type argType) {
+ private static Object getTypeParameter(final Class<?> clazz, final Type
argType) {
if (argType instanceof Class<?>) {
return argType;
}
Modified:
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/PooledSoftReference.java
URL:
http://svn.apache.org/viewvc/commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/PooledSoftReference.java?rev=1729268&r1=1729267&r2=1729268&view=diff
==============================================================================
---
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/PooledSoftReference.java
(original)
+++
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/PooledSoftReference.java
Mon Feb 8 21:47:12 2016
@@ -40,7 +40,7 @@ public class PooledSoftReference<T> exte
*
* @param reference SoftReference to be managed by the pool
*/
- public PooledSoftReference(SoftReference<T> reference) {
+ public PooledSoftReference(final SoftReference<T> reference) {
super(null); // Null the hard reference in the parent
this.reference = reference;
}
@@ -94,7 +94,7 @@ public class PooledSoftReference<T> exte
*
* @param reference new reference
*/
- public synchronized void setReference(SoftReference<T> reference) {
+ public synchronized void setReference(final SoftReference<T> reference) {
this.reference = reference;
}
}
Modified:
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/SoftReferenceObjectPool.java
URL:
http://svn.apache.org/viewvc/commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/SoftReferenceObjectPool.java?rev=1729268&r1=1729267&r2=1729268&view=diff
==============================================================================
---
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/SoftReferenceObjectPool.java
(original)
+++
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/SoftReferenceObjectPool.java
Mon Feb 8 21:47:12 2016
@@ -75,7 +75,7 @@ public class SoftReferenceObjectPool<T>
*
* @param factory object factory to use.
*/
- public SoftReferenceObjectPool(PooledObjectFactory<T> factory) {
+ public SoftReferenceObjectPool(final PooledObjectFactory<T> factory) {
this.factory = factory;
}
@@ -189,7 +189,7 @@ public class SoftReferenceObjectPool<T>
* instance to return to the pool
*/
@Override
- public synchronized void returnObject(T obj) throws Exception {
+ public synchronized void returnObject(final T obj) throws Exception {
boolean success = !isClosed();
final PooledSoftReference<T> ref = findReference(obj);
if (ref == null) {
@@ -231,7 +231,7 @@ public class SoftReferenceObjectPool<T>
* {@inheritDoc}
*/
@Override
- public synchronized void invalidateObject(T obj) throws Exception {
+ public synchronized void invalidateObject(final T obj) throws Exception {
final PooledSoftReference<T> ref = findReference(obj);
if (ref == null) {
throw new IllegalStateException(
@@ -387,7 +387,7 @@ public class SoftReferenceObjectPool<T>
* @param obj returning object
* @return PooledSoftReference wrapping a soft reference to obj
*/
- private PooledSoftReference<T> findReference(T obj) {
+ private PooledSoftReference<T> findReference(final T obj) {
final Iterator<PooledSoftReference<T>> iterator =
allReferences.iterator();
while (iterator.hasNext()) {
final PooledSoftReference<T> reference = iterator.next();
@@ -406,7 +406,7 @@ public class SoftReferenceObjectPool<T>
*
* @throws Exception If an error occurs while trying to destroy the object
*/
- private void destroy(PooledSoftReference<T> toDestroy) throws Exception {
+ private void destroy(final PooledSoftReference<T> toDestroy) throws
Exception {
toDestroy.invalidate();
idleReferences.remove(toDestroy);
allReferences.remove(toDestroy);
@@ -422,7 +422,7 @@ public class SoftReferenceObjectPool<T>
* Clears cleared references from iterator's collection
* @param iterator iterator over idle/allReferences
*/
- private void removeClearedReferences(Iterator<PooledSoftReference<T>>
iterator) {
+ private void removeClearedReferences(final
Iterator<PooledSoftReference<T>> iterator) {
PooledSoftReference<T> ref;
while (iterator.hasNext()) {
ref = iterator.next();
@@ -433,7 +433,7 @@ public class SoftReferenceObjectPool<T>
}
@Override
- protected void toStringAppendFields(StringBuilder builder) {
+ protected void toStringAppendFields(final StringBuilder builder) {
super.toStringAppendFields(builder);
builder.append(", factory=");
builder.append(factory);
Modified:
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/proxy/BaseProxyHandler.java
URL:
http://svn.apache.org/viewvc/commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/proxy/BaseProxyHandler.java?rev=1729268&r1=1729267&r2=1729268&view=diff
==============================================================================
---
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/proxy/BaseProxyHandler.java
(original)
+++
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/proxy/BaseProxyHandler.java
Mon Feb 8 21:47:12 2016
@@ -42,7 +42,7 @@ class BaseProxyHandler<T> {
* be provided with usage tracking information for
this
* wrapped object
*/
- BaseProxyHandler(T pooledObject, UsageTracking<T> usageTracking) {
+ BaseProxyHandler(final T pooledObject, final UsageTracking<T>
usageTracking) {
this.pooledObject = pooledObject;
this.usageTracking = usageTracking;
}
@@ -94,7 +94,7 @@ class BaseProxyHandler<T> {
* @return The result of the method call
* @throws Throwable If the method invocation fails
*/
- Object doInvoke(Method method, Object[] args) throws Throwable {
+ Object doInvoke(final Method method, final Object[] args) throws Throwable
{
validateProxiedObject();
final T object = getPooledObject();
if (usageTracking != null) {
Modified:
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/proxy/CglibProxyHandler.java
URL:
http://svn.apache.org/viewvc/commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/proxy/CglibProxyHandler.java?rev=1729268&r1=1729267&r2=1729268&view=diff
==============================================================================
---
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/proxy/CglibProxyHandler.java
(original)
+++
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/proxy/CglibProxyHandler.java
Mon Feb 8 21:47:12 2016
@@ -42,13 +42,13 @@ class CglibProxyHandler<T> extends BaseP
* be provided with usage tracking information for
this
* wrapped object
*/
- CglibProxyHandler(T pooledObject, UsageTracking<T> usageTracking) {
+ CglibProxyHandler(final T pooledObject, final UsageTracking<T>
usageTracking) {
super(pooledObject, usageTracking);
}
@Override
- public Object intercept(Object object, Method method, Object[] args,
- MethodProxy methodProxy) throws Throwable {
+ public Object intercept(final Object object, final Method method, final
Object[] args,
+ final MethodProxy methodProxy) throws Throwable {
return doInvoke(method, args);
}
}
Modified:
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/proxy/CglibProxySource.java
URL:
http://svn.apache.org/viewvc/commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/proxy/CglibProxySource.java?rev=1729268&r1=1729267&r2=1729268&view=diff
==============================================================================
---
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/proxy/CglibProxySource.java
(original)
+++
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/proxy/CglibProxySource.java
Mon Feb 8 21:47:12 2016
@@ -37,12 +37,12 @@ public class CglibProxySource<T> impleme
*
* @param superclass The class to proxy
*/
- public CglibProxySource(Class<? extends T> superclass) {
+ public CglibProxySource(final Class<? extends T> superclass) {
this.superclass = superclass;
}
@Override
- public T createProxy(T pooledObject, UsageTracking<T> usageTracking) {
+ public T createProxy(final T pooledObject, final UsageTracking<T>
usageTracking) {
final Enhancer enhancer = new Enhancer();
enhancer.setSuperclass(superclass);
@@ -59,7 +59,7 @@ public class CglibProxySource<T> impleme
@Override
- public T resolveProxy(T proxy) {
+ public T resolveProxy(final T proxy) {
@SuppressWarnings("unchecked")
final
CglibProxyHandler<T> cglibProxyHandler =
Modified:
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/proxy/JdkProxyHandler.java
URL:
http://svn.apache.org/viewvc/commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/proxy/JdkProxyHandler.java?rev=1729268&r1=1729267&r2=1729268&view=diff
==============================================================================
---
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/proxy/JdkProxyHandler.java
(original)
+++
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/proxy/JdkProxyHandler.java
Mon Feb 8 21:47:12 2016
@@ -39,13 +39,13 @@ class JdkProxyHandler<T> extends BasePro
* be provided with usage tracking information for
this
* wrapped object
*/
- JdkProxyHandler(T pooledObject, UsageTracking<T> usageTracking) {
+ JdkProxyHandler(final T pooledObject, final UsageTracking<T>
usageTracking) {
super(pooledObject, usageTracking);
}
@Override
- public Object invoke(Object proxy, Method method, Object[] args)
+ public Object invoke(final Object proxy, final Method method, final
Object[] args)
throws Throwable {
return doInvoke(method, args);
}
Modified:
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/proxy/JdkProxySource.java
URL:
http://svn.apache.org/viewvc/commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/proxy/JdkProxySource.java?rev=1729268&r1=1729267&r2=1729268&view=diff
==============================================================================
---
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/proxy/JdkProxySource.java
(original)
+++
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/proxy/JdkProxySource.java
Mon Feb 8 21:47:12 2016
@@ -40,7 +40,7 @@ public class JdkProxySource<T> implement
* @param classLoader The class loader with which to create the proxy
* @param interfaces The interfaces to proxy
*/
- public JdkProxySource(ClassLoader classLoader, Class<?>[] interfaces) {
+ public JdkProxySource(final ClassLoader classLoader, final Class<?>[]
interfaces) {
this.classLoader = classLoader;
// Defensive copy
this.interfaces = new Class<?>[interfaces.length];
@@ -49,7 +49,7 @@ public class JdkProxySource<T> implement
@Override
- public T createProxy(T pooledObject, UsageTracking<T> usageTracking) {
+ public T createProxy(final T pooledObject, final UsageTracking<T>
usageTracking) {
@SuppressWarnings("unchecked")
final
T proxy = (T) Proxy.newProxyInstance(classLoader, interfaces,
@@ -59,7 +59,7 @@ public class JdkProxySource<T> implement
@Override
- public T resolveProxy(T proxy) {
+ public T resolveProxy(final T proxy) {
@SuppressWarnings("unchecked")
final
JdkProxyHandler<T> jdkProxyHandler =
Modified:
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/proxy/ProxiedKeyedObjectPool.java
URL:
http://svn.apache.org/viewvc/commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/proxy/ProxiedKeyedObjectPool.java?rev=1729268&r1=1729267&r2=1729268&view=diff
==============================================================================
---
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/proxy/ProxiedKeyedObjectPool.java
(original)
+++
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/proxy/ProxiedKeyedObjectPool.java
Mon Feb 8 21:47:12 2016
@@ -44,8 +44,8 @@ public class ProxiedKeyedObjectPool<K,V>
* @param pool The object pool to wrap
* @param proxySource The source of the proxy objects
*/
- public ProxiedKeyedObjectPool(KeyedObjectPool<K,V> pool,
- ProxySource<V> proxySource) {
+ public ProxiedKeyedObjectPool(final KeyedObjectPool<K,V> pool,
+ final ProxySource<V> proxySource) {
this.pool = pool;
this.proxySource = proxySource;
}
@@ -53,7 +53,7 @@ public class ProxiedKeyedObjectPool<K,V>
@SuppressWarnings("unchecked")
@Override
- public V borrowObject(K key) throws Exception, NoSuchElementException,
+ public V borrowObject(final K key) throws Exception,
NoSuchElementException,
IllegalStateException {
UsageTracking<V> usageTracking = null;
if (pool instanceof UsageTracking) {
@@ -65,30 +65,30 @@ public class ProxiedKeyedObjectPool<K,V>
}
@Override
- public void returnObject(K key, V proxy) throws Exception {
+ public void returnObject(final K key, final V proxy) throws Exception {
final V pooledObject = proxySource.resolveProxy(proxy);
pool.returnObject(key, pooledObject);
}
@Override
- public void invalidateObject(K key, V proxy) throws Exception {
+ public void invalidateObject(final K key, final V proxy) throws Exception {
final V pooledObject = proxySource.resolveProxy(proxy);
pool.invalidateObject(key, pooledObject);
}
@Override
- public void addObject(K key) throws Exception, IllegalStateException,
+ public void addObject(final K key) throws Exception, IllegalStateException,
UnsupportedOperationException {
pool.addObject(key);
}
@Override
- public int getNumIdle(K key) {
+ public int getNumIdle(final K key) {
return pool.getNumIdle(key);
}
@Override
- public int getNumActive(K key) {
+ public int getNumActive(final K key) {
return pool.getNumActive(key);
}
@@ -108,7 +108,7 @@ public class ProxiedKeyedObjectPool<K,V>
}
@Override
- public void clear(K key) throws Exception, UnsupportedOperationException {
+ public void clear(final K key) throws Exception,
UnsupportedOperationException {
pool.clear(key);
}
