From d9ac4d502e84661f4ed81b3d3992fea2f44ebdde Mon Sep 17 00:00:00 2001 From: "SOUISSI Maissa (Externe)" Date: Tue, 5 May 2026 09:12:32 +0200 Subject: [PATCH] rename Signed-off-by: SOUISSI Maissa (Externe) --- .../server/dto/modification/NetworkModificationMetadata.java | 4 ++++ .../gridsuite/study/server/NetworkModificationUnitTest.java | 4 ++-- .../studycontroller/StudyControllerRebuildNodeTest.java | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/gridsuite/study/server/dto/modification/NetworkModificationMetadata.java b/src/main/java/org/gridsuite/study/server/dto/modification/NetworkModificationMetadata.java index 8135f6abc2..acfb6c4cf2 100644 --- a/src/main/java/org/gridsuite/study/server/dto/modification/NetworkModificationMetadata.java +++ b/src/main/java/org/gridsuite/study/server/dto/modification/NetworkModificationMetadata.java @@ -6,6 +6,7 @@ */ package org.gridsuite.study.server.dto.modification; +import com.fasterxml.jackson.annotation.JsonInclude; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; import lombok.Getter; @@ -29,4 +30,7 @@ public class NetworkModificationMetadata { String description; @Schema(description = "Modification type") String type; + @Schema(description = "Modification name (only present for composite modifications)") + @JsonInclude(JsonInclude.Include.NON_NULL) + String name; } diff --git a/src/test/java/org/gridsuite/study/server/NetworkModificationUnitTest.java b/src/test/java/org/gridsuite/study/server/NetworkModificationUnitTest.java index 53358f1212..c392e06104 100644 --- a/src/test/java/org/gridsuite/study/server/NetworkModificationUnitTest.java +++ b/src/test/java/org/gridsuite/study/server/NetworkModificationUnitTest.java @@ -209,7 +209,7 @@ void updateDescription() { UUID modificationUuid = UUID.randomUUID(); List childrenNodes = List.of(node2Uuid, node4Uuid, node3Uuid); - NetworkModificationMetadata metadata = new NetworkModificationMetadata(null, "new description", null); + NetworkModificationMetadata metadata = new NetworkModificationMetadata(null, "new description", null, null); studyController.updateNetworkModificationsMetadata(studyUuid, node1Uuid, List.of(modificationUuid), metadata, USER_ID_HEADER); checkModificationUpdatedMessageReceived(studyUuid, node1Uuid, childrenNodes, NotificationService.MODIFICATIONS_UPDATING_IN_PROGRESS); @@ -283,7 +283,7 @@ void unbuildAllNodes() { } private void updateNetworkModificationActivationStatus(List networkModificationUuids, UUID nodeWithModification, List childrenNodes, List nodesToUnbuild, boolean activated) { - NetworkModificationMetadata metadata = new NetworkModificationMetadata(activated, null, null); + NetworkModificationMetadata metadata = new NetworkModificationMetadata(activated, null, null, null); studyController.updateNetworkModificationsMetadata(studyUuid, node1Uuid, networkModificationUuids, metadata, USER_ID_HEADER); checkModificationUpdatedMessageReceived(studyUuid, nodeWithModification, childrenNodes, NotificationService.MODIFICATIONS_UPDATING_IN_PROGRESS); diff --git a/src/test/java/org/gridsuite/study/server/studycontroller/StudyControllerRebuildNodeTest.java b/src/test/java/org/gridsuite/study/server/studycontroller/StudyControllerRebuildNodeTest.java index b275e1e6f8..ad313cab3f 100644 --- a/src/test/java/org/gridsuite/study/server/studycontroller/StudyControllerRebuildNodeTest.java +++ b/src/test/java/org/gridsuite/study/server/studycontroller/StudyControllerRebuildNodeTest.java @@ -121,7 +121,7 @@ void restoreNetworkModification() { @Test void updateNetworkModificationMetadata() { List modificationUuids = List.of(UUID.randomUUID()); - NetworkModificationMetadata networkModificationMetadata = new NetworkModificationMetadata(true, "description", "type"); + NetworkModificationMetadata networkModificationMetadata = new NetworkModificationMetadata(true, "description", "type", null); studyController.updateNetworkModificationsMetadata(studyUuid, nodeUuid, modificationUuids, networkModificationMetadata, userId); verify(rebuildNodeService, times(1)).updateNetworkModificationsMetadata(studyUuid, nodeUuid, modificationUuids, userId, networkModificationMetadata);