fix after merge with conflicts

Signed-off-by: David BRAQUART <[email protected]>
gridsuite · Jan 9, 2024 · 23ad0d3 · 23ad0d3
1 parent 9cb42a2
commit 23ad0d3
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 13 deletions.
diff --git a/...fication/server/modifications/tabularmodifications/TabularGeneratorModificationsTest.java b/...fication/server/modifications/tabularmodifications/TabularGeneratorModificationsTest.java
@@ -8,7 +8,6 @@
 package org.gridsuite.modification.server.modifications.tabularmodifications;
 
 import com.fasterxml.jackson.core.type.TypeReference;
-import com.powsybl.iidm.network.IdentifiableType;
 import com.powsybl.iidm.network.Network;
 import lombok.SneakyThrows;
 import org.gridsuite.modification.server.ModificationType;

diff --git a/.../modification/server/modifications/tabularmodifications/TabularLoadModificationsTest.java b/.../modification/server/modifications/tabularmodifications/TabularLoadModificationsTest.java
@@ -8,7 +8,6 @@
 package org.gridsuite.modification.server.modifications.tabularmodifications;
 
 import com.fasterxml.jackson.core.type.TypeReference;
-import com.powsybl.iidm.network.IdentifiableType;
 import com.powsybl.iidm.network.Network;
 import lombok.SneakyThrows;
 import org.gridsuite.modification.server.ModificationType;

diff --git a/...n/server/modifications/tabularmodifications/TabularShuntCompensatorModificationsTest.java b/...n/server/modifications/tabularmodifications/TabularShuntCompensatorModificationsTest.java
@@ -15,6 +15,7 @@
 import com.powsybl.iidm.network.ShuntCompensator;
 import com.powsybl.iidm.network.ShuntCompensatorModelType;
 import lombok.SneakyThrows;
+import org.gridsuite.modification.server.ModificationType;
 import org.gridsuite.modification.server.dto.AttributeModification;
 import org.gridsuite.modification.server.dto.ModificationInfos;
 import org.gridsuite.modification.server.dto.OperationType;
@@ -68,7 +69,7 @@ protected ModificationInfos buildModification() {
                 ShuntCompensatorModificationInfos.builder().equipmentId("v5shunt").maximumSectionCount(new AttributeModification<>(200, OperationType.SET)).sectionCount(new AttributeModification<>(20, OperationType.SET)).build()
         );
         return TabularModificationInfos.builder()
-                .modificationType("SHUNT_COMPENSATOR_MODIFICATION")
+                .modificationType(ModificationType.SHUNT_COMPENSATOR_MODIFICATION)
                 .modifications(modifications)
                 .stashed(false)
                 .build();
@@ -81,7 +82,7 @@ protected ModificationInfos buildModificationUpdate() {
                 ShuntCompensatorModificationInfos.builder().equipmentId("v5shunt").maximumSectionCount(new AttributeModification<>(500, OperationType.SET)).sectionCount(new AttributeModification<>(50, OperationType.SET)).build()
         );
         return TabularModificationInfos.builder()
-                .modificationType("SHUNT_COMPENSATOR_MODIFICATION")
+                .modificationType(ModificationType.SHUNT_COMPENSATOR_MODIFICATION)
                 .modifications(modifications)
                 .stashed(false)
                 .build();
@@ -106,17 +107,17 @@ protected void assertAfterNetworkModificationDeletion() {
     @Override
     @SneakyThrows
     protected void testCreationModificationMessage(ModificationInfos modificationInfos) {
-        assertEquals("TABULAR_MODIFICATION", modificationInfos.getMessageType());
+        assertEquals(ModificationType.TABULAR_MODIFICATION.name(), modificationInfos.getMessageType());
         Map<String, String> createdValues = mapper.readValue(modificationInfos.getMessageValues(), new TypeReference<>() { });
-        assertEquals("SHUNT_COMPENSATOR_MODIFICATION", createdValues.get("tabularModificationType"));
+        assertEquals(ModificationType.SHUNT_COMPENSATOR_MODIFICATION.name(), createdValues.get("tabularModificationType"));
     }
 
     @Override
     @SneakyThrows
     protected void testUpdateModificationMessage(ModificationInfos modificationInfos) {
-        assertEquals("TABULAR_MODIFICATION", modificationInfos.getMessageType());
+        assertEquals(ModificationType.TABULAR_MODIFICATION.name(), modificationInfos.getMessageType());
         Map<String, String> updatedValues = mapper.readValue(modificationInfos.getMessageValues(), new TypeReference<>() { });
-        assertEquals("SHUNT_COMPENSATOR_MODIFICATION", updatedValues.get("tabularModificationType"));
+        assertEquals(ModificationType.SHUNT_COMPENSATOR_MODIFICATION.name(), updatedValues.get("tabularModificationType"));
     }
 
     @Test
@@ -130,7 +131,7 @@ void testCheckModificationConflict() {
 
         var tabularModificationInfos = TabularModificationInfos
                 .builder()
-                .modificationType("SHUNT_COMPENSATOR_MODIFICATION")
+                .modificationType(ModificationType.SHUNT_COMPENSATOR_MODIFICATION)
                 .modifications(Collections.singletonList(shuntModification))
                 .build();
 
@@ -161,7 +162,7 @@ void testCheckModificationNonLinear() {
 
         var tabularModificationInfos = TabularModificationInfos
                 .builder()
-                .modificationType("SHUNT_COMPENSATOR_MODIFICATION")
+                .modificationType(ModificationType.SHUNT_COMPENSATOR_MODIFICATION)
                 .modifications(Collections.singletonList(shuntModification))
                 .build();
 
@@ -185,7 +186,7 @@ void testCheckModificationOK() {
 
         var tabularModificationInfos = TabularModificationInfos
                 .builder()
-                .modificationType("SHUNT_COMPENSATOR_MODIFICATION")
+                .modificationType(ModificationType.SHUNT_COMPENSATOR_MODIFICATION)
                 .modifications(Collections.singletonList(shuntModification))
                 .build();
 

diff --git a/...er/modifications/tabularmodifications/TabularTwoWindingsTransformerModificationsTest.java b/...er/modifications/tabularmodifications/TabularTwoWindingsTransformerModificationsTest.java
@@ -8,7 +8,6 @@
 package org.gridsuite.modification.server.modifications.tabularmodifications;
 
 import com.fasterxml.jackson.core.type.TypeReference;
-import com.powsybl.iidm.network.IdentifiableType;
 import com.powsybl.iidm.network.Network;
 import lombok.SneakyThrows;
 import org.gridsuite.modification.server.ModificationType;

diff --git a/...ation/server/modifications/tabularmodifications/TabularVoltageLevelModificationsTest.java b/...ation/server/modifications/tabularmodifications/TabularVoltageLevelModificationsTest.java
@@ -8,7 +8,6 @@
 package org.gridsuite.modification.server.modifications.tabularmodifications;
 
 import com.fasterxml.jackson.core.type.TypeReference;
-import com.powsybl.iidm.network.IdentifiableType;
 import com.powsybl.iidm.network.Network;
 import lombok.SneakyThrows;
 import org.gridsuite.modification.server.ModificationType;