rename rest client from CryptomktRestClient to CryptomarketRestClient, same with implementation

Author: Insmael

README.md

@@ -26,7 +26,7 @@ add the Maven dependency
 // instance a client
 String api_key = "AB32B3201";
 String api_secret= "21b12401";
-CryptomktRestClient client = new CryptomktRestClientImpl(api_key, api_secret);
+CryptomarketRestClient client = new CryptomarketRestClientImpl(api_key, api_secret);
 
 // get all currencies
 List<Currency> currencies = client.getCurrencies(null);
@@ -208,7 +208,7 @@ try {
 ```java
 
 // rest exceptions
-CryptomktRestClient client = new CryptomktRestClientImpl(api_key, api_secret);
+CryptomarketRestClient client = new CryptomarketRestClientImpl(api_key, api_secret);
 
 // all rest client methods can throw a CryptomarketApiException
 try {

…ryptomarket/sdk/CryptomktRestClient.java …tomarket/sdk/CryptomarketRestClient.javasrc/main/java/com/cryptomarket/sdk/CryptomktRestClient.java renamed to src/main/java/com/cryptomarket/sdk/CryptomarketRestClient.java src/main/java/com/cryptomarket/sdk/CryptomktRestClient.java renamed to src/main/java/com/cryptomarket/sdk/CryptomarketRestClient.java

@@ -32,7 +32,7 @@
 /**
  * Client
  */
-public interface CryptomktRestClient {
+public interface CryptomarketRestClient {
 
     /**
      * Get a list of all currencies or specified currencies.
@@ -403,17 +403,16 @@ public Order createOrder(
     public Order createOrder(OrderRequest orderRequest) throws CryptomarketSDKException;
 
     /**
-     * Cancel all active orders, or all active orders for a specified symbol.
+     * Cancel all active orders.
      * <p>
      * Requires authentication
      * <p>
      * https://api.exchange.cryptomkt.com/#cancel-orders
      * 
-     * @param symbol Optional. If given, cancels all orders of the symbol. If not given, cancels all orders of all symbols
      * @return All the canceled orders
      * @throws CryptomarketSDKException
      */
-    public List<Order> cancelAllOrders(@Nullable String symbol) throws CryptomarketSDKException;
+    public List<Order> cancelAllOrders() throws CryptomarketSDKException;
 
     /**
      * Cancel the order with clientOrderId.

…omarket/sdk/CryptomktRestClientImpl.java …rket/sdk/CryptomarketRestClientImpl.javasrc/main/java/com/cryptomarket/sdk/CryptomktRestClientImpl.java renamed to src/main/java/com/cryptomarket/sdk/CryptomarketRestClientImpl.java src/main/java/com/cryptomarket/sdk/CryptomktRestClientImpl.java renamed to src/main/java/com/cryptomarket/sdk/CryptomarketRestClientImpl.java

@@ -30,17 +30,17 @@
 import com.cryptomarket.sdk.models.Trade;
 import com.cryptomarket.sdk.models.Transaction;
 
-public class CryptomktRestClientImpl implements CryptomktRestClient {
+public class CryptomarketRestClientImpl implements CryptomarketRestClient {
     HttpClient httpClient;
     Adapter adapter = new Adapter();
 
-    public CryptomktRestClientImpl(String apiKey, String apiSecret) {
+    public CryptomarketRestClientImpl(String apiKey, String apiSecret) {
         // httpClient = new HttpClientImpl(apiKey, apiSecret);
         // httpClient = new HttpClientApacheWithBasic(apiKey, apiSecret);
         httpClient = new HttpClientImpl(apiKey, apiSecret);
     }
 
-    public CryptomktRestClientImpl() {
+    public CryptomarketRestClientImpl() {
         this("","");
     }
 
@@ -314,9 +314,8 @@ public Order createOrder(OrderRequest orderRequest) throws CryptomarketSDKExcept
     }
 
     @Override
-    public List<Order> cancelAllOrders(String symbol) throws CryptomarketSDKException {
+    public List<Order> cancelAllOrders() throws CryptomarketSDKException {
         Map<String, String> params = new HashMap<String, String>();
-        if (symbol != null) params.put("symbol", symbol);
         String jsonResponse = httpClient.delete("order", params);
         return adapter.listFromJson(jsonResponse, Order.class);
     }

src/test/java/com/cryptomarket/sdk/AppTest.java

@@ -10,7 +10,7 @@
 public class AppTest 
     extends TestCase
 {
-    CryptomktRestClient client = new CryptomktRestClientImpl(KeyLoader.getApiKey(), KeyLoader.getApiSecret());
+    CryptomarketRestClient client = new CryptomarketRestClientImpl(KeyLoader.getApiKey(), KeyLoader.getApiSecret());
     /**
      * Create the test case
      *

src/test/java/com/cryptomarket/sdk/TestRestClientAccountManagement.java

@@ -13,7 +13,7 @@
 import org.junit.Test;
 
 public class TestRestClientAccountManagement {
-    CryptomktRestClient client = new CryptomktRestClientImpl(KeyLoader.getApiKey(), KeyLoader.getApiSecret());
+    CryptomarketRestClient client = new CryptomarketRestClientImpl(KeyLoader.getApiKey(), KeyLoader.getApiSecret());
 
     @Test
     public void testGetAccountBalance() {

src/test/java/com/cryptomarket/sdk/TestRestClientPublic.java

@@ -22,7 +22,7 @@
 import org.junit.Test;
 
 public class TestRestClientPublic {
-    CryptomktRestClient client = new CryptomktRestClientImpl();
+    CryptomarketRestClient client = new CryptomarketRestClientImpl();
 
 
     @Test

src/test/java/com/cryptomarket/sdk/TestRestClientTrading.java

@@ -16,7 +16,7 @@
 import org.junit.Test;
 
 public class TestRestClientTrading {
-    CryptomktRestClient client = new CryptomktRestClientImpl(KeyLoader.getApiKey(), KeyLoader.getApiSecret());
+    CryptomarketRestClient client = new CryptomarketRestClientImpl(KeyLoader.getApiKey(), KeyLoader.getApiSecret());
 
 
     @Test
@@ -44,7 +44,7 @@ public void testGetActiveOrders() {
     @Test
     public void testCancelAllOrders() {
         try {
-            List<Order> orders = client.cancelAllOrders(null);
+            List<Order> orders = client.cancelAllOrders();
             orders.forEach(Checker.checkOrder);
         } catch (CryptomarketSDKException e) {
             e.printStackTrace();
@@ -55,7 +55,7 @@ public void testCancelAllOrders() {
     @Test
     public void testCancelOrdersOfSymbol() {
         try {
-            client.cancelAllOrders(null);
+            client.cancelAllOrders();
             client.createOrder(new OrderRequest.Builder()
                 .symbol("EOSBTC")
                 .side(Side.SELL)
@@ -72,10 +72,9 @@ public void testCancelOrdersOfSymbol() {
                 .price("1000")
                 .build()
             );
-            List<Order> orders = client.cancelAllOrders("EOSBTC");
+            List<Order> orders = client.cancelAllOrders();
             System.out.println(orders.size());
-            assertTrue(orders.size() == 1);
-            client.cancelAllOrders(null);
+            assertTrue(orders.size() == 2);
 
             orders.forEach(Checker.checkOrder);
         } catch (CryptomarketSDKException e) {

src/test/java/com/cryptomarket/sdk/TestRestClientTradingHistory.java

@@ -12,7 +12,7 @@
 import org.junit.Test;
 
 public class TestRestClientTradingHistory {
-    CryptomktRestClient client = new CryptomktRestClientImpl(KeyLoader.getApiKey(), KeyLoader.getApiSecret());
+    CryptomarketRestClient client = new CryptomarketRestClientImpl(KeyLoader.getApiKey(), KeyLoader.getApiSecret());
 
     @Test
     public void testGetOrderHistoryAndGetOrders() {

src/test/java/com/cryptomarket/sdk/TestWSAccountClientSubs.java

@@ -16,7 +16,7 @@
 
 public class TestWSAccountClientSubs {
     CryptomarketWSAccountClient wsClient;
-    CryptomktRestClient restClient;
+    CryptomarketRestClient restClient;
     Boolean authenticated = false;
     Callback<Boolean> resultCallback = new Callback<Boolean>() {
         @Override
@@ -35,7 +35,7 @@ public void before() {
         try {
             wsClient = new CryptomarketWSAccountClientImpl(KeyLoader.getApiKey(), KeyLoader.getApiSecret());
             wsClient.connect();
-            restClient = new CryptomktRestClientImpl(KeyLoader.getApiKey(), KeyLoader.getApiSecret());
+            restClient = new CryptomarketRestClientImpl(KeyLoader.getApiKey(), KeyLoader.getApiSecret());
             try {TimeUnit.SECONDS.sleep(3);} catch (InterruptedException e) {fail();}
         } catch (Exception e) {
             e.printStackTrace();