Disconnect NormalizedNode from Identifiable

[yangtools.git] / data / yang-data-impl / src / main / java / org / opendaylight / yangtools / yang / data / impl / schema / ImmutableMountPointNormalizedNodeStreamWriter.java

diff --git a/data/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/ImmutableMountPointNormalizedNodeStreamWriter.java b/data/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/ImmutableMountPointNormalizedNodeStreamWriter.java
index 58c917c3eb583022b72f2a77c689606d26e7b561..f5ee6fbee2dddc3c1b56d51cfb57c33373bf751b 100644 (file)
--- a/data/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/ImmutableMountPointNormalizedNodeStreamWriter.java
+++ b/data/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/ImmutableMountPointNormalizedNodeStreamWriter.java
@@ -7,36 +7,58 @@
  */
 package org.opendaylight.yangtools.yang.data.impl.schema;
 
+import static com.google.common.base.Preconditions.checkState;
+import static java.util.Objects.requireNonNull;
+
 import com.google.common.annotations.Beta;
-import com.google.common.collect.ClassToInstanceMap;
-import com.google.common.collect.ImmutableClassToInstanceMap;
 import java.io.IOException;
-import org.opendaylight.yangtools.rfc8528.data.api.MountPointIdentifier;
-import org.opendaylight.yangtools.rfc8528.data.util.ImmutableMountPointNode;
+import java.util.ArrayDeque;
+import java.util.Deque;
+import java.util.List;
+import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.opendaylight.yangtools.rfc8528.model.api.MountPointLabel;
+import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.PathArgument;
 import org.opendaylight.yangtools.yang.data.api.schema.ContainerNode;
 import org.opendaylight.yangtools.yang.data.api.schema.MountPointContext;
+import org.opendaylight.yangtools.yang.data.api.schema.builder.NormalizedNodeBuilder;
 import org.opendaylight.yangtools.yang.data.api.schema.stream.ForwardingNormalizedNodeStreamWriter;
 import org.opendaylight.yangtools.yang.data.api.schema.stream.NormalizedNodeStreamWriter;
-import org.opendaylight.yangtools.yang.data.api.schema.stream.NormalizedNodeStreamWriterExtension;
-import org.opendaylight.yangtools.yang.data.api.schema.stream.StreamWriterMountPointExtension;
+import org.opendaylight.yangtools.yang.data.api.schema.stream.NormalizedNodeStreamWriter.MountPointExtension;
+import org.opendaylight.yangtools.yang.data.util.ImmutableNormalizedMountPoint;
+import org.opendaylight.yangtools.yang.data.util.ImmutableNormalizedMountpoints;
+import org.opendaylight.yangtools.yang.data.util.ImmutableNormalizedMountpoints.Builder;
 
 // FIXME: document usage of this
 @Beta
 public abstract class ImmutableMountPointNormalizedNodeStreamWriter extends ImmutableNormalizedNodeStreamWriter
-        implements StreamWriterMountPointExtension {
+        implements MountPointExtension {
+    @NonNullByDefault
+    private record BuilderEntry(PathArgument identifier, Builder builder) {
+        BuilderEntry {
+            requireNonNull(identifier);
+            requireNonNull(builder);
+        }
+    }
+
+    private final Deque<BuilderEntry> builders = new ArrayDeque<>();
+    private final NormalizationResultHolder holder;
+
     protected ImmutableMountPointNormalizedNodeStreamWriter(final NormalizationResultHolder holder) {
         super(holder);
+        this.holder = requireNonNull(holder);
     }
 
     @Override
-    public final ClassToInstanceMap<NormalizedNodeStreamWriterExtension> getExtensions() {
-        return ImmutableClassToInstanceMap.of(StreamWriterMountPointExtension.class, this);
+    public final List<MountPointExtension> supportedExtensions() {
+        return List.of(this);
     }
 
     @Override
     public final NormalizedNodeStreamWriter startMountPoint(final MountPointLabel label,
             final MountPointContext mountCtx) {
+        final var current = builders.peek();
+        checkState(current != null, "Attempted to emit mount point when no data is open");
+
         final var mountResult = new NormalizationResultHolder();
         final var mountDelegate = ImmutableNormalizedNodeStreamWriter.from(mountResult);
 
@@ -50,13 +72,40 @@ public abstract class ImmutableMountPointNormalizedNodeStreamWriter extends Immu
             public void close() throws IOException {
                 super.close();
 
-                final var data = mountResult.getResult().data();
+                final var result = mountResult.getResult();
+                final var data = result.data();
                 if (!(data instanceof ContainerNode container)) {
                     throw new IOException("Unhandled mount data " + data);
                 }
 
-                writeChild(ImmutableMountPointNode.of(new MountPointIdentifier(label), mountCtx, container));
+                current.builder.withMountPoint(new ImmutableNormalizedMountPoint(label, mountCtx, container,
+                    result.metadata(), result.mountPoints()));
             }
         };
     }
+
+    @Override
+    @SuppressWarnings("rawtypes")
+    final void enter(final PathArgument identifier, final NormalizedNodeBuilder next) {
+        super.enter(identifier, next);
+        builders.push(new BuilderEntry(identifier, ImmutableNormalizedMountpoints.builder()));
+    }
+
+    @Override
+    public final void endNode() {
+        super.endNode();
+
+        final var last = builders.pop();
+        final var mountPoints = last.builder.build();
+        final var current = builders.peek();
+        if (current != null) {
+            if (mountPoints.mountPoint() != null || !mountPoints.getChildren().isEmpty()) {
+                current.builder.withChild(last.identifier, mountPoints);
+            }
+        } else {
+            // All done
+            holder.setMountPoints(mountPoints);
+        }
+    }
 }
+