[commons-dbcp] branch master updated: Fix generics compiler warnings.

[ggregory]

This is an automated email from the ASF dual-hosted git repository.

ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-dbcp.git


The following commit(s) were added to refs/heads/master by this push:
     new de3db98  Fix generics compiler warnings.
de3db98 is described below

commit de3db98bef345c326782dda63d1c912dd5f977da
Author: Gary Gregory <gardgreg...@gmail.com>
AuthorDate: Fri Jul 9 09:22:56 2021 -0400

    Fix generics compiler warnings.
---
 .../commons/dbcp2/managed/TestSynchronizationOrder.java | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git 
a/src/test/java/org/apache/commons/dbcp2/managed/TestSynchronizationOrder.java 
b/src/test/java/org/apache/commons/dbcp2/managed/TestSynchronizationOrder.java
index 3bdb208..1d348ec 100644
--- 
a/src/test/java/org/apache/commons/dbcp2/managed/TestSynchronizationOrder.java
+++ 
b/src/test/java/org/apache/commons/dbcp2/managed/TestSynchronizationOrder.java
@@ -45,6 +45,7 @@ import javax.transaction.xa.XAResource;
 
 import org.apache.commons.dbcp2.BasicDataSource;
 import org.apache.commons.dbcp2.DelegatingConnection;
+import org.apache.commons.dbcp2.PoolableConnection;
 import org.apache.commons.dbcp2.PoolableConnectionFactory;
 import org.apache.commons.dbcp2.TesterClassLoader;
 import org.apache.commons.pool2.impl.GenericObjectPool;
@@ -65,7 +66,7 @@ public class TestSynchronizationOrder {
     @Test
     public void testSessionSynchronization() throws Exception {
         final DataSourceXAConnectionFactory xaConnectionFactory = new 
DataSourceXAConnectionFactory(transactionManager,
-                xads);
+            xads);
 
         final PoolableConnectionFactory factory = new 
PoolableConnectionFactory(xaConnectionFactory, null);
         factory.setValidationQuery("SELECT DUMMY FROM DUAL");
@@ -73,14 +74,14 @@ public class TestSynchronizationOrder {
         factory.setDefaultAutoCommit(Boolean.TRUE);
 
         // create the pool
-        try (final GenericObjectPool pool = new GenericObjectPool<>(factory)) {
+        try (final GenericObjectPool<PoolableConnection> pool = new 
GenericObjectPool<>(factory)) {
             factory.setPool(pool);
             pool.setMaxTotal(10);
             pool.setMaxWaitMillis(1000);
 
             // finally create the datasource
-            try (final ManagedDataSource ds = new ManagedDataSource<>(pool,
-                    xaConnectionFactory.getTransactionRegistry())) {
+            try (final ManagedDataSource<PoolableConnection> ds = new 
ManagedDataSource<>(pool,
+                xaConnectionFactory.getTransactionRegistry())) {
                 ds.setAccessToUnderlyingConnectionAllowed(true);
 
                 transactionManager.begin();
@@ -97,7 +98,7 @@ public class TestSynchronizationOrder {
     @Test
     public void testInterposedSynchronization() throws Exception {
         final DataSourceXAConnectionFactory xaConnectionFactory = new 
DataSourceXAConnectionFactory(transactionManager,
-                xads, transactionSynchronizationRegistry);
+            xads, transactionSynchronizationRegistry);
 
         final PoolableConnectionFactory factory = new 
PoolableConnectionFactory(xaConnectionFactory, null);
         factory.setValidationQuery("SELECT DUMMY FROM DUAL");
@@ -105,14 +106,14 @@ public class TestSynchronizationOrder {
         factory.setDefaultAutoCommit(Boolean.TRUE);
 
         // create the pool
-        try (final GenericObjectPool pool = new GenericObjectPool<>(factory)) {
+        try (final GenericObjectPool<PoolableConnection> pool = new 
GenericObjectPool<>(factory)) {
             factory.setPool(pool);
             pool.setMaxTotal(10);
             pool.setMaxWaitMillis(1000);
 
             // finally create the datasource
-            try (final ManagedDataSource ds = new ManagedDataSource<>(pool,
-                    xaConnectionFactory.getTransactionRegistry())) {
+            try (final ManagedDataSource<PoolableConnection> ds = new 
ManagedDataSource<>(pool,
+                xaConnectionFactory.getTransactionRegistry())) {
                 ds.setAccessToUnderlyingConnectionAllowed(true);
 
                 transactionManager.begin();