added object.new

Author: ianopolous

src/org/ipfs/IPFS.java

@@ -7,6 +7,8 @@
 
 public class IPFS {
 
+    public List<String> ObjectTemplates = Arrays.asList("unixfs-dir");
+
     public final String host;
     public final int port;
     private final String version;
@@ -164,7 +166,14 @@ public byte[] data(MerkleNode merkleObject) throws IOException {
             return retrieve("object/data?stream-channels=true&arg=" + merkleObject.hash);
         }
 
-        // TODO new, patch
+        public MerkleNode _new(Optional<String> template) throws IOException {
+            if (template.isPresent() && !ObjectTemplates.contains(template.get()))
+                throw new IllegalStateException("Unrecognised template: "+template.get());
+            Map json = retrieveMap("object/new?stream-channels=true"+(template.isPresent() ? "&arg=" + template.get() : ""));
+            return MerkleNode.fromJSON(json);
+        }
+
+        // TODO patch
     }
 
     class Name {

src/org/ipfs/MerkleNode.java

@@ -48,10 +48,11 @@ public static MerkleNode fromJSON(Object rawjson) {
         String hash = (String)json.get("Hash");
         if (hash == null)
             hash = (String)json.get("Key");
-        Optional<String> name = json.containsKey("Name") ? Optional.of((String)json.get("Name")): Optional.empty();
+        Optional<String> name = json.containsKey("Name") ? Optional.of((String) json.get("Name")): Optional.empty();
         Optional<Integer> size = json.containsKey("Size") ? Optional.<Integer>empty().of((Integer) json.get("Size")): Optional.<Integer>empty().empty();
         Optional<Integer> type = json.containsKey("Type") ? Optional.<Integer>empty().of((Integer) json.get("Type")): Optional.<Integer>empty().empty();
-        List<MerkleNode> links = json.containsKey("Links") ? ((List<Object>)json.get("Links")).stream().map(x -> MerkleNode.fromJSON(x)).collect(Collectors.toList()) : Arrays.asList();
+        List<Object> linksRaw = (List<Object>) json.get("Links");
+        List<MerkleNode> links = linksRaw == null ? Collections.EMPTY_LIST : linksRaw.stream().map(x -> MerkleNode.fromJSON(x)).collect(Collectors.toList());
         Optional<byte[]> data = json.containsKey("Data") ? Optional.of(((String)json.get("Data")).getBytes()): Optional.empty();
         return new MerkleNode(hash, name, size, type, links, data);
     }

test/org/ipfs/Test.java

@@ -68,6 +68,7 @@ public void refsTest() {
     @org.junit.Test
     public void objectTest() {
         try {
+            MerkleNode _new = ipfs.object._new(Optional.empty());
             MerkleNode pointer = new MerkleNode("QmPZ9gcCEpqKTo6aq61g2nXGUhM4iCL3ewB6LDXZCtioEB");
             MerkleNode object = ipfs.object.get(pointer);
             List<MerkleNode> newPointer = ipfs.object.put(Arrays.asList(object.toJSONString().getBytes()));