draft

Signed-off-by: Clement Philipot <[email protected]>

Author: cphili

iidm/iidm-serde/src/main/java/com/powsybl/iidm/serde/IidmVersion.java

@@ -14,8 +14,7 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import static com.powsybl.iidm.serde.IidmSerDeConstants.ITESLA_DOMAIN;
-import static com.powsybl.iidm.serde.IidmSerDeConstants.POWSYBL_DOMAIN;
+import static com.powsybl.iidm.serde.IidmSerDeConstants.*;
 
 /**
  * @author Miora Ralambotiana {@literal <miora.ralambotiana at rte-france.com>}
@@ -85,6 +84,11 @@ public String getXsd(boolean valid) {
     public static IidmVersion fromNamespaceURI(String namespaceURI) {
         String version = namespaceURI.substring(namespaceURI.lastIndexOf('/') + 1);
         IidmVersion v = of(version, "_");
+
+        if (v.compareTo(CURRENT_IIDM_VERSION) > 0) {
+            throw new PowsyblException("Unsupported IIDM version " + v.toString(".") + ", maximum supported version : " + CURRENT_IIDM_VERSION.toString(".") + ".");
+        }
+
         String namespaceUriV = v.getNamespaceURI();
         if (!namespaceURI.equals(namespaceUriV)) {
             if (v.compareTo(V_1_7) >= 0 && namespaceURI.equals(v.getNamespaceURI(false))) {
@@ -103,4 +107,28 @@ public static IidmVersion of(String version, String separator) {
                 .findFirst() // there can only be 0 or exactly 1 match
                 .orElseThrow(() -> new PowsyblException("Version " + version + " is not supported."));
     }
+
+    public static int compareVersions(String v1, String v2) {
+        int[] version1 = parseVersion(v1);
+        int[] version2 = parseVersion(v2);
+
+        if (version1[0] != version2[0]) {
+            return Integer.compare(version1[0], version2[0]);
+        }
+        int result = Integer.compare(version1[1], version2[1]);
+        return result;
+    }
+
+    private static int[] parseVersion(String v) {
+        String version = v.startsWith("V_") ? v.substring(2) : v;
+        String[] parts = version.split("_");
+        int major = Integer.parseInt(parts[0]);
+        int minor = Integer.parseInt(parts[1]);
+        return new int[]{major, minor};
+    }
+
+    public static boolean isVersionSupported(IidmVersion version) {
+        return version.compareTo(CURRENT_IIDM_VERSION) <= 0;
+    }
+
 }

iidm/iidm-serde/src/main/java/com/powsybl/iidm/serde/XMLImporter.java

@@ -8,6 +8,7 @@
 package com.powsybl.iidm.serde;
 
 import com.google.auto.service.AutoService;
+import com.powsybl.commons.PowsyblException;
 import com.powsybl.commons.config.PlatformConfig;
 import com.powsybl.commons.datasource.ReadOnlyDataSource;
 import com.powsybl.commons.xml.XmlUtil;
@@ -69,9 +70,14 @@ protected boolean exists(ReadOnlyDataSource dataSource, String ext) throws IOExc
                             if (eventType == XMLStreamConstants.START_ELEMENT) {
                                 String name = xmlsr.getLocalName();
                                 String ns = xmlsr.getNamespaceURI();
-                                return NetworkSerDe.NETWORK_ROOT_ELEMENT_NAME.equals(name)
-                                        && (Stream.of(IidmVersion.values()).anyMatch(v -> v.getNamespaceURI().equals(ns))
-                                        || Stream.of(IidmVersion.values()).filter(v -> v.compareTo(IidmVersion.V_1_7) >= 0).anyMatch(v -> v.getNamespaceURI(false).equals(ns)));
+
+                                String xmlIidmVersion = ns.substring(ns.lastIndexOf('/') + 1);
+                                if (!xmlIidmVersion.isEmpty() && IidmVersion.compareVersions(xmlIidmVersion, CURRENT_IIDM_VERSION.toString()) <= 0) {
+                                    return NetworkSerDe.NETWORK_ROOT_ELEMENT_NAME.equals(name)
+                                            && (Stream.of(IidmVersion.values()).anyMatch(v -> v.getNamespaceURI().equals(ns))
+                                            || Stream.of(IidmVersion.values()).filter(v -> v.compareTo(IidmVersion.V_1_7) >= 0).anyMatch(v -> v.getNamespaceURI(false).equals(ns)));
+                                }
+                                throw new PowsyblException("Unsupported IIDM Version" + xmlIidmVersion);
                             }
                         }
                     } finally {

iidm/iidm-serde/src/test/resources/testNetworkNodeBreaker.xiidm

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<iidm:network xmlns:iidm="http://www.powsybl.org/schema/iidm/1_14" id="testCase11" caseDate="2022-07-26T13:56:23.057+02:00" forecastDistance="0" sourceFormat="test" minimumValidationLevel="STEADY_STATE_HYPOTHESIS">
+<iidm:network xmlns:iidm="http://www.powsybl.org/schema/iidm/1_19" id="testCase11" caseDate="2022-07-26T13:56:23.057+02:00" forecastDistance="0" sourceFormat="test" minimumValidationLevel="STEADY_STATE_HYPOTHESIS">
     <iidm:substation id="subst" name="subst" country="FR">
         <iidm:voltageLevel id="vl1" name="vl1" nominalV="380.0" topologyKind="NODE_BREAKER">
             <iidm:nodeBreakerTopology>
@@ -115,4 +115,4 @@
         </iidm:voltageLevel>
     </iidm:substation>
     <iidm:line id="line1" name="line1" r="2.0" x="14.745" g1="1.0" b1="1.0" g2="1.0" b2="1.0" node1="35" voltageLevelId1="vl1" node2="2" voltageLevelId2="vlSubst2"/>
-</iidm:network>
+</iidm:network>