Force source encoding to UTF-8

.gitignore

@@ -94,3 +94,8 @@ hs_err_pid*
 # Maven
 target/
 # End of https://www.gitignore.io/api/java,intellij
+
+# Ignore files and folders starting with dot (except gitignore)
+.*
+!/.gitignore
+/nbproject/

LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2017 Binance
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

README.md

@@ -186,7 +186,8 @@ System.out.println(order.getExecutedQty());
 
 #### Placing a MARKET order
 ```java
-NewOrderResponse newOrderResponse = client.newOrder(marketBuy("LINKETH", "1000"));
+NewOrderResponse newOrderResponse = client.newOrder(marketBuy("LINKETH", "1000").orderRespType(OrderResponseType.FULL));
+List<Trade> fills = newOrderResponse.getFills();
 System.out.println(newOrderResponse.getClientOrderId());
 ```
 <details>
@@ -279,6 +280,43 @@ client.closeUserDataStream(listenKey);
 BinanceApiWebSocketClient client = BinanceApiClientFactory.newInstance().newWebSocketClient();
 ```
 
+User needs to be aware that REST symbols which are `upper case` differ from WebSocket symbols which must be `lower case`.
+In scenario of subscription with upper case styled symbol, server will return no error and subscribe to given channel - however, no events will be pushed.   
+
+#### Handling web socket errors
+
+Each of the methods on `BinanceApiWebSocketClient`, which opens a new web socket, takes a `BinanceApiCallback`, which is
+called for each event received from the Binance servers. 
+
+The `BinanceApiCallback` interface also has a `onFailure(Throwable)` method, which, optionally, can be implemented to 
+receive notifications if the web-socket fails, e.g. disconnection.   
+
+```java
+client.onAggTradeEvent(symbol.toLowerCase(), new BinanceApiCallback<AggTradeEvent>() {
+    @Override
+    public void onResponse(final AggTradeEvent response) {
+        System.out.println(response);
+    }
+
+    @Override
+    public void onFailure(final Throwable cause) {
+        System.err.println("Web socket failed");
+        cause.printStackTrace(System.err);
+    }
+});
+```
+
+#### Closing web sockets
+
+Each of the methods on `BinanceApiWebSocketClient`, which opens a new web socket, also returns a `Closeable`.
+This `Closeable` can be used to close the underlying web socket and free any associated resources, e.g.
+
+```java
+Closable ws = client.onAggTradeEvent("ethbtc", someCallback);
+// some time later...
+ws.close();
+```
+
 #### Listen for aggregated trade events for ETH/BTC
 ```java
 client.onAggTradeEvent("ethbtc", (AggTradeEvent response) -> {
@@ -396,6 +434,37 @@ client.onUserDataUpdateEvent(listenKey, response -> {
 });
 ```
 
+#### Multi-channel subscription
+Client provides a way for user to subscribe to multiple channels using same websocket - to achieve that user needs to coma-separate symbols as it is in following examples.
+
+````java
+client.onAggTradeEvent("ethbtc,ethusdt", (AggTradeEvent response) -> {
+  if (Objects.equals(response.getSymbol(),"ethbtc")) {
+      // handle ethbtc event
+  } else if(Objects.equals(response.getSymbol()),"ethusdt")) {
+      // handle ethusdt event
+  }
+});
+````
+````java
+client.onDepthEvent("ethbtc,ethusdt", (DepthEvent response) -> {
+  if (Objects.equals(response.getSymbol(),"ethbtc")) {
+      // handle ethbtc event
+  } else if(Objects.equals(response.getSymbol()),"ethusdt")) {
+      // handle ethusdt event
+  }
+});
+````
+````java
+client.onCandlestickEvent("ethbtc,ethusdt", CandlestickInterval.ONE_MINUTE, (CandlestickEvent response) -> {
+  if (Objects.equals(response.getSymbol(),"ethbtc")) {
+      // handle ethbtc event
+  } else if(Objects.equals(response.getSymbol()),"ethusdt")) {
+      // handle ethusdt event
+  }
+});
+````
+
 ### Asynchronous requests
 
 To make an asynchronous request it is necessary to use the `BinanceApiAsyncRestClient`, and call the method with the same name as in the synchronous version, but passing a callback [`BinanceApiCallback`](https://github.com/joaopsilva/binance-java-api/blob/master/src/main/java/com/binance/api/client/BinanceApiCallback.java) that handles the response whenever it arrives.

pom.xml

@@ -7,9 +7,16 @@
   <groupId>com.binance.api</groupId>
   <artifactId>binance-api-client</artifactId>
   <version>1.0.0</version>
+  <licenses>
+    <license>
+      <name>The MIT License</name>
+      <url>https://opensource.org/licenses/MIT</url>
+    </license>
+  </licenses>
 
   <properties>
-    <com.squareup.retrofit2.version>2.3.0</com.squareup.retrofit2.version>
+    <com.squareup.retrofit2.version>2.4.0</com.squareup.retrofit2.version>
+	<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
   </properties>
 
   <dependencies>
@@ -49,6 +56,7 @@
         <configuration>
           <source>1.8</source>
           <target>1.8</target>
+		  <encoding>UTF-8</encoding>
         </configuration>
       </plugin>
     </plugins>

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

@@ -7,12 +7,17 @@
 import com.binance.api.client.domain.account.NewOrderResponse;
 import com.binance.api.client.domain.account.Order;
 import com.binance.api.client.domain.account.Trade;
+import com.binance.api.client.domain.account.TradeHistoryItem;
 import com.binance.api.client.domain.account.WithdrawHistory;
+import com.binance.api.client.domain.account.WithdrawResult;
 import com.binance.api.client.domain.account.request.AllOrdersRequest;
 import com.binance.api.client.domain.account.request.CancelOrderRequest;
+import com.binance.api.client.domain.account.request.CancelOrderResponse;
 import com.binance.api.client.domain.account.request.OrderRequest;
 import com.binance.api.client.domain.account.request.OrderStatusRequest;
 import com.binance.api.client.domain.event.ListenKey;
+import com.binance.api.client.domain.general.Asset;
+import com.binance.api.client.domain.general.ExchangeInfo;
 import com.binance.api.client.domain.general.ServerTime;
 import com.binance.api.client.domain.market.AggTrade;
 import com.binance.api.client.domain.market.BookTicker;
@@ -41,6 +46,16 @@ public interface BinanceApiAsyncRestClient {
    */
   void getServerTime(BinanceApiCallback<ServerTime> callback);
 
+  /**
+   * Current exchange trading rules and symbol information
+   */
+  void getExchangeInfo(BinanceApiCallback<ExchangeInfo> callback);
+
+  /**
+   * ALL supported assets and whether or not they can be withdrawn.
+   */
+  void getAllAssets(BinanceApiCallback<List<Asset>> callback);
+
   // Market Data endpoints
 
   /**
@@ -52,6 +67,25 @@ public interface BinanceApiAsyncRestClient {
    */
   void getOrderBook(String symbol, Integer limit, BinanceApiCallback<OrderBook> callback);
 
+  /**
+   * Get recent trades (up to last 500). Weight: 1
+   *
+   * @param symbol ticker symbol (e.g. ETHBTC)
+   * @param limit of last trades (Default 500; max 1000.)
+   * @param callback the callback that handles the response
+   */
+  void getTrades(String symbol, Integer limit, BinanceApiCallback<List<TradeHistoryItem>> callback);
+
+  /**
+   * Get older trades. Weight: 5
+   *
+   * @param symbol ticker symbol (e.g. ETHBTC)
+   * @param limit of last trades (Default 500; max 1000.)
+   * @param fromId TradeId to fetch from. Default gets most recent trades.
+   * @param callback the callback that handles the response
+   */
+  void getHistoricalTrades(String symbol, Integer limit, Long fromId, BinanceApiCallback<List<TradeHistoryItem>> callback);
+
   /**
    * Get compressed, aggregate trades. Trades that fill at the time, from the same order, with
    * the same price will have the quantity aggregated.
@@ -61,7 +95,7 @@ public interface BinanceApiAsyncRestClient {
    *
    * @param symbol symbol to aggregate (mandatory)
    * @param fromId ID to get aggregate trades from INCLUSIVE (optional)
-   * @param limit Default 500; max 500 (optional)
+   * @param limit Default 500; max 1000 (optional)
    * @param startTime Timestamp in ms to get aggregate trades from INCLUSIVE (optional).
    * @param endTime Timestamp in ms to get aggregate trades until INCLUSIVE (optional).
    * @param callback the callback that handles the response
@@ -81,7 +115,7 @@ public interface BinanceApiAsyncRestClient {
    *
    * @param symbol symbol to aggregate (mandatory)
    * @param interval candlestick interval (mandatory)
-   * @param limit Default 500; max 500 (optional)
+   * @param limit Default 500; max 1000 (optional)
    * @param startTime Timestamp in ms to get candlestick bars from INCLUSIVE (optional).
    * @param endTime Timestamp in ms to get candlestick bars until INCLUSIVE (optional).
    * @param callback the callback that handles the response containing a candlestick bar for the given symbol and interval
@@ -102,13 +136,28 @@ public interface BinanceApiAsyncRestClient {
    * @param callback the callback that handles the response
    */
   void get24HrPriceStatistics(String symbol, BinanceApiCallback<TickerStatistics> callback);
+
+  /**
+   * Get 24 hour price change statistics for all symbols (asynchronous).
+   * 
+   * @param callback the callback that handles the response
+   */
+   void getAll24HrPriceStatistics(BinanceApiCallback<List<TickerStatistics>> callback);
 
   /**
    * Get Latest price for all symbols (asynchronous).
    *
    * @param callback the callback that handles the response
    */
   void getAllPrices(BinanceApiCallback<List<TickerPrice>> callback);
+
+  /**
+   * Get latest price for <code>symbol</code> (asynchronous).
+   * 
+   * @param symbol ticker symbol (e.g. ETHBTC)
+   * @param callback the callback that handles the response
+   */
+   void getPrice(String symbol , BinanceApiCallback<TickerPrice> callback);
 
   /**
    * Get best price/qty on the order book for all symbols (asynchronous).
@@ -149,7 +198,7 @@ public interface BinanceApiAsyncRestClient {
    * @param cancelOrderRequest order status request parameters
    * @param callback the callback that handles the response
    */
-  void cancelOrder(CancelOrderRequest cancelOrderRequest, BinanceApiCallback<Void> callback);
+  void cancelOrder(CancelOrderRequest cancelOrderRequest, BinanceApiCallback<CancelOrderResponse> callback);
 
   /**
    * Get all open orders on a symbol (asynchronous).
@@ -181,7 +230,7 @@ public interface BinanceApiAsyncRestClient {
    * Get trades for a specific account and symbol.
    *
    * @param symbol symbol to get trades from
-   * @param limit default 500; max 500
+   * @param limit default 500; max 1000
    * @param fromId TradeId to fetch from. Default gets most recent trades.
    * @param callback the callback that handles the response with a list of trades
    */
@@ -191,7 +240,7 @@ public interface BinanceApiAsyncRestClient {
    * Get trades for a specific account and symbol.
    *
    * @param symbol symbol to get trades from
-   * @param limit default 500; max 500
+   * @param limit default 500; max 1000
    * @param callback the callback that handles the response with a list of trades
    */
   void getMyTrades(String symbol, Integer limit, BinanceApiCallback<List<Trade>> callback);
@@ -213,8 +262,9 @@ public interface BinanceApiAsyncRestClient {
    * @param address address to withdraw to
    * @param amount amount to withdraw
    * @param name description/alias of the address
+   * @param addressTag Secondary address identifier for coins like XRP,XMR etc.
    */
-  void withdraw(String asset, String address, String amount, String name, BinanceApiCallback<Void> callback);
+  void withdraw(String asset, String address, String amount, String name, String addressTag, BinanceApiCallback<WithdrawResult> callback);
 
   /**
    * Fetch account deposit history.

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

@@ -1,19 +1,24 @@
 package com.binance.api.client;
 
-import com.binance.api.client.exception.BinanceApiException;
-
 /**
  * BinanceApiCallback is a functional interface used together with the BinanceApiAsyncClient to provide a non-blocking REST client.
  *
  * @param <T> the return type from the callback
  */
+@FunctionalInterface
 public interface BinanceApiCallback<T> {
 
     /**
      * Called whenever a response comes back from the Binance API.
      *
      * @param response the expected response object
-     * @throws BinanceApiException if it is not possible to obtain the expected response object (e.g. incorrect API-KEY).
      */
-    void onResponse(T response) throws BinanceApiException;
+    void onResponse(T response);
+
+    /**
+     * Called whenever an error occurs.
+     *
+     * @param cause the cause of the failure
+     */
+    default void onFailure(Throwable cause) {}
 }

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

@@ -4,6 +4,8 @@
 import com.binance.api.client.impl.BinanceApiRestClientImpl;
 import com.binance.api.client.impl.BinanceApiWebSocketClientImpl;
 
+import static com.binance.api.client.impl.BinanceApiServiceGenerator.getSharedClient;
+
 /**
  * A factory for creating BinanceApi client objects.
  */
@@ -68,6 +70,6 @@ public BinanceApiRestClient newRestClient() {
    * Creates a new web socket client used for handling data streams.
    */
   public BinanceApiWebSocketClient newWebSocketClient() {
-    return new BinanceApiWebSocketClientImpl();
+    return new BinanceApiWebSocketClientImpl(getSharedClient());
   }
 }

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

@@ -1,7 +1,7 @@
 package com.binance.api.client;
 
+import com.binance.api.client.constant.BinanceApiConstants;
 import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 
 /**
  * Binance API error object.
@@ -36,7 +36,7 @@ public void setMsg(String msg) {
 
   @Override
   public String toString() {
-    return new ToStringBuilder(this, ToStringStyle.SHORT_PREFIX_STYLE)
+    return new ToStringBuilder(this, BinanceApiConstants.TO_STRING_BUILDER_STYLE)
         .append("code", code)
         .append("msg", msg)
         .toString();