Split out yang-model-ri

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

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/leaf_list/AbstractLeafListEffectiveStatement.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/leaf_list/AbstractLeafListEffectiveStatement.java
index 1236dd5bb80ed4b3c549552215a4d7a373d47d5c..ae06c5eccc841bf50ec0eece310aeddf8b360cb7 100644 (file)
--- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/leaf_list/AbstractLeafListEffectiveStatement.java
+++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/leaf_list/AbstractLeafListEffectiveStatement.java
@@ -24,21 +24,18 @@ import org.opendaylight.yangtools.yang.model.api.stmt.ReferenceEffectiveStatemen
 import org.opendaylight.yangtools.yang.model.api.stmt.StatusEffectiveStatement;
 import org.opendaylight.yangtools.yang.model.api.stmt.TypeEffectiveStatement;
 import org.opendaylight.yangtools.yang.model.api.stmt.UnitsEffectiveStatement;
-import org.opendaylight.yangtools.yang.model.spi.type.ConcreteTypeBuilder;
-import org.opendaylight.yangtools.yang.model.spi.type.ConcreteTypes;
-import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.AbstractDeclaredEffectiveStatement;
+import org.opendaylight.yangtools.yang.model.ri.type.ConcreteTypeBuilder;
+import org.opendaylight.yangtools.yang.model.ri.type.ConcreteTypes;
+import org.opendaylight.yangtools.yang.model.spi.meta.AbstractDeclaredEffectiveStatement;
 import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.EffectiveStatementMixins.DataSchemaNodeMixin;
 import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.EffectiveStatementMixins.MustConstraintMixin;
 import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.EffectiveStatementMixins.UserOrderedMixin;
-import org.opendaylight.yangtools.yang.parser.spi.meta.EffectiveSchemaTreeStatementState;
-import org.opendaylight.yangtools.yang.parser.spi.meta.EffectiveStatementState;
-import org.opendaylight.yangtools.yang.parser.spi.meta.EffectiveStatementStateAware;
 
 abstract class AbstractLeafListEffectiveStatement
         extends AbstractDeclaredEffectiveStatement.Default<QName, LeafListStatement>
         implements LeafListEffectiveStatement, LeafListSchemaNode, DerivableSchemaNode,
             UserOrderedMixin<QName, LeafListStatement>, DataSchemaNodeMixin<QName, LeafListStatement>,
-            MustConstraintMixin<QName, LeafListStatement>, EffectiveStatementStateAware {
+            MustConstraintMixin<QName, LeafListStatement> {
     private final @NonNull Object substatements;
     private final @NonNull Immutable path;
     private final @NonNull TypeDefinition<?> type;
@@ -60,7 +57,7 @@ abstract class AbstractLeafListEffectiveStatement
         this.path = requireNonNull(path);
         this.substatements = original.substatements;
         this.flags = flags;
-        // FIXME: share with original?
+        // TODO: lazy instantiation?
         this.type = buildType();
     }
 
@@ -99,11 +96,6 @@ abstract class AbstractLeafListEffectiveStatement
         return this;
     }
 
-    @Override
-    public final EffectiveStatementState toEffectiveStatementState() {
-        return new EffectiveSchemaTreeStatementState(path, flags);
-    }
-
     @Override
     public final String toString() {
         return getClass().getSimpleName() + "[" + getQName() + "]";