Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id D4BA6200D3C for ; Tue, 31 Oct 2017 00:07:58 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id D3532160BE4; Mon, 30 Oct 2017 23:07:58 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id CF9E4160BF8 for ; Tue, 31 Oct 2017 00:07:56 +0100 (CET) Received: (qmail 91749 invoked by uid 500); 30 Oct 2017 23:07:55 -0000 Mailing-List: contact commits-help@commons.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@commons.apache.org Delivered-To: mailing list commits@commons.apache.org Received: (qmail 91732 invoked by uid 99); 30 Oct 2017 23:07:55 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 30 Oct 2017 23:07:55 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id A4645DFC32; Mon, 30 Oct 2017 23:07:55 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: ggregory@apache.org To: commits@commons.apache.org Date: Mon, 30 Oct 2017 23:07:56 -0000 Message-Id: In-Reply-To: <0cf23cbed7c84db692ba70102dcfcfbc@git.apache.org> References: <0cf23cbed7c84db692ba70102dcfcfbc@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/2] commons-pool git commit: [POOL-331] Update from Java 6 to 7. Remove redundant type arguments. archived-at: Mon, 30 Oct 2017 23:07:59 -0000 [POOL-331] Update from Java 6 to 7. Remove redundant type arguments. Project: http://git-wip-us.apache.org/repos/asf/commons-pool/repo Commit: http://git-wip-us.apache.org/repos/asf/commons-pool/commit/4373a323 Tree: http://git-wip-us.apache.org/repos/asf/commons-pool/tree/4373a323 Diff: http://git-wip-us.apache.org/repos/asf/commons-pool/diff/4373a323 Branch: refs/heads/master Commit: 4373a323eb38f6dc31dca718e331e69ed245c9d5 Parents: 7275cf1 Author: Gary Gregory Authored: Mon Oct 30 17:07:48 2017 -0600 Committer: Gary Gregory Committed: Mon Oct 30 17:07:48 2017 -0600 ---------------------------------------------------------------------- .../org/apache/commons/pool2/PoolUtils.java | 20 ++--- .../pool2/impl/BaseGenericObjectPool.java | 2 +- .../pool2/impl/GenericKeyedObjectPool.java | 30 +++---- .../commons/pool2/impl/GenericObjectPool.java | 18 ++-- .../commons/pool2/impl/LinkedBlockingDeque.java | 4 +- .../pool2/impl/SecurityManagerCallStack.java | 2 +- .../pool2/impl/SoftReferenceObjectPool.java | 14 +-- .../commons/pool2/proxy/CglibProxySource.java | 2 +- .../commons/pool2/proxy/JdkProxySource.java | 2 +- .../pool2/MethodCallPoolableObjectFactory.java | 2 +- .../java/org/apache/commons/pool2/PoolTest.java | 4 +- .../TestBaseKeyedPoolableObjectFactory.java | 2 +- .../pool2/TestBasePoolableObjectFactory.java | 2 +- .../commons/pool2/TestKeyedObjectPool.java | 16 ++-- .../apache/commons/pool2/TestObjectPool.java | 12 +-- .../org/apache/commons/pool2/TestPoolUtils.java | 54 +++++------ .../commons/pool2/VisitTrackerFactory.java | 4 +- .../org/apache/commons/pool2/WaiterFactory.java | 4 +- .../pool2/impl/TestAbandonedObjectPool.java | 12 +-- .../pool2/impl/TestBaseGenericObjectPool.java | 2 +- .../pool2/impl/TestDefaultPooledObject.java | 4 +- .../pool2/impl/TestDefaultPooledObjectInfo.java | 8 +- .../pool2/impl/TestGenericKeyedObjectPool.java | 94 ++++++++++---------- .../pool2/impl/TestGenericObjectPool.java | 82 ++++++++--------- .../impl/TestGenericObjectPoolClassLoaders.java | 6 +- .../pool2/impl/TestLinkedBlockingDeque.java | 16 ++-- .../pool2/impl/TestPooledSoftReference.java | 6 +- .../pool2/impl/TestSoftRefOutOfMemory.java | 24 ++--- .../pool2/impl/TestSoftReferenceObjectPool.java | 6 +- .../pool2/performance/PerformanceTest.java | 4 +- .../performance/SleepingObjectFactory.java | 2 +- .../proxy/BaseTestProxiedKeyedObjectPool.java | 6 +- .../pool2/proxy/BaseTestProxiedObjectPool.java | 6 +- ...estProxiedKeyedObjectPoolWithCglibProxy.java | 2 +- .../TestProxiedKeyedObjectPoolWithJdkProxy.java | 2 +- .../TestProxiedObjectPoolWithCglibProxy.java | 2 +- .../TestProxiedObjectPoolWithJdkProxy.java | 2 +- 37 files changed, 240 insertions(+), 240 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/commons-pool/blob/4373a323/src/main/java/org/apache/commons/pool2/PoolUtils.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/pool2/PoolUtils.java b/src/main/java/org/apache/commons/pool2/PoolUtils.java index 6ed141d..9a863af 100644 --- a/src/main/java/org/apache/commons/pool2/PoolUtils.java +++ b/src/main/java/org/apache/commons/pool2/PoolUtils.java @@ -106,7 +106,7 @@ public final class PoolUtils { if (minIdle < 0) { throw new IllegalArgumentException("minIdle must be non-negative."); } - final TimerTask task = new ObjectPoolMinIdleTimerTask(pool, minIdle); + final TimerTask task = new ObjectPoolMinIdleTimerTask<>(pool, minIdle); getMinIdleTimer().schedule(task, 0L, period); return task; } @@ -150,7 +150,7 @@ public final class PoolUtils { if (minIdle < 0) { throw new IllegalArgumentException("minIdle must be non-negative."); } - final TimerTask task = new KeyedObjectPoolMinIdleTimerTask( + final TimerTask task = new KeyedObjectPoolMinIdleTimerTask<>( keyedPool, key, minIdle); getMinIdleTimer().schedule(task, 0L, period); return task; @@ -190,7 +190,7 @@ public final class PoolUtils { if (keys == null) { throw new IllegalArgumentException("keys must not be null."); } - final Map tasks = new HashMap(keys.size()); + final Map tasks = new HashMap<>(keys.size()); final Iterator iter = keys.iterator(); while (iter.hasNext()) { final K key = iter.next(); @@ -321,7 +321,7 @@ public final class PoolUtils { * .equals(pool.getClass().getName()) : * "CompositeObjectPools are already thread-safe"; */ - return new SynchronizedObjectPool(pool); + return new SynchronizedObjectPool<>(pool); } /** @@ -354,7 +354,7 @@ public final class PoolUtils { * .equals(keyedPool.getClass().getName()) : * "CompositeKeyedObjectPools are already thread-safe"; */ - return new SynchronizedKeyedObjectPool(keyedPool); + return new SynchronizedKeyedObjectPool<>(keyedPool); } /** @@ -369,7 +369,7 @@ public final class PoolUtils { */ public static PooledObjectFactory synchronizedPooledFactory( final PooledObjectFactory factory) { - return new SynchronizedPooledObjectFactory(factory); + return new SynchronizedPooledObjectFactory<>(factory); } /** @@ -385,7 +385,7 @@ public final class PoolUtils { */ public static KeyedPooledObjectFactory synchronizedKeyedPooledFactory( final KeyedPooledObjectFactory keyedFactory) { - return new SynchronizedKeyedPooledObjectFactory(keyedFactory); + return new SynchronizedKeyedPooledObjectFactory<>(keyedFactory); } /** @@ -441,7 +441,7 @@ public final class PoolUtils { if (factor <= 0f) { throw new IllegalArgumentException("factor must be positive."); } - return new ErodingObjectPool(pool, factor); + return new ErodingObjectPool<>(pool, factor); } /** @@ -544,9 +544,9 @@ public final class PoolUtils { throw new IllegalArgumentException("factor must be positive."); } if (perKey) { - return new ErodingPerKeyKeyedObjectPool(keyedPool, factor); + return new ErodingPerKeyKeyedObjectPool<>(keyedPool, factor); } - return new ErodingKeyedObjectPool(keyedPool, factor); + return new ErodingKeyedObjectPool<>(keyedPool, factor); } /** http://git-wip-us.apache.org/repos/asf/commons-pool/blob/4373a323/src/main/java/org/apache/commons/pool2/impl/BaseGenericObjectPool.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/pool2/impl/BaseGenericObjectPool.java b/src/main/java/org/apache/commons/pool2/impl/BaseGenericObjectPool.java index b901d50..5686588 100644 --- a/src/main/java/org/apache/commons/pool2/impl/BaseGenericObjectPool.java +++ b/src/main/java/org/apache/commons/pool2/impl/BaseGenericObjectPool.java @@ -146,7 +146,7 @@ public abstract class BaseGenericObjectPool extends BaseObject { if (cl == null) { factoryClassLoader = null; } else { - factoryClassLoader = new WeakReference(cl); + factoryClassLoader = new WeakReference<>(cl); } fairness = config.getFairness(); http://git-wip-us.apache.org/repos/asf/commons-pool/blob/4373a323/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 19199a7..a366ec2 100644 --- a/src/main/java/org/apache/commons/pool2/impl/GenericKeyedObjectPool.java +++ b/src/main/java/org/apache/commons/pool2/impl/GenericKeyedObjectPool.java @@ -463,7 +463,7 @@ implements KeyedObjectPool, GenericKeyedObjectPoolMXBean { final ObjectDeque objectDeque = poolMap.get(key); - final PooledObject p = objectDeque.getAllObjects().get(new IdentityWrapper(obj)); + final PooledObject p = objectDeque.getAllObjects().get(new IdentityWrapper<>(obj)); if (p == null) { throw new IllegalStateException( @@ -575,7 +575,7 @@ implements KeyedObjectPool, GenericKeyedObjectPoolMXBean { final ObjectDeque objectDeque = poolMap.get(key); - final PooledObject p = objectDeque.getAllObjects().get(new IdentityWrapper(obj)); + final PooledObject p = objectDeque.getAllObjects().get(new IdentityWrapper<>(obj)); if (p == null) { throw new IllegalStateException( "Object not currently part of this pool"); @@ -738,7 +738,7 @@ implements KeyedObjectPool, GenericKeyedObjectPoolMXBean { public void clearOldest() { // build sorted map of idle objects - final Map, K> map = new TreeMap, K>(); + final Map, K> map = new TreeMap<>(); for (final Map.Entry> entry : poolMap.entrySet()) { final K k = entry.getKey(); @@ -885,7 +885,7 @@ implements KeyedObjectPool, GenericKeyedObjectPoolMXBean { if(evictionIterator == null || !evictionIterator.hasNext()) { if (evictionKeyIterator == null || !evictionKeyIterator.hasNext()) { - final List keyCopy = new ArrayList(); + final List keyCopy = new ArrayList<>(); final Lock readLock = keyLock.readLock(); readLock.lock(); try { @@ -1074,7 +1074,7 @@ implements KeyedObjectPool, GenericKeyedObjectPoolMXBean { } createdCount.incrementAndGet(); - objectDeque.getAllObjects().put(new IdentityWrapper(p.getObject()), p); + objectDeque.getAllObjects().put(new IdentityWrapper<>(p.getObject()), p); return p; } @@ -1097,7 +1097,7 @@ implements KeyedObjectPool, GenericKeyedObjectPoolMXBean { final boolean isIdle = objectDeque.getIdleObjects().remove(toDestroy); if (isIdle || always) { - objectDeque.getAllObjects().remove(new IdentityWrapper(toDestroy.getObject())); + objectDeque.getAllObjects().remove(new IdentityWrapper<>(toDestroy.getObject())); toDestroy.invalidate(); try { @@ -1140,7 +1140,7 @@ implements KeyedObjectPool, GenericKeyedObjectPoolMXBean { lock.lock(); objectDeque = poolMap.get(k); if (objectDeque == null) { - objectDeque = new ObjectDeque(fairness); + objectDeque = new ObjectDeque<>(fairness); objectDeque.getNumInterested().incrementAndGet(); // NOTE: Keys must always be added to both poolMap and // poolKeyList at the same time while protected by @@ -1355,7 +1355,7 @@ implements KeyedObjectPool, GenericKeyedObjectPoolMXBean { @Override public Map getNumActivePerKey() { - final HashMap result = new HashMap(); + final HashMap result = new HashMap<>(); final Iterator>> iter = poolMap.entrySet().iterator(); while (iter.hasNext()) { @@ -1407,7 +1407,7 @@ implements KeyedObjectPool, GenericKeyedObjectPoolMXBean { */ @Override public Map getNumWaitersByKey() { - final Map result = new HashMap(); + final Map result = new HashMap<>(); for (final Map.Entry> entry : poolMap.entrySet()) { final K k = entry.getKey(); @@ -1438,14 +1438,14 @@ implements KeyedObjectPool, GenericKeyedObjectPoolMXBean { @Override public Map> listAllObjects() { final Map> result = - new HashMap>(); + new HashMap<>(); for (final Map.Entry> entry : poolMap.entrySet()) { final K k = entry.getKey(); final ObjectDeque deque = entry.getValue(); if (deque != null) { final List list = - new ArrayList(); + new ArrayList<>(); result.put(k.toString(), list); for (final PooledObject p : deque.getAllObjects().values()) { list.add(new DefaultPooledObjectInfo(p)); @@ -1479,7 +1479,7 @@ implements KeyedObjectPool, GenericKeyedObjectPoolMXBean { * they work properly as keys. */ private final Map, PooledObject> allObjects = - new ConcurrentHashMap, PooledObject>(); + new ConcurrentHashMap<>(); /* * Number of threads with registered interest in this key. @@ -1495,7 +1495,7 @@ implements KeyedObjectPool, GenericKeyedObjectPoolMXBean { * will be served as if waiting in a FIFO queue. */ public ObjectDeque(final boolean fairness) { - idleObjects = new LinkedBlockingDeque>(fairness); + idleObjects = new LinkedBlockingDeque<>(fairness); } /** @@ -1571,14 +1571,14 @@ implements KeyedObjectPool, GenericKeyedObjectPoolMXBean { * changes to the list of current keys is made in a thread-safe manner. */ private final Map> poolMap = - new ConcurrentHashMap>(); // @GuardedBy("keyLock") for write access (and some read access) + new ConcurrentHashMap<>(); // @GuardedBy("keyLock") for write access (and some read access) /* * List of pool keys - used to control eviction order. The list of keys * must be kept in step with {@link #poolMap} using {@link #keyLock} * to ensure any changes to the list of current keys is made in a * thread-safe manner. */ - private final List poolKeyList = new ArrayList(); // @GuardedBy("keyLock") + private final List poolKeyList = new ArrayList<>(); // @GuardedBy("keyLock") private final ReadWriteLock keyLock = new ReentrantReadWriteLock(true); /* * The combined count of the currently active objects for all keys and those http://git-wip-us.apache.org/repos/asf/commons-pool/blob/4373a323/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 b901e5a..d743702 100644 --- a/src/main/java/org/apache/commons/pool2/impl/GenericObjectPool.java +++ b/src/main/java/org/apache/commons/pool2/impl/GenericObjectPool.java @@ -110,7 +110,7 @@ public class GenericObjectPool extends BaseGenericObjectPool } this.factory = factory; - idleObjects = new LinkedBlockingDeque>(config.getFairness()); + idleObjects = new LinkedBlockingDeque<>(config.getFairness()); setConfig(config); @@ -522,7 +522,7 @@ public class GenericObjectPool extends BaseGenericObjectPool */ @Override public void returnObject(final T obj) { - final PooledObject p = allObjects.get(new IdentityWrapper(obj)); + final PooledObject p = allObjects.get(new IdentityWrapper<>(obj)); if (p == null) { if (!isAbandonedConfig()) { @@ -618,7 +618,7 @@ public class GenericObjectPool extends BaseGenericObjectPool */ @Override public void invalidateObject(final T obj) throws Exception { - final PooledObject p = allObjects.get(new IdentityWrapper(obj)); + final PooledObject p = allObjects.get(new IdentityWrapper<>(obj)); if (p == null) { if (isAbandonedConfig()) { return; @@ -902,7 +902,7 @@ public class GenericObjectPool extends BaseGenericObjectPool } createdCount.incrementAndGet(); - allObjects.put(new IdentityWrapper(p.getObject()), p); + allObjects.put(new IdentityWrapper<>(p.getObject()), p); return p; } @@ -917,7 +917,7 @@ public class GenericObjectPool extends BaseGenericObjectPool private void destroy(final PooledObject toDestroy) throws Exception { toDestroy.invalidate(); idleObjects.remove(toDestroy); - allObjects.remove(new IdentityWrapper(toDestroy.getObject())); + allObjects.remove(new IdentityWrapper<>(toDestroy.getObject())); try { factory.destroyObject(toDestroy); } finally { @@ -1033,7 +1033,7 @@ public class GenericObjectPool extends BaseGenericObjectPool final long now = System.currentTimeMillis(); final long timeout = now - (ac.getRemoveAbandonedTimeout() * 1000L); - final ArrayList> remove = new ArrayList>(); + final ArrayList> remove = new ArrayList<>(); final Iterator> it = allObjects.values().iterator(); while (it.hasNext()) { final PooledObject pooledObject = it.next(); @@ -1068,7 +1068,7 @@ public class GenericObjectPool extends BaseGenericObjectPool public void use(final T pooledObject) { final AbandonedConfig ac = this.abandonedConfig; if (ac != null && ac.getUseUsageTracking()) { - final PooledObject wrapper = allObjects.get(new IdentityWrapper(pooledObject)); + final PooledObject wrapper = allObjects.get(new IdentityWrapper<>(pooledObject)); wrapper.use(); } } @@ -1130,7 +1130,7 @@ public class GenericObjectPool extends BaseGenericObjectPool @Override public Set listAllObjects() { final Set result = - new HashSet(allObjects.size()); + new HashSet<>(allObjects.size()); for (final PooledObject p : allObjects.values()) { result.add(new DefaultPooledObjectInfo(p)); } @@ -1154,7 +1154,7 @@ public class GenericObjectPool extends BaseGenericObjectPool * wrappers used internally by the pool. */ private final Map, PooledObject> allObjects = - new ConcurrentHashMap, PooledObject>(); + new ConcurrentHashMap<>(); /* * The combined count of the currently created objects and those in the * process of being created. Under load, it may exceed {@link #_maxActive} http://git-wip-us.apache.org/repos/asf/commons-pool/blob/4373a323/src/main/java/org/apache/commons/pool2/impl/LinkedBlockingDeque.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/pool2/impl/LinkedBlockingDeque.java b/src/main/java/org/apache/commons/pool2/impl/LinkedBlockingDeque.java index 6cf9f4e..aa57b84 100644 --- a/src/main/java/org/apache/commons/pool2/impl/LinkedBlockingDeque.java +++ b/src/main/java/org/apache/commons/pool2/impl/LinkedBlockingDeque.java @@ -245,7 +245,7 @@ class LinkedBlockingDeque extends AbstractQueue return false; } final Node f = first; - final Node x = new Node(e, null, f); + final Node x = new Node<>(e, null, f); first = x; if (last == null) { last = x; @@ -270,7 +270,7 @@ class LinkedBlockingDeque extends AbstractQueue return false; } final Node l = last; - final Node x = new Node(e, l, null); + final Node x = new Node<>(e, l, null); last = x; if (first == null) { first = x; http://git-wip-us.apache.org/repos/asf/commons-pool/blob/4373a323/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 e217a8f..39d54bc 100644 --- a/src/main/java/org/apache/commons/pool2/impl/SecurityManagerCallStack.java +++ b/src/main/java/org/apache/commons/pool2/impl/SecurityManagerCallStack.java @@ -88,7 +88,7 @@ public class SecurityManagerCallStack implements CallStack { private static class PrivateSecurityManager extends SecurityManager { private List>> getCallStack() { final Class[] classes = getClassContext(); - final List>> stack = new ArrayList>>(classes.length); + final List>> stack = new ArrayList<>(classes.length); for (final Class klass : classes) { stack.add(new WeakReference>(klass)); } http://git-wip-us.apache.org/repos/asf/commons-pool/blob/4373a323/src/main/java/org/apache/commons/pool2/impl/SoftReferenceObjectPool.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/pool2/impl/SoftReferenceObjectPool.java b/src/main/java/org/apache/commons/pool2/impl/SoftReferenceObjectPool.java index 8bcf1fb..0f6bcc5 100644 --- a/src/main/java/org/apache/commons/pool2/impl/SoftReferenceObjectPool.java +++ b/src/main/java/org/apache/commons/pool2/impl/SoftReferenceObjectPool.java @@ -48,7 +48,7 @@ public class SoftReferenceObjectPool extends BaseObjectPool { * _pool. This is used to help {@link #getNumIdle()} be more * accurate with minimal performance overhead. */ - private final ReferenceQueue refQueue = new ReferenceQueue(); + private final ReferenceQueue refQueue = new ReferenceQueue<>(); /** Count of instances that have been checkout out to pool clients */ private int numActive = 0; // @GuardedBy("this") @@ -62,11 +62,11 @@ public class SoftReferenceObjectPool extends BaseObjectPool { /** Idle references - waiting to be borrowed */ private final LinkedBlockingDeque> idleReferences = - new LinkedBlockingDeque>(); + new LinkedBlockingDeque<>(); /** All references - checked out or waiting to be borrowed. */ private final ArrayList> allReferences = - new ArrayList>(); + new ArrayList<>(); /** * Create a SoftReferenceObjectPool with the specified factory. @@ -127,7 +127,7 @@ public class SoftReferenceObjectPool extends BaseObjectPool { obj = factory.makeObject().getObject(); createCount++; // Do not register with the queue - ref = new PooledSoftReference(new SoftReference(obj)); + ref = new PooledSoftReference<>(new SoftReference<>(obj)); allReferences.add(ref); } else { ref = idleReferences.pollFirst(); @@ -136,7 +136,7 @@ public class SoftReferenceObjectPool extends BaseObjectPool { // a new, non-registered reference so we can still track this object // in allReferences ref.getReference().clear(); - ref.setReference(new SoftReference(obj)); + ref.setReference(new SoftReference<>(obj)); } if (null != factory && null != obj) { try { @@ -274,8 +274,8 @@ public class SoftReferenceObjectPool extends BaseObjectPool { final T obj = factory.makeObject().getObject(); createCount++; // Create and register with the queue - final PooledSoftReference ref = new PooledSoftReference( - new SoftReference(obj, refQueue)); + final PooledSoftReference ref = new PooledSoftReference<>( + new SoftReference<>(obj, refQueue)); allReferences.add(ref); boolean success = true; http://git-wip-us.apache.org/repos/asf/commons-pool/blob/4373a323/src/main/java/org/apache/commons/pool2/proxy/CglibProxySource.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/pool2/proxy/CglibProxySource.java b/src/main/java/org/apache/commons/pool2/proxy/CglibProxySource.java index 9784b5f..e849ba4 100644 --- a/src/main/java/org/apache/commons/pool2/proxy/CglibProxySource.java +++ b/src/main/java/org/apache/commons/pool2/proxy/CglibProxySource.java @@ -47,7 +47,7 @@ public class CglibProxySource implements ProxySource { enhancer.setSuperclass(superclass); final CglibProxyHandler proxyInterceptor = - new CglibProxyHandler(pooledObject, usageTracking); + new CglibProxyHandler<>(pooledObject, usageTracking); enhancer.setCallback(proxyInterceptor); @SuppressWarnings("unchecked") http://git-wip-us.apache.org/repos/asf/commons-pool/blob/4373a323/src/main/java/org/apache/commons/pool2/proxy/JdkProxySource.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/pool2/proxy/JdkProxySource.java b/src/main/java/org/apache/commons/pool2/proxy/JdkProxySource.java index 80aa07d..fa9fa19 100644 --- a/src/main/java/org/apache/commons/pool2/proxy/JdkProxySource.java +++ b/src/main/java/org/apache/commons/pool2/proxy/JdkProxySource.java @@ -53,7 +53,7 @@ public class JdkProxySource implements ProxySource { @SuppressWarnings("unchecked") final T proxy = (T) Proxy.newProxyInstance(classLoader, interfaces, - new JdkProxyHandler(pooledObject, usageTracking)); + new JdkProxyHandler<>(pooledObject, usageTracking)); return proxy; } http://git-wip-us.apache.org/repos/asf/commons-pool/blob/4373a323/src/test/java/org/apache/commons/pool2/MethodCallPoolableObjectFactory.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/pool2/MethodCallPoolableObjectFactory.java b/src/test/java/org/apache/commons/pool2/MethodCallPoolableObjectFactory.java index 712bb6e..edbdee0 100644 --- a/src/test/java/org/apache/commons/pool2/MethodCallPoolableObjectFactory.java +++ b/src/test/java/org/apache/commons/pool2/MethodCallPoolableObjectFactory.java @@ -29,7 +29,7 @@ import org.apache.commons.pool2.impl.DefaultPooledObject; * @see MethodCall */ public class MethodCallPoolableObjectFactory implements PooledObjectFactory { - private final List methodCalls = new ArrayList(); + private final List methodCalls = new ArrayList<>(); private int count = 0; private boolean valid = true; private boolean makeObjectFail; http://git-wip-us.apache.org/repos/asf/commons-pool/blob/4373a323/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 0a96feb..837a7d9 100644 --- a/src/test/java/org/apache/commons/pool2/PoolTest.java +++ b/src/test/java/org/apache/commons/pool2/PoolTest.java @@ -38,7 +38,7 @@ public class PoolTest { @Override public PooledObject makeObject() throws Exception { - return new DefaultPooledObject(new Foo()); + return new DefaultPooledObject<>(new Foo()); } @Override @@ -71,7 +71,7 @@ public class PoolTest { final PooledFooFactory pooledFooFactory = new PooledFooFactory(); GenericObjectPool pool = null; try { - pool = new GenericObjectPool(pooledFooFactory, poolConfig); + pool = new GenericObjectPool<>(pooledFooFactory, poolConfig); pool.setTimeBetweenEvictionRunsMillis(EVICTION_PERIOD_IN_MILLIS); pool.addObject(); try { http://git-wip-us.apache.org/repos/asf/commons-pool/blob/4373a323/src/test/java/org/apache/commons/pool2/TestBaseKeyedPoolableObjectFactory.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/pool2/TestBaseKeyedPoolableObjectFactory.java b/src/test/java/org/apache/commons/pool2/TestBaseKeyedPoolableObjectFactory.java index 334fcce..58af0bd 100644 --- a/src/test/java/org/apache/commons/pool2/TestBaseKeyedPoolableObjectFactory.java +++ b/src/test/java/org/apache/commons/pool2/TestBaseKeyedPoolableObjectFactory.java @@ -43,7 +43,7 @@ public class TestBaseKeyedPoolableObjectFactory { } @Override public PooledObject wrap(final Object value) { - return new DefaultPooledObject(value); + return new DefaultPooledObject<>(value); } } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/commons-pool/blob/4373a323/src/test/java/org/apache/commons/pool2/TestBasePoolableObjectFactory.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/pool2/TestBasePoolableObjectFactory.java b/src/test/java/org/apache/commons/pool2/TestBasePoolableObjectFactory.java index 201dfcc..11fa724 100644 --- a/src/test/java/org/apache/commons/pool2/TestBasePoolableObjectFactory.java +++ b/src/test/java/org/apache/commons/pool2/TestBasePoolableObjectFactory.java @@ -42,7 +42,7 @@ public class TestBasePoolableObjectFactory { } @Override public PooledObject wrap(final Object value) { - return new DefaultPooledObject(value); + return new DefaultPooledObject<>(value); } } } http://git-wip-us.apache.org/repos/asf/commons-pool/blob/4373a323/src/test/java/org/apache/commons/pool2/TestKeyedObjectPool.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/pool2/TestKeyedObjectPool.java b/src/test/java/org/apache/commons/pool2/TestKeyedObjectPool.java index eb175bf..c972d67 100644 --- a/src/test/java/org/apache/commons/pool2/TestKeyedObjectPool.java +++ b/src/test/java/org/apache/commons/pool2/TestKeyedObjectPool.java @@ -139,7 +139,7 @@ public abstract class TestKeyedObjectPool { } catch(final UnsupportedOperationException uoe) { return; // test not supported } - final List expectedMethods = new ArrayList(); + final List expectedMethods = new ArrayList<>(); // addObject should make a new object, passivate it and put it in the pool pool.addObject(KEY); @@ -187,7 +187,7 @@ public abstract class TestKeyedObjectPool { } catch(final UnsupportedOperationException uoe) { return; // test not supported } - final List expectedMethods = new ArrayList(); + final List expectedMethods = new ArrayList<>(); Object obj; if (pool instanceof GenericKeyedObjectPool) { @@ -275,7 +275,7 @@ public abstract class TestKeyedObjectPool { } catch(final UnsupportedOperationException uoe) { return; // test not supported } - final List expectedMethods = new ArrayList(); + final List expectedMethods = new ArrayList<>(); Object obj; /// Test correct behavior code paths @@ -333,7 +333,7 @@ public abstract class TestKeyedObjectPool { } catch(final UnsupportedOperationException uoe) { return; // test not supported } - final List expectedMethods = new ArrayList(); + final List expectedMethods = new ArrayList<>(); Object obj; /// Test correct behavior code paths @@ -372,7 +372,7 @@ public abstract class TestKeyedObjectPool { } catch(final UnsupportedOperationException uoe) { return; // test not supported } - final List expectedMethods = new ArrayList(); + final List expectedMethods = new ArrayList<>(); /// Test correct behavior code paths PoolUtils.prefill(pool, KEY, 5); @@ -395,7 +395,7 @@ public abstract class TestKeyedObjectPool { } catch(final UnsupportedOperationException uoe) { return; // test not supported } - final List expectedMethods = new ArrayList(); + final List expectedMethods = new ArrayList<>(); /// Test correct behavior code paths PoolUtils.prefill(pool, KEY, 5); @@ -674,12 +674,12 @@ public abstract class TestKeyedObjectPool { } @Override public PooledObject wrap(final Object value) { - return new DefaultPooledObject(value); + return new DefaultPooledObject<>(value); } } protected static class FailingKeyedPooledObjectFactory implements KeyedPooledObjectFactory { - private final List methodCalls = new ArrayList(); + private final List methodCalls = new ArrayList<>(); private int count = 0; private boolean makeObjectFail; private boolean activateObjectFail; http://git-wip-us.apache.org/repos/asf/commons-pool/blob/4373a323/src/test/java/org/apache/commons/pool2/TestObjectPool.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/pool2/TestObjectPool.java b/src/test/java/org/apache/commons/pool2/TestObjectPool.java index 2dc7316..38741d4 100644 --- a/src/test/java/org/apache/commons/pool2/TestObjectPool.java +++ b/src/test/java/org/apache/commons/pool2/TestObjectPool.java @@ -116,7 +116,7 @@ public abstract class TestObjectPool { } catch(final UnsupportedOperationException uoe) { return; // test not supported } - final List expectedMethods = new ArrayList(); + final List expectedMethods = new ArrayList<>(); assertEquals(0, pool.getNumActive()); assertEquals(0, pool.getNumIdle()); @@ -181,7 +181,7 @@ public abstract class TestObjectPool { if (pool instanceof GenericObjectPool) { ((GenericObjectPool) pool).setTestOnBorrow(true); } - final List expectedMethods = new ArrayList(); + final List expectedMethods = new ArrayList<>(); Object obj; /// Test correct behavior code paths @@ -262,7 +262,7 @@ public abstract class TestObjectPool { } catch (final UnsupportedOperationException uoe) { return; // test not supported } - final List expectedMethods = new ArrayList(); + final List expectedMethods = new ArrayList<>(); Object obj; /// Test correct behavior code paths @@ -323,7 +323,7 @@ public abstract class TestObjectPool { } catch (final UnsupportedOperationException uoe) { return; // test not supported } - final List expectedMethods = new ArrayList(); + final List expectedMethods = new ArrayList<>(); Object obj; /// Test correct behavior code paths @@ -362,7 +362,7 @@ public abstract class TestObjectPool { } catch (final UnsupportedOperationException uoe) { return; // test not supported } - final List expectedMethods = new ArrayList(); + final List expectedMethods = new ArrayList<>(); /// Test correct behavior code paths PoolUtils.prefill(pool, 5); @@ -385,7 +385,7 @@ public abstract class TestObjectPool { } catch (final UnsupportedOperationException uoe) { return; // test not supported } - final List expectedMethods = new ArrayList(); + final List expectedMethods = new ArrayList<>(); /// Test correct behavior code paths PoolUtils.prefill(pool, 5); http://git-wip-us.apache.org/repos/asf/commons-pool/blob/4373a323/src/test/java/org/apache/commons/pool2/TestPoolUtils.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/pool2/TestPoolUtils.java b/src/test/java/org/apache/commons/pool2/TestPoolUtils.java index a8d63a5..0c9f0ed 100644 --- a/src/test/java/org/apache/commons/pool2/TestPoolUtils.java +++ b/src/test/java/org/apache/commons/pool2/TestPoolUtils.java @@ -105,12 +105,12 @@ public class TestPoolUtils { // expected } - final List calledMethods = new ArrayList(); + final List calledMethods = new ArrayList<>(); // Test that the minIdle check doesn't add too many idle objects @SuppressWarnings("unchecked") final PooledObjectFactory pof = createProxy(PooledObjectFactory.class, calledMethods); - final ObjectPool op = new GenericObjectPool(pof); + final ObjectPool op = new GenericObjectPool<>(pof); PoolUtils.checkMinIdle(op, 2, 100); Thread.sleep(1000); assertEquals(2, op.getNumIdle()); @@ -140,7 +140,7 @@ public class TestPoolUtils { task.cancel(); task.toString(); - final List expectedMethods = new ArrayList(); + final List expectedMethods = new ArrayList<>(); for (int i=0; i < CHECK_COUNT; i++) { expectedMethods.add("getNumIdle"); expectedMethods.add("addObject"); @@ -181,7 +181,7 @@ public class TestPoolUtils { // expected } - final List calledMethods = new ArrayList(); + final List calledMethods = new ArrayList<>(); final Object key = new Object(); // Test that the minIdle check doesn't add too many idle objects @@ -189,7 +189,7 @@ public class TestPoolUtils { final KeyedPooledObjectFactory kpof = createProxy(KeyedPooledObjectFactory.class, calledMethods); final KeyedObjectPool kop = - new GenericKeyedObjectPool(kpof); + new GenericKeyedObjectPool<>(kpof); PoolUtils.checkMinIdle(kop, key, 2, 100); Thread.sleep(400); assertEquals(2, kop.getNumIdle(key)); @@ -220,7 +220,7 @@ public class TestPoolUtils { task.cancel(); task.toString(); - final List expectedMethods = new ArrayList(); + final List expectedMethods = new ArrayList<>(); for (int i=0; i < CHECK_COUNT; i++) { expectedMethods.add("getNumIdle"); expectedMethods.add("addObject"); @@ -261,10 +261,10 @@ public class TestPoolUtils { do { afe = null; try { - final List calledMethods = new ArrayList(); + final List calledMethods = new ArrayList<>(); @SuppressWarnings("unchecked") final KeyedObjectPool pool = createProxy(KeyedObjectPool.class, calledMethods); - final Collection keys = new ArrayList(2); + final Collection keys = new ArrayList<>(2); keys.add("one"); keys.add("two"); final Map tasks = PoolUtils.checkMinIdle(pool, keys, 1, CHECK_PERIOD); // checks minIdle immediately @@ -274,7 +274,7 @@ public class TestPoolUtils { task.cancel(); } - final List expectedMethods = new ArrayList(); + final List expectedMethods = new ArrayList<>(); for (int i=0; i < CHECK_COUNT * keys.size(); i++) { expectedMethods.add("getNumIdle"); expectedMethods.add("addObject"); @@ -298,12 +298,12 @@ public class TestPoolUtils { // expected } - final List calledMethods = new ArrayList(); + final List calledMethods = new ArrayList<>(); @SuppressWarnings("unchecked") final ObjectPool pool = createProxy(ObjectPool.class, calledMethods); PoolUtils.prefill(pool, 0); - final List expectedMethods = new ArrayList(); + final List expectedMethods = new ArrayList<>(); assertEquals(expectedMethods, calledMethods); calledMethods.clear(); @@ -331,12 +331,12 @@ public class TestPoolUtils { // expected } - final List calledMethods = new ArrayList(); + final List calledMethods = new ArrayList<>(); @SuppressWarnings("unchecked") final KeyedObjectPool pool = createProxy(KeyedObjectPool.class, calledMethods); PoolUtils.prefill(pool, new Object(), 0); - final List expectedMethods = new ArrayList(); + final List expectedMethods = new ArrayList<>(); assertEquals(expectedMethods, calledMethods); calledMethods.clear(); @@ -358,13 +358,13 @@ public class TestPoolUtils { // expected } - final List calledMethods = new ArrayList(); + final List calledMethods = new ArrayList<>(); @SuppressWarnings("unchecked") final KeyedObjectPool pool = createProxy(KeyedObjectPool.class, calledMethods); - final Set keys = new HashSet(); + final Set keys = new HashSet<>(); PoolUtils.prefill(pool, keys, 0); - final List expectedMethods = new ArrayList(); + final List expectedMethods = new ArrayList<>(); assertEquals(expectedMethods, calledMethods); calledMethods.clear(); @@ -387,7 +387,7 @@ public class TestPoolUtils { // expected } - final List calledMethods = new ArrayList(); + final List calledMethods = new ArrayList<>(); @SuppressWarnings("unchecked") final ObjectPool op = createProxy(ObjectPool.class, calledMethods); @@ -407,7 +407,7 @@ public class TestPoolUtils { // expected } - final List calledMethods = new ArrayList(); + final List calledMethods = new ArrayList<>(); @SuppressWarnings("unchecked") final KeyedObjectPool kop = createProxy(KeyedObjectPool.class, calledMethods); @@ -427,7 +427,7 @@ public class TestPoolUtils { // expected } - final List calledMethods = new ArrayList(); + final List calledMethods = new ArrayList<>(); @SuppressWarnings("unchecked") final PooledObjectFactory pof = createProxy(PooledObjectFactory.class, calledMethods); @@ -448,7 +448,7 @@ public class TestPoolUtils { // expected } - final List calledMethods = new ArrayList(); + final List calledMethods = new ArrayList<>(); @SuppressWarnings("unchecked") final KeyedPooledObjectFactory kpof = createProxy(KeyedPooledObjectFactory.class, calledMethods); @@ -476,7 +476,7 @@ public class TestPoolUtils { // expected } - final List calledMethods = new ArrayList(); + final List calledMethods = new ArrayList<>(); final InvocationHandler handler = new MethodCallLogger(calledMethods) { @Override public Object invoke(final Object proxy, final Method method, final Object[] args) throws Throwable { @@ -504,7 +504,7 @@ public class TestPoolUtils { final ObjectPool pool = PoolUtils.erodingPool( createProxy(ObjectPool.class, handler), factor); - final List expectedMethods = new ArrayList(); + final List expectedMethods = new ArrayList<>(); assertEquals(expectedMethods, calledMethods); pool.addObject(); @@ -596,7 +596,7 @@ public class TestPoolUtils { // expected } - final List calledMethods = new ArrayList(); + final List calledMethods = new ArrayList<>(); final InvocationHandler handler = new MethodCallLogger(calledMethods) { @Override public Object invoke(final Object proxy, final Method method, final Object[] args) throws Throwable { @@ -633,7 +633,7 @@ public class TestPoolUtils { final KeyedObjectPool pool = PoolUtils.erodingPool(createProxy(KeyedObjectPool.class, handler), factor); - final List expectedMethods = new ArrayList(); + final List expectedMethods = new ArrayList<>(); assertEquals(expectedMethods, calledMethods); final Object key = "key"; @@ -727,7 +727,7 @@ public class TestPoolUtils { // expected } - final List calledMethods = new ArrayList(); + final List calledMethods = new ArrayList<>(); final InvocationHandler handler = new MethodCallLogger(calledMethods) { @Override public Object invoke(final Object proxy, final Method method, final Object[] args) throws Throwable { @@ -746,7 +746,7 @@ public class TestPoolUtils { final KeyedObjectPool pool = PoolUtils.erodingPool( createProxy(KeyedObjectPool.class, handler), factor, true); - final List expectedMethods = new ArrayList(); + final List expectedMethods = new ArrayList<>(); assertEquals(expectedMethods, calledMethods); final Object key = "key"; @@ -901,7 +901,7 @@ public class TestPoolUtils { } else if (Object.class.equals(method.getReturnType())) { return new Object(); } else if (PooledObject.class.equals(method.getReturnType())) { - return new DefaultPooledObject(new Object()); + return new DefaultPooledObject<>(new Object()); } else { return null; } http://git-wip-us.apache.org/repos/asf/commons-pool/blob/4373a323/src/test/java/org/apache/commons/pool2/VisitTrackerFactory.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/pool2/VisitTrackerFactory.java b/src/test/java/org/apache/commons/pool2/VisitTrackerFactory.java index 155613c..8346655 100644 --- a/src/test/java/org/apache/commons/pool2/VisitTrackerFactory.java +++ b/src/test/java/org/apache/commons/pool2/VisitTrackerFactory.java @@ -35,12 +35,12 @@ public class VisitTrackerFactory @Override public PooledObject> makeObject() { - return new DefaultPooledObject>(new VisitTracker(nextId++)); + return new DefaultPooledObject<>(new VisitTracker(nextId++)); } @Override public PooledObject> makeObject(final K key) { - return new DefaultPooledObject>(new VisitTracker(nextId++, key)); + return new DefaultPooledObject<>(new VisitTracker<>(nextId++, key)); } @Override http://git-wip-us.apache.org/repos/asf/commons-pool/blob/4373a323/src/test/java/org/apache/commons/pool2/WaiterFactory.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/pool2/WaiterFactory.java b/src/test/java/org/apache/commons/pool2/WaiterFactory.java index 3ac1709..1ab30f2 100644 --- a/src/test/java/org/apache/commons/pool2/WaiterFactory.java +++ b/src/test/java/org/apache/commons/pool2/WaiterFactory.java @@ -59,7 +59,7 @@ KeyedPooledObjectFactory { private long activeCount = 0; /** Count of (makes - destroys) per key since last reset */ - private final Map activeCounts = new HashMap(); + private final Map activeCounts = new HashMap<>(); /** Maximum of (makes - destroys) - if exceeded IllegalStateException */ private final long maxActive; // GKOP 1.x calls this maxTotal @@ -124,7 +124,7 @@ KeyedPooledObjectFactory { activeCount++; } doWait(makeLatency); - return new DefaultPooledObject(new Waiter(false, true, waiterLatency)); + return new DefaultPooledObject<>(new Waiter(false, true, waiterLatency)); } @Override http://git-wip-us.apache.org/repos/asf/commons-pool/blob/4373a323/src/test/java/org/apache/commons/pool2/impl/TestAbandonedObjectPool.java ---------------------------------------------------------------------- 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 1789026..6dadbce 100644 --- a/src/test/java/org/apache/commons/pool2/impl/TestAbandonedObjectPool.java +++ b/src/test/java/org/apache/commons/pool2/impl/TestAbandonedObjectPool.java @@ -52,7 +52,7 @@ public class TestAbandonedObjectPool { abandonedConfig.setRemoveAbandonedOnBorrow(true); abandonedConfig.setRemoveAbandonedTimeout(1); - pool = new GenericObjectPool( + pool = new GenericObjectPool<>( new SimpleFactory(), new GenericObjectPoolConfig(), abandonedConfig); @@ -98,7 +98,7 @@ public class TestAbandonedObjectPool { pool.setBlockWhenExhausted(false); // Exhaust the connection pool - final ArrayList vec = new ArrayList(); + final ArrayList vec = new ArrayList<>(); for (int i = 0; i < POOL_SIZE; i++) { vec.add(pool.borrowObject()); } @@ -146,7 +146,7 @@ public class TestAbandonedObjectPool { abandonedConfig.setRemoveAbandonedOnBorrow(true); abandonedConfig.setRemoveAbandonedTimeout(1); pool.close(); // Unregister pool created by setup - pool = new GenericObjectPool( + pool = new GenericObjectPool<>( new SimpleFactory(200, 0), new GenericObjectPoolConfig(), abandonedConfig); final int n = 10; @@ -183,7 +183,7 @@ public class TestAbandonedObjectPool { abandonedConfig.setRemoveAbandonedOnMaintenance(true); abandonedConfig.setRemoveAbandonedTimeout(1); pool.close(); // Unregister pool created by setup - pool = new GenericObjectPool( + pool = new GenericObjectPool<>( // destroys take 200 ms new SimpleFactory(200, 0), new GenericObjectPoolConfig(), abandonedConfig); @@ -214,7 +214,7 @@ public class TestAbandonedObjectPool { abandonedConfig.setRemoveAbandonedOnMaintenance(true); abandonedConfig.setRemoveAbandonedTimeout(1); pool.close(); // Unregister pool created by setup - pool = new GenericObjectPool( + pool = new GenericObjectPool<>( // validate takes 1 second new SimpleFactory(0, 1000), new GenericObjectPoolConfig(), abandonedConfig); @@ -333,7 +333,7 @@ public class TestAbandonedObjectPool { @Override public PooledObject makeObject() { - return new DefaultPooledObject(new PooledTestObject()); + return new DefaultPooledObject<>(new PooledTestObject()); } @Override http://git-wip-us.apache.org/repos/asf/commons-pool/blob/4373a323/src/test/java/org/apache/commons/pool2/impl/TestBaseGenericObjectPool.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/pool2/impl/TestBaseGenericObjectPool.java b/src/test/java/org/apache/commons/pool2/impl/TestBaseGenericObjectPool.java index 2e194a0..3b90a4f 100644 --- a/src/test/java/org/apache/commons/pool2/impl/TestBaseGenericObjectPool.java +++ b/src/test/java/org/apache/commons/pool2/impl/TestBaseGenericObjectPool.java @@ -33,7 +33,7 @@ public class TestBaseGenericObjectPool { @Before public void setUp() throws Exception { factory = new SimpleFactory(); - pool = new GenericObjectPool(factory); + pool = new GenericObjectPool<>(factory); } @After http://git-wip-us.apache.org/repos/asf/commons-pool/blob/4373a323/src/test/java/org/apache/commons/pool2/impl/TestDefaultPooledObject.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/pool2/impl/TestDefaultPooledObject.java b/src/test/java/org/apache/commons/pool2/impl/TestDefaultPooledObject.java index 6484afd..cba537a 100644 --- a/src/test/java/org/apache/commons/pool2/impl/TestDefaultPooledObject.java +++ b/src/test/java/org/apache/commons/pool2/impl/TestDefaultPooledObject.java @@ -34,7 +34,7 @@ public class TestDefaultPooledObject { */ @Test public void testgetIdleTimeMillis() throws Exception { - final DefaultPooledObject dpo = new DefaultPooledObject(new Object()); + final DefaultPooledObject dpo = new DefaultPooledObject<>(new Object()); final AtomicBoolean negativeIdleTimeReturned = new AtomicBoolean(false); final ExecutorService executor = Executors.newFixedThreadPool( Runtime.getRuntime().availableProcessors()*3); @@ -69,7 +69,7 @@ public class TestDefaultPooledObject { } }; final double probabilityOfAllocationTask = 0.7; - final List> futures = new ArrayList>(); + final List> futures = new ArrayList<>(); for (int i = 1; i <= 10000; i++) { final Runnable randomTask = Math.random() < probabilityOfAllocationTask ? allocateAndDeallocateTask : getIdleTimeTask; http://git-wip-us.apache.org/repos/asf/commons-pool/blob/4373a323/src/test/java/org/apache/commons/pool2/impl/TestDefaultPooledObjectInfo.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/pool2/impl/TestDefaultPooledObjectInfo.java b/src/test/java/org/apache/commons/pool2/impl/TestDefaultPooledObjectInfo.java index 42f2b17..88728f9 100644 --- a/src/test/java/org/apache/commons/pool2/impl/TestDefaultPooledObjectInfo.java +++ b/src/test/java/org/apache/commons/pool2/impl/TestDefaultPooledObjectInfo.java @@ -28,7 +28,7 @@ public class TestDefaultPooledObjectInfo { @Test public void testTiming() throws Exception { final GenericObjectPool pool = - new GenericObjectPool(new SimpleFactory()); + new GenericObjectPool<>(new SimpleFactory()); final long t1 = System.currentTimeMillis(); @@ -77,7 +77,7 @@ public class TestDefaultPooledObjectInfo { @Test public void testGetPooledObjectType() throws Exception { final GenericObjectPool pool = - new GenericObjectPool(new SimpleFactory()); + new GenericObjectPool<>(new SimpleFactory()); pool.borrowObject(); @@ -94,7 +94,7 @@ public class TestDefaultPooledObjectInfo { @Test public void testGetPooledObjectToString() throws Exception { final GenericObjectPool pool = - new GenericObjectPool(new SimpleFactory()); + new GenericObjectPool<>(new SimpleFactory()); final String s1 = pool.borrowObject(); @@ -114,7 +114,7 @@ public class TestDefaultPooledObjectInfo { abandonedConfig.setRemoveAbandonedOnBorrow(true); abandonedConfig.setRemoveAbandonedTimeout(1); abandonedConfig.setLogAbandoned(true); - final GenericObjectPool pool = new GenericObjectPool( + final GenericObjectPool pool = new GenericObjectPool<>( new SimpleFactory(), new GenericObjectPoolConfig(), abandonedConfig); http://git-wip-us.apache.org/repos/asf/commons-pool/blob/4373a323/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 ffee23d..4aef60b 100644 --- a/src/test/java/org/apache/commons/pool2/impl/TestGenericKeyedObjectPool.java +++ b/src/test/java/org/apache/commons/pool2/impl/TestGenericKeyedObjectPool.java @@ -71,7 +71,7 @@ public class TestGenericKeyedObjectPool extends TestKeyedObjectPool { final KeyedPooledObjectFactory perKeyFactory = new SimplePerKeyFactory(); final GenericKeyedObjectPool perKeyPool = - new GenericKeyedObjectPool(perKeyFactory); + new GenericKeyedObjectPool<>(perKeyFactory); perKeyPool.setMaxTotalPerKey(mincapacity); perKeyPool.setMaxIdlePerKey(mincapacity); return perKeyPool; @@ -79,7 +79,7 @@ public class TestGenericKeyedObjectPool extends TestKeyedObjectPool { @Override protected KeyedObjectPool makeEmptyPool(final KeyedPooledObjectFactory fac) { - return new GenericKeyedObjectPool(fac); + return new GenericKeyedObjectPool<>(fac); } @Override @@ -102,8 +102,8 @@ public class TestGenericKeyedObjectPool extends TestKeyedObjectPool { @Before public void setUp() throws Exception { - factory = new SimpleFactory(); - pool = new GenericKeyedObjectPool(factory); + factory = new SimpleFactory<>(); + pool = new GenericKeyedObjectPool<>(factory); } @Override @@ -426,7 +426,7 @@ public class TestGenericKeyedObjectPool extends TestKeyedObjectPool { config.setTimeBetweenEvictionRunsMillis(500); config.setMinEvictableIdleTimeMillis(50); config.setNumTestsPerEvictionRun(5); - final GenericKeyedObjectPool p = new GenericKeyedObjectPool(factory, config); + final GenericKeyedObjectPool p = new GenericKeyedObjectPool<>(factory, config); for(int i=0;i<5;i++) { p.addObject("one"); } @@ -543,9 +543,9 @@ public class TestGenericKeyedObjectPool extends TestKeyedObjectPool { * @param gkopPool The keyed object pool to use */ public void runTestThreads(final int numThreads, final int iterations, final int delay, final GenericKeyedObjectPool gkopPool) { - final ArrayList> threads = new ArrayList>(); + final ArrayList> threads = new ArrayList<>(); for(int i=0;i testThread = new TestThread(gkopPool, iterations, delay); + final TestThread testThread = new TestThread<>(gkopPool, iterations, delay); threads.add(testThread); final Thread t = new Thread(testThread); t.start(); @@ -760,9 +760,9 @@ public class TestGenericKeyedObjectPool extends TestKeyedObjectPool { } private void checkEvictionOrder(final boolean lifo) throws Exception { - final SimpleFactory intFactory = new SimpleFactory(); + final SimpleFactory intFactory = new SimpleFactory<>(); final GenericKeyedObjectPool intPool = - new GenericKeyedObjectPool(intFactory); + new GenericKeyedObjectPool<>(intFactory); intPool.setNumTestsPerEvictionRun(2); intPool.setMinEvictableIdleTimeMillis(100); intPool.setLifo(lifo); @@ -886,9 +886,9 @@ public class TestGenericKeyedObjectPool extends TestKeyedObjectPool { } private void checkEvictorVisiting(final boolean lifo) throws Exception { - VisitTrackerFactory trackerFactory = new VisitTrackerFactory(); + VisitTrackerFactory trackerFactory = new VisitTrackerFactory<>(); GenericKeyedObjectPool> intPool = - new GenericKeyedObjectPool>(trackerFactory); + new GenericKeyedObjectPool<>(trackerFactory); intPool.setNumTestsPerEvictionRun(2); intPool.setMinEvictableIdleTimeMillis(-1); intPool.setTestWhileIdle(true); @@ -975,8 +975,8 @@ public class TestGenericKeyedObjectPool extends TestKeyedObjectPool { 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(); - intPool = new GenericKeyedObjectPool>(trackerFactory); + trackerFactory = new VisitTrackerFactory<>(); + intPool = new GenericKeyedObjectPool<>(trackerFactory); intPool.setMaxIdlePerKey(-1); intPool.setMaxTotalPerKey(-1); intPool.setNumTestsPerEvictionRun(smallPrimes[i]); @@ -1074,7 +1074,7 @@ public class TestGenericKeyedObjectPool extends TestKeyedObjectPool { config.setLifo(false); config.setMaxIdlePerKey(maxTotal); - pool = new GenericKeyedObjectPool(factory, config); + pool = new GenericKeyedObjectPool<>(factory, config); // Exhaust the pool final String[] objects = new String[maxTotal]; @@ -1136,7 +1136,7 @@ public class TestGenericKeyedObjectPool extends TestKeyedObjectPool { final KeyedPooledObjectFactory dummyFactory = new DummyFactory(); GenericKeyedObjectPool objPool = - new GenericKeyedObjectPool(dummyFactory); + new GenericKeyedObjectPool<>(dummyFactory); assertEquals(GenericKeyedObjectPoolConfig.DEFAULT_MAX_TOTAL_PER_KEY, objPool.getMaxTotalPerKey()); assertEquals(GenericKeyedObjectPoolConfig.DEFAULT_MAX_IDLE_PER_KEY, objPool.getMaxIdlePerKey()); assertEquals(BaseObjectPoolConfig.DEFAULT_MAX_WAIT_MILLIS, objPool.getMaxWaitMillis()); @@ -1175,7 +1175,7 @@ public class TestGenericKeyedObjectPool extends TestKeyedObjectPool { config.setTestWhileIdle(testWhileIdle); config.setTimeBetweenEvictionRunsMillis(timeBetweenEvictionRunsMillis); config.setBlockWhenExhausted(blockWhenExhausted); - objPool = new GenericKeyedObjectPool(dummyFactory, config); + objPool = new GenericKeyedObjectPool<>(dummyFactory, config); assertEquals(maxTotalPerKey, objPool.getMaxTotalPerKey()); assertEquals(maxIdle, objPool.getMaxIdlePerKey()); assertEquals(maxWait, objPool.getMaxWaitMillis()); @@ -1291,7 +1291,7 @@ public class TestGenericKeyedObjectPool extends TestKeyedObjectPool { pool.borrowObject("one"); final long start = System.currentTimeMillis(); // Needs to be in a separate thread as this will block - final Runnable simple = new SimpleTestThread(pool, "one"); + final Runnable simple = new SimpleTestThread<>(pool, "one"); (new Thread(simple)).start(); // This should be almost instant. If it isn't it means this thread got // stuck behind the thread created above which is bad. @@ -1377,11 +1377,11 @@ public class TestGenericKeyedObjectPool extends TestKeyedObjectPool { */ @Test(timeout=200000) public void testMaxActivePerKeyExceeded() throws Exception { - final WaiterFactory waiterFactory = new WaiterFactory(0, 20, 0, 0, 0, 0, 8, 5, 0); + final WaiterFactory waiterFactory = new WaiterFactory<>(0, 20, 0, 0, 0, 0, 8, 5, 0); // TODO Fix this. Can't use local pool since runTestThreads uses the // protected pool field final GenericKeyedObjectPool waiterPool = - new GenericKeyedObjectPool(waiterFactory); + new GenericKeyedObjectPool<>(waiterFactory); waiterPool.setMaxTotalPerKey(5); waiterPool.setMaxTotal(8); waiterPool.setTestOnBorrow(true); @@ -1399,9 +1399,9 @@ public class TestGenericKeyedObjectPool extends TestKeyedObjectPool { @Test(timeout=60000) public void testClearOldest() throws Exception { // Make destroy have some latency so clearOldest takes some time - final WaiterFactory waiterFactory = new WaiterFactory(0, 20, 0, 0, 0, 0, 50, 5, 0); + final WaiterFactory waiterFactory = new WaiterFactory<>(0, 20, 0, 0, 0, 0, 50, 5, 0); final GenericKeyedObjectPool waiterPool = - new GenericKeyedObjectPool(waiterFactory); + new GenericKeyedObjectPool<>(waiterFactory); waiterPool.setMaxTotalPerKey(5); waiterPool.setMaxTotal(50); waiterPool.setLifo(false); @@ -1417,7 +1417,7 @@ public class TestGenericKeyedObjectPool extends TestKeyedObjectPool { // Now set up a race - one thread wants a new instance, triggering clearOldest // Other goes after an element on death row // See if we end up with dead man walking - final SimpleTestThread t2 = new SimpleTestThread(waiterPool, "51"); + final SimpleTestThread t2 = new SimpleTestThread<>(waiterPool, "51"); final Thread thread2 = new Thread(t2); thread2.start(); // Triggers clearOldest, killing all of the 0's and the 2 oldest 1's Thread.sleep(50); // Wait for clearOldest to kick off, but not long enough to reach the 1's @@ -1541,7 +1541,7 @@ public class TestGenericKeyedObjectPool extends TestKeyedObjectPool { final int nIterations = 60; final InvalidateThread[] threads = new InvalidateThread[nThreads]; // Randomly generated list of distinct invalidation targets - final ArrayList targets = new ArrayList(); + final ArrayList targets = new ArrayList<>(); final Random random = new Random(); for (int j = 0; j < nIterations; j++) { // Get a random invalidation target @@ -1573,10 +1573,10 @@ public class TestGenericKeyedObjectPool extends TestKeyedObjectPool { // POOL-259 @Test public void testClientWaitStats() throws Exception { - final SimpleFactory factory = new SimpleFactory(); + final SimpleFactory factory = new SimpleFactory<>(); // Give makeObject a little latency factory.setMakeLatency(200); - final GenericKeyedObjectPool pool = new GenericKeyedObjectPool( + final GenericKeyedObjectPool pool = new GenericKeyedObjectPool<>( factory, new GenericKeyedObjectPoolConfig()); final String s = pool.borrowObject("one"); // First borrow waits on create, so wait time should be at least 200 ms @@ -1834,7 +1834,7 @@ public class TestGenericKeyedObjectPool extends TestKeyedObjectPool { } out = String.valueOf(key) + String.valueOf(counter++); } - return new DefaultPooledObject(out); + return new DefaultPooledObject<>(out); } @Override public void destroyObject(final K key, final PooledObject obj) throws Exception { @@ -1997,7 +1997,7 @@ public class TestGenericKeyedObjectPool extends TestKeyedObjectPool { config.setTimeBetweenEvictionRunsMillis(-1); final GenericKeyedObjectPool pool = - new GenericKeyedObjectPool( + new GenericKeyedObjectPool<>( new ObjectFactory(), config); // Allocate both objects with this thread @@ -2065,8 +2065,8 @@ public class TestGenericKeyedObjectPool extends TestKeyedObjectPool { @Test public void testInvalidateFreesCapacity() throws Exception { - final SimpleFactory factory = new SimpleFactory(); - final GenericKeyedObjectPool pool = new GenericKeyedObjectPool(factory); + final SimpleFactory factory = new SimpleFactory<>(); + final GenericKeyedObjectPool pool = new GenericKeyedObjectPool<>(factory); pool.setMaxTotalPerKey(2); pool.setMaxWaitMillis(500); // Borrow an instance and hold if for 5 seconds @@ -2097,10 +2097,10 @@ public class TestGenericKeyedObjectPool extends TestKeyedObjectPool { @Test public void testValidationFailureOnReturnFreesCapacity() throws Exception { - final SimpleFactory factory = new SimpleFactory(); + final SimpleFactory factory = new SimpleFactory<>(); factory.setValid(false); // Validate will always fail factory.setValidationEnabled(true); - final GenericKeyedObjectPool pool = new GenericKeyedObjectPool(factory); + final GenericKeyedObjectPool pool = new GenericKeyedObjectPool<>(factory); pool.setMaxTotalPerKey(2); pool.setMaxWaitMillis(1500); pool.setTestOnReturn(true); @@ -2127,8 +2127,8 @@ public class TestGenericKeyedObjectPool extends TestKeyedObjectPool { @Test public void testMakeObjectException() throws Exception { - final SimpleFactory factory = new SimpleFactory(); - final GenericKeyedObjectPool pool = new GenericKeyedObjectPool(factory); + final SimpleFactory factory = new SimpleFactory<>(); + final GenericKeyedObjectPool pool = new GenericKeyedObjectPool<>(factory); pool.setMaxTotalPerKey(1); pool.setBlockWhenExhausted(false); factory.exceptionOnCreate = true; @@ -2151,10 +2151,10 @@ public class TestGenericKeyedObjectPool extends TestKeyedObjectPool { */ @Test public void testReturnToHead() throws Exception { - final SimpleFactory factory = new SimpleFactory(); + final SimpleFactory factory = new SimpleFactory<>(); factory.setValidateLatency(100); factory.setValid(true); // Validation always succeeds - final GenericKeyedObjectPool pool = new GenericKeyedObjectPool(factory); + final GenericKeyedObjectPool pool = new GenericKeyedObjectPool<>(factory); pool.setMaxWaitMillis(1000); pool.setTestWhileIdle(true); pool.setMaxTotalPerKey(2); @@ -2189,7 +2189,7 @@ public class TestGenericKeyedObjectPool extends TestKeyedObjectPool { public void testEqualsIndiscernible() throws Exception { final HashSetFactory factory = new HashSetFactory(); final GenericKeyedObjectPool> pool = - new GenericKeyedObjectPool>( + new GenericKeyedObjectPool<>( factory, new GenericKeyedObjectPoolConfig()); final HashSet s1 = pool.borrowObject("a"); final HashSet s2 = pool.borrowObject("a"); @@ -2208,7 +2208,7 @@ public class TestGenericKeyedObjectPool extends TestKeyedObjectPool { public void testMutable() throws Exception { final HashSetFactory factory = new HashSetFactory(); final GenericKeyedObjectPool> pool = - new GenericKeyedObjectPool>( + new GenericKeyedObjectPool<>( factory, new GenericKeyedObjectPoolConfig()); final HashSet s1 = pool.borrowObject("a"); final HashSet s2 = pool.borrowObject("a"); @@ -2227,9 +2227,9 @@ public class TestGenericKeyedObjectPool extends TestKeyedObjectPool { */ @Test public void testMultipleReturn() throws Exception { - final WaiterFactory factory = new WaiterFactory(0, 0, 0, 0, 0, 0); + final WaiterFactory factory = new WaiterFactory<>(0, 0, 0, 0, 0, 0); final GenericKeyedObjectPool pool = - new GenericKeyedObjectPool(factory); + new GenericKeyedObjectPool<>(factory); pool.setTestOnReturn(true); final Waiter waiter = pool.borrowObject("a"); pool.returnObject("a",waiter); @@ -2259,8 +2259,8 @@ public class TestGenericKeyedObjectPool extends TestKeyedObjectPool { final int holdTime = 2000; - final TestThread testA = new TestThread(pool, 1, 0, holdTime, false, null, "a"); - final TestThread testB = new TestThread(pool, 1, 0, holdTime, false, null, "b"); + final TestThread testA = new TestThread<>(pool, 1, 0, holdTime, false, null, "a"); + final TestThread testB = new TestThread<>(pool, 1, 0, holdTime, false, null, "b"); final Thread threadA = new Thread(testA); final Thread threadB = new Thread(testB); @@ -2295,7 +2295,7 @@ public class TestGenericKeyedObjectPool extends TestKeyedObjectPool { } @Override public PooledObject wrap(final Object value) { - return new DefaultPooledObject(value); + return new DefaultPooledObject<>(value); } } @@ -2308,18 +2308,18 @@ public class TestGenericKeyedObjectPool extends TestKeyedObjectPool { extends BaseKeyedPooledObjectFactory> { @Override public HashSet create(final String key) throws Exception { - return new HashSet(); + return new HashSet<>(); } @Override public PooledObject> wrap(final HashSet value) { - return new DefaultPooledObject>(value); + return new DefaultPooledObject<>(value); } } private static class SimplePerKeyFactory extends BaseKeyedPooledObjectFactory { ConcurrentHashMap map = - new ConcurrentHashMap(); + new ConcurrentHashMap<>(); @Override public Object create(final Object key) throws Exception { int counter = 0; @@ -2334,7 +2334,7 @@ public class TestGenericKeyedObjectPool extends TestKeyedObjectPool { } @Override public PooledObject wrap(final Object value) { - return new DefaultPooledObject(value); + return new DefaultPooledObject<>(value); } } @@ -2349,7 +2349,7 @@ public class TestGenericKeyedObjectPool extends TestKeyedObjectPool { @Override public PooledObject wrap(final Object value) { - return new DefaultPooledObject(value); + return new DefaultPooledObject<>(value); } } }