Use instanceof expression for yang-xpath-api equality

[yangtools.git] / xpath / yang-xpath-api / src / main / java / org / opendaylight / yangtools / yang / xpath / api / YangPathExpr.java

diff --git a/xpath/yang-xpath-api/src/main/java/org/opendaylight/yangtools/yang/xpath/api/YangPathExpr.java b/xpath/yang-xpath-api/src/main/java/org/opendaylight/yangtools/yang/xpath/api/YangPathExpr.java
index dd7886e5cce7b29346b0e540e07b5a85472b16a7..d305b90cf01bc14899192232f58fb953ca5c22f4 100644 (file)
--- a/xpath/yang-xpath-api/src/main/java/org/opendaylight/yangtools/yang/xpath/api/YangPathExpr.java
+++ b/xpath/yang-xpath-api/src/main/java/org/opendaylight/yangtools/yang/xpath/api/YangPathExpr.java
@@ -16,7 +16,7 @@ import org.eclipse.jdt.annotation.Nullable;
 import org.opendaylight.yangtools.yang.xpath.api.YangLocationPath.Relative;
 
 @Beta
-public class YangPathExpr implements YangExpr {
+public sealed class YangPathExpr implements YangExpr {
     private static final class WithLocation extends YangPathExpr {
         private static final long serialVersionUID = 1L;
 
@@ -37,7 +37,7 @@ public class YangPathExpr implements YangExpr {
 
     private final YangExpr filterExpr;
 
-    YangPathExpr(final YangExpr filterExpr) {
+    private YangPathExpr(final YangExpr filterExpr) {
         this.filterExpr = requireNonNull(filterExpr);
     }
 
@@ -64,14 +64,8 @@ public class YangPathExpr implements YangExpr {
 
     @Override
     public final boolean equals(final @Nullable Object obj) {
-        if (this == obj) {
-            return true;
-        }
-        if (!(obj instanceof YangPathExpr)) {
-            return false;
-        }
-        final YangPathExpr other = (YangPathExpr) obj;
-        return filterExpr.equals(((YangPathExpr) obj).filterExpr) && getLocationPath().equals(other.getLocationPath());
+        return this == obj || obj instanceof YangPathExpr other && filterExpr.equals(other.filterExpr)
+            && getLocationPath().equals(other.getLocationPath());
     }
 
     @Override