Remove DerivableSchemaNode

[yangtools.git] / model / yang-model-ri / src / main / java / org / opendaylight / yangtools / yang / model / ri / stmt / impl / eff / AbstractLeafEffectiveStatement.java

diff --git a/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/AbstractLeafEffectiveStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/AbstractLeafEffectiveStatement.java
index 61a176aa2554d9c3835cc14ada0bd0d5de3e311e..08d2598319b3a2b4ea05b5f9725df0632f80e580 100644 (file)
--- a/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/AbstractLeafEffectiveStatement.java
+++ b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/AbstractLeafEffectiveStatement.java
@@ -35,8 +35,12 @@ public abstract class AbstractLeafEffectiveStatement
         implements LeafEffectiveStatement, LeafSchemaNode, DataSchemaNodeMixin<LeafStatement>,
             MandatoryMixin<QName, LeafStatement>, MustConstraintMixin<QName, LeafStatement> {
     private final @NonNull Object substatements;
+    // FIXME: YANGTOOLS-1316: this seems to imply that argument.equals(declared.argument()) and we could save a field,
+    //                        except we need it in the constructors to materialize type. But if we turn it into a lazy
+    //                        field, we should be okay.
     private final @NonNull QName argument;
     private final @NonNull TypeDefinition<?> type;
+
     private final int flags;
 
     AbstractLeafEffectiveStatement(final LeafStatement declared, final QName argument, final int flags,
@@ -45,18 +49,16 @@ public abstract class AbstractLeafEffectiveStatement
         this.argument = requireNonNull(argument);
         this.substatements = maskList(substatements);
         this.flags = flags;
-        // TODO: lazy instantiation?
-        this.type = buildType();
+        type = buildType();
     }
 
     AbstractLeafEffectiveStatement(final AbstractLeafEffectiveStatement original, final QName argument,
             final int flags) {
         super(original);
         this.argument = requireNonNull(argument);
-        this.substatements = original.substatements;
+        substatements = original.substatements;
         this.flags = flags;
-        // FIXME: share with original?
-        this.type = buildType();
+        type = buildType();
     }
 
     @Override