From 4a824dbe4101f8a1172d6696604f52d43a85588b Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Tue, 26 Apr 2022 12:10:41 +0200 Subject: [PATCH] Seal JavaTypeName JavaTypeName cannot be externally subclassed, make it a sealed class. Change-Id: I2f79f8cf3d4ff060ebb269a1d2fc0f57a3cda604 Signed-off-by: Robert Varga --- .../mdsal/binding/model/api/JavaTypeName.java | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/binding/mdsal-binding-model-api/src/main/java/org/opendaylight/mdsal/binding/model/api/JavaTypeName.java b/binding/mdsal-binding-model-api/src/main/java/org/opendaylight/mdsal/binding/model/api/JavaTypeName.java index 67aea7e623..018942638f 100644 --- a/binding/mdsal-binding-model-api/src/main/java/org/opendaylight/mdsal/binding/model/api/JavaTypeName.java +++ b/binding/mdsal-binding-model-api/src/main/java/org/opendaylight/mdsal/binding/model/api/JavaTypeName.java @@ -32,7 +32,7 @@ import org.slf4j.LoggerFactory; */ @Beta @NonNullByDefault -public abstract class JavaTypeName implements Identifier, Immutable { +public abstract sealed class JavaTypeName implements Identifier, Immutable { private static final class Primitive extends JavaTypeName { private static final long serialVersionUID = 1L; @@ -88,7 +88,7 @@ public abstract class JavaTypeName implements Identifier, Immutable { } } - private abstract static class Reference extends JavaTypeName { + private abstract static sealed class Reference extends JavaTypeName { private static final long serialVersionUID = 1L; Reference(final String simpleName) { @@ -370,15 +370,9 @@ public abstract class JavaTypeName implements Identifier, Immutable { @Override public final boolean equals(final @Nullable Object obj) { - if (obj == this) { - return true; - } - if (!(obj instanceof JavaTypeName)) { - return false; - } - final JavaTypeName other = (JavaTypeName) obj; - return simpleName.equals(other.simpleName) && packageName().equals(other.packageName()) - && immediatelyEnclosingClass().equals(other.immediatelyEnclosingClass()); + return this == obj || obj instanceof JavaTypeName other + && simpleName.equals(other.simpleName) && packageName().equals(other.packageName()) + && immediatelyEnclosingClass().equals(other.immediatelyEnclosingClass()); } /** -- 2.36.6