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
commit 1b3c83f393aa4827809d2be74f04972acad64635 Author: Gary D. Gregory <[email protected]> AuthorDate: Tue Feb 11 08:11:22 2025 -0500 Add Checkstyle WhitespaceAround --- src/conf/checkstyle.xml | 1 + src/main/java/org/apache/commons/pool2/PoolUtils.java | 2 +- .../org/apache/commons/pool2/impl/GenericKeyedObjectPool.java | 4 ++-- src/test/java/org/apache/commons/pool2/TestBaseObjectPool.java | 3 +-- .../apache/commons/pool2/TestBasePoolableObjectFactory.java | 10 +++++----- .../apache/commons/pool2/impl/TestGenericKeyedObjectPool.java | 2 +- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/conf/checkstyle.xml b/src/conf/checkstyle.xml index 3408ab83..85cd3df7 100644 --- a/src/conf/checkstyle.xml +++ b/src/conf/checkstyle.xml @@ -94,5 +94,6 @@ <property name="protectedAllowed" value="true" /> </module> <module name="WhitespaceAfter" /> + <module name="WhitespaceAround" /> </module> </module> diff --git a/src/main/java/org/apache/commons/pool2/PoolUtils.java b/src/main/java/org/apache/commons/pool2/PoolUtils.java index 36fe754b..a6b8b3b5 100644 --- a/src/main/java/org/apache/commons/pool2/PoolUtils.java +++ b/src/main/java/org/apache/commons/pool2/PoolUtils.java @@ -355,7 +355,7 @@ public final class PoolUtils { * {@inheritDoc} */ @Override - public void addObject() throws Exception{ + public void addObject() throws Exception { pool.addObject(); } 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 bf019bf9..df367e32 100644 --- a/src/main/java/org/apache/commons/pool2/impl/GenericKeyedObjectPool.java +++ b/src/main/java/org/apache/commons/pool2/impl/GenericKeyedObjectPool.java @@ -441,8 +441,8 @@ public class GenericKeyedObjectPool<K, T> extends BaseGenericObjectPool<T> } if (blockWhenExhausted) { if (PooledObject.isNull(p)) { - p = borrowMaxWaitMillis < 0 ? objectDeque.getIdleObjects().takeFirst(): - objectDeque.getIdleObjects().pollFirst(borrowMaxWaitMillis, TimeUnit.MILLISECONDS); + p = borrowMaxWaitMillis < 0 ? objectDeque.getIdleObjects().takeFirst() + : objectDeque.getIdleObjects().pollFirst(borrowMaxWaitMillis, TimeUnit.MILLISECONDS); } if (PooledObject.isNull(p)) { throw new NoSuchElementException(appendStats( diff --git a/src/test/java/org/apache/commons/pool2/TestBaseObjectPool.java b/src/test/java/org/apache/commons/pool2/TestBaseObjectPool.java index 5fd0efd4..dcd473b0 100644 --- a/src/test/java/org/apache/commons/pool2/TestBaseObjectPool.java +++ b/src/test/java/org/apache/commons/pool2/TestBaseObjectPool.java @@ -197,7 +197,7 @@ public class TestBaseObjectPool extends AbstractTestObjectPool { } @Test - public void testBaseClosePool() throws Exception{ + public void testBaseClosePool() throws Exception { try { pool = makeEmptyPool(3); } catch (final UnsupportedOperationException e) { @@ -205,7 +205,6 @@ public class TestBaseObjectPool extends AbstractTestObjectPool { } final String obj = pool.borrowObject(); pool.returnObject(obj); - pool.close(); assertThrows(IllegalStateException.class, pool::borrowObject); } diff --git a/src/test/java/org/apache/commons/pool2/TestBasePoolableObjectFactory.java b/src/test/java/org/apache/commons/pool2/TestBasePoolableObjectFactory.java index d9f408da..ca444b99 100644 --- a/src/test/java/org/apache/commons/pool2/TestBasePoolableObjectFactory.java +++ b/src/test/java/org/apache/commons/pool2/TestBasePoolableObjectFactory.java @@ -33,12 +33,14 @@ public class TestBasePoolableObjectFactory { public AtomicInteger create() { return new AtomicInteger(); } + @Override - public void destroyObject(final PooledObject<AtomicInteger> p, final DestroyMode destroyMode){ + public void destroyObject(final PooledObject<AtomicInteger> p, final DestroyMode destroyMode) { if (destroyMode.equals(DestroyMode.ABANDONED)) { p.getObject().incrementAndGet(); } } + @Override public PooledObject<AtomicInteger> wrap(final AtomicInteger value) { return new DefaultPooledObject<>(value); @@ -48,7 +50,6 @@ public class TestBasePoolableObjectFactory { @Test public void testDefaultMethods() throws Exception { final PooledObjectFactory<AtomicInteger> factory = new TestFactory(); - factory.activateObject(null); // a no-op factory.passivateObject(null); // a no-op factory.destroyObject(null); // a no-op @@ -56,9 +57,8 @@ public class TestBasePoolableObjectFactory { } /** - * Default destroy does nothing to underlying AtomicInt, ABANDONED mode - * increments the value. Verify that destroy with no mode does default, - * destroy with ABANDONED mode increments. + * Default destroy does nothing to underlying AtomicInt, ABANDONED mode increments the value. Verify that destroy with no mode does default, destroy with + * ABANDONED mode increments. * * @throws RuntimeException May occur in some failure modes */ 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 8bb65b62..52f58646 100644 --- a/src/test/java/org/apache/commons/pool2/impl/TestGenericKeyedObjectPool.java +++ b/src/test/java/org/apache/commons/pool2/impl/TestGenericKeyedObjectPool.java @@ -658,7 +658,7 @@ public class TestGenericKeyedObjectPool extends AbstractTestKeyedObjectPool { final Random random = new Random(); random.setSeed(System.currentTimeMillis()); for (int i = 0; i < smallPrimes.length; i++) { - for (int j = 0; j < 5; j++) {// Try the tests a few times + for (int j = 0; j < 5; j++) { // Try the tests a few times // Can't use clear as some objects are still active so create // a new pool trackerFactory = new VisitTrackerFactory<>();
