Make pubsub.sub return Map

Author: ianopolous

src/main/java/io/ipfs/api/IPFS.java

@@ -246,12 +246,13 @@ public Object pub(String topic, String data) throws IOException {
             return retrieveAndParse("pubsub/pub?arg="+topic + "&arg=" + data);
         }
 
-        public Supplier<Object> sub(String topic) throws IOException {
+        public Supplier<Map<String, Object>> sub(String topic) throws IOException {
             return sub(topic, ForkJoinPool.commonPool());
         }
 
-        public Supplier<Object> sub(String topic, ForkJoinPool threadSupplier) throws IOException {
-            return retrieveAndParseStream("pubsub/sub?arg="+topic, threadSupplier);
+        public Supplier<Map<String, Object>> sub(String topic, ForkJoinPool threadSupplier) throws IOException {
+            Supplier<Object> sup = retrieveAndParseStream("pubsub/sub?arg=" + topic, threadSupplier);
+            return () -> (Map) sup.get();
         }
 
         /**
@@ -260,8 +261,8 @@ public Supplier<Object> sub(String topic, ForkJoinPool threadSupplier) throws IO
          * @param results
          * @throws IOException
          */
-        public void sub(String topic, Consumer<Object> results) throws IOException {
-            retrieveAndParseStream("pubsub/sub?arg="+topic, results);
+        public void sub(String topic, Consumer<Map<String, Object>> results) throws IOException {
+            retrieveAndParseStream("pubsub/sub?arg="+topic, res -> results.accept((Map)res));
         }
 
 

src/test/java/io/ipfs/api/APITest.java

@@ -383,7 +383,7 @@ public void bulkBlockTest() throws IOException {
     @Test
     public void pubsubSynchronous() throws IOException {
         String topic = "topic" + System.nanoTime();
-        List<Object> res = Collections.synchronizedList(new ArrayList<>());
+        List<Map<String, Object>> res = Collections.synchronizedList(new ArrayList<>());
         new Thread(() -> {
             try {
                 ipfs.pubsub.sub(topic, res::add);
@@ -410,12 +410,12 @@ public void pubsub() throws IOException {
         Object ls = ipfs.pubsub.ls();
         Object peers = ipfs.pubsub.peers();
         String topic = "topic" + System.nanoTime();
-        Supplier<Object> sub = ipfs.pubsub.sub(topic);
-        Object first = sub.get();
+        Supplier<Map<String, Object>> sub = ipfs.pubsub.sub(topic);
+        Map<String, Object> first = sub.get();
         Assert.assertTrue(first.equals(Collections.emptyMap()));
         String data = "Hello!";
         Object pub = ipfs.pubsub.pub(topic, data);
-        Object second = sub.get();
+        Map second = sub.get();
         Assert.assertTrue( ! second.equals(Collections.emptyMap()));
     }