diff --git a/.github/workflows/create-release.yaml b/.github/workflows/create-release.yaml index 364d55c..903c65c 100644 --- a/.github/workflows/create-release.yaml +++ b/.github/workflows/create-release.yaml @@ -15,11 +15,11 @@ jobs: release-tag: ${{ steps.version-step.outputs.newTag }} should_run_next_job: ${{ steps.check-tag.outputs.should_continue }} steps: - - name: Set up JDK 21 + - name: Set up JDK 25 uses: actions/setup-java@v5 with: distribution: 'temurin' - java-version: '21' + java-version: '25' - name: Checkout repo uses: actions/checkout@v6 diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 3742284..b001aae 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -22,10 +22,10 @@ jobs: steps: - uses: actions/checkout@v6 - - name: Set up JDK 21 + - name: Set up JDK 25 uses: actions/setup-java@v5 with: - java-version: '21' + java-version: '25' distribution: 'temurin' cache: maven diff --git a/pom.xml b/pom.xml index 67469f2..0dbc3bf 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 3.5.9 + 4.0.1 @@ -40,11 +40,10 @@ - 21 - 21 + 25 + 25 UTF-8 UTF-8 - 2.20.1 0.8.12 @@ -91,14 +90,12 @@ - com.fasterxml.jackson.core + tools.jackson.core jackson-core - ${jackson.version} - com.fasterxml.jackson.core + tools.jackson.core jackson-databind - ${jackson.version} @@ -134,8 +131,14 @@ maven-compiler-plugin 3.14.1 - 1.21 - 1.21 + ${java.version} + ${java.version} + + + org.projectlombok + lombok + + diff --git a/src/main/java/fr/insee/bpm/metadata/reader/ReaderUtils.java b/src/main/java/fr/insee/bpm/metadata/reader/ReaderUtils.java index a875e4f..95da1ee 100644 --- a/src/main/java/fr/insee/bpm/metadata/reader/ReaderUtils.java +++ b/src/main/java/fr/insee/bpm/metadata/reader/ReaderUtils.java @@ -1,6 +1,6 @@ package fr.insee.bpm.metadata.reader; -import com.fasterxml.jackson.databind.JsonNode; +import tools.jackson.databind.JsonNode; import fr.insee.bpm.exceptions.MetadataParserException; import fr.insee.bpm.metadata.Constants; import fr.insee.bpm.metadata.model.*; diff --git a/src/main/java/fr/insee/bpm/metadata/reader/lunatic/LunaticReader.java b/src/main/java/fr/insee/bpm/metadata/reader/lunatic/LunaticReader.java index 89ea361..b45c3cc 100644 --- a/src/main/java/fr/insee/bpm/metadata/reader/lunatic/LunaticReader.java +++ b/src/main/java/fr/insee/bpm/metadata/reader/lunatic/LunaticReader.java @@ -1,6 +1,6 @@ package fr.insee.bpm.metadata.reader.lunatic; -import com.fasterxml.jackson.databind.JsonNode; +import tools.jackson.databind.JsonNode; import fr.insee.bpm.metadata.Constants; import fr.insee.bpm.metadata.model.CalculatedVariables; import fr.insee.bpm.metadata.model.Group; diff --git a/src/main/java/fr/insee/bpm/metadata/reader/lunatic/LunaticUtils.java b/src/main/java/fr/insee/bpm/metadata/reader/lunatic/LunaticUtils.java index 74a6cee..3236dba 100644 --- a/src/main/java/fr/insee/bpm/metadata/reader/lunatic/LunaticUtils.java +++ b/src/main/java/fr/insee/bpm/metadata/reader/lunatic/LunaticUtils.java @@ -1,6 +1,6 @@ package fr.insee.bpm.metadata.reader.lunatic; -import com.fasterxml.jackson.databind.JsonNode; +import tools.jackson.databind.JsonNode; import fr.insee.bpm.metadata.Constants; import fr.insee.bpm.metadata.model.Group; import fr.insee.bpm.metadata.model.MetadataModel; diff --git a/src/main/java/fr/insee/bpm/metadata/reader/lunatic/processor/CheckboxGroupProcessor.java b/src/main/java/fr/insee/bpm/metadata/reader/lunatic/processor/CheckboxGroupProcessor.java index 089439a..3e0ad57 100644 --- a/src/main/java/fr/insee/bpm/metadata/reader/lunatic/processor/CheckboxGroupProcessor.java +++ b/src/main/java/fr/insee/bpm/metadata/reader/lunatic/processor/CheckboxGroupProcessor.java @@ -1,6 +1,6 @@ package fr.insee.bpm.metadata.reader.lunatic.processor; -import com.fasterxml.jackson.databind.JsonNode; +import tools.jackson.databind.JsonNode; import fr.insee.bpm.metadata.model.Group; import fr.insee.bpm.metadata.model.McqVariable; import fr.insee.bpm.metadata.model.MetadataModel; diff --git a/src/main/java/fr/insee/bpm/metadata/reader/lunatic/processor/ComponentProcessor.java b/src/main/java/fr/insee/bpm/metadata/reader/lunatic/processor/ComponentProcessor.java index 54332b5..e51749a 100644 --- a/src/main/java/fr/insee/bpm/metadata/reader/lunatic/processor/ComponentProcessor.java +++ b/src/main/java/fr/insee/bpm/metadata/reader/lunatic/processor/ComponentProcessor.java @@ -1,6 +1,6 @@ package fr.insee.bpm.metadata.reader.lunatic.processor; -import com.fasterxml.jackson.databind.JsonNode; +import tools.jackson.databind.JsonNode; import fr.insee.bpm.metadata.model.Group; import fr.insee.bpm.metadata.model.MetadataModel; diff --git a/src/main/java/fr/insee/bpm/metadata/reader/lunatic/processor/DropdownProcessor.java b/src/main/java/fr/insee/bpm/metadata/reader/lunatic/processor/DropdownProcessor.java index 6c38a97..921a257 100644 --- a/src/main/java/fr/insee/bpm/metadata/reader/lunatic/processor/DropdownProcessor.java +++ b/src/main/java/fr/insee/bpm/metadata/reader/lunatic/processor/DropdownProcessor.java @@ -1,6 +1,6 @@ package fr.insee.bpm.metadata.reader.lunatic.processor; -import com.fasterxml.jackson.databind.JsonNode; +import tools.jackson.databind.JsonNode; import fr.insee.bpm.metadata.model.Group; import fr.insee.bpm.metadata.model.MetadataModel; import fr.insee.bpm.metadata.model.UcqVariable; diff --git a/src/main/java/fr/insee/bpm/metadata/reader/lunatic/processor/DynamicTableProcessor.java b/src/main/java/fr/insee/bpm/metadata/reader/lunatic/processor/DynamicTableProcessor.java index e0d5a58..5821298 100644 --- a/src/main/java/fr/insee/bpm/metadata/reader/lunatic/processor/DynamicTableProcessor.java +++ b/src/main/java/fr/insee/bpm/metadata/reader/lunatic/processor/DynamicTableProcessor.java @@ -1,6 +1,6 @@ package fr.insee.bpm.metadata.reader.lunatic.processor; -import com.fasterxml.jackson.databind.JsonNode; +import tools.jackson.databind.JsonNode; import fr.insee.bpm.metadata.Constants; import fr.insee.bpm.metadata.model.Group; import fr.insee.bpm.metadata.model.MetadataModel; diff --git a/src/main/java/fr/insee/bpm/metadata/reader/lunatic/processor/InputNumberProcessor.java b/src/main/java/fr/insee/bpm/metadata/reader/lunatic/processor/InputNumberProcessor.java index 2d34ee5..5c38b4b 100644 --- a/src/main/java/fr/insee/bpm/metadata/reader/lunatic/processor/InputNumberProcessor.java +++ b/src/main/java/fr/insee/bpm/metadata/reader/lunatic/processor/InputNumberProcessor.java @@ -1,6 +1,6 @@ package fr.insee.bpm.metadata.reader.lunatic.processor; -import com.fasterxml.jackson.databind.JsonNode; +import tools.jackson.databind.JsonNode; import fr.insee.bpm.metadata.model.Group; import fr.insee.bpm.metadata.model.MetadataModel; import fr.insee.bpm.metadata.model.Variable; diff --git a/src/main/java/fr/insee/bpm/metadata/reader/lunatic/processor/NoOpProcessor.java b/src/main/java/fr/insee/bpm/metadata/reader/lunatic/processor/NoOpProcessor.java index 7a145aa..1193e8f 100644 --- a/src/main/java/fr/insee/bpm/metadata/reader/lunatic/processor/NoOpProcessor.java +++ b/src/main/java/fr/insee/bpm/metadata/reader/lunatic/processor/NoOpProcessor.java @@ -1,6 +1,6 @@ package fr.insee.bpm.metadata.reader.lunatic.processor; -import com.fasterxml.jackson.databind.JsonNode; +import tools.jackson.databind.JsonNode; import fr.insee.bpm.metadata.model.Group; import fr.insee.bpm.metadata.model.MetadataModel; diff --git a/src/main/java/fr/insee/bpm/metadata/reader/lunatic/processor/PairwiseLinksProcessor.java b/src/main/java/fr/insee/bpm/metadata/reader/lunatic/processor/PairwiseLinksProcessor.java index 28cdcb7..71da776 100644 --- a/src/main/java/fr/insee/bpm/metadata/reader/lunatic/processor/PairwiseLinksProcessor.java +++ b/src/main/java/fr/insee/bpm/metadata/reader/lunatic/processor/PairwiseLinksProcessor.java @@ -1,6 +1,6 @@ package fr.insee.bpm.metadata.reader.lunatic.processor; -import com.fasterxml.jackson.databind.JsonNode; +import tools.jackson.databind.JsonNode; import fr.insee.bpm.metadata.model.Group; import fr.insee.bpm.metadata.model.MetadataModel; import fr.insee.bpm.metadata.reader.lunatic.LunaticReader; diff --git a/src/main/java/fr/insee/bpm/metadata/reader/lunatic/processor/QuestionProcessor.java b/src/main/java/fr/insee/bpm/metadata/reader/lunatic/processor/QuestionProcessor.java index c4bcc9e..78bed4d 100644 --- a/src/main/java/fr/insee/bpm/metadata/reader/lunatic/processor/QuestionProcessor.java +++ b/src/main/java/fr/insee/bpm/metadata/reader/lunatic/processor/QuestionProcessor.java @@ -1,6 +1,6 @@ package fr.insee.bpm.metadata.reader.lunatic.processor; -import com.fasterxml.jackson.databind.JsonNode; +import tools.jackson.databind.JsonNode; import fr.insee.bpm.metadata.model.Group; import fr.insee.bpm.metadata.model.MetadataModel; import fr.insee.bpm.metadata.reader.lunatic.LunaticReader; diff --git a/src/main/java/fr/insee/bpm/metadata/reader/lunatic/processor/RadioCheckboxProcessor.java b/src/main/java/fr/insee/bpm/metadata/reader/lunatic/processor/RadioCheckboxProcessor.java index 5f2cb11..96137dd 100644 --- a/src/main/java/fr/insee/bpm/metadata/reader/lunatic/processor/RadioCheckboxProcessor.java +++ b/src/main/java/fr/insee/bpm/metadata/reader/lunatic/processor/RadioCheckboxProcessor.java @@ -1,6 +1,6 @@ package fr.insee.bpm.metadata.reader.lunatic.processor; -import com.fasterxml.jackson.databind.JsonNode; +import tools.jackson.databind.JsonNode; import fr.insee.bpm.metadata.model.Group; import fr.insee.bpm.metadata.model.MetadataModel; import fr.insee.bpm.metadata.model.UcqVariable; diff --git a/src/main/java/fr/insee/bpm/metadata/reader/lunatic/processor/RoundaboutProcessor.java b/src/main/java/fr/insee/bpm/metadata/reader/lunatic/processor/RoundaboutProcessor.java index 5fc85e9..f13f951 100644 --- a/src/main/java/fr/insee/bpm/metadata/reader/lunatic/processor/RoundaboutProcessor.java +++ b/src/main/java/fr/insee/bpm/metadata/reader/lunatic/processor/RoundaboutProcessor.java @@ -1,6 +1,6 @@ package fr.insee.bpm.metadata.reader.lunatic.processor; -import com.fasterxml.jackson.databind.JsonNode; +import tools.jackson.databind.JsonNode; import fr.insee.bpm.metadata.Constants; import fr.insee.bpm.metadata.model.Group; import fr.insee.bpm.metadata.model.MetadataModel; diff --git a/src/main/java/fr/insee/bpm/metadata/reader/lunatic/processor/SimpleVariableProcessor.java b/src/main/java/fr/insee/bpm/metadata/reader/lunatic/processor/SimpleVariableProcessor.java index 5af10f6..1ffd726 100644 --- a/src/main/java/fr/insee/bpm/metadata/reader/lunatic/processor/SimpleVariableProcessor.java +++ b/src/main/java/fr/insee/bpm/metadata/reader/lunatic/processor/SimpleVariableProcessor.java @@ -1,6 +1,6 @@ package fr.insee.bpm.metadata.reader.lunatic.processor; -import com.fasterxml.jackson.databind.JsonNode; +import tools.jackson.databind.JsonNode; import fr.insee.bpm.metadata.model.Group; import fr.insee.bpm.metadata.model.MetadataModel; import fr.insee.bpm.metadata.model.Variable; diff --git a/src/main/java/fr/insee/bpm/metadata/reader/lunatic/processor/TableProcessor.java b/src/main/java/fr/insee/bpm/metadata/reader/lunatic/processor/TableProcessor.java index 2468a9a..a5f62d2 100644 --- a/src/main/java/fr/insee/bpm/metadata/reader/lunatic/processor/TableProcessor.java +++ b/src/main/java/fr/insee/bpm/metadata/reader/lunatic/processor/TableProcessor.java @@ -1,6 +1,6 @@ package fr.insee.bpm.metadata.reader.lunatic.processor; -import com.fasterxml.jackson.databind.JsonNode; +import tools.jackson.databind.JsonNode; import fr.insee.bpm.metadata.model.Group; import fr.insee.bpm.metadata.model.MetadataModel; import fr.insee.bpm.metadata.reader.lunatic.LunaticReader; diff --git a/src/main/java/fr/insee/bpm/metadata/reader/lunatic/processor/UnknownComponentProcessor.java b/src/main/java/fr/insee/bpm/metadata/reader/lunatic/processor/UnknownComponentProcessor.java index e03a48c..e3d58c8 100644 --- a/src/main/java/fr/insee/bpm/metadata/reader/lunatic/processor/UnknownComponentProcessor.java +++ b/src/main/java/fr/insee/bpm/metadata/reader/lunatic/processor/UnknownComponentProcessor.java @@ -1,6 +1,6 @@ package fr.insee.bpm.metadata.reader.lunatic.processor; -import com.fasterxml.jackson.databind.JsonNode; +import tools.jackson.databind.JsonNode; import fr.insee.bpm.metadata.model.Group; import fr.insee.bpm.metadata.model.MetadataModel; import lombok.extern.log4j.Log4j2; diff --git a/src/main/java/fr/insee/bpm/utils/json/JsonReader.java b/src/main/java/fr/insee/bpm/utils/json/JsonReader.java index a64962a..1ce451b 100644 --- a/src/main/java/fr/insee/bpm/utils/json/JsonReader.java +++ b/src/main/java/fr/insee/bpm/utils/json/JsonReader.java @@ -1,7 +1,7 @@ package fr.insee.bpm.utils.json; -import com.fasterxml.jackson.databind.JsonNode; -import com.fasterxml.jackson.databind.ObjectMapper; +import tools.jackson.databind.JsonNode; +import tools.jackson.databind.ObjectMapper; import java.io.IOException; import java.io.InputStream; diff --git a/src/test/java/fr/insee/bpm/metadata/reader/lunatic/LunaticUtilsTest.java b/src/test/java/fr/insee/bpm/metadata/reader/lunatic/LunaticUtilsTest.java index b9e1806..3b62d5a 100644 --- a/src/test/java/fr/insee/bpm/metadata/reader/lunatic/LunaticUtilsTest.java +++ b/src/test/java/fr/insee/bpm/metadata/reader/lunatic/LunaticUtilsTest.java @@ -1,7 +1,7 @@ package fr.insee.bpm.metadata.reader.lunatic; -import com.fasterxml.jackson.databind.JsonNode; -import com.fasterxml.jackson.databind.ObjectMapper; +import tools.jackson.databind.JsonNode; +import tools.jackson.databind.ObjectMapper; import org.junit.jupiter.api.Test; import java.util.ArrayList; diff --git a/src/test/java/fr/insee/bpm/metadata/reader/lunatic/processor/CheckboxGroupProcessorTest.java b/src/test/java/fr/insee/bpm/metadata/reader/lunatic/processor/CheckboxGroupProcessorTest.java index e11404c..6d8f4a5 100644 --- a/src/test/java/fr/insee/bpm/metadata/reader/lunatic/processor/CheckboxGroupProcessorTest.java +++ b/src/test/java/fr/insee/bpm/metadata/reader/lunatic/processor/CheckboxGroupProcessorTest.java @@ -1,7 +1,7 @@ package fr.insee.bpm.metadata.reader.lunatic.processor; -import com.fasterxml.jackson.databind.JsonNode; -import com.fasterxml.jackson.databind.ObjectMapper; +import tools.jackson.databind.JsonNode; +import tools.jackson.databind.ObjectMapper; import fr.insee.bpm.TestConstants; import fr.insee.bpm.metadata.model.McqVariable; import fr.insee.bpm.metadata.model.MetadataModel; diff --git a/src/test/java/fr/insee/bpm/metadata/reader/lunatic/processor/DropdownProcessorTest.java b/src/test/java/fr/insee/bpm/metadata/reader/lunatic/processor/DropdownProcessorTest.java index 86febca..c433b14 100644 --- a/src/test/java/fr/insee/bpm/metadata/reader/lunatic/processor/DropdownProcessorTest.java +++ b/src/test/java/fr/insee/bpm/metadata/reader/lunatic/processor/DropdownProcessorTest.java @@ -1,7 +1,7 @@ package fr.insee.bpm.metadata.reader.lunatic.processor; -import com.fasterxml.jackson.databind.JsonNode; -import com.fasterxml.jackson.databind.ObjectMapper; +import tools.jackson.databind.JsonNode; +import tools.jackson.databind.ObjectMapper; import fr.insee.bpm.TestConstants; import fr.insee.bpm.metadata.model.MetadataModel; import fr.insee.bpm.metadata.model.UcqModality; diff --git a/src/test/java/fr/insee/bpm/metadata/reader/lunatic/processor/InputNumberProcessorTest.java b/src/test/java/fr/insee/bpm/metadata/reader/lunatic/processor/InputNumberProcessorTest.java index 30cb7aa..3ed34e4 100644 --- a/src/test/java/fr/insee/bpm/metadata/reader/lunatic/processor/InputNumberProcessorTest.java +++ b/src/test/java/fr/insee/bpm/metadata/reader/lunatic/processor/InputNumberProcessorTest.java @@ -1,7 +1,7 @@ package fr.insee.bpm.metadata.reader.lunatic.processor; -import com.fasterxml.jackson.databind.JsonNode; -import com.fasterxml.jackson.databind.ObjectMapper; +import tools.jackson.databind.JsonNode; +import tools.jackson.databind.ObjectMapper; import fr.insee.bpm.TestConstants; import fr.insee.bpm.metadata.model.MetadataModel; import fr.insee.bpm.metadata.model.VariableType; diff --git a/src/test/java/fr/insee/bpm/metadata/reader/lunatic/processor/NoOpProcessorTest.java b/src/test/java/fr/insee/bpm/metadata/reader/lunatic/processor/NoOpProcessorTest.java index 02af157..37515d8 100644 --- a/src/test/java/fr/insee/bpm/metadata/reader/lunatic/processor/NoOpProcessorTest.java +++ b/src/test/java/fr/insee/bpm/metadata/reader/lunatic/processor/NoOpProcessorTest.java @@ -1,7 +1,7 @@ package fr.insee.bpm.metadata.reader.lunatic.processor; -import com.fasterxml.jackson.databind.JsonNode; -import com.fasterxml.jackson.databind.ObjectMapper; +import tools.jackson.databind.JsonNode; +import tools.jackson.databind.ObjectMapper; import fr.insee.bpm.TestConstants; import fr.insee.bpm.metadata.model.MetadataModel; import org.junit.jupiter.api.BeforeEach; diff --git a/src/test/java/fr/insee/bpm/metadata/reader/lunatic/processor/QuestionProcessorTest.java b/src/test/java/fr/insee/bpm/metadata/reader/lunatic/processor/QuestionProcessorTest.java index 9ea58cc..8a5a3e2 100644 --- a/src/test/java/fr/insee/bpm/metadata/reader/lunatic/processor/QuestionProcessorTest.java +++ b/src/test/java/fr/insee/bpm/metadata/reader/lunatic/processor/QuestionProcessorTest.java @@ -1,7 +1,7 @@ package fr.insee.bpm.metadata.reader.lunatic.processor; -import com.fasterxml.jackson.databind.JsonNode; -import com.fasterxml.jackson.databind.ObjectMapper; +import tools.jackson.databind.JsonNode; +import tools.jackson.databind.ObjectMapper; import fr.insee.bpm.TestConstants; import fr.insee.bpm.metadata.model.Group; import fr.insee.bpm.metadata.model.MetadataModel; diff --git a/src/test/java/fr/insee/bpm/metadata/reader/lunatic/processor/RadioCheckboxProcessorTest.java b/src/test/java/fr/insee/bpm/metadata/reader/lunatic/processor/RadioCheckboxProcessorTest.java index f1e372e..9c91c55 100644 --- a/src/test/java/fr/insee/bpm/metadata/reader/lunatic/processor/RadioCheckboxProcessorTest.java +++ b/src/test/java/fr/insee/bpm/metadata/reader/lunatic/processor/RadioCheckboxProcessorTest.java @@ -1,7 +1,7 @@ package fr.insee.bpm.metadata.reader.lunatic.processor; -import com.fasterxml.jackson.databind.JsonNode; -import com.fasterxml.jackson.databind.ObjectMapper; +import tools.jackson.databind.JsonNode; +import tools.jackson.databind.ObjectMapper; import fr.insee.bpm.TestConstants; import fr.insee.bpm.metadata.model.MetadataModel; import fr.insee.bpm.metadata.model.UcqModality; diff --git a/src/test/java/fr/insee/bpm/metadata/reader/lunatic/processor/RoundaboutProcessorTest.java b/src/test/java/fr/insee/bpm/metadata/reader/lunatic/processor/RoundaboutProcessorTest.java index 760212c..44fa709 100644 --- a/src/test/java/fr/insee/bpm/metadata/reader/lunatic/processor/RoundaboutProcessorTest.java +++ b/src/test/java/fr/insee/bpm/metadata/reader/lunatic/processor/RoundaboutProcessorTest.java @@ -1,9 +1,9 @@ package fr.insee.bpm.metadata.reader.lunatic.processor; -import com.fasterxml.jackson.databind.JsonNode; -import com.fasterxml.jackson.databind.node.ArrayNode; -import com.fasterxml.jackson.databind.node.JsonNodeFactory; -import com.fasterxml.jackson.databind.node.ObjectNode; +import tools.jackson.databind.JsonNode; +import tools.jackson.databind.node.ArrayNode; +import tools.jackson.databind.node.JsonNodeFactory; +import tools.jackson.databind.node.ObjectNode; import fr.insee.bpm.metadata.model.Group; import fr.insee.bpm.metadata.model.MetadataModel; import fr.insee.bpm.metadata.model.Variable; @@ -98,7 +98,7 @@ private ObjectNode objectNodeWithType(String type) { name.put("name", "name"+type); ObjectNode obj = JsonNodeFactory.instance.objectNode(); obj.put("componentType", type); - obj.put("response", name); + obj.set("response", name); return obj; } } diff --git a/src/test/java/fr/insee/bpm/metadata/reader/lunatic/processor/SimpleVariableProcessorTest.java b/src/test/java/fr/insee/bpm/metadata/reader/lunatic/processor/SimpleVariableProcessorTest.java index d6e339c..499e715 100644 --- a/src/test/java/fr/insee/bpm/metadata/reader/lunatic/processor/SimpleVariableProcessorTest.java +++ b/src/test/java/fr/insee/bpm/metadata/reader/lunatic/processor/SimpleVariableProcessorTest.java @@ -1,8 +1,8 @@ package fr.insee.bpm.metadata.reader.lunatic.processor; -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.databind.JsonNode; -import com.fasterxml.jackson.databind.ObjectMapper; +import tools.jackson.core.JacksonException; +import tools.jackson.databind.JsonNode; +import tools.jackson.databind.ObjectMapper; import fr.insee.bpm.metadata.model.MetadataModel; import fr.insee.bpm.metadata.reader.lunatic.ComponentLunatic; import org.junit.jupiter.api.BeforeEach; @@ -34,7 +34,7 @@ void setUp() { } @Test - void testProcess_AddsVariableToMetadataModel() throws JsonProcessingException { + void testProcess_AddsVariableToMetadataModel() throws JacksonException { //GIVEN String json = "{\"id\": \"lz9wh5gy\",\"page\": \"2\",\"response\": {\"name\": \"QSIMPLETXT\"},\"mandatory\": false,\"maxLength\": 249,\"componentType\": \"Input\"}"; primaryComponent = objectMapper.readTree(json); @@ -49,7 +49,7 @@ void testProcess_AddsVariableToMetadataModel() throws JsonProcessingException { } @Test - void testProcess_IfVariableNameNotInList() throws JsonProcessingException { + void testProcess_IfVariableNameNotInList() throws JacksonException { //GIVEN // The primary component contains a variable not identified in the list of variables to add in the metadata model String json = "{\"id\": \"lz9wh5gy\",\"page\": \"2\",\"response\": {\"name\": \"UnknownVariable\"},\"mandatory\": false,\"maxLength\": 249,\"componentType\": \"Input\"}"; diff --git a/src/test/java/fr/insee/bpm/metadata/reader/lunatic/processor/TableProcessorTest.java b/src/test/java/fr/insee/bpm/metadata/reader/lunatic/processor/TableProcessorTest.java index 38a2ecb..98c60ee 100644 --- a/src/test/java/fr/insee/bpm/metadata/reader/lunatic/processor/TableProcessorTest.java +++ b/src/test/java/fr/insee/bpm/metadata/reader/lunatic/processor/TableProcessorTest.java @@ -1,7 +1,7 @@ package fr.insee.bpm.metadata.reader.lunatic.processor; -import com.fasterxml.jackson.databind.JsonNode; -import com.fasterxml.jackson.databind.ObjectMapper; +import tools.jackson.databind.JsonNode; +import tools.jackson.databind.ObjectMapper; import fr.insee.bpm.TestConstants; import fr.insee.bpm.metadata.model.MetadataModel; import fr.insee.bpm.metadata.model.SpecType; diff --git a/src/test/java/fr/insee/bpm/metadata/reader/lunatic/processor/UnknownComponentProcessorTest.java b/src/test/java/fr/insee/bpm/metadata/reader/lunatic/processor/UnknownComponentProcessorTest.java index a35eef5..def2f38 100644 --- a/src/test/java/fr/insee/bpm/metadata/reader/lunatic/processor/UnknownComponentProcessorTest.java +++ b/src/test/java/fr/insee/bpm/metadata/reader/lunatic/processor/UnknownComponentProcessorTest.java @@ -4,8 +4,8 @@ import ch.qos.logback.classic.Logger; import ch.qos.logback.classic.spi.ILoggingEvent; import ch.qos.logback.core.read.ListAppender; -import com.fasterxml.jackson.databind.JsonNode; -import com.fasterxml.jackson.databind.ObjectMapper; +import tools.jackson.databind.JsonNode; +import tools.jackson.databind.ObjectMapper; import fr.insee.bpm.metadata.model.MetadataModel; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test;