Merge branch 'main' into devModeleFiliere

Author: loichenninger

.github/workflows/create-release.yaml

@@ -27,7 +27,7 @@ jobs:
           java-version: '21'
 
       - name: Checkout repo
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           fetch-depth: 0
 
@@ -70,7 +70,7 @@ jobs:
           java-version: '21'
 
       - name: Clone BPM
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           repository: InseeFr/BPM
           path: bpm
@@ -81,7 +81,7 @@ jobs:
           mvn clean install --no-transfer-progress
           cd ..
 
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - name: Build app
         run: |
           git fetch origin main
@@ -99,7 +99,7 @@ jobs:
     if: needs.check-version.outputs.should_run_next_job == 'true'
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
         with:
           ref: ${{ github.ref }}
           fetch-depth: 0
@@ -162,7 +162,7 @@ jobs:
     needs: [ check-version, create-release ]
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
 
       - name: Download uploaded jar
         uses: actions/download-artifact@v6

.github/workflows/docker.yaml

@@ -16,7 +16,7 @@ jobs:
         run: echo "branch=$(echo ${GITHUB_REF#refs/heads/})" >>$GITHUB_OUTPUT
         id: extract_branch
 
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
         with:
           ref: ${{ steps.extract_branch.outputs.branch }}
 
@@ -52,7 +52,7 @@ jobs:
       - build-snapshot
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
 
       - name: Download uploaded jar
         uses: actions/download-artifact@v6

.github/workflows/maven.yml

@@ -20,7 +20,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v6
 
     - name: Set up JDK 21
       uses: actions/setup-java@v5

.github/workflows/pr-version.yaml

@@ -14,7 +14,7 @@ jobs:
       contains(github.event.pull_request.labels.*.name, 'Version Update - Prod')
     steps:
       - name: Checkout PR branch
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           ref: ${{ github.head_ref }}
 

.github/workflows/scheduled-version-update.yaml

@@ -19,7 +19,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           path: genesis
           ref: main
@@ -196,7 +196,7 @@ jobs:
     runs-on: ubuntu-latest
     needs: update-version
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - name: Wait for merged version commit
         run: |
           echo "Fetching main branch..."

CHANGELOG.md

@@ -1,4 +1,10 @@
 # Changelog
+## 1.12.2 [2025-11-06]
+### Fixed
+- Scientific notation for Doubles during raw data processing
+
+### Updated
+- BPM 1.0.19
 ## 1.12.0 [2025-10-23]
 - Get review indicator endpoint
 

Dockerfile

@@ -1,4 +1,4 @@
-FROM eclipse-temurin:21.0.8_9-jre-alpine
+FROM eclipse-temurin:21.0.9_10-jre-alpine
 
 ENV PATH_TO_JAR=/opt/app/app.jar
 WORKDIR /opt/app/

pom.xml

@@ -4,21 +4,21 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>fr.insee.genesis</groupId>
     <artifactId>genesis-api</artifactId>
-    <version>1.12.1</version>
+    <version>1.12.4</version>
     <packaging>jar</packaging>
     <name>genesis-api</name>
 
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>3.5.7</version>
+        <version>3.5.8</version>
     </parent>
 
     <properties>
         <java.version>21</java.version>
-        <springdoc.version>2.8.13</springdoc.version>
+        <springdoc.version>2.8.14</springdoc.version>
         <mapstruct.version>1.6.3</mapstruct.version>
-        <cucumber.version>7.31.0</cucumber.version>
+        <cucumber.version>7.32.0</cucumber.version>
         <junit-jupiter.version>5.13.4</junit-jupiter.version>
 
         <!-- Proprietes sonar -->
@@ -33,10 +33,10 @@
         </sonar.exclusions>
         <skipSurefireReport>true</skipSurefireReport>
         <!-- Pi Test-->
-        <pitest.version>1.21.0</pitest.version>
+        <pitest.version>1.22.0</pitest.version>
         <pitest.junit.version>1.2.3</pitest.junit.version>
         <jackson.version>2.19.0</jackson.version>
-        <bpm.version>1.0.18</bpm.version>
+        <bpm.version>1.0.19</bpm.version>
     </properties>
     <dependencies>
         <dependency>
@@ -175,7 +175,7 @@
                 <plugin>
                     <groupId>org.sonarsource.scanner.maven</groupId>
                     <artifactId>sonar-maven-plugin</artifactId>
-                    <version>5.2.0.4988</version>
+                    <version>5.3.0.6276</version>
                 </plugin>
                 <plugin>
                     <groupId>org.jacoco</groupId>

src/main/java/fr/insee/genesis/domain/service/rawdata/LunaticJsonRawDataService.java

@@ -36,6 +36,7 @@
 import org.springframework.stereotype.Service;
 
 import java.io.IOException;
+import java.math.BigDecimal;
 import java.time.Instant;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
@@ -376,6 +377,10 @@ private static void convertToCollectedVar(
             Map<String, Object> states = JsonUtils.asMap(collectedVariable.getValue());
 
             // nothing if no state
+            if (states == null || states.isEmpty()) {
+                continue;
+            }
+
             if (states.containsKey(stateKey)) {
                 Object value = states.get(stateKey);
 
@@ -388,7 +393,7 @@ private static void convertToCollectedVar(
                 // scalaire non null ?
                 if (value != null && !(value instanceof List<?>)) {
                     // idem: on garde convertOneVar(entry, String, ...)
-                    convertOneVar(collectedVariable, String.valueOf(value), variablesMap, 1, dest);
+                    convertOneVar(collectedVariable, getValueString(value), variablesMap, 1, dest);
                 }
             }
         }
@@ -461,4 +466,15 @@ public Page<LunaticJsonRawDataModel> findRawDataByCampaignIdAndDate(String campa
 
     }
 
+    //Utils
+    protected static String getValueString(Object value) {
+        if (value instanceof Double || value instanceof Float) {
+            BigDecimal bd = new BigDecimal(value.toString());
+            return bd.stripTrailingZeros().toPlainString();
+        }
+        if (value instanceof Number) {
+            return value.toString();
+        }
+        return String.valueOf(value);
+    }
 }

src/test/java/fr/insee/genesis/domain/service/rawdata/LunaticJsonRawDataServiceTest.java

@@ -33,6 +33,7 @@
 import java.util.List;
 import java.util.Map;
 
+import static fr.insee.genesis.domain.service.rawdata.LunaticJsonRawDataService.getValueString;
 import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
 
 class LunaticJsonRawDataServiceTest {
@@ -570,4 +571,38 @@ private List<String> prepareConvertTest(int rawDataSize, String campaignId, Stri
         }
         return interrogationIdList;
     }
+
+    @Test
+    void getValueString_null_test(){
+        Object stringObject = null;
+
+        Assertions.assertThat(getValueString(stringObject)).isEqualTo("null");
+    }
+
+    @Test
+    void getValueString_string_test(){
+        Object stringObject = "test";
+
+        Assertions.assertThat(getValueString(stringObject)).isEqualTo("test");
+    }
+    @Test
+    void getValueString_int_test(){
+        Object intObject = 10;
+
+        Assertions.assertThat(getValueString(intObject)).isEqualTo("10");
+    }
+
+    @Test
+    void getValueString_float_test(){
+        Object floatObject = 10.111f;
+
+        Assertions.assertThat(getValueString(floatObject)).isEqualTo("10.111");
+    }
+
+    @Test
+    void getValueString_double_test(){
+        Object doubleObject = 101010101010.111d;
+
+        Assertions.assertThat(getValueString(doubleObject)).isEqualTo("101010101010.111");
+    }
 }