Changed nomenclature from Broker to Registry.
diff --git a/net/core/trivial/src/main/java/org/onlab/onos/event/impl/SimpleEventDispatcher.java b/net/core/trivial/src/main/java/org/onlab/onos/event/impl/SimpleEventDispatcher.java
index 7ef8735..da919e4 100644
--- a/net/core/trivial/src/main/java/org/onlab/onos/event/impl/SimpleEventDispatcher.java
+++ b/net/core/trivial/src/main/java/org/onlab/onos/event/impl/SimpleEventDispatcher.java
@@ -5,9 +5,9 @@
import org.apache.felix.scr.annotations.Deactivate;
import org.apache.felix.scr.annotations.Service;
import org.onlab.onos.event.AbstractEvent;
-import org.onlab.onos.event.DefaultEventSinkBroker;
+import org.onlab.onos.event.DefaultEventSinkRegistry;
import org.onlab.onos.event.Event;
-import org.onlab.onos.event.EventDispatchService;
+import org.onlab.onos.event.EventDeliveryService;
import org.onlab.onos.event.EventSink;
import org.slf4j.Logger;
@@ -24,8 +24,8 @@
*/
@Component(immediate = true)
@Service
-public class SimpleEventDispatcher extends DefaultEventSinkBroker
- implements EventDispatchService {
+public class SimpleEventDispatcher extends DefaultEventSinkRegistry
+ implements EventDeliveryService {
private final Logger log = getLogger(getClass());
diff --git a/net/core/trivial/src/main/java/org/onlab/onos/net/trivial/impl/SimpleDeviceManager.java b/net/core/trivial/src/main/java/org/onlab/onos/net/trivial/impl/SimpleDeviceManager.java
index a293183..4344fd0 100644
--- a/net/core/trivial/src/main/java/org/onlab/onos/net/trivial/impl/SimpleDeviceManager.java
+++ b/net/core/trivial/src/main/java/org/onlab/onos/net/trivial/impl/SimpleDeviceManager.java
@@ -6,8 +6,8 @@
import org.apache.felix.scr.annotations.Reference;
import org.apache.felix.scr.annotations.ReferenceCardinality;
import org.apache.felix.scr.annotations.Service;
-import org.onlab.onos.event.AbstractListenerManager;
-import org.onlab.onos.event.EventDispatchService;
+import org.onlab.onos.event.AbstractListenerRegistry;
+import org.onlab.onos.event.EventDeliveryService;
import org.onlab.onos.net.Device;
import org.onlab.onos.net.DeviceId;
import org.onlab.onos.net.MastershipRole;
@@ -17,11 +17,11 @@
import org.onlab.onos.net.device.DeviceEvent;
import org.onlab.onos.net.device.DeviceListener;
import org.onlab.onos.net.device.DeviceProvider;
-import org.onlab.onos.net.device.DeviceProviderBroker;
+import org.onlab.onos.net.device.DeviceProviderRegistry;
import org.onlab.onos.net.device.DeviceProviderService;
import org.onlab.onos.net.device.DeviceService;
import org.onlab.onos.net.device.PortDescription;
-import org.onlab.onos.net.provider.AbstractProviderBroker;
+import org.onlab.onos.net.provider.AbstractProviderRegistry;
import org.onlab.onos.net.provider.AbstractProviderService;
import org.slf4j.Logger;
@@ -36,8 +36,8 @@
@Component(immediate = true)
@Service
public class SimpleDeviceManager
- extends AbstractProviderBroker<DeviceProvider, DeviceProviderService>
- implements DeviceService, DeviceProviderBroker {
+ extends AbstractProviderRegistry<DeviceProvider, DeviceProviderService>
+ implements DeviceService, DeviceProviderRegistry {
public static final String DEVICE_ID_NULL = "Device ID cannot be null";
public static final String PORT_NUMBER_NULL = "Port number cannot be null";
@@ -46,17 +46,17 @@
private final Logger log = getLogger(getClass());
- private final AbstractListenerManager<DeviceEvent, DeviceListener>
- listenerManager = new AbstractListenerManager<>();
+ private final AbstractListenerRegistry<DeviceEvent, DeviceListener>
+ listenerRegistry = new AbstractListenerRegistry<>();
private final DeviceStore store = new DeviceStore();
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
- private EventDispatchService eventDispatcher;
+ private EventDeliveryService eventDispatcher;
@Activate
public void activate() {
- eventDispatcher.addSink(DeviceEvent.class, listenerManager);
+ eventDispatcher.addSink(DeviceEvent.class, listenerRegistry);
log.info("Started");
}
@@ -98,12 +98,12 @@
@Override
public void addListener(DeviceListener listener) {
- listenerManager.addListener(listener);
+ listenerRegistry.addListener(listener);
}
@Override
public void removeListener(DeviceListener listener) {
- listenerManager.removeListener(listener);
+ listenerRegistry.removeListener(listener);
}
@Override
diff --git a/net/core/trivial/src/main/java/org/onlab/onos/net/trivial/impl/SimpleHostManager.java b/net/core/trivial/src/main/java/org/onlab/onos/net/trivial/impl/SimpleHostManager.java
index 0c0c983..c9aa71b 100644
--- a/net/core/trivial/src/main/java/org/onlab/onos/net/trivial/impl/SimpleHostManager.java
+++ b/net/core/trivial/src/main/java/org/onlab/onos/net/trivial/impl/SimpleHostManager.java
@@ -6,15 +6,15 @@
import org.apache.felix.scr.annotations.Reference;
import org.apache.felix.scr.annotations.ReferenceCardinality;
import org.apache.felix.scr.annotations.Service;
-import org.onlab.onos.event.AbstractListenerManager;
-import org.onlab.onos.event.EventDispatchService;
+import org.onlab.onos.event.AbstractListenerRegistry;
+import org.onlab.onos.event.EventDeliveryService;
import org.onlab.onos.net.host.HostDescription;
import org.onlab.onos.net.host.HostEvent;
import org.onlab.onos.net.host.HostListener;
import org.onlab.onos.net.host.HostProvider;
-import org.onlab.onos.net.host.HostProviderBroker;
+import org.onlab.onos.net.host.HostProviderRegistry;
import org.onlab.onos.net.host.HostProviderService;
-import org.onlab.onos.net.provider.AbstractProviderBroker;
+import org.onlab.onos.net.provider.AbstractProviderRegistry;
import org.onlab.onos.net.provider.AbstractProviderService;
import org.slf4j.Logger;
@@ -26,21 +26,21 @@
@Component(immediate = true)
@Service
public class SimpleHostManager
- extends AbstractProviderBroker<HostProvider, HostProviderService>
- implements HostProviderBroker {
+ extends AbstractProviderRegistry<HostProvider, HostProviderService>
+ implements HostProviderRegistry {
private final Logger log = getLogger(getClass());
- private final AbstractListenerManager<HostEvent, HostListener>
- listenerManager = new AbstractListenerManager<>();
+ private final AbstractListenerRegistry<HostEvent, HostListener>
+ listenerRegistry = new AbstractListenerRegistry<>();
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
- private EventDispatchService eventDispatcher;
+ private EventDeliveryService eventDispatcher;
@Activate
public void activate() {
- eventDispatcher.addSink(HostEvent.class, listenerManager);
+ eventDispatcher.addSink(HostEvent.class, listenerRegistry);
log.info("Started");
}
diff --git a/net/core/trivial/src/main/java/org/onlab/onos/net/trivial/impl/SimpleLinkManager.java b/net/core/trivial/src/main/java/org/onlab/onos/net/trivial/impl/SimpleLinkManager.java
index 73fedab..8efa526 100644
--- a/net/core/trivial/src/main/java/org/onlab/onos/net/trivial/impl/SimpleLinkManager.java
+++ b/net/core/trivial/src/main/java/org/onlab/onos/net/trivial/impl/SimpleLinkManager.java
@@ -6,15 +6,15 @@
import org.apache.felix.scr.annotations.Reference;
import org.apache.felix.scr.annotations.ReferenceCardinality;
import org.apache.felix.scr.annotations.Service;
-import org.onlab.onos.event.AbstractListenerManager;
-import org.onlab.onos.event.EventDispatchService;
+import org.onlab.onos.event.AbstractListenerRegistry;
+import org.onlab.onos.event.EventDeliveryService;
import org.onlab.onos.net.link.LinkDescription;
import org.onlab.onos.net.link.LinkEvent;
import org.onlab.onos.net.link.LinkListener;
import org.onlab.onos.net.link.LinkProvider;
-import org.onlab.onos.net.link.LinkProviderBroker;
+import org.onlab.onos.net.link.LinkProviderRegistry;
import org.onlab.onos.net.link.LinkProviderService;
-import org.onlab.onos.net.provider.AbstractProviderBroker;
+import org.onlab.onos.net.provider.AbstractProviderRegistry;
import org.onlab.onos.net.provider.AbstractProviderService;
import org.slf4j.Logger;
@@ -26,20 +26,20 @@
@Component(immediate = true)
@Service
public class SimpleLinkManager
- extends AbstractProviderBroker<LinkProvider, LinkProviderService>
- implements LinkProviderBroker {
+ extends AbstractProviderRegistry<LinkProvider, LinkProviderService>
+ implements LinkProviderRegistry {
private final Logger log = getLogger(getClass());
- private final AbstractListenerManager<LinkEvent, LinkListener>
- listenerManager = new AbstractListenerManager<>();
+ private final AbstractListenerRegistry<LinkEvent, LinkListener>
+ listenerRegistry = new AbstractListenerRegistry<>();
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
- private EventDispatchService eventDispatcher;
+ private EventDeliveryService eventDispatcher;
@Activate
public void activate() {
- eventDispatcher.addSink(LinkEvent.class, listenerManager);
+ eventDispatcher.addSink(LinkEvent.class, listenerRegistry);
log.info("Started");
}