Skip to content

Commit c9e07fc

Browse files
authored
Fix restore use of "node" in notifications headers (#41)
Signed-off-by: sBouzols <[email protected]>
1 parent 8b7c064 commit c9e07fc

File tree

2 files changed

+4
-0
lines changed

2 files changed

+4
-0
lines changed

src/main/java/org/gridsuite/notification/server/NotificationWebSocketHandler.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@ public class NotificationWebSocketHandler implements WebSocketHandler {
5959
static final String HEADER_SUBSTATIONS_IDS = "substationsIds";
6060
static final String HEADER_DELETED_EQUIPMENT_ID = "deletedEquipmentId";
6161
static final String HEADER_DELETED_EQUIPMENT_TYPE = "deletedEquipmentType";
62+
static final String HEADER_NODE = "node";
6263
static final String HEADER_NODES = "nodes";
6364
static final String HEADER_PARENT_NODE = "parentNode";
6465
static final String HEADER_NEW_NODE = "newNode";
@@ -132,6 +133,7 @@ private static Map<String, Object> toResultHeader(Map<String, Object> messageHea
132133
passHeader(messageHeader, resHeader, HEADER_PARENT_NODE);
133134
passHeader(messageHeader, resHeader, HEADER_INSERT_MODE);
134135
passHeader(messageHeader, resHeader, HEADER_REMOVE_CHILDREN);
136+
passHeader(messageHeader, resHeader, HEADER_NODE);
135137
passHeader(messageHeader, resHeader, HEADER_NODES);
136138
passHeader(messageHeader, resHeader, HEADER_NEW_NODE);
137139

src/test/java/org/gridsuite/notification/server/NotificationWebSocketHandlerTest.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -135,6 +135,7 @@ private void withFilters(String filterStudyUuid, String filterUpdateType) {
135135

136136
Map.of(HEADER_STUDY_UUID, "nodes", HEADER_UPDATE_TYPE, "insert", HEADER_PARENT_NODE, UUID.randomUUID().toString(), HEADER_NEW_NODE, UUID.randomUUID().toString(), HEADER_INSERT_MODE, true),
137137
Map.of(HEADER_STUDY_UUID, "nodes", HEADER_UPDATE_TYPE, "update", HEADER_NODES, List.of(UUID.randomUUID().toString())),
138+
Map.of(HEADER_STUDY_UUID, "nodes", HEADER_UPDATE_TYPE, "update", HEADER_NODE, UUID.randomUUID().toString()),
138139
Map.of(HEADER_STUDY_UUID, "nodes", HEADER_UPDATE_TYPE, "delete", HEADER_NODES, List.of(UUID.randomUUID().toString()),
139140
HEADER_PARENT_NODE, UUID.randomUUID().toString(), HEADER_REMOVE_CHILDREN, true))
140141
.map(map -> new GenericMessage<>("", map))
@@ -186,6 +187,7 @@ private Map<String, Object> toResultHeader(Map<String, Object> messageHeader) {
186187
passHeaderRef(messageHeader, resHeader, HEADER_DELETED_EQUIPMENT_ID);
187188
passHeaderRef(messageHeader, resHeader, HEADER_DELETED_EQUIPMENT_TYPE);
188189
passHeaderRef(messageHeader, resHeader, HEADER_NEW_NODE);
190+
passHeaderRef(messageHeader, resHeader, HEADER_NODE);
189191
passHeaderRef(messageHeader, resHeader, HEADER_NODES);
190192
passHeaderRef(messageHeader, resHeader, HEADER_REMOVE_CHILDREN);
191193
passHeaderRef(messageHeader, resHeader, HEADER_PARENT_NODE);

0 commit comments

Comments
 (0)