use Objects.equals()

Author: thurka

visualvm/caching.api/src/org/graalvm/visualvm/api/caching/Entry.java

@@ -24,6 +24,8 @@
  */
 package org.graalvm.visualvm.api.caching;
 
+import java.util.Objects;
+
 /**
  * Generic representation of a cache entry
  * Supports operations based on TTL (time-to-live)
@@ -88,7 +90,7 @@ public boolean equals(Object obj) {
         if (this.updateTs != other.updateTs) {
             return false;
         }
-        if (this.object != other.object && (this.object == null || !this.object.equals(other.object))) {
+        if (!Objects.equals(object, other.object)) {
             return false;
         }
         return true;

visualvm/caching.api/src/org/graalvm/visualvm/api/caching/impl/SoftReferenceEx.java

@@ -27,6 +27,7 @@
 
 import java.lang.ref.ReferenceQueue;
 import java.lang.ref.SoftReference;
+import java.util.Objects;
 
 /**
  * Extended {@linkplain SoftReference} to allow euqals() and hashCode()
@@ -51,8 +52,7 @@ class SoftReferenceEx<T> extends SoftReference<T> {
     public boolean equals(Object obj) {
         if (!(obj instanceof SoftReferenceEx)) return false;
         SoftReferenceEx other = (SoftReferenceEx)obj;
-        if (get() == null || other.get() == null) return false;
-        return get().equals(other.get());
+        return Objects.equals(get(), other.get());
     }
 
     @Override

visualvm/caching.api/src/org/graalvm/visualvm/api/caching/impl/WeakReferenceEx.java

@@ -27,6 +27,7 @@
 
 import java.lang.ref.ReferenceQueue;
 import java.lang.ref.WeakReference;
+import java.util.Objects;
 
 /**
  * Extended {@linkplain WeakReference} to allow euqals() and hashCode()
@@ -51,8 +52,7 @@ class WeakReferenceEx<T> extends WeakReference<T> {
     public boolean equals(Object obj) {
         if (!(obj instanceof WeakReferenceEx)) return false;
         WeakReferenceEx other = (WeakReferenceEx)obj;
-        if (get() == null || other.get() == null) return false;
-        return get().equals(other.get());
+        return Objects.equals(get(), other.get());
     }
 
     @Override

visualvm/core/src/org/graalvm/visualvm/core/datasupport/ComparableWeakReference.java

@@ -26,6 +26,7 @@
 
 import java.lang.ref.ReferenceQueue;
 import java.lang.ref.WeakReference;
+import java.util.Objects;
 
 /**
  * WeakReference delegating hashCode() and equals(Object) methods to the referenced object.
@@ -71,9 +72,6 @@ public boolean equals(Object o) {
         if (!(o instanceof ComparableWeakReference)) {
             return false;
         }
-        try {
-            return this.get().equals(((ComparableWeakReference) o).get());
-        } catch (Exception e) {}
-        return false;
+        return Objects.equals(get(), ((ComparableWeakReference) o).get());
     }
 }

visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/client/ClientUtils.java

@@ -25,6 +25,7 @@
 
 package org.graalvm.visualvm.lib.jfluid.client;
 
+import java.util.Objects;
 import java.util.regex.Pattern;
 import org.graalvm.visualvm.lib.jfluid.global.CommonConstants;
 import org.graalvm.visualvm.lib.jfluid.utils.formatting.DefaultMethodNameFormatter;
@@ -206,24 +207,11 @@ public boolean equals(Object obj) {
 //            }
             if (!getNormalizedClassName().equals(other.getNormalizedClassName())) return false;
 
-            if (this.methodName != null) {
-                if (!this.methodName.equals(other.methodName)) {
-                    return false;
-                }
-            } else {
-                if (other.methodName != null) {
-                    return false;
-                }
+            if (!Objects.equals(methodName, other.methodName)) {
+                return false;
             }
-
-            if (this.methodSignature != null) {
-                if (!this.methodSignature.equals(other.methodSignature)) {
-                    return false;
-                }
-            } else {
-                if (other.methodSignature != null) {
-                    return false;
-                }
+            if (!Objects.equals(methodSignature, other.methodSignature)) {
+                return false;
             }
 
             return true;

visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/results/cpu/StackTraceSnapshotBuilder.java

@@ -34,6 +34,7 @@
 import java.util.List;
 import java.util.ListIterator;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Set;
 import java.util.concurrent.atomic.AtomicReference;
 import org.graalvm.visualvm.lib.jfluid.filters.InstrumentationFilter;
@@ -157,10 +158,10 @@ public boolean equals(Object obj) {
                 return false;
             }
             final MethodInfo other = (MethodInfo) obj;
-            if ((className == null) ? (other.className != null) : !className.equals(other.className)) {
+            if (!Objects.equals(className, other.className)) {
                 return false;
             }
-            if ((methodName == null) ? (other.methodName != null) : !methodName.equals(other.methodName)) {
+            if (!Objects.equals(methodName, other.methodName)) {
                 return false;
             }
             return true;

visualvm/libs.profiler/profiler.api/src/org/graalvm/visualvm/lib/profiler/api/java/SourceClassInfo.java

@@ -25,6 +25,7 @@
 package org.graalvm.visualvm.lib.profiler.api.java;
 
 import java.util.Comparator;
+import java.util.Objects;
 import java.util.Set;
 import java.util.regex.Pattern;
 import org.openide.filesystems.FileObject;
@@ -63,7 +64,7 @@ public boolean equals(Object obj) {
             return false;
         }
         final SourceClassInfo other = (SourceClassInfo) obj;
-        if ((this.vmName == null) ? (other.vmName != null) : !this.vmName.equals(other.vmName)) {
+        if (!Objects.equals(vmName, other.vmName)) {
             return false;
         }
         return true;

visualvm/libs.profiler/profiler.api/src/org/graalvm/visualvm/lib/profiler/api/java/SourceMethodInfo.java

@@ -25,6 +25,7 @@
 package org.graalvm.visualvm.lib.profiler.api.java;
 
 import java.lang.reflect.Modifier;
+import java.util.Objects;
 
 /**
  * A simplified java method descriptor
@@ -56,13 +57,13 @@ public boolean equals(Object obj) {
             return false;
         }
         final SourceMethodInfo other = (SourceMethodInfo) obj;
-        if ((this.className == null) ? (other.className != null) : !this.className.equals(other.className)) {
+        if (!Objects.equals(className, other.className)) {
             return false;
         }
-        if ((this.name == null) ? (other.name != null) : !this.name.equals(other.name)) {
+        if (!Objects.equals(name, other.name)) {
             return false;
         }
-        if ((this.signature == null) ? (other.signature != null) : !this.signature.equals(other.signature)) {
+        if (!Objects.equals(signature, other.signature)) {
             return false;
         }
         return true;

visualvm/libs.profiler/profiler.oql/src/org/graalvm/visualvm/lib/profiler/oql/engine/api/ReferenceChain.java

@@ -25,6 +25,7 @@
 package org.graalvm.visualvm.lib.profiler.oql.engine.api;
 
 import java.lang.ref.WeakReference;
+import java.util.Objects;
 import org.graalvm.visualvm.lib.jfluid.heap.Heap;
 import org.graalvm.visualvm.lib.jfluid.heap.Instance;
 import org.graalvm.visualvm.lib.jfluid.heap.JavaClass;
@@ -115,10 +116,10 @@ public boolean equals(Object obj) {
             return false;
         }
         final ReferenceChain other = (ReferenceChain) obj;
-        if (this.obj != other.obj && (this.obj == null || !this.obj.equals(other.obj))) {
+        if (!Objects.equals(obj, other.obj)) {
             return false;
         }
-        if (this.next != other.next && (this.next == null || !this.next.equals(other.next))) {
+        if (!Objects.equals(next, other.next)) {
             return false;
         }
         return true;