Skip to content

refactor delete remote node infos #950

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
souissimai wants to merge 5 commits into
base: main
Choose a base branch
from
Open

refactor delete remote node infos #950

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8fe0d37
refactor delete remote node infos
Feb 23, 2026
5341e75
refactoring
Feb 23, 2026
93941d0
Merge branch 'main' into refactor_remote_node_deletion_ifos
souissimai Feb 24, 2026
42fdaaa
Merge branch 'main' into refactor_remote_node_deletion_ifos
souissimai Feb 25, 2026
9f3f56c
Merge branch 'main' into refactor_remote_node_deletion_ifos
souissimai Feb 25, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
74 changes: 1 addition & 73 deletions src/main/java/org/gridsuite/study/server/dto/DeleteNodeInfos.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,37 +19,13 @@
@NoArgsConstructor
@Getter
@Setter
public class DeleteNodeInfos {
public class DeleteNodeInfos extends NodeInfos {
private List<UUID> removedNodeUuids = new ArrayList<>();

private List<UUID> modificationGroupUuids = new ArrayList<>();

private List<UUID> reportUuids = new ArrayList<>();

private Map<UUID, List<String>> variantIds = new HashMap<>();

private List<UUID> loadFlowResultUuids = new ArrayList<>();

private List<UUID> securityAnalysisResultUuids = new ArrayList<>();

private List<UUID> sensitivityAnalysisResultUuids = new ArrayList<>();

private List<UUID> shortCircuitAnalysisResultUuids = new ArrayList<>();

private List<UUID> oneBusShortCircuitAnalysisResultUuids = new ArrayList<>();

private List<UUID> voltageInitResultUuids = new ArrayList<>();

private List<UUID> dynamicSimulationResultUuids = new ArrayList<>();

private List<UUID> dynamicSecurityAnalysisResultUuids = new ArrayList<>();

private List<UUID> dynamicMarginCalculationResultUuids = new ArrayList<>();

private List<UUID> stateEstimationResultUuids = new ArrayList<>();

private List<UUID> pccMinResultUuids = new ArrayList<>();

public void addRemovedNodeUuid(UUID removedNodeUuid) {
removedNodeUuids.add(removedNodeUuid);
}
Expand All @@ -58,56 +34,8 @@ public void addModificationGroupUuid(UUID modificationGroupUuid) {
modificationGroupUuids.add(modificationGroupUuid);
}

public void addReportUuid(UUID reportUuid) {
reportUuids.add(reportUuid);
}

public void addVariantId(UUID networkUuid, String variantId) {
variantIds.getOrDefault(networkUuid, new ArrayList<>()).add(variantId);
}

public void addLoadFlowResultUuid(UUID loadFlowResultUuid) {
loadFlowResultUuids.add(loadFlowResultUuid);
}

public void addSecurityAnalysisResultUuid(UUID securityAnalysisResultUuid) {
securityAnalysisResultUuids.add(securityAnalysisResultUuid);
}

public void addDynamicSimulationResultUuid(UUID dynamicSimulationResultUuid) {
dynamicSimulationResultUuids.add(dynamicSimulationResultUuid);
}

public void addDynamicSecurityAnalysisResultUuid(UUID dynamicSecurityAnalysisResultUuid) {
dynamicSecurityAnalysisResultUuids.add(dynamicSecurityAnalysisResultUuid);
}

public void addDynamicMarginCalculationResultUuid(UUID dynamicMarginCalculationResultUuid) {
dynamicMarginCalculationResultUuids.add(dynamicMarginCalculationResultUuid);
}

public void addSensitivityAnalysisResultUuid(UUID sensitivityAnalysisResultUuid) {
sensitivityAnalysisResultUuids.add(sensitivityAnalysisResultUuid);
}

public void addShortCircuitAnalysisResultUuid(UUID shortCircuitAnalysisResultUuid) {
shortCircuitAnalysisResultUuids.add(shortCircuitAnalysisResultUuid);
}

public void addOneBusShortCircuitAnalysisResultUuid(UUID oneBusShortCircuitAnalysisResultUuid) {
oneBusShortCircuitAnalysisResultUuids.add(oneBusShortCircuitAnalysisResultUuid);
}

public void addVoltageInitResultUuid(UUID voltageInitResultUuid) {
voltageInitResultUuids.add(voltageInitResultUuid);
}

public void addStateEstimationResultUuid(UUID stateEstimationResultUuid) {
stateEstimationResultUuids.add(stateEstimationResultUuid);
}

public void addPccMinResultUuid(UUID pccMinResultUuid) {
pccMinResultUuids.add(pccMinResultUuid);
}

}
129 changes: 18 additions & 111 deletions src/main/java/org/gridsuite/study/server/dto/InvalidateNodeInfos.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,29 +19,15 @@
* @author Nicolas Noir <nicolas.noir at rte-france.com>
*/
@NoArgsConstructor
public class InvalidateNodeInfos {
public class InvalidateNodeInfos extends NodeInfos {
@Getter
@Setter
private UUID networkUuid;

private Set<UUID> nodeUuids = new HashSet<>();
private Set<UUID> groupUuids = new HashSet<>();

private Set<UUID> reportUuids = new HashSet<>();
private Set<String> variantIds = new HashSet<>();

private Set<UUID> loadFlowResultUuids = new HashSet<>();
private Set<UUID> securityAnalysisResultUuids = new HashSet<>();
private Set<UUID> sensitivityAnalysisResultUuids = new HashSet<>();
private Set<UUID> shortCircuitAnalysisResultUuids = new HashSet<>();
private Set<UUID> oneBusShortCircuitAnalysisResultUuids = new HashSet<>();
private Set<UUID> voltageInitResultUuids = new HashSet<>();
private Set<UUID> stateEstimationResultUuids = new HashSet<>();
private Set<UUID> pccMinResultUuids = new HashSet<>();
private Set<UUID> dynamicSimulationResultUuids = new HashSet<>();
private Set<UUID> dynamicSecurityAnalysisResultUuids = new HashSet<>();
private Set<UUID> dynamicMarginCalculationResultUuids = new HashSet<>();

public List<UUID> getNodeUuids() {
return nodeUuids.stream().toList();
}
Expand All @@ -50,110 +36,14 @@ public List<UUID> getGroupUuids() {
return groupUuids.stream().toList();
}

public List<UUID> getReportUuids() {
return reportUuids.stream().toList();
}

public List<String> getVariantIds() {
return variantIds.stream().toList();
}

public List<UUID> getLoadFlowResultUuids() {
return loadFlowResultUuids.stream().toList();
}

public List<UUID> getSecurityAnalysisResultUuids() {
return securityAnalysisResultUuids.stream().toList();
}

public List<UUID> getSensitivityAnalysisResultUuids() {
return sensitivityAnalysisResultUuids.stream().toList();
}

public List<UUID> getShortCircuitAnalysisResultUuids() {
return shortCircuitAnalysisResultUuids.stream().toList();
}

public List<UUID> getOneBusShortCircuitAnalysisResultUuids() {
return oneBusShortCircuitAnalysisResultUuids.stream().toList();
}

public List<UUID> getVoltageInitResultUuids() {
return voltageInitResultUuids.stream().toList();
}

public List<UUID> getStateEstimationResultUuids() {
return stateEstimationResultUuids.stream().toList();
}

public List<UUID> getPccMinResultUuids() {
return pccMinResultUuids.stream().toList();
}

public List<UUID> getDynamicSimulationResultUuids() {
return dynamicSimulationResultUuids.stream().toList();
}

public List<UUID> getDynamicSecurityAnalysisResultUuids() {
return dynamicSecurityAnalysisResultUuids.stream().toList();
}

public List<UUID> getDynamicMarginCalculationResultUuids() {
return dynamicMarginCalculationResultUuids.stream().toList();
}

public void addReportUuid(UUID reportUuid) {
reportUuids.add(reportUuid);
}

public void addVariantId(String variantId) {
variantIds.add(variantId);
}

public void addLoadFlowResultUuid(UUID loadFlowResultUuid) {
loadFlowResultUuids.add(loadFlowResultUuid);
}

public void addSecurityAnalysisResultUuid(UUID securityAnalysisResultUuid) {
securityAnalysisResultUuids.add(securityAnalysisResultUuid);
}

public void addSensitivityAnalysisResultUuid(UUID sensitivityAnalysisResultUuid) {
sensitivityAnalysisResultUuids.add(sensitivityAnalysisResultUuid);
}

public void addShortCircuitAnalysisResultUuid(UUID shortCircuitAnalysisResultUuid) {
shortCircuitAnalysisResultUuids.add(shortCircuitAnalysisResultUuid);
}

public void addOneBusShortCircuitAnalysisResultUuid(UUID oneBusShortCircuitAnalysisResultUuid) {
oneBusShortCircuitAnalysisResultUuids.add(oneBusShortCircuitAnalysisResultUuid);
}

public void addVoltageInitResultUuid(UUID voltageInitResultUuid) {
voltageInitResultUuids.add(voltageInitResultUuid);
}

public void addDynamicSimulationResultUuid(UUID dynamicSimulationResultUuid) {
dynamicSimulationResultUuids.add(dynamicSimulationResultUuid);
}

public void addDynamicSecurityAnalysisResultUuid(UUID dynamicSecurityAnalysisResultUuid) {
dynamicSecurityAnalysisResultUuids.add(dynamicSecurityAnalysisResultUuid);
}

public void addDynamicMarginCalculationResultUuid(UUID dynamicMarginCalculationResultUuid) {
dynamicMarginCalculationResultUuids.add(dynamicMarginCalculationResultUuid);
}

public void addStateEstimationResultUuid(UUID stateEstimationResultUuid) {
stateEstimationResultUuids.add(stateEstimationResultUuid);
}

public void addPccMinResultUuid(UUID pccMinResultUuid) {
pccMinResultUuids.add(pccMinResultUuid);
}

public void addGroupUuids(List<UUID> groupUuids) {
this.groupUuids.addAll(groupUuids);
}
Expand Down Expand Up @@ -181,4 +71,21 @@ public void add(InvalidateNodeInfos invalidateNodeInfos) {
dynamicSecurityAnalysisResultUuids.addAll(invalidateNodeInfos.getDynamicSecurityAnalysisResultUuids());
dynamicMarginCalculationResultUuids.addAll(invalidateNodeInfos.getDynamicMarginCalculationResultUuids());
}

public NodeInfos toNodeInfos(InvalidateNodeInfos invalidateNodeInfos) {
NodeInfos infos = new NodeInfos();
infos.setReportUuids(new HashSet<>(invalidateNodeInfos.getReportUuids()));
infos.setLoadFlowResultUuids(new HashSet<>(invalidateNodeInfos.getLoadFlowResultUuids()));
infos.setSecurityAnalysisResultUuids(new HashSet<>(invalidateNodeInfos.getSecurityAnalysisResultUuids()));
infos.setSensitivityAnalysisResultUuids(new HashSet<>(invalidateNodeInfos.getSensitivityAnalysisResultUuids()));
infos.setShortCircuitAnalysisResultUuids(new HashSet<>(invalidateNodeInfos.getShortCircuitAnalysisResultUuids()));
infos.setOneBusShortCircuitAnalysisResultUuids(new HashSet<>(invalidateNodeInfos.getOneBusShortCircuitAnalysisResultUuids()));
infos.setVoltageInitResultUuids(new HashSet<>(invalidateNodeInfos.getVoltageInitResultUuids()));
infos.setDynamicSimulationResultUuids(new HashSet<>(invalidateNodeInfos.getDynamicSimulationResultUuids()));
infos.setDynamicSecurityAnalysisResultUuids(new HashSet<>(invalidateNodeInfos.getDynamicSecurityAnalysisResultUuids()));
infos.setDynamicMarginCalculationResultUuids(new HashSet<>(invalidateNodeInfos.getDynamicMarginCalculationResultUuids()));
infos.setStateEstimationResultUuids(new HashSet<>(invalidateNodeInfos.getStateEstimationResultUuids()));
infos.setPccMinResultUuids(new HashSet<>(invalidateNodeInfos.getPccMinResultUuids()));
return infos;
}
}
132 changes: 132 additions & 0 deletions src/main/java/org/gridsuite/study/server/dto/NodeInfos.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,132 @@
/**
* Copyright (c) 2026 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.study.server.dto;

import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;

import java.util.*;

/**
* @author Maissa Souissi <maissa.souissi at rte-france.com>
*/

@NoArgsConstructor
@Getter
@Setter
public class NodeInfos {
protected Set<UUID> reportUuids = new HashSet<>();
protected Set<UUID> loadFlowResultUuids = new HashSet<>();
protected Set<UUID> securityAnalysisResultUuids = new HashSet<>();
protected Set<UUID> sensitivityAnalysisResultUuids = new HashSet<>();
protected Set<UUID> shortCircuitAnalysisResultUuids = new HashSet<>();
protected Set<UUID> oneBusShortCircuitAnalysisResultUuids = new HashSet<>();
protected Set<UUID> voltageInitResultUuids = new HashSet<>();
protected Set<UUID> dynamicSimulationResultUuids = new HashSet<>();
protected Set<UUID> dynamicSecurityAnalysisResultUuids = new HashSet<>();
protected Set<UUID> dynamicMarginCalculationResultUuids = new HashSet<>();
protected Set<UUID> stateEstimationResultUuids = new HashSet<>();
protected Set<UUID> pccMinResultUuids = new HashSet<>();

public List<UUID> getReportUuids() {
return reportUuids.stream().toList();
}

public List<UUID> getLoadFlowResultUuids() {
return loadFlowResultUuids.stream().toList();
}

public List<UUID> getSecurityAnalysisResultUuids() {
return securityAnalysisResultUuids.stream().toList();
}

public List<UUID> getSensitivityAnalysisResultUuids() {
return sensitivityAnalysisResultUuids.stream().toList();
}

public List<UUID> getShortCircuitAnalysisResultUuids() {
return shortCircuitAnalysisResultUuids.stream().toList();
}

public List<UUID> getOneBusShortCircuitAnalysisResultUuids() {
return oneBusShortCircuitAnalysisResultUuids.stream().toList();
}

public List<UUID> getVoltageInitResultUuids() {
return voltageInitResultUuids.stream().toList();
}

public List<UUID> getStateEstimationResultUuids() {
return stateEstimationResultUuids.stream().toList();
}

public List<UUID> getPccMinResultUuids() {
return pccMinResultUuids.stream().toList();
}

public List<UUID> getDynamicSimulationResultUuids() {
return dynamicSimulationResultUuids.stream().toList();
}

public List<UUID> getDynamicSecurityAnalysisResultUuids() {
return dynamicSecurityAnalysisResultUuids.stream().toList();
}

public List<UUID> getDynamicMarginCalculationResultUuids() {
return dynamicMarginCalculationResultUuids.stream().toList();
}

public void addReportUuid(UUID reportUuid) {
reportUuids.add(reportUuid);
}

public void addLoadFlowResultUuid(UUID loadFlowResultUuid) {
loadFlowResultUuids.add(loadFlowResultUuid);
}

public void addSecurityAnalysisResultUuid(UUID securityAnalysisResultUuid) {
securityAnalysisResultUuids.add(securityAnalysisResultUuid);
}

public void addDynamicSimulationResultUuid(UUID dynamicSimulationResultUuid) {
dynamicSimulationResultUuids.add(dynamicSimulationResultUuid);
}

public void addDynamicSecurityAnalysisResultUuid(UUID dynamicSecurityAnalysisResultUuid) {
dynamicSecurityAnalysisResultUuids.add(dynamicSecurityAnalysisResultUuid);
}

public void addDynamicMarginCalculationResultUuid(UUID dynamicMarginCalculationResultUuid) {
dynamicMarginCalculationResultUuids.add(dynamicMarginCalculationResultUuid);
}

public void addSensitivityAnalysisResultUuid(UUID sensitivityAnalysisResultUuid) {
sensitivityAnalysisResultUuids.add(sensitivityAnalysisResultUuid);
}

public void addShortCircuitAnalysisResultUuid(UUID shortCircuitAnalysisResultUuid) {
shortCircuitAnalysisResultUuids.add(shortCircuitAnalysisResultUuid);
}

public void addOneBusShortCircuitAnalysisResultUuid(UUID oneBusShortCircuitAnalysisResultUuid) {
oneBusShortCircuitAnalysisResultUuids.add(oneBusShortCircuitAnalysisResultUuid);
}

public void addVoltageInitResultUuid(UUID voltageInitResultUuid) {
voltageInitResultUuids.add(voltageInitResultUuid);
}

public void addStateEstimationResultUuid(UUID stateEstimationResultUuid) {
stateEstimationResultUuids.add(stateEstimationResultUuid);
}

public void addPccMinResultUuid(UUID pccMinResultUuid) {
pccMinResultUuids.add(pccMinResultUuid);
}

}
Loading