Use instanceof expression for yang-xpath-api equality

JDK17 allows us to ditch some amount of verbosity in equals()
implementations.

Change-Id: I3c2fdf0d688aaad3a04feb2ee4aebc69bbb4a228
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/xpath/yang-xpath-api/src/main/java/org/opendaylight/yangtools/yang/xpath/api/BigDecimalNumberExpr.java b/xpath/yang-xpath-api/src/main/java/org/opendaylight/yangtools/yang/xpath/api/BigDecimalNumberExpr.java
index cc54a44a14828ce4ebb797c9c6acd8c39cb8b289..96cfde7f7f71cc22d5c2e6d66f13d16f23db8360 100644 (file)
--- a/xpath/yang-xpath-api/src/main/java/org/opendaylight/yangtools/yang/xpath/api/BigDecimalNumberExpr.java
+++ b/xpath/yang-xpath-api/src/main/java/org/opendaylight/yangtools/yang/xpath/api/BigDecimalNumberExpr.java
@@ -42,8 +42,7 @@ final class BigDecimalNumberExpr extends YangNumberExpr {
 
     @Override
     public boolean equals(final @Nullable Object obj) {
-        return this == obj || obj instanceof BigDecimalNumberExpr
-                && number.equals(((BigDecimalNumberExpr) obj).number);
+        return this == obj || obj instanceof BigDecimalNumberExpr other && number.equals(other.number);
     }
 
     @Override

diff --git a/xpath/yang-xpath-api/src/main/java/org/opendaylight/yangtools/yang/xpath/api/YangBinaryExpr.java b/xpath/yang-xpath-api/src/main/java/org/opendaylight/yangtools/yang/xpath/api/YangBinaryExpr.java
index deff33dd3837bd90d52bdb8ef8dcc7eb35a3fbc1..5b196f46827dbcd49278b381ed8c68cea19d9ecd 100644 (file)
--- a/xpath/yang-xpath-api/src/main/java/org/opendaylight/yangtools/yang/xpath/api/YangBinaryExpr.java
+++ b/xpath/yang-xpath-api/src/main/java/org/opendaylight/yangtools/yang/xpath/api/YangBinaryExpr.java
@@ -47,15 +47,8 @@ public abstract sealed class YangBinaryExpr implements YangExpr permits YangBina
 
     @Override
     public final boolean equals(final @Nullable Object obj) {
-        if (this == obj) {
-            return true;
-        }
-        if (!(obj instanceof YangBinaryExpr)) {
-            return false;
-        }
-        final YangBinaryExpr other = (YangBinaryExpr) obj;
-        return getOperator().equals(other.getOperator()) && leftExpr.equals(other.leftExpr)
-                && rightExpr.equals(other.rightExpr);
+        return this == obj || obj instanceof YangBinaryExpr other && getOperator().equals(other.getOperator())
+            && leftExpr.equals(other.leftExpr) && rightExpr.equals(other.rightExpr);
     }
 
     @Override

diff --git a/xpath/yang-xpath-api/src/main/java/org/opendaylight/yangtools/yang/xpath/api/YangFilterExpr.java b/xpath/yang-xpath-api/src/main/java/org/opendaylight/yangtools/yang/xpath/api/YangFilterExpr.java
index 8ceaea98993fd36266b50bbc3ee54159a82e982f..89ea8a248310c2ad5c2b5a42517eff7570d8d98a 100644 (file)
--- a/xpath/yang-xpath-api/src/main/java/org/opendaylight/yangtools/yang/xpath/api/YangFilterExpr.java
+++ b/xpath/yang-xpath-api/src/main/java/org/opendaylight/yangtools/yang/xpath/api/YangFilterExpr.java
@@ -66,14 +66,8 @@ public sealed class YangFilterExpr implements YangExpr, YangPredicateAware {
 
     @Override
     public final boolean equals(final @Nullable Object obj) {
-        if (this == obj) {
-            return true;
-        }
-        if (!(obj instanceof YangFilterExpr)) {
-            return false;
-        }
-        final YangFilterExpr other = (YangFilterExpr) obj;
-        return expr.equals(((YangFilterExpr) obj).expr) && getPredicates().equals(other.getPredicates());
+        return this == obj || obj instanceof YangFilterExpr other
+            && expr.equals(other.expr) && getPredicates().equals(other.getPredicates());
     }
 
     @Override

diff --git a/xpath/yang-xpath-api/src/main/java/org/opendaylight/yangtools/yang/xpath/api/YangFunctionCallExpr.java b/xpath/yang-xpath-api/src/main/java/org/opendaylight/yangtools/yang/xpath/api/YangFunctionCallExpr.java
index d3ec795e6d18941133bba68e9640528bcd601c1c..a7080eb936fb35e61b83ae920ffb5d3d7fe6f894 100644 (file)
--- a/xpath/yang-xpath-api/src/main/java/org/opendaylight/yangtools/yang/xpath/api/YangFunctionCallExpr.java
+++ b/xpath/yang-xpath-api/src/main/java/org/opendaylight/yangtools/yang/xpath/api/YangFunctionCallExpr.java
@@ -77,14 +77,8 @@ public sealed class YangFunctionCallExpr implements YangExpr {
 
     @Override
     public final boolean equals(final @Nullable Object obj) {
-        if (this == obj) {
-            return true;
-        }
-        if (!(obj instanceof YangFunctionCallExpr)) {
-            return false;
-        }
-        final YangFunctionCallExpr other = (YangFunctionCallExpr) obj;
-        return getName().equals(other.getName()) && getArguments().equals(other.getArguments());
+        return this == obj || obj instanceof YangFunctionCallExpr other && getName().equals(other.getName())
+            && getArguments().equals(other.getArguments());
     }
 
     @Override

diff --git a/xpath/yang-xpath-api/src/main/java/org/opendaylight/yangtools/yang/xpath/api/YangLiteralExpr.java b/xpath/yang-xpath-api/src/main/java/org/opendaylight/yangtools/yang/xpath/api/YangLiteralExpr.java
index 8aaf104db2f7c3deeb620b2cae1be8d9e24926a1..4848bc81558fea15cdd5a3c99228c7255772a1e1 100644 (file)
--- a/xpath/yang-xpath-api/src/main/java/org/opendaylight/yangtools/yang/xpath/api/YangLiteralExpr.java
+++ b/xpath/yang-xpath-api/src/main/java/org/opendaylight/yangtools/yang/xpath/api/YangLiteralExpr.java
@@ -57,7 +57,7 @@ public final class YangLiteralExpr implements YangExpr {
 
     @Override
     public boolean equals(final @Nullable Object obj) {
-        return this == obj || obj instanceof YangLiteralExpr && literal.equals(((YangLiteralExpr) obj).literal);
+        return this == obj || obj instanceof YangLiteralExpr other && literal.equals(other.literal);
     }
 
     @Override

diff --git a/xpath/yang-xpath-api/src/main/java/org/opendaylight/yangtools/yang/xpath/api/YangLocationPath.java b/xpath/yang-xpath-api/src/main/java/org/opendaylight/yangtools/yang/xpath/api/YangLocationPath.java
index e987baa9f373e7ba01134461dbfcc5374ca9dcbf..5e2cd065ddcd1e90fb3980dcdd53b0b945529a98 100644 (file)
--- a/xpath/yang-xpath-api/src/main/java/org/opendaylight/yangtools/yang/xpath/api/YangLocationPath.java
+++ b/xpath/yang-xpath-api/src/main/java/org/opendaylight/yangtools/yang/xpath/api/YangLocationPath.java
@@ -77,14 +77,8 @@ public abstract sealed class YangLocationPath implements YangExpr {
 
         @Override
         public final boolean equals(@Nullable final Object obj) {
-            if (this == obj) {
-                return true;
-            }
-            if (!(obj instanceof AxisStep)) {
-                return false;
-            }
-            final AxisStep other = (AxisStep) obj;
-            return getAxis().equals(other.getAxis()) && getPredicates().equals(other.getPredicates());
+            return this == obj || obj instanceof AxisStep other && getAxis().equals(other.getAxis())
+                && getPredicates().equals(other.getPredicates());
         }
 
         @SuppressFBWarnings(value = "SE_PRIVATE_READ_RESOLVE_NOT_INHERITED",
@@ -132,15 +126,8 @@ public abstract sealed class YangLocationPath implements YangExpr {
 
         @Override
         public boolean equals(@Nullable final Object obj) {
-            if (this == obj) {
-                return true;
-            }
-            if (!(obj instanceof NamespaceStep)) {
-                return false;
-            }
-            final NamespaceStep other = (NamespaceStep) obj;
-            return getAxis().equals(other.getAxis()) && namespace.equals(other.namespace)
-                    && getPredicates().equals(other.getPredicates());
+            return this == obj || obj instanceof NamespaceStep other && getAxis().equals(other.getAxis())
+                && namespace.equals(other.namespace) && getPredicates().equals(other.getPredicates());
         }
 
         @Override
@@ -467,14 +454,8 @@ public abstract sealed class YangLocationPath implements YangExpr {
 
     @Override
     public final boolean equals(final @Nullable Object obj) {
-        if (this == obj) {
-            return true;
-        }
-        if (!(obj instanceof YangLocationPath)) {
-            return false;
-        }
-        final YangLocationPath other = (YangLocationPath) obj;
-        return isAbsolute() == other.isAbsolute() && steps.equals(other.steps);
+        return this == obj || obj instanceof YangLocationPath other && isAbsolute() == other.isAbsolute()
+            && steps.equals(other.steps);
     }
 
     @Override

diff --git a/xpath/yang-xpath-api/src/main/java/org/opendaylight/yangtools/yang/xpath/api/YangNaryExpr.java b/xpath/yang-xpath-api/src/main/java/org/opendaylight/yangtools/yang/xpath/api/YangNaryExpr.java
index 982b3380957445e8f0469754840e7df0a2f969c8..e228f80dc3528a1949eaa407573bc18926cd584c 100644 (file)
--- a/xpath/yang-xpath-api/src/main/java/org/opendaylight/yangtools/yang/xpath/api/YangNaryExpr.java
+++ b/xpath/yang-xpath-api/src/main/java/org/opendaylight/yangtools/yang/xpath/api/YangNaryExpr.java
@@ -46,14 +46,8 @@ public final class YangNaryExpr implements YangExpr {
 
     @Override
     public boolean equals(final @Nullable Object obj) {
-        if (this == obj) {
-            return true;
-        }
-        if (!(obj instanceof YangNaryExpr)) {
-            return false;
-        }
-        final YangNaryExpr other = (YangNaryExpr) obj;
-        return getOperator().equals(other.getOperator()) && expressions.equals(other.expressions);
+        return this == obj || obj instanceof YangNaryExpr other && getOperator().equals(other.getOperator())
+            && expressions.equals(other.expressions);
     }
 
     @Override

diff --git a/xpath/yang-xpath-api/src/main/java/org/opendaylight/yangtools/yang/xpath/api/YangNegateExpr.java b/xpath/yang-xpath-api/src/main/java/org/opendaylight/yangtools/yang/xpath/api/YangNegateExpr.java
index 41fd77f9a18b8fe0d08bed8d43b0b273d824b6cd..ee9b7d0c744a54e5e9a243a9200f89032e23e0f7 100644 (file)
--- a/xpath/yang-xpath-api/src/main/java/org/opendaylight/yangtools/yang/xpath/api/YangNegateExpr.java
+++ b/xpath/yang-xpath-api/src/main/java/org/opendaylight/yangtools/yang/xpath/api/YangNegateExpr.java
@@ -37,7 +37,7 @@ public final class YangNegateExpr implements YangExpr {
 
     @Override
     public boolean equals(final @Nullable Object obj) {
-        return this == obj || obj instanceof YangNegateExpr && subExpr.equals(((YangNegateExpr) obj).subExpr);
+        return this == obj || obj instanceof YangNegateExpr other && subExpr.equals(other.subExpr);
     }
 
     @Override

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 c841a20bd2f1e57c8e190eb9a6f40fc68809f976..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
@@ -64,14 +64,8 @@ public sealed 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

diff --git a/xpath/yang-xpath-api/src/main/java/org/opendaylight/yangtools/yang/xpath/api/YangQNameExpr.java b/xpath/yang-xpath-api/src/main/java/org/opendaylight/yangtools/yang/xpath/api/YangQNameExpr.java
index e228975e498da393734392b9acf1ab35be56711e..c9dd4d65b899117a452a9aa11fa9817127d101f4 100644 (file)
--- a/xpath/yang-xpath-api/src/main/java/org/opendaylight/yangtools/yang/xpath/api/YangQNameExpr.java
+++ b/xpath/yang-xpath-api/src/main/java/org/opendaylight/yangtools/yang/xpath/api/YangQNameExpr.java
@@ -48,7 +48,7 @@ public abstract sealed class YangQNameExpr implements YangExpr, QNameReferent {
 
         @Override
         public boolean equals(final @Nullable Object obj) {
-            return this == obj || obj instanceof Resolved && qname.equals(((Resolved) obj).qname);
+            return this == obj || obj instanceof Resolved other && qname.equals(other.qname);
         }
 
         @Override
@@ -78,7 +78,7 @@ public abstract sealed class YangQNameExpr implements YangExpr, QNameReferent {
 
         @Override
         public boolean equals(final @Nullable Object obj) {
-            return this == obj || obj instanceof Unresolved && qname.equals(((Unresolved) obj).qname);
+            return this == obj || obj instanceof Unresolved other && qname.equals(other.qname);
         }
 
         @Override

diff --git a/xpath/yang-xpath-api/src/main/java/org/opendaylight/yangtools/yang/xpath/api/YangVariableReferenceExpr.java b/xpath/yang-xpath-api/src/main/java/org/opendaylight/yangtools/yang/xpath/api/YangVariableReferenceExpr.java
index ec7c1124b248ac0409e497de4754440e0332546c..46526487cff5234a0a6b3f9f94927826a1a42bbe 100644 (file)
--- a/xpath/yang-xpath-api/src/main/java/org/opendaylight/yangtools/yang/xpath/api/YangVariableReferenceExpr.java
+++ b/xpath/yang-xpath-api/src/main/java/org/opendaylight/yangtools/yang/xpath/api/YangVariableReferenceExpr.java
@@ -38,8 +38,7 @@ public final class YangVariableReferenceExpr implements YangExpr {
 
     @Override
     public boolean equals(final @Nullable Object obj) {
-        return this == obj || obj instanceof YangVariableReferenceExpr
-                && variableName.equals(((YangVariableReferenceExpr) obj).variableName);
+        return this == obj || obj instanceof YangVariableReferenceExpr other && variableName.equals(other.variableName);
     }
 
     @Override