Fix UserDataStream

Author: mah454

README.md

@@ -420,16 +420,16 @@ client.onUserDataUpdateEvent(listenKey, response -> {
     // Print new balances of every available asset
     System.out.println(accountUpdateEvent.getBalances());
   } else {
-    OrderTradeUpdateEvent orderTradeUpdateEvent = response.getOrderTradeUpdateEvent();
+    OrderTradeUpdateEvent executionReport = response.getOrderTradeUpdateEvent();
 
     // Print details about an order/trade
-    System.out.println(orderTradeUpdateEvent);
+    System.out.println(executionReport);
 
     // Print original quantity
-    System.out.println(orderTradeUpdateEvent.getOriginalQuantity());
+    System.out.println(executionReport.getOriginalQuantity());
 
     // Or price
-    System.out.println(orderTradeUpdateEvent.getPrice());
+    System.out.println(executionReport.getPrice());
   }
 });
 ```

src/main/java/com/binance/api/client/api/BinanceApiService.java

@@ -228,6 +228,9 @@ Call<List<Trade>> getMyMarginTrades(@Query("symbol") String symbol, @Query("limi
     @PUT("/sapi/v1/userDataStream")
     Call<Void> keepAliveMarginUserDataStream(@Query("listenKey") String listenKey);
 
+    @Headers(BinanceApiConstants.ENDPOINT_SECURITY_TYPE_APIKEY_HEADER)
+    @DELETE("/sapi/v1/userDataStream")
+    Call<Void> closeAliveMarginUserDataStream(@Query("listenKey") String listenKey);
     // Binance Liquidity Swap Pool endpoints
 
     @Headers(BinanceApiConstants.ENDPOINT_SECURITY_TYPE_APIKEY_HEADER)

src/main/java/com/binance/api/client/api/sync/BinanceApiFuturesRestClient.java

@@ -26,6 +26,34 @@ public interface BinanceApiFuturesRestClient extends BinanceApiGeneralRestClient
      */
     LeverageResponse changeInitialLeverage(LeverageRequest leverageRequest);
 
+    /**
+     * Change type of margin CROSSED/ISOLATED
+     *
+     * @param marginTypeRequest
+     */
     void changeMarginType(MarginTypeRequest marginTypeRequest);
 
+    // User stream endpoints
+
+    /**
+     * Start a new user data stream.
+     *
+     * @return a listen key that can be used with data streams
+     */
+    String startUserDataStream();
+
+    /**
+     * PING a user data stream to prevent a time out.
+     *
+     * @param listenKey listen key that identifies a data stream
+     */
+    void keepAliveUserDataStream(String listenKey);
+
+    /**
+     * Close out a new user data stream.
+     *
+     * @param listenKey listen key that identifies a data stream
+     */
+    void closeUserDataStream(String listenKey);
+
 }

src/main/java/com/binance/api/client/api/sync/BinanceApiGeneralRestClient.java

@@ -142,26 +142,4 @@ public interface BinanceApiGeneralRestClient {
      * @return a list of all account open orders on a symbol.
      */
     List<Order> getOpenOrders(OrderRequest orderRequest);
-
-    // User stream endpoints
-    /**
-     * Start a new user data stream.
-     *
-     * @return a listen key that can be used with data streams
-     */
-    String startUserDataStream();
-
-    /**
-     * PING a user data stream to prevent a time out.
-     *
-     * @param listenKey listen key that identifies a data stream
-     */
-    void keepAliveUserDataStream(String listenKey);
-
-    /**
-     * Close out a new user data stream.
-     *
-     * @param listenKey listen key that identifies a data stream
-     */
-    void closeUserDataStream(String listenKey);
 }

src/main/java/com/binance/api/client/api/sync/BinanceApiMarginRestClient.java

@@ -105,4 +105,26 @@ public interface BinanceApiMarginRestClient {
      * @return loan records
      */
     LoanQueryResult queryLoan(String asset, String txId);
+
+    // User stream endpoints
+    /**
+     * Start a new user data stream.
+     *
+     * @return a listen key that can be used with data streams
+     */
+    String startUserDataStream();
+
+    /**
+     * PING a user data stream to prevent a time out.
+     *
+     * @param listenKey listen key that identifies a data stream
+     */
+    void keepAliveUserDataStream(String listenKey);
+
+    /**
+     * Close out a new user data stream.
+     *
+     * @param listenKey listen key that identifies a data stream
+     */
+    void closeUserDataStream(String listenKey);
 }

src/main/java/com/binance/api/client/api/sync/BinanceApiSpotRestClient.java

@@ -127,4 +127,26 @@ public interface BinanceApiSpotRestClient extends BinanceApiGeneralRestClient {
      * @return deposit address for a given asset.
      */
     DepositAddress getDepositAddress(String asset);
+
+    // User stream endpoints
+    /**
+     * Start a new user data stream.
+     *
+     * @return a listen key that can be used with data streams
+     */
+    String startUserDataStream();
+
+    /**
+     * PING a user data stream to prevent a time out.
+     *
+     * @param listenKey listen key that identifies a data stream
+     */
+    void keepAliveUserDataStream(String listenKey);
+
+    /**
+     * Close out a new user data stream.
+     *
+     * @param listenKey listen key that identifies a data stream
+     */
+    void closeUserDataStream(String listenKey);
 }

src/main/java/com/binance/api/client/config/SpotApiConfig.java

@@ -4,7 +4,7 @@
  * Configuration used for Binance operations.
  */
 
-@ApiConfig(apiUrl = "https://api.binance.com", webSocketUrl = "wss://stream.binance.com:9443/ws")
+@ApiConfig(apiUrl = "https://api.binance.com", webSocketUrl = "wss://stream.binance.com/ws")
 public class SpotApiConfig implements BinanceApiConfig {
 
 }

src/main/java/com/binance/api/client/domain/OrderType.java

@@ -17,5 +17,5 @@ public enum OrderType {
     LIMIT_MAKER,
     STOP_MARKET,
     TRAILING_STOP_MARKET,
-    TAKE_PROFIT_MARKET,
+    TAKE_PROFIT_MARKET;
 }

…/domain/event/OrderTradeUpdateEvent.java …client/domain/event/ExecutionReport.javasrc/main/java/com/binance/api/client/domain/event/OrderTradeUpdateEvent.java renamed to src/main/java/com/binance/api/client/domain/event/ExecutionReport.java src/main/java/com/binance/api/client/domain/event/OrderTradeUpdateEvent.java renamed to src/main/java/com/binance/api/client/domain/event/ExecutionReport.java

@@ -14,7 +14,7 @@
  * @see UserDataUpdateEvent
  */
 @JsonIgnoreProperties(ignoreUnknown = true)
-public class OrderTradeUpdateEvent {
+public class ExecutionReport {
 
   @JsonProperty("e")
   private String eventType;