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 bcda14c1 Remove trailing whitespace
bcda14c1 is described below
commit bcda14c127486ead46d30bed2fead068a703993f
Author: Gary Gregory <garydgreg...@gmail.com>
AuthorDate: Sun Feb 18 10:47:08 2024 -0500
Remove trailing whitespace
- Use Checkstyle for trailing whitespace
- Use final
- Simplify lambda
---
src/conf/checkstyle.xml | 5 +++++
src/main/java/org/apache/commons/pool2/ObjectPool.java | 2 +-
src/main/java/org/apache/commons/pool2/PoolUtils.java | 2 +-
.../org/apache/commons/pool2/AbstractTestKeyedObjectPool.java | 4 ++--
src/test/java/org/apache/commons/pool2/PoolTest.java | 1 -
src/test/java/org/apache/commons/pool2/TestPoolUtils.java | 4 ++--
src/test/java/org/apache/commons/pool2/WaiterFactory.java | 2 +-
.../org/apache/commons/pool2/impl/DisconnectingWaiterFactory.java | 4 ++--
.../org/apache/commons/pool2/impl/TestGenericKeyedObjectPool.java | 8 ++++----
.../java/org/apache/commons/pool2/impl/TestGenericObjectPool.java | 2 +-
10 files changed, 19 insertions(+), 15 deletions(-)
diff --git a/src/conf/checkstyle.xml b/src/conf/checkstyle.xml
index c089407d..207a32fc 100644
--- a/src/conf/checkstyle.xml
+++ b/src/conf/checkstyle.xml
@@ -90,4 +90,9 @@
<property name="fileExtensions" value="java" />
<property name="severity" value="warning" />
</module>
+ <module name="RegexpSingleline">
+ <!-- \s matches whitespace character, $ matches end of line. -->
+ <property name="format" value="\s+$" />
+ <property name="message" value="Line has trailing spaces." />
+ </module>
</module>
diff --git a/src/main/java/org/apache/commons/pool2/ObjectPool.java
b/src/main/java/org/apache/commons/pool2/ObjectPool.java
index ba5b9564..146c838d 100644
--- a/src/main/java/org/apache/commons/pool2/ObjectPool.java
+++ b/src/main/java/org/apache/commons/pool2/ObjectPool.java
@@ -50,7 +50,7 @@ import java.util.NoSuchElementException;
* </p>
*
* @param <T> Type of element pooled in this pool.
- *
+ *
*
* @see PooledObjectFactory
* @see KeyedObjectPool
diff --git a/src/main/java/org/apache/commons/pool2/PoolUtils.java
b/src/main/java/org/apache/commons/pool2/PoolUtils.java
index ea753dbc..5ed0d6c9 100644
--- a/src/main/java/org/apache/commons/pool2/PoolUtils.java
+++ b/src/main/java/org/apache/commons/pool2/PoolUtils.java
@@ -1351,7 +1351,7 @@ public final class PoolUtils {
throw new IllegalArgumentException(MSG_NULL_KEYS);
}
final Map<K, TimerTask> tasks = new HashMap<>(keys.size());
- for (K key : keys) {
+ for (final K key : keys) {
final TimerTask task = checkMinIdle(keyedPool, key, minIdle,
periodMillis);
tasks.put(key, task);
}
diff --git
a/src/test/java/org/apache/commons/pool2/AbstractTestKeyedObjectPool.java
b/src/test/java/org/apache/commons/pool2/AbstractTestKeyedObjectPool.java
index 0043440b..90d6b6d3 100644
--- a/src/test/java/org/apache/commons/pool2/AbstractTestKeyedObjectPool.java
+++ b/src/test/java/org/apache/commons/pool2/AbstractTestKeyedObjectPool.java
@@ -191,7 +191,7 @@ public abstract class AbstractTestKeyedObjectPool {
* Return what we expect to be the n<sup>th</sup>
* object (zero indexed) created by the pool
* for the given key.
- *
+ *
* @param key Key for the object to be obtained
* @param n index of the object to be obtained
*
@@ -209,7 +209,7 @@ public abstract class AbstractTestKeyedObjectPool {
* idle and active objects, or
* throw {@link IllegalArgumentException}
* if such a pool cannot be created.
- *
+ *
* @param minCapacity Minimum capacity of the pool to create
*
* @return the newly created keyed object pool
diff --git a/src/test/java/org/apache/commons/pool2/PoolTest.java
b/src/test/java/org/apache/commons/pool2/PoolTest.java
index ba978015..686723fa 100644
--- a/src/test/java/org/apache/commons/pool2/PoolTest.java
+++ b/src/test/java/org/apache/commons/pool2/PoolTest.java
@@ -25,7 +25,6 @@ import java.time.Duration;
import org.apache.commons.pool2.impl.DefaultPooledObject;
import org.apache.commons.pool2.impl.GenericObjectPool;
import org.apache.commons.pool2.impl.GenericObjectPoolConfig;
-import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
public class PoolTest {
diff --git a/src/test/java/org/apache/commons/pool2/TestPoolUtils.java
b/src/test/java/org/apache/commons/pool2/TestPoolUtils.java
index 4d261ed6..902be893 100644
--- a/src/test/java/org/apache/commons/pool2/TestPoolUtils.java
+++ b/src/test/java/org/apache/commons/pool2/TestPoolUtils.java
@@ -183,7 +183,7 @@ public class TestPoolUtils {
assertEquals(2, kop.getNumIdle());
}
int makeObjectCount = 0;
- for (String methodName : calledMethods) {
+ for (final String methodName : calledMethods) {
if ("makeObject".equals(methodName)) {
makeObjectCount++;
}
@@ -296,7 +296,7 @@ public class TestPoolUtils {
assertEquals(2, op.getNumIdle());
}
int makeObjectCount = 0;
- for (String methodName : calledMethods) {
+ for (final String methodName : calledMethods) {
if ("makeObject".equals(methodName)) {
makeObjectCount++;
}
diff --git a/src/test/java/org/apache/commons/pool2/WaiterFactory.java
b/src/test/java/org/apache/commons/pool2/WaiterFactory.java
index 5dd45312..fdfd4c8a 100644
--- a/src/test/java/org/apache/commons/pool2/WaiterFactory.java
+++ b/src/test/java/org/apache/commons/pool2/WaiterFactory.java
@@ -188,7 +188,7 @@ public class WaiterFactory<K> implements
PooledObjectFactory<Waiter>, KeyedPoole
if (activeCounts.isEmpty()) {
return;
}
- for (K key : activeCounts.keySet()) {
+ for (final K key : activeCounts.keySet()) {
activeCounts.put(key, ZERO);
}
}
diff --git
a/src/test/java/org/apache/commons/pool2/impl/DisconnectingWaiterFactory.java
b/src/test/java/org/apache/commons/pool2/impl/DisconnectingWaiterFactory.java
index 5b7429e9..11e643d5 100644
---
a/src/test/java/org/apache/commons/pool2/impl/DisconnectingWaiterFactory.java
+++
b/src/test/java/org/apache/commons/pool2/impl/DisconnectingWaiterFactory.java
@@ -59,7 +59,7 @@ public class DisconnectingWaiterFactory<K> extends
WaiterFactory<K> {
/**
* Blocks until connected or maxWait is exceeded.
- *
+ *
* @throws TimeoutException if maxWait is exceeded.
*/
private static void waitForConnection(final AtomicBoolean connected,
@@ -78,7 +78,7 @@ public class DisconnectingWaiterFactory<K> extends
WaiterFactory<K> {
}
/**
- *
+ *
* A WaiterFactory that simulates a resource required by factory methods
going
* down (and coming back).
* <p>
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 3336fb7c..3b0e05af 100644
---
a/src/test/java/org/apache/commons/pool2/impl/TestGenericKeyedObjectPool.java
+++
b/src/test/java/org/apache/commons/pool2/impl/TestGenericKeyedObjectPool.java
@@ -297,7 +297,7 @@ public class TestGenericKeyedObjectPool extends
AbstractTestKeyedObjectPool {
@Override
public Object create(final Object key) {
- int counter = map.computeIfAbsent(key, k -> new
AtomicInteger(-1)).incrementAndGet();
+ final int counter = map.computeIfAbsent(key, k -> new
AtomicInteger(-1)).incrementAndGet();
return String.valueOf(key) + String.valueOf(counter);
}
@@ -1247,7 +1247,7 @@ public class TestGenericKeyedObjectPool extends
AbstractTestKeyedObjectPool {
gkoPool.clear(key, true);
try {
gkoPool.addObjects(Arrays.asList(key), addCount);
- } catch (Exception e) {
+ } catch (final Exception e) {
fail(e);
}
}
@@ -1261,7 +1261,7 @@ public class TestGenericKeyedObjectPool extends
AbstractTestKeyedObjectPool {
final String pooled = gkoPool.borrowObject(key);
gkoPool.returnObject(key, pooled);
}
- } catch (Exception e) {
+ } catch (final Exception e) {
fail(e);
}
}));
@@ -2806,7 +2806,7 @@ public void testValidateOnCreateFailure() throws
Exception {
assertEquals(0,
gkoPool.getNumWaitersByKey().get(keys[i]).intValue());
}
assertEquals(3, gkoPool.getNumIdle());
- for (String key : keys) {
+ for (final String key : keys) {
assertEquals(1, gkoPool.getNumIdle(key));
}
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 92ec36b7..0f3e5e03 100644
--- a/src/test/java/org/apache/commons/pool2/impl/TestGenericObjectPool.java
+++ b/src/test/java/org/apache/commons/pool2/impl/TestGenericObjectPool.java
@@ -2050,7 +2050,7 @@ public class TestGenericObjectPool extends
TestBaseObjectPool {
final DisconnectingWaiterFactory<String> factory = new
DisconnectingWaiterFactory<>(
DisconnectingWaiterFactory.DEFAULT_DISCONNECTED_CREATE_ACTION,
DisconnectingWaiterFactory.DEFAULT_DISCONNECTED_LIFECYCLE_ACTION,
- (obj) -> false // all instances fail validation
+ obj -> false // all instances fail validation
);
final GenericObjectPool<Waiter> pool = new
GenericObjectPool<>(factory);
pool.setMaxWait(Duration.ofMillis(100));
