Use pattern matching on instanceof in yang-common

[yangtools.git] / common / yang-common / src / main / java / org / opendaylight / yangtools / yang / common / CanonicalValueViolation.java

diff --git a/common/yang-common/src/main/java/org/opendaylight/yangtools/yang/common/CanonicalValueViolation.java b/common/yang-common/src/main/java/org/opendaylight/yangtools/yang/common/CanonicalValueViolation.java
index 6a21058faa181f70d006a658676203701e6c1f08..b766114ed79953063491824717f61399f198f13a 100644 (file)
--- a/common/yang-common/src/main/java/org/opendaylight/yangtools/yang/common/CanonicalValueViolation.java
+++ b/common/yang-common/src/main/java/org/opendaylight/yangtools/yang/common/CanonicalValueViolation.java
@@ -67,7 +67,6 @@ public abstract class CanonicalValueViolation implements Immutable, Serializable
         }
 
         @Override
-        @SuppressFBWarnings("NP_NONNULL_RETURN_VIOLATION")
         @Nullable String appTag() {
             return null;
         }
@@ -140,14 +139,8 @@ public abstract class CanonicalValueViolation implements Immutable, Serializable
 
     @Override
     public final boolean equals(final @Nullable Object obj) {
-        if (this == obj) {
-            return true;
-        }
-        if (!(obj instanceof CanonicalValueViolation)) {
-            return false;
-        }
-        final CanonicalValueViolation other = (CanonicalValueViolation) obj;
-        return Objects.equals(appTag(), other.appTag()) && Objects.equals(message(), other.message());
+        return this == obj || obj instanceof CanonicalValueViolation other
+            && Objects.equals(appTag(), other.appTag()) && Objects.equals(message(), other.message());
     }
 
     @Override