Fix bugs

Author: mah454

src/main/java/com/binance/api/client/factory/BinanceFuturesApiClientFactory.java

@@ -2,9 +2,11 @@
 
 import com.binance.api.client.BinanceApiAsyncFuturesRestClient;
 import com.binance.api.client.BinanceApiFuturesRestClient;
+import com.binance.api.client.BinanceApiRestClient;
 import com.binance.api.client.BinanceApiWebSocketClient;
 import com.binance.api.client.impl.BinanceApiAsyncFuturesRestClientImpl;
 import com.binance.api.client.impl.BinanceApiFuturesRestClientImpl;
+import com.binance.api.client.impl.BinanceApiRestClientImpl;
 import com.binance.api.client.impl.BinanceApiWebSocketClientImpl;
 
 import static com.binance.api.client.impl.BinanceApiServiceGenerator.getSharedClient;
@@ -71,8 +73,8 @@ public BinanceApiAsyncFuturesRestClient newAsyncRestClient() {
     /**
      * Creates a new synchronous/blocking Futures REST client.
      */
-    public BinanceApiFuturesRestClient newRestClient() {
-        return new BinanceApiFuturesRestClientImpl(apiKey, secret, apiUrl);
+    public BinanceApiRestClient newRestClient() {
+        return new BinanceApiRestClientImpl(apiKey, secret, apiUrl);
     }
 
     /**
@@ -81,4 +83,11 @@ public BinanceApiFuturesRestClient newRestClient() {
     public BinanceApiWebSocketClient newWebSocketClient() {
         return new BinanceApiWebSocketClientImpl(getSharedClient(), websocketUrl);
     }
+
+    /**
+     * Creates a new synchronous/blocking Futures REST client.
+     */
+    public BinanceApiFuturesRestClient newFuturesRestClient() {
+        return new BinanceApiFuturesRestClientImpl(apiKey, secret, apiUrl);
+    }
 }

src/test/java/com/binance/api/examples/futures/FuturesAccountExample.java

@@ -4,7 +4,6 @@
 import com.binance.api.client.domain.account.FuturesAccount;
 import com.binance.api.client.factory.BinanceAbstractFactory;
 import com.binance.api.client.factory.BinanceFuturesApiClientFactory;
-import com.binance.api.client.factory.BinanceSpotApiClientFactory;
 
 /**
  * Examples binance futures account information
@@ -14,7 +13,7 @@ public class FuturesAccountExample {
 
     public static void main(String[] args) {
         BinanceFuturesApiClientFactory factory = BinanceAbstractFactory.createFuturesFactory("YOUR_API_KEY", "YOUR_SECRET");
-        BinanceApiFuturesRestClient client = factory.newRestClient();
+        BinanceApiFuturesRestClient client = factory.newFuturesRestClient();
 
         FuturesAccount account = client.getAccount();
         System.out.println("Available Balance: " + account.getAvailableBalance());

src/test/java/com/binance/api/examples/futures/FuturesOrdersExample.java

@@ -21,7 +21,7 @@ public class FuturesOrdersExample {
 
     public static void main(String[] args) {
         BinanceFuturesApiClientFactory futuresApiClientFactory = BinanceAbstractFactory.createFuturesFactory("YOUR_API_KEY", "YOUR_SECRET");
-        BinanceApiFuturesRestClient client = futuresApiClientFactory.newRestClient();
+        BinanceApiFuturesRestClient client = futuresApiClientFactory.newFuturesRestClient();
 
         FuturesNewOrderResponse futuresOrderResponse = client.newOrder(limitLong(SYMBOL, TimeInForce.GTC, WorkingType.CONTRACT_PRICE, "13", "27", false));
         long orderId = futuresOrderResponse.getOrderId();

src/test/java/com/binance/api/examples/futures/FuturesUserDataStreamExample.java

@@ -0,0 +1,56 @@
+package com.binance.api.examples.futures;
+
+import com.binance.api.client.BinanceApiFuturesRestClient;
+import com.binance.api.client.BinanceApiRestClient;
+import com.binance.api.client.BinanceApiWebSocketClient;
+import com.binance.api.client.domain.event.AccountUpdateEvent;
+import com.binance.api.client.domain.event.OrderTradeUpdateEvent;
+import com.binance.api.client.domain.event.UserDataUpdateEvent.UserDataUpdateEventType;
+import com.binance.api.client.factory.BinanceAbstractFactory;
+import com.binance.api.client.factory.BinanceFuturesApiClientFactory;
+
+/**
+ * User data stream endpoints examples.
+ * <p>
+ * It illustrates how to create a stream to obtain updates on a user account,
+ * as well as update on trades/orders on a user account.
+ */
+public class FuturesUserDataStreamExample {
+
+    public static void main(String[] args) {
+        BinanceFuturesApiClientFactory factory = BinanceAbstractFactory.createFuturesFactory("YOUR_API_KEY", "YOUR_SECRET");
+        BinanceApiRestClient client = factory.newRestClient();
+
+        // First, we obtain a listenKey which is required to interact with the user data stream
+        String listenKey = client.startUserDataStream();
+
+        // Then, we open a new web socket client, and provide a callback that is called on every update
+        BinanceApiWebSocketClient webSocketClient = factory.newWebSocketClient();
+
+        // Listen for changes in the account
+        webSocketClient.onUserDataUpdateEvent(listenKey, response -> {
+            if (response.getEventType() == UserDataUpdateEventType.ACCOUNT_UPDATE) {
+                AccountUpdateEvent accountUpdateEvent = response.getAccountUpdateEvent();
+                // Print new balances of every available asset
+                System.out.println(accountUpdateEvent.getBalances());
+            } else {
+                OrderTradeUpdateEvent orderTradeUpdateEvent = response.getOrderTradeUpdateEvent();
+                // Print details about an order/trade
+                System.out.println(orderTradeUpdateEvent);
+
+                // Print original quantity
+                System.out.println(orderTradeUpdateEvent.getOriginalQuantity());
+
+                // Or price
+                System.out.println(orderTradeUpdateEvent.getPrice());
+            }
+        });
+        System.out.println("Waiting for events...");
+
+        // We can keep alive the user data stream
+        // client.keepAliveUserDataStream(listenKey);
+
+        // Or we can invalidate it, whenever it is no longer needed
+        // client.closeUserDataStream(listenKey);
+    }
+}

src/test/java/com/binance/api/examples/testnet/TestnetAccountExample.java

@@ -14,7 +14,7 @@ public class TestnetAccountExample {
 
     public static void main(String[] args) {
         BinanceFuturesApiClientFactory factory = BinanceAbstractFactory.createTestnetFactory(API_KEY, SECRET_KEY);
-        BinanceApiFuturesRestClient client = factory.newRestClient();
+        BinanceApiFuturesRestClient client = factory.newFuturesRestClient();
 
         FuturesAccount account = client.getAccount();
         System.out.println("Available Balance: " + account.getAvailableBalance());

src/test/java/com/binance/api/examples/testnet/TestnetOrdersExample.java

@@ -23,7 +23,7 @@ public class TestnetOrdersExample {
 
     public static void main(String[] args) {
         BinanceFuturesApiClientFactory futuresApiClientFactory = BinanceAbstractFactory.createTestnetFactory(API_KEY, SECRET_KEY);
-        BinanceApiFuturesRestClient client = futuresApiClientFactory.newRestClient();
+        BinanceApiFuturesRestClient client = futuresApiClientFactory.newFuturesRestClient();
 
         FuturesNewOrderResponse futuresOrderResponse = client.newOrder(limitLong(SYMBOL, TimeInForce.GTC, WorkingType.CONTRACT_PRICE, "13", "200", false));
         long orderId = futuresOrderResponse.getOrderId();