Harmonize CRAC importers (#1069)

Harmonize CRAC importers Signed-off-by: Peter Mitri <[email protected]>
powsybl · Jul 5, 2024 · 2214e41 · 2214e41
1 parent ee32693
commit 2214e41
Show file tree

Hide file tree

Showing 203 changed files with 1,523 additions and 2,346 deletions.
diff --git a/...ion-util/src/main/java/com/powsybl/openrao/data/craccreation/util/RaUsageLimitsAdder.java b/...ion-util/src/main/java/com/powsybl/openrao/data/craccreation/util/RaUsageLimitsAdder.java
@@ -8,7 +8,7 @@
 package com.powsybl.openrao.data.craccreation.util;
 
 import com.powsybl.openrao.data.cracapi.Crac;
-import com.powsybl.openrao.data.craccreation.creator.api.parameters.CracCreationParameters;
+import com.powsybl.openrao.data.cracapi.parameters.CracCreationParameters;
 
 /**
  * @author Martin Belthle {@literal <martin.belthle at rte-france.com>}

diff --git a/data/crac-creation/crac-creator-api/pom.xml b/data/crac-creation/crac-creator-api/pom.xml
@@ -21,16 +21,6 @@
             <artifactId>open-rao-crac-api</artifactId>
             <version>${project.version}</version>
         </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>open-rao-native-crac-api</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>open-rao-native-crac-io-api</artifactId>
-            <version>${project.version}</version>
-        </dependency>
 
         <!-- Test dependencies -->
         <dependency>

diff --git a/...ator-api/src/main/java/com/powsybl/openrao/data/craccreation/creator/api/CracCreator.java b/...ator-api/src/main/java/com/powsybl/openrao/data/craccreation/creator/api/CracCreator.java
diff --git a/...tor-api/src/main/java/com/powsybl/openrao/data/craccreation/creator/api/CracCreators.java b/...tor-api/src/main/java/com/powsybl/openrao/data/craccreation/creator/api/CracCreators.java
diff --git a/...ybl/openrao/data/craccreation/creator/api/stdcreationcontext/UcteCracCreationContext.java b/...ybl/openrao/data/craccreation/creator/api/stdcreationcontext/UcteCracCreationContext.java
@@ -6,7 +6,7 @@
  */
 package com.powsybl.openrao.data.craccreation.creator.api.stdcreationcontext;
 
-import com.powsybl.openrao.data.craccreation.creator.api.CracCreationContext;
+import com.powsybl.openrao.data.cracapi.CracCreationContext;
 
 import java.util.List;
 

diff --git a/...c/test/java/com/powsybl/openrao/data/craccreation/creator/api/CracCreationReportTest.java b/...c/test/java/com/powsybl/openrao/data/craccreation/creator/api/CracCreationReportTest.java
@@ -11,6 +11,7 @@
 import ch.qos.logback.classic.spi.ILoggingEvent;
 import ch.qos.logback.core.read.ListAppender;
 import com.powsybl.openrao.commons.logs.RaoBusinessLogs;
+import com.powsybl.openrao.data.cracapi.CracCreationReport;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.slf4j.LoggerFactory;

diff --git a/...api/src/test/java/com/powsybl/openrao/data/craccreation/creator/api/CracCreatorsTest.java b/...api/src/test/java/com/powsybl/openrao/data/craccreation/creator/api/CracCreatorsTest.java
diff --git a/.../java/com/powsybl/openrao/data/craccreation/creator/api/mock/CracCreationContextMock.java b/.../java/com/powsybl/openrao/data/craccreation/creator/api/mock/CracCreationContextMock.java
diff --git a/...src/test/java/com/powsybl/openrao/data/craccreation/creator/api/mock/CracCreatorMock.java b/...src/test/java/com/powsybl/openrao/data/craccreation/creator/api/mock/CracCreatorMock.java
diff --git a/...t/java/com/powsybl/openrao/data/craccreation/creator/api/mock/NativeCracImporterMock.java b/...t/java/com/powsybl/openrao/data/craccreation/creator/api/mock/NativeCracImporterMock.java