Merge pull request binance-exchange#261 from xnetz/master

Updated model according to the latest Binance api spec.

Author: joaopsilva

pom.xml

@@ -6,7 +6,7 @@
 
   <groupId>com.binance.api</groupId>
   <artifactId>binance-api-client</artifactId>
-  <version>1.0.0</version>
+  <version>1.0.1</version>
   <licenses>
     <license>
       <name>The MIT License</name>
@@ -60,4 +60,4 @@
     </plugins>
   </build>
 
-</project>
+</project>

src/main/java/com/binance/api/client/domain/account/NewOrder.java

@@ -38,6 +38,11 @@ public class NewOrder {
    */
   private String quantity;
 
+  /**
+   * Quote quantity.
+   */
+  private String quoteOrderQty;
+
   /**
    * Price.
    */
@@ -140,6 +145,15 @@ public NewOrder quantity(String quantity) {
     return this;
   }
 
+  public String getQuoteOrderQty() {
+    return quoteOrderQty;
+  }
+
+  public NewOrder quoteOrderQty(String quoteOrderQty) {
+    this.quoteOrderQty = quoteOrderQty;
+    return this;
+  }
+
   public String getPrice() {
     return price;
   }
@@ -247,6 +261,7 @@ public String toString() {
         .append("type", type)
         .append("timeInForce", timeInForce)
         .append("quantity", quantity)
+        .append("quoteOrderQty", quoteOrderQty)
         .append("price", price)
         .append("newClientOrderId", newClientOrderId)
         .append("stopPrice", stopPrice)

src/main/java/com/binance/api/client/domain/account/Order.java

@@ -6,6 +6,7 @@
 import com.binance.api.client.domain.OrderType;
 import com.binance.api.client.domain.TimeInForce;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
 /**
@@ -78,12 +79,28 @@ public class Order {
    * Order timestamp.
    */
   private long time;
-  
+
   /**
-  * Used to calculate the average price 
-  */
+   * Used to calculate the average price
+   */
   private String cummulativeQuoteQty;
 
+  /**
+   * Update timestamp.
+   */
+  private long updateTime;
+
+  /**
+   * Is working.
+   */
+  @JsonProperty("isWorking")
+  private boolean working;
+
+  /**
+   * Original quote order quantity.
+   */
+  private String origQuoteOrderQty;
+
   public String getSymbol() {
     return symbol;
   }
@@ -187,13 +204,37 @@ public long getTime() {
   public void setTime(long time) {
     this.time = time;
   }
-  
+
   public String getCummulativeQuoteQty() {
     return cummulativeQuoteQty;
   }
 
   public void setCummulativeQuoteQty(String cummulativeQuoteQty) {
-     this.cummulativeQuoteQty = cummulativeQuoteQty;
+    this.cummulativeQuoteQty = cummulativeQuoteQty;
+  }
+
+  public long getUpdateTime() {
+    return updateTime;
+  }
+
+  public void setUpdateTime(long updateTime) {
+    this.updateTime = updateTime;
+  }
+
+  public boolean isWorking() {
+    return working;
+  }
+
+  public void setWorking(boolean working) {
+    this.working = working;
+  }
+
+  public String getOrigQuoteOrderQty() {
+    return origQuoteOrderQty;
+  }
+
+  public void setOrigQuoteOrderQty(String origQuoteOrderQty) {
+    this.origQuoteOrderQty = origQuoteOrderQty;
   }
 
   @Override
@@ -213,6 +254,9 @@ public String toString() {
         .append("icebergQty", icebergQty)
         .append("time", time)
         .append("cummulativeQuoteQty", cummulativeQuoteQty)
+        .append("updateTime", updateTime)
+        .append("isWorking", working)
+        .append("origQuoteOrderQty", origQuoteOrderQty)
         .toString();
   }
 }

src/main/java/com/binance/api/client/domain/event/BalanceUpdateEvent.java

@@ -0,0 +1,83 @@
+package com.binance.api.client.domain.event;
+
+import com.binance.api.client.constant.BinanceApiConstants;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+
+/**
+ * Account update event which will reflect the balance changes of the account.
+ * <p>
+ * This event is embedded as part of a user data update event.
+ *
+ * @see UserDataUpdateEvent
+ */
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class BalanceUpdateEvent {
+
+  @JsonProperty("e")
+  private String eventType;
+
+  @JsonProperty("E")
+  private long eventTime;
+
+  @JsonProperty("a")
+  private String asset;
+
+  @JsonProperty("d")
+  private String balanceDelta;
+
+  @JsonProperty("T")
+  private Long clearTime;
+
+  public String getEventType() {
+    return eventType;
+  }
+
+  public void setEventType(String eventType) {
+    this.eventType = eventType;
+  }
+
+  public long getEventTime() {
+    return eventTime;
+  }
+
+  public void setEventTime(long eventTime) {
+    this.eventTime = eventTime;
+  }
+
+  public String getAsset() {
+    return asset;
+  }
+
+  public void setAsset(String asset) {
+    this.asset = asset;
+  }
+
+  public String getBalanceDelta() {
+    return balanceDelta;
+  }
+
+  public void setBalanceDelta(String balanceDelta) {
+    this.balanceDelta = balanceDelta;
+  }
+
+  public Long getClearTime() {
+    return clearTime;
+  }
+
+  public void setClearTime(Long clearTime) {
+    this.clearTime = clearTime;
+  }
+
+  @Override
+  public String toString() {
+    return new ToStringBuilder(this, BinanceApiConstants.TO_STRING_BUILDER_STYLE)
+        .append("eventType", eventType)
+        .append("eventTime", eventTime)
+        .append("balances", asset)
+        .append("balanceDelta", balanceDelta)
+        .append("clearTime", clearTime)
+        .toString();
+  }
+}

src/main/java/com/binance/api/client/domain/event/OrderTradeUpdateEvent.java

@@ -1,19 +1,14 @@
 package com.binance.api.client.domain.event;
 
 import com.binance.api.client.constant.BinanceApiConstants;
-import com.binance.api.client.domain.ExecutionType;
-import com.binance.api.client.domain.OrderRejectReason;
-import com.binance.api.client.domain.OrderSide;
-import com.binance.api.client.domain.OrderStatus;
-import com.binance.api.client.domain.OrderType;
-import com.binance.api.client.domain.TimeInForce;
+import com.binance.api.client.domain.*;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
 /**
  * Order or trade report update event.
- *
+ * <p>
  * This event is embedded as part of a user data update event.
  *
  * @see UserDataUpdateEvent
@@ -129,6 +124,30 @@ public class OrderTradeUpdateEvent {
   @JsonProperty("t")
   private Long tradeId;
 
+  /**
+   * Order creation time.
+   */
+  @JsonProperty("O")
+  private Long orderCreationTime;
+
+  /**
+   * Cumulative quote asset transacted quantity.
+   */
+  @JsonProperty("Z")
+  private String cumulativeQuoteQty;
+
+  /**
+   * Last quote asset transacted quantity (i.e. lastPrice * lastQty).
+   */
+  @JsonProperty("Y")
+  private String lastQuoteQty;
+
+  /**
+   * Quote Order Qty.
+   */
+  @JsonProperty("Q")
+  private String quoteOrderQty;
+
   public String getEventType() {
     return eventType;
   }
@@ -289,6 +308,37 @@ public void setTradeId(Long tradeId) {
     this.tradeId = tradeId;
   }
 
+  public Long getOrderCreationTime() {
+    return orderCreationTime;
+  }
+
+  public void setOrderCreationTime(Long orderCreationTime) {
+    this.orderCreationTime = orderCreationTime;
+  }
+
+  public String getCumulativeQuoteQty() {
+    return cumulativeQuoteQty;
+  }
+
+  public void setCumulativeQuoteQty(String cumulativeQuoteQty) {
+    this.cumulativeQuoteQty = cumulativeQuoteQty;
+  }
+
+  public String getLastQuoteQty() {
+    return lastQuoteQty;
+  }
+
+  public void setLastQuoteQty(String lastQuoteQty) {
+    this.lastQuoteQty = lastQuoteQty;
+  }
+
+  public String getQuoteOrderQty() {
+    return quoteOrderQty;
+  }
+
+  public void setQuoteOrderQty(String quoteOrderQty) {
+    this.quoteOrderQty = quoteOrderQty;
+  }
 
   @Override
   public String toString() {
@@ -313,6 +363,10 @@ public String toString() {
         .append("commissionAsset", commissionAsset)
         .append("orderTradeTime", orderTradeTime)
         .append("tradeId", tradeId)
+        .append("orderCreationTime", orderCreationTime)
+        .append("cumulativeQuoteQty", cumulativeQuoteQty)
+        .append("lastQuoteQty", lastQuoteQty)
+        .append("quoteOrderQty", quoteOrderQty)
         .toString();
   }
 }

src/main/java/com/binance/api/client/domain/event/TopOrdersEvent.java

@@ -0,0 +1,51 @@
+package com.binance.api.client.domain.event;
+
+import com.binance.api.client.constant.BinanceApiConstants;
+import com.binance.api.client.domain.market.OrderBookEntry;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+
+import java.util.List;
+
+/**
+ * Top bids and asks from Partial Book Depth event
+ */
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class TopOrdersEvent {
+  private Long lastUpdateId;
+  private List<OrderBookEntry> bids;
+  private List<OrderBookEntry> asks;
+
+  public Long getLastUpdateId() {
+    return lastUpdateId;
+  }
+
+  public void setLastUpdateId(Long lastUpdateId) {
+    this.lastUpdateId = lastUpdateId;
+  }
+
+  public List<OrderBookEntry> getBids() {
+    return bids;
+  }
+
+  public void setBids(List<OrderBookEntry> bids) {
+    this.bids = bids;
+  }
+
+  public List<OrderBookEntry> getAsks() {
+    return asks;
+  }
+
+  public void setAsks(List<OrderBookEntry> asks) {
+    this.asks = asks;
+  }
+
+  @Override
+  public String toString() {
+    return new ToStringBuilder(this, BinanceApiConstants.TO_STRING_BUILDER_STYLE)
+        .append("lastUpdateId", lastUpdateId)
+        .append("bids", bids)
+        .append("asks", asks)
+        .toString();
+  }
+}