You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@commons.apache.org by sa...@apache.org on 2006/03/29 18:21:58 UTC
svn commit: r389821 - in /jakarta/commons/proper/pool/trunk/src:
java/org/apache/commons/pool/composite/
test/org/apache/commons/pool/composite/
Author: sandymac
Date: Wed Mar 29 08:21:55 2006
New Revision: 389821
URL: http://svn.apache.org/viewcvs?rev=389821&view=rev
Log:
Refactored public enum names:
BorrowType -> BorrowPolicy
ExhaustionBehavior -> ExhaustionPolicy
LimitBehavior -> LimitPolicy
TrackingType -> TrackingPolicy
Added:
jakarta/commons/proper/pool/trunk/src/java/org/apache/commons/pool/composite/BorrowPolicy.java (contents, props changed)
- copied, changed from r389683, jakarta/commons/proper/pool/trunk/src/java/org/apache/commons/pool/composite/BorrowType.java
jakarta/commons/proper/pool/trunk/src/java/org/apache/commons/pool/composite/ExhaustionPolicy.java (contents, props changed)
- copied, changed from r389683, jakarta/commons/proper/pool/trunk/src/java/org/apache/commons/pool/composite/ExhaustionBehavior.java
jakarta/commons/proper/pool/trunk/src/java/org/apache/commons/pool/composite/LimitPolicy.java (contents, props changed)
- copied, changed from r389683, jakarta/commons/proper/pool/trunk/src/java/org/apache/commons/pool/composite/LimitBehavior.java
jakarta/commons/proper/pool/trunk/src/java/org/apache/commons/pool/composite/TrackingPolicy.java (contents, props changed)
- copied, changed from r389683, jakarta/commons/proper/pool/trunk/src/java/org/apache/commons/pool/composite/TrackingType.java
Removed:
jakarta/commons/proper/pool/trunk/src/java/org/apache/commons/pool/composite/BorrowType.java
jakarta/commons/proper/pool/trunk/src/java/org/apache/commons/pool/composite/ExhaustionBehavior.java
jakarta/commons/proper/pool/trunk/src/java/org/apache/commons/pool/composite/LimitBehavior.java
jakarta/commons/proper/pool/trunk/src/java/org/apache/commons/pool/composite/TrackingType.java
Modified:
jakarta/commons/proper/pool/trunk/src/java/org/apache/commons/pool/composite/ActiveLimitManager.java
jakarta/commons/proper/pool/trunk/src/java/org/apache/commons/pool/composite/CompositeKeyedObjectPoolFactory.java
jakarta/commons/proper/pool/trunk/src/java/org/apache/commons/pool/composite/CompositeObjectPoolFactory.java
jakarta/commons/proper/pool/trunk/src/java/org/apache/commons/pool/composite/DebugTracker.java
jakarta/commons/proper/pool/trunk/src/java/org/apache/commons/pool/composite/FailLimitManager.java
jakarta/commons/proper/pool/trunk/src/java/org/apache/commons/pool/composite/FailManager.java
jakarta/commons/proper/pool/trunk/src/java/org/apache/commons/pool/composite/FifoLender.java
jakarta/commons/proper/pool/trunk/src/java/org/apache/commons/pool/composite/GrowManager.java
jakarta/commons/proper/pool/trunk/src/java/org/apache/commons/pool/composite/LifoLender.java
jakarta/commons/proper/pool/trunk/src/java/org/apache/commons/pool/composite/Manager.java
jakarta/commons/proper/pool/trunk/src/java/org/apache/commons/pool/composite/NullLender.java
jakarta/commons/proper/pool/trunk/src/java/org/apache/commons/pool/composite/NullTracker.java
jakarta/commons/proper/pool/trunk/src/java/org/apache/commons/pool/composite/ReferenceTracker.java
jakarta/commons/proper/pool/trunk/src/java/org/apache/commons/pool/composite/SimpleTracker.java
jakarta/commons/proper/pool/trunk/src/java/org/apache/commons/pool/composite/SoftLender.java
jakarta/commons/proper/pool/trunk/src/java/org/apache/commons/pool/composite/Tracker.java
jakarta/commons/proper/pool/trunk/src/java/org/apache/commons/pool/composite/WaitLimitManager.java
jakarta/commons/proper/pool/trunk/src/test/org/apache/commons/pool/composite/PerformanceTest.java
Modified: jakarta/commons/proper/pool/trunk/src/java/org/apache/commons/pool/composite/ActiveLimitManager.java
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/pool/trunk/src/java/org/apache/commons/pool/composite/ActiveLimitManager.java?rev=389821&r1=389820&r2=389821&view=diff
==============================================================================
--- jakarta/commons/proper/pool/trunk/src/java/org/apache/commons/pool/composite/ActiveLimitManager.java (original)
+++ jakarta/commons/proper/pool/trunk/src/java/org/apache/commons/pool/composite/ActiveLimitManager.java Wed Mar 29 08:21:55 2006
@@ -21,7 +21,7 @@
/**
* Base class for all {@link Manager}s that limit the number of active objects associate with the pool.
*
- * @see LimitBehavior
+ * @see LimitPolicy
* @author Sandy McArthur
* @version $Revision$ $Date$
* @since #.#
Copied: jakarta/commons/proper/pool/trunk/src/java/org/apache/commons/pool/composite/BorrowPolicy.java (from r389683, jakarta/commons/proper/pool/trunk/src/java/org/apache/commons/pool/composite/BorrowType.java)
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/pool/trunk/src/java/org/apache/commons/pool/composite/BorrowPolicy.java?p2=jakarta/commons/proper/pool/trunk/src/java/org/apache/commons/pool/composite/BorrowPolicy.java&p1=jakarta/commons/proper/pool/trunk/src/java/org/apache/commons/pool/composite/BorrowType.java&r1=389683&r2=389821&rev=389821&view=diff
==============================================================================
--- jakarta/commons/proper/pool/trunk/src/java/org/apache/commons/pool/composite/BorrowType.java (original)
+++ jakarta/commons/proper/pool/trunk/src/java/org/apache/commons/pool/composite/BorrowPolicy.java Wed Mar 29 08:21:55 2006
@@ -25,53 +25,53 @@
/**
* Specifies the order in which objects are borrowed and returned to the pool.
*
- * @see CompositeObjectPoolFactory#setBorrowType(BorrowType)
- * @see CompositeKeyedObjectPoolFactory#setBorrowType(BorrowType)
+ * @see CompositeObjectPoolFactory#setBorrowPolicy(BorrowPolicy)
+ * @see CompositeKeyedObjectPoolFactory#setBorrowPolicy(BorrowPolicy)
* @author Sandy McArthur
* @since #.#
* @version $Revision$ $Date$
*/
-public final class BorrowType implements Serializable {
+public final class BorrowPolicy implements Serializable {
private static final long serialVersionUID = 3357921765798594792L;
/**
* Objects are returned from the pool in the order they are added to the pool.
*/
- public static final BorrowType FIFO = new BorrowType("FIFO");
+ public static final BorrowPolicy FIFO = new BorrowPolicy("FIFO");
/**
* The most recently returned object is the first one returned when an object is borrowed.
*/
- public static final BorrowType LIFO = new BorrowType("LIFO");
+ public static final BorrowPolicy LIFO = new BorrowPolicy("LIFO");
/**
* Like {@link #FIFO} but idle objects are wrapped in a {@link SoftReference} to allow possible garbage
* collection. Idle objects collected by the garbage collector will not be
* {@link ObjectPool#invalidateObject(Object) invalidated} like normal.
*/
- public static final BorrowType SOFT_FIFO = new BorrowType("SOFT_FIFO");
+ public static final BorrowPolicy SOFT_FIFO = new BorrowPolicy("SOFT_FIFO");
/**
* Like {@link #LIFO} but idle objects are wrapped in a {@link SoftReference} to allow possible garbage
* collection. Idle objects collected by the garbage collector will not be
* {@link ObjectPool#invalidateObject(Object) invalidated} like normal.
*/
- public static final BorrowType SOFT_LIFO = new BorrowType("SOFT_LIFO");
+ public static final BorrowPolicy SOFT_LIFO = new BorrowPolicy("SOFT_LIFO");
/**
* Never returns an object from the pool nor returns one to the pool. This basically turns the pool into a factory,
* it may have some utility if used with {@link CompositeObjectPoolFactory#setMaxActive(int) maxActive}.
- * This is not compatible with {@link ExhaustionBehavior#FAIL}.
+ * This is not compatible with {@link ExhaustionPolicy#FAIL}.
*/
- public static final BorrowType NULL = new BorrowType("NULL");
+ public static final BorrowPolicy NULL = new BorrowPolicy("NULL");
/**
* enum name.
*/
private final String name;
- private BorrowType(final String name) {
+ private BorrowPolicy(final String name) {
this.name = name;
}
@@ -80,8 +80,8 @@
}
// Autogenerated with Java 1.5 enums
- public static BorrowType[] values() {
- return new BorrowType[] {NULL, FIFO, LIFO, SOFT_FIFO, SOFT_LIFO};
+ public static BorrowPolicy[] values() {
+ return new BorrowPolicy[] {NULL, FIFO, LIFO, SOFT_FIFO, SOFT_LIFO};
}
// necessary for serialization
Propchange: jakarta/commons/proper/pool/trunk/src/java/org/apache/commons/pool/composite/BorrowPolicy.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jakarta/commons/proper/pool/trunk/src/java/org/apache/commons/pool/composite/BorrowPolicy.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Modified: jakarta/commons/proper/pool/trunk/src/java/org/apache/commons/pool/composite/CompositeKeyedObjectPoolFactory.java
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/pool/trunk/src/java/org/apache/commons/pool/composite/CompositeKeyedObjectPoolFactory.java?rev=389821&r1=389820&r2=389821&view=diff
==============================================================================
--- jakarta/commons/proper/pool/trunk/src/java/org/apache/commons/pool/composite/CompositeKeyedObjectPoolFactory.java (original)
+++ jakarta/commons/proper/pool/trunk/src/java/org/apache/commons/pool/composite/CompositeKeyedObjectPoolFactory.java Wed Mar 29 08:21:55 2006
@@ -34,10 +34,10 @@
* </p>
*
* @see CompositeObjectPoolFactory
- * @see BorrowType
- * @see ExhaustionBehavior
- * @see LimitBehavior
- * @see TrackingType
+ * @see BorrowPolicy
+ * @see ExhaustionPolicy
+ * @see LimitPolicy
+ * @see TrackingPolicy
* @author Sandy McArthur
* @since #.#
* @version $Revision$ $Date$
@@ -201,18 +201,18 @@
*
* @return the order in which objects are pooled.
*/
- public BorrowType getBorrowType() {
- return factory.getBorrowType();
+ public BorrowPolicy getBorrowPolicy() {
+ return factory.getBorrowPolicy();
}
/**
* Set the order in which objects are borrowed from the pool.
*
- * @param borrowType the order in which objects are pooled.
- * @throws IllegalArgumentException when <code>borrowType</code> is <code>null</code>.
+ * @param borrowPolicy the order in which objects are pooled.
+ * @throws IllegalArgumentException when <code>borrowPolicy</code> is <code>null</code>.
*/
- public void setBorrowType(final BorrowType borrowType) throws IllegalArgumentException {
- factory.setBorrowType(borrowType);
+ public void setBorrowPolicy(final BorrowPolicy borrowPolicy) throws IllegalArgumentException {
+ factory.setBorrowPolicy(borrowPolicy);
}
/**
@@ -220,18 +220,18 @@
*
* @return behavior of the pool when all idle objects have been exhausted.
*/
- public ExhaustionBehavior getExhaustionBehavior() {
- return factory.getExhaustionBehavior();
+ public ExhaustionPolicy getExhaustionPolicy() {
+ return factory.getExhaustionPolicy();
}
/**
* Set the behavior for when the pool is exhausted of any idle objects.
*
- * @param exhaustionBehavior the desired exhausted behavior of the pool.
- * @throws IllegalArgumentException when <code>exhaustionBehavior</code> is <code>null</code>.
+ * @param exhaustionPolicy the desired exhausted behavior of the pool.
+ * @throws IllegalArgumentException when <code>exhaustionPolicy</code> is <code>null</code>.
*/
- public void setExhaustionBehavior(final ExhaustionBehavior exhaustionBehavior) throws IllegalArgumentException {
- factory.setExhaustionBehavior(exhaustionBehavior);
+ public void setExhaustionPolicy(final ExhaustionPolicy exhaustionPolicy) throws IllegalArgumentException {
+ factory.setExhaustionPolicy(exhaustionPolicy);
}
/**
@@ -284,27 +284,27 @@
* @return the behavior of the pool when the limit of active objects has been reached.
* @see #getMaxWaitMillis()
*/
- public LimitBehavior getLimitBehavior() {
- return factory.getLimitBehavior();
+ public LimitPolicy getLimitPolicy() {
+ return factory.getLimitPolicy();
}
/**
* Set the behavior of when the pool's limit of active objects has been reached.
*
- * @param limitBehavior action to take if the pool has an active object limit and is exhausted.
- * @throws IllegalArgumentException when <code>limitBehavior</code> is <code>null</code>.
+ * @param limitPolicy action to take if the pool has an active object limit and is exhausted.
+ * @throws IllegalArgumentException when <code>limitPolicy</code> is <code>null</code>.
* @see #setMaxWaitMillis(int)
*/
- public void setLimitBehavior(final LimitBehavior limitBehavior) throws IllegalArgumentException {
- factory.setLimitBehavior(limitBehavior);
+ public void setLimitPolicy(final LimitPolicy limitPolicy) throws IllegalArgumentException {
+ factory.setLimitPolicy(limitPolicy);
}
/**
- * Wait time in milliseconds for an object to become available to the pool when the {@link LimitBehavior#WAIT WAIT}
- * {@link #setLimitBehavior(LimitBehavior) limit behavior} is used.
+ * Wait time in milliseconds for an object to become available to the pool when the {@link LimitPolicy#WAIT WAIT}
+ * {@link #setLimitPolicy(LimitPolicy) limit behavior} is used.
*
* @return the wait time for an object to become available to the pool.
- * @see #getLimitBehavior()
+ * @see #getLimitPolicy()
*/
public int getMaxWaitMillis() {
return factory.getMaxWaitMillis();
@@ -312,11 +312,11 @@
/**
* Set the wait time in milliseconds for an object to become available to the pool when it was exhausted.
- * This has no effect unless the {@link #setLimitBehavior(LimitBehavior) limit behavior}
- * is set to {@link LimitBehavior#WAIT}.
+ * This has no effect unless the {@link #setLimitPolicy(LimitPolicy) limit behavior}
+ * is set to {@link LimitPolicy#WAIT}.
*
* @param maxWaitMillis the milliseconds to wait for an available object in the pool or <= 0 for no limit.
- * @see #setLimitBehavior(LimitBehavior)
+ * @see #setLimitPolicy(LimitPolicy)
*/
public void setMaxWaitMillis(final int maxWaitMillis) {
factory.setMaxWaitMillis(maxWaitMillis);
@@ -327,18 +327,18 @@
*
* @return Type of tracking for active objects while they are borrowed from the pool.
*/
- public TrackingType getTrackerType() {
+ public TrackingPolicy getTrackerType() {
return factory.getTrackerType();
}
/**
* Set the type of tracking for active objects while they are borrowed from the pool.
*
- * @param trackerType type of tracking for active objects.
- * @throws IllegalArgumentException when <code>trackerType</code> is <code>null</code>.
+ * @param trackerPolicy type of tracking for active objects.
+ * @throws IllegalArgumentException when <code>trackerPolicy</code> is <code>null</code>.
*/
- public void setTrackerType(final TrackingType trackerType) throws IllegalArgumentException {
- factory.setTrackerType(trackerType);
+ public void setTrackerType(final TrackingPolicy trackerPolicy) throws IllegalArgumentException {
+ factory.setTrackerType(trackerPolicy);
}
/**
Modified: jakarta/commons/proper/pool/trunk/src/java/org/apache/commons/pool/composite/CompositeObjectPoolFactory.java
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/pool/trunk/src/java/org/apache/commons/pool/composite/CompositeObjectPoolFactory.java?rev=389821&r1=389820&r2=389821&view=diff
==============================================================================
--- jakarta/commons/proper/pool/trunk/src/java/org/apache/commons/pool/composite/CompositeObjectPoolFactory.java (original)
+++ jakarta/commons/proper/pool/trunk/src/java/org/apache/commons/pool/composite/CompositeObjectPoolFactory.java Wed Mar 29 08:21:55 2006
@@ -31,20 +31,20 @@
*
* <p>Default values for a newly created factory:
* <ul>
- * <li>{@link #setBorrowType(BorrowType) borrowType}:
- * {@link BorrowType#FIFO FIFO}</li>
- * <li>{@link #setExhaustionBehavior(ExhaustionBehavior) exhaustionBehavior}:
- * {@link ExhaustionBehavior#GROW GROW}</li>
+ * <li>{@link #setBorrowPolicy(BorrowPolicy) borrowPolicy}:
+ * {@link BorrowPolicy#FIFO FIFO}</li>
+ * <li>{@link #setExhaustionPolicy(ExhaustionPolicy) exhaustionPolicy}:
+ * {@link ExhaustionPolicy#GROW GROW}</li>
* <li>{@link #setMaxIdle(int) maxIdle}: a negative value (unlimited)</li>
* <li>{@link #setMaxActive(int) maxActive}: a non-positive value (unlimited)</li>
- * <li>{@link #setLimitBehavior(LimitBehavior) limitBehavior}:
- * {@link LimitBehavior#FAIL FAIL}
+ * <li>{@link #setLimitPolicy(LimitPolicy) limitPolicy}:
+ * {@link LimitPolicy#FAIL FAIL}
* (has no effect unless {@link #setMaxActive(int) maxActive} is positive)</li>
* <li>{@link #setMaxWaitMillis(int) maxWaitMillis}: a non-positive value (wait forever)
- * (has no effect unless {@link #setLimitBehavior(LimitBehavior) limitBehavior} is
- * {@link LimitBehavior#WAIT WAIT})</li>
- * <li>{@link #setTrackerType(TrackingType) trackingType}:
- * {@link TrackingType#SIMPLE SIMPLE}</li>
+ * (has no effect unless {@link #setLimitPolicy(LimitPolicy) limitPolicy} is
+ * {@link LimitPolicy#WAIT WAIT})</li>
+ * <li>{@link #setTrackerType(TrackingPolicy) trackingPolicy}:
+ * {@link TrackingPolicy#SIMPLE SIMPLE}</li>
* <li>{@link #setValidateOnReturn(boolean) validateOnReturn}: false (do not validate on return)</li>
* <li>{@link #setEvictIdleMillis(long) evictIdleMillis}: non-positive (do not evict objects for being idle)</li>
* <li>{@link #setEvictInvalidFrequencyMillis(long) evictInvalidFrequencyMillis}: non-positive (do not check if idle
@@ -63,11 +63,11 @@
* <pre>
* PoolableObjectFactory pof = ...;
* CompositeObjectPoolFactory copf = new CompositeObjectPoolFactory(pof);
- * copf.setBorrowType(BorrowType.LIFO)
+ * copf.setBorrowPolicy(BorrowPolicy.LIFO)
* copf.setMaxIdle(5);
* copf.setEvictInvalidFrequencyMillis(5 * 60 * 1000);
* copf.setEvictIdleMillis(60 * 60 * 1000);
- * copf.setTrackingType(TrackingType.REFERENCE);
+ * copf.setTrackingPolicy(TrackingPolicy.REFERENCE);
* ObjectPool pool = copf.createPool();
* </pre>
*
@@ -78,9 +78,9 @@
* <pre>
* PoolableObjectFactory pof = ...;
* CompositeObjectPoolFactory copf = new CompositeObjectPoolFactory(pof);
- * copf.setsetExhaustionBehavior(ExhaustionBehavior.FAIL);
+ * copf.setsetExhaustionPolicy(ExhaustionPolicy.FAIL);
* copf.setMaxActive(2);
- * copf.setLimitBehavior(LimitBehavior.WAIT);
+ * copf.setLimitPolicy(LimitPolicy.WAIT);
* copf.setMaxWaitMillis(10 * 1000);
* ObjectPool pool = copf.createPool();
* pool.addObject(); pool.addObject(); pool.addObject();
@@ -92,8 +92,8 @@
* <pre>
* PoolableObjectFactory pof = ...;
* CompositeObjectPoolFactory copf = new CompositeObjectPoolFactory(pof);
- * copf.setBorrowType(BorrowType.SOFT_FIFO);
- * copf.setTrackingType(TrackingType.DEBUG);
+ * copf.setBorrowPolicy(BorrowPolicy.SOFT_FIFO);
+ * copf.setTrackingPolicy(TrackingPolicy.DEBUG);
* ObjectPool pool = copf.createPool();
* </pre>
*
@@ -131,10 +131,10 @@
* </ul>
* </p>
*
- * @see BorrowType
- * @see ExhaustionBehavior
- * @see LimitBehavior
- * @see TrackingType
+ * @see BorrowPolicy
+ * @see ExhaustionPolicy
+ * @see LimitPolicy
+ * @see TrackingPolicy
* @author Sandy McArthur
* @version $Revision$ $Date$
* @since #.#
@@ -164,12 +164,12 @@
/**
* Configured {@link Lender} type.
*/
- private BorrowType borrowType = BorrowType.FIFO;
+ private BorrowPolicy borrowPolicy = BorrowPolicy.FIFO;
/**
* Configured {@link Manager} type.
*/
- private ExhaustionBehavior exhaustionBehavior = ExhaustionBehavior.GROW;
+ private ExhaustionPolicy exhaustionPolicy = ExhaustionPolicy.GROW;
/**
* Maximum number of idle objects in the pool.
@@ -189,7 +189,7 @@
/**
* Configured {@link ActiveLimitManager} type. Not used if {@link #maxActive} is non-positive.
*/
- private LimitBehavior limitBehavior = LimitBehavior.FAIL;
+ private LimitPolicy limitPolicy = LimitPolicy.FAIL;
/**
* Configured max wait time for an available object. Non-positive means wait forever.
@@ -201,7 +201,7 @@
/**
* Configured {@link Tracker} type.
*/
- private TrackingType trackerType = TrackingType.SIMPLE;
+ private TrackingPolicy trackerPolicy = TrackingPolicy.SIMPLE;
/**
* Should the object pool validate borrowed objects when they are returned.
@@ -260,11 +260,11 @@
*/
private static List getList(final FactoryConfig config) {
final List list; // LIFO is more suited to an ArrayList, FIFO is more suited to a LinkedList
- if (BorrowType.NULL.equals(config.borrowType) || config.maxIdle == 0) {
+ if (BorrowPolicy.NULL.equals(config.borrowPolicy) || config.maxIdle == 0) {
// an empty pool can use an empty list.
list = Collections.EMPTY_LIST;
- } else if (BorrowType.LIFO.equals(config.borrowType) || BorrowType.SOFT_LIFO.equals(config.borrowType)) {
+ } else if (BorrowPolicy.LIFO.equals(config.borrowPolicy) || BorrowPolicy.SOFT_LIFO.equals(config.borrowPolicy)) {
// pre-allocate the backing array if the max size is known.
if (config.maxIdle >= 0) {
list = new ArrayList(config.maxIdle);
@@ -292,21 +292,21 @@
* @param config
*/
private static Lender getLender(final FactoryConfig config) {
- final BorrowType borrowType = config.borrowType;
+ final BorrowPolicy borrowPolicy = config.borrowPolicy;
Lender lender;
if (config.maxIdle != 0) {
- if (BorrowType.FIFO.equals(borrowType)) {
+ if (BorrowPolicy.FIFO.equals(borrowPolicy)) {
lender = new FifoLender();
- } else if (BorrowType.LIFO.equals(borrowType)) {
+ } else if (BorrowPolicy.LIFO.equals(borrowPolicy)) {
lender = new LifoLender();
- } else if (BorrowType.SOFT_FIFO.equals(borrowType)) {
+ } else if (BorrowPolicy.SOFT_FIFO.equals(borrowPolicy)) {
lender = new SoftLender(new FifoLender());
- } else if (BorrowType.SOFT_LIFO.equals(borrowType)) {
+ } else if (BorrowPolicy.SOFT_LIFO.equals(borrowPolicy)) {
lender = new SoftLender(new LifoLender());
- } else if (BorrowType.NULL.equals(borrowType)) {
+ } else if (BorrowPolicy.NULL.equals(borrowPolicy)) {
lender = new NullLender();
} else {
- throw new IllegalStateException("No clue what this borrow type is: " + borrowType);
+ throw new IllegalStateException("No clue what this borrow type is: " + borrowPolicy);
}
} else {
lender = new NullLender();
@@ -337,33 +337,33 @@
*/
private static Manager getManager(final FactoryConfig config) {
Manager manager;
- final ExhaustionBehavior exhaustionBehavior = config.exhaustionBehavior;
- if (ExhaustionBehavior.GROW.equals(exhaustionBehavior)) {
+ final ExhaustionPolicy exhaustionPolicy = config.exhaustionPolicy;
+ if (ExhaustionPolicy.GROW.equals(exhaustionPolicy)) {
manager = new GrowManager();
- } else if (ExhaustionBehavior.FAIL.equals(exhaustionBehavior)) {
- if (BorrowType.NULL.equals(config.borrowType)) {
+ } else if (ExhaustionPolicy.FAIL.equals(exhaustionPolicy)) {
+ if (BorrowPolicy.NULL.equals(config.borrowPolicy)) {
throw new IllegalStateException("Using the NULL borrow type with the FAIL exhaustion behavior is pointless.");
} else if (config.maxIdle == 0) {
throw new IllegalStateException("Using the FAIL exhaustion behavior with a max of zero idle objects is pointless.");
}
manager = new FailManager();
} else {
- throw new IllegalStateException("No clue what this exhaustion behavior is: " + exhaustionBehavior);
+ throw new IllegalStateException("No clue what this exhaustion behavior is: " + exhaustionPolicy);
}
final int maxActive = config.maxActive;
if (maxActive > 0) {
- if (TrackingType.NULL.equals(config.trackerType)) {
+ if (TrackingPolicy.NULL.equals(config.trackerPolicy)) {
throw new IllegalStateException("Using the NULL tracker and limiting pool size is not valid.");
}
- final LimitBehavior limitBehavior = config.limitBehavior;
- if (LimitBehavior.FAIL.equals(limitBehavior)) {
+ final LimitPolicy limitPolicy = config.limitPolicy;
+ if (LimitPolicy.FAIL.equals(limitPolicy)) {
manager = new FailLimitManager(manager);
- } else if (LimitBehavior.WAIT.equals(limitBehavior)) {
+ } else if (LimitPolicy.WAIT.equals(limitPolicy)) {
manager = new WaitLimitManager(manager);
((WaitLimitManager)manager).setMaxWaitMillis(config.maxWaitMillis);
} else {
- throw new IllegalStateException("No clue what this wait behavior is: " + limitBehavior);
+ throw new IllegalStateException("No clue what this wait behavior is: " + limitPolicy);
}
((ActiveLimitManager)manager).setMaxActive(maxActive);
}
@@ -383,17 +383,17 @@
*/
private static Tracker getTracker(final FactoryConfig config) {
final Tracker tracker;
- final TrackingType trackerType = config.trackerType;
- if (TrackingType.SIMPLE.equals(trackerType)) {
+ final TrackingPolicy trackerPolicy = config.trackerPolicy;
+ if (TrackingPolicy.SIMPLE.equals(trackerPolicy)) {
tracker = new SimpleTracker();
- } else if (TrackingType.NULL.equals(trackerType)) {
+ } else if (TrackingPolicy.NULL.equals(trackerPolicy)) {
tracker = new NullTracker();
- } else if (TrackingType.REFERENCE.equals(trackerType)) {
+ } else if (TrackingPolicy.REFERENCE.equals(trackerPolicy)) {
tracker = new ReferenceTracker();
- } else if (TrackingType.DEBUG.equals(trackerType)) {
+ } else if (TrackingPolicy.DEBUG.equals(trackerPolicy)) {
tracker = new DebugTracker();
} else {
- throw new IllegalStateException("No clue what this tracking type is: " + trackerType);
+ throw new IllegalStateException("No clue what this tracking type is: " + trackerPolicy);
}
return tracker;
}
@@ -442,8 +442,8 @@
*
* @return the order in which objects are pooled.
*/
- public BorrowType getBorrowType() {
- return borrowType;
+ public BorrowPolicy getBorrowPolicy() {
+ return borrowPolicy;
}
/**
@@ -451,16 +451,16 @@
*
* <p>Note: this doesn't mean much if {@link #setMaxIdle(int) maxIdle} is set to zero.</p>
*
- * @param borrowType the order in which objects are pooled.
- * @throws IllegalArgumentException when <code>borrowType</code> is <code>null</code>.
+ * @param borrowPolicy the order in which objects are pooled.
+ * @throws IllegalArgumentException when <code>borrowPolicy</code> is <code>null</code>.
*/
- public void setBorrowType(final BorrowType borrowType) throws IllegalArgumentException {
- if (borrowType == null) {
+ public void setBorrowPolicy(final BorrowPolicy borrowPolicy) throws IllegalArgumentException {
+ if (borrowPolicy == null) {
throw new IllegalArgumentException("borrow type must not be null.");
}
synchronized (lock){
config = null;
- this.borrowType = borrowType;
+ this.borrowPolicy = borrowPolicy;
}
}
@@ -469,23 +469,23 @@
*
* @return behavior of the pool when all idle objects have been exhausted.
*/
- public ExhaustionBehavior getExhaustionBehavior() {
- return exhaustionBehavior;
+ public ExhaustionPolicy getExhaustionPolicy() {
+ return exhaustionPolicy;
}
/**
* Set the behavior for when the pool is exhausted of any idle objects.
*
- * @param exhaustionBehavior the desired exhausted behavior of the pool.
- * @throws IllegalArgumentException when <code>exhaustionBehavior</code> is <code>null</code>.
+ * @param exhaustionPolicy the desired exhausted behavior of the pool.
+ * @throws IllegalArgumentException when <code>exhaustionPolicy</code> is <code>null</code>.
*/
- public void setExhaustionBehavior(final ExhaustionBehavior exhaustionBehavior) throws IllegalArgumentException {
- if (exhaustionBehavior == null) {
+ public void setExhaustionPolicy(final ExhaustionPolicy exhaustionPolicy) throws IllegalArgumentException {
+ if (exhaustionPolicy == null) {
throw new IllegalArgumentException("exhaustion behavior must not be null.");
}
synchronized (lock){
config = null;
- this.exhaustionBehavior = exhaustionBehavior;
+ this.exhaustionPolicy = exhaustionPolicy;
}
}
@@ -543,34 +543,34 @@
* @return the behavior of the pool when the limit of active objects has been reached.
* @see #getMaxWaitMillis()
*/
- public LimitBehavior getLimitBehavior() {
- return limitBehavior;
+ public LimitPolicy getLimitPolicy() {
+ return limitPolicy;
}
/**
* Set the behavior of when the pool's limit of active objects has been reached.
*
- * @param limitBehavior action to take if the pool has an object limit and is exhausted.
- * @throws IllegalArgumentException when <code>limitBehavior</code> is <code>null</code>.
+ * @param limitPolicy action to take if the pool has an object limit and is exhausted.
+ * @throws IllegalArgumentException when <code>limitPolicy</code> is <code>null</code>.
* @see #setMaxWaitMillis(int)
*/
- public void setLimitBehavior(final LimitBehavior limitBehavior) throws IllegalArgumentException {
- if (limitBehavior == null) {
+ public void setLimitPolicy(final LimitPolicy limitPolicy) throws IllegalArgumentException {
+ if (limitPolicy == null) {
throw new IllegalArgumentException("limit behavior must not be null.");
}
synchronized (lock){
config = null;
- this.limitBehavior = limitBehavior;
+ this.limitPolicy = limitPolicy;
}
}
/**
- * Wait time in milliseconds for an object to become available to the pool when the {@link LimitBehavior#WAIT WAIT}
- * <code>LimitBehavior</code> is used.
+ * Wait time in milliseconds for an object to become available to the pool when the {@link LimitPolicy#WAIT WAIT}
+ * <code>LimitPolicy</code> is used.
*
* @return the wait time for an object to become available to the pool.
- * @see #getLimitBehavior()
- * @see LimitBehavior#WAIT
+ * @see #getLimitPolicy()
+ * @see LimitPolicy#WAIT
*/
public int getMaxWaitMillis() {
return maxWaitMillis;
@@ -578,11 +578,11 @@
/**
* Set the wait time in milliseconds for an object to become available to the pool when it was exhausted.
- * This has no effect unless the {@link #setLimitBehavior(LimitBehavior) limit behavior}
- * is set to {@link LimitBehavior#WAIT}.
+ * This has no effect unless the {@link #setLimitPolicy(LimitPolicy) limit behavior}
+ * is set to {@link LimitPolicy#WAIT}.
*
* @param maxWaitMillis the milliseconds to wait for an available object in the pool or <= 0 for no limit.
- * @see #setLimitBehavior(LimitBehavior)
+ * @see #setLimitPolicy(LimitPolicy)
*/
public void setMaxWaitMillis(final int maxWaitMillis) {
synchronized (lock){
@@ -596,23 +596,23 @@
*
* @return Type of tracking for active objects while they are borrowed from the pool.
*/
- public TrackingType getTrackerType() {
- return trackerType;
+ public TrackingPolicy getTrackerType() {
+ return trackerPolicy;
}
/**
* Set the type of tracking for active objects while they are borrowed from the pool.
*
- * @param trackerType type of tracking for active objects.
- * @throws IllegalArgumentException when <code>trackerType</code> is <code>null</code>.
+ * @param trackerPolicy type of tracking for active objects.
+ * @throws IllegalArgumentException when <code>trackerPolicy</code> is <code>null</code>.
*/
- public void setTrackerType(final TrackingType trackerType) throws IllegalArgumentException {
- if (trackerType == null) {
+ public void setTrackerType(final TrackingPolicy trackerPolicy) throws IllegalArgumentException {
+ if (trackerPolicy == null) {
throw new IllegalArgumentException("tracker type must not be null.");
}
synchronized (lock){
config = null;
- this.trackerType = trackerType;
+ this.trackerPolicy = trackerPolicy;
}
}
@@ -717,11 +717,11 @@
// XXX: Add better handling of when this instance is not Serializable
private final PoolableObjectFactory factory;
- /** @see CompositeObjectPoolFactory#borrowType */
- private final BorrowType borrowType;
+ /** @see CompositeObjectPoolFactory#borrowPolicy */
+ private final BorrowPolicy borrowPolicy;
- /** @see CompositeObjectPoolFactory#exhaustionBehavior */
- private final ExhaustionBehavior exhaustionBehavior;
+ /** @see CompositeObjectPoolFactory#exhaustionPolicy */
+ private final ExhaustionPolicy exhaustionPolicy;
/** @see CompositeObjectPoolFactory#maxIdle */
private final int maxIdle;
@@ -729,14 +729,14 @@
/** @see CompositeObjectPoolFactory#maxActive */
private final int maxActive;
- /** @see CompositeObjectPoolFactory#limitBehavior */
- private final LimitBehavior limitBehavior;
+ /** @see CompositeObjectPoolFactory#limitPolicy */
+ private final LimitPolicy limitPolicy;
/** @see CompositeObjectPoolFactory#maxWaitMillis */
private final int maxWaitMillis;
- /** @see CompositeObjectPoolFactory#trackerType */
- private final TrackingType trackerType;
+ /** @see CompositeObjectPoolFactory#trackerPolicy */
+ private final TrackingPolicy trackerPolicy;
/** @see CompositeObjectPoolFactory#validateOnReturn */
private final boolean validateOnReturn;
@@ -751,24 +751,24 @@
* Convenience constructor. This <b>must</b> be called from a synchronized context to be thread-safe.
*/
FactoryConfig(final CompositeObjectPoolFactory copf) {
- this(copf.getFactory(), copf.getBorrowType(), copf.getExhaustionBehavior(), copf.getMaxIdle(),
- copf.getMaxActive(), copf.getLimitBehavior(), copf.getMaxWaitMillis(), copf.getTrackerType(),
+ this(copf.getFactory(), copf.getBorrowPolicy(), copf.getExhaustionPolicy(), copf.getMaxIdle(),
+ copf.getMaxActive(), copf.getLimitPolicy(), copf.getMaxWaitMillis(), copf.getTrackerType(),
copf.isValidateOnReturn(), copf.getEvictIdleMillis(), copf.getEvictInvalidFrequencyMillis());
}
- FactoryConfig(final PoolableObjectFactory factory, final BorrowType borrowType,
- final ExhaustionBehavior exhaustionBehavior, final int maxIdle, final int maxActive,
- final LimitBehavior limitBehavior, final int maxWaitMillis, final TrackingType trackerType,
+ FactoryConfig(final PoolableObjectFactory factory, final BorrowPolicy borrowPolicy,
+ final ExhaustionPolicy exhaustionPolicy, final int maxIdle, final int maxActive,
+ final LimitPolicy limitPolicy, final int maxWaitMillis, final TrackingPolicy trackerPolicy,
final boolean validateOnReturn, final long evictIdleMillis,
final long evictInvalidFrequencyMillis) {
this.factory = factory;
- this.borrowType = borrowType;
- this.exhaustionBehavior = exhaustionBehavior;
+ this.borrowPolicy = borrowPolicy;
+ this.exhaustionPolicy = exhaustionPolicy;
this.maxIdle = maxIdle;
this.maxActive = maxActive;
- this.limitBehavior = limitBehavior;
+ this.limitPolicy = limitPolicy;
this.maxWaitMillis = maxWaitMillis;
- this.trackerType = trackerType;
+ this.trackerPolicy = trackerPolicy;
this.validateOnReturn = validateOnReturn;
this.evictIdleMillis = evictIdleMillis;
this.evictInvalidFrequencyMillis = evictInvalidFrequencyMillis;
@@ -778,17 +778,17 @@
public String toString() {
final StringBuffer sb = new StringBuffer();
sb.append("factory=").append(factory);
- sb.append(", borrowType=").append(borrowType);
- sb.append(", exhaustionBehavior=").append(exhaustionBehavior);
+ sb.append(", borrowPolicy=").append(borrowPolicy);
+ sb.append(", exhaustionPolicy=").append(exhaustionPolicy);
sb.append(", maxIdle=").append(maxIdle);
sb.append(", maxActive=").append(maxActive);
if (maxActive > 0) {
- sb.append(", limitBehavior=").append(limitBehavior);
- if (LimitBehavior.WAIT.equals(limitBehavior)) {
+ sb.append(", limitPolicy=").append(limitPolicy);
+ if (LimitPolicy.WAIT.equals(limitPolicy)) {
sb.append(", maxWaitMillis=").append(maxWaitMillis);
}
}
- sb.append(", trackerType=").append(trackerType);
+ sb.append(", trackerPolicy=").append(trackerPolicy);
sb.append(", validateOnReturn=").append(validateOnReturn);
if (evictIdleMillis > 0) {
sb.append(", evictIdleMillis=").append(evictIdleMillis);
Modified: jakarta/commons/proper/pool/trunk/src/java/org/apache/commons/pool/composite/DebugTracker.java
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/pool/trunk/src/java/org/apache/commons/pool/composite/DebugTracker.java?rev=389821&r1=389820&r2=389821&view=diff
==============================================================================
--- jakarta/commons/proper/pool/trunk/src/java/org/apache/commons/pool/composite/DebugTracker.java (original)
+++ jakarta/commons/proper/pool/trunk/src/java/org/apache/commons/pool/composite/DebugTracker.java Wed Mar 29 08:21:55 2006
@@ -26,7 +26,7 @@
/**
* Keeps track of active objects with {@link Reference}s and logs when they are not returned to the pool.
*
- * @see TrackingType#DEBUG
+ * @see TrackingPolicy#DEBUG
* @author Sandy McArthur
* @version $Revision$ $Date$
* @since #.#
Copied: jakarta/commons/proper/pool/trunk/src/java/org/apache/commons/pool/composite/ExhaustionPolicy.java (from r389683, jakarta/commons/proper/pool/trunk/src/java/org/apache/commons/pool/composite/ExhaustionBehavior.java)
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/pool/trunk/src/java/org/apache/commons/pool/composite/ExhaustionPolicy.java?p2=jakarta/commons/proper/pool/trunk/src/java/org/apache/commons/pool/composite/ExhaustionPolicy.java&p1=jakarta/commons/proper/pool/trunk/src/java/org/apache/commons/pool/composite/ExhaustionBehavior.java&r1=389683&r2=389821&rev=389821&view=diff
==============================================================================
--- jakarta/commons/proper/pool/trunk/src/java/org/apache/commons/pool/composite/ExhaustionBehavior.java (original)
+++ jakarta/commons/proper/pool/trunk/src/java/org/apache/commons/pool/composite/ExhaustionPolicy.java Wed Mar 29 08:21:55 2006
@@ -26,20 +26,20 @@
/**
* Specifies the behavior of the pool when the pool is out of idle objects.
*
- * @see CompositeObjectPoolFactory#setExhaustionBehavior(ExhaustionBehavior)
- * @see CompositeKeyedObjectPoolFactory#setExhaustionBehavior(ExhaustionBehavior)
+ * @see CompositeObjectPoolFactory#setExhaustionPolicy(ExhaustionPolicy)
+ * @see CompositeKeyedObjectPoolFactory#setExhaustionPolicy(ExhaustionPolicy)
* @author Sandy McArthur
* @since #.#
* @version $Revision$ $Date$
*/
-public final class ExhaustionBehavior implements Serializable {
+public final class ExhaustionPolicy implements Serializable {
private static final long serialVersionUID = -4895490364329810018L;
/**
* Grow the pool when all idle objects have been exhausted.
*/
- public static final ExhaustionBehavior GROW = new ExhaustionBehavior("GROW");
+ public static final ExhaustionPolicy GROW = new ExhaustionPolicy("GROW");
/**
* Throw a <code>NoSuchElementException</code> when all idle objects have been exhausted. Clients of the pool must
@@ -47,14 +47,14 @@
* @see NoSuchElementException
* @see PoolUtils#prefill
*/
- public static final ExhaustionBehavior FAIL = new ExhaustionBehavior("FAIL");
+ public static final ExhaustionPolicy FAIL = new ExhaustionPolicy("FAIL");
/**
* enum name.
*/
private final String name;
- private ExhaustionBehavior(final String name) {
+ private ExhaustionPolicy(final String name) {
this.name = name;
}
@@ -63,8 +63,8 @@
}
// Autogenerated with Java 1.5 enums
- public static ExhaustionBehavior[] values() {
- return new ExhaustionBehavior[] {FAIL, GROW};
+ public static ExhaustionPolicy[] values() {
+ return new ExhaustionPolicy[] {FAIL, GROW};
}
// necessary for serialization
Propchange: jakarta/commons/proper/pool/trunk/src/java/org/apache/commons/pool/composite/ExhaustionPolicy.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jakarta/commons/proper/pool/trunk/src/java/org/apache/commons/pool/composite/ExhaustionPolicy.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Modified: jakarta/commons/proper/pool/trunk/src/java/org/apache/commons/pool/composite/FailLimitManager.java
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/pool/trunk/src/java/org/apache/commons/pool/composite/FailLimitManager.java?rev=389821&r1=389820&r2=389821&view=diff
==============================================================================
--- jakarta/commons/proper/pool/trunk/src/java/org/apache/commons/pool/composite/FailLimitManager.java (original)
+++ jakarta/commons/proper/pool/trunk/src/java/org/apache/commons/pool/composite/FailLimitManager.java Wed Mar 29 08:21:55 2006
@@ -24,7 +24,7 @@
/**
* Throws {@link NoSuchElementException} when the max number of active objects has been reached.
*
- * @see LimitBehavior#FAIL
+ * @see LimitPolicy#FAIL
* @author Sandy McArthur
* @version $Revision$ $Date$
* @since #.#
Modified: jakarta/commons/proper/pool/trunk/src/java/org/apache/commons/pool/composite/FailManager.java
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/pool/trunk/src/java/org/apache/commons/pool/composite/FailManager.java?rev=389821&r1=389820&r2=389821&view=diff
==============================================================================
--- jakarta/commons/proper/pool/trunk/src/java/org/apache/commons/pool/composite/FailManager.java (original)
+++ jakarta/commons/proper/pool/trunk/src/java/org/apache/commons/pool/composite/FailManager.java Wed Mar 29 08:21:55 2006
@@ -26,7 +26,7 @@
* Throws a {@link NoSuchElementException} when the idle pool is exhausted. If you want to add objects to the pool you
* should call {@link ObjectPool#addObject()}.
*
- * @see ExhaustionBehavior#FAIL
+ * @see ExhaustionPolicy#FAIL
* @author Sandy McArthur
* @version $Revision$ $Date$
* @since #.#
Modified: jakarta/commons/proper/pool/trunk/src/java/org/apache/commons/pool/composite/FifoLender.java
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/pool/trunk/src/java/org/apache/commons/pool/composite/FifoLender.java?rev=389821&r1=389820&r2=389821&view=diff
==============================================================================
--- jakarta/commons/proper/pool/trunk/src/java/org/apache/commons/pool/composite/FifoLender.java (original)
+++ jakarta/commons/proper/pool/trunk/src/java/org/apache/commons/pool/composite/FifoLender.java Wed Mar 29 08:21:55 2006
@@ -23,7 +23,7 @@
/**
* A First In First Out (FIFO) {@link Lender}.
*
- * @see BorrowType#FIFO
+ * @see BorrowPolicy#FIFO
* @author Sandy McArthur
* @version $Revision$ $Date$
* @since #.#
Modified: jakarta/commons/proper/pool/trunk/src/java/org/apache/commons/pool/composite/GrowManager.java
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/pool/trunk/src/java/org/apache/commons/pool/composite/GrowManager.java?rev=389821&r1=389820&r2=389821&view=diff
==============================================================================
--- jakarta/commons/proper/pool/trunk/src/java/org/apache/commons/pool/composite/GrowManager.java (original)
+++ jakarta/commons/proper/pool/trunk/src/java/org/apache/commons/pool/composite/GrowManager.java Wed Mar 29 08:21:55 2006
@@ -27,7 +27,7 @@
* Whe the idle object pool is exhausted a new new object will be created via
* {@link PoolableObjectFactory#makeObject()}.
*
- * @see ExhaustionBehavior#GROW
+ * @see ExhaustionPolicy#GROW
* @author Sandy McArthur
* @version $Revision$ $Date$
* @since #.#
Modified: jakarta/commons/proper/pool/trunk/src/java/org/apache/commons/pool/composite/LifoLender.java
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/pool/trunk/src/java/org/apache/commons/pool/composite/LifoLender.java?rev=389821&r1=389820&r2=389821&view=diff
==============================================================================
--- jakarta/commons/proper/pool/trunk/src/java/org/apache/commons/pool/composite/LifoLender.java (original)
+++ jakarta/commons/proper/pool/trunk/src/java/org/apache/commons/pool/composite/LifoLender.java Wed Mar 29 08:21:55 2006
@@ -23,7 +23,7 @@
/**
* A Last In First Out (LIFO) {@link Lender}.
*
- * @see BorrowType#LIFO
+ * @see BorrowPolicy#LIFO
* @author Sandy McArthur
* @version $Revision$ $Date$
* @since #.#
Copied: jakarta/commons/proper/pool/trunk/src/java/org/apache/commons/pool/composite/LimitPolicy.java (from r389683, jakarta/commons/proper/pool/trunk/src/java/org/apache/commons/pool/composite/LimitBehavior.java)
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/pool/trunk/src/java/org/apache/commons/pool/composite/LimitPolicy.java?p2=jakarta/commons/proper/pool/trunk/src/java/org/apache/commons/pool/composite/LimitPolicy.java&p1=jakarta/commons/proper/pool/trunk/src/java/org/apache/commons/pool/composite/LimitBehavior.java&r1=389683&r2=389821&rev=389821&view=diff
==============================================================================
--- jakarta/commons/proper/pool/trunk/src/java/org/apache/commons/pool/composite/LimitBehavior.java (original)
+++ jakarta/commons/proper/pool/trunk/src/java/org/apache/commons/pool/composite/LimitPolicy.java Wed Mar 29 08:21:55 2006
@@ -26,13 +26,13 @@
/**
* Specifies the behavior of when the max number of active objects has been reached.
*
- * @see CompositeObjectPoolFactory#setLimitBehavior(LimitBehavior)
- * @see CompositeKeyedObjectPoolFactory#setLimitBehavior(LimitBehavior)
+ * @see CompositeObjectPoolFactory#setLimitPolicy(LimitPolicy)
+ * @see CompositeKeyedObjectPoolFactory#setLimitPolicy(LimitPolicy)
* @author Sandy McArthur
* @since #.#
* @version $Revision$ $Date$
*/
-public final class LimitBehavior implements Serializable {
+public final class LimitPolicy implements Serializable {
private static final long serialVersionUID = -4325661345028907604L;
@@ -43,7 +43,7 @@
* @see ObjectPool#getNumActive
* @see KeyedObjectPool#getNumActive
*/
- public static final LimitBehavior FAIL = new LimitBehavior("FAIL");
+ public static final LimitPolicy FAIL = new LimitPolicy("FAIL");
/**
* When the number of active objects has been reached, wait for the specified amount of time before failing with
@@ -52,14 +52,14 @@
* @see ObjectPool#getNumActive
* @see KeyedObjectPool#getNumActive
*/
- public static final LimitBehavior WAIT = new LimitBehavior("WAIT");
+ public static final LimitPolicy WAIT = new LimitPolicy("WAIT");
/**
* enum name.
*/
private final String name;
- private LimitBehavior(final String name) {
+ private LimitPolicy(final String name) {
this.name = name;
}
@@ -68,8 +68,8 @@
}
// Autogenerated with Java 1.5 enums
- public static LimitBehavior[] values() {
- return new LimitBehavior[] {FAIL, WAIT};
+ public static LimitPolicy[] values() {
+ return new LimitPolicy[] {FAIL, WAIT};
}
// necessary for serialization
Propchange: jakarta/commons/proper/pool/trunk/src/java/org/apache/commons/pool/composite/LimitPolicy.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jakarta/commons/proper/pool/trunk/src/java/org/apache/commons/pool/composite/LimitPolicy.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Modified: jakarta/commons/proper/pool/trunk/src/java/org/apache/commons/pool/composite/Manager.java
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/pool/trunk/src/java/org/apache/commons/pool/composite/Manager.java?rev=389821&r1=389820&r2=389821&view=diff
==============================================================================
--- jakarta/commons/proper/pool/trunk/src/java/org/apache/commons/pool/composite/Manager.java (original)
+++ jakarta/commons/proper/pool/trunk/src/java/org/apache/commons/pool/composite/Manager.java Wed Mar 29 08:21:55 2006
@@ -25,8 +25,8 @@
* Managers are expected to transition an object from an active or idle state and vice versa.
* Implementations are expected to be called from a synchronized context on the idle object pool.
*
- * @see ExhaustionBehavior
- * @see LimitBehavior
+ * @see ExhaustionPolicy
+ * @see LimitPolicy
* @author Sandy McArthur
* @version $Revision$ $Date$
* @since #.#
Modified: jakarta/commons/proper/pool/trunk/src/java/org/apache/commons/pool/composite/NullLender.java
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/pool/trunk/src/java/org/apache/commons/pool/composite/NullLender.java?rev=389821&r1=389820&r2=389821&view=diff
==============================================================================
--- jakarta/commons/proper/pool/trunk/src/java/org/apache/commons/pool/composite/NullLender.java (original)
+++ jakarta/commons/proper/pool/trunk/src/java/org/apache/commons/pool/composite/NullLender.java Wed Mar 29 08:21:55 2006
@@ -23,7 +23,7 @@
/**
* Neither borrow nor return objects.
*
- * @see BorrowType#NULL
+ * @see BorrowPolicy#NULL
* @author Sandy McArthur
* @since #.#
* @version $Revision$ $Date$
Modified: jakarta/commons/proper/pool/trunk/src/java/org/apache/commons/pool/composite/NullTracker.java
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/pool/trunk/src/java/org/apache/commons/pool/composite/NullTracker.java?rev=389821&r1=389820&r2=389821&view=diff
==============================================================================
--- jakarta/commons/proper/pool/trunk/src/java/org/apache/commons/pool/composite/NullTracker.java (original)
+++ jakarta/commons/proper/pool/trunk/src/java/org/apache/commons/pool/composite/NullTracker.java Wed Mar 29 08:21:55 2006
@@ -21,7 +21,7 @@
/**
* Doesn't actually track active objects. Not compatiable with any {@link ActiveLimitManager} implementation.
*
- * @see TrackingType#NULL
+ * @see TrackingPolicy#NULL
* @author Sandy McArthur
* @version $Revision$ $Date$
* @since #.#
Modified: jakarta/commons/proper/pool/trunk/src/java/org/apache/commons/pool/composite/ReferenceTracker.java
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/pool/trunk/src/java/org/apache/commons/pool/composite/ReferenceTracker.java?rev=389821&r1=389820&r2=389821&view=diff
==============================================================================
--- jakarta/commons/proper/pool/trunk/src/java/org/apache/commons/pool/composite/ReferenceTracker.java (original)
+++ jakarta/commons/proper/pool/trunk/src/java/org/apache/commons/pool/composite/ReferenceTracker.java Wed Mar 29 08:21:55 2006
@@ -27,7 +27,7 @@
/**
* Keeps track of active objects with {@link Reference}s and detectes when they are not returned to the pool.
*
- * @see TrackingType#REFERENCE
+ * @see TrackingPolicy#REFERENCE
* @author Sandy McArthur
* @version $Revision$ $Date$
* @since #.#
Modified: jakarta/commons/proper/pool/trunk/src/java/org/apache/commons/pool/composite/SimpleTracker.java
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/pool/trunk/src/java/org/apache/commons/pool/composite/SimpleTracker.java?rev=389821&r1=389820&r2=389821&view=diff
==============================================================================
--- jakarta/commons/proper/pool/trunk/src/java/org/apache/commons/pool/composite/SimpleTracker.java (original)
+++ jakarta/commons/proper/pool/trunk/src/java/org/apache/commons/pool/composite/SimpleTracker.java Wed Mar 29 08:21:55 2006
@@ -23,7 +23,7 @@
* trusts the user will properly return an object. If the counter goes negative it throws an
* {@link IllegalStateException}.
*
- * @see TrackingType#SIMPLE
+ * @see TrackingPolicy#SIMPLE
* @author Sandy McArthur
* @version $Revision$ $Date$
* @since #.#
Modified: jakarta/commons/proper/pool/trunk/src/java/org/apache/commons/pool/composite/SoftLender.java
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/pool/trunk/src/java/org/apache/commons/pool/composite/SoftLender.java?rev=389821&r1=389820&r2=389821&view=diff
==============================================================================
--- jakarta/commons/proper/pool/trunk/src/java/org/apache/commons/pool/composite/SoftLender.java (original)
+++ jakarta/commons/proper/pool/trunk/src/java/org/apache/commons/pool/composite/SoftLender.java Wed Mar 29 08:21:55 2006
@@ -21,7 +21,6 @@
import java.io.Serializable;
import java.lang.ref.Reference;
import java.lang.ref.SoftReference;
-import java.lang.ref.ReferenceQueue;
import java.util.Iterator;
import java.util.ListIterator;
@@ -29,8 +28,8 @@
* Wraps object in a {@link SoftReference} before letting a delegate {@link Lender} add them to the idle object pool.
* Idle objects that are garbage collected will not be {@link ObjectPool#invalidateObject(Object) invalidated}.
*
- * @see BorrowType#SOFT_FIFO
- * @see BorrowType#SOFT_LIFO
+ * @see BorrowPolicy#SOFT_FIFO
+ * @see BorrowPolicy#SOFT_LIFO
* @author Sandy McArthur
* @since #.#
* @version $Revision$ $Date$
Modified: jakarta/commons/proper/pool/trunk/src/java/org/apache/commons/pool/composite/Tracker.java
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/pool/trunk/src/java/org/apache/commons/pool/composite/Tracker.java?rev=389821&r1=389820&r2=389821&view=diff
==============================================================================
--- jakarta/commons/proper/pool/trunk/src/java/org/apache/commons/pool/composite/Tracker.java (original)
+++ jakarta/commons/proper/pool/trunk/src/java/org/apache/commons/pool/composite/Tracker.java Wed Mar 29 08:21:55 2006
@@ -28,7 +28,7 @@
* <p>Implementations must not make any assumptions about nor modify the state of the objects it sees. This is simply
* a tool for active object accounting.</p>
*
- * @see TrackingType
+ * @see TrackingPolicy
* @author Sandy McArthur
* @version $Revision$ $Date$
* @since #.#
Copied: jakarta/commons/proper/pool/trunk/src/java/org/apache/commons/pool/composite/TrackingPolicy.java (from r389683, jakarta/commons/proper/pool/trunk/src/java/org/apache/commons/pool/composite/TrackingType.java)
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/pool/trunk/src/java/org/apache/commons/pool/composite/TrackingPolicy.java?p2=jakarta/commons/proper/pool/trunk/src/java/org/apache/commons/pool/composite/TrackingPolicy.java&p1=jakarta/commons/proper/pool/trunk/src/java/org/apache/commons/pool/composite/TrackingType.java&r1=389683&r2=389821&rev=389821&view=diff
==============================================================================
--- jakarta/commons/proper/pool/trunk/src/java/org/apache/commons/pool/composite/TrackingType.java (original)
+++ jakarta/commons/proper/pool/trunk/src/java/org/apache/commons/pool/composite/TrackingPolicy.java Wed Mar 29 08:21:55 2006
@@ -23,13 +23,13 @@
/**
* Specifies how active objects are tracked while they are out of the pool.
*
- * @see CompositeObjectPoolFactory#setTrackerType(TrackingType)
- * @see CompositeKeyedObjectPoolFactory#setTrackerType(TrackingType)
+ * @see CompositeObjectPoolFactory#setTrackerType(TrackingPolicy)
+ * @see CompositeKeyedObjectPoolFactory#setTrackerType(TrackingPolicy)
* @author Sandy McArthur
* @since #.#
* @version $Revision$ $Date$
*/
-public final class TrackingType implements Serializable {
+public final class TrackingPolicy implements Serializable {
private static final long serialVersionUID = 181851949909846032L;
@@ -37,14 +37,14 @@
* Do not track how objects are borrowed from the pool. While this is the fastest tracking type it is
* incompatible with pools that limit the number of objects in the pool.
*/
- public static final TrackingType NULL = new TrackingType("NULL");
+ public static final TrackingPolicy NULL = new TrackingPolicy("NULL");
/**
* Borrowed object tracker that trusts you'll return the objects you borrow. This is the most common method of
* tracking active objects. If you return more objects than you borrow then this will throw an
* {@link IllegalStateException}.
*/
- public static final TrackingType SIMPLE = new TrackingType("SIMPLE");
+ public static final TrackingPolicy SIMPLE = new TrackingPolicy("SIMPLE");
/**
* Borrowed object tracker that detects when borrowed objects are lost. This implementation keeps track of
@@ -53,20 +53,20 @@
* first object borrowed or returned to the pool after garbage collector has collected the lost object. If you
* return an object that wasn't borrowed from the pool an {@link IllegalStateException} will be thrown.
*/
- public static final TrackingType REFERENCE = new TrackingType("REFERENCE");
+ public static final TrackingPolicy REFERENCE = new TrackingPolicy("REFERENCE");
/**
* Like {@link #REFERENCE} but prints a stack trace for lost objects from when the object was borrowed from the
* pool. The point in time at which the stack trace is printed is dependent on the garbage collector's behavior.
*/
- public static final TrackingType DEBUG = new TrackingType("DEBUG");
+ public static final TrackingPolicy DEBUG = new TrackingPolicy("DEBUG");
/**
* enum name.
*/
private final String name;
- private TrackingType(final String name) {
+ private TrackingPolicy(final String name) {
this.name = name;
}
@@ -75,8 +75,8 @@
}
// Autogenerated with Java 1.5 enums
- public static TrackingType[] values() {
- return new TrackingType[] {NULL, SIMPLE, REFERENCE, DEBUG};
+ public static TrackingPolicy[] values() {
+ return new TrackingPolicy[] {NULL, SIMPLE, REFERENCE, DEBUG};
}
// necessary for serialization
Propchange: jakarta/commons/proper/pool/trunk/src/java/org/apache/commons/pool/composite/TrackingPolicy.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jakarta/commons/proper/pool/trunk/src/java/org/apache/commons/pool/composite/TrackingPolicy.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Modified: jakarta/commons/proper/pool/trunk/src/java/org/apache/commons/pool/composite/WaitLimitManager.java
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/pool/trunk/src/java/org/apache/commons/pool/composite/WaitLimitManager.java?rev=389821&r1=389820&r2=389821&view=diff
==============================================================================
--- jakarta/commons/proper/pool/trunk/src/java/org/apache/commons/pool/composite/WaitLimitManager.java (original)
+++ jakarta/commons/proper/pool/trunk/src/java/org/apache/commons/pool/composite/WaitLimitManager.java Wed Mar 29 08:21:55 2006
@@ -26,7 +26,7 @@
* object doesn't become available in the specified amount of time. For this to work all {@link Lender}s must call
* {@link Object#notifyAll()} on the idle object pool once they've returned an object.
*
- * @see LimitBehavior#WAIT
+ * @see LimitPolicy#WAIT
* @author Sandy McArthur
* @version $Revision$ $Date$
* @since #.#
Modified: jakarta/commons/proper/pool/trunk/src/test/org/apache/commons/pool/composite/PerformanceTest.java
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/pool/trunk/src/test/org/apache/commons/pool/composite/PerformanceTest.java?rev=389821&r1=389820&r2=389821&view=diff
==============================================================================
--- jakarta/commons/proper/pool/trunk/src/test/org/apache/commons/pool/composite/PerformanceTest.java (original)
+++ jakarta/commons/proper/pool/trunk/src/test/org/apache/commons/pool/composite/PerformanceTest.java Wed Mar 29 08:21:55 2006
@@ -39,26 +39,26 @@
*/
public class PerformanceTest {
public static final Object LOCK = new Object();
- private static final List borrowTypes = Arrays.asList(BorrowType.values());
- private static final List exhaustionBehaviors = Arrays.asList(ExhaustionBehavior.values());
+ private static final List borrowPolicies = Arrays.asList(BorrowPolicy.values());
+ private static final List exhaustionPolicies = Arrays.asList(ExhaustionPolicy.values());
private static final List maxIdles = Arrays.asList(new Integer[] {new Integer(-1), new Integer(10)});
private static final List maxActives = Arrays.asList(new Integer[] {new Integer(-1), new Integer(10)});
- private static final List limitBehaviors = Arrays.asList(LimitBehavior.values());
+ private static final List limitPolicies = Arrays.asList(LimitPolicy.values());
private static final List maxWaits = Arrays.asList(new Integer[] {new Integer(-1), new Integer(50)}); // not sure how to use this
- private static final List trackingTypes = new ArrayList(Arrays.asList(TrackingType.values()));
+ private static final List trackingPolicies = new ArrayList(Arrays.asList(TrackingPolicy.values()));
private static final List validateOnReturns = Arrays.asList(new Boolean[] {Boolean.FALSE, Boolean.TRUE});
// evictIdleMillis
// evictInvalidFrequencyMillis
static {
- trackingTypes.remove(TrackingType.DEBUG); // based off of TrackingType.REFERENCE and slower (about 1/5 as fast)
+ trackingPolicies.remove(TrackingPolicy.DEBUG); // based off of TrackingPolicy.REFERENCE and slower (about 1/5 as fast)
}
- private Iterator borrowIter = borrowTypes.iterator();
- private Iterator exhaustionIter = exhaustionBehaviors.iterator();
+ private Iterator borrowIter = borrowPolicies.iterator();
+ private Iterator exhaustionIter = exhaustionPolicies.iterator();
private Iterator maxIdleIter = maxIdles.iterator();
private Iterator maxActiveIter = maxActives.iterator();
- private Iterator limitIter = limitBehaviors.iterator();
- private Iterator trackingIter = trackingTypes.iterator();
+ private Iterator limitIter = limitPolicies.iterator();
+ private Iterator trackingIter = trackingPolicies.iterator();
private Iterator validateIter = validateOnReturns.iterator();
private PoolableObjectFactory objectFactory = new IntegerFactory();
@@ -73,10 +73,10 @@
validateIter = validateOnReturns.iterator();
if (!trackingIter.hasNext()) {
- trackingIter = trackingTypes.iterator();
+ trackingIter = trackingPolicies.iterator();
if (!limitIter.hasNext()) {
- limitIter = limitBehaviors.iterator();
+ limitIter = limitPolicies.iterator();
if (!maxActiveIter.hasNext()) {
maxActiveIter = maxActives.iterator();
@@ -85,23 +85,23 @@
maxIdleIter = maxIdles.iterator();
if (!exhaustionIter.hasNext()) {
- exhaustionIter = exhaustionBehaviors.iterator();
+ exhaustionIter = exhaustionPolicies.iterator();
if (!borrowIter.hasNext()) {
- borrowIter = borrowTypes.iterator();
+ borrowIter = borrowPolicies.iterator();
newCombination = false;
}
- poolFactory.setBorrowType((BorrowType)borrowIter.next());
+ poolFactory.setBorrowPolicy((BorrowPolicy)borrowIter.next());
}
- poolFactory.setExhaustionBehavior((ExhaustionBehavior)exhaustionIter.next());
+ poolFactory.setExhaustionPolicy((ExhaustionPolicy)exhaustionIter.next());
}
poolFactory.setMaxIdle(((Integer)maxIdleIter.next()).intValue());
}
poolFactory.setMaxActive(((Integer)maxActiveIter.next()).intValue());
}
- poolFactory.setLimitBehavior((LimitBehavior)limitIter.next());
+ poolFactory.setLimitPolicy((LimitPolicy)limitIter.next());
}
- poolFactory.setTrackerType((TrackingType)trackingIter.next());
+ poolFactory.setTrackerType((TrackingPolicy)trackingIter.next());
}
poolFactory.setValidateOnReturn(((Boolean)validateIter.next()).booleanValue());
@@ -493,10 +493,10 @@
maxActive = (Integer)maxActiveIter.next();
validateOnReturn = (Boolean)validateIter.next();
- compositeFactory.setBorrowType(BorrowType.FIFO);
- compositeFactory.setExhaustionBehavior(ExhaustionBehavior.GROW);
- compositeFactory.setLimitBehavior(LimitBehavior.FAIL);
- compositeFactory.setTrackerType(TrackingType.SIMPLE);
+ compositeFactory.setBorrowPolicy(BorrowPolicy.FIFO);
+ compositeFactory.setExhaustionPolicy(ExhaustionPolicy.GROW);
+ compositeFactory.setLimitPolicy(LimitPolicy.FAIL);
+ compositeFactory.setTrackerType(TrackingPolicy.SIMPLE);
genericConfig.minIdle = 0;
genericConfig.testOnBorrow = true;
---------------------------------------------------------------------
To unsubscribe, e-mail: commons-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: commons-dev-help@jakarta.apache.org