Decouple config and netconf subsystems.

[controller.git] / opendaylight / netconf / sal-netconf-connector / src / main / java / org / opendaylight / controller / sal / connect / netconf / NotificationHandler.java

diff --git a/opendaylight/md-sal/sal-netconf-connector/src/main/java/org/opendaylight/controller/sal/connect/netconf/NotificationHandler.java b/opendaylight/netconf/sal-netconf-connector/src/main/java/org/opendaylight/controller/sal/connect/netconf/NotificationHandler.java
similarity index 88%
rename from opendaylight/md-sal/sal-netconf-connector/src/main/java/org/opendaylight/controller/sal/connect/netconf/NotificationHandler.java
rename to opendaylight/netconf/sal-netconf-connector/src/main/java/org/opendaylight/controller/sal/connect/netconf/NotificationHandler.java
index 2d47c6ae1bbe11f5863d66c97db5301208fa29ae..6a0d8984e9bdd1ce989be5fd0c5e4de70d5895de 100644 (file)
--- a/opendaylight/md-sal/sal-netconf-connector/src/main/java/org/opendaylight/controller/sal/connect/netconf/NotificationHandler.java
+++ b/opendaylight/netconf/sal-netconf-connector/src/main/java/org/opendaylight/controller/sal/connect/netconf/NotificationHandler.java
@@ -11,9 +11,9 @@ import com.google.common.base.Optional;
 import com.google.common.base.Preconditions;
 import java.util.LinkedList;
 import java.util.List;
+import org.opendaylight.controller.config.util.xml.XmlUtil;
 import org.opendaylight.controller.md.sal.dom.api.DOMNotification;
 import org.opendaylight.controller.netconf.api.NetconfMessage;
-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;
@@ -25,7 +25,7 @@ import org.slf4j.LoggerFactory;
  */
 final class NotificationHandler {
 
-    private static final Logger logger = LoggerFactory.getLogger(NotificationHandler.class);
+    private static final Logger LOG = LoggerFactory.getLogger(NotificationHandler.class);
 
     private final RemoteDeviceHandler<?> salFacade;
     private final List<NetconfMessage> queue = new LinkedList<>();
@@ -73,16 +73,16 @@ final class NotificationHandler {
     private void queueNotification(final NetconfMessage notification) {
         Preconditions.checkState(passNotifications == false);
 
-        logger.debug("{}: Caching notification {}, remote schema not yet fully built", id, notification);
-        if(logger.isTraceEnabled()) {
-            logger.trace("{}: Caching notification {}", id, XmlUtil.toString(notification.getDocument()));
+        LOG.debug("{}: Caching notification {}, remote schema not yet fully built", id, notification);
+        if(LOG.isTraceEnabled()) {
+            LOG.trace("{}: Caching notification {}", id, XmlUtil.toString(notification.getDocument()));
         }
 
         queue.add(notification);
     }
 
     private synchronized void passNotification(final DOMNotification parsedNotification) {
-        logger.debug("{}: Forwarding notification {}", id, parsedNotification);
+        LOG.debug("{}: Forwarding notification {}", id, parsedNotification);
 
         if(filter == null || filter.filterNotification(parsedNotification).isPresent()) {
             salFacade.onNotification(parsedNotification);