You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gg...@apache.org on 2018/07/13 00:26:25 UTC
[45/50] [abbrv] commons-dbcp git commit: Fix generics compiler
warnings.
Fix generics compiler warnings.
Project: http://git-wip-us.apache.org/repos/asf/commons-dbcp/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-dbcp/commit/d6819f7c
Tree: http://git-wip-us.apache.org/repos/asf/commons-dbcp/tree/d6819f7c
Diff: http://git-wip-us.apache.org/repos/asf/commons-dbcp/diff/d6819f7c
Branch: refs/heads/release
Commit: d6819f7cc25aa649682215eeab9d7040b5438560
Parents: 6fdbd4f
Author: Gary Gregory <ga...@gmail.com>
Authored: Sun Jul 8 15:45:33 2018 -0600
Committer: Gary Gregory <ga...@gmail.com>
Committed: Sun Jul 8 15:45:33 2018 -0600
----------------------------------------------------------------------
.../commons/dbcp2/TestDriverManagerConnectionFactory.java | 2 +-
src/test/java/org/apache/commons/dbcp2/TestPStmtPooling.java | 5 ++---
.../java/org/apache/commons/dbcp2/TestPoolingConnection.java | 4 ++--
.../java/org/apache/commons/dbcp2/TestPoolingDriver.java | 8 ++++----
4 files changed, 9 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/d6819f7c/src/test/java/org/apache/commons/dbcp2/TestDriverManagerConnectionFactory.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/dbcp2/TestDriverManagerConnectionFactory.java b/src/test/java/org/apache/commons/dbcp2/TestDriverManagerConnectionFactory.java
index f8abce1..959a47c 100644
--- a/src/test/java/org/apache/commons/dbcp2/TestDriverManagerConnectionFactory.java
+++ b/src/test/java/org/apache/commons/dbcp2/TestDriverManagerConnectionFactory.java
@@ -92,7 +92,7 @@ public class TestDriverManagerConnectionFactory {
}
public void testDriverManagerInit(final boolean withProperties) throws Exception {
- final GenericObjectPoolConfig config = new GenericObjectPoolConfig();
+ final GenericObjectPoolConfig<PoolableConnection> config = new GenericObjectPoolConfig<>();
config.setMaxTotal(10);
config.setMaxIdle(0);
final Properties properties = new Properties();
http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/d6819f7c/src/test/java/org/apache/commons/dbcp2/TestPStmtPooling.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/dbcp2/TestPStmtPooling.java b/src/test/java/org/apache/commons/dbcp2/TestPStmtPooling.java
index ab890c1..4c78d46 100644
--- a/src/test/java/org/apache/commons/dbcp2/TestPStmtPooling.java
+++ b/src/test/java/org/apache/commons/dbcp2/TestPStmtPooling.java
@@ -131,11 +131,10 @@ public class TestPStmtPooling {
pcf.setDefaultReadOnly(Boolean.FALSE);
pcf.setDefaultAutoCommit(Boolean.TRUE);
- final GenericObjectPoolConfig config = new GenericObjectPoolConfig();
+ final GenericObjectPoolConfig<PoolableConnection> config = new GenericObjectPoolConfig<>();
config.setJmxNameBase("UnitTests:DataSource=test,connectionpool=connections");
config.setJmxNamePrefix("");
- final ObjectPool<PoolableConnection> connPool =
- new GenericObjectPool<>(pcf, config);
+ final ObjectPool<PoolableConnection> connPool = new GenericObjectPool<>(pcf, config);
pcf.setPool(connPool);
final PoolingDataSource<?> ds = new PoolingDataSource<>(connPool);
http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/d6819f7c/src/test/java/org/apache/commons/dbcp2/TestPoolingConnection.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/dbcp2/TestPoolingConnection.java b/src/test/java/org/apache/commons/dbcp2/TestPoolingConnection.java
index 6a5d3ff..7104a5a 100644
--- a/src/test/java/org/apache/commons/dbcp2/TestPoolingConnection.java
+++ b/src/test/java/org/apache/commons/dbcp2/TestPoolingConnection.java
@@ -33,13 +33,13 @@ public class TestPoolingConnection {
@Before
public void setUp() throws Exception {
con = new PoolingConnection(new TesterConnection("test", "test"));
- final GenericKeyedObjectPoolConfig config = new GenericKeyedObjectPoolConfig();
+ final GenericKeyedObjectPoolConfig<DelegatingPreparedStatement> config = new GenericKeyedObjectPoolConfig<>();
config.setMaxTotalPerKey(-1);
config.setBlockWhenExhausted(false);
config.setMaxWaitMillis(0);
config.setMaxIdlePerKey(1);
config.setMaxTotal(1);
- final KeyedObjectPool<PStmtKey,DelegatingPreparedStatement> stmtPool =
+ final KeyedObjectPool<PStmtKey, DelegatingPreparedStatement> stmtPool =
new GenericKeyedObjectPool<>(con, config);
con.setStatementPool(stmtPool);
}
http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/d6819f7c/src/test/java/org/apache/commons/dbcp2/TestPoolingDriver.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/dbcp2/TestPoolingDriver.java b/src/test/java/org/apache/commons/dbcp2/TestPoolingDriver.java
index bf811a2..666f6af 100644
--- a/src/test/java/org/apache/commons/dbcp2/TestPoolingDriver.java
+++ b/src/test/java/org/apache/commons/dbcp2/TestPoolingDriver.java
@@ -64,7 +64,7 @@ public class TestPoolingDriver extends TestConnectionPool {
pcf.setDefaultReadOnly(Boolean.FALSE);
pcf.setDefaultAutoCommit(Boolean.TRUE);
- final GenericObjectPoolConfig poolConfig = new GenericObjectPoolConfig();
+ final GenericObjectPoolConfig<PoolableConnection> poolConfig = new GenericObjectPoolConfig<>();
poolConfig.setMaxTotal(getMaxTotal());
poolConfig.setMaxWaitMillis(getMaxWaitMillis());
poolConfig.setMinIdle(10);
@@ -140,7 +140,7 @@ public class TestPoolingDriver extends TestConnectionPool {
/** "http://issues.apache.org/bugzilla/show_bug.cgi?id=12400" */
@Test
public void testReportedBug12400() throws Exception {
- final GenericObjectPoolConfig config = new GenericObjectPoolConfig();
+ final GenericObjectPoolConfig<PoolableConnection> config = new GenericObjectPoolConfig<>();
config.setMaxTotal(70);
config.setMaxWaitMillis(60000);
config.setMaxIdle(10);
@@ -152,8 +152,8 @@ public class TestPoolingDriver extends TestConnectionPool {
new PoolableConnectionFactory(connectionFactory, null);
poolableConnectionFactory.setDefaultReadOnly(Boolean.FALSE);
poolableConnectionFactory.setDefaultAutoCommit(Boolean.TRUE);
- final ObjectPool<PoolableConnection> connectionPool =
- new GenericObjectPool<>(poolableConnectionFactory,config);
+ final ObjectPool<PoolableConnection> connectionPool = new GenericObjectPool<>(poolableConnectionFactory,
+ config);
poolableConnectionFactory.setPool(connectionPool);
assertNotNull(poolableConnectionFactory);
final PoolingDriver driver2 = new PoolingDriver();