X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-netconf-connector%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fsal%2Fconnect%2Fnetconf%2FNotificationHandler.java;h=481afa5c833e9e74719d4aa2593b9953b86b2083;hb=412db94945c5db5d2da918f5e23bd3abcecc4d10;hp=bc3326e1ae5b58dc23dc7c14927a83d5d34d1fcf;hpb=cccc148d3cd2b5a2a7c86da2e74f2ea43fa00b93;p=controller.git

diff --git a/opendaylight/md-sal/sal-netconf-connector/src/main/java/org/opendaylight/controller/sal/connect/netconf/NotificationHandler.java b/opendaylight/md-sal/sal-netconf-connector/src/main/java/org/opendaylight/controller/sal/connect/netconf/NotificationHandler.java
index bc3326e1ae..481afa5c83 100644
--- a/opendaylight/md-sal/sal-netconf-connector/src/main/java/org/opendaylight/controller/sal/connect/netconf/NotificationHandler.java
+++ b/opendaylight/md-sal/sal-netconf-connector/src/main/java/org/opendaylight/controller/sal/connect/netconf/NotificationHandler.java
@@ -16,7 +16,8 @@ import org.opendaylight.controller.netconf.util.xml.XmlUtil;
 import org.opendaylight.controller.sal.connect.api.MessageTransformer;
 import org.opendaylight.controller.sal.connect.api.RemoteDeviceHandler;
 import org.opendaylight.controller.sal.connect.util.RemoteDeviceId;
-import org.opendaylight.yangtools.yang.data.api.CompositeNode;
+import org.opendaylight.yangtools.yang.data.api.schema.ContainerNode;
+import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -29,14 +30,14 @@ final class NotificationHandler {
 
     private final RemoteDeviceHandler<?> salFacade;
     private final List<NetconfMessage> queue = new LinkedList<>();
-    private final MessageTransformer<NetconfMessage> messageTransformer;
     private final RemoteDeviceId id;
     private boolean passNotifications = false;
+
     private NotificationFilter filter;
+    private MessageTransformer<NetconfMessage> messageTransformer;
 
-    NotificationHandler(final RemoteDeviceHandler<?> salFacade, final MessageTransformer<NetconfMessage> messageTransformer, final RemoteDeviceId id) {
+    NotificationHandler(final RemoteDeviceHandler<?> salFacade, final RemoteDeviceId id) {
         this.salFacade = Preconditions.checkNotNull(salFacade);
-        this.messageTransformer = Preconditions.checkNotNull(messageTransformer);
         this.id = Preconditions.checkNotNull(id);
     }
 
@@ -50,8 +51,11 @@ final class NotificationHandler {
 
     /**
      * Forward all cached notifications and pass all notifications from this point directly to sal facade.
+     * @param messageTransformer
      */
-    synchronized void onRemoteSchemaUp() {
+    synchronized void onRemoteSchemaUp(final MessageTransformer<NetconfMessage> messageTransformer) {
+        this.messageTransformer = Preconditions.checkNotNull(messageTransformer);
+
         passNotifications = true;
 
         for (final NetconfMessage cachedNotification : queue) {
@@ -61,8 +65,8 @@ final class NotificationHandler {
         queue.clear();
     }
 
-    private CompositeNode transformNotification(final NetconfMessage cachedNotification) {
-        final CompositeNode parsedNotification = messageTransformer.toNotification(cachedNotification);
+    private ContainerNode transformNotification(final NetconfMessage cachedNotification) {
+        final ContainerNode parsedNotification = messageTransformer.toNotification(cachedNotification);
         Preconditions.checkNotNull(parsedNotification, "%s: Unable to parse received notification: %s", id, cachedNotification);
         return parsedNotification;
     }
@@ -78,7 +82,7 @@ final class NotificationHandler {
         queue.add(notification);
     }
 
-    private synchronized void passNotification(final CompositeNode parsedNotification) {
+    private synchronized void passNotification(final ContainerNode parsedNotification) {
         logger.debug("{}: Forwarding notification {}", id, parsedNotification);
 
         if(filter == null || filter.filterNotification(parsedNotification).isPresent()) {
@@ -93,10 +97,11 @@ final class NotificationHandler {
     synchronized void onRemoteSchemaDown() {
         queue.clear();
         passNotifications = false;
+        messageTransformer = null;
     }
 
     static interface NotificationFilter {
 
-        Optional<CompositeNode> filterNotification(CompositeNode notification);
+        Optional<NormalizedNode<?, ?>> filterNotification(NormalizedNode<?, ?> notification);
     }
 }