[refactor] Java7: Use Object.equals for readability

Author: dizzzz

exist-core/src/main/java/org/exist/collections/triggers/TriggerStatePerThread.java

@@ -27,6 +27,7 @@
 import java.util.ArrayDeque;
 import java.util.Deque;
 import java.util.Iterator;
+import java.util.Objects;
 
 /**
  * Avoid infinite recursions in Triggers by preventing the same trigger
@@ -238,7 +239,7 @@ private boolean equals(final Object o, final boolean ignorePhase) {
 				return false;
 			}
 
-			return dst != null ? dst.equals(that.dst) : that.dst == null;
+			return Objects.equals(dst, that.dst);
 		}
 
 		private boolean equalsIgnoringPhase(final Trigger otherTrigger, final TriggerEvent otherTriggerEvent, final XmldbURI otherSrc, @Nullable final XmldbURI otherDst) {
@@ -254,7 +255,7 @@ private boolean equalsIgnoringPhase(final Trigger otherTrigger, final TriggerEve
 				return false;
 			}
 
-			return dst != null ? dst.equals(otherDst) : otherDst == null;
+			return Objects.equals(dst, otherDst);
 		}
 
 		public boolean isCompletedBy(final Trigger otherTrigger, final TriggerPhase otherTriggerPhase, final TriggerEvent otherTriggerEvent, final XmldbURI otherSrc, @Nullable final XmldbURI otherDst) {
@@ -275,7 +276,7 @@ public boolean isCompletedBy(final Trigger otherTrigger, final TriggerPhase othe
 				return false;
 			}
 
-			return dst != null ? dst.equals(otherDst) : otherDst == null;
+			return Objects.equals(dst, otherDst);
 		}
 
 		public boolean completes(final Object o) {
@@ -306,7 +307,7 @@ public boolean completes(final Object o) {
 				return false;
 			}
 
-			return dst != null ? dst.equals(that.dst) : that.dst == null;
+			return Objects.equals(dst, that.dst);
 		}
 	}
 }

exist-core/src/main/java/org/exist/collections/triggers/XQueryTrigger.java

@@ -22,13 +22,7 @@
 package org.exist.collections.triggers;
 
 import java.io.IOException;
-import java.util.ArrayList;
-import java.util.EnumSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.Properties;
-import java.util.Set;
+import java.util.*;
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
@@ -490,27 +484,27 @@ public boolean equals(final Object o) {
 
 		final XQueryTrigger that = (XQueryTrigger) o;
 
-		if (events != null ? !events.equals(that.events) : that.events != null) {
+		if (!Objects.equals(events, that.events)) {
 			return false;
 		}
 
-		if (collection != null ? !collection.equals(that.collection) : that.collection != null) {
+		if (!Objects.equals(collection, that.collection)) {
 			return false;
 		}
 
-		if (strQuery != null ? !strQuery.equals(that.strQuery) : that.strQuery != null) {
+		if (!Objects.equals(strQuery, that.strQuery)) {
 			return false;
 		}
 
-		if (urlQuery != null ? !urlQuery.equals(that.urlQuery) : that.urlQuery != null) {
+		if (!Objects.equals(urlQuery, that.urlQuery)) {
 			return false;
 		}
 
-		if (userDefinedVariables != null ? !userDefinedVariables.equals(that.userDefinedVariables) : that.userDefinedVariables != null) {
+		if (!Objects.equals(userDefinedVariables, that.userDefinedVariables)) {
 			return false;
 		}
 
-		return bindingPrefix != null ? bindingPrefix.equals(that.bindingPrefix) : that.bindingPrefix == null;
+		return Objects.equals(bindingPrefix, that.bindingPrefix);
 	}
 
 	//Collection's methods