[commons-dbcp] branch master updated: Use Objects.hash().

[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 b133be7  Use Objects.hash().
b133be7 is described below

commit b133be76375910f1795ff6dc2f0a72f826bbf029
Author: Gary Gregory <gardgreg...@gmail.com>
AuthorDate: Fri Nov 20 16:42:46 2020 -0500

    Use Objects.hash().
---
 src/main/java/org/apache/commons/dbcp2/PStmtKey.java      | 15 ++-------------
 .../org/apache/commons/dbcp2/datasources/PoolKey.java     |  6 +-----
 .../org/apache/commons/dbcp2/datasources/UserPassKey.java |  5 +----
 3 files changed, 4 insertions(+), 22 deletions(-)

diff --git a/src/main/java/org/apache/commons/dbcp2/PStmtKey.java 
b/src/main/java/org/apache/commons/dbcp2/PStmtKey.java
index f7769a4..9a39557 100644
--- a/src/main/java/org/apache/commons/dbcp2/PStmtKey.java
+++ b/src/main/java/org/apache/commons/dbcp2/PStmtKey.java
@@ -928,19 +928,8 @@ public class PStmtKey {
 
     @Override
     public int hashCode() {
-        final int prime = 31;
-        int result = 1;
-        result = prime * result + ((autoGeneratedKeys == null) ? 0 : 
autoGeneratedKeys.hashCode());
-        result = prime * result + ((catalog == null) ? 0 : catalog.hashCode());
-        result = prime * result + Arrays.hashCode(columnIndexes);
-        result = prime * result + Arrays.hashCode(columnNames);
-        result = prime * result + ((resultSetConcurrency == null) ? 0 : 
resultSetConcurrency.hashCode());
-        result = prime * result + ((resultSetHoldability == null) ? 0 : 
resultSetHoldability.hashCode());
-        result = prime * result + ((resultSetType == null) ? 0 : 
resultSetType.hashCode());
-        result = prime * result + ((schema == null) ? 0 : schema.hashCode());
-        result = prime * result + ((sql == null) ? 0 : sql.hashCode());
-        result = prime * result + ((statementType == null) ? 0 : 
statementType.hashCode());
-        return result;
+        return Objects.hash(autoGeneratedKeys, catalog, 
Arrays.hashCode(columnIndexes), Arrays.hashCode(columnNames),
+            resultSetConcurrency, resultSetHoldability, resultSetType, schema, 
sql, statementType);
     }
 
     @Override
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 2ace389..441e24c 100644
--- a/src/main/java/org/apache/commons/dbcp2/datasources/PoolKey.java
+++ b/src/main/java/org/apache/commons/dbcp2/datasources/PoolKey.java
@@ -57,11 +57,7 @@ class PoolKey implements Serializable {
 
     @Override
     public int hashCode() {
-        final int prime = 31;
-        int result = 1;
-        result = prime * result + ((dataSourceName == null) ? 0 : 
dataSourceName.hashCode());
-        result = prime * result + ((userName == null) ? 0 : 
userName.hashCode());
-        return result;
+        return Objects.hash(dataSourceName, userName);
     }
 
     @Override
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 9584db5..3de79d9 100644
--- a/src/main/java/org/apache/commons/dbcp2/datasources/UserPassKey.java
+++ b/src/main/java/org/apache/commons/dbcp2/datasources/UserPassKey.java
@@ -114,10 +114,7 @@ class UserPassKey implements Serializable {
      */
     @Override
     public int hashCode() {
-        final int prime = 31;
-        int result = 1;
-        result = prime * result + ((userName == null) ? 0 : 
userName.hashCode());
-        return result;
+        return Objects.hash(userName);
     }
 
 }