Merge branch 'develop' of https://github.com/knowm/XChange into develop

# Conflicts: # pom.xml
knowm · Dec 1, 2023 · 6eb16c9 · 6eb16c9
2 parents 9d22a6b + 9c0ba9e
commit 6eb16c9
Show file tree

Hide file tree

Showing 76 changed files with 111 additions and 104 deletions.
diff --git a/pom.xml b/pom.xml
@@ -32,14 +32,14 @@
 
     <version.java>1.8</version.java>
     <version.assertj>3.24.2</version.assertj>
-    <version.commons.lang3>3.12.0</version.commons.lang3>
+    <version.commons.lang3>3.13.0</version.commons.lang3>
     <version.fasterxml>2.14.3</version.fasterxml>
     <version.github.mmazi>3.0</version.github.mmazi>
     <version.resilience4j>1.7.0</version.resilience4j>
     <version.junit>5.9.3</version.junit>
     <version.lombok>1.18.26</version.lombok>
     <version.knowm.xchart>3.8.2</version.knowm.xchart>
-    <version.qos.logback>1.4.5</version.qos.logback>
+    <version.qos.logback>1.4.11</version.qos.logback>
     <version.reflections>0.10.2</version.reflections>
     <version.slf4j>2.0.6</version.slf4j>
     <version.crypto>5.0.0</version.crypto>

diff --git a/xchange-ascendex/src/main/java/org/knowm/xchange/ascendex/AscendexAdapters.java b/xchange-ascendex/src/main/java/org/knowm/xchange/ascendex/AscendexAdapters.java
@@ -118,7 +118,7 @@ public static UserTrades adaptUserTrades(
     ascendexOrderHistoryResponse.forEach(
         order ->
             userTrades.add(
-                new UserTrade.Builder()
+                UserTrade.builder()
                     .feeAmount(order.getCumFee())
                     .orderId(order.getOrderId())
                     .price(order.getPrice())

diff --git a/xchange-bankera/src/main/java/org/knowm/xchange/bankera/BankeraAdapters.java b/xchange-bankera/src/main/java/org/knowm/xchange/bankera/BankeraAdapters.java
@@ -188,7 +188,7 @@ public static List<UserTrade> adaptUserTrades(BankeraUserTrades userTrades) {
               CurrencyPair pair = new CurrencyPair(currencies[0], currencies[1]);
               Currency feeCurrency = new Currency(currencies[1]);
               tradeList.add(
-                  new UserTrade.Builder()
+                  UserTrade.builder()
                       .type(trade.getSide().equalsIgnoreCase("buy") ? OrderType.BID : OrderType.ASK)
                       .originalAmount(new BigDecimal(trade.getAmount()))
                       .currencyPair(pair)

diff --git a/xchange-bibox/src/main/java/org/knowm/xchange/bibox/dto/BiboxAdapters.java b/xchange-bibox/src/main/java/org/knowm/xchange/bibox/dto/BiboxAdapters.java
@@ -144,7 +144,7 @@ public static UserTrades adaptUserTrades(BiboxOrders biboxOrderHistory) {
   }
 
   private static UserTrade adaptUserTrade(BiboxOrder order) {
-    return new UserTrade.Builder()
+    return UserTrade.builder()
         .orderId(order.getId())
         .id(order.getId())
         .currencyPair(new CurrencyPair(order.getCoinSymbol(), order.getCurrencySymbol()))

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
@@ -376,7 +376,7 @@ public static UserTrades adaptUserTrades(List<BinanceTrade> binanceTrades, boole
             binanceTrades.stream()
                     .map(
                             t ->
-                                    new UserTrade.Builder()
+                                    UserTrade.builder()
                                             .type(BinanceAdapters.convertType(t.isBuyer))
                                             .originalAmount(t.qty)
                                             .instrument(adaptSymbol(t.symbol, isFuture))

diff --git a/xchange-bitbay/src/main/java/org/knowm/xchange/bitbay/BitbayAdapters.java b/xchange-bitbay/src/main/java/org/knowm/xchange/bitbay/BitbayAdapters.java
@@ -206,7 +206,7 @@ private static UserTrade createUserTrade(BitbayOrder bitbayOrder) {
       throw new IllegalArgumentException(e);
     }
 
-    return new UserTrade.Builder()
+    return UserTrade.builder()
         .type(type)
         .originalAmount(bitbayOrder.getAmount())
         .currencyPair(currencyPair)
@@ -244,7 +244,7 @@ public static List<UserTrade> adaptTransactions(List<Map> response) {
         String id = (type + "_" + date + "_" + market).replaceAll("\\s+", "");
 
         trades.add(
-            new UserTrade.Builder()
+            UserTrade.builder()
                 .type(orderType)
                 .originalAmount(amount)
                 .currencyPair(pair)

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
@@ -36,7 +36,7 @@ public static UserTrades adaptUserTrades(BitbayUserTrades response) {
           new CurrencyPair(Currency.getInstance(parts[0]), Currency.getInstance(parts[1]));
       Date timestamp = new Date(trade.getTime());
       trades.add(
-          new UserTrade.Builder()
+          UserTrade.builder()
               .id(trade.getId().toString())
               .type(orderType)
               .originalAmount(trade.getAmount())

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
@@ -394,7 +394,7 @@ public static UserTrades adaptTradeHistory(
               : trade.getCreatedAt();
 
       result.add(
-          new UserTrade.Builder()
+          UserTrade.builder()
               .id(trade.getTradeId())
               .timestamp(timestamp)
               .currencyPair(trade.getTradingPair())

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
@@ -582,7 +582,7 @@ public static UserTrades adaptTradeHistory(BitfinexTradeResponse[] trades, Strin
       Date timestamp = convertBigDecimalTimestampToDate(trade.getTimestamp());
       final BigDecimal fee = trade.getFeeAmount() == null ? null : trade.getFeeAmount().negate();
       pastTrades.add(
-          new UserTrade.Builder()
+          UserTrade.builder()
               .type(orderType)
               .originalAmount(trade.getAmount())
               .currencyPair(currencyPair)
@@ -611,7 +611,7 @@ public static UserTrades adaptTradeHistoryV2(
               : trade.getExecAmount();
       final BigDecimal fee = trade.getFee() != null ? trade.getFee().negate() : null;
       pastTrades.add(
-          new UserTrade.Builder()
+          UserTrade.builder()
               .type(orderType)
               .originalAmount(amount)
               .currencyPair(adaptCurrencyPair(trade.getSymbol()))

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
@@ -179,7 +179,7 @@ public static UserTrades adaptUserTrades(
   private static UserTrade adaptUserTrade(
       BithumbUserTransaction bithumbTransaction, CurrencyPair currencyPair) {
 
-    return new UserTrade.Builder()
+    return UserTrade.builder()
         .currencyPair(currencyPair)
         .originalAmount(bithumbTransaction.getUnits())
         .type(adaptTransactionSearch(bithumbTransaction.getSearch()))

diff --git a/xchange-bitmex/src/main/java/org/knowm/xchange/bitmex/BitmexAdapters.java b/xchange-bitmex/src/main/java/org/knowm/xchange/bitmex/BitmexAdapters.java
@@ -354,7 +354,7 @@ public static UserTrade adoptUserTrade(BitmexPrivateExecution exec) {
     OrderType orderType = convertType(exec.side);
     return orderType == null
         ? null
-        : new UserTrade.Builder()
+        : UserTrade.builder()
             .id(exec.execID)
             .orderId(exec.orderID)
             .currencyPair(pair)

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
@@ -171,7 +171,7 @@ public static UserTrades adaptTradeHistory(BitsoUserTransaction[] bitsoUserTrans
         String feeCurrency =
             sell ? currencyPair.counter.getCurrencyCode() : currencyPair.base.getCurrencyCode();
         UserTrade trade =
-            new UserTrade.Builder()
+            UserTrade.builder()
                 .type(orderType)
                 .originalAmount(originalAmount)
                 .currencyPair(currencyPair)

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
@@ -234,7 +234,7 @@ public static UserTrades adaptTradeHistory(BitstampUserTransaction[] bitstampUse
       final CurrencyPair pair =
           new CurrencyPair(t.getBaseCurrency().toUpperCase(), t.getCounterCurrency().toUpperCase());
       UserTrade trade =
-          new UserTrade.Builder()
+          UserTrade.builder()
               .type(orderType)
               .originalAmount(t.getBaseAmount().abs())
               .currencyPair(pair)
@@ -425,6 +425,7 @@ public static InstrumentMetaData adaptCurrencyPairInfo(BitstampPairInfo pairInfo
         .counterMinimumAmount(minOrder)
         .priceScale(pairInfo.getCounterDecimals())
         .volumeScale(pairInfo.getBaseDecimals())
+        .marketOrderEnabled(pairInfo.isMarketOrdersEnabled())
         .build();
   }
 

diff --git a/...ge-bitstamp/src/main/java/org/knowm/xchange/bitstamp/dto/marketdata/BitstampPairInfo.java b/...ge-bitstamp/src/main/java/org/knowm/xchange/bitstamp/dto/marketdata/BitstampPairInfo.java
@@ -31,4 +31,10 @@ public class BitstampPairInfo {
   @JsonProperty("description")
   String description;
 
+  @JsonProperty("instant_and_market_orders")
+  String instantAndMarketOrders;
+
+  public boolean isMarketOrdersEnabled(){
+    return "Enabled".equals(instantAndMarketOrders);
+  }
 }
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
@@ -146,7 +146,7 @@ public static List<UserTrade> adaptUserTrades(List<BittrexOrder> bittrexUserTrad
     return bittrexUserTrades.stream()
         .map(
             bittrexOrder ->
-                new UserTrade.Builder()
+                UserTrade.builder()
                     .type(
                         BittrexConstants.BUY.equalsIgnoreCase(bittrexOrder.getDirection())
                             ? OrderType.BID

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
@@ -56,7 +56,7 @@ public static UserTrade adaptTrade(BityOrder order) {
     Date date = order.getTimestampCreated();
     String orderId = order.getResourceUri();
 
-    return new UserTrade.Builder()
+    return UserTrade.builder()
         .type(orderType)
         .originalAmount(amount)
         .currencyPair(currencyPair)

diff --git a/xchange-bl3p/src/main/java/org/knowm/xchange/bl3p/Bl3pAdapters.java b/xchange-bl3p/src/main/java/org/knowm/xchange/bl3p/Bl3pAdapters.java
@@ -86,7 +86,7 @@ public static List<UserTrade> adaptUserTransactionsToUserTrades(
 
     for (Bl3pUserTransactions.Bl3pUserTransaction t : transactions) {
       UserTrade ut =
-          new UserTrade.Builder()
+          UserTrade.builder()
               .currencyPair(CurrencyPair.BTC_EUR)
               .id(Integer.toString(t.id))
               .orderId(Integer.toString(t.orderId))

diff --git a/xchange-bleutrade/src/main/java/org/knowm/xchange/bleutrade/BleutradeAdapters.java b/xchange-bleutrade/src/main/java/org/knowm/xchange/bleutrade/BleutradeAdapters.java
@@ -184,7 +184,7 @@ public static ExchangeMetaData adaptToExchangeMetaData(
   public static UserTrade adaptUserTrade(BluetradeExecutedTrade trade) {
     OrderType orderType = trade.type.equalsIgnoreCase("sell") ? OrderType.ASK : OrderType.BID;
     CurrencyPair currencyPair = BleutradeUtils.toCurrencyPair(trade.exchange);
-    return new UserTrade.Builder()
+    return UserTrade.builder()
         .type(orderType)
         .originalAmount(trade.quantity)
         .currencyPair(currencyPair)

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
@@ -212,7 +212,7 @@ private static String generateClOrdId() {
 
     public static UserTrades toUserTrades(List<BlockchainOrder> blockchainTrades) {
         List<UserTrade> trades = blockchainTrades.stream()
-                .map(blockchainTrade -> new UserTrade.Builder()
+                .map(blockchainTrade -> UserTrade.builder()
                                 .type(blockchainTrade.getOrderType())
                                 .originalAmount(blockchainTrade.getCumQty())
                                 .currencyPair(blockchainTrade.getSymbol())

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
@@ -152,7 +152,7 @@ public static UserTrade adaptTrade(BTCMarketsUserTrade trade, CurrencyPair curre
     final String tradeId = Long.toString(trade.getId());
     final Long orderId = trade.getOrderId();
     final String feeCurrency = currencyPair.counter.getCurrencyCode();
-    return new UserTrade.Builder()
+    return UserTrade.builder()
         .type(type)
         .originalAmount(trade.getVolume())
         .currencyPair(currencyPair)
@@ -172,7 +172,7 @@ public static UserTrade adaptTradeHistory(BTCMarketsTradeHistoryResponse trade)
     final String orderId = trade.orderId;
     final String feeCurrency = currencyPair.counter.getCurrencyCode();
     try {
-      return new UserTrade.Builder()
+      return UserTrade.builder()
           .type(type)
           .originalAmount(trade.amount)
           .currencyPair(currencyPair)

diff --git a/...-btcmarkets/src/test/java/org/knowm/xchange/btcmarkets/service/BTCMarketsTestSupport.java b/...-btcmarkets/src/test/java/org/knowm/xchange/btcmarkets/service/BTCMarketsTestSupport.java
@@ -157,7 +157,7 @@ protected static LimitOrder[] expectedOrders() {
 
   protected static UserTrade[] expectedUserTrades() {
     return new UserTrade[] {
-      new UserTrade.Builder()
+      UserTrade.builder()
           .type(Order.OrderType.ASK)
           .originalAmount(new BigDecimal("20.00000000"))
           .currencyPair(CurrencyPair.BTC_AUD)
@@ -167,7 +167,7 @@ protected static UserTrade[] expectedUserTrades() {
           .feeAmount(BigDecimal.ONE)
           .feeCurrency(Currency.AUD)
           .build(),
-      new UserTrade.Builder()
+      UserTrade.builder()
           .type(Order.OrderType.ASK)
           .originalAmount(new BigDecimal("40.00000000"))
           .currencyPair(CurrencyPair.BTC_AUD)
@@ -177,7 +177,7 @@ protected static UserTrade[] expectedUserTrades() {
           .feeAmount(BigDecimal.valueOf(2))
           .feeCurrency(Currency.AUD)
           .build(),
-      new UserTrade.Builder()
+      UserTrade.builder()
           .type(Order.OrderType.BID)
           .originalAmount(new BigDecimal("60.00000000"))
           .currencyPair(CurrencyPair.BTC_AUD)
@@ -187,7 +187,7 @@ protected static UserTrade[] expectedUserTrades() {
           .feeAmount(BigDecimal.valueOf(3))
           .feeCurrency(Currency.AUD)
           .build(),
-      new UserTrade.Builder()
+      UserTrade.builder()
           .type(Order.OrderType.BID)
           .originalAmount(new BigDecimal("80.00000000"))
           .currencyPair(CurrencyPair.BTC_AUD)
@@ -197,7 +197,7 @@ protected static UserTrade[] expectedUserTrades() {
           .feeAmount(BigDecimal.valueOf(4))
           .feeCurrency(Currency.AUD)
           .build(),
-      new UserTrade.Builder()
+      UserTrade.builder()
           .type(Order.OrderType.BID)
           .originalAmount(BigDecimal.ZERO)
           .currencyPair(CurrencyPair.BTC_AUD)

diff --git a/xchange-btcturk/src/main/java/org/knowm/xchange/btcturk/service/BTCTurkTradeService.java b/xchange-btcturk/src/main/java/org/knowm/xchange/btcturk/service/BTCTurkTradeService.java
@@ -93,7 +93,7 @@ public UserTrades getTradeHistory(TradeHistoryParams params) throws IOException
     for (BTCTurkUserTransactions transaction : transactions) {
       if (transaction.getOperation().equals(BTCTurkOperations.trade))
         trades.add(
-            new UserTrade.Builder()
+            UserTrade.builder()
                 .type(
                     ((transaction.getAmount().compareTo(BigDecimal.ZERO) > 0)
                         ? OrderType.ASK

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
@@ -228,7 +228,7 @@ public static UserTrade adaptUserTrade(CCEXOrderhistory trade) {
       price = trade.getLimit();
     }
 
-    return new UserTrade.Builder()
+    return UserTrade.builder()
         .type(orderType)
         .originalAmount(amount)
         .currencyPair(currencyPair)

diff --git a/xchange-cexio/src/main/java/org/knowm/xchange/cexio/CexIOAdapters.java b/xchange-cexio/src/main/java/org/knowm/xchange/cexio/CexIOAdapters.java
@@ -238,7 +238,7 @@ public static UserTrade adaptArchivedOrder(CexIOArchivedOrder cexIOArchivedOrder
               : Currency.getInstance(cexIOArchivedOrder.feeCcy);
       BigDecimal fee = cexIOArchivedOrder.feeValue;
 
-      return new UserTrade.Builder()
+      return UserTrade.builder()
           .type(orderType)
           .originalAmount(originalAmount)
           .currencyPair(currencyPair)

diff --git a/xchange-coinbase/src/main/java/org/knowm/xchange/coinbase/CoinbaseAdapters.java b/xchange-coinbase/src/main/java/org/knowm/xchange/coinbase/CoinbaseAdapters.java
@@ -57,7 +57,7 @@ public static UserTrades adaptTrades(List<CoinbaseBuySell> transactions, OrderTy
   }
 
   private static UserTrade adaptTrade(CoinbaseBuySell transaction, OrderType orderType) {
-    return new UserTrade.Builder()
+    return UserTrade.builder()
         .type(orderType)
         .originalAmount(transaction.getAmount().getAmount())
         .currencyPair(
@@ -101,7 +101,7 @@ public static UserTrade adaptTrade(CoinbaseTransfer transfer) {
     final BigDecimal feeAmount = transfer.getCoinbaseFee().getAmount();
     final String feeCurrency = transfer.getCoinbaseFee().getCurrency();
 
-    return new UserTrade.Builder()
+    return UserTrade.builder()
         .type(orderType)
         .originalAmount(originalAmount)
         .currencyPair(new CurrencyPair(tradableIdentifier, transactionCurrency))

diff --git a/xchange-coinbase/src/test/java/org/knowm/xchange/coinbase/CoinbaseAdapterTest.java b/xchange-coinbase/src/test/java/org/knowm/xchange/coinbase/CoinbaseAdapterTest.java
@@ -66,7 +66,7 @@ public void testAdaptTrades() throws IOException {
     BigDecimal price = new BigDecimal("905.10").divide(originalAmount, RoundingMode.HALF_EVEN);
 
     UserTrade expectedTrade =
-        new UserTrade.Builder()
+        UserTrade.builder()
             .type(OrderType.BID)
             .originalAmount(originalAmount)
             .currencyPair(CurrencyPair.BTC_USD)

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
@@ -309,7 +309,7 @@ public static UserTrades adaptTradeHistory(List<CoinbaseProFill> coinbaseExFills
       CurrencyPair currencyPair = new CurrencyPair(fill.getProductId().replace('-', '/'));
 
       trades.add(
-          new UserTrade.Builder()
+          UserTrade.builder()
               .type("buy".equals(fill.getSide()) ? OrderType.BID : OrderType.ASK)
               .originalAmount(fill.getSize())
               .currencyPair(currencyPair)

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
@@ -32,7 +32,7 @@ public static UserTrades adaptToUserTrades(List<CoindealTradeHistory> coindealTr
       CurrencyPair currencyPair =
           CurrencyPairDeserializer.getCurrencyPairFromString(coindealTradeHistory.getSymbol());
       userTrades.add(
-          new UserTrade.Builder()
+          UserTrade.builder()
               .type(
                   (coindealTradeHistory.getSide().equals("BUY"))
                       ? Order.OrderType.BID

diff --git a/...coindirect/src/main/java/org/knowm/xchange/coindirect/service/CoindirectTradeService.java b/...coindirect/src/main/java/org/knowm/xchange/coindirect/service/CoindirectTradeService.java
@@ -97,7 +97,7 @@ public UserTrades getTradeHistory(TradeHistoryParams params) throws IOException
                   if (t.executedAmount == null || t.executedAmount.signum() == 0) {
                     return null;
                   }
-                  return new UserTrade.Builder()
+                  return UserTrade.builder()
                       .type(CoindirectAdapters.convert(t.side))
                       .originalAmount(t.executedAmount)
                       .currencyPair(CoindirectAdapters.toCurrencyPair(t.symbol))

diff --git a/xchange-coinegg/src/main/java/org/knowm/xchange/coinegg/CoinEggAdapters.java b/xchange-coinegg/src/main/java/org/knowm/xchange/coinegg/CoinEggAdapters.java
@@ -140,7 +140,7 @@ public static UserTrades adaptTradeHistory(CoinEggTradeView coinEggTradeView) {
             .timestamp(coinEggTradeView.getDateTime())
             .build();
 
-    trades.add((UserTrade) UserTrade.Builder.from(trade).build());
+    trades.add((UserTrade) UserTrade.builder().from(trade).build());
 
     return new UserTrades(trades, null);
   }

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
@@ -129,7 +129,7 @@ public static UserTrades adaptTradeHistory(Collection<CoinfloorUserTransaction>
       final BigDecimal feeAmount = transaction.getFee();
 
       UserTrade trade =
-          new UserTrade.Builder()
+          UserTrade.builder()
               .type(transaction.getSide())
               .originalAmount(transaction.getAmount().abs())
               .currencyPair(transaction.getCurrencyPair())

diff --git a/xchange-coingi/src/main/java/org/knowm/xchange/coingi/CoingiAdapters.java b/xchange-coingi/src/main/java/org/knowm/xchange/coingi/CoingiAdapters.java
@@ -209,7 +209,7 @@ public static UserTrades adaptTradeHistory(CoingiOrdersList ordersList) {
               o.getCurrencyPair().get("counter").toUpperCase());
 
       UserTrade trade =
-          new UserTrade.Builder()
+          UserTrade.builder()
               .type(orderType)
               .originalAmount(o.getOriginalBaseAmount())
               .currencyPair(pair)

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
@@ -130,7 +130,7 @@ public static LimitOrder adaptOrderToLimitOrder(CoinjarOrder coinjarOrder) {
   }
 
   public static UserTrade adaptOrderToUserTrade(CoinjarOrder order) {
-    return new UserTrade.Builder()
+    return UserTrade.builder()
         .id(order.oid.toString())
         .orderId(order.oid.toString())
         .currencyPair(productToCurrencyPair(order.productId))
@@ -165,7 +165,7 @@ public static OrderBook adaptOrderbook(CoinjarOrderBook orderBook, CurrencyPair
   }
 
   public static UserTrade adaptFillToUserTrade(CoinjarFill coinjarFill) {
-    return new UserTrade.Builder()
+    return UserTrade.builder()
         .id(coinjarFill.tid.toString())
         .orderId(coinjarFill.oid.toString())
         .currencyPair(productToCurrencyPair(coinjarFill.productId))