Refactor ConfigListWarningNamespace

[yangtools.git] / yang / yang-parser-rfc7950 / src / main / java / org / opendaylight / yangtools / yang / parser / rfc7950 / stmt / list / AbstractListStatementSupport.java

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/list/AbstractListStatementSupport.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/list/AbstractListStatementSupport.java
index e686a7664cc0e86f0d37ea4b7beb847e32d9a437..bc03fdcd4a7c0ed1bbdab644092d21f66272174e 100644 (file)
--- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/list/AbstractListStatementSupport.java
+++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/list/AbstractListStatementSupport.java
@@ -44,6 +44,7 @@ import org.opendaylight.yangtools.yang.parser.spi.meta.InferenceException;
 import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext;
 import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext.Mutable;
 import org.opendaylight.yangtools.yang.parser.spi.source.SourceException;
+import org.opendaylight.yangtools.yang.parser.spi.source.StatementSourceReference;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -129,16 +130,16 @@ abstract class AbstractListStatementSupport extends
     }
 
     private static void warnConfigList(final @NonNull Current<QName, ListStatement> stmt) {
-        final StmtContext<QName, ListStatement, ListEffectiveStatement> ctx = stmt.caerbannog();
-        final StmtContext<QName, ListStatement, ListEffectiveStatement> warnCtx = ctx.getOriginalCtx().orElse(ctx);
-        final Boolean warned = warnCtx.getFromNamespace(ConfigListWarningNamespace.class, Boolean.TRUE);
+        final StatementSourceReference ref = stmt.sourceReference();
+        final Boolean warned = stmt.getFromNamespace(ConfigListWarningNamespace.class, ref);
         // Hacky check if we have issued a warning for the original statement
         if (warned == null) {
-            verify(warnCtx instanceof Mutable, "Unexpected context %s", warnCtx);
-            ((Mutable<?, ?, ?>) warnCtx).addToNs(ConfigListWarningNamespace.class, Boolean.TRUE, Boolean.TRUE);
+            final StmtContext<?, ?, ?> ctx = stmt.caerbannog();
+            verify(ctx instanceof Mutable, "Unexpected context %s", ctx);
+            ((Mutable<?, ?, ?>) ctx).addToNs(ConfigListWarningNamespace.class, ref, Boolean.TRUE);
             LOG.info("Configuration list {} does not define any keys in violation of RFC7950 section 7.8.2. While "
                     + "this is fine with OpenDaylight, it can cause interoperability issues with other systems "
-                    + "[defined at {}]", ctx.argument(), warnCtx.sourceReference());
+                    + "[defined at {}]", stmt.argument(), ref);
         }
     }