Migrate netconf to MD-SAL APIs

[netconf.git] / netconf / sal-netconf-connector / src / main / java / org / opendaylight / netconf / sal / connect / netconf / schema / mapping / SchemalessMessageTransformer.java

diff --git a/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/schema/mapping/SchemalessMessageTransformer.java b/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/schema/mapping/SchemalessMessageTransformer.java
index 00fb9b4645d55a37b2e82132e2ae6b732a048d7f..1dcb6979b0f701863099d25a682a32ced88a0d06 100644 (file)
--- a/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/schema/mapping/SchemalessMessageTransformer.java
+++ b/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/schema/mapping/SchemalessMessageTransformer.java
@@ -7,15 +7,15 @@
  */
 package org.opendaylight.netconf.sal.connect.netconf.schema.mapping;
 
-import java.util.Date;
+import java.time.Instant;
 import java.util.Map;
 import javax.xml.transform.dom.DOMSource;
-import org.opendaylight.controller.config.util.xml.MissingNameSpaceException;
-import org.opendaylight.controller.config.util.xml.XmlElement;
-import org.opendaylight.controller.md.sal.dom.api.DOMNotification;
-import org.opendaylight.controller.md.sal.dom.api.DOMRpcResult;
-import org.opendaylight.controller.md.sal.dom.spi.DefaultDOMRpcResult;
+import org.opendaylight.mdsal.dom.api.DOMNotification;
+import org.opendaylight.mdsal.dom.api.DOMRpcResult;
+import org.opendaylight.mdsal.dom.spi.DefaultDOMRpcResult;
 import org.opendaylight.netconf.api.NetconfMessage;
+import org.opendaylight.netconf.api.xml.MissingNameSpaceException;
+import org.opendaylight.netconf.api.xml.XmlElement;
 import org.opendaylight.netconf.sal.connect.api.MessageTransformer;
 import org.opendaylight.netconf.sal.connect.netconf.util.NetconfMessageTransformUtil;
 import org.opendaylight.netconf.sal.connect.util.MessageCounter;
@@ -39,7 +39,8 @@ public class SchemalessMessageTransformer implements MessageTransformer<NetconfM
     // TODO maybe we should move this somewhere else as this
     // might be used in applications using schemaless mountpoints
     public static final YangInstanceIdentifier.NodeIdentifier SCHEMALESS_NOTIFICATION_PAYLOAD =
-            new YangInstanceIdentifier.NodeIdentifier(QName.create("schemaless-notification-payload"));
+            // FIXME: assign proper namespace
+            new YangInstanceIdentifier.NodeIdentifier(QName.create("", "schemaless-notification-payload"));
 
     private final MessageCounter counter;
 
@@ -49,13 +50,14 @@ public class SchemalessMessageTransformer implements MessageTransformer<NetconfM
 
     @Override
     public DOMNotification toNotification(final NetconfMessage message) {
-        final Map.Entry<Date, XmlElement> stripped = NetconfMessageTransformUtil.stripNotification(message);
+        final Map.Entry<Instant, XmlElement> stripped = NetconfMessageTransformUtil.stripNotification(message);
         final QName notificationNoRev;
         try {
             notificationNoRev =
                     QName.create(stripped.getValue().getNamespace(), stripped.getValue().getName()).withoutRevision();
         } catch (final MissingNameSpaceException e) {
-            throw new IllegalArgumentException("Unable to parse notification " + message + ", cannot find namespace", e);
+            throw new IllegalArgumentException("Unable to parse notification "
+                    + message + ", cannot find namespace", e);
         }
 
         final AnyXmlNode notificationPayload = Builders.anyXmlBuilder()
@@ -75,12 +77,12 @@ public class SchemalessMessageTransformer implements MessageTransformer<NetconfM
     public NetconfMessage toRpcRequest(final SchemaPath rpc, final NormalizedNode<?, ?> input) {
         final DOMSource payload = (DOMSource) input.getValue();
         wrapPayload((Document) payload.getNode());
-        return new NetconfMessage(((Document) ((AnyXmlNode) input).getValue().getNode()));
+        return new NetconfMessage((Document) ((AnyXmlNode) input).getValue().getNode());
     }
 
     /**
-     * Transforms reply message to anyXml node. In case, that rpc-reply doesn't contain data and contains only &lt;ok/&gt;
-     * element, returns null.
+     * Transforms reply message to anyXml node.
+     * In case, that rpc-reply doesn't contain data and contains only &lt;ok/&gt; element, returns null.
      * @param rpcReply reply message
      * @return anyxml
      */
@@ -88,7 +90,7 @@ public class SchemalessMessageTransformer implements MessageTransformer<NetconfM
     public DOMRpcResult toRpcResult(final NetconfMessage rpcReply, final SchemaPath rpc) {
         final Document document = rpcReply.getDocument();
         final AnyXmlNode result;
-        if(BaseRpcSchemalessTransformer.isOkPresent(document)) {
+        if (BaseRpcSchemalessTransformer.isOkPresent(document)) {
             result =  null;
         } else {
             result = Builders.anyXmlBuilder()
@@ -102,10 +104,12 @@ public class SchemalessMessageTransformer implements MessageTransformer<NetconfM
     private void wrapPayload(final Document doc) {
         final Element payload = doc.getDocumentElement();
         doc.removeChild(payload);
-        final Element rpcNS = doc.createElementNS(NetconfMessageTransformUtil.NETCONF_RPC_QNAME.getNamespace().toString(),
+        final Element rpcNS =
+                doc.createElementNS(NetconfMessageTransformUtil.NETCONF_RPC_QNAME.getNamespace().toString(),
                 NetconfMessageTransformUtil.NETCONF_RPC_QNAME.getLocalName());
         // set msg id
-        rpcNS.setAttribute(NetconfMessageTransformUtil.MESSAGE_ID_ATTR, counter.getNewMessageId(NetconfMessageTransformUtil.MESSAGE_ID_PREFIX));
+        rpcNS.setAttribute(NetconfMessageTransformUtil.MESSAGE_ID_ATTR,
+                counter.getNewMessageId(NetconfMessageTransformUtil.MESSAGE_ID_PREFIX));
         rpcNS.appendChild(payload);
         doc.appendChild(rpcNS);
     }