Author: markt
Date: Tue Jun 19 09:15:25 2018
New Revision: 1833796
URL: http://svn.apache.org/viewvc?rev=1833796&view=rev
Log:
Fix generics warnings
Modified:
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/PoolableConnectionFactory.java
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/PoolingConnection.java
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/cpdsadapter/DriverAdapterCPDS.java
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/cpdsadapter/PooledConnectionImpl.java
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/datasources/SharedPoolDataSource.java
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/managed/PoolableManagedConnectionFactory.java
Modified: tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java?rev=1833796&r1=1833795&r2=1833796&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java Tue Jun
19 09:15:25 2018
@@ -2212,7 +2212,7 @@ public class BasicDataSource implements
*/
protected void createConnectionPool(final PoolableConnectionFactory
factory) {
// Create an object pool to contain our active connections
- final GenericObjectPoolConfig config = new GenericObjectPoolConfig();
+ final GenericObjectPoolConfig<PoolableConnection> config = new
GenericObjectPoolConfig<>();
updateJmxName(config);
// Disable JMX on the underlying pool if the DS is not registered:
config.setJmxEnabled(registeredJmxObjectName != null);
@@ -2247,7 +2247,7 @@ public class BasicDataSource implements
* @return a non-null instance
*/
protected GenericObjectPool<PoolableConnection> createObjectPool(final
PoolableConnectionFactory factory,
- final GenericObjectPoolConfig poolConfig, final AbandonedConfig
abandonedConfig) {
+ final GenericObjectPoolConfig<PoolableConnection> poolConfig,
final AbandonedConfig abandonedConfig) {
GenericObjectPool<PoolableConnection> gop;
if (abandonedConfig != null &&
(abandonedConfig.getRemoveAbandonedOnBorrow()
|| abandonedConfig.getRemoveAbandonedOnMaintenance())) {
@@ -2411,7 +2411,7 @@ public class BasicDataSource implements
// NO-OP
}
- private void updateJmxName(final GenericObjectPoolConfig config) {
+ private void updateJmxName(final GenericObjectPoolConfig<?> config) {
if (registeredJmxObjectName == null) {
return;
}
Modified:
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/PoolableConnectionFactory.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/PoolableConnectionFactory.java?rev=1833796&r1=1833795&r2=1833796&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/PoolableConnectionFactory.java
(original)
+++
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/PoolableConnectionFactory.java
Tue Jun 19 09:15:25 2018
@@ -297,7 +297,7 @@ public class PoolableConnectionFactory i
if (poolStatements) {
conn = new PoolingConnection(conn);
- final GenericKeyedObjectPoolConfig config = new
GenericKeyedObjectPoolConfig();
+ final GenericKeyedObjectPoolConfig<DelegatingPreparedStatement>
config = new GenericKeyedObjectPoolConfig<>();
config.setMaxTotalPerKey(-1);
config.setBlockWhenExhausted(false);
config.setMaxWaitMillis(0);
Modified: tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/PoolingConnection.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/PoolingConnection.java?rev=1833796&r1=1833795&r2=1833796&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/PoolingConnection.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/PoolingConnection.java Tue
Jun 19 09:15:25 2018
@@ -322,11 +322,11 @@ public class PoolingConnection extends D
final PreparedStatement statement = (PreparedStatement)
key.createStatement(getDelegate());
@SuppressWarnings({"rawtypes", "unchecked" }) // Unable to find
way to avoid this
final PoolablePreparedStatement pps = new
PoolablePreparedStatement(statement, key, pstmtPool, this);
- return new DefaultPooledObject<DelegatingPreparedStatement>(pps);
+ return new DefaultPooledObject<>(pps);
}
final CallableStatement statement = (CallableStatement)
key.createStatement(getDelegate());
final PoolableCallableStatement pcs = new
PoolableCallableStatement(statement, key, pstmtPool, this);
- return new DefaultPooledObject<DelegatingPreparedStatement>(pcs);
+ return new DefaultPooledObject<>(pcs);
}
/**
Modified:
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/cpdsadapter/DriverAdapterCPDS.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/cpdsadapter/DriverAdapterCPDS.java?rev=1833796&r1=1833795&r2=1833796&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/cpdsadapter/DriverAdapterCPDS.java
(original)
+++
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/cpdsadapter/DriverAdapterCPDS.java
Tue Jun 19 09:15:25 2018
@@ -182,7 +182,7 @@ public class DriverAdapterCPDS implement
}
KeyedObjectPool<PStmtKey, DelegatingPreparedStatement> stmtPool = null;
if (isPoolPreparedStatements()) {
- final GenericKeyedObjectPoolConfig config = new
GenericKeyedObjectPoolConfig();
+ final GenericKeyedObjectPoolConfig<DelegatingPreparedStatement>
config = new GenericKeyedObjectPoolConfig<>();
config.setMaxTotalPerKey(Integer.MAX_VALUE);
config.setBlockWhenExhausted(false);
config.setMaxWaitMillis(0);
Modified:
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/cpdsadapter/PooledConnectionImpl.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/cpdsadapter/PooledConnectionImpl.java?rev=1833796&r1=1833795&r2=1833796&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/cpdsadapter/PooledConnectionImpl.java
(original)
+++
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/cpdsadapter/PooledConnectionImpl.java
Tue Jun 19 09:15:25 2018
@@ -339,13 +339,13 @@ class PooledConnectionImpl
@SuppressWarnings({"rawtypes", "unchecked" }) // Unable to find
way to avoid this
final PoolablePreparedStatement pps = new
PoolablePreparedStatement(statement, key, pStmtPool,
delegatingConnection);
- return new DefaultPooledObject<DelegatingPreparedStatement>(pps);
+ return new DefaultPooledObject<>(pps);
}
final CallableStatement statement = (CallableStatement)
key.createStatement(connection);
@SuppressWarnings("unchecked")
final PoolableCallableStatement pcs = new
PoolableCallableStatement(statement, key, pStmtPool,
(DelegatingConnection<Connection>) delegatingConnection);
- return new DefaultPooledObject<DelegatingPreparedStatement>(pcs);
+ return new DefaultPooledObject<>(pcs);
}
/**
Modified:
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/datasources/SharedPoolDataSource.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/datasources/SharedPoolDataSource.java?rev=1833796&r1=1833795&r2=1833796&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/datasources/SharedPoolDataSource.java
(original)
+++
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/datasources/SharedPoolDataSource.java
Tue Jun 19 09:15:25 2018
@@ -173,7 +173,7 @@ public class SharedPoolDataSource extend
isRollbackAfterValidation());
factory.setMaxConnLifetimeMillis(getMaxConnLifetimeMillis());
- final GenericKeyedObjectPoolConfig config = new
GenericKeyedObjectPoolConfig();
+ final GenericKeyedObjectPoolConfig<PooledConnectionAndInfo> config =
new GenericKeyedObjectPoolConfig<>();
config.setBlockWhenExhausted(getDefaultBlockWhenExhausted());
config.setEvictionPolicyClassName(getDefaultEvictionPolicyClassName());
config.setLifo(getDefaultLifo());
Modified:
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/managed/PoolableManagedConnectionFactory.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/managed/PoolableManagedConnectionFactory.java?rev=1833796&r1=1833795&r2=1833796&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/managed/PoolableManagedConnectionFactory.java
(original)
+++
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/managed/PoolableManagedConnectionFactory.java
Tue Jun 19 09:15:25 2018
@@ -71,7 +71,7 @@ public class PoolableManagedConnectionFa
initializeConnection(conn);
if (getPoolStatements()) {
conn = new PoolingConnection(conn);
- final GenericKeyedObjectPoolConfig config = new
GenericKeyedObjectPoolConfig();
+ final GenericKeyedObjectPoolConfig<DelegatingPreparedStatement>
config = new GenericKeyedObjectPoolConfig<>();
config.setMaxTotalPerKey(-1);
config.setBlockWhenExhausted(false);
config.setMaxWaitMillis(0);
@@ -96,6 +96,6 @@ public class PoolableManagedConnectionFa
final PoolableManagedConnection pmc = new
PoolableManagedConnection(transactionRegistry, conn, getPool(),
getDisconnectionSqlCodes(), isFastFailValidation());
pmc.setCacheState(getCacheState());
- return new DefaultPooledObject<PoolableConnection>(pmc);
+ return new DefaultPooledObject<>(pmc);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
