Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/development' into development
Browse files Browse the repository at this point in the history 
# Conflicts:
#	docs/docs/ressources/how-tos/how-to-create-a-release.md
  • Loading branch information
@straumat
straumat committed Jan 15, 2022
2 parents 9967ff9 + 1aa0386 commit 9d42fc2
Show file tree
Hide file tree
Showing 28 changed files with 117 additions and 110 deletions.
2 changes: 1 addition & 1 deletion .mvn/jvm.config
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
-Xmx1024m -Xms1024m -Djava.awt.headless=true --add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/sun.nio.ch=ALL-UNNAMED --add-opens java.base/java.lang.reflect=ALL-UNNAMED --add-opens java.base/javax.crypto=ALL-UNNAMED --add-opens java.base/java.io=ALL-UNNAMED
-Xmx1024m -Xms1024m -Djava.awt.headless=true --add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/sun.nio.ch=ALL-UNNAMED --add-opens java.base/java.lang.reflect=ALL-UNNAMED --add-opens java.base/javax.crypto=ALL-UNNAMED --add-opens java.base/java.io=ALL-UNNAMED -Dmaven.compiler.showWarnings=true -Dmaven.compiler.showDeprecation=true
6 changes: 3 additions & 3 deletions ...configure/src/main/java/tech/cassandre/trading/bot/api/graphql/data/OrderDataFetcher.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ public class OrderDataFetcher extends BaseDataFetcher {
public final List<OrderDTO> orders() {
return orderRepository.findAll()
.stream()
.map(orderMapper::mapToOrderDTO)
.map(ORDER_MAPPER::mapToOrderDTO)
.collect(Collectors.toList());
}

Expand All @@ -43,7 +43,7 @@ public final List<OrderDTO> orders() {
@DgsQuery
public OrderDTO order(@InputArgument final long id) {
return orderRepository.findById(id)
.map(orderMapper::mapToOrderDTO)
.map(ORDER_MAPPER::mapToOrderDTO)
.orElse(null);
}

Expand All @@ -56,7 +56,7 @@ public OrderDTO order(@InputArgument final long id) {
@DgsQuery
public OrderDTO orderByOrderId(@InputArgument final String orderId) {
return orderRepository.findByOrderId(orderId)
.map(orderMapper::mapToOrderDTO)
.map(ORDER_MAPPER::mapToOrderDTO)
.orElse(null);
}

Expand Down
12 changes: 6 additions & 6 deletions ...figure/src/main/java/tech/cassandre/trading/bot/api/graphql/data/PositionDataFetcher.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ public class PositionDataFetcher extends BaseDataFetcher {
public final List<PositionDTO> positions() {
return positionRepository.findAll()
.stream()
.map(positionMapper::mapToPositionDTO)
.map(POSITION_MAPPER::mapToPositionDTO)
.collect(Collectors.toList());
}

Expand All @@ -45,7 +45,7 @@ public final List<PositionDTO> positions() {
@DgsQuery
public final PositionDTO position(@InputArgument final long id) {
return positionRepository.findById(id)
.map(positionMapper::mapToPositionDTO)
.map(POSITION_MAPPER::mapToPositionDTO)
.orElse(null);
}

Expand All @@ -60,7 +60,7 @@ public final List<PositionDTO> positionsByStrategy(@InputArgument final long id)
return positionRepository.findAll()
.stream()
.filter(position -> position.getStrategy().getId() == id)
.map(positionMapper::mapToPositionDTO)
.map(POSITION_MAPPER::mapToPositionDTO)
.collect(Collectors.toList());
}

Expand All @@ -75,7 +75,7 @@ public final List<PositionDTO> positionsByStrategyId(@InputArgument final String
return positionRepository.findAll()
.stream()
.filter(position -> Objects.equals(position.getStrategy().getStrategyId(), strategyId))
.map(positionMapper::mapToPositionDTO)
.map(POSITION_MAPPER::mapToPositionDTO)
.collect(Collectors.toList());
}

Expand All @@ -92,7 +92,7 @@ public final List<PositionDTO> positionsByStrategyAndStatus(@InputArgument final
return positionRepository.findByStatus(status)
.stream()
.filter(position -> position.getStrategy().getId() == id)
.map(positionMapper::mapToPositionDTO)
.map(POSITION_MAPPER::mapToPositionDTO)
.collect(Collectors.toList());
}

Expand All @@ -109,7 +109,7 @@ public final List<PositionDTO> positionsByStrategyIdAndStatus(@InputArgument fin
return positionRepository.findByStatus(status)
.stream()
.filter(position -> Objects.equals(position.getStrategy().getStrategyId(), strategyId))
.map(positionMapper::mapToPositionDTO)
.map(POSITION_MAPPER::mapToPositionDTO)
.collect(Collectors.toList());
}

Expand Down
6 changes: 3 additions & 3 deletions ...figure/src/main/java/tech/cassandre/trading/bot/api/graphql/data/StrategyDataFetcher.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ public class StrategyDataFetcher extends BaseDataFetcher {
public final List<StrategyDTO> strategies() {
return strategyRepository.findAll()
.stream()
.map(strategyMapper::mapToStrategyDTO)
.map(STRATEGY_MAPPER::mapToStrategyDTO)
.collect(Collectors.toList());
}

Expand All @@ -43,7 +43,7 @@ public final List<StrategyDTO> strategies() {
@DgsQuery
public StrategyDTO strategy(@InputArgument final long id) {
return strategyRepository.findById(id)
.map(strategyMapper::mapToStrategyDTO)
.map(STRATEGY_MAPPER::mapToStrategyDTO)
.orElse(null);
}

Expand All @@ -56,7 +56,7 @@ public StrategyDTO strategy(@InputArgument final long id) {
@DgsQuery
public StrategyDTO strategyByStrategyId(@InputArgument final String strategyId) {
return strategyRepository.findByStrategyId(strategyId)
.map(strategyMapper::mapToStrategyDTO)
.map(STRATEGY_MAPPER::mapToStrategyDTO)
.orElse(null);
}

Expand Down
6 changes: 3 additions & 3 deletions ...configure/src/main/java/tech/cassandre/trading/bot/api/graphql/data/TradeDataFetcher.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ public class TradeDataFetcher extends BaseDataFetcher {
public final List<TradeDTO> trades() {
return tradeRepository.findAll()
.stream()
.map(tradeMapper::mapToTradeDTO)
.map(TRADE_MAPPER::mapToTradeDTO)
.collect(Collectors.toList());
}

Expand All @@ -43,7 +43,7 @@ public final List<TradeDTO> trades() {
@DgsQuery
public final TradeDTO trade(@InputArgument final long id) {
return tradeRepository.findById(id)
.map(tradeMapper::mapToTradeDTO)
.map(TRADE_MAPPER::mapToTradeDTO)
.orElse(null);
}

Expand All @@ -56,7 +56,7 @@ public final TradeDTO trade(@InputArgument final long id) {
@DgsQuery
public final TradeDTO tradeByTradeId(@InputArgument final String tradeId) {
return tradeRepository.findByTradeId(tradeId)
.map(tradeMapper::mapToTradeDTO)
.map(TRADE_MAPPER::mapToTradeDTO)
.orElse(null);
}

Expand Down
8 changes: 4 additions & 4 deletions ...-boot-starter/autoconfigure/src/main/java/tech/cassandre/trading/bot/batch/OrderFlux.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ protected final Set<OrderDTO> getNewValues() {

// If the local order is already saved in database and the order retrieved from the exchange
// is different, then, we update the order in database.
if (orderInDatabase.isPresent() && !orderMapper.mapToOrderDTO(orderInDatabase.get()).equals(order)) {
if (orderInDatabase.isPresent() && !ORDER_MAPPER.mapToOrderDTO(orderInDatabase.get()).equals(order)) {
logger.debug("Updated order from exchange: {}", order);
newValues.add(order);
}
Expand All @@ -61,18 +61,18 @@ protected final Set<OrderDTO> saveValues(final Set<OrderDTO> newValues) {
newValues.forEach(newValue -> orderRepository.findByOrderId(newValue.getOrderId())
.ifPresentOrElse(order -> {
// Update order.
orderMapper.updateOrder(newValue, order);
ORDER_MAPPER.updateOrder(newValue, order);
orders.add(orderRepository.save(order));
logger.debug("Updating order in database: {}", order);
}, () -> {
// Create order.
final Order newOrder = orderMapper.mapToOrder(newValue);
final Order newOrder = ORDER_MAPPER.mapToOrder(newValue);
orders.add(orderRepository.save(newOrder));
logger.debug("Creating order in database: {}", newOrder);
}));

return orders.stream()
.map(orderMapper::mapToOrderDTO)
.map(ORDER_MAPPER::mapToOrderDTO)
.collect(Collectors.toCollection(LinkedHashSet::new));
}

Expand Down
4 changes: 2 additions & 2 deletions ...ot-starter/autoconfigure/src/main/java/tech/cassandre/trading/bot/batch/PositionFlux.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ public final Set<PositionDTO> saveValues(final Set<PositionDTO> newValues) {
final Optional<Position> position = positionRepository.findById(positionDTO.getId());
if (position.isPresent()) {
// If the position is in database (which should be always true), we update it.
positionMapper.updatePosition(positionDTO, position.get());
POSITION_MAPPER.updatePosition(positionDTO, position.get());
positions.add(positionRepository.save(position.get()));
logger.debug("Updating position in database: {}", positionDTO);
} else {
Expand All @@ -45,7 +45,7 @@ public final Set<PositionDTO> saveValues(final Set<PositionDTO> newValues) {
});

return positions.stream()
.map(positionMapper::mapToPositionDTO)
.map(POSITION_MAPPER::mapToPositionDTO)
.collect(Collectors.toCollection(LinkedHashSet::new));
}

Expand Down
8 changes: 4 additions & 4 deletions ...-boot-starter/autoconfigure/src/main/java/tech/cassandre/trading/bot/batch/TradeFlux.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ protected final Set<TradeDTO> getNewValues() {
}

// The trade is in database but the trade values from the server changed.
if (tradeInDatabase.isPresent() && !tradeMapper.mapToTradeDTO(tradeInDatabase.get()).equals(trade)) {
if (tradeInDatabase.isPresent() && !TRADE_MAPPER.mapToTradeDTO(tradeInDatabase.get()).equals(trade)) {
logger.debug("Updated trade from exchange: {}", trade);
newValues.add(trade);
}
Expand All @@ -66,20 +66,20 @@ public final Set<TradeDTO> saveValues(final Set<TradeDTO> newValues) {
newValues.forEach(newValue -> tradeRepository.findByTradeId(newValue.getTradeId())
.ifPresentOrElse(trade -> {
// Update trade.
tradeMapper.updateTrade(newValue, trade);
TRADE_MAPPER.updateTrade(newValue, trade);
trades.add(tradeRepository.save(trade));
logger.debug("Updating trade in database: {}", trade);
}, () -> {
// Create trade.
final Trade newTrade = tradeMapper.mapToTrade(newValue);
final Trade newTrade = TRADE_MAPPER.mapToTrade(newValue);
// Order is always present as we check it in getNewValues().
orderRepository.findByOrderId(newValue.getOrderId()).ifPresent(newTrade::setOrder);
trades.add(tradeRepository.save(newTrade));
logger.debug("Creating trade in database: {}", newTrade);
}));

return trades.stream()
.map(tradeMapper::mapToTradeDTO)
.map(TRADE_MAPPER::mapToTradeDTO)
.collect(Collectors.toCollection(LinkedHashSet::new));
}

Expand Down
8 changes: 4 additions & 4 deletions ...e/src/main/java/tech/cassandre/trading/bot/configuration/StrategiesAutoConfiguration.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -238,8 +238,8 @@ public void configure() {
// positionService. Here we force the status recalculation, and we save it.
positionRepository.findByStatusIn(Stream.of(OPENING, CLOSING).collect(Collectors.toSet()))
.stream()
.map(positionMapper::mapToPositionDTO)
.map(positionMapper::mapToPosition)
.map(POSITION_MAPPER::mapToPositionDTO)
.map(POSITION_MAPPER::mapToPosition)
.forEach(positionRepository::save);

// =============================================================================================================
Expand Down Expand Up @@ -279,7 +279,7 @@ public void configure() {
// Update.
existingStrategy.setName(annotation.strategyName());
strategyRepository.save(existingStrategy);
final StrategyDTO strategyDTO = strategyMapper.mapToStrategyDTO(existingStrategy);
final StrategyDTO strategyDTO = STRATEGY_MAPPER.mapToStrategyDTO(existingStrategy);
strategyDTO.initializeLastPositionIdUsed(positionRepository.getLastPositionIdUsedByStrategy(strategyDTO.getId()));
strategy.setStrategy(strategyDTO);
logger.debug("Strategy updated in database: {}.", existingStrategy);
Expand All @@ -296,7 +296,7 @@ public void configure() {
newStrategy.setType(BASIC_TA4J_STRATEGY);
}
logger.debug("Strategy created in database: {}.", newStrategy);
StrategyDTO strategyDTO = strategyMapper.mapToStrategyDTO(strategyRepository.save(newStrategy));
StrategyDTO strategyDTO = STRATEGY_MAPPER.mapToStrategyDTO(strategyRepository.save(newStrategy));
strategyDTO.initializeLastPositionIdUsed(positionRepository.getLastPositionIdUsedByStrategy(strategyDTO.getId()));
strategy.setStrategy(strategyDTO);
});
Expand Down
2 changes: 1 addition & 1 deletion ...rc/main/java/tech/cassandre/trading/bot/service/ExchangeServiceXChangeImplementation.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ public Set<CurrencyPairDTO> getAvailableCurrencyPairs() {
.keySet()
.stream()
.peek(cp -> logger.debug(" - {} available", cp))
.map(currencyMapper::mapToCurrencyPairDTO)
.map(CURRENCY_MAPPER::mapToCurrencyPairDTO)
.collect(Collectors.toCollection(LinkedHashSet::new));
}

Expand Down
6 changes: 3 additions & 3 deletions .../src/main/java/tech/cassandre/trading/bot/service/MarketServiceXChangeImplementation.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ public Optional<TickerDTO> getTicker(final CurrencyPairDTO currencyPair) {
bucket.asBlocking().consume(1);

logger.debug("Getting ticker for {} currency pair", currencyPair);
TickerDTO t = tickerMapper.mapToTickerDTO(marketDataService.getTicker(currencyMapper.mapToCurrencyPair(currencyPair)));
TickerDTO t = TICKER_MAPPER.mapToTickerDTO(marketDataService.getTicker(CURRENCY_MAPPER.mapToInstrument(currencyPair)));
logger.debug(" - New ticker {}", t);
return Optional.ofNullable(t);
} catch (IOException e) {
Expand All @@ -62,7 +62,7 @@ public Set<TickerDTO> getTickers(final Set<CurrencyPairDTO> currencyPairs) {
// We create the currency pairs parameters.
CurrencyPairsParam params = () -> currencyPairs
.stream()
.map(currencyMapper::mapToCurrencyPair)
.map(CURRENCY_MAPPER::mapToCurrencyPair)
.collect(Collectors.toCollection(LinkedList::new));

// Consume a token from the token bucket.
Expand All @@ -72,7 +72,7 @@ public Set<TickerDTO> getTickers(final Set<CurrencyPairDTO> currencyPairs) {
logger.debug("Getting tickers for {} currency pairs", currencyPairs.size());
final List<Ticker> tickers = marketDataService.getTickers(params);
return tickers.stream()
.map(tickerMapper::mapToTickerDTO)
.map(TICKER_MAPPER::mapToTickerDTO)
.peek(t -> logger.debug(" - New ticker: {}", t))
.collect(Collectors.toCollection(LinkedHashSet::new));
} catch (IOException e) {
Expand Down
14 changes: 7 additions & 7 deletions .../main/java/tech/cassandre/trading/bot/service/PositionServiceCassandreImplementation.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -117,13 +117,13 @@ public final PositionCreationResultDTO createPosition(final GenericCassandreStra
// =========================================================================================================
// Creates the position in database.
Position position = new Position();
position.setStrategy(strategyMapper.mapToStrategy(strategy.getStrategyDTO()));
position.setStrategy(STRATEGY_MAPPER.mapToStrategy(strategy.getStrategyDTO()));
position = positionRepository.save(position);

// =========================================================================================================
// Creates the position dto.
PositionDTO p = new PositionDTO(position.getId(), type, strategy.getStrategyDTO(), currencyPair, amount, orderCreationResult.getOrder(), rules);
positionRepository.save(positionMapper.mapToPosition(p));
positionRepository.save(POSITION_MAPPER.mapToPosition(p));
logger.debug("Position {} opened with order {}",
p.getPositionId(),
orderCreationResult.getOrder().getOrderId());
Expand Down Expand Up @@ -163,7 +163,7 @@ public final void updatePositionRules(final long id, final PositionRulesDTO newR
public final OrderCreationResultDTO closePosition(final GenericCassandreStrategy strategy, final long id, final TickerDTO ticker) {
final Optional<Position> position = positionRepository.findById(id);
if (position.isPresent()) {
final PositionDTO positionDTO = positionMapper.mapToPositionDTO(position.get());
final PositionDTO positionDTO = POSITION_MAPPER.mapToPositionDTO(position.get());

final OrderCreationResultDTO orderCreationResult;
// Here, we treat the order creation depending on the position type (Short or long).
Expand Down Expand Up @@ -212,22 +212,22 @@ public final void forcePositionClosing(final long id) {
public final Set<PositionDTO> getPositions() {
logger.debug("Retrieving all positions");
return positionRepository.findByOrderById().stream()
.map(positionMapper::mapToPositionDTO)
.map(POSITION_MAPPER::mapToPositionDTO)
.collect(Collectors.toCollection(LinkedHashSet::new));
}

@Override
public final Optional<PositionDTO> getPositionById(final long id) {
logger.debug("Retrieving position by id {}", id);
final Optional<Position> position = positionRepository.findById(id);
return position.map(positionMapper::mapToPositionDTO);
return position.map(POSITION_MAPPER::mapToPositionDTO);
}

@Override
public final Map<Long, CurrencyAmountDTO> getAmountsLockedByPosition() {
// List of status that locks amounts.
return positionRepository.findByStatusIn(new HashSet<>(Arrays.asList(OPENING, OPENED))).stream()
.map(positionMapper::mapToPositionDTO)
.map(POSITION_MAPPER::mapToPositionDTO)
.collect(Collectors.toMap(PositionDTO::getId, PositionDTO::getAmountToLock, (key, value) -> key, HashMap::new));
}

Expand All @@ -243,7 +243,7 @@ public final HashMap<CurrencyDTO, GainDTO> getGains() {
// We calculate, by currency, the amount bought & sold.
positionRepository.findByStatus(CLOSED)
.stream()
.map(positionMapper::mapToPositionDTO)
.map(POSITION_MAPPER::mapToPositionDTO)
.forEach(p -> {
// We retrieve the currency and initiate the maps if they are empty
CurrencyDTO currency;
Expand Down
Loading

0 comments on commit 9d42fc2

Please sign in to comment.