review notes

Signed-off-by: Samir Romdhani <samir.romdhani_externe@rte-france.com>

Author: samirromdhani

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

@@ -56,6 +56,8 @@
 import java.time.ZonedDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.*;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.ForkJoinPool;
 import java.util.function.Supplier;
@@ -89,7 +91,9 @@ public final class NetworkSerDe {
     static final byte[] BIIDM_MAGIC_NUMBER = {0x42, 0x69, 0x6e, 0x61, 0x72, 0x79, 0x20, 0x49, 0x49, 0x44, 0x4d};
 
     private static final Supplier<Schema> DEFAULT_SCHEMA_SUPPLIER = Suppliers.memoize(() -> NetworkSerDe.createSchema(DefaultExtensionsSupplier.getInstance()));
-    private static final Supplier<Map<IidmVersion, Schema>> DEFAULT_SCHEMAS_SUPPLIER = Suppliers.memoize(() -> NetworkSerDe.createDefaultSchemas(DefaultExtensionsSupplier.getInstance()));
+    private static final Supplier<ConcurrentMap<IidmVersion, Schema>> DEFAULT_SCHEMAS_SUPPLIER = Suppliers.memoize(ConcurrentHashMap::new);
+    private static final Supplier<Map<IidmVersion, Schema>> DEFAULT_SCHEMAS_SUPPLIER_V_TEST = Suppliers.memoize(() -> NetworkSerDe.createDefaultSchemas(DefaultExtensionsSupplier.getInstance()));
+
     private static final int MAX_NAMESPACE_PREFIX_NUM = 100;
     private static final String XSD_RESOURCE_DIR = "/xsd/";
 
@@ -177,7 +181,7 @@ private static void validate(InputStream is, IidmVersion version, ExtensionsSupp
         // XSD validation
         Schema schema;
         if (extensionsSupplier == DefaultExtensionsSupplier.getInstance()) {
-            schema = DEFAULT_SCHEMAS_SUPPLIER.get().get(version);
+            schema = DEFAULT_SCHEMAS_SUPPLIER.get().computeIfAbsent(version, v -> createSchema(DefaultExtensionsSupplier.getInstance(), v));
             if (schema == null) {
                 throw new PowsyblException("Schema not found: version=" + version);
             }
@@ -301,7 +305,7 @@ private static List<String> extractSchemaLocations(byte[] xsdBytes) {
                         && XMLConstants.W3C_XML_SCHEMA_NS_URI.equals(reader.getNamespaceURI())
                         && ("import".equals(reader.getLocalName()))) {
                     String schemaLocation = reader.getAttributeValue(null, "schemaLocation");
-                    if (schemaLocation != null && !schemaLocation.isBlank()) {
+                    if (schemaLocation != null && !schemaLocation.isBlank() && isValidXsdFile(schemaLocation)) {
                         locations.add(schemaLocation);
                     }
                 }
@@ -340,6 +344,15 @@ private static String readRootNamespace(byte[] xmlBytes) {
         }
     }
 
+    private static boolean isValidXsdFile(String shemaLocation) {
+        for (IidmVersion version :IidmVersion.values()) {
+            if(shemaLocation.equals("iidm_V" + version.toString("_") + ".xsd")){
+                return true;
+            }
+        }
+        return false;
+    }
+
     private static void throwExceptionIfOption(AbstractOptions<?> options, String message) {
         if (options.isThrowExceptionIfExtensionNotFound()) {
             throw new PowsyblException(message);

iidm/iidm-serde/src/test/java/com/powsybl/iidm/serde/NetworkSerDeTest.java

@@ -419,6 +419,7 @@ void testValidateByVersionWhenMismatchedNetworkVersion() throws IOException {
     @Test
     void testValidateByVersionWhenInvalidNetwork() throws IOException {
         try (InputStream is = getClass().getResourceAsStream("/V1_16/shuntOldTagName.xml")) {
+            assertNotNull(is);
             assertThatThrownBy(() -> NetworkSerDe.validate(is, IidmVersion.V_1_16))
                     .isInstanceOf(com.powsybl.commons.exceptions.UncheckedSaxException.class)
                     .hasMessageContaining("Invalid content was found starting with element '{\"http://www.powsybl.org/schema/iidm/1_16\":shunt}'");
@@ -429,13 +430,15 @@ void testValidateByVersionWhenInvalidNetwork() throws IOException {
     void testValidateByVersionWhenNetworkContainSlackTerminalExtension() throws IOException {
         // Given extension: slack_terminal, version 1.5 that require iidm version 1.8 when validate should succeed
         try (InputStream is = getClass().getResourceAsStream("/slackTerminal.xml")) {
+            assertNotNull(is);
             assertDoesNotThrow(() -> NetworkSerDe.validate(is, IidmVersion.V_1_16));
         }
     }
 
     @Test
     void testValidateByVersionWhenNetworkContainTerminalMockExtension() throws IOException {
         try (InputStream is = getClass().getResourceAsStream("/V1_16/eurostag-tutorial-example1-with-terminalMock-ext.xml")) {
+            assertNotNull(is);
             assertDoesNotThrow(() -> NetworkSerDe.validate(is, IidmVersion.V_1_16));
         }
     }
@@ -448,8 +451,6 @@ void testValidateByVersionWhenInValidExtension() throws IOException {
                     .isInstanceOf(com.powsybl.commons.exceptions.UncheckedSaxException.class)
                     .hasMessageContaining("Value 'TEST' is not facet-valid with respect to enumeration " +
                             "'[IN_OPERATION, PLANNED_OUTAGE, FORCED_OUTAGE]'. It must be a value from the enumeration.");
-
         }
     }
-
 }