Skip to content

Commit 0d6409d

Browse files
straumatstraumat
committed
Merge branch 'release/5.0.8'
2 parents 08aacf0 + 47e79c3 commit 0d6409d

File tree

79 files changed

+871
-255
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

79 files changed

+871
-255
lines changed

‎.github/workflows/integration-tests.yml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@ name: Integration tests
22

33
on:
44
schedule:
5-
- cron: '0 18 * * MON'
6-
- cron: '0 18 * * THU'
75
- cron: '0 18 * * SUN'
86

97
jobs:

‎.github/workflows/release-creation.yml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,12 @@ on:
55
tags:
66
- '*'
77

8+
permissions:
9+
id-token: "write"
10+
contents: "write"
11+
packages: "write"
12+
pull-requests: "read"
13+
814
jobs:
915
build:
1016
runs-on: ubuntu-latest

‎.mvn/jvm.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +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
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 -Dmaven.compiler.showWarnings=true -Dmaven.compiler.showDeprecation=true

‎docs/docs/ressources/how-tos/how-to-create-a-release.md‎

Lines changed: 22 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,9 @@ description: How to create an official Cassandre release
55
---
66
# Create a release
77

8-
## Prepare the release
9-
* Fix [Codacy](https://app.codacy.com/gh/cassandre-tech/cassandre-trading-bot/issues) & Intellij warnings.
8+
## Things to check before release
9+
* Fix Intellij warnings.
10+
* Fix [Codacy](https://app.codacy.com/gh/cassandre-tech/cassandre-trading-bot/issues) warnings.
1011
* Update [security.md](https://github.com/cassandre-tech/cassandre-trading-bot/blob/development/SECURITY.md).
1112

1213
## Create the release with Maven
@@ -15,7 +16,7 @@ You must be using `ssh` and not `https`. To switch to `ssh`, type :
1516
git remote set-url origin git@github.com:cassandre-tech/cassandre-trading-bot.git
1617
```
1718

18-
Check that you are on the develop branch and that everything is committed:
19+
Check that you are on the `development` branch and that everything is committed:
1920
```bash
2021
git checkout development
2122
git status
@@ -35,3 +36,21 @@ mvn gitflow:release-finish
3536
* Close the corresponding [milestone in Github](https://github.com/cassandre-tech/cassandre-trading-bot/milestones?direction=asc&sort=due_date&state=open).
3637
* Write and send a [substack post](https://cassandre.substack.com/publish?utm_source=menu).
3738
* Update cassandre release number on production trading bots.
39+
40+
## Releases text
41+
* English: "We've just released Cassandre 5.0.7, a Spring boot starter to create and run your java crypto trading bot in minutes. Details here: URL #trading #tradingbot #crypto #bitcoin #java"
42+
* French: "Sortie de Cassandre 5.0.7, notre Spring Boot Starter qui permet de créer son propre bot de trading pour les cryptos en quelques minutes. Plus de détails ici : URL #trading #tradingbot #crypto #bitcoin #java"
43+
44+
## Tell the world
45+
* Retrieve the news URL from [GitHub](https://github.com/cassandre-tech/cassandre-trading-bot/releases).
46+
* Publish on Cassandre Twitter (should be done by GitHub CI).
47+
* Publish on Cassandre Discord (should be done by GitHub CI).
48+
* Publish on my personal accounts (Facebook, Twitter & LinkedIn).
49+
* Publish on [linuxfr](https://linuxfr.org/).
50+
* Publish on [bitcointalk](https://bitcointalk.org/index.php?board=8.0).
51+
* Publish on [IndieHackers](https://www.indiehackers.com/new-post).
52+
* Publish on Reddit.
53+
* Programming: [Java](https://www.reddit.com/r/java/), [Kotlin](https://www.reddit.com/r/Kotlin/).
54+
* Exchanges: [Kucoin](https://www.reddit.com/r/kucoin/), [Coinbase](https://www.reddit.com/r/CoinBase/), [Binance](https://www.reddit.com/r/binance/).
55+
* Trading: [Cryptotrading](https://www.reddit.com/r/cryptotrading/).
56+
* Crypto currencies: TODO.

‎pom.xml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<!-- Project information -->
99
<groupId>tech.cassandre.trading.bot</groupId>
1010
<artifactId>cassandre-trading-bot-project</artifactId>
11-
<version>5.0.7</version>
11+
<version>5.0.8</version>
1212
<packaging>pom</packaging>
1313
<name>Cassandre trading bot</name>
1414
<url>https://github.com/cassandre-tech/cassandre-trading-bot</url>
@@ -55,7 +55,7 @@
5555
<parent>
5656
<groupId>org.springframework.boot</groupId>
5757
<artifactId>spring-boot-starter-parent</artifactId>
58-
<version>2.6.2</version>
58+
<version>2.6.3</version>
5959
<relativePath/>
6060
</parent>
6161
<!-- =========================================================================================================== -->
@@ -75,9 +75,9 @@
7575
<!-- Core -->
7676
<spring.version>2.6.1</spring.version>
7777
<reactor.version>Dysprosium-SR25</reactor.version>
78-
<xchange.version>5.0.12</xchange.version>
79-
<bucket4j.version>6.4.1</bucket4j.version>
80-
<liquibase.version>4.6.2</liquibase.version>
78+
<xchange.version>5.0.13</xchange.version>
79+
<bucket4j.version>7.0.0</bucket4j.version>
80+
<liquibase.version>4.7.1</liquibase.version>
8181
<opencsv.version>5.5.2</opencsv.version>
8282

8383
<!-- Core utils -->
@@ -96,20 +96,20 @@
9696
<jackson.version>2.12.6</jackson.version>
9797

9898
<!-- GraphQL API -->
99-
<graphql-dgs.version>4.9.15</graphql-dgs.version>
99+
<graphql-dgs.version>4.9.16</graphql-dgs.version>
100100

101101
<!-- Maven -->
102102
<maven.checkstyle.plugin.version>3.1.2</maven.checkstyle.plugin.version>
103103
<maven.puppycrawl.checkstyle.version>9.2.1</maven.puppycrawl.checkstyle.version>
104104
<maven.resources.plugin.version>3.2.0</maven.resources.plugin.version>
105-
<maven.compiler.plugin.version>3.8.1</maven.compiler.plugin.version>
105+
<maven.compiler.plugin.version>3.9.0</maven.compiler.plugin.version>
106106
<maven.surefire.plugin.version>2.22.2</maven.surefire.plugin.version>
107107
<maven.jacoco.plugin.version>0.8.7</maven.jacoco.plugin.version>
108108
<maven.failsafe.plugin.version>2.22.2</maven.failsafe.plugin.version>
109109
<maven.lombok.plugin.version>1.18.20.0</maven.lombok.plugin.version>
110110
<maven.source.plugin.version>3.2.1</maven.source.plugin.version>
111111
<maven.javadoc.plugin.version>3.3.1</maven.javadoc.plugin.version>
112-
<maven.jar.plugin.version>3.2.0</maven.jar.plugin.version>
112+
<maven.jar.plugin.version>3.2.2</maven.jar.plugin.version>
113113
<maven.archetype-packaging.version>3.2.1</maven.archetype-packaging.version>
114114
</properties>
115115
<!-- =========================================================================================================== -->

‎spring-boot-starter-api/spring-boot-starter-api-graphql/autoconfigure/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@
219219
<parent>
220220
<groupId>tech.cassandre.trading.bot</groupId>
221221
<artifactId>cassandre-trading-bot-project</artifactId>
222-
<version>5.0.7</version>
222+
<version>5.0.8</version>
223223
<relativePath>../../../pom.xml</relativePath>
224224
</parent>
225225
<!-- =========================================================================================================== -->

‎spring-boot-starter-api/spring-boot-starter-api-graphql/autoconfigure/src/main/java/tech/cassandre/trading/bot/api/graphql/data/OrderDataFetcher.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public class OrderDataFetcher extends BaseDataFetcher {
3030
public final List<OrderDTO> orders() {
3131
return orderRepository.findAll()
3232
.stream()
33-
.map(orderMapper::mapToOrderDTO)
33+
.map(ORDER_MAPPER::mapToOrderDTO)
3434
.collect(Collectors.toList());
3535
}
3636

@@ -43,7 +43,7 @@ public final List<OrderDTO> orders() {
4343
@DgsQuery
4444
public OrderDTO order(@InputArgument final long id) {
4545
return orderRepository.findById(id)
46-
.map(orderMapper::mapToOrderDTO)
46+
.map(ORDER_MAPPER::mapToOrderDTO)
4747
.orElse(null);
4848
}
4949

@@ -56,7 +56,7 @@ public OrderDTO order(@InputArgument final long id) {
5656
@DgsQuery
5757
public OrderDTO orderByOrderId(@InputArgument final String orderId) {
5858
return orderRepository.findByOrderId(orderId)
59-
.map(orderMapper::mapToOrderDTO)
59+
.map(ORDER_MAPPER::mapToOrderDTO)
6060
.orElse(null);
6161
}
6262

‎spring-boot-starter-api/spring-boot-starter-api-graphql/autoconfigure/src/main/java/tech/cassandre/trading/bot/api/graphql/data/PositionDataFetcher.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ public class PositionDataFetcher extends BaseDataFetcher {
3232
public final List<PositionDTO> positions() {
3333
return positionRepository.findAll()
3434
.stream()
35-
.map(positionMapper::mapToPositionDTO)
35+
.map(POSITION_MAPPER::mapToPositionDTO)
3636
.collect(Collectors.toList());
3737
}
3838

@@ -45,7 +45,7 @@ public final List<PositionDTO> positions() {
4545
@DgsQuery
4646
public final PositionDTO position(@InputArgument final long id) {
4747
return positionRepository.findById(id)
48-
.map(positionMapper::mapToPositionDTO)
48+
.map(POSITION_MAPPER::mapToPositionDTO)
4949
.orElse(null);
5050
}
5151

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

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

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

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

‎spring-boot-starter-api/spring-boot-starter-api-graphql/autoconfigure/src/main/java/tech/cassandre/trading/bot/api/graphql/data/StrategyDataFetcher.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public class StrategyDataFetcher extends BaseDataFetcher {
3030
public final List<StrategyDTO> strategies() {
3131
return strategyRepository.findAll()
3232
.stream()
33-
.map(strategyMapper::mapToStrategyDTO)
33+
.map(STRATEGY_MAPPER::mapToStrategyDTO)
3434
.collect(Collectors.toList());
3535
}
3636

@@ -43,7 +43,7 @@ public final List<StrategyDTO> strategies() {
4343
@DgsQuery
4444
public StrategyDTO strategy(@InputArgument final long id) {
4545
return strategyRepository.findById(id)
46-
.map(strategyMapper::mapToStrategyDTO)
46+
.map(STRATEGY_MAPPER::mapToStrategyDTO)
4747
.orElse(null);
4848
}
4949

@@ -56,7 +56,7 @@ public StrategyDTO strategy(@InputArgument final long id) {
5656
@DgsQuery
5757
public StrategyDTO strategyByStrategyId(@InputArgument final String strategyId) {
5858
return strategyRepository.findByStrategyId(strategyId)
59-
.map(strategyMapper::mapToStrategyDTO)
59+
.map(STRATEGY_MAPPER::mapToStrategyDTO)
6060
.orElse(null);
6161
}
6262

‎spring-boot-starter-api/spring-boot-starter-api-graphql/autoconfigure/src/main/java/tech/cassandre/trading/bot/api/graphql/data/TradeDataFetcher.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public class TradeDataFetcher extends BaseDataFetcher {
3030
public final List<TradeDTO> trades() {
3131
return tradeRepository.findAll()
3232
.stream()
33-
.map(tradeMapper::mapToTradeDTO)
33+
.map(TRADE_MAPPER::mapToTradeDTO)
3434
.collect(Collectors.toList());
3535
}
3636

@@ -43,7 +43,7 @@ public final List<TradeDTO> trades() {
4343
@DgsQuery
4444
public final TradeDTO trade(@InputArgument final long id) {
4545
return tradeRepository.findById(id)
46-
.map(tradeMapper::mapToTradeDTO)
46+
.map(TRADE_MAPPER::mapToTradeDTO)
4747
.orElse(null);
4848
}
4949

@@ -56,7 +56,7 @@ public final TradeDTO trade(@InputArgument final long id) {
5656
@DgsQuery
5757
public final TradeDTO tradeByTradeId(@InputArgument final String tradeId) {
5858
return tradeRepository.findByTradeId(tradeId)
59-
.map(tradeMapper::mapToTradeDTO)
59+
.map(TRADE_MAPPER::mapToTradeDTO)
6060
.orElse(null);
6161
}
6262

0 commit comments

Comments
 (0)