From b51bfca49a61a0177531e49c210fea9f44d7c5ea Mon Sep 17 00:00:00 2001 From: Franck LECUYER Date: Thu, 4 Dec 2025 10:40:23 +0100 Subject: [PATCH 1/4] Add rootNetworkName, nodeName and computationDate in voltage init modifications infos dto Signed-off-by: Franck LECUYER --- .../dto/VoltageInitModificationInfos.java | 21 +++++++++++++++++++ .../VoltageInitModificationTest.java | 5 +++++ 2 files changed, 26 insertions(+) diff --git a/src/main/java/org/gridsuite/modification/dto/VoltageInitModificationInfos.java b/src/main/java/org/gridsuite/modification/dto/VoltageInitModificationInfos.java index 28443339..39ac1288 100644 --- a/src/main/java/org/gridsuite/modification/dto/VoltageInitModificationInfos.java +++ b/src/main/java/org/gridsuite/modification/dto/VoltageInitModificationInfos.java @@ -17,7 +17,10 @@ import org.gridsuite.modification.modifications.AbstractModification; import org.gridsuite.modification.modifications.VoltageInitModification; +import java.time.Instant; +import java.util.HashMap; import java.util.List; +import java.util.Map; /** * @author Franck Lecuyer @@ -48,6 +51,15 @@ public class VoltageInitModificationInfos extends ModificationInfos { @Schema(description = "buses modifications") private List buses; + @Schema(description = "root network name") + private String rootNetworkName; + + @Schema(description = "node name") + private String nodeName; + + @Schema(description = "computation date") + private Instant computationDate; + @Override public AbstractModification toModification() { return new VoltageInitModification(this); @@ -57,4 +69,13 @@ public AbstractModification toModification() { public ReportNode createSubReportNode(ReportNode reportNode) { return reportNode.newReportNode().withMessageTemplate("network.modification.voltageInitModification").add(); } + + @Override + public Map getMapMessageValues() { + Map mapMessageValues = new HashMap<>(); + mapMessageValues.put("rootNetworkName", getRootNetworkName()); + mapMessageValues.put("nodeName", getNodeName()); + mapMessageValues.put("computationDate", getComputationDate() != null ? getComputationDate().toString() : null); + return mapMessageValues; + } } diff --git a/src/test/java/org/gridsuite/modification/modifications/VoltageInitModificationTest.java b/src/test/java/org/gridsuite/modification/modifications/VoltageInitModificationTest.java index a61cb735..7533f7ff 100644 --- a/src/test/java/org/gridsuite/modification/modifications/VoltageInitModificationTest.java +++ b/src/test/java/org/gridsuite/modification/modifications/VoltageInitModificationTest.java @@ -13,6 +13,8 @@ import org.gridsuite.modification.report.NetworkModificationReportResourceBundle; import org.gridsuite.modification.utils.NetworkCreation; import org.junit.jupiter.api.Test; + +import java.time.Instant; import java.util.List; import java.util.UUID; @@ -199,6 +201,9 @@ protected ModificationInfos buildModification() { .v(230.) .angle(0.5) .build())) + .rootNetworkName("rootNetwork1") + .nodeName("node1") + .computationDate(Instant.now()) .build(); } From c1c9c8cde3353eea591592db97bfbfeb090e321c Mon Sep 17 00:00:00 2001 From: Franck LECUYER Date: Fri, 5 Dec 2025 15:32:40 +0100 Subject: [PATCH 2/4] Fix coverage and checkstyle pb Signed-off-by: Franck LECUYER --- .../modifications/VoltageInitModificationTest.java | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/test/java/org/gridsuite/modification/modifications/VoltageInitModificationTest.java b/src/test/java/org/gridsuite/modification/modifications/VoltageInitModificationTest.java index 7533f7ff..4b64a2d7 100644 --- a/src/test/java/org/gridsuite/modification/modifications/VoltageInitModificationTest.java +++ b/src/test/java/org/gridsuite/modification/modifications/VoltageInitModificationTest.java @@ -16,6 +16,7 @@ import java.time.Instant; import java.util.List; +import java.util.Map; import java.util.UUID; import static org.gridsuite.modification.utils.NetworkUtil.createGenerator; @@ -265,6 +266,14 @@ void testVoltageInitDisconnectedCurrentSection1Section1() throws Exception { assertEquals(1, getNetwork().getShuntCompensator("v5shunt").getSectionCount()); } + @Test + void testMapMessageValues() { + ModificationInfos modifications = buildModification(); + Map values = modifications.getMapMessageValues(); + assertEquals("rootNetwork1", values.get("rootNetworkName")); + assertEquals("node1", values.get("nodeName")); + } + @Override protected void assertAfterNetworkModificationApplication() { assertEquals(10., getNetwork().getGenerator("idGenerator").getTargetQ(), 0.001); From fe028e16903c3c06ee8321887e5ed7901175981f Mon Sep 17 00:00:00 2001 From: Franck LECUYER Date: Mon, 8 Dec 2025 17:14:21 +0100 Subject: [PATCH 3/4] UUID instead of name for the root network and the node in the voltage init modifications infos dto Signed-off-by: Franck LECUYER --- .../dto/VoltageInitModificationInfos.java | 13 +++++++------ .../modifications/VoltageInitModificationTest.java | 11 +++++++---- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/src/main/java/org/gridsuite/modification/dto/VoltageInitModificationInfos.java b/src/main/java/org/gridsuite/modification/dto/VoltageInitModificationInfos.java index 39ac1288..f9c0e696 100644 --- a/src/main/java/org/gridsuite/modification/dto/VoltageInitModificationInfos.java +++ b/src/main/java/org/gridsuite/modification/dto/VoltageInitModificationInfos.java @@ -21,6 +21,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.UUID; /** * @author Franck Lecuyer @@ -51,11 +52,11 @@ public class VoltageInitModificationInfos extends ModificationInfos { @Schema(description = "buses modifications") private List buses; - @Schema(description = "root network name") - private String rootNetworkName; + @Schema(description = "root network id") + private UUID rootNetworkId; - @Schema(description = "node name") - private String nodeName; + @Schema(description = "node id") + private UUID nodeId; @Schema(description = "computation date") private Instant computationDate; @@ -73,8 +74,8 @@ public ReportNode createSubReportNode(ReportNode reportNode) { @Override public Map getMapMessageValues() { Map mapMessageValues = new HashMap<>(); - mapMessageValues.put("rootNetworkName", getRootNetworkName()); - mapMessageValues.put("nodeName", getNodeName()); + mapMessageValues.put("rootNetworkId", getRootNetworkId().toString()); + mapMessageValues.put("nodeId", getNodeId().toString()); mapMessageValues.put("computationDate", getComputationDate() != null ? getComputationDate().toString() : null); return mapMessageValues; } diff --git a/src/test/java/org/gridsuite/modification/modifications/VoltageInitModificationTest.java b/src/test/java/org/gridsuite/modification/modifications/VoltageInitModificationTest.java index 4b64a2d7..f3e07301 100644 --- a/src/test/java/org/gridsuite/modification/modifications/VoltageInitModificationTest.java +++ b/src/test/java/org/gridsuite/modification/modifications/VoltageInitModificationTest.java @@ -29,6 +29,9 @@ * @author Ayoub LABIDI */ class VoltageInitModificationTest extends AbstractNetworkModificationTest { + private static final UUID ROOT_NETWORK_UUID = UUID.randomUUID(); + private static final UUID NODE_UUID = UUID.randomUUID(); + @Override protected Network createNetwork(UUID networkUuid) { Network network = NetworkCreation.create(networkUuid, true); @@ -202,8 +205,8 @@ protected ModificationInfos buildModification() { .v(230.) .angle(0.5) .build())) - .rootNetworkName("rootNetwork1") - .nodeName("node1") + .rootNetworkId(ROOT_NETWORK_UUID) + .nodeId(NODE_UUID) .computationDate(Instant.now()) .build(); } @@ -270,8 +273,8 @@ void testVoltageInitDisconnectedCurrentSection1Section1() throws Exception { void testMapMessageValues() { ModificationInfos modifications = buildModification(); Map values = modifications.getMapMessageValues(); - assertEquals("rootNetwork1", values.get("rootNetworkName")); - assertEquals("node1", values.get("nodeName")); + assertEquals(ROOT_NETWORK_UUID.toString(), values.get("rootNetworkId")); + assertEquals(NODE_UUID.toString(), values.get("nodeId")); } @Override From c049ae5fc4860b26b83971973280f7649d6b133d Mon Sep 17 00:00:00 2001 From: Franck LECUYER Date: Tue, 9 Dec 2025 12:55:09 +0100 Subject: [PATCH 4/4] Revert "UUID instead of name for the root network and the node in the voltage init modifications infos dto" This reverts commit fe028e16903c3c06ee8321887e5ed7901175981f. --- .../dto/VoltageInitModificationInfos.java | 13 ++++++------- .../modifications/VoltageInitModificationTest.java | 11 ++++------- 2 files changed, 10 insertions(+), 14 deletions(-) diff --git a/src/main/java/org/gridsuite/modification/dto/VoltageInitModificationInfos.java b/src/main/java/org/gridsuite/modification/dto/VoltageInitModificationInfos.java index f9c0e696..39ac1288 100644 --- a/src/main/java/org/gridsuite/modification/dto/VoltageInitModificationInfos.java +++ b/src/main/java/org/gridsuite/modification/dto/VoltageInitModificationInfos.java @@ -21,7 +21,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.UUID; /** * @author Franck Lecuyer @@ -52,11 +51,11 @@ public class VoltageInitModificationInfos extends ModificationInfos { @Schema(description = "buses modifications") private List buses; - @Schema(description = "root network id") - private UUID rootNetworkId; + @Schema(description = "root network name") + private String rootNetworkName; - @Schema(description = "node id") - private UUID nodeId; + @Schema(description = "node name") + private String nodeName; @Schema(description = "computation date") private Instant computationDate; @@ -74,8 +73,8 @@ public ReportNode createSubReportNode(ReportNode reportNode) { @Override public Map getMapMessageValues() { Map mapMessageValues = new HashMap<>(); - mapMessageValues.put("rootNetworkId", getRootNetworkId().toString()); - mapMessageValues.put("nodeId", getNodeId().toString()); + mapMessageValues.put("rootNetworkName", getRootNetworkName()); + mapMessageValues.put("nodeName", getNodeName()); mapMessageValues.put("computationDate", getComputationDate() != null ? getComputationDate().toString() : null); return mapMessageValues; } diff --git a/src/test/java/org/gridsuite/modification/modifications/VoltageInitModificationTest.java b/src/test/java/org/gridsuite/modification/modifications/VoltageInitModificationTest.java index f3e07301..4b64a2d7 100644 --- a/src/test/java/org/gridsuite/modification/modifications/VoltageInitModificationTest.java +++ b/src/test/java/org/gridsuite/modification/modifications/VoltageInitModificationTest.java @@ -29,9 +29,6 @@ * @author Ayoub LABIDI */ class VoltageInitModificationTest extends AbstractNetworkModificationTest { - private static final UUID ROOT_NETWORK_UUID = UUID.randomUUID(); - private static final UUID NODE_UUID = UUID.randomUUID(); - @Override protected Network createNetwork(UUID networkUuid) { Network network = NetworkCreation.create(networkUuid, true); @@ -205,8 +202,8 @@ protected ModificationInfos buildModification() { .v(230.) .angle(0.5) .build())) - .rootNetworkId(ROOT_NETWORK_UUID) - .nodeId(NODE_UUID) + .rootNetworkName("rootNetwork1") + .nodeName("node1") .computationDate(Instant.now()) .build(); } @@ -273,8 +270,8 @@ void testVoltageInitDisconnectedCurrentSection1Section1() throws Exception { void testMapMessageValues() { ModificationInfos modifications = buildModification(); Map values = modifications.getMapMessageValues(); - assertEquals(ROOT_NETWORK_UUID.toString(), values.get("rootNetworkId")); - assertEquals(NODE_UUID.toString(), values.get("nodeId")); + assertEquals("rootNetwork1", values.get("rootNetworkName")); + assertEquals("node1", values.get("nodeName")); } @Override