Refactor the storage of the Topology Listeners: move the state
from the TopologyModule to the TopologyManager.
Also:
- Keep the last ADD MastershipEvent inside field
TopologyManager.lastAddMastershipEvents
- Minor editorial changes inside TopologyManager.java
No functional changes.
Change-Id: I99956fdbb1dcd847e3e6ed2ad27f68ff3464b491
diff --git a/src/main/java/net/onrc/onos/core/topology/TopologyModule.java b/src/main/java/net/onrc/onos/core/topology/TopologyModule.java
index 657682f..d24f4df 100644
--- a/src/main/java/net/onrc/onos/core/topology/TopologyModule.java
+++ b/src/main/java/net/onrc/onos/core/topology/TopologyModule.java
@@ -5,7 +5,6 @@
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import java.util.concurrent.CopyOnWriteArrayList;
import net.floodlightcontroller.core.module.FloodlightModuleContext;
import net.floodlightcontroller.core.module.FloodlightModuleException;
@@ -23,9 +22,6 @@
private TopologyManager topologyManager;
private IDatagridService datagridService;
private IControllerRegistryService registryService;
-
- private CopyOnWriteArrayList<ITopologyListener> topologyListeners;
-
private IRestApiService restApi;
@Override
@@ -61,9 +57,7 @@
restApi = context.getServiceImpl(IRestApiService.class);
datagridService = context.getServiceImpl(IDatagridService.class);
registryService = context.getServiceImpl(IControllerRegistryService.class);
-
- topologyListeners = new CopyOnWriteArrayList<>();
- topologyManager = new TopologyManager(registryService, topologyListeners);
+ topologyManager = new TopologyManager(registryService);
}
@Override
@@ -84,12 +78,11 @@
@Override
public void registerTopologyListener(ITopologyListener listener) {
- topologyListeners.addIfAbsent(listener);
+ topologyManager.registerTopologyListener(listener);
}
@Override
public void deregisterTopologyListener(ITopologyListener listener) {
- topologyListeners.remove(listener);
+ topologyManager.deregisterTopologyListener(listener);
}
-
}