Remove dependency on controller config-util

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

diff --git a/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/NotificationHandler.java b/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/NotificationHandler.java
index 5b28366c07703d2b5337866f355438b5691bd4f2..5e9b33efab4995754839085d27dc975bb7b2a2bf 100644 (file)
--- a/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/NotificationHandler.java
+++ b/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/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.netconf.api.NetconfMessage;
+import org.opendaylight.netconf.api.xml.XmlUtil;
 import org.opendaylight.netconf.sal.connect.api.MessageTransformer;
 import org.opendaylight.netconf.sal.connect.api.RemoteDeviceHandler;
 import org.opendaylight.netconf.sal.connect.util.RemoteDeviceId;
@@ -50,10 +50,10 @@ final class NotificationHandler {
 
     /**
      * Forward all cached notifications and pass all notifications from this point directly to sal facade.
-     * @param messageTransformer Message transformer
+     * @param transformer Message transformer
      */
-    synchronized void onRemoteSchemaUp(final MessageTransformer<NetconfMessage> messageTransformer) {
-        this.messageTransformer = Preconditions.checkNotNull(messageTransformer);
+    synchronized void onRemoteSchemaUp(final MessageTransformer<NetconfMessage> transformer) {
+        this.messageTransformer = Preconditions.checkNotNull(transformer);
 
         passNotifications = true;
 
@@ -72,7 +72,7 @@ final class NotificationHandler {
     }
 
     private void queueNotification(final NetconfMessage notification) {
-        Preconditions.checkState(passNotifications == false);
+        Preconditions.checkState(!passNotifications);
 
         LOG.debug("{}: Caching notification {}, remote schema not yet fully built", id, notification);
         if (LOG.isTraceEnabled()) {
@@ -90,8 +90,8 @@ final class NotificationHandler {
         }
     }
 
-    synchronized void addNotificationFilter(final NotificationFilter filter) {
-        this.filter = filter;
+    synchronized void addNotificationFilter(final NotificationFilter newFilter) {
+        this.filter = newFilter;
     }
 
     synchronized void onRemoteSchemaDown() {