Skip to content

Commit

Permalink
Fix sonar issues
Browse files Browse the repository at this point in the history 
Signed-off-by: Ayoub LABIDI <[email protected]>
  • Loading branch information
@ayolab
ayolab committed Sep 18, 2024
1 parent 7456ffc commit 3421f31
Show file tree
Hide file tree
Showing 7 changed files with 18 additions and 38 deletions.
18 changes: 5 additions & 13 deletions src/main/java/org/gridsuite/study/server/service/NetworkModificationTreeService.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -307,14 +307,10 @@ private void deleteNodes(UUID id, boolean deleteChildren, boolean allowDeleteRoo
deleteNodeInfos.addModificationGroupUuid(modificationGroupUuid);

// delete all modification reports
repositories.get(nodeToDelete.getType()).getModificationReports(nodeToDelete.getIdNode()).entrySet().stream().forEach(entry -> {
deleteNodeInfos.addReportUuid(entry.getValue());
});
repositories.get(nodeToDelete.getType()).getModificationReports(nodeToDelete.getIdNode()).entrySet().stream().forEach(entry -> deleteNodeInfos.addReportUuid(entry.getValue()));

// delete all computation reports
repositories.get(nodeToDelete.getType()).getComputationReports(nodeToDelete.getIdNode()).entrySet().stream().forEach(entry -> {
deleteNodeInfos.addReportUuid(entry.getValue());
});
repositories.get(nodeToDelete.getType()).getComputationReports(nodeToDelete.getIdNode()).entrySet().stream().forEach(entry -> deleteNodeInfos.addReportUuid(entry.getValue()));

String variantId = repositories.get(nodeToDelete.getType()).getVariantId(id);
if (!StringUtils.isBlank(variantId)) {
Expand Down Expand Up @@ -668,9 +664,7 @@ public Map<String, UUID> getComputationReports(UUID nodeUuid) {

@Transactional
public void setModificationReports(UUID nodeUuid, Map<UUID, UUID> modificationReports) {
nodesRepository.findById(nodeUuid).ifPresent(n -> {
repositories.get(n.getType()).setModificationReports(nodeUuid, modificationReports);
});
nodesRepository.findById(nodeUuid).ifPresent(n -> repositories.get(n.getType()).setModificationReports(nodeUuid, modificationReports));
}

@Transactional
Expand Down Expand Up @@ -760,7 +754,7 @@ private void getBuildInfos(NodeEntity nodeEntity, BuildInfos buildInfos) {
buildInfos.addModificationsToExclude(modificationNode.getModificationsToExclude());
}
if (!modificationNode.getNodeBuildStatus().isBuilt()) {
UUID reportUuid = getReportUuid(nodeEntity.getIdNode());
UUID reportUuid = self.getReportUuid(nodeEntity.getIdNode());
buildInfos.insertModificationInfos(modificationNode.getModificationGroupUuid(), new ReportInfos(reportUuid, modificationNode.getId()));
getBuildInfos(nodeEntity.getParentNode(), buildInfos);
} else {
Expand Down Expand Up @@ -791,9 +785,7 @@ private void fillInvalidateNodeInfos(NodeEntity node, InvalidateNodeInfos invali
boolean deleteVoltageInitResults) {
if (!invalidateOnlyChildrenBuildStatus) {
// we want to delete associated report and variant in this case
repositories.get(node.getType()).getModificationReports(node.getIdNode()).entrySet().stream().forEach(entry -> {
invalidateNodeInfos.addReportUuid(entry.getValue());
});
repositories.get(node.getType()).getModificationReports(node.getIdNode()).entrySet().stream().forEach(entry -> invalidateNodeInfos.addReportUuid(entry.getValue()));
invalidateNodeInfos.addVariantId(repositories.get(node.getType()).getVariantId(node.getIdNode()));
}

Expand Down
4 changes: 0 additions & 4 deletions src/main/java/org/gridsuite/study/server/service/ReportService.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,10 +52,6 @@ private String getReportsServerURI() {
return this.reportServerBaseUri + DELIMITER + REPORT_API_VERSION + DELIMITER + "reports" + DELIMITER;
}

private String getSubReportsServerURI() {
return this.reportServerBaseUri + DELIMITER + REPORT_API_VERSION + DELIMITER + "subreports" + DELIMITER;
}

public Report getReport(@NonNull UUID id, @NonNull String defaultName, Set<String> severityLevels) {
var uriBuilder = UriComponentsBuilder.fromPath("{id}")
.queryParam(QUERY_PARAM_REPORT_DEFAULT_NAME, defaultName)
Expand Down
16 changes: 8 additions & 8 deletions src/main/java/org/gridsuite/study/server/service/StudyService.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -703,7 +703,7 @@ public UUID runLoadFlow(UUID studyUuid, UUID nodeUuid, String userId, Float limi
prevResultUuidOpt.ifPresent(loadflowService::deleteLoadFlowResult);

UUID lfParametersUuid = loadflowService.getLoadFlowParametersOrDefaultsUuid(studyEntity);
UUID lfReportUuid = networkModificationTreeService.getComputationReports(nodeUuid).getOrDefault(LOAD_FLOW, UUID.randomUUID());
UUID lfReportUuid = networkModificationTreeService.getComputationReports(nodeUuid).getOrDefault(LOAD_FLOW.name(), UUID.randomUUID());
networkModificationTreeService.updateComputationReportUuid(nodeUuid, LOAD_FLOW, lfReportUuid);
UUID result = loadflowService.runLoadFlow(studyUuid, nodeUuid, lfParametersUuid, lfReportUuid, userId, limitReduction);

Expand Down Expand Up @@ -947,7 +947,7 @@ public UUID runSecurityAnalysis(UUID studyUuid, List<String> contingencyListName

UUID networkUuid = networkStoreService.getNetworkUuid(studyUuid);
String variantId = networkModificationTreeService.getVariantId(nodeUuid);
UUID saReportUuid = networkModificationTreeService.getComputationReports(nodeUuid).getOrDefault(SECURITY_ANALYSIS, UUID.randomUUID());
UUID saReportUuid = networkModificationTreeService.getComputationReports(nodeUuid).getOrDefault(SECURITY_ANALYSIS.name(), UUID.randomUUID());
networkModificationTreeService.updateComputationReportUuid(nodeUuid, SECURITY_ANALYSIS, saReportUuid);
StudyEntity study = studyRepository.findById(studyUuid).orElseThrow(() -> new StudyException(STUDY_NOT_FOUND));
String receiver;
Expand Down Expand Up @@ -1767,7 +1767,7 @@ public UUID runSensitivityAnalysis(UUID studyUuid, UUID nodeUuid, String userId)
StudyEntity study = studyRepository.findById(studyUuid).orElseThrow(() -> new StudyException(STUDY_NOT_FOUND));
UUID networkUuid = networkStoreService.getNetworkUuid(studyUuid);
String variantId = networkModificationTreeService.getVariantId(nodeUuid);
UUID sensiReportUuid = networkModificationTreeService.getComputationReports(nodeUuid).getOrDefault(SENSITIVITY_ANALYSIS, UUID.randomUUID());
UUID sensiReportUuid = networkModificationTreeService.getComputationReports(nodeUuid).getOrDefault(SENSITIVITY_ANALYSIS.name(), UUID.randomUUID());
networkModificationTreeService.updateComputationReportUuid(nodeUuid, SENSITIVITY_ANALYSIS, sensiReportUuid);

UUID result = sensitivityAnalysisService.runSensitivityAnalysis(nodeUuid, networkUuid, variantId, sensiReportUuid, userId, study.getSensitivityAnalysisParametersUuid(), study.getLoadFlowParametersUuid());
Expand All @@ -1781,7 +1781,7 @@ public UUID runShortCircuit(UUID studyUuid, UUID nodeUuid, Optional<String> busI
networkModificationTreeService.getComputationResultUuid(nodeUuid, busId.isEmpty() ? SHORT_CIRCUIT : SHORT_CIRCUIT_ONE_BUS)
.ifPresent(shortCircuitService::deleteShortCircuitAnalysisResult);
final Optional<UUID> parametersUuid = studyRepository.findById(studyUuid).map(StudyEntity::getShortCircuitParametersUuid);
UUID scReportUuid = networkModificationTreeService.getComputationReports(nodeUuid).getOrDefault(SHORT_CIRCUIT, UUID.randomUUID());
UUID scReportUuid = networkModificationTreeService.getComputationReports(nodeUuid).getOrDefault(busId.isEmpty() ? SHORT_CIRCUIT.name() : SHORT_CIRCUIT_ONE_BUS.name(), UUID.randomUUID());
networkModificationTreeService.updateComputationReportUuid(nodeUuid, SHORT_CIRCUIT, scReportUuid);
final UUID result = shortCircuitService.runShortCircuit(studyUuid, nodeUuid, busId.orElse(null), parametersUuid, scReportUuid, userId);
updateComputationResultUuid(nodeUuid, result, busId.isEmpty() ? SHORT_CIRCUIT : SHORT_CIRCUIT_ONE_BUS);
Expand All @@ -1797,7 +1797,7 @@ public UUID runVoltageInit(UUID studyUuid, UUID nodeUuid, String userId) {
UUID networkUuid = networkStoreService.getNetworkUuid(studyUuid);
String variantId = networkModificationTreeService.getVariantId(nodeUuid);
StudyEntity studyEntity = studyRepository.findById(studyUuid).orElseThrow(() -> new StudyException(STUDY_NOT_FOUND));
UUID reportUuid = networkModificationTreeService.getComputationReports(nodeUuid).getOrDefault(VOLTAGE_INITIALIZATION, UUID.randomUUID());
UUID reportUuid = networkModificationTreeService.getComputationReports(nodeUuid).getOrDefault(VOLTAGE_INITIALIZATION.name(), UUID.randomUUID());
networkModificationTreeService.updateComputationReportUuid(nodeUuid, VOLTAGE_INITIALIZATION, reportUuid);
UUID result = voltageInitService.runVoltageInit(networkUuid, variantId, studyEntity.getVoltageInitParametersUuid(), reportUuid, nodeUuid, userId);

Expand Down Expand Up @@ -1949,7 +1949,7 @@ public UUID runDynamicSimulation(UUID studyUuid, UUID nodeUuid, DynamicSimulatio
if (parameters != null) {
PropertyUtils.copyNonNullProperties(parameters, mergeParameters);
}
UUID reportUuid = networkModificationTreeService.getComputationReports(nodeUuid).getOrDefault(DYNAMIC_SIMULATION, UUID.randomUUID());
UUID reportUuid = networkModificationTreeService.getComputationReports(nodeUuid).getOrDefault(DYNAMIC_SIMULATION.name(), UUID.randomUUID());
networkModificationTreeService.updateComputationReportUuid(nodeUuid, DYNAMIC_SIMULATION, reportUuid);

// launch dynamic simulation
Expand Down Expand Up @@ -2090,7 +2090,7 @@ public UUID runNonEvacuatedEnergy(UUID studyUuid, UUID nodeUuid, String userId)
UUID networkUuid = networkStoreService.getNetworkUuid(studyUuid);
String provider = getNonEvacuatedEnergyProvider(studyUuid);
String variantId = networkModificationTreeService.getVariantId(nodeUuid);
UUID reportUuid = networkModificationTreeService.getComputationReports(nodeUuid).getOrDefault(NON_EVACUATED_ENERGY_ANALYSIS, UUID.randomUUID());
UUID reportUuid = networkModificationTreeService.getComputationReports(nodeUuid).getOrDefault(NON_EVACUATED_ENERGY_ANALYSIS.name(), UUID.randomUUID());
networkModificationTreeService.updateComputationReportUuid(nodeUuid, NON_EVACUATED_ENERGY_ANALYSIS, reportUuid);

NonEvacuatedEnergyParametersInfos nonEvacuatedEnergyParametersInfos = getNonEvacuatedEnergyParametersInfos(studyUuid);
Expand Down Expand Up @@ -2178,7 +2178,7 @@ public UUID runStateEstimation(UUID studyUuid, UUID nodeUuid, String userId) {

UUID networkUuid = networkStoreService.getNetworkUuid(studyUuid);
String variantId = networkModificationTreeService.getVariantId(nodeUuid);
UUID reportUuid = networkModificationTreeService.getComputationReports(nodeUuid).getOrDefault(STATE_ESTIMATION, UUID.randomUUID());
UUID reportUuid = networkModificationTreeService.getComputationReports(nodeUuid).getOrDefault(STATE_ESTIMATION.name(), UUID.randomUUID());
networkModificationTreeService.updateComputationReportUuid(nodeUuid, STATE_ESTIMATION, reportUuid);
String receiver;
try {
Expand Down
4 changes: 0 additions & 4 deletions src/main/java/org/gridsuite/study/server/service/VoltageInitService.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -241,10 +241,6 @@ public void stopVoltageInit(UUID studyUuid, UUID nodeUuid, String userId) {
restTemplate.exchange(voltageInitServerBaseUri + path, HttpMethod.PUT, new HttpEntity<>(headers), Void.class);
}

private UUID getReportUuid(UUID nodeUuid) {
return networkModificationTreeService.getReportUuid(nodeUuid);
}

public void setVoltageInitServerBaseUri(String voltageInitServerBaseUri) {
this.voltageInitServerBaseUri = voltageInitServerBaseUri;
}
Expand Down
4 changes: 0 additions & 4 deletions src/test/java/org/gridsuite/study/server/NetworkModificationTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2414,7 +2414,6 @@ public void testNodesInvalidation() throws Exception {
NetworkModificationNode modificationNode3 = createNetworkModificationNode(studyNameUserIdUuid, modificationNode2Uuid, UUID.randomUUID(), VARIANT_ID_3, "node 3", BuildStatus.BUILT, userId);
UUID modificationNode3Uuid = modificationNode3.getId();

//modificationNode1.setModificationReports(Map.of(modificationNode1Uuid, UUID.randomUUID()));
modificationNode1.setSecurityAnalysisResultUuid(UUID.fromString(SECURITY_ANALYSIS_RESULT_UUID));
modificationNode1.setSensitivityAnalysisResultUuid(UUID.fromString(SENSITIVITY_ANALYSIS_RESULT_UUID));
modificationNode1.setNonEvacuatedEnergyResultUuid(UUID.fromString(SENSITIVITY_ANALYSIS_NON_EVACUATED_ENERGY_RESULT_UUID));
Expand All @@ -2423,9 +2422,6 @@ public void testNodesInvalidation() throws Exception {
modificationNode1.setVoltageInitResultUuid(UUID.fromString(VOLTAGE_INIT_RESULT_UUID));
modificationNode1.setStateEstimationResultUuid(UUID.fromString(STATE_ESTIMATION_RESULT_UUID));

//modificationNode2.setReportUuid(UUID.randomUUID());
//modificationNode3.setReportUuid(UUID.randomUUID());

networkModificationTreeService.updateNode(studyNameUserIdUuid, modificationNode1, userId);
checkElementUpdatedMessageSent(studyNameUserIdUuid, userId);
output.receive(TIMEOUT, studyUpdateDestination);
Expand Down
8 changes: 4 additions & 4 deletions src/test/java/org/gridsuite/study/server/service/ReportServiceTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@ public void testReport() {
checkReports(reports, expectedRootReports);
assertTrue(TestUtils.getRequestsDone(1, server).stream().anyMatch(r -> r.matches("/v1/reports/.*")));

NetworkModificationNode node = (NetworkModificationNode) networkModificationTreeService.createNode(rootNode.getStudyId(), rootNode.getId(), createModificationNodeInfo("Node1", MODIFICATION_NODE_REPORT_UUID), InsertMode.AFTER, null);
NetworkModificationNode node = (NetworkModificationNode) networkModificationTreeService.createNode(rootNode.getStudyId(), rootNode.getId(), createModificationNodeInfo("Node1"), InsertMode.AFTER, null);
output.receive(TIMEOUT, STUDY_UPDATE_DESTINATION); // message for modification node creation
List<Report> expectedNodeReports = List.of(getNodeReport(MODIFICATION_NODE_REPORT_UUID, node.getId().toString()));

Expand All @@ -200,9 +200,9 @@ public void testReport() {
@Test
public void testMultipleReport() {
RootNode rootNode = createRoot();
NetworkModificationNode node = (NetworkModificationNode) networkModificationTreeService.createNode(rootNode.getStudyId(), rootNode.getId(), createModificationNodeInfo("Modification Node", MODIFICATION_NODE_REPORT_UUID), InsertMode.AFTER, null);
NetworkModificationNode child1 = (NetworkModificationNode) networkModificationTreeService.createNode(rootNode.getStudyId(), node.getId(), createModificationNodeInfo("Child 1", MODIFICATION_CHILD_NODE1_REPORT_UUID), InsertMode.AFTER, null);
NetworkModificationNode child2 = (NetworkModificationNode) networkModificationTreeService.createNode(rootNode.getStudyId(), node.getId(), createModificationNodeInfo("Child 2", MODIFICATION_CHILD_NODE2_REPORT_UUID), InsertMode.AFTER, null);
NetworkModificationNode node = (NetworkModificationNode) networkModificationTreeService.createNode(rootNode.getStudyId(), rootNode.getId(), createModificationNodeInfo("Modification Node"), InsertMode.AFTER, null);
NetworkModificationNode child1 = (NetworkModificationNode) networkModificationTreeService.createNode(rootNode.getStudyId(), node.getId(), createModificationNodeInfo("Child 1"), InsertMode.AFTER, null);
NetworkModificationNode child2 = (NetworkModificationNode) networkModificationTreeService.createNode(rootNode.getStudyId(), node.getId(), createModificationNodeInfo("Child 2"), InsertMode.AFTER, null);

// message for 3 modification nodes creation
output.receive(TIMEOUT, STUDY_UPDATE_DESTINATION);
Expand Down
2 changes: 1 addition & 1 deletion src/test/java/org/gridsuite/study/server/utils/TestUtils.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ public static StudyEntity createDummyStudy(UUID networkUuid, UUID caseUuid, Stri
.build();
}

public static NetworkModificationNode createModificationNodeInfo(String name, UUID reportUuid) {
public static NetworkModificationNode createModificationNodeInfo(String name) {
return NetworkModificationNode.builder()
.name(name)
.description("")
Expand Down

0 comments on commit 3421f31

Please sign in to comment.