Merge pull request #27 from Kucoin/revert-26-stoporder

Revert "integrate stop order api and websocket"
Kucoin · Oct 26, 2020 · 5264c2f · 5264c2f
2 parents a37feda + 9781d91
commit 5264c2f
Show file tree

Hide file tree

Showing 25 changed files with 97 additions and 468 deletions.
diff --git a/README.md b/README.md
@@ -13,7 +13,7 @@ The detailed document [https://docs.kucoin.com](https://docs.kucoin.com).
 <dependency>
     <groupId>com.kucoin</groupId>
     <artifactId>kucoin-java-sdk</artifactId>
-    <version>1.0.4</version>
+    <version>1.0.3</version>
 </dependency>
 ```
 ## Usage

diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>com.kucoin</groupId>
     <artifactId>kucoin-java-sdk</artifactId>
-    <version>1.0.4</version>
+    <version>1.0.3</version>
 
     <name>kucoin-java-sdk</name>
     <url>http://www.kucoin.com</url>

diff --git a/src/main/java/com/kucoin/sdk/KucoinClientBuilder.java b/src/main/java/com/kucoin/sdk/KucoinClientBuilder.java
@@ -54,8 +54,6 @@ public class KucoinClientBuilder {
 
     private HistoryAPI historyAPI;
 
-    private StopOrderAPI stopOrderAPI;
-
     private ChooseServerStrategy chooseServerStrategy;
 
     public KucoinRestClient buildRestClient() {
@@ -66,7 +64,6 @@ public KucoinRestClient buildRestClient() {
         if (withdrawalAPI == null) withdrawalAPI = new WithdrawalAPIAdapter(baseUrl, apiKey, secret, passPhrase);
         if (fillAPI == null) fillAPI = new FillAPIAdapter(baseUrl, apiKey, secret, passPhrase);
         if (orderAPI == null) orderAPI = new OrderAPIAdapter(baseUrl, apiKey, secret, passPhrase);
-        if (stopOrderAPI == null) stopOrderAPI = new StopOrderAPIAdapter(baseUrl, apiKey, secret, passPhrase);
         if (currencyAPI == null) currencyAPI = new CurrencyAPIAdaptor(baseUrl);
         if (timeAPI == null) timeAPI = new TimeAPIAdapter(baseUrl);
         if (symbolAPI == null) symbolAPI = new SymbolAPIAdaptor(baseUrl);
@@ -118,11 +115,6 @@ public KucoinClientBuilder withOrderAPI(OrderAPI orderAPI) {
         return this;
     }
 
-    public KucoinClientBuilder withStopOrderAPI(StopOrderAPI stopOrderAPI) {
-        this.stopOrderAPI = stopOrderAPI;
-        return this;
-    }
-
     public KucoinClientBuilder withWithdrawalAPI(WithdrawalAPI withdrawalAPI) {
         this.withdrawalAPI = withdrawalAPI;
         return this;

diff --git a/src/main/java/com/kucoin/sdk/KucoinPrivateWSClient.java b/src/main/java/com/kucoin/sdk/KucoinPrivateWSClient.java
@@ -20,9 +20,7 @@ public interface KucoinPrivateWSClient {
      * @param callback
      * @param symbols
      * @return The subscription UUID, or null if sending failed.
-     * @deprecated instead use the method <code>onStopOrderChange(KucoinAPICallback<KucoinEvent<OrderChangeEvent>> callback, String... symbols)</code>
      */
-    @Deprecated
     String onOrderActivate(KucoinAPICallback<KucoinEvent<OrderActivateEvent>> callback, String... symbols);
 
     /**
@@ -42,15 +40,6 @@ public interface KucoinPrivateWSClient {
      */
     String onOrderChange(KucoinAPICallback<KucoinEvent<OrderChangeEvent>> callback, String... symbols);
 
-    /**
-     * You will receive the message when the status of advanced order changes. The message contains the details of the change.
-     *
-     * @param callback
-     * @param symbols
-     * @return The subscription UUID, or null if sending failed.
-     */
-    String onAdvancedOrder(KucoinAPICallback<KucoinEvent<? extends AdvancedOrderEvent>> callback, String... symbols);
-
     /**
      * To prevent the TCP link being disconnected by the server, the client side needs to send ping messages to the server to keep alive the link.
      * After the ping message is sent to the server, the system would return a pong message to the client side.

diff --git a/src/main/java/com/kucoin/sdk/KucoinRestClient.java b/src/main/java/com/kucoin/sdk/KucoinRestClient.java
@@ -32,6 +32,4 @@ public interface KucoinRestClient {
 
     TimeAPI timeAPI();
 
-    StopOrderAPI stopOrderAPI();
-
 }
diff --git a/src/main/java/com/kucoin/sdk/constants/APIConstants.java b/src/main/java/com/kucoin/sdk/constants/APIConstants.java
@@ -24,10 +24,8 @@ public class APIConstants {
     public static final String API_DEPTH5_LEVEL2_TOPIC_PREFIX = "/spotMarket/level2Depth5:";
     public static final String API_DEPTH50_LEVEL2_TOPIC_PREFIX = "/spotMarket/level2Depth50:";
     public static final String API_MATCH_TOPIC_PREFIX = "/market/match:";
-    @Deprecated
     public static final String API_LEVEL3_TOPIC_PREFIX = "/market/level3:";
     public static final String API_LEVEL3_V2_TOPIC_PREFIX = "/spotMarket/level3:";
-    @Deprecated
     public static final String API_ACTIVATE_TOPIC_PREFIX = "/market/level3:";
     public static final String API_BALANCE_TOPIC_PREFIX = "/account/balance";
     public static final String API_ADVANCED_ORDER_TOPIC_PREFIX = "/spotMarket/advancedOrders";

diff --git a/src/main/java/com/kucoin/sdk/factory/RetrofitFactory.java b/src/main/java/com/kucoin/sdk/factory/RetrofitFactory.java
@@ -4,6 +4,7 @@
 package com.kucoin.sdk.factory;
 
 import com.kucoin.sdk.KucoinObjectMapper;
+
 import retrofit2.Converter;
 import retrofit2.Retrofit;
 import retrofit2.converter.jackson.JacksonConverterFactory;
@@ -13,25 +14,45 @@
  */
 public class RetrofitFactory {
 
-    private static final Converter.Factory CONVERTER_FACTORY = JacksonConverterFactory.create(KucoinObjectMapper.INSTANCE);
+    private static volatile boolean publicInited;
+    private static Retrofit publicRetrofit;
 
-    public static Retrofit getPublicRetorfit(String baseUrl) {
+    private static volatile boolean authInited;
+    private static Retrofit authRetrofit;
 
-        return new Retrofit.Builder()
-                .baseUrl(baseUrl)
-                .addConverterFactory(CONVERTER_FACTORY)
-                .client(HttpClientFactory.getPublicClient())
-                .build();
+    private static final Converter.Factory CONVERTER_FACTORY = JacksonConverterFactory.create(KucoinObjectMapper.INSTANCE);
 
+    public static Retrofit getPublicRetorfit(String baseUrl) {
+        if (publicInited)
+            return publicRetrofit;
+        synchronized (RetrofitFactory.class) {
+            if (publicInited)
+                return publicRetrofit;
+            publicInited = true;
+            Retrofit retrofit = new Retrofit.Builder()
+                    .baseUrl(baseUrl)
+                    .addConverterFactory(CONVERTER_FACTORY)
+                    .client(HttpClientFactory.getPublicClient())
+                    .build();
+            publicRetrofit = retrofit;
+            return retrofit;
+        }
     }
 
     public static Retrofit getAuthRetorfit(String baseUrl, String apiKey, String secret, String passPhrase) {
-
-        return new Retrofit.Builder()
-                .baseUrl(baseUrl)
-                .addConverterFactory(CONVERTER_FACTORY)
-                .client(HttpClientFactory.getAuthClient(apiKey, secret, passPhrase))
-                .build();
-
+        if (authInited)
+            return authRetrofit;
+        synchronized (RetrofitFactory.class) {
+            if (authInited)
+                return authRetrofit;
+            authInited = true;
+            Retrofit retrofit =  new Retrofit.Builder()
+                    .baseUrl(baseUrl)
+                    .addConverterFactory(CONVERTER_FACTORY)
+                    .client(HttpClientFactory.getAuthClient(apiKey, secret, passPhrase))
+                    .build();
+            authRetrofit = retrofit;
+            return retrofit;
+        }
     }
 }
diff --git a/src/main/java/com/kucoin/sdk/impl/KucoinPrivateWSClientImpl.java b/src/main/java/com/kucoin/sdk/impl/KucoinPrivateWSClientImpl.java
@@ -56,7 +56,6 @@ protected WebsocketTokenResponse requestToken() throws IOException {
     }
 
     @Override
-    @Deprecated
     public String onOrderActivate(KucoinAPICallback<KucoinEvent<OrderActivateEvent>> callback, String... symbols) {
         if (callback != null) {
             this.listener.setOrderActivateCallback(callback);
@@ -81,14 +80,6 @@ public String onOrderChange(KucoinAPICallback<KucoinEvent<OrderChangeEvent>> cal
         return subscribe(APIConstants.API_ORDER_TOPIC_PREFIX, true, true);
     }
 
-    @Override
-    public String onAdvancedOrder(KucoinAPICallback<KucoinEvent<? extends AdvancedOrderEvent>> callback, String... symbols) {
-        if (callback != null) {
-            this.listener.setAdvancedOrderCallback(callback);
-        }
-        return subscribe(APIConstants.API_ADVANCED_ORDER_TOPIC_PREFIX, true, true);
-    }
-
     @Override
     public String ping(String requestId) {
         return super.ping(requestId);

diff --git a/src/main/java/com/kucoin/sdk/impl/KucoinPublicWSClientImpl.java b/src/main/java/com/kucoin/sdk/impl/KucoinPublicWSClientImpl.java
@@ -110,7 +110,6 @@ public String onLevel3Data_V2(KucoinAPICallback<KucoinEvent<Level3Event>> callba
     }
 
     @Override
-    @Deprecated
     public String onLevel3Data(KucoinAPICallback<KucoinEvent<Level3ChangeEvent>> callback, String... symbols) {
         if (callback != null) {
             this.listener.setLevel3Callback(callback);

diff --git a/src/main/java/com/kucoin/sdk/impl/KucoinRestClientImpl.java b/src/main/java/com/kucoin/sdk/impl/KucoinRestClientImpl.java
@@ -4,37 +4,35 @@
 package com.kucoin.sdk.impl;
 
 import com.kucoin.sdk.KucoinClientBuilder;
-import com.kucoin.sdk.KucoinRestClient;
 import com.kucoin.sdk.rest.interfaces.*;
+import com.kucoin.sdk.KucoinRestClient;
 
 /**
  * Created by chenshiwei on 2019/1/9.
  */
 public class KucoinRestClientImpl implements KucoinRestClient {
 
-    private final UserAPI userAPI;
-
-    private final AccountAPI accountAPI;
+    private UserAPI userAPI;
 
-    private final DepositAPI depositAPI;
+    private AccountAPI accountAPI;
 
-    private final FillAPI fillAPI;
+    private DepositAPI depositAPI;
 
-    private final OrderAPI orderAPI;
+    private FillAPI fillAPI;
 
-    private final WithdrawalAPI withdrawAPI;
+    private OrderAPI orderAPI;
 
-    private final SymbolAPI symbolAPI;
+    private WithdrawalAPI withdrawAPI;
 
-    private final OrderBookAPI orderBookAPI;
+    private SymbolAPI symbolAPI;
 
-    private final HistoryAPI historyAPI;
+    private OrderBookAPI orderBookAPI;
 
-    private final CurrencyAPI currencyAPI;
+    private HistoryAPI historyAPI;
 
-    private final TimeAPI timeAPI;
+    private CurrencyAPI currencyAPI;
 
-    private final StopOrderAPI stopOrderAPI;
+    private TimeAPI timeAPI;
 
     public KucoinRestClientImpl(KucoinClientBuilder kucoinBuilder) {
         this.userAPI = kucoinBuilder.getUserAPI();
@@ -48,7 +46,6 @@ public KucoinRestClientImpl(KucoinClientBuilder kucoinBuilder) {
         this.historyAPI = kucoinBuilder.getHistoryAPI();
         this.currencyAPI = kucoinBuilder.getCurrencyAPI();
         this.timeAPI = kucoinBuilder.getTimeAPI();
-        this.stopOrderAPI = kucoinBuilder.getStopOrderAPI();
     }
 
     @Override
@@ -106,9 +103,4 @@ public TimeAPI timeAPI() {
         return timeAPI;
     }
 
-    @Override
-    public StopOrderAPI stopOrderAPI() {
-        return stopOrderAPI;
-    }
-
 }
diff --git a/src/main/java/com/kucoin/sdk/model/enums/PrivateChannelEnum.java b/src/main/java/com/kucoin/sdk/model/enums/PrivateChannelEnum.java
@@ -12,14 +12,11 @@
 @Getter
 public enum PrivateChannelEnum {
 
-    @Deprecated
     ORDER(APIConstants.API_ACTIVATE_TOPIC_PREFIX),
 
     ORDER_CHANGE(APIConstants.API_ORDER_TOPIC_PREFIX),
 
-    ACCOUNT(APIConstants.API_BALANCE_TOPIC_PREFIX),
-
-    ADVANCED_ORDER(APIConstants.API_ADVANCED_ORDER_TOPIC_PREFIX);
+    ACCOUNT(APIConstants.API_BALANCE_TOPIC_PREFIX);
 
     private String topicPrefix;
 

diff --git a/src/main/java/com/kucoin/sdk/model/enums/PublicChannelEnum.java b/src/main/java/com/kucoin/sdk/model/enums/PublicChannelEnum.java
@@ -22,7 +22,6 @@ public enum PublicChannelEnum {
 
     MATCH(APIConstants.API_MATCH_TOPIC_PREFIX),
 
-    @Deprecated
     LEVEL3(APIConstants.API_LEVEL3_TOPIC_PREFIX),
 
     LEVEL3_V2(APIConstants.API_LEVEL3_V2_TOPIC_PREFIX),

diff --git a/src/main/java/com/kucoin/sdk/rest/adapter/OrderBookAPIAdapter.java b/src/main/java/com/kucoin/sdk/rest/adapter/OrderBookAPIAdapter.java
@@ -3,14 +3,14 @@
  */
 package com.kucoin.sdk.rest.adapter;
 
+import java.io.IOException;
+
 import com.kucoin.sdk.rest.impl.retrofit.PublicRetrofitAPIImpl;
 import com.kucoin.sdk.rest.interfaces.OrderBookAPI;
 import com.kucoin.sdk.rest.interfaces.retrofit.OrderBookAPIRetrofit;
 import com.kucoin.sdk.rest.response.Level3Response;
 import com.kucoin.sdk.rest.response.OrderBookResponse;
 
-import java.io.IOException;
-
 /**
  * Created by chenshiwei on 2019/1/22.
  */
@@ -21,34 +21,16 @@ public OrderBookAPIAdapter(String baseUrl) {
     }
 
     @Override
-    @Deprecated
     public OrderBookResponse getPartOrderBookAggregated(String symbol) throws IOException {
         return super.executeSync(getAPIImpl().getPartOrderBookAggregated(symbol));
     }
 
     @Override
-    public OrderBookResponse getTop100Level2OrderBook(String symbol) throws IOException {
-        return super.executeSync(getAPIImpl().getTop100Level2OrderBook(symbol));
-    }
-
-    @Override
-    public OrderBookResponse getTop20Level2OrderBook(String symbol) throws IOException {
-        return super.executeSync(getAPIImpl().getTop20Level2OrderBook(symbol));
-    }
-
-    @Override
-    @Deprecated
     public OrderBookResponse getFullOrderBookAggregated(String symbol) throws IOException {
         return super.executeSync(getAPIImpl().getFullOrderBookAggregated(symbol));
     }
 
     @Override
-    public OrderBookResponse getFullLevel2OrderBook(String symbol) throws IOException {
-        return super.executeSync(getAPIImpl().getFullLevel2OrderBook(symbol));
-    }
-
-    @Override
-    @Deprecated
     public OrderBookResponse getFullOrderBookAtomic(String symbol) throws IOException {
         return super.executeSync(getAPIImpl().getFullOrderBookAtomic(symbol));
     }