Migrate test-provider to CompositeListener

[openflowplugin.git] / test-provider / src / main / java / org / opendaylight / openflowplugin / test / FlowEventListenerLoggingImpl.java

diff --git a/test-provider/src/main/java/org/opendaylight/openflowplugin/test/FlowEventListenerLoggingImpl.java b/test-provider/src/main/java/org/opendaylight/openflowplugin/test/FlowEventListenerLoggingImpl.java
index e518647343d4b81a2120192825ebe2a66416c22a..1f382cea44b6529cb320943b4aeb82f4d1beec34 100644 (file)
--- a/test-provider/src/main/java/org/opendaylight/openflowplugin/test/FlowEventListenerLoggingImpl.java
+++ b/test-provider/src/main/java/org/opendaylight/openflowplugin/test/FlowEventListenerLoggingImpl.java
@@ -7,12 +7,13 @@
  */
 package org.opendaylight.openflowplugin.test;
 
+import java.util.Set;
+import org.opendaylight.mdsal.binding.api.NotificationService.CompositeListener;
+import org.opendaylight.mdsal.binding.api.NotificationService.CompositeListener.Component;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.service.rev130819.FlowAdded;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.service.rev130819.FlowRemoved;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.service.rev130819.FlowUpdated;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.service.rev130819.NodeErrorNotification;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.service.rev130819.NodeExperimenterErrorNotification;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.service.rev130819.SalFlowListener;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.service.rev130819.SwitchFlowRemoved;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -20,51 +21,39 @@ import org.slf4j.LoggerFactory;
 /**
  * Dummy implementation flushing events into log.
  */
-public class FlowEventListenerLoggingImpl implements SalFlowListener {
+@Deprecated
+public final class FlowEventListenerLoggingImpl {
     private static final Logger LOG = LoggerFactory.getLogger(FlowEventListenerLoggingImpl.class);
 
-    @Override
-    @Deprecated
-    public void onFlowAdded(final FlowAdded notification) {
-        LOG.info("flow to be added {}", notification.toString());
-        LOG.info("added flow Xid {}", notification.getTransactionId().getValue());
+    private FlowEventListenerLoggingImpl() {
+        // Hidden on purpose
     }
 
-    @Override
-    @Deprecated
-    public void onFlowRemoved(final FlowRemoved notification) {
-        LOG.debug("removed flow {}", notification.toString());
-        LOG.debug("remove flow Xid {}", notification.getTransactionId().getValue());
-    }
-
-    @Override
-    @Deprecated
-    public void onFlowUpdated(final FlowUpdated notification) {
-        LOG.debug("updated flow {}", notification.toString());
-        LOG.debug("updated flow Xid {}", notification.getTransactionId().getValue());
-    }
-
-    @Override
-    @Deprecated
-    public void onNodeErrorNotification(final NodeErrorNotification notification) {
-    //commenting as we have a NodeErrorListener
-    /*    LOG.error("Error notification  flow Xid........................."
-                + notification.getTransactionId().getValue());
-        LOG.debug("notification Begin-Transaction:"
-                + notification.getTransactionUri()
-                + "-----------------------------------------------------------------------------------");
-    */
-    }
-
-    @Override
-    @Deprecated
-    public void onNodeExperimenterErrorNotification(final NodeExperimenterErrorNotification notification) {
-        // TODO Auto-generated method stub
-    }
-
-    @Override
-    @Deprecated
-    public void onSwitchFlowRemoved(final SwitchFlowRemoved notification) {
-        LOG.debug("Switch flow removed : Cookies {}", notification.getCookie().toString());
+    static CompositeListener newListener() {
+        return new CompositeListener(Set.of(
+            new Component<>(FlowAdded.class, notification -> {
+                LOG.info("flow to be added {}", notification);
+                LOG.info("added flow Xid {}", notification.getTransactionId().getValue());
+            }),
+            new Component<>(FlowRemoved.class, notification -> {
+                LOG.debug("removed flow {}", notification);
+                LOG.debug("remove flow Xid {}", notification.getTransactionId().getValue());
+            }),
+            new Component<>(FlowUpdated.class, notification -> {
+                LOG.debug("updated flow {}", notification);
+                LOG.debug("updated flow Xid {}", notification.getTransactionId().getValue());
+            }),
+            new Component<>(NodeErrorNotification.class, notification -> {
+                //commenting as we have a NodeErrorListener
+                /*    LOG.error("Error notification  flow Xid........................."
+                            + notification.getTransactionId().getValue());
+                    LOG.debug("notification Begin-Transaction:"
+                            + notification.getTransactionUri()
+                            + "-----------------------------------------------------------------------------------");
+                */
+            }),
+            new Component<>(SwitchFlowRemoved.class, notification -> {
+                LOG.debug("Switch flow removed : Cookies {}", notification.getCookie().toString());
+            })));
     }
 }