Bump upstreams

[lispflowmapping.git] / mappingservice / implementation / src / main / java / org / opendaylight / lispflowmapping / implementation / mdsal / AbstractDataListener.java

diff --git a/mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/mdsal/AbstractDataListener.java b/mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/mdsal/AbstractDataListener.java
index 13704a5133cfd1b7c9db6a635903df2d6676d1b6..88ef3aeeade570df5b358387d7fe2af558979b09 100644 (file)
--- a/mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/mdsal/AbstractDataListener.java
+++ b/mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/mdsal/AbstractDataListener.java
@@ -7,11 +7,11 @@
  */
 package org.opendaylight.lispflowmapping.implementation.mdsal;
 
-import org.opendaylight.controller.md.sal.binding.api.ClusteredDataTreeChangeListener;
-import org.opendaylight.controller.md.sal.binding.api.DataBroker;
-import org.opendaylight.controller.md.sal.binding.api.DataTreeIdentifier;
-import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
-import org.opendaylight.yangtools.concepts.ListenerRegistration;
+import org.opendaylight.mdsal.binding.api.DataBroker;
+import org.opendaylight.mdsal.binding.api.DataTreeChangeListener;
+import org.opendaylight.mdsal.binding.api.DataTreeIdentifier;
+import org.opendaylight.mdsal.common.api.LogicalDatastoreType;
+import org.opendaylight.yangtools.concepts.Registration;
 import org.opendaylight.yangtools.yang.binding.DataObject;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 
@@ -19,20 +19,17 @@ import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
  * The superclass for the different MD-SAL data change event listeners.
  *
  */
-public abstract class AbstractDataListener<T extends DataObject> implements ClusteredDataTreeChangeListener<T> {
+public abstract class AbstractDataListener<T extends DataObject> implements DataTreeChangeListener<T> {
     private DataBroker broker;
     private InstanceIdentifier<T> path;
-    private ListenerRegistration<ClusteredDataTreeChangeListener<T>> configRegistration;
-    private ListenerRegistration<ClusteredDataTreeChangeListener<T>> operRegistration;
-
-    public void registerDataChangeListener() {
-        final DataTreeIdentifier<T> configDataTreeIdentifier = new DataTreeIdentifier<>(
-                LogicalDatastoreType.CONFIGURATION, path);
-        final DataTreeIdentifier<T> operDataTreeIdentifier = new DataTreeIdentifier<>(
-                LogicalDatastoreType.OPERATIONAL, path);
-
-        configRegistration = broker.registerDataTreeChangeListener(configDataTreeIdentifier, this);
-        operRegistration = broker.registerDataTreeChangeListener(operDataTreeIdentifier, this);
+    private Registration configRegistration;
+    private Registration operRegistration;
+
+    void registerDataChangeListener() {
+        configRegistration = broker.registerTreeChangeListener(
+            DataTreeIdentifier.of(LogicalDatastoreType.CONFIGURATION, path), this);
+        operRegistration = broker.registerTreeChangeListener(
+            DataTreeIdentifier.of(LogicalDatastoreType.OPERATIONAL, path), this);
     }
 
     public void closeDataChangeListener() {
@@ -40,12 +37,11 @@ public abstract class AbstractDataListener<T extends DataObject> implements Clus
         operRegistration.close();
     }
 
-    public void setBroker(DataBroker broker) {
+    void setBroker(DataBroker broker) {
         this.broker = broker;
     }
 
     void setPath(InstanceIdentifier<T> path) {
         this.path = path;
     }
-
 }