From d69b253183a146d1f106d24fc2a5db8e26490771 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Wed, 18 May 2022 00:26:57 +0200 Subject: [PATCH] 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 --- .../yang/model/api/stmt/PatternExpression.java | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) 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 -- 2.36.6