minor fixes

Author: kevodwyer

README.md

@@ -114,7 +114,7 @@ Feel free to join in. All welcome. Open an [issue](https://github.com/ipfs/java-
 
 This repository falls under the IPFS [Code of Conduct](https://github.com/ipfs/community/blob/master/code-of-conduct.md).
 
-[![](https://cdn.rawgit.com/jbenet/contribute-ipfs-gif/master/img/contribute.gif)](https://github.com/ipfs/community/blob/master/contributing.md)
+[![](https://cdn.rawgit.com/jbenet/contribute-ipfs-gif/master/img/contribute.gif)](https://github.com/ipfs/community/blob/master/CONTRIBUTING.md)
 
 ## License
 

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

@@ -160,7 +160,7 @@ public Map resolve(String scheme, Multihash hash, boolean recursive) throws IOEx
         return retrieveMap("resolve?arg=/" + scheme+"/"+hash +"&r="+recursive);
     }
 
-
+    @Deprecated
     public String dns(String domain, boolean recursive) throws IOException {
         Map res = retrieveMap("dns?arg=" + domain + "&r=" + recursive);
         return (String)res.get("Path");
@@ -353,14 +353,15 @@ public Map stat(Multihash hash) throws IOException {
     /* 'ipfs object' is a plumbing command used to manipulate DAG objects directly. {Object} is a subset of {Block}
      */
     public class IPFSObject {
+        @Deprecated
         public List<MerkleNode> put(List<byte[]> data) throws IOException {
             Multipart m = new Multipart(protocol +"://" + host + ":" + port + version+"object/put?stream-channels=true", "UTF-8");
             for (byte[] f : data)
                 m.addFilePart("file", Paths.get(""), new NamedStreamable.ByteArrayWrapper(f));
             String res = m.finish();
             return JSONParser.parseStream(res).stream().map(x -> MerkleNode.fromJSON((Map<String, Object>) x)).collect(Collectors.toList());
         }
-
+        @Deprecated
         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");
@@ -370,33 +371,33 @@ public List<MerkleNode> put(String encoding, List<byte[]> data) throws IOExcepti
             String res = m.finish();
             return JSONParser.parseStream(res).stream().map(x -> MerkleNode.fromJSON((Map<String, Object>) x)).collect(Collectors.toList());
         }
-
+        @Deprecated
         public MerkleNode get(Multihash hash) throws IOException {
             Map json = retrieveMap("object/get?stream-channels=true&arg=" + hash);
             json.put("Hash", hash.toBase58());
             return MerkleNode.fromJSON(json);
         }
-
+        @Deprecated
         public MerkleNode links(Multihash hash) throws IOException {
             Map json = retrieveMap("object/links?stream-channels=true&arg=" + hash);
             return MerkleNode.fromJSON(json);
         }
-
+        @Deprecated
         public Map<String, Object> stat(Multihash hash) throws IOException {
             return retrieveMap("object/stat?stream-channels=true&arg=" + hash);
         }
-
+        @Deprecated
         public byte[] data(Multihash hash) throws IOException {
             return retrieve("object/data?stream-channels=true&arg=" + hash);
         }
-
+        @Deprecated
         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);
         }
-
+        @Deprecated
         public MerkleNode patch(Multihash base, String command, Optional<byte[]> data, Optional<String> name, Optional<Multihash> target) throws IOException {
             if (!ObjectPatchTypes.contains(command))
                 throw new IllegalStateException("Illegal Object.patch command type: "+command);
@@ -445,6 +446,7 @@ public String resolve(Multihash hash) throws IOException {
     }
 
     public class DHT {
+        @Deprecated
         public List<Map<String, Object>> findprovs(Multihash hash) throws IOException {
             return getAndParseStream("dht/findprovs?arg=" + hash).stream()
                     .map(x -> (Map<String, Object>) x)
@@ -454,21 +456,22 @@ public List<Map<String, Object>> findprovs(Multihash hash) throws IOException {
         public Map query(Multihash peerId) throws IOException {
             return retrieveMap("dht/query?arg=" + peerId.toString());
         }
-
+        @Deprecated
         public Map findpeer(Multihash id) throws IOException {
             return retrieveMap("dht/findpeer?arg=" + id.toString());
         }
-
+        @Deprecated
         public Map get(Multihash hash) throws IOException {
             return retrieveMap("dht/get?arg=" + hash);
         }
-
+        @Deprecated
         public Map put(String key, String value) throws IOException {
             return retrieveMap("dht/put?arg=" + key + "&arg="+value);
         }
     }
 
     public class File {
+        @Deprecated
         public Map ls(Multihash path) throws IOException {
             return retrieveMap("file/ls?arg=" + path);
         }

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

@@ -25,7 +25,7 @@ public Multipart(String requestURL, String charset) {
             httpConn.setDoInput(true);
             httpConn.setRequestProperty("Expect", "100-continue");
             httpConn.setRequestProperty("Content-Type", "multipart/form-data; boundary=" + boundary);
-            httpConn.setRequestProperty("User-Agent", "Java IPFS CLient");
+            httpConn.setRequestProperty("User-Agent", "Java IPFS Client");
             httpConn.setChunkedStreamingMode(4096);
             out = httpConn.getOutputStream();
         } catch (IOException e) {

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

@@ -415,7 +415,7 @@ public void pubsubSynchronous() {
 
         int nMessages = 100;
         for (int i = 1; i < nMessages; ) {
-            ipfs.pubsub.pub(topic, "Hello!");
+            ipfs.pubsub.pub(topic, "Hello World!");
             if (res.size() >= i) {
                 i++;
             }
@@ -427,7 +427,7 @@ public void pubsubSynchronous() {
     public void pubsub() throws Exception {
         String topic = "topic" + System.nanoTime();
         Stream<Map<String, Object>> sub = ipfs.pubsub.sub(topic);
-        String data = "Hello!";
+        String data = "Hello World!";
         ipfs.pubsub.pub(topic, data);
         ipfs.pubsub.pub(topic, "G'day");
         List<Map> results = sub.limit(2).collect(Collectors.toList());
@@ -623,6 +623,7 @@ public void mountTest() throws IOException {
     }
 
     @Test
+    @Ignore("dhtTest may fail with timeout")
     public void dhtTest() throws IOException {
         MerkleNode raw = ipfs.block.put("Mathematics is wonderful".getBytes(), Optional.of("raw"));
 //        Map get = ipfs.dht.get(raw.hash);