Bump MRI upstreams

[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 5ccab6ba66e760762fe361020bbe772e32ec9f54..613a5e7da708cfe9555f55b6f91be175e9cf48d7 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
@@ -7,42 +7,73 @@
  */
 package org.opendaylight.netconf.sal.connect.netconf.util;
 
-import com.google.common.base.Optional;
-import org.opendaylight.yangtools.yang.data.api.ModifyAction;
+import java.io.IOException;
+import java.net.URISyntaxException;
+import java.util.List;
+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.AnyXmlNode;
+import org.opendaylight.yangtools.yang.data.api.schema.AnyxmlNode;
+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.model.api.SchemaContext;
+import org.opendaylight.yangtools.yang.data.impl.schema.NormalizedNodeResult;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+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;
+    private final MountPointContext mountContext;
 
-    NetconfRpcStructureTransformer(final SchemaContext schemaContext) {
-        this.schemaContext = schemaContext;
+    NetconfRpcStructureTransformer(final MountPointContext mountContext) {
+        this.mountContext = mountContext;
     }
 
     @Override
-    public Optional<NormalizedNode<?, ?>> selectFromDataStructure(
-            final DataContainerChild<? extends YangInstanceIdentifier.PathArgument, ?> data,
+    public Optional<NormalizedNode> selectFromDataStructure(final DataContainerChild data,
             final YangInstanceIdentifier path) {
-        return NormalizedNodes.findNode(data, path.getPathArguments());
+        if (data instanceof DOMSourceAnyxmlNode) {
+            final NormalizedNodeResult node;
+            try {
+                node = NetconfUtil.transformDOMSourceToNormalizedNode(mountContext,
+                    ((DOMSourceAnyxmlNode)data).body());
+                return NormalizedNodes.findNode(node.getResult(), path.getPathArguments());
+            } catch (final XMLStreamException | URISyntaxException | IOException | SAXException e) {
+                LOG.error("Cannot parse anyxml.", e);
+                return Optional.empty();
+            }
+        } else {
+            return NormalizedNodes.findNode(data, path.getPathArguments());
+        }
     }
 
     @Override
-    public AnyXmlNode createEditConfigStructure(final Optional<NormalizedNode<?, ?>> data,
-                                                final YangInstanceIdentifier dataPath,
-                                                Optional<ModifyAction> operation) {
-        return NetconfMessageTransformUtil.createEditConfigAnyxml(schemaContext, dataPath, operation, data);
+    public DOMSourceAnyxmlNode createEditConfigStructure(final Optional<NormalizedNode> data,
+                                                         final YangInstanceIdentifier dataPath,
+                                                         final Optional<ModifyAction> operation) {
+        // FIXME: propagate MountPointContext
+        return NetconfMessageTransformUtil.createEditConfigAnyxml(mountContext.getEffectiveModelContext(), dataPath,
+            operation, data);
     }
 
     @Override
-    public DataContainerChild<?, ?> toFilterStructure(final YangInstanceIdentifier path) {
-        return NetconfMessageTransformUtil.toFilterStructure(path, schemaContext);
+    public AnyxmlNode<?> toFilterStructure(final YangInstanceIdentifier path) {
+        // FIXME: propagate MountPointContext
+        return NetconfMessageTransformUtil.toFilterStructure(path, mountContext.getEffectiveModelContext());
+    }
+
+    @Override
+    public AnyxmlNode<?> toFilterStructure(final List<FieldsFilter> fieldsFilters) {
+        // FIXME: propagate MountPointContext
+        return NetconfMessageTransformUtil.toFilterStructure(fieldsFilters, mountContext.getEffectiveModelContext());
     }
 }