Merge branch 'master' of github.com:binance-exchange/binance-java-api

Author: mdvx

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

@@ -37,6 +37,12 @@ public class AllMarketTickersEvent {
   @JsonProperty("Q")
   private String closeTradesQuantity;
 
+  @JsonProperty("b")
+  private String bestBidPrice;
+
+  @JsonProperty("B")
+  private String bestBidQuantity;
+
   @JsonProperty("a")
   private String bestAskPrice;
 
@@ -145,6 +151,22 @@ public void setCloseTradesQuantity(String closeTradesQuantity) {
     this.closeTradesQuantity = closeTradesQuantity;
   }
 
+  public String getBestBidPrice() {
+    return bestBidPrice;
+  }
+
+  public void setBestBidPrice(String bestBidPrice) {
+    this.bestBidPrice = bestBidPrice;
+  }
+
+  public String getBestBidQuantity() {
+    return bestBidQuantity;
+  }
+
+  public void setBestBidQuantity(String bestBidQuantity) {
+    this.bestBidQuantity = bestBidQuantity;
+  }
+
   public String getBestAskPrice() {
     return bestAskPrice;
   }
@@ -253,6 +275,8 @@ public String toString() {
             .append("previousDaysClosePrice", previousDaysClosePrice)
             .append("currentDaysClosePrice", currentDaysClosePrice)
             .append("closeTradesQuantity", closeTradesQuantity)
+            .append("bestBidPrice", bestBidPrice)
+            .append("bestBidQuantity", bestBidQuantity)
             .append("bestAskPrice", bestAskPrice)
             .append("bestAskQuantity", bestAskQuantity)
             .append("openPrice", openPrice)

src/main/java/com/binance/api/client/impl/BinanceApiWebSocketListener.java

@@ -1,13 +1,15 @@
 package com.binance.api.client.impl;
 
-import java.io.IOException;
-import okhttp3.Response;
-import okhttp3.WebSocket;
-import okhttp3.WebSocketListener;
 import com.binance.api.client.BinanceApiCallback;
 import com.binance.api.client.exception.BinanceApiException;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.ObjectReader;
+import okhttp3.Response;
+import okhttp3.WebSocket;
+import okhttp3.WebSocketListener;
+
+import java.io.IOException;
 
 /**
  * Binance API WebSocket listener.
@@ -16,32 +18,26 @@ public class BinanceApiWebSocketListener<T> extends WebSocketListener {
 
   private BinanceApiCallback<T> callback;
 
-  private Class<T> eventClass;
+  private static final ObjectMapper mapper = new ObjectMapper();
 
-  private TypeReference<T> eventTypeReference;
+  private final ObjectReader objectReader;
 
   private boolean closing = false;
 
   public BinanceApiWebSocketListener(BinanceApiCallback<T> callback, Class<T> eventClass) {
     this.callback = callback;
-    this.eventClass = eventClass;
+    this.objectReader = mapper.readerFor(eventClass);
   }
 
   public BinanceApiWebSocketListener(BinanceApiCallback<T> callback, TypeReference<T> eventTypeReference) {
     this.callback = callback;
-    this.eventTypeReference = eventTypeReference;
+    this.objectReader = mapper.readerFor(eventTypeReference);
   }
 
   @Override
   public void onMessage(WebSocket webSocket, String text) {
-    ObjectMapper mapper = new ObjectMapper();
     try {
-      T event = null;
-      if (eventClass == null) {
-        event = mapper.readValue(text, eventTypeReference);
-      } else {
-        event = mapper.readValue(text, eventClass);
-      }
+      T event = objectReader.readValue(text);
       callback.onResponse(event);
     } catch (IOException e) {
       throw new BinanceApiException(e);