Bump yangtools to 4.0.1

[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 1572e203f7cee05c93c7561830dfed3c29d40ee1..5e444cc361ce24a882a996dc91461a30d0d39e52 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,20 +7,29 @@
  */
 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.Optional;
+import javax.xml.stream.XMLStreamException;
+import org.opendaylight.netconf.api.ModifyAction;
+import org.opendaylight.netconf.util.NetconfUtil;
 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.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;
 
 /**
  * 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) {
@@ -28,14 +37,28 @@ class NetconfRpcStructureTransformer implements RpcStructureTransformer {
     }
 
     @Override
-    public Optional<NormalizedNode<?, ?>> selectFromDataStructure(final DataContainerChild<? extends YangInstanceIdentifier.PathArgument, ?> data,
-                                                                  final YangInstanceIdentifier path) {
-        return NormalizedNodes.findNode(data, path.getPathArguments());
+    public Optional<NormalizedNode<?, ?>> selectFromDataStructure(
+            final DataContainerChild<? extends YangInstanceIdentifier.PathArgument, ?> data,
+            final YangInstanceIdentifier path) {
+        if (data instanceof DOMSourceAnyxmlNode) {
+            final NormalizedNodeResult node;
+            try {
+                node = NetconfUtil.transformDOMSourceToNormalizedNode(schemaContext,
+                    ((DOMSourceAnyxmlNode)data).getValue());
+                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) {
+    public DOMSourceAnyxmlNode createEditConfigStructure(final Optional<NormalizedNode<?, ?>> data,
+                                                         final YangInstanceIdentifier dataPath,
+                                                         final Optional<ModifyAction> operation) {
         return NetconfMessageTransformUtil.createEditConfigAnyxml(schemaContext, dataPath, operation, data);
     }