Merge remote-tracking branch 'origin/feature/mdd/jackson-deduction-re…

…placement' into feature/mdd/jackson-deduction-replacement # Conflicts: # csv_parser/out/EMSI/EMSI.schema.docx # csv_parser/out/EMSI/EMSI.uml_diagram.pdf # csv_parser/out/GEO-POS/GEO-POS.schema.docx # csv_parser/out/GEO-POS/GEO-POS.uml_diagram.pdf # csv_parser/out/GEO-REQ/GEO-REQ.schema.docx # csv_parser/out/GEO-REQ/GEO-REQ.uml_diagram.pdf # csv_parser/out/GEO-RES/GEO-RES.schema.docx # csv_parser/out/GEO-RES/GEO-RES.uml_diagram.pdf # csv_parser/out/RC-DE/RC-DE.schema.docx # csv_parser/out/RC-DE/RC-DE.uml_diagram.pdf # csv_parser/out/RC-EDA/RC-EDA.schema.docx # csv_parser/out/RC-EDA/RC-EDA.uml_diagram.pdf # csv_parser/out/RC-REF/RC-REF.schema.docx # csv_parser/out/RC-REF/RC-REF.uml_diagram.pdf # csv_parser/out/RS-BPV/RS-BPV.schema.docx # csv_parser/out/RS-BPV/RS-BPV.uml_diagram.pdf # csv_parser/out/RS-DR/RS-DR.schema.docx # csv_parser/out/RS-DR/RS-DR.uml_diagram.pdf # csv_parser/out/RS-EDA-MAJ/RS-EDA-MAJ.schema.docx # csv_parser/out/RS-EDA-MAJ/RS-EDA-MAJ.uml_diagram.pdf # csv_parser/out/RS-EDA/RS-EDA.schema.docx # csv_parser/out/RS-EDA/RS-EDA.uml_diagram.pdf # csv_parser/out/RS-ER/RS-ER.schema.docx # csv_parser/out/RS-ER/RS-ER.uml_diagram.pdf # csv_parser/out/RS-ERROR/RS-ERROR.schema.docx # csv_parser/out/RS-ERROR/RS-ERROR.uml_diagram.pdf # csv_parser/out/RS-RI/RS-RI.schema.docx # csv_parser/out/RS-RI/RS-RI.uml_diagram.pdf # csv_parser/out/RS-RPIS/RS-RPIS.schema.docx # csv_parser/out/RS-RPIS/RS-RPIS.uml_diagram.pdf # csv_parser/out/RS-RR/RS-RR.schema.docx # csv_parser/out/RS-RR/RS-RR.uml_diagram.pdf # csv_parser/out/RS-SR/RS-SR.schema.docx # csv_parser/out/RS-SR/RS-SR.uml_diagram.pdf # csv_parser/out/RS-URL/RS-URL.schema.docx # csv_parser/out/RS-URL/RS-URL.uml_diagram.pdf # csv_parser/out/TECHNICAL/TECHNICAL.schema.docx # csv_parser/out/TECHNICAL/TECHNICAL.uml_diagram.pdf # csv_parser/out/TECHNICAL_NOREQ/TECHNICAL_NOREQ.schema.docx # csv_parser/out/TECHNICAL_NOREQ/TECHNICAL_NOREQ.uml_diagram.pdf # csv_parser/out/customContent/customContent.schema.docx # csv_parser/out/customContent/customContent.uml_diagram.pdf # src/main/resources/json-schema/EMSI.schema.json # src/main/resources/json-schema/GEO-POS.schema.json # src/main/resources/json-schema/GEO-REQ.schema.json # src/main/resources/json-schema/GEO-RES.schema.json # src/main/resources/json-schema/RC-DE.schema.json # src/main/resources/json-schema/RC-EDA.schema.json # src/main/resources/json-schema/RC-REF.schema.json # src/main/resources/json-schema/RS-BPV.schema.json # src/main/resources/json-schema/RS-DR.schema.json # src/main/resources/json-schema/RS-EDA-MAJ.schema.json # src/main/resources/json-schema/RS-EDA.schema.json # src/main/resources/json-schema/RS-ER.schema.json # src/main/resources/json-schema/RS-ERROR.schema.json # src/main/resources/json-schema/RS-RI.schema.json # src/main/resources/json-schema/RS-RPIS.schema.json # src/main/resources/json-schema/RS-RR.schema.json # src/main/resources/json-schema/RS-SR.schema.json # src/main/resources/json-schema/RS-URL.schema.json # src/main/resources/json-schema/TECHNICAL.schema.json # src/main/resources/json-schema/TECHNICAL_NOREQ.schema.json # src/main/resources/json-schema/customContent.schema.json
ansforge · Dec 20, 2024 · 19164f1 · 19164f1
2 parents 4aa4917 + ebeee30
commit 19164f1
Show file tree

Hide file tree

Showing 64 changed files with 25 additions and 27 deletions.
diff --git a/csv_parser/out/EMSI/EMSI.schema.docx b/csv_parser/out/EMSI/EMSI.schema.docx
diff --git a/csv_parser/out/EMSI/EMSI.uml_diagram.pdf b/csv_parser/out/EMSI/EMSI.uml_diagram.pdf
diff --git a/csv_parser/out/GEO-POS/GEO-POS.schema.docx b/csv_parser/out/GEO-POS/GEO-POS.schema.docx
diff --git a/csv_parser/out/GEO-POS/GEO-POS.uml_diagram.pdf b/csv_parser/out/GEO-POS/GEO-POS.uml_diagram.pdf
diff --git a/csv_parser/out/GEO-REQ/GEO-REQ.schema.docx b/csv_parser/out/GEO-REQ/GEO-REQ.schema.docx
diff --git a/csv_parser/out/GEO-REQ/GEO-REQ.uml_diagram.pdf b/csv_parser/out/GEO-REQ/GEO-REQ.uml_diagram.pdf
diff --git a/csv_parser/out/GEO-RES/GEO-RES.schema.docx b/csv_parser/out/GEO-RES/GEO-RES.schema.docx
diff --git a/csv_parser/out/GEO-RES/GEO-RES.uml_diagram.pdf b/csv_parser/out/GEO-RES/GEO-RES.uml_diagram.pdf
diff --git a/csv_parser/out/RC-DE/RC-DE.schema.docx b/csv_parser/out/RC-DE/RC-DE.schema.docx
diff --git a/csv_parser/out/RC-DE/RC-DE.uml_diagram.pdf b/csv_parser/out/RC-DE/RC-DE.uml_diagram.pdf
diff --git a/csv_parser/out/RC-EDA/RC-EDA.schema.docx b/csv_parser/out/RC-EDA/RC-EDA.schema.docx
diff --git a/csv_parser/out/RC-EDA/RC-EDA.uml_diagram.pdf b/csv_parser/out/RC-EDA/RC-EDA.uml_diagram.pdf
diff --git a/csv_parser/out/RC-REF/RC-REF.schema.docx b/csv_parser/out/RC-REF/RC-REF.schema.docx
diff --git a/csv_parser/out/RC-REF/RC-REF.uml_diagram.pdf b/csv_parser/out/RC-REF/RC-REF.uml_diagram.pdf
diff --git a/csv_parser/out/RS-BPV/RS-BPV.schema.docx b/csv_parser/out/RS-BPV/RS-BPV.schema.docx
diff --git a/csv_parser/out/RS-BPV/RS-BPV.uml_diagram.pdf b/csv_parser/out/RS-BPV/RS-BPV.uml_diagram.pdf
diff --git a/csv_parser/out/RS-DR/RS-DR.schema.docx b/csv_parser/out/RS-DR/RS-DR.schema.docx
diff --git a/csv_parser/out/RS-DR/RS-DR.uml_diagram.pdf b/csv_parser/out/RS-DR/RS-DR.uml_diagram.pdf
diff --git a/csv_parser/out/RS-EDA-MAJ/RS-EDA-MAJ.schema.docx b/csv_parser/out/RS-EDA-MAJ/RS-EDA-MAJ.schema.docx
diff --git a/csv_parser/out/RS-EDA-MAJ/RS-EDA-MAJ.uml_diagram.pdf b/csv_parser/out/RS-EDA-MAJ/RS-EDA-MAJ.uml_diagram.pdf
diff --git a/csv_parser/out/RS-EDA/RS-EDA.schema.docx b/csv_parser/out/RS-EDA/RS-EDA.schema.docx
diff --git a/csv_parser/out/RS-EDA/RS-EDA.uml_diagram.pdf b/csv_parser/out/RS-EDA/RS-EDA.uml_diagram.pdf
diff --git a/csv_parser/out/RS-ER/RS-ER.schema.docx b/csv_parser/out/RS-ER/RS-ER.schema.docx
diff --git a/csv_parser/out/RS-ER/RS-ER.uml_diagram.pdf b/csv_parser/out/RS-ER/RS-ER.uml_diagram.pdf
diff --git a/csv_parser/out/RS-ERROR/RS-ERROR.schema.docx b/csv_parser/out/RS-ERROR/RS-ERROR.schema.docx
diff --git a/csv_parser/out/RS-ERROR/RS-ERROR.uml_diagram.pdf b/csv_parser/out/RS-ERROR/RS-ERROR.uml_diagram.pdf
diff --git a/csv_parser/out/RS-RI/RS-RI.schema.docx b/csv_parser/out/RS-RI/RS-RI.schema.docx
diff --git a/csv_parser/out/RS-RI/RS-RI.uml_diagram.pdf b/csv_parser/out/RS-RI/RS-RI.uml_diagram.pdf
diff --git a/csv_parser/out/RS-RPIS/RS-RPIS.schema.docx b/csv_parser/out/RS-RPIS/RS-RPIS.schema.docx
diff --git a/csv_parser/out/RS-RPIS/RS-RPIS.uml_diagram.pdf b/csv_parser/out/RS-RPIS/RS-RPIS.uml_diagram.pdf
diff --git a/csv_parser/out/RS-RR/RS-RR.schema.docx b/csv_parser/out/RS-RR/RS-RR.schema.docx
diff --git a/csv_parser/out/RS-RR/RS-RR.uml_diagram.pdf b/csv_parser/out/RS-RR/RS-RR.uml_diagram.pdf
diff --git a/csv_parser/out/RS-SR/RS-SR.schema.docx b/csv_parser/out/RS-SR/RS-SR.schema.docx
diff --git a/csv_parser/out/RS-SR/RS-SR.uml_diagram.pdf b/csv_parser/out/RS-SR/RS-SR.uml_diagram.pdf
diff --git a/csv_parser/out/RS-URL/RS-URL.schema.docx b/csv_parser/out/RS-URL/RS-URL.schema.docx
diff --git a/csv_parser/out/RS-URL/RS-URL.uml_diagram.pdf b/csv_parser/out/RS-URL/RS-URL.uml_diagram.pdf
diff --git a/csv_parser/out/TECHNICAL/TECHNICAL.schema.docx b/csv_parser/out/TECHNICAL/TECHNICAL.schema.docx
diff --git a/csv_parser/out/TECHNICAL/TECHNICAL.uml_diagram.pdf b/csv_parser/out/TECHNICAL/TECHNICAL.uml_diagram.pdf
diff --git a/csv_parser/out/TECHNICAL_NOREQ/TECHNICAL_NOREQ.schema.docx b/csv_parser/out/TECHNICAL_NOREQ/TECHNICAL_NOREQ.schema.docx
diff --git a/csv_parser/out/TECHNICAL_NOREQ/TECHNICAL_NOREQ.uml_diagram.pdf b/csv_parser/out/TECHNICAL_NOREQ/TECHNICAL_NOREQ.uml_diagram.pdf
diff --git a/csv_parser/out/customContent/customContent.schema.docx b/csv_parser/out/customContent/customContent.schema.docx
diff --git a/csv_parser/out/customContent/customContent.uml_diagram.pdf b/csv_parser/out/customContent/customContent.uml_diagram.pdf
diff --git a/src/main/resources/json-schema/EMSI.schema.json b/src/main/resources/json-schema/EMSI.schema.json
@@ -2,7 +2,7 @@
     "$schema": "http://json-schema.org/draft-07/schema#",
     "$id": "classpath:/json-schema/schema#",
     "x-id": "EMSI.schema.json#",
-    "version": "24.12.20",
+    "version": "24.12.19",
     "example": "example.json#",
     "type": "object",
     "title": "emsi",

diff --git a/src/main/resources/json-schema/GEO-POS.schema.json b/src/main/resources/json-schema/GEO-POS.schema.json
@@ -2,7 +2,7 @@
     "$schema": "http://json-schema.org/draft-07/schema#",
     "$id": "classpath:/json-schema/schema#",
     "x-id": "GEO-POS.schema.json#",
-    "version": "24.12.20",
+    "version": "24.12.19",
     "example": "example.json#",
     "type": "object",
     "title": "geoPositionsUpdate",

diff --git a/src/main/resources/json-schema/GEO-REQ.schema.json b/src/main/resources/json-schema/GEO-REQ.schema.json
@@ -2,7 +2,7 @@
     "$schema": "http://json-schema.org/draft-07/schema#",
     "$id": "classpath:/json-schema/schema#",
     "x-id": "GEO-REQ.schema.json#",
-    "version": "24.12.20",
+    "version": "24.12.19",
     "example": "example.json#",
     "type": "object",
     "title": "geoResourcesRequest",

diff --git a/src/main/resources/json-schema/GEO-RES.schema.json b/src/main/resources/json-schema/GEO-RES.schema.json
@@ -2,7 +2,7 @@
     "$schema": "http://json-schema.org/draft-07/schema#",
     "$id": "classpath:/json-schema/schema#",
     "x-id": "GEO-RES.schema.json#",
-    "version": "24.12.20",
+    "version": "24.12.19",
     "example": "example.json#",
     "type": "object",
     "title": "geoResourcesDetails",

diff --git a/src/main/resources/json-schema/RC-DE.schema.json b/src/main/resources/json-schema/RC-DE.schema.json
@@ -2,7 +2,7 @@
     "$schema": "http://json-schema.org/draft-07/schema#",
     "$id": "classpath:/json-schema/schema#",
     "x-id": "RC-DE.schema.json#",
-    "version": "24.12.20",
+    "version": "24.12.19",
     "example": "example.json#",
     "type": "object",
     "title": "DistributionElement",

diff --git a/src/main/resources/json-schema/RC-EDA.schema.json b/src/main/resources/json-schema/RC-EDA.schema.json
@@ -2,7 +2,7 @@
     "$schema": "http://json-schema.org/draft-07/schema#",
     "$id": "classpath:/json-schema/schema#",
     "x-id": "RC-EDA.schema.json#",
-    "version": "24.12.20",
+    "version": "24.12.19",
     "example": "example.json#",
     "type": "object",
     "title": "createCase",

diff --git a/src/main/resources/json-schema/RC-REF.schema.json b/src/main/resources/json-schema/RC-REF.schema.json
@@ -2,7 +2,7 @@
     "$schema": "http://json-schema.org/draft-07/schema#",
     "$id": "classpath:/json-schema/schema#",
     "x-id": "RC-REF.schema.json#",
-    "version": "24.12.20",
+    "version": "24.12.19",
     "example": "example.json#",
     "type": "object",
     "title": "reference",

diff --git a/src/main/resources/json-schema/RS-BPV.schema.json b/src/main/resources/json-schema/RS-BPV.schema.json
@@ -2,7 +2,7 @@
     "$schema": "http://json-schema.org/draft-07/schema#",
     "$id": "classpath:/json-schema/schema#",
     "x-id": "RS-BPV.schema.json#",
-    "version": "24.12.20",
+    "version": "24.12.19",
     "example": "example.json#",
     "type": "object",
     "title": "interventionReport",

diff --git a/src/main/resources/json-schema/RS-DR.schema.json b/src/main/resources/json-schema/RS-DR.schema.json
@@ -2,7 +2,7 @@
     "$schema": "http://json-schema.org/draft-07/schema#",
     "$id": "classpath:/json-schema/schema#",
     "x-id": "RS-DR.schema.json#",
-    "version": "24.12.20",
+    "version": "24.12.19",
     "example": "example.json#",
     "type": "object",
     "title": "resourcesRequest",

diff --git a/src/main/resources/json-schema/RS-EDA-MAJ.schema.json b/src/main/resources/json-schema/RS-EDA-MAJ.schema.json
@@ -2,7 +2,7 @@
     "$schema": "http://json-schema.org/draft-07/schema#",
     "$id": "classpath:/json-schema/schema#",
     "x-id": "RS-EDA-MAJ.schema.json#",
-    "version": "24.12.20",
+    "version": "24.12.19",
     "example": "example.json#",
     "type": "object",
     "title": "createCaseHealthUpdate",

diff --git a/src/main/resources/json-schema/RS-EDA.schema.json b/src/main/resources/json-schema/RS-EDA.schema.json
@@ -2,7 +2,7 @@
     "$schema": "http://json-schema.org/draft-07/schema#",
     "$id": "classpath:/json-schema/schema#",
     "x-id": "RS-EDA.schema.json#",
-    "version": "24.12.20",
+    "version": "24.12.19",
     "example": "example.json#",
     "type": "object",
     "title": "createCaseHealth",

diff --git a/src/main/resources/json-schema/RS-ER.schema.json b/src/main/resources/json-schema/RS-ER.schema.json
@@ -2,7 +2,7 @@
     "$schema": "http://json-schema.org/draft-07/schema#",
     "$id": "classpath:/json-schema/schema#",
     "x-id": "RS-ER.schema.json#",
-    "version": "24.12.20",
+    "version": "24.12.19",
     "example": "example.json#",
     "type": "object",
     "title": "resourcesEngagement",

diff --git a/src/main/resources/json-schema/RS-ERROR.schema.json b/src/main/resources/json-schema/RS-ERROR.schema.json
@@ -2,7 +2,7 @@
     "$schema": "http://json-schema.org/draft-07/schema#",
     "$id": "classpath:/json-schema/schema#",
     "x-id": "RS-ERROR.schema.json#",
-    "version": "24.12.20",
+    "version": "24.12.19",
     "example": "example.json#",
     "type": "object",
     "title": "error",

diff --git a/src/main/resources/json-schema/RS-RI.schema.json b/src/main/resources/json-schema/RS-RI.schema.json
@@ -2,7 +2,7 @@
     "$schema": "http://json-schema.org/draft-07/schema#",
     "$id": "classpath:/json-schema/schema#",
     "x-id": "RS-RI.schema.json#",
-    "version": "24.12.20",
+    "version": "24.12.19",
     "example": "example.json#",
     "type": "object",
     "title": "resourcesInfo",

diff --git a/src/main/resources/json-schema/RS-RPIS.schema.json b/src/main/resources/json-schema/RS-RPIS.schema.json
@@ -2,7 +2,7 @@
     "$schema": "http://json-schema.org/draft-07/schema#",
     "$id": "classpath:/json-schema/schema#",
     "x-id": "RS-RPIS.schema.json#",
-    "version": "24.12.20",
+    "version": "24.12.19",
     "example": "example.json#",
     "type": "object",
     "title": "rpis",

diff --git a/src/main/resources/json-schema/RS-RR.schema.json b/src/main/resources/json-schema/RS-RR.schema.json
@@ -2,7 +2,7 @@
     "$schema": "http://json-schema.org/draft-07/schema#",
     "$id": "classpath:/json-schema/schema#",
     "x-id": "RS-RR.schema.json#",
-    "version": "24.12.20",
+    "version": "24.12.19",
     "example": "example.json#",
     "type": "object",
     "title": "resourcesResponse",

diff --git a/src/main/resources/json-schema/RS-SR.schema.json b/src/main/resources/json-schema/RS-SR.schema.json
@@ -2,7 +2,7 @@
     "$schema": "http://json-schema.org/draft-07/schema#",
     "$id": "classpath:/json-schema/schema#",
     "x-id": "RS-SR.schema.json#",
-    "version": "24.12.20",
+    "version": "24.12.19",
     "example": "example.json#",
     "type": "object",
     "title": "resourcesStatus",

diff --git a/src/main/resources/json-schema/RS-URL.schema.json b/src/main/resources/json-schema/RS-URL.schema.json
@@ -2,7 +2,7 @@
     "$schema": "http://json-schema.org/draft-07/schema#",
     "$id": "classpath:/json-schema/schema#",
     "x-id": "RS-URL.schema.json#",
-    "version": "24.12.20",
+    "version": "24.12.19",
     "example": "example.json#",
     "type": "object",
     "title": "documentLink",

diff --git a/src/main/resources/json-schema/TECHNICAL.schema.json b/src/main/resources/json-schema/TECHNICAL.schema.json
@@ -2,7 +2,7 @@
     "$schema": "http://json-schema.org/draft-07/schema#",
     "$id": "classpath:/json-schema/schema#",
     "x-id": "TECHNICAL.schema.json#",
-    "version": "24.12.20",
+    "version": "24.12.19",
     "example": "example.json#",
     "type": "object",
     "title": "technical",

diff --git a/src/main/resources/json-schema/TECHNICAL_NOREQ.schema.json b/src/main/resources/json-schema/TECHNICAL_NOREQ.schema.json
@@ -2,7 +2,7 @@
     "$schema": "http://json-schema.org/draft-07/schema#",
     "$id": "classpath:/json-schema/schema#",
     "x-id": "TECHNICAL_NOREQ.schema.json#",
-    "version": "24.12.20",
+    "version": "24.12.19",
     "example": "example.json#",
     "type": "object",
     "title": "technicalNoreq",

diff --git a/src/main/resources/json-schema/customContent.schema.json b/src/main/resources/json-schema/customContent.schema.json
@@ -2,7 +2,7 @@
     "$schema": "http://json-schema.org/draft-07/schema#",
     "$id": "classpath:/json-schema/schema#",
     "x-id": "customContent.schema.json#",
-    "version": "24.12.20",
+    "version": "24.12.19",
     "example": "example.json#",
     "type": "object",
     "title": "customContent",

diff --git a/src/test/java/com/hubsante/model/edxlhandler/EdxlHandlerTest.java b/src/test/java/com/hubsante/model/edxlhandler/EdxlHandlerTest.java
@@ -46,8 +46,7 @@
 import static com.hubsante.model.EdxlWrapperUtils.wrapUseCaseMessage;
 import static com.hubsante.model.EdxlWrapperUtils.wrapUseCaseMessageWithoutDistributionElement;
 import static com.hubsante.model.TestMessagesHelper.getInvalidMessage;
-import static com.hubsante.model.config.Constants.FULL_SCHEMA;
-import static com.hubsante.model.config.Constants.FULL_XSD;
+import static com.hubsante.model.config.Constants.*;
 import static com.hubsante.model.utils.TestFileUtils.getMessageByFileName;
 import static com.hubsante.model.utils.TestFileUtils.getMessageString;
 import static org.junit.jupiter.api.Assertions.*;
@@ -75,16 +74,15 @@ public void deserializeCompleteMessages() throws IOException, ValidationExceptio
         String jsonMessageString = new String(Files.readAllBytes(jsonMessage.toPath()), StandardCharsets.UTF_8);
         validator.validateJSON(jsonMessageString, FULL_SCHEMA);
         EdxlMessage jsonEdxlMessage = converter.deserializeJsonEDXL(jsonMessageString);
-//        String xmlEdxlSerializedMessage = converter.serializeXmlEDXL(jsonEdxlMessage);
-//        validator.validateXML(xmlEdxlSerializedMessage, FULL_XSD);
+        String xmlEdxlSerializedMessage = converter.serializeXmlEDXL(jsonEdxlMessage);
+        validator.validateXML(xmlEdxlSerializedMessage, FULL_XSD_NO_HEADER);
 
         File xmlMessage = new File(TestMessagesHelper.class.getClassLoader().getResource("sample/valid/EDXL-DE/EDXL-DE.xml").getFile());
         String xmlMessageString = new String(Files.readAllBytes(xmlMessage.toPath()), StandardCharsets.UTF_8);
-        validator.validateXML(xmlMessageString, FULL_XSD);
+        validator.validateXML(xmlMessageString, FULL_XSD_NO_HEADER);
         EdxlMessage xmlEdxlMessage = converter.deserializeXmlEDXL(xmlMessageString);
         String jsonEdxlSerializedMessage = converter.serializeJsonEDXL(xmlEdxlMessage);
         validator.validateJSON(jsonEdxlSerializedMessage, FULL_SCHEMA);
-
     }
 
     @Test