commit 01e05fbed2eccb734ade964b8db78a05cc40ad24
author Madan Jampani <madan@onlab.us> Thu Aug 13 13:29:36 2015 -0700
committer Madan Jampani <madan@onlab.us> Fri Aug 14 11:18:02 2015 -0700
tree d88dfbb7192fde85e7548311d1493ee49ecf773c
parent d35201025941e2eeaa9d1059ad872f3a921758f9

Removed usage of deprecated ClusterCommunicationService APIs

Change-Id: Id306dadad48d1bad7b3fbde3a40ba3e0fdac4cbc

core/store/dist/src/main/java/org/onosproject/store/app/GossipApplicationStore.java

diff --git a/core/store/dist/src/main/java/org/onosproject/store/app/GossipApplicationStore.java b/core/store/dist/src/main/java/org/onosproject/store/app/GossipApplicationStore.java
index 3261f33..0c902bf 100644
--- a/core/store/dist/src/main/java/org/onosproject/store/app/GossipApplicationStore.java
+++ b/core/store/dist/src/main/java/org/onosproject/store/app/GossipApplicationStore.java
@@ -17,6 +17,7 @@
 
 import com.google.common.base.Charsets;
 import com.google.common.collect.ImmutableSet;
+
 import org.apache.felix.scr.annotations.Activate;
 import org.apache.felix.scr.annotations.Component;
 import org.apache.felix.scr.annotations.Deactivate;
@@ -39,8 +40,6 @@
 import org.onosproject.core.DefaultApplication;
 import org.onosproject.core.Permission;
 import org.onosproject.store.cluster.messaging.ClusterCommunicationService;
-import org.onosproject.store.cluster.messaging.ClusterMessage;
-import org.onosproject.store.cluster.messaging.ClusterMessageHandler;
 import org.onosproject.store.cluster.messaging.MessageSubject;
 import org.onosproject.store.serializers.KryoNamespaces;
 import org.onosproject.store.service.EventuallyConsistentMap;
@@ -48,10 +47,12 @@
 import org.onosproject.store.service.EventuallyConsistentMapListener;
 import org.onosproject.store.service.LogicalClockService;
 import org.onosproject.store.service.MultiValuedTimestamp;
+import org.onosproject.store.service.StorageException;
 import org.onosproject.store.service.StorageService;
 import org.slf4j.Logger;
 
 import java.io.ByteArrayInputStream;
+import java.io.IOException;
 import java.io.InputStream;
 import java.util.Set;
 import java.util.concurrent.CountDownLatch;
@@ -126,7 +127,17 @@
         messageHandlingExecutor = Executors.newSingleThreadExecutor(
                 groupedThreads("onos/store/app", "message-handler"));
 
-        clusterCommunicator.addSubscriber(APP_BITS_REQUEST, new InternalBitServer(), messageHandlingExecutor);
+        clusterCommunicator.<String, byte[]>addSubscriber(APP_BITS_REQUEST,
+                bytes -> new String(bytes, Charsets.UTF_8),
+                name -> {
+                    try {
+                        return toByteArray(getApplicationInputStream(name));
+                    } catch (IOException e) {
+                        throw new StorageException(e);
+                    }
+                },
+                Function.identity(),
+                messageHandlingExecutor);
 
         // FIXME: Consider consolidating into a single map.
 
@@ -394,21 +405,6 @@
     }
 
     /**
-     * Responder to requests for application bits.
-     */
-    private class InternalBitServer implements ClusterMessageHandler {
-        @Override
-        public void handle(ClusterMessage message) {
-            String name = new String(message.payload(), Charsets.UTF_8);
-            try {
-                message.respond(toByteArray(getApplicationInputStream(name)));
-            } catch (Exception e) {
-                log.debug("Unable to read bits for application {}", name);
-            }
-        }
-    }
-
-    /**
      * Prunes applications which are not in the map, but are on disk.
      */
     private void pruneUninstalledApps() {