Reformulate StatementContextFactory.createEffective()

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

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/AbstractDeclaredEffectiveStatement.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/AbstractDeclaredEffectiveStatement.java
index d7dd37dbf4af6274a589f6d95664ea5478255695..17d9fc84e24d37a18a301cc431c84d97115ef3b1 100644 (file)
--- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/AbstractDeclaredEffectiveStatement.java
+++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/AbstractDeclaredEffectiveStatement.java
@@ -29,7 +29,6 @@ import org.opendaylight.yangtools.yang.model.api.stmt.DataTreeEffectiveStatement
 import org.opendaylight.yangtools.yang.model.api.stmt.SchemaTreeAwareEffectiveStatement;
 import org.opendaylight.yangtools.yang.model.api.stmt.SchemaTreeEffectiveStatement;
 import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.EffectiveStatementMixins.DataNodeContainerMixin;
-import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext;
 import org.opendaylight.yangtools.yang.parser.spi.source.SourceException;
 import org.opendaylight.yangtools.yang.parser.spi.source.StatementSourceReference;
 
@@ -259,9 +258,10 @@ public abstract class AbstractDeclaredEffectiveStatement<A, D extends DeclaredSt
                 E extends SchemaTreeAwareEffectiveStatement<A, D>> extends DefaultWithSchemaTree<A, D, E> {
             private final @NonNull Object substatements;
 
-            protected WithSubstatements(final D declared, final StmtContext<?, ?, ?> ctx,
-                    final ImmutableList<? extends EffectiveStatement<?, ?>> substatements) {
-                super(declared, ctx, substatements);
+            protected WithSubstatements(final D declared,
+                    final ImmutableList<? extends EffectiveStatement<?, ?>> substatements,
+                    final StatementSourceReference ref) {
+                super(declared, substatements, ref);
                 this.substatements = maskList(substatements);
             }
 
@@ -274,11 +274,11 @@ public abstract class AbstractDeclaredEffectiveStatement<A, D extends DeclaredSt
         private final @NonNull ImmutableMap<QName, SchemaTreeEffectiveStatement<?>> schemaTree;
         private final @NonNull D declared;
 
-        protected DefaultWithSchemaTree(final D declared, final StmtContext<?, ?, ?> ctx,
-                final ImmutableList<? extends EffectiveStatement<?, ?>> substatements) {
+        protected DefaultWithSchemaTree(final D declared,
+                final ImmutableList<? extends EffectiveStatement<?, ?>> substatements,
+                final StatementSourceReference ref) {
             this.declared = requireNonNull(declared);
-            this.schemaTree = ImmutableMap.copyOf(createSchemaTreeNamespace(
-                ctx.getStatementSourceReference(), substatements));
+            this.schemaTree = ImmutableMap.copyOf(createSchemaTreeNamespace(ref, substatements));
         }
 
         @Override
@@ -306,9 +306,10 @@ public abstract class AbstractDeclaredEffectiveStatement<A, D extends DeclaredSt
                 E extends DataTreeAwareEffectiveStatement<A, D>> extends DefaultWithDataTree<A, D, E> {
             private final @NonNull Object substatements;
 
-            protected WithSubstatements(final D declared, final StmtContext<?, ?, ?> ctx,
-                    final ImmutableList<? extends EffectiveStatement<?, ?>> substatements) {
-                super(declared, ctx, substatements);
+            protected WithSubstatements(final D declared,
+                    final ImmutableList<? extends EffectiveStatement<?, ?>> substatements,
+                    final StatementSourceReference ref) {
+                super(declared, substatements, ref);
                 this.substatements = maskList(substatements);
             }
 
@@ -322,10 +323,10 @@ public abstract class AbstractDeclaredEffectiveStatement<A, D extends DeclaredSt
         private final @NonNull ImmutableMap<QName, DataTreeEffectiveStatement<?>> dataTree;
         private final @NonNull D declared;
 
-        protected DefaultWithDataTree(final D declared, final StmtContext<?, ?, ?> ctx,
-                final ImmutableList<? extends EffectiveStatement<?, ?>> substatements) {
+        protected DefaultWithDataTree(final D declared,
+                final ImmutableList<? extends EffectiveStatement<?, ?>> substatements,
+                final StatementSourceReference ref) {
             this.declared = requireNonNull(declared);
-            final StatementSourceReference ref = ctx.getStatementSourceReference();
             final Map<QName, SchemaTreeEffectiveStatement<?>> schema = createSchemaTreeNamespace(ref, substatements);
             this.schemaTree = ImmutableMap.copyOf(schema);
             this.dataTree = createDataTreeNamespace(ref, schema.values(), schemaTree);