Clean up code a bit

There is no functional change in this commit

library/src/main/java/com/echsylon/kraken/dto/OrderCancelReceipt.java

@@ -1,13 +1,18 @@
 package com.echsylon.kraken.dto;
 
+import com.google.gson.annotations.SerializedName;
+
 /**
  * For technical details on the API see the online documentation:
  * https://www.kraken.com/help/api
  */
 @SuppressWarnings("WeakerAccess")
 public final class OrderCancelReceipt {
 
+    @SerializedName("count")
     public Integer count;
+
+    @SerializedName("pending")
     public Boolean pending;
 
 }

library/src/main/java/com/echsylon/kraken/dto/Time.java

@@ -1,10 +1,17 @@
 package com.echsylon.kraken.dto;
 
+import com.google.gson.annotations.SerializedName;
+
 /**
  * For technical details on the API see the online documentation:
  * https://www.kraken.com/help/api
  */
 public final class Time {
+
+    @SerializedName("unixtime")
     public Long unixtime;
+
+    @SerializedName("rfc1123")
     public String rfc1123;
+
 }

library/src/main/java/com/echsylon/kraken/request/AddOrderRequestBuilder.java

@@ -51,7 +51,7 @@ public AddOrderRequestBuilder useOneTimePassword(final String oneTimePassword) {
      * @param assetPair Asset pair of the new order.
      * @return This request builder instance allowing method call chaining.
      */
-    public AddOrderRequestBuilder useAssetPair(String assetPair) {
+    public AddOrderRequestBuilder useAssetPair(final String assetPair) {
         data.put("pair", assetPair);
         return this;
     }
@@ -62,7 +62,7 @@ public AddOrderRequestBuilder useAssetPair(String assetPair) {
      * @param type Nature of the order. Options: "buy", "sell".
      * @return This request builder instance allowing method call chaining.
      */
-    public AddOrderRequestBuilder useType(String type) {
+    public AddOrderRequestBuilder useType(final String type) {
         data.put("type", type);
         return this;
     }
@@ -77,7 +77,7 @@ public AddOrderRequestBuilder useType(String type) {
      *                  "stop-loss-and-limit", "settle-position".
      * @return This request builder instance allowing method call chaining.
      */
-    public AddOrderRequestBuilder useOrderType(String orderType) {
+    public AddOrderRequestBuilder useOrderType(final String orderType) {
         data.put("ordertype", orderType);
         return this;
     }
@@ -88,7 +88,7 @@ public AddOrderRequestBuilder useOrderType(String orderType) {
      * @param price The price (depends on order type).
      * @return This request builder instance allowing method call chaining.
      */
-    public AddOrderRequestBuilder usePrice(String price) {
+    public AddOrderRequestBuilder usePrice(final String price) {
         data.put("price", price);
         return this;
     }
@@ -110,7 +110,7 @@ public AddOrderRequestBuilder useSecondaryPrice(String secondaryPrice) {
      * @param volume Order volume in lots.
      * @return This request builder instance allowing method call chaining.
      */
-    public AddOrderRequestBuilder useVolume(String volume) {
+    public AddOrderRequestBuilder useVolume(final String volume) {
         data.put("volume", volume);
         return this;
     }
@@ -121,7 +121,7 @@ public AddOrderRequestBuilder useVolume(String volume) {
      * @param leverage Amount of desired leverage. Defaults to none.
      * @return This request builder instance allowing method call chaining.
      */
-    public AddOrderRequestBuilder useLeverage(String leverage) {
+    public AddOrderRequestBuilder useLeverage(final String leverage) {
         data.put("leverage", leverage);
         return this;
     }
@@ -133,7 +133,7 @@ public AddOrderRequestBuilder useLeverage(String leverage) {
      *              See API documentation for details.
      * @return This request builder instance allowing method call chaining.
      */
-    public AddOrderRequestBuilder useOrderFlags(String... flags) {
+    public AddOrderRequestBuilder useOrderFlags(final String... flags) {
         data.put("oflags", join(flags));
         return this;
     }
@@ -145,7 +145,7 @@ public AddOrderRequestBuilder useOrderFlags(String... flags) {
      *                  (default), +[n], [n].
      * @return This request builder instance allowing method call chaining.
      */
-    public AddOrderRequestBuilder useStartTime(String startTime) {
+    public AddOrderRequestBuilder useStartTime(final String startTime) {
         data.put("starttm", startTime);
         return this;
     }
@@ -157,7 +157,7 @@ public AddOrderRequestBuilder useStartTime(String startTime) {
      *                   (no exp. default), +[n], [n].
      * @return This request builder instance allowing method call chaining.
      */
-    public AddOrderRequestBuilder useExpireTime(String expireTime) {
+    public AddOrderRequestBuilder useExpireTime(final String expireTime) {
         data.put("expiretm", expireTime);
         return this;
     }
@@ -168,7 +168,7 @@ public AddOrderRequestBuilder useExpireTime(String expireTime) {
      * @param userReference User reference id. 32-bit, signed.
      * @return This request builder instance allowing method call chaining.
      */
-    public AddOrderRequestBuilder useReference(String userReference) {
+    public AddOrderRequestBuilder useReference(final String userReference) {
         data.put("userref", userReference);
         return this;
     }
@@ -179,7 +179,7 @@ public AddOrderRequestBuilder useReference(String userReference) {
      * @param closeOrderType Closing order type.
      * @return This request builder instance allowing method call chaining.
      */
-    public AddOrderRequestBuilder useCloseOrderType(String closeOrderType) {
+    public AddOrderRequestBuilder useCloseOrderType(final String closeOrderType) {
         data.put("close[ordertype]", closeOrderType);
         return this;
     }
@@ -190,7 +190,7 @@ public AddOrderRequestBuilder useCloseOrderType(String closeOrderType) {
      * @param closePrice Closing order price.
      * @return This request builder instance allowing method call chaining.
      */
-    public AddOrderRequestBuilder useClosePrice(String closePrice) {
+    public AddOrderRequestBuilder useClosePrice(final String closePrice) {
         data.put("close[price]", closePrice);
         return this;
     }
@@ -201,7 +201,7 @@ public AddOrderRequestBuilder useClosePrice(String closePrice) {
      * @param closeSecondaryPrice Closing order secondary price.
      * @return This request builder instance allowing method call chaining.
      */
-    public AddOrderRequestBuilder useSecondaryClosePrice(String closeSecondaryPrice) {
+    public AddOrderRequestBuilder useSecondaryClosePrice(final String closeSecondaryPrice) {
         data.put("close[price2]", closeSecondaryPrice);
         return this;
     }
@@ -212,7 +212,7 @@ public AddOrderRequestBuilder useSecondaryClosePrice(String closeSecondaryPrice)
      * @param validateOnly Validate only, do not submit order.
      * @return This request builder instance allowing method call chaining.
      */
-    public AddOrderRequestBuilder useValidateOnlyFlag(boolean validateOnly) {
+    public AddOrderRequestBuilder useValidateOnlyFlag(final boolean validateOnly) {
         data.put("validate", asString(validateOnly));
         return this;
     }

library/src/main/java/com/echsylon/kraken/request/AssetInfoRequestBuilder.java

@@ -43,7 +43,7 @@ public AssetInfoRequestBuilder(final CallCounter callCounter,
      * @param info The level of information to get.
      * @return This request builder instance allowing method call chaining.
      */
-    public AssetInfoRequestBuilder useInfo(String info) {
+    public AssetInfoRequestBuilder useInfo(final String info) {
         data.put("info", info);
         return this;
     }
@@ -54,7 +54,7 @@ public AssetInfoRequestBuilder useInfo(String info) {
      * @param assetClass The type of the asset to fetch info on.
      * @return This request builder instance allowing method call chaining.
      */
-    public AssetInfoRequestBuilder useAssetClass(String assetClass) {
+    public AssetInfoRequestBuilder useAssetClass(final String assetClass) {
         data.put("aclass", assetClass);
         return this;
     }
@@ -65,7 +65,7 @@ public AssetInfoRequestBuilder useAssetClass(String assetClass) {
      * @param assets The assets to get info on.
      * @return This request builder instance allowing method call chaining.
      */
-    public AssetInfoRequestBuilder useAssets(String... assets) {
+    public AssetInfoRequestBuilder useAssets(final String... assets) {
         data.put("assets", join(assets));
         return this;
     }

library/src/main/java/com/echsylon/kraken/request/CancelOrderRequestBuilder.java

@@ -48,7 +48,7 @@ public CancelOrderRequestBuilder useOneTimePassword(final String oneTimePassword
      * @param id The transaction or user reference id of the order(s) to close.
      * @return This request builder instance allowing method call chaining.
      */
-    public CancelOrderRequestBuilder useOrderId(String id) {
+    public CancelOrderRequestBuilder useOrderId(final String id) {
         data.put("txid", id);
         return this;
     }

library/src/main/java/com/echsylon/kraken/request/ClosedOrdersRequestBuilder.java

@@ -55,7 +55,7 @@ public ClosedOrdersRequestBuilder useOneTimePassword(final String oneTimePasswor
      * @param includeTrades Whether to include trades. Defaults to false.
      * @return This request builder instance allowing method call chaining.
      */
-    public ClosedOrdersRequestBuilder useTradesFlag(boolean includeTrades) {
+    public ClosedOrdersRequestBuilder useTradesFlag(final boolean includeTrades) {
         data.put("trades", asString(includeTrades));
         return this;
     }
@@ -66,7 +66,7 @@ public ClosedOrdersRequestBuilder useTradesFlag(boolean includeTrades) {
      * @param userReferenceId Restrict results to given user reference id.
      * @return This request builder instance allowing method call chaining.
      */
-    public ClosedOrdersRequestBuilder useReference(String userReferenceId) {
+    public ClosedOrdersRequestBuilder useReference(final String userReferenceId) {
         data.put("userref", userReferenceId);
         return this;
     }
@@ -77,7 +77,7 @@ public ClosedOrdersRequestBuilder useReference(String userReferenceId) {
      * @param start Start time or transaction id of results. Exclusive.
      * @return This request builder instance allowing method call chaining.
      */
-    public ClosedOrdersRequestBuilder useStartTag(String start) {
+    public ClosedOrdersRequestBuilder useStartTag(final String start) {
         data.put("start", start);
         return this;
     }
@@ -88,7 +88,7 @@ public ClosedOrdersRequestBuilder useStartTag(String start) {
      * @param end End time or transaction id of results. Inclusive.
      * @return This request builder instance allowing method call chaining.
      */
-    public ClosedOrdersRequestBuilder useEndTag(String end) {
+    public ClosedOrdersRequestBuilder useEndTag(final String end) {
         data.put("end", end);
         return this;
     }
@@ -99,7 +99,7 @@ public ClosedOrdersRequestBuilder useEndTag(String end) {
      * @param offset Result offset.
      * @return This request builder instance allowing method call chaining.
      */
-    public ClosedOrdersRequestBuilder useOffset(int offset) {
+    public ClosedOrdersRequestBuilder useOffset(final int offset) {
         data.put("ofs", asString(offset));
         return this;
     }
@@ -111,7 +111,7 @@ public ClosedOrdersRequestBuilder useOffset(int offset) {
      *                  "close".
      * @return This request builder instance allowing method call chaining.
      */
-    public ClosedOrdersRequestBuilder useCloseTime(String closeTime) {
+    public ClosedOrdersRequestBuilder useCloseTime(final String closeTime) {
         data.put("closetime", closeTime);
         return this;
     }

library/src/main/java/com/echsylon/kraken/request/LedgersRequestBuilder.java

@@ -55,7 +55,7 @@ public LedgersRequestBuilder useOneTimePassword(final String oneTimePassword) {
      * @param assetClass The type of asset. Defaults to "currency".
      * @return This request builder instance allowing method call chaining.
      */
-    public LedgersRequestBuilder useAssetClass(String assetClass) {
+    public LedgersRequestBuilder useAssetClass(final String assetClass) {
         data.put("aclass", assetClass);
         return this;
     }
@@ -67,7 +67,7 @@ public LedgersRequestBuilder useAssetClass(String assetClass) {
      *             "withdrawal", "trade", "margin".
      * @return This request builder instance allowing method call chaining.
      */
-    public LedgersRequestBuilder useType(String type) {
+    public LedgersRequestBuilder useType(final String type) {
         data.put("type", type);
         return this;
     }
@@ -78,7 +78,7 @@ public LedgersRequestBuilder useType(String type) {
      * @param start Start time or ledger id of results. Exclusive.
      * @return This request builder instance allowing method call chaining.
      */
-    public LedgersRequestBuilder useStartTag(String start) {
+    public LedgersRequestBuilder useStartTag(final String start) {
         data.put("start", start);
         return this;
     }
@@ -89,7 +89,7 @@ public LedgersRequestBuilder useStartTag(String start) {
      * @param end End time or ledger id of results. Inclusive.
      * @return This request builder instance allowing method call chaining.
      */
-    public LedgersRequestBuilder useEndTag(String end) {
+    public LedgersRequestBuilder useEndTag(final String end) {
         data.put("end", end);
         return this;
     }
@@ -100,7 +100,7 @@ public LedgersRequestBuilder useEndTag(String end) {
      * @param offset Result offset.
      * @return This request builder instance allowing method call chaining.
      */
-    public LedgersRequestBuilder useOffset(int offset) {
+    public LedgersRequestBuilder useOffset(final int offset) {
         data.put("ofs", asString(offset));
         return this;
     }
@@ -111,7 +111,7 @@ public LedgersRequestBuilder useOffset(int offset) {
      * @param assets Assets to restrict result to. Defaults to all.
      * @return This request builder instance allowing method call chaining.
      */
-    public LedgersRequestBuilder useAsset(String... assets) {
+    public LedgersRequestBuilder useAsset(final String... assets) {
         data.put("asset", join(assets));
         return this;
     }

library/src/main/java/com/echsylon/kraken/request/OhlcDataRequestBuilder.java

@@ -43,7 +43,7 @@ public OhlcDataRequestBuilder(final CallCounter callCounter,
      * @param pair The asset pair to get OHLC data for.
      * @return This request builder instance allowing method call chaining.
      */
-    public OhlcDataRequestBuilder useAssetPair(String pair) {
+    public OhlcDataRequestBuilder useAssetPair(final String pair) {
         data.put("pair", pair);
         return this;
     }
@@ -56,7 +56,7 @@ public OhlcDataRequestBuilder useAssetPair(String pair) {
      *                 21600
      * @return This request builder instance allowing method call chaining.
      */
-    public OhlcDataRequestBuilder useInterval(int interval) {
+    public OhlcDataRequestBuilder useInterval(final int interval) {
         data.put("interval", asString(interval));
         return this;
     }
@@ -68,7 +68,7 @@ public OhlcDataRequestBuilder useInterval(int interval) {
      *                OHLC data from.
      * @return This request builder instance allowing method call chaining.
      */
-    public OhlcDataRequestBuilder useSinceId(String sinceId) {
+    public OhlcDataRequestBuilder useSinceId(final String sinceId) {
         data.put("since", sinceId);
         return this;
     }

library/src/main/java/com/echsylon/kraken/request/OpenOrdersRequestBuilder.java

@@ -55,7 +55,7 @@ public OpenOrdersRequestBuilder useOneTimePassword(final String oneTimePassword)
      * @param includeTrades Whether to include trades. Defaults to false.
      * @return This request builder instance allowing method call chaining.
      */
-    public OpenOrdersRequestBuilder useTradesFlag(boolean includeTrades) {
+    public OpenOrdersRequestBuilder useTradesFlag(final boolean includeTrades) {
         data.put("trades", asString(includeTrades));
         return this;
     }
@@ -66,7 +66,7 @@ public OpenOrdersRequestBuilder useTradesFlag(boolean includeTrades) {
      * @param userReferenceId Restrict results to given user reference id.
      * @return This request builder instance allowing method call chaining.
      */
-    public OpenOrdersRequestBuilder useReference(String userReferenceId) {
+    public OpenOrdersRequestBuilder useReference(final String userReferenceId) {
         data.put("userref", userReferenceId);
         return this;
     }

library/src/main/java/com/echsylon/kraken/request/OpenPositionsRequestBuilder.java

@@ -57,7 +57,7 @@ public OpenPositionsRequestBuilder useOneTimePassword(final String oneTimePasswo
      *                            Defaults to false.
      * @return This request builder instance allowing method call chaining.
      */
-    public OpenPositionsRequestBuilder useCalculationsFlag(boolean performCalculations) {
+    public OpenPositionsRequestBuilder useCalculationsFlag(final boolean performCalculations) {
         data.put("docalcs", asString(performCalculations));
         return this;
     }
@@ -68,7 +68,7 @@ public OpenPositionsRequestBuilder useCalculationsFlag(boolean performCalculatio
      * @param transactionIds Transaction ids to restrict the result to.
      * @return This request builder instance allowing method call chaining.
      */
-    public OpenPositionsRequestBuilder useTransactions(String... transactionIds) {
+    public OpenPositionsRequestBuilder useTransactions(final String... transactionIds) {
         data.put("txid", join(transactionIds));
         return this;
     }

library/src/main/java/com/echsylon/kraken/request/OrderBookRequestBuilder.java

@@ -43,7 +43,7 @@ public OrderBookRequestBuilder(final CallCounter callCounter,
      * @param pair The asset pair to get the market depth for.
      * @return This request builder instance allowing method call chaining.
      */
-    public OrderBookRequestBuilder useAssetPair(String pair) {
+    public OrderBookRequestBuilder useAssetPair(final String pair) {
         data.put("pair", pair);
         return this;
     }
@@ -54,7 +54,7 @@ public OrderBookRequestBuilder useAssetPair(String pair) {
      * @param count The maximum number of asks or bids.
      * @return This request builder instance allowing method call chaining.
      */
-    public OrderBookRequestBuilder useCount(int count) {
+    public OrderBookRequestBuilder useCount(final int count) {
         data.put("count", asString(count));
         return this;
     }

library/src/main/java/com/echsylon/kraken/request/QueryLedgersRequestBuilder.java

@@ -55,7 +55,7 @@ public QueryLedgersRequestBuilder useOneTimePassword(final String oneTimePasswor
      * @param ledgerIds Id of ledgers to get. 20 max, at least one is required.
      * @return This request builder instance allowing method call chaining.
      */
-    public QueryLedgersRequestBuilder useLedgers(String... ledgerIds) {
+    public QueryLedgersRequestBuilder useLedgers(final String... ledgerIds) {
         data.put("id", join(ledgerIds));
         return this;
     }