From 1fb743f1590cb63beb0f9b28dee51663917d4dcc Mon Sep 17 00:00:00 2001
From: BOUHOURS Antoine <antoine.bouhours@rte-france.com>
Date: Wed, 14 Jan 2026 09:26:19 +0100
Subject: [PATCH 1/9] Fix Sonar coverage of monitor-commons

---
 .../monitor/commons/ProcessStatus.java        | 25 ++++++++++++++++++-
 1 file changed, 24 insertions(+), 1 deletion(-)

diff --git a/monitor-commons/src/main/java/org/gridsuite/monitor/commons/ProcessStatus.java b/monitor-commons/src/main/java/org/gridsuite/monitor/commons/ProcessStatus.java
index da5a24c..ea8fcd3 100644
--- a/monitor-commons/src/main/java/org/gridsuite/monitor/commons/ProcessStatus.java
+++ b/monitor-commons/src/main/java/org/gridsuite/monitor/commons/ProcessStatus.java
@@ -13,5 +13,28 @@ public enum ProcessStatus {
     SCHEDULED,
     RUNNING,
     COMPLETED,
-    FAILED
+    FAILED,
+    TEST1,
+    TEST2,
+    TEST3,
+    TEST4,
+    TEST5,
+    TEST6,
+    TEST7,
+    TEST8,
+    TEST9,
+    TEST10,
+    TEST11,
+    TEST12,
+    TEST13,
+    TEST14,
+    TEST15,
+    TEST16,
+    TEST17,
+    TEST18,
+    TEST19,
+    TEST20,
+    TEST21,
+    TEST22,
+    TEST23,
 }

From 5c5ee80d086505de8f502c4a9e28b1cbb3d5ac07 Mon Sep 17 00:00:00 2001
From: BOUHOURS Antoine <antoine.bouhours@rte-france.com>
Date: Wed, 14 Jan 2026 09:59:38 +0100
Subject: [PATCH 2/9] Fix Sonar coverage of monitor-commons

---
 .github/workflows/maven.yml | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)
 create mode 100644 .github/workflows/maven.yml

diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
new file mode 100644
index 0000000..abd7201
--- /dev/null
+++ b/.github/workflows/maven.yml
@@ -0,0 +1,33 @@
+name: CI
+
+on:
+  push:
+    branches:
+      - 'main'
+      - 'branch-test'
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Set up JDK 17
+        uses: actions/setup-java@v1
+        with:
+          java-version: 21
+
+      - name: Checkout sources
+        uses: actions/checkout@v1
+
+      - name: Build with Maven
+        run: mvn --batch-mode -P jacoco install
+
+      - name: Run SonarCloud analysis
+        run: >
+          mvn --batch-mode -DskipTests sonar:sonar
+          -Dsonar.host.url=https://sonarcloud.io
+          -Dsonar.organization=gridsuite
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          SONAR_TOKEN: ${{ secrets.REPO_ACCESS_TOKEN }}

From 9bf212270948a0b5efd994426f00137cc0b81be7 Mon Sep 17 00:00:00 2001
From: BOUHOURS Antoine <antoine.bouhours@rte-france.com>
Date: Wed, 14 Jan 2026 10:06:06 +0100
Subject: [PATCH 3/9] Fix Sonar coverage of monitor-commons

---
 .github/workflows/maven.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index abd7201..f7a2e19 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -29,5 +29,5 @@ jobs:
           -Dsonar.host.url=https://sonarcloud.io
           -Dsonar.organization=gridsuite
         env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          SONAR_TOKEN: ${{ secrets.REPO_ACCESS_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.REPO_ACCESS_TOKEN }}
+          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}

From 90bb375b298366694f03cbe0d1266ec718f4946e Mon Sep 17 00:00:00 2001
From: BOUHOURS Antoine <antoine.bouhours@rte-france.com>
Date: Wed, 14 Jan 2026 10:13:23 +0100
Subject: [PATCH 4/9] Fix Sonar coverage of monitor-commons

---
 monitor-server/pom.xml        | 28 ++++++++++++++++++++++++++++
 monitor-worker-server/pom.xml | 29 ++++++++++++++++++++++++++++-
 pom.xml                       |  4 ++++
 3 files changed, 60 insertions(+), 1 deletion(-)

diff --git a/monitor-server/pom.xml b/monitor-server/pom.xml
index 1a53beb..c3a90d4 100644
--- a/monitor-server/pom.xml
+++ b/monitor-server/pom.xml
@@ -150,4 +150,32 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
+
+    <!-- The report-aggregate goal collects coverage data from this module and all its dependencies,
+     including monitor-commons DTOs, to generate a unified coverage report. -->
+    <profiles>
+        <profile>
+            <id>jacoco</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.jacoco</groupId>
+                        <artifactId>jacoco-maven-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>report-aggregate</id>
+                                <phase>verify</phase>
+                                <goals>
+                                    <goal>report-aggregate</goal>
+                                </goals>
+                                <configuration>
+                                    <title>${project.parent.name}</title>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
 </project>
diff --git a/monitor-worker-server/pom.xml b/monitor-worker-server/pom.xml
index f124ed4..dda419c 100644
--- a/monitor-worker-server/pom.xml
+++ b/monitor-worker-server/pom.xml
@@ -143,6 +143,33 @@
             <artifactId>spring-boot-starter-test</artifactId>
             <scope>test</scope>
         </dependency>
-
     </dependencies>
+
+    <!-- The report-aggregate goal collects coverage data from this module and all its dependencies,
+ including monitor-commons DTOs, to generate a unified coverage report. -->
+    <profiles>
+        <profile>
+            <id>jacoco</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.jacoco</groupId>
+                        <artifactId>jacoco-maven-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>report-aggregate</id>
+                                <phase>verify</phase>
+                                <goals>
+                                    <goal>report-aggregate</goal>
+                                </goals>
+                                <configuration>
+                                    <title>${project.parent.name}</title>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
 </project>
diff --git a/pom.xml b/pom.xml
index 03e52b3..fc540d2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -43,6 +43,10 @@
         <gridsuite-dependencies.version>46.0.0</gridsuite-dependencies.version>
         <sonar.organization>gridsuite</sonar.organization>
         <sonar.projectKey>org.gridsuite:monitor-core</sonar.projectKey>
+        <sonar.coverage.jacoco.xmlReportPaths>
+            ${project.basedir}/monitor-server/target/site/jacoco/jacoco.xml,
+            ${project.basedir}/monitor-worker-server/target/site/jacoco/jacoco.xml,
+        </sonar.coverage.jacoco.xmlReportPaths>
     </properties>
 
     <dependencyManagement>

From 44845ea62b64e3779d715acc4048c4ce2f3902b4 Mon Sep 17 00:00:00 2001
From: BOUHOURS Antoine <antoine.bouhours@rte-france.com>
Date: Wed, 14 Jan 2026 10:20:50 +0100
Subject: [PATCH 5/9] Fix Sonar coverage of monitor-commons

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index fc540d2..aca4365 100644
--- a/pom.xml
+++ b/pom.xml
@@ -44,8 +44,8 @@
         <sonar.organization>gridsuite</sonar.organization>
         <sonar.projectKey>org.gridsuite:monitor-core</sonar.projectKey>
         <sonar.coverage.jacoco.xmlReportPaths>
-            ${project.basedir}/monitor-server/target/site/jacoco/jacoco.xml,
-            ${project.basedir}/monitor-worker-server/target/site/jacoco/jacoco.xml,
+            ../monitor-server/target/site/jacoco/jacoco.xml,
+            ../monitor-worker-server/target/site/jacoco/jacoco.xml,
         </sonar.coverage.jacoco.xmlReportPaths>
     </properties>
 

From b1edfa2de5f41662fb45d9c4246f8b9982f556c4 Mon Sep 17 00:00:00 2001
From: BOUHOURS Antoine <antoine.bouhours@rte-france.com>
Date: Wed, 14 Jan 2026 10:23:18 +0100
Subject: [PATCH 6/9] Fix Sonar coverage of monitor-commons

---
 pom.xml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pom.xml b/pom.xml
index aca4365..a74b5b0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -46,6 +46,10 @@
         <sonar.coverage.jacoco.xmlReportPaths>
             ../monitor-server/target/site/jacoco/jacoco.xml,
             ../monitor-worker-server/target/site/jacoco/jacoco.xml,
+            ../../monitor-server/target/site/jacoco/jacoco.xml,
+            ../../monitor-worker-server/target/site/jacoco/jacoco.xml,
+            ../../../monitor-server/target/site/jacoco/jacoco.xml,
+            ../../../monitor-worker-server/target/site/jacoco/jacoco.xml,
         </sonar.coverage.jacoco.xmlReportPaths>
     </properties>
 

From 591ba994c66310bf07fbfcd1fa9ed90c4097a8b6 Mon Sep 17 00:00:00 2001
From: BOUHOURS Antoine <antoine.bouhours@rte-france.com>
Date: Wed, 14 Jan 2026 10:49:04 +0100
Subject: [PATCH 7/9] Fix Sonar coverage of monitor-commons

---
 pom.xml | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/pom.xml b/pom.xml
index a74b5b0..5dc9e4a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -44,12 +44,8 @@
         <sonar.organization>gridsuite</sonar.organization>
         <sonar.projectKey>org.gridsuite:monitor-core</sonar.projectKey>
         <sonar.coverage.jacoco.xmlReportPaths>
-            ../monitor-server/target/site/jacoco/jacoco.xml,
-            ../monitor-worker-server/target/site/jacoco/jacoco.xml,
-            ../../monitor-server/target/site/jacoco/jacoco.xml,
-            ../../monitor-worker-server/target/site/jacoco/jacoco.xml,
-            ../../../monitor-server/target/site/jacoco/jacoco.xml,
-            ../../../monitor-worker-server/target/site/jacoco/jacoco.xml,
+            ${maven.multiModuleProjectDirectory}/monitor-server/target/site/jacoco/jacoco.xml,
+            ${maven.multiModuleProjectDirectory}/monitor-worker-server/target/site/jacoco/jacoco.xml,
         </sonar.coverage.jacoco.xmlReportPaths>
     </properties>
 

From ee2767d5104ce50ec827a21f28a4df579004aec4 Mon Sep 17 00:00:00 2001
From: BOUHOURS Antoine <antoine.bouhours@rte-france.com>
Date: Wed, 14 Jan 2026 10:53:18 +0100
Subject: [PATCH 8/9] Fix Sonar coverage of monitor-commons

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 5dc9e4a..df7f4e8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -44,8 +44,8 @@
         <sonar.organization>gridsuite</sonar.organization>
         <sonar.projectKey>org.gridsuite:monitor-core</sonar.projectKey>
         <sonar.coverage.jacoco.xmlReportPaths>
-            ${maven.multiModuleProjectDirectory}/monitor-server/target/site/jacoco/jacoco.xml,
-            ${maven.multiModuleProjectDirectory}/monitor-worker-server/target/site/jacoco/jacoco.xml,
+            ${maven.multiModuleProjectDirectory}/monitor-server/target/site/jacoco-aggregate/jacoco.xml,
+            ${maven.multiModuleProjectDirectory}/monitor-worker-server/target/site/jacoco-aggregate/jacoco.xml,
         </sonar.coverage.jacoco.xmlReportPaths>
     </properties>
 

From 4657882597b5c063fffbfd845550cf982d0eae4b Mon Sep 17 00:00:00 2001
From: BOUHOURS Antoine <antoine.bouhours@rte-france.com>
Date: Wed, 14 Jan 2026 18:15:16 +0100
Subject: [PATCH 9/9] Improve tests for jackson customization in config

---
 monitor-server/pom.xml        | 17 +++++++++++++++++
 monitor-worker-server/pom.xml | 17 +++++++++++++++++
 pom.xml                       |  4 ++--
 3 files changed, 36 insertions(+), 2 deletions(-)

diff --git a/monitor-server/pom.xml b/monitor-server/pom.xml
index c3a90d4..2f5565f 100644
--- a/monitor-server/pom.xml
+++ b/monitor-server/pom.xml
@@ -31,6 +31,23 @@
             </plugins>
         </pluginManagement>
         <plugins>
+            <plugin>
+                <groupId>org.jacoco</groupId>
+                <artifactId>jacoco-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>report</id>
+                        <goals>
+                            <goal>report</goal>
+                        </goals>
+                        <configuration>
+                            <!-- Include monitor-commons classes in coverage report -->
+                            <additionalClassDirs>${project.basedir}/../monitor-commons/target/classes</additionalClassDirs>
+                            <additionalSourceDirs>${project.basedir}/../monitor-commons/src/main/java</additionalSourceDirs>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
             <plugin>
                 <groupId>com.google.cloud.tools</groupId>
                 <artifactId>jib-maven-plugin</artifactId>
diff --git a/monitor-worker-server/pom.xml b/monitor-worker-server/pom.xml
index dda419c..8524002 100644
--- a/monitor-worker-server/pom.xml
+++ b/monitor-worker-server/pom.xml
@@ -27,6 +27,23 @@
             </plugins>
         </pluginManagement>
         <plugins>
+            <plugin>
+                <groupId>org.jacoco</groupId>
+                <artifactId>jacoco-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>report</id>
+                        <goals>
+                            <goal>report</goal>
+                        </goals>
+                        <configuration>
+                            <!-- Include monitor-commons classes in coverage report -->
+                            <additionalClassDirs>${project.basedir}/../monitor-commons/target/classes</additionalClassDirs>
+                            <additionalSourceDirs>${project.basedir}/../monitor-commons/src/main/java</additionalSourceDirs>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
             <plugin>
                 <groupId>com.google.cloud.tools</groupId>
                 <artifactId>jib-maven-plugin</artifactId>
diff --git a/pom.xml b/pom.xml
index df7f4e8..5dc9e4a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -44,8 +44,8 @@
         <sonar.organization>gridsuite</sonar.organization>
         <sonar.projectKey>org.gridsuite:monitor-core</sonar.projectKey>
         <sonar.coverage.jacoco.xmlReportPaths>
-            ${maven.multiModuleProjectDirectory}/monitor-server/target/site/jacoco-aggregate/jacoco.xml,
-            ${maven.multiModuleProjectDirectory}/monitor-worker-server/target/site/jacoco-aggregate/jacoco.xml,
+            ${maven.multiModuleProjectDirectory}/monitor-server/target/site/jacoco/jacoco.xml,
+            ${maven.multiModuleProjectDirectory}/monitor-worker-server/target/site/jacoco/jacoco.xml,
         </sonar.coverage.jacoco.xmlReportPaths>
     </properties>