Skip to content

Commit dff4c70

Browse files
committed
Merge latest remote changes into this fork to maintain API compatility
2 parents 95ab6bf + 29f603e commit dff4c70

34 files changed

Lines changed: 134 additions & 15 deletions

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ public interface BinanceApiAsyncRestClient {
7070
* Get recent trades (up to last 500). Weight: 1
7171
*
7272
* @param symbol ticker symbol (e.g. ETHBTC)
73-
* @param limit of last trades (Default 500; max 500.)
73+
* @param limit of last trades (Default 500; max 1000.)
7474
* @param callback the callback that handles the response
7575
*/
7676
void getTrades(String symbol, Integer limit, BinanceApiCallback<List<TradeHistoryItem>> callback);
@@ -79,7 +79,7 @@ public interface BinanceApiAsyncRestClient {
7979
* Get older trades. Weight: 5
8080
*
8181
* @param symbol ticker symbol (e.g. ETHBTC)
82-
* @param limit of last trades (Default 500; max 500.)
82+
* @param limit of last trades (Default 500; max 1000.)
8383
* @param fromId TradeId to fetch from. Default gets most recent trades.
8484
* @param callback the callback that handles the response
8585
*/
@@ -94,7 +94,7 @@ public interface BinanceApiAsyncRestClient {
9494
*
9595
* @param symbol symbol to aggregate (mandatory)
9696
* @param fromId ID to get aggregate trades from INCLUSIVE (optional)
97-
* @param limit Default 500; max 500 (optional)
97+
* @param limit Default 500; max 1000 (optional)
9898
* @param startTime Timestamp in ms to get aggregate trades from INCLUSIVE (optional).
9999
* @param endTime Timestamp in ms to get aggregate trades until INCLUSIVE (optional).
100100
* @param callback the callback that handles the response
@@ -114,7 +114,7 @@ public interface BinanceApiAsyncRestClient {
114114
*
115115
* @param symbol symbol to aggregate (mandatory)
116116
* @param interval candlestick interval (mandatory)
117-
* @param limit Default 500; max 500 (optional)
117+
* @param limit Default 500; max 1000 (optional)
118118
* @param startTime Timestamp in ms to get candlestick bars from INCLUSIVE (optional).
119119
* @param endTime Timestamp in ms to get candlestick bars until INCLUSIVE (optional).
120120
* @param callback the callback that handles the response containing a candlestick bar for the given symbol and interval
@@ -229,7 +229,7 @@ public interface BinanceApiAsyncRestClient {
229229
* Get trades for a specific account and symbol.
230230
*
231231
* @param symbol symbol to get trades from
232-
* @param limit default 500; max 500
232+
* @param limit default 500; max 1000
233233
* @param fromId TradeId to fetch from. Default gets most recent trades.
234234
* @param callback the callback that handles the response with a list of trades
235235
*/
@@ -239,7 +239,7 @@ public interface BinanceApiAsyncRestClient {
239239
* Get trades for a specific account and symbol.
240240
*
241241
* @param symbol symbol to get trades from
242-
* @param limit default 500; max 500
242+
* @param limit default 500; max 1000
243243
* @param callback the callback that handles the response with a list of trades
244244
*/
245245
void getMyTrades(String symbol, Integer limit, BinanceApiCallback<List<Trade>> callback);

‎src/main/java/com/binance/api/client/BinanceApiRestClient.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -69,15 +69,15 @@ public interface BinanceApiRestClient {
6969
* Get recent trades (up to last 500). Weight: 1
7070
*
7171
* @param symbol ticker symbol (e.g. ETHBTC)
72-
* @param limit of last trades (Default 500; max 500.)
72+
* @param limit of last trades (Default 500; max 1000.)
7373
*/
7474
List<TradeHistoryItem> getTrades(String symbol, Integer limit);
7575

7676
/**
7777
* Get older trades. Weight: 5
7878
*
7979
* @param symbol ticker symbol (e.g. ETHBTC)
80-
* @param limit of last trades (Default 500; max 500.)
80+
* @param limit of last trades (Default 500; max 1000.)
8181
* @param fromId TradeId to fetch from. Default gets most recent trades.
8282
*/
8383
List<TradeHistoryItem> getHistoricalTrades(String symbol, Integer limit, Long fromId);
@@ -91,7 +91,7 @@ public interface BinanceApiRestClient {
9191
*
9292
* @param symbol symbol to aggregate (mandatory)
9393
* @param fromId ID to get aggregate trades from INCLUSIVE (optional)
94-
* @param limit Default 500; max 500 (optional)
94+
* @param limit Default 500; max 1000 (optional)
9595
* @param startTime Timestamp in ms to get aggregate trades from INCLUSIVE (optional).
9696
* @param endTime Timestamp in ms to get aggregate trades until INCLUSIVE (optional).
9797
* @return a list of aggregate trades for the given symbol
@@ -110,7 +110,7 @@ public interface BinanceApiRestClient {
110110
*
111111
* @param symbol symbol to aggregate (mandatory)
112112
* @param interval candlestick interval (mandatory)
113-
* @param limit Default 500; max 500 (optional)
113+
* @param limit Default 500; max 1000 (optional)
114114
* @param startTime Timestamp in ms to get candlestick bars from INCLUSIVE (optional).
115115
* @param endTime Timestamp in ms to get candlestick bars until INCLUSIVE (optional).
116116
* @return a candlestick bar for the given symbol and interval
@@ -215,7 +215,7 @@ public interface BinanceApiRestClient {
215215
* Get trades for a specific account and symbol.
216216
*
217217
* @param symbol symbol to get trades from
218-
* @param limit default 500; max 500
218+
* @param limit default 500; max 1000
219219
* @param fromId TradeId to fetch from. Default gets most recent trades.
220220
* @return a list of trades
221221
*/
@@ -225,7 +225,7 @@ public interface BinanceApiRestClient {
225225
* Get trades for a specific account and symbol.
226226
*
227227
* @param symbol symbol to get trades from
228-
* @param limit default 500; max 500
228+
* @param limit default 500; max 1000
229229
* @return a list of trades
230230
*/
231231
List<Trade> getMyTrades(String symbol, Integer limit);

‎src/main/java/com/binance/api/client/domain/ExecutionType.java‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
11
package com.binance.api.client.domain;
22

3+
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
4+
35
/**
46
* Order execution type.
57
*/
8+
@JsonIgnoreProperties(ignoreUnknown = true)
69
public enum ExecutionType {
710
NEW,
811
CANCELED,

‎src/main/java/com/binance/api/client/domain/OrderRejectReason.java‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
11
package com.binance.api.client.domain;
22

3+
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
4+
35
/**
46
* Order reject reason values.
57
*/
8+
@JsonIgnoreProperties(ignoreUnknown = true)
69
public enum OrderRejectReason {
710
NONE,
811
UNKNOWN_INSTRUMENT,

‎src/main/java/com/binance/api/client/domain/OrderSide.java‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
11
package com.binance.api.client.domain;
22

3+
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
4+
35
/**
46
* Buy/Sell order side.
57
*/
8+
@JsonIgnoreProperties(ignoreUnknown = true)
69
public enum OrderSide {
710
BUY,
811
SELL

‎src/main/java/com/binance/api/client/domain/OrderStatus.java‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
11
package com.binance.api.client.domain;
22

3+
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
4+
35
/**
46
* Status of a submitted order.
57
*/
8+
@JsonIgnoreProperties(ignoreUnknown = true)
69
public enum OrderStatus {
710
NEW,
811
PARTIALLY_FILLED,

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
11
package com.binance.api.client.domain;
22

3+
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
4+
35
/**
46
* Type of order to submit to the system.
57
*/
8+
@JsonIgnoreProperties(ignoreUnknown = true)
69
public enum OrderType {
710
LIMIT,
811
MARKET,

‎src/main/java/com/binance/api/client/domain/TimeInForce.java‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
package com.binance.api.client.domain;
22

3+
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
4+
35
/**
46
* Time in force to indicate how long an order will remain active before it is executed or expires.
57
*
@@ -9,6 +11,7 @@
911
*
1012
* @see <a href="http://www.investopedia.com/terms/t/timeinforce.asp">http://www.investopedia.com/terms/t/timeinforce.asp</a>
1113
*/
14+
@JsonIgnoreProperties(ignoreUnknown = true)
1215
public enum TimeInForce {
1316
GTC,
1417
IOC,

‎src/main/java/com/binance/api/client/domain/account/AssetBalance.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,15 @@
11
package com.binance.api.client.domain.account;
22

33
import com.binance.api.client.constant.BinanceApiConstants;
4+
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
45
import org.apache.commons.lang3.builder.ToStringBuilder;
56

67
/**
78
* An asset balance in an Account.
89
*
910
* @see Account
1011
*/
12+
@JsonIgnoreProperties(ignoreUnknown = true)
1113
public class AssetBalance {
1214

1315
/**

‎src/main/java/com/binance/api/client/domain/account/DepositAddress.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
package com.binance.api.client.domain.account;
22

33
import com.binance.api.client.constant.BinanceApiConstants;
4+
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
45
import org.apache.commons.lang3.builder.ToStringBuilder;
56

67
/**
78
* A deposit address for a given asset.
89
*/
10+
@JsonIgnoreProperties(ignoreUnknown = true)
911
public class DepositAddress {
1012

1113
private String address;

0 commit comments

Comments
 (0)