diff --git a/xchange-binance/src/main/java/org/knowm/xchange/binance/BinanceAdapters.java b/xchange-binance/src/main/java/org/knowm/xchange/binance/BinanceAdapters.java index e169f3d3a67..4ab125d49ec 100644 --- a/xchange-binance/src/main/java/org/knowm/xchange/binance/BinanceAdapters.java +++ b/xchange-binance/src/main/java/org/knowm/xchange/binance/BinanceAdapters.java @@ -118,8 +118,8 @@ public static String toSymbol(Instrument pair, Boolean isInverse) { symbol = ((OptionsContract) pair).getCurrencyPair().toString().replace("/", ""); } else { symbol = - ((CurrencyPair) pair).base.getCurrencyCode() - + ((CurrencyPair) pair).counter.getCurrencyCode(); + ((CurrencyPair) pair).getBase().getCurrencyCode() + + ((CurrencyPair) pair).getCounter().getCurrencyCode(); } return symbol; } @@ -585,13 +585,13 @@ public static ExchangeMetaData adaptExchangeMetaData( .amountStepSize(stepSize) .marketOrderEnabled(Arrays.asList(symbol.getOrderTypes()).contains("MARKET")) .build()); - Currency baseCurrency = currentCurrencyPair.base; + Currency baseCurrency = currentCurrencyPair.getBase(); CurrencyMetaData baseCurrencyMetaData = BinanceAdapters.adaptCurrencyMetaData( currencies, baseCurrency, assetDetailMap, basePrecision); currencies.put(baseCurrency, baseCurrencyMetaData); - Currency counterCurrency = currentCurrencyPair.counter; + Currency counterCurrency = currentCurrencyPair.getCounter(); CurrencyMetaData counterCurrencyMetaData = BinanceAdapters.adaptCurrencyMetaData( currencies, counterCurrency, assetDetailMap, counterPrecision); diff --git a/xchange-bitbay/src/main/java/org/knowm/xchange/bitbay/service/BitbayMarketDataServiceRaw.java b/xchange-bitbay/src/main/java/org/knowm/xchange/bitbay/service/BitbayMarketDataServiceRaw.java index 9ee3446bb55..cee0bd6b809 100644 --- a/xchange-bitbay/src/main/java/org/knowm/xchange/bitbay/service/BitbayMarketDataServiceRaw.java +++ b/xchange-bitbay/src/main/java/org/knowm/xchange/bitbay/service/BitbayMarketDataServiceRaw.java @@ -25,13 +25,13 @@ protected BitbayMarketDataServiceRaw(Exchange exchange) { public BitbayTicker getBitbayTicker(CurrencyPair currencyPair) throws IOException { return bitbay.getBitbayTicker( - currencyPair.base.getCurrencyCode().toUpperCase() + currencyPair.counter.getCurrencyCode()); + currencyPair.getBase().getCurrencyCode().toUpperCase() + currencyPair.getCounter().getCurrencyCode()); } public BitbayOrderBook getBitbayOrderBook(CurrencyPair currencyPair) throws IOException { return bitbay.getBitbayOrderBook( - currencyPair.base.getCurrencyCode().toUpperCase() + currencyPair.counter.getCurrencyCode()); + currencyPair.getBase().getCurrencyCode().toUpperCase() + currencyPair.getCounter().getCurrencyCode()); } public BitbayTrade[] getBitbayTrades(CurrencyPair currencyPair, Object[] args) @@ -49,7 +49,7 @@ public BitbayTrade[] getBitbayTrades(CurrencyPair currencyPair, Object[] args) limit = ((Number) args[2]).intValue(); } return bitbay.getBitbayTrades( - currencyPair.base.getCurrencyCode().toUpperCase() + currencyPair.counter.getCurrencyCode(), + currencyPair.getBase().getCurrencyCode().toUpperCase() + currencyPair.getCounter().getCurrencyCode(), since, sort, limit); diff --git a/xchange-bitbay/src/main/java/org/knowm/xchange/bitbay/service/BitbayTradeServiceRaw.java b/xchange-bitbay/src/main/java/org/knowm/xchange/bitbay/service/BitbayTradeServiceRaw.java index 92bde83e4cc..9bdb68e9d73 100644 --- a/xchange-bitbay/src/main/java/org/knowm/xchange/bitbay/service/BitbayTradeServiceRaw.java +++ b/xchange-bitbay/src/main/java/org/knowm/xchange/bitbay/service/BitbayTradeServiceRaw.java @@ -33,12 +33,12 @@ public List getBitbayTransactions(CurrencyPair currencyPair) exchange.getNonceFactory(), currencyPair == null ? null - : currencyPair.base.toString() + "-" + currencyPair.counter.toString()); + : currencyPair.getBase().toString() + "-" + currencyPair.getCounter().toString()); } public BitbayTradeResponse placeBitbayOrder(LimitOrder order) throws IOException { - String currency = order.getCurrencyPair().base.toString(); - String paymentCurrency = order.getCurrencyPair().counter.toString(); + String currency = order.getCurrencyPair().getBase().toString(); + String paymentCurrency = order.getCurrencyPair().getCounter().toString(); String type = order.getType() == Order.OrderType.ASK ? "ask" : "bid"; BitbayTradeResponse response = diff --git a/xchange-bitbay/src/main/java/org/knowm/xchange/bitbay/v3/BitbayAdapters.java b/xchange-bitbay/src/main/java/org/knowm/xchange/bitbay/v3/BitbayAdapters.java index e793031104d..891bd6e9021 100644 --- a/xchange-bitbay/src/main/java/org/knowm/xchange/bitbay/v3/BitbayAdapters.java +++ b/xchange-bitbay/src/main/java/org/knowm/xchange/bitbay/v3/BitbayAdapters.java @@ -46,7 +46,7 @@ public static UserTrades adaptUserTrades(BitbayUserTrades response) { .price(trade.getRate()) .timestamp(timestamp) .feeAmount(trade.getCommissionValue()) - .feeCurrency(trade.getCommissionValue() == null ? null : pair.base) + .feeCurrency(trade.getCommissionValue() == null ? null : pair.getBase()) .build()); } return new UserTrades( @@ -54,6 +54,6 @@ public static UserTrades adaptUserTrades(BitbayUserTrades response) { } public static String adaptCurrencyPair(CurrencyPair currencyPair) { - return currencyPair.base + "-" + currencyPair.counter; + return currencyPair.getBase() + "-" + currencyPair.getCounter(); } } diff --git a/xchange-bitcoinaverage/src/main/java/org/knowm/xchange/bitcoinaverage/service/BitcoinAverageMarketDataService.java b/xchange-bitcoinaverage/src/main/java/org/knowm/xchange/bitcoinaverage/service/BitcoinAverageMarketDataService.java index ceaf2ffeeb3..4a03e76fdb3 100644 --- a/xchange-bitcoinaverage/src/main/java/org/knowm/xchange/bitcoinaverage/service/BitcoinAverageMarketDataService.java +++ b/xchange-bitcoinaverage/src/main/java/org/knowm/xchange/bitcoinaverage/service/BitcoinAverageMarketDataService.java @@ -37,7 +37,7 @@ public Ticker getTicker(CurrencyPair currencyPair, Object... args) throws IOExce // Request data BitcoinAverageTicker bitcoinAverageTicker = getBitcoinAverageTicker( - currencyPair.base.getCurrencyCode(), currencyPair.counter.getCurrencyCode()); + currencyPair.getBase().getCurrencyCode(), currencyPair.getCounter().getCurrencyCode()); // Adapt to XChange DTOs return BitcoinAverageAdapters.adaptTicker(bitcoinAverageTicker, currencyPair); diff --git a/xchange-bitcoinde/src/main/java/org/knowm/xchange/bitcoinde/BitcoindeUtils.java b/xchange-bitcoinde/src/main/java/org/knowm/xchange/bitcoinde/BitcoindeUtils.java index b2dbb856fd9..894e41aa9bc 100644 --- a/xchange-bitcoinde/src/main/java/org/knowm/xchange/bitcoinde/BitcoindeUtils.java +++ b/xchange-bitcoinde/src/main/java/org/knowm/xchange/bitcoinde/BitcoindeUtils.java @@ -14,8 +14,8 @@ public class BitcoindeUtils { private BitcoindeUtils() {} public static String createBitcoindePair(CurrencyPair currencyPair) { - return createBitcoindeCurrency(currencyPair.base) - + createBitcoindeCurrency(currencyPair.counter); + return createBitcoindeCurrency(currencyPair.getBase()) + + createBitcoindeCurrency(currencyPair.getCounter()); } public static String createBitcoindeCurrency(Currency currency) { diff --git a/xchange-bitcoinde/src/main/java/org/knowm/xchange/bitcoinde/service/BitcoindeTradeServiceRaw.java b/xchange-bitcoinde/src/main/java/org/knowm/xchange/bitcoinde/service/BitcoindeTradeServiceRaw.java index d4aaea5fd0a..d2b8b45c2a0 100644 --- a/xchange-bitcoinde/src/main/java/org/knowm/xchange/bitcoinde/service/BitcoindeTradeServiceRaw.java +++ b/xchange-bitcoinde/src/main/java/org/knowm/xchange/bitcoinde/service/BitcoindeTradeServiceRaw.java @@ -33,7 +33,7 @@ public BitcoindeIdResponse bitcoindeCancelOrders(String order_id, CurrencyPair c throws IOException { try { String currPair = - currencyPair.base.getCurrencyCode() + currencyPair.counter.getCurrencyCode(); + currencyPair.getBase().getCurrencyCode() + currencyPair.getCounter().getCurrencyCode(); return bitcoinde.deleteOrder(apiKey, nonceFactory, signatureCreator, order_id, currPair); } catch (BitcoindeException e) { throw handleError(e); @@ -44,8 +44,8 @@ public BitcoindeIdResponse bitcoindePlaceLimitOrder(LimitOrder l) throws IOExcep try { String side = l.getType().equals(OrderType.ASK) ? "sell" : "buy"; String bitcoindeCurrencyPair = - l.getCurrencyPair().base.getCurrencyCode() - + l.getCurrencyPair().counter.getCurrencyCode(); + l.getCurrencyPair().getBase().getCurrencyCode() + + l.getCurrencyPair().getCounter().getCurrencyCode(); return bitcoinde.createOrder( apiKey, nonceFactory, diff --git a/xchange-bitcoinde/src/main/java/org/knowm/xchange/bitcoinde/v4/BitcoindeAdapters.java b/xchange-bitcoinde/src/main/java/org/knowm/xchange/bitcoinde/v4/BitcoindeAdapters.java index 37ae103973b..0d082db6729 100644 --- a/xchange-bitcoinde/src/main/java/org/knowm/xchange/bitcoinde/v4/BitcoindeAdapters.java +++ b/xchange-bitcoinde/src/main/java/org/knowm/xchange/bitcoinde/v4/BitcoindeAdapters.java @@ -380,10 +380,10 @@ public static UserTrades adaptTradeHistory( Currency feeCurrency; if (trade.getType() == BitcoindeType.BUY) { fee = trade.getFeeCurrencyToTrade(); - feeCurrency = trade.getTradingPair().base; + feeCurrency = trade.getTradingPair().getBase(); } else if (trade.getType() == BitcoindeType.SELL) { fee = trade.getFeeCurrencyToPay(); - feeCurrency = trade.getTradingPair().counter; + feeCurrency = trade.getTradingPair().getCounter(); } else { throw new TypeNotPresentException(trade.getType().toString(), null); } diff --git a/xchange-bitcointoyou/src/main/java/org/knowm/xchange/bitcointoyou/service/polling/BitcointoyouMarketDataServiceRaw.java b/xchange-bitcointoyou/src/main/java/org/knowm/xchange/bitcointoyou/service/polling/BitcointoyouMarketDataServiceRaw.java index 5d4c259abbd..5414d483ab4 100644 --- a/xchange-bitcointoyou/src/main/java/org/knowm/xchange/bitcointoyou/service/polling/BitcointoyouMarketDataServiceRaw.java +++ b/xchange-bitcointoyou/src/main/java/org/knowm/xchange/bitcointoyou/service/polling/BitcointoyouMarketDataServiceRaw.java @@ -86,7 +86,7 @@ BitcointoyouPublicTrade[] getBitcointoyouPublicTrades(CurrencyPair currencyPair) BitcointoyouPublicTrade[] getBitcointoyouPublicTrades( CurrencyPair currencyPair, Long tradeTimestamp, Long minTradeId) throws IOException { - String currency = currencyPair.base.toString(); + String currency = currencyPair.getBase().toString(); try { return bitcointoyou.getTrades(currency, tradeTimestamp, minTradeId); diff --git a/xchange-bitcointoyou/src/main/java/org/knowm/xchange/bitcointoyou/service/polling/BitcointoyouTradeServiceRaw.java b/xchange-bitcointoyou/src/main/java/org/knowm/xchange/bitcointoyou/service/polling/BitcointoyouTradeServiceRaw.java index b81555b3642..ac08374d0a2 100644 --- a/xchange-bitcointoyou/src/main/java/org/knowm/xchange/bitcointoyou/service/polling/BitcointoyouTradeServiceRaw.java +++ b/xchange-bitcointoyou/src/main/java/org/knowm/xchange/bitcointoyou/service/polling/BitcointoyouTradeServiceRaw.java @@ -51,7 +51,7 @@ public BitcointoyouOrderResponse sell(LimitOrder limitOrder) throws IOException private BitcointoyouOrderResponse createOrder(String action, LimitOrder limitOrder) throws IOException { try { - String asset = limitOrder.getCurrencyPair().base.getSymbol(); + String asset = limitOrder.getCurrencyPair().getBase().getSymbol(); return bitcointoyouAuthenticated.createOrder( apiKey, exchange.getNonceFactory(), diff --git a/xchange-bitfinex/src/main/java/org/knowm/xchange/bitfinex/service/BitfinexAdapters.java b/xchange-bitfinex/src/main/java/org/knowm/xchange/bitfinex/service/BitfinexAdapters.java index 265ad881ea4..e55e2e58bad 100644 --- a/xchange-bitfinex/src/main/java/org/knowm/xchange/bitfinex/service/BitfinexAdapters.java +++ b/xchange-bitfinex/src/main/java/org/knowm/xchange/bitfinex/service/BitfinexAdapters.java @@ -643,7 +643,7 @@ public ExchangeMetaData adaptMetaData( // Remove currencies that are no-longer in use Set currencies = currencyPairs.stream() - .flatMap(pair -> Stream.of(pair.base, pair.counter)) + .flatMap(pair -> Stream.of(pair.getBase(), pair.getCounter())) .collect(Collectors.toSet()); currenciesMap.keySet().retainAll(currencies); @@ -653,16 +653,16 @@ public ExchangeMetaData adaptMetaData( pairsMap.put(c, null); } - if (!currenciesMap.containsKey(c.base)) { + if (!currenciesMap.containsKey(c.getBase())) { currenciesMap.put( - c.base, + c.getBase(), new CurrencyMetaData( 2, null)); // When missing, add default meta-data with scale of 2 (Bitfinex's minimal // scale) } - if (!currenciesMap.containsKey(c.counter)) { - currenciesMap.put(c.counter, new CurrencyMetaData(2, null)); + if (!currenciesMap.containsKey(c.getCounter())) { + currenciesMap.put(c.getCounter(), new CurrencyMetaData(2, null)); } } diff --git a/xchange-bitflyer/src/main/java/org/knowm/xchange/bitflyer/service/BitflyerMarketDataService.java b/xchange-bitflyer/src/main/java/org/knowm/xchange/bitflyer/service/BitflyerMarketDataService.java index faa80a46f39..fd3c6df1187 100755 --- a/xchange-bitflyer/src/main/java/org/knowm/xchange/bitflyer/service/BitflyerMarketDataService.java +++ b/xchange-bitflyer/src/main/java/org/knowm/xchange/bitflyer/service/BitflyerMarketDataService.java @@ -27,13 +27,14 @@ public BitflyerMarketDataService(Exchange exchange) { @Override public Ticker getTicker(CurrencyPair currencyPair, Object... args) throws IOException { - BitflyerTicker ticker = getTicker(currencyPair.base + "_" + currencyPair.counter); + BitflyerTicker ticker = getTicker(currencyPair.getBase() + "_" + currencyPair.getCounter()); return BitflyerAdapters.adaptTicker(ticker, currencyPair); } @Override public OrderBook getOrderBook(CurrencyPair currencyPair, Object... args) throws IOException { - BitflyerOrderbook orderbook = getOrderbook(currencyPair.base + "_" + currencyPair.counter); + BitflyerOrderbook orderbook = getOrderbook( + currencyPair.getBase() + "_" + currencyPair.getCounter()); List bids = orderbook.getBids().stream() .map( diff --git a/xchange-bithumb/src/main/java/org/knowm/xchange/bithumb/BithumbAdapters.java b/xchange-bithumb/src/main/java/org/knowm/xchange/bithumb/BithumbAdapters.java index cb96113f528..f9128e6449c 100644 --- a/xchange-bithumb/src/main/java/org/knowm/xchange/bithumb/BithumbAdapters.java +++ b/xchange-bithumb/src/main/java/org/knowm/xchange/bithumb/BithumbAdapters.java @@ -184,7 +184,7 @@ private static UserTrade adaptUserTrade( .originalAmount(bithumbTransaction.getUnits()) .type(adaptTransactionSearch(bithumbTransaction.getSearch())) .feeAmount(bithumbTransaction.getFee()) - .feeCurrency(currencyPair.counter) + .feeCurrency(currencyPair.getCounter()) .price(bithumbTransaction.getPrice()) .timestamp(new Date(bithumbTransaction.getTransferDate() / 1000L)) .build(); diff --git a/xchange-bithumb/src/main/java/org/knowm/xchange/bithumb/BithumbUtils.java b/xchange-bithumb/src/main/java/org/knowm/xchange/bithumb/BithumbUtils.java index 50cf945b699..f2cd9053e14 100644 --- a/xchange-bithumb/src/main/java/org/knowm/xchange/bithumb/BithumbUtils.java +++ b/xchange-bithumb/src/main/java/org/knowm/xchange/bithumb/BithumbUtils.java @@ -15,7 +15,7 @@ private BithumbUtils() { public static String getBaseCurrency(@Nullable CurrencyPair currencyPair) { return Optional.ofNullable(currencyPair) - .map(c -> c.base) + .map(c -> c.getBase()) .map(Currency::getCurrencyCode) .orElse(null); } diff --git a/xchange-bitso/src/main/java/org/knowm/xchange/bitso/BitsoAdapters.java b/xchange-bitso/src/main/java/org/knowm/xchange/bitso/BitsoAdapters.java index 561dfc83d96..f5503d3293f 100644 --- a/xchange-bitso/src/main/java/org/knowm/xchange/bitso/BitsoAdapters.java +++ b/xchange-bitso/src/main/java/org/knowm/xchange/bitso/BitsoAdapters.java @@ -169,7 +169,7 @@ public static UserTrades adaptTradeHistory(BitsoUserTransaction[] bitsoUserTrans final CurrencyPair currencyPair = new CurrencyPair(Currency.BTC, Currency.MXN); String feeCurrency = - sell ? currencyPair.counter.getCurrencyCode() : currencyPair.base.getCurrencyCode(); + sell ? currencyPair.getCounter().getCurrencyCode() : currencyPair.getBase().getCurrencyCode(); UserTrade trade = UserTrade.builder() .type(orderType) diff --git a/xchange-bitso/src/main/java/org/knowm/xchange/bitso/service/BitsoMarketDataServiceRaw.java b/xchange-bitso/src/main/java/org/knowm/xchange/bitso/service/BitsoMarketDataServiceRaw.java index 9f524e90d96..21c9515f90f 100644 --- a/xchange-bitso/src/main/java/org/knowm/xchange/bitso/service/BitsoMarketDataServiceRaw.java +++ b/xchange-bitso/src/main/java/org/knowm/xchange/bitso/service/BitsoMarketDataServiceRaw.java @@ -45,7 +45,7 @@ public BitsoTransaction[] getBitsoTransactions(Object... args) throws IOExceptio } public BitsoTicker getBitsoTicker(CurrencyPair pair) throws IOException { - return bitso.getTicker(pair.base + "_" + pair.counter); + return bitso.getTicker(pair.getBase() + "_" + pair.getCounter()); } public enum BitsoTime { diff --git a/xchange-bitstamp/src/main/java/org/knowm/xchange/bitstamp/BitstampAdapters.java b/xchange-bitstamp/src/main/java/org/knowm/xchange/bitstamp/BitstampAdapters.java index 4ecacf39013..995baad9c42 100644 --- a/xchange-bitstamp/src/main/java/org/knowm/xchange/bitstamp/BitstampAdapters.java +++ b/xchange-bitstamp/src/main/java/org/knowm/xchange/bitstamp/BitstampAdapters.java @@ -333,7 +333,7 @@ private static CurrencyPair adaptCurrencyPair( private static BigDecimal getBaseCurrencyAmountFromBitstampTransaction( BitstampOrderTransaction bitstampTransaction, CurrencyPair currencyPair) { - return bitstampTransaction.getAmount(currencyPair.base.getCurrencyCode().toLowerCase()); + return bitstampTransaction.getAmount(currencyPair.getBase().getCurrencyCode().toLowerCase()); } public static Order.OrderStatus adaptOrderStatus(BitstampOrderStatus bitstampOrderStatus) { 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 388d9f69600..d04c55c12d2 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 @@ -84,8 +84,8 @@ public String toString() { ? "" : String.format( "%s%s", - pair.base.getCurrencyCode().toLowerCase(), - pair.counter.getCurrencyCode().toLowerCase()); + pair.getBase().getCurrencyCode().toLowerCase(), + pair.getCounter().getCurrencyCode().toLowerCase()); } } } diff --git a/xchange-bittrex/src/main/java/org/knowm/xchange/bittrex/BittrexAdapters.java b/xchange-bittrex/src/main/java/org/knowm/xchange/bittrex/BittrexAdapters.java index e583f0357a7..5f5864f9727 100644 --- a/xchange-bittrex/src/main/java/org/knowm/xchange/bittrex/BittrexAdapters.java +++ b/xchange-bittrex/src/main/java/org/knowm/xchange/bittrex/BittrexAdapters.java @@ -158,7 +158,7 @@ public static List adaptUserTrades(List bittrexUserTrad .id(bittrexOrder.getId()) .feeAmount(bittrexOrder.getCommission()) .feeCurrency( - BittrexUtils.toCurrencyPair(bittrexOrder.getMarketSymbol()).counter) + BittrexUtils.toCurrencyPair(bittrexOrder.getMarketSymbol()).getCounter()) .build()) .collect(Collectors.toList()); } diff --git a/xchange-bittrex/src/test/java/org/knowm/xchange/bittrex/BittrexAdaptersTest.java b/xchange-bittrex/src/test/java/org/knowm/xchange/bittrex/BittrexAdaptersTest.java index 14b3dffa562..26d1fb9004a 100644 --- a/xchange-bittrex/src/test/java/org/knowm/xchange/bittrex/BittrexAdaptersTest.java +++ b/xchange-bittrex/src/test/java/org/knowm/xchange/bittrex/BittrexAdaptersTest.java @@ -216,7 +216,7 @@ public void testAdaptUserTrades() { Assert.assertEquals(order1.getClosedAt(), trade1.getTimestamp()); Assert.assertEquals(order1.getId(), trade1.getId()); Assert.assertEquals(order1.getCommission(), trade1.getFeeAmount()); - Assert.assertEquals(pair.counter, trade1.getFeeCurrency()); + Assert.assertEquals(pair.getCounter(), trade1.getFeeCurrency()); UserTrade trade2 = tradesList.get(1); Assert.assertEquals(Order.OrderType.ASK, trade2.getType()); @@ -226,6 +226,6 @@ public void testAdaptUserTrades() { Assert.assertEquals(order2.getClosedAt(), trade2.getTimestamp()); Assert.assertEquals(order2.getId(), trade2.getId()); Assert.assertEquals(order2.getCommission(), trade2.getFeeAmount()); - Assert.assertEquals(pair.counter, trade2.getFeeCurrency()); + Assert.assertEquals(pair.getCounter(), trade2.getFeeCurrency()); } } diff --git a/xchange-bity/src/main/java/org/knowm/xchange/bity/BityAdapters.java b/xchange-bity/src/main/java/org/knowm/xchange/bity/BityAdapters.java index cbe1314a31f..cbeb0184534 100644 --- a/xchange-bity/src/main/java/org/knowm/xchange/bity/BityAdapters.java +++ b/xchange-bity/src/main/java/org/knowm/xchange/bity/BityAdapters.java @@ -65,7 +65,7 @@ public static UserTrade adaptTrade(BityOrder order) { .id(orderId) .orderId(orderId) .feeAmount(fee) - .feeCurrency(currencyPair.counter) + .feeCurrency(currencyPair.getCounter()) .build(); } @@ -81,11 +81,11 @@ public static ExchangeMetaData adaptMetaData( if (!pairsMap.containsKey(c)) { pairsMap.put(c, null); } - if (!currenciesMap.containsKey(c.base)) { - currenciesMap.put(c.base, null); + if (!currenciesMap.containsKey(c.getBase())) { + currenciesMap.put(c.getBase(), null); } - if (!currenciesMap.containsKey(c.counter)) { - currenciesMap.put(c.counter, null); + if (!currenciesMap.containsKey(c.getCounter())) { + currenciesMap.put(c.getCounter(), null); } } diff --git a/xchange-bitz/src/main/java/org/knowm/xchange/bitz/BitZUtils.java b/xchange-bitz/src/main/java/org/knowm/xchange/bitz/BitZUtils.java index c27784f423b..9d53d65282c 100644 --- a/xchange-bitz/src/main/java/org/knowm/xchange/bitz/BitZUtils.java +++ b/xchange-bitz/src/main/java/org/knowm/xchange/bitz/BitZUtils.java @@ -9,8 +9,8 @@ public class BitZUtils { public static String toPairString(CurrencyPair currency) { return String.format( "%s_%s", - currency.base.getCurrencyCode().toLowerCase(), - currency.counter.getCurrencyCode().toLowerCase()); + currency.getBase().getCurrencyCode().toLowerCase(), + currency.getCounter().getCurrencyCode().toLowerCase()); } public static CurrencyPair toCurrencyPair(String pairstring) { diff --git a/xchange-bitz/src/main/java/org/knowm/xchange/bitz/service/BitZMarketDataServiceRaw.java b/xchange-bitz/src/main/java/org/knowm/xchange/bitz/service/BitZMarketDataServiceRaw.java index f31d820f541..15833da1bce 100644 --- a/xchange-bitz/src/main/java/org/knowm/xchange/bitz/service/BitZMarketDataServiceRaw.java +++ b/xchange-bitz/src/main/java/org/knowm/xchange/bitz/service/BitZMarketDataServiceRaw.java @@ -65,7 +65,7 @@ public Map> getCoinRate(CurrencyPair... curr List coinList = new ArrayList<>(currencyPairs.length); Arrays.stream(currencyPairs) .forEach( - currencyPair -> coinList.add(currencyPair.counter.getCurrencyCode().toLowerCase())); + currencyPair -> coinList.add(currencyPair.getCounter().getCurrencyCode().toLowerCase())); String coins = coinList.stream().collect(Collectors.joining(",")); return bitz.getCurrencyCoinRate(coins).getData(); } @@ -179,7 +179,7 @@ public Map> getCurrencyCoinRate(CurrencyPair throws IOException { List coinList = new ArrayList<>(currencyPairs.length); Arrays.stream(currencyPairs) - .forEach(currencyPair -> coinList.add(currencyPair.base.getCurrencyCode().toLowerCase())); + .forEach(currencyPair -> coinList.add(currencyPair.getBase().getCurrencyCode().toLowerCase())); String coins = coinList.stream().collect(Collectors.joining(",")); return bitz.getCurrencyCoinRate(coins).getData(); } diff --git a/xchange-bl3p/src/main/java/org/knowm/xchange/bl3p/Bl3pUtils.java b/xchange-bl3p/src/main/java/org/knowm/xchange/bl3p/Bl3pUtils.java index 6a0ecfc3028..2f122c04bd9 100644 --- a/xchange-bl3p/src/main/java/org/knowm/xchange/bl3p/Bl3pUtils.java +++ b/xchange-bl3p/src/main/java/org/knowm/xchange/bl3p/Bl3pUtils.java @@ -27,7 +27,7 @@ public static final long toEuroshi(BigDecimal bd) { } public static String toPairString(CurrencyPair currencyPair) { - return currencyPair.base.getCurrencyCode() + currencyPair.counter.getCurrencyCode(); + return currencyPair.getBase().getCurrencyCode() + currencyPair.getCounter().getCurrencyCode(); } public static Order.OrderType fromBl3pOrderType(String bl3pType) { diff --git a/xchange-bleutrade/src/main/java/org/knowm/xchange/bleutrade/BleutradeUtils.java b/xchange-bleutrade/src/main/java/org/knowm/xchange/bleutrade/BleutradeUtils.java index 808d8b4babe..80c9677ad57 100644 --- a/xchange-bleutrade/src/main/java/org/knowm/xchange/bleutrade/BleutradeUtils.java +++ b/xchange-bleutrade/src/main/java/org/knowm/xchange/bleutrade/BleutradeUtils.java @@ -10,9 +10,9 @@ public final class BleutradeUtils { public static String toPairString(CurrencyPair currencyPair) { - return currencyPair.base.getCurrencyCode().toUpperCase() + return currencyPair.getBase().getCurrencyCode().toUpperCase() + "_" - + currencyPair.counter.getCurrencyCode().toUpperCase(); + + currencyPair.getCounter().getCurrencyCode().toUpperCase(); } public static CurrencyPair toCurrencyPair(String pairString) { diff --git a/xchange-bleutrade/src/main/java/org/knowm/xchange/bleutrade/service/BleutradeTradeServiceRaw.java b/xchange-bleutrade/src/main/java/org/knowm/xchange/bleutrade/service/BleutradeTradeServiceRaw.java index 9a29512103d..6426dace10d 100644 --- a/xchange-bleutrade/src/main/java/org/knowm/xchange/bleutrade/service/BleutradeTradeServiceRaw.java +++ b/xchange-bleutrade/src/main/java/org/knowm/xchange/bleutrade/service/BleutradeTradeServiceRaw.java @@ -32,7 +32,7 @@ public BleutradeTradeServiceRaw(Exchange exchange, IRestProxyFactory restProxyFa } private static String toMarket(CurrencyPair currencyPair) { - return currencyPair.base + "_" + currencyPair.counter; + return currencyPair.getBase() + "_" + currencyPair.getCounter(); } public String buyLimit(LimitOrder limitOrder) throws IOException { diff --git a/xchange-blockchain/src/main/java/org/knowm/xchange/blockchain/BlockchainAdapters.java b/xchange-blockchain/src/main/java/org/knowm/xchange/blockchain/BlockchainAdapters.java index aade86f5ddf..7206b48c37b 100644 --- a/xchange-blockchain/src/main/java/org/knowm/xchange/blockchain/BlockchainAdapters.java +++ b/xchange-blockchain/src/main/java/org/knowm/xchange/blockchain/BlockchainAdapters.java @@ -1,9 +1,30 @@ package org.knowm.xchange.blockchain; -import static org.knowm.xchange.blockchain.BlockchainConstants.*; +import static org.knowm.xchange.blockchain.BlockchainConstants.BUY; +import static org.knowm.xchange.blockchain.BlockchainConstants.CANCELED; +import static org.knowm.xchange.blockchain.BlockchainConstants.COMPLETED; +import static org.knowm.xchange.blockchain.BlockchainConstants.CURRENCY_PAIR_SYMBOL_FORMAT; +import static org.knowm.xchange.blockchain.BlockchainConstants.EXPIRED; +import static org.knowm.xchange.blockchain.BlockchainConstants.FAILED; +import static org.knowm.xchange.blockchain.BlockchainConstants.FILLED; +import static org.knowm.xchange.blockchain.BlockchainConstants.LIMIT; +import static org.knowm.xchange.blockchain.BlockchainConstants.MARKET; +import static org.knowm.xchange.blockchain.BlockchainConstants.OPEN; +import static org.knowm.xchange.blockchain.BlockchainConstants.PART_FILLED; +import static org.knowm.xchange.blockchain.BlockchainConstants.PENDING; +import static org.knowm.xchange.blockchain.BlockchainConstants.REFUNDING; +import static org.knowm.xchange.blockchain.BlockchainConstants.REJECTED; +import static org.knowm.xchange.blockchain.BlockchainConstants.SELL; +import static org.knowm.xchange.blockchain.BlockchainConstants.STATUS_INVALID; +import static org.knowm.xchange.blockchain.BlockchainConstants.STOP; +import static org.knowm.xchange.blockchain.BlockchainConstants.UNCONFIRMED; import java.math.BigDecimal; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.UUID; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; import lombok.experimental.UtilityClass; @@ -25,7 +46,12 @@ import org.knowm.xchange.dto.meta.ExchangeMetaData; import org.knowm.xchange.dto.meta.InstrumentMetaData; import org.knowm.xchange.dto.meta.RateLimit; -import org.knowm.xchange.dto.trade.*; +import org.knowm.xchange.dto.trade.LimitOrder; +import org.knowm.xchange.dto.trade.MarketOrder; +import org.knowm.xchange.dto.trade.OpenOrders; +import org.knowm.xchange.dto.trade.StopOrder; +import org.knowm.xchange.dto.trade.UserTrade; +import org.knowm.xchange.dto.trade.UserTrades; import org.knowm.xchange.instrument.Instrument; @UtilityClass @@ -34,8 +60,8 @@ public class BlockchainAdapters { public static String toSymbol(CurrencyPair currencyPair) { return String.format( CURRENCY_PAIR_SYMBOL_FORMAT, - currencyPair.base.getCurrencyCode(), - currencyPair.counter.getCurrencyCode()); + currencyPair.getBase().getCurrencyCode(), + currencyPair.getCounter().getCurrencyCode()); } public static CurrencyPair toCurrencyPair(Instrument instrument) { diff --git a/xchange-btcc/src/main/java/org/knowm/xchange/btcc/service/BTCCMarketDataService.java b/xchange-btcc/src/main/java/org/knowm/xchange/btcc/service/BTCCMarketDataService.java index 5975e1c1c8a..d8af62c04b1 100644 --- a/xchange-btcc/src/main/java/org/knowm/xchange/btcc/service/BTCCMarketDataService.java +++ b/xchange-btcc/src/main/java/org/knowm/xchange/btcc/service/BTCCMarketDataService.java @@ -19,7 +19,7 @@ public BTCCMarketDataService(Exchange exchange) { @Override public Ticker getTicker(CurrencyPair currencyPair, Object... args) throws IOException { // Request data - String symbol = currencyPair.base.getCurrencyCode() + currencyPair.counter.getCurrencyCode(); + String symbol = currencyPair.getBase().getCurrencyCode() + currencyPair.getCounter().getCurrencyCode(); BTCCTicker btccTicker = getBTCCTicker(symbol); // Adapt to XChange DTOs diff --git a/xchange-btcmarkets/src/main/java/org/knowm/xchange/btcmarkets/BTCMarketsAdapters.java b/xchange-btcmarkets/src/main/java/org/knowm/xchange/btcmarkets/BTCMarketsAdapters.java index 039a737d863..560853967c6 100644 --- a/xchange-btcmarkets/src/main/java/org/knowm/xchange/btcmarkets/BTCMarketsAdapters.java +++ b/xchange-btcmarkets/src/main/java/org/knowm/xchange/btcmarkets/BTCMarketsAdapters.java @@ -151,7 +151,7 @@ public static UserTrade adaptTrade(BTCMarketsUserTrade trade, CurrencyPair curre final Order.OrderType type = adaptOrderType(trade.getSide()); final String tradeId = Long.toString(trade.getId()); final Long orderId = trade.getOrderId(); - final String feeCurrency = currencyPair.counter.getCurrencyCode(); + final String feeCurrency = currencyPair.getCounter().getCurrencyCode(); return UserTrade.builder() .type(type) .originalAmount(trade.getVolume()) @@ -170,7 +170,7 @@ public static UserTrade adaptTradeHistory(BTCMarketsTradeHistoryResponse trade) final CurrencyPair currencyPair = adaptCurrencyPair(trade.marketId); final String tradeId = trade.id; final String orderId = trade.orderId; - final String feeCurrency = currencyPair.counter.getCurrencyCode(); + final String feeCurrency = currencyPair.getCounter().getCurrencyCode(); try { return UserTrade.builder() .type(type) diff --git a/xchange-btcmarkets/src/main/java/org/knowm/xchange/btcmarkets/service/BTCMarketsMarketDataServiceRaw.java b/xchange-btcmarkets/src/main/java/org/knowm/xchange/btcmarkets/service/BTCMarketsMarketDataServiceRaw.java index c5981329cc5..67dcdaf94f3 100644 --- a/xchange-btcmarkets/src/main/java/org/knowm/xchange/btcmarkets/service/BTCMarketsMarketDataServiceRaw.java +++ b/xchange-btcmarkets/src/main/java/org/knowm/xchange/btcmarkets/service/BTCMarketsMarketDataServiceRaw.java @@ -18,17 +18,17 @@ public BTCMarketsMarketDataServiceRaw(Exchange exchange) { public BTCMarketsTicker getBTCMarketsTicker(CurrencyPair currencyPair) throws IOException { return btcmPublic.getTicker( - currencyPair.base.getCurrencyCode(), currencyPair.counter.getCurrencyCode()); + currencyPair.getBase().getCurrencyCode(), currencyPair.getCounter().getCurrencyCode()); } public BTCMarketsOrderBook getBTCMarketsOrderBook(CurrencyPair currencyPair) throws IOException { return btcmPublic.getOrderBook( - currencyPair.base.getCurrencyCode(), currencyPair.counter.getCurrencyCode()); + currencyPair.getBase().getCurrencyCode(), currencyPair.getCounter().getCurrencyCode()); } public List getBTCMarketsTrade(CurrencyPair currencyPair) throws IOException { return btcmPublic.getTrades( - currencyPair.base.getCurrencyCode() + "-" + currencyPair.counter.getCurrencyCode()); + currencyPair.getBase().getCurrencyCode() + "-" + currencyPair.getCounter().getCurrencyCode()); } public List getBTCMarketsTrade(CurrencyPair currencyPair, Params parameters) @@ -37,6 +37,6 @@ public List getBTCMarketsTrade(CurrencyPair currencyPair, Param ((BTCMarketsMarketTradeParams) parameters).before, ((BTCMarketsMarketTradeParams) parameters).after, ((BTCMarketsMarketTradeParams) parameters).limit, - currencyPair.base.getCurrencyCode() + "-" + currencyPair.counter.getCurrencyCode()); + currencyPair.getBase().getCurrencyCode() + "-" + currencyPair.getCounter().getCurrencyCode()); } } 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 b6eb8d8de79..8210d16fcce 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 @@ -86,7 +86,7 @@ private String placeOrder( BTCMarketsOrder.Side side = orderSide == BID ? BTCMarketsOrder.Side.Bid : BTCMarketsOrder.Side.Ask; - final String marketId = currencyPair.base.toString() + "-" + currencyPair.counter.toString(); + final String marketId = currencyPair.getBase().toString() + "-" + currencyPair.getCounter().toString(); String timeInForce; if (flags.contains(BTCMarketsOrderFlags.FOK)) { timeInForce = "FOK"; diff --git a/xchange-btcmarkets/src/main/java/org/knowm/xchange/btcmarkets/service/BTCMarketsTradeServiceRaw.java b/xchange-btcmarkets/src/main/java/org/knowm/xchange/btcmarkets/service/BTCMarketsTradeServiceRaw.java index 262b1cb708b..eac68e4dcf9 100644 --- a/xchange-btcmarkets/src/main/java/org/knowm/xchange/btcmarkets/service/BTCMarketsTradeServiceRaw.java +++ b/xchange-btcmarkets/src/main/java/org/knowm/xchange/btcmarkets/service/BTCMarketsTradeServiceRaw.java @@ -54,8 +54,8 @@ public BTCMarketsOrders getBTCMarketsOpenOrders( CurrencyPair currencyPair, Integer limit, Long since) throws IOException { BTCMarketsOpenOrdersRequest request = new BTCMarketsOpenOrdersRequest( - currencyPair.counter.getCurrencyCode(), - currencyPair.base.getCurrencyCode(), + currencyPair.getCounter().getCurrencyCode(), + currencyPair.getBase().getCurrencyCode(), limit, since); return btcm.getOpenOrders( @@ -74,7 +74,7 @@ public List getBTCMarketsUserTransactions( CurrencyPair currencyPair, String before, String after, Integer limit) throws IOException { String marketId = null; if (currencyPair != null) { - marketId = currencyPair.base.getCurrencyCode() + "-" + currencyPair.counter.getCurrencyCode(); + marketId = currencyPair.getBase().getCurrencyCode() + "-" + currencyPair.getCounter().getCurrencyCode(); } return btcmv3.trades( exchange.getExchangeSpecification().getApiKey(), diff --git a/xchange-btcturk/src/main/java/org/knowm/xchange/btcturk/dto/BTCTurkPair.java b/xchange-btcturk/src/main/java/org/knowm/xchange/btcturk/dto/BTCTurkPair.java index 72feb149ebc..bd0e24236b9 100644 --- a/xchange-btcturk/src/main/java/org/knowm/xchange/btcturk/dto/BTCTurkPair.java +++ b/xchange-btcturk/src/main/java/org/knowm/xchange/btcturk/dto/BTCTurkPair.java @@ -34,6 +34,6 @@ public int hashCode() { public String toString() { return pair == null ? "" - : String.format("%s%s", pair.base.getCurrencyCode(), pair.counter.getCurrencyCode()); + : String.format("%s%s", pair.getBase().getCurrencyCode(), pair.getCounter().getCurrencyCode()); } } 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 3c13a2e779f..f8b97051bdc 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 @@ -72,7 +72,7 @@ public int hashCode() { public String toString() { return String.format( "%s-%s", - pair.base.getCurrencyCode().toLowerCase(), pair.counter.getCurrencyCode().toLowerCase()); + pair.getBase().getCurrencyCode().toLowerCase(), pair.getCounter().getCurrencyCode().toLowerCase()); } } } 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 bfde198caf3..1d812081d1e 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 @@ -132,8 +132,8 @@ public static ExchangeMetaData adaptToExchangeMetaData( .priceScale(0) .feeTiers(existingFeeTiers) .build()); - currencies.put(pair.base, null); - currencies.put(pair.counter, null); + currencies.put(pair.getBase(), null); + currencies.put(pair.getCounter(), null); } return new ExchangeMetaData(currencyPairs, currencies, null, null, true); @@ -239,7 +239,7 @@ public static UserTrade adaptUserTrade(CCEXOrderhistory trade) { .id(orderId) .orderId(orderId) .feeAmount(trade.getCommission()) - .feeCurrency(currencyPair.counter) + .feeCurrency(currencyPair.getCounter()) .build(); } 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 db9188a7e01..a7230b10133 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 @@ -14,9 +14,9 @@ private CCEXUtils() {} public static String toPairString(CurrencyPair currencyPair) { - return currencyPair.counter.getCurrencyCode().toLowerCase() + return currencyPair.getCounter().getCurrencyCode().toLowerCase() + "-" - + currencyPair.base.getCurrencyCode().toLowerCase(); + + currencyPair.getBase().getCurrencyCode().toLowerCase(); } public static Date toDate(String datetime) { diff --git a/xchange-ccex/src/main/java/org/knowm/xchange/ccex/service/CCEXMarketDataServiceRaw.java b/xchange-ccex/src/main/java/org/knowm/xchange/ccex/service/CCEXMarketDataServiceRaw.java index 08b5e43a6d7..44eef3a8c10 100644 --- a/xchange-ccex/src/main/java/org/knowm/xchange/ccex/service/CCEXMarketDataServiceRaw.java +++ b/xchange-ccex/src/main/java/org/knowm/xchange/ccex/service/CCEXMarketDataServiceRaw.java @@ -33,7 +33,7 @@ public CCEXGetorderbook getCCEXOrderBook(CurrencyPair pair, int depth) throws IO public CCEXPriceResponse getTicker(CurrencyPair pair) throws IOException { CCEXTickerResponse response = - ccex.getTicker(pair.base.toString().toLowerCase(), pair.counter.toString().toLowerCase()); + ccex.getTicker(pair.getBase().toString().toLowerCase(), pair.getCounter().toString().toLowerCase()); return response.getTicker(); } 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 d8bb494fdd9..66056c6b190 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 @@ -56,8 +56,8 @@ public boolean cancelCCEXLimitOrder(String uuid) throws IOException { public String placeCCEXLimitOrder(LimitOrder limitOrder) throws IOException { - String lpair = limitOrder.getCurrencyPair().base.toString().toLowerCase(); - String rpair = limitOrder.getCurrencyPair().counter.toString().toLowerCase(); + String lpair = limitOrder.getCurrencyPair().getBase().toString().toLowerCase(); + String rpair = limitOrder.getCurrencyPair().getCounter().toString().toLowerCase(); if (limitOrder.getType() == OrderType.BID) { CCEXBuySellLimitResponse response = diff --git a/xchange-cexio/src/main/java/org/knowm/xchange/cexio/service/CexIOMarketDataServiceRaw.java b/xchange-cexio/src/main/java/org/knowm/xchange/cexio/service/CexIOMarketDataServiceRaw.java index a7a528acd99..0ca6212bf20 100644 --- a/xchange-cexio/src/main/java/org/knowm/xchange/cexio/service/CexIOMarketDataServiceRaw.java +++ b/xchange-cexio/src/main/java/org/knowm/xchange/cexio/service/CexIOMarketDataServiceRaw.java @@ -40,7 +40,7 @@ public CexIOTicker getCexIOTicker(CurrencyPair currencyPair) throws IOException CexIOTicker cexIOTicker = cexio.getTicker( - currencyPair.base.getCurrencyCode(), currencyPair.counter.getCurrencyCode()); + currencyPair.getBase().getCurrencyCode(), currencyPair.getCounter().getCurrencyCode()); return cexIOTicker; } @@ -48,7 +48,7 @@ public CexIOTicker getCexIOTicker(CurrencyPair currencyPair) throws IOException public CexIODepth getCexIOOrderBook(CurrencyPair currencyPair) throws IOException { CexIODepth cexIODepth = - cexio.getDepth(currencyPair.base.getCurrencyCode(), currencyPair.counter.getCurrencyCode()); + cexio.getDepth(currencyPair.getBase().getCurrencyCode(), currencyPair.getCounter().getCurrencyCode()); return cexIODepth; } @@ -60,11 +60,11 @@ public CexIOTrade[] getCexIOTrades(CurrencyPair currencyPair, Long since) throws if (since != null) { trades = cexio.getTradesSince( - currencyPair.base.getCurrencyCode(), currencyPair.counter.getCurrencyCode(), since); + currencyPair.getBase().getCurrencyCode(), currencyPair.getCounter().getCurrencyCode(), since); } else { // default to full available trade history trades = cexio.getTrades( - currencyPair.base.getCurrencyCode(), currencyPair.counter.getCurrencyCode()); + currencyPair.getBase().getCurrencyCode(), currencyPair.getCounter().getCurrencyCode()); } return trades; diff --git a/xchange-cexio/src/main/java/org/knowm/xchange/cexio/service/CexIOTradeServiceRaw.java b/xchange-cexio/src/main/java/org/knowm/xchange/cexio/service/CexIOTradeServiceRaw.java index f32351fcc59..cad4454f599 100644 --- a/xchange-cexio/src/main/java/org/knowm/xchange/cexio/service/CexIOTradeServiceRaw.java +++ b/xchange-cexio/src/main/java/org/knowm/xchange/cexio/service/CexIOTradeServiceRaw.java @@ -40,7 +40,11 @@ import org.knowm.xchange.dto.trade.LimitOrder; import org.knowm.xchange.dto.trade.MarketOrder; import org.knowm.xchange.exceptions.ExchangeException; -import org.knowm.xchange.service.trade.params.*; +import org.knowm.xchange.service.trade.params.TradeHistoryParamCurrencyPair; +import org.knowm.xchange.service.trade.params.TradeHistoryParamLimit; +import org.knowm.xchange.service.trade.params.TradeHistoryParamPaging; +import org.knowm.xchange.service.trade.params.TradeHistoryParams; +import org.knowm.xchange.service.trade.params.TradeHistoryParamsTimeSpan; public class CexIOTradeServiceRaw extends CexIOBaseService { public CexIOTradeServiceRaw(Exchange exchange) { @@ -49,8 +53,8 @@ public CexIOTradeServiceRaw(Exchange exchange) { public List getCexIOOpenOrders(CurrencyPair currencyPair) throws IOException { - String tradableIdentifier = currencyPair.base.getCurrencyCode(); - String transactionCurrency = currencyPair.counter.getCurrencyCode(); + String tradableIdentifier = currencyPair.getBase().getCurrencyCode(); + String transactionCurrency = currencyPair.getCounter().getCurrencyCode(); return cexIOAuthenticated .getOpenOrders( @@ -67,8 +71,8 @@ public CexIOOrder placeCexIOLimitOrder(LimitOrder limitOrder) throws IOException CexIOOrder order = cexIOAuthenticated.placeOrder( signatureCreator, - limitOrder.getCurrencyPair().base.getCurrencyCode(), - limitOrder.getCurrencyPair().counter.getCurrencyCode(), + limitOrder.getCurrencyPair().getBase().getCurrencyCode(), + limitOrder.getCurrencyPair().getCounter().getCurrencyCode(), new CexioPlaceOrderRequest( (limitOrder.getType() == BID ? CexIOOrder.Type.buy : CexIOOrder.Type.sell), limitOrder.getLimitPrice(), @@ -94,8 +98,8 @@ public CexIOOrder placeCexIOMarketOrder(MarketOrder marketOrder) throws IOExcept CexIOOrder order = cexIOAuthenticated.placeOrder( signatureCreator, - marketOrder.getCurrencyPair().base.getCurrencyCode(), - marketOrder.getCurrencyPair().counter.getCurrencyCode(), + marketOrder.getCurrencyPair().getBase().getCurrencyCode(), + marketOrder.getCurrencyPair().getCounter().getCurrencyCode(), new CexioPlaceOrderRequest( (marketOrder.getType() == BID ? CexIOOrder.Type.buy : CexIOOrder.Type.sell), null, @@ -117,8 +121,8 @@ public CexIOCancelAllOrdersResponse cancelCexIOOrders(CurrencyPair currencyPair) throws IOException { return cexIOAuthenticated.cancelAllOrders( signatureCreator, - currencyPair.base.getCurrencyCode(), - currencyPair.counter.getCurrencyCode(), + currencyPair.getBase().getCurrencyCode(), + currencyPair.getCounter().getCurrencyCode(), new CexIORequest()); } @@ -145,8 +149,8 @@ public CexIOCancelReplaceOrderResponse cancelReplaceCexIOOrder( CexIOCancelReplaceOrderResponse response = cexIOAuthenticated.cancelReplaceOrder( signatureCreator, - currencyPair.base.getCurrencyCode(), - currencyPair.counter.getCurrencyCode(), + currencyPair.getBase().getCurrencyCode(), + currencyPair.getCounter().getCurrencyCode(), new CexioCancelReplaceOrderRequest(orderId, orderType, amount, price)); if (response.getError() != null) { @@ -171,8 +175,8 @@ public List archivedOrders(TradeHistoryParams tradeHistoryPa CexIOTradeHistoryParams params = (CexIOTradeHistoryParams) tradeHistoryParams; CurrencyPair currencyPair = params.currencyPair; - baseCcy = currencyPair == null ? null : currencyPair.base.getCurrencyCode(); - counterCcy = currencyPair == null ? null : currencyPair.counter.getCurrencyCode(); + baseCcy = currencyPair == null ? null : currencyPair.getBase().getCurrencyCode(); + counterCcy = currencyPair == null ? null : currencyPair.getCounter().getCurrencyCode(); limit = params.limit; dateTo = params.dateTo; dateFrom = params.dateFrom; @@ -196,8 +200,8 @@ public List archivedOrders(TradeHistoryParams tradeHistoryPa CurrencyPair currencyPair = ((TradeHistoryParamCurrencyPair) tradeHistoryParams).getCurrencyPair(); - baseCcy = currencyPair == null ? null : currencyPair.base.getCurrencyCode(); - counterCcy = currencyPair == null ? null : currencyPair.counter.getCurrencyCode(); + baseCcy = currencyPair == null ? null : currencyPair.getBase().getCurrencyCode(); + counterCcy = currencyPair == null ? null : currencyPair.getCounter().getCurrencyCode(); } if (tradeHistoryParams instanceof TradeHistoryParamLimit) { @@ -265,8 +269,8 @@ public List getOpenPositions(CurrencyPair currencyPair) throws IO CexioOpenPositionsResponse response = cexIOAuthenticated.getOpenPositions( signatureCreator, - currencyPair.base.getSymbol(), - currencyPair.counter.getSymbol(), + currencyPair.getBase().getSymbol(), + currencyPair.getCounter().getSymbol(), new CexIORequest()); if (!"ok".equalsIgnoreCase(response.getStatus())) { throw new ExchangeException(response.getEventName() + " " + response.getStatus()); @@ -313,10 +317,10 @@ public CexioOpenPosition openCexIOPosition( CexioOpenPositionResponse order = cexIOAuthenticated.openPosition( signatureCreator, - currencyPair.base.getCurrencyCode(), - currencyPair.counter.getCurrencyCode(), + currencyPair.getBase().getCurrencyCode(), + currencyPair.getCounter().getCurrencyCode(), new CexIOOpenPositionRequest( - currencyPair.base.getCurrencyCode(), + currencyPair.getBase().getCurrencyCode(), amount, collateral.getCurrencyCode(), leverage, @@ -334,8 +338,8 @@ public CexioClosePosition closePosition(CurrencyPair currencyPair, String id) th CexioClosePositionResponse response = cexIOAuthenticated.closePosition( signatureCreator, - currencyPair.base.getSymbol(), - currencyPair.counter.getSymbol(), + currencyPair.getBase().getSymbol(), + currencyPair.getCounter().getSymbol(), new CexIOGetPositionRequest(id)); if (!"ok".equalsIgnoreCase(response.getStatus())) { throw new ExchangeException(response.getEventName() + " " + response.getStatus()); diff --git a/xchange-coinbase/src/main/java/org/knowm/xchange/coinbase/service/CoinbaseMarketDataService.java b/xchange-coinbase/src/main/java/org/knowm/xchange/coinbase/service/CoinbaseMarketDataService.java index dcb650ad41b..2ef449dd7da 100644 --- a/xchange-coinbase/src/main/java/org/knowm/xchange/coinbase/service/CoinbaseMarketDataService.java +++ b/xchange-coinbase/src/main/java/org/knowm/xchange/coinbase/service/CoinbaseMarketDataService.java @@ -40,7 +40,7 @@ public CoinbaseMarketDataService(Exchange exchange) { @Override public Ticker getTicker(CurrencyPair currencyPair, final Object... args) throws IOException { - final String currency = currencyPair.counter.getCurrencyCode(); + final String currency = currencyPair.getCounter().getCurrencyCode(); final CoinbasePrice buyPrice = super.getCoinbaseBuyPrice(BigDecimal.ONE, currency); final CoinbasePrice sellPrice = super.getCoinbaseSellPrice(BigDecimal.ONE, currency); final CoinbaseMoney spotRate = super.getCoinbaseSpotRate(currency); diff --git a/xchange-coinbasepro/src/main/java/org/knowm/xchange/coinbasepro/CoinbaseProAdapters.java b/xchange-coinbasepro/src/main/java/org/knowm/xchange/coinbasepro/CoinbaseProAdapters.java index 774850eaf6e..5cfcb1a2d2c 100644 --- a/xchange-coinbasepro/src/main/java/org/knowm/xchange/coinbasepro/CoinbaseProAdapters.java +++ b/xchange-coinbasepro/src/main/java/org/knowm/xchange/coinbasepro/CoinbaseProAdapters.java @@ -318,7 +318,7 @@ public static UserTrades adaptTradeHistory(List coinbaseExFills .id(String.valueOf(fill.getTradeId())) .orderId(fill.getOrderId()) .feeAmount(fill.getFee()) - .feeCurrency(currencyPair.counter) + .feeCurrency(currencyPair.getCounter()) .build()); } @@ -393,7 +393,7 @@ public static ExchangeMetaData adaptToExchangeMetaData( .counterMinimumAmount(product.getMinMarketFunds()) .counterMaximumAmount(product.getMaxMarketFunds()) .feeTiers(staticMetaData != null ? staticMetaData.getFeeTiers() : null) - .tradingFeeCurrency(pair.counter) + .tradingFeeCurrency(pair.getCounter()) .marketOrderEnabled(marketOrderAllowed) .build()); } @@ -422,7 +422,7 @@ public static ExchangeMetaData adaptToExchangeMetaData( public static String adaptProductID(CurrencyPair currencyPair) { return currencyPair == null ? null - : currencyPair.base.getCurrencyCode() + "-" + currencyPair.counter.getCurrencyCode(); + : currencyPair.getBase().getCurrencyCode() + "-" + currencyPair.getCounter().getCurrencyCode(); } public static CoinbaseProPlaceOrder.Side adaptSide(OrderType orderType) { diff --git a/xchange-coinbasepro/src/main/java/org/knowm/xchange/coinbasepro/service/CoinbaseProMarketDataServiceRaw.java b/xchange-coinbasepro/src/main/java/org/knowm/xchange/coinbasepro/service/CoinbaseProMarketDataServiceRaw.java index 578e2984366..8a7116e7cd3 100644 --- a/xchange-coinbasepro/src/main/java/org/knowm/xchange/coinbasepro/service/CoinbaseProMarketDataServiceRaw.java +++ b/xchange-coinbasepro/src/main/java/org/knowm/xchange/coinbasepro/service/CoinbaseProMarketDataServiceRaw.java @@ -38,7 +38,7 @@ public CoinbaseProProductTicker getCoinbaseProProductTicker(CurrencyPair currenc return decorateApiCall( () -> coinbasePro.getProductTicker( - currencyPair.base.getCurrencyCode(), currencyPair.counter.getCurrencyCode())) + currencyPair.getBase().getCurrencyCode(), currencyPair.getCounter().getCurrencyCode())) .withRateLimiter(rateLimiter(PUBLIC_REST_ENDPOINT_RATE_LIMITER)) .call(); } catch (CoinbaseProException e) { @@ -57,7 +57,7 @@ public CoinbaseProProductStats getCoinbaseProProductStats(CurrencyPair currencyP return decorateApiCall( () -> coinbasePro.getProductStats( - currencyPair.base.getCurrencyCode(), currencyPair.counter.getCurrencyCode())) + currencyPair.getBase().getCurrencyCode(), currencyPair.getCounter().getCurrencyCode())) .withRateLimiter(rateLimiter(PUBLIC_REST_ENDPOINT_RATE_LIMITER)) .call(); } catch (CoinbaseProException e) { @@ -83,8 +83,8 @@ public CoinbaseProProductBook getCoinbaseProProductOrderBook(CurrencyPair curren return decorateApiCall( () -> coinbasePro.getProductOrderBook( - currencyPair.base.getCurrencyCode(), - currencyPair.counter.getCurrencyCode(), + currencyPair.getBase().getCurrencyCode(), + currencyPair.getCounter().getCurrencyCode(), String.valueOf(level))) .withRateLimiter(rateLimiter(PUBLIC_REST_ENDPOINT_RATE_LIMITER)) .call(); @@ -99,7 +99,7 @@ public CoinbaseProTrade[] getCoinbaseProTrades(CurrencyPair currencyPair) throws return decorateApiCall( () -> coinbasePro.getTrades( - currencyPair.base.getCurrencyCode(), currencyPair.counter.getCurrencyCode())) + currencyPair.getBase().getCurrencyCode(), currencyPair.getCounter().getCurrencyCode())) .withRateLimiter(rateLimiter(PUBLIC_REST_ENDPOINT_RATE_LIMITER)) .call(); } catch (CoinbaseProException e) { @@ -115,8 +115,8 @@ public CoinbaseProCandle[] getCoinbaseProHistoricalCandles( return decorateApiCall( () -> coinbasePro.getHistoricalCandles( - currencyPair.base.getCurrencyCode(), - currencyPair.counter.getCurrencyCode(), + currencyPair.getBase().getCurrencyCode(), + currencyPair.getCounter().getCurrencyCode(), start, end, granularity)) @@ -155,8 +155,8 @@ public CoinbaseProTrades getCoinbaseProTradesExtended( return decorateApiCall( () -> coinbasePro.getTradesPageable( - currencyPair.base.getCurrencyCode(), - currencyPair.counter.getCurrencyCode(), + currencyPair.getBase().getCurrencyCode(), + currencyPair.getCounter().getCurrencyCode(), after, limit)) .withRateLimiter(rateLimiter(PUBLIC_REST_ENDPOINT_RATE_LIMITER)) diff --git a/xchange-coincheck/src/main/java/org/knowm/xchange/coincheck/dto/marketdata/CoincheckPair.java b/xchange-coincheck/src/main/java/org/knowm/xchange/coincheck/dto/marketdata/CoincheckPair.java index 26a27d94a62..b661bd6c41d 100644 --- a/xchange-coincheck/src/main/java/org/knowm/xchange/coincheck/dto/marketdata/CoincheckPair.java +++ b/xchange-coincheck/src/main/java/org/knowm/xchange/coincheck/dto/marketdata/CoincheckPair.java @@ -24,8 +24,8 @@ public String toString() { } public static String pairToString(CoincheckPair pair) { - String base = pair.getPair().base.toString().toLowerCase(Locale.ROOT); - String counter = pair.getPair().counter.toString().toLowerCase(Locale.ROOT); + String base = pair.getPair().getBase().toString().toLowerCase(Locale.ROOT); + String counter = pair.getPair().getCounter().toString().toLowerCase(Locale.ROOT); return base + '_' + counter; } diff --git a/xchange-coindeal/src/main/java/org/knowm/xchange/coindeal/CoindealAdapters.java b/xchange-coindeal/src/main/java/org/knowm/xchange/coindeal/CoindealAdapters.java index 411dce6c5a3..a5e74c84f63 100644 --- a/xchange-coindeal/src/main/java/org/knowm/xchange/coindeal/CoindealAdapters.java +++ b/xchange-coindeal/src/main/java/org/knowm/xchange/coindeal/CoindealAdapters.java @@ -46,8 +46,8 @@ public static UserTrades adaptToUserTrades(List coindealTr .feeAmount(coindealTradeHistory.getFee()) .feeCurrency( (coindealTradeHistory.getSide().equals("BUY") - ? currencyPair.base - : currencyPair.counter)) + ? currencyPair.getBase() + : currencyPair.getCounter())) .build()); } diff --git a/xchange-coindirect/src/main/java/org/knowm/xchange/coindirect/CoindirectAdapters.java b/xchange-coindirect/src/main/java/org/knowm/xchange/coindirect/CoindirectAdapters.java index ee49453fbff..0ce68de4585 100644 --- a/xchange-coindirect/src/main/java/org/knowm/xchange/coindirect/CoindirectAdapters.java +++ b/xchange-coindirect/src/main/java/org/knowm/xchange/coindirect/CoindirectAdapters.java @@ -14,7 +14,7 @@ public class CoindirectAdapters { public static String toSymbol(CurrencyPair pair) { - return pair.base.getCurrencyCode() + "-" + pair.counter.getCurrencyCode(); + return pair.getBase().getCurrencyCode() + "-" + pair.getCounter().getCurrencyCode(); } public static CurrencyPair toCurrencyPair(String symbol) { diff --git a/xchange-coindirect/src/main/java/org/knowm/xchange/coindirect/service/CoindirectTradeService.java b/xchange-coindirect/src/main/java/org/knowm/xchange/coindirect/service/CoindirectTradeService.java index 48a596bd8c1..6c13febee09 100644 --- a/xchange-coindirect/src/main/java/org/knowm/xchange/coindirect/service/CoindirectTradeService.java +++ b/xchange-coindirect/src/main/java/org/knowm/xchange/coindirect/service/CoindirectTradeService.java @@ -106,7 +106,7 @@ public UserTrades getTradeHistory(TradeHistoryParams params) throws IOException .id(t.uuid) .orderId(t.uuid) .feeAmount(t.executedFees) - .feeCurrency(CoindirectAdapters.toCurrencyPair(t.symbol).counter) + .feeCurrency(CoindirectAdapters.toCurrencyPair(t.symbol).getCounter()) .build(); }) .filter(t -> t != null) diff --git a/xchange-coinegg/src/main/java/org/knowm/xchange/coinegg/service/CoinEggMarketDataService.java b/xchange-coinegg/src/main/java/org/knowm/xchange/coinegg/service/CoinEggMarketDataService.java index 6ab61dcccc2..cac4cdc6356 100644 --- a/xchange-coinegg/src/main/java/org/knowm/xchange/coinegg/service/CoinEggMarketDataService.java +++ b/xchange-coinegg/src/main/java/org/knowm/xchange/coinegg/service/CoinEggMarketDataService.java @@ -19,21 +19,21 @@ public CoinEggMarketDataService(Exchange exchange) { @Override public Ticker getTicker(CurrencyPair currencyPair, Object... args) throws IOException { return CoinEggAdapters.adaptTicker( - getCoinEggTicker(currencyPair.base.getCurrencyCode().toLowerCase()), currencyPair); + getCoinEggTicker(currencyPair.getBase().getCurrencyCode().toLowerCase()), currencyPair); } @Override public OrderBook getOrderBook(CurrencyPair currencyPair, Object... args) throws IOException { return CoinEggAdapters.adaptOrders( getCoinEggOrders( - currencyPair.counter.getCurrencyCode().toLowerCase(), - currencyPair.base.getCurrencyCode().toLowerCase()), + currencyPair.getCounter().getCurrencyCode().toLowerCase(), + currencyPair.getBase().getCurrencyCode().toLowerCase()), currencyPair); } @Override public Trades getTrades(CurrencyPair currencyPair, Object... args) throws IOException { return CoinEggAdapters.adaptTrades( - getCoinEggTrades(currencyPair.base.getCurrencyCode().toLowerCase()), currencyPair); + getCoinEggTrades(currencyPair.getBase().getCurrencyCode().toLowerCase()), currencyPair); } } diff --git a/xchange-coinegg/src/main/java/org/knowm/xchange/coinegg/service/CoinEggTradeService.java b/xchange-coinegg/src/main/java/org/knowm/xchange/coinegg/service/CoinEggTradeService.java index fd2e81fcabe..ed360960191 100644 --- a/xchange-coinegg/src/main/java/org/knowm/xchange/coinegg/service/CoinEggTradeService.java +++ b/xchange-coinegg/src/main/java/org/knowm/xchange/coinegg/service/CoinEggTradeService.java @@ -31,7 +31,7 @@ public String placeLimitOrder(LimitOrder limitOrder) throws IOException { BigDecimal amount = limitOrder.getOriginalAmount(); BigDecimal price = limitOrder.getAveragePrice(); String type = limitOrder.getType() == OrderType.ASK ? "buy" : "sell"; - String coin = limitOrder.getCurrencyPair().base.getCurrencyCode().toLowerCase(); + String coin = limitOrder.getCurrencyPair().getBase().getCurrencyCode().toLowerCase(); return CoinEggAdapters.adaptTradeAdd(getCoinEggTradeAdd(amount, price, type, coin)); } @@ -46,7 +46,7 @@ public boolean cancelOrder(CancelOrderParams orderParams) throws IOException { String coin = ((CancelOrderByCurrencyPair) orderParams) .getCurrencyPair() - .base + .getBase() .getCurrencyCode() .toLowerCase(); diff --git a/xchange-coinfloor/src/main/java/org/knowm/xchange/coinfloor/CoinfloorAdapters.java b/xchange-coinfloor/src/main/java/org/knowm/xchange/coinfloor/CoinfloorAdapters.java index 20d3fb10410..6b8e9cd72a0 100644 --- a/xchange-coinfloor/src/main/java/org/knowm/xchange/coinfloor/CoinfloorAdapters.java +++ b/xchange-coinfloor/src/main/java/org/knowm/xchange/coinfloor/CoinfloorAdapters.java @@ -138,7 +138,7 @@ public static UserTrades adaptTradeHistory(Collection .id(tradeId) .orderId(orderId) .feeAmount(feeAmount) - .feeCurrency(transaction.getCurrencyPair().counter) + .feeCurrency(transaction.getCurrencyPair().getCounter()) .build(); trades.add(trade); } diff --git a/xchange-coinfloor/src/main/java/org/knowm/xchange/coinfloor/dto/trade/CoinfloorUserTransaction.java b/xchange-coinfloor/src/main/java/org/knowm/xchange/coinfloor/dto/trade/CoinfloorUserTransaction.java index b98fedcc876..c4480674ade 100644 --- a/xchange-coinfloor/src/main/java/org/knowm/xchange/coinfloor/dto/trade/CoinfloorUserTransaction.java +++ b/xchange-coinfloor/src/main/java/org/knowm/xchange/coinfloor/dto/trade/CoinfloorUserTransaction.java @@ -133,15 +133,15 @@ public Currency getCurrency() { public BigDecimal getAmount() { if (isTrade()) { - if (getCurrencyPair().base == Currency.BTC) { + if (getCurrencyPair().getBase() == Currency.BTC) { return btc; - } else if (getCurrencyPair().base == Currency.XRP) { + } else if (getCurrencyPair().getBase() == Currency.XRP) { return xrp; - } else if (getCurrencyPair().base == Currency.LTC) { + } else if (getCurrencyPair().getBase() == Currency.LTC) { return ltc; - } else if (getCurrencyPair().base == Currency.ETH) { + } else if (getCurrencyPair().getBase() == Currency.ETH) { return eth; - } else if (getCurrencyPair().base == Currency.BCH) { + } else if (getCurrencyPair().getBase() == Currency.BCH) { return bch; } else { return BigDecimal.ZERO; diff --git a/xchange-coinfloor/src/main/java/org/knowm/xchange/coinfloor/service/CoinfloorMarketDataServiceRaw.java b/xchange-coinfloor/src/main/java/org/knowm/xchange/coinfloor/service/CoinfloorMarketDataServiceRaw.java index 97625760dbf..ac31b05311c 100644 --- a/xchange-coinfloor/src/main/java/org/knowm/xchange/coinfloor/service/CoinfloorMarketDataServiceRaw.java +++ b/xchange-coinfloor/src/main/java/org/knowm/xchange/coinfloor/service/CoinfloorMarketDataServiceRaw.java @@ -25,16 +25,16 @@ protected CoinfloorMarketDataServiceRaw(Exchange exchange) { } public CoinfloorTicker getCoinfloorTicker(CurrencyPair pair) throws IOException { - return coinfloor.getTicker(normalise(pair.base), normalise(pair.counter)); + return coinfloor.getTicker(normalise(pair.getBase()), normalise(pair.getCounter())); } public CoinfloorOrderBook getCoinfloorOrderBook(CurrencyPair pair) throws IOException { - return coinfloor.getOrderBook(normalise(pair.base), normalise(pair.counter)); + return coinfloor.getOrderBook(normalise(pair.getBase()), normalise(pair.getCounter())); } public CoinfloorTransaction[] getCoinfloorTransactions( CurrencyPair pair, CoinfloorInterval interval) throws IOException { - return coinfloor.getTransactions(normalise(pair.base), normalise(pair.counter), interval); + return coinfloor.getTransactions(normalise(pair.getBase()), normalise(pair.getCounter()), interval); } private Currency normalise(Currency xchange) { diff --git a/xchange-coinfloor/src/main/java/org/knowm/xchange/coinfloor/service/CoinfloorTradeServiceRaw.java b/xchange-coinfloor/src/main/java/org/knowm/xchange/coinfloor/service/CoinfloorTradeServiceRaw.java index 19349d92ca3..1e440afcc69 100644 --- a/xchange-coinfloor/src/main/java/org/knowm/xchange/coinfloor/service/CoinfloorTradeServiceRaw.java +++ b/xchange-coinfloor/src/main/java/org/knowm/xchange/coinfloor/service/CoinfloorTradeServiceRaw.java @@ -48,7 +48,7 @@ public CoinfloorUserTransaction[] getUserTransactions( public CoinfloorOrder[] getOpenOrders(CurrencyPair pair) throws IOException { try { - return coinfloor.getOpenOrders(normalise(pair.base), normalise(pair.counter)); + return coinfloor.getOpenOrders(normalise(pair.getBase()), normalise(pair.getCounter())); } catch (HttpStatusIOException e) { if (e.getHttpStatusCode() == HttpURLConnection.HTTP_BAD_REQUEST) { throw new ExchangeException(e.getHttpBody(), e); @@ -60,8 +60,8 @@ public CoinfloorOrder[] getOpenOrders(CurrencyPair pair) throws IOException { public CoinfloorOrder placeLimitOrder( CurrencyPair pair, OrderType side, BigDecimal amount, BigDecimal price) throws IOException { - Currency base = normalise(pair.base); - Currency counter = normalise(pair.counter); + Currency base = normalise(pair.getBase()); + Currency counter = normalise(pair.getCounter()); try { if (side == OrderType.BID) { @@ -82,8 +82,8 @@ public CoinfloorOrder placeLimitOrder( public CoinfloorMarketOrderResponse placeMarketOrder( CurrencyPair pair, OrderType side, BigDecimal amount) throws IOException { - Currency base = normalise(pair.base); - Currency counter = normalise(pair.counter); + Currency base = normalise(pair.getBase()); + Currency counter = normalise(pair.getCounter()); try { if (side == OrderType.BID) { return coinfloor.buyMarket(base, counter, amount); @@ -103,7 +103,7 @@ public CoinfloorMarketOrderResponse placeMarketOrder( public boolean cancelOrder(CurrencyPair pair, long id) throws IOException { try { - return coinfloor.cancelOrder(normalise(pair.base), normalise(pair.counter), id); + return coinfloor.cancelOrder(normalise(pair.getBase()), normalise(pair.getCounter()), id); } catch (HttpStatusIOException e) { if (e.getHttpStatusCode() == HttpURLConnection.HTTP_BAD_REQUEST) { throw new ExchangeException(e.getHttpBody(), e); diff --git a/xchange-coinjar/src/main/java/org/knowm/xchange/coinjar/CoinjarAdapters.java b/xchange-coinjar/src/main/java/org/knowm/xchange/coinjar/CoinjarAdapters.java index 3bb5fd31364..5ae8b9995cc 100644 --- a/xchange-coinjar/src/main/java/org/knowm/xchange/coinjar/CoinjarAdapters.java +++ b/xchange-coinjar/src/main/java/org/knowm/xchange/coinjar/CoinjarAdapters.java @@ -31,10 +31,10 @@ private CoinjarAdapters() {} public static String currencyPairToProduct(CurrencyPair pair) { String sep = ""; - if (pair.base.getCurrencyCode().length() > 3 || pair.counter.getCurrencyCode().length() > 3) { + if (pair.getBase().getCurrencyCode().length() > 3 || pair.getCounter().getCurrencyCode().length() > 3) { sep = "-"; } - return pair.base.getCurrencyCode() + sep + pair.counter.getCurrencyCode(); + return pair.getBase().getCurrencyCode() + sep + pair.getCounter().getCurrencyCode(); } public static CurrencyPair productToCurrencyPair(String product) { diff --git a/xchange-coinmarketcap/src/main/java/org/knowm/xchange/coinmarketcap/pro/v1/CmcAdapter.java b/xchange-coinmarketcap/src/main/java/org/knowm/xchange/coinmarketcap/pro/v1/CmcAdapter.java index 9c15a8a8f16..0f8b19ba245 100644 --- a/xchange-coinmarketcap/src/main/java/org/knowm/xchange/coinmarketcap/pro/v1/CmcAdapter.java +++ b/xchange-coinmarketcap/src/main/java/org/knowm/xchange/coinmarketcap/pro/v1/CmcAdapter.java @@ -15,7 +15,7 @@ public class CmcAdapter { public static Ticker adaptTicker(CmcTicker ticker, CurrencyPair currencyPair) { Date timestamp = ticker.getLastUpdated(); - CmcQuote cmcQuote = ticker.getQuote().get(currencyPair.counter.getCurrencyCode()); + CmcQuote cmcQuote = ticker.getQuote().get(currencyPair.getCounter().getCurrencyCode()); BigDecimal price = cmcQuote.getPrice(); BigDecimal volume24h = cmcQuote.getVolume24h(); diff --git a/xchange-coinmarketcap/src/main/java/org/knowm/xchange/coinmarketcap/pro/v1/service/CmcMarketDataService.java b/xchange-coinmarketcap/src/main/java/org/knowm/xchange/coinmarketcap/pro/v1/service/CmcMarketDataService.java index 89760f1b59e..403cb2783ef 100644 --- a/xchange-coinmarketcap/src/main/java/org/knowm/xchange/coinmarketcap/pro/v1/service/CmcMarketDataService.java +++ b/xchange-coinmarketcap/src/main/java/org/knowm/xchange/coinmarketcap/pro/v1/service/CmcMarketDataService.java @@ -33,7 +33,7 @@ public Ticker getTicker(CurrencyPair currencyPair, Object... args) throws IOExce CmcTicker ticker = null; try { - ticker = super.getCmcLatestQuote(currencyPair).get(currencyPair.base.getCurrencyCode()); + ticker = super.getCmcLatestQuote(currencyPair).get(currencyPair.getBase().getCurrencyCode()); } catch (HttpStatusIOException ex) { CmcErrorAdapter.adapt(ex); } @@ -53,8 +53,8 @@ public List getTickers(Params params) throws IOException { Set baseSymbols = new HashSet<>(); Set convertSymbols = new HashSet<>(); for (CurrencyPair pair : pairs) { - baseSymbols.add(pair.base); - convertSymbols.add(pair.counter); + baseSymbols.add(pair.getBase()); + convertSymbols.add(pair.getCounter()); } Map cmcTickerMap = super.getCmcLatestQuotes(baseSymbols, convertSymbols); diff --git a/xchange-coinmarketcap/src/main/java/org/knowm/xchange/coinmarketcap/pro/v1/service/CmcMarketDataServiceRaw.java b/xchange-coinmarketcap/src/main/java/org/knowm/xchange/coinmarketcap/pro/v1/service/CmcMarketDataServiceRaw.java index 221b89c5cd3..cc61b29759e 100644 --- a/xchange-coinmarketcap/src/main/java/org/knowm/xchange/coinmarketcap/pro/v1/service/CmcMarketDataServiceRaw.java +++ b/xchange-coinmarketcap/src/main/java/org/knowm/xchange/coinmarketcap/pro/v1/service/CmcMarketDataServiceRaw.java @@ -115,7 +115,7 @@ public Map getCmcLatestQuote(CurrencyPair currencyPair) throw try { response = cmcAuthenticated.getLatestQuotes( - apiKey, currencyPair.base.getCurrencyCode(), currencyPair.counter.getCurrencyCode()); + apiKey, currencyPair.getBase().getCurrencyCode(), currencyPair.getCounter().getCurrencyCode()); } catch (HttpStatusIOException ex) { CmcErrorAdapter.adapt(ex); } diff --git a/xchange-coinmate/src/main/java/org/knowm/xchange/coinmate/CoinmateAdapters.java b/xchange-coinmate/src/main/java/org/knowm/xchange/coinmate/CoinmateAdapters.java index 79f653c235e..d784189058d 100644 --- a/xchange-coinmate/src/main/java/org/knowm/xchange/coinmate/CoinmateAdapters.java +++ b/xchange-coinmate/src/main/java/org/knowm/xchange/coinmate/CoinmateAdapters.java @@ -41,7 +41,15 @@ import org.knowm.xchange.coinmate.dto.marketdata.CoinmateTradeStatistics; import org.knowm.xchange.coinmate.dto.marketdata.CoinmateTransactions; import org.knowm.xchange.coinmate.dto.marketdata.CoinmateTransactionsEntry; -import org.knowm.xchange.coinmate.dto.trade.*; +import org.knowm.xchange.coinmate.dto.trade.CoinmateOpenOrders; +import org.knowm.xchange.coinmate.dto.trade.CoinmateOpenOrdersEntry; +import org.knowm.xchange.coinmate.dto.trade.CoinmateOrderHistoryEntry; +import org.knowm.xchange.coinmate.dto.trade.CoinmateTradeHistory; +import org.knowm.xchange.coinmate.dto.trade.CoinmateTransactionHistory; +import org.knowm.xchange.coinmate.dto.trade.CoinmateTransactionHistoryEntry; +import org.knowm.xchange.coinmate.dto.trade.CoinmateTransferDetail; +import org.knowm.xchange.coinmate.dto.trade.CoinmateTransferHistory; +import org.knowm.xchange.coinmate.dto.trade.CoinmateTransferHistoryEntry; import org.knowm.xchange.currency.Currency; import org.knowm.xchange.currency.CurrencyPair; import org.knowm.xchange.dto.Order; @@ -229,7 +237,7 @@ public static UserTrades adaptTradeHistory(CoinmateTradeHistory coinmateTradeHis .id(Long.toString(entry.getTransactionId())) .orderId(Long.toString(entry.getOrderId())) .feeAmount(entry.getFee()) - .feeCurrency(CoinmateUtils.getPair(entry.getCurrencyPair()).counter) + .feeCurrency(CoinmateUtils.getPair(entry.getCurrencyPair()).getCounter()) .build()) .collect( Collectors.toCollection( diff --git a/xchange-coinone/src/main/java/org/knowm/xchange/coinone/dto/trade/CoinoneTradeCancelRequest.java b/xchange-coinone/src/main/java/org/knowm/xchange/coinone/dto/trade/CoinoneTradeCancelRequest.java index 2ef6525c62a..13d2156c508 100644 --- a/xchange-coinone/src/main/java/org/knowm/xchange/coinone/dto/trade/CoinoneTradeCancelRequest.java +++ b/xchange-coinone/src/main/java/org/knowm/xchange/coinone/dto/trade/CoinoneTradeCancelRequest.java @@ -44,7 +44,7 @@ public CoinoneTradeCancelRequest(String orderId, LimitOrder limitOrder) { this.price = limitOrder.getLimitPrice(); this.qty = limitOrder.getOriginalAmount(); this.isAsk = limitOrder.getType() == Order.OrderType.ASK ? true : false; - this.currency = limitOrder.getCurrencyPair().base.getSymbol().toLowerCase(); + this.currency = limitOrder.getCurrencyPair().getBase().getSymbol().toLowerCase(); } public String getAccessTocken() { diff --git a/xchange-coinone/src/main/java/org/knowm/xchange/coinone/service/CoinoneMarketDataServiceRaw.java b/xchange-coinone/src/main/java/org/knowm/xchange/coinone/service/CoinoneMarketDataServiceRaw.java index 98f63231d3d..70f5f91e444 100644 --- a/xchange-coinone/src/main/java/org/knowm/xchange/coinone/service/CoinoneMarketDataServiceRaw.java +++ b/xchange-coinone/src/main/java/org/knowm/xchange/coinone/service/CoinoneMarketDataServiceRaw.java @@ -33,14 +33,14 @@ public CoinoneMarketDataServiceRaw(Exchange exchange) { } public CoinoneTicker getTicker(CurrencyPair currencyPair) throws IOException { - return coinone.getTicker(currencyPair.base.getSymbol()); + return coinone.getTicker(currencyPair.getBase().getSymbol()); } public CoinoneOrderBook getCoinoneOrderBook(CurrencyPair currencyPair) throws IOException { - return coinone.getOrderBook(currencyPair.base.getSymbol()); + return coinone.getOrderBook(currencyPair.getBase().getSymbol()); } public CoinoneTrades getTrades(CurrencyPair currencyPair, String period) throws IOException { - return coinone.getTrades(currencyPair.base.getSymbol(), period); + return coinone.getTrades(currencyPair.getBase().getSymbol(), period); } } diff --git a/xchange-coinone/src/main/java/org/knowm/xchange/coinone/service/CoinoneTradeServiceRaw.java b/xchange-coinone/src/main/java/org/knowm/xchange/coinone/service/CoinoneTradeServiceRaw.java index b8b4446a64f..d8a62791fc7 100644 --- a/xchange-coinone/src/main/java/org/knowm/xchange/coinone/service/CoinoneTradeServiceRaw.java +++ b/xchange-coinone/src/main/java/org/knowm/xchange/coinone/service/CoinoneTradeServiceRaw.java @@ -26,7 +26,7 @@ public CoinoneTradeResponse placeLimitOrderRaw(LimitOrder limitOrder) exchange.getNonceFactory().createValue(), limitOrder.getLimitPrice(), limitOrder.getOriginalAmount(), - limitOrder.getCurrencyPair().base); + limitOrder.getCurrencyPair().getBase()); if (limitOrder.getType().equals(OrderType.ASK)) { return coinone.limitSell(payloadCreator, signatureCreator, request); } else { @@ -50,7 +50,7 @@ public CoinoneOrderInfoResponse getOrderInfo(String orderId, CurrencyPair curren apiKey, exchange.getNonceFactory().createValue(), orderId, - currencyPair.base.getSymbol().toLowerCase()); + currencyPair.getBase().getSymbol().toLowerCase()); return coinone.getOrder(payloadCreator, signatureCreator, request); } } diff --git a/xchange-core/src/main/java/org/knowm/xchange/currency/CurrencyPair.java b/xchange-core/src/main/java/org/knowm/xchange/currency/CurrencyPair.java index 2cbe5ade84c..64540f87ea1 100644 --- a/xchange-core/src/main/java/org/knowm/xchange/currency/CurrencyPair.java +++ b/xchange-core/src/main/java/org/knowm/xchange/currency/CurrencyPair.java @@ -396,9 +396,9 @@ public class CurrencyPair extends Instrument implements Comparable public static final CurrencyPair WETH_PUSD = new CurrencyPair(Currency.WETH, Currency.PUSD); public static final CurrencyPair PLINK_USDC = new CurrencyPair(Currency.PLINK, Currency.USDC); - public final Currency base; + private final Currency base; - public final Currency counter; + private final Currency counter; /** * Full constructor In general the CurrencyPair.base is what you're wanting to buy/sell. The diff --git a/xchange-core/src/main/java/org/knowm/xchange/derivative/FuturesContract.java b/xchange-core/src/main/java/org/knowm/xchange/derivative/FuturesContract.java index 48a4906bf13..00bd3311ae2 100644 --- a/xchange-core/src/main/java/org/knowm/xchange/derivative/FuturesContract.java +++ b/xchange-core/src/main/java/org/knowm/xchange/derivative/FuturesContract.java @@ -79,12 +79,12 @@ public int hashCode() { @Override public Currency getBase() { - return currencyPair.base; + return currencyPair.getBase(); } @Override public Currency getCounter() { - return currencyPair.counter; + return currencyPair.getCounter(); } @JsonValue diff --git a/xchange-core/src/main/java/org/knowm/xchange/derivative/OptionsContract.java b/xchange-core/src/main/java/org/knowm/xchange/derivative/OptionsContract.java index bf593c2116a..2e68830f3d7 100644 --- a/xchange-core/src/main/java/org/knowm/xchange/derivative/OptionsContract.java +++ b/xchange-core/src/main/java/org/knowm/xchange/derivative/OptionsContract.java @@ -157,20 +157,20 @@ public OptionsContract build() { @Override public Currency getBase() { - return currencyPair.base; + return currencyPair.getBase(); } @Override public Currency getCounter() { - return currencyPair.counter; + return currencyPair.getCounter(); } @JsonValue @Override public String toString() { - return currencyPair.base + return currencyPair.getBase() + "/" - + currencyPair.counter + + currencyPair.getCounter() + "/" + DATE_PARSER.get().format(this.expireDate) + "/" diff --git a/xchange-core/src/test/java/org/knowm/xchange/CurrencyPairTest.java b/xchange-core/src/test/java/org/knowm/xchange/CurrencyPairTest.java index 797d9d224ec..c5223a164cf 100644 --- a/xchange-core/src/test/java/org/knowm/xchange/CurrencyPairTest.java +++ b/xchange-core/src/test/java/org/knowm/xchange/CurrencyPairTest.java @@ -12,48 +12,48 @@ public class CurrencyPairTest { @Test public void testMajors() { - assertThat(CurrencyPair.EUR_USD.base.getCurrencyCode()).isEqualTo("EUR"); - assertThat(CurrencyPair.EUR_USD.counter.getCurrencyCode()).isEqualTo("USD"); + assertThat(CurrencyPair.EUR_USD.getBase().getCurrencyCode()).isEqualTo("EUR"); + assertThat(CurrencyPair.EUR_USD.getCounter().getCurrencyCode()).isEqualTo("USD"); - assertThat(CurrencyPair.GBP_USD.base.getCurrencyCode()).isEqualTo("GBP"); - assertThat(CurrencyPair.GBP_USD.counter.getCurrencyCode()).isEqualTo("USD"); + assertThat(CurrencyPair.GBP_USD.getBase().getCurrencyCode()).isEqualTo("GBP"); + assertThat(CurrencyPair.GBP_USD.getCounter().getCurrencyCode()).isEqualTo("USD"); - assertThat(CurrencyPair.USD_JPY.base.getCurrencyCode()).isEqualTo("USD"); - assertThat(CurrencyPair.USD_JPY.counter.getCurrencyCode()).isEqualTo("JPY"); + assertThat(CurrencyPair.USD_JPY.getBase().getCurrencyCode()).isEqualTo("USD"); + assertThat(CurrencyPair.USD_JPY.getCounter().getCurrencyCode()).isEqualTo("JPY"); - assertThat(CurrencyPair.USD_CHF.base.getCurrencyCode()).isEqualTo("USD"); - assertThat(CurrencyPair.USD_CHF.counter.getCurrencyCode()).isEqualTo("CHF"); + assertThat(CurrencyPair.USD_CHF.getBase().getCurrencyCode()).isEqualTo("USD"); + assertThat(CurrencyPair.USD_CHF.getCounter().getCurrencyCode()).isEqualTo("CHF"); - assertThat(CurrencyPair.USD_AUD.base.getCurrencyCode()).isEqualTo("USD"); - assertThat(CurrencyPair.USD_AUD.counter.getCurrencyCode()).isEqualTo("AUD"); + assertThat(CurrencyPair.USD_AUD.getBase().getCurrencyCode()).isEqualTo("USD"); + assertThat(CurrencyPair.USD_AUD.getCounter().getCurrencyCode()).isEqualTo("AUD"); - assertThat(CurrencyPair.USD_CAD.base.getCurrencyCode()).isEqualTo("USD"); - assertThat(CurrencyPair.USD_CAD.counter.getCurrencyCode()).isEqualTo("CAD"); + assertThat(CurrencyPair.USD_CAD.getBase().getCurrencyCode()).isEqualTo("USD"); + assertThat(CurrencyPair.USD_CAD.getCounter().getCurrencyCode()).isEqualTo("CAD"); } @Test public void testBitcoinCourtesy() { - assertThat(CurrencyPair.BTC_USD.base.getCurrencyCode()).isEqualTo("BTC"); - assertThat(CurrencyPair.BTC_USD.counter.getCurrencyCode()).isEqualTo("USD"); + assertThat(CurrencyPair.BTC_USD.getBase().getCurrencyCode()).isEqualTo("BTC"); + assertThat(CurrencyPair.BTC_USD.getCounter().getCurrencyCode()).isEqualTo("USD"); - assertThat(CurrencyPair.BTC_GBP.base.getCurrencyCode()).isEqualTo("BTC"); - assertThat(CurrencyPair.BTC_USD.counter.getCurrencyCode()).isEqualTo("USD"); + assertThat(CurrencyPair.BTC_GBP.getBase().getCurrencyCode()).isEqualTo("BTC"); + assertThat(CurrencyPair.BTC_USD.getCounter().getCurrencyCode()).isEqualTo("USD"); - assertThat(CurrencyPair.BTC_EUR.base.getCurrencyCode()).isEqualTo("BTC"); - assertThat(CurrencyPair.BTC_EUR.counter.getCurrencyCode()).isEqualTo("EUR"); + assertThat(CurrencyPair.BTC_EUR.getBase().getCurrencyCode()).isEqualTo("BTC"); + assertThat(CurrencyPair.BTC_EUR.getCounter().getCurrencyCode()).isEqualTo("EUR"); - assertThat(CurrencyPair.BTC_JPY.base.getCurrencyCode()).isEqualTo("BTC"); - assertThat(CurrencyPair.BTC_JPY.counter.getCurrencyCode()).isEqualTo("JPY"); + assertThat(CurrencyPair.BTC_JPY.getBase().getCurrencyCode()).isEqualTo("BTC"); + assertThat(CurrencyPair.BTC_JPY.getCounter().getCurrencyCode()).isEqualTo("JPY"); - assertThat(CurrencyPair.BTC_CHF.base.getCurrencyCode()).isEqualTo("BTC"); - assertThat(CurrencyPair.BTC_CHF.counter.getCurrencyCode()).isEqualTo("CHF"); + assertThat(CurrencyPair.BTC_CHF.getBase().getCurrencyCode()).isEqualTo("BTC"); + assertThat(CurrencyPair.BTC_CHF.getCounter().getCurrencyCode()).isEqualTo("CHF"); - assertThat(CurrencyPair.BTC_AUD.base.getCurrencyCode()).isEqualTo("BTC"); - assertThat(CurrencyPair.BTC_AUD.counter.getCurrencyCode()).isEqualTo("AUD"); + assertThat(CurrencyPair.BTC_AUD.getBase().getCurrencyCode()).isEqualTo("BTC"); + assertThat(CurrencyPair.BTC_AUD.getCounter().getCurrencyCode()).isEqualTo("AUD"); - assertThat(CurrencyPair.BTC_CAD.base.getCurrencyCode()).isEqualTo("BTC"); - assertThat(CurrencyPair.BTC_CAD.counter.getCurrencyCode()).isEqualTo("CAD"); + assertThat(CurrencyPair.BTC_CAD.getBase().getCurrencyCode()).isEqualTo("BTC"); + assertThat(CurrencyPair.BTC_CAD.getCounter().getCurrencyCode()).isEqualTo("CAD"); } @Test diff --git a/xchange-core/src/test/java/org/knowm/xchange/utils/CurrencyPairDeserializerTest.java b/xchange-core/src/test/java/org/knowm/xchange/utils/CurrencyPairDeserializerTest.java index e8750dd6831..bf7871dace9 100644 --- a/xchange-core/src/test/java/org/knowm/xchange/utils/CurrencyPairDeserializerTest.java +++ b/xchange-core/src/test/java/org/knowm/xchange/utils/CurrencyPairDeserializerTest.java @@ -20,21 +20,21 @@ public void testCurrencyPairFromString() { assertThat(currencyPair).isEqualTo(CurrencyPair.DOGE_HKD); currencyPair = CurrencyPairDeserializer.getCurrencyPairFromString("BTCUSD"); - assertThat(currencyPair.base).isEqualTo(Currency.BTC); - assertThat(currencyPair.counter).isEqualTo(Currency.USD); + assertThat(currencyPair.getBase()).isEqualTo(Currency.BTC); + assertThat(currencyPair.getCounter()).isEqualTo(Currency.USD); currencyPair = CurrencyPairDeserializer.getCurrencyPairFromString("BCBTC"); - assertThat(currencyPair.base).isEqualTo(Currency.BC); - assertThat(currencyPair.counter).isEqualTo(Currency.BTC); + assertThat(currencyPair.getBase()).isEqualTo(Currency.BC); + assertThat(currencyPair.getCounter()).isEqualTo(Currency.BTC); currencyPair = CurrencyPairDeserializer.getCurrencyPairFromString("DOGEBTC"); - assertThat(currencyPair.base).isEqualTo(Currency.DOGE); - assertThat(currencyPair.counter).isEqualTo(Currency.BTC); + assertThat(currencyPair.getBase()).isEqualTo(Currency.DOGE); + assertThat(currencyPair.getCounter()).isEqualTo(Currency.BTC); // Current heuristic: CurrencyPairDeserializer takes the end which gives the longer match to a // real currency currencyPair = CurrencyPairDeserializer.getCurrencyPairFromString("USDEHQXYVBC"); - assertThat(currencyPair.base).isEqualTo(Currency.USDE); - assertThat(currencyPair.counter.getCurrencyCode()).isEqualTo("HQXYVBC"); + assertThat(currencyPair.getBase()).isEqualTo(Currency.USDE); + assertThat(currencyPair.getCounter().getCurrencyCode()).isEqualTo("HQXYVBC"); } } diff --git a/xchange-cryptowatch/src/main/java/org/knowm/xchange/cryptowatch/CryptowatchAdapters.java b/xchange-cryptowatch/src/main/java/org/knowm/xchange/cryptowatch/CryptowatchAdapters.java index 6a0b4e7996e..5f700104a72 100644 --- a/xchange-cryptowatch/src/main/java/org/knowm/xchange/cryptowatch/CryptowatchAdapters.java +++ b/xchange-cryptowatch/src/main/java/org/knowm/xchange/cryptowatch/CryptowatchAdapters.java @@ -132,6 +132,6 @@ public static Trades adaptToTrades( } public static String adaptCurrencyPair(CurrencyPair pair) { - return pair.base.getCurrencyCode().concat(pair.counter.getCurrencyCode()).toLowerCase(); + return pair.getBase().getCurrencyCode().concat(pair.getCounter().getCurrencyCode()).toLowerCase(); } } diff --git a/xchange-cryptowatch/src/test/java/org/knowm/xchange/cryptowatch/CryptowatchAdaptersTest.java b/xchange-cryptowatch/src/test/java/org/knowm/xchange/cryptowatch/CryptowatchAdaptersTest.java index 0e39ff021ba..111c485ad94 100644 --- a/xchange-cryptowatch/src/test/java/org/knowm/xchange/cryptowatch/CryptowatchAdaptersTest.java +++ b/xchange-cryptowatch/src/test/java/org/knowm/xchange/cryptowatch/CryptowatchAdaptersTest.java @@ -58,8 +58,8 @@ public void adaptToCurrencyPair1STBTC() throws IOException { .orElse(null); CurrencyPair currencyPair = CryptowatchAdapters.adaptToCurrencyPair(assetPair); assertNotNull(currencyPair); - assertEquals("1ST", currencyPair.base.getCurrencyCode()); - assertEquals("BTC", currencyPair.counter.getCurrencyCode()); + assertEquals("1ST", currencyPair.getBase().getCurrencyCode()); + assertEquals("BTC", currencyPair.getCounter().getCurrencyCode()); } @Test @@ -76,8 +76,8 @@ public void adaptToCurrencyPairBTCEUR() throws IOException { .orElse(null); CurrencyPair currencyPair = CryptowatchAdapters.adaptToCurrencyPair(assetPair); assertNotNull(currencyPair); - assertEquals("BTC", currencyPair.base.getCurrencyCode()); - assertEquals("EUR", currencyPair.counter.getCurrencyCode()); + assertEquals("BTC", currencyPair.getBase().getCurrencyCode()); + assertEquals("EUR", currencyPair.getCounter().getCurrencyCode()); } @Test diff --git a/xchange-deribit/src/main/java/org/knowm/xchange/deribit/v2/DeribitAdapters.java b/xchange-deribit/src/main/java/org/knowm/xchange/deribit/v2/DeribitAdapters.java index 8ccc526757e..0619d4d2ea2 100644 --- a/xchange-deribit/src/main/java/org/knowm/xchange/deribit/v2/DeribitAdapters.java +++ b/xchange-deribit/src/main/java/org/knowm/xchange/deribit/v2/DeribitAdapters.java @@ -66,8 +66,8 @@ public static String adaptInstrumentName(Instrument instrument) { } public static String adaptInstrumentName(FuturesContract future) { - return future.getCurrencyPair().base - + (future.getCurrencyPair().counter == Currency.USDC ? "_USDC" : "") + return future.getCurrencyPair().getBase() + + (future.getCurrencyPair().getCounter() == Currency.USDC ? "_USDC" : "") + "-" + (future.getPrompt() == null ? PERPETUAL : (future.getPrompt())); } @@ -77,7 +77,7 @@ public static String adaptInstrumentName(OptionsContract option) { if (parts.length != 5) { throw new IllegalArgumentException("Could not adapt instrument name from '" + option + "'"); } - return option.getCurrencyPair().base + return option.getCurrencyPair().getBase() + "-" + formatDate(option.getExpireDate()) + "-" diff --git a/xchange-deribit/src/main/java/org/knowm/xchange/deribit/v2/service/DeribitTradeService.java b/xchange-deribit/src/main/java/org/knowm/xchange/deribit/v2/service/DeribitTradeService.java index e1d53afed3f..3322d721bb7 100644 --- a/xchange-deribit/src/main/java/org/knowm/xchange/deribit/v2/service/DeribitTradeService.java +++ b/xchange-deribit/src/main/java/org/knowm/xchange/deribit/v2/service/DeribitTradeService.java @@ -63,7 +63,7 @@ public OpenOrders getOpenOrders(OpenOrdersParams params) throws IOException { if (params instanceof OpenOrdersParamCurrencyPair) { OpenOrdersParamCurrencyPair pairParams = (OpenOrdersParamCurrencyPair) params; CurrencyPair pair = pairParams.getCurrencyPair(); - openOrders = super.getOpenOrdersByCurrency(pair.base.getCurrencyCode(), null, null); + openOrders = super.getOpenOrdersByCurrency(pair.getBase().getCurrencyCode(), null, null); } else if (params instanceof OpenOrdersParamInstrument) { OpenOrdersParamInstrument instrumentParams = (OpenOrdersParamInstrument) params; Instrument instrument = instrumentParams.getInstrument(); @@ -236,7 +236,7 @@ public UserTrades getTradeHistory(TradeHistoryParams params) throws IOException if (params instanceof TradeHistoryParamCurrencyPair) { CurrencyPair currencyPair = ((TradeHistoryParamCurrencyPair) params).getCurrencyPair(); if (currencyPair != null) { - currency = currencyPair.base.getCurrencyCode(); + currency = currencyPair.getBase().getCurrencyCode(); } } diff --git a/xchange-dvchain/src/main/java/org/knowm/xchange/dvchain/service/DVChainMarketDataService.java b/xchange-dvchain/src/main/java/org/knowm/xchange/dvchain/service/DVChainMarketDataService.java index cf53966029a..b21157ec534 100644 --- a/xchange-dvchain/src/main/java/org/knowm/xchange/dvchain/service/DVChainMarketDataService.java +++ b/xchange-dvchain/src/main/java/org/knowm/xchange/dvchain/service/DVChainMarketDataService.java @@ -21,7 +21,7 @@ public OrderBook getOrderBook(CurrencyPair currencyPair, Object... args) throws IOException, RateLimitExceededException { DVChainMarketResponse marketResponse = getMarketData(); DVChainMarketData marketData = - marketResponse.getMarketData().get(currencyPair.base.getSymbol()); + marketResponse.getMarketData().get(currencyPair.getBase().getSymbol()); return DVChainAdapters.adaptOrderBook(marketData, marketData.getExpiresAt(), currencyPair); } } diff --git a/xchange-dvchain/src/main/java/org/knowm/xchange/dvchain/service/DVChainTradeService.java b/xchange-dvchain/src/main/java/org/knowm/xchange/dvchain/service/DVChainTradeService.java index a07e4012087..7758a76974b 100644 --- a/xchange-dvchain/src/main/java/org/knowm/xchange/dvchain/service/DVChainTradeService.java +++ b/xchange-dvchain/src/main/java/org/knowm/xchange/dvchain/service/DVChainTradeService.java @@ -48,7 +48,7 @@ private BigDecimal getPriceForMarketOrder(List levels, MarketOrder public String placeMarketOrder(MarketOrder marketOrder) throws IOException { DVChainMarketResponse marketResponse = marketDataService.getMarketData(); DVChainMarketData marketData = - marketResponse.getMarketData().get(marketOrder.getCurrencyPair().base.getSymbol()); + marketResponse.getMarketData().get(marketOrder.getCurrencyPair().getBase().getSymbol()); List levels = marketData.getLevels(); String side = marketOrder.getType() == Order.OrderType.BID ? "Buy" : "Sell"; DVChainNewMarketOrder dvChainNewMarketOrder = @@ -56,7 +56,7 @@ public String placeMarketOrder(MarketOrder marketOrder) throws IOException { side, getPriceForMarketOrder(levels, marketOrder), marketOrder.getOriginalAmount(), - marketOrder.getCurrencyPair().base.getSymbol()); + marketOrder.getCurrencyPair().getBase().getSymbol()); return newDVChainMarketOrder(dvChainNewMarketOrder).toString(); } @@ -68,7 +68,7 @@ public String placeLimitOrder(LimitOrder limitOrder) throws IOException { side, limitOrder.getLimitPrice(), limitOrder.getOriginalAmount(), - limitOrder.getCurrencyPair().base.getSymbol()); + limitOrder.getCurrencyPair().getBase().getSymbol()); return newDVChainLimitOrder(dvChainNewLimitOrder).toString(); } diff --git a/xchange-examples/src/main/java/org/knowm/xchange/examples/bitcoinaverage/BitcoinAverageTickerDemo.java b/xchange-examples/src/main/java/org/knowm/xchange/examples/bitcoinaverage/BitcoinAverageTickerDemo.java index 7971b1b6c8d..e7add158ec6 100644 --- a/xchange-examples/src/main/java/org/knowm/xchange/examples/bitcoinaverage/BitcoinAverageTickerDemo.java +++ b/xchange-examples/src/main/java/org/knowm/xchange/examples/bitcoinaverage/BitcoinAverageTickerDemo.java @@ -31,7 +31,7 @@ private static void generic(Exchange bitcoinAverageExchange) throws IOException Ticker ticker = marketDataService.getTicker(CurrencyPair.BTC_EUR); double value = ticker.getLast().doubleValue(); - System.out.println("Last: " + ticker.getCurrencyPair().counter.getCurrencyCode() + "-" + value); + System.out.println("Last: " + ticker.getCurrencyPair().getCounter().getCurrencyCode() + "-" + value); System.out.println("Last: " + ticker.getLast().toString()); System.out.println("Volume: " + ticker.getVolume().toString()); } diff --git a/xchange-exmo/src/main/java/org/knowm/xchange/exmo/service/ExmoAdapters.java b/xchange-exmo/src/main/java/org/knowm/xchange/exmo/service/ExmoAdapters.java index 374b2978dcd..c7d5a100691 100644 --- a/xchange-exmo/src/main/java/org/knowm/xchange/exmo/service/ExmoAdapters.java +++ b/xchange-exmo/src/main/java/org/knowm/xchange/exmo/service/ExmoAdapters.java @@ -81,6 +81,6 @@ public static Ticker adaptTicker(CurrencyPair currencyPair, Map } public static String format(CurrencyPair currencyPair) { - return currencyPair.base.getCurrencyCode() + "_" + currencyPair.counter.getCurrencyCode(); + return currencyPair.getBase().getCurrencyCode() + "_" + currencyPair.getCounter().getCurrencyCode(); } } diff --git a/xchange-exmo/src/main/java/org/knowm/xchange/exmo/service/ExmoMarketDataServiceRaw.java b/xchange-exmo/src/main/java/org/knowm/xchange/exmo/service/ExmoMarketDataServiceRaw.java index 7f898fa2605..47b25788d5f 100644 --- a/xchange-exmo/src/main/java/org/knowm/xchange/exmo/service/ExmoMarketDataServiceRaw.java +++ b/xchange-exmo/src/main/java/org/knowm/xchange/exmo/service/ExmoMarketDataServiceRaw.java @@ -87,10 +87,10 @@ public void updateMetadata(ExchangeMetaData exchangeMetaData) throws IOException .feeTiers(staticMeta != null ? staticMeta.getFeeTiers() : null) .build()); - if (!currencies.containsKey(currencyPair.base)) - currencies.put(currencyPair.base, new CurrencyMetaData(8, null)); - if (!currencies.containsKey(currencyPair.counter)) - currencies.put(currencyPair.counter, new CurrencyMetaData(8, null)); + if (!currencies.containsKey(currencyPair.getBase())) + currencies.put(currencyPair.getBase(), new CurrencyMetaData(8, null)); + if (!currencies.containsKey(currencyPair.getCounter())) + currencies.put(currencyPair.getCounter(), new CurrencyMetaData(8, null)); } } @@ -101,7 +101,7 @@ public Trades trades(CurrencyPair... currencyPairs) { public Trades trades(Collection currencyPairs) { Map markets = new HashMap<>(); for (CurrencyPair currencyPair : currencyPairs) { - String market = currencyPair.base + "_" + currencyPair.counter; + String market = currencyPair.getBase() + "_" + currencyPair.getCounter(); markets.put(market, currencyPair); } String marketNames = join(markets.keySet(), ","); diff --git a/xchange-gateio/src/main/java/org/knowm/xchange/gateio/GateioUtils.java b/xchange-gateio/src/main/java/org/knowm/xchange/gateio/GateioUtils.java index 1ce3789c4bf..5b561c45abf 100644 --- a/xchange-gateio/src/main/java/org/knowm/xchange/gateio/GateioUtils.java +++ b/xchange-gateio/src/main/java/org/knowm/xchange/gateio/GateioUtils.java @@ -6,8 +6,8 @@ public class GateioUtils { public static String toPairString(CurrencyPair currencyPair) { - String baseSymbol = currencyPair.base.getCurrencyCode().toLowerCase(); - String counterSymbol = currencyPair.counter.getCurrencyCode().toLowerCase(); + String baseSymbol = currencyPair.getBase().getCurrencyCode().toLowerCase(); + String counterSymbol = currencyPair.getCounter().getCurrencyCode().toLowerCase(); String pair = baseSymbol + "_" + counterSymbol; return pair; diff --git a/xchange-gateio/src/main/java/org/knowm/xchange/gateio/service/GateioMarketDataService.java b/xchange-gateio/src/main/java/org/knowm/xchange/gateio/service/GateioMarketDataService.java index 288d512bcf5..8e86c63db2f 100644 --- a/xchange-gateio/src/main/java/org/knowm/xchange/gateio/service/GateioMarketDataService.java +++ b/xchange-gateio/src/main/java/org/knowm/xchange/gateio/service/GateioMarketDataService.java @@ -37,7 +37,7 @@ public Ticker getTicker(CurrencyPair currencyPair, Object... args) throws IOExce GateioTicker ticker = super.getBTERTicker( - currencyPair.base.getCurrencyCode(), currencyPair.counter.getCurrencyCode()); + currencyPair.getBase().getCurrencyCode(), currencyPair.getCounter().getCurrencyCode()); return GateioAdapters.adaptTicker(currencyPair, ticker); } @@ -59,7 +59,7 @@ public OrderBook getOrderBook(CurrencyPair currencyPair, Object... args) throws GateioDepth gateioDepth = super.getBTEROrderBook( - currencyPair.base.getCurrencyCode(), currencyPair.counter.getCurrencyCode()); + currencyPair.getBase().getCurrencyCode(), currencyPair.getCounter().getCurrencyCode()); return GateioAdapters.adaptOrderBook(gateioDepth, currencyPair); } @@ -84,11 +84,11 @@ public Trades getTrades(CurrencyPair currencyPair, Object... args) throws IOExce GateioTradeHistory tradeHistory = (args != null && args.length > 0 && args[0] != null && args[0] instanceof String) ? super.getBTERTradeHistorySince( - currencyPair.base.getCurrencyCode(), - currencyPair.counter.getCurrencyCode(), + currencyPair.getBase().getCurrencyCode(), + currencyPair.getCounter().getCurrencyCode(), (String) args[0]) : super.getBTERTradeHistory( - currencyPair.base.getCurrencyCode(), currencyPair.counter.getCurrencyCode()); + currencyPair.getBase().getCurrencyCode(), currencyPair.getCounter().getCurrencyCode()); return GateioAdapters.adaptTrades(tradeHistory, currencyPair); } diff --git a/xchange-gateio/src/main/java/org/knowm/xchange/gateio/service/GateioTradeServiceRaw.java b/xchange-gateio/src/main/java/org/knowm/xchange/gateio/service/GateioTradeServiceRaw.java index 8af33843210..8eec782187d 100644 --- a/xchange-gateio/src/main/java/org/knowm/xchange/gateio/service/GateioTradeServiceRaw.java +++ b/xchange-gateio/src/main/java/org/knowm/xchange/gateio/service/GateioTradeServiceRaw.java @@ -143,7 +143,7 @@ public GateioTradeHistoryReturn getGateioTradeHistory(CurrencyPair currencyPair) private String formatCurrencyPair(CurrencyPair currencyPair) { return String.format( - "%s_%s", currencyPair.base.getCurrencyCode(), currencyPair.counter.getCurrencyCode()) + "%s_%s", currencyPair.getBase().getCurrencyCode(), currencyPair.getCounter().getCurrencyCode()) .toLowerCase(); } diff --git a/xchange-gemini/src/main/java/org/knowm/xchange/gemini/v1/GeminiAdapters.java b/xchange-gemini/src/main/java/org/knowm/xchange/gemini/v1/GeminiAdapters.java index 33218c15ef9..9221221d068 100644 --- a/xchange-gemini/src/main/java/org/knowm/xchange/gemini/v1/GeminiAdapters.java +++ b/xchange-gemini/src/main/java/org/knowm/xchange/gemini/v1/GeminiAdapters.java @@ -74,7 +74,7 @@ public static CurrencyPair adaptCurrencyPair(String symbol) { public static String adaptCurrencyPair(CurrencyPair pair) { - return (pair.base.getCurrencyCode() + pair.counter.getCurrencyCode()).toLowerCase(); + return (pair.getBase().getCurrencyCode() + pair.getCounter().getCurrencyCode()).toLowerCase(); } public static OrderBook adaptOrderBook(GeminiDepth btceDepth, CurrencyPair currencyPair) { @@ -447,11 +447,11 @@ public static ExchangeMetaData adaptMetaData( if (!pairsMap.containsKey(c)) { pairsMap.put(c, null); } - if (!currenciesMap.containsKey(c.base)) { - currenciesMap.put(c.base, null); + if (!currenciesMap.containsKey(c.getBase())) { + currenciesMap.put(c.getBase(), null); } - if (!currenciesMap.containsKey(c.counter)) { - currenciesMap.put(c.counter, null); + if (!currenciesMap.containsKey(c.getCounter())) { + currenciesMap.put(c.getCounter(), null); } } diff --git a/xchange-gemini/src/main/java/org/knowm/xchange/gemini/v1/GeminiUtils.java b/xchange-gemini/src/main/java/org/knowm/xchange/gemini/v1/GeminiUtils.java index 283e6b1c44f..20904f80fcf 100644 --- a/xchange-gemini/src/main/java/org/knowm/xchange/gemini/v1/GeminiUtils.java +++ b/xchange-gemini/src/main/java/org/knowm/xchange/gemini/v1/GeminiUtils.java @@ -11,8 +11,8 @@ private GeminiUtils() {} public static String toPairString(CurrencyPair currencyPair) { - return currencyPair.base.toString().toLowerCase() - + currencyPair.counter.toString().toLowerCase(); + return currencyPair.getBase().toString().toLowerCase() + + currencyPair.getCounter().toString().toLowerCase(); } /** diff --git a/xchange-gemini/src/main/java/org/knowm/xchange/gemini/v1/dto/marketdata/GeminiTicker.java b/xchange-gemini/src/main/java/org/knowm/xchange/gemini/v1/dto/marketdata/GeminiTicker.java index e025be98301..269c5edb6ac 100644 --- a/xchange-gemini/src/main/java/org/knowm/xchange/gemini/v1/dto/marketdata/GeminiTicker.java +++ b/xchange-gemini/src/main/java/org/knowm/xchange/gemini/v1/dto/marketdata/GeminiTicker.java @@ -76,11 +76,11 @@ public long getTimestampMS() { } public BigDecimal getBaseVolume(CurrencyPair currencyPair) { - return new BigDecimal((String) valueMap.get(currencyPair.base.toString())); + return new BigDecimal((String) valueMap.get(currencyPair.getBase().toString())); } public BigDecimal getCounterVolume(CurrencyPair currencyPair) { - return new BigDecimal((String) valueMap.get(currencyPair.counter.toString())); + return new BigDecimal((String) valueMap.get(currencyPair.getCounter().toString())); } } } diff --git a/xchange-hitbtc/src/main/java/org/knowm/xchange/hitbtc/v2/HitbtcAdapters.java b/xchange-hitbtc/src/main/java/org/knowm/xchange/hitbtc/v2/HitbtcAdapters.java index 841abf8ca7a..6e6a375fab4 100644 --- a/xchange-hitbtc/src/main/java/org/knowm/xchange/hitbtc/v2/HitbtcAdapters.java +++ b/xchange-hitbtc/src/main/java/org/knowm/xchange/hitbtc/v2/HitbtcAdapters.java @@ -243,7 +243,7 @@ public static UserTrades adaptTradeHistory(List tradeHistoryRaw) id, orderId, hitbtcOwnTrade.getFee(), - pair.counter, + pair.getCounter(), clientOrderId); trades.add(trade); @@ -267,7 +267,7 @@ public static Wallet adaptWallet(String name, List hitbtcBalances public static String adaptCurrencyPair(CurrencyPair pair) { - return pair == null ? null : pair.base.getCurrencyCode() + pair.counter.getCurrencyCode(); + return pair == null ? null : pair.getBase().getCurrencyCode() + pair.getCounter().getCurrencyCode(); } public static HitbtcSide getSide(OrderType type) { diff --git a/xchange-huobi/src/main/java/org/knowm/xchange/huobi/HuobiAdapters.java b/xchange-huobi/src/main/java/org/knowm/xchange/huobi/HuobiAdapters.java index 39baf39c5e1..4dd33eb6f1f 100644 --- a/xchange-huobi/src/main/java/org/knowm/xchange/huobi/HuobiAdapters.java +++ b/xchange-huobi/src/main/java/org/knowm/xchange/huobi/HuobiAdapters.java @@ -2,7 +2,12 @@ import java.math.BigDecimal; import java.math.RoundingMode; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; import java.util.stream.Collectors; import org.knowm.xchange.currency.Currency; import org.knowm.xchange.currency.CurrencyPair; @@ -15,7 +20,11 @@ import org.knowm.xchange.dto.account.Wallet; import org.knowm.xchange.dto.marketdata.Ticker; import org.knowm.xchange.dto.marketdata.Trades.TradeSortType; -import org.knowm.xchange.dto.meta.*; +import org.knowm.xchange.dto.meta.CurrencyMetaData; +import org.knowm.xchange.dto.meta.ExchangeMetaData; +import org.knowm.xchange.dto.meta.FeeTier; +import org.knowm.xchange.dto.meta.InstrumentMetaData; +import org.knowm.xchange.dto.meta.WalletHealth; import org.knowm.xchange.dto.trade.LimitOrder; import org.knowm.xchange.dto.trade.MarketOrder; import org.knowm.xchange.dto.trade.OpenOrders; @@ -313,7 +322,7 @@ private static UserTrade adaptTrade(LimitOrder order) { .id("") // Trade id .orderId(order.getId()) // Original order id .feeAmount(feeAmount) - .feeCurrency(order.getCurrencyPair().counter) + .feeCurrency(order.getCurrencyPair().getCounter()) .build(); } diff --git a/xchange-huobi/src/main/java/org/knowm/xchange/huobi/HuobiUtils.java b/xchange-huobi/src/main/java/org/knowm/xchange/huobi/HuobiUtils.java index 930e7bdb3d8..f7938c6b1f3 100644 --- a/xchange-huobi/src/main/java/org/knowm/xchange/huobi/HuobiUtils.java +++ b/xchange-huobi/src/main/java/org/knowm/xchange/huobi/HuobiUtils.java @@ -62,7 +62,7 @@ public static void setHuobiAssetPairs(HuobiAssetPair[] huobiAssetPairs) { new CurrencyPair( translateHuobiCurrencyCode(entry.getBaseCurrency()), translateHuobiCurrencyCode(entry.getQuoteCurrency())); - if (pair.base != null && pair.counter != null) { + if (pair.getBase() != null && pair.getCounter() != null) { assetPairMap.put(entry.getKey(), pair); assetPairMapReverse.put(pair, entry.getKey()); } diff --git a/xchange-huobi/src/main/java/org/knowm/xchange/huobi/service/HuobiMarketDataServiceRaw.java b/xchange-huobi/src/main/java/org/knowm/xchange/huobi/service/HuobiMarketDataServiceRaw.java index c4f01c7eb18..f6e480aa8c3 100644 --- a/xchange-huobi/src/main/java/org/knowm/xchange/huobi/service/HuobiMarketDataServiceRaw.java +++ b/xchange-huobi/src/main/java/org/knowm/xchange/huobi/service/HuobiMarketDataServiceRaw.java @@ -58,7 +58,7 @@ public HuobiKline[] getKlines(CurrencyPair pair, KlineInterval interval, Integer throws IOException { return checkResult( huobi.getKlines( - pair.base.getSymbol().toLowerCase() + pair.counter.getSymbol().toLowerCase(), + pair.getBase().getSymbol().toLowerCase() + pair.getCounter().getSymbol().toLowerCase(), interval.code(), limit)); } diff --git a/xchange-idex/src/main/java/org/knowm/xchange/idex/IdexExchange.java b/xchange-idex/src/main/java/org/knowm/xchange/idex/IdexExchange.java index 8d64eef17dd..96fabd20a43 100644 --- a/xchange-idex/src/main/java/org/knowm/xchange/idex/IdexExchange.java +++ b/xchange-idex/src/main/java/org/knowm/xchange/idex/IdexExchange.java @@ -142,7 +142,7 @@ public static BigDecimal safeParse(String s) { } public static String getMarket(CurrencyPair currencyPair) { - return currencyPair.counter.getSymbol() + "_" + currencyPair.base.getSymbol(); + return currencyPair.getCounter().getSymbol() + "_" + currencyPair.getBase().getSymbol(); } public static CurrencyPair getCurrencyPair(String market) { diff --git a/xchange-idex/src/main/java/org/knowm/xchange/idex/IdexTradeHistoryParams.java b/xchange-idex/src/main/java/org/knowm/xchange/idex/IdexTradeHistoryParams.java index 233df851b0c..e5c80588f16 100644 --- a/xchange-idex/src/main/java/org/knowm/xchange/idex/IdexTradeHistoryParams.java +++ b/xchange-idex/src/main/java/org/knowm/xchange/idex/IdexTradeHistoryParams.java @@ -46,6 +46,6 @@ public CurrencyPair getCurrencyPair() { @Override public void setCurrencyPair(CurrencyPair currencyPair) { - setMarket(currencyPair.counter.getSymbol() + "_" + currencyPair.base.getSymbol()); + setMarket(currencyPair.getCounter().getSymbol() + "_" + currencyPair.getBase().getSymbol()); } } diff --git a/xchange-idex/src/main/java/org/knowm/xchange/idex/IdexTradeService.java b/xchange-idex/src/main/java/org/knowm/xchange/idex/IdexTradeService.java index be556d13adf..1b83ff90687 100644 --- a/xchange-idex/src/main/java/org/knowm/xchange/idex/IdexTradeService.java +++ b/xchange-idex/src/main/java/org/knowm/xchange/idex/IdexTradeService.java @@ -223,8 +223,8 @@ public String placeStopOrder(StopOrder stopOrder) { @Override public String placeLimitOrder(LimitOrder placeOrder) { OrderType type = placeOrder.getType(); - Currency baseCurrency = placeOrder.getCurrencyPair().base; - Currency counterCurrency = placeOrder.getCurrencyPair().counter; + Currency baseCurrency = placeOrder.getCurrencyPair().getBase(); + Currency counterCurrency = placeOrder.getCurrencyPair().getCounter(); BigDecimal originalAmount = placeOrder.getOriginalAmount(); BigDecimal limitPrice = placeOrder.getLimitPrice(); OrderReq orderReq = 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 0ceb3ce5ab3..05402d2df4c 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 @@ -24,7 +24,7 @@ public IndependentReserveMarketDataService( @Override public Ticker getTicker(CurrencyPair currencyPair, Object... args) throws IOException { IndependentReserveTicker t = - getIndependentReserveTicker(currencyPair.base.toString(), currencyPair.counter.toString()); + getIndependentReserveTicker(currencyPair.getBase().toString(), currencyPair.getCounter().toString()); return IndependentReserveAdapters.adaptTicker(t, currencyPair); } @@ -32,6 +32,6 @@ public Ticker getTicker(CurrencyPair currencyPair, Object... args) throws IOExce public OrderBook getOrderBook(CurrencyPair currencyPair, Object... args) throws IOException { return IndependentReserveAdapters.adaptOrderBook( getIndependentReserveOrderBook( - currencyPair.base.getCurrencyCode(), currencyPair.counter.getCurrencyCode())); + currencyPair.getBase().getCurrencyCode(), currencyPair.getCounter().getCurrencyCode())); } } 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 7d12060ea08..a501e76c451 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 @@ -45,8 +45,8 @@ public OpenOrders getOpenOrders(OpenOrdersParams params) throws IOException { if (params instanceof OpenOrdersParamCurrencyPair) { final CurrencyPair cp = ((OpenOrdersParamCurrencyPair) params).getCurrencyPair(); if (cp != null) { - primaryCurrency = cp.base.getCurrencyCode(); - secondaryCurrency = cp.counter.getCurrencyCode(); + primaryCurrency = cp.getBase().getCurrencyCode(); + secondaryCurrency = cp.getCounter().getCurrencyCode(); } } return IndependentReserveAdapters.adaptOpenOrders( 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 25d1c64bc5c..2c25049d740 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 @@ -103,8 +103,8 @@ public String independentReservePlaceLimitOrder( new IndependentReservePlaceLimitOrderRequest( apiKey, nonce, - currencyPair.base.getCurrencyCode(), - currencyPair.counter.getCurrencyCode(), + currencyPair.getBase().getCurrencyCode(), + currencyPair.getCounter().getCurrencyCode(), orderType, limitPrice.toString(), originalAmount.toString()); @@ -144,8 +144,8 @@ public String independentReservePlaceMarketOrder( new IndependentReservePlaceMarketOrderRequest( apiKey, nonce, - currencyPair.base.getCurrencyCode(), - currencyPair.counter.getCurrencyCode(), + currencyPair.getBase().getCurrencyCode(), + currencyPair.getCounter().getCurrencyCode(), orderType, originalAmount.toString()); independentReservePlaceMarketOrderRequest.setSignature( diff --git a/xchange-itbit/src/main/java/org/knowm/xchange/itbit/ItBitAdapters.java b/xchange-itbit/src/main/java/org/knowm/xchange/itbit/ItBitAdapters.java index 92271fc5cae..ca18f79ac83 100644 --- a/xchange-itbit/src/main/java/org/knowm/xchange/itbit/ItBitAdapters.java +++ b/xchange-itbit/src/main/java/org/knowm/xchange/itbit/ItBitAdapters.java @@ -323,7 +323,8 @@ public static String formatCryptoAmount(BigDecimal amount) { public static CurrencyPair adaptCurrencyPairToExchange(CurrencyPair currencyPair) { return new CurrencyPair( - adaptCurrencyToExchange(currencyPair.base), adaptCurrencyToExchange(currencyPair.counter)); + adaptCurrencyToExchange(currencyPair.getBase()), adaptCurrencyToExchange( + currencyPair.getCounter())); } public static Currency adaptCurrencyToExchange(Currency currency) { diff --git a/xchange-itbit/src/main/java/org/knowm/xchange/itbit/service/ItBitMarketDataServiceRaw.java b/xchange-itbit/src/main/java/org/knowm/xchange/itbit/service/ItBitMarketDataServiceRaw.java index 0de8745cb08..1cc94487b3b 100644 --- a/xchange-itbit/src/main/java/org/knowm/xchange/itbit/service/ItBitMarketDataServiceRaw.java +++ b/xchange-itbit/src/main/java/org/knowm/xchange/itbit/service/ItBitMarketDataServiceRaw.java @@ -25,7 +25,7 @@ public ItBitTicker getItBitTicker(CurrencyPair currencyPair) throws IOException CurrencyPair exchangePair = ItBitAdapters.adaptCurrencyPairToExchange(currencyPair); ItBitTicker ticker = itBitAuthenticated.getTicker( - exchangePair.base.getCurrencyCode(), exchangePair.counter.getCurrencyCode()); + exchangePair.getBase().getCurrencyCode(), exchangePair.getCounter().getCurrencyCode()); return ticker; } @@ -35,7 +35,7 @@ public ItBitDepth getItBitDepth(CurrencyPair currencyPair, Object... args) throw CurrencyPair exchangePair = ItBitAdapters.adaptCurrencyPairToExchange(currencyPair); ItBitDepth depth = itBitPublic.getDepth( - exchangePair.base.getCurrencyCode(), exchangePair.counter.getCurrencyCode()); + exchangePair.getBase().getCurrencyCode(), exchangePair.getCounter().getCurrencyCode()); return depth; } @@ -50,7 +50,7 @@ public ItBitTrades getItBitTrades(CurrencyPair currencyPair, Object... args) thr CurrencyPair exchangePair = ItBitAdapters.adaptCurrencyPairToExchange(currencyPair); ItBitTrades trades = itBitPublic.getTrades( - exchangePair.base.getCurrencyCode(), exchangePair.counter.getCurrencyCode(), since); + exchangePair.getBase().getCurrencyCode(), exchangePair.getCounter().getCurrencyCode(), since); return trades; } } diff --git a/xchange-itbit/src/main/java/org/knowm/xchange/itbit/service/ItBitTradeServiceRaw.java b/xchange-itbit/src/main/java/org/knowm/xchange/itbit/service/ItBitTradeServiceRaw.java index b9e05b75cf0..30c61600c06 100644 --- a/xchange-itbit/src/main/java/org/knowm/xchange/itbit/service/ItBitTradeServiceRaw.java +++ b/xchange-itbit/src/main/java/org/knowm/xchange/itbit/service/ItBitTradeServiceRaw.java @@ -31,7 +31,7 @@ public ItBitOrder[] getItBitOpenOrders(CurrencyPair currencyPair) throws IOExcep signatureCreator, new Date().getTime(), exchange.getNonceFactory(), - exchangePair.base.getCurrencyCode() + exchangePair.counter.getCurrencyCode(), + exchangePair.getBase().getCurrencyCode() + exchangePair.getCounter().getCurrencyCode(), "1", "1000", "open", @@ -90,10 +90,10 @@ public ItBitOrder placeItBitLimitOrder(LimitOrder limitOrder) throws IOException new ItBitPlaceOrderRequest( side, "limit", - exchangePair.base.getCurrencyCode(), + exchangePair.getBase().getCurrencyCode(), amount, price, - exchangePair.base.getCurrencyCode() + exchangePair.counter.getCurrencyCode(), + exchangePair.getBase().getCurrencyCode() + exchangePair.getCounter().getCurrencyCode(), (limitOrder.getOrderFlags().contains(ItBitOrderFlags.POST_ONLY)))); return postOrder; diff --git a/xchange-koineks/src/main/java/org/knowm/xchange/koineks/KoineksAdapters.java b/xchange-koineks/src/main/java/org/knowm/xchange/koineks/KoineksAdapters.java index 8a910162e13..56e04fa740b 100644 --- a/xchange-koineks/src/main/java/org/knowm/xchange/koineks/KoineksAdapters.java +++ b/xchange-koineks/src/main/java/org/knowm/xchange/koineks/KoineksAdapters.java @@ -25,17 +25,17 @@ private KoineksAdapters() {} * @return The ticker */ public static Ticker adaptTicker(KoineksTicker koineksTicker, CurrencyPair currencyPair) { - switch (currencyPair.base.getCurrencyCode()) { + switch (currencyPair.getBase().getCurrencyCode()) { case KoineksCurrency.BTC: - return getTickerOf(koineksTicker.getKoineksBTCTicker(), currencyPair.base); + return getTickerOf(koineksTicker.getKoineksBTCTicker(), currencyPair.getBase()); case KoineksCurrency.ETH: - return getTickerOf(koineksTicker.getKoineksETHTicker(), currencyPair.base); + return getTickerOf(koineksTicker.getKoineksETHTicker(), currencyPair.getBase()); case KoineksCurrency.LTC: - return getTickerOf(koineksTicker.getKoineksLTCTicker(), currencyPair.base); + return getTickerOf(koineksTicker.getKoineksLTCTicker(), currencyPair.getBase()); case KoineksCurrency.DASH: - return getTickerOf(koineksTicker.getKoineksDASHTicker(), currencyPair.base); + return getTickerOf(koineksTicker.getKoineksDASHTicker(), currencyPair.getBase()); case KoineksCurrency.DOGE: - return getTickerOf(koineksTicker.getKoineksDOGETicker(), currencyPair.base); + return getTickerOf(koineksTicker.getKoineksDOGETicker(), currencyPair.getBase()); default: throw new NotAvailableFromExchangeException(); } 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 5967272aa76..b189a0cb440 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 @@ -324,7 +324,7 @@ public static KrakenUserTrade adaptTrade(KrakenTrade krakenTrade, String tradeId tradeId, krakenTrade.getOrderTxId(), krakenTrade.getFee(), - pair.counter, + pair.getCounter(), krakenTrade.getCost()); } diff --git a/xchange-kraken/src/test/java/org/knowm/xchange/kraken/KrakenAdaptersTest.java b/xchange-kraken/src/test/java/org/knowm/xchange/kraken/KrakenAdaptersTest.java index d6606d34740..4c9f100ff22 100644 --- a/xchange-kraken/src/test/java/org/knowm/xchange/kraken/KrakenAdaptersTest.java +++ b/xchange-kraken/src/test/java/org/knowm/xchange/kraken/KrakenAdaptersTest.java @@ -102,8 +102,8 @@ public void testAdaptTicker() throws IOException { assertThat(ticker.getVwap()).isEqualTo(new BigDecimal("576.77284")); assertThat(ticker.getVolume()).isEqualByComparingTo("600.91850325"); assertThat(ticker.getOpen()).isEqualTo(new BigDecimal("568.98910")); - assertThat(ticker.getCurrencyPair().base.getCurrencyCode()) - .isEqualTo(currencyPair.base.getCurrencyCode()); + assertThat(ticker.getCurrencyPair().getBase().getCurrencyCode()) + .isEqualTo(currencyPair.getBase().getCurrencyCode()); } @Test @@ -217,8 +217,8 @@ public void testAdaptOpenOrders() throws IOException { assertThat(orders.getOpenOrders().get(0).getId()).isEqualTo("O767CW-TXHCL-FWZ5R2"); assertThat(orders.getOpenOrders().get(0).getLimitPrice()).isEqualTo("0.00001000"); assertThat(orders.getOpenOrders().get(0).getOriginalAmount()).isEqualTo("1000.00000000"); - assertThat(orders.getOpenOrders().get(0).getCurrencyPair().base).isEqualTo(Currency.XRP); - assertThat(orders.getOpenOrders().get(0).getCurrencyPair().counter).isEqualTo(Currency.BTC); + assertThat(orders.getOpenOrders().get(0).getCurrencyPair().getBase()).isEqualTo(Currency.XRP); + assertThat(orders.getOpenOrders().get(0).getCurrencyPair().getCounter()).isEqualTo(Currency.BTC); assertThat(orders.getOpenOrders().get(0).getType()).isEqualTo(OrderType.BID); } @@ -241,8 +241,8 @@ public void testAdaptOpenOrdersInTransactionCurrency() throws IOException { assertThat(orders.getOpenOrders().get(0).getId()).isEqualTo("OR6QMM-BCKM4-Q6YHIN"); assertThat(orders.getOpenOrders().get(0).getLimitPrice()).isEqualTo("500.00000"); assertThat(orders.getOpenOrders().get(0).getOriginalAmount()).isEqualTo("1.00000000"); - assertThat(orders.getOpenOrders().get(0).getCurrencyPair().base).isEqualTo(Currency.BTC); - assertThat(orders.getOpenOrders().get(0).getCurrencyPair().counter).isEqualTo(Currency.EUR); + assertThat(orders.getOpenOrders().get(0).getCurrencyPair().getBase()).isEqualTo(Currency.BTC); + assertThat(orders.getOpenOrders().get(0).getCurrencyPair().getCounter()).isEqualTo(Currency.EUR); assertThat(orders.getOpenOrders().get(0).getType()).isEqualTo(OrderType.BID); } @@ -257,8 +257,8 @@ public void testAdaptTradeHistory() throws JsonParseException, JsonMappingExcept assertThat(trade.getId()).isEqualTo("TY5BYV-WJUQF-XPYEYD-1"); assertThat(trade.getPrice()).isEqualTo("32.07562"); assertThat(trade.getOriginalAmount()).isEqualTo("0.50000000"); - assertThat(trade.getCurrencyPair().base).isEqualTo(Currency.LTC); - assertThat(trade.getCurrencyPair().counter).isEqualTo(Currency.BTC); + assertThat(trade.getCurrencyPair().getBase()).isEqualTo(Currency.LTC); + assertThat(trade.getCurrencyPair().getCounter()).isEqualTo(Currency.BTC); assertThat(trade.getType()).isEqualTo(OrderType.ASK); assertThat(trade.getFeeAmount()).isEqualTo("0.03208"); assertThat(trade.getFeeCurrency()).isEqualTo(Currency.BTC); @@ -276,8 +276,8 @@ public void testIcnTradeHistory() throws JsonParseException, JsonMappingExceptio assertThat(trade.getId()).isEqualTo("TY5BYV-WJUQF-XPYEYD"); assertThat(trade.getPrice()).isEqualTo("32.07562"); assertThat(trade.getOriginalAmount()).isEqualTo("0.50000000"); - assertThat(trade.getCurrencyPair().base).isEqualTo(Currency.getInstance("XICNX")); - assertThat(trade.getCurrencyPair().counter).isEqualTo(Currency.BTC); + assertThat(trade.getCurrencyPair().getBase()).isEqualTo(Currency.getInstance("XICNX")); + assertThat(trade.getCurrencyPair().getCounter()).isEqualTo(Currency.BTC); assertThat(trade.getType()).isEqualTo(OrderType.ASK); assertThat(trade.getFeeAmount()).isEqualTo("0.03208"); assertThat(trade.getFeeCurrency()).isEqualTo(Currency.BTC); diff --git a/xchange-kraken/src/test/java/org/knowm/xchange/kraken/KrakenUtilsTest.java b/xchange-kraken/src/test/java/org/knowm/xchange/kraken/KrakenUtilsTest.java index 383543b6f20..525673bf3bc 100644 --- a/xchange-kraken/src/test/java/org/knowm/xchange/kraken/KrakenUtilsTest.java +++ b/xchange-kraken/src/test/java/org/knowm/xchange/kraken/KrakenUtilsTest.java @@ -49,8 +49,8 @@ public void testFilterOpenOrdersByCurrencyPair() throws IOException { assertThat(orders.getOpenOrders().get(0).getId()).isEqualTo("OU5JPQ-OIDTK-QIGIGI"); assertThat(orders.getOpenOrders().get(0).getLimitPrice()).isEqualTo("1000.000"); assertThat(orders.getOpenOrders().get(0).getOriginalAmount()).isEqualTo("0.01000000"); - assertThat(orders.getOpenOrders().get(0).getCurrencyPair().base).isEqualTo(Currency.XBT); - assertThat(orders.getOpenOrders().get(0).getCurrencyPair().counter).isEqualTo(Currency.EUR); + assertThat(orders.getOpenOrders().get(0).getCurrencyPair().getBase()).isEqualTo(Currency.XBT); + assertThat(orders.getOpenOrders().get(0).getCurrencyPair().getCounter()).isEqualTo(Currency.EUR); assertThat(orders.getOpenOrders().get(0).getType()).isEqualTo(Order.OrderType.BID); } @@ -75,8 +75,8 @@ public void testAdaptTradeHistoryByCurrencyPair() assertThat(trade0.getId()).isEqualTo("TY5BYV-WJUQF-XPYEYD-2"); assertThat(trade0.getPrice()).isEqualTo("32.07562"); assertThat(trade0.getOriginalAmount()).isEqualTo("0.50000000"); - assertThat(trade0.getCurrencyPair().base).isEqualTo(Currency.BTC); - assertThat(trade0.getCurrencyPair().counter).isEqualTo(Currency.USD); + assertThat(trade0.getCurrencyPair().getBase()).isEqualTo(Currency.BTC); + assertThat(trade0.getCurrencyPair().getCounter()).isEqualTo(Currency.USD); assertThat(trade0.getType()).isEqualTo(OrderType.ASK); assertThat(trade0.getFeeAmount()).isEqualTo("0.03208"); assertThat(trade0.getFeeCurrency()).isEqualTo(Currency.USD); @@ -87,8 +87,8 @@ public void testAdaptTradeHistoryByCurrencyPair() assertThat(trade1.getId()).isEqualTo("TY5BYV-WJUQF-XPYEYD-3"); assertThat(trade1.getPrice()).isEqualTo("32.07562"); assertThat(trade1.getOriginalAmount()).isEqualTo("0.50000000"); - assertThat(trade1.getCurrencyPair().base).isEqualTo(Currency.BTC); - assertThat(trade1.getCurrencyPair().counter).isEqualTo(Currency.USD); + assertThat(trade1.getCurrencyPair().getBase()).isEqualTo(Currency.BTC); + assertThat(trade1.getCurrencyPair().getCounter()).isEqualTo(Currency.USD); assertThat(trade1.getType()).isEqualTo(OrderType.ASK); assertThat(trade1.getFeeAmount()).isEqualTo("0.03208"); assertThat(trade1.getFeeCurrency()).isEqualTo(Currency.USD); diff --git a/xchange-kucoin/src/main/java/org/knowm/xchange/kucoin/KucoinAdapters.java b/xchange-kucoin/src/main/java/org/knowm/xchange/kucoin/KucoinAdapters.java index 997408c2c86..3efddc56f2d 100644 --- a/xchange-kucoin/src/main/java/org/knowm/xchange/kucoin/KucoinAdapters.java +++ b/xchange-kucoin/src/main/java/org/knowm/xchange/kucoin/KucoinAdapters.java @@ -172,10 +172,10 @@ public static ExchangeMetaData adaptMetadata( .marketOrderEnabled(true) .build()); - if (!currencies.containsKey(pair.base)) - currencies.put(pair.base, stringCurrencyMetaDataMap.get(pair.base.getCurrencyCode())); - if (!currencies.containsKey(pair.counter)) - currencies.put(pair.counter, stringCurrencyMetaDataMap.get(pair.counter.getCurrencyCode())); + if (!currencies.containsKey(pair.getBase())) + currencies.put(pair.getBase(), stringCurrencyMetaDataMap.get(pair.getBase().getCurrencyCode())); + if (!currencies.containsKey(pair.getCounter())) + currencies.put(pair.getCounter(), stringCurrencyMetaDataMap.get(pair.getCounter().getCurrencyCode())); } return new ExchangeMetaData( @@ -351,7 +351,7 @@ public static UserTrade adaptHistOrder(HistOrdersResponse histOrder) { return UserTrade.builder() .currencyPair(currencyPair) .feeAmount(histOrder.getFee()) - .feeCurrency(currencyPair.base) + .feeCurrency(currencyPair.getBase()) .id(histOrder.getId()) .originalAmount(histOrder.getAmount()) .price(histOrder.getPrice()) diff --git a/xchange-kuna/src/main/java/org/knowm/xchange/kuna/util/KunaUtils.java b/xchange-kuna/src/main/java/org/knowm/xchange/kuna/util/KunaUtils.java index 0ca7d93d58c..c7b13081cd4 100644 --- a/xchange-kuna/src/main/java/org/knowm/xchange/kuna/util/KunaUtils.java +++ b/xchange-kuna/src/main/java/org/knowm/xchange/kuna/util/KunaUtils.java @@ -17,8 +17,8 @@ public class KunaUtils { private KunaUtils() {} public static String toPairString(CurrencyPair currencyPair) { - return currencyPair.base.getCurrencyCode().toLowerCase() - + currencyPair.counter.getCurrencyCode().toLowerCase(); + return currencyPair.getBase().getCurrencyCode().toLowerCase() + + currencyPair.getCounter().getCurrencyCode().toLowerCase(); } public static Date toDate(String dateString) { diff --git a/xchange-latoken/src/main/java/org/knowm/xchange/latoken/LatokenAdapters.java b/xchange-latoken/src/main/java/org/knowm/xchange/latoken/LatokenAdapters.java index b6392682934..8fbf8db678f 100644 --- a/xchange-latoken/src/main/java/org/knowm/xchange/latoken/LatokenAdapters.java +++ b/xchange-latoken/src/main/java/org/knowm/xchange/latoken/LatokenAdapters.java @@ -213,14 +213,14 @@ public static UserTrade adaptUserTrade(LatokenUserTrade latokenUserTrade, Curren .id(latokenUserTrade.getId()) .orderId(latokenUserTrade.getOrderId()) .feeAmount(latokenUserTrade.getFee()) - .feeCurrency(pair.counter) // Fee is always in counter currency + .feeCurrency(pair.getCounter()) // Fee is always in counter currency .build(); } // --------------- Convert to Latoken convention -------------------------- public static String toSymbol(CurrencyPair pair) { - return pair.base.getCurrencyCode() + pair.counter.getCurrencyCode(); + return pair.getBase().getCurrencyCode() + pair.getCounter().getCurrencyCode(); } public static String toSymbol(Currency currency) { 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 22fcc4f089c..51acee7d7d1 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 @@ -112,8 +112,8 @@ public static ExchangeMetaData adaptToExchangeMetaData(List .minimumAmount(product.getMinLimitQuantity()) .build()); - if (!currencies.containsKey(pair.base)) currencies.put(pair.base, null); - if (!currencies.containsKey(pair.counter)) currencies.put(pair.counter, null); + if (!currencies.containsKey(pair.getBase())) currencies.put(pair.getBase(), null); + if (!currencies.containsKey(pair.getCounter())) currencies.put(pair.getCounter(), null); } return new ExchangeMetaData(currencyPairs, currencies, null, null, true); } 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 a9fc275e94c..7056e40f4fb 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 @@ -31,7 +31,7 @@ public LivecoinTicker getTickerRaw(CurrencyPair currencyPair) throws IOException return decorateApiCall( () -> service.getTicker( - currencyPair.base.getCurrencyCode(), currencyPair.counter.getCurrencyCode())) + currencyPair.getBase().getCurrencyCode(), currencyPair.getCounter().getCurrencyCode())) .withRetry(retry("getTicker")) .call(); } @@ -45,8 +45,8 @@ public LivecoinOrderBook getOrderBookRaw( return decorateApiCall( () -> service.getOrderBook( - currencyPair.base.getCurrencyCode().toUpperCase(), - currencyPair.counter.getCurrencyCode().toUpperCase(), + currencyPair.getBase().getCurrencyCode().toUpperCase(), + currencyPair.getCounter().getCurrencyCode().toUpperCase(), depth, groupByPrice.toString())) .withRetry(retry("getOrderBook")) @@ -66,7 +66,7 @@ public List getTradesRaw(CurrencyPair currencyPair) throws IOExce return decorateApiCall( () -> service.getTrades( - currencyPair.base.getCurrencyCode(), currencyPair.counter.getCurrencyCode())) + currencyPair.getBase().getCurrencyCode(), currencyPair.getCounter().getCurrencyCode())) .withRetry(retry("getTrades")) .call(); } diff --git a/xchange-luno/src/main/java/org/knowm/xchange/luno/LunoUtil.java b/xchange-luno/src/main/java/org/knowm/xchange/luno/LunoUtil.java index 2b2372d8eb5..0dacae730b6 100644 --- a/xchange-luno/src/main/java/org/knowm/xchange/luno/LunoUtil.java +++ b/xchange-luno/src/main/java/org/knowm/xchange/luno/LunoUtil.java @@ -7,7 +7,7 @@ public class LunoUtil { public static String toLunoPair(CurrencyPair pair) { - return toLunoCurrency(pair.base) + toLunoCurrency(pair.counter); + return toLunoCurrency(pair.getBase()) + toLunoCurrency(pair.getCounter()); } public static String toLunoCurrency(Currency c) { diff --git a/xchange-luno/src/main/java/org/knowm/xchange/luno/service/LunoTradeService.java b/xchange-luno/src/main/java/org/knowm/xchange/luno/service/LunoTradeService.java index e4bfc542330..9b0f2818425 100644 --- a/xchange-luno/src/main/java/org/knowm/xchange/luno/service/LunoTradeService.java +++ b/xchange-luno/src/main/java/org/knowm/xchange/luno/service/LunoTradeService.java @@ -169,10 +169,10 @@ public UserTrades getTradeHistory(TradeHistoryParams params) final Currency feeCurrency; if (t.feeBase.compareTo(BigDecimal.ZERO) > 0) { feeAmount = t.feeBase; - feeCurrency = pair.base; + feeCurrency = pair.getBase(); } else { feeAmount = t.feeCounter; - feeCurrency = pair.counter; + feeCurrency = pair.getCounter(); } trades.add( UserTrade.builder() diff --git a/xchange-mercadobitcoin/src/main/java/org/knowm/xchange/mercadobitcoin/MercadoBitcoinAdapters.java b/xchange-mercadobitcoin/src/main/java/org/knowm/xchange/mercadobitcoin/MercadoBitcoinAdapters.java index f9c13d0098e..d47be746bb6 100644 --- a/xchange-mercadobitcoin/src/main/java/org/knowm/xchange/mercadobitcoin/MercadoBitcoinAdapters.java +++ b/xchange-mercadobitcoin/src/main/java/org/knowm/xchange/mercadobitcoin/MercadoBitcoinAdapters.java @@ -202,7 +202,7 @@ private static OrderType toOrderType(String mercadoType) { } public static String adaptCurrencyPair(CurrencyPair pair) { - return (pair.base.getCurrencyCode() + "_" + pair.counter.getCurrencyCode()).toLowerCase(); + return (pair.getBase().getCurrencyCode() + "_" + pair.getCounter().getCurrencyCode()).toLowerCase(); } public static UserTrades toUserTrades( diff --git a/xchange-mercadobitcoin/src/main/java/org/knowm/xchange/mercadobitcoin/service/MercadoBitcoinMarketDataServiceRaw.java b/xchange-mercadobitcoin/src/main/java/org/knowm/xchange/mercadobitcoin/service/MercadoBitcoinMarketDataServiceRaw.java index fc304880c6d..dbe556b9cb3 100644 --- a/xchange-mercadobitcoin/src/main/java/org/knowm/xchange/mercadobitcoin/service/MercadoBitcoinMarketDataServiceRaw.java +++ b/xchange-mercadobitcoin/src/main/java/org/knowm/xchange/mercadobitcoin/service/MercadoBitcoinMarketDataServiceRaw.java @@ -36,13 +36,13 @@ public MercadoBitcoinOrderBook getMercadoBitcoinOrderBook(CurrencyPair currencyP throws IOException { MercadoBitcoinUtils.verifyCurrencyPairAvailability(currencyPair); - return mercadoBitcoin.getOrderBook(currencyPair.base.getSymbol()); + return mercadoBitcoin.getOrderBook(currencyPair.getBase().getSymbol()); } public MercadoBitcoinTicker getMercadoBitcoinTicker(CurrencyPair currencyPair) throws IOException { MercadoBitcoinUtils.verifyCurrencyPairAvailability(currencyPair); - return mercadoBitcoin.getTicker(currencyPair.base.getSymbol()); + return mercadoBitcoin.getTicker(currencyPair.getBase().getSymbol()); } public MercadoBitcoinTransaction[] getMercadoBitcoinTransactions( @@ -55,12 +55,12 @@ public MercadoBitcoinTransaction[] getMercadoBitcoinTransactions( if (args.length == 0) { // default values: offset=0, limit=100 - transactions = mercadoBitcoin.getTransactions(currencyPair.base.getSymbol()); + transactions = mercadoBitcoin.getTransactions(currencyPair.getBase().getSymbol()); } else if (args.length == 1) { BigDecimal time = new BigDecimal((Long) args[0]); transactions = - mercadoBitcoin.getTransactions(currencyPair.base.getSymbol(), time.longValue() / 1000L); + mercadoBitcoin.getTransactions(currencyPair.getBase().getSymbol(), time.longValue() / 1000L); } else if (args.length == 2) { BigDecimal timeStart = new BigDecimal((Long) args[0]); @@ -68,7 +68,7 @@ public MercadoBitcoinTransaction[] getMercadoBitcoinTransactions( transactions = mercadoBitcoin.getTransactions( - currencyPair.base.getSymbol(), + currencyPair.getBase().getSymbol(), timeStart.longValue() / 1000L, timeEnd.longValue() / 1000L); } else { 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 448bc043db2..3011d23b5ae 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 @@ -379,7 +379,7 @@ public static UserTrades adaptTradeHistory( .id(tradeId) .orderId(orderId) .feeAmount(feeAmount) - .feeCurrency(Currency.getInstance(currencyPair.counter.getCurrencyCode())) + .feeCurrency(Currency.getInstance(currencyPair.getCounter().getCurrencyCode())) .build(); trades.add(trade); diff --git a/xchange-okcoin/src/main/java/org/knowm/xchange/okcoin/OkexAdaptersV3.java b/xchange-okcoin/src/main/java/org/knowm/xchange/okcoin/OkexAdaptersV3.java index 1548838a326..7f8c5d73d96 100644 --- a/xchange-okcoin/src/main/java/org/knowm/xchange/okcoin/OkexAdaptersV3.java +++ b/xchange-okcoin/src/main/java/org/knowm/xchange/okcoin/OkexAdaptersV3.java @@ -54,13 +54,13 @@ public static Balance convert(String currency, FuturesAccount acc) { public static Balance convert(SwapAccountInfo rec) { return new Balance.Builder() - .currency(toPair(rec.getInstrumentId()).base) + .currency(toPair(rec.getInstrumentId()).getBase()) .total(rec.getEquity()) .build(); } public static String toSpotInstrument(CurrencyPair pair) { - return pair == null ? null : pair.base.getCurrencyCode() + "-" + pair.counter.getCurrencyCode(); + return pair == null ? null : pair.getBase().getCurrencyCode() + "-" + pair.getCounter().getCurrencyCode(); } /** diff --git a/xchange-okcoin/src/main/java/org/knowm/xchange/okcoin/v3/service/OkexTradeService.java b/xchange-okcoin/src/main/java/org/knowm/xchange/okcoin/v3/service/OkexTradeService.java index 04a9051e5d9..914caa5c454 100644 --- a/xchange-okcoin/src/main/java/org/knowm/xchange/okcoin/v3/service/OkexTradeService.java +++ b/xchange-okcoin/src/main/java/org/knowm/xchange/okcoin/v3/service/OkexTradeService.java @@ -206,12 +206,12 @@ public UserTrades getTradeHistory(TradeHistoryParams params) throws IOException if (o.getSide() == Side.buy) { // the same side as the order! amount = t.getSize(); - feeCurrency = p.base; + feeCurrency = p.getBase(); } else { // order and trade (transaction) have different sides! amount = stripTrailingZeros( t.getSize().divide(t.getPrice(), 16, RoundingMode.HALF_UP)); - feeCurrency = p.counter; + feeCurrency = p.getCounter(); } UserTrade ut = @@ -286,12 +286,12 @@ public UserTrades getMarginTradeHistory(TradeHistoryParams params) throws IOExce if (o.getSide() == Side.buy) { // the same side as the order! amount = t.getSize(); - feeCurrency = p.base; + feeCurrency = p.getBase(); } else { // order and trade (transaction) have different sides! amount = stripTrailingZeros( t.getSize().divide(t.getPrice(), 16, RoundingMode.HALF_UP)); - feeCurrency = p.counter; + feeCurrency = p.getCounter(); } UserTrade ut = diff --git a/xchange-openexchangerates/src/main/java/org/knowm/xchange/oer/service/OERMarketDataService.java b/xchange-openexchangerates/src/main/java/org/knowm/xchange/oer/service/OERMarketDataService.java index 82d7aa60b38..e97917fcb20 100644 --- a/xchange-openexchangerates/src/main/java/org/knowm/xchange/oer/service/OERMarketDataService.java +++ b/xchange-openexchangerates/src/main/java/org/knowm/xchange/oer/service/OERMarketDataService.java @@ -37,7 +37,7 @@ public Ticker getTicker(CurrencyPair currencyPair, Object... args) throws IOExce // Use reflection to get at data. Method method = null; try { - method = OERRates.class.getMethod("get" + currencyPair.counter.getCurrencyCode(), null); + method = OERRates.class.getMethod("get" + currencyPair.getCounter().getCurrencyCode(), null); } catch (SecurityException | NoSuchMethodException e) { throw new ExchangeException("Problem getting exchange rate!", e); } diff --git a/xchange-openexchangerates/src/main/java/org/knowm/xchange/oer/service/OERMarketDataServiceRaw.java b/xchange-openexchangerates/src/main/java/org/knowm/xchange/oer/service/OERMarketDataServiceRaw.java index 27d51ed6d18..791f308d034 100644 --- a/xchange-openexchangerates/src/main/java/org/knowm/xchange/oer/service/OERMarketDataServiceRaw.java +++ b/xchange-openexchangerates/src/main/java/org/knowm/xchange/oer/service/OERMarketDataServiceRaw.java @@ -35,8 +35,8 @@ public OERRates getOERTicker(CurrencyPair pair) throws IOException { OERTickers oERTickers = openExchangeRates.getTickers( exchange.getExchangeSpecification().getApiKey(), - pair.base.toString(), - pair.counter.toString()); + pair.getBase().toString(), + pair.getCounter().toString()); if (oERTickers == null) { throw new ExchangeException("Null response returned from Open Exchange Rates!"); } diff --git a/xchange-openexchangerates/src/test/java/org/knowm/xchange/oer/service/OERMarketDataServiceTest.java b/xchange-openexchangerates/src/test/java/org/knowm/xchange/oer/service/OERMarketDataServiceTest.java index 9c4b11a04d7..1cfcffd1a84 100644 --- a/xchange-openexchangerates/src/test/java/org/knowm/xchange/oer/service/OERMarketDataServiceTest.java +++ b/xchange-openexchangerates/src/test/java/org/knowm/xchange/oer/service/OERMarketDataServiceTest.java @@ -23,7 +23,7 @@ public void testTakesCorrectValueFromOERRates() throws IOException { new OERMarketDataService(exchange) { @Override public OERRates getOERTicker(CurrencyPair pair) { - assertThat(pair.base).isEqualTo(Currency.USD); + assertThat(pair.getBase()).isEqualTo(Currency.USD); OERRates r = new OERRates(); r.setAUD(1.23d); return r; diff --git a/xchange-poloniex/src/main/java/org/knowm/xchange/poloniex/PoloniexAdapters.java b/xchange-poloniex/src/main/java/org/knowm/xchange/poloniex/PoloniexAdapters.java index 9e7a9b8b49e..c4a7451c638 100644 --- a/xchange-poloniex/src/main/java/org/knowm/xchange/poloniex/PoloniexAdapters.java +++ b/xchange-poloniex/src/main/java/org/knowm/xchange/poloniex/PoloniexAdapters.java @@ -20,7 +20,12 @@ import org.knowm.xchange.dto.account.Balance; import org.knowm.xchange.dto.account.FundingRecord; import org.knowm.xchange.dto.account.FundingRecord.Type; -import org.knowm.xchange.dto.marketdata.*; +import org.knowm.xchange.dto.marketdata.CandleStick; +import org.knowm.xchange.dto.marketdata.CandleStickData; +import org.knowm.xchange.dto.marketdata.OrderBook; +import org.knowm.xchange.dto.marketdata.Ticker; +import org.knowm.xchange.dto.marketdata.Trade; +import org.knowm.xchange.dto.marketdata.Trades; import org.knowm.xchange.dto.marketdata.Trades.TradeSortType; import org.knowm.xchange.dto.meta.CurrencyMetaData; import org.knowm.xchange.dto.meta.ExchangeMetaData; @@ -34,7 +39,12 @@ import org.knowm.xchange.poloniex.dto.LoanInfo; import org.knowm.xchange.poloniex.dto.account.PoloniexBalance; import org.knowm.xchange.poloniex.dto.account.PoloniexLoan; -import org.knowm.xchange.poloniex.dto.marketdata.*; +import org.knowm.xchange.poloniex.dto.marketdata.PoloniexChartData; +import org.knowm.xchange.poloniex.dto.marketdata.PoloniexCurrencyInfo; +import org.knowm.xchange.poloniex.dto.marketdata.PoloniexDepth; +import org.knowm.xchange.poloniex.dto.marketdata.PoloniexMarketData; +import org.knowm.xchange.poloniex.dto.marketdata.PoloniexPublicTrade; +import org.knowm.xchange.poloniex.dto.marketdata.PoloniexTicker; import org.knowm.xchange.poloniex.dto.trade.PoloniexAdjustment; import org.knowm.xchange.poloniex.dto.trade.PoloniexDeposit; import org.knowm.xchange.poloniex.dto.trade.PoloniexDepositsWithdrawalsResponse; @@ -218,10 +228,10 @@ public static UserTrade adaptPoloniexUserTrade( if (orderType == OrderType.ASK) { feeAmount = amount.multiply(price).multiply(userTrade.getFee()).setScale(8, RoundingMode.DOWN); - feeCurrencyCode = currencyPair.counter.getCurrencyCode(); + feeCurrencyCode = currencyPair.getCounter().getCurrencyCode(); } else { feeAmount = amount.multiply(userTrade.getFee()).setScale(8, RoundingMode.DOWN); - feeCurrencyCode = currencyPair.base.getCurrencyCode(); + feeCurrencyCode = currencyPair.getBase().getCurrencyCode(); } return UserTrade.builder() diff --git a/xchange-poloniex/src/main/java/org/knowm/xchange/poloniex/PoloniexUtils.java b/xchange-poloniex/src/main/java/org/knowm/xchange/poloniex/PoloniexUtils.java index 734fe11d5d5..085e4f6cea2 100644 --- a/xchange-poloniex/src/main/java/org/knowm/xchange/poloniex/PoloniexUtils.java +++ b/xchange-poloniex/src/main/java/org/knowm/xchange/poloniex/PoloniexUtils.java @@ -18,9 +18,9 @@ public class PoloniexUtils { public static String toPairString(CurrencyPair currencyPair) { - return currencyPair.counter.getCurrencyCode().toUpperCase() + return currencyPair.getCounter().getCurrencyCode().toUpperCase() + "_" - + currencyPair.base.getCurrencyCode().toUpperCase(); + + currencyPair.getBase().getCurrencyCode().toUpperCase(); } public static CurrencyPair toCurrencyPair(String pair) { diff --git a/xchange-quoine/src/main/java/org/knowm/xchange/quoine/QuoineAdapters.java b/xchange-quoine/src/main/java/org/knowm/xchange/quoine/QuoineAdapters.java index dbf03ad14f3..d0d688919cf 100644 --- a/xchange-quoine/src/main/java/org/knowm/xchange/quoine/QuoineAdapters.java +++ b/xchange-quoine/src/main/java/org/knowm/xchange/quoine/QuoineAdapters.java @@ -207,7 +207,7 @@ public static List adapt(List executions, CurrencyPa } public static String toPairString(CurrencyPair currencyPair) { - return currencyPair.base.getCurrencyCode() + currencyPair.counter.getCurrencyCode(); + return currencyPair.getBase().getCurrencyCode() + currencyPair.getCounter().getCurrencyCode(); } public static FundingRecord adaptFunding( diff --git a/xchange-quoine/src/main/java/org/knowm/xchange/quoine/service/QuoineMarketDataService.java b/xchange-quoine/src/main/java/org/knowm/xchange/quoine/service/QuoineMarketDataService.java index cabb27798b9..21db3de14fb 100644 --- a/xchange-quoine/src/main/java/org/knowm/xchange/quoine/service/QuoineMarketDataService.java +++ b/xchange-quoine/src/main/java/org/knowm/xchange/quoine/service/QuoineMarketDataService.java @@ -52,10 +52,10 @@ public List getTickers(Params params) throws IOException { pairs.getCurrencyPairs().stream() .anyMatch( pair -> - product.getBaseCurrency().equals(pair.base.getCurrencyCode()) + product.getBaseCurrency().equals(pair.getBase().getCurrencyCode()) && product .getQuotedCurrency() - .equals(pair.counter.getCurrencyCode()))) + .equals(pair.getCounter().getCurrencyCode()))) .map(product -> QuoineAdapters.adaptTicker(product, buildCurrencyPair(product))) .collect(Collectors.toList()); } diff --git a/xchange-quoine/src/main/java/org/knowm/xchange/quoine/service/QuoineTradeServiceRaw.java b/xchange-quoine/src/main/java/org/knowm/xchange/quoine/service/QuoineTradeServiceRaw.java index e5d2c55ca92..56d53b10a84 100644 --- a/xchange-quoine/src/main/java/org/knowm/xchange/quoine/service/QuoineTradeServiceRaw.java +++ b/xchange-quoine/src/main/java/org/knowm/xchange/quoine/service/QuoineTradeServiceRaw.java @@ -63,7 +63,7 @@ public QuoineOrderResponse placeLimitOrder( originalAmount, price, leverageLevel, - currencyPair.counter.getCurrencyCode()) + currencyPair.getCounter().getCurrencyCode()) : new QuoineNewOrderRequest("limit", productId, type, originalAmount, price); try { return quoine.placeOrder( @@ -90,7 +90,7 @@ public QuoineOrderResponse placeMarketOrder( originalAmount, null, leverageLevel, - currencyPair.counter.getCurrencyCode()) + currencyPair.getCounter().getCurrencyCode()) : new QuoineNewOrderRequest("market", productId, type, originalAmount, null); try { return quoine.placeOrder( diff --git a/xchange-ripple/src/main/java/org/knowm/xchange/ripple/RippleAdapters.java b/xchange-ripple/src/main/java/org/knowm/xchange/ripple/RippleAdapters.java index e5c8f437c5e..ef53b3367b8 100644 --- a/xchange-ripple/src/main/java/org/knowm/xchange/ripple/RippleAdapters.java +++ b/xchange-ripple/src/main/java/org/knowm/xchange/ripple/RippleAdapters.java @@ -99,7 +99,7 @@ public static OrderBook adaptOrderBook( final String[] baseSplit = splitPair[0].split("\\+"); final String baseSymbol = baseSplit[0]; - if (baseSymbol.equals(currencyPair.base.getCurrencyCode()) == false) { + if (baseSymbol.equals(currencyPair.getBase().getCurrencyCode()) == false) { throw new IllegalStateException( String.format( "base symbol in Ripple order book %s does not match requested base %s", @@ -120,7 +120,7 @@ public static OrderBook adaptOrderBook( final String[] counterSplit = splitPair[1].split("\\+"); final String counterSymbol = counterSplit[0]; - if (counterSymbol.equals(currencyPair.counter.getCurrencyCode()) == false) { + if (counterSymbol.equals(currencyPair.getCounter().getCurrencyCode()) == false) { throw new IllegalStateException( String.format( "counter symbol in Ripple order book %s does not match requested base %s", @@ -317,12 +317,12 @@ public static UserTrade adaptTrade( && (((TradeHistoryParamCurrencyPair) params).getCurrencyPair() != null)) { // Searching for a specific currency pair - use this direction final CurrencyPair pair = ((TradeHistoryParamCurrencyPair) params).getCurrencyPair(); - if (pair.base.getCurrencyCode().equals(balanceChanges.get(0).getCurrency()) - && pair.counter.getCurrencyCode().equals(balanceChanges.get(1).getCurrency())) { + if (pair.getBase().getCurrencyCode().equals(balanceChanges.get(0).getCurrency()) + && pair.getCounter().getCurrencyCode().equals(balanceChanges.get(1).getCurrency())) { base = balanceChanges.get(0); counter = balanceChanges.get(1); - } else if (pair.base.getCurrencyCode().equals(balanceChanges.get(1).getCurrency()) - && pair.counter.getCurrencyCode().equals(balanceChanges.get(0).getCurrency())) { + } else if (pair.getBase().getCurrencyCode().equals(balanceChanges.get(1).getCurrency()) + && pair.getCounter().getCurrencyCode().equals(balanceChanges.get(0).getCurrency())) { base = balanceChanges.get(1); counter = balanceChanges.get(0); } else { diff --git a/xchange-ripple/src/main/java/org/knowm/xchange/ripple/dto/trade/RippleUserTrade.java b/xchange-ripple/src/main/java/org/knowm/xchange/ripple/dto/trade/RippleUserTrade.java index 6755b77adb9..0b25b08b44a 100644 --- a/xchange-ripple/src/main/java/org/knowm/xchange/ripple/dto/trade/RippleUserTrade.java +++ b/xchange-ripple/src/main/java/org/knowm/xchange/ripple/dto/trade/RippleUserTrade.java @@ -60,7 +60,7 @@ public BigDecimal getBaseTransferFee() { } public Currency getBaseTransferFeeCurrency() { - return getCurrencyPair().base; + return getCurrencyPair().getBase(); } public BigDecimal getCounterTransferFee() { @@ -68,7 +68,7 @@ public BigDecimal getCounterTransferFee() { } public Currency getCounterTransferFeeCurrency() { - return getCurrencyPair().counter; + return getCurrencyPair().getCounter(); } public static class Builder extends UserTrade.Builder { diff --git a/xchange-ripple/src/main/java/org/knowm/xchange/ripple/service/RippleMarketDataServiceRaw.java b/xchange-ripple/src/main/java/org/knowm/xchange/ripple/service/RippleMarketDataServiceRaw.java index 773e34521c5..bb0056d9ee5 100644 --- a/xchange-ripple/src/main/java/org/knowm/xchange/ripple/service/RippleMarketDataServiceRaw.java +++ b/xchange-ripple/src/main/java/org/knowm/xchange/ripple/service/RippleMarketDataServiceRaw.java @@ -21,24 +21,24 @@ public RippleOrderBook getRippleOrderBook( } final String base; - if (pair.base.equals(Currency.XRP)) { - base = pair.base.getCurrencyCode(); // XRP is the native currency - no counterparty + if (pair.getBase().equals(Currency.XRP)) { + base = pair.getBase().getCurrencyCode(); // XRP is the native currency - no counterparty } else if (params.getBaseCounterparty().isEmpty()) { throw new ExchangeException( - "base counterparty must be populated for currency: " + pair.base.getCurrencyCode()); + "base counterparty must be populated for currency: " + pair.getBase().getCurrencyCode()); } else { - base = String.format("%s+%s", pair.base.getCurrencyCode(), params.getBaseCounterparty()); + base = String.format("%s+%s", pair.getBase().getCurrencyCode(), params.getBaseCounterparty()); } final String counter; - if (pair.counter.equals(Currency.XRP)) { - counter = pair.counter.getCurrencyCode(); // XRP is the native currency - no counterparty + if (pair.getCounter().equals(Currency.XRP)) { + counter = pair.getCounter().getCurrencyCode(); // XRP is the native currency - no counterparty } else if (params.getCounterCounterparty().isEmpty()) { throw new ExchangeException( - "counter counterparty must be populated for currency: " + pair.counter.getCurrencyCode()); + "counter counterparty must be populated for currency: " + pair.getCounter().getCurrencyCode()); } else { counter = - String.format("%s+%s", pair.counter.getCurrencyCode(), params.getCounterCounterparty()); + String.format("%s+%s", pair.getCounter().getCurrencyCode(), params.getCounterCounterparty()); } return ripplePublic.getOrderBook(params.getAddress(), base, counter, params.getLimit()); 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 50635c6aba0..a02419495a3 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 @@ -104,7 +104,7 @@ public String placeOrder(final RippleLimitOrder order, final boolean validate) counterAmount = request.getTakerPays(); } - baseAmount.setCurrency(order.getCurrencyPair().base.getCurrencyCode()); + baseAmount.setCurrency(order.getCurrencyPair().getBase().getCurrencyCode()); baseAmount.setValue(order.getOriginalAmount()); if (baseAmount.getCurrency().equals("XRP") == false) { // not XRP - need a counterparty for this currency @@ -117,7 +117,7 @@ public String placeOrder(final RippleLimitOrder order, final boolean validate) baseAmount.setCounterparty(counterparty); } - counterAmount.setCurrency(order.getCurrencyPair().counter.getCurrencyCode()); + counterAmount.setCurrency(order.getCurrencyPair().getCounter().getCurrencyCode()); counterAmount.setValue(order.getOriginalAmount().multiply(order.getLimitPrice())); if (counterAmount.getCurrency().equals("XRP") == false) { // not XRP - need a counterparty for this currency @@ -239,8 +239,8 @@ public List getTradesForAccount( if (params instanceof TradeHistoryParamCurrencyPair) { final CurrencyPair pair = ((TradeHistoryParamCurrencyPair) params).getCurrencyPair(); if (pair != null) { - currencyFilter.add(pair.base.getCurrencyCode()); - currencyFilter.add(pair.counter.getCurrencyCode()); + currencyFilter.add(pair.getBase().getCurrencyCode()); + currencyFilter.add(pair.getCounter().getCurrencyCode()); } } @@ -383,7 +383,7 @@ public BigDecimal getTransactionFee() { public BigDecimal getExpectedBaseTransferFee(final RippleLimitOrder order) throws IOException { final ITransferFeeSource transferFeeSource = (ITransferFeeSource) exchange.getAccountService(); final String counterparty = order.getBaseCounterparty(); - final String currency = order.getCurrencyPair().base.getCurrencyCode(); + final String currency = order.getCurrencyPair().getBase().getCurrencyCode(); final BigDecimal quantity = order.getOriginalAmount(); final OrderType type = order.getType(); return getExpectedTransferFee(transferFeeSource, counterparty, currency, quantity, type); @@ -395,7 +395,7 @@ public BigDecimal getExpectedBaseTransferFee(final RippleLimitOrder order) throw public BigDecimal getExpectedCounterTransferFee(final RippleLimitOrder order) throws IOException { final ITransferFeeSource transferFeeSource = (ITransferFeeSource) exchange.getAccountService(); final String counterparty = order.getCounterCounterparty(); - final String currency = order.getCurrencyPair().counter.getCurrencyCode(); + final String currency = order.getCurrencyPair().getCounter().getCurrencyCode(); final BigDecimal quantity = order.getOriginalAmount().multiply(order.getLimitPrice()); final OrderType type; if (order.getType() == OrderType.BID) { diff --git a/xchange-ripple/src/test/java/org/knowm/xchange/ripple/RippleAdaptersTest.java b/xchange-ripple/src/test/java/org/knowm/xchange/ripple/RippleAdaptersTest.java index 3281f3637c2..d83abe9f0f0 100644 --- a/xchange-ripple/src/test/java/org/knowm/xchange/ripple/RippleAdaptersTest.java +++ b/xchange-ripple/src/test/java/org/knowm/xchange/ripple/RippleAdaptersTest.java @@ -212,13 +212,14 @@ public void adaptTrade_BuyXRP_SellBTC() assertThat(ripple.getBaseCounterparty()).isEmpty(); assertThat(ripple.getBaseTransferFee()).isZero(); assertThat(ripple.getBaseTransferFeeCurrency()).isEqualTo(Currency.XRP); - assertThat(ripple.getBaseTransferFeeCurrency()).isEqualTo(trade.getCurrencyPair().base); + assertThat(ripple.getBaseTransferFeeCurrency()).isEqualTo(trade.getCurrencyPair().getBase()); assertThat(ripple.getCounterCounterparty()).isEqualTo("rMwjYedjc7qqtKYVLiAccJSmCwih4LnE2q"); // Transfer fee = 0.000029309526038 * 0.002 assertThat(ripple.getCounterTransferFee()).isEqualTo("0.000000058619052076"); assertThat(ripple.getCounterTransferFeeCurrency()).isEqualTo(Currency.BTC); - assertThat(ripple.getCounterTransferFeeCurrency()).isEqualTo(trade.getCurrencyPair().counter); + assertThat(ripple.getCounterTransferFeeCurrency()).isEqualTo( + trade.getCurrencyPair().getCounter()); } @Test @@ -262,12 +263,13 @@ public void adaptTrade_SellBTC_BuyXRP() // Transfer fee = 0.000029309526038 * 0.002 assertThat(ripple.getBaseTransferFee()).isEqualTo("0.000000058619052076"); assertThat(ripple.getBaseTransferFeeCurrency()).isEqualTo(Currency.BTC); - assertThat(ripple.getBaseTransferFeeCurrency()).isEqualTo(trade.getCurrencyPair().base); + assertThat(ripple.getBaseTransferFeeCurrency()).isEqualTo(trade.getCurrencyPair().getBase()); assertThat(ripple.getCounterCounterparty()).isEmpty(); assertThat(ripple.getCounterTransferFee()).isZero(); assertThat(ripple.getCounterTransferFeeCurrency()).isEqualTo(Currency.XRP); - assertThat(ripple.getCounterTransferFeeCurrency()).isEqualTo(trade.getCurrencyPair().counter); + assertThat(ripple.getCounterTransferFeeCurrency()).isEqualTo( + trade.getCurrencyPair().getCounter()); } @Test @@ -309,12 +311,13 @@ public void adaptTrade_SellXRP_BuyBTC() assertThat(ripple.getBaseCounterparty()).isEmpty(); assertThat(ripple.getBaseTransferFee()).isZero(); assertThat(ripple.getBaseTransferFeeCurrency()).isEqualTo(Currency.XRP); - assertThat(ripple.getBaseTransferFeeCurrency()).isEqualTo(trade.getCurrencyPair().base); + assertThat(ripple.getBaseTransferFeeCurrency()).isEqualTo(trade.getCurrencyPair().getBase()); assertThat(ripple.getCounterCounterparty()).isEqualTo("rMwjYedjc7qqtKYVLiAccJSmCwih4LnE2q"); assertThat(ripple.getCounterTransferFee()).isZero(); assertThat(ripple.getCounterTransferFeeCurrency()).isEqualTo(Currency.BTC); - assertThat(ripple.getCounterTransferFeeCurrency()).isEqualTo(trade.getCurrencyPair().counter); + assertThat(ripple.getCounterTransferFeeCurrency()).isEqualTo( + trade.getCurrencyPair().getCounter()); // make sure that if the IRippleTradeTransaction is adapted again it returns the same values final UserTrade trade2 = RippleAdapters.adaptTrade(response, params, this, roundingScale); @@ -369,12 +372,13 @@ public void adaptTrade_BuyBTC_SellXRP() assertThat(ripple.getBaseCounterparty()).isEqualTo("rMwjYedjc7qqtKYVLiAccJSmCwih4LnE2q"); assertThat(ripple.getBaseTransferFee()).isZero(); assertThat(ripple.getBaseTransferFeeCurrency()).isEqualTo(Currency.BTC); - assertThat(ripple.getBaseTransferFeeCurrency()).isEqualTo(trade.getCurrencyPair().base); + assertThat(ripple.getBaseTransferFeeCurrency()).isEqualTo(trade.getCurrencyPair().getBase()); assertThat(ripple.getCounterCounterparty()).isEmpty(); assertThat(ripple.getCounterTransferFee()).isZero(); assertThat(ripple.getCounterTransferFeeCurrency()).isEqualTo(Currency.XRP); - assertThat(ripple.getCounterTransferFeeCurrency()).isEqualTo(trade.getCurrencyPair().counter); + assertThat(ripple.getCounterTransferFeeCurrency()).isEqualTo( + trade.getCurrencyPair().getCounter()); } @Test @@ -394,8 +398,8 @@ public void adaptTrade_BuyBTC_SellBTC() final TradeHistoryParams params = new TradeHistoryParams() {}; final UserTrade trade = RippleAdapters.adaptTrade(response, params, this, roundingScale); - assertThat(trade.getCurrencyPair().base).isEqualTo(Currency.BTC); - assertThat(trade.getCurrencyPair().counter).isEqualTo(Currency.BTC); + assertThat(trade.getCurrencyPair().getBase()).isEqualTo(Currency.BTC); + assertThat(trade.getCurrencyPair().getCounter()).isEqualTo(Currency.BTC); assertThat(trade.getFeeAmount()).isEqualTo("0.012"); assertThat(trade.getFeeCurrency()).isEqualTo(Currency.XRP); assertThat(trade.getId()) @@ -417,13 +421,14 @@ public void adaptTrade_BuyBTC_SellBTC() assertThat(ripple.getBaseCounterparty()).isEqualTo("rMwjYedjc7qqtKYVLiAccJSmCwih4LnE2q"); assertThat(ripple.getBaseTransferFee()).isZero(); assertThat(ripple.getBaseTransferFeeCurrency()).isEqualTo(Currency.BTC); - assertThat(ripple.getBaseTransferFeeCurrency()).isEqualTo(trade.getCurrencyPair().base); + assertThat(ripple.getBaseTransferFeeCurrency()).isEqualTo(trade.getCurrencyPair().getBase()); assertThat(ripple.getCounterCounterparty()).isEqualTo("rvYAfWj5gh67oV6fW32ZzP3Aw4Eubs59B"); // Transfer fee = 0.501 * 0.002 assertThat(ripple.getCounterTransferFee()).isEqualTo("0.001002"); assertThat(ripple.getCounterTransferFeeCurrency()).isEqualTo(Currency.BTC); - assertThat(ripple.getCounterTransferFeeCurrency()).isEqualTo(trade.getCurrencyPair().counter); + assertThat(ripple.getCounterTransferFeeCurrency()).isEqualTo( + trade.getCurrencyPair().getCounter()); } @Test @@ -443,8 +448,8 @@ public void adaptTrade_PaymentPassthrough() final TradeHistoryParams params = new TradeHistoryParams() {}; final UserTrade trade = RippleAdapters.adaptTrade(response, params, this, roundingScale); - assertThat(trade.getCurrencyPair().base).isEqualTo(Currency.XRP); - assertThat(trade.getCurrencyPair().counter).isEqualTo(Currency.BTC); + assertThat(trade.getCurrencyPair().getBase()).isEqualTo(Currency.XRP); + assertThat(trade.getCurrencyPair().getCounter()).isEqualTo(Currency.BTC); assertThat(trade.getFeeAmount()).isEqualTo("0.012"); assertThat(trade.getFeeCurrency()).isEqualTo(Currency.XRP); assertThat(trade.getId()) @@ -466,12 +471,13 @@ public void adaptTrade_PaymentPassthrough() assertThat(ripple.getBaseCounterparty()).isEqualTo(""); assertThat(ripple.getBaseTransferFee()).isZero(); assertThat(ripple.getBaseTransferFeeCurrency()).isEqualTo(Currency.XRP); - assertThat(ripple.getBaseTransferFeeCurrency()).isEqualTo(trade.getCurrencyPair().base); + assertThat(ripple.getBaseTransferFeeCurrency()).isEqualTo(trade.getCurrencyPair().getBase()); assertThat(ripple.getCounterCounterparty()).isEqualTo("rMwjYedjc7qqtKYVLiAccJSmCwih4LnE2q"); // Transfer fee = 0.501 * 0.002 assertThat(ripple.getCounterTransferFee()).isEqualTo("0"); assertThat(ripple.getCounterTransferFeeCurrency()).isEqualTo(Currency.BTC); - assertThat(ripple.getCounterTransferFeeCurrency()).isEqualTo(trade.getCurrencyPair().counter); + assertThat(ripple.getCounterTransferFeeCurrency()).isEqualTo( + trade.getCurrencyPair().getCounter()); } } diff --git a/xchange-simulated/src/main/java/org/knowm/xchange/simulated/Account.java b/xchange-simulated/src/main/java/org/knowm/xchange/simulated/Account.java index d7af0f4119d..f1ce77a2f7c 100644 --- a/xchange-simulated/src/main/java/org/knowm/xchange/simulated/Account.java +++ b/xchange-simulated/src/main/java/org/knowm/xchange/simulated/Account.java @@ -40,12 +40,12 @@ public void checkBalance(Order order, BigDecimal bidAmount) { case ASK: BigDecimal askAmount = order.getRemainingAmount(); Balance askBalance = - balances.computeIfAbsent(order.getCurrencyPair().base, this::defaultBalance).get(); + balances.computeIfAbsent(order.getCurrencyPair().getBase(), this::defaultBalance).get(); checkBalance(order, askAmount, askBalance); break; case BID: Balance bidBalance = - balances.computeIfAbsent(order.getCurrencyPair().counter, this::defaultBalance).get(); + balances.computeIfAbsent(order.getCurrencyPair().getCounter(), this::defaultBalance).get(); checkBalance(order, bidAmount, bidBalance); break; default: @@ -59,7 +59,7 @@ private void checkBalance(Order order, BigDecimal amount, Balance balance) { throw new FundsExceededException( "Insufficient balance: " + amount.toPlainString() - + order.getCurrencyPair().base + + order.getCurrencyPair().getBase() + " required but only " + balance.getAvailable() + " available"); @@ -83,14 +83,14 @@ private void reserve(LimitOrder order, boolean negate) { case ASK: BigDecimal askAmount = negate ? order.getRemainingAmount().negate() : order.getRemainingAmount(); - balance(order.getCurrencyPair().base) + balance(order.getCurrencyPair().getBase()) .updateAndGet( b -> { if (b.getAvailable().compareTo(askAmount) < 0) { throw new ExchangeException( "Insufficient balance: " + askAmount.toPlainString() - + order.getCurrencyPair().base + + order.getCurrencyPair().getBase() + " required but only " + b.getAvailable() + " available"); @@ -104,14 +104,14 @@ private void reserve(LimitOrder order, boolean negate) { case BID: BigDecimal bid = order.getRemainingAmount().multiply(order.getLimitPrice()); BigDecimal bidAmount = negate ? bid.negate() : bid; - balance(order.getCurrencyPair().counter) + balance(order.getCurrencyPair().getCounter()) .updateAndGet( b -> { if (b.getAvailable().compareTo(bidAmount) < 0) { throw new ExchangeException( "Insufficient balance: " + bidAmount.toPlainString() - + order.getCurrencyPair().counter + + order.getCurrencyPair().getCounter() + " required but only " + b.getAvailable() + " available"); @@ -132,7 +132,7 @@ public void fill(UserTrade userTrade, boolean reserved) { BigDecimal counterAmount = userTrade.getOriginalAmount().multiply(userTrade.getPrice()); switch (userTrade.getType()) { case ASK: - balance(userTrade.getCurrencyPair().base) + balance(userTrade.getCurrencyPair().getBase()) .updateAndGet( b -> Balance.Builder.from(b) @@ -146,7 +146,7 @@ public void fill(UserTrade userTrade, boolean reserved) { : b.getFrozen()) .total(b.getTotal().subtract(userTrade.getOriginalAmount())) .build()); - balance(userTrade.getCurrencyPair().counter) + balance(userTrade.getCurrencyPair().getCounter()) .updateAndGet( b -> Balance.Builder.from(b) @@ -155,14 +155,14 @@ public void fill(UserTrade userTrade, boolean reserved) { .build()); break; case BID: - balance(userTrade.getCurrencyPair().base) + balance(userTrade.getCurrencyPair().getBase()) .updateAndGet( b -> Balance.Builder.from(b) .total(b.getTotal().add(userTrade.getOriginalAmount())) .available(b.getAvailable().add(userTrade.getOriginalAmount())) .build()); - balance(userTrade.getCurrencyPair().counter) + balance(userTrade.getCurrencyPair().getCounter()) .updateAndGet( b -> Balance.Builder.from(b) diff --git a/xchange-simulated/src/main/java/org/knowm/xchange/simulated/MatchingEngine.java b/xchange-simulated/src/main/java/org/knowm/xchange/simulated/MatchingEngine.java index 02bcde12dda..1bf799b5792 100644 --- a/xchange-simulated/src/main/java/org/knowm/xchange/simulated/MatchingEngine.java +++ b/xchange-simulated/src/main/java/org/knowm/xchange/simulated/MatchingEngine.java @@ -282,7 +282,8 @@ private void matchOff(BookOrder takerOrder, BookOrder makerOrder, BigDecimal tra takerOrder.getType() == ASK ? tradeAmount.multiply(makerOrder.getLimitPrice()).multiply(FEE_RATE) : tradeAmount.multiply(FEE_RATE)) - .feeCurrency(takerOrder.getType() == ASK ? currencyPair.counter : currencyPair.base) + .feeCurrency(takerOrder.getType() == ASK ? currencyPair.getCounter() + : currencyPair.getBase()) .build(); LOGGER.debug("Created taker trade: {}", takerTrade); @@ -303,7 +304,7 @@ private void matchOff(BookOrder takerOrder, BookOrder makerOrder, BigDecimal tra makerType == ASK ? tradeAmount.multiply(makerOrder.getLimitPrice()).multiply(FEE_RATE) : tradeAmount.multiply(FEE_RATE)) - .feeCurrency(makerType == ASK ? currencyPair.counter : currencyPair.base) + .feeCurrency(makerType == ASK ? currencyPair.getCounter() : currencyPair.getBase()) .build(); LOGGER.debug("Created maker trade: {}", makerOrder); diff --git a/xchange-stream-bitfinex/src/main/java/info/bitrich/xchangestream/bitfinex/BitfinexStreamingMarketDataService.java b/xchange-stream-bitfinex/src/main/java/info/bitrich/xchangestream/bitfinex/BitfinexStreamingMarketDataService.java index 891cab24a45..23816fffde5 100644 --- a/xchange-stream-bitfinex/src/main/java/info/bitrich/xchangestream/bitfinex/BitfinexStreamingMarketDataService.java +++ b/xchange-stream-bitfinex/src/main/java/info/bitrich/xchangestream/bitfinex/BitfinexStreamingMarketDataService.java @@ -37,9 +37,9 @@ public BitfinexStreamingMarketDataService(BitfinexStreamingService service) { } private String pairToSymbol(CurrencyPair currencyPair) { - return (currencyPair.counter == Currency.USDT) - ? ("t" + currencyPair.base.getCurrencyCode() + "UST") - : ("t" + currencyPair.base.getCurrencyCode() + currencyPair.counter.getCurrencyCode()); + return (currencyPair.getCounter() == Currency.USDT) + ? ("t" + currencyPair.getBase().getCurrencyCode() + "UST") + : ("t" + currencyPair.getBase().getCurrencyCode() + currencyPair.getCounter().getCurrencyCode()); } @Override diff --git a/xchange-stream-bitfinex/src/main/java/info/bitrich/xchangestream/bitfinex/BitfinexStreamingTradeService.java b/xchange-stream-bitfinex/src/main/java/info/bitrich/xchangestream/bitfinex/BitfinexStreamingTradeService.java index b17a0b89517..07d924ab7b2 100644 --- a/xchange-stream-bitfinex/src/main/java/info/bitrich/xchangestream/bitfinex/BitfinexStreamingTradeService.java +++ b/xchange-stream-bitfinex/src/main/java/info/bitrich/xchangestream/bitfinex/BitfinexStreamingTradeService.java @@ -25,8 +25,8 @@ public Observable getOrderChanges() { .map(BitfinexStreamingAdapters::adaptOrder) .doOnNext( o -> { - service.scheduleCalculatedBalanceFetch(o.getCurrencyPair().base.getCurrencyCode()); - service.scheduleCalculatedBalanceFetch(o.getCurrencyPair().counter.getCurrencyCode()); + service.scheduleCalculatedBalanceFetch(o.getCurrencyPair().getBase().getCurrencyCode()); + service.scheduleCalculatedBalanceFetch(o.getCurrencyPair().getCounter().getCurrencyCode()); }); } @@ -46,8 +46,8 @@ public Observable getUserTrades() { .map(BitfinexStreamingAdapters::adaptUserTrade) .doOnNext( t -> { - service.scheduleCalculatedBalanceFetch(t.getCurrencyPair().base.getCurrencyCode()); - service.scheduleCalculatedBalanceFetch(t.getCurrencyPair().counter.getCurrencyCode()); + service.scheduleCalculatedBalanceFetch(t.getCurrencyPair().getBase().getCurrencyCode()); + service.scheduleCalculatedBalanceFetch(t.getCurrencyPair().getCounter().getCurrencyCode()); }); } diff --git a/xchange-stream-bitfinex/src/test/java/info/bitrich/xchangestream/bitfinex/BitfinexStreamingAdaptersTest.java b/xchange-stream-bitfinex/src/test/java/info/bitrich/xchangestream/bitfinex/BitfinexStreamingAdaptersTest.java index 26b7d21e02e..7748c0e6ccc 100644 --- a/xchange-stream-bitfinex/src/test/java/info/bitrich/xchangestream/bitfinex/BitfinexStreamingAdaptersTest.java +++ b/xchange-stream-bitfinex/src/test/java/info/bitrich/xchangestream/bitfinex/BitfinexStreamingAdaptersTest.java @@ -284,7 +284,7 @@ public void testTradeBuy() { UserTrade adapted = BitfinexStreamingAdapters.adaptUserTrade(bitfinexWebSocketAuthTrade); assertEquals(CurrencyPair.BTC_USD, adapted.getCurrencyPair()); assertEquals(new BigDecimal("0.00000682896"), adapted.getFeeAmount()); - assertEquals(CurrencyPair.BTC_USD.base, adapted.getFeeCurrency()); + assertEquals(CurrencyPair.BTC_USD.getBase(), adapted.getFeeCurrency()); assertEquals("335015622", adapted.getId()); assertEquals("21895093123", adapted.getOrderId()); assertEquals(new BigDecimal("0.00341448"), adapted.getOriginalAmount()); @@ -312,7 +312,7 @@ public void testTradeSell() { UserTrade adapted = BitfinexStreamingAdapters.adaptUserTrade(bitfinexWebSocketAuthTrade); assertEquals(CurrencyPair.BTC_USD, adapted.getCurrencyPair()); assertEquals(new BigDecimal("0.00000682896"), adapted.getFeeAmount()); - assertEquals(CurrencyPair.BTC_USD.base, adapted.getFeeCurrency()); + assertEquals(CurrencyPair.BTC_USD.getBase(), adapted.getFeeCurrency()); assertEquals("335015622", adapted.getId()); assertEquals("21895093123", adapted.getOrderId()); assertEquals(new BigDecimal("0.00341448"), adapted.getOriginalAmount()); diff --git a/xchange-stream-bitflyer/src/main/java/info/bitrich/xchangestream/bitflyer/BitflyerStreamingMarketDataService.java b/xchange-stream-bitflyer/src/main/java/info/bitrich/xchangestream/bitflyer/BitflyerStreamingMarketDataService.java index dfcaa6abae0..eca0ab8ef55 100644 --- a/xchange-stream-bitflyer/src/main/java/info/bitrich/xchangestream/bitflyer/BitflyerStreamingMarketDataService.java +++ b/xchange-stream-bitflyer/src/main/java/info/bitrich/xchangestream/bitflyer/BitflyerStreamingMarketDataService.java @@ -40,11 +40,11 @@ public BitflyerStreamingMarketDataService(PubnubStreamingService streamingServic public Observable getOrderBook(CurrencyPair currencyPair, Object... args) { String channelOrderbookSnapshotName = "lightning_board_snapshot_" - + currencyPair.base.toString() + + currencyPair.getBase().toString() + "_" - + currencyPair.counter.toString(); + + currencyPair.getCounter().toString(); String channelOrderbookUpdatesName = - "lightning_board_" + currencyPair.base.toString() + "_" + currencyPair.counter.toString(); + "lightning_board_" + currencyPair.getBase().toString() + "_" + currencyPair.getCounter().toString(); Observable snapshotTransactions = streamingService @@ -81,7 +81,7 @@ public Observable getOrderBook(CurrencyPair currencyPair, Object... a @Override public Observable getTicker(CurrencyPair currencyPair, Object... args) { String channelName = - "lightning_ticker_" + currencyPair.base.toString() + "_" + currencyPair.counter.toString(); + "lightning_ticker_" + currencyPair.getBase().toString() + "_" + currencyPair.getCounter().toString(); Observable tickerTransactions = streamingService .subscribeChannel(channelName) @@ -99,9 +99,9 @@ public Observable getTicker(CurrencyPair currencyPair, Object... args) { public Observable getTrades(CurrencyPair currencyPair, Object... args) { String channelName = "lightning_executions_" - + currencyPair.base.toString() + + currencyPair.getBase().toString() + "_" - + currencyPair.counter.toString(); + + currencyPair.getCounter().toString(); Observable tradeTransactions = streamingService .subscribeChannel(channelName) diff --git a/xchange-stream-bitmex/src/test/java/info/bitrich/xchangestream/bitmex/BitmexDeadManSwitchTest.java b/xchange-stream-bitmex/src/test/java/info/bitrich/xchangestream/bitmex/BitmexDeadManSwitchTest.java index 3b355bb48eb..75decf78f03 100644 --- a/xchange-stream-bitmex/src/test/java/info/bitrich/xchangestream/bitmex/BitmexDeadManSwitchTest.java +++ b/xchange-stream-bitmex/src/test/java/info/bitrich/xchangestream/bitmex/BitmexDeadManSwitchTest.java @@ -67,8 +67,8 @@ public void testDeadmanSwitch() throws Exception { // streamingMarketDataService.authenticate(); CurrencyPair xbtUsd = exchange.determineActiveContract( - CurrencyPair.XBT_USD.base.toString(), - CurrencyPair.XBT_USD.counter.toString(), + CurrencyPair.XBT_USD.getBase().toString(), + CurrencyPair.XBT_USD.getCounter().toString(), PERPETUAL); streamingMarketDataService diff --git a/xchange-stream-bitmex/src/test/java/info/bitrich/xchangestream/bitmex/BitmexManualExample.java b/xchange-stream-bitmex/src/test/java/info/bitrich/xchangestream/bitmex/BitmexManualExample.java index 851e44c4d4d..bb243c3fd42 100644 --- a/xchange-stream-bitmex/src/test/java/info/bitrich/xchangestream/bitmex/BitmexManualExample.java +++ b/xchange-stream-bitmex/src/test/java/info/bitrich/xchangestream/bitmex/BitmexManualExample.java @@ -62,8 +62,8 @@ public static void main(String[] args) { // BIQUARTERLY Contract CurrencyPair xbtUsdBiquarterly = exchange.determineActiveContract( - CurrencyPair.XBT_USD.base.toString(), - CurrencyPair.XBT_USD.counter.toString(), + CurrencyPair.XBT_USD.getBase().toString(), + CurrencyPair.XBT_USD.getCounter().toString(), BitmexPrompt.BIQUARTERLY); streamingMarketDataService .getOrderBook(xbtUsdBiquarterly) diff --git a/xchange-stream-bitstamp/src/main/java/info/bitrich/xchangestream/bitstamp/v2/BitstampStreamingMarketDataService.java b/xchange-stream-bitstamp/src/main/java/info/bitrich/xchangestream/bitstamp/v2/BitstampStreamingMarketDataService.java index dffc50f0243..c7aa78df84a 100644 --- a/xchange-stream-bitstamp/src/main/java/info/bitrich/xchangestream/bitstamp/v2/BitstampStreamingMarketDataService.java +++ b/xchange-stream-bitstamp/src/main/java/info/bitrich/xchangestream/bitstamp/v2/BitstampStreamingMarketDataService.java @@ -85,7 +85,7 @@ public Observable getTrades(CurrencyPair currencyPair, Object... args) { private String getChannelPostfix(CurrencyPair currencyPair) { return "_" - + currencyPair.base.toString().toLowerCase() - + currencyPair.counter.toString().toLowerCase(); + + currencyPair.getBase().toString().toLowerCase() + + currencyPair.getCounter().toString().toLowerCase(); } } diff --git a/xchange-stream-btcmarkets/src/main/java/info/bitrich/xchangestream/btcmarkets/BTCMarketsStreamingAdapters.java b/xchange-stream-btcmarkets/src/main/java/info/bitrich/xchangestream/btcmarkets/BTCMarketsStreamingAdapters.java index f8de36dc648..f54f7af181c 100644 --- a/xchange-stream-btcmarkets/src/main/java/info/bitrich/xchangestream/btcmarkets/BTCMarketsStreamingAdapters.java +++ b/xchange-stream-btcmarkets/src/main/java/info/bitrich/xchangestream/btcmarkets/BTCMarketsStreamingAdapters.java @@ -24,7 +24,7 @@ public class BTCMarketsStreamingAdapters { private static final Logger LOG = LoggerFactory.getLogger(BTCMarketsStreamingAdapters.class); public static String adaptCurrencyPairToMarketId(CurrencyPair currencyPair) { - return currencyPair.base.toString() + "-" + currencyPair.counter.toString(); + return currencyPair.getBase().toString() + "-" + currencyPair.getCounter().toString(); } public static CurrencyPair adaptMarketIdToCurrencyPair(String marketId) { diff --git a/xchange-stream-cexio/src/main/java/info/bitrich/xchangestream/cexio/dto/CexioWebSocketOrderBookSubscriptionData.java b/xchange-stream-cexio/src/main/java/info/bitrich/xchangestream/cexio/dto/CexioWebSocketOrderBookSubscriptionData.java index b47a537d19c..1ca507a23a3 100644 --- a/xchange-stream-cexio/src/main/java/info/bitrich/xchangestream/cexio/dto/CexioWebSocketOrderBookSubscriptionData.java +++ b/xchange-stream-cexio/src/main/java/info/bitrich/xchangestream/cexio/dto/CexioWebSocketOrderBookSubscriptionData.java @@ -17,7 +17,7 @@ public CexioWebSocketOrderBookSubscriptionData( CurrencyPair currencyPair, boolean subscribe, int depth) { pair = new ArrayList( - Arrays.asList(currencyPair.base.toString(), currencyPair.counter.toString())); + Arrays.asList(currencyPair.getBase().toString(), currencyPair.getCounter().toString())); this.subscribe = subscribe; this.depth = depth; // should be 0 for full depth, but instead return an empty orderbook } diff --git a/xchange-stream-coinbasepro/src/main/java/info/bitrich/xchangestream/coinbasepro/CoinbaseProStreamingService.java b/xchange-stream-coinbasepro/src/main/java/info/bitrich/xchangestream/coinbasepro/CoinbaseProStreamingService.java index 013222f06e7..1bff22baead 100644 --- a/xchange-stream-coinbasepro/src/main/java/info/bitrich/xchangestream/coinbasepro/CoinbaseProStreamingService.java +++ b/xchange-stream-coinbasepro/src/main/java/info/bitrich/xchangestream/coinbasepro/CoinbaseProStreamingService.java @@ -9,7 +9,10 @@ import info.bitrich.xchangestream.coinbasepro.dto.CoinbaseProWebSocketSubscriptionMessage; import info.bitrich.xchangestream.coinbasepro.dto.CoinbaseProWebSocketTransaction; import info.bitrich.xchangestream.core.ProductSubscription; -import info.bitrich.xchangestream.service.netty.*; +import info.bitrich.xchangestream.service.netty.JsonNettyStreamingService; +import info.bitrich.xchangestream.service.netty.StreamingObjectMapperHelper; +import info.bitrich.xchangestream.service.netty.WebSocketClientCompressionAllowClientNoContextAndServerNoContextHandler; +import info.bitrich.xchangestream.service.netty.WebSocketClientHandler; import io.netty.channel.ChannelHandlerContext; import io.netty.handler.codec.http.websocketx.WebSocketClientHandshaker; import io.netty.handler.codec.http.websocketx.extensions.WebSocketClientExtensionHandler; @@ -101,7 +104,7 @@ public Observable subscribeChannel(String channelName, Object... args) */ public Observable getRawWebSocketTransactions( CurrencyPair currencyPair, boolean filterChannelName) { - String channelName = currencyPair.base.toString() + "-" + currencyPair.counter.toString(); + String channelName = currencyPair.getBase().toString() + "-" + currencyPair.getCounter().toString(); final ObjectMapper mapper = StreamingObjectMapperHelper.getObjectMapper(); return subscribeChannel(channelName) .map(s -> mapToTransaction(mapper, s)) diff --git a/xchange-stream-coinbasepro/src/main/java/info/bitrich/xchangestream/coinbasepro/dto/CoinbaseProWebSocketSubscriptionMessage.java b/xchange-stream-coinbasepro/src/main/java/info/bitrich/xchangestream/coinbasepro/dto/CoinbaseProWebSocketSubscriptionMessage.java index 10e2ab682b2..d2918dcbddb 100644 --- a/xchange-stream-coinbasepro/src/main/java/info/bitrich/xchangestream/coinbasepro/dto/CoinbaseProWebSocketSubscriptionMessage.java +++ b/xchange-stream-coinbasepro/src/main/java/info/bitrich/xchangestream/coinbasepro/dto/CoinbaseProWebSocketSubscriptionMessage.java @@ -88,7 +88,7 @@ public CoinbaseProWebSocketSubscriptionMessage( private String[] generateProductIds(CurrencyPair[] pairs) { List productIds = new ArrayList<>(pairs.length); for (CurrencyPair pair : pairs) { - productIds.add(pair.base.toString() + "-" + pair.counter.toString()); + productIds.add(pair.getBase().toString() + "-" + pair.getCounter().toString()); } return productIds.toArray(new String[0]); diff --git a/xchange-stream-coinjar/src/main/java/info/bitrich/xchangestream/coinjar/CoinjarStreamingAdapters.java b/xchange-stream-coinjar/src/main/java/info/bitrich/xchangestream/coinjar/CoinjarStreamingAdapters.java index d9cc4d10ebc..33f9e0c1274 100644 --- a/xchange-stream-coinjar/src/main/java/info/bitrich/xchangestream/coinjar/CoinjarStreamingAdapters.java +++ b/xchange-stream-coinjar/src/main/java/info/bitrich/xchangestream/coinjar/CoinjarStreamingAdapters.java @@ -26,10 +26,10 @@ public static CurrencyPair adaptTopicToCurrencyPair(String topic) { public static String adaptCurrencyPairToBookTopic(CurrencyPair pair) { String sep = ""; - if (pair.base.getCurrencyCode().length() > 3 || pair.counter.getCurrencyCode().length() > 3) { + if (pair.getBase().getCurrencyCode().length() > 3 || pair.getCounter().getCurrencyCode().length() > 3) { sep = "-"; } - return "book:" + pair.base.toString() + sep + pair.counter.toString(); + return "book:" + pair.getBase().toString() + sep + pair.getCounter().toString(); } public static LimitOrder toLimitOrder( diff --git a/xchange-stream-coinmate/src/main/java/info/bitrich/xchangestream/coinmate/v2/CoinmateStreamingAdapter.java b/xchange-stream-coinmate/src/main/java/info/bitrich/xchangestream/coinmate/v2/CoinmateStreamingAdapter.java index cb5504ddb3e..f416ce50320 100644 --- a/xchange-stream-coinmate/src/main/java/info/bitrich/xchangestream/coinmate/v2/CoinmateStreamingAdapter.java +++ b/xchange-stream-coinmate/src/main/java/info/bitrich/xchangestream/coinmate/v2/CoinmateStreamingAdapter.java @@ -20,9 +20,9 @@ public class CoinmateStreamingAdapter { public static String getChannelPostfix(CurrencyPair currencyPair) { - return currencyPair.base.toString().toUpperCase() + return currencyPair.getBase().toString().toUpperCase() + "_" - + currencyPair.counter.toString().toUpperCase(); + + currencyPair.getCounter().toString().toUpperCase(); } public static UserTrades adaptWebSocketUserTrades( @@ -47,7 +47,7 @@ public static UserTrades adaptWebSocketUserTrades( ? coinmateWebSocketUserTrade.getSellOrderId() : coinmateWebSocketUserTrade.getBuyOrderId()) .feeAmount(BigDecimal.valueOf(coinmateWebSocketUserTrade.getFee())) - .feeCurrency(currencyPair.counter) + .feeCurrency(currencyPair.getCounter()) .build()); }); return new UserTrades(userTrades, Trades.TradeSortType.SortByTimestamp); diff --git a/xchange-stream-dydx/src/main/java/info/bitrich/xchangestream/dydx/dydxStreamingAdapters.java b/xchange-stream-dydx/src/main/java/info/bitrich/xchangestream/dydx/dydxStreamingAdapters.java index ae2c85b138e..770a986053f 100644 --- a/xchange-stream-dydx/src/main/java/info/bitrich/xchangestream/dydx/dydxStreamingAdapters.java +++ b/xchange-stream-dydx/src/main/java/info/bitrich/xchangestream/dydx/dydxStreamingAdapters.java @@ -55,9 +55,10 @@ public static List dydxOrderBookChanges( price = new BigDecimal(level[level.length - 2]) .movePointRight( - amounts.get(currencyPair.base) - amounts.get(currencyPair.counter)); + amounts.get(currencyPair.getBase()) - amounts.get(currencyPair.getCounter())); volume = - new BigDecimal(level[level.length - 1]).movePointLeft(amounts.get(currencyPair.base)); + new BigDecimal(level[level.length - 1]).movePointLeft(amounts.get( + currencyPair.getBase())); } else { price = new BigDecimal(level[level.length - 2]); volume = new BigDecimal(level[level.length - 1]); diff --git a/xchange-stream-gemini-v2/src/main/java/info/bitrich/xchangestream/gemini/GeminiStreamingService.java b/xchange-stream-gemini-v2/src/main/java/info/bitrich/xchangestream/gemini/GeminiStreamingService.java index 5d08ba20acd..b8a7d73261e 100644 --- a/xchange-stream-gemini-v2/src/main/java/info/bitrich/xchangestream/gemini/GeminiStreamingService.java +++ b/xchange-stream-gemini-v2/src/main/java/info/bitrich/xchangestream/gemini/GeminiStreamingService.java @@ -36,7 +36,7 @@ public ProductSubscription getProduct() { public Observable getRawWebSocketTransactions( CurrencyPair currencyPair, boolean filterChannelName) { - String channelName = currencyPair.base.toString() + currencyPair.counter.toString(); + String channelName = currencyPair.getBase().toString() + currencyPair.getCounter().toString(); final ObjectMapper mapper = StreamingObjectMapperHelper.getObjectMapper(); return subscribeChannel(channelName) .map(s -> mapper.treeToValue(s, GeminiWebSocketTransaction.class)) diff --git a/xchange-stream-gemini/src/main/java/info/bitrich/xchangestream/gemini/GeminiStreamingService.java b/xchange-stream-gemini/src/main/java/info/bitrich/xchangestream/gemini/GeminiStreamingService.java index 9f3a5891a09..6774d8dc2a3 100644 --- a/xchange-stream-gemini/src/main/java/info/bitrich/xchangestream/gemini/GeminiStreamingService.java +++ b/xchange-stream-gemini/src/main/java/info/bitrich/xchangestream/gemini/GeminiStreamingService.java @@ -31,7 +31,7 @@ public GeminiStreamingService(String baseUri) { public Observable subscribeChannel(CurrencyPair currencyPair, Object... args) { if (!productStreamingServices.containsKey(currencyPair)) { - String symbolUri = baseUri + currencyPair.base.toString() + currencyPair.counter.toString(); + String symbolUri = baseUri + currencyPair.getBase().toString() + currencyPair.getCounter().toString(); GeminiProductStreamingService productStreamingService = new GeminiProductStreamingService(symbolUri, currencyPair); productStreamingService.connect().blockingAwait(); diff --git a/xchange-stream-hitbtc/src/main/java/info/bitrich/xchangestream/hitbtc/HitbtcStreamingMarketDataService.java b/xchange-stream-hitbtc/src/main/java/info/bitrich/xchangestream/hitbtc/HitbtcStreamingMarketDataService.java index 5e6ebabf5e2..b48e79d0852 100644 --- a/xchange-stream-hitbtc/src/main/java/info/bitrich/xchangestream/hitbtc/HitbtcStreamingMarketDataService.java +++ b/xchange-stream-hitbtc/src/main/java/info/bitrich/xchangestream/hitbtc/HitbtcStreamingMarketDataService.java @@ -33,7 +33,7 @@ public HitbtcStreamingMarketDataService(HitbtcStreamingService service) { @Override public Observable getOrderBook(CurrencyPair currencyPair, Object... args) { - String pair = currencyPair.base.toString() + currencyPair.counter.toString(); + String pair = currencyPair.getBase().toString() + currencyPair.getCounter().toString(); String channelName = getChannelName("orderbook", pair); final ObjectMapper mapper = StreamingObjectMapperHelper.getObjectMapper(); @@ -52,7 +52,7 @@ public Observable getOrderBook(CurrencyPair currencyPair, Object... a @Override public Observable getTrades(CurrencyPair currencyPair, Object... args) { - String pair = currencyPair.base.toString() + currencyPair.counter.toString(); + String pair = currencyPair.getBase().toString() + currencyPair.getCounter().toString(); String channelName = getChannelName("trades", pair); final ObjectMapper mapper = StreamingObjectMapperHelper.getObjectMapper(); @@ -73,7 +73,7 @@ public Observable getTrades(CurrencyPair currencyPair, Object... args) { @Override public Observable getTicker(CurrencyPair currencyPair, Object... args) { - String pair = currencyPair.base.toString() + currencyPair.counter.toString(); + String pair = currencyPair.getBase().toString() + currencyPair.getCounter().toString(); String channelName = getChannelName("ticker", pair); final ObjectMapper mapper = StreamingObjectMapperHelper.getObjectMapper(); diff --git a/xchange-stream-kraken/src/main/java/info/bitrich/xchangestream/kraken/KrakenStreamingMarketDataService.java b/xchange-stream-kraken/src/main/java/info/bitrich/xchangestream/kraken/KrakenStreamingMarketDataService.java index e48b17adeff..e1015313ce1 100644 --- a/xchange-stream-kraken/src/main/java/info/bitrich/xchangestream/kraken/KrakenStreamingMarketDataService.java +++ b/xchange-stream-kraken/src/main/java/info/bitrich/xchangestream/kraken/KrakenStreamingMarketDataService.java @@ -121,7 +121,7 @@ public Observable subscribe(String channelName, int maxItems, Object. } public String getChannelName(KrakenSubscriptionName subscriptionName, CurrencyPair currencyPair) { - String pair = currencyPair.base.toString() + "/" + currencyPair.counter.toString(); + String pair = currencyPair.getBase().toString() + "/" + currencyPair.getCounter().toString(); return subscriptionName + KRAKEN_CHANNEL_DELIMITER + pair; } } diff --git a/xchange-stream-kraken/src/main/java/info/bitrich/xchangestream/kraken/KrakenStreamingTradeService.java b/xchange-stream-kraken/src/main/java/info/bitrich/xchangestream/kraken/KrakenStreamingTradeService.java index 3d24322bcba..8d1916cacba 100644 --- a/xchange-stream-kraken/src/main/java/info/bitrich/xchangestream/kraken/KrakenStreamingTradeService.java +++ b/xchange-stream-kraken/src/main/java/info/bitrich/xchangestream/kraken/KrakenStreamingTradeService.java @@ -218,7 +218,7 @@ private List adaptKrakenUserTrade(KrakenDtoUserTradeHolder[] ownTrade .type(KrakenAdapters.adaptOrderType(KrakenType.fromString(dto.type))) .price(dto.price) .feeAmount(dto.fee) - .feeCurrency(currencyPair.counter) + .feeCurrency(currencyPair.getCounter()) .originalAmount(dto.vol) .orderUserReference(resolveUserReference(dto.cl_ord_id, dto.userref)) .build()); diff --git a/xchange-stream-okcoin/src/main/java/info/bitrich/xchangestream/okcoin/OkCoinStreamingMarketDataService.java b/xchange-stream-okcoin/src/main/java/info/bitrich/xchangestream/okcoin/OkCoinStreamingMarketDataService.java index 2984e8ced42..d33d229f117 100644 --- a/xchange-stream-okcoin/src/main/java/info/bitrich/xchangestream/okcoin/OkCoinStreamingMarketDataService.java +++ b/xchange-stream-okcoin/src/main/java/info/bitrich/xchangestream/okcoin/OkCoinStreamingMarketDataService.java @@ -54,8 +54,8 @@ public Observable getOrderBook(CurrencyPair currencyPair, Object... a String channel = String.format( "ok_sub_spot_%s_%s_depth", - currencyPair.base.toString().toLowerCase(), - currencyPair.counter.toString().toLowerCase()); + currencyPair.getBase().toString().toLowerCase(), + currencyPair.getCounter().toString().toLowerCase()); if (args.length > 0) { if (args[0] instanceof FuturesContract) { @@ -63,8 +63,8 @@ public Observable getOrderBook(CurrencyPair currencyPair, Object... a channel = String.format( "ok_sub_future%s_%s_depth_%s", - currencyPair.counter.toString().toLowerCase(), - currencyPair.base.toString().toLowerCase(), + currencyPair.getCounter().toString().toLowerCase(), + currencyPair.getBase().toString().toLowerCase(), contract.getName()); if (args.length > 1) { channel = channel + "_" + args[1]; @@ -121,8 +121,8 @@ public Observable getTicker(CurrencyPair currencyPair, Object... args) { String channel = String.format( "ok_sub_spot_%s_%s_ticker", - currencyPair.base.toString().toLowerCase(), - currencyPair.counter.toString().toLowerCase()); + currencyPair.getBase().toString().toLowerCase(), + currencyPair.getCounter().toString().toLowerCase()); return service .subscribeChannel(channel) @@ -148,8 +148,8 @@ public Observable getFutureTicker( String channel = String.format( "ok_sub_future%s_%s_ticker_%s", - currencyPair.counter.toString().toLowerCase(), - currencyPair.base.toString().toLowerCase(), + currencyPair.getCounter().toString().toLowerCase(), + currencyPair.getBase().toString().toLowerCase(), contract.getName()); return service .subscribeChannel(channel) @@ -171,16 +171,16 @@ public Observable getTrades(CurrencyPair currencyPair, Object... args) { String channel = String.format( "ok_sub_spot_%s_%s_deals", - currencyPair.base.toString().toLowerCase(), - currencyPair.counter.toString().toLowerCase()); + currencyPair.getBase().toString().toLowerCase(), + currencyPair.getCounter().toString().toLowerCase()); if (args.length > 0) { FuturesContract contract = (FuturesContract) args[0]; channel = String.format( "ok_sub_future%s_%s_trade_%s", - currencyPair.counter.toString().toLowerCase(), - currencyPair.base.toString().toLowerCase(), + currencyPair.getCounter().toString().toLowerCase(), + currencyPair.getBase().toString().toLowerCase(), contract.getName()); } diff --git a/xchange-stream-poloniex2/src/main/java/info/bitrich/xchangestream/poloniex2/PoloniexStreamingService.java b/xchange-stream-poloniex2/src/main/java/info/bitrich/xchangestream/poloniex2/PoloniexStreamingService.java index 3f22d3f13d9..89e891579b8 100644 --- a/xchange-stream-poloniex2/src/main/java/info/bitrich/xchangestream/poloniex2/PoloniexStreamingService.java +++ b/xchange-stream-poloniex2/src/main/java/info/bitrich/xchangestream/poloniex2/PoloniexStreamingService.java @@ -84,7 +84,7 @@ public synchronized Observable subscribeChannel(String channelName, Ob public Observable> subscribeCurrencyPairChannel( CurrencyPair currencyPair) { - String channelName = currencyPair.counter.toString() + "_" + currencyPair.base.toString(); + String channelName = currencyPair.getCounter().toString() + "_" + currencyPair.getBase().toString(); return subscribeChannel(channelName) .map( jsonNode -> diff --git a/xchange-tradeogre/src/main/java/org/knowm/xchange/tradeogre/TradeOgreAdapters.java b/xchange-tradeogre/src/main/java/org/knowm/xchange/tradeogre/TradeOgreAdapters.java index fe2ea703af4..86b88d4812a 100644 --- a/xchange-tradeogre/src/main/java/org/knowm/xchange/tradeogre/TradeOgreAdapters.java +++ b/xchange-tradeogre/src/main/java/org/knowm/xchange/tradeogre/TradeOgreAdapters.java @@ -23,7 +23,7 @@ public class TradeOgreAdapters { public static String adaptCurrencyPair(CurrencyPair currencyPair) { - return currencyPair.counter.toString() + "-" + currencyPair.base.toString(); + return currencyPair.getCounter().toString() + "-" + currencyPair.getBase().toString(); } public static CurrencyPair adaptTradeOgreCurrencyPair(String currencyPair) { 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 3b13c6d035d..263a9803d72 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 @@ -73,7 +73,7 @@ private VaultoroNewOrderResponse placeOrder( BigDecimal price) throws IOException { - String baseSymbol = currencyPair.base.getCurrencyCode().toLowerCase(); + String baseSymbol = currencyPair.getBase().getCurrencyCode().toLowerCase(); if (orderType == OrderType.BID) { 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 94cca2bc9ef..10eb40aa850 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 @@ -82,20 +82,20 @@ BigDecimal.ZERO, new Fee(value.getFee_seller(), value.getFee_buyer())) }) .build()); - if (!currencies.containsKey(pair.base)) { - CurrencyMetaData currencyMetaData = exchangeMetaData.getCurrencies().get(pair.base); + if (!currencies.containsKey(pair.getBase())) { + CurrencyMetaData currencyMetaData = exchangeMetaData.getCurrencies().get(pair.getBase()); BigDecimal withdrawalFee = currencyMetaData == null ? null : currencyMetaData.getWithdrawalFee(); - currencies.put(pair.base, new CurrencyMetaData(8, withdrawalFee)); + currencies.put(pair.getBase(), new CurrencyMetaData(8, withdrawalFee)); } - if (!currencies.containsKey(pair.counter)) { - CurrencyMetaData currencyMetaData = exchangeMetaData.getCurrencies().get(pair.counter); + if (!currencies.containsKey(pair.getCounter())) { + CurrencyMetaData currencyMetaData = exchangeMetaData.getCurrencies().get(pair.getCounter()); CurrencyMetaData withdrawalFee = currencyMetaData == null ? null : new CurrencyMetaData(8, currencyMetaData.getWithdrawalFee()); - currencies.put(pair.counter, withdrawalFee); + currencies.put(pair.getCounter(), withdrawalFee); } } @@ -169,9 +169,9 @@ public static String adaptCcyPairsToUrlFormat(Iterable currencyPai } public static String adaptCcyPairToUrlFormat(CurrencyPair currencyPair) { - return currencyPair.base.getCurrencyCode().toLowerCase() + return currencyPair.getBase().getCurrencyCode().toLowerCase() + "_" - + currencyPair.counter.getCurrencyCode().toLowerCase(); + + currencyPair.getCounter().getCurrencyCode().toLowerCase(); } public static OrderType adaptType(String type) { diff --git a/xchange-zaif/src/main/java/org/knowm/xchange/zaif/service/ZaifMarketDataServiceRaw.java b/xchange-zaif/src/main/java/org/knowm/xchange/zaif/service/ZaifMarketDataServiceRaw.java index 3c9c42d5717..1d91a3f417c 100644 --- a/xchange-zaif/src/main/java/org/knowm/xchange/zaif/service/ZaifMarketDataServiceRaw.java +++ b/xchange-zaif/src/main/java/org/knowm/xchange/zaif/service/ZaifMarketDataServiceRaw.java @@ -19,8 +19,8 @@ protected ZaifMarketDataServiceRaw(Exchange exchange) { public ZaifFullBook getZaifFullBook(CurrencyPair currencyPair) throws IOException { try { return this.zaif.getDepth( - currencyPair.base.toString().toLowerCase(), - currencyPair.counter.toString().toLowerCase()); + currencyPair.getBase().toString().toLowerCase(), + currencyPair.getCounter().toString().toLowerCase()); } catch (ZaifException e) { throw new ExchangeException(e.getMessage()); }