From 5262bc382ad4ea246703a62dc07e59a43eade39d Mon Sep 17 00:00:00 2001 From: Rehili Ghazwa Date: Wed, 23 Apr 2025 09:13:23 +0200 Subject: [PATCH 1/6] add voltage level modification table --- .../server/entities/EntityRegistry.java | 1 + ...oltageLevelTopologyModificationEntity.java | 94 +++++++++++++++++++ .../changesets/changelog_20250422T110241Z.xml | 24 +++++ .../db/changelog/db.changelog-master.yaml | 3 + 4 files changed, 122 insertions(+) create mode 100644 src/main/java/org/gridsuite/modification/server/entities/equipment/modification/VoltageLevelTopologyModificationEntity.java create mode 100644 src/main/resources/db/changelog/changesets/changelog_20250422T110241Z.xml diff --git a/src/main/java/org/gridsuite/modification/server/entities/EntityRegistry.java b/src/main/java/org/gridsuite/modification/server/entities/EntityRegistry.java index 9d6f9d491..853d45bb2 100644 --- a/src/main/java/org/gridsuite/modification/server/entities/EntityRegistry.java +++ b/src/main/java/org/gridsuite/modification/server/entities/EntityRegistry.java @@ -65,6 +65,7 @@ private EntityRegistry() { register(ByFormulaModificationInfos.class, ByFormulaModificationEntity.class); register(ModificationByAssignmentInfos.class, ModificationByAssignmentEntity.class); register(EquipmentAttributeModificationInfos.class, EquipmentAttributeModificationEntity.class); + register(VoltageLevelTopologyModificationInfos.class, VoltageLevelTopologyModificationEntity.class); // // attatching and splitting register(LineAttachToVoltageLevelInfos.class, LineAttachToVoltageLevelEntity.class); diff --git a/src/main/java/org/gridsuite/modification/server/entities/equipment/modification/VoltageLevelTopologyModificationEntity.java b/src/main/java/org/gridsuite/modification/server/entities/equipment/modification/VoltageLevelTopologyModificationEntity.java new file mode 100644 index 000000000..8179910fa --- /dev/null +++ b/src/main/java/org/gridsuite/modification/server/entities/equipment/modification/VoltageLevelTopologyModificationEntity.java @@ -0,0 +1,94 @@ +/** + * Copyright (c) 2023, RTE (http://www.rte-france.com) + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ + +package org.gridsuite.modification.server.entities.equipment.modification; + +import jakarta.persistence.*; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.NonNull; +import org.gridsuite.modification.dto.ModificationInfos; +import org.gridsuite.modification.dto.VoltageLevelTopologyModificationInfos; +import org.gridsuite.modification.server.entities.equipment.modification.attribute.BooleanEquipmentAttributeModificationEntity; +import org.gridsuite.modification.server.entities.equipment.modification.attribute.EquipmentAttributeModificationEntity; + +import java.util.ArrayList; +import java.util.List; +import java.util.Optional; +import java.util.stream.Collectors; + +/** + * @author REHILI Ghazwa + */ + +@NoArgsConstructor +@Getter +@Entity +@Table(name = "voltageLevelTopologyModification") +@PrimaryKeyJoinColumn(foreignKey = @ForeignKey(name = "voltageLevelTopologyModification_id_fk_constraint")) +public class VoltageLevelTopologyModificationEntity extends EquipmentModificationEntity { + + @OneToMany(cascade = CascadeType.ALL, orphanRemoval = true, fetch = FetchType.LAZY) + @JoinColumn( + name = "voltage_level_topology_modification_id", + referencedColumnName = "id", + foreignKey = @ForeignKey( + name = "voltageLevel_booleanEquipmentAttributeModification_fk" + )) + @OrderBy + private List equipmentAttributeModification; + + public VoltageLevelTopologyModificationEntity(VoltageLevelTopologyModificationInfos voltageLevelTopologyModificationInfos) { + super(voltageLevelTopologyModificationInfos); + assignAttributes(voltageLevelTopologyModificationInfos); + } + + @Override + public void update(@NonNull ModificationInfos modificationInfos) { + super.update(modificationInfos); + assignAttributes((VoltageLevelTopologyModificationInfos) modificationInfos); + } + + private void assignAttributes(VoltageLevelTopologyModificationInfos voltageLevelTopologyModificationInfos) { + // Initialize the collection if it's null + if (this.equipmentAttributeModification == null) { + this.equipmentAttributeModification = new ArrayList<>(); + } else { + this.equipmentAttributeModification.clear(); + } + + // Add new entities to the existing collection + if (voltageLevelTopologyModificationInfos.getEquipmentAttributeModification() != null) { + List newEntities = + voltageLevelTopologyModificationInfos.getEquipmentAttributeModification().stream() + .map(BooleanEquipmentAttributeModificationEntity::new) + .collect(Collectors.toList()); + + this.equipmentAttributeModification.addAll(newEntities); + } + } + + @Override + public VoltageLevelTopologyModificationInfos toModificationInfos() { + return toVoltageLevelTopologyModificationInfosBuilder().build(); + } + + private VoltageLevelTopologyModificationInfos.VoltageLevelTopologyModificationInfosBuilder toVoltageLevelTopologyModificationInfosBuilder() { + List attributeModificationEntities = getEquipmentAttributeModification(); + return VoltageLevelTopologyModificationInfos.builder() + .uuid(getId()) + .equipmentId(getEquipmentId()) + .date(getDate()) + .stashed(getStashed()) + .activated(getActivated()) + .equipmentAttributeModification(Optional.ofNullable(attributeModificationEntities) + .map(list -> list.stream() + .map(EquipmentAttributeModificationEntity::toModificationInfos) + .toList()) + .orElse(null)); + } +} diff --git a/src/main/resources/db/changelog/changesets/changelog_20250422T110241Z.xml b/src/main/resources/db/changelog/changesets/changelog_20250422T110241Z.xml new file mode 100644 index 000000000..b782bb848 --- /dev/null +++ b/src/main/resources/db/changelog/changesets/changelog_20250422T110241Z.xml @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/resources/db/changelog/db.changelog-master.yaml b/src/main/resources/db/changelog/db.changelog-master.yaml index e588c44e8..c6019864d 100644 --- a/src/main/resources/db/changelog/db.changelog-master.yaml +++ b/src/main/resources/db/changelog/db.changelog-master.yaml @@ -345,3 +345,6 @@ databaseChangeLog: - include: file: changesets/changelog_20250403T114049Z.xml relativeToChangelogFile: true + - include: + file: changesets/changelog_20250422T110241Z.xml + relativeToChangelogFile: true \ No newline at end of file From b2b06114ed6759492759b7e0cd64cce017c7f19c Mon Sep 17 00:00:00 2001 From: Rehili Ghazwa Date: Wed, 23 Apr 2025 23:25:49 +0200 Subject: [PATCH 2/6] add TU --- .../VoltageLevelTopologyModificationTest.java | 227 ++++++++++++++++++ .../service/ModificationRepositoryTest.java | 24 ++ 2 files changed, 251 insertions(+) create mode 100644 src/test/java/org/gridsuite/modification/server/modifications/VoltageLevelTopologyModificationTest.java diff --git a/src/test/java/org/gridsuite/modification/server/modifications/VoltageLevelTopologyModificationTest.java b/src/test/java/org/gridsuite/modification/server/modifications/VoltageLevelTopologyModificationTest.java new file mode 100644 index 000000000..0cd492567 --- /dev/null +++ b/src/test/java/org/gridsuite/modification/server/modifications/VoltageLevelTopologyModificationTest.java @@ -0,0 +1,227 @@ +/** + * Copyright (c) 2025, RTE (http://www.rte-france.com) + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ +package org.gridsuite.modification.server.modifications; + +import com.fasterxml.jackson.core.type.TypeReference; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.powsybl.iidm.network.IdentifiableType; +import com.powsybl.iidm.network.Network; +import com.powsybl.iidm.network.Switch; +import com.powsybl.iidm.network.VoltageLevel; +import org.gridsuite.modification.dto.EquipmentAttributeModificationInfos; +import org.gridsuite.modification.dto.ModificationInfos; +import org.gridsuite.modification.dto.VoltageLevelTopologyModificationInfos; +import org.gridsuite.modification.server.utils.NetworkCreation; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.springframework.http.MediaType; + +import java.util.*; + +import static org.junit.jupiter.api.Assertions.*; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; + +/** + * @author REHILI Ghazwa + */ +@Tag("IntegrationTest") +class VoltageLevelTopologyModificationTest extends AbstractNetworkModificationTest { + private ObjectMapper objectMapper; + + @Override + protected Network createNetwork(UUID networkUuid) { + return NetworkCreation.create(networkUuid, true); + } + + @Override + protected ModificationInfos buildModification() { + List equipmentAttributeModificationInfos = new ArrayList<>( + Arrays.asList( + EquipmentAttributeModificationInfos.builder() + .equipmentId("v1d1") + .equipmentAttributeName("open") + .equipmentAttributeValue(false) + .equipmentType(IdentifiableType.SWITCH) + .build(), + EquipmentAttributeModificationInfos.builder() + .equipmentId("v1b1") + .equipmentAttributeName("open") + .equipmentAttributeValue(false) + .equipmentType(IdentifiableType.SWITCH) + .build(), + EquipmentAttributeModificationInfos.builder() + .equipmentId("v1blcc") + .equipmentAttributeName("open") + .equipmentAttributeValue(false) + .equipmentType(IdentifiableType.SWITCH) + .build(), + EquipmentAttributeModificationInfos.builder() + .equipmentId("v1dlcc") + .equipmentAttributeName("open") + .equipmentAttributeValue(false) + .equipmentType(IdentifiableType.SWITCH) + .build() + ) + ); + return VoltageLevelTopologyModificationInfos.builder() + .stashed(false) + .activated(true) + .equipmentId("v1") + .equipmentAttributeModification(equipmentAttributeModificationInfos) + .build(); + } + + @Override + protected ModificationInfos buildModificationUpdate() { + List equipmentAttributeModificationInfos = new ArrayList<>( + Arrays.asList( + EquipmentAttributeModificationInfos.builder() + .equipmentId("v1d1") + .equipmentAttributeName("open") + .equipmentAttributeValue(true) + .equipmentType(IdentifiableType.SWITCH) + .build(), + EquipmentAttributeModificationInfos.builder() + .equipmentId("v1b1") + .equipmentAttributeName("open") + .equipmentAttributeValue(true) + .equipmentType(IdentifiableType.SWITCH) + .build() + ) + ); + return VoltageLevelTopologyModificationInfos.builder() + .stashed(false) + .activated(true) + .equipmentId("v1") + .equipmentAttributeModification(equipmentAttributeModificationInfos) + .build(); + } + + @Override + protected void assertAfterNetworkModificationCreation() { + VoltageLevel voltageLevel = getNetwork().getVoltageLevel("v1"); + assertNotNull(voltageLevel); + + Switch switch1 = getNetwork().getSwitch("v1d1"); + assertNotNull(switch1); + assertFalse(switch1.isOpen()); + + Switch switch2 = getNetwork().getSwitch("v1b1"); + assertNotNull(switch2); + assertFalse(switch2.isOpen()); + + Switch switch3 = getNetwork().getSwitch("v1blcc"); + assertNotNull(switch3); + assertFalse(switch3.isOpen()); + + Switch switch4 = getNetwork().getSwitch("v1dlcc"); + assertNotNull(switch4); + assertFalse(switch4.isOpen()); + } + + @Override + protected void assertAfterNetworkModificationDeletion() { + VoltageLevel voltageLevel = getNetwork().getVoltageLevel("v1"); + assertNotNull(voltageLevel); + + Switch switch1 = getNetwork().getSwitch("v1d1"); + assertNotNull(switch1); + assertFalse(switch1.isOpen()); + + Switch switch2 = getNetwork().getSwitch("v1b1"); + assertNotNull(switch2); + assertFalse(switch2.isOpen()); + + Switch switch3 = getNetwork().getSwitch("v1blcc"); + assertNotNull(switch3); + assertFalse(switch3.isOpen()); + + Switch switch4 = getNetwork().getSwitch("v1dlcc"); + assertNotNull(switch4); + assertFalse(switch4.isOpen()); + } + + @Test + void testInvalidVoltageLevel() throws Exception { + VoltageLevelTopologyModificationInfos infos = VoltageLevelTopologyModificationInfos.builder() + .stashed(false) + .activated(true) + .equipmentId("nonexistent_vl") + .equipmentAttributeModification(List.of()) + .build(); + + String body = getJsonBody(infos, null); + mockMvc.perform(post(getNetworkModificationUri()) + .content(body) + .contentType(MediaType.APPLICATION_JSON)).andExpect(status().isOk()).andReturn(); + } + + @Test + void testEmptyModifications() throws Exception { + List emptyModifications = new ArrayList<>(); + + VoltageLevelTopologyModificationInfos infos = VoltageLevelTopologyModificationInfos.builder() + .stashed(false) + .activated(true) + .equipmentId("v1") + .equipmentAttributeModification(emptyModifications) + .build(); + + String body = getJsonBody(infos, null); + mockMvc.perform(post(getNetworkModificationUri()) + .content(body) + .contentType(MediaType.APPLICATION_JSON)).andExpect(status().isOk()).andReturn(); + } + + @Test + void testNonExistentSwitch() throws Exception { + List equipmentAttributeModificationInfos = new ArrayList<>( + Arrays.asList( + EquipmentAttributeModificationInfos.builder() + .equipmentId("nonexistent_switch") + .equipmentAttributeName("open") + .equipmentAttributeValue(false) + .equipmentType(IdentifiableType.SWITCH) + .build() + ) + ); + + VoltageLevelTopologyModificationInfos infos = VoltageLevelTopologyModificationInfos.builder() + .stashed(false) + .equipmentId("v1") + .equipmentAttributeModification(equipmentAttributeModificationInfos) + .build(); + + String body = getJsonBody(infos, null); + mockMvc.perform(post(getNetworkModificationUri()) + .content(body) + .contentType(MediaType.APPLICATION_JSON)).andExpect(status().isOk()).andReturn(); + } + + private void applyModification(VoltageLevelTopologyModificationInfos infos) throws Exception { + String body = getJsonBody(infos, null); + mockMvc.perform(post(getNetworkModificationUri()) + .content(body) + .contentType(MediaType.APPLICATION_JSON)) + .andExpect(status().isOk()).andReturn(); + } + + @Override + protected void testCreationModificationMessage(ModificationInfos modificationInfos) throws Exception { + assertEquals("VOLTAGE_LEVEL_TOPOLOGY_MODIFICATION", modificationInfos.getMessageType()); + Map createdValues = mapper.readValue(modificationInfos.getMessageValues(), new TypeReference<>() { }); + assertEquals("v1", createdValues.get("equipmentId")); + } + + @Override + protected void testUpdateModificationMessage(ModificationInfos modificationInfos) throws Exception { + assertEquals("VOLTAGE_LEVEL_TOPOLOGY_MODIFICATION", modificationInfos.getMessageType()); + Map updatedValues = mapper.readValue(modificationInfos.getMessageValues(), new TypeReference<>() { }); + assertEquals("v1", updatedValues.get("equipmentId")); + } +} diff --git a/src/test/java/org/gridsuite/modification/server/service/ModificationRepositoryTest.java b/src/test/java/org/gridsuite/modification/server/service/ModificationRepositoryTest.java index 47b364c17..dd7dc4e9e 100644 --- a/src/test/java/org/gridsuite/modification/server/service/ModificationRepositoryTest.java +++ b/src/test/java/org/gridsuite/modification/server/service/ModificationRepositoryTest.java @@ -1348,4 +1348,28 @@ void testStaticVarCompensatorCreation() { assertThrows(NetworkModificationException.class, () -> networkModificationRepository.getModifications(TEST_GROUP_ID, true, true), new NetworkModificationException(MODIFICATION_GROUP_NOT_FOUND, TEST_GROUP_ID.toString()).getMessage()); } + + @Test + void testVoltageLevelTopologyModification() { + List equipmentAttributeModificationInfos = new ArrayList<>( + Arrays.asList( + EquipmentAttributeModificationInfos.builder() + .equipmentId("sw1") + .equipmentAttributeName("open") + .equipmentAttributeValue(false) + .equipmentType(IdentifiableType.SWITCH) + .build() + ) + ); + var voltageLevelTopologyModificationEntity = ModificationEntity.fromDTO(VoltageLevelTopologyModificationInfos.builder() + .equipmentId("VL1") + .equipmentAttributeModification(equipmentAttributeModificationInfos) + .build()); + + networkModificationRepository.saveModifications(TEST_GROUP_ID, List.of(voltageLevelTopologyModificationEntity)); + assertRequestsCount(2, 5, 1, 0); + + List modificationInfos = networkModificationRepository.getModifications(TEST_GROUP_ID, true, true); + assertEquals(1, modificationInfos.size()); + } } From 7af96af5b0cffc5e7b297c4c24e755551c8ab76a Mon Sep 17 00:00:00 2001 From: Rehili Ghazwa Date: Mon, 28 Apr 2025 12:42:47 +0200 Subject: [PATCH 3/6] review remarks --- .../VoltageLevelTopologyModificationEntity.java | 15 +++++++-------- .../changesets/changelog_20250422T110241Z.xml | 2 +- .../VoltageLevelTopologyModificationTest.java | 10 +++++----- .../service/ModificationRepositoryTest.java | 2 +- 4 files changed, 14 insertions(+), 15 deletions(-) diff --git a/src/main/java/org/gridsuite/modification/server/entities/equipment/modification/VoltageLevelTopologyModificationEntity.java b/src/main/java/org/gridsuite/modification/server/entities/equipment/modification/VoltageLevelTopologyModificationEntity.java index 8179910fa..2f085a2ae 100644 --- a/src/main/java/org/gridsuite/modification/server/entities/equipment/modification/VoltageLevelTopologyModificationEntity.java +++ b/src/main/java/org/gridsuite/modification/server/entities/equipment/modification/VoltageLevelTopologyModificationEntity.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2023, RTE (http://www.rte-france.com) + * Copyright (c) 2025, RTE (http://www.rte-france.com) * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. @@ -19,7 +19,6 @@ import java.util.ArrayList; import java.util.List; import java.util.Optional; -import java.util.stream.Collectors; /** * @author REHILI Ghazwa @@ -28,7 +27,7 @@ @NoArgsConstructor @Getter @Entity -@Table(name = "voltageLevelTopologyModification") +@Table(name = "voltage_level_topology_modification") @PrimaryKeyJoinColumn(foreignKey = @ForeignKey(name = "voltageLevelTopologyModification_id_fk_constraint")) public class VoltageLevelTopologyModificationEntity extends EquipmentModificationEntity { @@ -37,7 +36,7 @@ public class VoltageLevelTopologyModificationEntity extends EquipmentModificatio name = "voltage_level_topology_modification_id", referencedColumnName = "id", foreignKey = @ForeignKey( - name = "voltageLevel_booleanEquipmentAttributeModification_fk" + name = "voltageLevelTopologyModification_booleanEquipmentAttributeModification_fk" )) @OrderBy private List equipmentAttributeModification; @@ -62,11 +61,11 @@ private void assignAttributes(VoltageLevelTopologyModificationInfos voltageLevel } // Add new entities to the existing collection - if (voltageLevelTopologyModificationInfos.getEquipmentAttributeModification() != null) { + if (voltageLevelTopologyModificationInfos.getEquipmentAttributeModificationList() != null) { List newEntities = - voltageLevelTopologyModificationInfos.getEquipmentAttributeModification().stream() + voltageLevelTopologyModificationInfos.getEquipmentAttributeModificationList().stream() .map(BooleanEquipmentAttributeModificationEntity::new) - .collect(Collectors.toList()); + .toList(); this.equipmentAttributeModification.addAll(newEntities); } @@ -85,7 +84,7 @@ public VoltageLevelTopologyModificationInfos toModificationInfos() { .date(getDate()) .stashed(getStashed()) .activated(getActivated()) - .equipmentAttributeModification(Optional.ofNullable(attributeModificationEntities) + .equipmentAttributeModificationList(Optional.ofNullable(attributeModificationEntities) .map(list -> list.stream() .map(EquipmentAttributeModificationEntity::toModificationInfos) .toList()) diff --git a/src/main/resources/db/changelog/changesets/changelog_20250422T110241Z.xml b/src/main/resources/db/changelog/changesets/changelog_20250422T110241Z.xml index b782bb848..bbd00524a 100644 --- a/src/main/resources/db/changelog/changesets/changelog_20250422T110241Z.xml +++ b/src/main/resources/db/changelog/changesets/changelog_20250422T110241Z.xml @@ -19,6 +19,6 @@ - + diff --git a/src/test/java/org/gridsuite/modification/server/modifications/VoltageLevelTopologyModificationTest.java b/src/test/java/org/gridsuite/modification/server/modifications/VoltageLevelTopologyModificationTest.java index 0cd492567..0ec3a193d 100644 --- a/src/test/java/org/gridsuite/modification/server/modifications/VoltageLevelTopologyModificationTest.java +++ b/src/test/java/org/gridsuite/modification/server/modifications/VoltageLevelTopologyModificationTest.java @@ -72,7 +72,7 @@ protected ModificationInfos buildModification() { .stashed(false) .activated(true) .equipmentId("v1") - .equipmentAttributeModification(equipmentAttributeModificationInfos) + .equipmentAttributeModificationList(equipmentAttributeModificationInfos) .build(); } @@ -98,7 +98,7 @@ protected ModificationInfos buildModificationUpdate() { .stashed(false) .activated(true) .equipmentId("v1") - .equipmentAttributeModification(equipmentAttributeModificationInfos) + .equipmentAttributeModificationList(equipmentAttributeModificationInfos) .build(); } @@ -152,7 +152,7 @@ void testInvalidVoltageLevel() throws Exception { .stashed(false) .activated(true) .equipmentId("nonexistent_vl") - .equipmentAttributeModification(List.of()) + .equipmentAttributeModificationList(List.of()) .build(); String body = getJsonBody(infos, null); @@ -169,7 +169,7 @@ void testEmptyModifications() throws Exception { .stashed(false) .activated(true) .equipmentId("v1") - .equipmentAttributeModification(emptyModifications) + .equipmentAttributeModificationList(emptyModifications) .build(); String body = getJsonBody(infos, null); @@ -194,7 +194,7 @@ void testNonExistentSwitch() throws Exception { VoltageLevelTopologyModificationInfos infos = VoltageLevelTopologyModificationInfos.builder() .stashed(false) .equipmentId("v1") - .equipmentAttributeModification(equipmentAttributeModificationInfos) + .equipmentAttributeModificationList(equipmentAttributeModificationInfos) .build(); String body = getJsonBody(infos, null); diff --git a/src/test/java/org/gridsuite/modification/server/service/ModificationRepositoryTest.java b/src/test/java/org/gridsuite/modification/server/service/ModificationRepositoryTest.java index dd7dc4e9e..7c3c1cde5 100644 --- a/src/test/java/org/gridsuite/modification/server/service/ModificationRepositoryTest.java +++ b/src/test/java/org/gridsuite/modification/server/service/ModificationRepositoryTest.java @@ -1363,7 +1363,7 @@ void testVoltageLevelTopologyModification() { ); var voltageLevelTopologyModificationEntity = ModificationEntity.fromDTO(VoltageLevelTopologyModificationInfos.builder() .equipmentId("VL1") - .equipmentAttributeModification(equipmentAttributeModificationInfos) + .equipmentAttributeModificationList(equipmentAttributeModificationInfos) .build()); networkModificationRepository.saveModifications(TEST_GROUP_ID, List.of(voltageLevelTopologyModificationEntity)); From 82a09d8392900f4a290716cadb8649b785555554 Mon Sep 17 00:00:00 2001 From: Rehili Ghazwa Date: Fri, 2 May 2025 09:30:04 +0200 Subject: [PATCH 4/6] upgrade network-modification version --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 292d28ef5..0697f26d6 100644 --- a/pom.xml +++ b/pom.xml @@ -49,7 +49,7 @@ 5.0.0-alpha.14 org.gridsuite.modification.server **/migration/**/* - 0.13.0 + 0.15.0-SNAPSHOT 1.24.0 gridsuite From e7ceae2892cfde7a78a2d29071e43ef31dbaa1ee Mon Sep 17 00:00:00 2001 From: Rehili Ghazwa Date: Fri, 2 May 2025 09:41:22 +0200 Subject: [PATCH 5/6] upgrade to 0.14.0 network-modification --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 0697f26d6..3b24ce47c 100644 --- a/pom.xml +++ b/pom.xml @@ -49,7 +49,7 @@ 5.0.0-alpha.14 org.gridsuite.modification.server **/migration/**/* - 0.15.0-SNAPSHOT + 0.14.0 1.24.0 gridsuite From e4dba668abcf02a2a525a7cee4f6387663e4d7a0 Mon Sep 17 00:00:00 2001 From: Rehili Ghazwa Date: Fri, 2 May 2025 11:07:04 +0200 Subject: [PATCH 6/6] fix sonar issue --- .../VoltageLevelTopologyModificationTest.java | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/src/test/java/org/gridsuite/modification/server/modifications/VoltageLevelTopologyModificationTest.java b/src/test/java/org/gridsuite/modification/server/modifications/VoltageLevelTopologyModificationTest.java index 0ec3a193d..a2ea096e0 100644 --- a/src/test/java/org/gridsuite/modification/server/modifications/VoltageLevelTopologyModificationTest.java +++ b/src/test/java/org/gridsuite/modification/server/modifications/VoltageLevelTopologyModificationTest.java @@ -7,7 +7,6 @@ package org.gridsuite.modification.server.modifications; import com.fasterxml.jackson.core.type.TypeReference; -import com.fasterxml.jackson.databind.ObjectMapper; import com.powsybl.iidm.network.IdentifiableType; import com.powsybl.iidm.network.Network; import com.powsybl.iidm.network.Switch; @@ -31,7 +30,6 @@ */ @Tag("IntegrationTest") class VoltageLevelTopologyModificationTest extends AbstractNetworkModificationTest { - private ObjectMapper objectMapper; @Override protected Network createNetwork(UUID networkUuid) { @@ -203,14 +201,6 @@ void testNonExistentSwitch() throws Exception { .contentType(MediaType.APPLICATION_JSON)).andExpect(status().isOk()).andReturn(); } - private void applyModification(VoltageLevelTopologyModificationInfos infos) throws Exception { - String body = getJsonBody(infos, null); - mockMvc.perform(post(getNetworkModificationUri()) - .content(body) - .contentType(MediaType.APPLICATION_JSON)) - .andExpect(status().isOk()).andReturn(); - } - @Override protected void testCreationModificationMessage(ModificationInfos modificationInfos) throws Exception { assertEquals("VOLTAGE_LEVEL_TOPOLOGY_MODIFICATION", modificationInfos.getMessageType());