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 9026523 Minor Improvement: (#58)
9026523 is described below
commit 9026523a9dc5bc7b83895f5c94c7e8c88587c95b
Author: Arturo Bernal <arturobern...@gmail.com>
AuthorDate: Sun Dec 27 17:58:40 2020 +0100
Minor Improvement: (#58)
* Redundant 'if' statement
* Add final
* Fix JavDoc
---
.../java/org/apache/commons/pool2/impl/DefaultEvictionPolicy.java | 7 ++-----
src/main/java/org/apache/commons/pool2/impl/EvictionTimer.java | 2 +-
src/test/java/org/apache/commons/pool2/MethodCall.java | 6 +-----
src/test/java/org/apache/commons/pool2/ObjectPoolIssue326.java | 2 +-
src/test/java/org/apache/commons/pool2/TestObjectPool.java | 2 +-
src/test/java/org/apache/commons/pool2/Waiter.java | 2 +-
.../org/apache/commons/pool2/impl/TestGenericKeyedObjectPool.java | 4 ++--
.../java/org/apache/commons/pool2/impl/TestGenericObjectPool.java | 7 ++-----
.../java/org/apache/commons/pool2/impl/TestSoftRefOutOfMemory.java | 5 +----
.../java/org/apache/commons/pool2/performance/PerformanceTest.java | 2 +-
10 files changed, 13 insertions(+), 26 deletions(-)
diff --git
a/src/main/java/org/apache/commons/pool2/impl/DefaultEvictionPolicy.java
b/src/main/java/org/apache/commons/pool2/impl/DefaultEvictionPolicy.java
index 44f75b9..b434ca9 100644
--- a/src/main/java/org/apache/commons/pool2/impl/DefaultEvictionPolicy.java
+++ b/src/main/java/org/apache/commons/pool2/impl/DefaultEvictionPolicy.java
@@ -45,11 +45,8 @@ public class DefaultEvictionPolicy<T> implements
EvictionPolicy<T> {
public boolean evict(final EvictionConfig config, final PooledObject<T>
underTest,
final int idleCount) {
- if ((config.getIdleSoftEvictTime() < underTest.getIdleTimeMillis() &&
+ return (config.getIdleSoftEvictTime() < underTest.getIdleTimeMillis()
&&
config.getMinIdle() < idleCount) ||
- config.getIdleEvictTime() < underTest.getIdleTimeMillis()) {
- return true;
- }
- return false;
+ config.getIdleEvictTime() < underTest.getIdleTimeMillis();
}
}
diff --git a/src/main/java/org/apache/commons/pool2/impl/EvictionTimer.java
b/src/main/java/org/apache/commons/pool2/impl/EvictionTimer.java
index 89a95e8..517e8bb 100644
--- a/src/main/java/org/apache/commons/pool2/impl/EvictionTimer.java
+++ b/src/main/java/org/apache/commons/pool2/impl/EvictionTimer.java
@@ -72,7 +72,7 @@ class EvictionTimer {
/**
* Adds the specified eviction task to the timer. Tasks that are added with
* a call to this method *must* call {@link
- * #cancel(org.apache.commons.pool2.impl.BaseGenericObjectPool.Evictor,
long, TimeUnit)}
+ * #cancel(BaseGenericObjectPool.Evictor, long, TimeUnit, boolean)}
* to cancel the task to prevent memory and/or thread leaks in application
* server environments.
*
diff --git a/src/test/java/org/apache/commons/pool2/MethodCall.java
b/src/test/java/org/apache/commons/pool2/MethodCall.java
index dca9c27..76a034b 100644
--- a/src/test/java/org/apache/commons/pool2/MethodCall.java
+++ b/src/test/java/org/apache/commons/pool2/MethodCall.java
@@ -91,11 +91,7 @@ public class MethodCall {
if (params != null ? !params.equals(that.params) : that.params !=
null) {
return false;
}
- if (returned != null ? !returned.equals(that.returned) : that.returned
!= null) {
- return false;
- }
-
- return true;
+ return returned != null ? returned.equals(that.returned) :
that.returned == null;
}
@Override
diff --git a/src/test/java/org/apache/commons/pool2/ObjectPoolIssue326.java
b/src/test/java/org/apache/commons/pool2/ObjectPoolIssue326.java
index 15286ea..7b0341d 100644
--- a/src/test/java/org/apache/commons/pool2/ObjectPoolIssue326.java
+++ b/src/test/java/org/apache/commons/pool2/ObjectPoolIssue326.java
@@ -129,7 +129,7 @@ public final class ObjectPoolIssue326 {
@Override
public Object call() throws Exception {
try {
- Object value;
+ final Object value;
value = m_pool.borrowObject(m_key);
// don't make this too long or it won't reproduce, and don't
make it zero or it
// won't reproduce
diff --git a/src/test/java/org/apache/commons/pool2/TestObjectPool.java
b/src/test/java/org/apache/commons/pool2/TestObjectPool.java
index 33f68cd..cd4b01c 100644
--- a/src/test/java/org/apache/commons/pool2/TestObjectPool.java
+++ b/src/test/java/org/apache/commons/pool2/TestObjectPool.java
@@ -406,7 +406,7 @@ public abstract class TestObjectPool {
@Test
public void testToString() throws Exception {
- ObjectPool<Object> pool;
+ final ObjectPool<Object> pool;
try {
pool = makeEmptyPool(new MethodCallPoolableObjectFactory());
} catch (final UnsupportedOperationException uoe) {
diff --git a/src/test/java/org/apache/commons/pool2/Waiter.java
b/src/test/java/org/apache/commons/pool2/Waiter.java
index 5cfc226..e0905ef 100644
--- a/src/test/java/org/apache/commons/pool2/Waiter.java
+++ b/src/test/java/org/apache/commons/pool2/Waiter.java
@@ -27,7 +27,7 @@ import java.util.concurrent.atomic.AtomicInteger;
* <p>This class is *not* threadsafe.</p>
*/
public class Waiter {
- private static AtomicInteger instanceCount = new AtomicInteger();
+ private static final AtomicInteger instanceCount = new AtomicInteger();
private boolean active = false;
private boolean valid = true;
private long latency = 0;
diff --git
a/src/test/java/org/apache/commons/pool2/impl/TestGenericKeyedObjectPool.java
b/src/test/java/org/apache/commons/pool2/impl/TestGenericKeyedObjectPool.java
index 4266d5e..71d7e79 100644
---
a/src/test/java/org/apache/commons/pool2/impl/TestGenericKeyedObjectPool.java
+++
b/src/test/java/org/apache/commons/pool2/impl/TestGenericKeyedObjectPool.java
@@ -1935,7 +1935,7 @@ public class TestGenericKeyedObjectPool extends
TestKeyedObjectPool {
}
volatile int counter = 0;
- boolean valid;
+ final boolean valid;
int activeCount = 0;
int validateCounter = 0;
@@ -2432,7 +2432,7 @@ public class TestGenericKeyedObjectPool extends
TestKeyedObjectPool {
private static class SimplePerKeyFactory
extends BaseKeyedPooledObjectFactory<Object,Object> {
- ConcurrentHashMap<Object,AtomicInteger> map =
+ final ConcurrentHashMap<Object,AtomicInteger> map =
new ConcurrentHashMap<>();
@Override
public Object create(final Object key) 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 728870d..2333675 100644
--- a/src/test/java/org/apache/commons/pool2/impl/TestGenericObjectPool.java
+++ b/src/test/java/org/apache/commons/pool2/impl/TestGenericObjectPool.java
@@ -425,10 +425,7 @@ public class TestGenericObjectPool extends
TestBaseObjectPool {
@Override
public boolean evict(final EvictionConfig config, final
PooledObject<T> underTest,
final int idleCount) {
- if (callCount.incrementAndGet() > 1500) {
- return true;
- }
- return false;
+ return callCount.incrementAndGet() > 1500;
}
}
@@ -1902,7 +1899,7 @@ public class TestGenericObjectPool extends
TestBaseObjectPool {
@Test
@Timeout(value = 60000, unit = TimeUnit.MILLISECONDS)
public void testLIFO() throws Exception {
- String o;
+ final String o;
genericObjectPool.setLifo(true);
genericObjectPool.addObject(); // "0"
genericObjectPool.addObject(); // "1"
diff --git
a/src/test/java/org/apache/commons/pool2/impl/TestSoftRefOutOfMemory.java
b/src/test/java/org/apache/commons/pool2/impl/TestSoftRefOutOfMemory.java
index 460a37e..f249a68 100644
--- a/src/test/java/org/apache/commons/pool2/impl/TestSoftRefOutOfMemory.java
+++ b/src/test/java/org/apache/commons/pool2/impl/TestSoftRefOutOfMemory.java
@@ -274,10 +274,7 @@ public class TestSoftRefOutOfMemory {
if (trigger.equals(OomeTrigger.VALIDATE)) {
throw new OutOfMemoryError();
}
- if (trigger.equals(OomeTrigger.DESTROY)) {
- return false;
- }
- return true;
+ return !trigger.equals(OomeTrigger.DESTROY);
}
@Override
diff --git
a/src/test/java/org/apache/commons/pool2/performance/PerformanceTest.java
b/src/test/java/org/apache/commons/pool2/performance/PerformanceTest.java
index 8ba9fd3..d5f31d4 100644
--- a/src/test/java/org/apache/commons/pool2/performance/PerformanceTest.java
+++ b/src/test/java/org/apache/commons/pool2/performance/PerformanceTest.java
@@ -50,7 +50,7 @@ public class PerformanceTest {
}
class PerfTask implements Callable<TaskStats> {
- TaskStats taskStats = new TaskStats();
+ final TaskStats taskStats = new TaskStats();
long borrowTime;
long returnTime;
