This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-pool.git
The following commit(s) were added to refs/heads/master by this push:
new cfef141 Minor performances Improvement: (#60)
cfef141 is described below
commit cfef14199ddb1b0371d5ab6770577d01f4e406b0
Author: Arturo Bernal <[email protected]>
AuthorDate: Wed Feb 17 05:33:50 2021 +0100
Minor performances Improvement: (#60)
* Inline variable
* Remove redundant initializer
* Use Math.min
* Add final var
---
.../commons/pool2/impl/BaseGenericObjectPool.java | 4 +--
.../commons/pool2/impl/DefaultPooledObject.java | 2 +-
.../pool2/impl/SoftReferenceObjectPool.java | 6 ++---
.../commons/pool2/proxy/CglibProxySource.java | 3 +--
.../apache/commons/pool2/proxy/JdkProxySource.java | 3 +--
.../pool2/proxy/ProxiedKeyedObjectPool.java | 3 +--
.../commons/pool2/proxy/ProxiedObjectPool.java | 3 +--
.../pool2/MethodCallPoolableObjectFactory.java | 2 +-
.../org/apache/commons/pool2/VisitTracker.java | 12 ++++-----
.../apache/commons/pool2/VisitTrackerFactory.java | 2 +-
src/test/java/org/apache/commons/pool2/Waiter.java | 14 +++++-----
.../org/apache/commons/pool2/WaiterFactory.java | 2 +-
.../commons/pool2/impl/AtomicIntegerFactory.java | 10 ++++----
.../pool2/impl/TestBaseGenericObjectPool.java | 4 +--
.../commons/pool2/impl/TestGenericObjectPool.java | 30 +++++++++++-----------
.../pool2/performance/SleepingObjectFactory.java | 4 +--
.../proxy/BaseTestProxiedKeyedObjectPool.java | 2 +-
17 files changed, 51 insertions(+), 55 deletions(-)
diff --git
a/src/main/java/org/apache/commons/pool2/impl/BaseGenericObjectPool.java
b/src/main/java/org/apache/commons/pool2/impl/BaseGenericObjectPool.java
index 1ab282a..c00f43c 100644
--- a/src/main/java/org/apache/commons/pool2/impl/BaseGenericObjectPool.java
+++ b/src/main/java/org/apache/commons/pool2/impl/BaseGenericObjectPool.java
@@ -332,7 +332,7 @@ public abstract class BaseGenericObjectPool<T> extends
BaseObject {
private volatile Duration evictorShutdownTimeout =
BaseObjectPoolConfig.DEFAULT_EVICTOR_SHUTDOWN_TIMEOUT;
// Internal (primarily state) attributes
final Object closeLock = new Object();
- volatile boolean closed = false;
+ volatile boolean closed;
final Object evictionLock = new Object();
@@ -1443,7 +1443,7 @@ public abstract class BaseGenericObjectPool<T> extends
BaseObject {
}
}
-
+
// Inner classes
diff --git
a/src/main/java/org/apache/commons/pool2/impl/DefaultPooledObject.java
b/src/main/java/org/apache/commons/pool2/impl/DefaultPooledObject.java
index 422ab74..7a0a8a2 100644
--- a/src/main/java/org/apache/commons/pool2/impl/DefaultPooledObject.java
+++ b/src/main/java/org/apache/commons/pool2/impl/DefaultPooledObject.java
@@ -45,7 +45,7 @@ public class DefaultPooledObject<T> implements
PooledObject<T> {
private volatile boolean logAbandoned = false;
private volatile CallStack borrowedBy = NoOpCallStack.INSTANCE;
private volatile CallStack usedBy = NoOpCallStack.INSTANCE;
- private volatile long borrowedCount = 0;
+ private volatile long borrowedCount;
/**
* Creates a new instance that wraps the provided object so that the pool
can
diff --git
a/src/main/java/org/apache/commons/pool2/impl/SoftReferenceObjectPool.java
b/src/main/java/org/apache/commons/pool2/impl/SoftReferenceObjectPool.java
index 1c6e7a7..1b771e1 100644
--- a/src/main/java/org/apache/commons/pool2/impl/SoftReferenceObjectPool.java
+++ b/src/main/java/org/apache/commons/pool2/impl/SoftReferenceObjectPool.java
@@ -52,14 +52,14 @@ public class SoftReferenceObjectPool<T> extends
BaseObjectPool<T> {
private final ReferenceQueue<T> refQueue = new ReferenceQueue<>();
/** Count of instances that have been checkout out to pool clients */
- private int numActive = 0; // @GuardedBy("this")
+ private int numActive; // @GuardedBy("this")
/** Total number of instances that have been destroyed */
- private long destroyCount = 0; // @GuardedBy("this")
+ private long destroyCount; // @GuardedBy("this")
/** Total number of instances that have been created */
- private long createCount = 0; // @GuardedBy("this")
+ private long createCount; // @GuardedBy("this")
/** Idle references - waiting to be borrowed */
private final LinkedBlockingDeque<PooledSoftReference<T>> idleReferences =
diff --git a/src/main/java/org/apache/commons/pool2/proxy/CglibProxySource.java
b/src/main/java/org/apache/commons/pool2/proxy/CglibProxySource.java
index e849ba4..cd1924b 100644
--- a/src/main/java/org/apache/commons/pool2/proxy/CglibProxySource.java
+++ b/src/main/java/org/apache/commons/pool2/proxy/CglibProxySource.java
@@ -64,8 +64,7 @@ public class CglibProxySource<T> implements ProxySource<T> {
final
CglibProxyHandler<T> cglibProxyHandler =
(CglibProxyHandler<T>) ((Factory) proxy).getCallback(0);
- final T pooledObject = cglibProxyHandler.disableProxy();
- return pooledObject;
+ return cglibProxyHandler.disableProxy();
}
/**
diff --git a/src/main/java/org/apache/commons/pool2/proxy/JdkProxySource.java
b/src/main/java/org/apache/commons/pool2/proxy/JdkProxySource.java
index fa9fa19..b2036c9 100644
--- a/src/main/java/org/apache/commons/pool2/proxy/JdkProxySource.java
+++ b/src/main/java/org/apache/commons/pool2/proxy/JdkProxySource.java
@@ -64,8 +64,7 @@ public class JdkProxySource<T> implements ProxySource<T> {
final
JdkProxyHandler<T> jdkProxyHandler =
(JdkProxyHandler<T>) Proxy.getInvocationHandler(proxy);
- final T pooledObject = jdkProxyHandler.disableProxy();
- return pooledObject;
+ return jdkProxyHandler.disableProxy();
}
diff --git
a/src/main/java/org/apache/commons/pool2/proxy/ProxiedKeyedObjectPool.java
b/src/main/java/org/apache/commons/pool2/proxy/ProxiedKeyedObjectPool.java
index a8f5eca..58ba10d 100644
--- a/src/main/java/org/apache/commons/pool2/proxy/ProxiedKeyedObjectPool.java
+++ b/src/main/java/org/apache/commons/pool2/proxy/ProxiedKeyedObjectPool.java
@@ -66,8 +66,7 @@ public class ProxiedKeyedObjectPool<K, V> implements
KeyedObjectPool<K, V> {
usageTracking = (UsageTracking<V>) pool;
}
final V pooledObject = pool.borrowObject(key);
- final V proxy = proxySource.createProxy(pooledObject, usageTracking);
- return proxy;
+ return proxySource.createProxy(pooledObject, usageTracking);
}
@Override
diff --git
a/src/main/java/org/apache/commons/pool2/proxy/ProxiedObjectPool.java
b/src/main/java/org/apache/commons/pool2/proxy/ProxiedObjectPool.java
index b9715da..cadb180 100644
--- a/src/main/java/org/apache/commons/pool2/proxy/ProxiedObjectPool.java
+++ b/src/main/java/org/apache/commons/pool2/proxy/ProxiedObjectPool.java
@@ -67,8 +67,7 @@ public class ProxiedObjectPool<T> implements ObjectPool<T> {
usageTracking = (UsageTracking<T>) pool;
}
final T pooledObject = pool.borrowObject();
- final T proxy = proxySource.createProxy(pooledObject, usageTracking);
- return proxy;
+ return proxySource.createProxy(pooledObject, usageTracking);
}
diff --git
a/src/test/java/org/apache/commons/pool2/MethodCallPoolableObjectFactory.java
b/src/test/java/org/apache/commons/pool2/MethodCallPoolableObjectFactory.java
index 5621ea8..62bbd81 100644
---
a/src/test/java/org/apache/commons/pool2/MethodCallPoolableObjectFactory.java
+++
b/src/test/java/org/apache/commons/pool2/MethodCallPoolableObjectFactory.java
@@ -29,7 +29,7 @@ import org.apache.commons.pool2.impl.DefaultPooledObject;
*/
public class MethodCallPoolableObjectFactory implements
PooledObjectFactory<Object> {
private final List<MethodCall> methodCalls = new ArrayList<>();
- private int count = 0;
+ private int count;
private boolean valid = true;
private boolean makeObjectFail;
private boolean activateObjectFail;
diff --git a/src/test/java/org/apache/commons/pool2/VisitTracker.java
b/src/test/java/org/apache/commons/pool2/VisitTracker.java
index 5de5a87..2fbed31 100644
--- a/src/test/java/org/apache/commons/pool2/VisitTracker.java
+++ b/src/test/java/org/apache/commons/pool2/VisitTracker.java
@@ -22,12 +22,12 @@ package org.apache.commons.pool2;
*
*/
public class VisitTracker<K> {
- private int validateCount = 0;
- private int activateCount = 0;
- private int passivateCount = 0;
- private boolean destroyed = false;
- private int id = 0;
- private K key = null;
+ private int validateCount;
+ private int activateCount;
+ private int passivateCount;
+ private boolean destroyed;
+ private int id;
+ private K key;
public VisitTracker() {
reset();
diff --git a/src/test/java/org/apache/commons/pool2/VisitTrackerFactory.java
b/src/test/java/org/apache/commons/pool2/VisitTrackerFactory.java
index 7cb1f81..12e7288 100644
--- a/src/test/java/org/apache/commons/pool2/VisitTrackerFactory.java
+++ b/src/test/java/org/apache/commons/pool2/VisitTrackerFactory.java
@@ -25,7 +25,7 @@ import org.apache.commons.pool2.impl.DefaultPooledObject;
*/
public class VisitTrackerFactory<K>
implements PooledObjectFactory<VisitTracker<K>>,
KeyedPooledObjectFactory<K, VisitTracker<K>> {
- private int nextId = 0;
+ private int nextId;
public VisitTrackerFactory() {
}
diff --git a/src/test/java/org/apache/commons/pool2/Waiter.java
b/src/test/java/org/apache/commons/pool2/Waiter.java
index 52b9df1..1b0f75b 100644
--- a/src/test/java/org/apache/commons/pool2/Waiter.java
+++ b/src/test/java/org/apache/commons/pool2/Waiter.java
@@ -28,13 +28,13 @@ import java.util.concurrent.atomic.AtomicInteger;
*/
public class Waiter {
private static final AtomicInteger instanceCount = new AtomicInteger();
- private boolean active = false;
- private boolean valid = true;
- private long latency = 0;
- private long lastPassivatedMillis = 0;
- private long lastIdleTimeMillis = 0;
- private long passivationCount = 0;
- private long validationCount = 0;
+ private boolean active;
+ private boolean valid;
+ private long latency;
+ private long lastPassivatedMillis;
+ private long lastIdleTimeMillis;
+ private long passivationCount;
+ private long validationCount;
private final int id = instanceCount.getAndIncrement();
public Waiter(final boolean active, final boolean valid, final long
latency) {
diff --git a/src/test/java/org/apache/commons/pool2/WaiterFactory.java
b/src/test/java/org/apache/commons/pool2/WaiterFactory.java
index 148ea22..1f81627 100644
--- a/src/test/java/org/apache/commons/pool2/WaiterFactory.java
+++ b/src/test/java/org/apache/commons/pool2/WaiterFactory.java
@@ -56,7 +56,7 @@ KeyedPooledObjectFactory<K,Waiter> {
private final double passivateInvalidationProbability;
/** Count of (makes - destroys) since last reset */
- private long activeCount = 0;
+ private long activeCount;
/** Count of (makes - destroys) per key since last reset */
private final Map<K,Integer> activeCounts = new HashMap<>();
diff --git
a/src/test/java/org/apache/commons/pool2/impl/AtomicIntegerFactory.java
b/src/test/java/org/apache/commons/pool2/impl/AtomicIntegerFactory.java
index b0b9d1f..5f7b7a5 100644
--- a/src/test/java/org/apache/commons/pool2/impl/AtomicIntegerFactory.java
+++ b/src/test/java/org/apache/commons/pool2/impl/AtomicIntegerFactory.java
@@ -31,11 +31,11 @@ import org.apache.commons.pool2.PooledObject;
public class AtomicIntegerFactory
extends BasePooledObjectFactory<AtomicInteger> {
- private long activateLatency = 0;
- private long passivateLatency = 0;
- private long createLatency = 0;
- private long destroyLatency = 0;
- private long validateLatency = 0;
+ private long activateLatency;
+ private long passivateLatency;
+ private long createLatency;
+ private long destroyLatency;
+ private long validateLatency;
@Override
public void activateObject(final PooledObject<AtomicInteger> p) {
diff --git
a/src/test/java/org/apache/commons/pool2/impl/TestBaseGenericObjectPool.java
b/src/test/java/org/apache/commons/pool2/impl/TestBaseGenericObjectPool.java
index 6beb283..bccf6e9 100644
--- a/src/test/java/org/apache/commons/pool2/impl/TestBaseGenericObjectPool.java
+++ b/src/test/java/org/apache/commons/pool2/impl/TestBaseGenericObjectPool.java
@@ -31,8 +31,8 @@ import org.junit.jupiter.api.Test;
*/
public class TestBaseGenericObjectPool {
- BaseGenericObjectPool<String> pool = null;
- SimpleFactory factory = null;
+ BaseGenericObjectPool<String> pool;
+ SimpleFactory factory;
@BeforeEach
public void setUp() throws Exception {
diff --git
a/src/test/java/org/apache/commons/pool2/impl/TestGenericObjectPool.java
b/src/test/java/org/apache/commons/pool2/impl/TestGenericObjectPool.java
index 573ed89..175662a 100644
--- a/src/test/java/org/apache/commons/pool2/impl/TestGenericObjectPool.java
+++ b/src/test/java/org/apache/commons/pool2/impl/TestGenericObjectPool.java
@@ -188,7 +188,7 @@ public class TestGenericObjectPool extends
TestBaseObjectPool {
static class InvalidateThread implements Runnable {
private final String obj;
private final ObjectPool<String> pool;
- private boolean done = false;
+ private boolean done;
public InvalidateThread(final ObjectPool<String> pool, final String
obj) {
this.obj = obj;
this.pool = pool;
@@ -234,31 +234,31 @@ public class TestGenericObjectPool extends
TestBaseObjectPool {
}
public static class SimpleFactory implements PooledObjectFactory<String> {
- int makeCounter = 0;
+ int makeCounter;
- int activationCounter = 0;
+ int activationCounter;
- int validateCounter = 0;
+ int validateCounter;
- int activeCount = 0;
+ int activeCount;
boolean evenValid = true;
boolean oddValid = true;
- boolean exceptionOnPassivate = false;
+ boolean exceptionOnPassivate;
- boolean exceptionOnActivate = false;
+ boolean exceptionOnActivate;
- boolean exceptionOnDestroy = false;
+ boolean exceptionOnDestroy;
boolean enableValidation = true;
- long destroyLatency = 0;
+ long destroyLatency;
- long makeLatency = 0;
+ long makeLatency;
- long validateLatency = 0;
+ long validateLatency;
int maxTotal = Integer.MAX_VALUE;
@@ -454,8 +454,8 @@ public class TestGenericObjectPool extends
TestBaseObjectPool {
/** object expected to be borrowed (fail otherwise) */
private final Object _expectedObject;
- private volatile boolean _complete = false;
- private volatile boolean _failed = false;
+ private volatile boolean _complete;
+ private volatile boolean _failed;
private volatile Throwable _error;
public TestThread(final ObjectPool<T> pool) {
@@ -591,9 +591,9 @@ public class TestGenericObjectPool extends
TestBaseObjectPool {
// mvn test -DargLine="-DTestGenericObjectPool.display.thread.details=true"
// @see https://issues.apache.org/jira/browse/SUREFIRE-121
- protected GenericObjectPool<String> genericObjectPool = null;
+ protected GenericObjectPool<String> genericObjectPool;
- private SimpleFactory simpleFactory = null;
+ private SimpleFactory simpleFactory;
@SuppressWarnings("deprecation")
private void assertConfiguration(final GenericObjectPoolConfig<?>
expected, final GenericObjectPool<?> actual)
diff --git
a/src/test/java/org/apache/commons/pool2/performance/SleepingObjectFactory.java
b/src/test/java/org/apache/commons/pool2/performance/SleepingObjectFactory.java
index a57a216..3156a8d 100644
---
a/src/test/java/org/apache/commons/pool2/performance/SleepingObjectFactory.java
+++
b/src/test/java/org/apache/commons/pool2/performance/SleepingObjectFactory.java
@@ -26,8 +26,8 @@ import org.apache.commons.pool2.impl.DefaultPooledObject;
*/
public class SleepingObjectFactory implements PooledObjectFactory<Integer> {
- private int counter = 0;
- private boolean debug = false;
+ private int counter;
+ private boolean debug;
@Override
public void activateObject(final PooledObject<Integer> obj) throws
Exception {
diff --git
a/src/test/java/org/apache/commons/pool2/proxy/BaseTestProxiedKeyedObjectPool.java
b/src/test/java/org/apache/commons/pool2/proxy/BaseTestProxiedKeyedObjectPool.java
index 109bb0b..486bfa1 100644
---
a/src/test/java/org/apache/commons/pool2/proxy/BaseTestProxiedKeyedObjectPool.java
+++
b/src/test/java/org/apache/commons/pool2/proxy/BaseTestProxiedKeyedObjectPool.java
@@ -71,7 +71,7 @@ public abstract class BaseTestProxiedKeyedObjectPool {
private static final String DATA1 = "data1";
- private KeyedObjectPool<String,TestObject> pool = null;
+ private KeyedObjectPool<String,TestObject> pool;
protected abstract ProxySource<TestObject> getproxySource();
