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 2020/09/14 14:40:27 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 c5f944d Remove trailing whitespace.
c5f944d is described below
commit c5f944d1ca9b5e4e578850e9466bb4915d0b00d3
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Mon Sep 14 10:40:18 2020 -0400
Remove trailing whitespace.
---
src/main/java/org/apache/commons/pool2/KeyedObjectPool.java | 4 ++--
.../java/org/apache/commons/pool2/KeyedPooledObjectFactory.java | 2 +-
src/main/java/org/apache/commons/pool2/ObjectPool.java | 2 +-
src/main/java/org/apache/commons/pool2/PooledObjectFactory.java | 2 +-
src/main/java/org/apache/commons/pool2/impl/EvictionTimer.java | 2 +-
.../org/apache/commons/pool2/impl/GenericKeyedObjectPool.java | 2 +-
.../java/org/apache/commons/pool2/impl/GenericObjectPool.java | 2 +-
.../org/apache/commons/pool2/TestBasePoolableObjectFactory.java | 8 ++++----
.../org/apache/commons/pool2/impl/TestAbandonedObjectPool.java | 8 ++++----
9 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/src/main/java/org/apache/commons/pool2/KeyedObjectPool.java b/src/main/java/org/apache/commons/pool2/KeyedObjectPool.java
index 49a156f..bb1380c 100644
--- a/src/main/java/org/apache/commons/pool2/KeyedObjectPool.java
+++ b/src/main/java/org/apache/commons/pool2/KeyedObjectPool.java
@@ -270,8 +270,8 @@ public interface KeyedObjectPool<K, V> extends Closeable {
* @throws Exception if the instance cannot be invalidated
*/
void invalidateObject(K key, V obj) throws Exception;
-
-
+
+
/**
* Invalidates an object from the pool, using the provided
* {@link DestroyMode}.
diff --git a/src/main/java/org/apache/commons/pool2/KeyedPooledObjectFactory.java b/src/main/java/org/apache/commons/pool2/KeyedPooledObjectFactory.java
index 0769357..ee822ab 100644
--- a/src/main/java/org/apache/commons/pool2/KeyedPooledObjectFactory.java
+++ b/src/main/java/org/apache/commons/pool2/KeyedPooledObjectFactory.java
@@ -112,7 +112,7 @@ public interface KeyedPooledObjectFactory<K, V> {
* @see KeyedObjectPool#invalidateObject
*/
void destroyObject(K key, PooledObject<V> p) throws Exception;
-
+
/**
* Destroy an instance no longer needed by the pool, using the provided {@link DestroyMode}.
*
diff --git a/src/main/java/org/apache/commons/pool2/ObjectPool.java b/src/main/java/org/apache/commons/pool2/ObjectPool.java
index eccc509..5e171cb 100644
--- a/src/main/java/org/apache/commons/pool2/ObjectPool.java
+++ b/src/main/java/org/apache/commons/pool2/ObjectPool.java
@@ -183,7 +183,7 @@ public interface ObjectPool<T> extends Closeable {
* @throws Exception if the instance cannot be invalidated
*/
void invalidateObject(T obj) throws Exception;
-
+
/**
* Invalidates an object from the pool, using the provided
* {@link DestroyMode}
diff --git a/src/main/java/org/apache/commons/pool2/PooledObjectFactory.java b/src/main/java/org/apache/commons/pool2/PooledObjectFactory.java
index 71128a6..08adf18 100644
--- a/src/main/java/org/apache/commons/pool2/PooledObjectFactory.java
+++ b/src/main/java/org/apache/commons/pool2/PooledObjectFactory.java
@@ -105,7 +105,7 @@ public interface PooledObjectFactory<T> {
* @see ObjectPool#invalidateObject
*/
void destroyObject(PooledObject<T> p) throws Exception;
-
+
/**
* Destroys an instance no longer needed by the pool, using the provided
* DestroyMode.
diff --git a/src/main/java/org/apache/commons/pool2/impl/EvictionTimer.java b/src/main/java/org/apache/commons/pool2/impl/EvictionTimer.java
index 554af96..8f0f04c 100644
--- a/src/main/java/org/apache/commons/pool2/impl/EvictionTimer.java
+++ b/src/main/java/org/apache/commons/pool2/impl/EvictionTimer.java
@@ -141,7 +141,7 @@ class EvictionTimer {
}
}
}
-
+
/**
* @return the number of eviction tasks under management.
*/
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 1380f8d..8429589 100644
--- a/src/main/java/org/apache/commons/pool2/impl/GenericKeyedObjectPool.java
+++ b/src/main/java/org/apache/commons/pool2/impl/GenericKeyedObjectPool.java
@@ -543,7 +543,7 @@ public class GenericKeyedObjectPool<K, T> extends BaseGenericObjectPool<T>
}
}
}
-
+
/**
* {@inheritDoc}
* <p>
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 dd4671c..1a3a02b 100644
--- a/src/main/java/org/apache/commons/pool2/impl/GenericObjectPool.java
+++ b/src/main/java/org/apache/commons/pool2/impl/GenericObjectPool.java
@@ -618,7 +618,7 @@ public class GenericObjectPool<T> extends BaseGenericObjectPool<T>
public void invalidateObject(final T obj) throws Exception {
invalidateObject(obj, DestroyMode.NORMAL);
}
-
+
/**
* {@inheritDoc}
* <p>
diff --git a/src/test/java/org/apache/commons/pool2/TestBasePoolableObjectFactory.java b/src/test/java/org/apache/commons/pool2/TestBasePoolableObjectFactory.java
index cdb0bc7..d1f5917 100644
--- a/src/test/java/org/apache/commons/pool2/TestBasePoolableObjectFactory.java
+++ b/src/test/java/org/apache/commons/pool2/TestBasePoolableObjectFactory.java
@@ -37,7 +37,7 @@ public class TestBasePoolableObjectFactory {
factory.destroyObject(null); // a no-op
assertTrue(factory.validateObject(null)); // constant true
}
-
+
/**
* Default destroy does nothing to underlying AtomicInt, ABANDONED mode
* increments the value. Verify that destroy with no mode does default,
@@ -53,7 +53,7 @@ public class TestBasePoolableObjectFactory {
factory.destroyObject(pooledObj);
assertEquals(0, obj.get());
factory.destroyObject(pooledObj, DestroyMode.ABANDONED);
- assertEquals(1, obj.get());
+ assertEquals(1, obj.get());
}
private static class TestFactory extends BasePooledObjectFactory<AtomicInteger> {
@@ -61,12 +61,12 @@ public class TestBasePoolableObjectFactory {
public AtomicInteger create() throws Exception {
return new AtomicInteger(0);
}
- @Override
+ @Override
public void destroyObject(final PooledObject<AtomicInteger> p, final DestroyMode mode){
if (mode.equals(DestroyMode.ABANDONED)) {
p.getObject().incrementAndGet();
}
- }
+ }
@Override
public PooledObject<AtomicInteger> wrap(final AtomicInteger value) {
return new DefaultPooledObject<>(value);
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 222c725..8031506 100644
--- a/src/test/java/org/apache/commons/pool2/impl/TestAbandonedObjectPool.java
+++ b/src/test/java/org/apache/commons/pool2/impl/TestAbandonedObjectPool.java
@@ -200,7 +200,7 @@ public class TestAbandonedObjectPool {
Assert.assertEquals(0, pool.getNumActive());
Assert.assertEquals(5, pool.getDestroyedCount());
}
-
+
public void testDestroyModeAbandoned() throws Exception {
abandonedConfig = new AbandonedConfig();
abandonedConfig.setRemoveAbandonedOnMaintenance(true);
@@ -216,7 +216,7 @@ public class TestAbandonedObjectPool {
Thread.sleep(100);
Assert.assertTrue(obj.isDetached());
}
-
+
public void testDestroyModeNormal() throws Exception {
abandonedConfig = new AbandonedConfig();
pool.close(); // Unregister pool created by setup
@@ -388,7 +388,7 @@ public class TestAbandonedObjectPool {
public void destroyObject(final PooledObject<PooledTestObject> obj) throws Exception {
destroyObject(obj, DestroyMode.NORMAL);
}
-
+
@Override
public void destroyObject(final PooledObject<PooledTestObject> obj, final DestroyMode mode) throws Exception {
obj.getObject().setActive(false);
@@ -433,7 +433,7 @@ class PooledTestObject implements TrackedUse {
public boolean isDestroyed() {
return destroyed;
}
-
+
public boolean isDetached() {
return detached;
}