From d6f64e5f8818109e0b60438f0988162c9ad341b0 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Fri, 30 Oct 2020 10:33:02 +0100 Subject: [PATCH] Tighten {Inferred,Substatement}Context.getParentNamespaceStorage() These two methods are guaranteed to return StatementContextBase, express that in their return type. Change-Id: I586c9f4ac88a42b094ed2061d0f698b6ce312d60 Signed-off-by: Robert Varga --- .../yang/parser/stmt/reactor/InferredStatementContext.java | 3 +-- .../yang/parser/stmt/reactor/SubstatementContext.java | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/yang/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/InferredStatementContext.java b/yang/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/InferredStatementContext.java index 03c6a49f5a..fb153a83c8 100644 --- a/yang/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/InferredStatementContext.java +++ b/yang/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/InferredStatementContext.java @@ -25,7 +25,6 @@ import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement; import org.opendaylight.yangtools.yang.model.api.meta.StatementDefinition; import org.opendaylight.yangtools.yang.parser.spi.meta.CopyHistory; import org.opendaylight.yangtools.yang.parser.spi.meta.CopyType; -import org.opendaylight.yangtools.yang.parser.spi.meta.NamespaceBehaviour.NamespaceStorageNode; import org.opendaylight.yangtools.yang.parser.spi.meta.NamespaceBehaviour.StorageNodeType; import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext; import org.opendaylight.yangtools.yang.parser.spi.source.StatementSourceReference; @@ -203,7 +202,7 @@ final class InferredStatementContext, E extend } @Override - public NamespaceStorageNode getParentNamespaceStorage() { + public StatementContextBase getParentNamespaceStorage() { return parent; } diff --git a/yang/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/SubstatementContext.java b/yang/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/SubstatementContext.java index 12605eddfb..85a805b979 100644 --- a/yang/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/SubstatementContext.java +++ b/yang/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/SubstatementContext.java @@ -14,7 +14,6 @@ import org.opendaylight.yangtools.yang.model.api.SchemaPath; import org.opendaylight.yangtools.yang.model.api.meta.DeclaredStatement; import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement; import org.opendaylight.yangtools.yang.parser.spi.meta.CopyType; -import org.opendaylight.yangtools.yang.parser.spi.meta.NamespaceBehaviour.NamespaceStorageNode; import org.opendaylight.yangtools.yang.parser.spi.meta.NamespaceBehaviour.StorageNodeType; import org.opendaylight.yangtools.yang.parser.spi.source.StatementSourceReference; @@ -79,7 +78,7 @@ final class SubstatementContext, E extends Eff } @Override - public NamespaceStorageNode getParentNamespaceStorage() { + public StatementContextBase getParentNamespaceStorage() { return parent; } -- 2.36.6