Merge pull request #44 from revidee/develop

- Fixed deprecated compiler warning
CCob · Sep 25, 2018 · 0e887bb · 0e887bb
2 parents a486210 + 0512c91
commit 0e887bb
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/src/main/java/com/github/ccob/bittrex4j/cloudflare/CloudFlareAuthorizer.java b/src/main/java/com/github/ccob/bittrex4j/cloudflare/CloudFlareAuthorizer.java
@@ -13,9 +13,12 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.script.*;
+import javax.script.ScriptEngine;
+import javax.script.ScriptEngineManager;
+import javax.script.ScriptException;
 import java.io.IOException;
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.net.URLEncoder;
@@ -24,9 +27,6 @@
 import java.util.TimerTask;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-import java.util.stream.Collectors;
-
-import static javax.script.ScriptContext.ENGINE_SCOPE;
 
 public class CloudFlareAuthorizer {
 
@@ -160,7 +160,7 @@ private String getJsAnswer(URL url, String responseHtml) throws ScriptException,
             }
 
             log.debug(String.format("CloudFlare JS challenge code: %s", jsCode));
-            return new BigDecimal(engine.eval(jsCode).toString()).setScale(10,BigDecimal.ROUND_HALF_UP).toString();
+            return new BigDecimal(engine.eval(jsCode).toString()).setScale(10, RoundingMode.HALF_UP).toString();
         }
         throw new IllegalStateException("BUG: could not find initial CF JS challenge code");
     }

diff --git a/src/main/java/com/github/ccob/bittrex4j/dao/Fill.java b/src/main/java/com/github/ccob/bittrex4j/dao/Fill.java
@@ -27,15 +27,15 @@ public class Fill {
     double quantity;
     double total;
     ZonedDateTime timeStamp;
-    int fillId;
+    Integer fillId;
 
 
 
     @JsonCreator
     public Fill(@Nullable @JsonProperty("Id") @JsonAlias("I") Long id, @JsonProperty("OrderType") @JsonAlias("OT") String orderType, @Nullable @JsonProperty("FillType") @JsonAlias("F") String fillType,
                 @Nullable @JsonProperty("Price") @JsonAlias("P") Double price, @Nullable @JsonProperty("Rate")  @JsonAlias("R")Double rate,
                 @JsonProperty("Quantity") @JsonAlias("Q") double quantity, @Nullable @JsonProperty("Total") @JsonAlias("t") Double total, @JsonProperty("TimeStamp") @JsonAlias("T") ZonedDateTime timeStamp,
-                @JsonProperty("FI") Integer fillId){
+                @Nullable @JsonProperty("FI") Integer fillId){
 
         if(rate == null && price == null){
             throw new IllegalArgumentException("Either rate or price should be set");