From 5bf23684a9c8367e6b8cda71d6609ead0e3ef5d9 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Fri, 4 Dec 2020 17:28:46 +0100 Subject: [PATCH] Add GroupingNamespace cleaning FIXMEs Drop FIXMEs that need to be addressed. JIRA: YANGTOOLS-1197 Change-Id: I24e7e9c5ebedf41c22a102782a1d3bfe9b63f1d4 Signed-off-by: Robert Varga --- .../yang/parser/stmt/reactor/RootStatementContext.java | 5 +++-- .../yang/parser/rfc7950/stmt/uses/UsesStatementSupport.java | 2 ++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/yang/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/RootStatementContext.java b/yang/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/RootStatementContext.java index dcb3d68687..8716e05597 100644 --- a/yang/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/RootStatementContext.java +++ b/yang/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/RootStatementContext.java @@ -53,10 +53,11 @@ public final class RootStatementContext, E ext private static final Logger LOG = LoggerFactory.getLogger(RootStatementContext.class); // These namespaces are well-known and not needed after the root is cleaned up private static final Map, SweptNamespace> SWEPT_NAMESPACES = ImmutableMap.of( + // FIXME: YANGTOOLS-1197: sweep GroupingNamespace + // GroupingNamespace.class, new SweptNamespace(GroupingNamespace.class), // FIXME: somehow these two end up being referenced post-sweep // this probably means we have a cross-module reference we do not account for -// GroupingNamespace.class, new SweptNamespace(GroupingNamespace.class), -// TypeNamespace.class, new SweptNamespace(TypeNamespace.class), + // TypeNamespace.class, new SweptNamespace(TypeNamespace.class), SchemaTreeNamespace.class, new SweptNamespace(SchemaTreeNamespace.class)); private final @NonNull SourceSpecificContext sourceContext; diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/uses/UsesStatementSupport.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/uses/UsesStatementSupport.java index c2a6fbc052..1ec33dd506 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/uses/UsesStatementSupport.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/uses/UsesStatementSupport.java @@ -178,6 +178,8 @@ public final class UsesStatementSupport } private static GroupingDefinition getSourceGrouping(final Current stmt) { + // FIXME: YANGTOOLS-1197: we have this lookup in inference action, just store a replica in local namespace + // during apply and pick it up when we build the statement return (GroupingDefinition) stmt.getFromNamespace(GroupingNamespace.class, stmt.getArgument()).buildEffective(); } -- 2.36.6