You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gg...@apache.org on 2024/02/18 16:02:49 UTC
(commons-pool) branch master updated: Remove trailing whitespace
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 bd9ca955 Remove trailing whitespace
bd9ca955 is described below
commit bd9ca955f95f505a06f1ce867008d1a75aee8c8b
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Sun Feb 18 11:02:44 2024 -0500
Remove trailing whitespace
- Use Checkstyle for trailing whitespace
- Use final
- Simplify lambda
---
LICENSE.txt | 4 ++--
src/conf/checkstyle.xml | 5 +++++
.../java/org/apache/commons/pool3/impl/BaseGenericObjectPool.java | 2 +-
.../java/org/apache/commons/pool3/impl/GenericKeyedObjectPool.java | 4 ++--
src/main/java/org/apache/commons/pool3/impl/GenericObjectPool.java | 2 +-
src/test/java/org/apache/commons/pool3/MethodCall.java | 3 +--
src/test/java/org/apache/commons/pool3/PoolTest.java | 2 +-
src/test/java/org/apache/commons/pool3/TestPoolUtils.java | 4 ++--
src/test/java/org/apache/commons/pool3/WaiterFactory.java | 2 +-
.../org/apache/commons/pool3/impl/DisconnectingWaiterFactory.java | 4 ++--
.../org/apache/commons/pool3/impl/TestGenericKeyedObjectPool.java | 4 ++--
.../java/org/apache/commons/pool3/impl/TestGenericObjectPool.java | 2 +-
12 files changed, 21 insertions(+), 17 deletions(-)
diff --git a/LICENSE.txt b/LICENSE.txt
index 06b2ca87..6d96e617 100644
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -200,9 +200,9 @@
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-
+
APACHE COMMONS POOL DERIVATIVE WORKS:
-
+
The LinkedBlockingDeque implementation is based on an implementation written by
Doug Lea with assistance from members of JCP JSR-166 Expert Group and released
to the public domain, as explained at
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/pool3/impl/BaseGenericObjectPool.java b/src/main/java/org/apache/commons/pool3/impl/BaseGenericObjectPool.java
index a60216dd..0095a20f 100644
--- a/src/main/java/org/apache/commons/pool3/impl/BaseGenericObjectPool.java
+++ b/src/main/java/org/apache/commons/pool3/impl/BaseGenericObjectPool.java
@@ -229,7 +229,7 @@ public abstract class BaseGenericObjectPool<T, E extends Exception> extends Base
public IdentityWrapper(final T instance) {
this.instance = instance;
}
-
+
@Override
@SuppressWarnings("rawtypes")
public boolean equals(final Object other) {
diff --git a/src/main/java/org/apache/commons/pool3/impl/GenericKeyedObjectPool.java b/src/main/java/org/apache/commons/pool3/impl/GenericKeyedObjectPool.java
index 360528e5..96ef8e8f 100644
--- a/src/main/java/org/apache/commons/pool3/impl/GenericKeyedObjectPool.java
+++ b/src/main/java/org/apache/commons/pool3/impl/GenericKeyedObjectPool.java
@@ -1355,7 +1355,7 @@ public class GenericKeyedObjectPool<K, T, E extends Exception> extends BaseGener
*/
@Override
public Map<String, List<DefaultPooledObjectInfo>> listAllObjects() {
- return poolMap.entrySet().stream().collect(Collectors.toMap(e -> e.getKey().toString(),
+ return poolMap.entrySet().stream().collect(Collectors.toMap(e -> e.getKey().toString(),
e -> e.getValue().getAllObjects().values().stream().map(DefaultPooledObjectInfo::new).collect(Collectors.toList())));
}
@@ -1398,7 +1398,7 @@ public class GenericKeyedObjectPool<K, T, E extends Exception> extends BaseGener
lock.unlock();
lock = keyLock.writeLock();
lock.lock();
- final AtomicBoolean allocated = new AtomicBoolean();
+ final AtomicBoolean allocated = new AtomicBoolean();
objectDeque = poolMap.computeIfAbsent(k, key -> {
allocated.set(true);
final ObjectDeque<T> deque = new ObjectDeque<>(fairness);
diff --git a/src/main/java/org/apache/commons/pool3/impl/GenericObjectPool.java b/src/main/java/org/apache/commons/pool3/impl/GenericObjectPool.java
index 5fed85ad..430b8d0f 100644
--- a/src/main/java/org/apache/commons/pool3/impl/GenericObjectPool.java
+++ b/src/main/java/org/apache/commons/pool3/impl/GenericObjectPool.java
@@ -212,7 +212,7 @@ public class GenericObjectPool<T, E extends Exception> extends BaseGenericObject
* is thrown. If there is no factory set (factory == null), an {@code IllegalStateException}
* is thrown.
* </p>
- *
+ *
*/
@Override
public void addObject() throws E {
diff --git a/src/test/java/org/apache/commons/pool3/MethodCall.java b/src/test/java/org/apache/commons/pool3/MethodCall.java
index ca109764..dd77cd56 100644
--- a/src/test/java/org/apache/commons/pool3/MethodCall.java
+++ b/src/test/java/org/apache/commons/pool3/MethodCall.java
@@ -91,8 +91,7 @@ public class MethodCall {
int result;
result = name != null ? name.hashCode() : 0;
result = 29 * result + (params != null ? params.hashCode() : 0);
- result = 29 * result + (returned != null ? returned.hashCode() : 0);
- return result;
+ return 29 * result + (returned != null ? returned.hashCode() : 0);
}
public MethodCall returned(final Object obj) {
diff --git a/src/test/java/org/apache/commons/pool3/PoolTest.java b/src/test/java/org/apache/commons/pool3/PoolTest.java
index f64b7104..b36d2ca8 100644
--- a/src/test/java/org/apache/commons/pool3/PoolTest.java
+++ b/src/test/java/org/apache/commons/pool3/PoolTest.java
@@ -68,7 +68,7 @@ public class PoolTest {
private static final CharSequence COMMONS_POOL_EVICTIONS_TIMER_THREAD_NAME = "commons-pool-EvictionTimer";
private static final long EVICTION_PERIOD_IN_MILLIS = 100;
-
+
private static final Duration EVICTION_DURATION = Duration.ofMillis(100);
@Test
diff --git a/src/test/java/org/apache/commons/pool3/TestPoolUtils.java b/src/test/java/org/apache/commons/pool3/TestPoolUtils.java
index 12a92e80..955e716c 100644
--- a/src/test/java/org/apache/commons/pool3/TestPoolUtils.java
+++ b/src/test/java/org/apache/commons/pool3/TestPoolUtils.java
@@ -181,7 +181,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++;
}
@@ -292,7 +292,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/pool3/WaiterFactory.java b/src/test/java/org/apache/commons/pool3/WaiterFactory.java
index 0ffd0371..2483ac27 100644
--- a/src/test/java/org/apache/commons/pool3/WaiterFactory.java
+++ b/src/test/java/org/apache/commons/pool3/WaiterFactory.java
@@ -194,7 +194,7 @@ public class WaiterFactory<K> implements PooledObjectFactory<Waiter, IllegalStat
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/pool3/impl/DisconnectingWaiterFactory.java b/src/test/java/org/apache/commons/pool3/impl/DisconnectingWaiterFactory.java
index d42b6019..4dcbd56f 100644
--- a/src/test/java/org/apache/commons/pool3/impl/DisconnectingWaiterFactory.java
+++ b/src/test/java/org/apache/commons/pool3/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/pool3/impl/TestGenericKeyedObjectPool.java b/src/test/java/org/apache/commons/pool3/impl/TestGenericKeyedObjectPool.java
index 0cbc0f2e..b22c7b8c 100644
--- a/src/test/java/org/apache/commons/pool3/impl/TestGenericKeyedObjectPool.java
+++ b/src/test/java/org/apache/commons/pool3/impl/TestGenericKeyedObjectPool.java
@@ -298,7 +298,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);
}
@@ -1260,7 +1260,7 @@ public class TestGenericKeyedObjectPool extends AbstractTestKeyedObjectPool {
final String pooled = gkoPool.borrowObject(key);
gkoPool.returnObject(key, pooled);
}
- } catch (TestException e) {
+ } catch (final TestException e) {
fail(e);
}
}));
diff --git a/src/test/java/org/apache/commons/pool3/impl/TestGenericObjectPool.java b/src/test/java/org/apache/commons/pool3/impl/TestGenericObjectPool.java
index 098e22d8..3a3066eb 100644
--- a/src/test/java/org/apache/commons/pool3/impl/TestGenericObjectPool.java
+++ b/src/test/java/org/apache/commons/pool3/impl/TestGenericObjectPool.java
@@ -2006,7 +2006,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 AtomicBoolean failed = new AtomicBoolean();
try (GenericObjectPool<Waiter, IllegalStateException> pool = new GenericObjectPool<>(factory)) {