[FbConstraintDocument] Support new schema versions (#1107)

powsybl · Aug 9, 2024 · a6074d0 · a6074d0
1 parent d3b1d3f
commit a6074d0
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 138 deletions.
diff --git a/...aint/src/main/java/com/powsybl/openrao/data/cracio/fbconstraint/FbConstraintImporter.java b/...aint/src/main/java/com/powsybl/openrao/data/cracio/fbconstraint/FbConstraintImporter.java
@@ -78,7 +78,7 @@ public boolean exists(String filename, InputStream inputStream) {
             int flowBasedDocumentVersion = flowBasedDocumentVersion(new ByteArrayInputStream(bytes));
             String schemaFile = schemaVersion(flowBasedDocumentVersion);
 
-            if (!schemaFile.equals("")) {
+            if (schemaFile != null) {
                 Source xmlFile = new StreamSource(new ByteArrayInputStream(bytes));
                 // The following line triggers sonar issue java:S2755 which prevents us from accessing XSD schema files
                 SchemaFactory schemaFactory = SchemaFactory.newInstance(XMLConstants.W3C_XML_SCHEMA_NS_URI); //NOSONAR
@@ -129,13 +129,13 @@ private int flowBasedDocumentVersion(InputStream inputStream) {
     }
 
     private String schemaVersion(int flowBasedDocumentVersion) {
-        if (flowBasedDocumentVersion >= 17 && flowBasedDocumentVersion <= 20) {
+        if (flowBasedDocumentVersion >= 17) {
             return FLOWBASED_CONSTRAINT_V18_SCHEMA_FILE;
         } else if (flowBasedDocumentVersion == 11) {
             return FLOWBASED_CONSTRAINT_V11_SCHEMA_FILE;
         } else {
             LOGGER.debug("Flow-based constraint document with version {} are not handled by the FbConstraintImporter", flowBasedDocumentVersion);
-            return "";
+            return null;
         }
     }
 

diff --git a/data/crac-io/crac-io-fb-constraint/src/test/resources/merged_cb/MNEC_test.xml b/data/crac-io/crac-io-fb-constraint/src/test/resources/merged_cb/MNEC_test.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<FlowBasedConstraintDocument DtdRelease="4" DtdVersion="0" xmlns="flowbased" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="flowbasedconstraintdocument-18.xsd">
+<FlowBasedConstraintDocument DtdRelease="4" DtdVersion="0" xmlns="flowbased" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="flowbasedconstraintdocument-23.xsd">
   <DocumentIdentification v="17XTSO-CS------W-20190108-F301v1"/>
   <DocumentVersion v="1"/>
   <DocumentType v="B06"/>

diff --git a/data/crac-io/crac-io-fb-constraint/src/test/resources/merged_cb/corrupted.xml b/data/crac-io/crac-io-fb-constraint/src/test/resources/merged_cb/corrupted.xml
diff --git a/data/crac-io/crac-io-fb-constraint/src/test/resources/merged_cb/schema_v99.xml b/data/crac-io/crac-io-fb-constraint/src/test/resources/merged_cb/schema_v99.xml
diff --git a/data/crac-io/crac-io-fb-constraint/src/test/resources/merged_cb/transformers.xml b/data/crac-io/crac-io-fb-constraint/src/test/resources/merged_cb/transformers.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<FlowBasedConstraintDocument DtdRelease="4" DtdVersion="0" xmlns="flowbased" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="flowbasedconstraintdocument-17.xsd">
+<FlowBasedConstraintDocument DtdRelease="4" DtdVersion="0" xmlns="flowbased" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="flowbasedconstraintdocument-1754.xsd">
   <DocumentIdentification v="17XTSO-CS------W-20190108-F301v1"/>
   <DocumentVersion v="1"/>
   <DocumentType v="B06"/>