Don't use NotificationListener (NodeRegistration)

[transportpce.git] / networkmodel / src / main / java / org / opendaylight / transportpce / networkmodel / dto / NodeRegistration.java

diff --git a/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/dto/NodeRegistration.java b/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/dto/NodeRegistration.java
index eb2a59330bf08ad262ac36e1f811a6aed8f30862..61fd4b7f48c3e9a96494e402ae5c6199ad94b925 100644 (file)
--- a/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/dto/NodeRegistration.java
+++ b/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/dto/NodeRegistration.java
@@ -25,10 +25,7 @@ import org.opendaylight.transportpce.networkmodel.listeners.DeviceListener710;
 import org.opendaylight.transportpce.networkmodel.listeners.TcaListener;
 import org.opendaylight.transportpce.networkmodel.listeners.TcaListener221;
 import org.opendaylight.transportpce.networkmodel.listeners.TcaListener710;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.alarm.rev161014.OrgOpenroadmAlarmListener;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.de.operations.rev161014.OrgOpenroadmDeOperationsListener;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev170206.OrgOpenroadmDeviceListener;
-import org.opendaylight.yangtools.concepts.ListenerRegistration;
+import org.opendaylight.yangtools.concepts.Registration;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -39,7 +36,7 @@ public class NodeRegistration {
     private final NotificationService notificationService;
     private final DataBroker dataBroker;
     private final PortMapping portMapping;
-    private final List<ListenerRegistration<?>> listeners;
+    private final List<Registration> listeners;
 
     public NodeRegistration(String nodeId, String nodeVersion, NotificationService notificationService,
             DataBroker dataBroker, PortMapping portMapping) {
@@ -48,7 +45,7 @@ public class NodeRegistration {
         this.notificationService = notificationService;
         this.dataBroker = dataBroker;
         this.portMapping = portMapping;
-        listeners = new ArrayList<ListenerRegistration<?>>();
+        listeners = new ArrayList<Registration>();
     }
 
     public void registerListeners() {
@@ -70,62 +67,62 @@ public class NodeRegistration {
 
     public void unregisterListeners() {
         LOG.info("Unregistering notification listeners for node: {}", this.nodeId);
-        for (ListenerRegistration<?> listenerRegistration : listeners) {
+        for (Registration listenerRegistration : listeners) {
             listenerRegistration.close();
         }
     }
 
     private void registerListeners121() {
-        OrgOpenroadmAlarmListener alarmListener = new AlarmNotificationListener(this.dataBroker);
+        AlarmNotificationListener alarmListener = new AlarmNotificationListener(this.dataBroker);
         LOG.info("Registering notification listener on OrgOpenroadmAlarmListener for node: {}", nodeId);
-        listeners.add(notificationService.registerNotificationListener(alarmListener));
+        listeners.add(notificationService.registerCompositeListener(alarmListener.getCompositeListener()));
 
-        OrgOpenroadmDeOperationsListener deOperationsListener = new DeOperationsListener();
+        DeOperationsListener deOperationsListener = new DeOperationsListener();
         LOG.info("Registering notification listener on OrgOpenroadmDeOperationsListener for node: {}", nodeId);
-        listeners.add(notificationService.registerNotificationListener(deOperationsListener));
+        listeners.add(notificationService.registerCompositeListener(deOperationsListener.getCompositeListener()));
 
-        OrgOpenroadmDeviceListener deviceListener = new DeviceListener121(nodeId, this.portMapping);
+        DeviceListener121 deviceListener = new DeviceListener121(nodeId, this.portMapping);
         LOG.info("Registering notification listener on OrgOpenroadmDeviceListener for node: {}", nodeId);
-        listeners.add(notificationService.registerNotificationListener(deviceListener));
+        listeners.add(notificationService.registerCompositeListener(deviceListener.getCompositeListener()));
 
         TcaListener tcaListener = new TcaListener();
         LOG.info("Registering notification listener on OrgOpenroadmTcaListener for node: {}", nodeId);
-        listeners.add(notificationService.registerNotificationListener(tcaListener));
+        listeners.add(notificationService.registerCompositeListener(tcaListener.getCompositeListener()));
     }
 
     private void registerListeners221() {
         AlarmNotificationListener221 alarmListener = new AlarmNotificationListener221(dataBroker);
         LOG.info("Registering notification listener on OrgOpenroadmAlarmListener for node: {}", nodeId);
-        listeners.add(notificationService.registerNotificationListener(alarmListener));
+        listeners.add(notificationService.registerCompositeListener(alarmListener.getCompositeListener()));
 
         DeOperationsListener221 deOperationsListener = new DeOperationsListener221();
         LOG.info("Registering notification listener on OrgOpenroadmDeOperationsListener for node: {}", nodeId);
-        listeners.add(notificationService.registerNotificationListener(deOperationsListener));
+        listeners.add(notificationService.registerCompositeListener(deOperationsListener.getCompositeListener()));
 
         DeviceListener221 deviceListener = new DeviceListener221(nodeId, this.portMapping);
         LOG.info("Registering notification listener on OrgOpenroadmDeviceListener for node: {}", nodeId);
-        listeners.add(notificationService.registerNotificationListener(deviceListener));
+        listeners.add(notificationService.registerCompositeListener(deviceListener.getCompositeListener()));
 
         TcaListener221 tcaListener = new TcaListener221();
         LOG.info("Registering notification listener on OrgOpenroadmTcaListener for node: {}", nodeId);
-        listeners.add(notificationService.registerNotificationListener(tcaListener));
+        listeners.add(notificationService.registerCompositeListener(tcaListener.getCompositeListener()));
     }
 
     private void registerListeners710() {
         AlarmNotificationListener710 alarmListener = new AlarmNotificationListener710(dataBroker);
         LOG.info("Registering notification listener on OrgOpenroadmAlarmListener for node: {}", nodeId);
-        listeners.add(notificationService.registerNotificationListener(alarmListener));
+        listeners.add(notificationService.registerCompositeListener(alarmListener.getCompositeListener()));
 
         DeOperationsListener710 deOperationsListener = new DeOperationsListener710();
         LOG.info("Registering notification listener on OrgOpenroadmDeOperationsListener for node: {}", nodeId);
-        listeners.add(notificationService.registerNotificationListener(deOperationsListener));
+        listeners.add(notificationService.registerCompositeListener(deOperationsListener.getCompositeListener()));
 
         DeviceListener710 deviceListener = new DeviceListener710(nodeId, this.portMapping);
         LOG.info("Registering notification listener on OrgOpenroadmDeviceListener for node: {}", nodeId);
-        listeners.add(notificationService.registerNotificationListener(deviceListener));
+        listeners.add(notificationService.registerCompositeListener(deviceListener.getCompositeListener()));
 
         TcaListener710 tcaListener = new TcaListener710();
         LOG.info("Registering notification listener on OrgOpenroadmTcaListener for node: {}", nodeId);
-        listeners.add(notificationService.registerNotificationListener(tcaListener));
+        listeners.add(notificationService.registerCompositeListener(tcaListener.getCompositeListener()));
     }
 }