Ditch use of EventListener

As noted in upstream changes, the use of EventListener is quite
superfluous. Ditch its use.

Change-Id: I9f3749d3709b653fc51ab1e58f3f8f167d26632f
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/bgp/rib-mock/src/main/java/org/opendaylight/protocol/bgp/rib/mock/BGPMock.java b/bgp/rib-mock/src/main/java/org/opendaylight/protocol/bgp/rib/mock/BGPMock.java
index de7895fd16a64311df431ae317035ec6282344bb..72f68d369e2295ff7d277646c1ef672b9b4ed0c5 100644 (file)
--- a/bgp/rib-mock/src/main/java/org/opendaylight/protocol/bgp/rib/mock/BGPMock.java
+++ b/bgp/rib-mock/src/main/java/org/opendaylight/protocol/bgp/rib/mock/BGPMock.java
@@ -21,7 +21,7 @@ import org.opendaylight.protocol.bgp.rib.spi.BGPSessionListener;
 import org.opendaylight.protocol.util.ByteArray;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev200120.Notify;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev200120.NotifyBuilder;
-import org.opendaylight.yangtools.concepts.ListenerRegistration;
+import org.opendaylight.yangtools.concepts.Registration;
 import org.opendaylight.yangtools.yang.binding.Notification;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -30,7 +30,6 @@ import org.slf4j.LoggerFactory;
  * Mock BGP session. It provides a way how to route a set of messages to BGPSessionListener. This class is thread-safe.
  */
 public final class BGPMock implements Closeable {
-
     private static final Logger LOG = LoggerFactory.getLogger(BGPMock.class);
 
     static final Notify CONNECTION_LOST_MAGIC_MSG = new NotifyBuilder().setErrorCode(BGPError.CEASE.getCode()).build();
@@ -73,7 +72,7 @@ public final class BGPMock implements Closeable {
         openRegistrations.clear();
     }
 
-    public ListenerRegistration<BGPSessionListener> registerUpdateListener(final BGPSessionListener listener) {
+    public Registration registerUpdateListener(final BGPSessionListener listener) {
         return EventBusRegistration.createAndRegister(eventBus, listener, allPreviousBGPMessages);
     }
 }

diff --git a/bgp/rib-mock/src/main/java/org/opendaylight/protocol/bgp/rib/mock/EventBusRegistration.java b/bgp/rib-mock/src/main/java/org/opendaylight/protocol/bgp/rib/mock/EventBusRegistration.java
index f0195f74600b160abe77abce225eed6347a3478c..1c845226379ecf658dbc8020a84ac169430b1073 100644 (file)
--- a/bgp/rib-mock/src/main/java/org/opendaylight/protocol/bgp/rib/mock/EventBusRegistration.java
+++ b/bgp/rib-mock/src/main/java/org/opendaylight/protocol/bgp/rib/mock/EventBusRegistration.java
@@ -36,7 +36,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.mult
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.multiprotocol.rev180329.mp.capabilities.AddPathCapability;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.multiprotocol.rev180329.mp.capabilities.MultiprotocolCapability;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.multiprotocol.rev180329.mp.capabilities.add.path.capability.AddressFamilies;
-import org.opendaylight.yangtools.concepts.AbstractListenerRegistration;
+import org.opendaylight.yangtools.concepts.AbstractObjectRegistration;
 import org.opendaylight.yangtools.yang.binding.Notification;
 import org.opendaylight.yangtools.yang.common.Uint32;
 import org.slf4j.Logger;
@@ -46,8 +46,7 @@ import org.slf4j.LoggerFactory;
  * This class has @Subscribe annotated methods which receive events from {@link EventBus} . Events are produced by
  * {@link BGPMock}, and each instance notifies exactly one {@link BGPSessionListener}.
  */
-final class EventBusRegistration extends AbstractListenerRegistration<BGPSessionListener> {
-
+final class EventBusRegistration extends AbstractObjectRegistration<BGPSessionListener> {
     private static final Logger LOG = LoggerFactory.getLogger(EventBusRegistration.class);
 
     private final EventBus eventBus;
@@ -70,7 +69,7 @@ final class EventBusRegistration extends AbstractListenerRegistration<BGPSession
 
     @Subscribe
     public void onMessage(final Notification<?> message) {
-        sendMessage(this.getInstance(), message);
+        sendMessage(getInstance(), message);
     }
 
     @Override

diff --git a/bgp/rib-spi/src/main/java/org/opendaylight/protocol/bgp/rib/spi/BGPSessionListener.java b/bgp/rib-spi/src/main/java/org/opendaylight/protocol/bgp/rib/spi/BGPSessionListener.java
index 2df73b2d876d6b3c94573a7bd1a6e3428079de24..47821ce167bf56d97da202d4b1d281ddda34bc0f 100644 (file)
--- a/bgp/rib-spi/src/main/java/org/opendaylight/protocol/bgp/rib/spi/BGPSessionListener.java
+++ b/bgp/rib-spi/src/main/java/org/opendaylight/protocol/bgp/rib/spi/BGPSessionListener.java
@@ -7,7 +7,6 @@
  */
 package org.opendaylight.protocol.bgp.rib.spi;
 
-import java.util.EventListener;
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
 import org.opendaylight.protocol.bgp.parser.BGPDocumentedException;
@@ -18,7 +17,7 @@ import org.opendaylight.yangtools.yang.binding.Notification;
  * Listener that receives session informations from the session.
  */
 @NonNullByDefault
-public interface BGPSessionListener extends PeerRPCs, EventListener {
+public interface BGPSessionListener extends PeerRPCs {
     /**
      * Marks synchronization finished for given Table key.
      *

diff --git a/bmp/bmp-spi/src/main/java/org/opendaylight/protocol/bmp/api/BmpSessionListener.java b/bmp/bmp-spi/src/main/java/org/opendaylight/protocol/bmp/api/BmpSessionListener.java
index 89fa2372866102fd165aa779e3a923057705c478..2042c189b738adf7470c94521ea3cace10152ab5 100644 (file)
--- a/bmp/bmp-spi/src/main/java/org/opendaylight/protocol/bmp/api/BmpSessionListener.java
+++ b/bmp/bmp-spi/src/main/java/org/opendaylight/protocol/bmp/api/BmpSessionListener.java
@@ -5,13 +5,11 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-
 package org.opendaylight.protocol.bmp.api;
 
-import java.util.EventListener;
 import org.opendaylight.yangtools.yang.binding.Notification;
 
-public interface BmpSessionListener extends EventListener {
+public interface BmpSessionListener {
 
     void onSessionUp(BmpSession session);
 

diff --git a/pcep/api/src/main/java/org/opendaylight/protocol/pcep/PCEPSessionListener.java b/pcep/api/src/main/java/org/opendaylight/protocol/pcep/PCEPSessionListener.java
index 6d9ec08ec26cee25e003a4833f7e52cec23f7fb7..25bcd9d81625835f5be9d67531bd3acc27568318 100644 (file)
--- a/pcep/api/src/main/java/org/opendaylight/protocol/pcep/PCEPSessionListener.java
+++ b/pcep/api/src/main/java/org/opendaylight/protocol/pcep/PCEPSessionListener.java
@@ -7,7 +7,6 @@
  */
 package org.opendaylight.protocol.pcep;
 
-import java.util.EventListener;
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev181109.Message;
 
@@ -15,7 +14,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.typ
  * Listener that receives session informations from the session.
  */
 @NonNullByDefault
-public interface PCEPSessionListener extends EventListener {
+public interface PCEPSessionListener {
     /**
      * Fired when the session was established successfully.
      *