diff --git a/etc/XChange_Eclipse_2017_04.xml b/etc/XChange_Eclipse_2017_04.xml new file mode 100644 index 00000000000..ee3d9ecb62b --- /dev/null +++ b/etc/XChange_Eclipse_2017_04.xml @@ -0,0 +1,1553 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/xchange-anx/src/main/java/org/knowm/xchange/anx/v2/ANXV2.java b/xchange-anx/src/main/java/org/knowm/xchange/anx/v2/ANXV2.java index 44532046f5a..d6e5e4621cb 100644 --- a/xchange-anx/src/main/java/org/knowm/xchange/anx/v2/ANXV2.java +++ b/xchange-anx/src/main/java/org/knowm/xchange/anx/v2/ANXV2.java @@ -52,13 +52,13 @@ ANXTickersWrapper getTickers(@PathParam("ident") String tradeableIdentifier, @Pa @GET @Path("{ident}{currency}/money/depth/fetch") - ANXDepthWrapper getPartialDepth(@PathParam("ident") String tradeableIdentifier, @PathParam("currency") String currency) - throws ANXException, IOException; + ANXDepthWrapper getPartialDepth(@PathParam("ident") String tradeableIdentifier, + @PathParam("currency") String currency) throws ANXException, IOException; @GET @Path("{ident}{currency}/money/depth/full") - ANXDepthWrapper getFullDepth(@PathParam("ident") String tradeableIdentifier, @PathParam("currency") String currency) - throws ANXException, IOException; + ANXDepthWrapper getFullDepth(@PathParam("ident") String tradeableIdentifier, + @PathParam("currency") String currency) throws ANXException, IOException; @GET @Path("{ident}{currency}/money/depth/full") @@ -67,8 +67,8 @@ ANXDepthsWrapper getFullDepths(@PathParam("ident") String tradeableIdentifier, @ @GET @Path("{ident}{currency}/money/trade/fetch") - ANXTradesWrapper getTrades(@PathParam("ident") String tradeableIdentifier, @PathParam("currency") String currency, @QueryParam("since") long since) - throws ANXException, IOException; + ANXTradesWrapper getTrades(@PathParam("ident") String tradeableIdentifier, @PathParam("currency") String currency, + @QueryParam("since") long since) throws ANXException, IOException; // Account Info API @@ -124,8 +124,8 @@ ANXOpenOrderWrapper getOpenOrders(@HeaderParam("Rest-Key") String apiKey, @Heade @Path("money/trade/list") @Consumes(MediaType.APPLICATION_FORM_URLENCODED) ANXTradeResultWrapper getExecutedTrades(@HeaderParam("Rest-Key") String apiKey, @HeaderParam("Rest-Sign") ParamsDigest postBodySignatureCreator, - @FormParam("nonce") SynchronizedValueFactory nonce, @FormParam("from") Long from, @FormParam("to") Long to) - throws ANXException, IOException; + @FormParam("nonce") SynchronizedValueFactory nonce, @FormParam("from") Long from, + @FormParam("to") Long to) throws ANXException, IOException; /** * Status of the order @@ -144,8 +144,8 @@ ANXTradeResultWrapper getExecutedTrades(@HeaderParam("Rest-Key") String apiKey, @Consumes(MediaType.APPLICATION_FORM_URLENCODED) ANXOrderResultWrapper getOrderResult(@HeaderParam("Rest-Key") String apiKey, @HeaderParam("Rest-Sign") ParamsDigest postBodySignatureCreator, @FormParam("nonce") SynchronizedValueFactory nonce, @PathParam("baseCurrency") String baseCurrency, - @PathParam("counterCurrency") String counterCurrency, @FormParam("order") String order, @FormParam("type") String type) - throws ANXException, IOException; + @PathParam("counterCurrency") String counterCurrency, @FormParam("order") String order, + @FormParam("type") String type) throws ANXException, IOException; /** * @param postBodySignatureCreator @@ -191,6 +191,6 @@ ANXGenericResponse cancelOrder(@HeaderParam("Rest-Key") String apiKey, @HeaderPa @Path("money/wallet/history") @Consumes(MediaType.APPLICATION_FORM_URLENCODED) ANXWalletHistoryWrapper getWalletHistory(@HeaderParam("Rest-Key") String apiKey, @HeaderParam("Rest-Sign") ParamsDigest postBodySignatureCreator, - @FormParam("nonce") SynchronizedValueFactory nonce, @FormParam("currency") String currency, @FormParam("page") Integer page) - throws ANXException, IOException; + @FormParam("nonce") SynchronizedValueFactory nonce, @FormParam("currency") String currency, + @FormParam("page") Integer page) throws ANXException, IOException; } diff --git a/xchange-anx/src/main/java/org/knowm/xchange/anx/v2/service/ANXAccountService.java b/xchange-anx/src/main/java/org/knowm/xchange/anx/v2/service/ANXAccountService.java index d8397d81ed0..a2851e56b2d 100644 --- a/xchange-anx/src/main/java/org/knowm/xchange/anx/v2/service/ANXAccountService.java +++ b/xchange-anx/src/main/java/org/knowm/xchange/anx/v2/service/ANXAccountService.java @@ -67,7 +67,8 @@ public TradeHistoryParams createFundingHistoryParams() { } @Override - public List getFundingHistory(TradeHistoryParams params) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { + public List getFundingHistory( + TradeHistoryParams params) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { throw new NotYetImplementedForExchangeException(); } } diff --git a/xchange-anx/src/main/java/org/knowm/xchange/anx/v2/service/ANXTradeService.java b/xchange-anx/src/main/java/org/knowm/xchange/anx/v2/service/ANXTradeService.java index 0f00c097040..ccd795bfc9e 100644 --- a/xchange-anx/src/main/java/org/knowm/xchange/anx/v2/service/ANXTradeService.java +++ b/xchange-anx/src/main/java/org/knowm/xchange/anx/v2/service/ANXTradeService.java @@ -47,7 +47,8 @@ public OpenOrders getOpenOrders() throws IOException { } @Override - public OpenOrders getOpenOrders(OpenOrdersParams params) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { + public OpenOrders getOpenOrders( + OpenOrdersParams params) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { return new OpenOrders(ANXAdapters.adaptOrders(getANXOpenOrders())); } @@ -127,8 +128,8 @@ public OpenOrdersParams createOpenOrdersParams() { } @Override - public Collection getOrder(String... orderIds) - throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { + public Collection getOrder( + String... orderIds) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { throw new NotYetImplementedForExchangeException(); } diff --git a/xchange-bitbay/src/main/java/org/knowm/xchange/bitbay/BitbayAdapters.java b/xchange-bitbay/src/main/java/org/knowm/xchange/bitbay/BitbayAdapters.java index 7bf06664c1b..89676cf9f91 100644 --- a/xchange-bitbay/src/main/java/org/knowm/xchange/bitbay/BitbayAdapters.java +++ b/xchange-bitbay/src/main/java/org/knowm/xchange/bitbay/BitbayAdapters.java @@ -147,7 +147,7 @@ private static LimitOrder createOrder(BitbayOrder bitbayOrder) { throw new IllegalArgumentException(e); } - return new LimitOrder(type, bitbayOrder.getAmount(), currencyPair, String.valueOf(bitbayOrder.getId()), date, bitbayOrder.getStartPrice() - .divide(bitbayOrder.getStartAmount())); + return new LimitOrder(type, bitbayOrder.getAmount(), currencyPair, String.valueOf(bitbayOrder.getId()), date, + bitbayOrder.getStartPrice().divide(bitbayOrder.getStartAmount())); } } diff --git a/xchange-bitbay/src/main/java/org/knowm/xchange/bitbay/BitbayAuthenticated.java b/xchange-bitbay/src/main/java/org/knowm/xchange/bitbay/BitbayAuthenticated.java index c84cd8b08c2..340066043a7 100644 --- a/xchange-bitbay/src/main/java/org/knowm/xchange/bitbay/BitbayAuthenticated.java +++ b/xchange-bitbay/src/main/java/org/knowm/xchange/bitbay/BitbayAuthenticated.java @@ -41,18 +41,15 @@ BitbayAccountInfoResponse info(@HeaderParam("API-Key") String apiKey, @HeaderPar *

* Input: *

- * type : offer type bid/buy or ask/sell - * currency : shortcut of main currency for offer (e.g. “BTC”) - * amount : quantity of main currency - * payment_currency : shortcut of currency used to pay for offer (e.g. “PLN”) - * rate : rate for offer + * type : offer type bid/buy or ask/sell currency : shortcut of main currency for offer (e.g. “BTC”) amount : quantity of main currency + * payment_currency : shortcut of currency used to pay for offer (e.g. “PLN”) rate : rate for offer */ @POST @FormParam("method") BitbayTradeResponse trade(@HeaderParam("API-Key") String apiKey, @HeaderParam("API-Hash") ParamsDigest sign, - @FormParam("moment") SynchronizedValueFactory timestamp, @FormParam("type") String type, - @FormParam("currency") String currency, @FormParam("amount") BigDecimal amount, - @FormParam("payment_currency") String paymentCurrency, @FormParam("rate") BigDecimal rate) throws IOException; + @FormParam("moment") SynchronizedValueFactory timestamp, @FormParam("type") String type, @FormParam("currency") String currency, + @FormParam("amount") BigDecimal amount, @FormParam("payment_currency") String paymentCurrency, + @FormParam("rate") BigDecimal rate) throws IOException; /** * cancel - removes offer from the stock market diff --git a/xchange-bitbay/src/main/java/org/knowm/xchange/bitbay/dto/acount/BitbayAccountInfoResponse.java b/xchange-bitbay/src/main/java/org/knowm/xchange/bitbay/dto/acount/BitbayAccountInfoResponse.java index 96f428c6a8d..8f637f525cd 100644 --- a/xchange-bitbay/src/main/java/org/knowm/xchange/bitbay/dto/acount/BitbayAccountInfoResponse.java +++ b/xchange-bitbay/src/main/java/org/knowm/xchange/bitbay/dto/acount/BitbayAccountInfoResponse.java @@ -13,8 +13,8 @@ public class BitbayAccountInfoResponse extends BitbayBaseResponse { private final Map bitbayBalances; - public BitbayAccountInfoResponse(@JsonProperty("balances") Map bitbayBalances, - @JsonProperty("success") boolean success, @JsonProperty("code") int code, @JsonProperty("message") String errorMsg) { + public BitbayAccountInfoResponse(@JsonProperty("balances") Map bitbayBalances, @JsonProperty("success") boolean success, + @JsonProperty("code") int code, @JsonProperty("message") String errorMsg) { super(success, code, errorMsg); this.bitbayBalances = bitbayBalances; diff --git a/xchange-bitbay/src/main/java/org/knowm/xchange/bitbay/dto/acount/BitbayBalance.java b/xchange-bitbay/src/main/java/org/knowm/xchange/bitbay/dto/acount/BitbayBalance.java index e49de681578..060ddfa5ff3 100644 --- a/xchange-bitbay/src/main/java/org/knowm/xchange/bitbay/dto/acount/BitbayBalance.java +++ b/xchange-bitbay/src/main/java/org/knowm/xchange/bitbay/dto/acount/BitbayBalance.java @@ -12,8 +12,7 @@ public class BitbayBalance { private final BigDecimal locked; /** - * available : amount of available money/cryptocurrency - * locked : amount of locked money/cryptocurrency + * available : amount of available money/cryptocurrency locked : amount of locked money/cryptocurrency */ public BitbayBalance(@JsonProperty("available") BigDecimal available, @JsonProperty("locked") BigDecimal locked) { this.available = available; diff --git a/xchange-bitbay/src/main/java/org/knowm/xchange/bitbay/dto/trade/BitbayOrder.java b/xchange-bitbay/src/main/java/org/knowm/xchange/bitbay/dto/trade/BitbayOrder.java index f4b6b9beaa0..5b8db9cf292 100644 --- a/xchange-bitbay/src/main/java/org/knowm/xchange/bitbay/dto/trade/BitbayOrder.java +++ b/xchange-bitbay/src/main/java/org/knowm/xchange/bitbay/dto/trade/BitbayOrder.java @@ -21,20 +21,14 @@ public class BitbayOrder { private final BigDecimal startPrice; /** - * order_id : id of offer - * order_currency : main currency (e.g. “LTC”) - * order_date : time, when offer was changed recently - * payment_currency : shortcut of currency used to pay for offer - * type : bid/ask - * status : “active” if order is active, “inactive” if order is unactive - * units : current amount of main currency in order - * start_units : amount of main currency when order was added - * current_price : price for whole amount of main currency + * order_id : id of offer order_currency : main currency (e.g. “LTC”) order_date : time, when offer was changed recently payment_currency : shortcut + * of currency used to pay for offer type : bid/ask status : “active” if order is active, “inactive” if order is unactive units : current amount of + * main currency in order start_units : amount of main currency when order was added current_price : price for whole amount of main currency * start_price : starting price for whole amount when offer was added */ public BitbayOrder(@JsonProperty("order_id") long id, @JsonProperty("order_currency") String currency, @JsonProperty("order_date") String date, - @JsonProperty("payment_currency") String paymentCurrency, @JsonProperty("type") String type, - @JsonProperty("status") String status, @JsonProperty("units") BigDecimal amount, @JsonProperty("start_units") BigDecimal startAmount, + @JsonProperty("payment_currency") String paymentCurrency, @JsonProperty("type") String type, @JsonProperty("status") String status, + @JsonProperty("units") BigDecimal amount, @JsonProperty("start_units") BigDecimal startAmount, @JsonProperty("current_price") BigDecimal currentPrice, @JsonProperty("start_price") BigDecimal startPrice) { this.id = id; diff --git a/xchange-bitbay/src/main/java/org/knowm/xchange/bitbay/dto/trade/BitbayTradeResponse.java b/xchange-bitbay/src/main/java/org/knowm/xchange/bitbay/dto/trade/BitbayTradeResponse.java index d3625676f1b..1ce72e63570 100644 --- a/xchange-bitbay/src/main/java/org/knowm/xchange/bitbay/dto/trade/BitbayTradeResponse.java +++ b/xchange-bitbay/src/main/java/org/knowm/xchange/bitbay/dto/trade/BitbayTradeResponse.java @@ -10,8 +10,8 @@ public class BitbayTradeResponse extends BitbayBaseResponse { private final long orderId; - public BitbayTradeResponse(@JsonProperty("order_id") long orderId, - @JsonProperty("success") boolean success, @JsonProperty("code") int code, @JsonProperty("message") String errorMsg) { + public BitbayTradeResponse(@JsonProperty("order_id") long orderId, @JsonProperty("success") boolean success, @JsonProperty("code") int code, + @JsonProperty("message") String errorMsg) { super(success, code, errorMsg); diff --git a/xchange-bitbay/src/main/java/org/knowm/xchange/bitbay/service/BitbayAccountService.java b/xchange-bitbay/src/main/java/org/knowm/xchange/bitbay/service/BitbayAccountService.java index ac1228375dc..ed5e956864a 100644 --- a/xchange-bitbay/src/main/java/org/knowm/xchange/bitbay/service/BitbayAccountService.java +++ b/xchange-bitbay/src/main/java/org/knowm/xchange/bitbay/service/BitbayAccountService.java @@ -30,12 +30,14 @@ public AccountInfo getAccountInfo() throws IOException { } @Override - public String withdrawFunds(Currency currency, BigDecimal amount, String address) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { + public String withdrawFunds(Currency currency, BigDecimal amount, + String address) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { throw new NotYetImplementedForExchangeException(); } @Override - public String requestDepositAddress(Currency currency, String... args) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { + public String requestDepositAddress(Currency currency, + String... args) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { throw new NotYetImplementedForExchangeException(); } @@ -45,7 +47,8 @@ public TradeHistoryParams createFundingHistoryParams() { } @Override - public List getFundingHistory(TradeHistoryParams params) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { + public List getFundingHistory( + TradeHistoryParams params) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { throw new NotYetImplementedForExchangeException(); } } diff --git a/xchange-bitbay/src/main/java/org/knowm/xchange/bitbay/service/BitbayTradeService.java b/xchange-bitbay/src/main/java/org/knowm/xchange/bitbay/service/BitbayTradeService.java index 072b5c6cec8..cdb88828ad2 100644 --- a/xchange-bitbay/src/main/java/org/knowm/xchange/bitbay/service/BitbayTradeService.java +++ b/xchange-bitbay/src/main/java/org/knowm/xchange/bitbay/service/BitbayTradeService.java @@ -35,28 +35,30 @@ public OpenOrders getOpenOrders() throws ExchangeException, NotAvailableFromExch } @Override - public OpenOrders getOpenOrders(OpenOrdersParams params) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { + public OpenOrders getOpenOrders( + OpenOrdersParams params) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { List response = getBitbayOpenOrders(); return BitbayAdapters.adaptOpenOrders(response); } @Override - public String placeMarketOrder(MarketOrder marketOrder) - throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { + public String placeMarketOrder( + MarketOrder marketOrder) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { throw new NotAvailableFromExchangeException(); } @Override - public String placeLimitOrder(LimitOrder limitOrder) - throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { + public String placeLimitOrder( + LimitOrder limitOrder) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { BitbayTradeResponse response = placeBitbayOrder(limitOrder); return String.valueOf(response.getOrderId()); } @Override - public boolean cancelOrder(String orderId) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { + public boolean cancelOrder( + String orderId) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { cancelBitbayOrder(Long.parseLong(orderId)); return true; } diff --git a/xchange-bitcoinaverage/src/main/java/org/knowm/xchange/bitcoinaverage/BitcoinAverageAdapters.java b/xchange-bitcoinaverage/src/main/java/org/knowm/xchange/bitcoinaverage/BitcoinAverageAdapters.java index 4eaf8957e9b..05eec51767d 100644 --- a/xchange-bitcoinaverage/src/main/java/org/knowm/xchange/bitcoinaverage/BitcoinAverageAdapters.java +++ b/xchange-bitcoinaverage/src/main/java/org/knowm/xchange/bitcoinaverage/BitcoinAverageAdapters.java @@ -52,6 +52,6 @@ public static ExchangeMetaData adaptMetaData(BitcoinAverageTickers tickers, Exch for (String currency : tickers.getTickers().keySet()) { currencyPairs.put(new CurrencyPair(BTC, Currency.getInstance(currency)), null); } - return new ExchangeMetaData(currencyPairs, Collections.emptyMap(), null, null, null); + return new ExchangeMetaData(currencyPairs, Collections. emptyMap(), null, null, null); } } diff --git a/xchange-bitcoincore/src/main/java/org/knowm/xchange/bitcoincore/service/BitcoinCoreAccountService.java b/xchange-bitcoincore/src/main/java/org/knowm/xchange/bitcoincore/service/BitcoinCoreAccountService.java index ea736302df5..1839b92dc79 100644 --- a/xchange-bitcoincore/src/main/java/org/knowm/xchange/bitcoincore/service/BitcoinCoreAccountService.java +++ b/xchange-bitcoincore/src/main/java/org/knowm/xchange/bitcoincore/service/BitcoinCoreAccountService.java @@ -23,22 +23,21 @@ public BitcoinCoreAccountService(Exchange exchange) { } @Override - public AccountInfo getAccountInfo() - throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { + public AccountInfo getAccountInfo() throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { final BitcoinCoreBalanceResponse balance = getBalance(); final BitcoinCoreBalanceResponse unconfirmed = getUnconfirmedBalance(); return BitcoinCoreAdapters.adaptAccountInfo(balance, unconfirmed); } @Override - public String withdrawFunds(Currency currency, BigDecimal amount, String address) - throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException { + public String withdrawFunds(Currency currency, BigDecimal amount, + String address) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException { throw new UnsupportedOperationException(); } @Override - public String requestDepositAddress(Currency currency, String... args) - throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException { + public String requestDepositAddress(Currency currency, + String... args) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException { throw new UnsupportedOperationException(); } @@ -48,7 +47,8 @@ public TradeHistoryParams createFundingHistoryParams() { } @Override - public List getFundingHistory(TradeHistoryParams params) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { + public List getFundingHistory( + TradeHistoryParams params) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { throw new NotYetImplementedForExchangeException(); } diff --git a/xchange-bitcurex/src/main/java/org/knowm/xchange/bitcurex/service/BitcurexAccountService.java b/xchange-bitcurex/src/main/java/org/knowm/xchange/bitcurex/service/BitcurexAccountService.java index 608fdfaef34..795a2c18088 100644 --- a/xchange-bitcurex/src/main/java/org/knowm/xchange/bitcurex/service/BitcurexAccountService.java +++ b/xchange-bitcurex/src/main/java/org/knowm/xchange/bitcurex/service/BitcurexAccountService.java @@ -51,7 +51,8 @@ public TradeHistoryParams createFundingHistoryParams() { } @Override - public List getFundingHistory(TradeHistoryParams params) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { + public List getFundingHistory( + TradeHistoryParams params) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { throw new NotYetImplementedForExchangeException(); } } diff --git a/xchange-bitfinex/src/main/java/org/knowm/xchange/bitfinex/v1/Bitfinex.java b/xchange-bitfinex/src/main/java/org/knowm/xchange/bitfinex/v1/Bitfinex.java index bf55b9eca56..12c6ee7fe7a 100644 --- a/xchange-bitfinex/src/main/java/org/knowm/xchange/bitfinex/v1/Bitfinex.java +++ b/xchange-bitfinex/src/main/java/org/knowm/xchange/bitfinex/v1/Bitfinex.java @@ -27,8 +27,8 @@ public interface Bitfinex { @GET @Path("book/{symbol}") - BitfinexDepth getBook(@PathParam("symbol") String symbol, @QueryParam("limit_bids") int limit_bids, @QueryParam("limit_asks") int limit_asks) - throws IOException, BitfinexException; + BitfinexDepth getBook(@PathParam("symbol") String symbol, @QueryParam("limit_bids") int limit_bids, + @QueryParam("limit_asks") int limit_asks) throws IOException, BitfinexException; @GET @Path("book/{symbol}") diff --git a/xchange-bitfinex/src/main/java/org/knowm/xchange/bitfinex/v1/BitfinexAdapters.java b/xchange-bitfinex/src/main/java/org/knowm/xchange/bitfinex/v1/BitfinexAdapters.java index c3237087711..e492beda1a7 100644 --- a/xchange-bitfinex/src/main/java/org/knowm/xchange/bitfinex/v1/BitfinexAdapters.java +++ b/xchange-bitfinex/src/main/java/org/knowm/xchange/bitfinex/v1/BitfinexAdapters.java @@ -327,13 +327,11 @@ public static List adaptFundingHistory(BitfinexDepositWithdrawalH String description = responseEntry.getDescription(); String txnId = ""; final Currency currency = Currency.getInstance(responseEntry.getCurrency()); - if (currency == Currency.BTC && responseEntry.getType() == FundingRecord.Type.WITHDRAWAL && - description.contains(",")) { + if (currency == Currency.BTC && responseEntry.getType() == FundingRecord.Type.WITHDRAWAL && description.contains(",")) { txnId = description.substring(description.indexOf("txid: ") + "txid: ".length()); } - FundingRecord fundingRecordEntry = new FundingRecord(address, responseEntry.getTimestamp(), - currency, responseEntry.getAmount(), txnId, responseEntry.getType(), - responseEntry.getStatus(), null, null, description); + FundingRecord fundingRecordEntry = new FundingRecord(address, responseEntry.getTimestamp(), currency, responseEntry.getAmount(), txnId, + responseEntry.getType(), responseEntry.getStatus(), null, null, description); fundingRecords.add(fundingRecordEntry); } diff --git a/xchange-bitfinex/src/main/java/org/knowm/xchange/bitfinex/v1/BitfinexAuthenticated.java b/xchange-bitfinex/src/main/java/org/knowm/xchange/bitfinex/v1/BitfinexAuthenticated.java index bf53f7c8a44..3c77b828b22 100644 --- a/xchange-bitfinex/src/main/java/org/knowm/xchange/bitfinex/v1/BitfinexAuthenticated.java +++ b/xchange-bitfinex/src/main/java/org/knowm/xchange/bitfinex/v1/BitfinexAuthenticated.java @@ -61,8 +61,8 @@ BitfinexOrderStatusResponse newOrder(@HeaderParam("X-BFX-APIKEY") String apiKey, @POST @Path("order/new/multi") BitfinexNewOrderMultiResponse newOrderMulti(@HeaderParam("X-BFX-APIKEY") String apiKey, @HeaderParam("X-BFX-PAYLOAD") ParamsDigest payload, - @HeaderParam("X-BFX-SIGNATURE") ParamsDigest signature, BitfinexNewOrderMultiRequest newOrderMultiRequest) - throws IOException, BitfinexException; + @HeaderParam("X-BFX-SIGNATURE") ParamsDigest signature, + BitfinexNewOrderMultiRequest newOrderMultiRequest) throws IOException, BitfinexException; @POST @Path("offer/new") @@ -82,8 +82,8 @@ BitfinexOrderStatusResponse cancelOrders(@HeaderParam("X-BFX-APIKEY") String api @POST @Path("order/cancel/multi") BitfinexCancelOrderMultiResponse cancelOrderMulti(@HeaderParam("X-BFX-APIKEY") String apiKey, @HeaderParam("X-BFX-PAYLOAD") ParamsDigest payload, - @HeaderParam("X-BFX-SIGNATURE") ParamsDigest signature, BitfinexCancelOrderMultiRequest cancelOrderRequest) - throws IOException, BitfinexException; + @HeaderParam("X-BFX-SIGNATURE") ParamsDigest signature, + BitfinexCancelOrderMultiRequest cancelOrderRequest) throws IOException, BitfinexException; @POST @Path("order/cancel/replace") @@ -132,8 +132,8 @@ BitfinexTradeResponse[] pastTrades(@HeaderParam("X-BFX-APIKEY") String apiKey, @ @POST @Path("credits") BitfinexCreditResponse[] activeCredits(@HeaderParam("X-BFX-APIKEY") String apiKey, @HeaderParam("X-BFX-PAYLOAD") ParamsDigest payload, - @HeaderParam("X-BFX-SIGNATURE") ParamsDigest signature, BitfinexActiveCreditsRequest activeCreditsRequest) - throws IOException, BitfinexException; + @HeaderParam("X-BFX-SIGNATURE") ParamsDigest signature, + BitfinexActiveCreditsRequest activeCreditsRequest) throws IOException, BitfinexException; @POST @Path("margin_infos") @@ -152,7 +152,8 @@ BitfinexDepositAddressResponse requestDeposit(@HeaderParam("X-BFX-APIKEY") Strin @POST @Path("history/movements") - BitfinexDepositWithdrawalHistoryResponse[] depositWithdrawalHistory(@HeaderParam("X-BFX-APIKEY") String apiKey, @HeaderParam("X-BFX-PAYLOAD") ParamsDigest payload, - @HeaderParam("X-BFX-SIGNATURE") ParamsDigest signature, BitfinexDepositWithdrawalHistoryRequest request) throws IOException, BitfinexException; + BitfinexDepositWithdrawalHistoryResponse[] depositWithdrawalHistory(@HeaderParam("X-BFX-APIKEY") String apiKey, + @HeaderParam("X-BFX-PAYLOAD") ParamsDigest payload, @HeaderParam("X-BFX-SIGNATURE") ParamsDigest signature, + BitfinexDepositWithdrawalHistoryRequest request) throws IOException, BitfinexException; } diff --git a/xchange-bitfinex/src/main/java/org/knowm/xchange/bitfinex/v1/BitfinexOrderType.java b/xchange-bitfinex/src/main/java/org/knowm/xchange/bitfinex/v1/BitfinexOrderType.java index ddf10f04e54..65746b4abb0 100644 --- a/xchange-bitfinex/src/main/java/org/knowm/xchange/bitfinex/v1/BitfinexOrderType.java +++ b/xchange-bitfinex/src/main/java/org/knowm/xchange/bitfinex/v1/BitfinexOrderType.java @@ -4,7 +4,7 @@ public enum BitfinexOrderType { MARKET("exchange market"), LIMIT("exchange limit"), STOP("exchange stop"), TRAILING_STOP("exchange trailing-stop"), FILL_OR_KILL( "exchange fill-or-kill"), MARGIN_MARKET( - "market"), MARGIN_LIMIT("limit"), MARGIN_STOP("stop"), MARGIN_TRAILING_STOP("trailing-stop"), MARGIN_FILL_OR_KILL("fill-or-kill"); + "market"), MARGIN_LIMIT("limit"), MARGIN_STOP("stop"), MARGIN_TRAILING_STOP("trailing-stop"), MARGIN_FILL_OR_KILL("fill-or-kill"); private String value; diff --git a/xchange-bitfinex/src/main/java/org/knowm/xchange/bitfinex/v1/dto/account/BitfinexDepositWithdrawalHistoryRequest.java b/xchange-bitfinex/src/main/java/org/knowm/xchange/bitfinex/v1/dto/account/BitfinexDepositWithdrawalHistoryRequest.java index a1c70533387..28f503a0120 100644 --- a/xchange-bitfinex/src/main/java/org/knowm/xchange/bitfinex/v1/dto/account/BitfinexDepositWithdrawalHistoryRequest.java +++ b/xchange-bitfinex/src/main/java/org/knowm/xchange/bitfinex/v1/dto/account/BitfinexDepositWithdrawalHistoryRequest.java @@ -50,8 +50,7 @@ public class BitfinexDepositWithdrawalHistoryRequest { @JsonInclude(Include.NON_NULL) private final Integer limit; - public BitfinexDepositWithdrawalHistoryRequest(String nonce, String currency, String method, Date since, Date until, - Integer limit) { + public BitfinexDepositWithdrawalHistoryRequest(String nonce, String currency, String method, Date since, Date until, Integer limit) { this.request = "/v1/history/movements"; this.nonce = String.valueOf(nonce); this.currency = currency; diff --git a/xchange-bitfinex/src/main/java/org/knowm/xchange/bitfinex/v1/dto/account/BitfinexDepositWithdrawalHistoryResponse.java b/xchange-bitfinex/src/main/java/org/knowm/xchange/bitfinex/v1/dto/account/BitfinexDepositWithdrawalHistoryResponse.java index 9f18f7930a0..bed7cad0601 100644 --- a/xchange-bitfinex/src/main/java/org/knowm/xchange/bitfinex/v1/dto/account/BitfinexDepositWithdrawalHistoryResponse.java +++ b/xchange-bitfinex/src/main/java/org/knowm/xchange/bitfinex/v1/dto/account/BitfinexDepositWithdrawalHistoryResponse.java @@ -38,9 +38,8 @@ public class BitfinexDepositWithdrawalHistoryResponse { @Override public String toString() { - return "BitfinexDepositWithdrawalHistoryResponse [id=" + id + ", currency=" + currency + ", method=" + method + ", type=" - + type + ", amount=" + amount + ", description=" + description + ", address=" + address + ", status=" + status - + ", timestamp=" + getTimestamp() + "]"; + return "BitfinexDepositWithdrawalHistoryResponse [id=" + id + ", currency=" + currency + ", method=" + method + ", type=" + type + ", amount=" + + amount + ", description=" + description + ", address=" + address + ", status=" + status + ", timestamp=" + getTimestamp() + "]"; } public long getId() { diff --git a/xchange-bitfinex/src/main/java/org/knowm/xchange/bitfinex/v1/dto/account/BitfinexMarginInfosResponse.java b/xchange-bitfinex/src/main/java/org/knowm/xchange/bitfinex/v1/dto/account/BitfinexMarginInfosResponse.java index 172474b1630..f2ce895e74f 100644 --- a/xchange-bitfinex/src/main/java/org/knowm/xchange/bitfinex/v1/dto/account/BitfinexMarginInfosResponse.java +++ b/xchange-bitfinex/src/main/java/org/knowm/xchange/bitfinex/v1/dto/account/BitfinexMarginInfosResponse.java @@ -18,7 +18,7 @@ @JsonInclude(JsonInclude.Include.NON_NULL) @Generated("org.jsonschema2pojo") @JsonPropertyOrder({"margin_balance", "tradable_balance", "unrealized_pl", "unrealized_swap", "net_value", "required_margin", "leverage", - "margin_requirement", "margin_limits", "message"}) + "margin_requirement", "margin_limits", "message"}) public class BitfinexMarginInfosResponse { @JsonProperty("margin_balance") diff --git a/xchange-bitfinex/src/main/java/org/knowm/xchange/bitfinex/v1/dto/trade/BitfinexAccountInfosResponse.java b/xchange-bitfinex/src/main/java/org/knowm/xchange/bitfinex/v1/dto/trade/BitfinexAccountInfosResponse.java index f2878c3207c..20fb35f7493 100644 --- a/xchange-bitfinex/src/main/java/org/knowm/xchange/bitfinex/v1/dto/trade/BitfinexAccountInfosResponse.java +++ b/xchange-bitfinex/src/main/java/org/knowm/xchange/bitfinex/v1/dto/trade/BitfinexAccountInfosResponse.java @@ -10,8 +10,7 @@ public class BitfinexAccountInfosResponse { private final BigDecimal takerFees; private final BitfinexFee[] fees; - public BitfinexAccountInfosResponse(@JsonProperty("maker_fees") BigDecimal makerFees, - @JsonProperty("taker_fees") BigDecimal takerFees, + public BitfinexAccountInfosResponse(@JsonProperty("maker_fees") BigDecimal makerFees, @JsonProperty("taker_fees") BigDecimal takerFees, @JsonProperty("fees") BitfinexFee[] fees) { this.makerFees = makerFees; this.takerFees = takerFees; diff --git a/xchange-bitfinex/src/main/java/org/knowm/xchange/bitfinex/v1/dto/trade/BitfinexFee.java b/xchange-bitfinex/src/main/java/org/knowm/xchange/bitfinex/v1/dto/trade/BitfinexFee.java index 0799288f80d..c36ce301d75 100644 --- a/xchange-bitfinex/src/main/java/org/knowm/xchange/bitfinex/v1/dto/trade/BitfinexFee.java +++ b/xchange-bitfinex/src/main/java/org/knowm/xchange/bitfinex/v1/dto/trade/BitfinexFee.java @@ -9,7 +9,8 @@ public class BitfinexFee { private final BigDecimal makerFees; private final BigDecimal takerFees; - public BitfinexFee(@JsonProperty("pairs") String pairs, @JsonProperty("maker_fees") BigDecimal makerFees, @JsonProperty("taker_fees") BigDecimal takerFees) { + public BitfinexFee(@JsonProperty("pairs") String pairs, @JsonProperty("maker_fees") BigDecimal makerFees, + @JsonProperty("taker_fees") BigDecimal takerFees) { this.pairs = pairs; this.makerFees = makerFees; this.takerFees = takerFees; diff --git a/xchange-bitfinex/src/main/java/org/knowm/xchange/bitfinex/v1/dto/trade/BitfinexLimitOrder.java b/xchange-bitfinex/src/main/java/org/knowm/xchange/bitfinex/v1/dto/trade/BitfinexLimitOrder.java index 169ed3063f4..5224b634a60 100644 --- a/xchange-bitfinex/src/main/java/org/knowm/xchange/bitfinex/v1/dto/trade/BitfinexLimitOrder.java +++ b/xchange-bitfinex/src/main/java/org/knowm/xchange/bitfinex/v1/dto/trade/BitfinexLimitOrder.java @@ -7,15 +7,14 @@ import org.knowm.xchange.dto.trade.LimitOrder; /** - * Bitfinex new order entry returns details of order status. If a LimitOrder object of this type is supplied to the trade service orderEntry - * method it will be populated with this information. + * Bitfinex new order entry returns details of order status. If a LimitOrder object of this type is supplied to the trade service orderEntry method it + * will be populated with this information. */ public class BitfinexLimitOrder extends LimitOrder { private BitfinexOrderStatusResponse response = null; - public BitfinexLimitOrder(OrderType type, BigDecimal tradableAmount, CurrencyPair currencyPair, String id, Date timestamp, - BigDecimal limitPrice) { + public BitfinexLimitOrder(OrderType type, BigDecimal tradableAmount, CurrencyPair currencyPair, String id, Date timestamp, BigDecimal limitPrice) { super(type, tradableAmount, currencyPair, id, timestamp, limitPrice); } diff --git a/xchange-bitfinex/src/main/java/org/knowm/xchange/bitfinex/v1/dto/trade/BitfinexNewOrderRequest.java b/xchange-bitfinex/src/main/java/org/knowm/xchange/bitfinex/v1/dto/trade/BitfinexNewOrderRequest.java index 1f1597d4399..9cecfb410cb 100644 --- a/xchange-bitfinex/src/main/java/org/knowm/xchange/bitfinex/v1/dto/trade/BitfinexNewOrderRequest.java +++ b/xchange-bitfinex/src/main/java/org/knowm/xchange/bitfinex/v1/dto/trade/BitfinexNewOrderRequest.java @@ -36,8 +36,7 @@ public class BitfinexNewOrderRequest { @JsonProperty("is_postonly") protected boolean is_postonly = false; - public BitfinexNewOrderRequest(String nonce, String symbol, BigDecimal amount, BigDecimal price, String exchange, String side, - String type) { + public BitfinexNewOrderRequest(String nonce, String symbol, BigDecimal amount, BigDecimal price, String exchange, String side, String type) { this.request = "/v1/order/new"; this.nonce = nonce; @@ -49,8 +48,8 @@ public BitfinexNewOrderRequest(String nonce, String symbol, BigDecimal amount, B this.type = type; } - public BitfinexNewOrderRequest(String nonce, String symbol, BigDecimal amount, BigDecimal price, String exchange, String side, - String type, boolean isHidden, boolean isPostOnly) { + public BitfinexNewOrderRequest(String nonce, String symbol, BigDecimal amount, BigDecimal price, String exchange, String side, String type, + boolean isHidden, boolean isPostOnly) { this(nonce, symbol, amount, price, exchange, side, type); this.is_hidden = isHidden; diff --git a/xchange-bitfinex/src/main/java/org/knowm/xchange/bitfinex/v1/dto/trade/BitfinexOrderFlags.java b/xchange-bitfinex/src/main/java/org/knowm/xchange/bitfinex/v1/dto/trade/BitfinexOrderFlags.java index 9a28f784c27..cbd7da8e9f8 100644 --- a/xchange-bitfinex/src/main/java/org/knowm/xchange/bitfinex/v1/dto/trade/BitfinexOrderFlags.java +++ b/xchange-bitfinex/src/main/java/org/knowm/xchange/bitfinex/v1/dto/trade/BitfinexOrderFlags.java @@ -10,8 +10,8 @@ public enum BitfinexOrderFlags implements IOrderFlags { FILL_OR_KILL, /** - * This is an order which does not appear in the orderbook, and thus doesn't influence other market participants. the taker fee will apply - * to any trades. + * This is an order which does not appear in the orderbook, and thus doesn't influence other market participants. the taker fee will apply to any + * trades. */ HIDDEN, diff --git a/xchange-bitfinex/src/main/java/org/knowm/xchange/bitfinex/v1/dto/trade/BitfinexReplaceOrderRequest.java b/xchange-bitfinex/src/main/java/org/knowm/xchange/bitfinex/v1/dto/trade/BitfinexReplaceOrderRequest.java index 8884ae1dde6..f415bd38988 100644 --- a/xchange-bitfinex/src/main/java/org/knowm/xchange/bitfinex/v1/dto/trade/BitfinexReplaceOrderRequest.java +++ b/xchange-bitfinex/src/main/java/org/knowm/xchange/bitfinex/v1/dto/trade/BitfinexReplaceOrderRequest.java @@ -12,8 +12,8 @@ public class BitfinexReplaceOrderRequest extends BitfinexNewOrderRequest { @JsonProperty("use_remaining") protected boolean useRemaining = false; - public BitfinexReplaceOrderRequest(String nonce, long replaceOrderId, String symbol, BigDecimal amount, BigDecimal price, String exchange, String side, - String type, boolean isHidden, boolean isPostOnly, boolean useRemaining) { + public BitfinexReplaceOrderRequest(String nonce, long replaceOrderId, String symbol, BigDecimal amount, BigDecimal price, String exchange, + String side, String type, boolean isHidden, boolean isPostOnly, boolean useRemaining) { super(nonce, symbol, amount, price, exchange, side, type, isHidden, isPostOnly); diff --git a/xchange-bitfinex/src/main/java/org/knowm/xchange/bitfinex/v1/service/BitfinexAccountService.java b/xchange-bitfinex/src/main/java/org/knowm/xchange/bitfinex/v1/service/BitfinexAccountService.java index 2c555dddf37..bbdcf8e1591 100644 --- a/xchange-bitfinex/src/main/java/org/knowm/xchange/bitfinex/v1/service/BitfinexAccountService.java +++ b/xchange-bitfinex/src/main/java/org/knowm/xchange/bitfinex/v1/service/BitfinexAccountService.java @@ -93,8 +93,7 @@ public List getFundingHistory(TradeHistoryParams params) throws I limit = limitParams.getLimit(); } - return BitfinexAdapters.adaptFundingHistory(getDepositWithdrawalHistory(currency, - null, startTime, endTime, limit)); + return BitfinexAdapters.adaptFundingHistory(getDepositWithdrawalHistory(currency, null, startTime, endTime, limit)); } public static class BitfinexFundingHistoryParams extends DefaultTradeHistoryParamsTimeSpan diff --git a/xchange-bitfinex/src/main/java/org/knowm/xchange/bitfinex/v1/service/BitfinexAccountServiceRaw.java b/xchange-bitfinex/src/main/java/org/knowm/xchange/bitfinex/v1/service/BitfinexAccountServiceRaw.java index 3b0178df8b4..fe7785e62d8 100644 --- a/xchange-bitfinex/src/main/java/org/knowm/xchange/bitfinex/v1/service/BitfinexAccountServiceRaw.java +++ b/xchange-bitfinex/src/main/java/org/knowm/xchange/bitfinex/v1/service/BitfinexAccountServiceRaw.java @@ -55,8 +55,8 @@ public BitfinexMarginInfosResponse[] getBitfinexMarginInfos() throws IOException public BitfinexDepositWithdrawalHistoryResponse[] getDepositWithdrawalHistory(String currency, String method, Date since, Date until, Integer limit) throws IOException { try { - BitfinexDepositWithdrawalHistoryRequest request = new BitfinexDepositWithdrawalHistoryRequest(String.valueOf(exchange.getNonceFactory().createValue()) - , currency, method, since, until, limit); + BitfinexDepositWithdrawalHistoryRequest request = new BitfinexDepositWithdrawalHistoryRequest( + String.valueOf(exchange.getNonceFactory().createValue()), currency, method, since, until, limit); return bitfinex.depositWithdrawalHistory(apiKey, payloadCreator, signatureCreator, request); } catch (BitfinexException e) { throw new ExchangeException(e); @@ -69,8 +69,8 @@ public String withdraw(String withdrawType, String walletSelected, BigDecimal am public String withdraw(String withdrawType, String walletSelected, BigDecimal amount, String address, String paymentId) throws IOException { - BitfinexWithdrawalResponse[] withdrawRepsonse = bitfinex.withdraw(apiKey, payloadCreator, signatureCreator, - new BitfinexWithdrawalRequest(String.valueOf(exchange.getNonceFactory().createValue()), withdrawType, walletSelected, amount, address, paymentId)); + BitfinexWithdrawalResponse[] withdrawRepsonse = bitfinex.withdraw(apiKey, payloadCreator, signatureCreator, new BitfinexWithdrawalRequest( + String.valueOf(exchange.getNonceFactory().createValue()), withdrawType, walletSelected, amount, address, paymentId)); return withdrawRepsonse[0].getWithdrawalId(); } diff --git a/xchange-bitfinex/src/main/java/org/knowm/xchange/bitfinex/v1/service/BitfinexTradeService.java b/xchange-bitfinex/src/main/java/org/knowm/xchange/bitfinex/v1/service/BitfinexTradeService.java index c485d336ef0..ef1e970acad 100644 --- a/xchange-bitfinex/src/main/java/org/knowm/xchange/bitfinex/v1/service/BitfinexTradeService.java +++ b/xchange-bitfinex/src/main/java/org/knowm/xchange/bitfinex/v1/service/BitfinexTradeService.java @@ -45,7 +45,8 @@ public OpenOrders getOpenOrders() throws IOException { } @Override - public OpenOrders getOpenOrders(OpenOrdersParams params) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { + public OpenOrders getOpenOrders( + OpenOrdersParams params) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { BitfinexOrderStatusResponse[] activeOrders = getBitfinexOpenOrders(); if (activeOrders.length <= 0) { @@ -185,8 +186,8 @@ public void setCurrencyPair(CurrencyPair pair) { } @Override - public Collection getOrder(String... orderIds) - throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { + public Collection getOrder( + String... orderIds) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { throw new NotYetImplementedForExchangeException(); } diff --git a/xchange-bitfinex/src/main/java/org/knowm/xchange/bitfinex/v1/service/BitfinexTradeServiceRaw.java b/xchange-bitfinex/src/main/java/org/knowm/xchange/bitfinex/v1/service/BitfinexTradeServiceRaw.java index 1eaf4684ae5..27d7b509eb9 100644 --- a/xchange-bitfinex/src/main/java/org/knowm/xchange/bitfinex/v1/service/BitfinexTradeServiceRaw.java +++ b/xchange-bitfinex/src/main/java/org/knowm/xchange/bitfinex/v1/service/BitfinexTradeServiceRaw.java @@ -104,14 +104,14 @@ public BitfinexOrderStatusResponse placeBitfinexLimitOrder(LimitOrder limitOrder return sendLimitOrder(limitOrder, orderType, Long.MIN_VALUE); } - public BitfinexOrderStatusResponse replaceBitfinexLimitOrder(LimitOrder limitOrder, BitfinexOrderType orderType, long replaceOrderId) - throws IOException { + public BitfinexOrderStatusResponse replaceBitfinexLimitOrder(LimitOrder limitOrder, BitfinexOrderType orderType, + long replaceOrderId) throws IOException { return sendLimitOrder(limitOrder, orderType, replaceOrderId); } - private BitfinexOrderStatusResponse sendLimitOrder(LimitOrder limitOrder, BitfinexOrderType bitfinexOrderType, long replaceOrderId) - throws IOException { + private BitfinexOrderStatusResponse sendLimitOrder(LimitOrder limitOrder, BitfinexOrderType bitfinexOrderType, + long replaceOrderId) throws IOException { String pair = BitfinexUtils.toPairString(limitOrder.getCurrencyPair()); String type = limitOrder.getType().equals(Order.OrderType.BID) ? "buy" : "sell"; @@ -208,8 +208,8 @@ public BitfinexOfferStatusResponse placeBitfinexFixedRateLoanOrder(FixedRateLoan } } - public BitfinexOfferStatusResponse placeBitfinexFloatingRateLoanOrder(FloatingRateLoanOrder loanOrder, BitfinexOrderType orderType) - throws IOException { + public BitfinexOfferStatusResponse placeBitfinexFloatingRateLoanOrder(FloatingRateLoanOrder loanOrder, + BitfinexOrderType orderType) throws IOException { String direction = loanOrder.getType() == OrderType.BID ? "loan" : "lend"; @@ -317,8 +317,8 @@ public String withdraw(String withdrawType, String walletSelected, BigDecimal am public String withdraw(String withdrawType, String walletSelected, BigDecimal amount, String address, String paymentId) throws IOException { - BitfinexWithdrawalResponse[] withdrawRepsonse = bitfinex.withdraw(apiKey, payloadCreator, signatureCreator, - new BitfinexWithdrawalRequest(String.valueOf(exchange.getNonceFactory().createValue()), withdrawType, walletSelected, amount, address, paymentId)); + BitfinexWithdrawalResponse[] withdrawRepsonse = bitfinex.withdraw(apiKey, payloadCreator, signatureCreator, new BitfinexWithdrawalRequest( + String.valueOf(exchange.getNonceFactory().createValue()), withdrawType, walletSelected, amount, address, paymentId)); return withdrawRepsonse[0].getWithdrawalId(); } diff --git a/xchange-bitmarket/src/main/java/org/knowm/xchange/bitmarket/service/BitMarketAccountService.java b/xchange-bitmarket/src/main/java/org/knowm/xchange/bitmarket/service/BitMarketAccountService.java index 4b17a716701..6a5b8a1df04 100644 --- a/xchange-bitmarket/src/main/java/org/knowm/xchange/bitmarket/service/BitMarketAccountService.java +++ b/xchange-bitmarket/src/main/java/org/knowm/xchange/bitmarket/service/BitMarketAccountService.java @@ -29,24 +29,23 @@ public BitMarketAccountService(Exchange exchange) { } @Override - public AccountInfo getAccountInfo() - throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { + public AccountInfo getAccountInfo() throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { BitMarketAccountInfo accountInfo = getBitMarketAccountInfo().getData(); return new AccountInfo(exchange.getExchangeSpecification().getUserName(), BitMarketAdapters.adaptWallet(accountInfo.getBalance())); } @Override - public String withdrawFunds(Currency currency, BigDecimal amount, String address) - throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { + public String withdrawFunds(Currency currency, BigDecimal amount, + String address) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { BitMarketWithdrawResponse response = withdrawFromBitMarket(currency.toString(), amount, address); return response.getData(); } @Override - public String requestDepositAddress(Currency currency, String... strings) - throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { + public String requestDepositAddress(Currency currency, + String... strings) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { BitMarketDepositResponse response = depositToBitMarket(currency.toString()); return response.getData(); @@ -58,7 +57,8 @@ public TradeHistoryParams createFundingHistoryParams() { } @Override - public List getFundingHistory(TradeHistoryParams params) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { + public List getFundingHistory( + TradeHistoryParams params) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { throw new NotYetImplementedForExchangeException(); } } diff --git a/xchange-bitmarket/src/main/java/org/knowm/xchange/bitmarket/service/BitMarketTradeService.java b/xchange-bitmarket/src/main/java/org/knowm/xchange/bitmarket/service/BitMarketTradeService.java index aeb6d463e28..bc5cc33f8b4 100644 --- a/xchange-bitmarket/src/main/java/org/knowm/xchange/bitmarket/service/BitMarketTradeService.java +++ b/xchange-bitmarket/src/main/java/org/knowm/xchange/bitmarket/service/BitMarketTradeService.java @@ -40,29 +40,30 @@ public OpenOrders getOpenOrders() throws ExchangeException, NotAvailableFromExch } @Override - public OpenOrders getOpenOrders(OpenOrdersParams params) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { + public OpenOrders getOpenOrders( + OpenOrdersParams params) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { BitMarketOrdersResponse response = getBitMarketOpenOrders(); return BitMarketAdapters.adaptOpenOrders(response.getData()); } @Override - public String placeMarketOrder(MarketOrder marketOrder) - throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { + public String placeMarketOrder( + MarketOrder marketOrder) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { throw new NotAvailableFromExchangeException(); } @Override - public String placeLimitOrder(LimitOrder limitOrder) - throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { + public String placeLimitOrder( + LimitOrder limitOrder) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { BitMarketTradeResponse response = placeBitMarketOrder(limitOrder); return String.valueOf(response.getData().getId()); } @Override - public boolean cancelOrder(String id) - throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { + public boolean cancelOrder( + String id) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { cancelBitMarketOrder(id); return true; @@ -88,8 +89,8 @@ public OpenOrdersParams createOpenOrdersParams() { } @Override - public Collection getOrder(String... orderIds) - throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { + public Collection getOrder( + String... orderIds) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { throw new NotYetImplementedForExchangeException(); } diff --git a/xchange-bitso/src/main/java/org/knowm/xchange/bitso/BitsoAuthenticated.java b/xchange-bitso/src/main/java/org/knowm/xchange/bitso/BitsoAuthenticated.java index e7218e03112..f7e99a3b427 100644 --- a/xchange-bitso/src/main/java/org/knowm/xchange/bitso/BitsoAuthenticated.java +++ b/xchange-bitso/src/main/java/org/knowm/xchange/bitso/BitsoAuthenticated.java @@ -36,14 +36,14 @@ BitsoOrder[] getOpenOrders(@FormParam("key") String apiKey, @FormParam("signatur @POST @Path("buy/") BitsoOrder buy(@FormParam("key") String apiKey, @FormParam("signature") ParamsDigest signer, - @FormParam("nonce") SynchronizedValueFactory nonce, @FormParam("amount") BigDecimal amount, @FormParam("price") BigDecimal price) - throws BitsoException, IOException; + @FormParam("nonce") SynchronizedValueFactory nonce, @FormParam("amount") BigDecimal amount, + @FormParam("price") BigDecimal price) throws BitsoException, IOException; @POST @Path("sell/") BitsoOrder sell(@FormParam("key") String apiKey, @FormParam("signature") ParamsDigest signer, - @FormParam("nonce") SynchronizedValueFactory nonce, @FormParam("amount") BigDecimal amount, @FormParam("price") BigDecimal price) - throws BitsoException, IOException; + @FormParam("nonce") SynchronizedValueFactory nonce, @FormParam("amount") BigDecimal amount, + @FormParam("price") BigDecimal price) throws BitsoException, IOException; /** * @return true if order has been canceled. @@ -77,8 +77,8 @@ BitsoDepositAddress getBitcoinDepositAddress(@FormParam("key") String apiKey, @F @POST @Path("bitcoin_withdrawal/") String withdrawBitcoin(@FormParam("key") String apiKey, @FormParam("signature") BitsoDigest signer, - @FormParam("nonce") SynchronizedValueFactory nonce, @FormParam("amount") BigDecimal amount, @FormParam("address") String address) - throws BitsoException, IOException; + @FormParam("nonce") SynchronizedValueFactory nonce, @FormParam("amount") BigDecimal amount, + @FormParam("address") String address) throws BitsoException, IOException; @POST @Path("ripple_withdrawal/") diff --git a/xchange-bitso/src/main/java/org/knowm/xchange/bitso/service/BitsoAccountService.java b/xchange-bitso/src/main/java/org/knowm/xchange/bitso/service/BitsoAccountService.java index ee58ec37024..a05f64f4740 100644 --- a/xchange-bitso/src/main/java/org/knowm/xchange/bitso/service/BitsoAccountService.java +++ b/xchange-bitso/src/main/java/org/knowm/xchange/bitso/service/BitsoAccountService.java @@ -55,7 +55,8 @@ public TradeHistoryParams createFundingHistoryParams() { } @Override - public List getFundingHistory(TradeHistoryParams params) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { + public List getFundingHistory( + TradeHistoryParams params) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { throw new NotYetImplementedForExchangeException(); } } diff --git a/xchange-bitso/src/main/java/org/knowm/xchange/bitso/service/BitsoMarketDataService.java b/xchange-bitso/src/main/java/org/knowm/xchange/bitso/service/BitsoMarketDataService.java index 58191645550..98387e7eb1e 100644 --- a/xchange-bitso/src/main/java/org/knowm/xchange/bitso/service/BitsoMarketDataService.java +++ b/xchange-bitso/src/main/java/org/knowm/xchange/bitso/service/BitsoMarketDataService.java @@ -23,8 +23,8 @@ public BitsoMarketDataService(Exchange exchange) { } @Override - public Ticker getTicker(CurrencyPair currencyPair, Object... args) - throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { + public Ticker getTicker(CurrencyPair currencyPair, + Object... args) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { return BitsoAdapters.adaptTicker(getBitsoTicker(), currencyPair); } @@ -34,8 +34,8 @@ public OrderBook getOrderBook(CurrencyPair currencyPair, Object... args) throws } @Override - public Trades getTrades(CurrencyPair currencyPair, Object... args) - throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { + public Trades getTrades(CurrencyPair currencyPair, + Object... args) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { return BitsoAdapters.adaptTrades(getBitsoTransactions(args), currencyPair); } } diff --git a/xchange-bitso/src/main/java/org/knowm/xchange/bitso/service/BitsoTradeService.java b/xchange-bitso/src/main/java/org/knowm/xchange/bitso/service/BitsoTradeService.java index 7eab6c52940..6953512ebbe 100644 --- a/xchange-bitso/src/main/java/org/knowm/xchange/bitso/service/BitsoTradeService.java +++ b/xchange-bitso/src/main/java/org/knowm/xchange/bitso/service/BitsoTradeService.java @@ -50,7 +50,8 @@ public OpenOrders getOpenOrders() throws IOException, BitsoException { } @Override - public OpenOrders getOpenOrders(OpenOrdersParams params) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { + public OpenOrders getOpenOrders( + OpenOrdersParams params) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { BitsoOrder[] openOrders = getBitsoOpenOrders(); List limitOrders = new ArrayList<>(); @@ -118,8 +119,8 @@ public OpenOrdersParams createOpenOrdersParams() { } @Override - public Collection getOrder(String... orderIds) - throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { + public Collection getOrder( + String... orderIds) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { throw new NotYetImplementedForExchangeException(); } diff --git a/xchange-bitstamp/src/main/java/org/knowm/xchange/bitstamp/BitstampAuthenticated.java b/xchange-bitstamp/src/main/java/org/knowm/xchange/bitstamp/BitstampAuthenticated.java index e9be866a35a..b59ff25b5ea 100644 --- a/xchange-bitstamp/src/main/java/org/knowm/xchange/bitstamp/BitstampAuthenticated.java +++ b/xchange-bitstamp/src/main/java/org/knowm/xchange/bitstamp/BitstampAuthenticated.java @@ -47,8 +47,8 @@ BitstampOrder[] getOpenOrders(@FormParam("key") String apiKey, @FormParam("signa @Path("buy/") @Deprecated BitstampOrder buy(@FormParam("key") String apiKey, @FormParam("signature") ParamsDigest signer, - @FormParam("nonce") SynchronizedValueFactory nonce, @FormParam("amount") BigDecimal amount, @FormParam("price") BigDecimal price) - throws BitstampException, IOException; + @FormParam("nonce") SynchronizedValueFactory nonce, @FormParam("amount") BigDecimal amount, + @FormParam("price") BigDecimal price) throws BitstampException, IOException; /** * @deprecated Use . @@ -57,8 +57,8 @@ BitstampOrder buy(@FormParam("key") String apiKey, @FormParam("signature") Param @Path("sell/") @Deprecated BitstampOrder sell(@FormParam("key") String apiKey, @FormParam("signature") ParamsDigest signer, - @FormParam("nonce") SynchronizedValueFactory nonce, @FormParam("amount") BigDecimal amount, @FormParam("price") BigDecimal price) - throws BitstampException, IOException; + @FormParam("nonce") SynchronizedValueFactory nonce, @FormParam("amount") BigDecimal amount, + @FormParam("price") BigDecimal price) throws BitstampException, IOException; /** * @return true if order has been canceled. @@ -92,8 +92,8 @@ BitstampDepositAddress getBitcoinDepositAddress(@FormParam("key") String apiKey, @POST @Path("bitcoin_withdrawal/") BitstampWithdrawal withdrawBitcoin(@FormParam("key") String apiKey, @FormParam("signature") ParamsDigest signer, - @FormParam("nonce") SynchronizedValueFactory nonce, @FormParam("amount") BigDecimal amount, @FormParam("address") String address) - throws BitstampException, IOException; + @FormParam("nonce") SynchronizedValueFactory nonce, @FormParam("amount") BigDecimal amount, + @FormParam("address") String address) throws BitstampException, IOException; @POST @Path("unconfirmed_btc/") diff --git a/xchange-bitstamp/src/main/java/org/knowm/xchange/bitstamp/BitstampAuthenticatedV2.java b/xchange-bitstamp/src/main/java/org/knowm/xchange/bitstamp/BitstampAuthenticatedV2.java index c9d4142a95c..66b178395b7 100644 --- a/xchange-bitstamp/src/main/java/org/knowm/xchange/bitstamp/BitstampAuthenticatedV2.java +++ b/xchange-bitstamp/src/main/java/org/knowm/xchange/bitstamp/BitstampAuthenticatedV2.java @@ -44,8 +44,8 @@ BitstampUserTransaction[] getUserTransactions(@FormParam("key") String apiKey, @ @Path("user_transactions/{pair}/") BitstampUserTransaction[] getUserTransactions(@FormParam("key") String apiKey, @FormParam("signature") ParamsDigest signer, @FormParam("nonce") SynchronizedValueFactory nonce, @PathParam("pair") BitstampV2.Pair pair, - @FormParam("limit") Long numberOfTransactions, @FormParam("offset") Long offset, @FormParam("sort") String sort) - throws BitstampException, IOException; + @FormParam("limit") Long numberOfTransactions, @FormParam("offset") Long offset, + @FormParam("sort") String sort) throws BitstampException, IOException; enum Side { buy, sell diff --git a/xchange-bitstamp/src/main/java/org/knowm/xchange/bitstamp/BitstampV2.java b/xchange-bitstamp/src/main/java/org/knowm/xchange/bitstamp/BitstampV2.java index c4dffd469e0..520bd89ffe2 100644 --- a/xchange-bitstamp/src/main/java/org/knowm/xchange/bitstamp/BitstampV2.java +++ b/xchange-bitstamp/src/main/java/org/knowm/xchange/bitstamp/BitstampV2.java @@ -38,8 +38,8 @@ public interface BitstampV2 { */ @GET @Path("transactions/{pair}/") - BitstampTransaction[] getTransactions(@PathParam("pair") Pair pair, @QueryParam("time") BitstampMarketDataServiceRaw.BitstampTime time) - throws IOException, BitstampException; + BitstampTransaction[] getTransactions(@PathParam("pair") Pair pair, + @QueryParam("time") BitstampMarketDataServiceRaw.BitstampTime time) throws IOException, BitstampException; class Pair { public final CurrencyPair pair; diff --git a/xchange-bitstamp/src/main/java/org/knowm/xchange/bitstamp/dto/account/BitstampBalance.java b/xchange-bitstamp/src/main/java/org/knowm/xchange/bitstamp/dto/account/BitstampBalance.java index 8424eab3eae..023b44a3d9d 100644 --- a/xchange-bitstamp/src/main/java/org/knowm/xchange/bitstamp/dto/account/BitstampBalance.java +++ b/xchange-bitstamp/src/main/java/org/knowm/xchange/bitstamp/dto/account/BitstampBalance.java @@ -41,8 +41,7 @@ public final class BitstampBalance { * @param xrpAvailable * @param fee */ - public BitstampBalance( - @JsonProperty("usd_balance") BigDecimal usdBalance, @JsonProperty("eur_balance") BigDecimal eurBalance, + public BitstampBalance(@JsonProperty("usd_balance") BigDecimal usdBalance, @JsonProperty("eur_balance") BigDecimal eurBalance, @JsonProperty("btc_balance") BigDecimal btcBalance, @JsonProperty("xrp_balance") BigDecimal xrpBalance, @JsonProperty("usd_reserved") BigDecimal usdReserved, @JsonProperty("eur_reserved") BigDecimal eurReserved, @JsonProperty("btc_reserved") BigDecimal btcReserved, @JsonProperty("xrp_reserved") BigDecimal xrpReserved, @@ -128,11 +127,9 @@ public String getError() { public String toString() { return String.format( - "Balance{usdBalance=%s, eurBalance=%s, btcBalance=%s, xrpBalance=%s, " + - "usdReserved=%s, eurReserved=%s, btcReserved=%s, xrpReserved=%s, " + - "usdAvailable=%s, eurAvailable=%s, btcAvailable=%s, xrpAvailable=%s, fee=%s}", - usdBalance, eurBalance, btcBalance, xrpBalance, - usdReserved, eurReserved, btcReserved, xrpReserved, - usdAvailable, eurAvailable, btcAvailable, xrpAvailable, fee); + "Balance{usdBalance=%s, eurBalance=%s, btcBalance=%s, xrpBalance=%s, " + "usdReserved=%s, eurReserved=%s, btcReserved=%s, xrpReserved=%s, " + + "usdAvailable=%s, eurAvailable=%s, btcAvailable=%s, xrpAvailable=%s, fee=%s}", + usdBalance, eurBalance, btcBalance, xrpBalance, usdReserved, eurReserved, btcReserved, xrpReserved, usdAvailable, eurAvailable, btcAvailable, + xrpAvailable, fee); } } diff --git a/xchange-bitstamp/src/main/java/org/knowm/xchange/bitstamp/service/BitstampAccountService.java b/xchange-bitstamp/src/main/java/org/knowm/xchange/bitstamp/service/BitstampAccountService.java index 3abe475c49d..73b04df2935 100644 --- a/xchange-bitstamp/src/main/java/org/knowm/xchange/bitstamp/service/BitstampAccountService.java +++ b/xchange-bitstamp/src/main/java/org/knowm/xchange/bitstamp/service/BitstampAccountService.java @@ -65,7 +65,8 @@ public TradeHistoryParams createFundingHistoryParams() { } @Override - public List getFundingHistory(TradeHistoryParams params) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { + public List getFundingHistory( + TradeHistoryParams params) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { throw new NotYetImplementedForExchangeException(); } } diff --git a/xchange-bitstamp/src/main/java/org/knowm/xchange/bitstamp/service/BitstampTradeService.java b/xchange-bitstamp/src/main/java/org/knowm/xchange/bitstamp/service/BitstampTradeService.java index 23004e51058..94968b81f78 100644 --- a/xchange-bitstamp/src/main/java/org/knowm/xchange/bitstamp/service/BitstampTradeService.java +++ b/xchange-bitstamp/src/main/java/org/knowm/xchange/bitstamp/service/BitstampTradeService.java @@ -122,8 +122,8 @@ public OpenOrdersParams createOpenOrdersParams() { } @Override - public Collection getOrder(String... orderIds) - throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { + public Collection getOrder( + String... orderIds) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { throw new NotYetImplementedForExchangeException(); } diff --git a/xchange-bitstamp/src/main/java/org/knowm/xchange/bitstamp/service/BitstampTradeServiceRaw.java b/xchange-bitstamp/src/main/java/org/knowm/xchange/bitstamp/service/BitstampTradeServiceRaw.java index e9409fe98b8..c9effc23bdf 100644 --- a/xchange-bitstamp/src/main/java/org/knowm/xchange/bitstamp/service/BitstampTradeServiceRaw.java +++ b/xchange-bitstamp/src/main/java/org/knowm/xchange/bitstamp/service/BitstampTradeServiceRaw.java @@ -63,8 +63,8 @@ public BitstampOrder[] getBitstampOpenOrders(CurrencyPair pair) throws IOExcepti return bitstampAuthenticatedV2.getOpenOrders(apiKey, signatureCreator, nonceFactory, new BitstampV2.Pair(pair)); } - public BitstampOrder placeBitstampOrder(CurrencyPair pair, BitstampAuthenticatedV2.Side side, BigDecimal tradableAmount, BigDecimal price) - throws IOException { + public BitstampOrder placeBitstampOrder(CurrencyPair pair, BitstampAuthenticatedV2.Side side, BigDecimal tradableAmount, + BigDecimal price) throws IOException { return bitstampAuthenticatedV2.placeOrder(apiKey, signatureCreator, nonceFactory, side, new BitstampV2.Pair(pair), tradableAmount, price); } @@ -81,8 +81,8 @@ public BitstampUserTransaction[] getBitstampUserTransactions(Long numberOfTransa return bitstampAuthenticatedV2.getUserTransactions(apiKey, signatureCreator, nonceFactory, numberOfTransactions, null, null); } - public BitstampUserTransaction[] getBitstampUserTransactions(Long numberOfTransactions, CurrencyPair pair, Long offset, String sort) - throws IOException { + public BitstampUserTransaction[] getBitstampUserTransactions(Long numberOfTransactions, CurrencyPair pair, Long offset, + String sort) throws IOException { return bitstampAuthenticatedV2.getUserTransactions(apiKey, signatureCreator, nonceFactory, new BitstampV2.Pair(pair), numberOfTransactions, offset, sort); } diff --git a/xchange-bittrex/src/main/java/org/knowm/xchange/bittrex/v1/Bittrex.java b/xchange-bittrex/src/main/java/org/knowm/xchange/bittrex/v1/Bittrex.java index b5171414522..ca59eb8bc95 100644 --- a/xchange-bittrex/src/main/java/org/knowm/xchange/bittrex/v1/Bittrex.java +++ b/xchange-bittrex/src/main/java/org/knowm/xchange/bittrex/v1/Bittrex.java @@ -29,8 +29,8 @@ public interface Bittrex { @GET @Path("public/getorderbook/") - BittrexDepthResponse getBook(@QueryParam("market") String market, @QueryParam("type") String type, @QueryParam("depth") int depth) - throws IOException; + BittrexDepthResponse getBook(@QueryParam("market") String market, @QueryParam("type") String type, + @QueryParam("depth") int depth) throws IOException; @GET @Path("public/getmarkethistory/") diff --git a/xchange-bittrex/src/main/java/org/knowm/xchange/bittrex/v1/BittrexAdapters.java b/xchange-bittrex/src/main/java/org/knowm/xchange/bittrex/v1/BittrexAdapters.java index c7d87041d38..c4e76eaaf9d 100644 --- a/xchange-bittrex/src/main/java/org/knowm/xchange/bittrex/v1/BittrexAdapters.java +++ b/xchange-bittrex/src/main/java/org/knowm/xchange/bittrex/v1/BittrexAdapters.java @@ -73,8 +73,9 @@ public static BittrexLimitOrder adaptOpenOrder(BittrexOpenOrder bittrexOpenOrder String[] currencies = bittrexOpenOrder.getExchange().split("-"); CurrencyPair pair = new CurrencyPair(currencies[1], currencies[0]); - return new BittrexLimitOrder(type, bittrexOpenOrder.getQuantityRemaining(), pair, bittrexOpenOrder.getOrderUuid(), BittrexUtils.toDate(bittrexOpenOrder.getOpened()), - bittrexOpenOrder.getLimit(), bittrexOpenOrder.getQuantityRemaining(), bittrexOpenOrder.getPricePerUnit()); + return new BittrexLimitOrder(type, bittrexOpenOrder.getQuantityRemaining(), pair, bittrexOpenOrder.getOrderUuid(), + BittrexUtils.toDate(bittrexOpenOrder.getOpened()), bittrexOpenOrder.getLimit(), bittrexOpenOrder.getQuantityRemaining(), + bittrexOpenOrder.getPricePerUnit()); } public static List adaptOrders(BittrexLevel[] orders, CurrencyPair currencyPair, String orderType, String id) { diff --git a/xchange-bittrex/src/main/java/org/knowm/xchange/bittrex/v1/BittrexAuthenticated.java b/xchange-bittrex/src/main/java/org/knowm/xchange/bittrex/v1/BittrexAuthenticated.java index 9b991d13aea..5c644d3d357 100644 --- a/xchange-bittrex/src/main/java/org/knowm/xchange/bittrex/v1/BittrexAuthenticated.java +++ b/xchange-bittrex/src/main/java/org/knowm/xchange/bittrex/v1/BittrexAuthenticated.java @@ -53,14 +53,14 @@ BittrexTradeResponse selllimit(@QueryParam("apikey") String apikey, @HeaderParam @GET @Path("market/buymarket") BittrexTradeResponse buymarket(@QueryParam("apikey") String apikey, @HeaderParam("apisign") ParamsDigest signature, - @QueryParam("nonce") SynchronizedValueFactory nonce, @QueryParam("market") String market, @QueryParam("quantity") String quantity) - throws IOException; + @QueryParam("nonce") SynchronizedValueFactory nonce, @QueryParam("market") String market, + @QueryParam("quantity") String quantity) throws IOException; @GET @Path("market/sellmarket") BittrexTradeResponse sellmarket(@QueryParam("apikey") String apikey, @HeaderParam("apisign") ParamsDigest signature, - @QueryParam("nonce") SynchronizedValueFactory nonce, @QueryParam("market") String market, @QueryParam("quantity") String quantity) - throws IOException; + @QueryParam("nonce") SynchronizedValueFactory nonce, @QueryParam("market") String market, + @QueryParam("quantity") String quantity) throws IOException; @GET @Path("market/cancel") diff --git a/xchange-bittrex/src/main/java/org/knowm/xchange/bittrex/v1/dto/trade/BittrexOpenOrder.java b/xchange-bittrex/src/main/java/org/knowm/xchange/bittrex/v1/dto/trade/BittrexOpenOrder.java index 6816c1b9f7f..1c4b84cbcc9 100644 --- a/xchange-bittrex/src/main/java/org/knowm/xchange/bittrex/v1/dto/trade/BittrexOpenOrder.java +++ b/xchange-bittrex/src/main/java/org/knowm/xchange/bittrex/v1/dto/trade/BittrexOpenOrder.java @@ -15,8 +15,8 @@ @JsonInclude(JsonInclude.Include.NON_NULL) @Generated("org.jsonschema2pojo") -@JsonPropertyOrder({"Uuid", "OrderUuid", "Exchange", "OrderType", "Quantity", "QuantityRemaining", "Limit", "CommissionPaid", "Price", - "PricePerUnit", "Opened", "Closed", "CancelInitiated", "ImmediateOrCancel", "IsConditional", "Condition", "ConditionTarget"}) +@JsonPropertyOrder({"Uuid", "OrderUuid", "Exchange", "OrderType", "Quantity", "QuantityRemaining", "Limit", "CommissionPaid", "Price", "PricePerUnit", + "Opened", "Closed", "CancelInitiated", "ImmediateOrCancel", "IsConditional", "Condition", "ConditionTarget"}) public class BittrexOpenOrder { @JsonProperty("Uuid") diff --git a/xchange-bittrex/src/main/java/org/knowm/xchange/bittrex/v1/dto/trade/BittrexUserTrade.java b/xchange-bittrex/src/main/java/org/knowm/xchange/bittrex/v1/dto/trade/BittrexUserTrade.java index 021995adaae..2a25398fb30 100644 --- a/xchange-bittrex/src/main/java/org/knowm/xchange/bittrex/v1/dto/trade/BittrexUserTrade.java +++ b/xchange-bittrex/src/main/java/org/knowm/xchange/bittrex/v1/dto/trade/BittrexUserTrade.java @@ -16,7 +16,7 @@ @JsonInclude(JsonInclude.Include.NON_NULL) @Generated("org.jsonschema2pojo") @JsonPropertyOrder({"OrderUuid", "Exchange", "TimeStamp", "OrderType", "Limit", "Quantity", "QuantityRemaining", "Commission", "Price", - "PricePerUnit", "IsConditional", "Condition", "ConditionTarget", "ImmediateOrCancel", "Closed"}) + "PricePerUnit", "IsConditional", "Condition", "ConditionTarget", "ImmediateOrCancel", "Closed"}) public class BittrexUserTrade { @JsonProperty("OrderUuid") diff --git a/xchange-bittrex/src/main/java/org/knowm/xchange/bittrex/v1/service/BittrexAccountService.java b/xchange-bittrex/src/main/java/org/knowm/xchange/bittrex/v1/service/BittrexAccountService.java index 0913f33e757..159d5c098fd 100644 --- a/xchange-bittrex/src/main/java/org/knowm/xchange/bittrex/v1/service/BittrexAccountService.java +++ b/xchange-bittrex/src/main/java/org/knowm/xchange/bittrex/v1/service/BittrexAccountService.java @@ -51,7 +51,8 @@ public TradeHistoryParams createFundingHistoryParams() { } @Override - public List getFundingHistory(TradeHistoryParams params) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { + public List getFundingHistory( + TradeHistoryParams params) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { throw new NotYetImplementedForExchangeException(); } } \ No newline at end of file diff --git a/xchange-bittrex/src/main/java/org/knowm/xchange/bittrex/v1/service/BittrexTradeService.java b/xchange-bittrex/src/main/java/org/knowm/xchange/bittrex/v1/service/BittrexTradeService.java index e3291ff030a..1e2133fcf6c 100644 --- a/xchange-bittrex/src/main/java/org/knowm/xchange/bittrex/v1/service/BittrexTradeService.java +++ b/xchange-bittrex/src/main/java/org/knowm/xchange/bittrex/v1/service/BittrexTradeService.java @@ -54,7 +54,8 @@ public OpenOrders getOpenOrders() throws IOException { } @Override - public OpenOrders getOpenOrders(OpenOrdersParams params) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { + public OpenOrders getOpenOrders( + OpenOrdersParams params) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { return new OpenOrders(BittrexAdapters.adaptOpenOrders(getBittrexOpenOrders())); } @@ -80,8 +81,8 @@ public OpenOrdersParams createOpenOrdersParams() { } @Override - public Collection getOrder(String... orderIds) - throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { + public Collection getOrder( + String... orderIds) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { throw new NotYetImplementedForExchangeException(); } diff --git a/xchange-bleutrade/src/main/java/org/knowm/xchange/bleutrade/Bleutrade.java b/xchange-bleutrade/src/main/java/org/knowm/xchange/bleutrade/Bleutrade.java index 3120fc969f9..837f757dd3e 100644 --- a/xchange-bleutrade/src/main/java/org/knowm/xchange/bleutrade/Bleutrade.java +++ b/xchange-bleutrade/src/main/java/org/knowm/xchange/bleutrade/Bleutrade.java @@ -41,7 +41,6 @@ BleutradeOrderBookReturn getBleutradeOrderBook(@QueryParam("market") String mark @GET @Path("public/getmarkethistory") - BleutradeMarketHistoryReturn getBleutradeMarketHistory(@QueryParam("market") String market, @QueryParam("count") int count) - throws IOException; + BleutradeMarketHistoryReturn getBleutradeMarketHistory(@QueryParam("market") String market, @QueryParam("count") int count) throws IOException; } diff --git a/xchange-bleutrade/src/main/java/org/knowm/xchange/bleutrade/service/BleutradeAccountService.java b/xchange-bleutrade/src/main/java/org/knowm/xchange/bleutrade/service/BleutradeAccountService.java index 86c1f6207dd..75ef0fcc4c9 100644 --- a/xchange-bleutrade/src/main/java/org/knowm/xchange/bleutrade/service/BleutradeAccountService.java +++ b/xchange-bleutrade/src/main/java/org/knowm/xchange/bleutrade/service/BleutradeAccountService.java @@ -53,7 +53,8 @@ public TradeHistoryParams createFundingHistoryParams() { } @Override - public List getFundingHistory(TradeHistoryParams params) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { + public List getFundingHistory( + TradeHistoryParams params) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { throw new NotYetImplementedForExchangeException(); } } diff --git a/xchange-bleutrade/src/main/java/org/knowm/xchange/bleutrade/service/BleutradeTradeService.java b/xchange-bleutrade/src/main/java/org/knowm/xchange/bleutrade/service/BleutradeTradeService.java index 38558afa890..37937a49ba7 100644 --- a/xchange-bleutrade/src/main/java/org/knowm/xchange/bleutrade/service/BleutradeTradeService.java +++ b/xchange-bleutrade/src/main/java/org/knowm/xchange/bleutrade/service/BleutradeTradeService.java @@ -36,7 +36,8 @@ public OpenOrders getOpenOrders() throws IOException { } @Override - public OpenOrders getOpenOrders(OpenOrdersParams params) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { + public OpenOrders getOpenOrders( + OpenOrdersParams params) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { return BleutradeAdapters.adaptBleutradeOpenOrders(getBleutradeOpenOrders()); } @@ -80,8 +81,8 @@ public OpenOrdersParams createOpenOrdersParams() { } @Override - public Collection getOrder(String... orderIds) - throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { + public Collection getOrder( + String... orderIds) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { throw new NotYetImplementedForExchangeException(); } diff --git a/xchange-bleutrade/src/test/java/org/knowm/xchange/bleutrade/BleutradeTestData.java b/xchange-bleutrade/src/test/java/org/knowm/xchange/bleutrade/BleutradeTestData.java index c90698ec0ca..0bb0d91dfc2 100644 --- a/xchange-bleutrade/src/test/java/org/knowm/xchange/bleutrade/BleutradeTestData.java +++ b/xchange-bleutrade/src/test/java/org/knowm/xchange/bleutrade/BleutradeTestData.java @@ -36,8 +36,7 @@ protected static Trade[] expectedTrades() { } protected static LimitOrder[] expectedPlacedOrders() { - return new LimitOrder[]{ - new LimitOrder(Order.OrderType.BID, new BigDecimal("10.00000000"), CurrencyPair.BTC_AUD, "", null, new BigDecimal("1.1")), + return new LimitOrder[]{new LimitOrder(Order.OrderType.BID, new BigDecimal("10.00000000"), CurrencyPair.BTC_AUD, "", null, new BigDecimal("1.1")), new LimitOrder(Order.OrderType.ASK, new BigDecimal("20.00000000"), CurrencyPair.BTC_AUD, "", null, new BigDecimal("2.2"))}; } diff --git a/xchange-btc38/src/main/java/org/knowm/xchange/btc38/service/Btc38MarketDataService.java b/xchange-btc38/src/main/java/org/knowm/xchange/btc38/service/Btc38MarketDataService.java index ac79de4931f..ec45f388007 100644 --- a/xchange-btc38/src/main/java/org/knowm/xchange/btc38/service/Btc38MarketDataService.java +++ b/xchange-btc38/src/main/java/org/knowm/xchange/btc38/service/Btc38MarketDataService.java @@ -25,8 +25,8 @@ public Btc38MarketDataService(Exchange exchange) { } @Override - public Ticker getTicker(CurrencyPair currencyPair, Object... args) - throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { + public Ticker getTicker(CurrencyPair currencyPair, + Object... args) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { // Request data Btc38Ticker btc38Ticker = getBtc38Ticker(currencyPair.base.getCurrencyCode(), currencyPair.counter.getCurrencyCode()); @@ -36,15 +36,15 @@ public Ticker getTicker(CurrencyPair currencyPair, Object... args) } @Override - public OrderBook getOrderBook(CurrencyPair currencyPair, Object... args) - throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { + public OrderBook getOrderBook(CurrencyPair currencyPair, + Object... args) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { throw new NotYetImplementedForExchangeException(); } @Override - public Trades getTrades(CurrencyPair currencyPair, Object... args) - throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { + public Trades getTrades(CurrencyPair currencyPair, + Object... args) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { throw new NotYetImplementedForExchangeException(); } diff --git a/xchange-btcchina/src/main/java/org/knowm/xchange/btcchina/BTCChina.java b/xchange-btcchina/src/main/java/org/knowm/xchange/btcchina/BTCChina.java index cd62ac253e9..f12e8984464 100644 --- a/xchange-btcchina/src/main/java/org/knowm/xchange/btcchina/BTCChina.java +++ b/xchange-btcchina/src/main/java/org/knowm/xchange/btcchina/BTCChina.java @@ -131,8 +131,8 @@ public interface BTCChina { */ @GET @Path("data/historydata") - BTCChinaTrade[] getHistoryData(@QueryParam("market") String market, @QueryParam("since") long since, @QueryParam("limit") int limit) - throws IOException; + BTCChinaTrade[] getHistoryData(@QueryParam("market") String market, @QueryParam("since") long since, + @QueryParam("limit") int limit) throws IOException; @GET @Path("data/historydata") @@ -143,8 +143,8 @@ BTCChinaTrade[] getHistoryData(@QueryParam("market") String market, @QueryParam( @Path("api_trade_v1.php") @Consumes(MediaType.APPLICATION_JSON) BTCChinaGetAccountInfoResponse getAccountInfo(@HeaderParam("Authorization") ParamsDigest authorization, - @HeaderParam("Json-Rpc-Tonce") SynchronizedValueFactory jsonRpcTonce, BTCChinaGetAccountInfoRequest getAccountInfoRequest) - throws IOException; + @HeaderParam("Json-Rpc-Tonce") SynchronizedValueFactory jsonRpcTonce, + BTCChinaGetAccountInfoRequest getAccountInfoRequest) throws IOException; @POST @Path("api_trade_v1.php") @@ -177,8 +177,8 @@ BTCChinaGetWithdrawalsResponse getWithdrawals(@HeaderParam("Authorization") Para @Path("api_trade_v1.php") @Consumes(MediaType.APPLICATION_JSON) BTCChinaRequestWithdrawalResponse requestWithdrawal(@HeaderParam("Authorization") ParamsDigest authorization, - @HeaderParam("Json-Rpc-Tonce") SynchronizedValueFactory jsonRpcTonce, BTCChinaRequestWithdrawalRequest requestWithdrawalRequest) - throws IOException; + @HeaderParam("Json-Rpc-Tonce") SynchronizedValueFactory jsonRpcTonce, + BTCChinaRequestWithdrawalRequest requestWithdrawalRequest) throws IOException; @POST @Path("api_trade_v1.php") diff --git a/xchange-btcchina/src/main/java/org/knowm/xchange/btcchina/BTCChinaAdapters.java b/xchange-btcchina/src/main/java/org/knowm/xchange/btcchina/BTCChinaAdapters.java index 2e6d032707c..e730a450ac7 100644 --- a/xchange-btcchina/src/main/java/org/knowm/xchange/btcchina/BTCChinaAdapters.java +++ b/xchange-btcchina/src/main/java/org/knowm/xchange/btcchina/BTCChinaAdapters.java @@ -391,15 +391,17 @@ public static ExchangeMetaData adaptToExchangeMetaData(Map adaptFundingHistory(final BTCChinaGetDepositsResponse depositsResponse, final BTCChinaGetWithdrawalsResponse withdrawalsResponse) { + public static List adaptFundingHistory(final BTCChinaGetDepositsResponse depositsResponse, + final BTCChinaGetWithdrawalsResponse withdrawalsResponse) { final List fundingRecords = new ArrayList<>(); if (depositsResponse != null && depositsResponse.getResult() != null) { final BTCChinaDeposit[] deposits = depositsResponse.getResult().getDeposits(); for (final BTCChinaDeposit deposit : deposits) { - FundingRecord fundingRecordEntry = new FundingRecord(deposit.getAddress(), adaptDate(deposit.getDate()), Currency.getInstance(deposit.getCurrency()), - deposit.getAmount(), String.valueOf(deposit.getId()), FundingRecord.Type.DEPOSIT, deposit.getStatus(), null, null, null); + FundingRecord fundingRecordEntry = new FundingRecord(deposit.getAddress(), adaptDate(deposit.getDate()), + Currency.getInstance(deposit.getCurrency()), deposit.getAmount(), String.valueOf(deposit.getId()), FundingRecord.Type.DEPOSIT, + deposit.getStatus(), null, null, null); fundingRecords.add(fundingRecordEntry); } } @@ -407,8 +409,9 @@ public static List adaptFundingHistory(final BTCChinaGetDepositsR if (withdrawalsResponse != null && withdrawalsResponse.getResult() != null) { final BTCChinaWithdrawal[] withdrawals = withdrawalsResponse.getResult().getWithdrawals(); for (final BTCChinaWithdrawal withdrawal : withdrawals) { - FundingRecord fundingRecordEntry = new FundingRecord(withdrawal.getAddress(), adaptDate(withdrawal.getDate()), Currency.getInstance(withdrawal.getCurrency()), - withdrawal.getAmount(), String.valueOf(withdrawal.getId()), FundingRecord.Type.WITHDRAWAL, withdrawal.getStatus(), null, null, null); + FundingRecord fundingRecordEntry = new FundingRecord(withdrawal.getAddress(), adaptDate(withdrawal.getDate()), + Currency.getInstance(withdrawal.getCurrency()), withdrawal.getAmount(), String.valueOf(withdrawal.getId()), FundingRecord.Type.WITHDRAWAL, + withdrawal.getStatus(), null, null, null); fundingRecords.add(fundingRecordEntry); } } diff --git a/xchange-btcchina/src/main/java/org/knowm/xchange/btcchina/dto/trade/request/BTCChinaBuyStopOrderRequest.java b/xchange-btcchina/src/main/java/org/knowm/xchange/btcchina/dto/trade/request/BTCChinaBuyStopOrderRequest.java index 7bea1dc508f..5111ec3b3c7 100644 --- a/xchange-btcchina/src/main/java/org/knowm/xchange/btcchina/dto/trade/request/BTCChinaBuyStopOrderRequest.java +++ b/xchange-btcchina/src/main/java/org/knowm/xchange/btcchina/dto/trade/request/BTCChinaBuyStopOrderRequest.java @@ -16,8 +16,8 @@ public class BTCChinaBuyStopOrderRequest extends BTCChinaStopOrderRequest { * Construct request for {@code buyStopOrder}. * * @param stopPrice The price in quote currency to trigger the order creation. The limit/market order will be triggered immediately if the last - * price is more than or equal to this stop price. Max 2 decimals for BTC/CNY and LTC/CNY markets. 4 decimals for LTC/BTC market. The stop - * price can only be specified if trailing amount or trailing percentage is not specified. + * price is more than or equal to this stop price. Max 2 decimals for BTC/CNY and LTC/CNY markets. 4 decimals for LTC/BTC market. The stop price can + * only be specified if trailing amount or trailing percentage is not specified. * @param price The price in quote currency to buy 1 base currency for the order to be created when the stop price is reached. Max 2 decimals for * BTC/CNY and LTC/CNY markets. 4 decimals for LTC/BTC market. Market order is executed by setting price to 'null'. * @param amount The total amount of LTC/BTC to buy for the order to be created when the stop price is reached. Supports 4 decimal places for BTC diff --git a/xchange-btcchina/src/main/java/org/knowm/xchange/btcchina/dto/trade/request/BTCChinaSellStopOrderRequest.java b/xchange-btcchina/src/main/java/org/knowm/xchange/btcchina/dto/trade/request/BTCChinaSellStopOrderRequest.java index 30e8e39dc71..ea1631e8a77 100644 --- a/xchange-btcchina/src/main/java/org/knowm/xchange/btcchina/dto/trade/request/BTCChinaSellStopOrderRequest.java +++ b/xchange-btcchina/src/main/java/org/knowm/xchange/btcchina/dto/trade/request/BTCChinaSellStopOrderRequest.java @@ -16,8 +16,8 @@ public class BTCChinaSellStopOrderRequest extends BTCChinaStopOrderRequest { * Constructs request for {@code sellStopOrder}. * * @param stopPrice The price in quote currency to trigger the order creation. The limit/market order will be triggered immediately if the last - * price is less than or equal to this stop price. Max 2 decimals for BTC/CNY and LTC/CNY markets. 4 decimals for LTC/BTC market. The stop - * price can only be specified if trailing amount or trailing percentage is not specified. + * price is less than or equal to this stop price. Max 2 decimals for BTC/CNY and LTC/CNY markets. 4 decimals for LTC/BTC market. The stop price can + * only be specified if trailing amount or trailing percentage is not specified. * @param price The price in quote currency to sell 1 base currency for the order to be created when the stop price is reached. Max 2 decimals for * BTC/CNY and LTC/CNY markets. 4 decimals for LTC/BTC market. Market order is executed by setting price to 'null'. * @param amount The total amount of LTC/BTC to sell for the order to be created when the stop price is reached. Supports 4 decimal places for BTC diff --git a/xchange-btcchina/src/main/java/org/knowm/xchange/btcchina/service/rest/BTCChinaAccountService.java b/xchange-btcchina/src/main/java/org/knowm/xchange/btcchina/service/rest/BTCChinaAccountService.java index afd07a0a7d7..eec727e2b48 100644 --- a/xchange-btcchina/src/main/java/org/knowm/xchange/btcchina/service/rest/BTCChinaAccountService.java +++ b/xchange-btcchina/src/main/java/org/knowm/xchange/btcchina/service/rest/BTCChinaAccountService.java @@ -68,7 +68,8 @@ public TradeHistoryParams createFundingHistoryParams() { } @Override - public List getFundingHistory(TradeHistoryParams params) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { + public List getFundingHistory( + TradeHistoryParams params) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { String currency = null; if (params instanceof TradeHistoryParamCurrency && ((TradeHistoryParamCurrency) params).getCurrency() != null) { currency = ((TradeHistoryParamCurrency) params).getCurrency().getCurrencyCode(); diff --git a/xchange-btcchina/src/main/java/org/knowm/xchange/btcchina/service/rest/BTCChinaTradeService.java b/xchange-btcchina/src/main/java/org/knowm/xchange/btcchina/service/rest/BTCChinaTradeService.java index e785119d5ef..d400f6b80e6 100644 --- a/xchange-btcchina/src/main/java/org/knowm/xchange/btcchina/service/rest/BTCChinaTradeService.java +++ b/xchange-btcchina/src/main/java/org/knowm/xchange/btcchina/service/rest/BTCChinaTradeService.java @@ -64,7 +64,8 @@ public OpenOrders getOpenOrders() throws IOException { } @Override - public OpenOrders getOpenOrders(OpenOrdersParams params) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { + public OpenOrders getOpenOrders( + OpenOrdersParams params) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { final List limitOrders = new ArrayList<>(); List page; @@ -262,8 +263,8 @@ public String getEndId() { } @Override - public Collection getOrder(String... orderIds) - throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { + public Collection getOrder( + String... orderIds) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { throw new NotYetImplementedForExchangeException(); } diff --git a/xchange-btcchina/src/main/java/org/knowm/xchange/btcchina/service/rest/BTCChinaTradeServiceRaw.java b/xchange-btcchina/src/main/java/org/knowm/xchange/btcchina/service/rest/BTCChinaTradeServiceRaw.java index f0524720fdd..3864f79c060 100644 --- a/xchange-btcchina/src/main/java/org/knowm/xchange/btcchina/service/rest/BTCChinaTradeServiceRaw.java +++ b/xchange-btcchina/src/main/java/org/knowm/xchange/btcchina/service/rest/BTCChinaTradeServiceRaw.java @@ -193,24 +193,24 @@ public BTCChinaTransactionsResponse getTransactions() throws IOException { /** * @see BTCChinaTransactionsRequest#BTCChinaTransactionsRequest(String, Integer, Integer, Integer, String) */ - public BTCChinaTransactionsResponse getTransactions(String type, Integer limit, Integer offset, Integer since, String sincetype) - throws IOException { + public BTCChinaTransactionsResponse getTransactions(String type, Integer limit, Integer offset, Integer since, + String sincetype) throws IOException { BTCChinaTransactionsRequest request = new BTCChinaTransactionsRequest(type, limit, offset, since, sincetype); BTCChinaTransactionsResponse response = btcChina.getTransactions(signatureCreator, exchange.getNonceFactory(), request); return checkResult(response); } - public BTCChinaIntegerResponse buyIcebergOrder(BigDecimal price, BigDecimal amount, BigDecimal disclosedAmount, BigDecimal variance, String market) - throws IOException { + public BTCChinaIntegerResponse buyIcebergOrder(BigDecimal price, BigDecimal amount, BigDecimal disclosedAmount, BigDecimal variance, + String market) throws IOException { BTCChinaBuyIcebergOrderRequest request = new BTCChinaBuyIcebergOrderRequest(price, amount, disclosedAmount, variance, market); BTCChinaIntegerResponse response = btcChina.buyIcebergOrder(signatureCreator, exchange.getNonceFactory(), request); return checkResult(response); } - public BTCChinaIntegerResponse sellIcebergOrder(BigDecimal price, BigDecimal amount, BigDecimal disclosedAmount, BigDecimal variance, String market) - throws IOException { + public BTCChinaIntegerResponse sellIcebergOrder(BigDecimal price, BigDecimal amount, BigDecimal disclosedAmount, BigDecimal variance, + String market) throws IOException { BTCChinaSellIcebergOrderRequest request = new BTCChinaSellIcebergOrderRequest(price, amount, disclosedAmount, variance, market); BTCChinaIntegerResponse response = btcChina.sellIcebergOrder(signatureCreator, exchange.getNonceFactory(), request); @@ -273,8 +273,8 @@ public BTCChinaGetStopOrderResponse getStopOrder(int id, String market) throws I /** * @see BTCChinaGetStopOrdersRequest */ - public BTCChinaGetStopOrdersResponse getStopOrders(String status, String type, BigDecimal stopPrice, Integer limit, Integer offset, String market) - throws IOException { + public BTCChinaGetStopOrdersResponse getStopOrders(String status, String type, BigDecimal stopPrice, Integer limit, Integer offset, + String market) throws IOException { BTCChinaGetStopOrdersRequest request = new BTCChinaGetStopOrdersRequest(status, type, stopPrice, limit, offset, market); BTCChinaGetStopOrdersResponse response = btcChina.getStopOrders(signatureCreator, exchange.getNonceFactory(), request); diff --git a/xchange-btce/src/main/java/org/knowm/xchange/btce/v3/BTCE.java b/xchange-btce/src/main/java/org/knowm/xchange/btce/v3/BTCE.java index 13df64c3b84..578d23d5788 100644 --- a/xchange-btce/src/main/java/org/knowm/xchange/btce/v3/BTCE.java +++ b/xchange-btce/src/main/java/org/knowm/xchange/btce/v3/BTCE.java @@ -28,8 +28,8 @@ public interface BTCE { @GET @Path("api/3/ticker/{pairs}") @Produces(MediaType.APPLICATION_JSON) - BTCETickerWrapper getTicker(@PathParam("pairs") String pairs, @DefaultValue("1") @QueryParam("ignore_invalid") int ignoreInvalid) - throws IOException; + BTCETickerWrapper getTicker(@PathParam("pairs") String pairs, + @DefaultValue("1") @QueryParam("ignore_invalid") int ignoreInvalid) throws IOException; @GET @Path("api/3/depth/{pairs}") diff --git a/xchange-btce/src/main/java/org/knowm/xchange/btce/v3/service/BTCEAccountService.java b/xchange-btce/src/main/java/org/knowm/xchange/btce/v3/service/BTCEAccountService.java index 78e25cb0dd4..26f97108441 100644 --- a/xchange-btce/src/main/java/org/knowm/xchange/btce/v3/service/BTCEAccountService.java +++ b/xchange-btce/src/main/java/org/knowm/xchange/btce/v3/service/BTCEAccountService.java @@ -56,7 +56,8 @@ public TradeHistoryParams createFundingHistoryParams() { } @Override - public List getFundingHistory(TradeHistoryParams params) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { + public List getFundingHistory( + TradeHistoryParams params) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { throw new NotYetImplementedForExchangeException(); } } diff --git a/xchange-btce/src/main/java/org/knowm/xchange/btce/v3/service/BTCEAccountServiceRaw.java b/xchange-btce/src/main/java/org/knowm/xchange/btce/v3/service/BTCEAccountServiceRaw.java index 80c31e6a980..717b2f2a0f1 100644 --- a/xchange-btce/src/main/java/org/knowm/xchange/btce/v3/service/BTCEAccountServiceRaw.java +++ b/xchange-btce/src/main/java/org/knowm/xchange/btce/v3/service/BTCEAccountServiceRaw.java @@ -35,8 +35,8 @@ public BTCEAccountServiceRaw(Exchange exchange) { * @return BTCEAccountInfo object: {funds={usd=0, rur=0, eur=0, btc=0.1, ltc=0, nmc=0}, rights={info=1, trade=1, withdraw=1}, transaction_count=1, * open_orders=0, server_time=1357678428} */ - public BTCEAccountInfo getBTCEAccountInfo(Long from, Long count, Long fromId, Long endId, Boolean descOrder, Long since, Long end) - throws IOException { + public BTCEAccountInfo getBTCEAccountInfo(Long from, Long count, Long fromId, Long endId, Boolean descOrder, Long since, + Long end) throws IOException { BTCEAccountInfoReturn info = btce.getInfo(apiKey, signatureCreator, exchange.getNonceFactory(), from, count, fromId, endId, BTCEAuthenticated.SortOrder.DESC, null, null); diff --git a/xchange-btce/src/main/java/org/knowm/xchange/btce/v3/service/BTCEHmacPostBodyDigest.java b/xchange-btce/src/main/java/org/knowm/xchange/btce/v3/service/BTCEHmacPostBodyDigest.java index f34b947faf2..c4d7278d657 100644 --- a/xchange-btce/src/main/java/org/knowm/xchange/btce/v3/service/BTCEHmacPostBodyDigest.java +++ b/xchange-btce/src/main/java/org/knowm/xchange/btce/v3/service/BTCEHmacPostBodyDigest.java @@ -16,7 +16,8 @@ * This may be used for REST APIs where some parameters' values must be digests of other parameters. An example is the MtGox API v1, where the * Rest-Sign header parameter must be a digest of the request body (which is composed of * - * @FormParams).

+ * @FormParams). + *

*/ public class BTCEHmacPostBodyDigest extends BaseParamsDigest { diff --git a/xchange-btce/src/main/java/org/knowm/xchange/btce/v3/service/BTCETradeService.java b/xchange-btce/src/main/java/org/knowm/xchange/btce/v3/service/BTCETradeService.java index 8c3af05506a..7c232b3b48f 100644 --- a/xchange-btce/src/main/java/org/knowm/xchange/btce/v3/service/BTCETradeService.java +++ b/xchange-btce/src/main/java/org/knowm/xchange/btce/v3/service/BTCETradeService.java @@ -57,7 +57,8 @@ public OpenOrders getOpenOrders() throws IOException { } @Override - public OpenOrders getOpenOrders(OpenOrdersParams params) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { + public OpenOrders getOpenOrders( + OpenOrdersParams params) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { // todo: use the currency pair from params Map orders = getBTCEActiveOrders(null); return BTCEAdapters.adaptOrders(orders); @@ -177,8 +178,8 @@ public OpenOrdersParams createOpenOrdersParams() { } @Override - public Collection getOrder(String... orderIds) - throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { + public Collection getOrder( + String... orderIds) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { throw new NotYetImplementedForExchangeException(); } diff --git a/xchange-btcmarkets/src/main/java/org/knowm/xchange/btcmarkets/BTCMarketsAuthenticated.java b/xchange-btcmarkets/src/main/java/org/knowm/xchange/btcmarkets/BTCMarketsAuthenticated.java index 32799ae2d85..46871868d2e 100644 --- a/xchange-btcmarkets/src/main/java/org/knowm/xchange/btcmarkets/BTCMarketsAuthenticated.java +++ b/xchange-btcmarkets/src/main/java/org/knowm/xchange/btcmarkets/BTCMarketsAuthenticated.java @@ -37,8 +37,8 @@ List getBalance(@HeaderParam("apikey") String publicKey, @Hea @Path("order/create") @Consumes(MediaType.APPLICATION_JSON) BTCMarketsPlaceOrderResponse placeOrder(@HeaderParam("apikey") String publicKey, - @HeaderParam("timestamp") SynchronizedValueFactory nonceFactory, @HeaderParam("signature") BTCMarketsDigest signer, BTCMarketsOrder order) - throws BTCMarketsException, IOException; + @HeaderParam("timestamp") SynchronizedValueFactory nonceFactory, @HeaderParam("signature") BTCMarketsDigest signer, + BTCMarketsOrder order) throws BTCMarketsException, IOException; @POST @Path("order/cancel") diff --git a/xchange-btcmarkets/src/main/java/org/knowm/xchange/btcmarkets/dto/trade/BTCMarketsUserTrade.java b/xchange-btcmarkets/src/main/java/org/knowm/xchange/btcmarkets/dto/trade/BTCMarketsUserTrade.java index b7dc7f9d5c5..aa93cd88cbd 100644 --- a/xchange-btcmarkets/src/main/java/org/knowm/xchange/btcmarkets/dto/trade/BTCMarketsUserTrade.java +++ b/xchange-btcmarkets/src/main/java/org/knowm/xchange/btcmarkets/dto/trade/BTCMarketsUserTrade.java @@ -69,7 +69,7 @@ public Long getOrderId() { @Override public String toString() { - return String.format("BTCMarketsUserTrade{id=%d, side='%s', description='%s', price=%s, volume=%s, fee=%s, creationTime=%s, orderId=%s}", id, side, - description, price, volume, fee, creationTime, orderId); + return String.format("BTCMarketsUserTrade{id=%d, side='%s', description='%s', price=%s, volume=%s, fee=%s, creationTime=%s, orderId=%s}", id, + side, description, price, volume, fee, creationTime, orderId); } } diff --git a/xchange-btcmarkets/src/main/java/org/knowm/xchange/btcmarkets/service/BTCMarketsAccountService.java b/xchange-btcmarkets/src/main/java/org/knowm/xchange/btcmarkets/service/BTCMarketsAccountService.java index 2776c24b07e..77c854bf0d1 100644 --- a/xchange-btcmarkets/src/main/java/org/knowm/xchange/btcmarkets/service/BTCMarketsAccountService.java +++ b/xchange-btcmarkets/src/main/java/org/knowm/xchange/btcmarkets/service/BTCMarketsAccountService.java @@ -45,7 +45,8 @@ public TradeHistoryParams createFundingHistoryParams() { } @Override - public List getFundingHistory(TradeHistoryParams params) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { + public List getFundingHistory( + TradeHistoryParams params) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { throw new NotYetImplementedForExchangeException(); } } diff --git a/xchange-btcmarkets/src/main/java/org/knowm/xchange/btcmarkets/service/BTCMarketsTradeService.java b/xchange-btcmarkets/src/main/java/org/knowm/xchange/btcmarkets/service/BTCMarketsTradeService.java index 63c7256d388..1c3a3d77923 100644 --- a/xchange-btcmarkets/src/main/java/org/knowm/xchange/btcmarkets/service/BTCMarketsTradeService.java +++ b/xchange-btcmarkets/src/main/java/org/knowm/xchange/btcmarkets/service/BTCMarketsTradeService.java @@ -61,8 +61,8 @@ public String placeLimitOrder(LimitOrder order) throws IOException, BTCMarketsEx return placeOrder(order.getCurrencyPair(), order.getType(), order.getTradableAmount(), order.getLimitPrice(), BTCMarketsOrder.Type.Limit); } - private String placeOrder(CurrencyPair currencyPair, Order.OrderType orderSide, BigDecimal amount, BigDecimal price, BTCMarketsOrder.Type orderType) - throws IOException { + private String placeOrder(CurrencyPair currencyPair, Order.OrderType orderSide, BigDecimal amount, BigDecimal price, + BTCMarketsOrder.Type orderType) throws IOException { BTCMarketsOrder.Side side = orderSide == BID ? BTCMarketsOrder.Side.Bid : BTCMarketsOrder.Side.Ask; final BTCMarketsPlaceOrderResponse orderResponse = placeBTCMarketsOrder(currencyPair, amount, price, side, orderType); return Long.toString(orderResponse.getId()); @@ -74,7 +74,8 @@ public OpenOrders getOpenOrders() throws IOException, BTCMarketsException { } @Override - public OpenOrders getOpenOrders(OpenOrdersParams params) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { + public OpenOrders getOpenOrders( + OpenOrdersParams params) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { BTCMarketsOrders openOrders = getBTCMarketsOpenOrders(((OpenOrdersParamCurrencyPair) params).getCurrencyPair(), 50, null); return BTCMarketsAdapters.adaptOpenOrders(openOrders); @@ -174,8 +175,8 @@ public void setCurrencyPair(CurrencyPair currencyPair) { } @Override - public Collection getOrder(String... orderIds) - throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { + public Collection getOrder( + String... orderIds) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { throw new NotYetImplementedForExchangeException(); } } diff --git a/xchange-btcmarkets/src/test/java/org/knowm/xchange/btcmarkets/service/BTCMarketsTradeServiceTest.java b/xchange-btcmarkets/src/test/java/org/knowm/xchange/btcmarkets/service/BTCMarketsTradeServiceTest.java index 012a07ff128..8625cec4e57 100644 --- a/xchange-btcmarkets/src/test/java/org/knowm/xchange/btcmarkets/service/BTCMarketsTradeServiceTest.java +++ b/xchange-btcmarkets/src/test/java/org/knowm/xchange/btcmarkets/service/BTCMarketsTradeServiceTest.java @@ -165,12 +165,10 @@ public void shouldGetTradeHistory() throws Exception { new Object[]{true, "", 0, Collections.singletonList(expectedBtcMarketsUserTrades.get(0))}); BTCMarketsTradeHistory pagingResponse = Whitebox.invokeConstructor(BTCMarketsTradeHistory.class, - new Class[]{Boolean.class, String.class, Integer.class, List.class}, - new Object[]{true, "", 0, expectedBtcMarketsUserTrades.subList(1, 3)}); + new Class[]{Boolean.class, String.class, Integer.class, List.class}, new Object[]{true, "", 0, expectedBtcMarketsUserTrades.subList(1, 3)}); BTCMarketsTradeHistory timeSpanResponse = Whitebox.invokeConstructor(BTCMarketsTradeHistory.class, - new Class[]{Boolean.class, String.class, Integer.class, List.class}, - new Object[]{true, "", 0, expectedBtcMarketsUserTrades.subList(2, 4)}); + new Class[]{Boolean.class, String.class, Integer.class, List.class}, new Object[]{true, "", 0, expectedBtcMarketsUserTrades.subList(2, 4)}); BTCMarketsAuthenticated btcm = mock(BTCMarketsAuthenticated.class); diff --git a/xchange-btctrade/src/main/java/org/knowm/xchange/btctrade/BTCTrade.java b/xchange-btctrade/src/main/java/org/knowm/xchange/btctrade/BTCTrade.java index 9eef375e6b1..3fafdc16c56 100644 --- a/xchange-btctrade/src/main/java/org/knowm/xchange/btctrade/BTCTrade.java +++ b/xchange-btctrade/src/main/java/org/knowm/xchange/btctrade/BTCTrade.java @@ -112,9 +112,8 @@ BTCTradeWallet getWallet(@FormParam("nonce") SynchronizedValueFactory nonc */ @POST @Path("orders") - BTCTradeOrder[] getOrders(@FormParam("since") long since, @FormParam("type") String type, - @FormParam("nonce") SynchronizedValueFactory nonce, @FormParam("key") String key, @FormParam("signature") ParamsDigest signature) - throws IOException; + BTCTradeOrder[] getOrders(@FormParam("since") long since, @FormParam("type") String type, @FormParam("nonce") SynchronizedValueFactory nonce, + @FormParam("key") String key, @FormParam("signature") ParamsDigest signature) throws IOException; /** * Returns order information. @@ -139,8 +138,8 @@ BTCTradeOrder getOrder(@FormParam("id") String id, @FormParam("nonce") Synchroni */ @POST @Path("cancel_order") - BTCTradeResult cancelOrder(@FormParam("id") String id, @FormParam("nonce") SynchronizedValueFactory nonce, - @FormParam("key") String key, @FormParam("signature") ParamsDigest signature) throws IOException; + BTCTradeResult cancelOrder(@FormParam("id") String id, @FormParam("nonce") SynchronizedValueFactory nonce, @FormParam("key") String key, + @FormParam("signature") ParamsDigest signature) throws IOException; /** * Places a buy order. @@ -154,8 +153,8 @@ BTCTradeResult cancelOrder(@FormParam("id") String id, @FormParam("nonce") Synch @POST @Path("buy") BTCTradePlaceOrderResult buy(@FormParam("amount") String amount, @FormParam("price") String price, - @FormParam("nonce") SynchronizedValueFactory nonce, @FormParam("key") String key, @FormParam("signature") ParamsDigest signature) - throws IOException; + @FormParam("nonce") SynchronizedValueFactory nonce, @FormParam("key") String key, + @FormParam("signature") ParamsDigest signature) throws IOException; /** * Places a sell order. @@ -169,7 +168,7 @@ BTCTradePlaceOrderResult buy(@FormParam("amount") String amount, @FormParam("pri @POST @Path("sell") BTCTradePlaceOrderResult sell(@FormParam("amount") String amount, @FormParam("price") String price, - @FormParam("nonce") SynchronizedValueFactory nonce, @FormParam("key") String key, @FormParam("signature") ParamsDigest signature) - throws IOException; + @FormParam("nonce") SynchronizedValueFactory nonce, @FormParam("key") String key, + @FormParam("signature") ParamsDigest signature) throws IOException; } diff --git a/xchange-btctrade/src/main/java/org/knowm/xchange/btctrade/service/BTCTradeAccountService.java b/xchange-btctrade/src/main/java/org/knowm/xchange/btctrade/service/BTCTradeAccountService.java index aa912bc4503..fda15f08ca5 100644 --- a/xchange-btctrade/src/main/java/org/knowm/xchange/btctrade/service/BTCTradeAccountService.java +++ b/xchange-btctrade/src/main/java/org/knowm/xchange/btctrade/service/BTCTradeAccountService.java @@ -60,7 +60,8 @@ public TradeHistoryParams createFundingHistoryParams() { } @Override - public List getFundingHistory(TradeHistoryParams params) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { + public List getFundingHistory( + TradeHistoryParams params) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { throw new NotYetImplementedForExchangeException(); } } diff --git a/xchange-btctrade/src/main/java/org/knowm/xchange/btctrade/service/BTCTradeTradeService.java b/xchange-btctrade/src/main/java/org/knowm/xchange/btctrade/service/BTCTradeTradeService.java index 79cfab6b68c..59314ec30e2 100644 --- a/xchange-btctrade/src/main/java/org/knowm/xchange/btctrade/service/BTCTradeTradeService.java +++ b/xchange-btctrade/src/main/java/org/knowm/xchange/btctrade/service/BTCTradeTradeService.java @@ -43,7 +43,8 @@ public OpenOrders getOpenOrders() throws IOException { } @Override - public OpenOrders getOpenOrders(OpenOrdersParams params) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { + public OpenOrders getOpenOrders( + OpenOrdersParams params) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { return BTCTradeAdapters.adaptOpenOrders(getBTCTradeOrders(0, "open")); } @@ -106,8 +107,8 @@ public OpenOrdersParams createOpenOrdersParams() { } @Override - public Collection getOrder(String... orderIds) - throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { + public Collection getOrder( + String... orderIds) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { throw new NotYetImplementedForExchangeException(); } diff --git a/xchange-bter/src/main/java/org/knowm/xchange/bter/BTERExchange.java b/xchange-bter/src/main/java/org/knowm/xchange/bter/BTERExchange.java index 4ea64b9ef31..fa1fc8cede2 100644 --- a/xchange-bter/src/main/java/org/knowm/xchange/bter/BTERExchange.java +++ b/xchange-bter/src/main/java/org/knowm/xchange/bter/BTERExchange.java @@ -47,8 +47,7 @@ public SynchronizedValueFactory getNonceFactory() { @Override public void remoteInit() throws IOException { - Map currencyPair2BTERMarketInfoMap = ((BTERMarketDataServiceRaw) marketDataService) - .getBTERMarketInfo(); + Map currencyPair2BTERMarketInfoMap = ((BTERMarketDataServiceRaw) marketDataService).getBTERMarketInfo(); exchangeMetaData = BTERAdapters.adaptToExchangeMetaData(currencyPair2BTERMarketInfoMap); } } diff --git a/xchange-bter/src/main/java/org/knowm/xchange/bter/service/BTERAccountService.java b/xchange-bter/src/main/java/org/knowm/xchange/bter/service/BTERAccountService.java index 9f2e194bcc6..26313d0130a 100644 --- a/xchange-bter/src/main/java/org/knowm/xchange/bter/service/BTERAccountService.java +++ b/xchange-bter/src/main/java/org/knowm/xchange/bter/service/BTERAccountService.java @@ -52,7 +52,8 @@ public TradeHistoryParams createFundingHistoryParams() { } @Override - public List getFundingHistory(TradeHistoryParams params) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { + public List getFundingHistory( + TradeHistoryParams params) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { throw new NotYetImplementedForExchangeException(); } } diff --git a/xchange-bter/src/main/java/org/knowm/xchange/bter/service/BTERTradeService.java b/xchange-bter/src/main/java/org/knowm/xchange/bter/service/BTERTradeService.java index f2329203436..7705eac7152 100644 --- a/xchange-bter/src/main/java/org/knowm/xchange/bter/service/BTERTradeService.java +++ b/xchange-bter/src/main/java/org/knowm/xchange/bter/service/BTERTradeService.java @@ -41,7 +41,8 @@ public OpenOrders getOpenOrders() throws IOException { } @Override - public OpenOrders getOpenOrders(OpenOrdersParams params) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { + public OpenOrders getOpenOrders( + OpenOrdersParams params) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { BTEROpenOrders openOrders = super.getBTEROpenOrders(); Collection currencyPairs = exchange.getExchangeSymbols(); @@ -99,8 +100,8 @@ public OpenOrdersParams createOpenOrdersParams() { } @Override - public Collection getOrder(String... orderIds) - throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { + public Collection getOrder( + String... orderIds) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { throw new NotYetImplementedForExchangeException(); } diff --git a/xchange-campbx/src/main/java/org/knowm/xchange/campbx/service/CampBXAccountService.java b/xchange-campbx/src/main/java/org/knowm/xchange/campbx/service/CampBXAccountService.java index 88b0d8afbfe..dd38c763662 100644 --- a/xchange-campbx/src/main/java/org/knowm/xchange/campbx/service/CampBXAccountService.java +++ b/xchange-campbx/src/main/java/org/knowm/xchange/campbx/service/CampBXAccountService.java @@ -85,7 +85,8 @@ public TradeHistoryParams createFundingHistoryParams() { } @Override - public List getFundingHistory(TradeHistoryParams params) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { + public List getFundingHistory( + TradeHistoryParams params) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { throw new NotYetImplementedForExchangeException(); } } diff --git a/xchange-campbx/src/main/java/org/knowm/xchange/campbx/service/CampBXTradeService.java b/xchange-campbx/src/main/java/org/knowm/xchange/campbx/service/CampBXTradeService.java index b6a8c4c2ed0..6770d3a2620 100644 --- a/xchange-campbx/src/main/java/org/knowm/xchange/campbx/service/CampBXTradeService.java +++ b/xchange-campbx/src/main/java/org/knowm/xchange/campbx/service/CampBXTradeService.java @@ -52,7 +52,8 @@ public OpenOrders getOpenOrders() throws IOException { } @Override - public OpenOrders getOpenOrders(OpenOrdersParams params) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { + public OpenOrders getOpenOrders( + OpenOrdersParams params) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { MyOpenOrders myOpenOrders = getCampBXOpenOrders(); logger.debug("myOpenOrders = {}", myOpenOrders); @@ -154,8 +155,8 @@ public OpenOrdersParams createOpenOrdersParams() { } @Override - public Collection getOrder(String... orderIds) - throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { + public Collection getOrder( + String... orderIds) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { throw new NotYetImplementedForExchangeException(); } diff --git a/xchange-ccex/src/main/java/org/knowm/xchange/ccex/CCEX.java b/xchange-ccex/src/main/java/org/knowm/xchange/ccex/CCEX.java index 4e51153753e..2c53244e831 100644 --- a/xchange-ccex/src/main/java/org/knowm/xchange/ccex/CCEX.java +++ b/xchange-ccex/src/main/java/org/knowm/xchange/ccex/CCEX.java @@ -34,8 +34,7 @@ public interface CCEX { CCEXTickerResponse getTicker(@PathParam("lpair") String lpair, @PathParam("rpair") String rpair) throws IOException; /** - * Returns "bids" and "asks". Each is a list of open orders and each order - * is represented as a list of data. + * Returns "bids" and "asks". Each is a list of open orders and each order is represented as a list of data. */ @GET @Path("api_pub.html?a=getorderbook&market={pair}&type=both&depth={depth}") @@ -71,8 +70,7 @@ public int hashCode() { @Override public String toString() { - return String.format("%s-%s", pair.base.getCurrencyCode().toLowerCase(), - pair.counter.getCurrencyCode().toLowerCase()); + return String.format("%s-%s", pair.base.getCurrencyCode().toLowerCase(), pair.counter.getCurrencyCode().toLowerCase()); } } } \ No newline at end of file diff --git a/xchange-ccex/src/main/java/org/knowm/xchange/ccex/CCEXAdapters.java b/xchange-ccex/src/main/java/org/knowm/xchange/ccex/CCEXAdapters.java index aef4bf53af8..b4c00720b6f 100644 --- a/xchange-ccex/src/main/java/org/knowm/xchange/ccex/CCEXAdapters.java +++ b/xchange-ccex/src/main/java/org/knowm/xchange/ccex/CCEXAdapters.java @@ -59,8 +59,7 @@ public static Trade adaptCCEXPublicTrade(CCEXTrade cCEXTrade, CurrencyPair curre OrderType type = cCEXTrade.getOrderType().equalsIgnoreCase("BUY") ? OrderType.BID : OrderType.ASK; Date timestamp = stringToDate(cCEXTrade.getTimestamp()); - Trade trade = new Trade(type, cCEXTrade.getQuantity(), currencyPair, cCEXTrade.getPrice(), timestamp, - cCEXTrade.getId()); + Trade trade = new Trade(type, cCEXTrade.getQuantity(), currencyPair, cCEXTrade.getPrice(), timestamp, cCEXTrade.getId()); return trade; } @@ -78,8 +77,7 @@ public static OrderBook adaptOrderBook(CCEXGetorderbook ccexOrderBook, CurrencyP return new OrderBook(date, asks, bids); } - public static List createOrders(CurrencyPair currencyPair, Order.OrderType orderType, - List orders) { + public static List createOrders(CurrencyPair currencyPair, Order.OrderType orderType, List orders) { List limitOrders = new ArrayList<>(); for (CCEXBuySellData ask : orders) { @@ -88,19 +86,16 @@ public static List createOrders(CurrencyPair currencyPair, Order.Ord return limitOrders; } - public static LimitOrder createOrder(CurrencyPair currencyPair, CCEXBuySellData priceAndAmount, - Order.OrderType orderType) { + public static LimitOrder createOrder(CurrencyPair currencyPair, CCEXBuySellData priceAndAmount, Order.OrderType orderType) { - return new LimitOrder(orderType, priceAndAmount.getQuantity(), currencyPair, "", null, - priceAndAmount.getRate()); + return new LimitOrder(orderType, priceAndAmount.getQuantity(), currencyPair, "", null, priceAndAmount.getRate()); } public static CurrencyPair adaptCurrencyPair(CCEXMarket product) { return new CurrencyPair(product.getBaseCurrency(), product.getMarketCurrency()); } - public static ExchangeMetaData adaptToExchangeMetaData(ExchangeMetaData exchangeMetaData, - List products) { + public static ExchangeMetaData adaptToExchangeMetaData(ExchangeMetaData exchangeMetaData, List products) { Map currencyPairs = new HashMap<>(); Map currencies = new HashMap<>(); @@ -138,10 +133,9 @@ public static Wallet adaptWallet(List balances) { List wallets = new ArrayList<>(balances.size()); for (CCEXBalance balance : balances) { - wallets.add(new Balance(Currency.getInstance(balance.getCurrency().toUpperCase()), balance.getBalance(), - balance.getAvailable(), - balance.getBalance().subtract(balance.getAvailable()).subtract(balance.getPending()), - BigDecimal.ZERO, BigDecimal.ZERO, BigDecimal.ZERO, balance.getPending())); + wallets.add(new Balance(Currency.getInstance(balance.getCurrency().toUpperCase()), balance.getBalance(), balance.getAvailable(), + balance.getBalance().subtract(balance.getAvailable()).subtract(balance.getPending()), BigDecimal.ZERO, BigDecimal.ZERO, BigDecimal.ZERO, + balance.getPending())); } return new Wallet(wallets); @@ -164,8 +158,7 @@ public static LimitOrder adaptOpenOrder(CCEXOpenorder cCEXOpenOrder) { String[] currencies = cCEXOpenOrder.getExchange().split("-"); CurrencyPair pair = new CurrencyPair(currencies[1], currencies[0]); - return new LimitOrder(type, cCEXOpenOrder.getQuantityRemaining(), pair, cCEXOpenOrder.getOrderUuid(), null, - cCEXOpenOrder.getLimit()); + return new LimitOrder(type, cCEXOpenOrder.getQuantityRemaining(), pair, cCEXOpenOrder.getOrderUuid(), null, cCEXOpenOrder.getLimit()); } public static List adaptUserTrades(List cCEXOrderhistory) { @@ -194,8 +187,7 @@ public static UserTrade adaptUserTrade(CCEXOrderhistory trade) { price = trade.getLimit(); } - return new UserTrade(orderType, amount, currencyPair, price, date, orderId, orderId, trade.getCommission(), - currencyPair.counter); + return new UserTrade(orderType, amount, currencyPair, price, date, orderId, orderId, trade.getCommission(), currencyPair.counter); } public static Ticker adaptTicker(CCEXPriceResponse cCEXTicker, CurrencyPair currencyPair) { @@ -209,7 +201,7 @@ public static Ticker adaptTicker(CCEXPriceResponse cCEXTicker, CurrencyPair curr Date timestamp = new Date(cCEXTicker.getUpdated()); - return new Ticker.Builder().currencyPair(currencyPair).last(last).bid(bid).ask(ask).high(high).low(low) - .volume(volume).timestamp(timestamp).build(); + return new Ticker.Builder().currencyPair(currencyPair).last(last).bid(bid).ask(ask).high(high).low(low).volume(volume).timestamp(timestamp) + .build(); } } diff --git a/xchange-ccex/src/main/java/org/knowm/xchange/ccex/CCEXAuthenticated.java b/xchange-ccex/src/main/java/org/knowm/xchange/ccex/CCEXAuthenticated.java index 5dc1fb7f6bc..38c39d7fabb 100644 --- a/xchange-ccex/src/main/java/org/knowm/xchange/ccex/CCEXAuthenticated.java +++ b/xchange-ccex/src/main/java/org/knowm/xchange/ccex/CCEXAuthenticated.java @@ -25,29 +25,38 @@ public interface CCEXAuthenticated extends CCEX { @GET @Path("api.html?a=getbalances&apikey={apikey}&nonce={nonce}") - CCEXBalancesResponse balances(@PathParam("apikey") String apikey, @HeaderParam("apisign") ParamsDigest signature, @PathParam("nonce") SynchronizedValueFactory nonce) throws IOException; + CCEXBalancesResponse balances(@PathParam("apikey") String apikey, @HeaderParam("apisign") ParamsDigest signature, + @PathParam("nonce") SynchronizedValueFactory nonce) throws IOException; @GET @Path("api.html?a=getbalance&apikey={apikey}&nonce={nonce}¤cy={currency}") - CCEXBalanceResponse getdepositaddress(@PathParam("apikey") String apikey, @HeaderParam("apisign") ParamsDigest signature, @PathParam("nonce") SynchronizedValueFactory nonce, @PathParam("currency") String currency) throws IOException; + CCEXBalanceResponse getdepositaddress(@PathParam("apikey") String apikey, @HeaderParam("apisign") ParamsDigest signature, + @PathParam("nonce") SynchronizedValueFactory nonce, @PathParam("currency") String currency) throws IOException; @GET @Path("api.html?a=getopenorders&apikey={apikey}&nonce={nonce}") - CCEXGetopenordersResponse getopenorders(@PathParam("apikey") String apikey, @HeaderParam("apisign") ParamsDigest signature, @PathParam("nonce") SynchronizedValueFactory nonce) throws IOException; + CCEXGetopenordersResponse getopenorders(@PathParam("apikey") String apikey, @HeaderParam("apisign") ParamsDigest signature, + @PathParam("nonce") SynchronizedValueFactory nonce) throws IOException; @GET @Path("api.html?a=getorderhistory&apikey={apikey}&nonce={nonce}") - CCEXGetorderhistoryResponse getorderhistory(@PathParam("apikey") String apikey, @HeaderParam("apisign") ParamsDigest signature, @PathParam("nonce") SynchronizedValueFactory nonce) throws IOException; + CCEXGetorderhistoryResponse getorderhistory(@PathParam("apikey") String apikey, @HeaderParam("apisign") ParamsDigest signature, + @PathParam("nonce") SynchronizedValueFactory nonce) throws IOException; @GET @Path("api.html?a=cancel&apikey={apikey}&nonce={nonce}&uuid={uuid}") - CCEXCancelResponse cancel(@PathParam("apikey") String apikey, @HeaderParam("apisign") ParamsDigest signature, @PathParam("nonce") SynchronizedValueFactory nonce, @PathParam("uuid") String uuid) throws IOException; + CCEXCancelResponse cancel(@PathParam("apikey") String apikey, @HeaderParam("apisign") ParamsDigest signature, + @PathParam("nonce") SynchronizedValueFactory nonce, @PathParam("uuid") String uuid) throws IOException; @GET @Path("api.html?a=buylimit&apikey={apikey}&nonce={nonce}&market={lmarket}-{rmarket}&quantity={quantity}&rate={rate}") - CCEXBuySellLimitResponse buylimit(@PathParam("apikey") String apikey, @HeaderParam("apisign") ParamsDigest signature, @PathParam("nonce") SynchronizedValueFactory nonce, @PathParam("lmarket") String lmarket, @PathParam("rmarket") String rmarket, @PathParam("quantity") String quantity, @PathParam("rate") String rate) throws IOException; + CCEXBuySellLimitResponse buylimit(@PathParam("apikey") String apikey, @HeaderParam("apisign") ParamsDigest signature, + @PathParam("nonce") SynchronizedValueFactory nonce, @PathParam("lmarket") String lmarket, @PathParam("rmarket") String rmarket, + @PathParam("quantity") String quantity, @PathParam("rate") String rate) throws IOException; @GET @Path("api.html?a=selllimit&apikey={apikey}&nonce={nonce}&market={lmarket}-{rmarket}&quantity={quantity}&rate={rate}") - CCEXBuySellLimitResponse selllimit(@PathParam("apikey") String apikey, @HeaderParam("apisign") ParamsDigest signature, @PathParam("nonce") SynchronizedValueFactory nonce, @PathParam("lmarket") String lmarket, @PathParam("rmarket") String rmarket, @PathParam("quantity") String quantity, @PathParam("rate") String rate) throws IOException; + CCEXBuySellLimitResponse selllimit(@PathParam("apikey") String apikey, @HeaderParam("apisign") ParamsDigest signature, + @PathParam("nonce") SynchronizedValueFactory nonce, @PathParam("lmarket") String lmarket, @PathParam("rmarket") String rmarket, + @PathParam("quantity") String quantity, @PathParam("rate") String rate) throws IOException; } diff --git a/xchange-ccex/src/main/java/org/knowm/xchange/ccex/CCEXUtils.java b/xchange-ccex/src/main/java/org/knowm/xchange/ccex/CCEXUtils.java index 7a3ea1b125d..049a7c76078 100644 --- a/xchange-ccex/src/main/java/org/knowm/xchange/ccex/CCEXUtils.java +++ b/xchange-ccex/src/main/java/org/knowm/xchange/ccex/CCEXUtils.java @@ -17,8 +17,7 @@ private CCEXUtils() { public static String toPairString(CurrencyPair currencyPair) { - return currencyPair.counter.getCurrencyCode().toLowerCase() + "-" - + currencyPair.base.getCurrencyCode().toLowerCase(); + return currencyPair.counter.getCurrencyCode().toLowerCase() + "-" + currencyPair.base.getCurrencyCode().toLowerCase(); } public static Date toDate(String datetime) { diff --git a/xchange-ccex/src/main/java/org/knowm/xchange/ccex/dto/account/CCEXBalance.java b/xchange-ccex/src/main/java/org/knowm/xchange/ccex/dto/account/CCEXBalance.java index c042917cf17..cc44e1f7557 100644 --- a/xchange-ccex/src/main/java/org/knowm/xchange/ccex/dto/account/CCEXBalance.java +++ b/xchange-ccex/src/main/java/org/knowm/xchange/ccex/dto/account/CCEXBalance.java @@ -12,11 +12,8 @@ public class CCEXBalance { private BigDecimal Pending; private String CryptoAddress; - public CCEXBalance( - @JsonProperty("Currency") String currency, - @JsonProperty("Balance") BigDecimal balance, - @JsonProperty("Available") BigDecimal available, - @JsonProperty("Pending") BigDecimal pending, + public CCEXBalance(@JsonProperty("Currency") String currency, @JsonProperty("Balance") BigDecimal balance, + @JsonProperty("Available") BigDecimal available, @JsonProperty("Pending") BigDecimal pending, @JsonProperty("CryptoAddress") String cryptoAddress) { super(); Currency = currency; @@ -68,7 +65,7 @@ public void setCryptoAddress(String cryptoAddress) { @Override public String toString() { - return "CCEXBalance [Currency=" + Currency + ", Balance=" + Balance + ", Available=" + Available + ", Pending=" - + Pending + ", CryptoAddress=" + CryptoAddress + "]"; + return "CCEXBalance [Currency=" + Currency + ", Balance=" + Balance + ", Available=" + Available + ", Pending=" + Pending + ", CryptoAddress=" + + CryptoAddress + "]"; } } diff --git a/xchange-ccex/src/main/java/org/knowm/xchange/ccex/dto/account/CCEXBalanceResponse.java b/xchange-ccex/src/main/java/org/knowm/xchange/ccex/dto/account/CCEXBalanceResponse.java index 993f7503455..5749478f8c7 100644 --- a/xchange-ccex/src/main/java/org/knowm/xchange/ccex/dto/account/CCEXBalanceResponse.java +++ b/xchange-ccex/src/main/java/org/knowm/xchange/ccex/dto/account/CCEXBalanceResponse.java @@ -8,9 +8,7 @@ public class CCEXBalanceResponse { private String message; private CCEXBalance result; - public CCEXBalanceResponse( - @JsonProperty("success") boolean success, - @JsonProperty("message") String message, + public CCEXBalanceResponse(@JsonProperty("success") boolean success, @JsonProperty("message") String message, @JsonProperty("result") CCEXBalance result) { super(); this.success = success; diff --git a/xchange-ccex/src/main/java/org/knowm/xchange/ccex/dto/account/CCEXBalancesResponse.java b/xchange-ccex/src/main/java/org/knowm/xchange/ccex/dto/account/CCEXBalancesResponse.java index 74576f8d3a5..1d3acd3ba00 100644 --- a/xchange-ccex/src/main/java/org/knowm/xchange/ccex/dto/account/CCEXBalancesResponse.java +++ b/xchange-ccex/src/main/java/org/knowm/xchange/ccex/dto/account/CCEXBalancesResponse.java @@ -10,9 +10,7 @@ public class CCEXBalancesResponse { private String message; private List result; - public CCEXBalancesResponse( - @JsonProperty("success") boolean success, - @JsonProperty("message") String message, + public CCEXBalancesResponse(@JsonProperty("success") boolean success, @JsonProperty("message") String message, @JsonProperty("result") List result) { super(); this.success = success; diff --git a/xchange-ccex/src/main/java/org/knowm/xchange/ccex/dto/marketdata/CCEXMarket.java b/xchange-ccex/src/main/java/org/knowm/xchange/ccex/dto/marketdata/CCEXMarket.java index dbb60aa1f57..909c5acfed9 100644 --- a/xchange-ccex/src/main/java/org/knowm/xchange/ccex/dto/marketdata/CCEXMarket.java +++ b/xchange-ccex/src/main/java/org/knowm/xchange/ccex/dto/marketdata/CCEXMarket.java @@ -14,15 +14,10 @@ public class CCEXMarket { private final Boolean IsActive; private final String Created; - public CCEXMarket( - @JsonProperty("MarketCurrency") String marketCurrency, - @JsonProperty("BaseCurrency") String baseCurrency, - @JsonProperty("MarketCurrencyLong") String marketCurrencyLong, - @JsonProperty("BaseCurrencyLong") String baseCurrencyLong, - @JsonProperty("MinTradeSize") BigDecimal minTradeSize, - @JsonProperty("MarketName") String marketName, - @JsonProperty("IsActive") Boolean isActive, - @JsonProperty("Created") String created) { + public CCEXMarket(@JsonProperty("MarketCurrency") String marketCurrency, @JsonProperty("BaseCurrency") String baseCurrency, + @JsonProperty("MarketCurrencyLong") String marketCurrencyLong, @JsonProperty("BaseCurrencyLong") String baseCurrencyLong, + @JsonProperty("MinTradeSize") BigDecimal minTradeSize, @JsonProperty("MarketName") String marketName, + @JsonProperty("IsActive") Boolean isActive, @JsonProperty("Created") String created) { super(); MarketCurrency = marketCurrency; BaseCurrency = baseCurrency; @@ -68,9 +63,8 @@ public String getCreated() { @Override public String toString() { - return "CCEXMarket [MarketCurrency=" + MarketCurrency + ", BaseCurrency=" + BaseCurrency - + ", MarketCurrencyLong=" + MarketCurrencyLong + ", BaseCurrencyLong=" + BaseCurrencyLong - + ", MinTradeSize=" + MinTradeSize + ", MarketName=" + MarketName + ", IsActive=" + IsActive + return "CCEXMarket [MarketCurrency=" + MarketCurrency + ", BaseCurrency=" + BaseCurrency + ", MarketCurrencyLong=" + MarketCurrencyLong + + ", BaseCurrencyLong=" + BaseCurrencyLong + ", MinTradeSize=" + MinTradeSize + ", MarketName=" + MarketName + ", IsActive=" + IsActive + ", Created=" + Created + "]"; } } diff --git a/xchange-ccex/src/main/java/org/knowm/xchange/ccex/dto/marketdata/CCEXMarkets.java b/xchange-ccex/src/main/java/org/knowm/xchange/ccex/dto/marketdata/CCEXMarkets.java index 705fd7abb94..56a5e5990d8 100644 --- a/xchange-ccex/src/main/java/org/knowm/xchange/ccex/dto/marketdata/CCEXMarkets.java +++ b/xchange-ccex/src/main/java/org/knowm/xchange/ccex/dto/marketdata/CCEXMarkets.java @@ -10,9 +10,7 @@ public class CCEXMarkets { private final String message; private List result = new ArrayList<>(); - public CCEXMarkets( - @JsonProperty("success") Boolean success, - @JsonProperty("message") String message, + public CCEXMarkets(@JsonProperty("success") Boolean success, @JsonProperty("message") String message, @JsonProperty("result") List result) { super(); this.success = success; diff --git a/xchange-ccex/src/main/java/org/knowm/xchange/ccex/dto/marketdata/CCEXTrade.java b/xchange-ccex/src/main/java/org/knowm/xchange/ccex/dto/marketdata/CCEXTrade.java index 42bd1fb866f..98e96b2c4b5 100644 --- a/xchange-ccex/src/main/java/org/knowm/xchange/ccex/dto/marketdata/CCEXTrade.java +++ b/xchange-ccex/src/main/java/org/knowm/xchange/ccex/dto/marketdata/CCEXTrade.java @@ -14,9 +14,8 @@ public class CCEXTrade { private final String fillType; private final String orderType; - public CCEXTrade(@JsonProperty("Id") String id, @JsonProperty("TimeStamp") String timestamp, - @JsonProperty("Quantity") BigDecimal quantity, @JsonProperty("Price") BigDecimal price, - @JsonProperty("Total") BigDecimal total, @JsonProperty("FillType") String fillType, + public CCEXTrade(@JsonProperty("Id") String id, @JsonProperty("TimeStamp") String timestamp, @JsonProperty("Quantity") BigDecimal quantity, + @JsonProperty("Price") BigDecimal price, @JsonProperty("Total") BigDecimal total, @JsonProperty("FillType") String fillType, @JsonProperty("OrderType") String orderType) { super(); this.id = id; diff --git a/xchange-ccex/src/main/java/org/knowm/xchange/ccex/dto/ticker/CCEXPrice.java b/xchange-ccex/src/main/java/org/knowm/xchange/ccex/dto/ticker/CCEXPrice.java index d82a695beb8..05913040af7 100644 --- a/xchange-ccex/src/main/java/org/knowm/xchange/ccex/dto/ticker/CCEXPrice.java +++ b/xchange-ccex/src/main/java/org/knowm/xchange/ccex/dto/ticker/CCEXPrice.java @@ -26,8 +26,8 @@ public class CCEXPrice { private final BigDecimal lastprice; private final int updated; - private CCEXPrice(BigDecimal high, BigDecimal low, BigDecimal avg, BigDecimal lastbuy, BigDecimal lastsell, - BigDecimal buy, BigDecimal sell, BigDecimal lastprice, int updated) { + private CCEXPrice(BigDecimal high, BigDecimal low, BigDecimal avg, BigDecimal lastbuy, BigDecimal lastsell, BigDecimal buy, BigDecimal sell, + BigDecimal lastprice, int updated) { this.high = high; this.low = low; @@ -79,9 +79,8 @@ public int getUpdated() { @Override public String toString() { - return "CCEXPrice [high=" + high + ", low=" + low + ", avg=" + avg + ", lastbuy=" + lastbuy + ", lastsell=" - + lastsell + ", buy=" + buy + ", sell=" + sell + ", lastprice=" + lastprice + ", updated=" + updated - + "]"; + return "CCEXPrice [high=" + high + ", low=" + low + ", avg=" + avg + ", lastbuy=" + lastbuy + ", lastsell=" + lastsell + ", buy=" + buy + + ", sell=" + sell + ", lastprice=" + lastprice + ", updated=" + updated + "]"; } static class CCEXPriceDeserializer extends JsonDeserializer { @@ -108,8 +107,7 @@ public static CCEXPrice deserializeFromNode(JsonNode tickerNode) { } @Override - public CCEXPrice deserialize(JsonParser jp, DeserializationContext ctxt) - throws IOException, JsonProcessingException { + public CCEXPrice deserialize(JsonParser jp, DeserializationContext ctxt) throws IOException, JsonProcessingException { final ObjectCodec oc = jp.getCodec(); final JsonNode tickerNode = oc.readTree(jp); diff --git a/xchange-ccex/src/main/java/org/knowm/xchange/ccex/dto/ticker/CCEXPriceResponse.java b/xchange-ccex/src/main/java/org/knowm/xchange/ccex/dto/ticker/CCEXPriceResponse.java index 8c86f211ec8..3b56231ecae 100644 --- a/xchange-ccex/src/main/java/org/knowm/xchange/ccex/dto/ticker/CCEXPriceResponse.java +++ b/xchange-ccex/src/main/java/org/knowm/xchange/ccex/dto/ticker/CCEXPriceResponse.java @@ -17,16 +17,9 @@ public class CCEXPriceResponse { private BigDecimal buysupport; private int updated; - public CCEXPriceResponse( - @JsonProperty("high") BigDecimal high, - @JsonProperty("low") BigDecimal low, - @JsonProperty("avg") BigDecimal avg, - @JsonProperty("lastbuy") BigDecimal lastbuy, - @JsonProperty("lastsell") BigDecimal lastsell, - @JsonProperty("buy") BigDecimal buy, - @JsonProperty("sell") BigDecimal sell, - @JsonProperty("lastprice") BigDecimal lastprice, - @JsonProperty("buysupport") BigDecimal buysupport, + public CCEXPriceResponse(@JsonProperty("high") BigDecimal high, @JsonProperty("low") BigDecimal low, @JsonProperty("avg") BigDecimal avg, + @JsonProperty("lastbuy") BigDecimal lastbuy, @JsonProperty("lastsell") BigDecimal lastsell, @JsonProperty("buy") BigDecimal buy, + @JsonProperty("sell") BigDecimal sell, @JsonProperty("lastprice") BigDecimal lastprice, @JsonProperty("buysupport") BigDecimal buysupport, @JsonProperty("updated") int updated) { super(); this.high = high; @@ -123,8 +116,7 @@ public void setUpdated(int updated) { @Override public String toString() { - return "CCEXPriceResponse [high=" + high + ", low=" + low + ", avg=" + avg + ", lastbuy=" + lastbuy - + ", lastsell=" + lastsell + ", buy=" + buy + ", sell=" + sell + ", lastprice=" + lastprice - + ", buysupport=" + buysupport + ", updated=" + updated + "]"; + return "CCEXPriceResponse [high=" + high + ", low=" + low + ", avg=" + avg + ", lastbuy=" + lastbuy + ", lastsell=" + lastsell + ", buy=" + buy + + ", sell=" + sell + ", lastprice=" + lastprice + ", buysupport=" + buysupport + ", updated=" + updated + "]"; } } diff --git a/xchange-ccex/src/main/java/org/knowm/xchange/ccex/dto/ticker/CCEXPrices.java b/xchange-ccex/src/main/java/org/knowm/xchange/ccex/dto/ticker/CCEXPrices.java index 855ac0de2bd..615ec2c819d 100644 --- a/xchange-ccex/src/main/java/org/knowm/xchange/ccex/dto/ticker/CCEXPrices.java +++ b/xchange-ccex/src/main/java/org/knowm/xchange/ccex/dto/ticker/CCEXPrices.java @@ -40,8 +40,7 @@ public String toString() { static class CCEXPricesDeserializer extends JsonDeserializer { @Override - public CCEXPrices deserialize(JsonParser jp, DeserializationContext ctxt) - throws IOException, JsonProcessingException { + public CCEXPrices deserialize(JsonParser jp, DeserializationContext ctxt) throws IOException, JsonProcessingException { Map priceMap = new HashMap<>(); ObjectCodec oc = jp.getCodec(); diff --git a/xchange-ccex/src/main/java/org/knowm/xchange/ccex/dto/ticker/Ticker.java b/xchange-ccex/src/main/java/org/knowm/xchange/ccex/dto/ticker/Ticker.java index a6dfca8ff18..3dcc864fae7 100644 --- a/xchange-ccex/src/main/java/org/knowm/xchange/ccex/dto/ticker/Ticker.java +++ b/xchange-ccex/src/main/java/org/knowm/xchange/ccex/dto/ticker/Ticker.java @@ -50,8 +50,8 @@ public Ticker() { * @param avg * @param low */ - public Ticker(Double high, Double low, Double avg, Double lastbuy, Double lastsell, Double buy, Double sell, - Double lastprice, Double buysupport, Integer updated) { + public Ticker(Double high, Double low, Double avg, Double lastbuy, Double lastsell, Double buy, Double sell, Double lastprice, Double buysupport, + Integer updated) { this.high = high; this.low = low; this.avg = avg; diff --git a/xchange-ccex/src/main/java/org/knowm/xchange/ccex/dto/trade/CCEXBuySellLimitResponse.java b/xchange-ccex/src/main/java/org/knowm/xchange/ccex/dto/trade/CCEXBuySellLimitResponse.java index 7704256e5f0..bdb47689fdc 100644 --- a/xchange-ccex/src/main/java/org/knowm/xchange/ccex/dto/trade/CCEXBuySellLimitResponse.java +++ b/xchange-ccex/src/main/java/org/knowm/xchange/ccex/dto/trade/CCEXBuySellLimitResponse.java @@ -8,9 +8,7 @@ public class CCEXBuySellLimitResponse { private String message; private CCEXUUIDResponse result; - public CCEXBuySellLimitResponse( - @JsonProperty("success") boolean success, - @JsonProperty("message") String message, + public CCEXBuySellLimitResponse(@JsonProperty("success") boolean success, @JsonProperty("message") String message, @JsonProperty("result") CCEXUUIDResponse result) { super(); this.success = success; diff --git a/xchange-ccex/src/main/java/org/knowm/xchange/ccex/dto/trade/CCEXGetopenordersResponse.java b/xchange-ccex/src/main/java/org/knowm/xchange/ccex/dto/trade/CCEXGetopenordersResponse.java index e079eff8917..ccb36db6218 100644 --- a/xchange-ccex/src/main/java/org/knowm/xchange/ccex/dto/trade/CCEXGetopenordersResponse.java +++ b/xchange-ccex/src/main/java/org/knowm/xchange/ccex/dto/trade/CCEXGetopenordersResponse.java @@ -10,9 +10,7 @@ public class CCEXGetopenordersResponse { private String message; private List result; - public CCEXGetopenordersResponse( - @JsonProperty("success") boolean success, - @JsonProperty("message") String message, + public CCEXGetopenordersResponse(@JsonProperty("success") boolean success, @JsonProperty("message") String message, @JsonProperty("result") List result) { super(); this.success = success; diff --git a/xchange-ccex/src/main/java/org/knowm/xchange/ccex/dto/trade/CCEXGetorderhistoryResponse.java b/xchange-ccex/src/main/java/org/knowm/xchange/ccex/dto/trade/CCEXGetorderhistoryResponse.java index 2fc656187a9..e0849ef3b1b 100644 --- a/xchange-ccex/src/main/java/org/knowm/xchange/ccex/dto/trade/CCEXGetorderhistoryResponse.java +++ b/xchange-ccex/src/main/java/org/knowm/xchange/ccex/dto/trade/CCEXGetorderhistoryResponse.java @@ -10,9 +10,7 @@ public class CCEXGetorderhistoryResponse { private String message; private List result; - public CCEXGetorderhistoryResponse( - @JsonProperty("success") boolean success, - @JsonProperty("message") String message, + public CCEXGetorderhistoryResponse(@JsonProperty("success") boolean success, @JsonProperty("message") String message, @JsonProperty("result") List result) { super(); this.success = success; diff --git a/xchange-ccex/src/main/java/org/knowm/xchange/ccex/dto/trade/CCEXOpenorder.java b/xchange-ccex/src/main/java/org/knowm/xchange/ccex/dto/trade/CCEXOpenorder.java index 90e54cad5a3..aa3fdc569b9 100644 --- a/xchange-ccex/src/main/java/org/knowm/xchange/ccex/dto/trade/CCEXOpenorder.java +++ b/xchange-ccex/src/main/java/org/knowm/xchange/ccex/dto/trade/CCEXOpenorder.java @@ -23,22 +23,13 @@ public class CCEXOpenorder { private String Condition; private String ConditionTarget; - public CCEXOpenorder( - @JsonProperty("OrderUuid") String orderUuid, - @JsonProperty("Exchange") String exchange, - @JsonProperty("OrderType") String orderType, - @JsonProperty("Quantity") BigDecimal quantity, - @JsonProperty("QuantityRemaining") BigDecimal quantityRemaining, - @JsonProperty("Limit") BigDecimal limit, - @JsonProperty("CommissionPaid") BigDecimal commissionPaid, - @JsonProperty("Price") BigDecimal price, - @JsonProperty("PricePerUnit") BigDecimal pricePerUnit, - @JsonProperty("Opened") String opened, - @JsonProperty("Closed") String closed, - @JsonProperty("CancelInitiated") boolean cancelInitiated, - @JsonProperty("ImmediateOrCancel") boolean immediateOrCancel, - @JsonProperty("IsConditional") boolean isConditional, - @JsonProperty("Condition") String condition, + public CCEXOpenorder(@JsonProperty("OrderUuid") String orderUuid, @JsonProperty("Exchange") String exchange, + @JsonProperty("OrderType") String orderType, @JsonProperty("Quantity") BigDecimal quantity, + @JsonProperty("QuantityRemaining") BigDecimal quantityRemaining, @JsonProperty("Limit") BigDecimal limit, + @JsonProperty("CommissionPaid") BigDecimal commissionPaid, @JsonProperty("Price") BigDecimal price, + @JsonProperty("PricePerUnit") BigDecimal pricePerUnit, @JsonProperty("Opened") String opened, @JsonProperty("Closed") String closed, + @JsonProperty("CancelInitiated") boolean cancelInitiated, @JsonProperty("ImmediateOrCancel") boolean immediateOrCancel, + @JsonProperty("IsConditional") boolean isConditional, @JsonProperty("Condition") String condition, @JsonProperty("ConditionTarget") String conditionTarget) { super(); OrderUuid = orderUuid; @@ -189,11 +180,10 @@ public void setConditionTarget(String conditionTarget) { @Override public String toString() { - return "CCEXOpenorder [OrderUuid=" + OrderUuid + ", Exchange=" + Exchange + ", OrderType=" + OrderType - + ", Quantity=" + Quantity + ", QuantityRemaining=" + QuantityRemaining + ", Limit=" + Limit - + ", CommissionPaid=" + CommissionPaid + ", Price=" + Price + ", PricePerUnit=" + PricePerUnit - + ", Opened=" + Opened + ", Closed=" + Closed + ", CancelInitiated=" + CancelInitiated - + ", ImmediateOrCancel=" + ImmediateOrCancel + ", IsConditional=" + IsConditional + ", Condition=" - + Condition + ", ConditionTarget=" + ConditionTarget + "]"; + return "CCEXOpenorder [OrderUuid=" + OrderUuid + ", Exchange=" + Exchange + ", OrderType=" + OrderType + ", Quantity=" + Quantity + + ", QuantityRemaining=" + QuantityRemaining + ", Limit=" + Limit + ", CommissionPaid=" + CommissionPaid + ", Price=" + Price + + ", PricePerUnit=" + PricePerUnit + ", Opened=" + Opened + ", Closed=" + Closed + ", CancelInitiated=" + CancelInitiated + + ", ImmediateOrCancel=" + ImmediateOrCancel + ", IsConditional=" + IsConditional + ", Condition=" + Condition + ", ConditionTarget=" + + ConditionTarget + "]"; } } diff --git a/xchange-ccex/src/main/java/org/knowm/xchange/ccex/dto/trade/CCEXOrderhistory.java b/xchange-ccex/src/main/java/org/knowm/xchange/ccex/dto/trade/CCEXOrderhistory.java index f85f6cff968..5f49766bd6d 100644 --- a/xchange-ccex/src/main/java/org/knowm/xchange/ccex/dto/trade/CCEXOrderhistory.java +++ b/xchange-ccex/src/main/java/org/knowm/xchange/ccex/dto/trade/CCEXOrderhistory.java @@ -21,22 +21,13 @@ public class CCEXOrderhistory { private String ConditionTarget; private boolean ImmediateOrCancel; - public CCEXOrderhistory( - @JsonProperty("OrderUuid") String orderUuid, - @JsonProperty("Exchange") String exchange, - @JsonProperty("TimeStamp") String timeStamp, - @JsonProperty("OrderType") String orderType, - @JsonProperty("Limit") BigDecimal limit, - @JsonProperty("Quantity") BigDecimal quantity, - @JsonProperty("QuantityRemaining") BigDecimal quantityRemaining, - @JsonProperty("Commission") BigDecimal commission, - @JsonProperty("Price") BigDecimal price, - @JsonProperty("PricePerUnit") BigDecimal pricePerUnit, - @JsonProperty("IsConditional") boolean isConditional, - @JsonProperty("Condition") String condition, - @JsonProperty("ConditionTarget") String conditionTarget, - @JsonProperty("ImmediateOrCancel") boolean immediateOrCancel - ) { + public CCEXOrderhistory(@JsonProperty("OrderUuid") String orderUuid, @JsonProperty("Exchange") String exchange, + @JsonProperty("TimeStamp") String timeStamp, @JsonProperty("OrderType") String orderType, @JsonProperty("Limit") BigDecimal limit, + @JsonProperty("Quantity") BigDecimal quantity, @JsonProperty("QuantityRemaining") BigDecimal quantityRemaining, + @JsonProperty("Commission") BigDecimal commission, @JsonProperty("Price") BigDecimal price, + @JsonProperty("PricePerUnit") BigDecimal pricePerUnit, @JsonProperty("IsConditional") boolean isConditional, + @JsonProperty("Condition") String condition, @JsonProperty("ConditionTarget") String conditionTarget, + @JsonProperty("ImmediateOrCancel") boolean immediateOrCancel) { super(); OrderUuid = orderUuid; Exchange = exchange; @@ -168,10 +159,9 @@ public void setImmediateOrCancel(boolean immediateOrCancel) { @Override public String toString() { - return "CCEXOrderhistory [OrderUuid=" + OrderUuid + ", Exchange=" + Exchange + ", TimeStamp=" + TimeStamp - + ", OrderType=" + OrderType + ", Limit=" + Limit + ", Quantity=" + Quantity + ", QuantityRemaining=" - + QuantityRemaining + ", Commission=" + Commission + ", Price=" + Price + ", PricePerUnit=" - + PricePerUnit + ", IsConditional=" + IsConditional + ", Condition=" + Condition + ", ConditionTarget=" + return "CCEXOrderhistory [OrderUuid=" + OrderUuid + ", Exchange=" + Exchange + ", TimeStamp=" + TimeStamp + ", OrderType=" + OrderType + + ", Limit=" + Limit + ", Quantity=" + Quantity + ", QuantityRemaining=" + QuantityRemaining + ", Commission=" + Commission + ", Price=" + + Price + ", PricePerUnit=" + PricePerUnit + ", IsConditional=" + IsConditional + ", Condition=" + Condition + ", ConditionTarget=" + ConditionTarget + ", ImmediateOrCancel=" + ImmediateOrCancel + "]"; } } diff --git a/xchange-ccex/src/main/java/org/knowm/xchange/ccex/service/CCEXAccountService.java b/xchange-ccex/src/main/java/org/knowm/xchange/ccex/service/CCEXAccountService.java index 5a4b544d944..f72fcbd6b5a 100644 --- a/xchange-ccex/src/main/java/org/knowm/xchange/ccex/service/CCEXAccountService.java +++ b/xchange-ccex/src/main/java/org/knowm/xchange/ccex/service/CCEXAccountService.java @@ -27,8 +27,8 @@ public AccountInfo getAccountInfo() throws IOException { } @Override - public String withdrawFunds(Currency currency, BigDecimal amount, String address) throws ExchangeException, - NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { + public String withdrawFunds(Currency currency, BigDecimal amount, + String address) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { throw new NotAvailableFromExchangeException(); } @@ -43,7 +43,8 @@ public TradeHistoryParams createFundingHistoryParams() { } @Override - public List getFundingHistory(TradeHistoryParams params) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { + public List getFundingHistory( + TradeHistoryParams params) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { throw new NotYetImplementedForExchangeException(); } } diff --git a/xchange-ccex/src/main/java/org/knowm/xchange/ccex/service/CCEXAccountServiceRaw.java b/xchange-ccex/src/main/java/org/knowm/xchange/ccex/service/CCEXAccountServiceRaw.java index 64cee291626..ef00ab528f8 100644 --- a/xchange-ccex/src/main/java/org/knowm/xchange/ccex/service/CCEXAccountServiceRaw.java +++ b/xchange-ccex/src/main/java/org/knowm/xchange/ccex/service/CCEXAccountServiceRaw.java @@ -17,8 +17,7 @@ public CCEXAccountServiceRaw(Exchange exchange) { public List getCCEXAccountInfo() throws IOException { - CCEXBalancesResponse response = cCEXAuthenticated.balances(apiKey, signatureCreator, - exchange.getNonceFactory()); + CCEXBalancesResponse response = cCEXAuthenticated.balances(apiKey, signatureCreator, exchange.getNonceFactory()); if (response.isSuccess()) { return response.getResult(); @@ -29,8 +28,7 @@ public List getCCEXAccountInfo() throws IOException { public String getCCEXDepositAddress(String currency) throws IOException { - CCEXBalanceResponse response = cCEXAuthenticated.getdepositaddress(apiKey, signatureCreator, - exchange.getNonceFactory(), currency); + CCEXBalanceResponse response = cCEXAuthenticated.getdepositaddress(apiKey, signatureCreator, exchange.getNonceFactory(), currency); if (response.isSuccess()) { return response.getResult().getCryptoAddress(); diff --git a/xchange-ccex/src/main/java/org/knowm/xchange/ccex/service/CCEXBaseService.java b/xchange-ccex/src/main/java/org/knowm/xchange/ccex/service/CCEXBaseService.java index 145749c287e..5878c67e3c2 100644 --- a/xchange-ccex/src/main/java/org/knowm/xchange/ccex/service/CCEXBaseService.java +++ b/xchange-ccex/src/main/java/org/knowm/xchange/ccex/service/CCEXBaseService.java @@ -26,8 +26,7 @@ public CCEXBaseService(Exchange exchange) { super(exchange); - this.cCEXAuthenticated = RestProxyFactory.createProxy(CCEXAuthenticated.class, - exchange.getExchangeSpecification().getSslUri()); + this.cCEXAuthenticated = RestProxyFactory.createProxy(CCEXAuthenticated.class, exchange.getExchangeSpecification().getSslUri()); this.apiKey = exchange.getExchangeSpecification().getApiKey(); this.signatureCreator = CCEXDigest.createInstance(exchange.getExchangeSpecification().getSecretKey()); } diff --git a/xchange-ccex/src/main/java/org/knowm/xchange/ccex/service/CCEXTradeService.java b/xchange-ccex/src/main/java/org/knowm/xchange/ccex/service/CCEXTradeService.java index 52c3965fa07..5b269008ce5 100644 --- a/xchange-ccex/src/main/java/org/knowm/xchange/ccex/service/CCEXTradeService.java +++ b/xchange-ccex/src/main/java/org/knowm/xchange/ccex/service/CCEXTradeService.java @@ -32,13 +32,14 @@ public OpenOrders getOpenOrders() throws IOException { } @Override - public OpenOrders getOpenOrders(OpenOrdersParams params) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { + public OpenOrders getOpenOrders( + OpenOrdersParams params) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { return new OpenOrders(CCEXAdapters.adaptOpenOrders(getCCEXOpenOrders())); } @Override - public String placeMarketOrder(MarketOrder marketOrder) throws ExchangeException, NotAvailableFromExchangeException, - NotYetImplementedForExchangeException, IOException { + public String placeMarketOrder( + MarketOrder marketOrder) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { throw new NotAvailableFromExchangeException(); } @@ -70,8 +71,8 @@ public OpenOrdersParams createOpenOrdersParams() { } @Override - public Collection getOrder(String... orderIds) throws ExchangeException, NotAvailableFromExchangeException, - NotYetImplementedForExchangeException, IOException { + public Collection getOrder( + String... orderIds) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { throw new NotYetImplementedForExchangeException(); } diff --git a/xchange-ccex/src/main/java/org/knowm/xchange/ccex/service/CCEXTradeServiceRaw.java b/xchange-ccex/src/main/java/org/knowm/xchange/ccex/service/CCEXTradeServiceRaw.java index f3c9d92fccb..ff37e329bac 100644 --- a/xchange-ccex/src/main/java/org/knowm/xchange/ccex/service/CCEXTradeServiceRaw.java +++ b/xchange-ccex/src/main/java/org/knowm/xchange/ccex/service/CCEXTradeServiceRaw.java @@ -21,8 +21,7 @@ public CCEXTradeServiceRaw(Exchange exchange) { } public List getCCEXOpenOrders() throws IOException { - CCEXGetopenordersResponse response = cCEXAuthenticated.getopenorders(apiKey, signatureCreator, - exchange.getNonceFactory()); + CCEXGetopenordersResponse response = cCEXAuthenticated.getopenorders(apiKey, signatureCreator, exchange.getNonceFactory()); if (response.isSuccess()) { return response.getResult(); @@ -34,8 +33,7 @@ public List getCCEXOpenOrders() throws IOException { public List getCCEXTradeHistory() throws IOException { - CCEXGetorderhistoryResponse response = cCEXAuthenticated.getorderhistory(apiKey, signatureCreator, - exchange.getNonceFactory()); + CCEXGetorderhistoryResponse response = cCEXAuthenticated.getorderhistory(apiKey, signatureCreator, exchange.getNonceFactory()); if (response.isSuccess()) { return response.getResult(); @@ -46,8 +44,7 @@ public List getCCEXTradeHistory() throws IOException { public boolean cancelCCEXLimitOrder(String uuid) throws IOException { - CCEXCancelResponse response = cCEXAuthenticated.cancel(apiKey, signatureCreator, exchange.getNonceFactory(), - uuid); + CCEXCancelResponse response = cCEXAuthenticated.cancel(apiKey, signatureCreator, exchange.getNonceFactory(), uuid); if (response.isSuccess()) { return true; @@ -63,9 +60,8 @@ public String placeCCEXLimitOrder(LimitOrder limitOrder) throws IOException { String rpair = limitOrder.getCurrencyPair().counter.toString().toLowerCase(); if (limitOrder.getType() == OrderType.BID) { - CCEXBuySellLimitResponse response = cCEXAuthenticated.buylimit(apiKey, signatureCreator, - exchange.getNonceFactory(), lpair, rpair, limitOrder.getTradableAmount().toPlainString(), - limitOrder.getLimitPrice().toPlainString()); + CCEXBuySellLimitResponse response = cCEXAuthenticated.buylimit(apiKey, signatureCreator, exchange.getNonceFactory(), lpair, rpair, + limitOrder.getTradableAmount().toPlainString(), limitOrder.getLimitPrice().toPlainString()); if (response.isSuccess()) { return response.getResult().getUuid(); @@ -74,9 +70,8 @@ public String placeCCEXLimitOrder(LimitOrder limitOrder) throws IOException { } } else { - CCEXBuySellLimitResponse response = cCEXAuthenticated.selllimit(apiKey, signatureCreator, - exchange.getNonceFactory(), lpair, rpair, limitOrder.getTradableAmount().toPlainString(), - limitOrder.getLimitPrice().toPlainString()); + CCEXBuySellLimitResponse response = cCEXAuthenticated.selllimit(apiKey, signatureCreator, exchange.getNonceFactory(), lpair, rpair, + limitOrder.getTradableAmount().toPlainString(), limitOrder.getLimitPrice().toPlainString()); if (response.isSuccess()) { return response.getResult().getUuid(); diff --git a/xchange-ccex/src/test/java/org/xchange/ccex/AppTest.java b/xchange-ccex/src/test/java/org/xchange/ccex/AppTest.java index 3ba49d6fc34..3dcedd52086 100644 --- a/xchange-ccex/src/test/java/org/xchange/ccex/AppTest.java +++ b/xchange-ccex/src/test/java/org/xchange/ccex/AppTest.java @@ -7,8 +7,7 @@ /** * Unit test for simple App. */ -public class AppTest - extends TestCase { +public class AppTest extends TestCase { /** * Create the test case * diff --git a/xchange-cexio/src/main/java/org/knowm/xchange/cexio/CexIOAuthenticated.java b/xchange-cexio/src/main/java/org/knowm/xchange/cexio/CexIOAuthenticated.java index 0f7f005245a..62260551198 100644 --- a/xchange-cexio/src/main/java/org/knowm/xchange/cexio/CexIOAuthenticated.java +++ b/xchange-cexio/src/main/java/org/knowm/xchange/cexio/CexIOAuthenticated.java @@ -36,8 +36,8 @@ CexIOBalanceInfo getBalance(@FormParam("key") String apiKey, @FormParam("signatu @POST @Path("open_orders/{ident}/{currency}/") CexIOOpenOrders getOpenOrders(@PathParam("ident") String tradeableIdentifier, @PathParam("currency") String currency, - @FormParam("key") String apiKey, @FormParam("signature") ParamsDigest signer, @FormParam("nonce") SynchronizedValueFactory nonce) - throws IOException; + @FormParam("key") String apiKey, @FormParam("signature") ParamsDigest signer, + @FormParam("nonce") SynchronizedValueFactory nonce) throws IOException; @POST @Path("cancel_order/") diff --git a/xchange-cexio/src/main/java/org/knowm/xchange/cexio/service/CexIOAccountService.java b/xchange-cexio/src/main/java/org/knowm/xchange/cexio/service/CexIOAccountService.java index 73789fc8afa..ed4cbec40b5 100644 --- a/xchange-cexio/src/main/java/org/knowm/xchange/cexio/service/CexIOAccountService.java +++ b/xchange-cexio/src/main/java/org/knowm/xchange/cexio/service/CexIOAccountService.java @@ -56,7 +56,8 @@ public TradeHistoryParams createFundingHistoryParams() { } @Override - public List getFundingHistory(TradeHistoryParams params) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { + public List getFundingHistory( + TradeHistoryParams params) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { throw new NotYetImplementedForExchangeException(); } } diff --git a/xchange-cexio/src/main/java/org/knowm/xchange/cexio/service/CexIOTradeService.java b/xchange-cexio/src/main/java/org/knowm/xchange/cexio/service/CexIOTradeService.java index 080e37459b7..ab918a1a043 100644 --- a/xchange-cexio/src/main/java/org/knowm/xchange/cexio/service/CexIOTradeService.java +++ b/xchange-cexio/src/main/java/org/knowm/xchange/cexio/service/CexIOTradeService.java @@ -41,7 +41,8 @@ public OpenOrders getOpenOrders() throws IOException { } @Override - public OpenOrders getOpenOrders(OpenOrdersParams params) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { + public OpenOrders getOpenOrders( + OpenOrdersParams params) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { List cexIOOrderList = getCexIOOpenOrders(); return CexIOAdapters.adaptOpenOrders(cexIOOrderList); @@ -85,8 +86,8 @@ public OpenOrdersParams createOpenOrdersParams() { } @Override - public Collection getOrder(String... orderIds) - throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { + public Collection getOrder( + String... orderIds) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { throw new NotYetImplementedForExchangeException(); } diff --git a/xchange-chbtc/src/main/java/org/knowm/xchange/chbtc/service/ChbtcMarketDataService.java b/xchange-chbtc/src/main/java/org/knowm/xchange/chbtc/service/ChbtcMarketDataService.java index c6f77b2c2c0..f5d66b75860 100644 --- a/xchange-chbtc/src/main/java/org/knowm/xchange/chbtc/service/ChbtcMarketDataService.java +++ b/xchange-chbtc/src/main/java/org/knowm/xchange/chbtc/service/ChbtcMarketDataService.java @@ -20,8 +20,8 @@ public ChbtcMarketDataService(Exchange exchange) { } @Override - public Ticker getTicker(CurrencyPair currencyPair, Object... args) - throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { + public Ticker getTicker(CurrencyPair currencyPair, + Object... args) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { return ChbtcAdapters.adaptTicker(getChbtcTicker(currencyPair), currencyPair); } @@ -31,8 +31,8 @@ public OrderBook getOrderBook(CurrencyPair currencyPair, Object... args) throws } @Override - public Trades getTrades(CurrencyPair currencyPair, Object... args) - throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { + public Trades getTrades(CurrencyPair currencyPair, + Object... args) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { Integer sinceTid = args.length > 0 && args[0] != null ? ((Number) args[0]).intValue() : null; return ChbtcAdapters.adaptTrades(getChbtcTransactions(currencyPair, sinceTid), currencyPair); } diff --git a/xchange-coinbase/src/main/java/org/knowm/xchange/coinbase/CoinbaseAuthenticated.java b/xchange-coinbase/src/main/java/org/knowm/xchange/coinbase/CoinbaseAuthenticated.java index c7e9758ba4b..0493f98c34c 100644 --- a/xchange-coinbase/src/main/java/org/knowm/xchange/coinbase/CoinbaseAuthenticated.java +++ b/xchange-coinbase/src/main/java/org/knowm/xchange/coinbase/CoinbaseAuthenticated.java @@ -55,15 +55,15 @@ CoinbaseUsers getUsers(@HeaderParam("ACCESS_KEY") String apiKey, @HeaderParam("A @Path("users/{userId}") @Consumes(MediaType.APPLICATION_JSON) CoinbaseUser updateUser(@PathParam("userId") String userId, CoinbaseUser user, @HeaderParam("ACCESS_KEY") String apiKey, - @HeaderParam("ACCESS_SIGNATURE") ParamsDigest signer, @HeaderParam("ACCESS_NONCE") SynchronizedValueFactory nonce) - throws IOException, CoinbaseException; + @HeaderParam("ACCESS_SIGNATURE") ParamsDigest signer, + @HeaderParam("ACCESS_NONCE") SynchronizedValueFactory nonce) throws IOException, CoinbaseException; @POST @Path("tokens/redeem") @Consumes(MediaType.APPLICATION_FORM_URLENCODED) CoinbaseBaseResponse redeemToken(@QueryParam("token_id") String tokenId, @HeaderParam("ACCESS_KEY") String apiKey, - @HeaderParam("ACCESS_SIGNATURE") ParamsDigest signer, @HeaderParam("ACCESS_NONCE") SynchronizedValueFactory nonce) - throws IOException, CoinbaseException; + @HeaderParam("ACCESS_SIGNATURE") ParamsDigest signer, + @HeaderParam("ACCESS_NONCE") SynchronizedValueFactory nonce) throws IOException, CoinbaseException; @GET @Path("account/balance") @@ -79,14 +79,14 @@ CoinbaseAddress getReceiveAddress(@HeaderParam("ACCESS_KEY") String apiKey, @Hea @Path("account/generate_receive_address") @Consumes(MediaType.APPLICATION_JSON) CoinbaseAddress generateReceiveAddress(CoinbaseAddressCallback callbackUrl, @HeaderParam("ACCESS_KEY") String apiKey, - @HeaderParam("ACCESS_SIGNATURE") ParamsDigest signer, @HeaderParam("ACCESS_NONCE") SynchronizedValueFactory nonce) - throws IOException, CoinbaseException; + @HeaderParam("ACCESS_SIGNATURE") ParamsDigest signer, + @HeaderParam("ACCESS_NONCE") SynchronizedValueFactory nonce) throws IOException, CoinbaseException; @GET @Path("account_changes") CoinbaseAccountChanges getAccountChanges(@QueryParam("page") Integer page, @HeaderParam("ACCESS_KEY") String apiKey, - @HeaderParam("ACCESS_SIGNATURE") ParamsDigest signer, @HeaderParam("ACCESS_NONCE") SynchronizedValueFactory nonce) - throws IOException, CoinbaseException; + @HeaderParam("ACCESS_SIGNATURE") ParamsDigest signer, + @HeaderParam("ACCESS_NONCE") SynchronizedValueFactory nonce) throws IOException, CoinbaseException; @GET @Path("addresses") @@ -103,55 +103,55 @@ CoinbaseContacts getContacts(@QueryParam("page") Integer page, @QueryParam("num_ @GET @Path("transfers") CoinbaseTransfers getTransfers(@QueryParam("page") Integer page, @QueryParam("limit") Integer limit, @HeaderParam("ACCESS_KEY") String apiKey, - @HeaderParam("ACCESS_SIGNATURE") ParamsDigest signer, @HeaderParam("ACCESS_NONCE") SynchronizedValueFactory nonce) - throws IOException, CoinbaseException; + @HeaderParam("ACCESS_SIGNATURE") ParamsDigest signer, + @HeaderParam("ACCESS_NONCE") SynchronizedValueFactory nonce) throws IOException, CoinbaseException; @GET @Path("transactions") CoinbaseTransactions getTransactions(@QueryParam("page") Integer page, @HeaderParam("ACCESS_KEY") String apiKey, - @HeaderParam("ACCESS_SIGNATURE") ParamsDigest signer, @HeaderParam("ACCESS_NONCE") SynchronizedValueFactory nonce) - throws IOException, CoinbaseException; + @HeaderParam("ACCESS_SIGNATURE") ParamsDigest signer, + @HeaderParam("ACCESS_NONCE") SynchronizedValueFactory nonce) throws IOException, CoinbaseException; @GET @Path("transactions/{transactionId}") CoinbaseTransaction getTransactionDetails(@PathParam("transactionId") String transactionId, @HeaderParam("ACCESS_KEY") String apiKey, - @HeaderParam("ACCESS_SIGNATURE") ParamsDigest signer, @HeaderParam("ACCESS_NONCE") SynchronizedValueFactory nonce) - throws IOException, CoinbaseException; + @HeaderParam("ACCESS_SIGNATURE") ParamsDigest signer, + @HeaderParam("ACCESS_NONCE") SynchronizedValueFactory nonce) throws IOException, CoinbaseException; @POST @Path("transactions/request_money") @Consumes(MediaType.APPLICATION_JSON) CoinbaseTransaction requestMoney(CoinbaseTransaction transactionRequest, @HeaderParam("ACCESS_KEY") String apiKey, - @HeaderParam("ACCESS_SIGNATURE") ParamsDigest signer, @HeaderParam("ACCESS_NONCE") SynchronizedValueFactory nonce) - throws IOException, CoinbaseException; + @HeaderParam("ACCESS_SIGNATURE") ParamsDigest signer, + @HeaderParam("ACCESS_NONCE") SynchronizedValueFactory nonce) throws IOException, CoinbaseException; @POST @Path("transactions/send_money") @Consumes(MediaType.APPLICATION_JSON) CoinbaseTransaction sendMoney(CoinbaseTransaction transactionRequest, @HeaderParam("ACCESS_KEY") String apiKey, - @HeaderParam("ACCESS_SIGNATURE") ParamsDigest signer, @HeaderParam("ACCESS_NONCE") SynchronizedValueFactory nonce) - throws IOException, CoinbaseException; + @HeaderParam("ACCESS_SIGNATURE") ParamsDigest signer, + @HeaderParam("ACCESS_NONCE") SynchronizedValueFactory nonce) throws IOException, CoinbaseException; @PUT @Path("transactions/{transactionId}/resend_request") @Consumes(MediaType.APPLICATION_FORM_URLENCODED) CoinbaseBaseResponse resendRequest(@PathParam("transactionId") String transactionId, @HeaderParam("ACCESS_KEY") String apiKey, - @HeaderParam("ACCESS_SIGNATURE") ParamsDigest signer, @HeaderParam("ACCESS_NONCE") SynchronizedValueFactory nonce) - throws IOException, CoinbaseException; + @HeaderParam("ACCESS_SIGNATURE") ParamsDigest signer, + @HeaderParam("ACCESS_NONCE") SynchronizedValueFactory nonce) throws IOException, CoinbaseException; @PUT @Path("transactions/{transactionId}/complete_request") @Consumes(MediaType.APPLICATION_FORM_URLENCODED) CoinbaseTransaction completeRequest(@PathParam("transactionId") String transactionId, @HeaderParam("ACCESS_KEY") String apiKey, - @HeaderParam("ACCESS_SIGNATURE") ParamsDigest signer, @HeaderParam("ACCESS_NONCE") SynchronizedValueFactory nonce) - throws IOException, CoinbaseException; + @HeaderParam("ACCESS_SIGNATURE") ParamsDigest signer, + @HeaderParam("ACCESS_NONCE") SynchronizedValueFactory nonce) throws IOException, CoinbaseException; @DELETE @Path("transactions/{transactionId}/cancel_request") @Consumes(MediaType.APPLICATION_FORM_URLENCODED) CoinbaseBaseResponse cancelRequest(@PathParam("transactionId") String transactionId, @HeaderParam("ACCESS_KEY") String apiKey, - @HeaderParam("ACCESS_SIGNATURE") ParamsDigest signer, @HeaderParam("ACCESS_NONCE") SynchronizedValueFactory nonce) - throws IOException, CoinbaseException; + @HeaderParam("ACCESS_SIGNATURE") ParamsDigest signer, + @HeaderParam("ACCESS_NONCE") SynchronizedValueFactory nonce) throws IOException, CoinbaseException; @POST @Path("buttons") @@ -162,21 +162,21 @@ CoinbaseButton createButton(CoinbaseButton button, @HeaderParam("ACCESS_KEY") St @GET @Path("orders") CoinbaseOrders getOrders(@QueryParam("page") Integer page, @HeaderParam("ACCESS_KEY") String apiKey, - @HeaderParam("ACCESS_SIGNATURE") ParamsDigest signer, @HeaderParam("ACCESS_NONCE") SynchronizedValueFactory nonce) - throws IOException, CoinbaseException; + @HeaderParam("ACCESS_SIGNATURE") ParamsDigest signer, + @HeaderParam("ACCESS_NONCE") SynchronizedValueFactory nonce) throws IOException, CoinbaseException; @GET @Path("orders/{orderId}") CoinbaseOrder getOrder(@PathParam("orderId") String orderId, @HeaderParam("ACCESS_KEY") String apiKey, - @HeaderParam("ACCESS_SIGNATURE") ParamsDigest signer, @HeaderParam("ACCESS_NONCE") SynchronizedValueFactory nonce) - throws IOException, CoinbaseException; + @HeaderParam("ACCESS_SIGNATURE") ParamsDigest signer, + @HeaderParam("ACCESS_NONCE") SynchronizedValueFactory nonce) throws IOException, CoinbaseException; @POST @Path("buttons/{code}/create_order") @Consumes(MediaType.APPLICATION_FORM_URLENCODED) CoinbaseOrder createOrder(@PathParam("code") String code, @HeaderParam("ACCESS_KEY") String apiKey, - @HeaderParam("ACCESS_SIGNATURE") ParamsDigest signer, @HeaderParam("ACCESS_NONCE") SynchronizedValueFactory nonce) - throws IOException, CoinbaseException; + @HeaderParam("ACCESS_SIGNATURE") ParamsDigest signer, + @HeaderParam("ACCESS_NONCE") SynchronizedValueFactory nonce) throws IOException, CoinbaseException; @POST @Path("orders") @@ -193,8 +193,8 @@ CoinbaseRecurringPayments getRecurringPayments(@QueryParam("page") Integer page, @GET @Path("recurring_payments/{recurringPaymentId}") CoinbaseRecurringPayment getRecurringPayment(@PathParam("recurringPaymentId") String recurringPaymentId, @HeaderParam("ACCESS_KEY") String apiKey, - @HeaderParam("ACCESS_SIGNATURE") ParamsDigest signer, @HeaderParam("ACCESS_NONCE") SynchronizedValueFactory nonce) - throws IOException, CoinbaseException; + @HeaderParam("ACCESS_SIGNATURE") ParamsDigest signer, + @HeaderParam("ACCESS_NONCE") SynchronizedValueFactory nonce) throws IOException, CoinbaseException; @GET @Path("subscribers") @@ -205,8 +205,8 @@ CoinbaseSubscriptions getsSubscriptions(@QueryParam("page") Integer page, @Query @GET @Path("subscribers/{subscriptionId}") CoinbaseSubscription getsSubscription(@PathParam("subscriptionId") String subscriptionId, @HeaderParam("ACCESS_KEY") String apiKey, - @HeaderParam("ACCESS_SIGNATURE") ParamsDigest signer, @HeaderParam("ACCESS_NONCE") SynchronizedValueFactory nonce) - throws IOException, CoinbaseException; + @HeaderParam("ACCESS_SIGNATURE") ParamsDigest signer, + @HeaderParam("ACCESS_NONCE") SynchronizedValueFactory nonce) throws IOException, CoinbaseException; @POST @Path("buys") @@ -219,6 +219,6 @@ CoinbaseTransfer buy(@QueryParam("qty") String quantity, @QueryParam("agree_btc_ @Path("sells") @Consumes(MediaType.APPLICATION_FORM_URLENCODED) CoinbaseTransfer sell(@QueryParam("qty") String quantity, @HeaderParam("ACCESS_KEY") String apiKey, - @HeaderParam("ACCESS_SIGNATURE") ParamsDigest signer, @HeaderParam("ACCESS_NONCE") SynchronizedValueFactory nonce) - throws IOException, CoinbaseException; + @HeaderParam("ACCESS_SIGNATURE") ParamsDigest signer, + @HeaderParam("ACCESS_NONCE") SynchronizedValueFactory nonce) throws IOException, CoinbaseException; } diff --git a/xchange-coinbase/src/main/java/org/knowm/xchange/coinbase/dto/account/CoinbaseAccountChangeCategory.java b/xchange-coinbase/src/main/java/org/knowm/xchange/coinbase/dto/account/CoinbaseAccountChangeCategory.java index d3150b4869a..b07ce2a389e 100644 --- a/xchange-coinbase/src/main/java/org/knowm/xchange/coinbase/dto/account/CoinbaseAccountChangeCategory.java +++ b/xchange-coinbase/src/main/java/org/knowm/xchange/coinbase/dto/account/CoinbaseAccountChangeCategory.java @@ -30,8 +30,8 @@ static class CoinbaseCategoryDeserializer extends JsonDeserializer { - private static final EnumFromStringHelper FROM_STRING_HELPER = new EnumFromStringHelper<>( - CoinbaseBuySellLevel.class).addJsonStringMapping("1", ONE).addJsonStringMapping("2", TWO).addJsonStringMapping("3", THREE); + private static final EnumFromStringHelper FROM_STRING_HELPER = new EnumFromStringHelper<>(CoinbaseBuySellLevel.class) + .addJsonStringMapping("1", ONE).addJsonStringMapping("2", TWO).addJsonStringMapping("3", THREE); @Override public CoinbaseBuySellLevel deserialize(JsonParser jsonParser, final DeserializationContext ctxt) throws IOException, JsonProcessingException { diff --git a/xchange-coinbase/src/main/java/org/knowm/xchange/coinbase/dto/common/CoinbaseRecurringPaymentStatus.java b/xchange-coinbase/src/main/java/org/knowm/xchange/coinbase/dto/common/CoinbaseRecurringPaymentStatus.java index 6ce0b56d3ab..2bad9ff489c 100644 --- a/xchange-coinbase/src/main/java/org/knowm/xchange/coinbase/dto/common/CoinbaseRecurringPaymentStatus.java +++ b/xchange-coinbase/src/main/java/org/knowm/xchange/coinbase/dto/common/CoinbaseRecurringPaymentStatus.java @@ -30,8 +30,8 @@ static class CoinbaseRecurringPaymentStatusDeserializer extends JsonDeserializer CoinbaseRecurringPaymentStatus.class); @Override - public CoinbaseRecurringPaymentStatus deserialize(JsonParser jsonParser, final DeserializationContext ctxt) - throws IOException, JsonProcessingException { + public CoinbaseRecurringPaymentStatus deserialize(JsonParser jsonParser, + final DeserializationContext ctxt) throws IOException, JsonProcessingException { final ObjectCodec oc = jsonParser.getCodec(); final JsonNode node = oc.readTree(jsonParser); diff --git a/xchange-coinbase/src/main/java/org/knowm/xchange/coinbase/dto/common/CoinbaseRecurringPaymentType.java b/xchange-coinbase/src/main/java/org/knowm/xchange/coinbase/dto/common/CoinbaseRecurringPaymentType.java index 61d20bd3e62..69d5ec21168 100644 --- a/xchange-coinbase/src/main/java/org/knowm/xchange/coinbase/dto/common/CoinbaseRecurringPaymentType.java +++ b/xchange-coinbase/src/main/java/org/knowm/xchange/coinbase/dto/common/CoinbaseRecurringPaymentType.java @@ -30,8 +30,8 @@ static class CoinbaseRecurringPaymentTypeDeserializer extends JsonDeserializer { - private static final EnumFromStringHelper FROM_STRING_HELPER = new EnumFromStringHelper<>( - CoinbaseButtonStyle.class); + private static final EnumFromStringHelper FROM_STRING_HELPER = new EnumFromStringHelper<>(CoinbaseButtonStyle.class); @Override public CoinbaseButtonStyle deserialize(JsonParser jsonParser, final DeserializationContext ctxt) throws IOException, JsonProcessingException { diff --git a/xchange-coinbase/src/main/java/org/knowm/xchange/coinbase/dto/merchant/CoinbaseButtonType.java b/xchange-coinbase/src/main/java/org/knowm/xchange/coinbase/dto/merchant/CoinbaseButtonType.java index ba49530125b..ed2516126ff 100644 --- a/xchange-coinbase/src/main/java/org/knowm/xchange/coinbase/dto/merchant/CoinbaseButtonType.java +++ b/xchange-coinbase/src/main/java/org/knowm/xchange/coinbase/dto/merchant/CoinbaseButtonType.java @@ -26,8 +26,7 @@ public enum CoinbaseButtonType { static class CoinbaseButtonTypeDeserializer extends JsonDeserializer { - private static final EnumFromStringHelper FROM_STRING_HELPER = new EnumFromStringHelper<>( - CoinbaseButtonType.class); + private static final EnumFromStringHelper FROM_STRING_HELPER = new EnumFromStringHelper<>(CoinbaseButtonType.class); @Override public CoinbaseButtonType deserialize(JsonParser jsonParser, final DeserializationContext ctxt) throws IOException, JsonProcessingException { diff --git a/xchange-coinbase/src/main/java/org/knowm/xchange/coinbase/dto/merchant/CoinbaseOrder.java b/xchange-coinbase/src/main/java/org/knowm/xchange/coinbase/dto/merchant/CoinbaseOrder.java index e3c284a97ba..de04096251c 100644 --- a/xchange-coinbase/src/main/java/org/knowm/xchange/coinbase/dto/merchant/CoinbaseOrder.java +++ b/xchange-coinbase/src/main/java/org/knowm/xchange/coinbase/dto/merchant/CoinbaseOrder.java @@ -99,8 +99,7 @@ public enum CoinbaseOrderStatus { static class CoinbaseOrderStatusDeserializer extends JsonDeserializer { - private static final EnumFromStringHelper FROM_STRING_HELPER = new EnumFromStringHelper<>( - CoinbaseOrderStatus.class); + private static final EnumFromStringHelper FROM_STRING_HELPER = new EnumFromStringHelper<>(CoinbaseOrderStatus.class); @Override public CoinbaseOrderStatus deserialize(JsonParser jsonParser, DeserializationContext ctxt) throws IOException, JsonProcessingException { diff --git a/xchange-coinbase/src/main/java/org/knowm/xchange/coinbase/dto/trade/CoinbaseTransferType.java b/xchange-coinbase/src/main/java/org/knowm/xchange/coinbase/dto/trade/CoinbaseTransferType.java index 13251ad66af..e6bb75a0781 100644 --- a/xchange-coinbase/src/main/java/org/knowm/xchange/coinbase/dto/trade/CoinbaseTransferType.java +++ b/xchange-coinbase/src/main/java/org/knowm/xchange/coinbase/dto/trade/CoinbaseTransferType.java @@ -26,8 +26,7 @@ public enum CoinbaseTransferType { static class CoinbaseTransferTypeDeserializer extends JsonDeserializer { - private static final EnumFromStringHelper FROM_STRING_HELPER = new EnumFromStringHelper<>( - CoinbaseTransferType.class); + private static final EnumFromStringHelper FROM_STRING_HELPER = new EnumFromStringHelper<>(CoinbaseTransferType.class); @Override public CoinbaseTransferType deserialize(JsonParser jsonParser, final DeserializationContext ctxt) throws IOException, JsonProcessingException { diff --git a/xchange-coinbase/src/main/java/org/knowm/xchange/coinbase/service/CoinbaseAccountService.java b/xchange-coinbase/src/main/java/org/knowm/xchange/coinbase/service/CoinbaseAccountService.java index 4f87e86d8c5..e0f84eb04ce 100644 --- a/xchange-coinbase/src/main/java/org/knowm/xchange/coinbase/service/CoinbaseAccountService.java +++ b/xchange-coinbase/src/main/java/org/knowm/xchange/coinbase/service/CoinbaseAccountService.java @@ -43,8 +43,8 @@ public AccountInfo getAccountInfo() throws IOException { /** * @return The Coinbase transaction id for the newly created withdrawal. See - * {@link CoinbaseAccountServiceRaw#getCoinbaseTransaction(String transactionIdOrIdemField)} to retreive more information about the - * transaction, including the blockchain transaction hash. + * {@link CoinbaseAccountServiceRaw#getCoinbaseTransaction(String transactionIdOrIdemField)} to retreive more information about the transaction, + * including the blockchain transaction hash. */ @Override public String withdrawFunds(Currency currency, BigDecimal amount, String address) throws IOException { @@ -67,7 +67,8 @@ public TradeHistoryParams createFundingHistoryParams() { } @Override - public List getFundingHistory(TradeHistoryParams params) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { + public List getFundingHistory( + TradeHistoryParams params) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { throw new NotYetImplementedForExchangeException(); } } diff --git a/xchange-coinbase/src/main/java/org/knowm/xchange/coinbase/service/CoinbaseTradeService.java b/xchange-coinbase/src/main/java/org/knowm/xchange/coinbase/service/CoinbaseTradeService.java index ee811da1a31..2b9721bf854 100644 --- a/xchange-coinbase/src/main/java/org/knowm/xchange/coinbase/service/CoinbaseTradeService.java +++ b/xchange-coinbase/src/main/java/org/knowm/xchange/coinbase/service/CoinbaseTradeService.java @@ -43,7 +43,8 @@ public OpenOrders getOpenOrders() throws NotAvailableFromExchangeException, IOEx } @Override - public OpenOrders getOpenOrders(OpenOrdersParams params) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { + public OpenOrders getOpenOrders( + OpenOrdersParams params) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { throw new NotAvailableFromExchangeException(); } @@ -87,8 +88,8 @@ public UserTrades getTradeHistory(TradeHistoryParams params) throws IOException } @Override - public Collection getOrder(String... orderIds) - throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { + public Collection getOrder( + String... orderIds) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { throw new NotYetImplementedForExchangeException(); } diff --git a/xchange-coinfloor/src/main/java/org/knowm/xchange/coinfloor/service/CoinfloorAccountService.java b/xchange-coinfloor/src/main/java/org/knowm/xchange/coinfloor/service/CoinfloorAccountService.java index 14bdedbe782..4e36e3e3549 100644 --- a/xchange-coinfloor/src/main/java/org/knowm/xchange/coinfloor/service/CoinfloorAccountService.java +++ b/xchange-coinfloor/src/main/java/org/knowm/xchange/coinfloor/service/CoinfloorAccountService.java @@ -51,7 +51,8 @@ public TradeHistoryParams createFundingHistoryParams() { } @Override - public List getFundingHistory(TradeHistoryParams params) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { + public List getFundingHistory( + TradeHistoryParams params) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { throw new NotYetImplementedForExchangeException(); } } diff --git a/xchange-coinfloor/src/main/java/org/knowm/xchange/coinfloor/service/CoinfloorTradeService.java b/xchange-coinfloor/src/main/java/org/knowm/xchange/coinfloor/service/CoinfloorTradeService.java index 2bf01c910b5..c31649d0371 100644 --- a/xchange-coinfloor/src/main/java/org/knowm/xchange/coinfloor/service/CoinfloorTradeService.java +++ b/xchange-coinfloor/src/main/java/org/knowm/xchange/coinfloor/service/CoinfloorTradeService.java @@ -49,8 +49,8 @@ public OpenOrders getOpenOrders() throws ExchangeException, NotAvailableFromExch } @Override - public OpenOrders getOpenOrders(OpenOrdersParams params) - throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { + public OpenOrders getOpenOrders( + OpenOrdersParams params) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { CurrencyPair pair; if (params instanceof OpenOrdersParamCurrencyPair) { pair = ((OpenOrdersParamCurrencyPair) params).getCurrencyPair(); @@ -167,30 +167,30 @@ public TradeHistoryParams createTradeHistoryParams() { } @Override - public String placeLimitOrder(LimitOrder order) - throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { + public String placeLimitOrder( + LimitOrder order) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { CoinfloorOrder rawOrder = placeLimitOrder(order.getCurrencyPair(), order.getType(), order.getTradableAmount(), order.getLimitPrice()); return Long.toString(rawOrder.getId()); } @Override - public String placeMarketOrder(MarketOrder order) - throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { + public String placeMarketOrder( + MarketOrder order) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { placeMarketOrder(order.getCurrencyPair(), order.getType(), order.getTradableAmount()); return ""; // coinfloor does not return an id for market orders } @Override - public boolean cancelOrder(String orderId) - throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { + public boolean cancelOrder( + String orderId) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { // API requires currency pair but value seems to be ignored - only the order ID is used for lookup. CurrencyPair currencyPairValueIsIgnored = CurrencyPair.BTC_GBP; return cancelOrder(currencyPairValueIsIgnored, Long.parseLong(orderId)); } @Override - public Collection getOrder(String... orderIds) - throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { + public Collection getOrder( + String... orderIds) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { throw new NotYetImplementedForExchangeException(); } diff --git a/xchange-coinmate/src/main/java/org/knowm/xchange/coinmate/Coinmate.java b/xchange-coinmate/src/main/java/org/knowm/xchange/coinmate/Coinmate.java index 49e5351b798..8116bc214c5 100644 --- a/xchange-coinmate/src/main/java/org/knowm/xchange/coinmate/Coinmate.java +++ b/xchange-coinmate/src/main/java/org/knowm/xchange/coinmate/Coinmate.java @@ -48,8 +48,8 @@ public interface Coinmate { @GET @Path("orderBook") - CoinmateOrderBook getOrderBook(@QueryParam("currencyPair") String currencyPair, @QueryParam("groupByPriceLimit") boolean groupByPriceLimit) - throws IOException; + CoinmateOrderBook getOrderBook(@QueryParam("currencyPair") String currencyPair, + @QueryParam("groupByPriceLimit") boolean groupByPriceLimit) throws IOException; @GET @Path("transactions") diff --git a/xchange-coinmate/src/main/java/org/knowm/xchange/coinmate/CoinmateAuthenticated.java b/xchange-coinmate/src/main/java/org/knowm/xchange/coinmate/CoinmateAuthenticated.java index 57a06004276..3904e8058dd 100644 --- a/xchange-coinmate/src/main/java/org/knowm/xchange/coinmate/CoinmateAuthenticated.java +++ b/xchange-coinmate/src/main/java/org/knowm/xchange/coinmate/CoinmateAuthenticated.java @@ -74,15 +74,15 @@ CoinmateOpenOrders getOpenOrders(@FormParam("publicKey") String publicKey, @Form @POST @Path("cancelOrder") CoinmateCancelOrderResponse cancelOder(@FormParam("publicKey") String publicKey, @FormParam("clientId") String clientId, - @FormParam("signature") ParamsDigest signer, @FormParam("nonce") SynchronizedValueFactory nonce, @FormParam("orderId") String orderId) - throws IOException; + @FormParam("signature") ParamsDigest signer, @FormParam("nonce") SynchronizedValueFactory nonce, + @FormParam("orderId") String orderId) throws IOException; // new in version 1.3 @POST @Path("cancelOrderWithInfo") CoinmateCancelOrderWithInfoResponse cancelOderWithInfo(@FormParam("publicKey") String publicKey, @FormParam("clientId") String clientId, - @FormParam("signature") ParamsDigest signer, @FormParam("nonce") SynchronizedValueFactory nonce, @FormParam("orderId") String orderId) - throws IOException; + @FormParam("signature") ParamsDigest signer, @FormParam("nonce") SynchronizedValueFactory nonce, + @FormParam("orderId") String orderId) throws IOException; @POST @Path("buyLimit") diff --git a/xchange-coinmate/src/main/java/org/knowm/xchange/coinmate/service/CoinmateAccountService.java b/xchange-coinmate/src/main/java/org/knowm/xchange/coinmate/service/CoinmateAccountService.java index 8f0c163140b..24985ac30ec 100644 --- a/xchange-coinmate/src/main/java/org/knowm/xchange/coinmate/service/CoinmateAccountService.java +++ b/xchange-coinmate/src/main/java/org/knowm/xchange/coinmate/service/CoinmateAccountService.java @@ -50,22 +50,21 @@ public CoinmateAccountService(Exchange exchange) { } @Override - public AccountInfo getAccountInfo() - throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { + public AccountInfo getAccountInfo() throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { return new AccountInfo(CoinmateAdapters.adaptWallet(getCoinmateBalance())); } @Override - public String withdrawFunds(Currency currency, BigDecimal amount, String address) - throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { + public String withdrawFunds(Currency currency, BigDecimal amount, + String address) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { CoinmateTradeResponse response = coinmateBitcoinWithdrawal(amount, address); return Long.toString(response.getData()); } @Override - public String requestDepositAddress(Currency currency, String... args) - throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { + public String requestDepositAddress(Currency currency, + String... args) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { CoinmateDepositAddresses addresses = coinmateBitcoinDepositAddresses(); if (addresses.getData().isEmpty()) { @@ -82,7 +81,8 @@ public TradeHistoryParams createFundingHistoryParams() { } @Override - public List getFundingHistory(TradeHistoryParams params) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { + public List getFundingHistory( + TradeHistoryParams params) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { throw new NotYetImplementedForExchangeException(); } } diff --git a/xchange-coinmate/src/main/java/org/knowm/xchange/coinmate/service/CoinmateMarketDataService.java b/xchange-coinmate/src/main/java/org/knowm/xchange/coinmate/service/CoinmateMarketDataService.java index 96d731e8c85..3202f20ab4a 100644 --- a/xchange-coinmate/src/main/java/org/knowm/xchange/coinmate/service/CoinmateMarketDataService.java +++ b/xchange-coinmate/src/main/java/org/knowm/xchange/coinmate/service/CoinmateMarketDataService.java @@ -49,23 +49,23 @@ public CoinmateMarketDataService(Exchange exchange) { } @Override - public Ticker getTicker(CurrencyPair currencyPair, Object... args) - throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { + public Ticker getTicker(CurrencyPair currencyPair, + Object... args) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { return CoinmateAdapters.adaptTicker(getCoinmateTicker(CoinmateUtils.getPair(currencyPair)), currencyPair); } @Override - public OrderBook getOrderBook(CurrencyPair currencyPair, Object... args) - throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { + public OrderBook getOrderBook(CurrencyPair currencyPair, + Object... args) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { return CoinmateAdapters.adaptOrderBook(getCoinmateOrderBook(CoinmateUtils.getPair(currencyPair), true), currencyPair); } @Override - public Trades getTrades(CurrencyPair currencyPair, Object... args) - throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { + public Trades getTrades(CurrencyPair currencyPair, + Object... args) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { return CoinmateAdapters.adaptTrades(getCoinmateTransactions(TRANSACTIONS_MINUTES_INTO_HISTORY)); } diff --git a/xchange-coinmate/src/main/java/org/knowm/xchange/coinmate/service/CoinmateTradeService.java b/xchange-coinmate/src/main/java/org/knowm/xchange/coinmate/service/CoinmateTradeService.java index 0760c6ca8c0..2ad11332f1f 100644 --- a/xchange-coinmate/src/main/java/org/knowm/xchange/coinmate/service/CoinmateTradeService.java +++ b/xchange-coinmate/src/main/java/org/knowm/xchange/coinmate/service/CoinmateTradeService.java @@ -58,7 +58,8 @@ public OpenOrders getOpenOrders() throws ExchangeException, NotAvailableFromExch } @Override - public OpenOrders getOpenOrders(OpenOrdersParams params) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { + public OpenOrders getOpenOrders( + OpenOrdersParams params) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { CurrencyPair currencyPair = null; if (params instanceof OpenOrdersParamCurrencyPair) { currencyPair = ((OpenOrdersParamCurrencyPair) params).getCurrencyPair(); @@ -75,8 +76,8 @@ public OpenOrders getOpenOrders(OpenOrdersParams params) throws ExchangeExceptio } @Override - public String placeMarketOrder(MarketOrder marketOrder) - throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { + public String placeMarketOrder( + MarketOrder marketOrder) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { CoinmateTradeResponse response; if (marketOrder.getType().equals(Order.OrderType.ASK)) { @@ -91,8 +92,8 @@ public String placeMarketOrder(MarketOrder marketOrder) } @Override - public String placeLimitOrder(LimitOrder limitOrder) - throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { + public String placeLimitOrder( + LimitOrder limitOrder) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { CoinmateTradeResponse response; if (limitOrder.getType().equals(Order.OrderType.ASK)) { @@ -107,8 +108,8 @@ public String placeLimitOrder(LimitOrder limitOrder) } @Override - public boolean cancelOrder(String orderId) - throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { + public boolean cancelOrder( + String orderId) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { CoinmateCancelOrderResponse response = cancelCoinmateOrder(orderId); return response.getData(); @@ -135,8 +136,8 @@ public CoinmateOpenOrdersParams createOpenOrdersParams() { } @Override - public Collection getOrder(String... orderIds) - throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { + public Collection getOrder( + String... orderIds) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { throw new NotYetImplementedForExchangeException(); } diff --git a/xchange-coinmate/src/test/java/org/knowm/xchange/coinmate/service/TradeServiceIntegration.java b/xchange-coinmate/src/test/java/org/knowm/xchange/coinmate/service/TradeServiceIntegration.java index 4e677dc6c38..9b9c7fe272e 100644 --- a/xchange-coinmate/src/test/java/org/knowm/xchange/coinmate/service/TradeServiceIntegration.java +++ b/xchange-coinmate/src/test/java/org/knowm/xchange/coinmate/service/TradeServiceIntegration.java @@ -58,9 +58,9 @@ public void openOrdersTest() throws Exception { /* * @Test public void marketBuyTest() throws Exception { Exchange exchange = ExchangeUtils.createExchangeFromJsonConfiguration(); if (exchange == - * null) { return; // forces pass if not configuration is available } assertNotNull(exchange); TradeService service = - * exchange.getTradeService(); assertNotNull(service); String id = service.placeMarketOrder(new MarketOrder(Order.OrderType.BID, new - * BigDecimal("0.1"), CurrencyPair.BTC_EUR)); System.out.println("Market buy order id = " + id); } + * null) { return; // forces pass if not configuration is available } assertNotNull(exchange); TradeService service = exchange.getTradeService(); + * assertNotNull(service); String id = service.placeMarketOrder(new MarketOrder(Order.OrderType.BID, new BigDecimal("0.1"), CurrencyPair.BTC_EUR)); + * System.out.println("Market buy order id = " + id); } */ @Test @@ -77,22 +77,22 @@ public void marketSellTest() throws Exception { /* * @Test public void limitBuyTest() throws Exception { Exchange exchange = ExchangeUtils.createExchangeFromJsonConfiguration(); if (exchange == - * null) { return; // forces pass if not configuration is available } assertNotNull(exchange); TradeService service = - * exchange.getTradeService(); assertNotNull(service); String id = service.placeLimitOrder(new LimitOrder(Order.OrderType.BID, new - * BigDecimal("1.0"), CurrencyPair.BTC_EUR, null, null, new BigDecimal("1.0"))); System.out.println("Limit buy order id = " + id); } + * null) { return; // forces pass if not configuration is available } assertNotNull(exchange); TradeService service = exchange.getTradeService(); + * assertNotNull(service); String id = service.placeLimitOrder(new LimitOrder(Order.OrderType.BID, new BigDecimal("1.0"), CurrencyPair.BTC_EUR, + * null, null, new BigDecimal("1.0"))); System.out.println("Limit buy order id = " + id); } */ /* * @Test public void limitSellTest() throws Exception { Exchange exchange = ExchangeUtils.createExchangeFromJsonConfiguration(); if (exchange == - * null) { return; // forces pass if not configuration is available } assertNotNull(exchange); TradeService service = - * exchange.getTradeService(); assertNotNull(service); String id = service.placeLimitOrder(new LimitOrder(Order.OrderType.ASK, new - * BigDecimal("0.0"), CurrencyPair.BTC_EUR, null, null, new BigDecimal("10000.0"))); System.out.println("Limit sell order id = " + id); } + * null) { return; // forces pass if not configuration is available } assertNotNull(exchange); TradeService service = exchange.getTradeService(); + * assertNotNull(service); String id = service.placeLimitOrder(new LimitOrder(Order.OrderType.ASK, new BigDecimal("0.0"), CurrencyPair.BTC_EUR, + * null, null, new BigDecimal("10000.0"))); System.out.println("Limit sell order id = " + id); } */ /* * @Test public void cancelOrderTest() throws Exception { Exchange exchange = ExchangeUtils.createExchangeFromJsonConfiguration(); if (exchange == - * null) { return; // forces pass if not configuration is available } assertNotNull(exchange); TradeService service = - * exchange.getTradeService(); assertNotNull(service); service.cancelOrder("784360"); } + * null) { return; // forces pass if not configuration is available } assertNotNull(exchange); TradeService service = exchange.getTradeService(); + * assertNotNull(service); service.cancelOrder("784360"); } */ } diff --git a/xchange-core/src/main/java/org/knowm/xchange/currency/CustomCurrencyPairSerializer.java b/xchange-core/src/main/java/org/knowm/xchange/currency/CustomCurrencyPairSerializer.java index 9c0693885bf..3925c02b7f2 100644 --- a/xchange-core/src/main/java/org/knowm/xchange/currency/CustomCurrencyPairSerializer.java +++ b/xchange-core/src/main/java/org/knowm/xchange/currency/CustomCurrencyPairSerializer.java @@ -13,8 +13,8 @@ public class CustomCurrencyPairSerializer extends JsonSerializer { @Override - public void serialize(CurrencyPair currencyPair, JsonGenerator jsonGenerator, SerializerProvider serializerProvider) - throws IOException, JsonProcessingException { + public void serialize(CurrencyPair currencyPair, JsonGenerator jsonGenerator, + SerializerProvider serializerProvider) throws IOException, JsonProcessingException { // jsonGenerator.writeStartObject(); jsonGenerator.writeString(currencyPair.toString()); diff --git a/xchange-core/src/main/java/org/knowm/xchange/dto/account/FundingRecord.java b/xchange-core/src/main/java/org/knowm/xchange/dto/account/FundingRecord.java index eba6b859673..f6f00085b5e 100644 --- a/xchange-core/src/main/java/org/knowm/xchange/dto/account/FundingRecord.java +++ b/xchange-core/src/main/java/org/knowm/xchange/dto/account/FundingRecord.java @@ -81,9 +81,8 @@ public final class FundingRecord { * @param fee Transaction Fee Amount * @param description Description of the transaction */ - public FundingRecord(final String address, final Date date, final Currency currency, final BigDecimal amount, final String id, - final Type type, final String status, final BigDecimal balance, final BigDecimal fee, - final String description) { + public FundingRecord(final String address, final Date date, final Currency currency, final BigDecimal amount, final String id, final Type type, + final String status, final BigDecimal balance, final BigDecimal fee, final String description) { this.address = address; this.date = date; this.currency = currency; @@ -168,18 +167,9 @@ public String getDescription() { @Override public String toString() { - return "FundingRecord{" + - "address='" + address + '\'' + - ", date=" + date + - ", currency='" + currency + '\'' + - ", amount=" + amount + - ", id='" + id + '\'' + - ", description='" + description + '\'' + - ", type='" + type + '\'' + - ", status='" + status + '\'' + - ", balance=" + balance + - ", fee=" + fee + - '}'; + return "FundingRecord{" + "address='" + address + '\'' + ", date=" + date + ", currency='" + currency + '\'' + ", amount=" + amount + ", id='" + + id + '\'' + ", description='" + description + '\'' + ", type='" + type + '\'' + ", status='" + status + '\'' + ", balance=" + balance + + ", fee=" + fee + '}'; } /** diff --git a/xchange-core/src/main/java/org/knowm/xchange/dto/marketdata/Trade.java b/xchange-core/src/main/java/org/knowm/xchange/dto/marketdata/Trade.java index 9f0bd4a4084..2d967e4ddf5 100644 --- a/xchange-core/src/main/java/org/knowm/xchange/dto/marketdata/Trade.java +++ b/xchange-core/src/main/java/org/knowm/xchange/dto/marketdata/Trade.java @@ -44,8 +44,8 @@ public class Trade { /** * This constructor is called to create a public Trade object in - * {@link MarketDataService#getTrades(org.knowm.xchange.currency.CurrencyPair, Object...)} - * implementations) since it's missing the orderId and fee parameters. + * {@link MarketDataService#getTrades(org.knowm.xchange.currency.CurrencyPair, Object...)} implementations) since it's missing the orderId and fee + * parameters. * * @param type The trade type (BID side or ASK side) * @param tradableAmount The depth of this trade diff --git a/xchange-core/src/main/java/org/knowm/xchange/dto/trade/MarketOrder.java b/xchange-core/src/main/java/org/knowm/xchange/dto/trade/MarketOrder.java index 9c22b6ea705..30b06912504 100644 --- a/xchange-core/src/main/java/org/knowm/xchange/dto/trade/MarketOrder.java +++ b/xchange-core/src/main/java/org/knowm/xchange/dto/trade/MarketOrder.java @@ -26,7 +26,8 @@ public class MarketOrder extends Order { * @param averagePrice the weighted average price of any fills belonging to the order * @param status the status of the order at the exchange or broker */ - public MarketOrder(OrderType type, BigDecimal tradableAmount, CurrencyPair currencyPair, String id, Date timestamp, BigDecimal averagePrice, BigDecimal cumulativeAmount, OrderStatus status) { + public MarketOrder(OrderType type, BigDecimal tradableAmount, CurrencyPair currencyPair, String id, Date timestamp, BigDecimal averagePrice, + BigDecimal cumulativeAmount, OrderStatus status) { super(type, tradableAmount, currencyPair, id, timestamp, averagePrice, cumulativeAmount, status); } diff --git a/xchange-core/src/main/java/org/knowm/xchange/dto/trade/UserTrade.java b/xchange-core/src/main/java/org/knowm/xchange/dto/trade/UserTrade.java index bae5c564603..7d458659cb0 100644 --- a/xchange-core/src/main/java/org/knowm/xchange/dto/trade/UserTrade.java +++ b/xchange-core/src/main/java/org/knowm/xchange/dto/trade/UserTrade.java @@ -31,8 +31,7 @@ public class UserTrade extends Trade { private final Currency feeCurrency; /** - * This constructor is called to construct user's trade objects (in - * {@link TradeService#getTradeHistory(TradeHistoryParams)} implementations). + * This constructor is called to construct user's trade objects (in {@link TradeService#getTradeHistory(TradeHistoryParams)} implementations). * * @param type The trade type (BID side or ASK side) * @param tradableAmount The depth of this trade diff --git a/xchange-core/src/main/java/org/knowm/xchange/service/account/AccountService.java b/xchange-core/src/main/java/org/knowm/xchange/service/account/AccountService.java index 059fbe534fb..74d72776cf4 100644 --- a/xchange-core/src/main/java/org/knowm/xchange/service/account/AccountService.java +++ b/xchange-core/src/main/java/org/knowm/xchange/service/account/AccountService.java @@ -31,11 +31,11 @@ public interface AccountService extends BaseService { * Get account info * * @return the AccountInfo object, null if some sort of error occurred. Implementers should log the error. - * @throws ExchangeException - Indication that the exchange reported some kind of error with the request or response - * @throws NotAvailableFromExchangeException - Indication that the exchange does not support the requested function or data + * @throws ExchangeException - Indication that the exchange reported some kind of error with the request or response + * @throws NotAvailableFromExchangeException - Indication that the exchange does not support the requested function or data * @throws NotYetImplementedForExchangeException - Indication that the exchange supports the requested function or data, but it has not yet been - * implemented - * @throws IOException - Indication that a networking error occurred while fetching JSON data + * implemented + * @throws IOException - Indication that a networking error occurred while fetching JSON data */ AccountInfo getAccountInfo() throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException; @@ -46,14 +46,14 @@ public interface AccountService extends BaseService { * @param amount The amount to withdraw * @param address The destination address * @return The result of the withdrawal (usually a transaction ID) - * @throws ExchangeException - Indication that the exchange reported some kind of error with the request or response - * @throws NotAvailableFromExchangeException - Indication that the exchange does not support the requested function or data + * @throws ExchangeException - Indication that the exchange reported some kind of error with the request or response + * @throws NotAvailableFromExchangeException - Indication that the exchange does not support the requested function or data * @throws NotYetImplementedForExchangeException - Indication that the exchange supports the requested function or data, but it has not yet been - * implemented - * @throws IOException - Indication that a networking error occurred while fetching JSON data + * implemented + * @throws IOException - Indication that a networking error occurred while fetching JSON data */ - String withdrawFunds(Currency currency, BigDecimal amount, String address) - throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException; + String withdrawFunds(Currency currency, BigDecimal amount, + String address) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException; /** * Request a digital currency address to fund this account. Allows to fund the exchange account with digital currency from an external address @@ -61,19 +61,19 @@ String withdrawFunds(Currency currency, BigDecimal amount, String address) * @param currency The digital currency that corresponds to the desired deposit address. * @param args * @return the internal deposit address to send funds to - * @throws ExchangeException - Indication that the exchange reported some kind of error with the request or response - * @throws NotAvailableFromExchangeException - Indication that the exchange does not support the requested function or data + * @throws ExchangeException - Indication that the exchange reported some kind of error with the request or response + * @throws NotAvailableFromExchangeException - Indication that the exchange does not support the requested function or data * @throws NotYetImplementedForExchangeException - Indication that the exchange supports the requested function or data, but it has not yet been - * implemented - * @throws IOException - Indication that a networking error occurred while fetching JSON data + * implemented + * @throws IOException - Indication that a networking error occurred while fetching JSON data */ - String requestDepositAddress(Currency currency, String... args) - throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException; + String requestDepositAddress(Currency currency, + String... args) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException; /** * Create {@link TradeHistoryParams} object specific to this exchange. Object created by this method may be used to discover supported and required - * {@link #getFundingHistory(TradeHistoryParams)} parameters and should be passed only to the method in the same class as the createFundingHistoryParams - * that created the object. + * {@link #getFundingHistory(TradeHistoryParams)} parameters and should be passed only to the method in the same class as the + * createFundingHistoryParams that created the object. */ TradeHistoryParams createFundingHistoryParams(); @@ -84,5 +84,6 @@ String requestDepositAddress(Currency currency, String... args) * @throws NotYetImplementedForExchangeException * @throws IOException */ - List getFundingHistory(TradeHistoryParams params) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException; + List getFundingHistory( + TradeHistoryParams params) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException; } diff --git a/xchange-core/src/main/java/org/knowm/xchange/service/marketdata/MarketDataService.java b/xchange-core/src/main/java/org/knowm/xchange/service/marketdata/MarketDataService.java index 4f6537b0f79..b93d8e16d04 100644 --- a/xchange-core/src/main/java/org/knowm/xchange/service/marketdata/MarketDataService.java +++ b/xchange-core/src/main/java/org/knowm/xchange/service/marketdata/MarketDataService.java @@ -31,14 +31,14 @@ public interface MarketDataService extends BaseService { *

* * @return The Ticker, null if some sort of error occurred. Implementers should log the error. - * @throws ExchangeException - Indication that the exchange reported some kind of error with the request or response - * @throws NotAvailableFromExchangeException - Indication that the exchange does not support the requested function or data + * @throws ExchangeException - Indication that the exchange reported some kind of error with the request or response + * @throws NotAvailableFromExchangeException - Indication that the exchange does not support the requested function or data * @throws NotYetImplementedForExchangeException - Indication that the exchange supports the requested function or data, but it has not yet been - * implemented - * @throws IOException - Indication that a networking error occurred while fetching JSON data + * implemented + * @throws IOException - Indication that a networking error occurred while fetching JSON data */ - Ticker getTicker(CurrencyPair currencyPair, Object... args) - throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException; + Ticker getTicker(CurrencyPair currencyPair, + Object... args) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException; /** *

@@ -47,14 +47,14 @@ Ticker getTicker(CurrencyPair currencyPair, Object... args) * * @param args Optional arguments. Exchange-specific * @return The OrderBook, null if some sort of error occurred. Implementers should log the error. - * @throws ExchangeException - Indication that the exchange reported some kind of error with the request or response - * @throws NotAvailableFromExchangeException - Indication that the exchange does not support the requested function or data + * @throws ExchangeException - Indication that the exchange reported some kind of error with the request or response + * @throws NotAvailableFromExchangeException - Indication that the exchange does not support the requested function or data * @throws NotYetImplementedForExchangeException - Indication that the exchange supports the requested function or data, but it has not yet been - * implemented - * @throws IOException - Indication that a networking error occurred while fetching JSON data + * implemented + * @throws IOException - Indication that a networking error occurred while fetching JSON data */ - OrderBook getOrderBook(CurrencyPair currencyPair, Object... args) - throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException; + OrderBook getOrderBook(CurrencyPair currencyPair, + Object... args) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException; /** *

@@ -63,13 +63,13 @@ OrderBook getOrderBook(CurrencyPair currencyPair, Object... args) * * @param args Optional arguments. Exchange-specific * @return The Trades, null if some sort of error occurred. Implementers should log the error. - * @throws ExchangeException - Indication that the exchange reported some kind of error with the request or response - * @throws NotAvailableFromExchangeException - Indication that the exchange does not support the requested function or data + * @throws ExchangeException - Indication that the exchange reported some kind of error with the request or response + * @throws NotAvailableFromExchangeException - Indication that the exchange does not support the requested function or data * @throws NotYetImplementedForExchangeException - Indication that the exchange supports the requested function or data, but it has not yet been - * implemented - * @throws IOException - Indication that a networking error occurred while fetching JSON data + * implemented + * @throws IOException - Indication that a networking error occurred while fetching JSON data */ - Trades getTrades(CurrencyPair currencyPair, Object... args) - throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException; + Trades getTrades(CurrencyPair currencyPair, + Object... args) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException; } diff --git a/xchange-core/src/main/java/org/knowm/xchange/service/trade/TradeService.java b/xchange-core/src/main/java/org/knowm/xchange/service/trade/TradeService.java index 1375eb7721b..ab7739cdba0 100644 --- a/xchange-core/src/main/java/org/knowm/xchange/service/trade/TradeService.java +++ b/xchange-core/src/main/java/org/knowm/xchange/service/trade/TradeService.java @@ -36,11 +36,11 @@ public interface TradeService extends BaseService { * Gets the open orders * * @return the open orders, null if some sort of error occurred. Implementers should log the error. - * @throws ExchangeException - Indication that the exchange reported some kind of error with the request or response - * @throws NotAvailableFromExchangeException - Indication that the exchange does not support the requested function or data + * @throws ExchangeException - Indication that the exchange reported some kind of error with the request or response + * @throws NotAvailableFromExchangeException - Indication that the exchange does not support the requested function or data * @throws NotYetImplementedForExchangeException - Indication that the exchange supports the requested function or data, but it has not yet been - * implemented - * @throws IOException - Indication that a networking error occurred while fetching JSON data + * implemented + * @throws IOException - Indication that a networking error occurred while fetching JSON data * @deprecated Use {@link #getOpenOrders(OpenOrdersParams)} instead. Will be removed in the future release. */ @Deprecated @@ -49,58 +49,58 @@ public interface TradeService extends BaseService { /** * Gets the open orders * - * @param params The parameters describing the filter. Note that {@link OpenOrdersParams} is an empty interface. Exchanges should implement its - * own params object. Params should be create with {@link #createOpenOrdersParams()}. + * @param params The parameters describing the filter. Note that {@link OpenOrdersParams} is an empty interface. Exchanges should implement its own + * params object. Params should be create with {@link #createOpenOrdersParams()}. * @return the open orders, null if some sort of error occurred. Implementers should log the error. - * @throws ExchangeException - Indication that the exchange reported some kind of error with the request or response - * @throws NotAvailableFromExchangeException - Indication that the exchange does not support the requested function or data + * @throws ExchangeException - Indication that the exchange reported some kind of error with the request or response + * @throws NotAvailableFromExchangeException - Indication that the exchange does not support the requested function or data * @throws NotYetImplementedForExchangeException - Indication that the exchange supports the requested function or data, but it has not yet been - * implemented - * @throws IOException - Indication that a networking error occurred while fetching JSON data + * implemented + * @throws IOException - Indication that a networking error occurred while fetching JSON data */ - OpenOrders getOpenOrders(OpenOrdersParams params) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException; + OpenOrders getOpenOrders( + OpenOrdersParams params) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException; /** * Place a market order * * @param marketOrder * @return the order ID - * @throws ExchangeException - Indication that the exchange reported some kind of error with the request or response - * @throws NotAvailableFromExchangeException - Indication that the exchange does not support the requested function or data + * @throws ExchangeException - Indication that the exchange reported some kind of error with the request or response + * @throws NotAvailableFromExchangeException - Indication that the exchange does not support the requested function or data * @throws NotYetImplementedForExchangeException - Indication that the exchange supports the requested function or data, but it has not yet been - * implemented - * @throws IOException - Indication that a networking error occurred while fetching JSON data + * implemented + * @throws IOException - Indication that a networking error occurred while fetching JSON data */ - String placeMarketOrder(MarketOrder marketOrder) - throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException; + String placeMarketOrder( + MarketOrder marketOrder) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException; /** * Place a limit order * * @param limitOrder * @return the order ID - * @throws ExchangeException - Indication that the exchange reported some kind of error with the request or response - * @throws NotAvailableFromExchangeException - Indication that the exchange does not support the requested function or data + * @throws ExchangeException - Indication that the exchange reported some kind of error with the request or response + * @throws NotAvailableFromExchangeException - Indication that the exchange does not support the requested function or data * @throws NotYetImplementedForExchangeException - Indication that the exchange supports the requested function or data, but it has not yet been - * implemented - * @throws IOException - Indication that a networking error occurred while fetching JSON data + * implemented + * @throws IOException - Indication that a networking error occurred while fetching JSON data */ - String placeLimitOrder(LimitOrder limitOrder) - throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException; + String placeLimitOrder( + LimitOrder limitOrder) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException; /** * cancels order with matching orderId * * @param orderId * @return true if order was successfully cancelled, false otherwise. - * @throws ExchangeException - Indication that the exchange reported some kind of error with the request or response - * @throws NotAvailableFromExchangeException - Indication that the exchange does not support the requested function or data + * @throws ExchangeException - Indication that the exchange reported some kind of error with the request or response + * @throws NotAvailableFromExchangeException - Indication that the exchange does not support the requested function or data * @throws NotYetImplementedForExchangeException - Indication that the exchange supports the requested function or data, but it has not yet been - * implemented - * @throws IOException - Indication that a networking error occurred while fetching JSON data + * implemented + * @throws IOException - Indication that a networking error occurred while fetching JSON data */ - boolean cancelOrder(String orderId) - throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException; + boolean cancelOrder(String orderId) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException; /** * Fetch the history of user trades. @@ -113,21 +113,21 @@ boolean cancelOrder(String orderId) * {@link TradeHistoryParams}. Note that whether an interface is required or supported will vary from exchange to exchange and it's described only * through the javadoc. *

- * There is also implementation of all the common interfaces, {@link TradeHistoryParamsAll} , that, - * with all properties set non-null, should work with any exchange. + * There is also implementation of all the common interfaces, {@link TradeHistoryParamsAll} , that, with all properties set non-null, should work + * with any exchange. *

* Some exchanges allow extra parameters, not covered by any common interface. To access them, you will have to use the object returned by * {@link #createTradeHistoryParams()} and cast it to the exchange-specific type. * * @param params The parameters describing the filter. Note that {@link TradeHistoryParams} is an empty interface. Exact set of interfaces that are - * required or supported by this method is described by the type of object returned from {@link #createTradeHistoryParams()} and the javadoc - * of the method. + * required or supported by this method is described by the type of object returned from {@link #createTradeHistoryParams()} and the javadoc of the + * method. * @return UserTrades as returned by the exchange API - * @throws ExchangeException - Indication that the exchange reported some kind of error with the request or response - * @throws NotAvailableFromExchangeException - Indication that the exchange does not support the requested function or data + * @throws ExchangeException - Indication that the exchange reported some kind of error with the request or response + * @throws NotAvailableFromExchangeException - Indication that the exchange does not support the requested function or data * @throws NotYetImplementedForExchangeException - Indication that the exchange supports the requested function or data, but it has not yet been - * implemented - * @throws IOException - Indication that a networking error occurred while fetching JSON data + * implemented + * @throws IOException - Indication that a networking error occurred while fetching JSON data * @see #createTradeHistoryParams() * @see TradeHistoryParamsAll */ @@ -142,8 +142,8 @@ boolean cancelOrder(String orderId) /** * Create {@link OpenOrdersParams} object specific to this exchange. Object created by this method may be used to discover supported and required - * {@link #getOpenOrders(OpenOrdersParams)} parameters and should be passed only to the method in the same class as the createOpenOrdersParams - * that created the object. + * {@link #getOpenOrders(OpenOrdersParams)} parameters and should be passed only to the method in the same class as the createOpenOrdersParams that + * created the object. */ OpenOrdersParams createOpenOrdersParams(); @@ -163,13 +163,13 @@ boolean cancelOrder(String orderId) * get's the latest order form the order book that with matching orderId * * @return the order as it is on the exchange. - * @throws ExchangeException - Indication that the exchange reported some kind of error with the request or response - * @throws NotAvailableFromExchangeException - Indication that the exchange does not support the requested function or data + * @throws ExchangeException - Indication that the exchange reported some kind of error with the request or response + * @throws NotAvailableFromExchangeException - Indication that the exchange does not support the requested function or data * @throws NotYetImplementedForExchangeException - Indication that the exchange supports the requested function or data, but it has not yet been - * implemented - * @throws IOException - Indication that a networking error occurred while fetching JSON data + * implemented + * @throws IOException - Indication that a networking error occurred while fetching JSON data */ - Collection getOrder(String... orderIds) - throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException; + Collection getOrder( + String... orderIds) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException; } diff --git a/xchange-core/src/main/java/org/knowm/xchange/service/trade/params/TradeHistoryParams.java b/xchange-core/src/main/java/org/knowm/xchange/service/trade/params/TradeHistoryParams.java index d0924fa89d9..9e5309ca50a 100644 --- a/xchange-core/src/main/java/org/knowm/xchange/service/trade/params/TradeHistoryParams.java +++ b/xchange-core/src/main/java/org/knowm/xchange/service/trade/params/TradeHistoryParams.java @@ -3,8 +3,7 @@ import org.knowm.xchange.service.trade.TradeService; /** - * Root interface for all interfaces used as a parameter type for - * {@link TradeService#getTradeHistory(TradeHistoryParams)} . + * Root interface for all interfaces used as a parameter type for {@link TradeService#getTradeHistory(TradeHistoryParams)} . */ public interface TradeHistoryParams { } diff --git a/xchange-core/src/main/java/org/knowm/xchange/service/trade/params/TradeHistoryParamsAll.java b/xchange-core/src/main/java/org/knowm/xchange/service/trade/params/TradeHistoryParamsAll.java index 3edebc38932..79ca7d2e733 100644 --- a/xchange-core/src/main/java/org/knowm/xchange/service/trade/params/TradeHistoryParamsAll.java +++ b/xchange-core/src/main/java/org/knowm/xchange/service/trade/params/TradeHistoryParamsAll.java @@ -9,11 +9,11 @@ /** * Generic {@link TradeHistoryParams} implementation that implements all the interfaces in the hierarchy and can be safely (without getting - * exceptions, if that all the required fields are non-null) passed to any implementation of - * {@link TradeService#getTradeHistory(TradeHistoryParams)} . + * exceptions, if that all the required fields are non-null) passed to any implementation of {@link TradeService#getTradeHistory(TradeHistoryParams)} + * . */ -public class TradeHistoryParamsAll - implements TradeHistoryParamsTimeSpan, TradeHistoryParamPaging, TradeHistoryParamsIdSpan, TradeHistoryParamOffset, TradeHistoryParamCurrencyPair, TradeHistoryParamMultiCurrencyPair { +public class TradeHistoryParamsAll implements TradeHistoryParamsTimeSpan, TradeHistoryParamPaging, TradeHistoryParamsIdSpan, TradeHistoryParamOffset, + TradeHistoryParamCurrencyPair, TradeHistoryParamMultiCurrencyPair { private Integer pageLength; private Integer pageNumber; diff --git a/xchange-core/src/main/java/org/knowm/xchange/service/trade/params/TradeHistoryParamsTimeSpan.java b/xchange-core/src/main/java/org/knowm/xchange/service/trade/params/TradeHistoryParamsTimeSpan.java index 78c584a4a9a..cf3fdf7ca00 100644 --- a/xchange-core/src/main/java/org/knowm/xchange/service/trade/params/TradeHistoryParamsTimeSpan.java +++ b/xchange-core/src/main/java/org/knowm/xchange/service/trade/params/TradeHistoryParamsTimeSpan.java @@ -5,8 +5,7 @@ import org.knowm.xchange.service.trade.TradeService; /** - * Parameters type for {@link TradeService#getTradeHistory(TradeHistoryParams)} with start and end - * timestamps. + * Parameters type for {@link TradeService#getTradeHistory(TradeHistoryParams)} with start and end timestamps. */ public interface TradeHistoryParamsTimeSpan extends TradeHistoryParams { diff --git a/xchange-core/src/main/java/org/knowm/xchange/service/trade/params/orders/OpenOrdersParams.java b/xchange-core/src/main/java/org/knowm/xchange/service/trade/params/orders/OpenOrdersParams.java index 7cfbb39dd20..9e96efa73d7 100644 --- a/xchange-core/src/main/java/org/knowm/xchange/service/trade/params/orders/OpenOrdersParams.java +++ b/xchange-core/src/main/java/org/knowm/xchange/service/trade/params/orders/OpenOrdersParams.java @@ -3,8 +3,7 @@ import org.knowm.xchange.service.trade.TradeService; /** - * Root interface for all interfaces used as a parameter type for - * {@link TradeService#getOpenOrders(OpenOrdersParams)}. + * Root interface for all interfaces used as a parameter type for {@link TradeService#getOpenOrders(OpenOrdersParams)}. *

* Each exchange should have its own class implementing at least one from following available interfaces: *

    diff --git a/xchange-core/src/main/java/org/knowm/xchange/utils/retries/Retries.java b/xchange-core/src/main/java/org/knowm/xchange/utils/retries/Retries.java index 1d1141d4c6c..a98d55b070b 100644 --- a/xchange-core/src/main/java/org/knowm/xchange/utils/retries/Retries.java +++ b/xchange-core/src/main/java/org/knowm/xchange/utils/retries/Retries.java @@ -20,11 +20,11 @@ public class Retries { * retryable, which can be any complex criteria that the user defines. * @return * @throws Exception If the exception isn't retryable, it's immediately thrown again. If it is retryable, then a RunTimeException is thrown after - * the allowed number of retries is exhausted. + * the allowed number of retries is exhausted. * @author Matija Mazi and Bryan Hernandez */ - public static V callWithRetries(int nAttempts, int initialRetrySec, Callable action, IPredicate retryableException) - throws Exception { + public static V callWithRetries(int nAttempts, int initialRetrySec, Callable action, + IPredicate retryableException) throws Exception { int retryDelaySec = initialRetrySec; for (int attemptsLeftAfterThis = nAttempts - 1; attemptsLeftAfterThis >= 0; attemptsLeftAfterThis--) { try { diff --git a/xchange-core/src/test/java/org/knowm/xchange/dto/trade/LimitOrderTest.java b/xchange-core/src/test/java/org/knowm/xchange/dto/trade/LimitOrderTest.java index 4b6d5d3d5c3..f24e9da3beb 100644 --- a/xchange-core/src/test/java/org/knowm/xchange/dto/trade/LimitOrderTest.java +++ b/xchange-core/src/test/java/org/knowm/xchange/dto/trade/LimitOrderTest.java @@ -27,8 +27,8 @@ public void testBuilder() { final String id = "id"; final Order.OrderStatus status = Order.OrderStatus.FILLED; - final LimitOrder copy = new LimitOrder.Builder(type, currencyPair).tradableAmount(tradableAmount) - .limitPrice(limitPrice).orderStatus(status).timestamp(timestamp).id(id).flag(TestFlags.TEST1).build(); + final LimitOrder copy = new LimitOrder.Builder(type, currencyPair).tradableAmount(tradableAmount).limitPrice(limitPrice).orderStatus(status) + .timestamp(timestamp).id(id).flag(TestFlags.TEST1).build(); assertThat(copy.getType()).isEqualTo(type); assertThat(copy.getTradableAmount()).isEqualTo(tradableAmount); diff --git a/xchange-cryptofacilities/src/main/java/org/knowm/xchange/cryptofacilities/dto/marketdata/CryptoFacilitiesCancelStatus.java b/xchange-cryptofacilities/src/main/java/org/knowm/xchange/cryptofacilities/dto/marketdata/CryptoFacilitiesCancelStatus.java index 1b9b64de16e..3745fdf3ee4 100644 --- a/xchange-cryptofacilities/src/main/java/org/knowm/xchange/cryptofacilities/dto/marketdata/CryptoFacilitiesCancelStatus.java +++ b/xchange-cryptofacilities/src/main/java/org/knowm/xchange/cryptofacilities/dto/marketdata/CryptoFacilitiesCancelStatus.java @@ -17,8 +17,8 @@ public class CryptoFacilitiesCancelStatus { private final Date receivedTime; private final String status; - public CryptoFacilitiesCancelStatus(@JsonProperty("receivedTime") String strReceivedTime, @JsonProperty("status") String status) - throws ParseException { + public CryptoFacilitiesCancelStatus(@JsonProperty("receivedTime") String strReceivedTime, + @JsonProperty("status") String status) throws ParseException { this.receivedTime = strReceivedTime == null ? null : DATE_FORMAT.parse(strReceivedTime); this.status = status; diff --git a/xchange-cryptofacilities/src/main/java/org/knowm/xchange/cryptofacilities/service/CryptoFacilitiesAccountService.java b/xchange-cryptofacilities/src/main/java/org/knowm/xchange/cryptofacilities/service/CryptoFacilitiesAccountService.java index 04573f25305..4cadacfc182 100644 --- a/xchange-cryptofacilities/src/main/java/org/knowm/xchange/cryptofacilities/service/CryptoFacilitiesAccountService.java +++ b/xchange-cryptofacilities/src/main/java/org/knowm/xchange/cryptofacilities/service/CryptoFacilitiesAccountService.java @@ -58,7 +58,8 @@ public TradeHistoryParams createFundingHistoryParams() { } @Override - public List getFundingHistory(TradeHistoryParams params) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { + public List getFundingHistory( + TradeHistoryParams params) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { throw new NotYetImplementedForExchangeException(); } } diff --git a/xchange-cryptofacilities/src/main/java/org/knowm/xchange/cryptofacilities/service/CryptoFacilitiesTradeService.java b/xchange-cryptofacilities/src/main/java/org/knowm/xchange/cryptofacilities/service/CryptoFacilitiesTradeService.java index d94b3eef2ea..52b0453a38b 100644 --- a/xchange-cryptofacilities/src/main/java/org/knowm/xchange/cryptofacilities/service/CryptoFacilitiesTradeService.java +++ b/xchange-cryptofacilities/src/main/java/org/knowm/xchange/cryptofacilities/service/CryptoFacilitiesTradeService.java @@ -39,7 +39,8 @@ public OpenOrders getOpenOrders() throws IOException { } @Override - public OpenOrders getOpenOrders(OpenOrdersParams params) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { + public OpenOrders getOpenOrders( + OpenOrdersParams params) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { return CryptoFacilitiesAdapters.adaptOpenOrders(super.getCryptoFacilitiesOpenOrders()); } @@ -80,8 +81,8 @@ public OpenOrdersParams createOpenOrdersParams() { } @Override - public Collection getOrder(String... orderIds) - throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { + public Collection getOrder( + String... orderIds) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { throw new NotYetImplementedForExchangeException(); } diff --git a/xchange-empoex/src/main/java/org/knowm/xchange/empoex/EmpoExAuthenticated.java b/xchange-empoex/src/main/java/org/knowm/xchange/empoex/EmpoExAuthenticated.java index 4c9082f92ff..1521e076b59 100644 --- a/xchange-empoex/src/main/java/org/knowm/xchange/empoex/EmpoExAuthenticated.java +++ b/xchange-empoex/src/main/java/org/knowm/xchange/empoex/EmpoExAuthenticated.java @@ -30,8 +30,8 @@ public interface EmpoExAuthenticated extends EmpoEx { @GET @Path("trade/cancel/{apiKey}/{orderId}/") - Map cancelEmpoExOrder(@PathParam("apiKey") String apiKey, @PathParam("orderId") String orderId) - throws IOException, EmpoExException; + Map cancelEmpoExOrder(@PathParam("apiKey") String apiKey, + @PathParam("orderId") String orderId) throws IOException, EmpoExException; @GET @Path("trade/buy/{apiKey}/{pairString}/{amount}/{price}/") diff --git a/xchange-empoex/src/main/java/org/knowm/xchange/empoex/dto/marketdata/EmpoExTicker.java b/xchange-empoex/src/main/java/org/knowm/xchange/empoex/dto/marketdata/EmpoExTicker.java index c68ce86a1d8..896af8b8abb 100644 --- a/xchange-empoex/src/main/java/org/knowm/xchange/empoex/dto/marketdata/EmpoExTicker.java +++ b/xchange-empoex/src/main/java/org/knowm/xchange/empoex/dto/marketdata/EmpoExTicker.java @@ -15,7 +15,7 @@ @JsonInclude(JsonInclude.Include.NON_NULL) @Generated("org.jsonschema2pojo") @JsonPropertyOrder({"pairname", "last", "base_volume_24hr", "low", "high", "bid", "ask", "open_buy_volume", "open_sell_volume", - "open_buy_volume_base", "open_sell_volume_base", "change"}) + "open_buy_volume_base", "open_sell_volume_base", "change"}) public class EmpoExTicker { @JsonProperty("pairname") diff --git a/xchange-empoex/src/main/java/org/knowm/xchange/empoex/service/EmpoExAccountService.java b/xchange-empoex/src/main/java/org/knowm/xchange/empoex/service/EmpoExAccountService.java index 4860da81c1b..e8f21450448 100644 --- a/xchange-empoex/src/main/java/org/knowm/xchange/empoex/service/EmpoExAccountService.java +++ b/xchange-empoex/src/main/java/org/knowm/xchange/empoex/service/EmpoExAccountService.java @@ -52,7 +52,8 @@ public TradeHistoryParams createFundingHistoryParams() { } @Override - public List getFundingHistory(TradeHistoryParams params) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { + public List getFundingHistory( + TradeHistoryParams params) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { throw new NotYetImplementedForExchangeException(); } } diff --git a/xchange-empoex/src/main/java/org/knowm/xchange/empoex/service/EmpoExTradeService.java b/xchange-empoex/src/main/java/org/knowm/xchange/empoex/service/EmpoExTradeService.java index 32ea140f012..a7eaa01e965 100644 --- a/xchange-empoex/src/main/java/org/knowm/xchange/empoex/service/EmpoExTradeService.java +++ b/xchange-empoex/src/main/java/org/knowm/xchange/empoex/service/EmpoExTradeService.java @@ -36,7 +36,8 @@ public OpenOrders getOpenOrders() throws IOException { } @Override - public OpenOrders getOpenOrders(OpenOrdersParams params) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { + public OpenOrders getOpenOrders( + OpenOrdersParams params) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { return EmpoExAdapters.adaptOpenOrders(super.getEmpoExOpenOrders()); } @@ -80,8 +81,8 @@ public OpenOrdersParams createOpenOrdersParams() { } @Override - public Collection getOrder(String... orderIds) - throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { + public Collection getOrder( + String... orderIds) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { throw new NotYetImplementedForExchangeException(); } diff --git a/xchange-examples/src/main/java/org/knowm/xchange/examples/btcchina/account/BTCChinaAccountDemo.java b/xchange-examples/src/main/java/org/knowm/xchange/examples/btcchina/account/BTCChinaAccountDemo.java index 65b465e1524..3716682cf2c 100644 --- a/xchange-examples/src/main/java/org/knowm/xchange/examples/btcchina/account/BTCChinaAccountDemo.java +++ b/xchange-examples/src/main/java/org/knowm/xchange/examples/btcchina/account/BTCChinaAccountDemo.java @@ -23,14 +23,14 @@ /** * @author ObsessiveOrange - *

    - * Example showing the following: - *

    - *
      - *
    • Connect to BTCChina exchange with authentication
      • - *
    • View account balance
      • - *
    • Get the bitcoin deposit address
      • - *
    + *

    + * Example showing the following: + *

    + *
      + *
    • Connect to BTCChina exchange with authentication
      • + *
    • View account balance
      • + *
    • Get the bitcoin deposit address
      • + *
    */ public class BTCChinaAccountDemo { diff --git a/xchange-examples/src/main/java/org/knowm/xchange/examples/btcchina/trade/BTCChinaTradeDemo.java b/xchange-examples/src/main/java/org/knowm/xchange/examples/btcchina/trade/BTCChinaTradeDemo.java index f7e2624f9e0..64838807887 100644 --- a/xchange-examples/src/main/java/org/knowm/xchange/examples/btcchina/trade/BTCChinaTradeDemo.java +++ b/xchange-examples/src/main/java/org/knowm/xchange/examples/btcchina/trade/BTCChinaTradeDemo.java @@ -19,13 +19,13 @@ /** * @author ObsessiveOrange - *

    - * Example showing the following: - *

    - *
      - *
    • Connect to BTCChina exchange with authentication
      • - *
    • Enter, review and cancel limit orders
      • - *
    + *

    + * Example showing the following: + *

    + *
      + *
    • Connect to BTCChina exchange with authentication
      • + *
    • Enter, review and cancel limit orders
      • + *
    */ public class BTCChinaTradeDemo { diff --git a/xchange-examples/src/main/java/org/knowm/xchange/examples/btcchina/trade/BTCChinaTradeStat.java b/xchange-examples/src/main/java/org/knowm/xchange/examples/btcchina/trade/BTCChinaTradeStat.java index 29f04fe3133..88b2f54eb31 100644 --- a/xchange-examples/src/main/java/org/knowm/xchange/examples/btcchina/trade/BTCChinaTradeStat.java +++ b/xchange-examples/src/main/java/org/knowm/xchange/examples/btcchina/trade/BTCChinaTradeStat.java @@ -58,7 +58,7 @@ private List getUserTrades(Date startTime, Date endTime) throws IOExc final String type = "all"; final Integer startId = null; - for (int pageNumber = 0; ; pageNumber++) { + for (int pageNumber = 0;; pageNumber++) { log.trace("pageNumber: {}", pageNumber); final BTCChinaTradeHistoryParams params = new BTCChinaTradeHistoryParams(pageLength, pageNumber, type, startTime, startId); diff --git a/xchange-examples/src/main/java/org/knowm/xchange/examples/btce/meta/BTCEMetaDataDemo.java b/xchange-examples/src/main/java/org/knowm/xchange/examples/btce/meta/BTCEMetaDataDemo.java index 1af1f75e179..f6b3e32f05d 100644 --- a/xchange-examples/src/main/java/org/knowm/xchange/examples/btce/meta/BTCEMetaDataDemo.java +++ b/xchange-examples/src/main/java/org/knowm/xchange/examples/btce/meta/BTCEMetaDataDemo.java @@ -45,8 +45,7 @@ private static void generic(Exchange exchange) throws IOException { ExchangeMetaData metaData = (ExchangeMetaData) exchange.getExchangeMetaData(); System.out.println("BTCE generic meta data: " + metaData); - exchange.getTradeService() - .verifyOrder(new MarketOrder.Builder(Order.OrderType.ASK, CurrencyPair.BTC_EUR).tradableAmount(BigDecimal.ONE).build()); + exchange.getTradeService().verifyOrder(new MarketOrder.Builder(Order.OrderType.ASK, CurrencyPair.BTC_EUR).tradableAmount(BigDecimal.ONE).build()); } } diff --git a/xchange-examples/src/main/java/org/knowm/xchange/examples/ccex/marketdata/DepthChartDemo.java b/xchange-examples/src/main/java/org/knowm/xchange/examples/ccex/marketdata/DepthChartDemo.java index 85ee95d48f0..60451561399 100644 --- a/xchange-examples/src/main/java/org/knowm/xchange/examples/ccex/marketdata/DepthChartDemo.java +++ b/xchange-examples/src/main/java/org/knowm/xchange/examples/ccex/marketdata/DepthChartDemo.java @@ -41,13 +41,13 @@ public static void main(String[] args) throws IOException { System.out.println("received data."); for (LimitOrder limitOrder : orderBook.getBids()) { - System.out.println(limitOrder.getType() + " " + limitOrder.getCurrencyPair() + " Limit price: " - + limitOrder.getLimitPrice() + " Amount: " + limitOrder.getTradableAmount()); + System.out.println(limitOrder.getType() + " " + limitOrder.getCurrencyPair() + " Limit price: " + limitOrder.getLimitPrice() + " Amount: " + + limitOrder.getTradableAmount()); } for (LimitOrder limitOrder : orderBook.getAsks()) { - System.out.println(limitOrder.getType() + " " + limitOrder.getCurrencyPair() + " Limit price: " - + limitOrder.getLimitPrice() + " Amount: " + limitOrder.getTradableAmount()); + System.out.println(limitOrder.getType() + " " + limitOrder.getCurrencyPair() + " Limit price: " + limitOrder.getLimitPrice() + " Amount: " + + limitOrder.getTradableAmount()); } System.out.println("plotting..."); diff --git a/xchange-examples/src/main/java/org/knowm/xchange/examples/ccex/marketdata/OrderBookDemo.java b/xchange-examples/src/main/java/org/knowm/xchange/examples/ccex/marketdata/OrderBookDemo.java index 2178e91227e..70ccd87b423 100644 --- a/xchange-examples/src/main/java/org/knowm/xchange/examples/ccex/marketdata/OrderBookDemo.java +++ b/xchange-examples/src/main/java/org/knowm/xchange/examples/ccex/marketdata/OrderBookDemo.java @@ -30,13 +30,13 @@ public static void main(String[] args) throws IOException { System.out.println("received data."); for (LimitOrder limitOrder : orderBook.getBids()) { - System.out.println(limitOrder.getType() + " " + limitOrder.getCurrencyPair() + " Limit price: " - + limitOrder.getLimitPrice() + " Amount: " + limitOrder.getTradableAmount()); + System.out.println(limitOrder.getType() + " " + limitOrder.getCurrencyPair() + " Limit price: " + limitOrder.getLimitPrice() + " Amount: " + + limitOrder.getTradableAmount()); } for (LimitOrder limitOrder : orderBook.getAsks()) { - System.out.println(limitOrder.getType() + " " + limitOrder.getCurrencyPair() + " Limit price: " - + limitOrder.getLimitPrice() + " Amount: " + limitOrder.getTradableAmount()); + System.out.println(limitOrder.getType() + " " + limitOrder.getCurrencyPair() + " Limit price: " + limitOrder.getLimitPrice() + " Amount: " + + limitOrder.getTradableAmount()); } } diff --git a/xchange-examples/src/main/java/org/knowm/xchange/examples/cexio/trade/TradeDemo.java b/xchange-examples/src/main/java/org/knowm/xchange/examples/cexio/trade/TradeDemo.java index e82c7817079..2c89fd3f74f 100644 --- a/xchange-examples/src/main/java/org/knowm/xchange/examples/cexio/trade/TradeDemo.java +++ b/xchange-examples/src/main/java/org/knowm/xchange/examples/cexio/trade/TradeDemo.java @@ -34,8 +34,8 @@ public static void main(String[] args) throws IOException { } - private static void generic(TradeService tradeService) - throws NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { + private static void generic( + TradeService tradeService) throws NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { printOpenOrders(tradeService); diff --git a/xchange-examples/src/main/java/org/knowm/xchange/examples/core/utils/RetriesDemo.java b/xchange-examples/src/main/java/org/knowm/xchange/examples/core/utils/RetriesDemo.java index 78110994823..428462dd6b8 100644 --- a/xchange-examples/src/main/java/org/knowm/xchange/examples/core/utils/RetriesDemo.java +++ b/xchange-examples/src/main/java/org/knowm/xchange/examples/core/utils/RetriesDemo.java @@ -41,8 +41,8 @@ public static void main(String[] args) throws Exception { } - private static void getMarketDataTooFastWithoutRetries(MarketDataService service, CurrencyPair cp) - throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { + private static void getMarketDataTooFastWithoutRetries(MarketDataService service, + CurrencyPair cp) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { System.out.println("Polling for orderbooks too fast without using Retries:"); for (int i = 0; i < 50; i++) { diff --git a/xchange-examples/src/main/java/org/knowm/xchange/examples/livecoin/marketdata/OrderBookDemo.java b/xchange-examples/src/main/java/org/knowm/xchange/examples/livecoin/marketdata/OrderBookDemo.java index e4734ddf6a6..5a1ffa4a213 100644 --- a/xchange-examples/src/main/java/org/knowm/xchange/examples/livecoin/marketdata/OrderBookDemo.java +++ b/xchange-examples/src/main/java/org/knowm/xchange/examples/livecoin/marketdata/OrderBookDemo.java @@ -30,13 +30,13 @@ public static void main(String[] args) throws IOException { System.out.println("received data."); for (LimitOrder limitOrder : orderBook.getBids()) { - System.out.println(limitOrder.getType() + " " + limitOrder.getCurrencyPair() + " Limit price: " - + limitOrder.getLimitPrice() + " Amount: " + limitOrder.getTradableAmount()); + System.out.println(limitOrder.getType() + " " + limitOrder.getCurrencyPair() + " Limit price: " + limitOrder.getLimitPrice() + " Amount: " + + limitOrder.getTradableAmount()); } for (LimitOrder limitOrder : orderBook.getAsks()) { - System.out.println(limitOrder.getType() + " " + limitOrder.getCurrencyPair() + " Limit price: " - + limitOrder.getLimitPrice() + " Amount: " + limitOrder.getTradableAmount()); + System.out.println(limitOrder.getType() + " " + limitOrder.getCurrencyPair() + " Limit price: " + limitOrder.getLimitPrice() + " Amount: " + + limitOrder.getTradableAmount()); } } diff --git a/xchange-examples/src/main/java/org/knowm/xchange/examples/livecoin/marketdata/TradeDemo.java b/xchange-examples/src/main/java/org/knowm/xchange/examples/livecoin/marketdata/TradeDemo.java index ce2c9417b36..9c5d73cc309 100644 --- a/xchange-examples/src/main/java/org/knowm/xchange/examples/livecoin/marketdata/TradeDemo.java +++ b/xchange-examples/src/main/java/org/knowm/xchange/examples/livecoin/marketdata/TradeDemo.java @@ -29,8 +29,7 @@ public static void main(String[] args) throws IOException { System.out.println("received data."); for (Trade trade : trades.getTrades()) { - System.out.println(trade.getType() + " " + trade.getCurrencyPair() + " Price: " - + trade.getPrice() + " Amount: " + trade.getTradableAmount()); + System.out.println(trade.getType() + " " + trade.getCurrencyPair() + " Price: " + trade.getPrice() + " Amount: " + trade.getTradableAmount()); } } diff --git a/xchange-examples/src/main/java/org/knowm/xchange/examples/yobit/marketdata/YoBitBookDemo.java b/xchange-examples/src/main/java/org/knowm/xchange/examples/yobit/marketdata/YoBitBookDemo.java index e1c0e0ac977..90911ac6bfd 100644 --- a/xchange-examples/src/main/java/org/knowm/xchange/examples/yobit/marketdata/YoBitBookDemo.java +++ b/xchange-examples/src/main/java/org/knowm/xchange/examples/yobit/marketdata/YoBitBookDemo.java @@ -30,13 +30,13 @@ public static void main(String[] args) throws IOException { System.out.println("received data."); for (LimitOrder limitOrder : orderBook.getBids()) { - System.out.println(limitOrder.getType() + " " + limitOrder.getCurrencyPair() + " Limit price: " - + limitOrder.getLimitPrice() + " Amount: " + limitOrder.getTradableAmount()); + System.out.println(limitOrder.getType() + " " + limitOrder.getCurrencyPair() + " Limit price: " + limitOrder.getLimitPrice() + " Amount: " + + limitOrder.getTradableAmount()); } for (LimitOrder limitOrder : orderBook.getAsks()) { - System.out.println(limitOrder.getType() + " " + limitOrder.getCurrencyPair() + " Limit price: " - + limitOrder.getLimitPrice() + " Amount: " + limitOrder.getTradableAmount()); + System.out.println(limitOrder.getType() + " " + limitOrder.getCurrencyPair() + " Limit price: " + limitOrder.getLimitPrice() + " Amount: " + + limitOrder.getTradableAmount()); } } diff --git a/xchange-examples/src/main/java/org/knowm/xchange/examples/yobit/marketdata/YoBitTradeDemo.java b/xchange-examples/src/main/java/org/knowm/xchange/examples/yobit/marketdata/YoBitTradeDemo.java index d1b6a5bd559..1b20b903864 100644 --- a/xchange-examples/src/main/java/org/knowm/xchange/examples/yobit/marketdata/YoBitTradeDemo.java +++ b/xchange-examples/src/main/java/org/knowm/xchange/examples/yobit/marketdata/YoBitTradeDemo.java @@ -29,8 +29,7 @@ public static void main(String[] args) throws IOException { System.out.println("received data."); for (Trade trade : trades.getTrades()) { - System.out.println(trade.getType() + " " + trade.getCurrencyPair() + " Price: " - + trade.getPrice() + " Amount: " + trade.getTradableAmount()); + System.out.println(trade.getType() + " " + trade.getCurrencyPair() + " Price: " + trade.getPrice() + " Amount: " + trade.getTradableAmount()); } } diff --git a/xchange-gatecoin/src/main/java/org/knowm/xchange/gatecoin/GatecoinAuthenticated.java b/xchange-gatecoin/src/main/java/org/knowm/xchange/gatecoin/GatecoinAuthenticated.java index 3c43609b0b1..282be4bf163 100644 --- a/xchange-gatecoin/src/main/java/org/knowm/xchange/gatecoin/GatecoinAuthenticated.java +++ b/xchange-gatecoin/src/main/java/org/knowm/xchange/gatecoin/GatecoinAuthenticated.java @@ -46,8 +46,8 @@ GatecoinPlaceOrderResult placeOrder(@HeaderParam("API_PUBLIC_KEY") String public @Path("Trade/Orders") @Consumes(MediaType.APPLICATION_FORM_URLENCODED) GatecoinCancelOrderResult cancelAllOrders(@HeaderParam("API_PUBLIC_KEY") String publicKey, - @HeaderParam("API_REQUEST_SIGNATURE") ParamsDigest signature, @HeaderParam("API_REQUEST_DATE") String date) - throws IOException, GatecoinException; + @HeaderParam("API_REQUEST_SIGNATURE") ParamsDigest signature, + @HeaderParam("API_REQUEST_DATE") String date) throws IOException, GatecoinException; @DELETE @Path("Trade/Orders/{OrderId}") @@ -58,14 +58,14 @@ GatecoinCancelOrderResult cancelOrder(@HeaderParam("API_PUBLIC_KEY") String publ @GET @Path("Trade/Trades") GatecoinTradeHistoryResult getUserTrades(@HeaderParam("API_PUBLIC_KEY") String publicKey, - @HeaderParam("API_REQUEST_SIGNATURE") ParamsDigest signature, @HeaderParam("API_REQUEST_DATE") String date) - throws IOException, GatecoinException; + @HeaderParam("API_REQUEST_SIGNATURE") ParamsDigest signature, + @HeaderParam("API_REQUEST_DATE") String date) throws IOException, GatecoinException; @GET @Path("Trade/Trades") GatecoinTradeHistoryResult getUserTrades(@HeaderParam("API_PUBLIC_KEY") String publicKey, - @HeaderParam("API_REQUEST_SIGNATURE") ParamsDigest signature, @HeaderParam("API_REQUEST_DATE") String date, @QueryParam("Count") int Count) - throws IOException, GatecoinException; + @HeaderParam("API_REQUEST_SIGNATURE") ParamsDigest signature, @HeaderParam("API_REQUEST_DATE") String date, + @QueryParam("Count") int Count) throws IOException, GatecoinException; @GET @Path("Trade/Trades") @@ -76,21 +76,21 @@ GatecoinTradeHistoryResult getUserTrades(@HeaderParam("API_PUBLIC_KEY") String p @GET @Path("Balance/Balances") GatecoinBalanceResult getUserBalance(@HeaderParam("API_PUBLIC_KEY") String publicKey, @HeaderParam("API_USER_ID") String userId, - @HeaderParam("API_REQUEST_SIGNATURE") ParamsDigest signature, @HeaderParam("API_REQUEST_DATE") String date) - throws IOException, GatecoinException; + @HeaderParam("API_REQUEST_SIGNATURE") ParamsDigest signature, + @HeaderParam("API_REQUEST_DATE") String date) throws IOException, GatecoinException; @GET @Path("ElectronicWallet/DepositWallets") GatecoinDepositAddressResult getDepositAddress(@HeaderParam("API_PUBLIC_KEY") String publicKey, - @HeaderParam("API_REQUEST_SIGNATURE") ParamsDigest signature, @HeaderParam("API_REQUEST_DATE") String date) - throws IOException, GatecoinException; + @HeaderParam("API_REQUEST_SIGNATURE") ParamsDigest signature, + @HeaderParam("API_REQUEST_DATE") String date) throws IOException, GatecoinException; @POST @Path("ElectronicWallet/Withdrawals/{DigiCurrency}") @Consumes(MediaType.APPLICATION_FORM_URLENCODED) GatecoinWithdrawResult withdrawBitcoin(@HeaderParam("API_PUBLIC_KEY") String publicKey, @HeaderParam("API_REQUEST_SIGNATURE") ParamsDigest signature, @HeaderParam("API_REQUEST_DATE") String date, - @PathParam("DigiCurrency") String DigiCurrency, @FormParam("AddressName") String AddressName, @FormParam("Amount") BigDecimal Amount) - throws IOException, GatecoinException; + @PathParam("DigiCurrency") String DigiCurrency, @FormParam("AddressName") String AddressName, + @FormParam("Amount") BigDecimal Amount) throws IOException, GatecoinException; } diff --git a/xchange-gatecoin/src/main/java/org/knowm/xchange/gatecoin/service/GatecoinAccountService.java b/xchange-gatecoin/src/main/java/org/knowm/xchange/gatecoin/service/GatecoinAccountService.java index abf4e91943e..fe7cbb74344 100644 --- a/xchange-gatecoin/src/main/java/org/knowm/xchange/gatecoin/service/GatecoinAccountService.java +++ b/xchange-gatecoin/src/main/java/org/knowm/xchange/gatecoin/service/GatecoinAccountService.java @@ -70,7 +70,8 @@ public TradeHistoryParams createFundingHistoryParams() { } @Override - public List getFundingHistory(TradeHistoryParams params) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { + public List getFundingHistory( + TradeHistoryParams params) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { throw new NotYetImplementedForExchangeException(); } } diff --git a/xchange-gatecoin/src/main/java/org/knowm/xchange/gatecoin/service/GatecoinTradeService.java b/xchange-gatecoin/src/main/java/org/knowm/xchange/gatecoin/service/GatecoinTradeService.java index 60e76e6b9d9..de0e616dbbe 100644 --- a/xchange-gatecoin/src/main/java/org/knowm/xchange/gatecoin/service/GatecoinTradeService.java +++ b/xchange-gatecoin/src/main/java/org/knowm/xchange/gatecoin/service/GatecoinTradeService.java @@ -51,7 +51,8 @@ public OpenOrders getOpenOrders() throws IOException { } @Override - public OpenOrders getOpenOrders(OpenOrdersParams params) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { + public OpenOrders getOpenOrders( + OpenOrdersParams params) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { GatecoinOrderResult openOrdersResult = getGatecoinOpenOrders(); List limitOrders = new ArrayList<>(); @@ -143,8 +144,8 @@ public OpenOrdersParams createOpenOrdersParams() { } @Override - public Collection getOrder(String... orderIds) - throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { + public Collection getOrder( + String... orderIds) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { throw new NotYetImplementedForExchangeException(); } diff --git a/xchange-gdax/src/main/java/org/knowm/xchange/gdax/GDAX.java b/xchange-gdax/src/main/java/org/knowm/xchange/gdax/GDAX.java index 8101ddcf175..daa46035f63 100644 --- a/xchange-gdax/src/main/java/org/knowm/xchange/gdax/GDAX.java +++ b/xchange-gdax/src/main/java/org/knowm/xchange/gdax/GDAX.java @@ -38,13 +38,13 @@ public interface GDAX { @GET @Path("products/{baseCurrency}-{targetCurrency}/ticker") - GDAXProductTicker getProductTicker(@PathParam("baseCurrency") String baseCurrency, @PathParam("targetCurrency") String targetCurrency) - throws IOException; + GDAXProductTicker getProductTicker(@PathParam("baseCurrency") String baseCurrency, + @PathParam("targetCurrency") String targetCurrency) throws IOException; @GET @Path("products/{baseCurrency}-{targetCurrency}/stats") - GDAXProductStats getProductStats(@PathParam("baseCurrency") String baseCurrency, @PathParam("targetCurrency") String targetCurrency) - throws IOException; + GDAXProductStats getProductStats(@PathParam("baseCurrency") String baseCurrency, + @PathParam("targetCurrency") String targetCurrency) throws IOException; @GET @Path("products/{baseCurrency}-{targetCurrency}/book?level={level}") diff --git a/xchange-gdax/src/main/java/org/knowm/xchange/gdax/dto/trade/GDAXFill.java b/xchange-gdax/src/main/java/org/knowm/xchange/gdax/dto/trade/GDAXFill.java index f5b4a171441..6f2cab6e059 100644 --- a/xchange-gdax/src/main/java/org/knowm/xchange/gdax/dto/trade/GDAXFill.java +++ b/xchange-gdax/src/main/java/org/knowm/xchange/gdax/dto/trade/GDAXFill.java @@ -19,10 +19,10 @@ public class GDAXFill { private final boolean settled; private final String side; - public GDAXFill(@JsonProperty("trade_id") String tradeId, @JsonProperty("product_id") String productId, - @JsonProperty("price") BigDecimal price, @JsonProperty("size") BigDecimal size, @JsonProperty("order_id") String orderId, - @JsonProperty("created_at") String createdAt, @JsonProperty("liquidity") String liquidity, @JsonProperty("fee") BigDecimal fee, - @JsonProperty("settled") boolean settled, @JsonProperty("side") String side) { + public GDAXFill(@JsonProperty("trade_id") String tradeId, @JsonProperty("product_id") String productId, @JsonProperty("price") BigDecimal price, + @JsonProperty("size") BigDecimal size, @JsonProperty("order_id") String orderId, @JsonProperty("created_at") String createdAt, + @JsonProperty("liquidity") String liquidity, @JsonProperty("fee") BigDecimal fee, @JsonProperty("settled") boolean settled, + @JsonProperty("side") String side) { this.tradeId = tradeId; this.productId = productId; this.price = price; diff --git a/xchange-gdax/src/main/java/org/knowm/xchange/gdax/service/GDAXAccountService.java b/xchange-gdax/src/main/java/org/knowm/xchange/gdax/service/GDAXAccountService.java index b1488dd509d..bd139d6920b 100644 --- a/xchange-gdax/src/main/java/org/knowm/xchange/gdax/service/GDAXAccountService.java +++ b/xchange-gdax/src/main/java/org/knowm/xchange/gdax/service/GDAXAccountService.java @@ -25,14 +25,13 @@ public GDAXAccountService(Exchange exchange) { } @Override - public AccountInfo getAccountInfo() - throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { + public AccountInfo getAccountInfo() throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { return new AccountInfo(GDAXAdapters.adaptAccountInfo(getCoinbaseExAccountInfo())); } @Override - public String withdrawFunds(Currency currency, BigDecimal amount, String address) - throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { + public String withdrawFunds(Currency currency, BigDecimal amount, + String address) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { GDAXAccount[] accounts = getCoinbaseExAccountInfo(); String accountId = null; for (GDAXAccount account : accounts) { @@ -51,8 +50,8 @@ public String withdrawFunds(Currency currency, BigDecimal amount, String address } @Override - public String requestDepositAddress(Currency currency, String... args) - throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { + public String requestDepositAddress(Currency currency, + String... args) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { throw new NotYetImplementedForExchangeException(); } @@ -62,7 +61,8 @@ public TradeHistoryParams createFundingHistoryParams() { } @Override - public List getFundingHistory(TradeHistoryParams params) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { + public List getFundingHistory( + TradeHistoryParams params) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { throw new NotYetImplementedForExchangeException(); } } diff --git a/xchange-gdax/src/main/java/org/knowm/xchange/gdax/service/GDAXTradeService.java b/xchange-gdax/src/main/java/org/knowm/xchange/gdax/service/GDAXTradeService.java index 5155366aa91..f27d5f20adb 100644 --- a/xchange-gdax/src/main/java/org/knowm/xchange/gdax/service/GDAXTradeService.java +++ b/xchange-gdax/src/main/java/org/knowm/xchange/gdax/service/GDAXTradeService.java @@ -34,23 +34,24 @@ public OpenOrders getOpenOrders() throws ExchangeException, NotAvailableFromExch } @Override - public OpenOrders getOpenOrders(OpenOrdersParams params) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { + public OpenOrders getOpenOrders( + OpenOrdersParams params) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { GDAXOrder[] coinbaseExOpenOrders = getCoinbaseExOpenOrders(); return GDAXAdapters.adaptOpenOrders(coinbaseExOpenOrders); } @Override - public String placeMarketOrder(MarketOrder marketOrder) - throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { + public String placeMarketOrder( + MarketOrder marketOrder) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { GDAXIdResponse response = placeCoinbaseExMarketOrder(marketOrder); return response.getId(); } @Override - public String placeLimitOrder(LimitOrder limitOrder) - throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { + public String placeLimitOrder( + LimitOrder limitOrder) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { GDAXIdResponse response = placeCoinbaseExLimitOrder(limitOrder); @@ -58,8 +59,8 @@ public String placeLimitOrder(LimitOrder limitOrder) } @Override - public boolean cancelOrder(String orderId) - throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { + public boolean cancelOrder( + String orderId) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { return cancelCoinbaseExOrder(orderId); } @@ -81,8 +82,8 @@ public OpenOrdersParams createOpenOrdersParams() { } @Override - public Collection getOrder(String... orderIds) - throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { + public Collection getOrder( + String... orderIds) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { throw new NotYetImplementedForExchangeException(); } } diff --git a/xchange-gemini/src/main/java/org/knowm/xchange/gemini/v1/Gemini.java b/xchange-gemini/src/main/java/org/knowm/xchange/gemini/v1/Gemini.java index 1710b32a1f4..b15236ef05f 100644 --- a/xchange-gemini/src/main/java/org/knowm/xchange/gemini/v1/Gemini.java +++ b/xchange-gemini/src/main/java/org/knowm/xchange/gemini/v1/Gemini.java @@ -27,8 +27,8 @@ public interface Gemini { @GET @Path("book/{symbol}") - GeminiDepth getBook(@PathParam("symbol") String symbol, @QueryParam("limit_bids") int limit_bids, @QueryParam("limit_asks") int limit_asks) - throws IOException, GeminiException; + GeminiDepth getBook(@PathParam("symbol") String symbol, @QueryParam("limit_bids") int limit_bids, + @QueryParam("limit_asks") int limit_asks) throws IOException, GeminiException; @GET @Path("book/{symbol}") @@ -45,8 +45,8 @@ GeminiLendDepth getLendBook(@PathParam("currency") String currency, @QueryParam( @GET @Path("lends/{currency}") - GeminiLend[] getLends(@PathParam("currency") String currency, @QueryParam("timestamp") long timestamp, @QueryParam("limit_trades") int limit_trades) - throws IOException, GeminiException; + GeminiLend[] getLends(@PathParam("currency") String currency, @QueryParam("timestamp") long timestamp, + @QueryParam("limit_trades") int limit_trades) throws IOException, GeminiException; @GET @Path("symbols") diff --git a/xchange-gemini/src/main/java/org/knowm/xchange/gemini/v1/GeminiOrderType.java b/xchange-gemini/src/main/java/org/knowm/xchange/gemini/v1/GeminiOrderType.java index 55fa51fc96d..31042b3837f 100644 --- a/xchange-gemini/src/main/java/org/knowm/xchange/gemini/v1/GeminiOrderType.java +++ b/xchange-gemini/src/main/java/org/knowm/xchange/gemini/v1/GeminiOrderType.java @@ -4,7 +4,7 @@ public enum GeminiOrderType { MARKET("exchange market"), LIMIT("exchange limit"), STOP("exchange stop"), TRAILING_STOP("exchange trailing-stop"), FILL_OR_KILL( "exchange fill-or-kill"), MARGIN_MARKET( - "market"), MARGIN_LIMIT("limit"), MARGIN_STOP("stop"), MARGIN_TRAILING_STOP("trailing-stop"), MARGIN_FILL_OR_KILL("fill-or-kill"); + "market"), MARGIN_LIMIT("limit"), MARGIN_STOP("stop"), MARGIN_TRAILING_STOP("trailing-stop"), MARGIN_FILL_OR_KILL("fill-or-kill"); private String value; diff --git a/xchange-gemini/src/main/java/org/knowm/xchange/gemini/v1/dto/account/GeminiMarginInfosResponse.java b/xchange-gemini/src/main/java/org/knowm/xchange/gemini/v1/dto/account/GeminiMarginInfosResponse.java index 49ca5cd6009..9d8203feddd 100644 --- a/xchange-gemini/src/main/java/org/knowm/xchange/gemini/v1/dto/account/GeminiMarginInfosResponse.java +++ b/xchange-gemini/src/main/java/org/knowm/xchange/gemini/v1/dto/account/GeminiMarginInfosResponse.java @@ -18,7 +18,7 @@ @JsonInclude(JsonInclude.Include.NON_NULL) @Generated("org.jsonschema2pojo") @JsonPropertyOrder({"margin_balance", "tradable_balance", "unrealized_pl", "unrealized_swap", "net_value", "required_margin", "leverage", - "margin_requirement", "margin_limits", "message"}) + "margin_requirement", "margin_limits", "message"}) public class GeminiMarginInfosResponse { @JsonProperty("margin_balance") diff --git a/xchange-gemini/src/main/java/org/knowm/xchange/gemini/v1/service/GeminiAccountService.java b/xchange-gemini/src/main/java/org/knowm/xchange/gemini/v1/service/GeminiAccountService.java index c91b969c969..c520ebb1fda 100644 --- a/xchange-gemini/src/main/java/org/knowm/xchange/gemini/v1/service/GeminiAccountService.java +++ b/xchange-gemini/src/main/java/org/knowm/xchange/gemini/v1/service/GeminiAccountService.java @@ -69,7 +69,8 @@ public TradeHistoryParams createFundingHistoryParams() { } @Override - public List getFundingHistory(TradeHistoryParams params) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { + public List getFundingHistory( + TradeHistoryParams params) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { throw new NotYetImplementedForExchangeException(); } } diff --git a/xchange-gemini/src/main/java/org/knowm/xchange/gemini/v1/service/GeminiTradeService.java b/xchange-gemini/src/main/java/org/knowm/xchange/gemini/v1/service/GeminiTradeService.java index ce623bec9bf..d8cc2b782d1 100644 --- a/xchange-gemini/src/main/java/org/knowm/xchange/gemini/v1/service/GeminiTradeService.java +++ b/xchange-gemini/src/main/java/org/knowm/xchange/gemini/v1/service/GeminiTradeService.java @@ -43,7 +43,8 @@ public OpenOrders getOpenOrders() throws IOException { } @Override - public OpenOrders getOpenOrders(OpenOrdersParams params) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { + public OpenOrders getOpenOrders( + OpenOrdersParams params) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { GeminiOrderStatusResponse[] activeOrders = getGeminiOpenOrders(); if (activeOrders.length <= 0) { @@ -178,8 +179,8 @@ public void setCurrencyPair(CurrencyPair pair) { } @Override - public Collection getOrder(String... orderIds) - throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { + public Collection getOrder( + String... orderIds) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { throw new NotYetImplementedForExchangeException(); } diff --git a/xchange-hitbtc/src/main/java/org/knowm/xchange/hitbtc/Hitbtc.java b/xchange-hitbtc/src/main/java/org/knowm/xchange/hitbtc/Hitbtc.java index 546fcb96429..25b7b263b5f 100644 --- a/xchange-hitbtc/src/main/java/org/knowm/xchange/hitbtc/Hitbtc.java +++ b/xchange-hitbtc/src/main/java/org/knowm/xchange/hitbtc/Hitbtc.java @@ -58,7 +58,7 @@ HitbtcTrades getTrades(@PathParam("currencyPair") String currencyPair, @QueryPar @GET @Path("public/{currencyPair}/trades/recent") - HitbtcTrades getTradesRecent(@PathParam("currencyPair") String currencyPair, - @DefaultValue("1000") @QueryParam("max_results") String max_results, @DefaultValue("object") @QueryParam("format_item") String format_item, + HitbtcTrades getTradesRecent(@PathParam("currencyPair") String currencyPair, @DefaultValue("1000") @QueryParam("max_results") String max_results, + @DefaultValue("object") @QueryParam("format_item") String format_item, @DefaultValue("true") @QueryParam("side") String side) throws IOException, HitbtcException; } diff --git a/xchange-hitbtc/src/main/java/org/knowm/xchange/hitbtc/HitbtcAuthenticated.java b/xchange-hitbtc/src/main/java/org/knowm/xchange/hitbtc/HitbtcAuthenticated.java index 46b963193f6..567824506b8 100644 --- a/xchange-hitbtc/src/main/java/org/knowm/xchange/hitbtc/HitbtcAuthenticated.java +++ b/xchange-hitbtc/src/main/java/org/knowm/xchange/hitbtc/HitbtcAuthenticated.java @@ -70,7 +70,6 @@ HitbtcBalanceResponse getHitbtcBalance(@HeaderParam("X-Signature") ParamsDigest @GET @Path("payment/address/{currency}") - HitbtcDepositAddressResponse getHitbtcDepositAddress(@PathParam("currency") String currency, - @HeaderParam("X-Signature") ParamsDigest signature, @QueryParam("nonce") SynchronizedValueFactory valueFactory, - @QueryParam("apikey") String apiKey) throws IOException, HitbtcException; + HitbtcDepositAddressResponse getHitbtcDepositAddress(@PathParam("currency") String currency, @HeaderParam("X-Signature") ParamsDigest signature, + @QueryParam("nonce") SynchronizedValueFactory valueFactory, @QueryParam("apikey") String apiKey) throws IOException, HitbtcException; } diff --git a/xchange-hitbtc/src/main/java/org/knowm/xchange/hitbtc/service/HitbtcAccountService.java b/xchange-hitbtc/src/main/java/org/knowm/xchange/hitbtc/service/HitbtcAccountService.java index aacbe329800..3a9039d643f 100644 --- a/xchange-hitbtc/src/main/java/org/knowm/xchange/hitbtc/service/HitbtcAccountService.java +++ b/xchange-hitbtc/src/main/java/org/knowm/xchange/hitbtc/service/HitbtcAccountService.java @@ -54,7 +54,8 @@ public TradeHistoryParams createFundingHistoryParams() { } @Override - public List getFundingHistory(TradeHistoryParams params) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { + public List getFundingHistory( + TradeHistoryParams params) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { throw new NotYetImplementedForExchangeException(); } } diff --git a/xchange-hitbtc/src/main/java/org/knowm/xchange/hitbtc/service/HitbtcTradeService.java b/xchange-hitbtc/src/main/java/org/knowm/xchange/hitbtc/service/HitbtcTradeService.java index 5800d4099d3..0cc25172548 100644 --- a/xchange-hitbtc/src/main/java/org/knowm/xchange/hitbtc/service/HitbtcTradeService.java +++ b/xchange-hitbtc/src/main/java/org/knowm/xchange/hitbtc/service/HitbtcTradeService.java @@ -43,7 +43,8 @@ public OpenOrders getOpenOrders() throws IOException { } @Override - public OpenOrders getOpenOrders(OpenOrdersParams params) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { + public OpenOrders getOpenOrders( + OpenOrdersParams params) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { HitbtcOrder[] openOrdersRaw = getOpenOrdersRaw(); return HitbtcAdapters.adaptOpenOrders(openOrdersRaw); } @@ -136,8 +137,8 @@ public CurrencyPair getCurrencyPair() { } @Override - public Collection getOrder(String... orderIds) - throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { + public Collection getOrder( + String... orderIds) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { throw new NotYetImplementedForExchangeException(); } diff --git a/xchange-hitbtc/src/main/java/org/knowm/xchange/hitbtc/service/HitbtcTradeServiceRaw.java b/xchange-hitbtc/src/main/java/org/knowm/xchange/hitbtc/service/HitbtcTradeServiceRaw.java index 3b86096f6e6..7ac79ce9cb5 100644 --- a/xchange-hitbtc/src/main/java/org/knowm/xchange/hitbtc/service/HitbtcTradeServiceRaw.java +++ b/xchange-hitbtc/src/main/java/org/knowm/xchange/hitbtc/service/HitbtcTradeServiceRaw.java @@ -148,8 +148,8 @@ public HitbtcExecutionReportResponse cancelOrderRaw(String orderId) throws IOExc } } - public HitbtcExecutionReportResponse cancelOrderRaw(String clientOrderId, String cancelRequestClientOrderId, String symbol, String side) - throws IOException { + public HitbtcExecutionReportResponse cancelOrderRaw(String clientOrderId, String cancelRequestClientOrderId, String symbol, + String side) throws IOException { try { return hitbtc.postHitbtcCancelOrder(signatureCreator, exchange.getNonceFactory(), apiKey, clientOrderId, cancelRequestClientOrderId, symbol, diff --git a/xchange-huobi/src/main/java/org/knowm/xchange/huobi/BitVc.java b/xchange-huobi/src/main/java/org/knowm/xchange/huobi/BitVc.java index 31162c26c0b..479552e955c 100644 --- a/xchange-huobi/src/main/java/org/knowm/xchange/huobi/BitVc.java +++ b/xchange-huobi/src/main/java/org/knowm/xchange/huobi/BitVc.java @@ -51,8 +51,8 @@ BitVcAccountInfo getAccountInfo(@FormParam("access_key") String accessKey, @Form @POST @Path("api/order/list") - HuobiOrderResult getOrders(@FormParam("access_key") String accessKey, @FormParam("coin_type") int coinType, - @FormParam("created") long created, @FormParam("sign") ParamsDigest sign) throws IOException; + HuobiOrderResult getOrders(@FormParam("access_key") String accessKey, @FormParam("coin_type") int coinType, @FormParam("created") long created, + @FormParam("sign") ParamsDigest sign) throws IOException; @POST @Path("api/order/{id}") @@ -68,12 +68,12 @@ HuobiPlaceOrderResult placeLimitOrder(@FormParam("access_key") String accessKey, @POST @Path("api/order/{side}") HuobiPlaceOrderResult placeMarketOrder(@FormParam("access_key") String accessKey, @FormParam("amount") String amount, - @FormParam("coin_type") int coinType, @FormParam("created") long created, @FormParam("sign") ParamsDigest sign, @PathParam("side") String side) - throws IOException; + @FormParam("coin_type") int coinType, @FormParam("created") long created, @FormParam("sign") ParamsDigest sign, + @PathParam("side") String side) throws IOException; @POST @Path("api/order/cancel/{id2}") HuobiCancelOrderResult cancelOrder(@FormParam("access_key") String accessKey, @FormParam("coin_type") int coinType, - @FormParam("created") long created, @FormParam("id") long id, @FormParam("sign") ParamsDigest sign, @PathParam("id2") long id2) - throws IOException; + @FormParam("created") long created, @FormParam("id") long id, @FormParam("sign") ParamsDigest sign, + @PathParam("id2") long id2) throws IOException; } diff --git a/xchange-huobi/src/main/java/org/knowm/xchange/huobi/BitVcFutures.java b/xchange-huobi/src/main/java/org/knowm/xchange/huobi/BitVcFutures.java index 879100861c1..248ff33d813 100644 --- a/xchange-huobi/src/main/java/org/knowm/xchange/huobi/BitVcFutures.java +++ b/xchange-huobi/src/main/java/org/knowm/xchange/huobi/BitVcFutures.java @@ -46,31 +46,19 @@ public interface BitVcFutures { @POST @Path("order/save") - BitVcFuturesPlaceOrderResult placeLimitOrder( - @FormParam("accessKey") String accessKey, - @FormParam("coinType") int coinType, - @FormParam("contractType") String contractType, - @FormParam("created") long created, - @FormParam("sign") ParamsDigest sign, - @FormParam("orderType") int orderType, - @FormParam("tradeType") int tradeType, - @FormParam("price") double price, + BitVcFuturesPlaceOrderResult placeLimitOrder(@FormParam("accessKey") String accessKey, @FormParam("coinType") int coinType, + @FormParam("contractType") String contractType, @FormParam("created") long created, @FormParam("sign") ParamsDigest sign, + @FormParam("orderType") int orderType, @FormParam("tradeType") int tradeType, @FormParam("price") double price, @FormParam("money") double amount) throws IOException; @POST @Path("balance") - BitVcFuturesAccountInfo balance( - @FormParam("accessKey") String accessKey, - @FormParam("coinType") int coinType, - @FormParam("created") long created, + BitVcFuturesAccountInfo balance(@FormParam("accessKey") String accessKey, @FormParam("coinType") int coinType, @FormParam("created") long created, @FormParam("sign") ParamsDigest sign); @POST @Path("holdOrder/list") - BitVcFuturesPositionByContract positions( - @FormParam("accessKey") String accessKey, - @FormParam("coinType") int coinType, - @FormParam("created") long created, - @FormParam("sign") ParamsDigest sign); + BitVcFuturesPositionByContract positions(@FormParam("accessKey") String accessKey, @FormParam("coinType") int coinType, + @FormParam("created") long created, @FormParam("sign") ParamsDigest sign); } \ No newline at end of file diff --git a/xchange-huobi/src/main/java/org/knowm/xchange/huobi/BitVcFuturesAdapter.java b/xchange-huobi/src/main/java/org/knowm/xchange/huobi/BitVcFuturesAdapter.java index 01ae0cd29cf..3d731bac2e3 100644 --- a/xchange-huobi/src/main/java/org/knowm/xchange/huobi/BitVcFuturesAdapter.java +++ b/xchange-huobi/src/main/java/org/knowm/xchange/huobi/BitVcFuturesAdapter.java @@ -96,7 +96,8 @@ public static OpenOrders adaptOpenOrders(final BitVcFuturesPositionByContract po List orders = new ArrayList<>(weekPositions.length); for (BitVcFuturesPosition position : weekPositions) { - orders.add(new LimitOrder(position.getTradeType() == 1 ? OrderType.BID : OrderType.ASK, position.getAmount(), CurrencyPair.BTC_CNY, String.valueOf(position.getId()), new Date(), position.getPrice())); + orders.add(new LimitOrder(position.getTradeType() == 1 ? OrderType.BID : OrderType.ASK, position.getAmount(), CurrencyPair.BTC_CNY, + String.valueOf(position.getId()), new Date(), position.getPrice())); } return new OpenOrders(orders); diff --git a/xchange-huobi/src/main/java/org/knowm/xchange/huobi/Huobi.java b/xchange-huobi/src/main/java/org/knowm/xchange/huobi/Huobi.java index 834aa062ab2..1a98d815d93 100644 --- a/xchange-huobi/src/main/java/org/knowm/xchange/huobi/Huobi.java +++ b/xchange-huobi/src/main/java/org/knowm/xchange/huobi/Huobi.java @@ -21,8 +21,8 @@ public interface Huobi { @POST - HuobiAccountInfo getAccountInfo(@FormParam("access_key") String accessKey, @FormParam("created") long created, - @FormParam("method") String method, @FormParam("sign") ParamsDigest sign) throws IOException; + HuobiAccountInfo getAccountInfo(@FormParam("access_key") String accessKey, @FormParam("created") long created, @FormParam("method") String method, + @FormParam("sign") ParamsDigest sign) throws IOException; @POST HuobiOrder[] getOrders(@FormParam("access_key") String accessKey, @FormParam("coin_type") int coinType, @FormParam("created") long created, @@ -44,6 +44,6 @@ HuobiPlaceOrderResult placeMarketOrder(@FormParam("access_key") String accessKey @POST HuobiCancelOrderResult cancelOrder(@FormParam("access_key") String accessKey, @FormParam("coin_type") int coinType, - @FormParam("created") long created, @FormParam("id") long id, @FormParam("method") String method, @FormParam("sign") ParamsDigest sign) - throws IOException; + @FormParam("created") long created, @FormParam("id") long id, @FormParam("method") String method, + @FormParam("sign") ParamsDigest sign) throws IOException; } diff --git a/xchange-huobi/src/main/java/org/knowm/xchange/huobi/dto/account/BitVcFuturesAccountInfo.java b/xchange-huobi/src/main/java/org/knowm/xchange/huobi/dto/account/BitVcFuturesAccountInfo.java index ba3eaa29451..f7e4e76fc27 100644 --- a/xchange-huobi/src/main/java/org/knowm/xchange/huobi/dto/account/BitVcFuturesAccountInfo.java +++ b/xchange-huobi/src/main/java/org/knowm/xchange/huobi/dto/account/BitVcFuturesAccountInfo.java @@ -10,10 +10,8 @@ public class BitVcFuturesAccountInfo { private final BigDecimal availableMargin; private final BigDecimal frozenMargin; - public BitVcFuturesAccountInfo( - @JsonProperty("masterUsedMargin") final BigDecimal usedMargin, - @JsonProperty("availableMargin") final BigDecimal availableMargin, - @JsonProperty("frozenMargin") final BigDecimal frozenMargin) { + public BitVcFuturesAccountInfo(@JsonProperty("masterUsedMargin") final BigDecimal usedMargin, + @JsonProperty("availableMargin") final BigDecimal availableMargin, @JsonProperty("frozenMargin") final BigDecimal frozenMargin) { this.usedMargin = usedMargin; this.availableMargin = availableMargin; diff --git a/xchange-huobi/src/main/java/org/knowm/xchange/huobi/dto/trade/BitVcFuturesPlaceOrderResult.java b/xchange-huobi/src/main/java/org/knowm/xchange/huobi/dto/trade/BitVcFuturesPlaceOrderResult.java index 7f7b5fea6a2..3d26dd8669c 100644 --- a/xchange-huobi/src/main/java/org/knowm/xchange/huobi/dto/trade/BitVcFuturesPlaceOrderResult.java +++ b/xchange-huobi/src/main/java/org/knowm/xchange/huobi/dto/trade/BitVcFuturesPlaceOrderResult.java @@ -3,29 +3,16 @@ import com.fasterxml.jackson.annotation.JsonProperty; /** - * fee : 0, //手续费 - * id : 2489, //订单ID - * storeId : 0, // 仓位ID - * tradeType : 2, //交易类型（1、买多 2、卖空） - * price : 215.77, //价格 - * orderType : 1, //订单类型（1、开仓 2、平仓） - * status : 0, //订单状态（0、未成交 1、部分成交 2、已成交 3、撤单 7、队列中） - * money : 200, //下单金额 - * amount : 0.08130081, // 订单比特币数量 - * lever : 10, // 订单杠杆倍数 - * orderTime : 1409991500, //下单时间 - * lastTime : 1409991500, //最后处理时间 - * processedMoney : 0, //已处理金额 - * processedAmount : 0, // 已处理比特币数量 - * margin : 0.008130081, // 订单冻结保证金 - * processedPrice : 0 // 成交价格 + * fee : 0, //手续费 id : 2489, //订单ID storeId : 0, // 仓位ID tradeType : 2, //交易类型（1、买多 2、卖空） price : 215.77, //价格 orderType : 1, //订单类型（1、开仓 2、平仓） status + * : 0, //订单状态（0、未成交 1、部分成交 2、已成交 3、撤单 7、队列中） money : 200, //下单金额 amount : 0.08130081, // 订单比特币数量 lever : 10, // 订单杠杆倍数 orderTime : 1409991500, //下单时间 + * lastTime : 1409991500, //最后处理时间 processedMoney : 0, //已处理金额 processedAmount : 0, // 已处理比特币数量 margin : 0.008130081, // 订单冻结保证金 processedPrice : 0 // + * 成交价格 */ public class BitVcFuturesPlaceOrderResult { private final long id; - public BitVcFuturesPlaceOrderResult( - @JsonProperty("id") final long id) { + public BitVcFuturesPlaceOrderResult(@JsonProperty("id") final long id) { this.id = id; } diff --git a/xchange-huobi/src/main/java/org/knowm/xchange/huobi/dto/trade/BitVcFuturesPosition.java b/xchange-huobi/src/main/java/org/knowm/xchange/huobi/dto/trade/BitVcFuturesPosition.java index 435b4e880a8..3fc8a114277 100644 --- a/xchange-huobi/src/main/java/org/knowm/xchange/huobi/dto/trade/BitVcFuturesPosition.java +++ b/xchange-huobi/src/main/java/org/knowm/xchange/huobi/dto/trade/BitVcFuturesPosition.java @@ -13,12 +13,9 @@ public class BitVcFuturesPosition { private final double usedMargin; private final int storeId; - public BitVcFuturesPosition(@JsonProperty("id") final int id, - @JsonProperty("tradeType") final int tradeType, - @JsonProperty("price") final BigDecimal price, - @JsonProperty("money") final BigDecimal amount, - @JsonProperty("holdProfitLoss") final double holdProfitLoss, - @JsonProperty("usedMargin") final double usedMargin, + public BitVcFuturesPosition(@JsonProperty("id") final int id, @JsonProperty("tradeType") final int tradeType, + @JsonProperty("price") final BigDecimal price, @JsonProperty("money") final BigDecimal amount, + @JsonProperty("holdProfitLoss") final double holdProfitLoss, @JsonProperty("usedMargin") final double usedMargin, @JsonProperty("storeId") final int storeId) { this.id = id; this.tradeType = tradeType; diff --git a/xchange-huobi/src/main/java/org/knowm/xchange/huobi/service/BitVcAccountService.java b/xchange-huobi/src/main/java/org/knowm/xchange/huobi/service/BitVcAccountService.java index d744c97b25c..3bed368d7f6 100644 --- a/xchange-huobi/src/main/java/org/knowm/xchange/huobi/service/BitVcAccountService.java +++ b/xchange-huobi/src/main/java/org/knowm/xchange/huobi/service/BitVcAccountService.java @@ -49,7 +49,8 @@ public TradeHistoryParams createFundingHistoryParams() { } @Override - public List getFundingHistory(TradeHistoryParams params) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { + public List getFundingHistory( + TradeHistoryParams params) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { throw new NotYetImplementedForExchangeException(); } } diff --git a/xchange-huobi/src/main/java/org/knowm/xchange/huobi/service/BitVcFuturesAccountService.java b/xchange-huobi/src/main/java/org/knowm/xchange/huobi/service/BitVcFuturesAccountService.java index 5d7338bc70c..866eab5d337 100644 --- a/xchange-huobi/src/main/java/org/knowm/xchange/huobi/service/BitVcFuturesAccountService.java +++ b/xchange-huobi/src/main/java/org/knowm/xchange/huobi/service/BitVcFuturesAccountService.java @@ -28,12 +28,14 @@ public AccountInfo getAccountInfo() throws ExchangeException, NotAvailableFromEx } @Override - public String withdrawFunds(final Currency currency, final BigDecimal bigDecimal, final String s) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { + public String withdrawFunds(final Currency currency, final BigDecimal bigDecimal, + final String s) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { return null; } @Override - public String requestDepositAddress(final Currency currency, final String... strings) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { + public String requestDepositAddress(final Currency currency, + final String... strings) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { return null; } @@ -43,7 +45,8 @@ public TradeHistoryParams createFundingHistoryParams() { } @Override - public List getFundingHistory(TradeHistoryParams params) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { + public List getFundingHistory( + TradeHistoryParams params) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { throw new NotYetImplementedForExchangeException(); } } diff --git a/xchange-huobi/src/main/java/org/knowm/xchange/huobi/service/BitVcFuturesTradeService.java b/xchange-huobi/src/main/java/org/knowm/xchange/huobi/service/BitVcFuturesTradeService.java index 20a6aa8a98a..6cc48c80526 100644 --- a/xchange-huobi/src/main/java/org/knowm/xchange/huobi/service/BitVcFuturesTradeService.java +++ b/xchange-huobi/src/main/java/org/knowm/xchange/huobi/service/BitVcFuturesTradeService.java @@ -56,17 +56,20 @@ public OpenOrders getOpenOrders() throws ExchangeException, NotAvailableFromExch } @Override - public OpenOrders getOpenOrders(final OpenOrdersParams openOrdersParams) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { + public OpenOrders getOpenOrders( + final OpenOrdersParams openOrdersParams) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { return getOpenOrders(); } @Override - public String placeMarketOrder(final MarketOrder marketOrder) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { + public String placeMarketOrder( + final MarketOrder marketOrder) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { return null; } @Override - public String placeLimitOrder(final LimitOrder limitOrder) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { + public String placeLimitOrder( + final LimitOrder limitOrder) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { final TradeTypes tradeTypes; switch (limitOrder.getType()) { case BID: @@ -89,15 +92,15 @@ public String placeLimitOrder(final LimitOrder limitOrder) throws ExchangeExcept break; } - final BitVcFuturesPlaceOrderResult result = - bitvc.placeLimitOrder(accessKey, 1, futuresContract.getName(), requestTimestamp(), digest, - tradeTypes.getOrderType(), tradeTypes.getTradeType(), limitOrder.getLimitPrice().doubleValue(), limitOrder.getTradableAmount().doubleValue()); + final BitVcFuturesPlaceOrderResult result = bitvc.placeLimitOrder(accessKey, 1, futuresContract.getName(), requestTimestamp(), digest, + tradeTypes.getOrderType(), tradeTypes.getTradeType(), limitOrder.getLimitPrice().doubleValue(), limitOrder.getTradableAmount().doubleValue()); return String.valueOf(result.getId()); } @Override - public boolean cancelOrder(final String s) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { + public boolean cancelOrder( + final String s) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { return false; } @@ -127,7 +130,8 @@ public void verifyOrder(final MarketOrder marketOrder) { } @Override - public Collection getOrder(final String... strings) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { + public Collection getOrder( + final String... strings) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { return null; } } diff --git a/xchange-huobi/src/main/java/org/knowm/xchange/huobi/service/GenericTradeService.java b/xchange-huobi/src/main/java/org/knowm/xchange/huobi/service/GenericTradeService.java index d3be27c588d..848db5e16d4 100644 --- a/xchange-huobi/src/main/java/org/knowm/xchange/huobi/service/GenericTradeService.java +++ b/xchange-huobi/src/main/java/org/knowm/xchange/huobi/service/GenericTradeService.java @@ -30,7 +30,7 @@ public class GenericTradeService extends BaseExchangeService implements TradeService { private final Map coinTypes; - private static final OpenOrders noOpenOrders = new OpenOrders(Collections.emptyList()); + private static final OpenOrders noOpenOrders = new OpenOrders(Collections. emptyList()); private final TradeServiceRaw tradeServiceRaw; /** @@ -58,7 +58,8 @@ public OpenOrders getOpenOrders() throws IOException { } @Override - public OpenOrders getOpenOrders(OpenOrdersParams params) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { + public OpenOrders getOpenOrders( + OpenOrdersParams params) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { // TODO use params for currency pair List openOrders = new ArrayList<>(); for (CurrencyPair currencyPair : exchange.getExchangeMetaData().getCurrencyPairs().keySet()) { @@ -118,8 +119,8 @@ public UserTrades getTradeHistory(TradeHistoryParams params) throws IOException } @Override - public Collection getOrder(String... orderIds) - throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { + public Collection getOrder( + String... orderIds) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { throw new NotYetImplementedForExchangeException(); } diff --git a/xchange-huobi/src/main/java/org/knowm/xchange/huobi/service/HuobiAccountService.java b/xchange-huobi/src/main/java/org/knowm/xchange/huobi/service/HuobiAccountService.java index 004e15eb170..a51f55ac159 100644 --- a/xchange-huobi/src/main/java/org/knowm/xchange/huobi/service/HuobiAccountService.java +++ b/xchange-huobi/src/main/java/org/knowm/xchange/huobi/service/HuobiAccountService.java @@ -48,7 +48,8 @@ public TradeHistoryParams createFundingHistoryParams() { } @Override - public List getFundingHistory(TradeHistoryParams params) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { + public List getFundingHistory( + TradeHistoryParams params) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { throw new NotYetImplementedForExchangeException(); } } diff --git a/xchange-independentreserve/src/main/java/org/knowm/xchange/independentreserve/IndependentReserveAuthenticated.java b/xchange-independentreserve/src/main/java/org/knowm/xchange/independentreserve/IndependentReserveAuthenticated.java index 8d949ca9981..36d6c70e125 100644 --- a/xchange-independentreserve/src/main/java/org/knowm/xchange/independentreserve/IndependentReserveAuthenticated.java +++ b/xchange-independentreserve/src/main/java/org/knowm/xchange/independentreserve/IndependentReserveAuthenticated.java @@ -37,30 +37,30 @@ public interface IndependentReserveAuthenticated { @POST @Path("GetOpenOrders") @Consumes(MediaType.APPLICATION_JSON) - IndependentReserveOpenOrdersResponse getOpenOrders(IndependentReserveOpenOrderRequest independentReserveOpenOrderRequest) - throws IndependentReserveHttpStatusException, IOException; + IndependentReserveOpenOrdersResponse getOpenOrders( + IndependentReserveOpenOrderRequest independentReserveOpenOrderRequest) throws IndependentReserveHttpStatusException, IOException; @POST @Path("GetTrades") @Consumes(MediaType.APPLICATION_JSON) - IndependentReserveTradeHistoryResponse getTradeHistory(IndependentReserveTradeHistoryRequest independentReserveTradeHistoryRequest) - throws IndependentReserveHttpStatusException, IOException; + IndependentReserveTradeHistoryResponse getTradeHistory( + IndependentReserveTradeHistoryRequest independentReserveTradeHistoryRequest) throws IndependentReserveHttpStatusException, IOException; @POST @Path("PlaceLimitOrder") @Consumes(MediaType.APPLICATION_JSON) - IndependentReservePlaceLimitOrderResponse placeLimitOrder(IndependentReservePlaceLimitOrderRequest independentReservePlaceLimitOrderRequest) - throws IndependentReserveHttpStatusException, IOException; + IndependentReservePlaceLimitOrderResponse placeLimitOrder( + IndependentReservePlaceLimitOrderRequest independentReservePlaceLimitOrderRequest) throws IndependentReserveHttpStatusException, IOException; @POST @Path("CancelOrder") @Consumes(MediaType.APPLICATION_JSON) - IndependentReserveCancelOrderResponse cancelOrder(IndependentReserveCancelOrderRequest independentReserveCancelOrderRequest) - throws IndependentReserveHttpStatusException, IOException; + IndependentReserveCancelOrderResponse cancelOrder( + IndependentReserveCancelOrderRequest independentReserveCancelOrderRequest) throws IndependentReserveHttpStatusException, IOException; @POST @Path("GetTransactions") @Consumes(MediaType.APPLICATION_JSON) - IndependentReserveTransactionsResponse getTransactions(IndependentReserveTransactionsRequest independentReserveTransactionsRequest) - throws IndependentReserveHttpStatusException, IOException; + IndependentReserveTransactionsResponse getTransactions( + IndependentReserveTransactionsRequest independentReserveTransactionsRequest) throws IndependentReserveHttpStatusException, IOException; } diff --git a/xchange-independentreserve/src/main/java/org/knowm/xchange/independentreserve/dto/account/IndependentReserveAccount.java b/xchange-independentreserve/src/main/java/org/knowm/xchange/independentreserve/dto/account/IndependentReserveAccount.java index 082438215de..08bd276eeb5 100644 --- a/xchange-independentreserve/src/main/java/org/knowm/xchange/independentreserve/dto/account/IndependentReserveAccount.java +++ b/xchange-independentreserve/src/main/java/org/knowm/xchange/independentreserve/dto/account/IndependentReserveAccount.java @@ -46,8 +46,8 @@ public BigDecimal getTotalBalance() { @Override public String toString() { - return "IndependentReserveAccount [accountGuid=" + accountGuid + ", accountStatus=" + accountStatus + ", availableBalance=" - + availableBalance + ", currencyCode=" + currencyCode + ", totalBalance=" + totalBalance + "]"; + return "IndependentReserveAccount [accountGuid=" + accountGuid + ", accountStatus=" + accountStatus + ", availableBalance=" + availableBalance + + ", currencyCode=" + currencyCode + ", totalBalance=" + totalBalance + "]"; } } diff --git a/xchange-independentreserve/src/main/java/org/knowm/xchange/independentreserve/dto/marketdata/IndependentReserveOrderBook.java b/xchange-independentreserve/src/main/java/org/knowm/xchange/independentreserve/dto/marketdata/IndependentReserveOrderBook.java index 4fb83f75e60..d3185bba4d0 100644 --- a/xchange-independentreserve/src/main/java/org/knowm/xchange/independentreserve/dto/marketdata/IndependentReserveOrderBook.java +++ b/xchange-independentreserve/src/main/java/org/knowm/xchange/independentreserve/dto/marketdata/IndependentReserveOrderBook.java @@ -21,8 +21,8 @@ public class IndependentReserveOrderBook { public IndependentReserveOrderBook(@JsonProperty("BuyOrders") List buyOrders, @JsonProperty("SellOrders") List sellOrders, @JsonProperty("PrimaryCurrencyCode") String primaryCurrencyCode, - @JsonProperty("SecondaryCurrencyCode") String secondaryCurrencyCode, @JsonProperty("CreatedTimestampUtc") String createdTimestampUtc) - throws InvalidFormatException { + @JsonProperty("SecondaryCurrencyCode") String secondaryCurrencyCode, + @JsonProperty("CreatedTimestampUtc") String createdTimestampUtc) throws InvalidFormatException { this.buyOrders = buyOrders; this.createdTimestamp = DatatypeConverter.parseDateTime(createdTimestampUtc).getTime(); this.sellOrders = sellOrders; diff --git a/xchange-independentreserve/src/main/java/org/knowm/xchange/independentreserve/dto/trade/IndependentReserveTransaction.java b/xchange-independentreserve/src/main/java/org/knowm/xchange/independentreserve/dto/trade/IndependentReserveTransaction.java index 08e60c3bb9f..4f55dde283b 100644 --- a/xchange-independentreserve/src/main/java/org/knowm/xchange/independentreserve/dto/trade/IndependentReserveTransaction.java +++ b/xchange-independentreserve/src/main/java/org/knowm/xchange/independentreserve/dto/trade/IndependentReserveTransaction.java @@ -21,13 +21,11 @@ public class IndependentReserveTransaction { private final String status; private final Type type; - public IndependentReserveTransaction(@JsonProperty("Balance") BigDecimal balance - , @JsonProperty("BitcoinTransactionId") String bitcoinTransactionId - , @JsonProperty("bitcoinTransactionOutputIndex") String bitcoinTransactionOutputIndex - , @JsonProperty("Comment") String comment, @JsonProperty("CreatedTimestampUtc") String createdTimestampUtc - , @JsonProperty("Credit") BigDecimal credit, @JsonProperty("CurrencyCode") String currencyCode - , @JsonProperty("Debit") BigDecimal debit, @JsonProperty("SettleTimestampUtc") String settleTimestampUtc - , @JsonProperty("Status") String status, @JsonProperty("Type") Type type) { + public IndependentReserveTransaction(@JsonProperty("Balance") BigDecimal balance, @JsonProperty("BitcoinTransactionId") String bitcoinTransactionId, + @JsonProperty("bitcoinTransactionOutputIndex") String bitcoinTransactionOutputIndex, @JsonProperty("Comment") String comment, + @JsonProperty("CreatedTimestampUtc") String createdTimestampUtc, @JsonProperty("Credit") BigDecimal credit, + @JsonProperty("CurrencyCode") String currencyCode, @JsonProperty("Debit") BigDecimal debit, + @JsonProperty("SettleTimestampUtc") String settleTimestampUtc, @JsonProperty("Status") String status, @JsonProperty("Type") Type type) { super(); this.balance = balance; this.bitcoinTransactionId = bitcoinTransactionId; @@ -88,10 +86,9 @@ public Type getType() { @Override public String toString() { - return "IndependentReserveTransaction [balance=" + balance + ", bitcoinTransactionId=" + bitcoinTransactionId - + ", bitcoinTransactionOutputIndex=" + bitcoinTransactionOutputIndex + ", comment=" + comment - + ", createdTimestamp=" + createdTimestamp + ", credit=" + credit + ", currencyCode=" + currencyCode + ", debit=" - + debit + ", settleTimestamp=" + settleTimestamp + ", status=" + status + ", type=" + type + "]"; + return "IndependentReserveTransaction [balance=" + balance + ", bitcoinTransactionId=" + bitcoinTransactionId + ", bitcoinTransactionOutputIndex=" + + bitcoinTransactionOutputIndex + ", comment=" + comment + ", createdTimestamp=" + createdTimestamp + ", credit=" + credit + ", currencyCode=" + + currencyCode + ", debit=" + debit + ", settleTimestamp=" + settleTimestamp + ", status=" + status + ", type=" + type + "]"; } public enum Type { diff --git a/xchange-independentreserve/src/main/java/org/knowm/xchange/independentreserve/dto/trade/IndependentReserveTransactionsRequest.java b/xchange-independentreserve/src/main/java/org/knowm/xchange/independentreserve/dto/trade/IndependentReserveTransactionsRequest.java index aa6b944ee1b..b2e20b790a6 100644 --- a/xchange-independentreserve/src/main/java/org/knowm/xchange/independentreserve/dto/trade/IndependentReserveTransactionsRequest.java +++ b/xchange-independentreserve/src/main/java/org/knowm/xchange/independentreserve/dto/trade/IndependentReserveTransactionsRequest.java @@ -11,8 +11,8 @@ */ public class IndependentReserveTransactionsRequest extends AuthAggregate { - public IndependentReserveTransactionsRequest(String apiKey, Long nonce, String accountGuid, Date fromTimestampUtc - , Date toTimestampUtc, Type[] txTypes, int pageIndex, int pageSize) { + public IndependentReserveTransactionsRequest(String apiKey, Long nonce, String accountGuid, Date fromTimestampUtc, Date toTimestampUtc, + Type[] txTypes, int pageIndex, int pageSize) { super(apiKey, nonce); this.parameters.put("accountGuid", accountGuid); diff --git a/xchange-independentreserve/src/main/java/org/knowm/xchange/independentreserve/service/IndependentReserveAccountService.java b/xchange-independentreserve/src/main/java/org/knowm/xchange/independentreserve/service/IndependentReserveAccountService.java index 81851be043a..34554eac5be 100644 --- a/xchange-independentreserve/src/main/java/org/knowm/xchange/independentreserve/service/IndependentReserveAccountService.java +++ b/xchange-independentreserve/src/main/java/org/knowm/xchange/independentreserve/service/IndependentReserveAccountService.java @@ -30,20 +30,19 @@ public IndependentReserveAccountService(Exchange exchange) { } @Override - public AccountInfo getAccountInfo() - throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { + public AccountInfo getAccountInfo() throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { return new AccountInfo(exchange.getExchangeSpecification().getUserName(), IndependentReserveAdapters.adaptWallet(getIndependentReserveBalance())); } @Override - public String withdrawFunds(Currency currency, BigDecimal amount, String address) - throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { + public String withdrawFunds(Currency currency, BigDecimal amount, + String address) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { throw new UnsupportedOperationException(); } @Override - public String requestDepositAddress(Currency currency, String... args) - throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { + public String requestDepositAddress(Currency currency, + String... args) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { throw new UnsupportedOperationException(); } @@ -53,7 +52,8 @@ public TradeHistoryParams createFundingHistoryParams() { } @Override - public List getFundingHistory(TradeHistoryParams params) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { + public List getFundingHistory( + TradeHistoryParams params) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { throw new NotYetImplementedForExchangeException(); } } diff --git a/xchange-independentreserve/src/main/java/org/knowm/xchange/independentreserve/service/IndependentReserveMarketDataService.java b/xchange-independentreserve/src/main/java/org/knowm/xchange/independentreserve/service/IndependentReserveMarketDataService.java index 3768ee0b3fd..e0123884d73 100644 --- a/xchange-independentreserve/src/main/java/org/knowm/xchange/independentreserve/service/IndependentReserveMarketDataService.java +++ b/xchange-independentreserve/src/main/java/org/knowm/xchange/independentreserve/service/IndependentReserveMarketDataService.java @@ -22,21 +22,21 @@ public IndependentReserveMarketDataService(IndependentReserveExchange independen } @Override - public Ticker getTicker(CurrencyPair currencyPair, Object... args) - throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { + public Ticker getTicker(CurrencyPair currencyPair, + Object... args) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { throw new UnsupportedOperationException(); } @Override - public OrderBook getOrderBook(CurrencyPair currencyPair, Object... args) - throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { + public OrderBook getOrderBook(CurrencyPair currencyPair, + Object... args) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { return IndependentReserveAdapters .adaptOrderBook(getIndependentReserveOrderBook(currencyPair.base.getCurrencyCode(), currencyPair.counter.getCurrencyCode())); } @Override - public Trades getTrades(CurrencyPair currencyPair, Object... args) - throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { + public Trades getTrades(CurrencyPair currencyPair, + Object... args) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { throw new UnsupportedOperationException(); } } diff --git a/xchange-independentreserve/src/main/java/org/knowm/xchange/independentreserve/service/IndependentReserveTradeService.java b/xchange-independentreserve/src/main/java/org/knowm/xchange/independentreserve/service/IndependentReserveTradeService.java index 876a5daf477..288e4fe6617 100644 --- a/xchange-independentreserve/src/main/java/org/knowm/xchange/independentreserve/service/IndependentReserveTradeService.java +++ b/xchange-independentreserve/src/main/java/org/knowm/xchange/independentreserve/service/IndependentReserveTradeService.java @@ -37,7 +37,8 @@ public OpenOrders getOpenOrders() throws ExchangeException, NotAvailableFromExch } @Override - public OpenOrders getOpenOrders(OpenOrdersParams params) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { + public OpenOrders getOpenOrders( + OpenOrdersParams params) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { // null: get orders for all currencies String primaryCurrency = null; String secondaryCurrency = null; @@ -52,27 +53,27 @@ public OpenOrders getOpenOrders(OpenOrdersParams params) throws ExchangeExceptio } @Override - public String placeMarketOrder(MarketOrder marketOrder) - throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { + public String placeMarketOrder( + MarketOrder marketOrder) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { throw new UnsupportedOperationException(); } @Override - public String placeLimitOrder(LimitOrder limitOrder) - throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { + public String placeLimitOrder( + LimitOrder limitOrder) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { return independentReservePlaceLimitOrder(limitOrder.getCurrencyPair(), limitOrder.getType(), limitOrder.getLimitPrice(), limitOrder.getTradableAmount()); } @Override - public Collection getOrder(String... orderIds) - throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { + public Collection getOrder( + String... orderIds) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { throw new NotYetImplementedForExchangeException(); } @Override - public boolean cancelOrder(String orderId) - throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { + public boolean cancelOrder( + String orderId) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { return independentReserveCancelOrder(orderId); } diff --git a/xchange-independentreserve/src/main/java/org/knowm/xchange/independentreserve/service/IndependentReserveTradeServiceRaw.java b/xchange-independentreserve/src/main/java/org/knowm/xchange/independentreserve/service/IndependentReserveTradeServiceRaw.java index e54fc6042dd..40b5f657286 100644 --- a/xchange-independentreserve/src/main/java/org/knowm/xchange/independentreserve/service/IndependentReserveTradeServiceRaw.java +++ b/xchange-independentreserve/src/main/java/org/knowm/xchange/independentreserve/service/IndependentReserveTradeServiceRaw.java @@ -53,8 +53,8 @@ protected IndependentReserveTradeServiceRaw(Exchange exchange) { * @return * @throws IOException */ - public IndependentReserveOpenOrdersResponse getIndependentReserveOpenOrders(String primaryCurrency, String secondaryCurrency, Integer pageNumber) - throws IOException { + public IndependentReserveOpenOrdersResponse getIndependentReserveOpenOrders(String primaryCurrency, String secondaryCurrency, + Integer pageNumber) throws IOException { if (pageNumber <= 0) { throw new IllegalArgumentException("Page number in IndependentReserve should be positive."); } @@ -71,8 +71,8 @@ public IndependentReserveOpenOrdersResponse getIndependentReserveOpenOrders(Stri return openOrders; } - public String independentReservePlaceLimitOrder(CurrencyPair currencyPair, Order.OrderType type, BigDecimal limitPrice, BigDecimal tradableAmount) - throws IOException { + public String independentReservePlaceLimitOrder(CurrencyPair currencyPair, Order.OrderType type, BigDecimal limitPrice, + BigDecimal tradableAmount) throws IOException { Long nonce = exchange.getNonceFactory().createValue(); String apiKey = exchange.getExchangeSpecification().getApiKey(); @@ -134,17 +134,16 @@ public IndependentReserveTradeHistoryResponse getIndependentReserveTradeHistory( return trades; } - public IndependentReserveTransactionsResponse getIndependentReserveTransactions(String accountGuid, Date fromTimestampUtc - , Date toTimestampUtc, Type[] txTypes, Integer pageNumber) throws IOException { + public IndependentReserveTransactionsResponse getIndependentReserveTransactions(String accountGuid, Date fromTimestampUtc, Date toTimestampUtc, + Type[] txTypes, Integer pageNumber) throws IOException { if (pageNumber <= 0) { throw new IllegalArgumentException("Page number in IndependentReserve should be positive."); } Long nonce = exchange.getNonceFactory().createValue(); String apiKey = exchange.getExchangeSpecification().getApiKey(); - IndependentReserveTransactionsRequest req = new IndependentReserveTransactionsRequest(apiKey, nonce, accountGuid - , fromTimestampUtc, toTimestampUtc, txTypes, pageNumber, TRANSACTION_HISTORY_PAGE_SIZE); - req.setSignature( - signatureCreator.digestParamsToString(ExchangeEndpoint.GET_TRANSACTIONS, nonce, req.getParameters())); + IndependentReserveTransactionsRequest req = new IndependentReserveTransactionsRequest(apiKey, nonce, accountGuid, fromTimestampUtc, + toTimestampUtc, txTypes, pageNumber, TRANSACTION_HISTORY_PAGE_SIZE); + req.setSignature(signatureCreator.digestParamsToString(ExchangeEndpoint.GET_TRANSACTIONS, nonce, req.getParameters())); return independentReserveAuthenticated.getTransactions(req); } diff --git a/xchange-independentreserve/src/main/java/org/knowm/xchange/independentreserve/util/ExchangeEndpoint.java b/xchange-independentreserve/src/main/java/org/knowm/xchange/independentreserve/util/ExchangeEndpoint.java index aa16043376f..71a6dde4cd6 100644 --- a/xchange-independentreserve/src/main/java/org/knowm/xchange/independentreserve/util/ExchangeEndpoint.java +++ b/xchange-independentreserve/src/main/java/org/knowm/xchange/independentreserve/util/ExchangeEndpoint.java @@ -4,7 +4,8 @@ * Author: Kamil Zbikowski Date: 4/13/15 */ public enum ExchangeEndpoint { - GET_ACCOUNTS("GetAccounts"), GET_OPEN_ORDERS("GetOpenOrders"), PLACE_LIMIT_ORDER("PlaceLimitOrder"), CANCEL_ORDER("CancelOrder"), GET_TRADES("GetTrades"), GET_TRANSACTIONS("GetTransactions"); + GET_ACCOUNTS("GetAccounts"), GET_OPEN_ORDERS("GetOpenOrders"), PLACE_LIMIT_ORDER("PlaceLimitOrder"), CANCEL_ORDER("CancelOrder"), GET_TRADES( + "GetTrades"), GET_TRANSACTIONS("GetTransactions"); private String endpointName; diff --git a/xchange-independentreserve/src/main/java/org/knowm/xchange/independentreserve/util/Util.java b/xchange-independentreserve/src/main/java/org/knowm/xchange/independentreserve/util/Util.java index fb290591293..a2d88ca775a 100644 --- a/xchange-independentreserve/src/main/java/org/knowm/xchange/independentreserve/util/Util.java +++ b/xchange-independentreserve/src/main/java/org/knowm/xchange/independentreserve/util/Util.java @@ -24,7 +24,7 @@ private Util() { * @return formatted date for Independent Reserve */ public static String formatDate(Date d) { - synchronized (DATE_FORMAT) { // SimpleDateFormat is not thread safe, therefore synchronize it + synchronized (DATE_FORMAT) { // SimpleDateFormat is not thread safe, therefore synchronize it return d == null ? null : DATE_FORMAT.format(d); } } diff --git a/xchange-itbit/src/main/java/org/knowm/xchange/itbit/v1/ItBit.java b/xchange-itbit/src/main/java/org/knowm/xchange/itbit/v1/ItBit.java index 45b67fab287..9bd27d893e1 100644 --- a/xchange-itbit/src/main/java/org/knowm/xchange/itbit/v1/ItBit.java +++ b/xchange-itbit/src/main/java/org/knowm/xchange/itbit/v1/ItBit.java @@ -23,6 +23,6 @@ public interface ItBit { @GET @Path("/markets/{ident}{currency}/trades") - ItBitTrades getTrades(@PathParam("ident") String tradeableIdentifier, @PathParam("currency") String currency, @QueryParam("since") long sinceId) - throws IOException, ItBitException; + ItBitTrades getTrades(@PathParam("ident") String tradeableIdentifier, @PathParam("currency") String currency, + @QueryParam("since") long sinceId) throws IOException, ItBitException; } diff --git a/xchange-itbit/src/main/java/org/knowm/xchange/itbit/v1/ItBitAdapters.java b/xchange-itbit/src/main/java/org/knowm/xchange/itbit/v1/ItBitAdapters.java index 3d981276331..e033a4399ca 100644 --- a/xchange-itbit/src/main/java/org/knowm/xchange/itbit/v1/ItBitAdapters.java +++ b/xchange-itbit/src/main/java/org/knowm/xchange/itbit/v1/ItBitAdapters.java @@ -43,7 +43,7 @@ public final class ItBitAdapters { - private static final OpenOrders noOpenOrders = new OpenOrders(Collections.emptyList()); + private static final OpenOrders noOpenOrders = new OpenOrders(Collections. emptyList()); private static final String DATE_FORMAT_STRING = "yyyy-MM-dd'T'HH:mm:ss.SSS'Z'"; private static final DecimalFormatSymbols CUSTOM_SYMBOLS = new DecimalFormatSymbols(); private static Pattern TIMESTAMP_PATTERN = Pattern.compile("(.*\\.[0-9]{3})0000Z$"); diff --git a/xchange-itbit/src/main/java/org/knowm/xchange/itbit/v1/ItBitAuthenticated.java b/xchange-itbit/src/main/java/org/knowm/xchange/itbit/v1/ItBitAuthenticated.java index 25d2504b3b8..343df8cf22e 100644 --- a/xchange-itbit/src/main/java/org/knowm/xchange/itbit/v1/ItBitAuthenticated.java +++ b/xchange-itbit/src/main/java/org/knowm/xchange/itbit/v1/ItBitAuthenticated.java @@ -39,14 +39,14 @@ public interface ItBitAuthenticated { @GET @Path("wallets") ItBitAccountInfoReturn[] getInfo(@HeaderParam("Authorization") ParamsDigest signer, @HeaderParam("X-Auth-Timestamp") long timestamp, - @HeaderParam("X-Auth-Nonce") SynchronizedValueFactory valueFactory, @QueryParam("userId") String userId) - throws IOException, ItBitException; + @HeaderParam("X-Auth-Nonce") SynchronizedValueFactory valueFactory, + @QueryParam("userId") String userId) throws IOException, ItBitException; @GET @Path("wallets/{walletId}") ItBitAccountInfoReturn getWallet(@HeaderParam("Authorization") ParamsDigest signer, @HeaderParam("X-Auth-Timestamp") long timestamp, - @HeaderParam("X-Auth-Nonce") SynchronizedValueFactory valueFactory, @PathParam("walletId") String walletId) - throws IOException, ItBitException; + @HeaderParam("X-Auth-Nonce") SynchronizedValueFactory valueFactory, + @PathParam("walletId") String walletId) throws IOException, ItBitException; @GET @Path("wallets/{walletId}/orders") @@ -88,8 +88,8 @@ ItBitWithdrawalResponse requestWithdrawal(@HeaderParam("Authorization") ParamsDi @Path("wallets/{walletId}/cryptocurrency_deposits") @Consumes(MediaType.APPLICATION_JSON) ItBitDepositResponse requestDeposit(@HeaderParam("Authorization") ParamsDigest signer, @HeaderParam("X-Auth-Timestamp") long timestamp, - @HeaderParam("X-Auth-Nonce") SynchronizedValueFactory valueFactory, @PathParam("walletId") String walletId, ItBitDepositRequest request) - throws IOException, ItBitException; + @HeaderParam("X-Auth-Nonce") SynchronizedValueFactory valueFactory, @PathParam("walletId") String walletId, + ItBitDepositRequest request) throws IOException, ItBitException; @GET @Path("wallets/{walletId}/trades") diff --git a/xchange-itbit/src/main/java/org/knowm/xchange/itbit/v1/service/ItBitAccountService.java b/xchange-itbit/src/main/java/org/knowm/xchange/itbit/v1/service/ItBitAccountService.java index f5dd93b7dce..9bc402ba7bc 100644 --- a/xchange-itbit/src/main/java/org/knowm/xchange/itbit/v1/service/ItBitAccountService.java +++ b/xchange-itbit/src/main/java/org/knowm/xchange/itbit/v1/service/ItBitAccountService.java @@ -51,7 +51,8 @@ public TradeHistoryParams createFundingHistoryParams() { } @Override - public List getFundingHistory(TradeHistoryParams params) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { + public List getFundingHistory( + TradeHistoryParams params) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { throw new NotYetImplementedForExchangeException(); } } diff --git a/xchange-itbit/src/main/java/org/knowm/xchange/itbit/v1/service/ItBitHmacPostBodyDigest.java b/xchange-itbit/src/main/java/org/knowm/xchange/itbit/v1/service/ItBitHmacPostBodyDigest.java index a1b1b3c4ee2..48959f04a99 100644 --- a/xchange-itbit/src/main/java/org/knowm/xchange/itbit/v1/service/ItBitHmacPostBodyDigest.java +++ b/xchange-itbit/src/main/java/org/knowm/xchange/itbit/v1/service/ItBitHmacPostBodyDigest.java @@ -61,18 +61,8 @@ public String digestParams(RestInvocation restInvocation) { String verb = restInvocation.getHttpMethod().trim(); String invocationUrl = restInvocation.getInvocationUrl().trim(); - String jsonEncodedArray = new StringBuilder("[\"") - .append(verb) - .append(FIELD_SEPARATOR) - .append(invocationUrl) - .append(FIELD_SEPARATOR) - .append(requestBody) - .append(FIELD_SEPARATOR) - .append(currentNonce) - .append(FIELD_SEPARATOR) - .append(currentTimestamp) - .append("\"]") - .toString(); + String jsonEncodedArray = new StringBuilder("[\"").append(verb).append(FIELD_SEPARATOR).append(invocationUrl).append(FIELD_SEPARATOR) + .append(requestBody).append(FIELD_SEPARATOR).append(currentNonce).append(FIELD_SEPARATOR).append(currentTimestamp).append("\"]").toString(); md.update(currentNonce.getBytes(charset)); md.update(jsonEncodedArray.getBytes(charset)); byte[] messageHash = md.digest(); diff --git a/xchange-itbit/src/main/java/org/knowm/xchange/itbit/v1/service/ItBitTradeService.java b/xchange-itbit/src/main/java/org/knowm/xchange/itbit/v1/service/ItBitTradeService.java index ae8b50636c1..9917bcd4e4d 100644 --- a/xchange-itbit/src/main/java/org/knowm/xchange/itbit/v1/service/ItBitTradeService.java +++ b/xchange-itbit/src/main/java/org/knowm/xchange/itbit/v1/service/ItBitTradeService.java @@ -42,7 +42,8 @@ public OpenOrders getOpenOrders() throws IOException { } @Override - public OpenOrders getOpenOrders(OpenOrdersParams params) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { + public OpenOrders getOpenOrders( + OpenOrdersParams params) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { CurrencyPair currencyPair = null; if (params instanceof OpenOrdersParamCurrencyPair) { currencyPair = ((OpenOrdersParamCurrencyPair) params).getCurrencyPair(); @@ -151,8 +152,8 @@ public Date getEndTime() { } @Override - public Collection getOrder(String... orderIds) - throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { + public Collection getOrder( + String... orderIds) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { throw new NotYetImplementedForExchangeException(); } diff --git a/xchange-itbit/src/main/java/org/knowm/xchange/itbit/v1/service/ItBitTradeServiceRaw.java b/xchange-itbit/src/main/java/org/knowm/xchange/itbit/v1/service/ItBitTradeServiceRaw.java index a7dd297991c..417743176aa 100644 --- a/xchange-itbit/src/main/java/org/knowm/xchange/itbit/v1/service/ItBitTradeServiceRaw.java +++ b/xchange-itbit/src/main/java/org/knowm/xchange/itbit/v1/service/ItBitTradeServiceRaw.java @@ -27,10 +27,8 @@ public ItBitTradeServiceRaw(Exchange exchange) { public ItBitOrder[] getItBitOpenOrders(CurrencyPair currencyPair) throws IOException { ItBitOrder[] orders = itBitAuthenticated.getOrders(signatureCreator, new Date().getTime(), exchange.getNonceFactory(), - ItBitAdapters.adaptCurrency(currencyPair.base).getCurrencyCode() + ItBitAdapters.adaptCurrency(currencyPair.counter).getCurrencyCode(), - "1", "1000", - "open", - walletId); + ItBitAdapters.adaptCurrency(currencyPair.base).getCurrencyCode() + ItBitAdapters.adaptCurrency(currencyPair.counter).getCurrencyCode(), "1", + "1000", "open", walletId); return orders; } @@ -83,8 +81,8 @@ public ItBitOrder[] getItBitOrderHistory(String currency, String pageNum, String return orders; } - public ItBitTradeHistory getUserTradeHistory(String lastExecutionId, Integer page, Integer perPage, Date rangeStart, Date rangeEnd) - throws IOException, ItBitException { + public ItBitTradeHistory getUserTradeHistory(String lastExecutionId, Integer page, Integer perPage, Date rangeStart, + Date rangeEnd) throws IOException, ItBitException { return itBitAuthenticated.getUserTradeHistory(signatureCreator, System.currentTimeMillis(), exchange.getNonceFactory(), walletId, lastExecutionId, page, perPage, rangeStart, rangeEnd); } diff --git a/xchange-jubi/src/main/java/org/knowm/xchange/jubi/service/JubiMarketDataService.java b/xchange-jubi/src/main/java/org/knowm/xchange/jubi/service/JubiMarketDataService.java index 2ed12e3c4f6..4cfd92ea292 100644 --- a/xchange-jubi/src/main/java/org/knowm/xchange/jubi/service/JubiMarketDataService.java +++ b/xchange-jubi/src/main/java/org/knowm/xchange/jubi/service/JubiMarketDataService.java @@ -25,8 +25,8 @@ public JubiMarketDataService(Exchange exchange) { } @Override - public Ticker getTicker(CurrencyPair currencyPair, Object... args) - throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { + public Ticker getTicker(CurrencyPair currencyPair, + Object... args) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { // Request data JubiTicker jubiTicker = getJubiTicker(currencyPair.base.getCurrencyCode(), currencyPair.counter.getCurrencyCode()); @@ -36,15 +36,15 @@ public Ticker getTicker(CurrencyPair currencyPair, Object... args) } @Override - public OrderBook getOrderBook(CurrencyPair currencyPair, Object... args) - throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { + public OrderBook getOrderBook(CurrencyPair currencyPair, + Object... args) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { throw new NotYetImplementedForExchangeException(); } @Override - public Trades getTrades(CurrencyPair currencyPair, Object... args) - throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { + public Trades getTrades(CurrencyPair currencyPair, + Object... args) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { throw new NotYetImplementedForExchangeException(); } diff --git a/xchange-kraken/src/main/java/org/knowm/xchange/kraken/KrakenAdapters.java b/xchange-kraken/src/main/java/org/knowm/xchange/kraken/KrakenAdapters.java index 40a44460b73..22b090338df 100644 --- a/xchange-kraken/src/main/java/org/knowm/xchange/kraken/KrakenAdapters.java +++ b/xchange-kraken/src/main/java/org/knowm/xchange/kraken/KrakenAdapters.java @@ -160,7 +160,8 @@ public static Set adaptCurrencyPairs(Collection krakenCurr } public static Currency adaptCurrency(String krakenCurrencyCode) { - String currencyCode = (krakenCurrencyCode.length() == 4 && !"USDT".equals(krakenCurrencyCode) && !"KFEE".equals(krakenCurrencyCode) && !"DASH".equals(krakenCurrencyCode)) ? krakenCurrencyCode.substring(1) : krakenCurrencyCode; + String currencyCode = (krakenCurrencyCode.length() == 4 && !"USDT".equals(krakenCurrencyCode) && !"KFEE".equals(krakenCurrencyCode) + && !"DASH".equals(krakenCurrencyCode)) ? krakenCurrencyCode.substring(1) : krakenCurrencyCode; return Currency.getInstance(currencyCode).getCommonlyUsedCurrency(); } @@ -269,7 +270,8 @@ public static ExchangeMetaData adaptToExchangeMetaData(ExchangeMetaData original private static CurrencyPairMetaData adaptPair(KrakenAssetPair krakenPair, CurrencyPairMetaData OriginalMeta) { if (OriginalMeta != null) { - return new CurrencyPairMetaData(krakenPair.getFees().get(0).getPercentFee().divide(new BigDecimal(100)), OriginalMeta.getMinimumAmount(), OriginalMeta.getMaximumAmount(), krakenPair.getPairScale()); + return new CurrencyPairMetaData(krakenPair.getFees().get(0).getPercentFee().divide(new BigDecimal(100)), OriginalMeta.getMinimumAmount(), + OriginalMeta.getMaximumAmount(), krakenPair.getPairScale()); } else { return new CurrencyPairMetaData(krakenPair.getFees().get(0).getPercentFee().divide(new BigDecimal(100)), null, null, krakenPair.getPairScale()); } @@ -286,10 +288,9 @@ public static List adaptFundingHistory(Map final Date timestamp = new Date((long) (krakenLedger.getUnixTime() * 1000L)); final FundingRecord.Type type = FundingRecord.Type.fromString(krakenLedger.getLedgerType().name()); if (type != null) { - FundingRecord fundingRecordEntry = new FundingRecord(null, timestamp, - currency, krakenLedger.getTransactionAmount(), krakenLedger.getRefId(), - FundingRecord.Type.fromString(krakenLedger.getLedgerType().name()), - null, krakenLedger.getBalance(), krakenLedger.getFee(), null); + FundingRecord fundingRecordEntry = new FundingRecord(null, timestamp, currency, krakenLedger.getTransactionAmount(), + krakenLedger.getRefId(), FundingRecord.Type.fromString(krakenLedger.getLedgerType().name()), null, krakenLedger.getBalance(), + krakenLedger.getFee(), null); fundingRecords.add(fundingRecordEntry); } } diff --git a/xchange-kraken/src/main/java/org/knowm/xchange/kraken/KrakenAuthenticated.java b/xchange-kraken/src/main/java/org/knowm/xchange/kraken/KrakenAuthenticated.java index 20067df1b32..ea089514b12 100644 --- a/xchange-kraken/src/main/java/org/knowm/xchange/kraken/KrakenAuthenticated.java +++ b/xchange-kraken/src/main/java/org/knowm/xchange/kraken/KrakenAuthenticated.java @@ -49,8 +49,8 @@ KrakenBalanceResult balance(@HeaderParam("API-Key") String apiKey, @HeaderParam( @Path("private/TradeBalance") @Consumes(MediaType.APPLICATION_FORM_URLENCODED) KrakenTradeBalanceInfoResult tradeBalance(@FormParam("aclass") String assetClass, @FormParam("asset") String asset, - @HeaderParam("API-Key") String apiKey, @HeaderParam("API-Sign") ParamsDigest signer, @FormParam("nonce") SynchronizedValueFactory nonce) - throws IOException; + @HeaderParam("API-Key") String apiKey, @HeaderParam("API-Sign") ParamsDigest signer, + @FormParam("nonce") SynchronizedValueFactory nonce) throws IOException; @POST @Path("private/Ledgers") @@ -78,13 +78,12 @@ KrakenOrderResult addOrder(@FormParam("pair") String pair, @FormParam("type") St @POST @Path("private/AddOrder") @Consumes(MediaType.APPLICATION_FORM_URLENCODED) - KrakenOrderResult addOrderValidateOnly(@FormParam("pair") String pair, @FormParam("type") String type, - @FormParam("ordertype") String ordertype, @FormParam("price") String price, @FormParam("price2") String secondaryPrice, - @FormParam("volume") String volume, @FormParam("leverage") String leverage, @FormParam("position") String positionTxId, - @FormParam("oflags") String orderFlags, @FormParam("starttm") String startTime, @FormParam("expiretm") String expireTime, - @FormParam("userref") String userRefId, @FormParam("validate") boolean validateOnly, @FormParam("close") Map closeOrder, - @HeaderParam("API-Key") String apiKey, @HeaderParam("API-Sign") ParamsDigest signer, @FormParam("nonce") SynchronizedValueFactory nonce) - throws IOException; + KrakenOrderResult addOrderValidateOnly(@FormParam("pair") String pair, @FormParam("type") String type, @FormParam("ordertype") String ordertype, + @FormParam("price") String price, @FormParam("price2") String secondaryPrice, @FormParam("volume") String volume, + @FormParam("leverage") String leverage, @FormParam("position") String positionTxId, @FormParam("oflags") String orderFlags, + @FormParam("starttm") String startTime, @FormParam("expiretm") String expireTime, @FormParam("userref") String userRefId, + @FormParam("validate") boolean validateOnly, @FormParam("close") Map closeOrder, @HeaderParam("API-Key") String apiKey, + @HeaderParam("API-Sign") ParamsDigest signer, @FormParam("nonce") SynchronizedValueFactory nonce) throws IOException; @POST @Path("private/CancelOrder") @@ -96,16 +95,16 @@ KrakenCancelOrderResult cancelOrder(@HeaderParam("API-Key") String apiKey, @Head @Path("private/OpenOrders") @Consumes(MediaType.APPLICATION_FORM_URLENCODED) KrakenOpenOrdersResult openOrders(@FormParam("trades") boolean includeTrades, @FormParam("userref") String userReferenceId, - @HeaderParam("API-Key") String apiKey, @HeaderParam("API-Sign") ParamsDigest signer, @FormParam("nonce") SynchronizedValueFactory nonce) - throws IOException; + @HeaderParam("API-Key") String apiKey, @HeaderParam("API-Sign") ParamsDigest signer, + @FormParam("nonce") SynchronizedValueFactory nonce) throws IOException; @POST @Path("private/ClosedOrders") @Consumes(MediaType.APPLICATION_FORM_URLENCODED) KrakenClosedOrdersResult closedOrders(@FormParam("trades") boolean includeTrades, @FormParam("userref") String userReferenceId, @FormParam("start") String start, @FormParam("end") String end, @FormParam("ofs") String offset, @FormParam("closetime") String closeTime, - @HeaderParam("API-Key") String apiKey, @HeaderParam("API-Sign") ParamsDigest signer, @FormParam("nonce") SynchronizedValueFactory nonce) - throws IOException; + @HeaderParam("API-Key") String apiKey, @HeaderParam("API-Sign") ParamsDigest signer, + @FormParam("nonce") SynchronizedValueFactory nonce) throws IOException; @POST @Path("private/QueryOrders") @@ -127,23 +126,23 @@ KrakenQueryOrderResult queryOrders(@FormParam("trades") boolean includeTrades, @ @POST @Path("private/TradesHistory") @Consumes(MediaType.APPLICATION_FORM_URLENCODED) - KrakenTradeHistoryResult tradeHistory(@FormParam("type") String type, @FormParam("trades") boolean includeTrades, - @FormParam("start") Long start, @FormParam("end") Long end, @FormParam("ofs") Long offset, @HeaderParam("API-Key") String apiKey, - @HeaderParam("API-Sign") ParamsDigest signer, @FormParam("nonce") SynchronizedValueFactory nonce) throws IOException; + KrakenTradeHistoryResult tradeHistory(@FormParam("type") String type, @FormParam("trades") boolean includeTrades, @FormParam("start") Long start, + @FormParam("end") Long end, @FormParam("ofs") Long offset, @HeaderParam("API-Key") String apiKey, @HeaderParam("API-Sign") ParamsDigest signer, + @FormParam("nonce") SynchronizedValueFactory nonce) throws IOException; @POST @Path("private/QueryTrades") @Consumes(MediaType.APPLICATION_FORM_URLENCODED) KrakenQueryTradeResult queryTrades(@FormParam("trades") boolean includeTrades, @FormParam("txid") String transactionIds, - @HeaderParam("API-Key") String apiKey, @HeaderParam("API-Sign") ParamsDigest signer, @FormParam("nonce") SynchronizedValueFactory nonce) - throws IOException; + @HeaderParam("API-Key") String apiKey, @HeaderParam("API-Sign") ParamsDigest signer, + @FormParam("nonce") SynchronizedValueFactory nonce) throws IOException; @POST @Path("private/OpenPositions") @Consumes(MediaType.APPLICATION_FORM_URLENCODED) KrakenOpenPositionsResult openPositions(@FormParam("txid") String transactionIds, @FormParam("docalcs") boolean doCalcs, - @HeaderParam("API-Key") String apiKey, @HeaderParam("API-Sign") ParamsDigest signer, @FormParam("nonce") SynchronizedValueFactory nonce) - throws IOException; + @HeaderParam("API-Key") String apiKey, @HeaderParam("API-Sign") ParamsDigest signer, + @FormParam("nonce") SynchronizedValueFactory nonce) throws IOException; @POST @Path("private/TradeVolume") @@ -157,15 +156,15 @@ KrakenTradeVolumeResult tradeVolume(@FormParam("pair") String assetPairs, @Heade KrakenDepositAddressResult getDepositAddresses(@FormParam("aclass") String assetPairs, @FormParam("asset") String assets, @FormParam("method") String method, // @FormParam("new") boolean newAddress, - @HeaderParam("API-Key") String apiKey, @HeaderParam("API-Sign") ParamsDigest signer, @FormParam("nonce") SynchronizedValueFactory nonce) - throws IOException; + @HeaderParam("API-Key") String apiKey, @HeaderParam("API-Sign") ParamsDigest signer, + @FormParam("nonce") SynchronizedValueFactory nonce) throws IOException; @POST @Path("private/DepositMethods") @Consumes(MediaType.APPLICATION_FORM_URLENCODED) KrakenDepositMethodsResults getDepositMethods(@FormParam("aclass") String assetPairs, @FormParam("asset") String assets, - @HeaderParam("API-Key") String apiKey, @HeaderParam("API-Sign") ParamsDigest signer, @FormParam("nonce") SynchronizedValueFactory nonce) - throws IOException; + @HeaderParam("API-Key") String apiKey, @HeaderParam("API-Sign") ParamsDigest signer, + @FormParam("nonce") SynchronizedValueFactory nonce) throws IOException; @POST @Path("private/WithdrawInfo") @@ -184,15 +183,15 @@ WithdrawResult withdraw(@FormParam("aclass") String assetPairs, @FormParam("asse @POST @Path("private/DepositStatus") @Consumes(MediaType.APPLICATION_FORM_URLENCODED) - DepositStatusResult getDepositStatus(@FormParam("aclass") String assetPairs, @FormParam("asset") String assets, @FormParam("method") String method - , @HeaderParam("API-Key") String apiKey, @HeaderParam("API-Sign") ParamsDigest signer - , @FormParam("nonce") SynchronizedValueFactory nonce) throws IOException; + DepositStatusResult getDepositStatus(@FormParam("aclass") String assetPairs, @FormParam("asset") String assets, @FormParam("method") String method, + @HeaderParam("API-Key") String apiKey, @HeaderParam("API-Sign") ParamsDigest signer, + @FormParam("nonce") SynchronizedValueFactory nonce) throws IOException; @POST @Path("private/WithdrawStatus") @Consumes(MediaType.APPLICATION_FORM_URLENCODED) - WithdrawStatusResult getWithdrawStatus(@FormParam("aclass") String assetPairs, @FormParam("asset") String assets, @FormParam("method") String method - , @HeaderParam("API-Key") String apiKey, @HeaderParam("API-Sign") ParamsDigest signer - , @FormParam("nonce") SynchronizedValueFactory nonce) throws IOException; + WithdrawStatusResult getWithdrawStatus(@FormParam("aclass") String assetPairs, @FormParam("asset") String assets, + @FormParam("method") String method, @HeaderParam("API-Key") String apiKey, @HeaderParam("API-Sign") ParamsDigest signer, + @FormParam("nonce") SynchronizedValueFactory nonce) throws IOException; } diff --git a/xchange-kraken/src/main/java/org/knowm/xchange/kraken/dto/account/DepostitStatus.java b/xchange-kraken/src/main/java/org/knowm/xchange/kraken/dto/account/DepostitStatus.java index 25afcad209b..a1313b503b7 100644 --- a/xchange-kraken/src/main/java/org/knowm/xchange/kraken/dto/account/DepostitStatus.java +++ b/xchange-kraken/src/main/java/org/knowm/xchange/kraken/dto/account/DepostitStatus.java @@ -19,10 +19,10 @@ public class DepostitStatus { private final String status; private final String statusProp; - public DepostitStatus(@JsonProperty("method") String method, @JsonProperty("aclass") String aclass - , @JsonProperty("asset") String asset, @JsonProperty("refid") String refid, @JsonProperty("txid") String txid - , @JsonProperty("info") String info, @JsonProperty("amount") BigDecimal amount, @JsonProperty("fee") BigDecimal fee - , @JsonProperty("time") long unixTimestamp, @JsonProperty("status") String status, @JsonProperty("status-prop") String statusProp) { + public DepostitStatus(@JsonProperty("method") String method, @JsonProperty("aclass") String aclass, @JsonProperty("asset") String asset, + @JsonProperty("refid") String refid, @JsonProperty("txid") String txid, @JsonProperty("info") String info, + @JsonProperty("amount") BigDecimal amount, @JsonProperty("fee") BigDecimal fee, @JsonProperty("time") long unixTimestamp, + @JsonProperty("status") String status, @JsonProperty("status-prop") String statusProp) { super(); this.method = method; this.aclass = aclass; @@ -83,9 +83,8 @@ public String getStatusProp() { @Override public String toString() { - return "DepostitStatus [method=" + method + ", aclass=" + aclass + ", asset=" + asset + ", refid=" + refid + ", txid=" + txid - + ", info=" + info + ", amount=" + amount + ", fee=" + fee + ", timestamp=" + timestamp + ", status=" + status - + ", statusProp=" + statusProp + "]"; + return "DepostitStatus [method=" + method + ", aclass=" + aclass + ", asset=" + asset + ", refid=" + refid + ", txid=" + txid + ", info=" + info + + ", amount=" + amount + ", fee=" + fee + ", timestamp=" + timestamp + ", status=" + status + ", statusProp=" + statusProp + "]"; } } diff --git a/xchange-kraken/src/main/java/org/knowm/xchange/kraken/dto/account/WithdrawStatus.java b/xchange-kraken/src/main/java/org/knowm/xchange/kraken/dto/account/WithdrawStatus.java index b12ff2b2941..3edd80ceaeb 100644 --- a/xchange-kraken/src/main/java/org/knowm/xchange/kraken/dto/account/WithdrawStatus.java +++ b/xchange-kraken/src/main/java/org/knowm/xchange/kraken/dto/account/WithdrawStatus.java @@ -19,10 +19,10 @@ public class WithdrawStatus { private final String status; private final String statusProp; - public WithdrawStatus(@JsonProperty("method") String method, @JsonProperty("aclass") String aclass - , @JsonProperty("asset") String asset, @JsonProperty("refid") String refid, @JsonProperty("txid") String txid - , @JsonProperty("info") String info, @JsonProperty("amount") BigDecimal amount, @JsonProperty("fee") BigDecimal fee - , @JsonProperty("time") long unixTimestamp, @JsonProperty("status") String status, @JsonProperty("status-prop") String statusProp) { + public WithdrawStatus(@JsonProperty("method") String method, @JsonProperty("aclass") String aclass, @JsonProperty("asset") String asset, + @JsonProperty("refid") String refid, @JsonProperty("txid") String txid, @JsonProperty("info") String info, + @JsonProperty("amount") BigDecimal amount, @JsonProperty("fee") BigDecimal fee, @JsonProperty("time") long unixTimestamp, + @JsonProperty("status") String status, @JsonProperty("status-prop") String statusProp) { super(); this.method = method; this.aclass = aclass; @@ -83,9 +83,8 @@ public String getStatusProp() { @Override public String toString() { - return "WithdrawStatus [method=" + method + ", aclass=" + aclass + ", asset=" + asset + ", refid=" + refid + ", txid=" + txid - + ", info=" + info + ", amount=" + amount + ", fee=" + fee + ", timestamp=" + timestamp + ", status=" + status - + ", statusProp=" + statusProp + "]"; + return "WithdrawStatus [method=" + method + ", aclass=" + aclass + ", asset=" + asset + ", refid=" + refid + ", txid=" + txid + ", info=" + info + + ", amount=" + amount + ", fee=" + fee + ", timestamp=" + timestamp + ", status=" + status + ", statusProp=" + statusProp + "]"; } } diff --git a/xchange-kraken/src/main/java/org/knowm/xchange/kraken/dto/account/results/WithdrawStatusResult.java b/xchange-kraken/src/main/java/org/knowm/xchange/kraken/dto/account/results/WithdrawStatusResult.java index f3df118e3ba..c587ea6541b 100644 --- a/xchange-kraken/src/main/java/org/knowm/xchange/kraken/dto/account/results/WithdrawStatusResult.java +++ b/xchange-kraken/src/main/java/org/knowm/xchange/kraken/dto/account/results/WithdrawStatusResult.java @@ -14,5 +14,3 @@ public WithdrawStatusResult(@JsonProperty("result") List result, } } - - diff --git a/xchange-kraken/src/main/java/org/knowm/xchange/kraken/service/KrakenAccountService.java b/xchange-kraken/src/main/java/org/knowm/xchange/kraken/service/KrakenAccountService.java index 715cf749db4..a19b74407d0 100644 --- a/xchange-kraken/src/main/java/org/knowm/xchange/kraken/service/KrakenAccountService.java +++ b/xchange-kraken/src/main/java/org/knowm/xchange/kraken/service/KrakenAccountService.java @@ -59,7 +59,8 @@ public TradeHistoryParams createFundingHistoryParams() { } @Override - public List getFundingHistory(TradeHistoryParams params) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { + public List getFundingHistory( + TradeHistoryParams params) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { String startTime = null; String endTime = null; if (params instanceof TradeHistoryParamsTimeSpan) { @@ -91,9 +92,7 @@ public List getFundingHistory(TradeHistoryParams params) throws E LedgerType ledgerType = null; if (params instanceof HistoryParamsFundingType) { final FundingRecord.Type type = ((HistoryParamsFundingType) params).getType(); - ledgerType = type == FundingRecord.Type.DEPOSIT ? LedgerType.DEPOSIT - : type == FundingRecord.Type.WITHDRAWAL ? LedgerType.WITHDRAWAL - : null; + ledgerType = type == FundingRecord.Type.DEPOSIT ? LedgerType.DEPOSIT : type == FundingRecord.Type.WITHDRAWAL ? LedgerType.WITHDRAWAL : null; } return KrakenAdapters.adaptFundingHistory(getKrakenLedgerInfo(ledgerType, startTime, endTime, offset, currencies)); } diff --git a/xchange-kraken/src/main/java/org/knowm/xchange/kraken/service/KrakenAccountServiceRaw.java b/xchange-kraken/src/main/java/org/knowm/xchange/kraken/service/KrakenAccountServiceRaw.java index c2b111b49fc..5852db47240 100644 --- a/xchange-kraken/src/main/java/org/knowm/xchange/kraken/service/KrakenAccountServiceRaw.java +++ b/xchange-kraken/src/main/java/org/knowm/xchange/kraken/service/KrakenAccountServiceRaw.java @@ -146,8 +146,8 @@ public Map getKrakenLedgerInfo() throws IOException { * @return * @throws IOException */ - public Map getKrakenLedgerInfo(LedgerType ledgerType, String start, String end, String offset, Currency... assets) - throws IOException { + public Map getKrakenLedgerInfo(LedgerType ledgerType, String start, String end, String offset, + Currency... assets) throws IOException { String ledgerTypeString = (ledgerType == null) ? "all" : ledgerType.toString().toLowerCase(); diff --git a/xchange-kraken/src/main/java/org/knowm/xchange/kraken/service/KrakenTradeService.java b/xchange-kraken/src/main/java/org/knowm/xchange/kraken/service/KrakenTradeService.java index 62745644c6a..e10cfe481e9 100644 --- a/xchange-kraken/src/main/java/org/knowm/xchange/kraken/service/KrakenTradeService.java +++ b/xchange-kraken/src/main/java/org/knowm/xchange/kraken/service/KrakenTradeService.java @@ -39,7 +39,8 @@ public OpenOrders getOpenOrders() throws IOException { } @Override - public OpenOrders getOpenOrders(OpenOrdersParams params) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { + public OpenOrders getOpenOrders( + OpenOrdersParams params) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { return KrakenAdapters.adaptOpenOrders(super.getKrakenOpenOrders()); } @@ -116,8 +117,8 @@ public Long getOffset() { } @Override - public Collection getOrder(String... orderIds) - throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { + public Collection getOrder( + String... orderIds) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { throw new NotYetImplementedForExchangeException(); } diff --git a/xchange-lakebtc/src/main/java/org/knowm/xchange/lakebtc/service/LakeBTCAccountService.java b/xchange-lakebtc/src/main/java/org/knowm/xchange/lakebtc/service/LakeBTCAccountService.java index 8d7b9e4e1f0..ea3f8afc663 100755 --- a/xchange-lakebtc/src/main/java/org/knowm/xchange/lakebtc/service/LakeBTCAccountService.java +++ b/xchange-lakebtc/src/main/java/org/knowm/xchange/lakebtc/service/LakeBTCAccountService.java @@ -53,7 +53,8 @@ public TradeHistoryParams createFundingHistoryParams() { } @Override - public List getFundingHistory(TradeHistoryParams params) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { + public List getFundingHistory( + TradeHistoryParams params) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { throw new NotYetImplementedForExchangeException(); } } diff --git a/xchange-lakebtc/src/main/java/org/knowm/xchange/lakebtc/service/LakeBTCTradeService.java b/xchange-lakebtc/src/main/java/org/knowm/xchange/lakebtc/service/LakeBTCTradeService.java index 42c42bb1e05..acdaee5b7fd 100755 --- a/xchange-lakebtc/src/main/java/org/knowm/xchange/lakebtc/service/LakeBTCTradeService.java +++ b/xchange-lakebtc/src/main/java/org/knowm/xchange/lakebtc/service/LakeBTCTradeService.java @@ -36,7 +36,8 @@ public OpenOrders getOpenOrders() throws IOException { } @Override - public OpenOrders getOpenOrders(OpenOrdersParams params) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { + public OpenOrders getOpenOrders( + OpenOrdersParams params) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { throw new NotYetImplementedForExchangeException(); } @@ -74,8 +75,8 @@ public OpenOrdersParams createOpenOrdersParams() { } @Override - public Collection getOrder(String... orderIds) - throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { + public Collection getOrder( + String... orderIds) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { throw new NotYetImplementedForExchangeException(); } diff --git a/xchange-lakebtc/src/main/java/org/knowm/xchange/lakebtc/service/LakeBTCTradeServiceRaw.java b/xchange-lakebtc/src/main/java/org/knowm/xchange/lakebtc/service/LakeBTCTradeServiceRaw.java index fec2a261179..92b9bef3e04 100755 --- a/xchange-lakebtc/src/main/java/org/knowm/xchange/lakebtc/service/LakeBTCTradeServiceRaw.java +++ b/xchange-lakebtc/src/main/java/org/knowm/xchange/lakebtc/service/LakeBTCTradeServiceRaw.java @@ -67,7 +67,8 @@ public LakeBTCOrderResponse placeLakeBTCLimitOrder(LimitOrder limitOrder) throws case ASK: newOrder = lakeBTCAuthenticated.placeSellOrder(signatureCreator, exchange.getNonceFactory(), //unit price, amount, currency concatenated by commas - new LakeBTCSellOrderRequest(String.format("\"%s,%s,%s\"", limitOrder.getLimitPrice(), limitOrder.getTradableAmount().toString(), pair))); + new LakeBTCSellOrderRequest( + String.format("\"%s,%s,%s\"", limitOrder.getLimitPrice(), limitOrder.getTradableAmount().toString(), pair))); break; } return newOrder; diff --git a/xchange-livecoin/src/main/java/org/knowm/xchange/livecoin/Livecoin.java b/xchange-livecoin/src/main/java/org/knowm/xchange/livecoin/Livecoin.java index eac630641db..aee7c9b3737 100644 --- a/xchange-livecoin/src/main/java/org/knowm/xchange/livecoin/Livecoin.java +++ b/xchange-livecoin/src/main/java/org/knowm/xchange/livecoin/Livecoin.java @@ -22,7 +22,8 @@ public interface Livecoin { @GET @Path("exchange/order_book?currencyPair={baseCurrency}/{targetCurrency}&depth={depth}") - LivecoinOrderBook getOrderBook(@PathParam("baseCurrency") String baseCurrency, @PathParam("targetCurrency") String targetCurrency, @PathParam("depth") int depth) throws IOException; + LivecoinOrderBook getOrderBook(@PathParam("baseCurrency") String baseCurrency, @PathParam("targetCurrency") String targetCurrency, + @PathParam("depth") int depth) throws IOException; @GET @Path("exchange/last_trades?currencyPair={baseCurrency}/{targetCurrency}") diff --git a/xchange-livecoin/src/main/java/org/knowm/xchange/livecoin/LivecoinAdapters.java b/xchange-livecoin/src/main/java/org/knowm/xchange/livecoin/LivecoinAdapters.java index 4ef21847390..bbd3e8cb813 100644 --- a/xchange-livecoin/src/main/java/org/knowm/xchange/livecoin/LivecoinAdapters.java +++ b/xchange-livecoin/src/main/java/org/knowm/xchange/livecoin/LivecoinAdapters.java @@ -50,8 +50,7 @@ public static OrderBook adaptOrderBook(LivecoinOrderBook book, CurrencyPair curr return new OrderBook(null, asks, bids); } - private static List toLimitOrderList(LivecoinAsksBidsData[] levels, OrderType orderType, - CurrencyPair currencyPair) { + private static List toLimitOrderList(LivecoinAsksBidsData[] levels, OrderType orderType, CurrencyPair currencyPair) { List allLevels = new ArrayList<>(levels.length); for (int i = 0; i < levels.length; i++) { @@ -64,14 +63,12 @@ private static List toLimitOrderList(LivecoinAsksBidsData[] levels, } - public static ExchangeMetaData adaptToExchangeMetaData(ExchangeMetaData exchangeMetaData, - List products) { + public static ExchangeMetaData adaptToExchangeMetaData(ExchangeMetaData exchangeMetaData, List products) { Map currencyPairs = new HashMap<>(); Map currencies = new HashMap<>(); for (LivecoinRestriction product : products) { - BigDecimal minSize = product.getMinLimitQuantity().setScale(product.getPriceScale(), - BigDecimal.ROUND_UNNECESSARY); + BigDecimal minSize = product.getMinLimitQuantity().setScale(product.getPriceScale(), BigDecimal.ROUND_UNNECESSARY); CurrencyPairMetaData cpmd = new CurrencyPairMetaData(null, minSize, null, 8); CurrencyPair pair = adaptCurrencyPair(product); currencyPairs.put(pair, cpmd); @@ -90,8 +87,7 @@ public static Trades adaptTrades(LivecoinTrade[] coinbaseExTrades, CurrencyPair OrderType type = trade.getType().equals("SELL") ? OrderType.BID : OrderType.ASK; - Trade t = new Trade(type, trade.getQuantity(), currencyPair, trade.getPrice(), parseDate(trade.getTime()), - String.valueOf(trade.getId())); + Trade t = new Trade(type, trade.getQuantity(), currencyPair, trade.getPrice(), parseDate(trade.getTime()), String.valueOf(trade.getId())); trades.add(t); } diff --git a/xchange-livecoin/src/main/java/org/knowm/xchange/livecoin/LivecoinExchange.java b/xchange-livecoin/src/main/java/org/knowm/xchange/livecoin/LivecoinExchange.java index a83d298783b..2bea68c96b7 100644 --- a/xchange-livecoin/src/main/java/org/knowm/xchange/livecoin/LivecoinExchange.java +++ b/xchange-livecoin/src/main/java/org/knowm/xchange/livecoin/LivecoinExchange.java @@ -42,8 +42,7 @@ protected void initServices() { @Override public void remoteInit() throws IOException { - List products = ((LivecoinMarketDataServiceRaw) marketDataService) - .getConbaseExProducts(); + List products = ((LivecoinMarketDataServiceRaw) marketDataService).getConbaseExProducts(); exchangeMetaData = LivecoinAdapters.adaptToExchangeMetaData(exchangeMetaData, products); // System.out.println("JSON: " + // ObjectMapperHelper.toJSON(exchangeMetaData)); diff --git a/xchange-livecoin/src/main/java/org/knowm/xchange/livecoin/dto/marketdata/LivecoinOrderBook.java b/xchange-livecoin/src/main/java/org/knowm/xchange/livecoin/dto/marketdata/LivecoinOrderBook.java index ba58e501ce6..f5c3600d998 100644 --- a/xchange-livecoin/src/main/java/org/knowm/xchange/livecoin/dto/marketdata/LivecoinOrderBook.java +++ b/xchange-livecoin/src/main/java/org/knowm/xchange/livecoin/dto/marketdata/LivecoinOrderBook.java @@ -13,8 +13,7 @@ public class LivecoinOrderBook { private final LivecoinAsksBidsData[] asks; private final LivecoinAsksBidsData[] bids; - public LivecoinOrderBook(@JsonProperty("timestamp") Long timestamp, @JsonProperty("asks") Object[][] asks, - @JsonProperty("bids") Object[][] bids) { + public LivecoinOrderBook(@JsonProperty("timestamp") Long timestamp, @JsonProperty("asks") Object[][] asks, @JsonProperty("bids") Object[][] bids) { super(); this.timestamp = timestamp; @@ -63,8 +62,7 @@ private static LivecoinAsksBidsData convertToOrderBookEntry(Object[] dataObject) @Override public String toString() { - return "LivecoinOrderBook [timestamp=" + timestamp + ", asks=" + Arrays.toString(asks) + ", bids=" - + Arrays.toString(bids) + "]"; + return "LivecoinOrderBook [timestamp=" + timestamp + ", asks=" + Arrays.toString(asks) + ", bids=" + Arrays.toString(bids) + "]"; } } diff --git a/xchange-livecoin/src/main/java/org/knowm/xchange/livecoin/dto/marketdata/LivecoinRestriction.java b/xchange-livecoin/src/main/java/org/knowm/xchange/livecoin/dto/marketdata/LivecoinRestriction.java index 6be6d1101a3..02db5e232c8 100644 --- a/xchange-livecoin/src/main/java/org/knowm/xchange/livecoin/dto/marketdata/LivecoinRestriction.java +++ b/xchange-livecoin/src/main/java/org/knowm/xchange/livecoin/dto/marketdata/LivecoinRestriction.java @@ -10,8 +10,7 @@ public class LivecoinRestriction { private BigDecimal minLimitQuantity; private Integer priceScale; - public LivecoinRestriction(@JsonProperty("currencyPair") String currencyPair, - @JsonProperty("minLimitQuantity") BigDecimal minLimitQuantity, + public LivecoinRestriction(@JsonProperty("currencyPair") String currencyPair, @JsonProperty("minLimitQuantity") BigDecimal minLimitQuantity, @JsonProperty("priceScale") Integer priceScale) { super(); this.currencyPair = currencyPair; diff --git a/xchange-livecoin/src/main/java/org/knowm/xchange/livecoin/dto/marketdata/LivecoinRestrictions.java b/xchange-livecoin/src/main/java/org/knowm/xchange/livecoin/dto/marketdata/LivecoinRestrictions.java index cf595040d46..8bc6ec6f452 100644 --- a/xchange-livecoin/src/main/java/org/knowm/xchange/livecoin/dto/marketdata/LivecoinRestrictions.java +++ b/xchange-livecoin/src/main/java/org/knowm/xchange/livecoin/dto/marketdata/LivecoinRestrictions.java @@ -10,8 +10,7 @@ public class LivecoinRestrictions { private final Boolean success; private List restrictions = new ArrayList<>(); - public LivecoinRestrictions(@JsonProperty("success") Boolean success, - @JsonProperty("restrictions") List restrictions) { + public LivecoinRestrictions(@JsonProperty("success") Boolean success, @JsonProperty("restrictions") List restrictions) { super(); this.success = success; this.restrictions = restrictions; diff --git a/xchange-livecoin/src/main/java/org/knowm/xchange/livecoin/dto/marketdata/LivecoinTrade.java b/xchange-livecoin/src/main/java/org/knowm/xchange/livecoin/dto/marketdata/LivecoinTrade.java index be4ec0703f1..21e1519465f 100644 --- a/xchange-livecoin/src/main/java/org/knowm/xchange/livecoin/dto/marketdata/LivecoinTrade.java +++ b/xchange-livecoin/src/main/java/org/knowm/xchange/livecoin/dto/marketdata/LivecoinTrade.java @@ -12,12 +12,8 @@ public class LivecoinTrade { private final BigDecimal quantity; private final String type; - public LivecoinTrade( - @JsonProperty("time") Long time, - @JsonProperty("id") Long id, - @JsonProperty("price") BigDecimal price, - @JsonProperty("quantity") BigDecimal quantity, - @JsonProperty("type") String type) { + public LivecoinTrade(@JsonProperty("time") Long time, @JsonProperty("id") Long id, @JsonProperty("price") BigDecimal price, + @JsonProperty("quantity") BigDecimal quantity, @JsonProperty("type") String type) { super(); this.time = time; @@ -49,7 +45,6 @@ public String getType() { @Override public String toString() { - return "LivecoinTrade [time=" + time + ", id=" + id + ", price=" + price + ", quantity=" + quantity + ", type=" - + type + "]"; + return "LivecoinTrade [time=" + time + ", id=" + id + ", price=" + price + ", quantity=" + quantity + ", type=" + type + "]"; } } diff --git a/xchange-livecoin/src/main/java/org/knowm/xchange/livecoin/service/LivecoinMarketDataService.java b/xchange-livecoin/src/main/java/org/knowm/xchange/livecoin/service/LivecoinMarketDataService.java index 71c9f312d6b..41d27c0a8d3 100644 --- a/xchange-livecoin/src/main/java/org/knowm/xchange/livecoin/service/LivecoinMarketDataService.java +++ b/xchange-livecoin/src/main/java/org/knowm/xchange/livecoin/service/LivecoinMarketDataService.java @@ -20,8 +20,8 @@ public LivecoinMarketDataService(Exchange exchange) { } @Override - public Ticker getTicker(CurrencyPair currencyPair, Object... args) throws ExchangeException, - NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { + public Ticker getTicker(CurrencyPair currencyPair, + Object... args) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { // TODO Auto-generated method stub return null; } diff --git a/xchange-livecoin/src/main/java/org/knowm/xchange/livecoin/service/LivecoinMarketDataServiceRaw.java b/xchange-livecoin/src/main/java/org/knowm/xchange/livecoin/service/LivecoinMarketDataServiceRaw.java index 4e0f98cd274..74d6a3311a3 100644 --- a/xchange-livecoin/src/main/java/org/knowm/xchange/livecoin/service/LivecoinMarketDataServiceRaw.java +++ b/xchange-livecoin/src/main/java/org/knowm/xchange/livecoin/service/LivecoinMarketDataServiceRaw.java @@ -27,8 +27,8 @@ public LivecoinOrderBook getOrderBookRaw(CurrencyPair currencyPair, int depth) t return null; } - return this.coinbaseEx.getOrderBook(currencyPair.base.getCurrencyCode().toUpperCase(), - currencyPair.counter.getCurrencyCode().toUpperCase(), depth); + return this.coinbaseEx.getOrderBook(currencyPair.base.getCurrencyCode().toUpperCase(), currencyPair.counter.getCurrencyCode().toUpperCase(), + depth); } public boolean checkProductExists(CurrencyPair currencyPair) throws IOException { diff --git a/xchange-mercadobitcoin/src/main/java/org/knowm/xchange/mercadobitcoin/MercadoBitcoinAuthenticated.java b/xchange-mercadobitcoin/src/main/java/org/knowm/xchange/mercadobitcoin/MercadoBitcoinAuthenticated.java index 5eb653ae43f..89b4a9297f7 100644 --- a/xchange-mercadobitcoin/src/main/java/org/knowm/xchange/mercadobitcoin/MercadoBitcoinAuthenticated.java +++ b/xchange-mercadobitcoin/src/main/java/org/knowm/xchange/mercadobitcoin/MercadoBitcoinAuthenticated.java @@ -37,11 +37,10 @@ MercadoBitcoinBaseTradeApiResult getInfo(@HeaderParam @POST @Path("/") - MercadoBitcoinBaseTradeApiResult getOrderList(@HeaderParam("Key") String key, - @HeaderParam("Sign") ParamsDigest sign, @FormParam("method") String method, @FormParam("tonce") long tonce, - @Nonnull @FormParam("pair") String pair, @Nullable @FormParam("type") String type, @FormParam("status") @Nullable String status, - @FormParam("fromId") @Nullable String fromId, @FormParam("endId") @Nullable String endId, @FormParam("since") @Nullable Long since, - @FormParam("end") @Nullable Long end) throws IOException; + MercadoBitcoinBaseTradeApiResult getOrderList(@HeaderParam("Key") String key, @HeaderParam("Sign") ParamsDigest sign, + @FormParam("method") String method, @FormParam("tonce") long tonce, @Nonnull @FormParam("pair") String pair, + @Nullable @FormParam("type") String type, @FormParam("status") @Nullable String status, @FormParam("fromId") @Nullable String fromId, + @FormParam("endId") @Nullable String endId, @FormParam("since") @Nullable Long since, @FormParam("end") @Nullable Long end) throws IOException; @POST @Path("/") diff --git a/xchange-mercadobitcoin/src/main/java/org/knowm/xchange/mercadobitcoin/service/MercadoBitcoinAccountService.java b/xchange-mercadobitcoin/src/main/java/org/knowm/xchange/mercadobitcoin/service/MercadoBitcoinAccountService.java index fdc5eb6ab61..6396f5c0f04 100644 --- a/xchange-mercadobitcoin/src/main/java/org/knowm/xchange/mercadobitcoin/service/MercadoBitcoinAccountService.java +++ b/xchange-mercadobitcoin/src/main/java/org/knowm/xchange/mercadobitcoin/service/MercadoBitcoinAccountService.java @@ -55,7 +55,8 @@ public TradeHistoryParams createFundingHistoryParams() { } @Override - public List getFundingHistory(TradeHistoryParams params) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { + public List getFundingHistory( + TradeHistoryParams params) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { throw new NotYetImplementedForExchangeException(); } } diff --git a/xchange-mercadobitcoin/src/main/java/org/knowm/xchange/mercadobitcoin/service/MercadoBitcoinTradeService.java b/xchange-mercadobitcoin/src/main/java/org/knowm/xchange/mercadobitcoin/service/MercadoBitcoinTradeService.java index 392014ef9e4..97c2d77b691 100644 --- a/xchange-mercadobitcoin/src/main/java/org/knowm/xchange/mercadobitcoin/service/MercadoBitcoinTradeService.java +++ b/xchange-mercadobitcoin/src/main/java/org/knowm/xchange/mercadobitcoin/service/MercadoBitcoinTradeService.java @@ -53,7 +53,8 @@ public OpenOrders getOpenOrders() throws IOException { } @Override - public OpenOrders getOpenOrders(OpenOrdersParams params) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { + public OpenOrders getOpenOrders( + OpenOrdersParams params) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { // TODO use currency pair param MercadoBitcoinBaseTradeApiResult openOrdersBitcoinResult = getMercadoBitcoinUserOrders("btc_brl", null, "active", null, null, null, null); @@ -69,8 +70,8 @@ public OpenOrders getOpenOrders(OpenOrdersParams params) throws ExchangeExceptio } @Override - public Collection getOrder(String... orderIds) - throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { + public Collection getOrder( + String... orderIds) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { throw new NotYetImplementedForExchangeException(); } diff --git a/xchange-mercadobitcoin/src/main/java/org/knowm/xchange/mercadobitcoin/service/MercadoBitcoinTradeServiceRaw.java b/xchange-mercadobitcoin/src/main/java/org/knowm/xchange/mercadobitcoin/service/MercadoBitcoinTradeServiceRaw.java index 453d37b8198..6e27db0cd59 100644 --- a/xchange-mercadobitcoin/src/main/java/org/knowm/xchange/mercadobitcoin/service/MercadoBitcoinTradeServiceRaw.java +++ b/xchange-mercadobitcoin/src/main/java/org/knowm/xchange/mercadobitcoin/service/MercadoBitcoinTradeServiceRaw.java @@ -83,8 +83,8 @@ public MercadoBitcoinBaseTradeApiResult mer * @return See {@link org.knowm.xchange.mercadobitcoin.dto.trade.MercadoBitcoinCancelOrderResult} . * @throws IOException */ - public MercadoBitcoinBaseTradeApiResult mercadoBitcoinCancelOrder(@Nonnull String pair, @Nonnull String orderId) - throws IOException { + public MercadoBitcoinBaseTradeApiResult mercadoBitcoinCancelOrder(@Nonnull String pair, + @Nonnull String orderId) throws IOException { String method = CANCEL_ORDER; long tonce = exchange.getNonceFactory().createValue(); diff --git a/xchange-okcoin/src/main/java/org/knowm/xchange/okcoin/OkCoin.java b/xchange-okcoin/src/main/java/org/knowm/xchange/okcoin/OkCoin.java index 6d4e81ed411..7bbd0c9d886 100644 --- a/xchange-okcoin/src/main/java/org/knowm/xchange/okcoin/OkCoin.java +++ b/xchange-okcoin/src/main/java/org/knowm/xchange/okcoin/OkCoin.java @@ -44,8 +44,8 @@ public interface OkCoin { @GET @Path("future_depth.do") - OkCoinDepth getFuturesDepth(@QueryParam("ok") String ok, @QueryParam("symbol") String symbol, @QueryParam("contract_type") String contract) - throws IOException; + OkCoinDepth getFuturesDepth(@QueryParam("ok") String ok, @QueryParam("symbol") String symbol, + @QueryParam("contract_type") String contract) throws IOException; @GET @Path("trades.do") @@ -53,8 +53,8 @@ OkCoinDepth getFuturesDepth(@QueryParam("ok") String ok, @QueryParam("symbol") S @GET @Path("future_trades.do") - OkCoinTrade[] getFuturesTrades(@QueryParam("ok") String ok, @QueryParam("symbol") String symbol, @QueryParam("contract_type") String contract) - throws IOException; + OkCoinTrade[] getFuturesTrades(@QueryParam("ok") String ok, @QueryParam("symbol") String symbol, + @QueryParam("contract_type") String contract) throws IOException; @GET @Path("trades.do") @@ -108,8 +108,8 @@ OkCoinOrderResult getOrder(@FormParam("api_key") String api_key, @FormParam("ord @Path("future_order_info.do") OkCoinFuturesOrderResult getFuturesOrder(@FormParam("api_key") String api_key, @FormParam("order_id") long orderId, @FormParam("symbol") String symbol, @FormParam("status") String status, @FormParam("current_page") String currentPage, - @FormParam("page_length") String pageLength, @FormParam("contract_type") String contract, @FormParam("sign") ParamsDigest sign) - throws IOException; + @FormParam("page_length") String pageLength, @FormParam("contract_type") String contract, + @FormParam("sign") ParamsDigest sign) throws IOException; @POST @Path(value = "future_orders_info.do") @@ -135,8 +135,8 @@ OkCoinPositionResult getFuturesPositionsCross(@FormParam("api_key") String api_k @POST @Path("order_history.do") OkCoinOrderResult getOrderHistory(@FormParam("api_key") String apikey, @FormParam("symbol") String symbol, @FormParam("status") String status, - @FormParam("current_page") String currentPage, @FormParam("page_length") String pageLength, @FormParam("sign") ParamsDigest sign) - throws IOException; + @FormParam("current_page") String currentPage, @FormParam("page_length") String pageLength, + @FormParam("sign") ParamsDigest sign) throws IOException; @POST @Path("withdraw.do") @@ -147,6 +147,6 @@ OKCoinWithdraw withdraw(@FormParam("api_key") String api_key, @FormParam("symbol @POST @Path("account_records.do") OkCoinAccountRecords getAccountRecords(@FormParam("api_key") String apikey, @FormParam("symbol") String symbol, @FormParam("type") String type, - @FormParam("current_page") String currentPage, @FormParam("page_length") String pageLength, @FormParam("sign") ParamsDigest sign) - throws IOException; + @FormParam("current_page") String currentPage, @FormParam("page_length") String pageLength, + @FormParam("sign") ParamsDigest sign) throws IOException; } diff --git a/xchange-okcoin/src/main/java/org/knowm/xchange/okcoin/OkCoinAdapters.java b/xchange-okcoin/src/main/java/org/knowm/xchange/okcoin/OkCoinAdapters.java index 1fdc23c2191..a3958f1d56b 100644 --- a/xchange-okcoin/src/main/java/org/knowm/xchange/okcoin/OkCoinAdapters.java +++ b/xchange-okcoin/src/main/java/org/knowm/xchange/okcoin/OkCoinAdapters.java @@ -339,20 +339,18 @@ public static List adaptFundingHistory(final OkCoinAccountRecords if (depositRecord != null) { final Currency depositCurrency = Currency.getInstance(depositRecord.getSymbol()); for (OkCoinRecords okCoinRecordEntry : depositRecord.getRecords()) { - fundingRecords.add(new FundingRecord(okCoinRecordEntry.getAddress(), adaptDate(okCoinRecordEntry.getDate()), - depositCurrency, okCoinRecordEntry.getAmount(), okCoinRecordEntry.getAddress(), - FundingRecord.Type.DEPOSIT, okCoinRecordEntry.getStatus(), null, okCoinRecordEntry.getFee(), null) - ); + fundingRecords.add(new FundingRecord(okCoinRecordEntry.getAddress(), adaptDate(okCoinRecordEntry.getDate()), depositCurrency, + okCoinRecordEntry.getAmount(), okCoinRecordEntry.getAddress(), FundingRecord.Type.DEPOSIT, okCoinRecordEntry.getStatus(), null, + okCoinRecordEntry.getFee(), null)); } } final OkCoinAccountRecords withdrawalRecord = okCoinAccountRecordsList[1]; if (withdrawalRecord != null) { final Currency withdrawalCurrency = Currency.getInstance(withdrawalRecord.getSymbol()); for (OkCoinRecords okCoinRecordEntry : withdrawalRecord.getRecords()) { - fundingRecords.add(new FundingRecord(okCoinRecordEntry.getAddress(), adaptDate(okCoinRecordEntry.getDate()), - withdrawalCurrency, okCoinRecordEntry.getAmount(), okCoinRecordEntry.getAddress(), - FundingRecord.Type.WITHDRAWAL, okCoinRecordEntry.getStatus(), null, okCoinRecordEntry.getFee(), null) - ); + fundingRecords.add(new FundingRecord(okCoinRecordEntry.getAddress(), adaptDate(okCoinRecordEntry.getDate()), withdrawalCurrency, + okCoinRecordEntry.getAmount(), okCoinRecordEntry.getAddress(), FundingRecord.Type.WITHDRAWAL, okCoinRecordEntry.getStatus(), null, + okCoinRecordEntry.getFee(), null)); } } } diff --git a/xchange-okcoin/src/main/java/org/knowm/xchange/okcoin/dto/account/OkCoinAccountRecords.java b/xchange-okcoin/src/main/java/org/knowm/xchange/okcoin/dto/account/OkCoinAccountRecords.java index 372cc6e5b5a..5419275025f 100644 --- a/xchange-okcoin/src/main/java/org/knowm/xchange/okcoin/dto/account/OkCoinAccountRecords.java +++ b/xchange-okcoin/src/main/java/org/knowm/xchange/okcoin/dto/account/OkCoinAccountRecords.java @@ -9,8 +9,8 @@ public class OkCoinAccountRecords extends OkCoinErrorResult { private final String symbol; private final int errorCode; - public OkCoinAccountRecords(@JsonProperty("error_code") final int errorCode, - @JsonProperty("records") final OkCoinRecords[] records, @JsonProperty("symbol") final String symbol) { + public OkCoinAccountRecords(@JsonProperty("error_code") final int errorCode, @JsonProperty("records") final OkCoinRecords[] records, + @JsonProperty("symbol") final String symbol) { super(true, errorCode); this.errorCode = errorCode; this.records = records; diff --git a/xchange-okcoin/src/main/java/org/knowm/xchange/okcoin/dto/account/OkCoinFunds.java b/xchange-okcoin/src/main/java/org/knowm/xchange/okcoin/dto/account/OkCoinFunds.java index 2c6bb2ded3e..0046709152c 100644 --- a/xchange-okcoin/src/main/java/org/knowm/xchange/okcoin/dto/account/OkCoinFunds.java +++ b/xchange-okcoin/src/main/java/org/knowm/xchange/okcoin/dto/account/OkCoinFunds.java @@ -17,7 +17,7 @@ public OkCoinFunds(@JsonProperty("free") final Map free, @Js this.free = free; this.freezed = freezed; - this.borrow = borrow == null ? Collections.emptyMap() : borrow; + this.borrow = borrow == null ? Collections. emptyMap() : borrow; } public Map getFree() { diff --git a/xchange-okcoin/src/main/java/org/knowm/xchange/okcoin/service/OkCoinAccountService.java b/xchange-okcoin/src/main/java/org/knowm/xchange/okcoin/service/OkCoinAccountService.java index abfd40462f0..138dcceacef 100644 --- a/xchange-okcoin/src/main/java/org/knowm/xchange/okcoin/service/OkCoinAccountService.java +++ b/xchange-okcoin/src/main/java/org/knowm/xchange/okcoin/service/OkCoinAccountService.java @@ -64,7 +64,8 @@ public TradeHistoryParams createFundingHistoryParams() { } @Override - public List getFundingHistory(TradeHistoryParams params) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { + public List getFundingHistory( + TradeHistoryParams params) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { String symbol = null; if (params instanceof TradeHistoryParamCurrency && ((TradeHistoryParamCurrency) params).getCurrency() != null) { symbol = OkCoinAdapters.adaptSymbol(((TradeHistoryParamCurrency) params).getCurrency()); @@ -104,8 +105,7 @@ public static class OkCoinFundingHistoryParams extends DefaultTradeHistoryParamP private Currency currency; private CurrencyPair currencyPair; - public OkCoinFundingHistoryParams(final Integer pageNumber, final Integer pageLength, - final Currency currency, final CurrencyPair currencyPair) { + public OkCoinFundingHistoryParams(final Integer pageNumber, final Integer pageLength, final Currency currency, final CurrencyPair currencyPair) { super(pageLength, pageNumber); this.currency = currency; this.currencyPair = currencyPair; diff --git a/xchange-okcoin/src/main/java/org/knowm/xchange/okcoin/service/OkCoinFuturesAccountService.java b/xchange-okcoin/src/main/java/org/knowm/xchange/okcoin/service/OkCoinFuturesAccountService.java index 9ed945730b9..627ead63216 100644 --- a/xchange-okcoin/src/main/java/org/knowm/xchange/okcoin/service/OkCoinFuturesAccountService.java +++ b/xchange-okcoin/src/main/java/org/knowm/xchange/okcoin/service/OkCoinFuturesAccountService.java @@ -51,7 +51,8 @@ public TradeHistoryParams createFundingHistoryParams() { } @Override - public List getFundingHistory(TradeHistoryParams params) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { + public List getFundingHistory( + TradeHistoryParams params) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { throw new NotYetImplementedForExchangeException(); } } diff --git a/xchange-okcoin/src/main/java/org/knowm/xchange/okcoin/service/OkCoinFuturesTradeService.java b/xchange-okcoin/src/main/java/org/knowm/xchange/okcoin/service/OkCoinFuturesTradeService.java index 1d0aafc97ff..9f8af208e81 100644 --- a/xchange-okcoin/src/main/java/org/knowm/xchange/okcoin/service/OkCoinFuturesTradeService.java +++ b/xchange-okcoin/src/main/java/org/knowm/xchange/okcoin/service/OkCoinFuturesTradeService.java @@ -37,7 +37,7 @@ public class OkCoinFuturesTradeService extends OkCoinTradeServiceRaw implements TradeService { - private static final OpenOrders noOpenOrders = new OpenOrders(Collections.emptyList()); + private static final OpenOrders noOpenOrders = new OpenOrders(Collections. emptyList()); private final Logger log = LoggerFactory.getLogger(OkCoinFuturesTradeService.class); private final int leverRate; @@ -63,7 +63,8 @@ public OpenOrders getOpenOrders() throws IOException { } @Override - public OpenOrders getOpenOrders(OpenOrdersParams params) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { + public OpenOrders getOpenOrders( + OpenOrdersParams params) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { // TODO use params for currency pair List exchangeSymbols = exchange.getExchangeSymbols(); @@ -258,8 +259,8 @@ public void setOrderId(String orderId) { } @Override - public Collection getOrder(String... orderIds) - throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { + public Collection getOrder( + String... orderIds) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { List exchangeSymbols = exchange.getExchangeSymbols(); List openOrders = new ArrayList<>(); List orderResults = new ArrayList<>(exchangeSymbols.size()); diff --git a/xchange-okcoin/src/main/java/org/knowm/xchange/okcoin/service/OkCoinTradeService.java b/xchange-okcoin/src/main/java/org/knowm/xchange/okcoin/service/OkCoinTradeService.java index 5d57139d68f..25f013462e4 100644 --- a/xchange-okcoin/src/main/java/org/knowm/xchange/okcoin/service/OkCoinTradeService.java +++ b/xchange-okcoin/src/main/java/org/knowm/xchange/okcoin/service/OkCoinTradeService.java @@ -32,7 +32,7 @@ public class OkCoinTradeService extends OkCoinTradeServiceRaw implements TradeService { - private static final OpenOrders noOpenOrders = new OpenOrders(Collections.emptyList()); + private static final OpenOrders noOpenOrders = new OpenOrders(Collections. emptyList()); private final Logger log = LoggerFactory.getLogger(OkCoinTradeService.class); @@ -52,7 +52,8 @@ public OpenOrders getOpenOrders() throws IOException { } @Override - public OpenOrders getOpenOrders(OpenOrdersParams params) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { + public OpenOrders getOpenOrders( + OpenOrdersParams params) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { // TODO use params to specify currency pair List exchangeSymbols = exchange.getExchangeSymbols(); @@ -194,8 +195,8 @@ public CurrencyPair getCurrencyPair() { } @Override - public Collection getOrder(String... orderIds) - throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { + public Collection getOrder( + String... orderIds) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { throw new NotYetImplementedForExchangeException(); } diff --git a/xchange-okcoin/src/main/java/org/knowm/xchange/okcoin/service/OkCoinTradeServiceRaw.java b/xchange-okcoin/src/main/java/org/knowm/xchange/okcoin/service/OkCoinTradeServiceRaw.java index 51e29db363e..507b9143291 100644 --- a/xchange-okcoin/src/main/java/org/knowm/xchange/okcoin/service/OkCoinTradeServiceRaw.java +++ b/xchange-okcoin/src/main/java/org/knowm/xchange/okcoin/service/OkCoinTradeServiceRaw.java @@ -64,16 +64,16 @@ public OkCoinTradeResult futuresCancelOrder(long orderId, String symbol, Futures return returnOrThrow(tradeResult); } - public OkCoinFuturesOrderResult getFuturesOrder(long orderId, String symbol, String currentPage, String pageLength, FuturesContract contract) - throws IOException { + public OkCoinFuturesOrderResult getFuturesOrder(long orderId, String symbol, String currentPage, String pageLength, + FuturesContract contract) throws IOException { OkCoinFuturesOrderResult futuresOrder = okCoin.getFuturesOrder(apikey, orderId, symbol, "1", currentPage, pageLength, contract.getName(), signatureCreator); return returnOrThrow(futuresOrder); } - public OkCoinFuturesOrderResult getFuturesFilledOrder(long orderId, String symbol, String currentPage, String pageLength, FuturesContract contract) - throws IOException { + public OkCoinFuturesOrderResult getFuturesFilledOrder(long orderId, String symbol, String currentPage, String pageLength, + FuturesContract contract) throws IOException { OkCoinFuturesOrderResult futuresOrder = okCoin.getFuturesOrder(apikey, orderId, symbol, "2", currentPage, pageLength, contract.getName(), signatureCreator); diff --git a/xchange-okcoin/src/test/java/org/knowm/xchange/okcoin/service/account/OkCoinAdaptersTest.java b/xchange-okcoin/src/test/java/org/knowm/xchange/okcoin/service/account/OkCoinAdaptersTest.java index 22298b1d4b5..1cb9cb52f70 100644 --- a/xchange-okcoin/src/test/java/org/knowm/xchange/okcoin/service/account/OkCoinAdaptersTest.java +++ b/xchange-okcoin/src/test/java/org/knowm/xchange/okcoin/service/account/OkCoinAdaptersTest.java @@ -28,7 +28,8 @@ public void testAdaptFundingHistory() throws JsonParseException, JsonMappingExce is = OkCoinAdaptersTest.class.getResourceAsStream("/account/example-accountrecords-withdrawal-data.json"); OkCoinAccountRecords okCoinAccountWithdrawalRecords = mapper.readValue(is, OkCoinAccountRecords.class); - final List records = OkCoinAdapters.adaptFundingHistory(new OkCoinAccountRecords[]{okCoinAccountDepositRecords, okCoinAccountWithdrawalRecords}); + final List records = OkCoinAdapters + .adaptFundingHistory(new OkCoinAccountRecords[]{okCoinAccountDepositRecords, okCoinAccountWithdrawalRecords}); assertThat(records.size()).isEqualTo(3); FundingRecord fundingRecord = records.get(1); diff --git a/xchange-poloniex/src/main/java/org/knowm/xchange/poloniex/Poloniex.java b/xchange-poloniex/src/main/java/org/knowm/xchange/poloniex/Poloniex.java index c974a48cc65..e8746b9e3d1 100644 --- a/xchange-poloniex/src/main/java/org/knowm/xchange/poloniex/Poloniex.java +++ b/xchange-poloniex/src/main/java/org/knowm/xchange/poloniex/Poloniex.java @@ -27,8 +27,8 @@ public interface Poloniex { HashMap getTicker(@QueryParam("command") String command) throws PoloniexException, IOException; @GET - PoloniexDepth getOrderBook(@QueryParam("command") String command, @QueryParam("currencyPair") String currencyPair) - throws PoloniexException, IOException; + PoloniexDepth getOrderBook(@QueryParam("command") String command, + @QueryParam("currencyPair") String currencyPair) throws PoloniexException, IOException; @GET PoloniexDepth getOrderBook(@QueryParam("command") String command, @QueryParam("currencyPair") String currencyPair, diff --git a/xchange-poloniex/src/main/java/org/knowm/xchange/poloniex/PoloniexAuthenticated.java b/xchange-poloniex/src/main/java/org/knowm/xchange/poloniex/PoloniexAuthenticated.java index aee151be6a5..d981ab6889e 100644 --- a/xchange-poloniex/src/main/java/org/knowm/xchange/poloniex/PoloniexAuthenticated.java +++ b/xchange-poloniex/src/main/java/org/knowm/xchange/poloniex/PoloniexAuthenticated.java @@ -51,10 +51,8 @@ HashMap returnDepositAddresses(@HeaderParam("Key") String apiKey @POST @FormParam("command") - Map returnOpenOrders( - @HeaderParam("Key") String apiKey, @HeaderParam("Sign") ParamsDigest signature, - @FormParam("nonce") SynchronizedValueFactory nonce, @FormParam("currencyPair") AllPairs all - ) throws PoloniexException, IOException; + Map returnOpenOrders(@HeaderParam("Key") String apiKey, @HeaderParam("Sign") ParamsDigest signature, + @FormParam("nonce") SynchronizedValueFactory nonce, @FormParam("currencyPair") AllPairs all) throws PoloniexException, IOException; @POST @FormParam("command") @@ -91,8 +89,8 @@ PoloniexTradeResponse sell(@HeaderParam("Key") String apiKey, @HeaderParam("Sign @FormParam("command") PoloniexMoveResponse moveOrder(@HeaderParam("Key") String apiKey, @HeaderParam("Sign") ParamsDigest signature, @FormParam("nonce") SynchronizedValueFactory nonce, @FormParam("orderNumber") String orderNumber, @FormParam("amount") String amount, - @FormParam("rate") String rate, @FormParam("immediateOrCancel") Integer immediateOrCancel, @FormParam("postOnly") Integer postOnly) - throws PoloniexException, IOException; + @FormParam("rate") String rate, @FormParam("immediateOrCancel") Integer immediateOrCancel, + @FormParam("postOnly") Integer postOnly) throws PoloniexException, IOException; @POST @FormParam("command") @@ -113,8 +111,10 @@ HashMap returnFeeInfo(@HeaderParam("Key") String apiKey, @Header @POST @FormParam("command") PoloniexDepositsWithdrawalsResponse returnDepositsWithdrawals(@HeaderParam("Key") String apiKey, @HeaderParam("Sign") ParamsDigest signature, - @FormParam("nonce") SynchronizedValueFactory nonce, @FormParam("start") Long startTime, @FormParam("end") Long endTime) - throws PoloniexException, IOException; + @FormParam("nonce") SynchronizedValueFactory nonce, @FormParam("start") Long startTime, + @FormParam("end") Long endTime) throws PoloniexException, IOException; - enum AllPairs {all} + enum AllPairs { + all + } } diff --git a/xchange-poloniex/src/main/java/org/knowm/xchange/poloniex/dto/trade/PoloniexDeposit.java b/xchange-poloniex/src/main/java/org/knowm/xchange/poloniex/dto/trade/PoloniexDeposit.java index 3df238a36ec..5cc2cfb8383 100644 --- a/xchange-poloniex/src/main/java/org/knowm/xchange/poloniex/dto/trade/PoloniexDeposit.java +++ b/xchange-poloniex/src/main/java/org/knowm/xchange/poloniex/dto/trade/PoloniexDeposit.java @@ -15,10 +15,9 @@ public class PoloniexDeposit { private final Date timestamp; private final String status; - public PoloniexDeposit(@JsonProperty("currency") String currency, @JsonProperty("address") String address - , @JsonProperty("amount") BigDecimal amount, @JsonProperty("confirmations") int confirmations - , @JsonProperty("txid") String txid, @JsonProperty("timestamp") long timestamp - , @JsonProperty("status") String status) { + public PoloniexDeposit(@JsonProperty("currency") String currency, @JsonProperty("address") String address, + @JsonProperty("amount") BigDecimal amount, @JsonProperty("confirmations") int confirmations, @JsonProperty("txid") String txid, + @JsonProperty("timestamp") long timestamp, @JsonProperty("status") String status) { super(); this.currency = currency; this.address = address; @@ -59,7 +58,7 @@ public String getStatus() { @Override public String toString() { - return "PoloniexDeposit [currency=" + currency + ", address=" + address + ", amount=" + amount + ", confirmations=" - + confirmations + ", txid=" + txid + ", timestamp=" + timestamp + ", status=" + status + "]"; + return "PoloniexDeposit [currency=" + currency + ", address=" + address + ", amount=" + amount + ", confirmations=" + confirmations + ", txid=" + + txid + ", timestamp=" + timestamp + ", status=" + status + "]"; } } diff --git a/xchange-poloniex/src/main/java/org/knowm/xchange/poloniex/dto/trade/PoloniexDepositsWithdrawalsResponse.java b/xchange-poloniex/src/main/java/org/knowm/xchange/poloniex/dto/trade/PoloniexDepositsWithdrawalsResponse.java index 02649b9a9c4..d30c0a46aad 100644 --- a/xchange-poloniex/src/main/java/org/knowm/xchange/poloniex/dto/trade/PoloniexDepositsWithdrawalsResponse.java +++ b/xchange-poloniex/src/main/java/org/knowm/xchange/poloniex/dto/trade/PoloniexDepositsWithdrawalsResponse.java @@ -13,9 +13,8 @@ public class PoloniexDepositsWithdrawalsResponse { private final List withdrawals; @JsonCreator - public PoloniexDepositsWithdrawalsResponse(@JsonProperty("error") String error - , @JsonProperty("deposits") List deposits - , @JsonProperty("withdrawals") List withdrawals) { + public PoloniexDepositsWithdrawalsResponse(@JsonProperty("error") String error, @JsonProperty("deposits") List deposits, + @JsonProperty("withdrawals") List withdrawals) { if (error != null) { throw new ExchangeException(error); } diff --git a/xchange-poloniex/src/main/java/org/knowm/xchange/poloniex/dto/trade/PoloniexWithdrawal.java b/xchange-poloniex/src/main/java/org/knowm/xchange/poloniex/dto/trade/PoloniexWithdrawal.java index c6b6e31d114..664770d74de 100644 --- a/xchange-poloniex/src/main/java/org/knowm/xchange/poloniex/dto/trade/PoloniexWithdrawal.java +++ b/xchange-poloniex/src/main/java/org/knowm/xchange/poloniex/dto/trade/PoloniexWithdrawal.java @@ -15,9 +15,9 @@ public class PoloniexWithdrawal { private final String status; private final String ipAddress; - public PoloniexWithdrawal(@JsonProperty("withdrawalNumber") long withdrawalNumber, @JsonProperty("currency") String currency - , @JsonProperty("address") String address, @JsonProperty("amount") BigDecimal amount - , @JsonProperty("timestamp") long timestamp, @JsonProperty("status") String status, @JsonProperty("ipAddress") String ipAddress) { + public PoloniexWithdrawal(@JsonProperty("withdrawalNumber") long withdrawalNumber, @JsonProperty("currency") String currency, + @JsonProperty("address") String address, @JsonProperty("amount") BigDecimal amount, @JsonProperty("timestamp") long timestamp, + @JsonProperty("status") String status, @JsonProperty("ipAddress") String ipAddress) { super(); this.withdrawalNumber = withdrawalNumber; this.currency = currency; @@ -58,8 +58,8 @@ public String getIpAddress() { @Override public String toString() { - return "PoloniexWithdrawal [withdrawalNumber=" + withdrawalNumber + ", currency=" + currency + ", address=" + address - + ", amount=" + amount + ", timestamp=" + timestamp + ", status=" + status + ", ipAddress=" + ipAddress + "]"; + return "PoloniexWithdrawal [withdrawalNumber=" + withdrawalNumber + ", currency=" + currency + ", address=" + address + ", amount=" + amount + + ", timestamp=" + timestamp + ", status=" + status + ", ipAddress=" + ipAddress + "]"; } } diff --git a/xchange-poloniex/src/main/java/org/knowm/xchange/poloniex/service/PoloniexAccountService.java b/xchange-poloniex/src/main/java/org/knowm/xchange/poloniex/service/PoloniexAccountService.java index d46d458c662..2ab40c7a0a6 100644 --- a/xchange-poloniex/src/main/java/org/knowm/xchange/poloniex/service/PoloniexAccountService.java +++ b/xchange-poloniex/src/main/java/org/knowm/xchange/poloniex/service/PoloniexAccountService.java @@ -57,7 +57,8 @@ public TradeHistoryParams createFundingHistoryParams() { } @Override - public List getFundingHistory(TradeHistoryParams params) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { + public List getFundingHistory( + TradeHistoryParams params) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { throw new NotYetImplementedForExchangeException(); } } diff --git a/xchange-poloniex/src/main/java/org/knowm/xchange/poloniex/service/PoloniexAccountServiceRaw.java b/xchange-poloniex/src/main/java/org/knowm/xchange/poloniex/service/PoloniexAccountServiceRaw.java index 2627d7a55d7..11c9e32e902 100644 --- a/xchange-poloniex/src/main/java/org/knowm/xchange/poloniex/service/PoloniexAccountServiceRaw.java +++ b/xchange-poloniex/src/main/java/org/knowm/xchange/poloniex/service/PoloniexAccountServiceRaw.java @@ -89,8 +89,8 @@ public String withdrawFunds(Currency currency, BigDecimal amount, String address } public PoloniexDepositsWithdrawalsResponse returnDepositsWithdrawals(Date start, Date end) throws IOException { - return poloniexAuthenticated.returnDepositsWithdrawals(apiKey, signatureCreator, exchange.getNonceFactory() - , DateUtils.toUnixTimeNullSafe(start), DateUtils.toUnixTimeNullSafe(end)); + return poloniexAuthenticated.returnDepositsWithdrawals(apiKey, signatureCreator, exchange.getNonceFactory(), DateUtils.toUnixTimeNullSafe(start), + DateUtils.toUnixTimeNullSafe(end)); } } diff --git a/xchange-poloniex/src/main/java/org/knowm/xchange/poloniex/service/PoloniexMarketDataServiceRaw.java b/xchange-poloniex/src/main/java/org/knowm/xchange/poloniex/service/PoloniexMarketDataServiceRaw.java index 5265fc08a97..5496f14a5fe 100644 --- a/xchange-poloniex/src/main/java/org/knowm/xchange/poloniex/service/PoloniexMarketDataServiceRaw.java +++ b/xchange-poloniex/src/main/java/org/knowm/xchange/poloniex/service/PoloniexMarketDataServiceRaw.java @@ -162,8 +162,8 @@ public PoloniexPublicTrade[] getPoloniexPublicTrades(CurrencyPair currencyPair, } } - public PoloniexChartData[] getPoloniexChartData(CurrencyPair currencyPair, Long startTime, Long endTime, PoloniexChartDataPeriodType period) - throws IOException { + public PoloniexChartData[] getPoloniexChartData(CurrencyPair currencyPair, Long startTime, Long endTime, + PoloniexChartDataPeriodType period) throws IOException { String command = "returnChartData"; String pairString = PoloniexUtils.toPairString(currencyPair); diff --git a/xchange-poloniex/src/main/java/org/knowm/xchange/poloniex/service/PoloniexTradeService.java b/xchange-poloniex/src/main/java/org/knowm/xchange/poloniex/service/PoloniexTradeService.java index 5584eaa3368..45d2cd2a5ac 100644 --- a/xchange-poloniex/src/main/java/org/knowm/xchange/poloniex/service/PoloniexTradeService.java +++ b/xchange-poloniex/src/main/java/org/knowm/xchange/poloniex/service/PoloniexTradeService.java @@ -172,8 +172,8 @@ public OpenOrdersParams createOpenOrdersParams() { } @Override - public Collection getOrder(String... orderIds) - throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { + public Collection getOrder( + String... orderIds) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { throw new NotYetImplementedForExchangeException(); } diff --git a/xchange-poloniex/src/main/java/org/knowm/xchange/poloniex/service/PoloniexTradeServiceRaw.java b/xchange-poloniex/src/main/java/org/knowm/xchange/poloniex/service/PoloniexTradeServiceRaw.java index 992c78ae89a..cdf6636016b 100644 --- a/xchange-poloniex/src/main/java/org/knowm/xchange/poloniex/service/PoloniexTradeServiceRaw.java +++ b/xchange-poloniex/src/main/java/org/knowm/xchange/poloniex/service/PoloniexTradeServiceRaw.java @@ -98,8 +98,7 @@ private PoloniexTradeResponse orderEntry(LimitOrder limitOrder, String name) thr } } - public PoloniexMoveResponse move(String orderId, BigDecimal tradableAmount, BigDecimal limitPrice, PoloniexOrderFlags flag) - throws IOException { + public PoloniexMoveResponse move(String orderId, BigDecimal tradableAmount, BigDecimal limitPrice, PoloniexOrderFlags flag) throws IOException { Integer immediateOrCancel; if (flag == PoloniexOrderFlags.IMMEDIATE_OR_CANCEL) { diff --git a/xchange-quadrigacx/src/main/java/org/knowm/xchange/quadrigacx/QuadrigaCx.java b/xchange-quadrigacx/src/main/java/org/knowm/xchange/quadrigacx/QuadrigaCx.java index 5539866409f..61d6da10fa4 100644 --- a/xchange-quadrigacx/src/main/java/org/knowm/xchange/quadrigacx/QuadrigaCx.java +++ b/xchange-quadrigacx/src/main/java/org/knowm/xchange/quadrigacx/QuadrigaCx.java @@ -23,8 +23,7 @@ public interface QuadrigaCx { */ @GET @Path("order_book?book={base}_{counter}") - QuadrigaCxOrderBook getOrderBook(@PathParam("base") String base, @PathParam("counter") String counter) - throws QuadrigaCxException, IOException; + QuadrigaCxOrderBook getOrderBook(@PathParam("base") String base, @PathParam("counter") String counter) throws QuadrigaCxException, IOException; @GET @Path("ticker?book={base}_{counter}") @@ -35,8 +34,8 @@ QuadrigaCxOrderBook getOrderBook(@PathParam("base") String base, @PathParam("cou */ @GET @Path("transactions?book={base}_{counter}") - QuadrigaCxTransaction[] getTransactions(@PathParam("base") String base, @PathParam("counter") String counter) - throws QuadrigaCxException, IOException; + QuadrigaCxTransaction[] getTransactions(@PathParam("base") String base, + @PathParam("counter") String counter) throws QuadrigaCxException, IOException; /** * Returns descending list of transactions. diff --git a/xchange-quadrigacx/src/main/java/org/knowm/xchange/quadrigacx/QuadrigaCxAuthenticated.java b/xchange-quadrigacx/src/main/java/org/knowm/xchange/quadrigacx/QuadrigaCxAuthenticated.java index 3cbc772f889..baa83d16889 100644 --- a/xchange-quadrigacx/src/main/java/org/knowm/xchange/quadrigacx/QuadrigaCxAuthenticated.java +++ b/xchange-quadrigacx/src/main/java/org/knowm/xchange/quadrigacx/QuadrigaCxAuthenticated.java @@ -33,14 +33,14 @@ QuadrigaCxOrder[] getOpenOrders(@FormParam("book") String book, @FormParam("key" @POST @Path("buy") QuadrigaCxOrder buy(@FormParam("book") String book, @FormParam("key") String apiKey, @FormParam("signature") ParamsDigest signer, - @FormParam("nonce") SynchronizedValueFactory nonce, @FormParam("amount") BigDecimal amount, @FormParam("price") BigDecimal price) - throws QuadrigaCxException, IOException; + @FormParam("nonce") SynchronizedValueFactory nonce, @FormParam("amount") BigDecimal amount, + @FormParam("price") BigDecimal price) throws QuadrigaCxException, IOException; @POST @Path("sell") QuadrigaCxOrder sell(@FormParam("book") String book, @FormParam("key") String apiKey, @FormParam("signature") ParamsDigest signer, - @FormParam("nonce") SynchronizedValueFactory nonce, @FormParam("amount") BigDecimal amount, @FormParam("price") BigDecimal price) - throws QuadrigaCxException, IOException; + @FormParam("nonce") SynchronizedValueFactory nonce, @FormParam("amount") BigDecimal amount, + @FormParam("price") BigDecimal price) throws QuadrigaCxException, IOException; /** * @return true if order has been canceled. @@ -60,8 +60,8 @@ QuadrigaCxUserTransaction[] getUserTransactions(@FormParam("book") String book, @Path("user_transactions") QuadrigaCxUserTransaction[] getUserTransactions(@FormParam("book") String book, @FormParam("key") String apiKey, @FormParam("signature") ParamsDigest signer, @FormParam("nonce") SynchronizedValueFactory nonce, - @FormParam("limit") long numberOfTransactions, @FormParam("offset") long offset, @FormParam("sort") String sort) - throws QuadrigaCxException, IOException; + @FormParam("limit") long numberOfTransactions, @FormParam("offset") long offset, + @FormParam("sort") String sort) throws QuadrigaCxException, IOException; @POST @Path("balance") @@ -81,12 +81,12 @@ QuadrigaCxDepositAddress getEtherDepositAddress(@FormParam("key") String apiKey, @POST @Path("bitcoin_withdrawal") String withdrawBitcoin(@FormParam("key") String apiKey, @FormParam("signature") QuadrigaCxDigest signer, - @FormParam("nonce") SynchronizedValueFactory nonce, @FormParam("amount") BigDecimal amount, @FormParam("address") String address) - throws QuadrigaCxException, IOException; + @FormParam("nonce") SynchronizedValueFactory nonce, @FormParam("amount") BigDecimal amount, + @FormParam("address") String address) throws QuadrigaCxException, IOException; @POST @Path("ether_withdrawal") String withdrawEther(@FormParam("key") String apiKey, @FormParam("signature") QuadrigaCxDigest signer, - @FormParam("nonce") SynchronizedValueFactory nonce, @FormParam("amount") BigDecimal amount, @FormParam("address") String address) - throws QuadrigaCxException, IOException; + @FormParam("nonce") SynchronizedValueFactory nonce, @FormParam("amount") BigDecimal amount, + @FormParam("address") String address) throws QuadrigaCxException, IOException; } diff --git a/xchange-quadrigacx/src/main/java/org/knowm/xchange/quadrigacx/QuadrigaCxUtils.java b/xchange-quadrigacx/src/main/java/org/knowm/xchange/quadrigacx/QuadrigaCxUtils.java index f037c863807..72de149e420 100644 --- a/xchange-quadrigacx/src/main/java/org/knowm/xchange/quadrigacx/QuadrigaCxUtils.java +++ b/xchange-quadrigacx/src/main/java/org/knowm/xchange/quadrigacx/QuadrigaCxUtils.java @@ -37,7 +37,7 @@ private QuadrigaCxUtils() { */ public static Date parseDate(String dateString) { try { - synchronized (DATE_FORMAT) { // SimpleDateFormat is not thread safe, therefore synchronize it + synchronized (DATE_FORMAT) { // SimpleDateFormat is not thread safe, therefore synchronize it return DATE_FORMAT.parse(dateString); } } catch (ParseException e) { diff --git a/xchange-quadrigacx/src/main/java/org/knowm/xchange/quadrigacx/service/QuadrigaCxAccountService.java b/xchange-quadrigacx/src/main/java/org/knowm/xchange/quadrigacx/service/QuadrigaCxAccountService.java index 7e813a366b8..a86a88e014e 100644 --- a/xchange-quadrigacx/src/main/java/org/knowm/xchange/quadrigacx/service/QuadrigaCxAccountService.java +++ b/xchange-quadrigacx/src/main/java/org/knowm/xchange/quadrigacx/service/QuadrigaCxAccountService.java @@ -53,7 +53,8 @@ public TradeHistoryParams createFundingHistoryParams() { } @Override - public List getFundingHistory(TradeHistoryParams params) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { + public List getFundingHistory( + TradeHistoryParams params) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { throw new NotYetImplementedForExchangeException(); } } diff --git a/xchange-quadrigacx/src/main/java/org/knowm/xchange/quadrigacx/service/QuadrigaCxMarketDataService.java b/xchange-quadrigacx/src/main/java/org/knowm/xchange/quadrigacx/service/QuadrigaCxMarketDataService.java index 6937b5778f7..4ab44acccc4 100644 --- a/xchange-quadrigacx/src/main/java/org/knowm/xchange/quadrigacx/service/QuadrigaCxMarketDataService.java +++ b/xchange-quadrigacx/src/main/java/org/knowm/xchange/quadrigacx/service/QuadrigaCxMarketDataService.java @@ -20,8 +20,8 @@ public QuadrigaCxMarketDataService(Exchange exchange) { } @Override - public Ticker getTicker(CurrencyPair currencyPair, Object... args) - throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { + public Ticker getTicker(CurrencyPair currencyPair, + Object... args) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { return QuadrigaCxAdapters.adaptTicker(getQuadrigaCxTicker(currencyPair), currencyPair); } @@ -31,8 +31,8 @@ public OrderBook getOrderBook(CurrencyPair currencyPair, Object... args) throws } @Override - public Trades getTrades(CurrencyPair currencyPair, Object... args) - throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { + public Trades getTrades(CurrencyPair currencyPair, + Object... args) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { return QuadrigaCxAdapters.adaptTrades(getQuadrigaCxTransactions(currencyPair, args), currencyPair); } } diff --git a/xchange-quadrigacx/src/main/java/org/knowm/xchange/quadrigacx/service/QuadrigaCxTradeService.java b/xchange-quadrigacx/src/main/java/org/knowm/xchange/quadrigacx/service/QuadrigaCxTradeService.java index 48959a0383d..a7d452ead88 100644 --- a/xchange-quadrigacx/src/main/java/org/knowm/xchange/quadrigacx/service/QuadrigaCxTradeService.java +++ b/xchange-quadrigacx/src/main/java/org/knowm/xchange/quadrigacx/service/QuadrigaCxTradeService.java @@ -47,7 +47,8 @@ public OpenOrders getOpenOrders() throws IOException, QuadrigaCxException { } @Override - public OpenOrders getOpenOrders(OpenOrdersParams params) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { + public OpenOrders getOpenOrders( + OpenOrdersParams params) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { // TODO use params to specify currency pair Collection pairs = exchange.getExchangeSymbols(); List limitOrders = new ArrayList<>(); @@ -144,8 +145,8 @@ public OpenOrdersParams createOpenOrdersParams() { } @Override - public Collection getOrder(String... orderIds) - throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { + public Collection getOrder( + String... orderIds) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { throw new NotYetImplementedForExchangeException(); } diff --git a/xchange-quadrigacx/src/main/java/org/knowm/xchange/quadrigacx/service/QuadrigaCxTradeServiceRaw.java b/xchange-quadrigacx/src/main/java/org/knowm/xchange/quadrigacx/service/QuadrigaCxTradeServiceRaw.java index d40ec1c64d6..293f70cfaa6 100644 --- a/xchange-quadrigacx/src/main/java/org/knowm/xchange/quadrigacx/service/QuadrigaCxTradeServiceRaw.java +++ b/xchange-quadrigacx/src/main/java/org/knowm/xchange/quadrigacx/service/QuadrigaCxTradeServiceRaw.java @@ -70,8 +70,8 @@ public QuadrigaCxUserTransaction[] getQuadrigaCxUserTransactions(CurrencyPair cu exchange.getExchangeSpecification().getApiKey(), signatureCreator, exchange.getNonceFactory(), numberOfTransactions); } - public QuadrigaCxUserTransaction[] getQuadrigaCxUserTransactions(CurrencyPair currencyPair, Long numberOfTransactions, Long offset, String sort) - throws IOException { + public QuadrigaCxUserTransaction[] getQuadrigaCxUserTransactions(CurrencyPair currencyPair, Long numberOfTransactions, Long offset, + String sort) throws IOException { return quadrigacxAuthenticated.getUserTransactions(QuadrigaCxUtils.currencyPairToBook(currencyPair), exchange.getExchangeSpecification().getApiKey(), signatureCreator, exchange.getNonceFactory(), numberOfTransactions, offset, sort); diff --git a/xchange-quoine/src/main/java/org/knowm/xchange/quoine/QuoineAuthenticated.java b/xchange-quoine/src/main/java/org/knowm/xchange/quoine/QuoineAuthenticated.java index 07d56f41e8a..66d2f9043bb 100644 --- a/xchange-quoine/src/main/java/org/knowm/xchange/quoine/QuoineAuthenticated.java +++ b/xchange-quoine/src/main/java/org/knowm/xchange/quoine/QuoineAuthenticated.java @@ -29,62 +29,43 @@ public interface QuoineAuthenticated extends Quoine { @GET @Path("fiat_accounts") - FiatAccount[] getFiatAccountInfo( - @HeaderParam("X-Quoine-API-Version") int apiVersion, - @HeaderParam("X-Quoine-Auth") ParamsDigest signer, + FiatAccount[] getFiatAccountInfo(@HeaderParam("X-Quoine-API-Version") int apiVersion, @HeaderParam("X-Quoine-Auth") ParamsDigest signer, @HeaderParam("Content-Type") String contentType) throws IOException; @GET @Path("crypto_accounts") - BitcoinAccount[] getCryptoAccountInfo( - @HeaderParam("X-Quoine-API-Version") int apiVersion, - @HeaderParam("X-Quoine-Auth") ParamsDigest signer, + BitcoinAccount[] getCryptoAccountInfo(@HeaderParam("X-Quoine-API-Version") int apiVersion, @HeaderParam("X-Quoine-Auth") ParamsDigest signer, @HeaderParam("Content-Type") String contentType) throws IOException; @GET @Path("accounts/balance") - QuoineAccountBalance[] getAllBalance( - @HeaderParam("X-Quoine-API-Version") int apiVersion, - @HeaderParam("X-Quoine-Auth") ParamsDigest signer, + QuoineAccountBalance[] getAllBalance(@HeaderParam("X-Quoine-API-Version") int apiVersion, @HeaderParam("X-Quoine-Auth") ParamsDigest signer, @HeaderParam("Content-Type") String contentType) throws IOException; @GET @Path("trading_accounts") - QuoineTradingAccountInfo[] getTradingAccountInfo( - @HeaderParam("X-Quoine-API-Version") int apiVersion, - @HeaderParam("X-Quoine-Auth") ParamsDigest signer, - @HeaderParam("Content-Type") String contentType) throws IOException; + QuoineTradingAccountInfo[] getTradingAccountInfo(@HeaderParam("X-Quoine-API-Version") int apiVersion, + @HeaderParam("X-Quoine-Auth") ParamsDigest signer, @HeaderParam("Content-Type") String contentType) throws IOException; @POST @Path("orders/") @Consumes(MediaType.APPLICATION_JSON) - QuoineOrderResponse placeOrder( - @HeaderParam("X-Quoine-API-Version") int apiVersion, - @HeaderParam("X-Quoine-Auth") ParamsDigest signer, - @HeaderParam("Content-Type") String contentTyp, - QuoineNewOrderRequestWrapper quoineNewOrderRequestWrapper) throws IOException; + QuoineOrderResponse placeOrder(@HeaderParam("X-Quoine-API-Version") int apiVersion, @HeaderParam("X-Quoine-Auth") ParamsDigest signer, + @HeaderParam("Content-Type") String contentTyp, QuoineNewOrderRequestWrapper quoineNewOrderRequestWrapper) throws IOException; @PUT @Path("orders/{order_id}/cancel") - QuoineOrderResponse cancelOrder( - @HeaderParam("X-Quoine-API-Version") int apiVersion, - @HeaderParam("X-Quoine-Auth") ParamsDigest signer, - @HeaderParam("Content-Type") String contentTyp, - @PathParam("order_id") String orderID) throws IOException; + QuoineOrderResponse cancelOrder(@HeaderParam("X-Quoine-API-Version") int apiVersion, @HeaderParam("X-Quoine-Auth") ParamsDigest signer, + @HeaderParam("Content-Type") String contentTyp, @PathParam("order_id") String orderID) throws IOException; @GET @Path("orders/{order_id}") - QuoineOrderDetailsResponse orderDetails( - @HeaderParam("X-Quoine-API-Version") int apiVersion, - @HeaderParam("X-Quoine-Auth") ParamsDigest signer, - @HeaderParam("Content-Type") String contentTyp, - @PathParam("order_id") String orderID) throws IOException; + QuoineOrderDetailsResponse orderDetails(@HeaderParam("X-Quoine-API-Version") int apiVersion, @HeaderParam("X-Quoine-Auth") ParamsDigest signer, + @HeaderParam("Content-Type") String contentTyp, @PathParam("order_id") String orderID) throws IOException; @GET @Path("orders") - QuoineOrdersList listOrders( - @HeaderParam("X-Quoine-API-Version") int apiVersion, - @HeaderParam("X-Quoine-Auth") ParamsDigest signer, + QuoineOrdersList listOrders(@HeaderParam("X-Quoine-API-Version") int apiVersion, @HeaderParam("X-Quoine-Auth") ParamsDigest signer, @HeaderParam("Content-Type") String contentTyp) throws IOException; } diff --git a/xchange-quoine/src/main/java/org/knowm/xchange/quoine/dto/account/QuoineAccountBalance.java b/xchange-quoine/src/main/java/org/knowm/xchange/quoine/dto/account/QuoineAccountBalance.java index 16562bd6b06..1ae09c1f5c3 100644 --- a/xchange-quoine/src/main/java/org/knowm/xchange/quoine/dto/account/QuoineAccountBalance.java +++ b/xchange-quoine/src/main/java/org/knowm/xchange/quoine/dto/account/QuoineAccountBalance.java @@ -7,8 +7,7 @@ public final class QuoineAccountBalance { private final String currency; private final double balance; - public QuoineAccountBalance(@JsonProperty("currency") String currency, - @JsonProperty("balance") double balance) { + public QuoineAccountBalance(@JsonProperty("currency") String currency, @JsonProperty("balance") double balance) { this.currency = currency; this.balance = balance; } diff --git a/xchange-quoine/src/main/java/org/knowm/xchange/quoine/dto/trade/QuoineNewMarginOrderRequest.java b/xchange-quoine/src/main/java/org/knowm/xchange/quoine/dto/trade/QuoineNewMarginOrderRequest.java index ebc6707d478..5f2bc4142e9 100644 --- a/xchange-quoine/src/main/java/org/knowm/xchange/quoine/dto/trade/QuoineNewMarginOrderRequest.java +++ b/xchange-quoine/src/main/java/org/knowm/xchange/quoine/dto/trade/QuoineNewMarginOrderRequest.java @@ -14,8 +14,8 @@ public class QuoineNewMarginOrderRequest extends QuoineNewOrderRequest { @JsonProperty("order_direction") private final String orderDirection; - public QuoineNewMarginOrderRequest(String orderType, int productCode, String side, BigDecimal quantity, BigDecimal price, - int leverageLevel, String fundingCurrency) { + public QuoineNewMarginOrderRequest(String orderType, int productCode, String side, BigDecimal quantity, BigDecimal price, int leverageLevel, + String fundingCurrency) { super(orderType, productCode, side, quantity, price); this.leverageLevel = leverageLevel; diff --git a/xchange-quoine/src/main/java/org/knowm/xchange/quoine/dto/trade/QuoineNewOrderRequest.java b/xchange-quoine/src/main/java/org/knowm/xchange/quoine/dto/trade/QuoineNewOrderRequest.java index e08b347aca3..9587bf98f5e 100644 --- a/xchange-quoine/src/main/java/org/knowm/xchange/quoine/dto/trade/QuoineNewOrderRequest.java +++ b/xchange-quoine/src/main/java/org/knowm/xchange/quoine/dto/trade/QuoineNewOrderRequest.java @@ -21,8 +21,8 @@ public class QuoineNewOrderRequest { @JsonProperty("price") private final BigDecimal price; // Price of BTC you want to trade. -// @JsonProperty("price_range") -// private final boolean priceRange; + // @JsonProperty("price_range") + // private final boolean priceRange; public QuoineNewOrderRequest(String orderType, int productId, String side, BigDecimal quantity, BigDecimal price) { this.orderType = orderType; @@ -54,8 +54,8 @@ public BigDecimal getPrice() { @Override public String toString() { - return "QuoineNewOrderRequest [orderType=" + orderType + ", productId=" + productId + ", side=" - + side + ", quantity=" + quantity + ", price=" + price + "]"; + return "QuoineNewOrderRequest [orderType=" + orderType + ", productId=" + productId + ", side=" + side + ", quantity=" + quantity + ", price=" + + price + "]"; } } diff --git a/xchange-quoine/src/main/java/org/knowm/xchange/quoine/service/QuoineAccountService.java b/xchange-quoine/src/main/java/org/knowm/xchange/quoine/service/QuoineAccountService.java index 40bb581aaea..2784e4e3614 100644 --- a/xchange-quoine/src/main/java/org/knowm/xchange/quoine/service/QuoineAccountService.java +++ b/xchange-quoine/src/main/java/org/knowm/xchange/quoine/service/QuoineAccountService.java @@ -41,12 +41,10 @@ public QuoineAccountService(BaseExchange baseExchange, boolean useMargin) { @Override public AccountInfo getAccountInfo() throws IOException { - -/* if (useMargin) { - QuoineTradingAccountInfo[] quoineTradingAccountInfo = getQuoineTradingAccountInfo(); - return new AccountInfo(QuoineAdapters.adaptTradingWallet(quoineTradingAccountInfo)); - - } else { */ + /* + * if (useMargin) { QuoineTradingAccountInfo[] quoineTradingAccountInfo = getQuoineTradingAccountInfo(); return new + * AccountInfo(QuoineAdapters.adaptTradingWallet(quoineTradingAccountInfo)); } else { + */ final FiatAccount[] quoineFiatAccountInfo = getQuoineFiatAccountInfo(); return new AccountInfo(QuoineAdapters.adaptFiatAccountWallet(quoineFiatAccountInfo)); /* } */ @@ -70,7 +68,8 @@ public TradeHistoryParams createFundingHistoryParams() { } @Override - public List getFundingHistory(TradeHistoryParams params) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { + public List getFundingHistory( + TradeHistoryParams params) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { throw new NotYetImplementedForExchangeException(); } } diff --git a/xchange-quoine/src/main/java/org/knowm/xchange/quoine/service/QuoineSignatureDigest.java b/xchange-quoine/src/main/java/org/knowm/xchange/quoine/service/QuoineSignatureDigest.java index 4807334eb32..9d96e7da0c8 100644 --- a/xchange-quoine/src/main/java/org/knowm/xchange/quoine/service/QuoineSignatureDigest.java +++ b/xchange-quoine/src/main/java/org/knowm/xchange/quoine/service/QuoineSignatureDigest.java @@ -28,10 +28,7 @@ public String digestParams(RestInvocation restInvocation) { String path = "/" + restInvocation.getMethodPath(); - final String sign = builder - .withClaim("path", path) - .withClaim("nonce", String.valueOf(nonceFactory.createValue())) - .withClaim("token_id", tokenID) + final String sign = builder.withClaim("path", path).withClaim("nonce", String.valueOf(nonceFactory.createValue())).withClaim("token_id", tokenID) .sign(Algorithm.HMAC256(userSecret)); return sign; diff --git a/xchange-quoine/src/main/java/org/knowm/xchange/quoine/service/QuoineTradeService.java b/xchange-quoine/src/main/java/org/knowm/xchange/quoine/service/QuoineTradeService.java index 6b27a7a1d5b..80ecd37fbe4 100644 --- a/xchange-quoine/src/main/java/org/knowm/xchange/quoine/service/QuoineTradeService.java +++ b/xchange-quoine/src/main/java/org/knowm/xchange/quoine/service/QuoineTradeService.java @@ -40,7 +40,8 @@ public OpenOrders getOpenOrders() throws IOException { } @Override - public OpenOrders getOpenOrders(OpenOrdersParams params) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { + public OpenOrders getOpenOrders( + OpenOrdersParams params) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { QuoineOrdersList quoineOrdersList = listQuoineOrders(); return QuoineAdapters.adapteOpenOrders(quoineOrdersList); } @@ -76,8 +77,8 @@ public UserTrades getTradeHistory(TradeHistoryParams params) throws IOException } @Override - public Collection getOrder(String... orderIds) - throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { + public Collection getOrder( + String... orderIds) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { throw new NotYetImplementedForExchangeException(); } diff --git a/xchange-ripple/src/main/java/org/knowm/xchange/ripple/RipplePublic.java b/xchange-ripple/src/main/java/org/knowm/xchange/ripple/RipplePublic.java index 5c234836d7e..c1c41032c51 100644 --- a/xchange-ripple/src/main/java/org/knowm/xchange/ripple/RipplePublic.java +++ b/xchange-ripple/src/main/java/org/knowm/xchange/ripple/RipplePublic.java @@ -62,16 +62,16 @@ RippleOrderBook getOrderBook(@PathParam("address") final String address, @PathPa */ @GET @Path("accounts/{address}/orders/{hash}") - RippleOrderTransaction orderTransaction(@PathParam("address") final String address, @PathParam("hash") final String hash) - throws IOException, RippleException; + RippleOrderTransaction orderTransaction(@PathParam("address") final String address, + @PathParam("hash") final String hash) throws IOException, RippleException; /** * Returns detailed information about this payment transaction. */ @GET @Path("accounts/{address}/payments/{hash}") - RipplePaymentTransaction paymentTransaction(@PathParam("address") final String address, @PathParam("hash") final String hash) - throws IOException, RippleException; + RipplePaymentTransaction paymentTransaction(@PathParam("address") final String address, + @PathParam("hash") final String hash) throws IOException, RippleException; /** * Returns notifications for this address. @@ -80,8 +80,8 @@ RipplePaymentTransaction paymentTransaction(@PathParam("address") final String a @Path("accounts/{address}/notifications") RippleNotifications notifications(@PathParam("address") final String address, @QueryParam("exclude_failed") final Boolean excludeFailed, @QueryParam("earliest_first") final Boolean earliestFirst, @QueryParam("results_per_page") final Integer resultsPerPage, - @QueryParam("page") final Integer page, @QueryParam("start_ledger") final Long startLedger, @QueryParam("end_ledger") final Long endLedger) - throws IOException, RippleException; + @QueryParam("page") final Integer page, @QueryParam("start_ledger") final Long startLedger, + @QueryParam("end_ledger") final Long endLedger) throws IOException, RippleException; /** * Fetch the network transaction fee. diff --git a/xchange-ripple/src/main/java/org/knowm/xchange/ripple/dto/ToPlainStringSerializer.java b/xchange-ripple/src/main/java/org/knowm/xchange/ripple/dto/ToPlainStringSerializer.java index 67a01941b42..f7820bc2538 100644 --- a/xchange-ripple/src/main/java/org/knowm/xchange/ripple/dto/ToPlainStringSerializer.java +++ b/xchange-ripple/src/main/java/org/knowm/xchange/ripple/dto/ToPlainStringSerializer.java @@ -10,8 +10,8 @@ public class ToPlainStringSerializer extends JsonSerializer { @Override - public void serialize(final BigDecimal value, final JsonGenerator jgen, final SerializerProvider provider) - throws IOException, JsonProcessingException { + public void serialize(final BigDecimal value, final JsonGenerator jgen, + final SerializerProvider provider) throws IOException, JsonProcessingException { jgen.writeString(value.stripTrailingZeros().toPlainString()); } } diff --git a/xchange-ripple/src/main/java/org/knowm/xchange/ripple/service/RippleAccountService.java b/xchange-ripple/src/main/java/org/knowm/xchange/ripple/service/RippleAccountService.java index 9d88ab15371..639fc046c36 100644 --- a/xchange-ripple/src/main/java/org/knowm/xchange/ripple/service/RippleAccountService.java +++ b/xchange-ripple/src/main/java/org/knowm/xchange/ripple/service/RippleAccountService.java @@ -26,22 +26,21 @@ public RippleAccountService(final Exchange exchange) { * A wallet's currency will be prefixed with the issuing counterparty address for all currencies other than XRP. */ @Override - public AccountInfo getAccountInfo() - throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { + public AccountInfo getAccountInfo() throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { final RippleAccountBalances account = getRippleAccountBalances(); final String username = exchange.getExchangeSpecification().getApiKey(); return RippleAdapters.adaptAccountInfo(account, username); } @Override - public String withdrawFunds(Currency currency, BigDecimal amount, String address) - throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { + public String withdrawFunds(Currency currency, BigDecimal amount, + String address) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { throw new NotYetImplementedForExchangeException(); } @Override - public String requestDepositAddress(Currency currency, String... args) - throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { + public String requestDepositAddress(Currency currency, + String... args) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { throw new NotYetImplementedForExchangeException(); } @@ -51,7 +50,8 @@ public TradeHistoryParams createFundingHistoryParams() { } @Override - public List getFundingHistory(TradeHistoryParams params) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { + public List getFundingHistory( + TradeHistoryParams params) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { throw new NotYetImplementedForExchangeException(); } } diff --git a/xchange-ripple/src/main/java/org/knowm/xchange/ripple/service/RippleMarketDataService.java b/xchange-ripple/src/main/java/org/knowm/xchange/ripple/service/RippleMarketDataService.java index 10e45935cef..645fcb75a50 100644 --- a/xchange-ripple/src/main/java/org/knowm/xchange/ripple/service/RippleMarketDataService.java +++ b/xchange-ripple/src/main/java/org/knowm/xchange/ripple/service/RippleMarketDataService.java @@ -41,14 +41,14 @@ public OrderBook getOrderBook(final CurrencyPair currencyPair, final Object... a } @Override - public Ticker getTicker(final CurrencyPair currencyPair, final Object... args) - throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { + public Ticker getTicker(final CurrencyPair currencyPair, + final Object... args) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { throw new NotYetImplementedForExchangeException(); } @Override - public Trades getTrades(final CurrencyPair currencyPair, final Object... args) - throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { + public Trades getTrades(final CurrencyPair currencyPair, + final Object... args) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { throw new NotYetImplementedForExchangeException(); } } diff --git a/xchange-ripple/src/main/java/org/knowm/xchange/ripple/service/RippleTradeService.java b/xchange-ripple/src/main/java/org/knowm/xchange/ripple/service/RippleTradeService.java index 323525661f2..ee2d2c734dc 100644 --- a/xchange-ripple/src/main/java/org/knowm/xchange/ripple/service/RippleTradeService.java +++ b/xchange-ripple/src/main/java/org/knowm/xchange/ripple/service/RippleTradeService.java @@ -49,13 +49,14 @@ public OpenOrders getOpenOrders() throws ExchangeException, NotAvailableFromExch } @Override - public OpenOrders getOpenOrders(OpenOrdersParams params) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { + public OpenOrders getOpenOrders( + OpenOrdersParams params) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { return RippleAdapters.adaptOpenOrders(getOpenAccountOrders(), ripple.getRoundingScale()); } @Override - public String placeMarketOrder(final MarketOrder order) - throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { + public String placeMarketOrder( + final MarketOrder order) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { throw new NotYetImplementedForExchangeException(); } @@ -63,8 +64,8 @@ public String placeMarketOrder(final MarketOrder order) * @param order this should be a RippleLimitOrder object with the base and counter counterparties populated for any currency other than XRP. */ @Override - public String placeLimitOrder(final LimitOrder order) - throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { + public String placeLimitOrder( + final LimitOrder order) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { if (order instanceof RippleLimitOrder) { return placeOrder((RippleLimitOrder) order, ripple.validateOrderRequests()); } else { @@ -73,8 +74,8 @@ public String placeLimitOrder(final LimitOrder order) } @Override - public boolean cancelOrder(final String orderId) - throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { + public boolean cancelOrder( + final String orderId) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { return cancelOrder(orderId, ripple.validateOrderRequests()); } @@ -85,19 +86,18 @@ public boolean cancelOrder(final String orderId) * this trade history query will result in many API calls without returning any trade history. In order to reduce the time and resources used in * these repeated calls In order to reduce the number of API calls a number of different methods can be used: *
      - *
    • RippleTradeHistoryHashLimit set the to the last known trade, this query will - * then terminate once it has been found.
      • - *
    • RippleTradeHistoryCount set the to restrict the number of trades to return, - * the default is {@link RippleTradeHistoryCount#DEFAULT_TRADE_COUNT_LIMIT}.
      • - *
    • RippleTradeHistoryCount set the to restrict the number of API calls that - * will be made during a single trade history query, the default is {@link RippleTradeHistoryCount#DEFAULT_API_CALL_COUNT}.
      • + *
    • RippleTradeHistoryHashLimit set the to the last known trade, this query will then terminate once it has been found.
      • + *
    • RippleTradeHistoryCount set the to restrict the number of trades to return, the default is + * {@link RippleTradeHistoryCount#DEFAULT_TRADE_COUNT_LIMIT}.
      • + *
    • RippleTradeHistoryCount set the to restrict the number of API calls that will be made during a single trade history query, the default + * is {@link RippleTradeHistoryCount#DEFAULT_API_CALL_COUNT}.
      • *
    • TradeHistoryParamsTimeSpan set the {@link TradeHistoryParamsTimeSpan#setStartTime(java.util.Date)} to limit the number of trades * searched for to those done since the given start time.
      • TradeHistoryParamsTimeSpan *
    * * @param params Can optionally implement {@RippleTradeHistoryAccount}, {@RippleTradeHistoryCount}, {@RippleTradeHistoryHashLimit}, - * {@RippleTradeHistoryPreferredCurrencies}, {@link TradeHistoryParamPaging}, {@TradeHistoryParamCurrencyPair}, - * {@link TradeHistoryParamsTimeSpan}. All other TradeHistoryParams types will be ignored. + * {@RippleTradeHistoryPreferredCurrencies}, {@link TradeHistoryParamPaging}, {@TradeHistoryParamCurrencyPair}, {@link TradeHistoryParamsTimeSpan}. + * All other TradeHistoryParams types will be ignored. */ @Override public UserTrades getTradeHistory(final TradeHistoryParams params) throws IOException { @@ -124,8 +124,8 @@ public UserTrades getTradeHistory(final TradeHistoryParams params) throws IOExce } @Override - public Collection getOrder(String... orderIds) - throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { + public Collection getOrder( + String... orderIds) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { throw new NotYetImplementedForExchangeException(); } diff --git a/xchange-ripple/src/main/java/org/knowm/xchange/ripple/service/RippleTradeServiceRaw.java b/xchange-ripple/src/main/java/org/knowm/xchange/ripple/service/RippleTradeServiceRaw.java index 3c916e22f4d..edcdce62314 100644 --- a/xchange-ripple/src/main/java/org/knowm/xchange/ripple/service/RippleTradeServiceRaw.java +++ b/xchange-ripple/src/main/java/org/knowm/xchange/ripple/service/RippleTradeServiceRaw.java @@ -160,8 +160,8 @@ public IRippleTradeTransaction getTrade(final String account, final RippleNotifi return trade; } - public List getTradesForAccount(final TradeHistoryParams params, final String account) - throws RippleException, IOException { + public List getTradesForAccount(final TradeHistoryParams params, + final String account) throws RippleException, IOException { final Integer pageLength; final Integer pageNumber; if (params instanceof TradeHistoryParamPaging) { diff --git a/xchange-taurus/src/main/java/org/knowm/xchange/taurus/TaurusAuthenticated.java b/xchange-taurus/src/main/java/org/knowm/xchange/taurus/TaurusAuthenticated.java index 81af428fba8..64c1a32e177 100644 --- a/xchange-taurus/src/main/java/org/knowm/xchange/taurus/TaurusAuthenticated.java +++ b/xchange-taurus/src/main/java/org/knowm/xchange/taurus/TaurusAuthenticated.java @@ -32,14 +32,14 @@ TaurusOrder[] getOpenOrders(@FormParam("key") String apiKey, @FormParam("signatu @POST @Path("buy/") TaurusOrder buy(@FormParam("key") String apiKey, @FormParam("signature") ParamsDigest signer, - @FormParam("nonce") SynchronizedValueFactory nonce, @FormParam("amount") BigDecimal amount, @FormParam("price") BigDecimal price) - throws TaurusException, IOException; + @FormParam("nonce") SynchronizedValueFactory nonce, @FormParam("amount") BigDecimal amount, + @FormParam("price") BigDecimal price) throws TaurusException, IOException; @POST @Path("sell/") TaurusOrder sell(@FormParam("key") String apiKey, @FormParam("signature") ParamsDigest signer, - @FormParam("nonce") SynchronizedValueFactory nonce, @FormParam("amount") BigDecimal amount, @FormParam("price") BigDecimal price) - throws TaurusException, IOException; + @FormParam("nonce") SynchronizedValueFactory nonce, @FormParam("amount") BigDecimal amount, + @FormParam("price") BigDecimal price) throws TaurusException, IOException; // todo: market order @@ -70,6 +70,6 @@ String getBitcoinDepositAddress(@FormParam("key") String apiKey, @FormParam("sig @POST @Path("bitcoin_withdrawal/") String withdrawBitcoin(@FormParam("key") String apiKey, @FormParam("signature") ParamsDigest signer, - @FormParam("nonce") SynchronizedValueFactory nonce, @FormParam("amount") BigDecimal amount, @FormParam("address") String address) - throws TaurusException, IOException; + @FormParam("nonce") SynchronizedValueFactory nonce, @FormParam("amount") BigDecimal amount, + @FormParam("address") String address) throws TaurusException, IOException; } diff --git a/xchange-taurus/src/main/java/org/knowm/xchange/taurus/service/TaurusAccountService.java b/xchange-taurus/src/main/java/org/knowm/xchange/taurus/service/TaurusAccountService.java index d1805f68071..92b026f77f7 100644 --- a/xchange-taurus/src/main/java/org/knowm/xchange/taurus/service/TaurusAccountService.java +++ b/xchange-taurus/src/main/java/org/knowm/xchange/taurus/service/TaurusAccountService.java @@ -45,7 +45,8 @@ public TradeHistoryParams createFundingHistoryParams() { } @Override - public List getFundingHistory(TradeHistoryParams params) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { + public List getFundingHistory( + TradeHistoryParams params) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { throw new NotYetImplementedForExchangeException(); } } diff --git a/xchange-taurus/src/main/java/org/knowm/xchange/taurus/service/TaurusTradeService.java b/xchange-taurus/src/main/java/org/knowm/xchange/taurus/service/TaurusTradeService.java index 270e3e2733d..07ae7bc74e3 100644 --- a/xchange-taurus/src/main/java/org/knowm/xchange/taurus/service/TaurusTradeService.java +++ b/xchange-taurus/src/main/java/org/knowm/xchange/taurus/service/TaurusTradeService.java @@ -46,7 +46,8 @@ public OpenOrders getOpenOrders() throws IOException, TaurusException { } @Override - public OpenOrders getOpenOrders(OpenOrdersParams params) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { + public OpenOrders getOpenOrders( + OpenOrdersParams params) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { TaurusOrder[] openOrders = getTaurusOpenOrders(); List limitOrders = new ArrayList<>(); @@ -108,8 +109,8 @@ public OpenOrdersParams createOpenOrdersParams() { } @Override - public Collection getOrder(String... orderIds) - throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { + public Collection getOrder( + String... orderIds) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { throw new NotYetImplementedForExchangeException(); } diff --git a/xchange-therock/src/main/java/org/knowm/xchange/therock/TheRockAdapters.java b/xchange-therock/src/main/java/org/knowm/xchange/therock/TheRockAdapters.java index ff7fcfd144b..6bb82585b1c 100644 --- a/xchange-therock/src/main/java/org/knowm/xchange/therock/TheRockAdapters.java +++ b/xchange-therock/src/main/java/org/knowm/xchange/therock/TheRockAdapters.java @@ -76,7 +76,7 @@ public static Trades adaptTrades(TheRockTrades trades, CurrencyPair currencyPair for (int i = 0; i < trades.getCount(); i++) { TheRockTrade trade = trades.getTrades()[i]; if (trade.getSide() != Side.buy && trade.getSide() != Side.sell) { - continue; // process buys and sells only + continue; // process buys and sells only } long tradeId = trade.getId(); if (tradeId > lastTradeId) @@ -95,10 +95,8 @@ public static UserTrade adaptUserTrade(TheRockUserTrade trade, CurrencyPair curr final String tradeId = String.valueOf(trade.getId()); //return new UserTrade(trade.getSide() == Side.sell ? OrderType.ASK : BID, trade.getAmount(), currencyPair, trade.getPrice(), trade.getDate(), tradeId); return new UserTrade.Builder().id(tradeId).tradableAmount(trade.getAmount()).currencyPair(currencyPair).price(trade.getPrice()) - .timestamp(trade.getDate()).orderId(String.valueOf(trade.getOrderId())) - .type(trade.getSide() == Side.buy ? OrderType.BID : OrderType.ASK) - .feeAmount(trade.getFeeAmount()).feeCurrency(trade.getFeeCurrency() == null ? null : new Currency(trade.getFeeCurrency())) - .build(); + .timestamp(trade.getDate()).orderId(String.valueOf(trade.getOrderId())).type(trade.getSide() == Side.buy ? OrderType.BID : OrderType.ASK) + .feeAmount(trade.getFeeAmount()).feeCurrency(trade.getFeeCurrency() == null ? null : new Currency(trade.getFeeCurrency())).build(); } public static UserTrades adaptUserTrades(TheRockUserTrades trades, CurrencyPair currencyPair) throws InvalidFormatException { @@ -116,8 +114,7 @@ public static UserTrades adaptUserTrades(TheRockUserTrades trades, CurrencyPair } public static LimitOrder adaptOrder(TheRockOrder o) { - return new LimitOrder(adaptOrderType(o.getSide()), o.getAmount(), o.getFundId().pair, - Long.toString(o.getId()), null, o.getPrice()); + return new LimitOrder(adaptOrderType(o.getSide()), o.getAmount(), o.getFundId().pair, Long.toString(o.getId()), null, o.getPrice()); } public static Order.OrderType adaptOrderType(TheRockOrder.Side orderSide) { diff --git a/xchange-therock/src/main/java/org/knowm/xchange/therock/TheRockAuthenticated.java b/xchange-therock/src/main/java/org/knowm/xchange/therock/TheRockAuthenticated.java index a0b9e5f143f..482eb33b216 100644 --- a/xchange-therock/src/main/java/org/knowm/xchange/therock/TheRockAuthenticated.java +++ b/xchange-therock/src/main/java/org/knowm/xchange/therock/TheRockAuthenticated.java @@ -40,8 +40,8 @@ public interface TheRockAuthenticated { @GET @Path("balances/{currency}") TheRockBalance balance(@HeaderParam(X_TRT_KEY) String publicKey, @HeaderParam(X_TRT_SIGN) TheRockDigest signer, - @HeaderParam(X_TRT_NONCE) SynchronizedValueFactory nonceFactory, @PathParam("currency") String currency) - throws TheRockException, IOException; + @HeaderParam(X_TRT_NONCE) SynchronizedValueFactory nonceFactory, + @PathParam("currency") String currency) throws TheRockException, IOException; @GET @Path("balances") @@ -60,39 +60,37 @@ TheRockWithdrawalResponse withdraw(@HeaderParam(X_TRT_KEY) String publicKey, @He @Consumes(MediaType.APPLICATION_JSON) @Path("funds/{fund_id}/orders") TheRockOrder placeOrder(@PathParam("fund_id") TheRock.Pair currencyPair, @HeaderParam(X_TRT_KEY) String publicKey, - @HeaderParam(X_TRT_SIGN) TheRockDigest signer, @HeaderParam(X_TRT_NONCE) SynchronizedValueFactory nonceFactory, TheRockOrder order) - throws TheRockException, IOException; + @HeaderParam(X_TRT_SIGN) TheRockDigest signer, @HeaderParam(X_TRT_NONCE) SynchronizedValueFactory nonceFactory, + TheRockOrder order) throws TheRockException, IOException; @DELETE @Path("funds/{fund_id}/orders/{id}") TheRockOrder cancelOrder(@PathParam("fund_id") TheRock.Pair currencyPair, @PathParam("id") Long orderId, @HeaderParam(X_TRT_KEY) String publicKey, - @HeaderParam(X_TRT_SIGN) TheRockDigest signer, @HeaderParam(X_TRT_NONCE) SynchronizedValueFactory nonceFactory) - throws TheRockException, IOException; + @HeaderParam(X_TRT_SIGN) TheRockDigest signer, + @HeaderParam(X_TRT_NONCE) SynchronizedValueFactory nonceFactory) throws TheRockException, IOException; @GET @Path("funds/{fund_id}/orders") TheRockOrders orders(@PathParam("fund_id") TheRock.Pair currencyPair, @HeaderParam(X_TRT_KEY) String publicKey, - @HeaderParam(X_TRT_SIGN) TheRockDigest signer, @HeaderParam(X_TRT_NONCE) SynchronizedValueFactory nonceFactory) - throws TheRockException, IOException; + @HeaderParam(X_TRT_SIGN) TheRockDigest signer, + @HeaderParam(X_TRT_NONCE) SynchronizedValueFactory nonceFactory) throws TheRockException, IOException; @GET @Path("funds/{fund_id}/orders/{id}") TheRockOrder showOrder(@PathParam("fund_id") TheRock.Pair currencyPair, @PathParam("id") Long orderId, @HeaderParam(X_TRT_KEY) String publicKey, - @HeaderParam(X_TRT_SIGN) TheRockDigest signer, @HeaderParam(X_TRT_NONCE) SynchronizedValueFactory nonceFactory) - throws TheRockException, IOException; + @HeaderParam(X_TRT_SIGN) TheRockDigest signer, + @HeaderParam(X_TRT_NONCE) SynchronizedValueFactory nonceFactory) throws TheRockException, IOException; @GET @Path("funds/{fund_id}/trades") TheRockUserTrades trades(@PathParam("fund_id") TheRock.Pair currencyPair, @HeaderParam(X_TRT_KEY) String publicKey, - @HeaderParam(X_TRT_SIGN) TheRockDigest signer, @HeaderParam(X_TRT_NONCE) SynchronizedValueFactory nonceFactory - , @QueryParam("trade_id") Long sinceTradeId, @QueryParam("after") Date after, @QueryParam("before") Date before - , @QueryParam("per_page") int perPage) - throws TheRockException, IOException; + @HeaderParam(X_TRT_SIGN) TheRockDigest signer, @HeaderParam(X_TRT_NONCE) SynchronizedValueFactory nonceFactory, + @QueryParam("trade_id") Long sinceTradeId, @QueryParam("after") Date after, @QueryParam("before") Date before, + @QueryParam("per_page") int perPage) throws TheRockException, IOException; @GET @Path("transactions") - TheRockTransactions transactions(@HeaderParam(X_TRT_KEY) String publicKey, @HeaderParam(X_TRT_SIGN) TheRockDigest signer - , @HeaderParam(X_TRT_NONCE) SynchronizedValueFactory nonceFactory, @QueryParam("type") String type - , @QueryParam("after") Date after, @QueryParam("before") Date before) - throws TheRockException, IOException; + TheRockTransactions transactions(@HeaderParam(X_TRT_KEY) String publicKey, @HeaderParam(X_TRT_SIGN) TheRockDigest signer, + @HeaderParam(X_TRT_NONCE) SynchronizedValueFactory nonceFactory, @QueryParam("type") String type, @QueryParam("after") Date after, + @QueryParam("before") Date before) throws TheRockException, IOException; } diff --git a/xchange-therock/src/main/java/org/knowm/xchange/therock/TheRockAuthenticatedV0.java b/xchange-therock/src/main/java/org/knowm/xchange/therock/TheRockAuthenticatedV0.java index a89ea772c83..5f0da42617a 100644 --- a/xchange-therock/src/main/java/org/knowm/xchange/therock/TheRockAuthenticatedV0.java +++ b/xchange-therock/src/main/java/org/knowm/xchange/therock/TheRockAuthenticatedV0.java @@ -29,8 +29,7 @@ public interface TheRockAuthenticatedV0 { @POST @Path("get_orders") - TheRockOrder placeOrder(@HeaderParam("X-TRT-KEY") String publicKey, - @HeaderParam("X-TRT-SIGN") TheRockDigest signer, @HeaderParam(X_TRT_NONCE) SynchronizedValueFactory nonceFactory, TheRockOrder order) - throws TheRockException, IOException; + TheRockOrder placeOrder(@HeaderParam("X-TRT-KEY") String publicKey, @HeaderParam("X-TRT-SIGN") TheRockDigest signer, + @HeaderParam(X_TRT_NONCE) SynchronizedValueFactory nonceFactory, TheRockOrder order) throws TheRockException, IOException; } diff --git a/xchange-therock/src/main/java/org/knowm/xchange/therock/dto/trade/TheRockTransaction.java b/xchange-therock/src/main/java/org/knowm/xchange/therock/dto/trade/TheRockTransaction.java index 8a679dcee3b..634e5793d09 100644 --- a/xchange-therock/src/main/java/org/knowm/xchange/therock/dto/trade/TheRockTransaction.java +++ b/xchange-therock/src/main/java/org/knowm/xchange/therock/dto/trade/TheRockTransaction.java @@ -16,10 +16,9 @@ public class TheRockTransaction { private final Long tradeId; private final TransferDetail transferDetail; - public TheRockTransaction(@JsonProperty("id") long id, @JsonProperty("date") Date date, @JsonProperty("type") String type - , @JsonProperty("price") BigDecimal price, @JsonProperty("currency") String currency - , @JsonProperty("order_id") Long orderId, @JsonProperty("trade_id") Long tradeId - , @JsonProperty("transfer_detail") TransferDetail transferDetail) { + public TheRockTransaction(@JsonProperty("id") long id, @JsonProperty("date") Date date, @JsonProperty("type") String type, + @JsonProperty("price") BigDecimal price, @JsonProperty("currency") String currency, @JsonProperty("order_id") Long orderId, + @JsonProperty("trade_id") Long tradeId, @JsonProperty("transfer_detail") TransferDetail transferDetail) { this.id = id; this.date = date; this.type = type; @@ -64,8 +63,8 @@ public TransferDetail getTransferDetail() { @Override public String toString() { - return "TheRockTransaction [id=" + id + ", date=" + date + ", type=" + type + ", price=" + price + ", currency=" + currency - + ", orderId=" + orderId + ", tradeId=" + tradeId + ", transferDetail=" + transferDetail + "]"; + return "TheRockTransaction [id=" + id + ", date=" + date + ", type=" + type + ", price=" + price + ", currency=" + currency + ", orderId=" + + orderId + ", tradeId=" + tradeId + ", transferDetail=" + transferDetail + "]"; } public static class TransferDetail { @@ -74,8 +73,8 @@ public static class TransferDetail { private final String recipient; private final int confirmations; - public TransferDetail(@JsonProperty("method") String method, @JsonProperty("id") String id - , @JsonProperty("recipient") String recipient, @JsonProperty("confirmations") int confirmations) { + public TransferDetail(@JsonProperty("method") String method, @JsonProperty("id") String id, @JsonProperty("recipient") String recipient, + @JsonProperty("confirmations") int confirmations) { this.method = method; this.id = id; this.recipient = recipient; @@ -84,8 +83,7 @@ public TransferDetail(@JsonProperty("method") String method, @JsonProperty("id") @Override public String toString() { - return "TransferDetail [method=" + method + ", id=" + id + ", recipient=" + recipient + ", confirmations=" - + confirmations + "]"; + return "TransferDetail [method=" + method + ", id=" + id + ", recipient=" + recipient + ", confirmations=" + confirmations + "]"; } public String getMethod() { diff --git a/xchange-therock/src/main/java/org/knowm/xchange/therock/dto/trade/TheRockUserTrade.java b/xchange-therock/src/main/java/org/knowm/xchange/therock/dto/trade/TheRockUserTrade.java index 598c4c49b0b..b909f62e50b 100644 --- a/xchange-therock/src/main/java/org/knowm/xchange/therock/dto/trade/TheRockUserTrade.java +++ b/xchange-therock/src/main/java/org/knowm/xchange/therock/dto/trade/TheRockUserTrade.java @@ -19,10 +19,8 @@ public class TheRockUserTrade { private final long orderId; private final TheRockUserTradeTransaction feeTransaction; - public TheRockUserTrade( - @JsonProperty("id") long id, @JsonProperty("fund_id") String fundId - , @JsonProperty("amount") BigDecimal amount, @JsonProperty("price") BigDecimal price - , @JsonProperty("date") Date date, @JsonProperty("side") Side tradeSide, + public TheRockUserTrade(@JsonProperty("id") long id, @JsonProperty("fund_id") String fundId, @JsonProperty("amount") BigDecimal amount, + @JsonProperty("price") BigDecimal price, @JsonProperty("date") Date date, @JsonProperty("side") Side tradeSide, @JsonProperty("order_id") long orderId, @JsonProperty("transactions") TheRockUserTradeTransaction[] transactions) { this.id = id; this.fundId = fundId; @@ -93,9 +91,8 @@ private static class TheRockUserTradeTransaction { private final BigDecimal price; private final String currency; - public TheRockUserTradeTransaction(@JsonProperty("id") long id, @JsonProperty("date") Date date - , @JsonProperty("type") TransactionType type, @JsonProperty("price") BigDecimal price - , @JsonProperty("currency") String currency) { + public TheRockUserTradeTransaction(@JsonProperty("id") long id, @JsonProperty("date") Date date, @JsonProperty("type") TransactionType type, + @JsonProperty("price") BigDecimal price, @JsonProperty("currency") String currency) { super(); this.id = id; this.date = date; diff --git a/xchange-therock/src/main/java/org/knowm/xchange/therock/service/TheRockAccountService.java b/xchange-therock/src/main/java/org/knowm/xchange/therock/service/TheRockAccountService.java index ddef9490a5a..9e52046b7e6 100644 --- a/xchange-therock/src/main/java/org/knowm/xchange/therock/service/TheRockAccountService.java +++ b/xchange-therock/src/main/java/org/knowm/xchange/therock/service/TheRockAccountService.java @@ -47,7 +47,8 @@ public TradeHistoryParams createFundingHistoryParams() { } @Override - public List getFundingHistory(TradeHistoryParams params) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { + public List getFundingHistory( + TradeHistoryParams params) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { throw new NotYetImplementedForExchangeException(); } } diff --git a/xchange-therock/src/main/java/org/knowm/xchange/therock/service/TheRockAccountServiceRaw.java b/xchange-therock/src/main/java/org/knowm/xchange/therock/service/TheRockAccountServiceRaw.java index 5bca9847595..3ae61ab4a51 100644 --- a/xchange-therock/src/main/java/org/knowm/xchange/therock/service/TheRockAccountServiceRaw.java +++ b/xchange-therock/src/main/java/org/knowm/xchange/therock/service/TheRockAccountServiceRaw.java @@ -34,8 +34,8 @@ protected TheRockAccountServiceRaw(Exchange exchange) { /** * Withdraw using the default method */ - public TheRockWithdrawalResponse withdrawDefault(Currency currency, BigDecimal amount, String destinationAddress) - throws TheRockException, IOException { + public TheRockWithdrawalResponse withdrawDefault(Currency currency, BigDecimal amount, + String destinationAddress) throws TheRockException, IOException { final TheRockWithdrawal withdrawal = TheRockWithdrawal.createDefaultWithdrawal(currency.getCurrencyCode(), amount, destinationAddress); return theRockAuthenticated.withdraw(apiKey, signatureCreator, exchange.getNonceFactory(), withdrawal); } @@ -43,8 +43,8 @@ public TheRockWithdrawalResponse withdrawDefault(Currency currency, BigDecimal a /** * Withdraw to Ripple */ - public TheRockWithdrawalResponse withdrawRipple(Currency currency, BigDecimal amount, String destinationAddress) - throws TheRockException, IOException { + public TheRockWithdrawalResponse withdrawRipple(Currency currency, BigDecimal amount, + String destinationAddress) throws TheRockException, IOException { final TheRockWithdrawal withdrawal = TheRockWithdrawal.createRippleWithdrawal(currency.getCurrencyCode(), amount, destinationAddress); return theRockAuthenticated.withdraw(apiKey, signatureCreator, exchange.getNonceFactory(), withdrawal); } diff --git a/xchange-therock/src/main/java/org/knowm/xchange/therock/service/TheRockTradeService.java b/xchange-therock/src/main/java/org/knowm/xchange/therock/service/TheRockTradeService.java index fac394aa03e..3586e05150e 100644 --- a/xchange-therock/src/main/java/org/knowm/xchange/therock/service/TheRockTradeService.java +++ b/xchange-therock/src/main/java/org/knowm/xchange/therock/service/TheRockTradeService.java @@ -58,7 +58,8 @@ public OpenOrders getOpenOrders() throws IOException { } @Override - public OpenOrders getOpenOrders(OpenOrdersParams params) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { + public OpenOrders getOpenOrders( + OpenOrdersParams params) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { CurrencyPair currencyPair = null; if (params instanceof OpenOrdersParamCurrencyPair) { @@ -89,8 +90,8 @@ public boolean cancelOrder(String orderId) throws IOException { * Not available from exchange since TheRock needs currency pair in order to return/show the order */ @Override - public Collection getOrder(String... orderIds) - throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { + public Collection getOrder( + String... orderIds) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { throw new NotAvailableFromExchangeException(); } @@ -100,7 +101,7 @@ public UserTrades getTradeHistory(TradeHistoryParams params) throws IOException throw new ExchangeException("TheRock API recquires " + TradeHistoryParamCurrencyPair.class.getName()); } TradeHistoryParamCurrencyPair pairParams = (TradeHistoryParamCurrencyPair) params; - Long sinceTradeId = null; // get all trades starting from a specific trade_id + Long sinceTradeId = null; // get all trades starting from a specific trade_id if (params instanceof TradeHistoryParamsIdSpan) { TradeHistoryParamsIdSpan trId = (TradeHistoryParamsIdSpan) params; try { @@ -116,7 +117,8 @@ public UserTrades getTradeHistory(TradeHistoryParams params) throws IOException after = time.getStartTime(); before = time.getEndTime(); } - return TheRockAdapters.adaptUserTrades(getTheRockUserTrades(pairParams.getCurrencyPair(), sinceTradeId, after, before), pairParams.getCurrencyPair()); + return TheRockAdapters.adaptUserTrades(getTheRockUserTrades(pairParams.getCurrencyPair(), sinceTradeId, after, before), + pairParams.getCurrencyPair()); } @Override diff --git a/xchange-therock/src/main/java/org/knowm/xchange/therock/service/TheRockTradeServiceRaw.java b/xchange-therock/src/main/java/org/knowm/xchange/therock/service/TheRockTradeServiceRaw.java index 9572efd4a93..5f08b37cb1f 100644 --- a/xchange-therock/src/main/java/org/knowm/xchange/therock/service/TheRockTradeServiceRaw.java +++ b/xchange-therock/src/main/java/org/knowm/xchange/therock/service/TheRockTradeServiceRaw.java @@ -71,12 +71,11 @@ public TheRockOrder showTheRockOrder(CurrencyPair currencyPair, Long orderId) th } } - public TheRockUserTrades getTheRockUserTrades(CurrencyPair currencyPair, Long sinceTradeId, Date after, Date before) - throws IOException { + public TheRockUserTrades getTheRockUserTrades(CurrencyPair currencyPair, Long sinceTradeId, Date after, Date before) throws IOException { try { - return theRockAuthenticated.trades(new TheRock.Pair(currencyPair), exchange.getExchangeSpecification().getApiKey(), - signatureCreator, exchange.getNonceFactory(), sinceTradeId, after, before, 200); + return theRockAuthenticated.trades(new TheRock.Pair(currencyPair), exchange.getExchangeSpecification().getApiKey(), signatureCreator, + exchange.getNonceFactory(), sinceTradeId, after, before, 200); } catch (Throwable e) { throw new ExchangeException(e); } @@ -84,8 +83,9 @@ public TheRockUserTrades getTheRockUserTrades(CurrencyPair currencyPair, Long si public TheRockTransaction[] getTheRockTransactions(String type, Date after, Date before) throws IOException { try { - return theRockAuthenticated.transactions(exchange.getExchangeSpecification().getApiKey(), - signatureCreator, exchange.getNonceFactory(), type, after, before).getTransactions(); + return theRockAuthenticated + .transactions(exchange.getExchangeSpecification().getApiKey(), signatureCreator, exchange.getNonceFactory(), type, after, before) + .getTransactions(); } catch (Throwable e) { throw new ExchangeException(e); } diff --git a/xchange-truefx/src/main/java/org/knowm/xchange/truefx/service/TrueFxMarketDataService.java b/xchange-truefx/src/main/java/org/knowm/xchange/truefx/service/TrueFxMarketDataService.java index 1ab7ea0df39..b9b632e69e3 100644 --- a/xchange-truefx/src/main/java/org/knowm/xchange/truefx/service/TrueFxMarketDataService.java +++ b/xchange-truefx/src/main/java/org/knowm/xchange/truefx/service/TrueFxMarketDataService.java @@ -21,21 +21,21 @@ public TrueFxMarketDataService(Exchange exchange) { } @Override - public Ticker getTicker(CurrencyPair pair, Object... args) - throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { + public Ticker getTicker(CurrencyPair pair, + Object... args) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { final TrueFxTicker ticker = super.getTicker(pair); return TrueFxAdapters.adaptTicker(ticker); } @Override - public OrderBook getOrderBook(CurrencyPair pair, Object... args) - throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { + public OrderBook getOrderBook(CurrencyPair pair, + Object... args) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { throw new NotAvailableFromExchangeException(); } @Override - public Trades getTrades(CurrencyPair pair, Object... args) - throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { + public Trades getTrades(CurrencyPair pair, + Object... args) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { throw new NotAvailableFromExchangeException(); } } diff --git a/xchange-vaultoro/src/main/java/org/knowm/xchange/vaultoro/service/VaultoroAccountService.java b/xchange-vaultoro/src/main/java/org/knowm/xchange/vaultoro/service/VaultoroAccountService.java index 9262034eab4..e5e187463f3 100644 --- a/xchange-vaultoro/src/main/java/org/knowm/xchange/vaultoro/service/VaultoroAccountService.java +++ b/xchange-vaultoro/src/main/java/org/knowm/xchange/vaultoro/service/VaultoroAccountService.java @@ -29,23 +29,22 @@ public VaultoroAccountService(Exchange exchange) { } @Override - public AccountInfo getAccountInfo() - throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { + public AccountInfo getAccountInfo() throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { List vaultoroBalances = super.getVaultoroBalances(); return VaultoroAdapters.adaptVaultoroBalances(vaultoroBalances); } @Override - public String requestDepositAddress(Currency arg0, String... arg1) - throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { + public String requestDepositAddress(Currency arg0, + String... arg1) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { throw new NotAvailableFromExchangeException(); } @Override - public String withdrawFunds(Currency arg0, BigDecimal arg1, String arg2) - throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { + public String withdrawFunds(Currency arg0, BigDecimal arg1, + String arg2) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { throw new NotAvailableFromExchangeException(); } @@ -56,7 +55,8 @@ public TradeHistoryParams createFundingHistoryParams() { } @Override - public List getFundingHistory(TradeHistoryParams params) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { + public List getFundingHistory( + TradeHistoryParams params) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { throw new NotYetImplementedForExchangeException(); } } \ No newline at end of file diff --git a/xchange-vaultoro/src/main/java/org/knowm/xchange/vaultoro/service/VaultoroMarketDataService.java b/xchange-vaultoro/src/main/java/org/knowm/xchange/vaultoro/service/VaultoroMarketDataService.java index 04ba5c526bf..53a4bc80725 100644 --- a/xchange-vaultoro/src/main/java/org/knowm/xchange/vaultoro/service/VaultoroMarketDataService.java +++ b/xchange-vaultoro/src/main/java/org/knowm/xchange/vaultoro/service/VaultoroMarketDataService.java @@ -46,8 +46,8 @@ public List getExchangeSymbols() throws IOException { } @Override - public OrderBook getOrderBook(CurrencyPair arg0, Object... arg1) - throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { + public OrderBook getOrderBook(CurrencyPair arg0, + Object... arg1) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { List vaultoroOrderBooks = super.getVaultoroOrderBook(arg0); @@ -67,16 +67,16 @@ public OrderBook getOrderBook(CurrencyPair arg0, Object... arg1) } @Override - public Ticker getTicker(CurrencyPair arg0, Object... arg1) - throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { + public Ticker getTicker(CurrencyPair arg0, + Object... arg1) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { BigDecimal latest = super.getLast(arg0); return VaultoroAdapters.adaptVaultoroLatest(latest); } @Override - public Trades getTrades(CurrencyPair arg0, Object... arg1) - throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { + public Trades getTrades(CurrencyPair arg0, + Object... arg1) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { List vaultoroTrades = super.getVaultoroTrades(arg0); return VaultoroAdapters.adaptVaultoroTransactions(vaultoroTrades, arg0); diff --git a/xchange-vaultoro/src/main/java/org/knowm/xchange/vaultoro/service/VaultoroTradeService.java b/xchange-vaultoro/src/main/java/org/knowm/xchange/vaultoro/service/VaultoroTradeService.java index 311ac05b4c6..2df119a213c 100644 --- a/xchange-vaultoro/src/main/java/org/knowm/xchange/vaultoro/service/VaultoroTradeService.java +++ b/xchange-vaultoro/src/main/java/org/knowm/xchange/vaultoro/service/VaultoroTradeService.java @@ -32,8 +32,8 @@ public VaultoroTradeService(Exchange exchange) { } @Override - public boolean cancelOrder(String arg0) - throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { + public boolean cancelOrder( + String arg0) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { try { VaultoroCancelOrderResponse response = super.cancelVaultoroOrder(arg0); @@ -64,7 +64,8 @@ public OpenOrders getOpenOrders() throws ExchangeException, NotAvailableFromExch } @Override - public OpenOrders getOpenOrders(OpenOrdersParams params) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { + public OpenOrders getOpenOrders( + OpenOrdersParams params) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { return VaultoroAdapters.adaptVaultoroOpenOrders(getVaultoroOrders()); } @@ -75,8 +76,8 @@ public UserTrades getTradeHistory(TradeHistoryParams arg0) throws IOException { } @Override - public String placeLimitOrder(LimitOrder arg0) - throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { + public String placeLimitOrder( + LimitOrder arg0) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { VaultoroNewOrderResponse response = super.placeLimitOrder(arg0.getCurrencyPair(), arg0.getType(), arg0.getTradableAmount(), arg0.getLimitPrice()); return response.getData().getOrderID(); @@ -84,8 +85,8 @@ public String placeLimitOrder(LimitOrder arg0) } @Override - public String placeMarketOrder(MarketOrder arg0) - throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { + public String placeMarketOrder( + MarketOrder arg0) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { VaultoroNewOrderResponse response = super.placeMarketOrder(arg0.getCurrencyPair(), arg0.getType(), arg0.getTradableAmount()); return response.getData().getOrderID(); @@ -93,8 +94,8 @@ public String placeMarketOrder(MarketOrder arg0) } @Override - public Collection getOrder(String... arg0) - throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { + public Collection getOrder( + String... arg0) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { throw new NotAvailableFromExchangeException(); diff --git a/xchange-vaultoro/src/main/java/org/knowm/xchange/vaultoro/service/VaultoroTradeServiceRaw.java b/xchange-vaultoro/src/main/java/org/knowm/xchange/vaultoro/service/VaultoroTradeServiceRaw.java index 10fd08ffd1e..fcd9d956161 100644 --- a/xchange-vaultoro/src/main/java/org/knowm/xchange/vaultoro/service/VaultoroTradeServiceRaw.java +++ b/xchange-vaultoro/src/main/java/org/knowm/xchange/vaultoro/service/VaultoroTradeServiceRaw.java @@ -51,8 +51,8 @@ public Map> getVaultoroOrders() throws IOExcepti } } - public VaultoroNewOrderResponse placeLimitOrder(CurrencyPair currencyPair, OrderType orderType, BigDecimal amount, BigDecimal price) - throws IOException { + public VaultoroNewOrderResponse placeLimitOrder(CurrencyPair currencyPair, OrderType orderType, BigDecimal amount, + BigDecimal price) throws IOException { return placeOrder("limit", currencyPair, orderType, amount, price); @@ -64,8 +64,8 @@ public VaultoroNewOrderResponse placeMarketOrder(CurrencyPair currencyPair, Orde } - private VaultoroNewOrderResponse placeOrder(String type, CurrencyPair currencyPair, OrderType orderType, BigDecimal amount, BigDecimal price) - throws IOException { + private VaultoroNewOrderResponse placeOrder(String type, CurrencyPair currencyPair, OrderType orderType, BigDecimal amount, + BigDecimal price) throws IOException { String baseSymbol = currencyPair.base.getCurrencyCode().toLowerCase(); diff --git a/xchange-vircurex/src/main/java/org/knowm/xchange/vircurex/service/VircurexAccountService.java b/xchange-vircurex/src/main/java/org/knowm/xchange/vircurex/service/VircurexAccountService.java index aa1e34f07c5..44b369ac772 100644 --- a/xchange-vircurex/src/main/java/org/knowm/xchange/vircurex/service/VircurexAccountService.java +++ b/xchange-vircurex/src/main/java/org/knowm/xchange/vircurex/service/VircurexAccountService.java @@ -52,7 +52,8 @@ public TradeHistoryParams createFundingHistoryParams() { } @Override - public List getFundingHistory(TradeHistoryParams params) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { + public List getFundingHistory( + TradeHistoryParams params) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { throw new NotYetImplementedForExchangeException(); } } diff --git a/xchange-vircurex/src/main/java/org/knowm/xchange/vircurex/service/VircurexTradeService.java b/xchange-vircurex/src/main/java/org/knowm/xchange/vircurex/service/VircurexTradeService.java index e2458819eb7..a21e307d9e7 100644 --- a/xchange-vircurex/src/main/java/org/knowm/xchange/vircurex/service/VircurexTradeService.java +++ b/xchange-vircurex/src/main/java/org/knowm/xchange/vircurex/service/VircurexTradeService.java @@ -34,7 +34,8 @@ public OpenOrders getOpenOrders() throws IOException { } @Override - public OpenOrders getOpenOrders(OpenOrdersParams params) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { + public OpenOrders getOpenOrders( + OpenOrdersParams params) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { return getVircurexOpenOrders(); } @@ -74,8 +75,8 @@ public OpenOrdersParams createOpenOrdersParams() { } @Override - public Collection getOrder(String... orderIds) - throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { + public Collection getOrder( + String... orderIds) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { throw new NotYetImplementedForExchangeException(); } diff --git a/xchange-vircurex/src/main/java/org/knowm/xchange/vircurex/service/VircurexTradeServiceRaw.java b/xchange-vircurex/src/main/java/org/knowm/xchange/vircurex/service/VircurexTradeServiceRaw.java index 88ae8318ef6..b2084fcc0df 100644 --- a/xchange-vircurex/src/main/java/org/knowm/xchange/vircurex/service/VircurexTradeServiceRaw.java +++ b/xchange-vircurex/src/main/java/org/knowm/xchange/vircurex/service/VircurexTradeServiceRaw.java @@ -29,9 +29,9 @@ public String placeVircurexLimitOrder(LimitOrder limitOrder) throws IOException String timestamp = VircurexUtils.getUtcTimestamp(); long nonce = exchange.getNonceFactory().createValue(); VircurexSha2Digest digest = new VircurexSha2Digest(exchange.getExchangeSpecification().getApiKey(), - exchange.getExchangeSpecification().getUserName(), timestamp, nonce, "create_order", type, - limitOrder.getTradableAmount().floatValue() + "", limitOrder.getCurrencyPair().counter.getCurrencyCode().toLowerCase(), - limitOrder.getLimitPrice().floatValue() + "", limitOrder.getCurrencyPair().base.getCurrencyCode().toLowerCase()); + exchange.getExchangeSpecification().getUserName(), timestamp, nonce, "create_order", type, limitOrder.getTradableAmount().floatValue() + "", + limitOrder.getCurrencyPair().counter.getCurrencyCode().toLowerCase(), limitOrder.getLimitPrice().floatValue() + "", + limitOrder.getCurrencyPair().base.getCurrencyCode().toLowerCase()); VircurexPlaceOrderReturn ret = vircurexAuthenticated.trade(exchange.getExchangeSpecification().getApiKey(), nonce, digest.toString(), timestamp, type, limitOrder.getTradableAmount().floatValue() + "", limitOrder.getCurrencyPair().counter.getCurrencyCode().toLowerCase(), diff --git a/xchange-yobit/src/main/java/org/knowm/xchange/yobit/YoBit.java b/xchange-yobit/src/main/java/org/knowm/xchange/yobit/YoBit.java index d7650349dea..bb48eebbfcb 100644 --- a/xchange-yobit/src/main/java/org/knowm/xchange/yobit/YoBit.java +++ b/xchange-yobit/src/main/java/org/knowm/xchange/yobit/YoBit.java @@ -22,7 +22,8 @@ public interface YoBit { @GET @Path("api/3/depth/{baseCurrency}_{targetCurrency}") - YoBitOrderBook getOrderBook(@PathParam("baseCurrency") String baseCurrency, @PathParam("targetCurrency") String targetCurrency, @QueryParam("limit") long limit) throws IOException; + YoBitOrderBook getOrderBook(@PathParam("baseCurrency") String baseCurrency, @PathParam("targetCurrency") String targetCurrency, + @QueryParam("limit") long limit) throws IOException; @GET @Path("api/3/trades/{baseCurrency}_{targetCurrency}") diff --git a/xchange-yobit/src/main/java/org/knowm/xchange/yobit/YoBitAdapters.java b/xchange-yobit/src/main/java/org/knowm/xchange/yobit/YoBitAdapters.java index 1b03e4a80b9..6f8bfb85524 100644 --- a/xchange-yobit/src/main/java/org/knowm/xchange/yobit/YoBitAdapters.java +++ b/xchange-yobit/src/main/java/org/knowm/xchange/yobit/YoBitAdapters.java @@ -57,8 +57,7 @@ public static ExchangeMetaData adaptToExchangeMetaData(ExchangeMetaData exchange return new ExchangeMetaData(currencyPairs, currencies, null, null, true); } - private static List toLimitOrderList(List levels, OrderType orderType, - CurrencyPair currencyPair) { + private static List toLimitOrderList(List levels, OrderType orderType, CurrencyPair currencyPair) { List allLevels = new ArrayList<>(levels.size()); for (int i = 0; i < levels.size(); i++) { @@ -84,8 +83,7 @@ public static Trades adaptTrades(YoBitTrades coinbaseTrades, CurrencyPair curren OrderType type = trade.getType().equals("bid") ? OrderType.BID : OrderType.ASK; - Trade t = new Trade(type, trade.getAmount(), currencyPair, trade.getPrice(), - parseDate(trade.getTimestamp()), String.valueOf(trade.getTid())); + Trade t = new Trade(type, trade.getAmount(), currencyPair, trade.getPrice(), parseDate(trade.getTimestamp()), String.valueOf(trade.getTid())); trades.add(t); lastTrade = i; } diff --git a/xchange-yobit/src/main/java/org/knowm/xchange/yobit/dto/marketdata/YoBitOrderBook.java b/xchange-yobit/src/main/java/org/knowm/xchange/yobit/dto/marketdata/YoBitOrderBook.java index c5c527c4a36..564d45e0fd4 100644 --- a/xchange-yobit/src/main/java/org/knowm/xchange/yobit/dto/marketdata/YoBitOrderBook.java +++ b/xchange-yobit/src/main/java/org/knowm/xchange/yobit/dto/marketdata/YoBitOrderBook.java @@ -42,8 +42,7 @@ static class YoBitOrderBookDeserializer extends JsonDeserializer private List bids = new ArrayList<>(); @Override - public YoBitOrderBook deserialize(JsonParser jp, DeserializationContext ctxt) - throws IOException, JsonProcessingException { + public YoBitOrderBook deserialize(JsonParser jp, DeserializationContext ctxt) throws IOException, JsonProcessingException { ObjectCodec oc = jp.getCodec(); JsonNode node = oc.readTree(jp); @@ -70,11 +69,9 @@ public YoBitOrderBook deserialize(JsonParser jp, DeserializationContext ctxt) if (arrNode.isArray()) { if (tmp.getKey().equals("asks")) { - asks.add(new YoBitAsksBidsData(BigDecimal.valueOf(arrNode.get(1).asDouble()), - BigDecimal.valueOf(arrNode.get(0).asDouble()))); + asks.add(new YoBitAsksBidsData(BigDecimal.valueOf(arrNode.get(1).asDouble()), BigDecimal.valueOf(arrNode.get(0).asDouble()))); } else { - bids.add(new YoBitAsksBidsData(BigDecimal.valueOf(arrNode.get(1).asDouble()), - BigDecimal.valueOf(arrNode.get(0).asDouble()))); + bids.add(new YoBitAsksBidsData(BigDecimal.valueOf(arrNode.get(1).asDouble()), BigDecimal.valueOf(arrNode.get(0).asDouble()))); } } } diff --git a/xchange-yobit/src/main/java/org/knowm/xchange/yobit/dto/marketdata/YoBitPair.java b/xchange-yobit/src/main/java/org/knowm/xchange/yobit/dto/marketdata/YoBitPair.java index 8d3ffada517..740039c6485 100644 --- a/xchange-yobit/src/main/java/org/knowm/xchange/yobit/dto/marketdata/YoBitPair.java +++ b/xchange-yobit/src/main/java/org/knowm/xchange/yobit/dto/marketdata/YoBitPair.java @@ -25,8 +25,8 @@ public class YoBitPair { private BigDecimal fee_buyer; private BigDecimal fee_seller; - public YoBitPair(Integer decimal_places, BigDecimal min_price, BigDecimal max_price, BigDecimal min_amount, - BigDecimal min_total, Integer hidden, BigDecimal fee, BigDecimal fee_buyer, BigDecimal fee_seller) { + public YoBitPair(Integer decimal_places, BigDecimal min_price, BigDecimal max_price, BigDecimal min_amount, BigDecimal min_total, Integer hidden, + BigDecimal fee, BigDecimal fee_buyer, BigDecimal fee_seller) { super(); this.decimal_places = decimal_places; this.min_price = min_price; @@ -77,9 +77,8 @@ public BigDecimal getFee_seller() { @Override public String toString() { - return "YoBitPair [decimal_places=" + decimal_places + ", min_price=" + min_price + ", max_price=" + max_price - + ", min_amount=" + min_amount + ", min_total=" + min_total + ", hidden=" + hidden + ", fee=" + fee - + ", fee_buyer=" + fee_buyer + ", fee_seller=" + fee_seller + "]"; + return "YoBitPair [decimal_places=" + decimal_places + ", min_price=" + min_price + ", max_price=" + max_price + ", min_amount=" + min_amount + + ", min_total=" + min_total + ", hidden=" + hidden + ", fee=" + fee + ", fee_buyer=" + fee_buyer + ", fee_seller=" + fee_seller + "]"; } static class YoBitPairDeserializer extends JsonDeserializer { @@ -102,13 +101,11 @@ public static YoBitPair deserializeFromNode(JsonNode tickerNode) { final BigDecimal fee_buyer = getNumberIfPresent(tickerNode.path("fee_buyer")); final BigDecimal fee_seller = getNumberIfPresent(tickerNode.path("fee_seller")); - return new YoBitPair(decimal_places, min_price, max_price, min_amount, min_total, hidden, fee, fee_buyer, - fee_seller); + return new YoBitPair(decimal_places, min_price, max_price, min_amount, min_total, hidden, fee, fee_buyer, fee_seller); } @Override - public YoBitPair deserialize(JsonParser jp, DeserializationContext ctxt) - throws IOException, JsonProcessingException { + public YoBitPair deserialize(JsonParser jp, DeserializationContext ctxt) throws IOException, JsonProcessingException { final ObjectCodec oc = jp.getCodec(); final JsonNode tickerNode = oc.readTree(jp); diff --git a/xchange-yobit/src/main/java/org/knowm/xchange/yobit/dto/marketdata/YoBitPairs.java b/xchange-yobit/src/main/java/org/knowm/xchange/yobit/dto/marketdata/YoBitPairs.java index 63d9abd53b3..850eccb1452 100644 --- a/xchange-yobit/src/main/java/org/knowm/xchange/yobit/dto/marketdata/YoBitPairs.java +++ b/xchange-yobit/src/main/java/org/knowm/xchange/yobit/dto/marketdata/YoBitPairs.java @@ -39,8 +39,7 @@ public String toString() { static class YoBitPricesDeserializer extends JsonDeserializer { @Override - public YoBitPairs deserialize(JsonParser jp, DeserializationContext ctxt) - throws IOException, JsonProcessingException { + public YoBitPairs deserialize(JsonParser jp, DeserializationContext ctxt) throws IOException, JsonProcessingException { Map priceMap = new HashMap<>(); ObjectCodec oc = jp.getCodec(); diff --git a/xchange-yobit/src/main/java/org/knowm/xchange/yobit/dto/marketdata/YoBitTrade.java b/xchange-yobit/src/main/java/org/knowm/xchange/yobit/dto/marketdata/YoBitTrade.java index cfe404a9e67..e5a105a7c64 100644 --- a/xchange-yobit/src/main/java/org/knowm/xchange/yobit/dto/marketdata/YoBitTrade.java +++ b/xchange-yobit/src/main/java/org/knowm/xchange/yobit/dto/marketdata/YoBitTrade.java @@ -11,12 +11,8 @@ public class YoBitTrade { private final Long tid; private final Long timestamp; - public YoBitTrade( - @JsonProperty("type") String type, - @JsonProperty("price") BigDecimal price, - @JsonProperty("amount") BigDecimal amount, - @JsonProperty("tid") Long tid, - @JsonProperty("timestamp") Long timestamp) { + public YoBitTrade(@JsonProperty("type") String type, @JsonProperty("price") BigDecimal price, @JsonProperty("amount") BigDecimal amount, + @JsonProperty("tid") Long tid, @JsonProperty("timestamp") Long timestamp) { super(); this.type = type; this.price = price; @@ -47,7 +43,6 @@ public Long getTimestamp() { @Override public String toString() { - return "YoBitTrade [type=" + type + ", price=" + price + ", amount=" + amount + ", tid=" + tid + ", timestamp=" - + timestamp + "]"; + return "YoBitTrade [type=" + type + ", price=" + price + ", amount=" + amount + ", tid=" + tid + ", timestamp=" + timestamp + "]"; } } diff --git a/xchange-yobit/src/main/java/org/knowm/xchange/yobit/dto/marketdata/YoBitTrades.java b/xchange-yobit/src/main/java/org/knowm/xchange/yobit/dto/marketdata/YoBitTrades.java index 264ce0a6ad6..3ccf481f70a 100644 --- a/xchange-yobit/src/main/java/org/knowm/xchange/yobit/dto/marketdata/YoBitTrades.java +++ b/xchange-yobit/src/main/java/org/knowm/xchange/yobit/dto/marketdata/YoBitTrades.java @@ -36,8 +36,7 @@ static class YoBitTradesDeserializer extends JsonDeserializer { private List trades = new ArrayList<>(); @Override - public YoBitTrades deserialize(JsonParser p, DeserializationContext ctxt) - throws IOException, JsonProcessingException { + public YoBitTrades deserialize(JsonParser p, DeserializationContext ctxt) throws IOException, JsonProcessingException { ObjectCodec oc = p.getCodec(); JsonNode node = oc.readTree(p); diff --git a/xchange-yobit/src/main/java/org/knowm/xchange/yobit/service/YoBitMarketDataService.java b/xchange-yobit/src/main/java/org/knowm/xchange/yobit/service/YoBitMarketDataService.java index de91e8f0568..00b0bcceab6 100644 --- a/xchange-yobit/src/main/java/org/knowm/xchange/yobit/service/YoBitMarketDataService.java +++ b/xchange-yobit/src/main/java/org/knowm/xchange/yobit/service/YoBitMarketDataService.java @@ -20,8 +20,8 @@ public YoBitMarketDataService(Exchange exchange) { } @Override - public Ticker getTicker(CurrencyPair currencyPair, Object... args) throws ExchangeException, - NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { + public Ticker getTicker(CurrencyPair currencyPair, + Object... args) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException { // TODO Auto-generated method stub return null; } diff --git a/xchange-yobit/src/main/java/org/knowm/xchange/yobit/service/YoBitMarketDataServiceRaw.java b/xchange-yobit/src/main/java/org/knowm/xchange/yobit/service/YoBitMarketDataServiceRaw.java index b5a38e81d70..e4b7a723f91 100644 --- a/xchange-yobit/src/main/java/org/knowm/xchange/yobit/service/YoBitMarketDataServiceRaw.java +++ b/xchange-yobit/src/main/java/org/knowm/xchange/yobit/service/YoBitMarketDataServiceRaw.java @@ -22,15 +22,14 @@ public YoBitInfo getProducts() throws IOException { public YoBitOrderBook getOrderBookA(CurrencyPair currencyPair, Long limit) throws IOException { /* - * if (!this.checkProductExists(currencyPair)) { return null; } - */ + * if (!this.checkProductExists(currencyPair)) { return null; } + */ - return this.coinbaseEx.getOrderBook(currencyPair.base.getCurrencyCode().toLowerCase(), - currencyPair.counter.getCurrencyCode().toLowerCase(), limit); + return this.coinbaseEx.getOrderBook(currencyPair.base.getCurrencyCode().toLowerCase(), currencyPair.counter.getCurrencyCode().toLowerCase(), + limit); } public YoBitTrades getTrades(CurrencyPair currencyPair) throws IOException { - return this.coinbaseEx.getTrades(currencyPair.base.getCurrencyCode().toLowerCase(), - currencyPair.counter.getCurrencyCode().toLowerCase()); + return this.coinbaseEx.getTrades(currencyPair.base.getCurrencyCode().toLowerCase(), currencyPair.counter.getCurrencyCode().toLowerCase()); } }