Merge branch 'main' into feature/csa/reorganize-constants

powsybl · Dec 2, 2024 · e4f5fa3 · e4f5fa3
2 parents 6bf2981 + 0e149ca
commit e4f5fa3
Show file tree

Hide file tree

Showing 170 changed files with 7,741 additions and 247 deletions.
diff --git a/commons/pom.xml b/commons/pom.xml
@@ -112,7 +112,7 @@
         </dependency>
         <dependency>
             <groupId>org.mockito</groupId>
-            <artifactId>mockito-inline</artifactId>
+            <artifactId>mockito-core</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>

diff --git a/data/crac/crac-api/pom.xml b/data/crac/crac-api/pom.xml
@@ -54,7 +54,7 @@
         </dependency>
         <dependency>
             <groupId>org.mockito</groupId>
-            <artifactId>mockito-inline</artifactId>
+            <artifactId>mockito-core</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>

diff --git a/data/crac/crac-impl/pom.xml b/data/crac/crac-impl/pom.xml
@@ -99,7 +99,7 @@
         </dependency>
         <dependency>
             <groupId>org.mockito</groupId>
-            <artifactId>mockito-inline</artifactId>
+            <artifactId>mockito-core</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>

diff --git a/data/crac/crac-io/crac-io-cim/pom.xml b/data/crac/crac-io/crac-io-cim/pom.xml
@@ -24,20 +24,8 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>org.jvnet.jaxb2.maven2</groupId>
-                <artifactId>maven-jaxb2-plugin</artifactId>
-                <configuration>
-                    <args>
-                        <arg>-Xinheritance</arg>
-                    </args>
-                    <plugins>
-                        <plugin>
-                            <groupId>org.jvnet.jaxb2_commons</groupId>
-                            <artifactId>jaxb2-basics</artifactId>
-                            <version>${maven.jvnet.jaxb2-basics.version}</version>
-                        </plugin>
-                    </plugins>
-                </configuration>
+                <groupId>org.jvnet.jaxb</groupId>
+                <artifactId>jaxb-maven-plugin</artifactId>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
@@ -63,8 +51,8 @@
             <version>${project.version}</version>
         </dependency>
         <dependency>
-            <groupId>javax.xml.bind</groupId>
-            <artifactId>jaxb-api</artifactId>
+            <groupId>jakarta.xml.bind</groupId>
+            <artifactId>jakarta.xml.bind-api</artifactId>
         </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
@@ -125,7 +113,7 @@
         </dependency>
         <dependency>
             <groupId>org.mockito</groupId>
-            <artifactId>mockito-inline</artifactId>
+            <artifactId>mockito-core</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>

diff --git a/...io-cim/src/main/java/com/powsybl/openrao/data/cracio/cim/craccreator/CimCracImporter.java b/...io-cim/src/main/java/com/powsybl/openrao/data/cracio/cim/craccreator/CimCracImporter.java
@@ -18,8 +18,8 @@
 import org.xml.sax.SAXException;
 
 import javax.xml.XMLConstants;
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBException;
+import jakarta.xml.bind.JAXBContext;
+import jakarta.xml.bind.JAXBException;
 import javax.xml.transform.Source;
 import javax.xml.transform.stream.StreamSource;
 import javax.xml.validation.Schema;

diff --git a/data/crac/crac-io/crac-io-commons/pom.xml b/data/crac/crac-io/crac-io-commons/pom.xml
@@ -61,7 +61,7 @@
         </dependency>
         <dependency>
             <groupId>org.mockito</groupId>
-            <artifactId>mockito-inline</artifactId>
+            <artifactId>mockito-core</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>

diff --git a/data/crac/crac-io/crac-io-csa-profiles/pom.xml b/data/crac/crac-io/crac-io-csa-profiles/pom.xml
@@ -24,20 +24,8 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>org.jvnet.jaxb2.maven2</groupId>
-                <artifactId>maven-jaxb2-plugin</artifactId>
-                <configuration>
-                    <args>
-                        <arg>-Xinheritance</arg>
-                    </args>
-                    <plugins>
-                        <plugin>
-                            <groupId>org.jvnet.jaxb2_commons</groupId>
-                            <artifactId>jaxb2-basics</artifactId>
-                            <version>${maven.jvnet.jaxb2-basics.version}</version>
-                        </plugin>
-                    </plugins>
-                </configuration>
+                <groupId>org.jvnet.jaxb</groupId>
+                <artifactId>jaxb-maven-plugin</artifactId>
             </plugin>
         </plugins>
     </build>
@@ -93,7 +81,7 @@
         </dependency>
         <dependency>
             <groupId>org.mockito</groupId>
-            <artifactId>mockito-inline</artifactId>
+            <artifactId>mockito-core</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>

diff --git a/data/crac/crac-io/crac-io-cse/pom.xml b/data/crac/crac-io/crac-io-cse/pom.xml
@@ -24,19 +24,9 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>org.jvnet.jaxb2.maven2</groupId>
-                <artifactId>maven-jaxb2-plugin</artifactId>
+                <groupId>org.jvnet.jaxb</groupId>
+                <artifactId>jaxb-maven-plugin</artifactId>
                 <configuration>
-                    <args>
-                        <arg>-Xinheritance</arg>
-                    </args>
-                    <plugins>
-                        <plugin>
-                            <groupId>org.jvnet.jaxb2_commons</groupId>
-                            <artifactId>jaxb2-basics</artifactId>
-                            <version>${maven.jvnet.jaxb2-basics.version}</version>
-                        </plugin>
-                    </plugins>
                     <generatePackage>com.powsybl.openrao.data.cracio.cse.xsd</generatePackage>
                     <schemaDirectory>src/main/resources/com/powsybl/openrao/data/cracio/cse/xsd</schemaDirectory>
                 </configuration>
@@ -63,8 +53,8 @@
             <version>${project.version}</version>
         </dependency>
         <dependency>
-            <groupId>javax.xml.bind</groupId>
-            <artifactId>jaxb-api</artifactId>
+            <groupId>jakarta.xml.bind</groupId>
+            <artifactId>jakarta.xml.bind-api</artifactId>
         </dependency>
 
         <!-- Runtime dependencies -->
@@ -108,7 +98,7 @@
         </dependency>
         <dependency>
             <groupId>org.mockito</groupId>
-            <artifactId>mockito-inline</artifactId>
+            <artifactId>mockito-core</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>

diff --git a/...rac-io/crac-io-cse/src/main/java/com/powsybl/openrao/data/cracio/cse/CseCracImporter.java b/...rac-io/crac-io-cse/src/main/java/com/powsybl/openrao/data/cracio/cse/CseCracImporter.java
@@ -18,8 +18,8 @@
 import org.xml.sax.SAXException;
 
 import javax.xml.XMLConstants;
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBException;
+import jakarta.xml.bind.JAXBContext;
+import jakarta.xml.bind.JAXBException;
 import javax.xml.transform.Source;
 import javax.xml.transform.stream.StreamSource;
 import javax.xml.validation.Schema;

diff --git a/data/crac/crac-io/crac-io-fb-constraint/pom.xml b/data/crac/crac-io/crac-io-fb-constraint/pom.xml
@@ -24,23 +24,8 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>org.jvnet.jaxb2.maven2</groupId>
-                <artifactId>maven-jaxb2-plugin</artifactId>
-                <configuration>
-                    <extension>true</extension>
-                    <args>
-                        <arg>-Xinheritance</arg>
-                        <arg>-Xcopyable</arg>
-                        <arg>-Xequals</arg>
-                    </args>
-                    <plugins>
-                        <plugin>
-                            <groupId>org.jvnet.jaxb2_commons</groupId>
-                            <artifactId>jaxb2-basics</artifactId>
-                            <version>${maven.jvnet.jaxb2-basics.version}</version>
-                        </plugin>
-                    </plugins>
-                </configuration>
+                <groupId>org.jvnet.jaxb</groupId>
+                <artifactId>jaxb-maven-plugin</artifactId>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
@@ -69,12 +54,8 @@
             <artifactId>powsybl-iidm-api</artifactId>
         </dependency>
         <dependency>
-            <groupId>javax.xml.bind</groupId>
-            <artifactId>jaxb-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.jvnet.jaxb2_commons</groupId>
-            <artifactId>jaxb2-basics</artifactId>
+            <groupId>jakarta.xml.bind</groupId>
+            <artifactId>jakarta.xml.bind-api</artifactId>
         </dependency>
 
         <!-- Runtime dependencies -->
@@ -119,7 +100,7 @@
         </dependency>
         <dependency>
             <groupId>org.mockito</groupId>
-            <artifactId>mockito-inline</artifactId>
+            <artifactId>mockito-core</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>

diff --git a/...b-constraint/src/main/java/com/powsybl/openrao/data/cracio/fbconstraint/ActionReader.java b/...b-constraint/src/main/java/com/powsybl/openrao/data/cracio/fbconstraint/ActionReader.java
@@ -21,7 +21,7 @@
 import com.powsybl.openrao.data.cracio.commons.ucte.UctePstHelper;
 import com.powsybl.openrao.data.cracio.commons.ucte.UcteTopologicalElementHelper;
 
-import javax.xml.bind.JAXBElement;
+import jakarta.xml.bind.JAXBElement;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;

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
@@ -19,9 +19,9 @@
 import org.xml.sax.SAXException;
 
 import javax.xml.XMLConstants;
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBException;
-import javax.xml.bind.Unmarshaller;
+import jakarta.xml.bind.JAXBContext;
+import jakarta.xml.bind.JAXBException;
+import jakarta.xml.bind.Unmarshaller;
 import javax.xml.transform.Source;
 import javax.xml.transform.stream.StreamSource;
 import javax.xml.validation.Schema;

diff --git a/data/crac/crac-io/crac-io-json/pom.xml b/data/crac/crac-io/crac-io-json/pom.xml
@@ -20,6 +20,10 @@
             <artifactId>open-rao-crac-api</artifactId>
             <version>${project.version}</version>
         </dependency>
+        <dependency>
+            <groupId>com.networknt</groupId>
+            <artifactId>json-schema-validator</artifactId>
+        </dependency>
 
         <!-- Test dependencies -->
         <dependency>
@@ -57,7 +61,7 @@
         </dependency>
         <dependency>
             <groupId>org.mockito</groupId>
-            <artifactId>mockito-inline</artifactId>
+            <artifactId>mockito-core</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>

diff --git a/...c/crac-io/crac-io-json/src/main/java/com/powsybl/openrao/data/cracio/json/JsonImport.java b/...c/crac-io/crac-io-json/src/main/java/com/powsybl/openrao/data/cracio/json/JsonImport.java
@@ -10,21 +10,30 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.module.SimpleModule;
 import com.google.auto.service.AutoService;
+import com.networknt.schema.JsonSchema;
 import com.powsybl.iidm.network.Network;
 import com.powsybl.openrao.commons.OpenRaoException;
 import com.powsybl.openrao.data.cracapi.Crac;
 import com.powsybl.openrao.data.cracapi.CracCreationContext;
 import com.powsybl.openrao.data.cracapi.io.Importer;
 import com.powsybl.openrao.data.cracapi.parameters.CracCreationParameters;
 import com.powsybl.openrao.data.cracio.json.deserializers.CracDeserializer;
-import org.apache.commons.io.FilenameUtils;
 
+import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.UncheckedIOException;
+import java.nio.charset.StandardCharsets;
 import java.time.OffsetDateTime;
+import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 import static com.powsybl.commons.json.JsonUtil.createObjectMapper;
+import static com.powsybl.openrao.commons.logs.OpenRaoLoggerProvider.TECHNICAL_LOGS;
+import static com.powsybl.openrao.data.cracio.json.JsonSchemaProvider.getSchema;
+import static com.powsybl.openrao.data.cracio.json.JsonSchemaProvider.getValidationErrors;
+import static com.powsybl.openrao.data.cracio.json.JsonSchemaProvider.isCracFile;
 
 /**
  * @author Viktor Terrier {@literal <viktor.terrier at rte-france.com>}
@@ -39,18 +48,24 @@ public String getFormat() {
 
     @Override
     public boolean exists(String filename, InputStream inputStream) {
-        if (!FilenameUtils.getExtension(filename).equals("json")) {
+        if (!filename.endsWith(".json")) {
             return false;
         }
         try {
-            ObjectMapper objectMapper = createObjectMapper();
-            SimpleModule module = new SimpleModule();
-            module.addDeserializer(Crac.class, new CracDeserializer(true));
-            objectMapper.registerModule(module);
-            // TODO: replace this by a call to CracDeserializer.isValid
-            objectMapper.readValue(inputStream, Crac.class);
-            return true;
-        } catch (OpenRaoException | IOException e) {
+            ByteArrayInputStream byteArrayInputStream = new ByteArrayInputStream(inputStream.readAllBytes());
+            if (isCracFile(byteArrayInputStream)) {
+                byteArrayInputStream.reset();
+                Version cracVersion = readVersion(byteArrayInputStream);
+                JsonSchema jsonSchema = getSchema(cracVersion);
+                List<String> validationError = getValidationErrors(jsonSchema, byteArrayInputStream);
+                if (validationError.isEmpty()) {
+                    return true;
+                }
+                throw new OpenRaoException("JSON file is not a valid CRAC v%s.%s. Reasons: %s".formatted(cracVersion.majorVersion(), cracVersion.minorVersion(), String.join("; ", validationError)));
+            }
+            return false;
+        } catch (IOException e) {
+            TECHNICAL_LOGS.debug("JSON file could not be processed as CRAC. Reason: {}", e.getMessage());
             return false;
         }
     }
@@ -80,4 +95,12 @@ public CracCreationContext importData(InputStream inputStream, CracCreationParam
         }
     }
 
+    private static Version readVersion(ByteArrayInputStream cracByteArrayInputStream) {
+        String cracContent = new String(cracByteArrayInputStream.readAllBytes(), StandardCharsets.UTF_8);
+        cracByteArrayInputStream.reset();
+        Pattern versionPattern = Pattern.compile("\"version\"\\s?:\\s?\"([1-9]\\d*)\\.(\\d+)\"");
+        Matcher versionMatcher = versionPattern.matcher(cracContent);
+        versionMatcher.find();
+        return new Version(Integer.parseInt(versionMatcher.group(1)), Integer.parseInt(versionMatcher.group(2)));
+    }
 }