Fix Serializer/Deserializer/Codec concepts

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

diff --git a/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/MountPointData.java b/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/MountPointData.java
index b5389aff638db43d6627f19b9ef3033f51a3da27..99f2c5c8edb927b1db6278bae38f3f575c3966a0 100644 (file)
--- a/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/MountPointData.java
+++ b/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/MountPointData.java
@@ -16,21 +16,14 @@ import java.util.ArrayList;
 import java.util.EnumMap;
 import java.util.List;
 import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Optional;
 import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.yangtools.concepts.AbstractIdentifiable;
-import org.opendaylight.yangtools.rfc8528.data.api.InlineMountPointSchemaResolver;
-import org.opendaylight.yangtools.rfc8528.data.api.InlineMountPointSchemaResolver.LibraryContext;
+import org.opendaylight.yangtools.rfc8528.data.api.MountPointChild;
+import org.opendaylight.yangtools.rfc8528.data.api.MountPointContext;
+import org.opendaylight.yangtools.rfc8528.data.api.MountPointContextFactory;
 import org.opendaylight.yangtools.rfc8528.data.api.MountPointIdentifier;
 import org.opendaylight.yangtools.rfc8528.data.api.MountPointStreamWriter;
-import org.opendaylight.yangtools.rfc8528.model.api.MountPointSchema;
-import org.opendaylight.yangtools.rfc8528.model.api.MountPointSchemaResolver;
-import org.opendaylight.yangtools.rfc8528.model.api.StaticMountpointSchemaResolver;
-import org.opendaylight.yangtools.rfc8528.model.api.YangLibraryConstants.ContainerName;
-import org.opendaylight.yangtools.yang.common.QName;
-import org.opendaylight.yangtools.yang.data.api.schema.ContainerNode;
-import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
+import org.opendaylight.yangtools.rfc8528.data.api.YangLibraryConstants.ContainerName;
 import org.opendaylight.yangtools.yang.data.api.schema.stream.NormalizedNodeStreamWriter;
 import org.opendaylight.yangtools.yang.model.parser.api.YangParserException;
 import org.slf4j.Logger;
@@ -45,9 +38,13 @@ public final class MountPointData extends AbstractIdentifiable<MountPointIdentif
 
     private final Map<ContainerName, MountPointChild> yangLib = new EnumMap<>(ContainerName.class);
     private final List<MountPointChild> children = new ArrayList<>();
+    private final MountPointContextFactory contextFactory;
 
-    MountPointData(final QName label) {
-        super(MountPointIdentifier.of(label));
+    private MountPointChild schemaMounts;
+
+    MountPointData(final MountPointIdentifier mountId, final MountPointContextFactory contextFactory) {
+        super(mountId);
+        this.contextFactory = requireNonNull(contextFactory);
     }
 
     public void setContainer(final @NonNull ContainerName containerName, final @NonNull MountPointChild data) {
@@ -56,6 +53,12 @@ public final class MountPointData extends AbstractIdentifiable<MountPointIdentif
         addChild(data);
     }
 
+    public void setSchemaMounts(final @NonNull MountPointChild data) {
+        checkState(schemaMounts == null, "Attempted to reset schema-mounts from %s to %s", schemaMounts, data);
+        schemaMounts = requireNonNull(data);
+        addChild(data);
+    }
+
     public void addChild(final @NonNull MountPointChild data) {
         children.add(requireNonNull(data));
     }
@@ -67,57 +70,15 @@ public final class MountPointData extends AbstractIdentifiable<MountPointIdentif
             return;
         }
 
-        final Optional<MountPointSchemaResolver> optResolver = mountWriter.findMountPoint(getIdentifier());
-        if (!optResolver.isPresent()) {
-            LOG.debug("Mount point for {} is not present, ignoring it", getIdentifier());
-            return;
-        }
-
-        final MountPointSchemaResolver resolver = optResolver.get();
-        if (resolver instanceof StaticMountpointSchemaResolver) {
-            writeTo(mountWriter, ((StaticMountpointSchemaResolver) resolver).getSchema());
-        } else if (resolver instanceof InlineMountPointSchemaResolver) {
-            writeInline(mountWriter, (InlineMountPointSchemaResolver) resolver);
-        } else {
-            throw new IOException("Unhandled resolver " + resolver);
-        }
-    }
-
-    private void writeInline(final @NonNull MountPointStreamWriter mountWriter,
-            final InlineMountPointSchemaResolver resolver) throws IOException {
-        for (Entry<ContainerName, MountPointChild> entry : yangLib.entrySet()) {
-            final Optional<LibraryContext> optLibContext = resolver.findSchemaForLibrary(entry.getKey());
-            if (!optLibContext.isPresent()) {
-                LOG.debug("YANG Library context for mount point {} container {} not found", getIdentifier(),
-                    entry.getKey());
-                continue;
-            }
-
-            final LibraryContext libContext = optLibContext.get();
-            final NormalizedNode<?, ?> data = entry.getValue().normalizeTo(libContext.getLibraryContainerSchema());
-            if (!(data instanceof ContainerNode)) {
-                throw new IOException("Invalid non-container " + data);
-            }
-
-            final MountPointSchema mountMeta;
-            try {
-                mountMeta = libContext.bindTo((ContainerNode) data);
-            } catch (YangParserException e) {
-                throw new IOException("Failed to assemble context for " + data, e);
-            }
-
-            writeTo(mountWriter, mountMeta);
-            return;
+        final MountPointContext mountCtx;
+        try {
+            mountCtx = contextFactory.createContext(yangLib, schemaMounts);
+        } catch (YangParserException e) {
+            throw new IOException("Failed to resolve mount point " + getIdentifier(), e);
         }
-
-        LOG.warn("Failed to create a dynamic context for mount point {}, ignoring its data", getIdentifier());
-    }
-
-    private void writeTo(final @NonNull MountPointStreamWriter mountWriter,
-            final @NonNull MountPointSchema mountMeta) throws IOException {
-        try (NormalizedNodeStreamWriter writer = mountWriter.startMountPoint(mountMeta)) {
+        try (NormalizedNodeStreamWriter nestedWriter = mountWriter.startMountPoint(getIdentifier(), mountCtx)) {
             for (MountPointChild child : children) {
-                child.writeTo(writer, mountMeta.getSchemaContext());
+                child.writeTo(nestedWriter, mountCtx);
             }
         }
     }