From 71f278c99bafb65b43d3cc563a205994a6f8dca9 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Mon, 19 Apr 2021 18:13:46 +0200 Subject: [PATCH] Remove StmtContextUtils.isUnrecognizedStatement() This utility method is only used in reactor itself, rehost it to its single caller. Change-Id: I6b40e0fcd936cc230b1a9586d4f20c2ac47205ad Signed-off-by: Robert Varga --- .../stmt/reactor/SourceSpecificContext.java | 4 ++-- .../yang/parser/spi/meta/StmtContextUtils.java | 16 ---------------- 2 files changed, 2 insertions(+), 18 deletions(-) diff --git a/yang/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/SourceSpecificContext.java b/yang/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/SourceSpecificContext.java index cdb2d2ce41..c32bab41ab 100644 --- a/yang/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/SourceSpecificContext.java +++ b/yang/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/SourceSpecificContext.java @@ -29,6 +29,7 @@ import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.common.QNameModule; import org.opendaylight.yangtools.yang.common.XMLNamespace; import org.opendaylight.yangtools.yang.common.YangVersion; +import org.opendaylight.yangtools.yang.model.api.stmt.UnrecognizedStatement; import org.opendaylight.yangtools.yang.model.repo.api.SourceIdentifier; import org.opendaylight.yangtools.yang.parser.spi.meta.InferenceException; import org.opendaylight.yangtools.yang.parser.spi.meta.ModelActionBuilder; @@ -41,7 +42,6 @@ import org.opendaylight.yangtools.yang.parser.spi.meta.StatementDefinitionNamesp import org.opendaylight.yangtools.yang.parser.spi.meta.StatementSupport; import org.opendaylight.yangtools.yang.parser.spi.meta.StatementSupportBundle; import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext; -import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContextUtils; import org.opendaylight.yangtools.yang.parser.spi.source.BelongsToModuleContext; import org.opendaylight.yangtools.yang.parser.spi.source.BelongsToPrefixToModuleCtx; import org.opendaylight.yangtools.yang.parser.spi.source.ImpPrefixToNamespace; @@ -112,7 +112,7 @@ final class SourceSpecificContext implements NamespaceStorageNode, NamespaceBeha globalContext.putModelDefinedStatementDefinition(name, def); } } - } else if (current != null && StmtContextUtils.isUnrecognizedStatement(current)) { + } else if (current != null && current.producesDeclared(UnrecognizedStatement.class)) { /* * This code wraps statements encountered inside an extension so * they do not get confused with regular statements. 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 abefa2c75f..74620a6482 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 @@ -38,7 +38,6 @@ import org.opendaylight.yangtools.yang.model.api.stmt.PresenceEffectiveStatement import org.opendaylight.yangtools.yang.model.api.stmt.RevisionStatement; import org.opendaylight.yangtools.yang.model.api.stmt.SubmoduleStatement; import org.opendaylight.yangtools.yang.model.api.stmt.UnknownStatement; -import org.opendaylight.yangtools.yang.model.api.stmt.UnrecognizedStatement; import org.opendaylight.yangtools.yang.parser.spi.meta.ModelActionBuilder.InferenceAction; import org.opendaylight.yangtools.yang.parser.spi.meta.ModelActionBuilder.InferenceContext; import org.opendaylight.yangtools.yang.parser.spi.meta.ModelActionBuilder.Prerequisite; @@ -232,21 +231,6 @@ public final class StmtContextUtils { return UnknownStatement.class.isAssignableFrom(stmtCtx.publicDefinition().getDeclaredRepresentationClass()); } - /** - * Returns true if supplied statement context represents unrecognized - * statement, otherwise returns false. - * - * @param stmtCtx - * statement context to be checked - * @return true if supplied statement context represents unrecognized - * statement, otherwise false - * @throws NullPointerException - * if supplied statement context is null - */ - public static boolean isUnrecognizedStatement(final StmtContext stmtCtx) { - return stmtCtx.producesDeclared(UnrecognizedStatement.class); - } - public static boolean checkFeatureSupport(final StmtContext stmtContext, final Set supportedFeatures) { boolean isSupported = false; -- 2.36.6