Skip to content

refactoring #931

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 1 commit into
base: main
Choose a base branch
from
Open

refactoring #931

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
71 changes: 2 additions & 69 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,35 +19,12 @@
@NoArgsConstructor
@Getter
@Setter
public class DeleteNodeInfos {
private List<UUID> removedNodeUuids = new ArrayList<>();
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> stateEstimationResultUuids = new ArrayList<>();

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

public void addRemovedNodeUuid(UUID removedNodeUuid) {
removedNodeUuids.add(removedNodeUuid);
}
Expand All @@ -56,52 +33,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 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);
}

}
146 changes: 21 additions & 125 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 @@ -10,165 +10,61 @@
import lombok.NoArgsConstructor;
import lombok.Setter;

import java.util.HashSet;
import java.util.List;
import java.util.Set;
import java.util.UUID;
import java.util.*;

/**
* @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<>();

public List<UUID> getNodeUuids() {
return nodeUuids.stream().toList();
return new ArrayList<>(nodeUuids);
}

public List<UUID> getGroupUuids() {
return groupUuids.stream().toList();
return new ArrayList<>(groupUuids);
}

public List<UUID> getReportUuids() {
return reportUuids.stream().toList();
public void addNodeUuid(UUID nodeUuid) {
nodeUuids.add(nodeUuid);
}

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 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 addStateEstimationResultUuid(UUID stateEstimationResultUuid) {
stateEstimationResultUuids.add(stateEstimationResultUuid);
}

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

public void addGroupUuids(List<UUID> groupUuids) {
this.groupUuids.addAll(groupUuids);
}

public void addNodeUuid(UUID nodeUuid) {
this.nodeUuids.add(nodeUuid);
}

public void add(InvalidateNodeInfos invalidateNodeInfos) {
nodeUuids.addAll(invalidateNodeInfos.getNodeUuids());
groupUuids.addAll(invalidateNodeInfos.getGroupUuids());
public void add(InvalidateNodeInfos infos) {
nodeUuids.addAll(infos.getNodeUuids());
groupUuids.addAll(infos.getGroupUuids());

reportUuids.addAll(invalidateNodeInfos.getReportUuids());
variantIds.addAll(invalidateNodeInfos.getVariantIds());
reportUuids.addAll(infos.getReportUuids());
variantIds.addAll(infos.getVariantIds());

loadFlowResultUuids.addAll(invalidateNodeInfos.getLoadFlowResultUuids());
securityAnalysisResultUuids.addAll(invalidateNodeInfos.getSecurityAnalysisResultUuids());
sensitivityAnalysisResultUuids.addAll(invalidateNodeInfos.getSensitivityAnalysisResultUuids());
shortCircuitAnalysisResultUuids.addAll(invalidateNodeInfos.getShortCircuitAnalysisResultUuids());
oneBusShortCircuitAnalysisResultUuids.addAll(invalidateNodeInfos.getOneBusShortCircuitAnalysisResultUuids());
voltageInitResultUuids.addAll(invalidateNodeInfos.getVoltageInitResultUuids());
stateEstimationResultUuids.addAll(invalidateNodeInfos.getStateEstimationResultUuids());
pccMinResultUuids.addAll(invalidateNodeInfos.getPccMinResultUuids());
dynamicSimulationResultUuids.addAll(invalidateNodeInfos.getDynamicSimulationResultUuids());
dynamicSecurityAnalysisResultUuids.addAll(invalidateNodeInfos.getDynamicSecurityAnalysisResultUuids());
loadFlowResultUuids.addAll(infos.getLoadFlowResultUuids());
securityAnalysisResultUuids.addAll(infos.getSecurityAnalysisResultUuids());
sensitivityAnalysisResultUuids.addAll(infos.getSensitivityAnalysisResultUuids());
shortCircuitAnalysisResultUuids.addAll(infos.getShortCircuitAnalysisResultUuids());
oneBusShortCircuitAnalysisResultUuids.addAll(infos.getOneBusShortCircuitAnalysisResultUuids());
voltageInitResultUuids.addAll(infos.getVoltageInitResultUuids());
stateEstimationResultUuids.addAll(infos.getStateEstimationResultUuids());
pccMinResultUuids.addAll(infos.getPccMinResultUuids());
dynamicSimulationResultUuids.addAll(infos.getDynamicSimulationResultUuids());
dynamicSecurityAnalysisResultUuids.addAll(infos.getDynamicSecurityAnalysisResultUuids());
}
}
120 changes: 120 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,120 @@
package org.gridsuite.study.server.dto;

import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
import lombok.experimental.SuperBuilder;

import java.util.*;

/**
* Common base class for DTOs that track analysis results, reports, and variants.
*/

@NoArgsConstructor
@Getter
@Setter
@SuperBuilder
public class NodeInfos {

protected List<UUID> reportUuids = new ArrayList<>();
protected List<UUID> loadFlowResultUuids = new ArrayList<>();
protected List<UUID> securityAnalysisResultUuids = new ArrayList<>();
protected List<UUID> sensitivityAnalysisResultUuids = new ArrayList<>();
protected List<UUID> shortCircuitAnalysisResultUuids = new ArrayList<>();
protected List<UUID> oneBusShortCircuitAnalysisResultUuids = new ArrayList<>();
protected List<UUID> voltageInitResultUuids = new ArrayList<>();
protected List<UUID> stateEstimationResultUuids = new ArrayList<>();
protected List<UUID> pccMinResultUuids = new ArrayList<>();
protected List<UUID> dynamicSimulationResultUuids = new ArrayList<>();
protected List<UUID> dynamicSecurityAnalysisResultUuids = new ArrayList<>();

public List<UUID> getReportUuids() {
return new ArrayList<>(reportUuids);
}

public List<UUID> getLoadFlowResultUuids() {
return new ArrayList<>(loadFlowResultUuids);
}

public List<UUID> getSecurityAnalysisResultUuids() {
return new ArrayList<>(securityAnalysisResultUuids);
}

public List<UUID> getSensitivityAnalysisResultUuids() {
return new ArrayList<>(sensitivityAnalysisResultUuids);
}

public List<UUID> getShortCircuitAnalysisResultUuids() {
return new ArrayList<>(shortCircuitAnalysisResultUuids);
}

public List<UUID> getOneBusShortCircuitAnalysisResultUuids() {
return new ArrayList<>(oneBusShortCircuitAnalysisResultUuids);
}

public List<UUID> getVoltageInitResultUuids() {
return new ArrayList<>(voltageInitResultUuids);
}

public List<UUID> getStateEstimationResultUuids() {
return new ArrayList<>(stateEstimationResultUuids);
}

public List<UUID> getPccMinResultUuids() {
return new ArrayList<>(pccMinResultUuids);
}

public List<UUID> getDynamicSimulationResultUuids() {
return new ArrayList<>(dynamicSimulationResultUuids);
}

public List<UUID> getDynamicSecurityAnalysisResultUuids() {
return new ArrayList<>(dynamicSecurityAnalysisResultUuids);
}

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

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

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

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

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

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

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

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

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

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

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