Merge pull request #3 from bitsoex/v1

V1 changes

Author: kushal256

bitgo-java-api/src/main/java/com/bitso/bitgo/v1/BitGoClient.java

@@ -19,7 +19,7 @@ public interface BitGoClient {
     Optional<Map<String, Object>> getCurrentUserProfile() throws IOException;
 
 
-    WalletTransactionResponse listWalletTransactions(String walletId, long skip, int limit) throws IOException;
+    WalletTransactionResponse listWalletTransactions(String walletId, long skip, int limit, Long minHeight, Long maxHeight, Integer minConfirms) throws IOException;
 
     WalletAddressResponse listWalletAddress(String walletId, long skip, int limit) throws IOException;
 }

bitgo-java-api/src/main/java/com/bitso/bitgo/v1/BitGoClientImpl.java

@@ -14,6 +14,7 @@
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Optional;
+import java.util.concurrent.TimeUnit;
 
 /**
  * Implementation of the BitGo client.
@@ -74,7 +75,7 @@ public Optional<Map<String, Object>> getCurrentUserProfile() throws IOException
      * @throws IOException
      */
     @Override
-    public WalletTransactionResponse listWalletTransactions(String walletId, long skip, int limit) throws IOException {
+    public WalletTransactionResponse listWalletTransactions(String walletId, long skip, int limit, Long minHeight, Long maxHeight, Integer minConfirms) throws IOException {
         if (limit > 250) limit = 250;
         if (limit < 0) limit = 0;
 
@@ -83,8 +84,32 @@ public WalletTransactionResponse listWalletTransactions(String walletId, long sk
         Map<String, String> reqPropMap = new HashMap<>();
         reqPropMap.put("skip", Long.toString(skip));
         reqPropMap.put("limit", Integer.toString(limit));
-
-        HttpURLConnection conn = httpGet(url, reqPropMap);
+        if (minHeight != null) reqPropMap.put("minHeight", minHeight.toString());
+        if (maxHeight != null) reqPropMap.put("maxHeight", maxHeight.toString());
+        if (minConfirms != null) reqPropMap.put("minConfirms", minConfirms.toString());
+
+        HttpURLConnection conn = null;
+
+        //TODO make these parameters configurable, apply to all our calls, not just this one.  
+        int retryCounter = 0;
+        while (retryCounter < 3) {
+            conn = httpGet(url, reqPropMap);
+            if (conn.getResponseCode() == HttpURLConnection.HTTP_OK) {
+                break;
+            } else if (conn.getResponseCode() >= 500 && conn.getResponseCode() < 600) {  //524 only?
+                long sleepTimeMillis = TimeUnit.SECONDS.toMillis(5);
+                log.info("Got responseCode={} with message={}, sleeping for {}ms, retryCounter={}", conn.getResponseCode(), conn.getResponseMessage(), sleepTimeMillis, retryCounter);
+                try {
+                    Thread.sleep(sleepTimeMillis);
+                } catch (InterruptedException e) {
+                    log.error("Error", e);
+                }
+                retryCounter++;
+            } else {
+                //Some other exception, don't retry
+                break;
+            }
+        }
 
         final WalletTransactionResponse resp = SerializationUtil.mapper.readValue(conn.getInputStream(), WalletTransactionResponse.class);
         log.trace("listWalletTransactions response: {}", resp);

bitgo-java-api/src/test/java/com/bitso/bitgo/util/TestClientV1.java

@@ -44,7 +44,7 @@ public void listWalletAddress() throws IOException {
 
     @Test
     public void listWalletTransfers() throws IOException {
-        final WalletTransactionResponse resp = client.listWalletTransactions(WALLET_ID, 0, 250);
+        final WalletTransactionResponse resp = client.listWalletTransactions(WALLET_ID, 0, 250, null, null, null);
         System.out.println("list.size() = " + resp.getTransactions().size());
         System.out.println("list = " + resp.getTransactions());
         assertTrue(resp.getTransactions().size() > 0);