From 394fbe42b4c445fc7958e976233066c9b03151c4 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Sun, 20 Jan 2019 14:52:19 +0100 Subject: [PATCH] Simplify NotificationListenerAdapter There is just no need for the ceremony around what sort of normalized node a DOMNotification has -- just use ContainerNode. Change-Id: I66e2e0e72b75b0ce58be359eaa40668bc0c53b81 Signed-off-by: Robert Varga --- .../streams/listeners/NotificationListenerAdapter.java | 9 ++------- .../streams/listeners/NotificationListenerAdapter.java | 9 ++------- 2 files changed, 4 insertions(+), 14 deletions(-) diff --git a/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/streams/listeners/NotificationListenerAdapter.java b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/streams/listeners/NotificationListenerAdapter.java index 95c2ca26fb..653e0bfbc1 100644 --- a/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/streams/listeners/NotificationListenerAdapter.java +++ b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/streams/listeners/NotificationListenerAdapter.java @@ -15,17 +15,13 @@ import java.io.IOException; import java.io.StringWriter; import java.io.Writer; import java.time.Instant; -import java.util.Collection; import javax.xml.stream.XMLStreamException; import javax.xml.transform.dom.DOMResult; import org.opendaylight.mdsal.dom.api.DOMNotification; import org.opendaylight.mdsal.dom.api.DOMNotificationListener; import org.opendaylight.netconf.sal.restconf.impl.ControllerContext; import org.opendaylight.restconf.common.errors.RestconfDocumentedException; -import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifier; -import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.PathArgument; -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.ContainerNode; import org.opendaylight.yangtools.yang.data.api.schema.stream.NormalizedNodeStreamWriter; import org.opendaylight.yangtools.yang.data.api.schema.stream.NormalizedNodeWriter; import org.opendaylight.yangtools.yang.data.codec.gson.JSONCodecFactorySupplier; @@ -184,8 +180,7 @@ public class NotificationListenerAdapter extends AbstractCommonSubscriber implem } private void addValuesToNotificationEventElement(final Document doc, final Element element) { - final NormalizedNode>> body = - notification.getBody(); + final ContainerNode body = notification.getBody(); try { final DOMResult domResult = writeNormalizedNode(body, schemaContext, this.path); diff --git a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/streams/listeners/NotificationListenerAdapter.java b/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/streams/listeners/NotificationListenerAdapter.java index 947c454b36..1a3e1e2093 100644 --- a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/streams/listeners/NotificationListenerAdapter.java +++ b/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/streams/listeners/NotificationListenerAdapter.java @@ -15,16 +15,12 @@ import java.io.IOException; import java.io.StringWriter; import java.io.Writer; import java.time.Instant; -import java.util.Collection; import javax.xml.stream.XMLStreamException; import javax.xml.transform.dom.DOMResult; import org.opendaylight.mdsal.dom.api.DOMNotification; import org.opendaylight.mdsal.dom.api.DOMNotificationListener; import org.opendaylight.restconf.common.errors.RestconfDocumentedException; -import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifier; -import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.PathArgument; -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.ContainerNode; import org.opendaylight.yangtools.yang.data.api.schema.stream.NormalizedNodeStreamWriter; import org.opendaylight.yangtools.yang.data.api.schema.stream.NormalizedNodeWriter; import org.opendaylight.yangtools.yang.data.codec.gson.JSONCodecFactorySupplier; @@ -186,8 +182,7 @@ public class NotificationListenerAdapter extends AbstractCommonSubscriber implem return; } - final NormalizedNode>> body = - notification.getBody(); + final ContainerNode body = notification.getBody(); try { final DOMResult domResult = writeNormalizedNode(body, schemaContext, this.path); -- 2.36.6