name.publish and name.resolve implemented

Author: ianopolous

src/org/ipfs/IPFS.java

@@ -164,9 +164,19 @@ public byte[] data(MerkleNode merkleObject) throws IOException {
     }
 
     class Name {
-        // TODO publish
+        public Map publish(MerkleNode node) throws IOException {
+            return publish(Optional.empty(), node);
+        }
 
-        // TODO resolve
+        public Map publish(Optional<String> id, MerkleNode node) throws IOException {
+            Map res = (Map) retrieveAndParse("name/publish?arg=" + (id.isPresent() ? id+"&arg=" : "") + "/ipfs/"+node.hash);
+            return res;
+        }
+
+        public String resolve(String addr) throws IOException {
+            Map res = (Map) retrieveAndParse("name/resolve?arg=" + addr);
+            return (String)res.get("Path");
+        }
     }
 
     class DHT {

test/org/ipfs/Test.java

@@ -96,6 +96,18 @@ public void fileTest() {
         }
     }
 
+    @org.junit.Test
+    public void nameTest() {
+        try {
+            MerkleNode pointer = new MerkleNode("QmPZ9gcCEpqKTo6aq61g2nXGUhM4iCL3ewB6LDXZCtioEB");
+            Map pub = ipfs.name.publish(pointer);
+            String resolved = ipfs.name.resolve((String)pub.get("Name"));
+            System.out.println(resolved);
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
     @org.junit.Test
     public void dnsTest() {
         try {