Implement remaining ipfs.key methods, including tests.

Author: ianopolous

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

@@ -185,8 +185,26 @@ public List<MultiAddress> update(Multihash existing, Multihash modified, boolean
     /* 'ipfs repo' is a plumbing command used to manipulate the repo.
      */
     public class Key {
-        public Object gen(String name, Optional<String> type, Optional<String> size) throws IOException {
-            return retrieveAndParse("key/gen?arg=" + name + type.map(t -> "&type=" + t).orElse("") + size.map(s -> "&size=" + s).orElse(""));
+        public KeyInfo gen(String name, Optional<String> type, Optional<String> size) throws IOException {
+            return KeyInfo.fromJson(retrieveAndParse("key/gen?arg=" + name + type.map(t -> "&type=" + t).orElse("") + size.map(s -> "&size=" + s).orElse("")));
+        }
+
+        public List<KeyInfo> list() throws IOException {
+            return ((List<Object>)((Map)retrieveAndParse("key/list")).get("Keys"))
+                    .stream()
+                    .map(KeyInfo::fromJson)
+                    .collect(Collectors.toList());
+        }
+
+        public Object rename(String name, String newName) throws IOException {
+            return retrieveAndParse("key/rename?arg="+name + "&arg=" + newName);
+        }
+
+        public List<KeyInfo> rm(String name) throws IOException {
+            return ((List<Object>)((Map)retrieveAndParse("key/rm?arg=" + name)).get("Keys"))
+                    .stream()
+                    .map(KeyInfo::fromJson)
+                    .collect(Collectors.toList());
         }
     }
 

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

@@ -0,0 +1,44 @@
+package io.ipfs.api;
+
+import io.ipfs.cid.*;
+import io.ipfs.multihash.*;
+
+import java.util.*;
+
+public class KeyInfo {
+
+    public final String name;
+    public final Multihash id;
+
+    public KeyInfo(String name, Multihash id) {
+        this.name = name;
+        this.id = id;
+    }
+
+    public String toString() {
+        return name + ": " + id;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+
+        KeyInfo keyInfo = (KeyInfo) o;
+
+        if (name != null ? !name.equals(keyInfo.name) : keyInfo.name != null) return false;
+        return id != null ? id.equals(keyInfo.id) : keyInfo.id == null;
+    }
+
+    @Override
+    public int hashCode() {
+        int result = name != null ? name.hashCode() : 0;
+        result = 31 * result + (id != null ? id.hashCode() : 0);
+        return result;
+    }
+
+    public static KeyInfo fromJson(Object json) {
+        Map<String, String> m = (Map) json;
+        return new KeyInfo(m.get("Name"), Cid.decode(m.get("Id")));
+    }
+}

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

@@ -50,7 +50,19 @@ public void dagCbor() throws IOException {
         Assert.assertTrue("Correct cid returned", cid.equals(expected));
     }
 
-    @org.junit.Test
+    @Test
+    public void keys() throws IOException {
+        List<KeyInfo> existing = ipfs.key.list();
+        String name = "mykey" + System.nanoTime();
+        KeyInfo gen = ipfs.key.gen(name, Optional.of("rsa"), Optional.of("2048"));
+        String newName = "bob" + System.nanoTime();
+        Object rename = ipfs.key.rename(name, newName);
+        List<KeyInfo> rm = ipfs.key.rm(newName);
+        List<KeyInfo> remaining = ipfs.key.list();
+        Assert.assertTrue("removed key", remaining.equals(existing));
+    }
+
+    @Test
     public void ipldNode() {
         Function<Stream<Pair<String, CborObject>>, CborObject.CborMap> map =
                 s -> CborObject.CborMap.build(s.collect(Collectors.toMap(p -> p.left, p -> p.right)));