This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch POOL_2_X
in repository https://gitbox.apache.org/repos/asf/commons-pool.git
The following commit(s) were added to refs/heads/POOL_2_X by this push:
new d1e97c6c Fix whitespace formatting
d1e97c6c is described below
commit d1e97c6c82b486de328db944f634d52a02ddddc8
Author: Gary Gregory <garydgreg...@gmail.com>
AuthorDate: Tue Jul 18 10:56:02 2023 -0400
Fix whitespace formatting
---
.../commons/pool2/impl/LinkedBlockingDeque.java | 6 +-
.../commons/pool2/AbstractTestObjectPool.java | 12 +-
.../java/org/apache/commons/pool2/PoolTest.java | 2 +-
.../pool2/TestBaseKeyedPooledObjectFactory.java | 8 +-
.../apache/commons/pool2/TestBaseObjectPool.java | 12 +-
.../org/apache/commons/pool2/WaiterFactory.java | 22 +--
.../pool2/impl/TestAbandonedKeyedObjectPool.java | 4 +-
.../pool2/impl/TestAbandonedObjectPool.java | 2 +-
.../pool2/impl/TestGenericKeyedObjectPool.java | 178 ++++++++++-----------
.../commons/pool2/impl/TestGenericObjectPool.java | 155 +++++++++---------
10 files changed, 196 insertions(+), 205 deletions(-)
diff --git
a/src/main/java/org/apache/commons/pool2/impl/LinkedBlockingDeque.java
b/src/main/java/org/apache/commons/pool2/impl/LinkedBlockingDeque.java
index 15a3912a..bd354719 100644
--- a/src/main/java/org/apache/commons/pool2/impl/LinkedBlockingDeque.java
+++ b/src/main/java/org/apache/commons/pool2/impl/LinkedBlockingDeque.java
@@ -983,7 +983,7 @@ class LinkedBlockingDeque<E> extends AbstractQueue<E>
lock.lockInterruptibly();
try {
E x;
- while ( (x = unlinkLast()) == null) {
+ while ((x = unlinkLast()) == null) {
if (nanos <= 0) {
return null;
}
@@ -1320,7 +1320,7 @@ class LinkedBlockingDeque<E> extends AbstractQueue<E>
lock.lock();
try {
E x;
- while ( (x = unlinkFirst()) == null) {
+ while ((x = unlinkFirst()) == null) {
notEmpty.await();
}
return x;
@@ -1340,7 +1340,7 @@ class LinkedBlockingDeque<E> extends AbstractQueue<E>
lock.lock();
try {
E x;
- while ( (x = unlinkLast()) == null) {
+ while ((x = unlinkLast()) == null) {
notEmpty.await();
}
return x;
diff --git a/src/test/java/org/apache/commons/pool2/AbstractTestObjectPool.java
b/src/test/java/org/apache/commons/pool2/AbstractTestObjectPool.java
index e6b6e6ab..ad310bb8 100644
--- a/src/test/java/org/apache/commons/pool2/AbstractTestObjectPool.java
+++ b/src/test/java/org/apache/commons/pool2/AbstractTestObjectPool.java
@@ -89,24 +89,24 @@ public abstract class AbstractTestObjectPool {
// The following should not throw exceptions just because the pool is
closed.
if (pool.getNumIdle() >= 0) {
- assertEquals( 0, pool.getNumIdle(),"A closed pool shouldn't have
any idle objects.");
+ assertEquals(0, pool.getNumIdle(), "A closed pool shouldn't have
any idle objects.");
}
if (pool.getNumActive() >= 0) {
- assertEquals( 2, pool.getNumActive(),"A closed pool should still
keep count of active objects.");
+ assertEquals(2, pool.getNumActive(), "A closed pool should still
keep count of active objects.");
}
pool.returnObject(o1);
if (pool.getNumIdle() >= 0) {
- assertEquals( 0, pool.getNumIdle(),"returnObject should not add
items back into the idle object pool for a closed pool.");
+ assertEquals(0, pool.getNumIdle(), "returnObject should not add
items back into the idle object pool for a closed pool.");
}
if (pool.getNumActive() >= 0) {
- assertEquals( 1, pool.getNumActive(),"A closed pool should still
keep count of active objects.");
+ assertEquals(1, pool.getNumActive(), "A closed pool should still
keep count of active objects.");
}
pool.invalidateObject(o2);
if (pool.getNumIdle() >= 0) {
- assertEquals( 0, pool.getNumIdle(),"invalidateObject must not add
items back into the idle object pool.");
+ assertEquals(0, pool.getNumIdle(), "invalidateObject must not add
items back into the idle object pool.");
}
if (pool.getNumActive() >= 0) {
- assertEquals( 0, pool.getNumActive(),"A closed pool should still
keep count of active objects.");
+ assertEquals(0, pool.getNumActive(), "A closed pool should still
keep count of active objects.");
}
pool.clear();
pool.close();
diff --git a/src/test/java/org/apache/commons/pool2/PoolTest.java
b/src/test/java/org/apache/commons/pool2/PoolTest.java
index 7ecfcd18..5e70938a 100644
--- a/src/test/java/org/apache/commons/pool2/PoolTest.java
+++ b/src/test/java/org/apache/commons/pool2/PoolTest.java
@@ -95,7 +95,7 @@ public class PoolTest {
continue;
}
final String name = thread.getName();
- assertFalse(
name.contains(COMMONS_POOL_EVICTIONS_TIMER_THREAD_NAME),name);
+
assertFalse(name.contains(COMMONS_POOL_EVICTIONS_TIMER_THREAD_NAME),name);
}
}
}
\ No newline at end of file
diff --git
a/src/test/java/org/apache/commons/pool2/TestBaseKeyedPooledObjectFactory.java
b/src/test/java/org/apache/commons/pool2/TestBaseKeyedPooledObjectFactory.java
index 206b85a8..7d8ca9bd 100644
---
a/src/test/java/org/apache/commons/pool2/TestBaseKeyedPooledObjectFactory.java
+++
b/src/test/java/org/apache/commons/pool2/TestBaseKeyedPooledObjectFactory.java
@@ -40,9 +40,9 @@ public class TestBaseKeyedPooledObjectFactory {
public void testDefaultMethods() throws Exception {
final KeyedPooledObjectFactory<Object, Object> factory = new
TestFactory();
- factory.activateObject("key",null); // a no-op
- factory.passivateObject("key",null); // a no-op
- factory.destroyObject("key",null); // a no-op
- assertTrue(factory.validateObject("key",null)); // constant true
+ factory.activateObject("key", null); // a no-op
+ factory.passivateObject("key", null); // a no-op
+ factory.destroyObject("key", null); // a no-op
+ assertTrue(factory.validateObject("key", null)); // constant true
}
}
\ No newline at end of file
diff --git a/src/test/java/org/apache/commons/pool2/TestBaseObjectPool.java
b/src/test/java/org/apache/commons/pool2/TestBaseObjectPool.java
index c7e00c59..c4414b2c 100644
--- a/src/test/java/org/apache/commons/pool2/TestBaseObjectPool.java
+++ b/src/test/java/org/apache/commons/pool2/TestBaseObjectPool.java
@@ -154,18 +154,18 @@ public class TestBaseObjectPool extends
AbstractTestObjectPool {
pool.returnObject(obj2);
obj2 = pool.borrowObject();
if (isLifo()) {
- assertEquals(getNthObject(2),obj2);
+ assertEquals(getNthObject(2), obj2);
}
if (isFifo()) {
- assertEquals(getNthObject(0),obj2);
+ assertEquals(getNthObject(0), obj2);
}
obj0 = pool.borrowObject();
if (isLifo()) {
- assertEquals(getNthObject(0),obj0);
+ assertEquals(getNthObject(0), obj0);
}
if (isFifo()) {
- assertEquals(getNthObject(2),obj0);
+ assertEquals(getNthObject(2), obj0);
}
pool.close();
}
@@ -271,8 +271,8 @@ public class TestBaseObjectPool extends
AbstractTestObjectPool {
}
try (final ObjectPool<Object> pool = new TestObjectPool()) {
- assertTrue( pool.getNumIdle() < 0,"Negative expected.");
- assertTrue( pool.getNumActive() < 0,"Negative expected.");
+ assertTrue(pool.getNumIdle() < 0, "Negative expected.");
+ assertTrue(pool.getNumActive() < 0, "Negative expected.");
assertThrows(UnsupportedOperationException.class, pool::clear);
assertThrows(UnsupportedOperationException.class, pool::addObject);
diff --git a/src/test/java/org/apache/commons/pool2/WaiterFactory.java
b/src/test/java/org/apache/commons/pool2/WaiterFactory.java
index e9e1c744..5dd45312 100644
--- a/src/test/java/org/apache/commons/pool2/WaiterFactory.java
+++ b/src/test/java/org/apache/commons/pool2/WaiterFactory.java
@@ -64,7 +64,7 @@ public class WaiterFactory<K> implements
PooledObjectFactory<Waiter>, KeyedPoole
private long activeCount;
/** Count of (makes - destroys) per key since last reset */
- private final Map<K,Integer> activeCounts = new HashMap<>();
+ private final Map<K, Integer> activeCounts = new HashMap<>();
/** Maximum of (makes - destroys) - if exceeded IllegalStateException */
private final long maxActive; // GKOP 1.x calls this maxTotal
@@ -72,24 +72,18 @@ public class WaiterFactory<K> implements
PooledObjectFactory<Waiter>, KeyedPoole
/** Maximum of (makes - destroys) per key */
private final long maxActivePerKey; // GKOP 1.x calls this maxActive
- public WaiterFactory(final long activateLatency, final long destroyLatency,
- final long makeLatency, final long passivateLatency, final long
validateLatency,
+ public WaiterFactory(final long activateLatency, final long
destroyLatency, final long makeLatency, final long passivateLatency, final long
validateLatency,
final long waiterLatency) {
- this(activateLatency, destroyLatency, makeLatency, passivateLatency,
- validateLatency, waiterLatency, Long.MAX_VALUE,
Long.MAX_VALUE, 0);
+ this(activateLatency, destroyLatency, makeLatency, passivateLatency,
validateLatency, waiterLatency, Long.MAX_VALUE, Long.MAX_VALUE, 0);
}
- public WaiterFactory(final long activateLatency, final long destroyLatency,
- final long makeLatency, final long passivateLatency, final long
validateLatency,
- final long waiterLatency,final long maxActive) {
- this(activateLatency, destroyLatency, makeLatency, passivateLatency,
- validateLatency, waiterLatency, maxActive, Long.MAX_VALUE, 0);
+ public WaiterFactory(final long activateLatency, final long
destroyLatency, final long makeLatency, final long passivateLatency, final long
validateLatency,
+ final long waiterLatency, final long maxActive) {
+ this(activateLatency, destroyLatency, makeLatency, passivateLatency,
validateLatency, waiterLatency, maxActive, Long.MAX_VALUE, 0);
}
- public WaiterFactory(final long activateLatency, final long destroyLatency,
- final long makeLatency, final long passivateLatency, final long
validateLatency,
- final long waiterLatency,final long maxActive, final long
maxActivePerKey,
- final double passivateInvalidationProbability) {
+ public WaiterFactory(final long activateLatency, final long
destroyLatency, final long makeLatency, final long passivateLatency, final long
validateLatency,
+ final long waiterLatency, final long maxActive, final long
maxActivePerKey, final double passivateInvalidationProbability) {
this.activateLatency = activateLatency;
this.destroyLatency = destroyLatency;
this.makeLatency = makeLatency;
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 aa09ffb2..775b789b 100644
---
a/src/test/java/org/apache/commons/pool2/impl/TestAbandonedKeyedObjectPool.java
+++
b/src/test/java/org/apache/commons/pool2/impl/TestAbandonedKeyedObjectPool.java
@@ -183,7 +183,7 @@ public class TestAbandonedKeyedObjectPool {
msg.append('\n');
mbs.unregisterMBean(name);
}
- assertEquals(0, registeredPoolCount,msg.toString());
+ assertEquals(0, registeredPoolCount, msg.toString());
}
/**
@@ -361,7 +361,7 @@ public class TestAbandonedKeyedObjectPool {
// validation takes a second, evictor runs every 500 ms
final PooledTestObject obj = pool.borrowObject(0);
Thread.sleep(50); // abandon obj
- pool.returnObject(0,obj); // evictor will run during validation
+ pool.returnObject(0, obj); // evictor will run during validation
final PooledTestObject obj2 = pool.borrowObject(0);
assertEquals(obj, obj2); // should get original back
assertFalse(obj2.isDestroyed()); // and not destroyed
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 1f13de22..2e166a8f 100644
--- a/src/test/java/org/apache/commons/pool2/impl/TestAbandonedObjectPool.java
+++ b/src/test/java/org/apache/commons/pool2/impl/TestAbandonedObjectPool.java
@@ -264,7 +264,7 @@ public class TestAbandonedObjectPool {
msg.append('\n');
mbs.unregisterMBean(name);
}
- assertEquals( 0, registeredPoolCount,msg.toString());
+ assertEquals(0, registeredPoolCount, msg.toString());
}
/**
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 51612780..0c674eb2 100644
---
a/src/test/java/org/apache/commons/pool2/impl/TestGenericKeyedObjectPool.java
+++
b/src/test/java/org/apache/commons/pool2/impl/TestGenericKeyedObjectPool.java
@@ -644,9 +644,9 @@ public class TestGenericKeyedObjectPool extends
AbstractTestKeyedObjectPool {
for (int i = 0; i < 8; i++) {
final VisitTracker<Integer> tracker =
intPool.borrowObject(KEY_ZERO);
if (tracker.getId() >= 4) {
- assertEquals( 0, tracker.getValidateCount(),"Unexpected
instance visited " + tracker.getId());
+ assertEquals(0, tracker.getValidateCount(), "Unexpected
instance visited " + tracker.getId());
} else {
- assertEquals( 1,
+ assertEquals(1,
tracker.getValidateCount(),"Instance " +
tracker.getId() + " visited wrong number of times.");
}
}
@@ -682,11 +682,9 @@ public class TestGenericKeyedObjectPool extends
AbstractTestKeyedObjectPool {
for (int i = 0; i < 8; i++) {
final VisitTracker<Integer> tracker =
intPool.borrowObject(KEY_ONE);
if (lifo && tracker.getId() > 1 || !lifo && tracker.getId() >
2) {
- assertEquals( 1,
- tracker.getValidateCount(),"Instance " +
tracker.getId() + " visited wrong number of times.");
+ assertEquals(1, tracker.getValidateCount(), "Instance " +
tracker.getId() + " visited wrong number of times.");
} else {
- assertEquals( 2,
- tracker.getValidateCount(),"Instance " +
tracker.getId() + " visited wrong number of times.");
+ assertEquals(2, tracker.getValidateCount(), "Instance " +
tracker.getId() + " visited wrong number of times.");
}
}
}
@@ -894,7 +892,7 @@ public class TestGenericKeyedObjectPool extends
AbstractTestKeyedObjectPool {
msg.append('\n');
mbs.unregisterMBean(name);
}
- assertEquals( 0, registeredPoolCount, msg.toString());
+ assertEquals(0, registeredPoolCount, msg.toString());
}
@Test
@@ -1505,11 +1503,11 @@ public class TestGenericKeyedObjectPool extends
AbstractTestKeyedObjectPool {
gkoPool.setDurationBetweenEvictionRuns(Duration.ofMillis(500));
final String[] active = new String[500];
- for(int i=0;i<500;i++) {
+ for (int i = 0; i < 500; i++) {
active[i] = gkoPool.borrowObject("");
}
- for(int i=0;i<500;i++) {
- gkoPool.returnObject("",active[i]);
+ for (int i = 0; i < 500; i++) {
+ gkoPool.returnObject("", active[i]);
}
Waiter.sleepQuietly(1000L);
@@ -1517,33 +1515,33 @@ public class TestGenericKeyedObjectPool extends
AbstractTestKeyedObjectPool {
Waiter.sleepQuietly(600L);
assertTrue(gkoPool.getNumIdle("") < 400, "Should be less than 400
idle, found " + gkoPool.getNumIdle(""));
Waiter.sleepQuietly(600L);
- assertTrue(gkoPool.getNumIdle("") < 300,"Should be less than 300 idle,
found " + gkoPool.getNumIdle(""));
+ assertTrue(gkoPool.getNumIdle("") < 300, "Should be less than 300
idle, found " + gkoPool.getNumIdle(""));
Waiter.sleepQuietly(600L);
assertTrue(gkoPool.getNumIdle("") < 200, "Should be less than 200
idle, found " + gkoPool.getNumIdle(""));
Waiter.sleepQuietly(600L);
- assertTrue(gkoPool.getNumIdle("") < 100 , "Should be less than 100
idle, found " + gkoPool.getNumIdle(""));
+ assertTrue(gkoPool.getNumIdle("") < 100, "Should be less than 100
idle, found " + gkoPool.getNumIdle(""));
Waiter.sleepQuietly(600L);
- assertEquals(0,gkoPool.getNumIdle(""),"Should be zero idle, found " +
gkoPool.getNumIdle(""));
+ assertEquals(0, gkoPool.getNumIdle(""), "Should be zero idle, found "
+ gkoPool.getNumIdle(""));
- for(int i=0;i<500;i++) {
+ for (int i = 0; i < 500; i++) {
active[i] = gkoPool.borrowObject("");
}
- for(int i=0;i<500;i++) {
- gkoPool.returnObject("",active[i]);
+ for (int i = 0; i < 500; i++) {
+ gkoPool.returnObject("", active[i]);
}
Waiter.sleepQuietly(1000L);
- assertTrue(gkoPool.getNumIdle("") < 500,"Should be less than 500 idle,
found " + gkoPool.getNumIdle(""));
+ assertTrue(gkoPool.getNumIdle("") < 500, "Should be less than 500
idle, found " + gkoPool.getNumIdle(""));
Waiter.sleepQuietly(600L);
- assertTrue(gkoPool.getNumIdle("") < 400,"Should be less than 400 idle,
found " + gkoPool.getNumIdle(""));
+ assertTrue(gkoPool.getNumIdle("") < 400, "Should be less than 400
idle, found " + gkoPool.getNumIdle(""));
Waiter.sleepQuietly(600L);
- assertTrue(gkoPool.getNumIdle("") < 300,"Should be less than 300 idle,
found " + gkoPool.getNumIdle(""));
+ assertTrue(gkoPool.getNumIdle("") < 300, "Should be less than 300
idle, found " + gkoPool.getNumIdle(""));
Waiter.sleepQuietly(600L);
- assertTrue(gkoPool.getNumIdle("") < 200,"Should be less than 200 idle,
found " + gkoPool.getNumIdle(""));
+ assertTrue(gkoPool.getNumIdle("") < 200, "Should be less than 200
idle, found " + gkoPool.getNumIdle(""));
Waiter.sleepQuietly(600L);
- assertTrue(gkoPool.getNumIdle("") < 100,"Should be less than 100 idle,
found " + gkoPool.getNumIdle(""));
+ assertTrue(gkoPool.getNumIdle("") < 100, "Should be less than 100
idle, found " + gkoPool.getNumIdle(""));
Waiter.sleepQuietly(600L);
- assertEquals(0,gkoPool.getNumIdle(""),"Should be zero idle, found " +
gkoPool.getNumIdle(""));
+ assertEquals(0, gkoPool.getNumIdle(""), "Should be zero idle, found "
+ gkoPool.getNumIdle(""));
}
@Test
@@ -1734,7 +1732,7 @@ public class TestGenericKeyedObjectPool extends
AbstractTestKeyedObjectPool {
final String obj = gkoPool.borrowObject("one");
simpleFactory.setThrowExceptionOnPassivate(true);
gkoPool.returnObject("one", obj);
- assertEquals(0,gkoPool.getNumIdle());
+ assertEquals(0, gkoPool.getNumIdle());
gkoPool.close();
}
@@ -1746,14 +1744,14 @@ public class TestGenericKeyedObjectPool extends
AbstractTestKeyedObjectPool {
gkoPool.addObject(key); // "key0"
gkoPool.addObject(key); // "key1"
gkoPool.addObject(key); // "key2"
- assertEquals( "key0", gkoPool.borrowObject(key),"Oldest");
- assertEquals( "key1", gkoPool.borrowObject(key),"Middle");
- assertEquals( "key2", gkoPool.borrowObject(key),"Youngest");
+ assertEquals("key0", gkoPool.borrowObject(key), "Oldest");
+ assertEquals("key1", gkoPool.borrowObject(key), "Middle");
+ assertEquals("key2", gkoPool.borrowObject(key), "Youngest");
final String s = gkoPool.borrowObject(key);
- assertEquals( "key3", s,"new-3");
+ assertEquals("key3", s, "new-3");
gkoPool.returnObject(key, s);
- assertEquals( s, gkoPool.borrowObject(key),"returned");
- assertEquals( "key4", gkoPool.borrowObject(key),"new-4");
+ assertEquals(s, gkoPool.borrowObject(key), "returned");
+ assertEquals("key4", gkoPool.borrowObject(key), "new-4");
}
@Test
@@ -1913,14 +1911,14 @@ public class TestGenericKeyedObjectPool extends
AbstractTestKeyedObjectPool {
gkoPool.addObject(key); // "key0"
gkoPool.addObject(key); // "key1"
gkoPool.addObject(key); // "key2"
- assertEquals( "key2", gkoPool.borrowObject(key),"Youngest");
- assertEquals( "key1", gkoPool.borrowObject(key),"Middle");
- assertEquals( "key0", gkoPool.borrowObject(key),"Oldest");
+ assertEquals("key2", gkoPool.borrowObject(key), "Youngest");
+ assertEquals("key1", gkoPool.borrowObject(key), "Middle");
+ assertEquals("key0", gkoPool.borrowObject(key), "Oldest");
final String s = gkoPool.borrowObject(key);
- assertEquals( "key3", s,"new-3");
+ assertEquals("key3", s, "new-3");
gkoPool.returnObject(key, s);
- assertEquals( s, gkoPool.borrowObject(key),"returned");
- assertEquals( "key4", gkoPool.borrowObject(key),"new-4");
+ assertEquals(s, gkoPool.borrowObject(key), "returned");
+ assertEquals("key4", gkoPool.borrowObject(key), "new-4");
}
/**
@@ -1995,26 +1993,26 @@ public class TestGenericKeyedObjectPool extends
AbstractTestKeyedObjectPool {
gkoPool.setMaxTotalPerKey(100);
gkoPool.setMaxIdlePerKey(8);
final String[] active = new String[100];
- for(int i=0;i<100;i++) {
+ for (int i = 0; i < 100; i++) {
active[i] = gkoPool.borrowObject("");
}
- assertEquals(100,gkoPool.getNumActive(""));
- assertEquals(0,gkoPool.getNumIdle(""));
- for(int i=0;i<100;i++) {
- gkoPool.returnObject("",active[i]);
- assertEquals(99 - i,gkoPool.getNumActive(""));
- assertEquals(i < 8 ? i+1 : 8,gkoPool.getNumIdle(""));
+ assertEquals(100, gkoPool.getNumActive(""));
+ assertEquals(0, gkoPool.getNumIdle(""));
+ for (int i = 0; i < 100; i++) {
+ gkoPool.returnObject("", active[i]);
+ assertEquals(99 - i, gkoPool.getNumActive(""));
+ assertEquals(i < 8 ? i + 1 : 8, gkoPool.getNumIdle(""));
}
- for(int i=0;i<100;i++) {
+ for (int i = 0; i < 100; i++) {
active[i] = gkoPool.borrowObject("a");
}
- assertEquals(100,gkoPool.getNumActive("a"));
- assertEquals(0,gkoPool.getNumIdle("a"));
- for(int i=0;i<100;i++) {
- gkoPool.returnObject("a",active[i]);
- assertEquals(99 - i,gkoPool.getNumActive("a"));
- assertEquals(i < 8 ? i+1 : 8,gkoPool.getNumIdle("a"));
+ assertEquals(100, gkoPool.getNumActive("a"));
+ assertEquals(0, gkoPool.getNumIdle("a"));
+ for (int i = 0; i < 100; i++) {
+ gkoPool.returnObject("a", active[i]);
+ assertEquals(99 - i, gkoPool.getNumActive("a"));
+ assertEquals(i < 8 ? i + 1 : 8, gkoPool.getNumIdle("a"));
}
// total number of idle instances is twice maxIdle
@@ -2262,7 +2260,7 @@ public class TestGenericKeyedObjectPool extends
AbstractTestKeyedObjectPool {
);
}
}
- assertEquals(wtt.length/2,failed,"Expected half the threads to fail");
+ assertEquals(wtt.length / 2, failed, "Expected half the threads to
fail");
}
@Test
@@ -2436,8 +2434,8 @@ public class TestGenericKeyedObjectPool extends
AbstractTestKeyedObjectPool {
gkoPool.setMaxTotalPerKey(-1);
gkoPool.setBlockWhenExhausted(false);
final String obj = gkoPool.borrowObject("");
- assertEquals("0",obj);
- gkoPool.returnObject("",obj);
+ assertEquals("0", obj);
+ gkoPool.returnObject("", obj);
}
/**
@@ -2469,52 +2467,52 @@ public class TestGenericKeyedObjectPool extends
AbstractTestKeyedObjectPool {
@Test
@Timeout(value = 60_000, unit = TimeUnit.MILLISECONDS)
public void testNumActiveNumIdle2() throws Exception {
- assertEquals(0,gkoPool.getNumActive());
- assertEquals(0,gkoPool.getNumIdle());
- assertEquals(0,gkoPool.getNumActive("A"));
- assertEquals(0,gkoPool.getNumIdle("A"));
- assertEquals(0,gkoPool.getNumActive("B"));
- assertEquals(0,gkoPool.getNumIdle("B"));
+ assertEquals(0, gkoPool.getNumActive());
+ assertEquals(0, gkoPool.getNumIdle());
+ assertEquals(0, gkoPool.getNumActive("A"));
+ assertEquals(0, gkoPool.getNumIdle("A"));
+ assertEquals(0, gkoPool.getNumActive("B"));
+ assertEquals(0, gkoPool.getNumIdle("B"));
final String objA0 = gkoPool.borrowObject("A");
final String objB0 = gkoPool.borrowObject("B");
- assertEquals(2,gkoPool.getNumActive());
- assertEquals(0,gkoPool.getNumIdle());
- assertEquals(1,gkoPool.getNumActive("A"));
- assertEquals(0,gkoPool.getNumIdle("A"));
- assertEquals(1,gkoPool.getNumActive("B"));
- assertEquals(0,gkoPool.getNumIdle("B"));
+ assertEquals(2, gkoPool.getNumActive());
+ assertEquals(0, gkoPool.getNumIdle());
+ assertEquals(1, gkoPool.getNumActive("A"));
+ assertEquals(0, gkoPool.getNumIdle("A"));
+ assertEquals(1, gkoPool.getNumActive("B"));
+ assertEquals(0, gkoPool.getNumIdle("B"));
final String objA1 = gkoPool.borrowObject("A");
final String objB1 = gkoPool.borrowObject("B");
- assertEquals(4,gkoPool.getNumActive());
- assertEquals(0,gkoPool.getNumIdle());
- assertEquals(2,gkoPool.getNumActive("A"));
- assertEquals(0,gkoPool.getNumIdle("A"));
- assertEquals(2,gkoPool.getNumActive("B"));
- assertEquals(0,gkoPool.getNumIdle("B"));
-
- gkoPool.returnObject("A",objA0);
- gkoPool.returnObject("B",objB0);
-
- assertEquals(2,gkoPool.getNumActive());
- assertEquals(2,gkoPool.getNumIdle());
- assertEquals(1,gkoPool.getNumActive("A"));
- assertEquals(1,gkoPool.getNumIdle("A"));
- assertEquals(1,gkoPool.getNumActive("B"));
- assertEquals(1,gkoPool.getNumIdle("B"));
-
- gkoPool.returnObject("A",objA1);
- gkoPool.returnObject("B",objB1);
-
- assertEquals(0,gkoPool.getNumActive());
- assertEquals(4,gkoPool.getNumIdle());
- assertEquals(0,gkoPool.getNumActive("A"));
- assertEquals(2,gkoPool.getNumIdle("A"));
- assertEquals(0,gkoPool.getNumActive("B"));
- assertEquals(2,gkoPool.getNumIdle("B"));
+ assertEquals(4, gkoPool.getNumActive());
+ assertEquals(0, gkoPool.getNumIdle());
+ assertEquals(2, gkoPool.getNumActive("A"));
+ assertEquals(0, gkoPool.getNumIdle("A"));
+ assertEquals(2, gkoPool.getNumActive("B"));
+ assertEquals(0, gkoPool.getNumIdle("B"));
+
+ gkoPool.returnObject("A", objA0);
+ gkoPool.returnObject("B", objB0);
+
+ assertEquals(2, gkoPool.getNumActive());
+ assertEquals(2, gkoPool.getNumIdle());
+ assertEquals(1, gkoPool.getNumActive("A"));
+ assertEquals(1, gkoPool.getNumIdle("A"));
+ assertEquals(1, gkoPool.getNumActive("B"));
+ assertEquals(1, gkoPool.getNumIdle("B"));
+
+ gkoPool.returnObject("A", objA1);
+ gkoPool.returnObject("B", objB1);
+
+ assertEquals(0, gkoPool.getNumActive());
+ assertEquals(4, gkoPool.getNumIdle());
+ assertEquals(0, gkoPool.getNumActive("A"));
+ assertEquals(2, gkoPool.getNumIdle("A"));
+ assertEquals(0, gkoPool.getNumActive("B"));
+ assertEquals(2, gkoPool.getNumIdle("B"));
}
@Test
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 521d7c54..31635a55 100644
--- a/src/test/java/org/apache/commons/pool2/impl/TestGenericObjectPool.java
+++ b/src/test/java/org/apache/commons/pool2/impl/TestGenericObjectPool.java
@@ -273,7 +273,7 @@ public class TestGenericObjectPool extends
TestBaseObjectPool {
}
public SimpleFactory(final boolean valid) {
- this(valid,valid);
+ this(valid, valid);
}
public SimpleFactory(final boolean evalid, final boolean ovalid) {
@@ -293,7 +293,7 @@ public class TestGenericObjectPool extends
TestBaseObjectPool {
oddTest = oddValid;
counter = activationCounter++;
}
- if (hurl && !(counter%2 == 0 ? evenTest : oddTest)) {
+ if (hurl && !(counter % 2 == 0 ? evenTest : oddTest)) {
throw new TestException();
}
}
@@ -693,7 +693,7 @@ public class TestGenericObjectPool extends
TestBaseObjectPool {
assertNotEquals("0", obj, "oldest not evicted");
assertNotEquals("1", obj, "second oldest not evicted");
// 2 should be next out for FIFO, 4 for LIFO
- assertEquals(lifo ? "4" : "2" , obj,"Wrong instance returned");
+ assertEquals(lifo ? "4" : "2", obj, "Wrong instance returned");
}
private void checkEvictionOrderPart2(final boolean lifo) throws Exception {
@@ -708,7 +708,7 @@ public class TestGenericObjectPool extends
TestBaseObjectPool {
genericObjectPool.evict(); // Should evict "0" and "1"
genericObjectPool.evict(); // Should evict "2" and "3"
final Object obj = genericObjectPool.borrowObject();
- assertEquals("4", obj,"Wrong instance remaining in pool");
+ assertEquals("4", obj, "Wrong instance remaining in pool");
}
private void checkEvictorVisiting(final boolean lifo) throws Exception {
@@ -736,10 +736,9 @@ public class TestGenericObjectPool extends
TestBaseObjectPool {
for (int i = 0; i < 8; i++) {
final VisitTracker<Object> tracker =
trackerPool.borrowObject();
if (tracker.getId() >= 4) {
- assertEquals( 0, tracker.getValidateCount(),"Unexpected
instance visited " + tracker.getId());
+ assertEquals(0, tracker.getValidateCount(), "Unexpected
instance visited " + tracker.getId());
} else {
- assertEquals( 1, tracker.getValidateCount(),
- "Instance " + tracker.getId() + " visited wrong
number of times.");
+ assertEquals(1, tracker.getValidateCount(), "Instance " +
tracker.getId() + " visited wrong number of times.");
}
}
}
@@ -772,10 +771,10 @@ public class TestGenericObjectPool extends
TestBaseObjectPool {
for (int i = 0; i < 8; i++) {
final VisitTracker<Object> tracker =
trackerPool.borrowObject();
if (tracker.getId() != 0) {
- assertEquals( 1, tracker.getValidateCount(),
+ assertEquals(1, tracker.getValidateCount(),
"Instance " + tracker.getId() + " visited wrong
number of times.");
} else {
- assertEquals( 2, tracker.getValidateCount(),
+ assertEquals(2, tracker.getValidateCount(),
"Instance " + tracker.getId() + " visited wrong
number of times.");
}
}
@@ -995,16 +994,16 @@ public class TestGenericObjectPool extends
TestBaseObjectPool {
@Test
@Timeout(value = 60000, unit = TimeUnit.MILLISECONDS)
public void testAddObject() throws Exception {
- assertEquals( 0, genericObjectPool.getNumIdle(),"should be zero idle");
+ assertEquals(0, genericObjectPool.getNumIdle(), "should be zero idle");
genericObjectPool.addObject();
- assertEquals( 1, genericObjectPool.getNumIdle(),"should be one idle");
- assertEquals( 0, genericObjectPool.getNumActive(),"should be zero
active");
+ assertEquals(1, genericObjectPool.getNumIdle(), "should be one idle");
+ assertEquals(0, genericObjectPool.getNumActive(), "should be zero
active");
final String obj = genericObjectPool.borrowObject();
- assertEquals( 0, genericObjectPool.getNumIdle(),"should be zero idle");
- assertEquals( 1, genericObjectPool.getNumActive(),"should be one
active");
+ assertEquals(0, genericObjectPool.getNumIdle(), "should be zero idle");
+ assertEquals(1, genericObjectPool.getNumActive(), "should be one
active");
genericObjectPool.returnObject(obj);
- assertEquals( 1, genericObjectPool.getNumIdle(),"should be one idle");
- assertEquals( 0, genericObjectPool.getNumActive(),"should be zero
active");
+ assertEquals(1, genericObjectPool.getNumIdle(), "should be one idle");
+ assertEquals(0, genericObjectPool.getNumActive(), "should be zero
active");
}
@Test
@@ -1519,17 +1518,17 @@ public class TestGenericObjectPool extends
TestBaseObjectPool {
}
Waiter.sleepQuietly(1000L);
- assertTrue(genericObjectPool.getNumIdle() < 500,"Should be less than
500 idle, found " + genericObjectPool.getNumIdle());
+ assertTrue(genericObjectPool.getNumIdle() < 500, "Should be less than
500 idle, found " + genericObjectPool.getNumIdle());
Waiter.sleepQuietly(600L);
- assertTrue(genericObjectPool.getNumIdle() < 400,"Should be less than
400 idle, found " + genericObjectPool.getNumIdle());
+ assertTrue(genericObjectPool.getNumIdle() < 400, "Should be less than
400 idle, found " + genericObjectPool.getNumIdle());
Waiter.sleepQuietly(600L);
- assertTrue(genericObjectPool.getNumIdle() < 300,"Should be less than
300 idle, found " + genericObjectPool.getNumIdle());
+ assertTrue(genericObjectPool.getNumIdle() < 300, "Should be less than
300 idle, found " + genericObjectPool.getNumIdle());
Waiter.sleepQuietly(600L);
- assertTrue(genericObjectPool.getNumIdle() < 200,"Should be less than
200 idle, found " + genericObjectPool.getNumIdle());
+ assertTrue(genericObjectPool.getNumIdle() < 200, "Should be less than
200 idle, found " + genericObjectPool.getNumIdle());
Waiter.sleepQuietly(600L);
- assertTrue(genericObjectPool.getNumIdle() < 100,"Should be less than
100 idle, found " + genericObjectPool.getNumIdle());
+ assertTrue(genericObjectPool.getNumIdle() < 100, "Should be less than
100 idle, found " + genericObjectPool.getNumIdle());
Waiter.sleepQuietly(600L);
- assertEquals(0,genericObjectPool.getNumIdle(),"Should be zero idle,
found " + genericObjectPool.getNumIdle());
+ assertEquals(0, genericObjectPool.getNumIdle(), "Should be zero idle,
found " + genericObjectPool.getNumIdle());
for (int i = 0; i < 500; i++) {
active[i] = genericObjectPool.borrowObject();
@@ -1539,17 +1538,17 @@ public class TestGenericObjectPool extends
TestBaseObjectPool {
}
Waiter.sleepQuietly(1000L);
- assertTrue(genericObjectPool.getNumIdle() < 500,"Should be less than
500 idle, found " + genericObjectPool.getNumIdle());
+ assertTrue(genericObjectPool.getNumIdle() < 500, "Should be less than
500 idle, found " + genericObjectPool.getNumIdle());
Waiter.sleepQuietly(600L);
- assertTrue(genericObjectPool.getNumIdle() < 400,"Should be less than
400 idle, found " + genericObjectPool.getNumIdle());
+ assertTrue(genericObjectPool.getNumIdle() < 400, "Should be less than
400 idle, found " + genericObjectPool.getNumIdle());
Waiter.sleepQuietly(600L);
- assertTrue(genericObjectPool.getNumIdle() < 300,"Should be less than
300 idle, found " + genericObjectPool.getNumIdle());
+ assertTrue(genericObjectPool.getNumIdle() < 300, "Should be less than
300 idle, found " + genericObjectPool.getNumIdle());
Waiter.sleepQuietly(600L);
- assertTrue(genericObjectPool.getNumIdle() < 200,"Should be less than
200 idle, found " + genericObjectPool.getNumIdle());
+ assertTrue(genericObjectPool.getNumIdle() < 200, "Should be less than
200 idle, found " + genericObjectPool.getNumIdle());
Waiter.sleepQuietly(600L);
- assertTrue(genericObjectPool.getNumIdle() < 100,"Should be less than
100 idle, found " + genericObjectPool.getNumIdle());
+ assertTrue(genericObjectPool.getNumIdle() < 100, "Should be less than
100 idle, found " + genericObjectPool.getNumIdle());
Waiter.sleepQuietly(600L);
- assertEquals(0,genericObjectPool.getNumIdle(),"Should be zero idle,
found " + genericObjectPool.getNumIdle());
+ assertEquals(0, genericObjectPool.getNumIdle(), "Should be zero idle,
found " + genericObjectPool.getNumIdle());
}
@Test
@@ -1586,8 +1585,8 @@ public class TestGenericObjectPool extends
TestBaseObjectPool {
Thread.sleep(1000);
// Should have an empty pool
- assertEquals( 0, invalidFactoryPool.getNumIdle(),"Idle count
different than expected.");
- assertEquals( 0, invalidFactoryPool.getNumActive(),"Total count
different than expected.");
+ assertEquals(0, invalidFactoryPool.getNumIdle(), "Idle count
different than expected.");
+ assertEquals(0, invalidFactoryPool.getNumActive(), "Total count
different than expected.");
}
}
@@ -1708,12 +1707,12 @@ public class TestGenericObjectPool extends
TestBaseObjectPool {
// Soft evict all but minIdle(2)
Thread.sleep(1500L);
timePool.evict();
- assertEquals( 2, timePool.getNumIdle(),"Idle count different than
expected.");
+ assertEquals(2, timePool.getNumIdle(), "Idle count different than
expected.");
// Hard evict the rest.
Thread.sleep(2000L);
timePool.evict();
- assertEquals( 0, timePool.getNumIdle(),"Idle count different than
expected.");
+ assertEquals(0, timePool.getNumIdle(), "Idle count different than
expected.");
}
}
@@ -1736,13 +1735,13 @@ public class TestGenericObjectPool extends
TestBaseObjectPool {
}
Waiter.sleepQuietly(100L);
- assertTrue(genericObjectPool.getNumIdle() <= 6,"Should at most 6 idle,
found " + genericObjectPool.getNumIdle());
+ assertTrue(genericObjectPool.getNumIdle() <= 6, "Should at most 6
idle, found " + genericObjectPool.getNumIdle());
Waiter.sleepQuietly(100L);
- assertTrue(genericObjectPool.getNumIdle() <= 3,"Should at most 3 idle,
found " + genericObjectPool.getNumIdle());
+ assertTrue(genericObjectPool.getNumIdle() <= 3, "Should at most 3
idle, found " + genericObjectPool.getNumIdle());
Waiter.sleepQuietly(100L);
- assertTrue(genericObjectPool.getNumIdle() <= 2,"Should be at most 2
idle, found " + genericObjectPool.getNumIdle());
+ assertTrue(genericObjectPool.getNumIdle() <= 2, "Should be at most 2
idle, found " + genericObjectPool.getNumIdle());
Waiter.sleepQuietly(100L);
- assertEquals(0,genericObjectPool.getNumIdle(),"Should be zero idle,
found " + genericObjectPool.getNumIdle());
+ assertEquals(0, genericObjectPool.getNumIdle(), "Should be zero idle,
found " + genericObjectPool.getNumIdle());
}
@Test
@@ -1902,14 +1901,14 @@ public class TestGenericObjectPool extends
TestBaseObjectPool {
genericObjectPool.addObject(); // "0"
genericObjectPool.addObject(); // "1"
genericObjectPool.addObject(); // "2"
- assertEquals( "0", genericObjectPool.borrowObject(),"Oldest");
- assertEquals( "1", genericObjectPool.borrowObject(),"Middle");
- assertEquals( "2", genericObjectPool.borrowObject(),"Youngest");
+ assertEquals("0", genericObjectPool.borrowObject(), "Oldest");
+ assertEquals("1", genericObjectPool.borrowObject(), "Middle");
+ assertEquals("2", genericObjectPool.borrowObject(), "Youngest");
final String o = genericObjectPool.borrowObject();
- assertEquals( "3", o,"new-3");
+ assertEquals("3", o, "new-3");
genericObjectPool.returnObject(o);
- assertEquals( o, genericObjectPool.borrowObject(),"returned-3");
- assertEquals( "4", genericObjectPool.borrowObject(),"new-4");
+ assertEquals(o, genericObjectPool.borrowObject(), "returned-3");
+ assertEquals("4", genericObjectPool.borrowObject(), "new-4");
}
@Test
@@ -2032,14 +2031,14 @@ public class TestGenericObjectPool extends
TestBaseObjectPool {
genericObjectPool.addObject(); // "0"
genericObjectPool.addObject(); // "1"
genericObjectPool.addObject(); // "2"
- assertEquals( "2", genericObjectPool.borrowObject(),"Youngest");
- assertEquals( "1", genericObjectPool.borrowObject(),"Middle");
- assertEquals( "0", genericObjectPool.borrowObject(),"Oldest");
+ assertEquals("2", genericObjectPool.borrowObject(), "Youngest");
+ assertEquals("1", genericObjectPool.borrowObject(), "Middle");
+ assertEquals("0", genericObjectPool.borrowObject(), "Oldest");
o = genericObjectPool.borrowObject();
- assertEquals( "3", o,"new-3");
+ assertEquals("3", o, "new-3");
genericObjectPool.returnObject(o);
- assertEquals( o, genericObjectPool.borrowObject(),"returned-3");
- assertEquals( "4", genericObjectPool.borrowObject(),"new-4");
+ assertEquals(o, genericObjectPool.borrowObject(), "returned-3");
+ assertEquals("4", genericObjectPool.borrowObject(), "new-4");
}
/**
@@ -2120,15 +2119,15 @@ public class TestGenericObjectPool extends
TestBaseObjectPool {
genericObjectPool.setMaxTotal(100);
genericObjectPool.setMaxIdle(8);
final String[] active = new String[100];
- for(int i=0;i<100;i++) {
+ for (int i = 0; i < 100; i++) {
active[i] = genericObjectPool.borrowObject();
}
- assertEquals(100,genericObjectPool.getNumActive());
- assertEquals(0,genericObjectPool.getNumIdle());
- for(int i=0;i<100;i++) {
+ assertEquals(100, genericObjectPool.getNumActive());
+ assertEquals(0, genericObjectPool.getNumIdle());
+ for (int i = 0; i < 100; i++) {
genericObjectPool.returnObject(active[i]);
- assertEquals(99 - i,genericObjectPool.getNumActive());
- assertEquals(i < 8 ? i+1 : 8,genericObjectPool.getNumIdle());
+ assertEquals(99 - i, genericObjectPool.getNumActive());
+ assertEquals(i < 8 ? i + 1 : 8, genericObjectPool.getNumIdle());
}
}
@@ -2138,14 +2137,14 @@ public class TestGenericObjectPool extends
TestBaseObjectPool {
genericObjectPool.setMaxTotal(100);
genericObjectPool.setMaxIdle(0);
final String[] active = new String[100];
- for(int i=0;i<100;i++) {
+ for (int i = 0; i < 100; i++) {
active[i] = genericObjectPool.borrowObject();
}
- assertEquals(100,genericObjectPool.getNumActive());
- assertEquals(0,genericObjectPool.getNumIdle());
- for(int i=0;i<100;i++) {
+ assertEquals(100, genericObjectPool.getNumActive());
+ assertEquals(0, genericObjectPool.getNumIdle());
+ for (int i = 0; i < 100; i++) {
genericObjectPool.returnObject(active[i]);
- assertEquals(99 - i,genericObjectPool.getNumActive());
+ assertEquals(99 - i, genericObjectPool.getNumActive());
assertEquals(0, genericObjectPool.getNumIdle());
}
}
@@ -2375,7 +2374,7 @@ public class TestGenericObjectPool extends
TestBaseObjectPool {
);
}
}
- assertEquals(wtt.length / 2, failed,"Expected half the threads to
fail");
+ assertEquals(wtt.length / 2, failed, "Expected half the threads to
fail");
}
@Test
@@ -2539,7 +2538,7 @@ public class TestGenericObjectPool extends
TestBaseObjectPool {
genericObjectPool.setMaxTotal(-1);
genericObjectPool.setBlockWhenExhausted(false);
final String obj = genericObjectPool.borrowObject();
- assertEquals(getNthObject(0),obj);
+ assertEquals(getNthObject(0), obj);
genericObjectPool.returnObject(obj);
}
@@ -2701,7 +2700,7 @@ public class TestGenericObjectPool extends
TestBaseObjectPool {
@Timeout(value = 60000, unit = TimeUnit.MILLISECONDS)
public void testSetConfig() throws Exception {
final GenericObjectPoolConfig<String> expected = new
GenericObjectPoolConfig<>();
- assertConfiguration(expected,genericObjectPool);
+ assertConfiguration(expected, genericObjectPool);
expected.setMaxTotal(2);
expected.setMaxIdle(3);
expected.setMaxWait(Duration.ofMillis(5));
@@ -2714,7 +2713,7 @@ public class TestGenericObjectPool extends
TestBaseObjectPool {
expected.setTimeBetweenEvictionRuns(Duration.ofMillis(11L));
expected.setBlockWhenExhausted(false);
genericObjectPool.setConfig(expected);
- assertConfiguration(expected,genericObjectPool);
+ assertConfiguration(expected, genericObjectPool);
}
@Test
@@ -2760,25 +2759,25 @@ public class TestGenericObjectPool extends
TestBaseObjectPool {
}
{
genericObjectPool.setMaxTotal(123);
- assertEquals(123,genericObjectPool.getMaxTotal());
+ assertEquals(123, genericObjectPool.getMaxTotal());
}
{
genericObjectPool.setMaxIdle(12);
- assertEquals(12,genericObjectPool.getMaxIdle());
+ assertEquals(12, genericObjectPool.getMaxIdle());
}
{
genericObjectPool.setMaxWaitMillis(1234L);
- assertEquals(1234L,genericObjectPool.getMaxWaitMillis());
+ assertEquals(1234L, genericObjectPool.getMaxWaitMillis());
}
{
genericObjectPool.setMinEvictableIdleTimeMillis(12345L);
-
assertEquals(12345L,genericObjectPool.getMinEvictableIdleDuration().toMillis());
-
assertEquals(12345L,genericObjectPool.getMinEvictableIdleTimeMillis());
-
assertEquals(12345L,genericObjectPool.getMinEvictableIdleTime().toMillis());
+ assertEquals(12345L,
genericObjectPool.getMinEvictableIdleDuration().toMillis());
+ assertEquals(12345L,
genericObjectPool.getMinEvictableIdleTimeMillis());
+ assertEquals(12345L,
genericObjectPool.getMinEvictableIdleTime().toMillis());
}
{
genericObjectPool.setNumTestsPerEvictionRun(11);
- assertEquals(11,genericObjectPool.getNumTestsPerEvictionRun());
+ assertEquals(11, genericObjectPool.getNumTestsPerEvictionRun());
}
{
genericObjectPool.setTestOnBorrow(true);
@@ -2800,15 +2799,15 @@ public class TestGenericObjectPool extends
TestBaseObjectPool {
}
{
genericObjectPool.setTimeBetweenEvictionRunsMillis(11235L);
-
assertEquals(11235L,genericObjectPool.getDurationBetweenEvictionRuns().toMillis());
-
assertEquals(11235L,genericObjectPool.getTimeBetweenEvictionRunsMillis());
-
assertEquals(11235L,genericObjectPool.getTimeBetweenEvictionRuns().toMillis());
+ assertEquals(11235L,
genericObjectPool.getDurationBetweenEvictionRuns().toMillis());
+ assertEquals(11235L,
genericObjectPool.getTimeBetweenEvictionRunsMillis());
+ assertEquals(11235L,
genericObjectPool.getTimeBetweenEvictionRuns().toMillis());
}
{
genericObjectPool.setSoftMinEvictableIdleTimeMillis(12135L);
-
assertEquals(12135L,genericObjectPool.getSoftMinEvictableIdleDuration().toMillis());
-
assertEquals(12135L,genericObjectPool.getSoftMinEvictableIdleTimeMillis());
-
assertEquals(12135L,genericObjectPool.getSoftMinEvictableIdleTime().toMillis());
+ assertEquals(12135L,
genericObjectPool.getSoftMinEvictableIdleDuration().toMillis());
+ assertEquals(12135L,
genericObjectPool.getSoftMinEvictableIdleTimeMillis());
+ assertEquals(12135L,
genericObjectPool.getSoftMinEvictableIdleTime().toMillis());
}
{
genericObjectPool.setBlockWhenExhausted(true);
@@ -2840,7 +2839,7 @@ public class TestGenericObjectPool extends
TestBaseObjectPool {
}
// note that it stays populated
- assertEquals(6,genericObjectPool.getNumIdle(),"Should have 6
idle");
+ assertEquals(6, genericObjectPool.getNumIdle(), "Should have 6
idle");
// start the evictor
genericObjectPool.setTimeBetweenEvictionRuns(Duration.ofMillis(50));
@@ -2849,7 +2848,7 @@ public class TestGenericObjectPool extends
TestBaseObjectPool {
Waiter.sleepQuietly(200L);
// assert that the evictor has cleared out the pool
- assertEquals(0,genericObjectPool.getNumIdle(),"Should have 0
idle");
+ assertEquals(0, genericObjectPool.getNumIdle(), "Should have 0
idle");
// stop the evictor
genericObjectPool.startEvictor(Duration.ZERO);
