svn commit: r1557684 - /commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/cpdsadapter/PStmtKeyCPDS.java

[ma...@apache.org]

Author: markt
Date: Mon Jan 13 11:46:06 2014
New Revision: 1557684

URL: http://svn.apache.org/r1557684
Log:
Reduce FindBugs warnings (equals() but no hashCode())
(using Eclipse's generated code for equals() and hashCode() with just formatting changes)

Modified:
    commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/cpdsadapter/PStmtKeyCPDS.java

Modified: commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/cpdsadapter/PStmtKeyCPDS.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/cpdsadapter/PStmtKeyCPDS.java?rev=1557684&r1=1557683&r2=1557684&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/cpdsadapter/PStmtKeyCPDS.java (original)
+++ commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/cpdsadapter/PStmtKeyCPDS.java Mon Jan 13 11:46:06 2014
@@ -83,27 +83,55 @@ public class PStmtKeyCPDS extends PStmtK
         return _autoGeneratedKeys;
     }
 
+
     @Override
-    public boolean equals(Object that) {
-        try {
-            PStmtKeyCPDS key = (PStmtKeyCPDS) that;
-            return(((null == getSql() && null == key.getSql()) || getSql().equals(key.getSql())) &&
-                   ((null == getCatalog() && null == key.getCatalog()) || getCatalog().equals(key.getCatalog())) &&
-                   ((null == getResultSetType() && null == key.getResultSetType()) || getResultSetType().equals(key.getResultSetType())) &&
-                   ((null == getResultSetConcurrency() && null == key.getResultSetConcurrency()) || getResultSetConcurrency().equals(key.getResultSetConcurrency())) &&
-                   (getStmtType() == key.getStmtType()) &&
-                   ((null == _autoGeneratedKeys && null == key._autoGeneratedKeys) || _autoGeneratedKeys.equals(key._autoGeneratedKeys)) &&
-                   ((null == _resultSetHoldability && null == key._resultSetHoldability) || _resultSetHoldability.equals(key._resultSetHoldability)) &&
-                   ((null == _columnIndexes && null == key._columnIndexes) || Arrays.equals(_columnIndexes, key._columnIndexes)) &&
-                   ((null == _columnNames && null == key._columnNames) || Arrays.equals(_columnNames, key._columnNames))
-                  );
-        } catch (ClassCastException e) {
+    public boolean equals(Object obj) {
+        if (this == obj) {
+            return true;
+        }
+        if (!super.equals(obj)) {
+            return false;
+        }
+        if (getClass() != obj.getClass()) {
+            return false;
+        }
+        PStmtKeyCPDS other = (PStmtKeyCPDS) obj;
+        if (_autoGeneratedKeys == null) {
+            if (other._autoGeneratedKeys != null) {
+                return false;
+            }
+        } else if (!_autoGeneratedKeys.equals(other._autoGeneratedKeys)) {
+            return false;
+        }
+        if (!Arrays.equals(_columnIndexes, other._columnIndexes)) {
             return false;
-        } catch (NullPointerException e) {
+        }
+        if (!Arrays.equals(_columnNames, other._columnNames)) {
+            return false;
+        }
+        if (_resultSetHoldability == null) {
+            if (other._resultSetHoldability != null) {
+                return false;
+            }
+        } else if (!_resultSetHoldability.equals(other._resultSetHoldability)) {
             return false;
         }
+        return true;
+    }
+
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int result = super.hashCode();
+        result = prime * result + ((_autoGeneratedKeys == null) ? 0 : _autoGeneratedKeys.hashCode());
+        result = prime * result + Arrays.hashCode(_columnIndexes);
+        result = prime * result + Arrays.hashCode(_columnNames);
+        result = prime * result + ((_resultSetHoldability == null) ? 0 : _resultSetHoldability.hashCode());
+        return result;
     }
 
+
     @Override
     public String toString() {
         StringBuffer buf = new StringBuffer();