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-jxpath.git
commit da8fb28f5a1b9f82310d785bab350e1d4437f402 Author: Gary D. Gregory <garydgreg...@gmail.com> AuthorDate: Sun Apr 13 14:48:03 2025 -0400 Reuse Objects.equals() --- .../commons/jxpath/ri/model/dynabeans/DynaBeanPointer.java | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/src/main/java/org/apache/commons/jxpath/ri/model/dynabeans/DynaBeanPointer.java b/src/main/java/org/apache/commons/jxpath/ri/model/dynabeans/DynaBeanPointer.java index d4afaac..a9b9a2e 100644 --- a/src/main/java/org/apache/commons/jxpath/ri/model/dynabeans/DynaBeanPointer.java +++ b/src/main/java/org/apache/commons/jxpath/ri/model/dynabeans/DynaBeanPointer.java @@ -18,6 +18,7 @@ package org.apache.commons.jxpath.ri.model.dynabeans; import java.util.Locale; +import java.util.Objects; import org.apache.commons.beanutils.DynaBean; import org.apache.commons.jxpath.ri.QName; @@ -32,17 +33,6 @@ public class DynaBeanPointer extends PropertyOwnerPointer { private static final long serialVersionUID = -9135052498044877965L; - /** - * Tests whether two objects are == || .equals(). - * - * @param o1 first object - * @param o2 second object - * @return boolean - */ - private static boolean equalObjects(final Object o1, final Object o2) { - return o1 == o2 || o1 != null && o1.equals(o2); - } - /** * Qualified name. */ @@ -93,7 +83,7 @@ public class DynaBeanPointer extends PropertyOwnerPointer { return false; } final DynaBeanPointer other = (DynaBeanPointer) object; - if (!(equalObjects(parent, other.parent) && equalObjects(qName, other.qName))) { + if (!(Objects.equals(parent, other.parent) && Objects.equals(qName, other.qName))) { return false; } final int iThis = index == WHOLE_COLLECTION ? 0 : index;