Use the Executor interface when specifying where to handle incoming messages

This is done so that one can simply specify a direct executor.
Change-Id: I1c3ea977dd7c2d604588d587fd67f7012355eedf

@@ -17,6 +17,7 @@ package org.onosproject.store.cluster.messaging;
 
 
 import java.util.Set;
 import java.util.Set;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.Executor;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.ExecutorService;
 import java.util.function.Consumer;
 import java.util.function.Consumer;
 import java.util.function.Function;
 import java.util.function.Function;
@@ -173,7 +174,7 @@ public interface ClusterCommunicationService {
                               Function<byte[], M> decoder,
                               Function<byte[], M> decoder,
                               Function<M, R> handler,
                               Function<M, R> handler,
                               Function<R, byte[]> encoder,
                               Function<R, byte[]> encoder,
-                              ExecutorService executor);
+                              Executor executor);
 
 
     /**
     /**
      * Adds a new subscriber for the specified message subject.
      * Adds a new subscriber for the specified message subject.
@@ -187,7 +188,7 @@ public interface ClusterCommunicationService {
     <M> void addSubscriber(MessageSubject subject,
     <M> void addSubscriber(MessageSubject subject,
                            Function<byte[], M> decoder,
                            Function<byte[], M> decoder,
                            Consumer<M> handler,
                            Consumer<M> handler,
-                           ExecutorService executor);
+                           Executor executor);
 
 
     /**
     /**
      * Removes a subscriber for the specified message subject.
      * Removes a subscriber for the specified message subject.

@@ -43,6 +43,7 @@ import com.google.common.util.concurrent.SettableFuture;
 import java.io.IOException;
 import java.io.IOException;
 import java.util.Set;
 import java.util.Set;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.Executor;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.ExecutorService;
 import java.util.function.Consumer;
 import java.util.function.Consumer;
 import java.util.function.Function;
 import java.util.function.Function;
@@ -270,7 +271,7 @@ public class ClusterCommunicationManager
             Function<byte[], M> decoder,
             Function<byte[], M> decoder,
             Function<M, R> handler,
             Function<M, R> handler,
             Function<R, byte[]> encoder,
             Function<R, byte[]> encoder,
-            ExecutorService executor) {
+            Executor executor) {
         messagingService.registerHandler(subject.value(),
         messagingService.registerHandler(subject.value(),
                 new InternalMessageResponder<>(decoder, encoder, handler),
                 new InternalMessageResponder<>(decoder, encoder, handler),
                 executor);
                 executor);
@@ -280,7 +281,7 @@ public class ClusterCommunicationManager
     public <M> void addSubscriber(MessageSubject subject,
     public <M> void addSubscriber(MessageSubject subject,
             Function<byte[], M> decoder,
             Function<byte[], M> decoder,
             Consumer<M> handler,
             Consumer<M> handler,
-            ExecutorService executor) {
+            Executor executor) {
         messagingService.registerHandler(subject.value(),
         messagingService.registerHandler(subject.value(),
                 new InternalMessageConsumer<>(decoder, handler),
                 new InternalMessageConsumer<>(decoder, handler),
                 executor);
                 executor);

@@ -54,6 +54,7 @@ import java.util.Objects;
 import java.util.Set;
 import java.util.Set;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.Executor;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.concurrent.atomic.AtomicLong;
@@ -780,13 +781,13 @@ public class EventuallyConsistentMapImplTest {
         @Override
         @Override
         public <M, R> void addSubscriber(MessageSubject subject,
         public <M, R> void addSubscriber(MessageSubject subject,
                 Function<byte[], M> decoder, Function<M, R> handler,
                 Function<byte[], M> decoder, Function<M, R> handler,
-                Function<R, byte[]> encoder, ExecutorService executor) {
+                Function<R, byte[]> encoder, Executor executor) {
         }
         }
 
 
         @Override
         @Override
         public <M> void addSubscriber(MessageSubject subject,
         public <M> void addSubscriber(MessageSubject subject,
                 Function<byte[], M> decoder, Consumer<M> handler,
                 Function<byte[], M> decoder, Consumer<M> handler,
-                ExecutorService executor) {
+                Executor executor) {
         }
         }
 
 
         @Override
         @Override

@@ -17,7 +17,7 @@ package org.onlab.netty;
 
 
 import java.io.IOException;
 import java.io.IOException;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executor;
 
 
 /**
 /**
  * Interface for low level messaging primitives.
  * Interface for low level messaging primitives.
@@ -48,7 +48,7 @@ public interface MessagingService {
      * @param handler message handler
      * @param handler message handler
      * @param executor executor to use for running message handler logic.
      * @param executor executor to use for running message handler logic.
      */
      */
-    public void registerHandler(String type, MessageHandler handler, ExecutorService executor);
+    public void registerHandler(String type, MessageHandler handler, Executor executor);
 
 
     /**
     /**
      * Registers a new message handler for message type.
      * Registers a new message handler for message type.

@@ -42,7 +42,7 @@ import java.net.UnknownHostException;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 import java.util.concurrent.ConcurrentMap;
-import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executor;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 import java.util.concurrent.TimeoutException;
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.concurrent.atomic.AtomicLong;
@@ -202,11 +202,11 @@ public class NettyMessagingService implements MessagingService {
     }
     }
 
 
     @Override
     @Override
-    public void registerHandler(String type, MessageHandler handler, ExecutorService executor) {
+    public void registerHandler(String type, MessageHandler handler, Executor executor) {
         handlers.put(type, new MessageHandler() {
         handlers.put(type, new MessageHandler() {
             @Override
             @Override
             public void handle(Message message) throws IOException {
             public void handle(Message message) throws IOException {
-                executor.submit(() -> {
+                executor.execute(() -> {
                     try {
                     try {
                         handler.handle(message);
                         handler.handle(message);
                     } catch (Exception e) {
                     } catch (Exception e) {