Merge branch 'feat/client-reusability' into develop

Author: Pedro Pablo Bustamante Barrera

src/main/java/com/cryptomarket/sdk/HMAC.java

@@ -25,6 +25,10 @@ public HMAC(String apiKey, String apiSecret, Integer window) {
     this.window = window;
   }
 
+  public Integer getWindow() {
+    return window;
+  }
+
   public String getCredential(String method, String body, String url) {
     String timestamp = String.format("%d", System.currentTimeMillis());
     String message = new StringBuffer()

src/main/java/com/cryptomarket/sdk/rest/CloseableHttpClient.java

@@ -9,6 +9,13 @@
 
 public interface CloseableHttpClient extends Closeable {
 
+  /**
+   * Changes the user credentials used for authentication in calls
+   * @param apiKey the user public key used in new calls
+   * @param apiSecret the user secret key used in new calls
+   */
+  public void changeCredentials(String apiKey, String apiSecret);
+
   /**
    * Does an http get without authentication
    *

src/main/java/com/cryptomarket/sdk/rest/CryptomarketRestClient.java

@@ -4,25 +4,25 @@
 import java.util.List;
 import java.util.Map;
 
+import org.jetbrains.annotations.Nullable;
+
 import com.cryptomarket.params.AccountType;
 import com.cryptomarket.params.ContingencyType;
-import com.cryptomarket.params.SortBy;
-import com.cryptomarket.params.SubAccountStatus;
+import com.cryptomarket.params.IdentifyBy;
+import com.cryptomarket.params.OrderBuilder;
 import com.cryptomarket.params.OrderType;
 import com.cryptomarket.params.ParamsBuilder;
 import com.cryptomarket.params.Period;
 import com.cryptomarket.params.Side;
 import com.cryptomarket.params.Sort;
+import com.cryptomarket.params.SortBy;
+import com.cryptomarket.params.SubAccountTransferType;
 import com.cryptomarket.params.TimeInForce;
 import com.cryptomarket.params.TransactionStatus;
 import com.cryptomarket.params.TransactionSubtype;
 import com.cryptomarket.params.TransactionType;
-import com.cryptomarket.params.SubAccountTransferType;
-import com.cryptomarket.params.IdentifyBy;
-import com.cryptomarket.params.OrderBuilder;
 import com.cryptomarket.params.UseOffchain;
 import com.cryptomarket.sdk.exceptions.CryptomarketSDKException;
-import com.cryptomarket.sdk.models.SubAccountSettings;
 import com.cryptomarket.sdk.models.Address;
 import com.cryptomarket.sdk.models.AmountLock;
 import com.cryptomarket.sdk.models.Balance;
@@ -36,19 +36,26 @@
 import com.cryptomarket.sdk.models.PublicTrade;
 import com.cryptomarket.sdk.models.SubAccount;
 import com.cryptomarket.sdk.models.SubAccountBalances;
+import com.cryptomarket.sdk.models.SubAccountSettings;
 import com.cryptomarket.sdk.models.Symbol;
 import com.cryptomarket.sdk.models.Ticker;
 import com.cryptomarket.sdk.models.TickerPrice;
 import com.cryptomarket.sdk.models.Trade;
 import com.cryptomarket.sdk.models.Transaction;
 
-import org.jetbrains.annotations.Nullable;
-
 /**
  * Rest Client Interface for cryptomarket API V3.
  */
 public interface CryptomarketRestClient extends Closeable {
 
+  /**
+   * Changes the user credentials used for authentication in calls
+   *
+   * @param apiKey    the user public key used in new calls
+   * @param apiSecret the user secret key used in new calls
+   */
+  public void changeCredentials(String apiKey, String apiSecret);
+
   /// PUBLIC CALLS///
 
   /**

src/main/java/com/cryptomarket/sdk/rest/CryptomarketRestClientImpl.java

@@ -5,22 +5,23 @@
 import java.util.List;
 import java.util.Map;
 
+import org.apache.http.impl.client.HttpClients;
+
 import com.cryptomarket.params.AccountType;
 import com.cryptomarket.params.ContingencyType;
-import com.cryptomarket.params.SortBy;
-import com.cryptomarket.params.SubAccountStatus;
+import com.cryptomarket.params.IdentifyBy;
+import com.cryptomarket.params.OrderBuilder;
 import com.cryptomarket.params.OrderType;
 import com.cryptomarket.params.ParamsBuilder;
 import com.cryptomarket.params.Period;
 import com.cryptomarket.params.Side;
 import com.cryptomarket.params.Sort;
+import com.cryptomarket.params.SortBy;
+import com.cryptomarket.params.SubAccountTransferType;
 import com.cryptomarket.params.TimeInForce;
 import com.cryptomarket.params.TransactionStatus;
 import com.cryptomarket.params.TransactionSubtype;
 import com.cryptomarket.params.TransactionType;
-import com.cryptomarket.params.SubAccountTransferType;
-import com.cryptomarket.params.IdentifyBy;
-import com.cryptomarket.params.OrderBuilder;
 import com.cryptomarket.params.UseOffchain;
 import com.cryptomarket.sdk.Adapter;
 import com.cryptomarket.sdk.ArgNames;
@@ -52,15 +53,29 @@ public class CryptomarketRestClientImpl implements CryptomarketRestClient {
   Adapter adapter = new Adapter();
 
   public CryptomarketRestClientImpl(String apiKey, String apiSecret) {
+    this(apiKey, apiSecret, HttpClients.createDefault());
+  }
+
+  public CryptomarketRestClientImpl(String apiKey, String apiSecret,
+      org.apache.http.impl.client.CloseableHttpClient client) {
     String url = "https://api.exchange.cryptomkt.com";
     String apiVersion = "/api/3/";
-    httpClient = new HttpClientImpl(url, apiVersion, apiKey, apiSecret);
+    httpClient = new HttpClientImpl(client, url, apiVersion, apiKey, apiSecret);
   }
 
   public CryptomarketRestClientImpl() {
     this("", "");
   }
 
+  public CryptomarketRestClientImpl(org.apache.http.impl.client.CloseableHttpClient client) {
+    this("", "", client);
+  }
+
+  @Override
+  public void changeCredentials(String apiKey, String apiSecret) {
+    httpClient.changeCredentials(apiKey, apiSecret);
+  }
+
   // PUBLIC
 
   @Override

src/main/java/com/cryptomarket/sdk/rest/HttpClientImpl.java

@@ -49,10 +49,9 @@ public class HttpClientImpl implements CloseableHttpClient {
   private final JsonAdapter<ErrorResponse> errorJsonAdapter = moshi.adapter(ErrorResponse.class);
   private final ParameterizedType mapStringString = Types.newParameterizedType(Map.class, String.class, String.class);
   private final JsonAdapter<Map<String, String>> mapStrStrJsonAdapter = moshi.adapter(mapStringString);
-  org.apache.http.impl.client.CloseableHttpClient client = HttpClients.createDefault();
+  private final org.apache.http.impl.client.CloseableHttpClient client;
   private HMAC hmac;
 
-
   class HttpDeleteWithBody extends HttpEntityEnclosingRequestBase {
     public static final String METHOD_NAME = "DELETE";
 
@@ -79,12 +78,31 @@ public HttpClientImpl(String url, String apiVersion, String apiKey, String apiSe
     this(url, apiVersion, apiKey, apiSecret, 0);
   }
 
+  public HttpClientImpl(org.apache.http.impl.client.CloseableHttpClient client, String url, String apiVersion,
+      String apiKey, String apiSecret) {
+    this(client, url, apiVersion, apiKey, apiSecret, 0);
+  }
+
   public HttpClientImpl(String url, String apiVersion, String apiKey, String apiSecret, Integer window) {
+    this.client = HttpClients.createDefault();
     this.hmac = new HMAC(apiKey, apiSecret, window);
     this.url = url;
     this.apiVersion = apiVersion;
   }
 
+  public HttpClientImpl(org.apache.http.impl.client.CloseableHttpClient client, String url, String apiVersion,
+      String apiKey, String apiSecret, Integer window) {
+    this.client = client;
+    this.hmac = new HMAC(apiKey, apiSecret, window);
+    this.url = url;
+    this.apiVersion = apiVersion;
+  }
+
+  @Override
+  public void changeCredentials(String apiKey, String apiSecret) {
+    this.hmac = new HMAC(apiKey, apiSecret, hmac.getWindow());
+  }
+
   public void close() throws IOException {
     client.close();
   }