From 932b5cf8b25c1a95d563d588726f1fc263fe8387 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Wed, 13 Jan 2021 23:00:57 +0100 Subject: [PATCH] Split StmtContextUtils.hasParentOfType() implementations EffectiveStmtCtx.Current version on this method is deferring to the StmtContext version. That is not needed, as EffectiveStmtCtx gives us everything we need. JIRA: YANGTOOLS-1186 Change-Id: I8eedc34c6513b8aa6825ba8b63171111379f03ce Signed-off-by: Robert Varga --- .../yang/parser/spi/meta/StmtContextUtils.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/StmtContextUtils.java b/yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/StmtContextUtils.java index 8aaad4478c..90d7311c3a 100644 --- a/yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/StmtContextUtils.java +++ b/yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/StmtContextUtils.java @@ -388,11 +388,13 @@ public final class StmtContextUtils { * * @param stmt EffectiveStmtCtx to be checked * @param parentType type of parent to check - * @return true if the parent of StmtContext is of specified type, otherwise false + * @return true if the parent statement of {@code stmt} is of specified type, otherwise false + * @throws NullPointerException if any argument is {@code null} */ - public static boolean hasParentOfType(final EffectiveStmtCtx.Current stmt, - final StatementDefinition parentType) { - return hasParentOfType(stmt.caerbannog(), parentType); + public static boolean hasParentOfType(final EffectiveStmtCtx stmt, final StatementDefinition parentType) { + requireNonNull(parentType); + final Parent parent = stmt.effectiveParent(); + return parent != null && parentType.equals(parent.publicDefinition()); } /** -- 2.36.6