Author: markt Date: Tue Dec 3 22:03:20 2013 New Revision: 1547605 URL: http://svn.apache.org/r1547605 Log: Some low hanging generics warnings fruit
Modified: commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TestPoolingDataSource.java Modified: commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TestPoolingDataSource.java URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TestPoolingDataSource.java?rev=1547605&r1=1547604&r2=1547605&view=diff ============================================================================== --- commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TestPoolingDataSource.java (original) +++ commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TestPoolingDataSource.java Tue Dec 3 22:03:20 2013 @@ -44,8 +44,8 @@ public class TestPoolingDataSource exten return ds.getConnection(); } - protected PoolingDataSource ds = null; - private GenericObjectPool pool = null; + protected PoolingDataSource<PoolableConnection> ds = null; + private GenericObjectPool<PoolableConnection> pool = null; @Override public void setUp() throws Exception { @@ -60,11 +60,11 @@ public class TestPoolingDataSource exten factory.setValidationQuery("SELECT DUMMY FROM DUAL"); factory.setDefaultReadOnly(true); factory.setDefaultAutoCommit(true); - pool = new GenericObjectPool(factory); + pool = new GenericObjectPool<>(factory); factory.setPool(pool); pool.setMaxTotal(getMaxTotal()); pool.setMaxWaitMillis(getMaxWaitMillis()); - ds = new PoolingDataSource(pool); + ds = new PoolingDataSource<>(pool); ds.setAccessToUnderlyingConnectionAllowed(true); }