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 18f6bdd Remove explicitly initialized. (#90)
18f6bdd is described below
commit 18f6bdd6c6777ac0b4a934eff043cad765742ad7
Author: Arturo Bernal <[email protected]>
AuthorDate: Sun Aug 8 17:27:45 2021 +0200
Remove explicitly initialized. (#90)
---
.../org/apache/commons/pool2/BaseObjectPool.java | 2 +-
.../commons/pool2/impl/BaseGenericObjectPool.java | 4 +--
.../commons/pool2/impl/GenericKeyedObjectPool.java | 6 ++--
.../commons/pool2/impl/GenericObjectPool.java | 2 +-
.../apache/commons/pool2/TestBaseObjectPool.java | 2 +-
.../apache/commons/pool2/TestKeyedObjectPool.java | 4 +--
.../pool2/impl/TestAbandonedKeyedObjectPool.java | 4 +--
.../pool2/impl/TestAbandonedObjectPool.java | 14 ++++-----
.../pool2/impl/TestGenericKeyedObjectPool.java | 34 +++++++++++-----------
.../commons/pool2/impl/TestSoftRefOutOfMemory.java | 4 +--
.../pool2/impl/TestSoftReferenceObjectPool.java | 2 +-
.../commons/pool2/performance/PerformanceTest.java | 12 ++++----
.../proxy/BaseTestProxiedKeyedObjectPool.java | 2 +-
.../pool2/proxy/BaseTestProxiedObjectPool.java | 4 +--
14 files changed, 48 insertions(+), 48 deletions(-)
diff --git a/src/main/java/org/apache/commons/pool2/BaseObjectPool.java
b/src/main/java/org/apache/commons/pool2/BaseObjectPool.java
index 291173d..53c7deb 100644
--- a/src/main/java/org/apache/commons/pool2/BaseObjectPool.java
+++ b/src/main/java/org/apache/commons/pool2/BaseObjectPool.java
@@ -30,7 +30,7 @@ package org.apache.commons.pool2;
*/
public abstract class BaseObjectPool<T> extends BaseObject implements
ObjectPool<T> {
- private volatile boolean closed = false;
+ private volatile boolean closed;
/**
* Not supported in this base implementation. Subclasses should override
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 3502d50..e4cd892 100644
--- a/src/main/java/org/apache/commons/pool2/impl/BaseGenericObjectPool.java
+++ b/src/main/java/org/apache/commons/pool2/impl/BaseGenericObjectPool.java
@@ -353,8 +353,8 @@ public abstract class BaseGenericObjectPool<T> extends
BaseObject {
volatile boolean closed;
final Object evictionLock = new Object();
- private Evictor evictor = null; // @GuardedBy("evictionLock")
- EvictionIterator evictionIterator = null; // @GuardedBy("evictionLock")
+ private Evictor evictor; // @GuardedBy("evictionLock")
+ EvictionIterator evictionIterator; // @GuardedBy("evictionLock")
/*
* Class loader for evictor thread to use since, in a JavaEE or similar
diff --git
a/src/main/java/org/apache/commons/pool2/impl/GenericKeyedObjectPool.java
b/src/main/java/org/apache/commons/pool2/impl/GenericKeyedObjectPool.java
index cfd663f..4d42aaa 100644
--- a/src/main/java/org/apache/commons/pool2/impl/GenericKeyedObjectPool.java
+++ b/src/main/java/org/apache/commons/pool2/impl/GenericKeyedObjectPool.java
@@ -107,7 +107,7 @@ public class GenericKeyedObjectPool<K, T> extends
BaseGenericObjectPool<T>
*/
private final AtomicInteger createCount = new AtomicInteger(0);
- private long makeObjectCount = 0;
+ private long makeObjectCount;
private final Object makeObjectCountLock = new Object();
/*
@@ -233,10 +233,10 @@ public class GenericKeyedObjectPool<K, T> extends
BaseGenericObjectPool<T>
*/
private final AtomicInteger numTotal = new AtomicInteger(0);
- private Iterator<K> evictionKeyIterator = null; //
@GuardedBy("evictionLock")
+ private Iterator<K> evictionKeyIterator; // @GuardedBy("evictionLock")
- private K evictionKey = null; // @GuardedBy("evictionLock")
+ private K evictionKey; // @GuardedBy("evictionLock")
/**
* Constructs a new {@code GenericKeyedObjectPool} using defaults from
diff --git a/src/main/java/org/apache/commons/pool2/impl/GenericObjectPool.java
b/src/main/java/org/apache/commons/pool2/impl/GenericObjectPool.java
index 9b7c59b..3014508 100644
--- a/src/main/java/org/apache/commons/pool2/impl/GenericObjectPool.java
+++ b/src/main/java/org/apache/commons/pool2/impl/GenericObjectPool.java
@@ -86,7 +86,7 @@ public class GenericObjectPool<T> extends
BaseGenericObjectPool<T>
private static final String ONAME_BASE =
"org.apache.commons.pool2:type=GenericObjectPool,name=";
- private volatile String factoryType = null;
+ private volatile String factoryType;
private volatile int maxIdle = GenericObjectPoolConfig.DEFAULT_MAX_IDLE;
diff --git a/src/test/java/org/apache/commons/pool2/TestBaseObjectPool.java
b/src/test/java/org/apache/commons/pool2/TestBaseObjectPool.java
index 302486b..58b849a 100644
--- a/src/test/java/org/apache/commons/pool2/TestBaseObjectPool.java
+++ b/src/test/java/org/apache/commons/pool2/TestBaseObjectPool.java
@@ -40,7 +40,7 @@ public class TestBaseObjectPool extends TestObjectPool {
}
}
- private ObjectPool<String> _pool = null;
+ private ObjectPool<String> _pool;
/**
* @param n Ignored by this implemented. Used by sub-classes.
diff --git a/src/test/java/org/apache/commons/pool2/TestKeyedObjectPool.java
b/src/test/java/org/apache/commons/pool2/TestKeyedObjectPool.java
index 9d9eee4..6979288 100644
--- a/src/test/java/org/apache/commons/pool2/TestKeyedObjectPool.java
+++ b/src/test/java/org/apache/commons/pool2/TestKeyedObjectPool.java
@@ -35,7 +35,7 @@ public abstract class TestKeyedObjectPool {
protected static class FailingKeyedPooledObjectFactory implements
KeyedPooledObjectFactory<Object,Object> {
private final List<MethodCall> methodCalls = new ArrayList<>();
- private int count = 0;
+ private int count;
private boolean makeObjectFail;
private boolean activateObjectFail;
private boolean validateObjectFail;
@@ -173,7 +173,7 @@ public abstract class TestKeyedObjectPool {
protected static final String KEY = "key";
- private KeyedObjectPool<Object,Object> _pool = null;
+ private KeyedObjectPool<Object,Object> _pool;
// Deliberate choice to create a new object in case future unit tests check
// for a specific object.
diff --git
a/src/test/java/org/apache/commons/pool2/impl/TestAbandonedKeyedObjectPool.java
b/src/test/java/org/apache/commons/pool2/impl/TestAbandonedKeyedObjectPool.java
index 2a58571..8fe1b10 100644
---
a/src/test/java/org/apache/commons/pool2/impl/TestAbandonedKeyedObjectPool.java
+++
b/src/test/java/org/apache/commons/pool2/impl/TestAbandonedKeyedObjectPool.java
@@ -135,9 +135,9 @@ public class TestAbandonedKeyedObjectPool {
}
}
- private GenericKeyedObjectPool<Integer,PooledTestObject> pool = null;
+ private GenericKeyedObjectPool<Integer,PooledTestObject> pool;
- private AbandonedConfig abandonedConfig = null;
+ private AbandonedConfig abandonedConfig;
@SuppressWarnings("deprecation")
@BeforeEach
diff --git
a/src/test/java/org/apache/commons/pool2/impl/TestAbandonedObjectPool.java
b/src/test/java/org/apache/commons/pool2/impl/TestAbandonedObjectPool.java
index d1cba90..5207c00 100644
--- a/src/test/java/org/apache/commons/pool2/impl/TestAbandonedObjectPool.java
+++ b/src/test/java/org/apache/commons/pool2/impl/TestAbandonedObjectPool.java
@@ -47,11 +47,11 @@ class PooledTestObject implements TrackedUse {
private static final AtomicInteger hash = new AtomicInteger();
private static final Instant INSTANT_0 = Instant.ofEpochMilli(0);
private static final Instant INSTANT_1 = Instant.ofEpochMilli(1);
- private boolean active = false;
- private boolean destroyed = false;
- private int _hash = 0;
- private boolean _abandoned = false;
- private boolean detached = false; // destroy-abandoned "detaches"
+ private boolean active;
+ private boolean destroyed;
+ private int _hash;
+ private boolean _abandoned;
+ private boolean detached; // destroy-abandoned "detaches"
public PooledTestObject() {
_hash = hash.incrementAndGet();
@@ -215,9 +215,9 @@ public class TestAbandonedObjectPool {
}
}
- private GenericObjectPool<PooledTestObject> pool = null;
+ private GenericObjectPool<PooledTestObject> pool;
- private AbandonedConfig abandonedConfig = null;
+ private AbandonedConfig abandonedConfig;
@SuppressWarnings("deprecation")
@BeforeEach
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 c031d48..77cdecf 100644
---
a/src/test/java/org/apache/commons/pool2/impl/TestGenericKeyedObjectPool.java
+++
b/src/test/java/org/apache/commons/pool2/impl/TestGenericKeyedObjectPool.java
@@ -115,7 +115,7 @@ public class TestGenericKeyedObjectPool extends
TestKeyedObjectPool {
private final String obj;
private final KeyedObjectPool<String, String> pool;
private final String key;
- private boolean done = false;
+ private boolean done;
public InvalidateThread(final KeyedObjectPool<String, String> pool,
final String key, final String obj) {
this.obj = obj;
this.pool = pool;
@@ -153,24 +153,24 @@ public class TestGenericKeyedObjectPool extends
TestKeyedObjectPool {
}
}
public static class SimpleFactory<K> implements
KeyedPooledObjectFactory<K,String> {
- volatile int counter = 0;
+ volatile int counter;
final boolean valid;
- int activeCount = 0;
- int validateCounter = 0;
+ int activeCount;
+ int validateCounter;
boolean evenValid = true;
boolean oddValid = true;
- boolean enableValidation = false;
+ boolean enableValidation;
- long destroyLatency = 0;
- long makeLatency = 0;
- long validateLatency = 0;
+ long destroyLatency;
+ long makeLatency;
+ long validateLatency;
volatile int maxTotalPerKey = Integer.MAX_VALUE;
- boolean exceptionOnPassivate = false;
- boolean exceptionOnActivate = false;
- boolean exceptionOnDestroy = false;
- boolean exceptionOnValidate = false;
+ boolean exceptionOnPassivate;
+ boolean exceptionOnActivate;
+ boolean exceptionOnDestroy;
+ boolean exceptionOnValidate;
- boolean exceptionOnCreate = false;
+ boolean exceptionOnCreate;
public SimpleFactory() {
this(true);
@@ -363,8 +363,8 @@ public class TestGenericKeyedObjectPool extends
TestKeyedObjectPool {
/** key used in borrow / return sequence - null means random */
private final String _key;
- private volatile boolean _complete = false;
- private volatile boolean _failed = false;
+ private volatile boolean _complete;
+ private volatile boolean _failed;
private volatile Exception _exception;
public TestThread(final KeyedObjectPool<String,T> pool) {
@@ -497,10 +497,10 @@ public class TestGenericKeyedObjectPool extends
TestKeyedObjectPool {
// @see https://issues.apache.org/jira/browse/SUREFIRE-121
/** setUp(): {@code new GenericKeyedObjectPool<String,String>(factory)} */
- private GenericKeyedObjectPool<String,String> gkoPool = null;
+ private GenericKeyedObjectPool<String,String> gkoPool;
/** setUp(): {@code new SimpleFactory<String>()} */
- private SimpleFactory<String> simpleFactory = null;
+ private SimpleFactory<String> simpleFactory;
private void checkEvictionOrder(final boolean lifo) throws Exception {
final SimpleFactory<Integer> intFactory = new SimpleFactory<>();
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 7e6aa1a..3bd3a67 100644
--- a/src/test/java/org/apache/commons/pool2/impl/TestSoftRefOutOfMemory.java
+++ b/src/test/java/org/apache/commons/pool2/impl/TestSoftRefOutOfMemory.java
@@ -36,7 +36,7 @@ import org.junit.jupiter.api.Test;
public class TestSoftRefOutOfMemory {
public static class LargePoolableObjectFactory extends
BasePooledObjectFactory<String> {
private final String buffer;
- private int counter = 0;
+ private int counter;
public LargePoolableObjectFactory(final int size) {
final char[] data = new char[size];
@@ -106,7 +106,7 @@ public class TestSoftRefOutOfMemory {
}
public static class SmallPoolableObjectFactory extends
BasePooledObjectFactory<String> {
- private int counter = 0;
+ private int counter;
@Override
public String create() {
diff --git
a/src/test/java/org/apache/commons/pool2/impl/TestSoftReferenceObjectPool.java
b/src/test/java/org/apache/commons/pool2/impl/TestSoftReferenceObjectPool.java
index c39cd5e..f29cc6c 100644
---
a/src/test/java/org/apache/commons/pool2/impl/TestSoftReferenceObjectPool.java
+++
b/src/test/java/org/apache/commons/pool2/impl/TestSoftReferenceObjectPool.java
@@ -27,7 +27,7 @@ import org.apache.commons.pool2.TestBaseObjectPool;
public class TestSoftReferenceObjectPool extends TestBaseObjectPool {
private static class SimpleFactory extends BasePooledObjectFactory<String>
{
- int counter = 0;
+ int counter;
@Override
public String create() {
return String.valueOf(counter++);
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 c1a0b16..0b19772 100644
--- a/src/test/java/org/apache/commons/pool2/performance/PerformanceTest.java
+++ b/src/test/java/org/apache/commons/pool2/performance/PerformanceTest.java
@@ -91,11 +91,11 @@ public class PerformanceTest {
}
}
private static class TaskStats {
- public int waiting = 0;
- public int complete = 0;
- public long totalBorrowTime = 0;
- public long totalReturnTime = 0;
- public int nrSamples = 0;
+ public int waiting;
+ public int complete;
+ public long totalBorrowTime;
+ public long totalReturnTime;
+ public int nrSamples;
}
public static void main(final String[] args) {
@@ -122,7 +122,7 @@ public class PerformanceTest {
// test.run(1, 400, 40, 5);
}
- private int logLevel = 0;
+ private int logLevel;
private int nrIterations = 5;
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 dcc4e47..b62264c 100644
---
a/src/test/java/org/apache/commons/pool2/proxy/BaseTestProxiedKeyedObjectPool.java
+++
b/src/test/java/org/apache/commons/pool2/proxy/BaseTestProxiedKeyedObjectPool.java
@@ -81,7 +81,7 @@ public abstract class BaseTestProxiedKeyedObjectPool {
private KeyedObjectPool<String,TestObject> pool;
- private StringWriter log = null;
+ private StringWriter log;
protected abstract ProxySource<TestObject> getproxySource();
diff --git
a/src/test/java/org/apache/commons/pool2/proxy/BaseTestProxiedObjectPool.java
b/src/test/java/org/apache/commons/pool2/proxy/BaseTestProxiedObjectPool.java
index 9d7cd66..84e6cac 100644
---
a/src/test/java/org/apache/commons/pool2/proxy/BaseTestProxiedObjectPool.java
+++
b/src/test/java/org/apache/commons/pool2/proxy/BaseTestProxiedObjectPool.java
@@ -75,9 +75,9 @@ public abstract class BaseTestProxiedObjectPool {
private static final Duration ABANDONED_TIMEOUT_SECS =
Duration.ofSeconds(3);
- private ObjectPool<TestObject> pool = null;
+ private ObjectPool<TestObject> pool;
- private StringWriter log = null;
+ private StringWriter log;
protected abstract ProxySource<TestObject> getproxySource();
