From f94e869efd16ca11f608c4d41888b3e5e1fd80d0 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Sat, 22 Aug 2020 19:20:42 +0200 Subject: [PATCH] Fix eclipse nullness warnings around Class Eclipse warns about @NonNull mismatch in typical callers, fix these warnings. Change-Id: I81973fa08bcd9408c99f38a6d7df0083c3445526 Signed-off-by: Robert Varga --- .../yangtools/yang/parser/stmt/reactor/ModifierImpl.java | 6 +++--- .../yang/parser/stmt/reactor/StatementContextBase.java | 8 ++++---- .../yang/parser/rfc7950/stmt/BaseStatementSupport.java | 3 ++- .../yang/parser/spi/meta/ModelActionBuilder.java | 4 ++-- .../yangtools/yang/parser/spi/meta/StmtContext.java | 9 +++++---- 5 files changed, 16 insertions(+), 14 deletions(-) diff --git a/yang/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/ModifierImpl.java b/yang/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/ModifierImpl.java index 664ad74a54..036f460440 100644 --- a/yang/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/ModifierImpl.java +++ b/yang/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/ModifierImpl.java @@ -169,15 +169,15 @@ final class ModifierImpl implements ModelActionBuilder { @Override public > Prerequisite> requiresCtx( - final StmtContext context, final Class namespace, final K key, + final StmtContext context, final Class<@NonNull N> namespace, final K key, final ModelProcessingPhase phase) { return requiresCtxImpl(context, namespace, key, phase); } @Override public > Prerequisite> requiresCtx( - final StmtContext context, final Class namespace, final NamespaceKeyCriterion criterion, - final ModelProcessingPhase phase) { + final StmtContext context, final Class<@NonNull N> namespace, + final NamespaceKeyCriterion criterion, final ModelProcessingPhase phase) { return requiresCtxImpl(context, namespace, criterion, phase); } diff --git a/yang/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/StatementContextBase.java b/yang/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/StatementContextBase.java index 3d1f8f97b3..79419b69b6 100644 --- a/yang/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/StatementContextBase.java +++ b/yang/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/StatementContextBase.java @@ -343,7 +343,7 @@ public abstract class StatementContextBase, E */ @Override public final > void addToNs( - final Class type, final T key, final U value) { + final Class<@NonNull N> type, final T key, final U value) { addToNamespace(type, key, value); } @@ -363,8 +363,8 @@ public abstract class StatementContextBase, E * @throws NamespaceNotAvailableException when the namespace is not available. */ @Override - public final > V getFromNamespace(final Class type, - final T key) { + public final > V getFromNamespace( + final Class<@NonNull N> type, final T key) { return getBehaviourRegistry().getNamespaceBehaviour(type).getFrom(this, key); } @@ -792,7 +792,7 @@ public abstract class StatementContextBase, E } @Override - public > void addContext(final Class namespace, + public > void addContext(final Class<@NonNull N> namespace, final KT key,final StmtContext stmt) { addContextToNamespace(namespace, key, stmt); } diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/BaseStatementSupport.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/BaseStatementSupport.java index b7e16a68ea..9490e66a35 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/BaseStatementSupport.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/BaseStatementSupport.java @@ -91,7 +91,8 @@ public abstract class BaseStatementSupport, } protected static final > A findFirstArgument( - final ImmutableList> statements, final Class type, final A defValue) { + final ImmutableList> statements, final Class<@NonNull E> type, + final A defValue) { final @Nullable E stmt = findFirstStatement(statements, type); return stmt != null ? stmt.argument() : defValue; } diff --git a/yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/ModelActionBuilder.java b/yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/ModelActionBuilder.java index 011b991a67..a956306ada 100644 --- a/yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/ModelActionBuilder.java +++ b/yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/ModelActionBuilder.java @@ -171,10 +171,10 @@ public interface ModelActionBuilder { requiresCtx(StmtContext context, ModelProcessingPhase phase); > @NonNull Prerequisite> requiresCtx( - StmtContext context, Class namespace, K key, ModelProcessingPhase phase); + StmtContext context, Class<@NonNull N> namespace, K key, ModelProcessingPhase phase); > @NonNull Prerequisite> requiresCtx( - StmtContext context, Class namespace, NamespaceKeyCriterion criterion, + StmtContext context, Class<@NonNull N> namespace, NamespaceKeyCriterion criterion, ModelProcessingPhase phase); /** diff --git a/yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/StmtContext.java b/yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/StmtContext.java index c264043d5a..2ca1a018e9 100644 --- a/yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/StmtContext.java +++ b/yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/StmtContext.java @@ -144,7 +144,8 @@ public interface StmtContext, E extends Effect * @return Value, or null if there is no element * @throws NamespaceNotAvailableException when the namespace is not available. */ - > @Nullable V getFromNamespace(Class type, T key); + > @Nullable V getFromNamespace(Class<@NonNull N> type, + T key); > Map getAllFromNamespace(Class type); @@ -266,8 +267,8 @@ public interface StmtContext, E extends Effect * @param value type * @throws NamespaceNotAvailableException when the namespace is not available. */ - > void addToNs(Class type, T key, - U value); + > void addToNs(Class<@NonNull N> type, + T key, U value); @Override Mutable getRoot(); @@ -342,7 +343,7 @@ public interface StmtContext, E extends Effect * @param stmt * to be added to namespace map */ - > void addContext(Class namespace, KT key, + > void addContext(Class<@NonNull N> namespace, KT key, StmtContext stmt); /** -- 2.36.6