Author: simonetripodi
Date: Sun Apr 24 20:40:24 2011
New Revision: 1096380
URL: http://svn.apache.org/viewvc?rev=1096380&view=rev
Log:
just marked deprecated methods/constructors with @Deprecated annotation
Modified:
commons/proper/pool/trunk/src/java/org/apache/commons/pool2/BaseKeyedObjectPool.java
commons/proper/pool/trunk/src/java/org/apache/commons/pool2/BaseObjectPool.java
commons/proper/pool/trunk/src/java/org/apache/commons/pool2/KeyedObjectPool.java
commons/proper/pool/trunk/src/java/org/apache/commons/pool2/ObjectPool.java
commons/proper/pool/trunk/src/java/org/apache/commons/pool2/PoolUtils.java
commons/proper/pool/trunk/src/java/org/apache/commons/pool2/impl/GenericKeyedObjectPool.java
commons/proper/pool/trunk/src/java/org/apache/commons/pool2/impl/GenericObjectPool.java
commons/proper/pool/trunk/src/java/org/apache/commons/pool2/impl/SoftReferenceObjectPool.java
commons/proper/pool/trunk/src/java/org/apache/commons/pool2/impl/StackKeyedObjectPool.java
commons/proper/pool/trunk/src/java/org/apache/commons/pool2/impl/StackObjectPool.java
Modified:
commons/proper/pool/trunk/src/java/org/apache/commons/pool2/BaseKeyedObjectPool.java
URL:
http://svn.apache.org/viewvc/commons/proper/pool/trunk/src/java/org/apache/commons/pool2/BaseKeyedObjectPool.java?rev=1096380&r1=1096379&r2=1096380&view=diff
==============================================================================
---
commons/proper/pool/trunk/src/java/org/apache/commons/pool2/BaseKeyedObjectPool.java
(original)
+++
commons/proper/pool/trunk/src/java/org/apache/commons/pool2/BaseKeyedObjectPool.java
Sun Apr 24 20:40:24 2011
@@ -131,6 +131,7 @@ public abstract class BaseKeyedObjectPoo
* @param factory the new KeyedPoolableObjectFactory
* @deprecated to be removed in pool 2.0
*/
+ @Deprecated
public void setFactory(KeyedPoolableObjectFactory<K,V> factory) throws
IllegalStateException, UnsupportedOperationException {
throw new UnsupportedOperationException();
}
Modified:
commons/proper/pool/trunk/src/java/org/apache/commons/pool2/BaseObjectPool.java
URL:
http://svn.apache.org/viewvc/commons/proper/pool/trunk/src/java/org/apache/commons/pool2/BaseObjectPool.java?rev=1096380&r1=1096379&r2=1096380&view=diff
==============================================================================
---
commons/proper/pool/trunk/src/java/org/apache/commons/pool2/BaseObjectPool.java
(original)
+++
commons/proper/pool/trunk/src/java/org/apache/commons/pool2/BaseObjectPool.java
Sun Apr 24 20:40:24 2011
@@ -115,6 +115,7 @@ public abstract class BaseObjectPool<T>
* @throws IllegalStateException
* @deprecated to be removed in pool 2.0
*/
+ @Deprecated
public void setFactory(PoolableObjectFactory<T> factory) throws
IllegalStateException, UnsupportedOperationException {
throw new UnsupportedOperationException();
}
Modified:
commons/proper/pool/trunk/src/java/org/apache/commons/pool2/KeyedObjectPool.java
URL:
http://svn.apache.org/viewvc/commons/proper/pool/trunk/src/java/org/apache/commons/pool2/KeyedObjectPool.java?rev=1096380&r1=1096379&r2=1096380&view=diff
==============================================================================
---
commons/proper/pool/trunk/src/java/org/apache/commons/pool2/KeyedObjectPool.java
(original)
+++
commons/proper/pool/trunk/src/java/org/apache/commons/pool2/KeyedObjectPool.java
Sun Apr 24 20:40:24 2011
@@ -225,5 +225,6 @@ public interface KeyedObjectPool<K,V> {
* @throws UnsupportedOperationException when this implementation doesn't
support the operation
* @deprecated to be removed in pool 2.0
*/
+ @Deprecated
void setFactory(KeyedPoolableObjectFactory<K,V> factory) throws
IllegalStateException, UnsupportedOperationException;
}
Modified:
commons/proper/pool/trunk/src/java/org/apache/commons/pool2/ObjectPool.java
URL:
http://svn.apache.org/viewvc/commons/proper/pool/trunk/src/java/org/apache/commons/pool2/ObjectPool.java?rev=1096380&r1=1096379&r2=1096380&view=diff
==============================================================================
--- commons/proper/pool/trunk/src/java/org/apache/commons/pool2/ObjectPool.java
(original)
+++ commons/proper/pool/trunk/src/java/org/apache/commons/pool2/ObjectPool.java
Sun Apr 24 20:40:24 2011
@@ -186,5 +186,6 @@ public interface ObjectPool<T> {
* @throws UnsupportedOperationException if this implementation does not
support the operation
* @deprecated to be removed in pool 2.0
*/
+ @Deprecated
void setFactory(PoolableObjectFactory<T> factory) throws
IllegalStateException, UnsupportedOperationException;
}
Modified:
commons/proper/pool/trunk/src/java/org/apache/commons/pool2/PoolUtils.java
URL:
http://svn.apache.org/viewvc/commons/proper/pool/trunk/src/java/org/apache/commons/pool2/PoolUtils.java?rev=1096380&r1=1096379&r2=1096380&view=diff
==============================================================================
--- commons/proper/pool/trunk/src/java/org/apache/commons/pool2/PoolUtils.java
(original)
+++ commons/proper/pool/trunk/src/java/org/apache/commons/pool2/PoolUtils.java
Sun Apr 24 20:40:24 2011
@@ -851,6 +851,7 @@ public final class PoolUtils {
* @param factory new PoolableObjectFactory
* @deprecated to be removed in version 2.0
*/
+ @Deprecated
public void setFactory(final PoolableObjectFactory<V> factory) throws
IllegalStateException, UnsupportedOperationException {
keyedPool.setFactory(new
KeyedPoolableObjectFactoryAdaptor<K,V>(factory));
}
@@ -1004,6 +1005,7 @@ public final class PoolUtils {
* @param factory new factory to use managing object instances
* @deprecated to be removed in version 2.0
*/
+ @Deprecated
public void setFactory(final KeyedPoolableObjectFactory<K,V> factory)
throws IllegalStateException, UnsupportedOperationException {
pool.setFactory(adapt((KeyedPoolableObjectFactory<Object, V>)
factory));
}
@@ -1150,6 +1152,7 @@ public final class PoolUtils {
* @param factory object factory
* @deprecated to be removed in version 2.0
*/
+ @Deprecated
public void setFactory(final PoolableObjectFactory<T> factory) throws
IllegalStateException, UnsupportedOperationException {
pool.setFactory(factory);
}
@@ -1320,6 +1323,7 @@ public final class PoolUtils {
* @param factory object factory
* @deprecated to be removed in version 2.0
*/
+ @Deprecated
public void setFactory(final KeyedPoolableObjectFactory<K,V> factory)
throws IllegalStateException, UnsupportedOperationException {
keyedPool.setFactory(factory);
}
@@ -1597,6 +1601,7 @@ public final class PoolUtils {
* @param factory new PoolableObjectFactory
* @deprecated to be removed in pool 2.0
*/
+ @Deprecated
public void setFactory(final PoolableObjectFactory<T> factory) throws
IllegalStateException, UnsupportedOperationException {
synchronized (lock) {
pool.setFactory(factory);
@@ -1765,6 +1770,7 @@ public final class PoolUtils {
* @param factory KeyedPoolableObjectFactory used by the pool
* @deprecated to be removed in pool 2.0
*/
+ @Deprecated
public void setFactory(final KeyedPoolableObjectFactory<K,V> factory)
throws IllegalStateException, UnsupportedOperationException {
synchronized (lock) {
keyedPool.setFactory(factory);
@@ -2151,6 +2157,7 @@ public final class PoolUtils {
* {@inheritDoc}
* @deprecated to be removed in pool 2.0
*/
+ @Deprecated
public void setFactory(final PoolableObjectFactory<T> factory) throws
IllegalStateException, UnsupportedOperationException {
pool.setFactory(factory);
}
@@ -2339,6 +2346,7 @@ public final class PoolUtils {
* {@inheritDoc}
* @deprecated to be removed in pool 2.0
*/
+ @Deprecated
public void setFactory(final KeyedPoolableObjectFactory<K,V> factory)
throws IllegalStateException, UnsupportedOperationException {
keyedPool.setFactory(factory);
}
Modified:
commons/proper/pool/trunk/src/java/org/apache/commons/pool2/impl/GenericKeyedObjectPool.java
URL:
http://svn.apache.org/viewvc/commons/proper/pool/trunk/src/java/org/apache/commons/pool2/impl/GenericKeyedObjectPool.java?rev=1096380&r1=1096379&r2=1096380&view=diff
==============================================================================
---
commons/proper/pool/trunk/src/java/org/apache/commons/pool2/impl/GenericKeyedObjectPool.java
(original)
+++
commons/proper/pool/trunk/src/java/org/apache/commons/pool2/impl/GenericKeyedObjectPool.java
Sun Apr 24 20:40:24 2011
@@ -1816,6 +1816,7 @@ public class GenericKeyedObjectPool<K,V>
* @throws IllegalStateException if there are active (checked out)
instances associated with this keyed object pool
* @deprecated to be removed in version 2.0
*/
+ @Deprecated
public void setFactory(KeyedPoolableObjectFactory<K,V> factory) throws
IllegalStateException {
Map<K,List<ObjectTimestampPair<V>>> toDestroy = new HashMap<K,
List<ObjectTimestampPair<V>>>();
final KeyedPoolableObjectFactory<K,V> oldFactory = _factory;
Modified:
commons/proper/pool/trunk/src/java/org/apache/commons/pool2/impl/GenericObjectPool.java
URL:
http://svn.apache.org/viewvc/commons/proper/pool/trunk/src/java/org/apache/commons/pool2/impl/GenericObjectPool.java?rev=1096380&r1=1096379&r2=1096380&view=diff
==============================================================================
---
commons/proper/pool/trunk/src/java/org/apache/commons/pool2/impl/GenericObjectPool.java
(original)
+++
commons/proper/pool/trunk/src/java/org/apache/commons/pool2/impl/GenericObjectPool.java
Sun Apr 24 20:40:24 2011
@@ -1503,6 +1503,7 @@ public class GenericObjectPool<T> extend
* @throws IllegalStateException when the factory cannot be set at this
time
* @deprecated to be removed in version 2.0
*/
+ @Deprecated
public void setFactory(PoolableObjectFactory<T> factory) throws
IllegalStateException {
List<ObjectTimestampPair<T>> toDestroy = new
ArrayList<ObjectTimestampPair<T>>();
final PoolableObjectFactory<T> oldFactory = _factory;
Modified:
commons/proper/pool/trunk/src/java/org/apache/commons/pool2/impl/SoftReferenceObjectPool.java
URL:
http://svn.apache.org/viewvc/commons/proper/pool/trunk/src/java/org/apache/commons/pool2/impl/SoftReferenceObjectPool.java?rev=1096380&r1=1096379&r2=1096380&view=diff
==============================================================================
---
commons/proper/pool/trunk/src/java/org/apache/commons/pool2/impl/SoftReferenceObjectPool.java
(original)
+++
commons/proper/pool/trunk/src/java/org/apache/commons/pool2/impl/SoftReferenceObjectPool.java
Sun Apr 24 20:40:24 2011
@@ -49,6 +49,7 @@ public class SoftReferenceObjectPool<T>
* @see #SoftReferenceObjectPool(PoolableObjectFactory)
* @deprecated to be removed in pool 2.0. Use {@link
#SoftReferenceObjectPool(PoolableObjectFactory)}.
*/
+ @Deprecated
public SoftReferenceObjectPool() {
_pool = new ArrayList<SoftReference<T>>();
_factory = null;
@@ -74,6 +75,7 @@ public class SoftReferenceObjectPool<T>
* @deprecated because this is a SoftReference pool, prefilled idle
obejects may be garbage collected before they are used.
* To be removed in Pool 2.0.
*/
+ @Deprecated
public SoftReferenceObjectPool(PoolableObjectFactory<T> factory, int
initSize) throws Exception, IllegalArgumentException {
if (factory == null) {
throw new IllegalArgumentException("factory required to prefill
the pool.");
@@ -312,6 +314,7 @@ public class SoftReferenceObjectPool<T>
* @throws IllegalStateException when the factory cannot be set at this
time
* @deprecated to be removed in pool 2.0
*/
+ @Deprecated
public synchronized void setFactory(PoolableObjectFactory<T> factory)
throws IllegalStateException {
assertOpen();
if(0 < getNumActive()) {
Modified:
commons/proper/pool/trunk/src/java/org/apache/commons/pool2/impl/StackKeyedObjectPool.java
URL:
http://svn.apache.org/viewvc/commons/proper/pool/trunk/src/java/org/apache/commons/pool2/impl/StackKeyedObjectPool.java?rev=1096380&r1=1096379&r2=1096380&view=diff
==============================================================================
---
commons/proper/pool/trunk/src/java/org/apache/commons/pool2/impl/StackKeyedObjectPool.java
(original)
+++
commons/proper/pool/trunk/src/java/org/apache/commons/pool2/impl/StackKeyedObjectPool.java
Sun Apr 24 20:40:24 2011
@@ -452,6 +452,7 @@ public class StackKeyedObjectPool<K,V> e
* @throws IllegalStateException when the factory cannot be set at this
time
* @deprecated to be removed in pool 2.0
*/
+ @Deprecated
public synchronized void setFactory(KeyedPoolableObjectFactory<K,V>
factory) throws IllegalStateException {
if(0 < getNumActive()) {
throw new IllegalStateException("Objects are already active");
Modified:
commons/proper/pool/trunk/src/java/org/apache/commons/pool2/impl/StackObjectPool.java
URL:
http://svn.apache.org/viewvc/commons/proper/pool/trunk/src/java/org/apache/commons/pool2/impl/StackObjectPool.java?rev=1096380&r1=1096379&r2=1096380&view=diff
==============================================================================
---
commons/proper/pool/trunk/src/java/org/apache/commons/pool2/impl/StackObjectPool.java
(original)
+++
commons/proper/pool/trunk/src/java/org/apache/commons/pool2/impl/StackObjectPool.java
Sun Apr 24 20:40:24 2011
@@ -390,6 +390,7 @@ public class StackObjectPool<T> extends
* @throws IllegalStateException when the factory cannot be set at this
time
* @deprecated to be removed in pool 2.0
*/
+ @Deprecated
@Override
public synchronized void setFactory(PoolableObjectFactory<T> factory)
throws IllegalStateException {
assertOpen();
