fix order processor concurrency issue (#11)

* fix order processor concurrency issue

* delete duplicate docker build config

* remove unused import

Author: Puneethkumarck

README.md

@@ -4,7 +4,7 @@
 [![Reliability Rating](https://sonarcloud.io/api/project_badges/measure?project=Puneethkumarck_trading-api&metric=reliability_rating)](https://sonarcloud.io/summary/new_code?id=Puneethkumarck_trading-api)
 [![Maintainability Rating](https://sonarcloud.io/api/project_badges/measure?project=Puneethkumarck_trading-api&metric=sqale_rating)](https://sonarcloud.io/summary/new_code?id=Puneethkumarck_trading-api)
 [![Vulnerabilities](https://sonarcloud.io/api/project_badges/measure?project=Puneethkumarck_trading-api&metric=vulnerabilities)](https://sonarcloud.io/summary/new_code?id=Puneethkumarck_trading-api)
-
+[<img src="https://run.pstmn.io/button.svg" alt="Run In Postman" style="width: 128px; height: 32px;">](https://god.gw.postman.com/run-collection/685178-34771dde-0c1a-4fa2-8613-14a572120e88?action=collection%2Ffork&source=rip_markdown&collection-url=entityId%3D685178-34771dde-0c1a-4fa2-8613-14a572120e88%26entityType%3Dcollection%26workspaceId%3De03b2ab3-447a-4a5f-8818-be163b36a6e7#?env%5Brailway%5D=W3sia2V5IjoidXJsIiwidmFsdWUiOiJodHRwczovL2NyeXB0by1hcGktcHJvZHVjdGlvbi00NzNhLnVwLnJhaWx3YXkuYXBwIiwiZW5hYmxlZCI6dHJ1ZSwidHlwZSI6ImRlZmF1bHQifV0=)
 
 # Trading API
 
@@ -370,7 +370,7 @@ sequenceDiagram
 ```
 
 ### API Documentation
-The API documentation is available at : [swagger](http://localhost:8080/swagger-ui.html)
+The API documentation is available at : [swagger](https://trading-api-production-057a.up.railway.app/swagger-ui/index.html)
 
 ### Code Style
 The project uses Spotless with Eclipse formatter for consistent code style. Format the code using:

deploy/Dockerfile

@@ -9,6 +9,7 @@
 import java.math.BigDecimal;
 import java.util.List;
 import java.util.TreeMap;
+import java.util.concurrent.ConcurrentNavigableMap;
 
 @Mapper
 public interface OrderBookDtoMapper {
@@ -19,7 +20,7 @@ public interface OrderBookDtoMapper {
 
   @Named("mapOrderBookLevels")
   default List<OrderBookResponseDto.OrderBookEntryDto> mapOrderBookLevels(
-    TreeMap<BigDecimal, OrderBook.OrderBookLevel> levels
+    ConcurrentNavigableMap<BigDecimal, OrderBook.OrderBookLevel> levels
   ) {
 
     if (levels == null || levels.isEmpty()) {

deploy/entrypoint.sh

@@ -3,16 +3,16 @@
 import com.xchange.valr.trading.api.domain.orderbook.OrderBook;
 
 import java.math.BigDecimal;
-import java.util.TreeMap;
+import java.util.concurrent.ConcurrentNavigableMap;
 
 public class BuyOrderProcessor extends OrderProcessor {
   @Override
-  protected TreeMap<BigDecimal, OrderBook.OrderBookLevel> getMatchingSide(OrderBook orderBook) {
+  protected ConcurrentNavigableMap<BigDecimal, OrderBook.OrderBookLevel> getMatchingSide(OrderBook orderBook) {
     return orderBook.asks();
   }
 
   @Override
-  protected TreeMap<BigDecimal, OrderBook.OrderBookLevel> getPlacementSide(OrderBook orderBook) {
+  protected ConcurrentNavigableMap<BigDecimal, OrderBook.OrderBookLevel> getPlacementSide(OrderBook orderBook) {
     return orderBook.bids();
   }
 

trading-app/src/main/java/com/xchange/valr/trading/api/application/orderbook/OrderBookDtoMapper.java

@@ -12,7 +12,8 @@
 import java.time.Instant;
 import java.util.Map;
 import java.util.Optional;
-import java.util.TreeMap;
+import java.util.concurrent.ConcurrentSkipListMap;
+
 import static com.xchange.valr.trading.api.domain.limitorder.LimitOrderCommand.LimitOrder.OrderBookSide.BUY;
 import static com.xchange.valr.trading.api.domain.limitorder.LimitOrderCommand.LimitOrder.OrderBookSide.SELL;
 import static java.util.UUID.randomUUID;
@@ -55,8 +56,8 @@ private OrderBook getOrCreateOrderBook(String currencyPair) {
       .orElseGet(
         () -> OrderBook.builder()
           .currencyPair(currencyPair)
-          .asks(new TreeMap<>())
-          .bids(new TreeMap<>())
+          .asks(new ConcurrentSkipListMap<>())
+          .bids(new ConcurrentSkipListMap<>())
           .build()
       );
   }

trading-app/src/main/java/com/xchange/valr/trading/api/domain/limitorder/BuyOrderProcessor.java

@@ -4,11 +4,12 @@
 
 import java.math.BigDecimal;
 import java.util.TreeMap;
+import java.util.concurrent.ConcurrentNavigableMap;
 
 abstract class OrderProcessor {
-  protected abstract TreeMap<BigDecimal, OrderBook.OrderBookLevel> getMatchingSide(OrderBook orderBook);
+  protected abstract ConcurrentNavigableMap<BigDecimal, OrderBook.OrderBookLevel> getMatchingSide(OrderBook orderBook);
 
-  protected abstract TreeMap<BigDecimal, OrderBook.OrderBookLevel> getPlacementSide(OrderBook orderBook);
+  protected abstract ConcurrentNavigableMap<BigDecimal, OrderBook.OrderBookLevel> getPlacementSide(OrderBook orderBook);
 
   protected abstract boolean canMatch(BigDecimal orderPrice, BigDecimal matchPrice);
 
@@ -60,7 +61,7 @@ private BigDecimal matchOrders(
   }
 
   private void updateMatchLevel(
-    TreeMap<BigDecimal, OrderBook.OrderBookLevel> side,
+    ConcurrentNavigableMap<BigDecimal, OrderBook.OrderBookLevel> side,
     BigDecimal price,
     OrderBook.OrderBookLevel level,
     BigDecimal matchedQuantity
@@ -82,7 +83,7 @@ private void placeOrder(
     String currencyPair,
     BigDecimal price,
     BigDecimal quantity,
-    TreeMap<BigDecimal, OrderBook.OrderBookLevel> side
+    ConcurrentNavigableMap<BigDecimal, OrderBook.OrderBookLevel> side
   ) {
     var existingLevel = side.get(price);
     if (existingLevel != null) {

trading-app/src/main/java/com/xchange/valr/trading/api/domain/limitorder/LimitOrderCommandHandler.java

@@ -3,16 +3,16 @@
 import com.xchange.valr.trading.api.domain.orderbook.OrderBook;
 
 import java.math.BigDecimal;
-import java.util.TreeMap;
+import java.util.concurrent.ConcurrentNavigableMap;
 
 public class SellOrderProcessor extends OrderProcessor {
   @Override
-  protected TreeMap<BigDecimal, OrderBook.OrderBookLevel> getMatchingSide(OrderBook orderBook) {
+  protected ConcurrentNavigableMap<BigDecimal, OrderBook.OrderBookLevel> getMatchingSide(OrderBook orderBook) {
     return orderBook.bids();
   }
 
   @Override
-  protected TreeMap<BigDecimal, OrderBook.OrderBookLevel> getPlacementSide(OrderBook orderBook) {
+  protected ConcurrentNavigableMap<BigDecimal, OrderBook.OrderBookLevel> getPlacementSide(OrderBook orderBook) {
     return orderBook.asks();
   }
 

trading-app/src/main/java/com/xchange/valr/trading/api/domain/limitorder/OrderProcessor.java

@@ -8,13 +8,14 @@
 import java.math.BigDecimal;
 import java.time.Instant;
 import java.util.TreeMap;
+import java.util.concurrent.ConcurrentNavigableMap;
 
 @Slf4j
 @Builder(toBuilder = true)
 public record OrderBook(
   String currencyPair,
-  TreeMap<BigDecimal, OrderBookLevel> asks,
-  TreeMap<BigDecimal, OrderBookLevel> bids,
+  ConcurrentNavigableMap<BigDecimal, OrderBookLevel> asks,
+  ConcurrentNavigableMap<BigDecimal, OrderBookLevel> bids,
   Instant lastChange,
   Long sequenceNumber
 ) {

trading-app/src/main/java/com/xchange/valr/trading/api/domain/limitorder/SellOrderProcessor.java

@@ -5,6 +5,7 @@
 
 import java.math.BigDecimal;
 import java.util.TreeMap;
+import java.util.concurrent.ConcurrentSkipListMap;
 
 import static com.xchange.valr.trading.api.domain.model.CurrencyPair.BTCZAR;
 import static org.assertj.core.api.Assertions.assertThat;
@@ -23,8 +24,8 @@ void shouldReturnCorrectOrderSide() {
   protected OrderBook createOrderBook() {
     return OrderBook.builder()
       .currencyPair(BTCZAR.name())
-      .asks(new TreeMap<>())
-      .bids(new TreeMap<>())
+      .asks(new ConcurrentSkipListMap<>())
+      .bids(new ConcurrentSkipListMap<>())
       .build();
   }
 

trading-app/src/main/java/com/xchange/valr/trading/api/domain/orderbook/OrderBook.java

@@ -6,6 +6,7 @@
 import java.math.BigDecimal;
 import java.util.Map;
 import java.util.TreeMap;
+import java.util.concurrent.ConcurrentSkipListMap;
 
 import static com.xchange.valr.trading.api.domain.orderbook.OrderBook.OrderBookSide.BUY;
 import static com.xchange.valr.trading.api.domain.orderbook.OrderBook.OrderBookSide.SELL;
@@ -18,7 +19,7 @@ public static OrderBook orderBook(String currencyPair) {
     return OrderBook.builder()
       .currencyPair(currencyPair)
       .asks(
-        new TreeMap<>(
+        new ConcurrentSkipListMap<>(
           Map.of(
             new BigDecimal("1000000"),
             OrderBook.OrderBookLevel.builder()
@@ -32,7 +33,7 @@ public static OrderBook orderBook(String currencyPair) {
         )
       )
       .bids(
-        new TreeMap<>(
+        new ConcurrentSkipListMap<>(
           Map.of(
             new BigDecimal("900000"),
             OrderBook.OrderBookLevel.builder()
@@ -70,13 +71,13 @@ public static OrderBook createOrderBook(
       .currencyPair(currencyPair)
       .asks(
         side == OrderBook.OrderBookSide.SELL
-          ? new TreeMap<>(Map.of(price, orderBookLevel))
-          : new TreeMap<>()
+          ? new ConcurrentSkipListMap<>(Map.of(price, orderBookLevel))
+          : new ConcurrentSkipListMap<>()
       )
       .bids(
         side == OrderBook.OrderBookSide.BUY
-          ? new TreeMap<>(Map.of(price, orderBookLevel))
-          : new TreeMap<>()
+          ? new ConcurrentSkipListMap<>(Map.of(price, orderBookLevel))
+          : new ConcurrentSkipListMap<>()
       )
       .build();
   }