Add GroupingNamespace cleaning FIXMEs

Drop FIXMEs that need to be addressed.

JIRA: YANGTOOLS-1197
Change-Id: I24e7e9c5ebedf41c22a102782a1d3bfe9b63f1d4
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

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 dcb3d6868756ccb326d4a22c2df6f8e33a18293b..8716e05597fae3541cd683b9ac53ac05645ecd7b 100644 (file)
--- 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<A, D extends DeclaredStatement<A>, 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<Class<?>, 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 c2a6fbc052c9a87176a27f57007a1ea5e1328dc4..1ec33dd506740019d5d2da54405333674644975d 100644 (file)
--- 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<QName, ?> 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();
     }