Renamed IOLoop & Netty to *MessagingManager for consistency.
Change-Id: Id8859e24d0c7ac7f948516388069639093bad524
diff --git a/core/store/dist/src/main/java/org/onosproject/store/cluster/impl/DistributedClusterStore.java b/core/store/dist/src/main/java/org/onosproject/store/cluster/impl/DistributedClusterStore.java
index c81079d..5d36bda 100644
--- a/core/store/dist/src/main/java/org/onosproject/store/cluster/impl/DistributedClusterStore.java
+++ b/core/store/dist/src/main/java/org/onosproject/store/cluster/impl/DistributedClusterStore.java
@@ -25,7 +25,7 @@
import org.apache.felix.scr.annotations.Deactivate;
import org.apache.felix.scr.annotations.Service;
import org.joda.time.DateTime;
-import org.onlab.netty.NettyMessagingService;
+import org.onlab.netty.NettyMessagingManager;
import org.onlab.packet.IpAddress;
import org.onlab.util.KryoNamespace;
import org.onosproject.cluster.ClusterEvent;
@@ -108,7 +108,7 @@
private final Map<NodeId, ControllerNode> allNodes = Maps.newConcurrentMap();
private final Map<NodeId, State> nodeStates = Maps.newConcurrentMap();
private final Map<NodeId, DateTime> nodeStateLastUpdatedTimes = Maps.newConcurrentMap();
- private NettyMessagingService messagingService;
+ private NettyMessagingManager messagingService;
private ScheduledExecutorService heartBeatSender = Executors.newSingleThreadScheduledExecutor(
groupedThreads("onos/cluster/membership", "heartbeat-sender"));
private ExecutorService heartBeatMessageHandler = Executors.newSingleThreadExecutor(
@@ -148,7 +148,7 @@
establishSelfIdentity();
- messagingService = new NettyMessagingService(HEARTBEAT_FD_PORT);
+ messagingService = new NettyMessagingManager(HEARTBEAT_FD_PORT);
try {
messagingService.activate();
} catch (InterruptedException e) {
diff --git a/core/store/dist/src/main/java/org/onosproject/store/cluster/messaging/impl/ClusterCommunicationManager.java b/core/store/dist/src/main/java/org/onosproject/store/cluster/messaging/impl/ClusterCommunicationManager.java
index 6f47b48..1a4512d 100644
--- a/core/store/dist/src/main/java/org/onosproject/store/cluster/messaging/impl/ClusterCommunicationManager.java
+++ b/core/store/dist/src/main/java/org/onosproject/store/cluster/messaging/impl/ClusterCommunicationManager.java
@@ -21,8 +21,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.netty.NettyMessagingService;
-import org.onlab.nio.service.IOLoopMessagingService;
+import org.onlab.netty.NettyMessagingManager;
+import org.onlab.nio.service.IOLoopMessagingManager;
import org.onosproject.cluster.ClusterService;
import org.onosproject.cluster.ControllerNode;
import org.onosproject.cluster.NodeId;
@@ -69,7 +69,7 @@
public void activate() {
ControllerNode localNode = clusterService.getLocalNode();
if (useNetty) {
- NettyMessagingService netty = new NettyMessagingService(localNode.ip(), localNode.tcpPort());
+ NettyMessagingManager netty = new NettyMessagingManager(localNode.ip(), localNode.tcpPort());
try {
netty.activate();
messagingService = netty;
@@ -77,7 +77,7 @@
log.error("NettyMessagingService#activate", e);
}
} else {
- IOLoopMessagingService ioLoop = new IOLoopMessagingService(localNode.ip(), localNode.tcpPort());
+ IOLoopMessagingManager ioLoop = new IOLoopMessagingManager(localNode.ip(), localNode.tcpPort());
try {
ioLoop.activate();
messagingService = ioLoop;
@@ -94,9 +94,9 @@
// FIXME: workaround until it becomes a service.
try {
if (useNetty) {
- ((NettyMessagingService) messagingService).deactivate();
+ ((NettyMessagingManager) messagingService).deactivate();
} else {
- ((IOLoopMessagingService) messagingService).deactivate();
+ ((IOLoopMessagingManager) messagingService).deactivate();
}
} catch (Exception e) {
log.error("MessagingService#deactivate", e);