Add key gen and publishing with non default keys

Author: ianopolous

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

@@ -19,6 +19,7 @@ public enum PinType {all, direct, indirect, recursive}
     public final String host;
     public final int port;
     private final String version;
+    public final Key key = new Key();
     public final Pin pin = new Pin();
     public final Repo repo = new Repo();
     public final IPFSObject object = new IPFSObject();
@@ -181,6 +182,14 @@ 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(""));
+        }
+    }
+
     /* 'ipfs repo' is a plumbing command used to manipulate the repo.
      */
     public class Repo {
@@ -299,11 +308,11 @@ public MerkleNode patch(Multihash base, String command, Optional<byte[]> data, O
 
     public class Name {
         public Map publish(Multihash hash) throws IOException {
-            return publish(Optional.empty(), hash);
+            return publish(hash, Optional.empty());
         }
 
-        public Map publish(Optional<String> id, Multihash hash) throws IOException {
-            return retrieveMap("name/publish?arg=" + (id.isPresent() ? id+"&arg=" : "") + "/ipfs/"+hash);
+        public Map publish(Multihash hash, Optional<String> id) throws IOException {
+            return retrieveMap("name/publish?arg=/ipfs/" + hash + id.map(name -> "&key=" + name).orElse(""));
         }
 
         public String resolve(Multihash hash) throws IOException {

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

@@ -578,6 +578,9 @@ public void nameTest() {
         try {
             MerkleNode pointer = new MerkleNode("QmPZ9gcCEpqKTo6aq61g2nXGUhM4iCL3ewB6LDXZCtioEB");
             Map pub = ipfs.name.publish(pointer.hash);
+            String name = "key" + System.nanoTime();
+            Object gen = ipfs.key.gen(name, Optional.of("rsa"), Optional.of("2048"));
+            Map mykey = ipfs.name.publish(pointer.hash, Optional.of(name));
             String resolved = ipfs.name.resolve(Multihash.fromBase58((String) pub.get("Name")));
         } catch (IOException e) {
             throw new RuntimeException(e);