Author: markt
Date: Wed Dec 14 19:42:38 2011
New Revision: 1214420
URL: http://svn.apache.org/viewvc?rev=1214420&view=rev
Log:
Fix POOL-201. Remove unnecessary generics from Config classes
Modified:
commons/proper/pool/trunk/src/java/org/apache/commons/pool2/impl/GenericKeyedObjectPool.java
commons/proper/pool/trunk/src/java/org/apache/commons/pool2/impl/GenericKeyedObjectPoolConfig.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/GenericObjectPoolConfig.java
commons/proper/pool/trunk/src/test/org/apache/commons/pool2/impl/TestGenericKeyedObjectPool.java
commons/proper/pool/trunk/src/test/org/apache/commons/pool2/impl/TestGenericObjectPool.java
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=1214420&r1=1214419&r2=1214420&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
Wed Dec 14 19:42:38 2011
@@ -220,7 +220,7 @@ public class GenericKeyedObjectPool<K,T>
* factory.
*/
public GenericKeyedObjectPool(KeyedPoolableObjectFactory<K,T> factory) {
- this(factory, new GenericKeyedObjectPoolConfig<K, T>());
+ this(factory, new GenericKeyedObjectPoolConfig());
}
/**
@@ -233,7 +233,7 @@ public class GenericKeyedObjectPool<K,T>
* pool.
*/
public GenericKeyedObjectPool(KeyedPoolableObjectFactory<K,T> factory,
- GenericKeyedObjectPoolConfig<K,T> config) {
+ GenericKeyedObjectPoolConfig config) {
// Copy the settings from the config
this.factory = factory;
setConfig(config);
@@ -624,7 +624,7 @@ public class GenericKeyedObjectPool<K,T>
* @param conf the new configuration to use.
* @see GenericKeyedObjectPoolConfig
*/
- public void setConfig(GenericKeyedObjectPoolConfig<K,T> conf) {
+ public void setConfig(GenericKeyedObjectPoolConfig conf) {
setLifo(conf.getLifo());
setMaxIdlePerKey(conf.getMaxIdlePerKey());
setMaxTotalPerKey(conf.getMaxTotalPerKey());
Modified:
commons/proper/pool/trunk/src/java/org/apache/commons/pool2/impl/GenericKeyedObjectPoolConfig.java
URL:
http://svn.apache.org/viewvc/commons/proper/pool/trunk/src/java/org/apache/commons/pool2/impl/GenericKeyedObjectPoolConfig.java?rev=1214420&r1=1214419&r2=1214420&view=diff
==============================================================================
---
commons/proper/pool/trunk/src/java/org/apache/commons/pool2/impl/GenericKeyedObjectPoolConfig.java
(original)
+++
commons/proper/pool/trunk/src/java/org/apache/commons/pool2/impl/GenericKeyedObjectPoolConfig.java
Wed Dec 14 19:42:38 2011
@@ -26,7 +26,7 @@ package org.apache.commons.pool2.impl;
*
* @since Pool 2.0
*/
-public class GenericKeyedObjectPoolConfig<K,T> extends BaseObjectPoolConfig {
+public class GenericKeyedObjectPoolConfig extends BaseObjectPoolConfig {
public static final int DEFAULT_MAX_TOTAL_PER_KEY = 8;
@@ -91,11 +91,10 @@ public class GenericKeyedObjectPoolConfi
this.maxIdlePerKey = maxIdlePerKey;
}
- @SuppressWarnings("unchecked")
@Override
- public GenericKeyedObjectPoolConfig<K, T> clone() {
+ public GenericKeyedObjectPoolConfig clone() {
try {
- return (GenericKeyedObjectPoolConfig<K, T>) super.clone();
+ return (GenericKeyedObjectPoolConfig) super.clone();
} catch (CloneNotSupportedException e) {
throw new AssertionError(); // Can't happen
}
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=1214420&r1=1214419&r2=1214420&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
Wed Dec 14 19:42:38 2011
@@ -183,11 +183,11 @@ public class GenericObjectPool<T> extend
* Create a new <tt>GenericObjectPool</tt> with default properties.
*/
public GenericObjectPool(PoolableObjectFactory<T> factory) {
- this(factory, new GenericObjectPoolConfig<T>());
+ this(factory, new GenericObjectPoolConfig());
}
public GenericObjectPool(PoolableObjectFactory<T> factory,
- GenericObjectPoolConfig<T> config) {
+ GenericObjectPoolConfig config) {
this.factory = factory;
setConfig(config);
@@ -628,7 +628,7 @@ public class GenericObjectPool<T> extend
* configuration to use.
* @see GenericObjectPoolConfig
*/
- public void setConfig(GenericObjectPoolConfig<T> conf) {
+ public void setConfig(GenericObjectPoolConfig conf) {
setLifo(conf.getLifo());
setMaxIdle(conf.getMaxIdle());
setMinIdle(conf.getMinIdle());
Modified:
commons/proper/pool/trunk/src/java/org/apache/commons/pool2/impl/GenericObjectPoolConfig.java
URL:
http://svn.apache.org/viewvc/commons/proper/pool/trunk/src/java/org/apache/commons/pool2/impl/GenericObjectPoolConfig.java?rev=1214420&r1=1214419&r2=1214420&view=diff
==============================================================================
---
commons/proper/pool/trunk/src/java/org/apache/commons/pool2/impl/GenericObjectPoolConfig.java
(original)
+++
commons/proper/pool/trunk/src/java/org/apache/commons/pool2/impl/GenericObjectPoolConfig.java
Wed Dec 14 19:42:38 2011
@@ -26,7 +26,7 @@ package org.apache.commons.pool2.impl;
*
* @since Pool 2.0
*/
-public class GenericObjectPoolConfig<T> extends BaseObjectPoolConfig {
+public class GenericObjectPoolConfig extends BaseObjectPoolConfig {
/**
* The default value for {@link #getSoftMinEvictableIdleTimeMillis}.
@@ -97,11 +97,10 @@ public class GenericObjectPoolConfig<T>
this.minIdle = minIdle;
}
- @SuppressWarnings("unchecked")
@Override
- public GenericObjectPoolConfig<T> clone() {
+ public GenericObjectPoolConfig clone() {
try {
- return (GenericObjectPoolConfig<T>) super.clone();
+ return (GenericObjectPoolConfig) super.clone();
} catch (CloneNotSupportedException e) {
throw new AssertionError(); // Can't happen
}
Modified:
commons/proper/pool/trunk/src/test/org/apache/commons/pool2/impl/TestGenericKeyedObjectPool.java
URL:
http://svn.apache.org/viewvc/commons/proper/pool/trunk/src/test/org/apache/commons/pool2/impl/TestGenericKeyedObjectPool.java?rev=1214420&r1=1214419&r2=1214420&view=diff
==============================================================================
---
commons/proper/pool/trunk/src/test/org/apache/commons/pool2/impl/TestGenericKeyedObjectPool.java
(original)
+++
commons/proper/pool/trunk/src/test/org/apache/commons/pool2/impl/TestGenericKeyedObjectPool.java
Wed Dec 14 19:42:38 2011
@@ -1044,8 +1044,8 @@ public class TestGenericKeyedObjectPool
pool.getBlockWhenExhausted());
assertEquals(GenericKeyedObjectPoolConfig.DEFAULT_LIFO,
pool.getLifo());
- GenericKeyedObjectPoolConfig<Object,Object> config =
- new GenericKeyedObjectPoolConfig<Object,Object>();
+ GenericKeyedObjectPoolConfig config =
+ new GenericKeyedObjectPoolConfig();
config.setLifo(lifo);
config.setMaxTotalPerKey(maxTotalPerKey);
config.setMaxIdlePerKey(maxIdle);
Modified:
commons/proper/pool/trunk/src/test/org/apache/commons/pool2/impl/TestGenericObjectPool.java
URL:
http://svn.apache.org/viewvc/commons/proper/pool/trunk/src/test/org/apache/commons/pool2/impl/TestGenericObjectPool.java?rev=1214420&r1=1214419&r2=1214420&view=diff
==============================================================================
---
commons/proper/pool/trunk/src/test/org/apache/commons/pool2/impl/TestGenericObjectPool.java
(original)
+++
commons/proper/pool/trunk/src/test/org/apache/commons/pool2/impl/TestGenericObjectPool.java
Wed Dec 14 19:42:38 2011
@@ -703,13 +703,12 @@ public class TestGenericObjectPool exten
SimpleFactory factory = new SimpleFactory();
GenericObjectPool<Object> pool =
new GenericObjectPool<Object>(factory);
- assertConfiguration(new GenericObjectPoolConfig<Object>(),pool);
+ assertConfiguration(new GenericObjectPoolConfig(),pool);
}
@Test(timeout=60000)
public void testSetConfig() throws Exception {
- GenericObjectPoolConfig<Object> expected =
- new GenericObjectPoolConfig<Object>();
+ GenericObjectPoolConfig expected = new GenericObjectPoolConfig();
GenericObjectPool<Object> pool =
new GenericObjectPool<Object>(new SimpleFactory());
assertConfiguration(expected,pool);
@@ -1291,7 +1290,7 @@ public class TestGenericObjectPool exten
protected GenericObjectPool<Object> pool = null;
- private void assertConfiguration(GenericObjectPoolConfig<?> expected,
GenericObjectPool<?> actual) throws Exception {
+ private void assertConfiguration(GenericObjectPoolConfig expected,
GenericObjectPool<?> actual) throws Exception {
assertEquals("testOnBorrow",expected.getTestOnBorrow(),actual.getTestOnBorrow());
assertEquals("testOnReturn",expected.getTestOnReturn(),actual.getTestOnReturn());
assertEquals("testWhileIdle",expected.getTestWhileIdle(),actual.getTestWhileIdle());
