From: Robert Varga Date: Tue, 17 May 2022 22:26:57 +0000 (+0200) Subject: Simplify PatternExpression.equals() X-Git-Tag: v9.0.0~55 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F97%2F101197%2F1;p=yangtools.git Simplify PatternExpression.equals() Java 17 allows us to make the method much simpler, use instanceof pattern match. Change-Id: I0d447a5d4db7ce265277896fd24901f875fac0ac Signed-off-by: Robert Varga --- diff --git a/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/PatternExpression.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/PatternExpression.java index 0e25e07962..f733f36b22 100644 --- a/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/PatternExpression.java +++ b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/PatternExpression.java @@ -77,14 +77,8 @@ public final class PatternExpression implements Immutable { @Override public boolean equals(final @Nullable Object obj) { - if (this == obj) { - return true; - } - if (!(obj instanceof PatternExpression)) { - return false; - } - final PatternExpression other = (PatternExpression) obj; - return regex.equals(other.regex) && pattern.equals(other.pattern); + return this == obj || obj instanceof PatternExpression other + && regex.equals(other.regex) && pattern.equals(other.pattern); } @Override