gridsuite dependencies 27 (#353)

Signed-off-by: Abdelsalem <[email protected]>
gridsuite · Oct 31, 2023 · 0625ca3 · 0625ca3
1 parent f33829c
commit 0625ca3
Show file tree

Hide file tree

Showing 13 changed files with 166 additions and 343 deletions.
diff --git a/pom.xml b/pom.xml
@@ -44,14 +44,13 @@
     </developers>
 
     <properties>
-        <gridsuite-dependencies.version>26</gridsuite-dependencies.version>
+        <gridsuite-dependencies.version>27</gridsuite-dependencies.version>
         <db-util.version>1.0.5</db-util.version>
         <commons-lang3.version>3.9</commons-lang3.version>
         <log4j2-mock-version>0.0.2</log4j2-mock-version>
         <testcontainers.version>1.16.2</testcontainers.version>
         <liquibase-hibernate-package>org.gridsuite.modification.server</liquibase-hibernate-package>
         <assertj.version>3.24.2</assertj.version>
-        <powsybl-network-store.version>1.4.0</powsybl-network-store.version>
     </properties>
 
     <build>
@@ -144,14 +143,6 @@
         <dependency>
             <groupId>com.powsybl</groupId>
             <artifactId>powsybl-network-store-client</artifactId>
-            <!-- FIXME: to be removed at next powsybl-ws-dependencies upgrade  -->
-            <version>${powsybl-network-store.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.powsybl</groupId>
-            <artifactId>powsybl-network-store-iidm-impl</artifactId>
-            <version>${powsybl-network-store.version}</version>
-            <!-- FIXME: to be removed at next powsybl-ws-dependencies upgrade  -->
         </dependency>
         <dependency>
             <groupId>com.powsybl</groupId>
@@ -175,7 +166,7 @@
             <artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.codehaus.groovy</groupId>
+            <groupId>org.apache.groovy</groupId>
             <artifactId>groovy</artifactId>
         </dependency>
         <dependency>

diff --git a/src/main/java/com/powsybl/iidm/modification/topology/RemoveHvdcLine.java b/src/main/java/com/powsybl/iidm/modification/topology/RemoveHvdcLine.java
diff --git a/src/main/java/com/powsybl/iidm/modification/topology/RemoveSubstation.java b/src/main/java/com/powsybl/iidm/modification/topology/RemoveSubstation.java
diff --git a/src/main/java/org/gridsuite/modification/server/NetworkModificationException.java b/src/main/java/org/gridsuite/modification/server/NetworkModificationException.java
@@ -70,6 +70,7 @@ public enum Type {
         SHUNT_COMPENSATOR_NOT_FOUND(HttpStatus.NOT_FOUND),
         LINE_ALREADY_EXISTS(HttpStatus.BAD_REQUEST),
         TWO_WINDINGS_TRANSFORMER_ALREADY_EXISTS(HttpStatus.BAD_REQUEST),
+        TWO_WINDINGS_TRANSFORMER_CREATION_ERROR(HttpStatus.BAD_REQUEST),
         CONNECTION_POSITION_ERROR(HttpStatus.BAD_REQUEST),
         MODIFY_BATTERY_ERROR(HttpStatus.INTERNAL_SERVER_ERROR),
         BRANCH_ACTION_ERROR(HttpStatus.INTERNAL_SERVER_ERROR),

diff --git a/src/main/java/org/gridsuite/modification/server/modifications/EquipmentDeletion.java b/src/main/java/org/gridsuite/modification/server/modifications/EquipmentDeletion.java
@@ -46,7 +46,8 @@ public void apply(Network network, Reporter subReporter) {
         } else if (identifiable instanceof VoltageLevel) {
             new RemoveVoltageLevel(modificationInfos.getEquipmentId()).apply(network, true, subReporter);
         } else if (identifiable instanceof Substation) {
-            new RemoveSubstation(modificationInfos.getEquipmentId()).apply(network, true, subReporter);
+            RemoveSubstation rs = new RemoveSubstationBuilder().withSubstationId(modificationInfos.getEquipmentId()).build();
+            rs.apply(network, true, subReporter);
         }
 
         subReporter.report(Report.builder()