Fix NormalizedNodeStreamWriterStack root handling

[yangtools.git] / data / yang-data-util / src / main / java / org / opendaylight / yangtools / yang / data / util / NormalizedNodeStreamWriterStack.java

diff --git a/data/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/NormalizedNodeStreamWriterStack.java b/data/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/NormalizedNodeStreamWriterStack.java
index 1b48afe72800a157e6024c20b9744dbd98be5d93..4cc02c76963593750aec4c57e185183ae33d24f6 100644 (file)
--- a/data/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/NormalizedNodeStreamWriterStack.java
+++ b/data/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/NormalizedNodeStreamWriterStack.java
@@ -60,7 +60,7 @@ public final class NormalizedNodeStreamWriterStack implements LeafrefResolver {
 
     private final Deque<EffectiveStatement<?, ?>> schemaStack = new ArrayDeque<>();
     private final SchemaInferenceStack dataTree;
-    private final Object root;
+    private final @NonNull Object root;
 
     private NormalizedNodeStreamWriterStack(final EffectiveModelContext context) {
         dataTree = SchemaInferenceStack.of(context);
@@ -180,10 +180,15 @@ public final class NormalizedNodeStreamWriterStack implements LeafrefResolver {
         return schemaStack.peek();
     }
 
+    private @NonNull Object currentStatementOrRoot() {
+        final var stmt = currentStatement();
+        return stmt != null ? stmt : root;
+    }
+
     private @NonNull DataTreeEffectiveStatement<?> enterDataTree(final PathArgument name) {
         final var qname = name.getNodeType();
         final var stmt = dataTree.enterDataTree(qname);
-        if (currentStatement() instanceof ChoiceEffectiveStatement choice) {
+        if (currentStatementOrRoot() instanceof ChoiceEffectiveStatement choice) {
             final var check = choice.findDataTreeNode(qname).orElse(null);
             verify(check == stmt, "Data tree result %s does not match choice result %s", stmt, check);
         }
@@ -208,10 +213,12 @@ public final class NormalizedNodeStreamWriterStack implements LeafrefResolver {
     }
 
     public void startListItem(final PathArgument name) throws IOException {
-        if (!(currentStatement() instanceof ListEffectiveStatement parentList)) {
-            throw new IllegalArgumentException("List item is not appropriate");
+        final var parent = currentStatementOrRoot();
+        if (parent instanceof ListEffectiveStatement parentList) {
+            schemaStack.push(parentList);
+        } else {
+            throw new IllegalArgumentException("List item is not appropriate under " + parent);
         }
-        schemaStack.push(parentList);
     }
 
     public void startLeafNode(final NodeIdentifier name) throws IOException {