Merge pull request #395 from InseeFr/fixVariableLongType

change variable reading type from int to long

Author: Hajarel-moukh

src/main/java/fr/insee/genesis/domain/service/contextualvariable/previous/ContextualPreviousVariableJsonService.java

@@ -160,7 +160,7 @@ private Object readValue(JsonParser jsonParser) throws IOException{
                 return jsonParser.getText();
             }
             case VALUE_NUMBER_INT -> {
-                return jsonParser.getIntValue();
+                return jsonParser.getLongValue();
             }
             case VALUE_NUMBER_FLOAT -> {
                 return jsonParser.getDoubleValue();

src/main/java/fr/insee/genesis/domain/utils/JsonUtils.java

@@ -40,7 +40,7 @@ public static Object readValue(JsonParser jsonParser) throws IOException {
                 return jsonParser.getText();
             }
             case VALUE_NUMBER_INT -> {
-                return jsonParser.getIntValue();
+                return jsonParser.getLongValue();
             }
             case VALUE_NUMBER_FLOAT -> {
                 return jsonParser.getDoubleValue();

src/test/java/fr/insee/genesis/controller/rest/responses/ContextualVariableControllerTest.java

@@ -912,9 +912,12 @@ private static void assertVariable(ContextualPreviousVariableDocument document,
                                        String variableName,
                                        int expectedValue
     ) {
-        Assertions.assertNotNull(document.getVariables().get(variableName));
-        Assertions.assertInstanceOf(Integer.class,document.getVariables().get(variableName));
-        Assertions.assertEquals(expectedValue,document.getVariables().get(variableName));    }
+        Object actual = document.getVariables().get(variableName);
+        Assertions.assertNotNull(actual);
+
+        Assertions.assertInstanceOf(Number.class, actual, "Unexpected type, expected Number, actual: " + actual.getClass());
+
+        Assertions.assertEquals((long) expectedValue, ((Number) actual).longValue());    }
 
     private static void assertVariableNull(ContextualPreviousVariableDocument document,
                                            String variableName
@@ -948,11 +951,15 @@ private static void assertVariable(ContextualPreviousVariableDocument document,
                                        String arrayVariableName,
                                        int index,
                                        int expectedValue
-    ) throws ClassCastException{
-        List<Object> list = (List<Object>)document.getVariables().get(arrayVariableName);
-        Assertions.assertTrue(list.size()>index);
-        Assertions.assertInstanceOf(Integer.class,list.get(index));
-        Assertions.assertEquals(expectedValue,(Integer)list.get(index));
+    ){
+        List<Object> list = (List<Object>) document.getVariables().get(arrayVariableName);
+        Assertions.assertTrue(list.size() > index);
+        Object actual = list.get(index);
+        Assertions.assertNotNull(actual);
+
+        Assertions.assertInstanceOf(Number.class, actual, "Unexpected type, expected Number, actual: " + actual.getClass());
+
+        Assertions.assertEquals((long) expectedValue, ((Number) actual).longValue());
     }
 
     private List<ContextualPreviousVariableDocument> getContextualPreviousTestDocuments() {
@@ -1116,9 +1123,10 @@ private static void assertVariable(ContextualExternalVariableDocument document,
                                        String variableName,
                                        int expectedValue
     ) {
-        Assertions.assertNotNull(document.getVariables().get(variableName));
-        Assertions.assertInstanceOf(Integer.class,document.getVariables().get(variableName));
-        Assertions.assertEquals(expectedValue,document.getVariables().get(variableName));
+        Object actual = document.getVariables().get(variableName);
+        Assertions.assertNotNull(actual);
+        Assertions.assertInstanceOf(Number.class, actual, "Unexpected type, expected Number, actual: " + actual.getClass());
+        Assertions.assertEquals((long) expectedValue, ((Number) actual).longValue());
     }
 
     @SuppressWarnings("unchecked")
@@ -1148,11 +1156,15 @@ private static void assertVariable(ContextualExternalVariableDocument document,
                                        String arrayVariableName,
                                        int index,
                                        int expectedValue
-    ) throws ClassCastException{
-        List<Object> list = (List<Object>)document.getVariables().get(arrayVariableName);
-        Assertions.assertTrue(list.size()>index);
-        Assertions.assertInstanceOf(Integer.class,list.get(index));
-        Assertions.assertEquals(expectedValue,(Integer)list.get(index));
+    ){
+        List<Object> list = (List<Object>) document.getVariables().get(arrayVariableName);
+        Assertions.assertTrue(list.size() > index);
+        Object actual = list.get(index);
+        Assertions.assertNotNull(actual);
+
+        Assertions.assertInstanceOf(Number.class, actual, "Unexpected type, expected Number, actual: " + actual.getClass());
+
+        Assertions.assertEquals((long) expectedValue, ((Number) actual).longValue());
 
     }
 }