You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by ma...@apache.org on 2012/05/04 14:38:37 UTC
svn commit: r1333912 - in
/commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2: ./ impl/
Author: markt
Date: Fri May 4 12:38:37 2012
New Revision: 1333912
URL: http://svn.apache.org/viewvc?rev=1333912&view=rev
Log:
Remove @since < 2.0
Modified:
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/BaseKeyedPoolableObjectFactory.java
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/BaseObjectPool.java
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/BasePoolableObjectFactory.java
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/KeyedObjectPool.java
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/KeyedPoolableObjectFactory.java
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/ObjectPool.java
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/PoolUtils.java
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/PoolableObjectFactory.java
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/GenericKeyedObjectPoolConfig.java
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/GenericObjectPoolConfig.java
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/SoftReferenceObjectPool.java
Modified: commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/BaseKeyedPoolableObjectFactory.java
URL: http://svn.apache.org/viewvc/commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/BaseKeyedPoolableObjectFactory.java?rev=1333912&r1=1333911&r2=1333912&view=diff
==============================================================================
--- commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/BaseKeyedPoolableObjectFactory.java (original)
+++ commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/BaseKeyedPoolableObjectFactory.java Fri May 4 12:38:37 2012
@@ -29,7 +29,6 @@ package org.apache.commons.pool2;
* @param <V> Type of element managed by this factory.
*
* @version $Revision$
- * @since Pool 1.0
*/
public abstract class BaseKeyedPoolableObjectFactory<K,V>
implements KeyedPoolableObjectFactory<K,V> {
Modified: commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/BaseObjectPool.java
URL: http://svn.apache.org/viewvc/commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/BaseObjectPool.java?rev=1333912&r1=1333911&r2=1333912&view=diff
==============================================================================
--- commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/BaseObjectPool.java (original)
+++ commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/BaseObjectPool.java Fri May 4 12:38:37 2012
@@ -26,7 +26,6 @@ package org.apache.commons.pool2;
* @param <T> Type of element pooled in this pool.
*
* @version $Revision$
- * @since Pool 1.0
*/
public abstract class BaseObjectPool<T> implements ObjectPool<T> {
/**
Modified: commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/BasePoolableObjectFactory.java
URL: http://svn.apache.org/viewvc/commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/BasePoolableObjectFactory.java?rev=1333912&r1=1333911&r2=1333912&view=diff
==============================================================================
--- commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/BasePoolableObjectFactory.java (original)
+++ commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/BasePoolableObjectFactory.java Fri May 4 12:38:37 2012
@@ -27,8 +27,6 @@ package org.apache.commons.pool2;
*
* @see PoolableObjectFactory
* @see BaseKeyedPoolableObjectFactory
- *
- * @since Pool 1.0
*/
public abstract class BasePoolableObjectFactory<T> implements PoolableObjectFactory<T> {
/**
Modified: commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/KeyedObjectPool.java
URL: http://svn.apache.org/viewvc/commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/KeyedObjectPool.java?rev=1333912&r1=1333911&r2=1333912&view=diff
==============================================================================
--- commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/KeyedObjectPool.java (original)
+++ commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/KeyedObjectPool.java Fri May 4 12:38:37 2012
@@ -59,7 +59,6 @@ import java.util.NoSuchElementException;
* @see KeyedPoolableObjectFactory
* @see ObjectPool
* @see org.apache.commons.pool2.impl.GenericKeyedObjectPool GenericKeyedObjectPool
- * @since Pool 1.0
*/
public interface KeyedObjectPool<K,V> {
/**
Modified: commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/KeyedPoolableObjectFactory.java
URL: http://svn.apache.org/viewvc/commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/KeyedPoolableObjectFactory.java?rev=1333912&r1=1333911&r2=1333912&view=diff
==============================================================================
--- commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/KeyedPoolableObjectFactory.java (original)
+++ commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/KeyedPoolableObjectFactory.java Fri May 4 12:38:37 2012
@@ -64,7 +64,6 @@ package org.apache.commons.pool2;
* @param <V> Type of element managed by this factory.
*
* @version $Revision$
- * @since Pool 1.0
*/
public interface KeyedPoolableObjectFactory<K,V> {
/**
Modified: commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/ObjectPool.java
URL: http://svn.apache.org/viewvc/commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/ObjectPool.java?rev=1333912&r1=1333911&r2=1333912&view=diff
==============================================================================
--- commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/ObjectPool.java (original)
+++ commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/ObjectPool.java Fri May 4 12:38:37 2012
@@ -52,7 +52,6 @@ import java.util.NoSuchElementException;
* @see PoolableObjectFactory
* @see KeyedObjectPool
* @see BaseObjectPool
- * @since Pool 1.0
*/
public interface ObjectPool<T> {
/**
Modified: commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/PoolUtils.java
URL: http://svn.apache.org/viewvc/commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/PoolUtils.java?rev=1333912&r1=1333911&r2=1333912&view=diff
==============================================================================
--- commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/PoolUtils.java (original)
+++ commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/PoolUtils.java Fri May 4 12:38:37 2012
@@ -33,7 +33,6 @@ import java.util.concurrent.locks.Reentr
* ObjectPool or KeyedObjectPool related interfaces.
*
* @version $Revision$
- * @since Pool 1.3 This class is intended to be thread-safe.
*/
public final class PoolUtils {
@@ -64,7 +63,6 @@ public final class PoolUtils {
* if that is passed in
* @throws VirtualMachineError
* if that is passed in
- * @since Pool 1.5.5
*/
public static void checkRethrow(Throwable t) {
if (t instanceof ThreadDeath) {
@@ -95,8 +93,6 @@ public final class PoolUtils {
* when <code>pool</code> is <code>null</code> or when
* <code>minIdle</code> is negative or when <code>period</code>
* isn't valid for {@link Timer#schedule(TimerTask, long, long)}
- * .
- * @since Pool 1.3
*/
public static <T> TimerTask checkMinIdle(final ObjectPool<T> pool,
final int minIdle, final long period)
@@ -135,7 +131,6 @@ public final class PoolUtils {
* <code>null</code> or when <code>minIdle</code> is negative or
* when <code>period</code> isn't valid for
* {@link Timer#schedule(TimerTask, long, long)}.
- * @since Pool 1.3
*/
public static <K, V> TimerTask checkMinIdle(
final KeyedObjectPool<K, V> keyedPool, final K key,
@@ -180,7 +175,6 @@ public final class PoolUtils {
* isn't valid for {@link Timer#schedule(TimerTask, long, long)}
* .
* @see #checkMinIdle(KeyedObjectPool, Object, int, long)
- * @since Pool 1.3
*/
public static <K, V> Map<K, TimerTask> checkMinIdle(
final KeyedObjectPool<K, V> keyedPool, final Collection<K> keys,
@@ -211,7 +205,6 @@ public final class PoolUtils {
* when {@link ObjectPool#addObject()} fails.
* @throws IllegalArgumentException
* when <code>pool</code> is <code>null</code>.
- * @since Pool 1.3
*/
public static <T> void prefill(final ObjectPool<T> pool, final int count)
throws Exception, IllegalArgumentException {
@@ -238,7 +231,6 @@ public final class PoolUtils {
* @throws IllegalArgumentException
* when <code>keyedPool</code> or <code>key</code> is
* <code>null</code>.
- * @since Pool 1.3
*/
public static <K, V> void prefill(final KeyedObjectPool<K, V> keyedPool,
final K key, final int count) throws Exception,
@@ -272,7 +264,6 @@ public final class PoolUtils {
* when <code>keyedPool</code>, <code>keys</code>, or any value
* in <code>keys</code> is <code>null</code>.
* @see #prefill(KeyedObjectPool, Object, int)
- * @since Pool 1.3
*/
public static <K, V> void prefill(final KeyedObjectPool<K, V> keyedPool,
final Collection<K> keys, final int count) throws Exception,
@@ -301,7 +292,6 @@ public final class PoolUtils {
* @param pool
* the ObjectPool to be "wrapped" in a synchronized ObjectPool.
* @return a synchronized view of the specified ObjectPool.
- * @since Pool 1.3
*/
public static <T> ObjectPool<T> synchronizedPool(final ObjectPool<T> pool) {
if (pool == null) {
@@ -337,7 +327,6 @@ public final class PoolUtils {
* the KeyedObjectPool to be "wrapped" in a synchronized
* KeyedObjectPool.
* @return a synchronized view of the specified KeyedObjectPool.
- * @since Pool 1.3
*/
public static <K, V> KeyedObjectPool<K, V> synchronizedPool(
final KeyedObjectPool<K, V> keyedPool) {
@@ -364,7 +353,6 @@ public final class PoolUtils {
* the PoolableObjectFactory to be "wrapped" in a synchronized
* PoolableObjectFactory.
* @return a synchronized view of the specified PoolableObjectFactory.
- * @since Pool 1.3
*/
public static <T> PoolableObjectFactory<T> synchronizedPoolableFactory(
final PoolableObjectFactory<T> factory) {
@@ -379,7 +367,6 @@ public final class PoolUtils {
* the KeyedPoolableObjectFactory to be "wrapped" in a
* synchronized KeyedPoolableObjectFactory.
* @return a synchronized view of the specified KeyedPoolableObjectFactory.
- * @since Pool 1.3
*/
public static <K, V> KeyedPoolableObjectFactory<K, V> synchronizedPoolableFactory(
final KeyedPoolableObjectFactory<K, V> keyedFactory) {
@@ -399,7 +386,6 @@ public final class PoolUtils {
* @return a pool that adaptively decreases it's size when idle objects are
* no longer needed.
* @see #erodingPool(ObjectPool, float)
- * @since Pool 1.4
*/
public static <T> ObjectPool<T> erodingPool(final ObjectPool<T> pool) {
return erodingPool(pool, 1f);
@@ -429,7 +415,6 @@ public final class PoolUtils {
* @return a pool that adaptively decreases it's size when idle objects are
* no longer needed.
* @see #erodingPool(ObjectPool)
- * @since Pool 1.4
*/
public static <T> ObjectPool<T> erodingPool(final ObjectPool<T> pool,
final float factor) {
@@ -456,7 +441,6 @@ public final class PoolUtils {
* no longer needed.
* @see #erodingPool(KeyedObjectPool, float)
* @see #erodingPool(KeyedObjectPool, float, boolean)
- * @since Pool 1.4
*/
public static <K, V> KeyedObjectPool<K, V> erodingPool(
final KeyedObjectPool<K, V> keyedPool) {
@@ -487,7 +471,6 @@ public final class PoolUtils {
* @return a pool that adaptively decreases it's size when idle objects are
* no longer needed.
* @see #erodingPool(KeyedObjectPool, float, boolean)
- * @since Pool 1.4
*/
public static <K, V> KeyedObjectPool<K, V> erodingPool(
final KeyedObjectPool<K, V> keyedPool, final float factor) {
@@ -527,7 +510,6 @@ public final class PoolUtils {
* no longer needed.
* @see #erodingPool(KeyedObjectPool)
* @see #erodingPool(KeyedObjectPool, float)
- * @since Pool 1.4
*/
public static <K, V> KeyedObjectPool<K, V> erodingPool(
final KeyedObjectPool<K, V> keyedPool, final float factor,
@@ -549,7 +531,6 @@ public final class PoolUtils {
* create the {@link Timer} as needed.
*
* @return the {@link Timer} for checking keyedPool's idle count.
- * @since Pool 1.3
*/
private static synchronized Timer getMinIdleTimer() {
if (MIN_IDLE_TIMER == null) {
Modified: commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/PoolableObjectFactory.java
URL: http://svn.apache.org/viewvc/commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/PoolableObjectFactory.java?rev=1333912&r1=1333911&r2=1333912&view=diff
==============================================================================
--- commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/PoolableObjectFactory.java (original)
+++ commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/PoolableObjectFactory.java Fri May 4 12:38:37 2012
@@ -61,7 +61,6 @@ package org.apache.commons.pool2;
* @see ObjectPool
*
* @version $Revision$
- * @since Pool 1.0
*/
public interface PoolableObjectFactory<T> {
/**
Modified: commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/GenericKeyedObjectPoolConfig.java
URL: http://svn.apache.org/viewvc/commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/GenericKeyedObjectPoolConfig.java?rev=1333912&r1=1333911&r2=1333912&view=diff
==============================================================================
--- commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/GenericKeyedObjectPoolConfig.java (original)
+++ commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/GenericKeyedObjectPoolConfig.java Fri May 4 12:38:37 2012
@@ -19,12 +19,12 @@ package org.apache.commons.pool2.impl;
/**
* A simple "struct" encapsulating the configuration for a
* {@link GenericKeyedObjectPool}.
- *
+ *
* <p>
* This class is not thread-safe; it is only intended to be used to provide
* attributes used when creating a pool.
- *
- * @since Pool 2.0
+ *
+ * @since 2.0
*/
public class GenericKeyedObjectPoolConfig extends BaseObjectPoolConfig {
@@ -35,27 +35,27 @@ public class GenericKeyedObjectPoolConfi
* (idle or checked out) across all keyed pools.
*/
public static final int DEFAULT_MAX_TOTAL = -1;
-
+
/**
* The default minimum number of idle instances that the maintenance
* thread (if enabled) will try to maintain per key.
*/
public static final int DEFAULT_MIN_IDLE_PER_KEY = 0;
-
+
/**
* The default maximum number of idle instances per key.
*/
public static final int DEFAULT_MAX_IDLE_PER_KEY = 8;
-
-
+
+
private int minIdlePerKey = DEFAULT_MIN_IDLE_PER_KEY;
-
+
private int maxIdlePerKey = DEFAULT_MAX_IDLE_PER_KEY;
-
+
private int maxTotalPerKey = DEFAULT_MAX_TOTAL_PER_KEY;
-
+
private int maxTotal = DEFAULT_MAX_TOTAL;
-
+
public GenericKeyedObjectPoolConfig() {
}
@@ -74,7 +74,7 @@ public class GenericKeyedObjectPoolConfi
public void setMaxTotalPerKey(int maxTotalPerKey) {
this.maxTotalPerKey = maxTotalPerKey;
}
-
+
public int getMinIdlePerKey() {
return minIdlePerKey;
}
Modified: commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/GenericObjectPoolConfig.java
URL: http://svn.apache.org/viewvc/commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/GenericObjectPoolConfig.java?rev=1333912&r1=1333911&r2=1333912&view=diff
==============================================================================
--- commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/GenericObjectPoolConfig.java (original)
+++ commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/GenericObjectPoolConfig.java Fri May 4 12:38:37 2012
@@ -19,12 +19,12 @@ package org.apache.commons.pool2.impl;
/**
* A simple "struct" encapsulating the configuration for a
* {@link GenericObjectPool}.
- *
+ *
* <p>
* This class is not thread-safe; it is only intended to be used to provide
* attributes used when creating a pool.
*
- * @since Pool 2.0
+ * @since 2.0
*/
public class GenericObjectPoolConfig extends BaseObjectPoolConfig {
@@ -45,11 +45,11 @@ public class GenericObjectPoolConfig ext
*/
public static final int DEFAULT_MIN_IDLE = 0;
-
+
private int maxTotal = DEFAULT_MAX_TOTAL;
private int maxIdle = DEFAULT_MAX_IDLE;
-
+
private int minIdle = DEFAULT_MIN_IDLE;
@@ -70,7 +70,7 @@ public class GenericObjectPoolConfig ext
this.maxIdle = maxIdle;
}
-
+
public int getMinIdle() {
return minIdle;
}
Modified: commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/SoftReferenceObjectPool.java
URL: http://svn.apache.org/viewvc/commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/SoftReferenceObjectPool.java?rev=1333912&r1=1333911&r2=1333912&view=diff
==============================================================================
--- commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/SoftReferenceObjectPool.java (original)
+++ commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/SoftReferenceObjectPool.java Fri May 4 12:38:37 2012
@@ -36,8 +36,8 @@ import org.apache.commons.pool2.Poolable
*
* @param <T>
* Type of element pooled in this pool.
+ *
* @version $Revision$
- * @since Pool 1.0
*/
public class SoftReferenceObjectPool<T> extends BaseObjectPool<T> {
/**
@@ -317,7 +317,6 @@ public class SoftReferenceObjectPool<T>
* manage object instances.
*
* @return the factory
- * @since 1.5.5
*/
public synchronized PoolableObjectFactory<T> getFactory() {
return _factory;