Fix leaf-list statement original propagation

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

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/case_/DeclaredCaseEffectiveStatement.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/case_/DeclaredCaseEffectiveStatement.java
index 5891fe5d59757dcfcb6675decc3b40c65b1eaa0e..4976a38dae37c9a02e01fb4106d7ff1b2d776ac8 100644 (file)
--- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/case_/DeclaredCaseEffectiveStatement.java
+++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/case_/DeclaredCaseEffectiveStatement.java
@@ -9,31 +9,37 @@ package org.opendaylight.yangtools.yang.parser.rfc7950.stmt.case_;
 
 import com.google.common.collect.ImmutableList;
 import java.util.Optional;
-import org.eclipse.jdt.annotation.NonNull;
 import org.eclipse.jdt.annotation.Nullable;
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.model.api.CaseSchemaNode;
 import org.opendaylight.yangtools.yang.model.api.DataSchemaNode;
+import org.opendaylight.yangtools.yang.model.api.SchemaNodeDefaults;
 import org.opendaylight.yangtools.yang.model.api.SchemaPath;
 import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement;
 import org.opendaylight.yangtools.yang.model.api.stmt.CaseEffectiveStatement;
 import org.opendaylight.yangtools.yang.model.api.stmt.CaseStatement;
 import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.AbstractDeclaredEffectiveStatement.DefaultWithSchemaTree.WithSubstatements;
-import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext;
 
 final class DeclaredCaseEffectiveStatement extends WithSubstatements<QName, CaseStatement, CaseEffectiveStatement>
         implements CaseEffectiveStatementMixin {
     private final CaseSchemaNode original;
-    private final @NonNull SchemaPath path;
+    private final @Nullable SchemaPath path;
     private final int flags;
 
     DeclaredCaseEffectiveStatement(final CaseStatement declared,
-            final StmtContext<QName, CaseStatement, CaseEffectiveStatement> ctx,
             final ImmutableList<? extends EffectiveStatement<?, ?>> substatements, final int flags,
-            final @Nullable CaseSchemaNode original) {
-        super(declared,  ctx, substatements);
+            final SchemaPath path, final @Nullable CaseSchemaNode original) {
+        super(declared, substatements);
         this.flags = flags;
-        this.path = ctx.getSchemaPath().get();
+        this.path = path;
+        this.original = original;
+    }
+
+    DeclaredCaseEffectiveStatement(final DeclaredCaseEffectiveStatement origEffective, final int flags,
+            final SchemaPath path, final @Nullable CaseSchemaNode original) {
+        super(origEffective);
+        this.flags = flags;
+        this.path = path;
         this.original = original;
     }
 
@@ -45,7 +51,7 @@ final class DeclaredCaseEffectiveStatement extends WithSubstatements<QName, Case
     @Override
     @Deprecated
     public SchemaPath getPath() {
-        return path;
+        return SchemaNodeDefaults.throwUnsupportedIfNull(this, path);
     }
 
     @Override
@@ -54,8 +60,8 @@ final class DeclaredCaseEffectiveStatement extends WithSubstatements<QName, Case
     }
 
     @Override
-    public Optional<DataSchemaNode> findDataChildByName(final QName name) {
-        return findDataSchemaNode(name);
+    public DataSchemaNode dataChildByName(final QName name) {
+        return dataSchemaNode(name);
     }
 
     @Override