Removed deprecated ClusterCommunicationService APIs
MessagingService::sendAsync now returns a CompletableFuture<Void> in place of boolean
Change-Id: I98134c4c0ea65b9c7e9ba705eebd1669067324ef
diff --git a/core/api/src/main/java/org/onosproject/store/cluster/messaging/ClusterCommunicationService.java b/core/api/src/main/java/org/onosproject/store/cluster/messaging/ClusterCommunicationService.java
index eb36202..f547a47 100644
--- a/core/api/src/main/java/org/onosproject/store/cluster/messaging/ClusterCommunicationService.java
+++ b/core/api/src/main/java/org/onosproject/store/cluster/messaging/ClusterCommunicationService.java
@@ -24,61 +24,12 @@
import org.onosproject.cluster.NodeId;
-import com.google.common.util.concurrent.ListenableFuture;
-
/**
* Service for assisting communications between controller cluster nodes.
*/
public interface ClusterCommunicationService {
/**
- * Broadcast a message to all controller nodes.
- *
- * @param message message to send
- * @return true if the message was sent successfully to all nodes; false otherwise.
- */
- @Deprecated
- boolean broadcast(ClusterMessage message);
-
- /**
- * Broadcast a message to all controller nodes including self.
- *
- * @param message message to send
- * @return true if the message was sent successfully to all nodes; false otherwise.
- */
- @Deprecated
- boolean broadcastIncludeSelf(ClusterMessage message);
-
- /**
- * Sends a message to the specified controller node.
- *
- * @param message message to send
- * @param toNodeId node identifier
- * @return true if the message was sent successfully; false otherwise.
- */
- @Deprecated
- boolean unicast(ClusterMessage message, NodeId toNodeId);
-
- /**
- * Multicast a message to a set of controller nodes.
- *
- * @param message message to send
- * @param nodeIds recipient node identifiers
- * @return true if the message was sent successfully to all nodes in the group; false otherwise.
- */
- @Deprecated
- boolean multicast(ClusterMessage message, Iterable<NodeId> nodeIds);
-
- /**
- * Sends a message synchronously.
- * @param message message to send
- * @param toNodeId recipient node identifier
- * @return reply future.
- */
- @Deprecated
- ListenableFuture<byte[]> sendAndReceive(ClusterMessage message, NodeId toNodeId);
-
- /**
* Adds a new subscriber for the specified message subject.
*
* @param subject message subject
@@ -120,9 +71,9 @@
* @param encoder function for encoding message to byte[]
* @param toNodeId destination node identifier
* @param <M> message type
- * @return true if the message was sent successfully; false otherwise
+ * @return future that is completed when the message is sent
*/
- <M> boolean unicast(M message,
+ <M> CompletableFuture<Void> unicast(M message,
MessageSubject subject,
Function<M, byte[]> encoder,
NodeId toNodeId);
diff --git a/core/api/src/main/java/org/onosproject/store/cluster/messaging/MessagingService.java b/core/api/src/main/java/org/onosproject/store/cluster/messaging/MessagingService.java
index 09f15f8..6ccd483 100644
--- a/core/api/src/main/java/org/onosproject/store/cluster/messaging/MessagingService.java
+++ b/core/api/src/main/java/org/onosproject/store/cluster/messaging/MessagingService.java
@@ -15,7 +15,6 @@
*/
package org.onosproject.store.cluster.messaging;
-import java.io.IOException;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.Executor;
import java.util.function.Consumer;
@@ -32,9 +31,9 @@
* @param ep end point to send the message to.
* @param type type of message.
* @param payload message payload bytes.
- * @throws IOException when I/O exception of some sort has occurred
+ * @return future that is completed when the message is sent
*/
- void sendAsync(Endpoint ep, String type, byte[] payload) throws IOException;
+ CompletableFuture<Void> sendAsync(Endpoint ep, String type, byte[] payload);
/**
* Sends a message synchronously and waits for a response.