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 2017/03/26 04:33:03 UTC
commons-pool git commit: Use final.
Repository: commons-pool
Updated Branches:
refs/heads/master 868b9fd6c -> 8e87b9e6a
Use final.
Project: http://git-wip-us.apache.org/repos/asf/commons-pool/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-pool/commit/8e87b9e6
Tree: http://git-wip-us.apache.org/repos/asf/commons-pool/tree/8e87b9e6
Diff: http://git-wip-us.apache.org/repos/asf/commons-pool/diff/8e87b9e6
Branch: refs/heads/master
Commit: 8e87b9e6a1faef2c4c398af43c98a09a1fc1dae0
Parents: 868b9fd
Author: Gary Gregory <gg...@apache.org>
Authored: Sat Mar 25 21:33:01 2017 -0700
Committer: Gary Gregory <gg...@apache.org>
Committed: Sat Mar 25 21:33:01 2017 -0700
----------------------------------------------------------------------
.../commons/pool2/impl/CallStackUtils.java | 2 +-
.../commons/pool2/impl/EvictionTimer.java | 4 +-
.../pool2/impl/GenericKeyedObjectPool.java | 10 +-
.../commons/pool2/impl/GenericObjectPool.java | 2 +-
.../pool2/impl/SecurityManagerCallStack.java | 4 +-
.../commons/pool2/impl/ThrowableCallStack.java | 4 +-
.../java/org/apache/commons/pool2/PoolTest.java | 158 +++++++++----------
.../commons/pool2/impl/CallStackTest.java | 6 +-
.../pool2/impl/TestGenericKeyedObjectPool.java | 8 +-
.../pool2/impl/TestGenericObjectPool.java | 2 +-
10 files changed, 100 insertions(+), 100 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/commons-pool/blob/8e87b9e6/src/main/java/org/apache/commons/pool2/impl/CallStackUtils.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/pool2/impl/CallStackUtils.java b/src/main/java/org/apache/commons/pool2/impl/CallStackUtils.java
index 7700651..4271af0 100644
--- a/src/main/java/org/apache/commons/pool2/impl/CallStackUtils.java
+++ b/src/main/java/org/apache/commons/pool2/impl/CallStackUtils.java
@@ -32,7 +32,7 @@ public final class CallStackUtils {
}
private static boolean canCreateSecurityManager() {
- SecurityManager manager = System.getSecurityManager();
+ final SecurityManager manager = System.getSecurityManager();
if (manager == null) {
return true;
}
http://git-wip-us.apache.org/repos/asf/commons-pool/blob/8e87b9e6/src/main/java/org/apache/commons/pool2/impl/EvictionTimer.java
----------------------------------------------------------------------
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 4b20a45..3b80d58 100644
--- a/src/main/java/org/apache/commons/pool2/impl/EvictionTimer.java
+++ b/src/main/java/org/apache/commons/pool2/impl/EvictionTimer.java
@@ -90,14 +90,14 @@ class EvictionTimer {
* terminate?
* @param unit The units for the specified timeout
*/
- static synchronized void cancel(final TimerTask task, long timeout, TimeUnit unit) {
+ static synchronized void cancel(final TimerTask task, final long timeout, final TimeUnit unit) {
task.cancel();
usageCount--;
if (usageCount == 0) {
executor.shutdown();
try {
executor.awaitTermination(timeout, unit);
- } catch (InterruptedException e) {
+ } catch (final InterruptedException e) {
// Swallow
// Significant API changes would be required to propagate this
}
http://git-wip-us.apache.org/repos/asf/commons-pool/blob/8e87b9e6/src/main/java/org/apache/commons/pool2/impl/GenericKeyedObjectPool.java
----------------------------------------------------------------------
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 396aaf9..c4bf1ba 100644
--- a/src/main/java/org/apache/commons/pool2/impl/GenericKeyedObjectPool.java
+++ b/src/main/java/org/apache/commons/pool2/impl/GenericKeyedObjectPool.java
@@ -738,7 +738,7 @@ implements KeyedObjectPool<K,T>, GenericKeyedObjectPoolMXBean<K> {
// build sorted map of idle objects
final Map<PooledObject<T>, K> map = new TreeMap<PooledObject<T>, K>();
- for (Map.Entry<K, ObjectDeque<T>> entry : poolMap.entrySet()) {
+ for (final Map.Entry<K, ObjectDeque<T>> entry : poolMap.entrySet()) {
final K k = entry.getKey();
final ObjectDeque<T> deque = entry.getValue();
// Protect against possible NPE if key has been removed in another
@@ -801,7 +801,7 @@ implements KeyedObjectPool<K,T>, GenericKeyedObjectPoolMXBean<K> {
int maxQueueLength = 0;
LinkedBlockingDeque<PooledObject<T>> mostLoaded = null;
K loadedKey = null;
- for (Map.Entry<K, ObjectDeque<T>> entry : poolMap.entrySet()) {
+ for (final Map.Entry<K, ObjectDeque<T>> entry : poolMap.entrySet()) {
final K k = entry.getKey();
final ObjectDeque<T> deque = entry.getValue();
if (deque != null) {
@@ -839,7 +839,7 @@ implements KeyedObjectPool<K,T>, GenericKeyedObjectPoolMXBean<K> {
* {@code false}
*/
private boolean hasBorrowWaiters() {
- for (Map.Entry<K, ObjectDeque<T>> entry : poolMap.entrySet()) {
+ for (final Map.Entry<K, ObjectDeque<T>> entry : poolMap.entrySet()) {
final ObjectDeque<T> deque = entry.getValue();
if (deque != null) {
final LinkedBlockingDeque<PooledObject<T>> pool =
@@ -1407,7 +1407,7 @@ implements KeyedObjectPool<K,T>, GenericKeyedObjectPoolMXBean<K> {
public Map<String,Integer> getNumWaitersByKey() {
final Map<String,Integer> result = new HashMap<String,Integer>();
- for (Map.Entry<K, ObjectDeque<T>> entry : poolMap.entrySet()) {
+ for (final Map.Entry<K, ObjectDeque<T>> entry : poolMap.entrySet()) {
final K k = entry.getKey();
final ObjectDeque<T> deque = entry.getValue();
if (deque != null) {
@@ -1438,7 +1438,7 @@ implements KeyedObjectPool<K,T>, GenericKeyedObjectPoolMXBean<K> {
final Map<String,List<DefaultPooledObjectInfo>> result =
new HashMap<String,List<DefaultPooledObjectInfo>>();
- for (Map.Entry<K, ObjectDeque<T>> entry : poolMap.entrySet()) {
+ for (final Map.Entry<K, ObjectDeque<T>> entry : poolMap.entrySet()) {
final K k = entry.getKey();
final ObjectDeque<T> deque = entry.getValue();
if (deque != null) {
http://git-wip-us.apache.org/repos/asf/commons-pool/blob/8e87b9e6/src/main/java/org/apache/commons/pool2/impl/GenericObjectPool.java
----------------------------------------------------------------------
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 be0f508..816c6cf 100644
--- a/src/main/java/org/apache/commons/pool2/impl/GenericObjectPool.java
+++ b/src/main/java/org/apache/commons/pool2/impl/GenericObjectPool.java
@@ -888,7 +888,7 @@ public class GenericObjectPool<T> extends BaseGenericObjectPool<T>
final PooledObject<T> p;
try {
p = factory.makeObject();
- } catch (Exception e) {
+ } catch (final Exception e) {
createCount.decrementAndGet();
throw e;
} finally {
http://git-wip-us.apache.org/repos/asf/commons-pool/blob/8e87b9e6/src/main/java/org/apache/commons/pool2/impl/SecurityManagerCallStack.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/pool2/impl/SecurityManagerCallStack.java b/src/main/java/org/apache/commons/pool2/impl/SecurityManagerCallStack.java
index 9d0a8d7..cec3900 100644
--- a/src/main/java/org/apache/commons/pool2/impl/SecurityManagerCallStack.java
+++ b/src/main/java/org/apache/commons/pool2/impl/SecurityManagerCallStack.java
@@ -55,7 +55,7 @@ public class SecurityManagerCallStack implements CallStack {
}
@Override
- public boolean printStackTrace(PrintWriter writer) {
+ public boolean printStackTrace(final PrintWriter writer) {
final Snapshot snapshot = this.snapshot;
if (snapshot == null) {
return false;
@@ -100,7 +100,7 @@ public class SecurityManagerCallStack implements CallStack {
private final long timestamp = System.currentTimeMillis();
private final List<WeakReference<Class<?>>> stack;
- private Snapshot(List<WeakReference<Class<?>>> stack) {
+ private Snapshot(final List<WeakReference<Class<?>>> stack) {
this.stack = stack;
}
}
http://git-wip-us.apache.org/repos/asf/commons-pool/blob/8e87b9e6/src/main/java/org/apache/commons/pool2/impl/ThrowableCallStack.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/pool2/impl/ThrowableCallStack.java b/src/main/java/org/apache/commons/pool2/impl/ThrowableCallStack.java
index 98c733f..0f3baa3 100644
--- a/src/main/java/org/apache/commons/pool2/impl/ThrowableCallStack.java
+++ b/src/main/java/org/apache/commons/pool2/impl/ThrowableCallStack.java
@@ -42,8 +42,8 @@ public class ThrowableCallStack implements CallStack {
}
@Override
- public synchronized boolean printStackTrace(PrintWriter writer) {
- Snapshot snapshot = this.snapshot;
+ public synchronized boolean printStackTrace(final PrintWriter writer) {
+ final Snapshot snapshot = this.snapshot;
if (snapshot == null) {
return false;
}
http://git-wip-us.apache.org/repos/asf/commons-pool/blob/8e87b9e6/src/test/java/org/apache/commons/pool2/PoolTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/pool2/PoolTest.java b/src/test/java/org/apache/commons/pool2/PoolTest.java
index e22e70b..4484979 100644
--- a/src/test/java/org/apache/commons/pool2/PoolTest.java
+++ b/src/test/java/org/apache/commons/pool2/PoolTest.java
@@ -1,80 +1,80 @@
-package org.apache.commons.pool2;
-
-import static org.junit.Assert.assertFalse;
-
-import org.apache.commons.pool2.impl.DefaultPooledObject;
-import org.apache.commons.pool2.impl.GenericObjectPool;
-import org.apache.commons.pool2.impl.GenericObjectPoolConfig;
-import org.junit.Ignore;
-import org.junit.Test;
-
-@Ignore
-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 class Foo {
- }
-
- private static class PooledFooFactory implements PooledObjectFactory<Foo> {
- private static final long VALIDATION_WAIT_IN_MILLIS = 1000;
-
- @Override
- public PooledObject<Foo> makeObject() throws Exception {
- return new DefaultPooledObject<Foo>(new Foo());
- }
-
- @Override
- public void destroyObject(PooledObject<Foo> pooledObject) throws Exception {
- }
-
- @Override
- public boolean validateObject(PooledObject<Foo> pooledObject) {
- try {
- Thread.sleep(VALIDATION_WAIT_IN_MILLIS);
- } catch (final InterruptedException e) {
- Thread.interrupted();
- }
- return false;
- }
-
- @Override
- public void activateObject(PooledObject<Foo> pooledObject) throws Exception {
- }
-
- @Override
- public void passivateObject(PooledObject<Foo> pooledObject) throws Exception {
- }
- }
-
- @Test
- public void testPool() throws Exception {
- final GenericObjectPoolConfig poolConfig = new GenericObjectPoolConfig();
- poolConfig.setTestWhileIdle(true /* testWhileIdle */);
- final PooledFooFactory pooledFooFactory = new PooledFooFactory();
- GenericObjectPool<Foo> pool = null;
- try {
- pool = new GenericObjectPool<Foo>(pooledFooFactory, poolConfig);
- pool.setTimeBetweenEvictionRunsMillis(EVICTION_PERIOD_IN_MILLIS);
- pool.addObject();
- try {
- Thread.sleep(EVICTION_PERIOD_IN_MILLIS);
- } catch (final InterruptedException e) {
- Thread.interrupted();
- }
- } finally {
- if (pool != null) {
- pool.close();
- }
- }
- final Thread[] threads = new Thread[Thread.activeCount()];
- Thread.enumerate(threads);
- for (final Thread thread : threads) {
- if (thread == null) {
- continue;
- }
- final String name = thread.getName();
- assertFalse(name, name.contains(COMMONS_POOL_EVICTIONS_TIMER_THREAD_NAME));
- }
- }
+package org.apache.commons.pool2;
+
+import static org.junit.Assert.assertFalse;
+
+import org.apache.commons.pool2.impl.DefaultPooledObject;
+import org.apache.commons.pool2.impl.GenericObjectPool;
+import org.apache.commons.pool2.impl.GenericObjectPoolConfig;
+import org.junit.Ignore;
+import org.junit.Test;
+
+@Ignore
+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 class Foo {
+ }
+
+ private static class PooledFooFactory implements PooledObjectFactory<Foo> {
+ private static final long VALIDATION_WAIT_IN_MILLIS = 1000;
+
+ @Override
+ public PooledObject<Foo> makeObject() throws Exception {
+ return new DefaultPooledObject<Foo>(new Foo());
+ }
+
+ @Override
+ public void destroyObject(final PooledObject<Foo> pooledObject) throws Exception {
+ }
+
+ @Override
+ public boolean validateObject(final PooledObject<Foo> pooledObject) {
+ try {
+ Thread.sleep(VALIDATION_WAIT_IN_MILLIS);
+ } catch (final InterruptedException e) {
+ Thread.interrupted();
+ }
+ return false;
+ }
+
+ @Override
+ public void activateObject(final PooledObject<Foo> pooledObject) throws Exception {
+ }
+
+ @Override
+ public void passivateObject(final PooledObject<Foo> pooledObject) throws Exception {
+ }
+ }
+
+ @Test
+ public void testPool() throws Exception {
+ final GenericObjectPoolConfig poolConfig = new GenericObjectPoolConfig();
+ poolConfig.setTestWhileIdle(true /* testWhileIdle */);
+ final PooledFooFactory pooledFooFactory = new PooledFooFactory();
+ GenericObjectPool<Foo> pool = null;
+ try {
+ pool = new GenericObjectPool<Foo>(pooledFooFactory, poolConfig);
+ pool.setTimeBetweenEvictionRunsMillis(EVICTION_PERIOD_IN_MILLIS);
+ pool.addObject();
+ try {
+ Thread.sleep(EVICTION_PERIOD_IN_MILLIS);
+ } catch (final InterruptedException e) {
+ Thread.interrupted();
+ }
+ } finally {
+ if (pool != null) {
+ pool.close();
+ }
+ }
+ final Thread[] threads = new Thread[Thread.activeCount()];
+ Thread.enumerate(threads);
+ for (final Thread thread : threads) {
+ if (thread == null) {
+ continue;
+ }
+ final String name = thread.getName();
+ assertFalse(name, name.contains(COMMONS_POOL_EVICTIONS_TIMER_THREAD_NAME));
+ }
+ }
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/commons-pool/blob/8e87b9e6/src/test/java/org/apache/commons/pool2/impl/CallStackTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/pool2/impl/CallStackTest.java b/src/test/java/org/apache/commons/pool2/impl/CallStackTest.java
index d3df55d..91f98f9 100644
--- a/src/test/java/org/apache/commons/pool2/impl/CallStackTest.java
+++ b/src/test/java/org/apache/commons/pool2/impl/CallStackTest.java
@@ -32,7 +32,7 @@ public class CallStackTest {
private final CallStack stack;
private final StringWriter writer = new StringWriter();
- public CallStackTest(CallStack stack) {
+ public CallStackTest(final CallStack stack) {
this.stack = stack;
}
@@ -49,7 +49,7 @@ public class CallStackTest {
stack.fillInStackTrace();
stack.clear();
stack.printStackTrace(new PrintWriter(writer));
- String stackTrace = writer.toString();
+ final String stackTrace = writer.toString();
assertEquals("", stackTrace);
}
@@ -57,7 +57,7 @@ public class CallStackTest {
public void testPrintFilledStackTrace() throws Exception {
stack.fillInStackTrace();
stack.printStackTrace(new PrintWriter(writer));
- String stackTrace = writer.toString();
+ final String stackTrace = writer.toString();
assertTrue(stackTrace.contains(getClass().getName()));
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/commons-pool/blob/8e87b9e6/src/test/java/org/apache/commons/pool2/impl/TestGenericKeyedObjectPool.java
----------------------------------------------------------------------
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 5e8ea4a..86f35c5 100644
--- a/src/test/java/org/apache/commons/pool2/impl/TestGenericKeyedObjectPool.java
+++ b/src/test/java/org/apache/commons/pool2/impl/TestGenericKeyedObjectPool.java
@@ -2260,11 +2260,11 @@ public class TestGenericKeyedObjectPool extends TestKeyedObjectPool {
final int holdTime = 2000;
- TestThread<String> testA = new TestThread<String>(pool, 1, 0, holdTime, false, null, "a");
- TestThread<String> testB = new TestThread<String>(pool, 1, 0, holdTime, false, null, "b");
+ final TestThread<String> testA = new TestThread<String>(pool, 1, 0, holdTime, false, null, "a");
+ final TestThread<String> testB = new TestThread<String>(pool, 1, 0, holdTime, false, null, "b");
- Thread threadA = new Thread(testA);
- Thread threadB = new Thread(testB);
+ final Thread threadA = new Thread(testA);
+ final Thread threadB = new Thread(testB);
threadA.start();
threadB.start();
http://git-wip-us.apache.org/repos/asf/commons-pool/blob/8e87b9e6/src/test/java/org/apache/commons/pool2/impl/TestGenericObjectPool.java
----------------------------------------------------------------------
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 838aab4..11a335d 100644
--- a/src/test/java/org/apache/commons/pool2/impl/TestGenericObjectPool.java
+++ b/src/test/java/org/apache/commons/pool2/impl/TestGenericObjectPool.java
@@ -2631,7 +2631,7 @@ public class TestGenericObjectPool extends TestBaseObjectPool {
}
@Override
- public PooledObject<String> wrap(String obj) {
+ public PooledObject<String> wrap(final String obj) {
return new DefaultPooledObject<String>(obj);
}