object.put with explicit encoding

Author: ianopolous

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

@@ -169,6 +169,16 @@ public List<MerkleNode> put(List<byte[]> data) throws IOException {
             return JSONParser.parseStream(res).stream().map(x -> MerkleNode.fromJSON((Map<String, Object>) x)).collect(Collectors.toList());
         }
 
+        public List<MerkleNode> put(String encoding, List<byte[]> data) throws IOException {
+            if (!"json".equals(encoding) && "protobuf".equals(encoding))
+                throw new IllegalArgumentException("Encoding must be json or protobuf");
+            Multipart m = new Multipart("http://" + host + ":" + port + version+"object/put?stream-channels=true&encoding="+encoding, "UTF-8");
+            for (byte[] f : data)
+                m.addFilePart("file", new NamedStreamable.ByteArrayWrapper(f));
+            String res = m.finish();
+            return JSONParser.parseStream(res).stream().map(x -> MerkleNode.fromJSON((Map<String, Object>) x)).collect(Collectors.toList());
+        }
+
         public MerkleNode get(Multihash hash) throws IOException {
             Map json = retrieveMap("object/get?stream-channels=true&arg=" + hash);
             json.put("Hash", hash.toBase58());

src/test/java/org/ipfs/api/Test.java

@@ -101,6 +101,7 @@ public void objectTest() {
             Multihash pointer = Multihash.fromBase58("QmPZ9gcCEpqKTo6aq61g2nXGUhM4iCL3ewB6LDXZCtioEB");
             MerkleNode object = ipfs.object.get(pointer);
             List<MerkleNode> newPointer = ipfs.object.put(Arrays.asList(object.toJSONString().getBytes()));
+            List<MerkleNode> newPointer2 = ipfs.object.put("json", Arrays.asList(object.toJSONString().getBytes()));
             MerkleNode links = ipfs.object.links(pointer);
             byte[] data = ipfs.object.data(pointer);
             Map stat = ipfs.object.stat(pointer);