From d03abd5d1287ce81ae3c6c4ff58fe255c77fc427 Mon Sep 17 00:00:00 2001 From: Matej Sramcik Date: Fri, 29 Sep 2023 12:48:46 +0200 Subject: [PATCH] Don't use NotificationListener (NodeRegistration) Don't use NotificationListener in classes used by NodeRegistration. This is a part of NotificationListener to Listener migration. JIRA: TRNSPRTPCE-756 Change-Id: Ic527adce8e535c2c7e5bd694afd7219b4e1a5613 Signed-off-by: Matej Sramcik --- .../networkmodel/dto/NodeRegistration.java | 41 +++++++++---------- .../listeners/AlarmNotificationListener.java | 12 ++++-- .../AlarmNotificationListener221.java | 12 ++++-- .../AlarmNotificationListener710.java | 13 ++++-- .../listeners/DeOperationsListener.java | 13 ++++-- .../listeners/DeOperationsListener221.java | 13 ++++-- .../listeners/DeOperationsListener710.java | 13 ++++-- .../listeners/DeviceListener121.java | 19 ++++++--- .../listeners/DeviceListener221.java | 22 ++++++---- .../listeners/DeviceListener710.java | 22 ++++++---- .../networkmodel/listeners/TcaListener.java | 13 ++++-- .../listeners/TcaListener221.java | 13 ++++-- .../listeners/TcaListener710.java | 13 ++++-- 13 files changed, 139 insertions(+), 80 deletions(-) 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 eb2a59330..61fd4b7f4 100644 --- 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> listeners; + private final List 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>(); + listeners = new ArrayList(); } 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())); } } diff --git a/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/listeners/AlarmNotificationListener.java b/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/listeners/AlarmNotificationListener.java index 434485beb..f0f57d62d 100644 --- a/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/listeners/AlarmNotificationListener.java +++ b/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/listeners/AlarmNotificationListener.java @@ -10,8 +10,10 @@ package org.opendaylight.transportpce.networkmodel.listeners; import java.util.ArrayList; import java.util.List; import java.util.Optional; +import java.util.Set; import java.util.concurrent.ExecutionException; import org.opendaylight.mdsal.binding.api.DataBroker; +import org.opendaylight.mdsal.binding.api.NotificationService.CompositeListener; import org.opendaylight.mdsal.binding.api.ReadTransaction; import org.opendaylight.mdsal.common.api.LogicalDatastoreType; import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.alarmsuppression.rev171102.ServiceNodelist; @@ -19,7 +21,6 @@ import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.alarmsupp import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.alarmsuppression.rev171102.service.nodelist.nodelist.Nodes; import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.alarmsuppression.rev171102.service.nodelist.nodelist.NodesBuilder; import org.opendaylight.yang.gen.v1.http.org.openroadm.alarm.rev161014.AlarmNotification; -import org.opendaylight.yang.gen.v1.http.org.openroadm.alarm.rev161014.OrgOpenroadmAlarmListener; import org.opendaylight.yang.gen.v1.http.org.openroadm.alarm.rev161014.alarm.ProbableCause; import org.opendaylight.yang.gen.v1.http.org.openroadm.resource.rev161014.resource.ResourceType; import org.opendaylight.yang.gen.v1.http.org.openroadm.resource.rev161014.resource.resource.Resource; @@ -37,7 +38,7 @@ import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class AlarmNotificationListener implements OrgOpenroadmAlarmListener { +public class AlarmNotificationListener { private static final Logger LOG = LoggerFactory.getLogger(AlarmNotificationListener.class); private static final String PIPE = "|"; @@ -47,14 +48,17 @@ public class AlarmNotificationListener implements OrgOpenroadmAlarmListener { this.dataBroker = dataBroker; } + public CompositeListener getCompositeListener() { + return new CompositeListener(Set.of( + new CompositeListener.Component<>(AlarmNotification.class, this::onAlarmNotification))); + } /** * Callback for alarm-notification. * * @param notification AlarmNotification object */ - @Override - public void onAlarmNotification(AlarmNotification notification) { + private void onAlarmNotification(AlarmNotification notification) { List allNodeList = new ArrayList<>(); InstanceIdentifier serviceNodeListIID = InstanceIdentifier.create(ServiceNodelist.class); try (ReadTransaction rtx = dataBroker.newReadOnlyTransaction()) { diff --git a/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/listeners/AlarmNotificationListener221.java b/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/listeners/AlarmNotificationListener221.java index d9973d23a..d7336eb55 100644 --- a/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/listeners/AlarmNotificationListener221.java +++ b/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/listeners/AlarmNotificationListener221.java @@ -10,8 +10,10 @@ package org.opendaylight.transportpce.networkmodel.listeners; import java.util.ArrayList; import java.util.List; import java.util.Optional; +import java.util.Set; import java.util.concurrent.ExecutionException; import org.opendaylight.mdsal.binding.api.DataBroker; +import org.opendaylight.mdsal.binding.api.NotificationService.CompositeListener; import org.opendaylight.mdsal.binding.api.ReadTransaction; import org.opendaylight.mdsal.common.api.LogicalDatastoreType; import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.alarmsuppression.rev171102.ServiceNodelist; @@ -19,7 +21,6 @@ import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.alarmsupp import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.alarmsuppression.rev171102.service.nodelist.nodelist.Nodes; import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.alarmsuppression.rev171102.service.nodelist.nodelist.NodesBuilder; import org.opendaylight.yang.gen.v1.http.org.openroadm.alarm.rev181019.AlarmNotification; -import org.opendaylight.yang.gen.v1.http.org.openroadm.alarm.rev181019.OrgOpenroadmAlarmListener; import org.opendaylight.yang.gen.v1.http.org.openroadm.alarm.rev181019.alarm.ProbableCause; import org.opendaylight.yang.gen.v1.http.org.openroadm.resource.rev181019.resource.ResourceType; import org.opendaylight.yang.gen.v1.http.org.openroadm.resource.rev181019.resource.resource.Resource; @@ -37,7 +38,7 @@ import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class AlarmNotificationListener221 implements OrgOpenroadmAlarmListener { +public class AlarmNotificationListener221 { private static final Logger LOG = LoggerFactory.getLogger(AlarmNotificationListener221.class); private static final String PIPE = "|"; @@ -47,14 +48,17 @@ public class AlarmNotificationListener221 implements OrgOpenroadmAlarmListener { this.dataBroker = dataBroker; } + public CompositeListener getCompositeListener() { + return new CompositeListener(Set.of( + new CompositeListener.Component<>(AlarmNotification.class, this::onAlarmNotification))); + } /** * Callback for alarm-notification. * * @param notification AlarmNotification object */ - @Override - public void onAlarmNotification(AlarmNotification notification) { + private void onAlarmNotification(AlarmNotification notification) { List allNodeList = new ArrayList<>(); InstanceIdentifier serviceNodeListIID = InstanceIdentifier.create(ServiceNodelist.class); try { diff --git a/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/listeners/AlarmNotificationListener710.java b/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/listeners/AlarmNotificationListener710.java index 4f825e487..e5328bd6e 100644 --- a/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/listeners/AlarmNotificationListener710.java +++ b/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/listeners/AlarmNotificationListener710.java @@ -10,8 +10,10 @@ package org.opendaylight.transportpce.networkmodel.listeners; import java.util.ArrayList; import java.util.List; import java.util.Optional; +import java.util.Set; import java.util.concurrent.ExecutionException; import org.opendaylight.mdsal.binding.api.DataBroker; +import org.opendaylight.mdsal.binding.api.NotificationService.CompositeListener; import org.opendaylight.mdsal.binding.api.ReadTransaction; import org.opendaylight.mdsal.common.api.LogicalDatastoreType; import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.alarmsuppression.rev171102.ServiceNodelist; @@ -19,7 +21,6 @@ import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.alarmsupp import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.alarmsuppression.rev171102.service.nodelist.nodelist.Nodes; import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.alarmsuppression.rev171102.service.nodelist.nodelist.NodesBuilder; import org.opendaylight.yang.gen.v1.http.org.openroadm.alarm.rev200529.AlarmNotification; -import org.opendaylight.yang.gen.v1.http.org.openroadm.alarm.rev200529.OrgOpenroadmAlarmListener; import org.opendaylight.yang.gen.v1.http.org.openroadm.alarm.rev200529.alarm.ProbableCause; import org.opendaylight.yang.gen.v1.http.org.openroadm.resource.rev200529.resource.ResourceType; import org.opendaylight.yang.gen.v1.http.org.openroadm.resource.rev200529.resource.resource.Resource; @@ -37,7 +38,7 @@ import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class AlarmNotificationListener710 implements OrgOpenroadmAlarmListener { +public class AlarmNotificationListener710 { private static final Logger LOG = LoggerFactory.getLogger(AlarmNotificationListener710.class); private static final String PIPE = "|"; @@ -47,14 +48,18 @@ public class AlarmNotificationListener710 implements OrgOpenroadmAlarmListener { this.dataBroker = dataBroker; } + public CompositeListener getCompositeListener() { + return new CompositeListener(Set.of( + new CompositeListener.Component<>(AlarmNotification.class, this::onAlarmNotification))); + } + /** * Callback for alarm-notification. * * @param notification AlarmNotification object */ - @Override - public void onAlarmNotification(AlarmNotification notification) { + private void onAlarmNotification(AlarmNotification notification) { List allNodeList = new ArrayList<>(); InstanceIdentifier serviceNodeListIID = InstanceIdentifier.create(ServiceNodelist.class); try { diff --git a/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/listeners/DeOperationsListener.java b/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/listeners/DeOperationsListener.java index c861c2f8e..3844e3f8b 100644 --- a/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/listeners/DeOperationsListener.java +++ b/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/listeners/DeOperationsListener.java @@ -8,22 +8,27 @@ package org.opendaylight.transportpce.networkmodel.listeners; -import org.opendaylight.yang.gen.v1.http.org.openroadm.de.operations.rev161014.OrgOpenroadmDeOperationsListener; +import java.util.Set; +import org.opendaylight.mdsal.binding.api.NotificationService.CompositeListener; import org.opendaylight.yang.gen.v1.http.org.openroadm.de.operations.rev161014.RestartNotification; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class DeOperationsListener implements OrgOpenroadmDeOperationsListener { +public class DeOperationsListener { private static final Logger LOG = LoggerFactory.getLogger(DeOperationsListener.class); + public CompositeListener getCompositeListener() { + return new CompositeListener(Set.of( + new CompositeListener.Component<>(RestartNotification.class, this::onRestartNotification))); + } + /** * Callback for restart-notification. * * @param notification RestartNotification object */ - @Override - public void onRestartNotification(RestartNotification notification) { + private void onRestartNotification(RestartNotification notification) { LOG.info("Notification {} received {}", RestartNotification.QNAME, notification); } diff --git a/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/listeners/DeOperationsListener221.java b/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/listeners/DeOperationsListener221.java index 61961c3d5..0a8fd0f65 100644 --- a/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/listeners/DeOperationsListener221.java +++ b/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/listeners/DeOperationsListener221.java @@ -8,22 +8,27 @@ package org.opendaylight.transportpce.networkmodel.listeners; -import org.opendaylight.yang.gen.v1.http.org.openroadm.de.operations.rev181019.OrgOpenroadmDeOperationsListener; +import java.util.Set; +import org.opendaylight.mdsal.binding.api.NotificationService.CompositeListener; import org.opendaylight.yang.gen.v1.http.org.openroadm.de.operations.rev181019.RestartNotification; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class DeOperationsListener221 implements OrgOpenroadmDeOperationsListener { +public class DeOperationsListener221 { private static final Logger LOG = LoggerFactory.getLogger(DeOperationsListener221.class); + public CompositeListener getCompositeListener() { + return new CompositeListener(Set.of( + new CompositeListener.Component<>(RestartNotification.class, this::onRestartNotification))); + } + /** * Callback for restart-notification. * * @param notification RestartNotification object */ - @Override - public void onRestartNotification(RestartNotification notification) { + private void onRestartNotification(RestartNotification notification) { LOG.info("Notification {} received {}", RestartNotification.QNAME, notification); } diff --git a/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/listeners/DeOperationsListener710.java b/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/listeners/DeOperationsListener710.java index f6c8be94a..cd33475fd 100644 --- a/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/listeners/DeOperationsListener710.java +++ b/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/listeners/DeOperationsListener710.java @@ -8,22 +8,27 @@ package org.opendaylight.transportpce.networkmodel.listeners; -import org.opendaylight.yang.gen.v1.http.org.openroadm.de.operations.rev200529.OrgOpenroadmDeOperationsListener; +import java.util.Set; +import org.opendaylight.mdsal.binding.api.NotificationService.CompositeListener; import org.opendaylight.yang.gen.v1.http.org.openroadm.de.operations.rev200529.RestartNotification; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class DeOperationsListener710 implements OrgOpenroadmDeOperationsListener { +public class DeOperationsListener710 { private static final Logger LOG = LoggerFactory.getLogger(DeOperationsListener710.class); + public CompositeListener getCompositeListener() { + return new CompositeListener(Set.of( + new CompositeListener.Component<>(RestartNotification.class, this::onRestartNotification))); + } + /** * Callback for restart-notification. * * @param notification RestartNotification object */ - @Override - public void onRestartNotification(RestartNotification notification) { + private void onRestartNotification(RestartNotification notification) { LOG.info("Notification {} received {}", RestartNotification.QNAME, notification); } diff --git a/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/listeners/DeviceListener121.java b/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/listeners/DeviceListener121.java index 9ab30acbf..d73b4223f 100644 --- a/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/listeners/DeviceListener121.java +++ b/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/listeners/DeviceListener121.java @@ -9,10 +9,11 @@ package org.opendaylight.transportpce.networkmodel.listeners; import java.util.LinkedList; +import java.util.Set; +import org.opendaylight.mdsal.binding.api.NotificationService.CompositeListener; import org.opendaylight.transportpce.common.mapping.PortMapping; import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev220922.mapping.Mapping; import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev170206.ChangeNotification; -import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev170206.OrgOpenroadmDeviceListener; import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev170206.OtdrScanResult; import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev170206.change.notification.Edit; import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev170206.circuit.pack.Ports; @@ -22,7 +23,7 @@ import org.opendaylight.yangtools.yang.binding.InstanceIdentifier.PathArgument; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class DeviceListener121 implements OrgOpenroadmDeviceListener { +public class DeviceListener121 { private static final Logger LOG = LoggerFactory.getLogger(DeviceListener121.class); private final String nodeId; @@ -34,13 +35,20 @@ public class DeviceListener121 implements OrgOpenroadmDeviceListener { this.portMapping = portMapping; } + public CompositeListener getCompositeListener() { + return new CompositeListener(Set.of( + new CompositeListener.Component<>(ChangeNotification.class, this::onChangeNotification), + new CompositeListener.Component<>(OtdrScanResult.class, this::onOtdrScanResult) + )); + } + /** * Callback for change-notification. * * @param notification ChangeNotification object */ - @Override - public void onChangeNotification(ChangeNotification notification) { + + void onChangeNotification(ChangeNotification notification) { if (notification.getEdit() == null) { LOG.warn("unable to handle {} notificatin received - list of edit is null", ChangeNotification.QNAME); return; @@ -87,8 +95,7 @@ public class DeviceListener121 implements OrgOpenroadmDeviceListener { * * @param notification OtdrScanResult object */ - @Override - public void onOtdrScanResult(OtdrScanResult notification) { + private void onOtdrScanResult(OtdrScanResult notification) { LOG.info("Notification {} received {}", OtdrScanResult.QNAME, notification); } diff --git a/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/listeners/DeviceListener221.java b/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/listeners/DeviceListener221.java index 79eaa3e68..27cc03312 100644 --- a/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/listeners/DeviceListener221.java +++ b/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/listeners/DeviceListener221.java @@ -9,11 +9,12 @@ package org.opendaylight.transportpce.networkmodel.listeners; import java.util.LinkedList; +import java.util.Set; +import org.opendaylight.mdsal.binding.api.NotificationService.CompositeListener; import org.opendaylight.transportpce.common.mapping.PortMapping; import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev220922.mapping.Mapping; import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev181019.ChangeNotification; import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev181019.CreateTechInfoNotification; -import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev181019.OrgOpenroadmDeviceListener; import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev181019.OtdrScanResult; import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev181019.change.notification.Edit; import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev181019.circuit.pack.Ports; @@ -24,7 +25,7 @@ import org.opendaylight.yangtools.yang.binding.InstanceIdentifier.PathArgument; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class DeviceListener221 implements OrgOpenroadmDeviceListener { +public class DeviceListener221 { private static final Logger LOG = LoggerFactory.getLogger(DeviceListener221.class); private final String nodeId; @@ -36,14 +37,21 @@ public class DeviceListener221 implements OrgOpenroadmDeviceListener { this.portMapping = portMapping; } + public CompositeListener getCompositeListener() { + return new CompositeListener(Set.of( + new CompositeListener.Component<>(ChangeNotification.class, this::onChangeNotification), + new CompositeListener.Component<>(CreateTechInfoNotification.class, this::onCreateTechInfoNotification), + new CompositeListener.Component<>(OtdrScanResult.class, this::onOtdrScanResult) + )); + } + /** * Callback for change-notification. * * @param notification * ChangeNotification object */ - @Override - public void onChangeNotification(ChangeNotification notification) { + void onChangeNotification(ChangeNotification notification) { LOG.info("notification received from device {}: {}", this.nodeId, notification.toString()); if (notification.getEdit() == null) { LOG.warn("unable to handle {} notificatin received - list of edit is null", ChangeNotification.QNAME); @@ -107,8 +115,7 @@ public class DeviceListener221 implements OrgOpenroadmDeviceListener { } } - @Override - public void onCreateTechInfoNotification(CreateTechInfoNotification notification) { + private void onCreateTechInfoNotification(CreateTechInfoNotification notification) { } /** @@ -117,8 +124,7 @@ public class DeviceListener221 implements OrgOpenroadmDeviceListener { * @param notification * OtdrScanResult object */ - @Override - public void onOtdrScanResult(OtdrScanResult notification) { + private void onOtdrScanResult(OtdrScanResult notification) { LOG.info("Notification {} received {}", OtdrScanResult.QNAME, notification); } diff --git a/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/listeners/DeviceListener710.java b/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/listeners/DeviceListener710.java index b774337f1..13b044345 100644 --- a/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/listeners/DeviceListener710.java +++ b/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/listeners/DeviceListener710.java @@ -13,11 +13,12 @@ import java.util.HashMap; import java.util.LinkedList; import java.util.List; import java.util.Map; +import java.util.Set; +import org.opendaylight.mdsal.binding.api.NotificationService.CompositeListener; import org.opendaylight.transportpce.common.mapping.PortMapping; import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev220922.mapping.Mapping; import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev200529.ChangeNotification; import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev200529.CreateTechInfoNotification; -import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev200529.OrgOpenroadmDeviceListener; import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev200529.OtdrScanResult; import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev200529.change.notification.Edit; import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev200529.circuit.pack.Ports; @@ -31,7 +32,7 @@ import org.opendaylight.yangtools.yang.common.Uint16; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class DeviceListener710 implements OrgOpenroadmDeviceListener { +public class DeviceListener710 { private static final Logger LOG = LoggerFactory.getLogger(DeviceListener710.class); private final String nodeId; @@ -43,14 +44,21 @@ public class DeviceListener710 implements OrgOpenroadmDeviceListener { this.portMapping = portMapping; } + public CompositeListener getCompositeListener() { + return new CompositeListener(Set.of( + new CompositeListener.Component<>(ChangeNotification.class, this::onChangeNotification), + new CompositeListener.Component<>(CreateTechInfoNotification.class, this::onCreateTechInfoNotification), + new CompositeListener.Component<>(OtdrScanResult.class, this::onOtdrScanResult) + )); + } + /** * Callback for change-notification. * * @param notification * ChangeNotification object */ - @Override - public void onChangeNotification(ChangeNotification notification) { + void onChangeNotification(ChangeNotification notification) { LOG.debug("device71 notification received = {}", notification); if (notification.getEdit() == null) { LOG.warn("unable to handle {} notificatin received - list of edit is null", ChangeNotification.QNAME); @@ -123,8 +131,7 @@ public class DeviceListener710 implements OrgOpenroadmDeviceListener { } } - @Override - public void onCreateTechInfoNotification(CreateTechInfoNotification notification) { + private void onCreateTechInfoNotification(CreateTechInfoNotification notification) { } /** @@ -133,8 +140,7 @@ public class DeviceListener710 implements OrgOpenroadmDeviceListener { * @param notification * OtdrScanResult object */ - @Override - public void onOtdrScanResult(OtdrScanResult notification) { + private void onOtdrScanResult(OtdrScanResult notification) { LOG.info("Notification {} received {}", OtdrScanResult.QNAME, notification); } diff --git a/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/listeners/TcaListener.java b/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/listeners/TcaListener.java index ecfa36584..6fc8ba60c 100644 --- a/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/listeners/TcaListener.java +++ b/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/listeners/TcaListener.java @@ -8,21 +8,26 @@ package org.opendaylight.transportpce.networkmodel.listeners; -import org.opendaylight.yang.gen.v1.http.org.openroadm.tca.rev161014.OrgOpenroadmTcaListener; +import java.util.Set; +import org.opendaylight.mdsal.binding.api.NotificationService.CompositeListener; import org.opendaylight.yang.gen.v1.http.org.openroadm.tca.rev161014.TcaNotification; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class TcaListener implements OrgOpenroadmTcaListener { +public class TcaListener { private static final Logger LOG = LoggerFactory.getLogger(TcaListener.class); + public CompositeListener getCompositeListener() { + return new CompositeListener(Set.of( + new CompositeListener.Component<>(TcaNotification.class, this::onTcaNotification))); + } + /** * Callback for tca-notification. * @param notification TcaNotification object */ - @Override - public void onTcaNotification(TcaNotification notification) { + private void onTcaNotification(TcaNotification notification) { LOG.info("Notification {} received {}", TcaNotification.QNAME, notification); } diff --git a/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/listeners/TcaListener221.java b/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/listeners/TcaListener221.java index 68cec92f4..b3429c687 100644 --- a/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/listeners/TcaListener221.java +++ b/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/listeners/TcaListener221.java @@ -8,21 +8,26 @@ package org.opendaylight.transportpce.networkmodel.listeners; -import org.opendaylight.yang.gen.v1.http.org.openroadm.tca.rev181019.OrgOpenroadmTcaListener; +import java.util.Set; +import org.opendaylight.mdsal.binding.api.NotificationService.CompositeListener; import org.opendaylight.yang.gen.v1.http.org.openroadm.tca.rev181019.TcaNotification; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class TcaListener221 implements OrgOpenroadmTcaListener { +public class TcaListener221 { private static final Logger LOG = LoggerFactory.getLogger(TcaListener221.class); + public CompositeListener getCompositeListener() { + return new CompositeListener(Set.of( + new CompositeListener.Component<>(TcaNotification.class, this::onTcaNotification))); + } + /** * Callback for tca-notification. * @param notification TcaNotification object */ - @Override - public void onTcaNotification(TcaNotification notification) { + private void onTcaNotification(TcaNotification notification) { LOG.info("Notification {} received {}", TcaNotification.QNAME, notification); } diff --git a/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/listeners/TcaListener710.java b/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/listeners/TcaListener710.java index 220e23b7b..14ec27289 100644 --- a/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/listeners/TcaListener710.java +++ b/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/listeners/TcaListener710.java @@ -8,21 +8,26 @@ package org.opendaylight.transportpce.networkmodel.listeners; -import org.opendaylight.yang.gen.v1.http.org.openroadm.tca.rev200327.OrgOpenroadmTcaListener; +import java.util.Set; +import org.opendaylight.mdsal.binding.api.NotificationService.CompositeListener; import org.opendaylight.yang.gen.v1.http.org.openroadm.tca.rev200327.TcaNotification; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class TcaListener710 implements OrgOpenroadmTcaListener { +public class TcaListener710 { private static final Logger LOG = LoggerFactory.getLogger(TcaListener710.class); + public CompositeListener getCompositeListener() { + return new CompositeListener(Set.of( + new CompositeListener.Component<>(TcaNotification.class, this::onTcaNotification))); + } + /** * Callback for tca-notification. * @param notification TcaNotification object */ - @Override - public void onTcaNotification(TcaNotification notification) { + private void onTcaNotification(TcaNotification notification) { LOG.info("Notification {} received {}", TcaNotification.QNAME, notification); } -- 2.36.6