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 2020/09/21 15:12:39 UTC

[commons-dbcp] branch master updated (b25983c -> 2f51ee4)

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

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


    from b25983c  Bump mockito-core from 3.5.10 to 3.5.11 (#64)
     new b4a0c6c  Remove trailing whitespace.
     new 02526fb  No need to create arrays explicitly.
     new 72ff233  Reuse Objects.equals().
     new d513b4a  Use lambdas.
     new ad44aea  Merge branch 'master' of https://gitbox.apache.org/repos/asf/commons-dbcp.git
     new 2f51ee4  mockito-core from 3.5.10 to 3.5.11 #64.

The 6 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 src/changes/changes.xml                            |  2 +-
 .../commons/dbcp2/BasicDataSourceMXBean.java       |  4 +-
 .../java/org/apache/commons/dbcp2/PStmtKey.java    | 43 ++++------------------
 .../commons/dbcp2/PoolableConnectionFactory.java   |  6 +--
 .../apache/commons/dbcp2/PoolingConnection.java    | 20 +++++-----
 .../apache/commons/dbcp2/datasources/PoolKey.java  | 13 ++-----
 .../commons/dbcp2/datasources/UserPassKey.java     |  7 +---
 .../apache/commons/dbcp2/TestBasicDataSource.java  |  6 +--
 .../commons/dbcp2/TestBasicDataSourceMXBean.java   |  2 +-
 .../commons/dbcp2/TestDelegatingConnection.java    |  2 +-
 .../apache/commons/dbcp2/TestListException.java    |  2 +-
 .../dbcp2/TestPStmtPoolingBasicDataSource.java     | 14 +++----
 .../dbcp2/TestParallelCreationWithNoIdle.java      |  2 +-
 .../datasources/TestSharedPoolDataSource.java      | 24 +++++-------
 .../dbcp2/managed/TestSynchronizationOrder.java    |  2 +-
 15 files changed, 53 insertions(+), 96 deletions(-)


[commons-dbcp] 02/06: No need to create arrays explicitly.

Posted by gg...@apache.org.
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

commit 02526fbd1a88899228d21705e5a50dafc270573e
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Mon Sep 21 11:03:23 2020 -0400

    No need to create arrays explicitly.
---
 src/test/java/org/apache/commons/dbcp2/TestBasicDataSource.java     | 6 +++---
 src/test/java/org/apache/commons/dbcp2/TestListException.java       | 2 +-
 .../org/apache/commons/dbcp2/TestParallelCreationWithNoIdle.java    | 2 +-
 .../org/apache/commons/dbcp2/managed/TestSynchronizationOrder.java  | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/test/java/org/apache/commons/dbcp2/TestBasicDataSource.java b/src/test/java/org/apache/commons/dbcp2/TestBasicDataSource.java
index 4be757d..9147992 100644
--- a/src/test/java/org/apache/commons/dbcp2/TestBasicDataSource.java
+++ b/src/test/java/org/apache/commons/dbcp2/TestBasicDataSource.java
@@ -84,7 +84,7 @@ public class TestBasicDataSource extends TestConnectionPool {
         ds.setUsername("userName");
         ds.setPassword("password");
         ds.setValidationQuery("SELECT DUMMY FROM DUAL");
-        ds.setConnectionInitSqls(Arrays.asList(new String[] { "SELECT 1", "SELECT 2"}));
+        ds.setConnectionInitSqls(Arrays.asList("SELECT 1", "SELECT 2"));
         ds.setDriverClassLoader(new TesterClassLoader());
         ds.setJmxName("org.apache.commons.dbcp2:name=test");
     }
@@ -327,7 +327,7 @@ public class TestBasicDataSource extends TestConnectionPool {
 
     @Test
     public void testEmptyInitConnectionSql() throws Exception {
-        ds.setConnectionInitSqls(Arrays.asList(new String[]{"", "   "}));
+        ds.setConnectionInitSqls(Arrays.asList("", "   "));
         assertNotNull(ds.getConnectionInitSqls());
         assertEquals(0, ds.getConnectionInitSqls().size());
 
@@ -339,7 +339,7 @@ public class TestBasicDataSource extends TestConnectionPool {
     @Test
     public void testInvalidConnectionInitSql() {
         try {
-            ds.setConnectionInitSqls(Arrays.asList(new String[]{"SELECT 1","invalid"}));
+            ds.setConnectionInitSqls(Arrays.asList("SELECT 1", "invalid"));
             try (Connection c = ds.getConnection()) {}
             fail("expected SQLException");
         }
diff --git a/src/test/java/org/apache/commons/dbcp2/TestListException.java b/src/test/java/org/apache/commons/dbcp2/TestListException.java
index 5f437c4..1b335eb 100644
--- a/src/test/java/org/apache/commons/dbcp2/TestListException.java
+++ b/src/test/java/org/apache/commons/dbcp2/TestListException.java
@@ -42,7 +42,7 @@ public class TestListException {
     public void testExceptionList() {
         @SuppressWarnings("unchecked")
         final
-        List<Throwable> exceptions = Arrays.asList(new Throwable[] {new NullPointerException(), new RuntimeException()});
+        List<Throwable> exceptions = Arrays.asList(new NullPointerException(), new RuntimeException());
         final ListException list = new ListException("Internal Error", exceptions);
         assertEquals("Internal Error", list.getMessage());
         assertArrayEquals(exceptions.toArray(), list.getExceptionList().toArray());
diff --git a/src/test/java/org/apache/commons/dbcp2/TestParallelCreationWithNoIdle.java b/src/test/java/org/apache/commons/dbcp2/TestParallelCreationWithNoIdle.java
index 1ae8d3d..1b2e4f9 100644
--- a/src/test/java/org/apache/commons/dbcp2/TestParallelCreationWithNoIdle.java
+++ b/src/test/java/org/apache/commons/dbcp2/TestParallelCreationWithNoIdle.java
@@ -69,7 +69,7 @@ public class TestParallelCreationWithNoIdle  {
         ds.setUsername("userName");
         ds.setPassword("password");
         ds.setValidationQuery("SELECT DUMMY FROM DUAL");
-        ds.setConnectionInitSqls(Arrays.asList(new String[] { "SELECT 1", "SELECT 2"}));
+        ds.setConnectionInitSqls(Arrays.asList("SELECT 1", "SELECT 2"));
         ds.setDriverClassLoader(new TesterClassLoader());
         ds.setJmxName("org.apache.commons.dbcp2:name=test");
     }
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 e8b9b87..ea89ca8 100644
--- a/src/test/java/org/apache/commons/dbcp2/managed/TestSynchronizationOrder.java
+++ b/src/test/java/org/apache/commons/dbcp2/managed/TestSynchronizationOrder.java
@@ -272,7 +272,7 @@ public class TestSynchronizationOrder {
         bds.setUsername("userName");
         bds.setPassword("password");
         bds.setValidationQuery("SELECT DUMMY FROM DUAL");
-        bds.setConnectionInitSqls(Arrays.asList(new String[]{"SELECT 1", "SELECT 2"}));
+        bds.setConnectionInitSqls(Arrays.asList("SELECT 1", "SELECT 2"));
         bds.setDriverClassLoader(new TesterClassLoader());
         bds.setJmxName("org.apache.commons.dbcp2:name=test");
         final AtomicInteger closeCounter = new AtomicInteger();


[commons-dbcp] 05/06: Merge branch 'master' of https://gitbox.apache.org/repos/asf/commons-dbcp.git

Posted by gg...@apache.org.
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

commit ad44aeaa7481bc5c13b6c30614e7dd0a1aa81a4b
Merge: d513b4a b25983c
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Mon Sep 21 11:11:52 2020 -0400

    Merge branch 'master' of https://gitbox.apache.org/repos/asf/commons-dbcp.git

 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


[commons-dbcp] 06/06: mockito-core from 3.5.10 to 3.5.11 #64.

Posted by gg...@apache.org.
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

commit 2f51ee419daa1e95318b95ea1305a0e8c487caeb
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Mon Sep 21 11:12:35 2020 -0400

    mockito-core from 3.5.10 to 3.5.11 #64.
---
 src/changes/changes.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 1145c4e..6dc765b 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -95,7 +95,7 @@ The <action> type attribute can be add,update,fix,remove.
         Update tests from H2 1.4.199 to 1.4.200.
       </action>
       <action dev="ggregory" type="update" due-to="Gary Gregory, Dependabot">
-        Update tests from Mockito 3.0.0 to 3.5.10 #47, #60.
+        Update tests from Mockito 3.0.0 to 3.5.11 #47, #60, #64.
       </action>
       <action dev="ggregory" type="update" due-to="Gary Gregory">
         Update tests from jboss-logging 3.4.0.Final to 3.4.1.Final.


[commons-dbcp] 01/06: Remove trailing whitespace.

Posted by gg...@apache.org.
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

commit b4a0c6cf985440545bd48c5739bd41ea052b0d7f
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Mon Sep 21 10:58:06 2020 -0400

    Remove trailing whitespace.
---
 .../apache/commons/dbcp2/BasicDataSourceMXBean.java  |  4 ++--
 .../commons/dbcp2/PoolableConnectionFactory.java     |  6 +++---
 .../org/apache/commons/dbcp2/PoolingConnection.java  | 20 ++++++++++----------
 .../commons/dbcp2/TestBasicDataSourceMXBean.java     |  2 +-
 .../commons/dbcp2/TestDelegatingConnection.java      |  2 +-
 .../dbcp2/TestPStmtPoolingBasicDataSource.java       | 14 +++++++-------
 6 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/src/main/java/org/apache/commons/dbcp2/BasicDataSourceMXBean.java b/src/main/java/org/apache/commons/dbcp2/BasicDataSourceMXBean.java
index 3d3033b..b103641 100644
--- a/src/main/java/org/apache/commons/dbcp2/BasicDataSourceMXBean.java
+++ b/src/main/java/org/apache/commons/dbcp2/BasicDataSourceMXBean.java
@@ -135,14 +135,14 @@ public interface BasicDataSourceMXBean {
 
     /**
      * See {@link BasicDataSource#isClearStatementPoolOnReturn()}
-     * 
+     *
      * @return {@link BasicDataSource#isClearStatementPoolOnReturn()}
      * @since 2.8.0
      */
     default boolean isClearStatementPoolOnReturn() {
         return false;
     }
-    
+
     /**
      * See {@link BasicDataSource#getMaxOpenPreparedStatements()}
      *
diff --git a/src/main/java/org/apache/commons/dbcp2/PoolableConnectionFactory.java b/src/main/java/org/apache/commons/dbcp2/PoolableConnectionFactory.java
index c744f49..15c30ad 100644
--- a/src/main/java/org/apache/commons/dbcp2/PoolableConnectionFactory.java
+++ b/src/main/java/org/apache/commons/dbcp2/PoolableConnectionFactory.java
@@ -601,16 +601,16 @@ public class PoolableConnectionFactory implements PooledObjectFactory<PoolableCo
     }
 
     /**
-     * Sets whether the pool of statements (which was enabled with {@link #setPoolStatements(boolean)}) should 
+     * Sets whether the pool of statements (which was enabled with {@link #setPoolStatements(boolean)}) should
      * be cleared when the connection is returned to its pool. Default is false.
-     * 
+     *
      * @param clearStatementPoolOnReturn clear or not
      * @since 2.8.0
      */
     public void setClearStatementPoolOnReturn(final boolean clearStatementPoolOnReturn) {
         this.clearStatementPoolOnReturn = clearStatementPoolOnReturn;
     }
-    
+
     public void setRollbackOnReturn(final boolean rollbackOnReturn) {
         this.rollbackOnReturn = rollbackOnReturn;
     }
diff --git a/src/main/java/org/apache/commons/dbcp2/PoolingConnection.java b/src/main/java/org/apache/commons/dbcp2/PoolingConnection.java
index ac1d489..4b856ff 100644
--- a/src/main/java/org/apache/commons/dbcp2/PoolingConnection.java
+++ b/src/main/java/org/apache/commons/dbcp2/PoolingConnection.java
@@ -66,7 +66,7 @@ public class PoolingConnection extends DelegatingConnection<Connection>
     private KeyedObjectPool<PStmtKey, DelegatingPreparedStatement> pstmtPool;
 
     private boolean clearStatementPoolOnReturn = false;
-    
+
     /**
      * Constructor.
      *
@@ -120,7 +120,7 @@ public class PoolingConnection extends DelegatingConnection<Connection>
 
     /**
      * Notification from {@link PoolableConnection} that we returned to the pool.
-     * 
+     *
      * @throws SQLException when <code>clearStatementPoolOnReturn</code> is true and the statement pool could not be
      *                      cleared
      * @since 2.8.0
@@ -319,7 +319,7 @@ public class PoolingConnection extends DelegatingConnection<Connection>
 
     /**
      * Returns the prepared statement pool we're using.
-     * 
+     *
      * @return statement pool
      * @since 2.8.0
      */
@@ -385,7 +385,7 @@ public class PoolingConnection extends DelegatingConnection<Connection>
     /**
      * Creates or obtains a {@link CallableStatement} from the pool.
      *
-     * @param key 
+     * @param key
      *            a {@link PStmtKey} for the given arguments
      * @return a {@link PoolableCallableStatement}
      * @throws SQLException
@@ -453,7 +453,7 @@ public class PoolingConnection extends DelegatingConnection<Connection>
     /**
      * Creates or obtains a {@link PreparedStatement} from the pool.
      *
-     * @param key 
+     * @param key
      *            a {@link PStmtKey} for the given arguments
      * @return a {@link PoolablePreparedStatement}
      * @throws SQLException
@@ -516,7 +516,7 @@ public class PoolingConnection extends DelegatingConnection<Connection>
      * @return a {@link PoolablePreparedStatement}
      * @throws SQLException
      *             Wraps an underlying exception.
-     *             
+     *
      */
     @Override
     public PreparedStatement prepareStatement(final String sql, final int columnIndexes[]) throws SQLException {
@@ -578,18 +578,18 @@ public class PoolingConnection extends DelegatingConnection<Connection>
     public PreparedStatement prepareStatement(final String sql, final String columnNames[]) throws SQLException {
         return prepareStatement(createKey(sql, columnNames));
     }
-    
+
     /**
-     * Sets whether the pool of statements should be cleared when the connection is returned to its pool. 
+     * Sets whether the pool of statements should be cleared when the connection is returned to its pool.
      * Default is false.
-     * 
+     *
      * @param clearStatementPoolOnReturn clear or not
      * @since 2.8.0
      */
     public void setClearStatementPoolOnReturn(final boolean clearStatementPoolOnReturn) {
         this.clearStatementPoolOnReturn = clearStatementPoolOnReturn;
     }
-    
+
     /**
      * Sets the prepared statement pool.
      *
diff --git a/src/test/java/org/apache/commons/dbcp2/TestBasicDataSourceMXBean.java b/src/test/java/org/apache/commons/dbcp2/TestBasicDataSourceMXBean.java
index f0f3a38..51f1185 100644
--- a/src/test/java/org/apache/commons/dbcp2/TestBasicDataSourceMXBean.java
+++ b/src/test/java/org/apache/commons/dbcp2/TestBasicDataSourceMXBean.java
@@ -45,7 +45,7 @@ public class TestBasicDataSourceMXBean {
         public boolean isClearStatementPoolOnReturn() {
             return false;
         }
-        
+
         @Override
         public boolean isClosed() {
             return false;
diff --git a/src/test/java/org/apache/commons/dbcp2/TestDelegatingConnection.java b/src/test/java/org/apache/commons/dbcp2/TestDelegatingConnection.java
index 02a836c..0e54e27 100644
--- a/src/test/java/org/apache/commons/dbcp2/TestDelegatingConnection.java
+++ b/src/test/java/org/apache/commons/dbcp2/TestDelegatingConnection.java
@@ -65,7 +65,7 @@ public class TestDelegatingConnection {
         public NoReadOnlyOrAutoCommitConnection() {
             super("","");
         }
-        
+
         @Override
         public void setReadOnly(boolean readOnly) {
             // Do nothing
diff --git a/src/test/java/org/apache/commons/dbcp2/TestPStmtPoolingBasicDataSource.java b/src/test/java/org/apache/commons/dbcp2/TestPStmtPoolingBasicDataSource.java
index e2d7e20..7d84056 100644
--- a/src/test/java/org/apache/commons/dbcp2/TestPStmtPoolingBasicDataSource.java
+++ b/src/test/java/org/apache/commons/dbcp2/TestPStmtPoolingBasicDataSource.java
@@ -237,7 +237,7 @@ public class TestPStmtPoolingBasicDataSource extends TestBasicDataSource {
     /**
      * Tests clearStatementPoolOnReturn introduced with DBCP-566.
      * When turned on, the statement pool must be empty after the connection is closed.
-     *  
+     *
      * @throws Exception
      * @since 2.8.0
      */
@@ -253,9 +253,9 @@ public class TestPStmtPoolingBasicDataSource extends TestBasicDataSource {
         assertEquals(0, ds.getNumIdle());
 
         @SuppressWarnings("unchecked")
-        final DelegatingConnection<Connection> poolableConn = 
+        final DelegatingConnection<Connection> poolableConn =
             (DelegatingConnection<Connection>) ((DelegatingConnection<Connection>) conn1).getDelegateInternal();
-        final KeyedObjectPool<PStmtKey, DelegatingPreparedStatement> stmtPool = 
+        final KeyedObjectPool<PStmtKey, DelegatingPreparedStatement> stmtPool =
             ((PoolingConnection) poolableConn.getDelegateInternal()).getStatementPool();
 
         final PreparedStatement stmt1 = conn1.prepareStatement("select 'a' from dual");
@@ -263,17 +263,17 @@ public class TestPStmtPoolingBasicDataSource extends TestBasicDataSource {
         final Statement inner1 = ((DelegatingPreparedStatement) stmt1).getInnermostDelegate();
         assertNotNull(inner1);
         stmt1.close();
-        
+
         final PreparedStatement stmt2 = conn1.prepareStatement("select 'a' from dual");
         assertNotNull(stmt2);
         final Statement inner2 = ((DelegatingPreparedStatement) stmt2).getInnermostDelegate();
         assertNotNull(inner2);
         assertSame(inner1, inner2); // from the same connection the statement must be pooled
         stmt2.close();
-        
+
         conn1.close();
         assertTrue(inner1.isClosed());
-        
+
         assertEquals(0, stmtPool.getNumActive());
         assertEquals(0, stmtPool.getNumIdle());
 
@@ -291,7 +291,7 @@ public class TestPStmtPoolingBasicDataSource extends TestBasicDataSource {
         assertNotNull(inner3);
 
         assertNotSame(inner1, inner3); // when acquiring the connection the next time, statement must be new
-        
+
         conn2.close();
     }
 


[commons-dbcp] 04/06: Use lambdas.

Posted by gg...@apache.org.
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

commit d513b4afaec8c0125934e1418ba188bf498ba9d2
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Mon Sep 21 11:11:28 2020 -0400

    Use lambdas.
---
 .../datasources/TestSharedPoolDataSource.java      | 24 ++++++++--------------
 1 file changed, 9 insertions(+), 15 deletions(-)

diff --git a/src/test/java/org/apache/commons/dbcp2/datasources/TestSharedPoolDataSource.java b/src/test/java/org/apache/commons/dbcp2/datasources/TestSharedPoolDataSource.java
index 65d0c55..ea791cf 100644
--- a/src/test/java/org/apache/commons/dbcp2/datasources/TestSharedPoolDataSource.java
+++ b/src/test/java/org/apache/commons/dbcp2/datasources/TestSharedPoolDataSource.java
@@ -726,24 +726,18 @@ public class TestSharedPoolDataSource extends TestConnectionPool {
             dataSources.add(dataSource);
         }
 
-        final Thread t1 = new Thread(new Runnable() {
-            @Override
-            public void run() {
-                for (final SharedPoolDataSource dataSource : dataSources) {
-                    dataSource.setDataSourceName("a");
-                }
+        final Thread t1 = new Thread(() -> {
+            for (final SharedPoolDataSource dataSource : dataSources) {
+                dataSource.setDataSourceName("a");
             }
         });
 
-        final Thread t2 = new Thread(new Runnable() {
-            @Override
-            public void run() {
-                for (final SharedPoolDataSource dataSource : dataSources) {
-                    try {
-                        dataSource.close();
-                    } catch (final Exception e) {
-                        // Ignore
-                    }
+        final Thread t2 = new Thread(() -> {
+            for (final SharedPoolDataSource dataSource : dataSources) {
+                try {
+                    dataSource.close();
+                } catch (final Exception e) {
+                    // Ignore
                 }
             }
         });


[commons-dbcp] 03/06: Reuse Objects.equals().

Posted by gg...@apache.org.
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

commit 72ff2333e07f9ece00c9088e496993367c1df13e
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Mon Sep 21 11:07:16 2020 -0400

    Reuse Objects.equals().
---
 .../java/org/apache/commons/dbcp2/PStmtKey.java    | 43 ++++------------------
 .../apache/commons/dbcp2/datasources/PoolKey.java  | 13 ++-----
 .../commons/dbcp2/datasources/UserPassKey.java     |  7 +---
 3 files changed, 13 insertions(+), 50 deletions(-)

diff --git a/src/main/java/org/apache/commons/dbcp2/PStmtKey.java b/src/main/java/org/apache/commons/dbcp2/PStmtKey.java
index 1bc4e23..f7769a4 100644
--- a/src/main/java/org/apache/commons/dbcp2/PStmtKey.java
+++ b/src/main/java/org/apache/commons/dbcp2/PStmtKey.java
@@ -20,6 +20,7 @@ import java.sql.Connection;
 import java.sql.SQLException;
 import java.sql.Statement;
 import java.util.Arrays;
+import java.util.Objects;
 
 import org.apache.commons.dbcp2.PoolingConnection.StatementType;
 
@@ -798,18 +799,10 @@ public class PStmtKey {
             return false;
         }
         final PStmtKey other = (PStmtKey) obj;
-        if (autoGeneratedKeys == null) {
-            if (other.autoGeneratedKeys != null) {
-                return false;
-            }
-        } else if (!autoGeneratedKeys.equals(other.autoGeneratedKeys)) {
+        if (!Objects.equals(autoGeneratedKeys, other.autoGeneratedKeys)) {
             return false;
         }
-        if (catalog == null) {
-            if (other.catalog != null) {
-                return false;
-            }
-        } else if (!catalog.equals(other.catalog)) {
+        if (!Objects.equals(catalog, other.catalog)) {
             return false;
         }
         if (!Arrays.equals(columnIndexes, other.columnIndexes)) {
@@ -818,39 +811,19 @@ public class PStmtKey {
         if (!Arrays.equals(columnNames, other.columnNames)) {
             return false;
         }
-        if (resultSetConcurrency == null) {
-            if (other.resultSetConcurrency != null) {
-                return false;
-            }
-        } else if (!resultSetConcurrency.equals(other.resultSetConcurrency)) {
+        if (!Objects.equals(resultSetConcurrency, other.resultSetConcurrency)) {
             return false;
         }
-        if (resultSetHoldability == null) {
-            if (other.resultSetHoldability != null) {
-                return false;
-            }
-        } else if (!resultSetHoldability.equals(other.resultSetHoldability)) {
+        if (!Objects.equals(resultSetHoldability, other.resultSetHoldability)) {
             return false;
         }
-        if (resultSetType == null) {
-            if (other.resultSetType != null) {
-                return false;
-            }
-        } else if (!resultSetType.equals(other.resultSetType)) {
+        if (!Objects.equals(resultSetType, other.resultSetType)) {
             return false;
         }
-        if (schema == null) {
-            if (other.schema != null) {
-                return false;
-            }
-        } else if (!schema.equals(other.schema)) {
+        if (!Objects.equals(schema, other.schema)) {
             return false;
         }
-        if (sql == null) {
-            if (other.sql != null) {
-                return false;
-            }
-        } else if (!sql.equals(other.sql)) {
+        if (!Objects.equals(sql, other.sql)) {
             return false;
         }
         if (statementType != other.statementType) {
diff --git a/src/main/java/org/apache/commons/dbcp2/datasources/PoolKey.java b/src/main/java/org/apache/commons/dbcp2/datasources/PoolKey.java
index dfbdc4f..0aa70ea 100644
--- a/src/main/java/org/apache/commons/dbcp2/datasources/PoolKey.java
+++ b/src/main/java/org/apache/commons/dbcp2/datasources/PoolKey.java
@@ -18,6 +18,7 @@
 package org.apache.commons.dbcp2.datasources;
 
 import java.io.Serializable;
+import java.util.Objects;
 
 /**
  * @since 2.0
@@ -45,18 +46,10 @@ class PoolKey implements Serializable {
             return false;
         }
         final PoolKey other = (PoolKey) obj;
-        if (dataSourceName == null) {
-            if (other.dataSourceName != null) {
-                return false;
-            }
-        } else if (!dataSourceName.equals(other.dataSourceName)) {
+        if (!Objects.equals(dataSourceName, other.dataSourceName)) {
             return false;
         }
-        if (userName == null) {
-            if (other.userName != null) {
-                return false;
-            }
-        } else if (!userName.equals(other.userName)) {
+        if (!Objects.equals(userName, other.userName)) {
             return false;
         }
         return true;
diff --git a/src/main/java/org/apache/commons/dbcp2/datasources/UserPassKey.java b/src/main/java/org/apache/commons/dbcp2/datasources/UserPassKey.java
index 094a6ba..789413c 100644
--- a/src/main/java/org/apache/commons/dbcp2/datasources/UserPassKey.java
+++ b/src/main/java/org/apache/commons/dbcp2/datasources/UserPassKey.java
@@ -18,6 +18,7 @@
 package org.apache.commons.dbcp2.datasources;
 
 import java.io.Serializable;
+import java.util.Objects;
 
 import org.apache.commons.dbcp2.Utils;
 
@@ -75,11 +76,7 @@ class UserPassKey implements Serializable {
             return false;
         }
         final UserPassKey other = (UserPassKey) obj;
-        if (userName == null) {
-            if (other.userName != null) {
-                return false;
-            }
-        } else if (!userName.equals(other.userName)) {
+        if (!Objects.equals(userName, other.userName)) {
             return false;
         }
         return true;