[256] Switch to Java 21

Bug: #256 Signed-off-by: Stéphane Bégaudeau <[email protected]>
svalyn · Sep 27, 2023 · 040c4e9 · 040c4e9
1 parent e895257
commit 040c4e9
Show file tree

Hide file tree

Showing 9 changed files with 28 additions and 38 deletions.
diff --git a/.github/workflows/continuous_integration.yml b/.github/workflows/continuous_integration.yml
@@ -14,20 +14,20 @@ jobs:
     if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4.0.0
 
       - name: Setup Node SDK
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v3.8.1
         with:
           node-version: '18.x'
           cache: 'npm'
           cache-dependency-path: frontend/svalyn-studio-app/package-lock.json
 
       - name: Setup Java SDK
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v3.13.0
         with:
           distribution: 'temurin'
-          java-version: 20
+          java-version: 21
           cache: 'maven'
 
       - name: Build the frontend

diff --git a/backend/svalyn-studio-application/pom.xml b/backend/svalyn-studio-application/pom.xml
@@ -35,8 +35,8 @@
     <version>2023.10.0-SNAPSHOT</version>
 
     <properties>
-        <maven.compiler.source>20</maven.compiler.source>
-        <maven.compiler.target>20</maven.compiler.target>
+        <maven.compiler.source>21</maven.compiler.source>
+        <maven.compiler.target>21</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
 

diff --git a/...lication/src/main/java/com/svalyn/studio/application/services/account/AccountService.java b/...lication/src/main/java/com/svalyn/studio/application/services/account/AccountService.java
@@ -107,30 +107,20 @@ public Page<AccountDTO> findAll(int page, int rowsPerPage) {
     @Override
     @Transactional
     public IPayload createAccount(CreateAccountInput input) {
-        IPayload payload = null;
-
         var result = this.accountCreationService.createAccount(input.name(), input.email(), input.username(), input.password());
-        if (result instanceof Failure<Account> failure) {
-            payload = new ErrorPayload(input.id(), failure.message());
-        } else if (result instanceof Success<Account> success) {
-            payload = new CreateAccountSuccessPayload(input.id(), this.toDTO(success.data()));
-        }
-
-        return payload;
+        return switch (result) {
+            case Failure<Account> failure -> new ErrorPayload(input.id(), failure.message());
+            case Success<Account> success -> new CreateAccountSuccessPayload(input.id(), this.toDTO(success.data()));
+        };
     }
 
     @Override
     @Transactional
     public IPayload deleteAccount(DeleteAccountInput input) {
-        IPayload payload = null;
-
         var result = this.accountDeletionService.deleteAccount(input.username());
-        if (result instanceof Failure<Void> failure) {
-            payload = new ErrorPayload(input.id(), failure.message());
-        } else if (result instanceof Success<Void>) {
-            payload = new SuccessPayload(input.id());
-        }
-
-        return payload;
+        return switch (result) {
+            case Failure<Void> failure -> new ErrorPayload(input.id(), failure.message());
+            case Success<Void> success -> new SuccessPayload(input.id());
+        };
     }
 }
diff --git a/backend/svalyn-studio-domain/pom.xml b/backend/svalyn-studio-domain/pom.xml
@@ -35,8 +35,8 @@
     <version>2023.10.0-SNAPSHOT</version>
 
     <properties>
-        <maven.compiler.source>20</maven.compiler.source>
-        <maven.compiler.target>20</maven.compiler.target>
+        <maven.compiler.source>21</maven.compiler.source>
+        <maven.compiler.target>21</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
 

diff --git a/backend/svalyn-studio-infrastructure/pom.xml b/backend/svalyn-studio-infrastructure/pom.xml
@@ -35,8 +35,8 @@
     <version>2023.10.0-SNAPSHOT</version>
 
     <properties>
-        <maven.compiler.source>20</maven.compiler.source>
-        <maven.compiler.target>20</maven.compiler.target>
+        <maven.compiler.source>21</maven.compiler.source>
+        <maven.compiler.target>21</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
 

diff --git a/backend/svalyn-studio-message/pom.xml b/backend/svalyn-studio-message/pom.xml
@@ -35,8 +35,8 @@
     <version>2023.10.0-SNAPSHOT</version>
 
     <properties>
-        <maven.compiler.source>20</maven.compiler.source>
-        <maven.compiler.target>20</maven.compiler.target>
+        <maven.compiler.source>21</maven.compiler.source>
+        <maven.compiler.target>21</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
 

diff --git a/backend/svalyn-studio-parent/pom.xml b/backend/svalyn-studio-parent/pom.xml
@@ -36,8 +36,8 @@
     <packaging>pom</packaging>
 
     <properties>
-        <maven.compiler.source>20</maven.compiler.source>
-        <maven.compiler.target>20</maven.compiler.target>
+        <maven.compiler.source>21</maven.compiler.source>
+        <maven.compiler.target>21</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
 
@@ -57,7 +57,7 @@
                 <configuration>
                     <toolchains>
                         <jdk>
-                            <version>20</version>
+                            <version>21</version>
                             <vendor>temurin</vendor>
                         </jdk>
                     </toolchains>
@@ -92,7 +92,7 @@
             <plugin>
                 <groupId>org.jacoco</groupId>
                 <artifactId>jacoco-maven-plugin</artifactId>
-                <version>0.8.9</version>
+                <version>0.8.10</version>
                 <executions>
                     <execution>
                         <goals>

diff --git a/backend/svalyn-studio-test-coverage/pom.xml b/backend/svalyn-studio-test-coverage/pom.xml
@@ -28,8 +28,8 @@
     <version>2023.10.0-SNAPSHOT</version>
 
     <properties>
-        <maven.compiler.source>20</maven.compiler.source>
-        <maven.compiler.target>20</maven.compiler.target>
+        <maven.compiler.source>21</maven.compiler.source>
+        <maven.compiler.target>21</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
 

diff --git a/backend/svalyn-studio/pom.xml b/backend/svalyn-studio/pom.xml
@@ -35,8 +35,8 @@
     <version>2023.10.0-SNAPSHOT</version>
 
     <properties>
-        <maven.compiler.source>20</maven.compiler.source>
-        <maven.compiler.target>20</maven.compiler.target>
+        <maven.compiler.source>21</maven.compiler.source>
+        <maven.compiler.target>21</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>