Improve equals and hashCode implementations using Objects

jhy · Dec 30, 2023 · fbf085b · fbf085b
1 parent 15558b4
commit fbf085b
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 42 deletions.
diff --git a/src/main/java/org/jsoup/nodes/Attribute.java b/src/main/java/org/jsoup/nodes/Attribute.java
@@ -10,6 +10,7 @@
 import java.io.IOException;
 import java.util.Arrays;
 import java.util.Map;
+import java.util.Objects;
 import java.util.regex.Pattern;
 
 /**
@@ -248,15 +249,12 @@ public boolean equals(@Nullable Object o) { // note parent not considered
         if (this == o) return true;
         if (o == null || getClass() != o.getClass()) return false;
         Attribute attribute = (Attribute) o;
-        if (key != null ? !key.equals(attribute.key) : attribute.key != null) return false;
-        return val != null ? val.equals(attribute.val) : attribute.val == null;
+        return Objects.equals(key, attribute.key) && Objects.equals(val, attribute.val);
     }
 
     @Override
     public int hashCode() { // note parent not considered
-        int result = key != null ? key.hashCode() : 0;
-        result = 31 * result + (val != null ? val.hashCode() : 0);
-        return result;
+        return Objects.hash(key, val);
     }
 
     @Override

diff --git a/src/main/java/org/jsoup/nodes/Attributes.java b/src/main/java/org/jsoup/nodes/Attributes.java
@@ -19,6 +19,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.NoSuchElementException;
+import java.util.Objects;
 import java.util.Set;
 
 import static org.jsoup.internal.Normalizer.lowerCase;
@@ -496,14 +497,7 @@ public boolean equals(@Nullable Object o) {
         for (int i = 0; i < size; i++) {
             String key = keys[i];
             int thatI = that.indexOfKey(key);
-            if (thatI == NotFound)
-                return false;
-            Object val = vals[i];
-            Object thatVal = that.vals[thatI];
-            if (val == null) {
-                if (thatVal != null)
-                    return false;
-            } else if (!val.equals(thatVal))
+            if (thatI == NotFound || !Objects.equals(vals[i], that.vals[thatI]))
                 return false;
         }
         return true;

diff --git a/src/main/java/org/jsoup/nodes/Range.java b/src/main/java/org/jsoup/nodes/Range.java
@@ -1,5 +1,7 @@
 package org.jsoup.nodes;
 
+import java.util.Objects;
+
 import static org.jsoup.internal.SharedConstants.*;
 
 /**
@@ -108,9 +110,7 @@ public boolean equals(Object o) {
 
     @Override
     public int hashCode() {
-        int result = start.hashCode();
-        result = 31 * result + end.hashCode();
-        return result;
+        return Objects.hash(start, end);
     }
 
     /**
@@ -198,10 +198,7 @@ public boolean equals(Object o) {
 
         @Override
         public int hashCode() {
-            int result = pos;
-            result = 31 * result + lineNumber;
-            result = 31 * result + columnNumber;
-            return result;
+            return Objects.hash(pos, lineNumber, columnNumber);
         }
     }
 
@@ -245,9 +242,7 @@ public Range valueRange() {
         }
 
         @Override public int hashCode() {
-            int result = nameRange.hashCode();
-            result = 31 * result + valueRange.hashCode();
-            return result;
+            return Objects.hash(nameRange, valueRange);
         }
     }
 }
diff --git a/src/main/java/org/jsoup/parser/Tag.java b/src/main/java/org/jsoup/parser/Tag.java
@@ -5,6 +5,7 @@
 
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Objects;
 import java.util.function.Consumer;
 
 /**
@@ -232,15 +233,8 @@ public boolean equals(Object o) {
 
     @Override
     public int hashCode() {
-        int result = tagName.hashCode();
-        result = 31 * result + (isBlock ? 1 : 0);
-        result = 31 * result + (formatAsBlock ? 1 : 0);
-        result = 31 * result + (empty ? 1 : 0);
-        result = 31 * result + (selfClosing ? 1 : 0);
-        result = 31 * result + (preserveWhitespace ? 1 : 0);
-        result = 31 * result + (formList ? 1 : 0);
-        result = 31 * result + (formSubmit ? 1 : 0);
-        return result;
+        return Objects.hash(tagName, isBlock, formatAsBlock, empty, selfClosing, preserveWhitespace,
+                formList, formSubmit);
     }
 
     @Override

diff --git a/src/main/java/org/jsoup/safety/Safelist.java b/src/main/java/org/jsoup/safety/Safelist.java
@@ -16,6 +16,7 @@ Thank you to Ryan Grove (wonko.com) for the Ruby HTML cleaner http://github.com/
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Set;
 
 import static org.jsoup.internal.Normalizer.lowerCase;
@@ -646,21 +647,15 @@ abstract static class TypedValue {
 
         @Override
         public int hashCode() {
-            final int prime = 31;
-            int result = 1;
-            result = prime * result + ((value == null) ? 0 : value.hashCode());
-            return result;
+            return Objects.hash(value);
         }
 
         @Override
         public boolean equals(Object obj) {
             if (this == obj) return true;
-            if (obj == null) return false;
-            if (getClass() != obj.getClass()) return false;
-            TypedValue other = (TypedValue) obj;
-            if (value == null) {
-                return other.value == null;
-            } else return value.equals(other.value);
+            if (obj == null || getClass() != obj.getClass()) return false;
+            TypedValue that = (TypedValue) obj;
+            return Objects.equals(value, that.value);
         }
 
         @Override