Propagate MountPointContext to NetconfRpcStructureTransformer

[netconf.git] / netconf / sal-netconf-connector / src / main / java / org / opendaylight / netconf / sal / connect / netconf / util / NetconfRpcStructureTransformer.java

diff --git a/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/util/NetconfRpcStructureTransformer.java b/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/util/NetconfRpcStructureTransformer.java
index 5e444cc361ce24a882a996dc91461a30d0d39e52..17556590093b145f94576770e6e21b42ef84b42c 100644 (file)
--- a/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/util/NetconfRpcStructureTransformer.java
+++ b/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/util/NetconfRpcStructureTransformer.java
@@ -13,13 +13,13 @@ import java.util.Optional;
 import javax.xml.stream.XMLStreamException;
 import org.opendaylight.netconf.api.ModifyAction;
 import org.opendaylight.netconf.util.NetconfUtil;
+import org.opendaylight.yangtools.rfc8528.data.api.MountPointContext;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
 import org.opendaylight.yangtools.yang.data.api.schema.DOMSourceAnyxmlNode;
 import org.opendaylight.yangtools.yang.data.api.schema.DataContainerChild;
 import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
 import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNodes;
 import org.opendaylight.yangtools.yang.data.impl.schema.NormalizedNodeResult;
-import org.opendaylight.yangtools.yang.model.api.SchemaContext;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.xml.sax.SAXException;
@@ -28,12 +28,12 @@ import org.xml.sax.SAXException;
  * Transforms rpc structures to normalized nodes and vice versa.
  */
 class NetconfRpcStructureTransformer implements RpcStructureTransformer {
-
     private static final Logger LOG = LoggerFactory.getLogger(NetconfRpcStructureTransformer.class);
-    private final SchemaContext schemaContext;
 
-    NetconfRpcStructureTransformer(final SchemaContext schemaContext) {
-        this.schemaContext = schemaContext;
+    private final MountPointContext mountContext;
+
+    NetconfRpcStructureTransformer(final MountPointContext mountContext) {
+        this.mountContext = mountContext;
     }
 
     @Override
@@ -43,7 +43,7 @@ class NetconfRpcStructureTransformer implements RpcStructureTransformer {
         if (data instanceof DOMSourceAnyxmlNode) {
             final NormalizedNodeResult node;
             try {
-                node = NetconfUtil.transformDOMSourceToNormalizedNode(schemaContext,
+                node = NetconfUtil.transformDOMSourceToNormalizedNode(mountContext,
                     ((DOMSourceAnyxmlNode)data).getValue());
                 return NormalizedNodes.findNode(node.getResult(), path.getPathArguments());
             } catch (final XMLStreamException | URISyntaxException | IOException | SAXException e) {
@@ -59,11 +59,14 @@ class NetconfRpcStructureTransformer implements RpcStructureTransformer {
     public DOMSourceAnyxmlNode createEditConfigStructure(final Optional<NormalizedNode<?, ?>> data,
                                                          final YangInstanceIdentifier dataPath,
                                                          final Optional<ModifyAction> operation) {
-        return NetconfMessageTransformUtil.createEditConfigAnyxml(schemaContext, dataPath, operation, data);
+        // FIXME: propagate MountPointContext
+        return NetconfMessageTransformUtil.createEditConfigAnyxml(mountContext.getSchemaContext(), dataPath, operation,
+            data);
     }
 
     @Override
     public DataContainerChild<?, ?> toFilterStructure(final YangInstanceIdentifier path) {
-        return NetconfMessageTransformUtil.toFilterStructure(path, schemaContext);
+        // FIXME: propagate MountPointContext
+        return NetconfMessageTransformUtil.toFilterStructure(path, mountContext.getSchemaContext());
     }
 }