diff --git a/pom.xml b/pom.xml
index 9d517e7a39..e73dc2a0fd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -13,7 +13,7 @@
com.powsybl
powsybl-parent-ws
- 26.1
+ 28
diff --git a/src/main/java/org/gridsuite/study/server/RestTemplateConfig.java b/src/main/java/org/gridsuite/study/server/RestTemplateConfig.java
index e392327955..555f2c4533 100644
--- a/src/main/java/org/gridsuite/study/server/RestTemplateConfig.java
+++ b/src/main/java/org/gridsuite/study/server/RestTemplateConfig.java
@@ -16,8 +16,8 @@
import com.powsybl.contingency.json.ContingencyJsonModule;
import com.powsybl.loadflow.json.LoadFlowParametersJsonModule;
import com.powsybl.loadflow.json.LoadFlowResultJsonModule;
-import com.powsybl.sensitivity.json.SensitivityJsonModule;
import com.powsybl.security.json.SecurityAnalysisJsonModule;
+import com.powsybl.sensitivity.json.SensitivityJsonModule;
import com.powsybl.shortcircuit.json.ShortCircuitAnalysisJsonModule;
import com.powsybl.timeseries.json.TimeSeriesJsonModule;
import org.springframework.boot.web.client.RestTemplateBuilder;
diff --git a/src/main/java/org/gridsuite/study/server/controller/StudyController.java b/src/main/java/org/gridsuite/study/server/controller/StudyController.java
index 08c0a9eec4..a09335b219 100644
--- a/src/main/java/org/gridsuite/study/server/controller/StudyController.java
+++ b/src/main/java/org/gridsuite/study/server/controller/StudyController.java
@@ -252,7 +252,8 @@ public ResponseEntity duplicateNode(@Parameter(description = "The study wh
@Parameter(description = "The copied node original study") @RequestParam(value = "sourceStudyUuid", required = false) UUID sourceStudyUuid,
@Parameter(description = "The node we want to copy") @RequestParam("nodeToCopyUuid") UUID nodeToCopyUuid,
@Parameter(description = "The reference node to where we want to paste") @RequestParam("referenceNodeUuid") UUID referenceNodeUuid,
- @Parameter(description = "The position where the node will be pasted relative to the reference node") @RequestParam(name = "insertMode") InsertMode insertMode,
+ @Parameter(description = "The position where the node will be pasted relative to the reference node")
+ @RequestParam(name = "insertMode") InsertMode insertMode,
@RequestHeader(HEADER_USER_ID) String userId) {
//if the source study is not set we assume it's the same as the target study
studyService.assertNoBlockedNodeInStudy(targetStudyUuid, referenceNodeUuid);
@@ -269,7 +270,8 @@ public ResponseEntity duplicateNode(@Parameter(description = "The study wh
public ResponseEntity cutAndPasteNode(@PathVariable("studyUuid") UUID studyUuid,
@Parameter(description = "The node we want to cut") @RequestParam("nodeToCutUuid") UUID nodeToCutUuid,
@Parameter(description = "The reference node to where we want to paste") @RequestParam("referenceNodeUuid") UUID referenceNodeUuid,
- @Parameter(description = "The position where the node will be pasted relative to the reference node") @RequestParam(name = "insertMode") InsertMode insertMode,
+ @Parameter(description = "The position where the node will be pasted relative to the reference node")
+ @RequestParam(name = "insertMode") InsertMode insertMode,
@RequestHeader(HEADER_USER_ID) String userId) {
studyService.assertNoBlockedNodeInStudy(studyUuid, nodeToCutUuid);
studyService.assertCanUpdateNodeInStudy(studyUuid, nodeToCutUuid);
@@ -355,9 +357,10 @@ public ResponseEntity cutAndPasteNodeSubtree(@PathVariable("studyUuid") UU
@ApiResponse(responseCode = "404", description = "The source study or subtree doesn't exist")})
public ResponseEntity duplicateSubtree(@Parameter(description = "The study where we want to copy the node") @PathVariable("studyUuid") UUID targetStudyUuid,
@Parameter(description = "The copied node original study") @RequestParam(value = "sourceStudyUuid") UUID sourceStudyUuid,
- @Parameter(description = "The parent node of the subtree we want to cut") @RequestParam("subtreeToCopyParentNodeUuid") UUID subtreeToCopyParentNodeUuid,
- @Parameter(description = "The reference node to where we want to paste") @RequestParam("referenceNodeUuid") UUID referenceNodeUuid,
- @RequestHeader(HEADER_USER_ID) String userId) {
+ @Parameter(description = "The parent node of the subtree we want to cut")
+ @RequestParam("subtreeToCopyParentNodeUuid") UUID subtreeToCopyParentNodeUuid,
+ @Parameter(description = "The reference node to where we want to paste") @RequestParam("referenceNodeUuid") UUID referenceNodeUuid,
+ @RequestHeader(HEADER_USER_ID) String userId) {
studyService.assertNoBlockedNodeInStudy(targetStudyUuid, referenceNodeUuid);
studyService.duplicateStudySubtree(sourceStudyUuid, targetStudyUuid, subtreeToCopyParentNodeUuid, referenceNodeUuid, userId);
return ResponseEntity.ok().build();
@@ -409,8 +412,10 @@ public ResponseEntity> getVoltageLevelBusesOrBusbarSecti
@PathVariable("rootNetworkUuid") UUID rootNetworkUuid,
@PathVariable("nodeUuid") UUID nodeUuid,
@PathVariable("voltageLevelId") String voltageLevelId,
- @Parameter(description = "Should get in upstream built node ?") @RequestParam(value = "inUpstreamBuiltParentNode", required = false, defaultValue = "false") boolean inUpstreamBuiltParentNode) {
- return ResponseEntity.ok().contentType(MediaType.APPLICATION_JSON).body(studyService.getVoltageLevelBusesOrBusbarSections(nodeUuid, rootNetworkUuid, voltageLevelId, inUpstreamBuiltParentNode));
+ @Parameter(description = "Should get in upstream built node ?") @RequestParam(value = "inUpstreamBuiltParentNode", required = false,
+ defaultValue = "false") boolean inUpstreamBuiltParentNode) {
+ return ResponseEntity.ok().contentType(MediaType.APPLICATION_JSON).body(studyService.getVoltageLevelBusesOrBusbarSections(nodeUuid, rootNetworkUuid, voltageLevelId,
+ inUpstreamBuiltParentNode));
}
@GetMapping(value = "/studies/{studyUuid}/root-networks/{rootNetworkUuid}/nodes/{nodeUuid}/network/voltage-levels/{voltageLevelId}/switches")
@@ -421,8 +426,10 @@ public ResponseEntity getVoltageLevelSwitches(
@PathVariable("rootNetworkUuid") UUID rootNetworkUuid,
@PathVariable("nodeUuid") UUID nodeUuid,
@PathVariable("voltageLevelId") String voltageLevelId,
- @Parameter(description = "Should get in upstream built node ?") @RequestParam(value = "inUpstreamBuiltParentNode", required = false, defaultValue = "false") boolean inUpstreamBuiltParentNode) {
- return ResponseEntity.ok().contentType(MediaType.APPLICATION_JSON).body(studyService.getVoltageLevelTopologyInfos(nodeUuid, rootNetworkUuid, voltageLevelId, inUpstreamBuiltParentNode, "switches"));
+ @Parameter(description = "Should get in upstream built node ?") @RequestParam(value = "inUpstreamBuiltParentNode", required = false,
+ defaultValue = "false") boolean inUpstreamBuiltParentNode) {
+ return ResponseEntity.ok().contentType(MediaType.APPLICATION_JSON).body(studyService.getVoltageLevelTopologyInfos(nodeUuid, rootNetworkUuid, voltageLevelId, inUpstreamBuiltParentNode,
+ "switches"));
}
@GetMapping(value = "/studies/{studyUuid}/root-networks/{rootNetworkUuid}/nodes/{nodeUuid}/network/voltage-levels/{voltageLevelId}/bus-bar-sections")
@@ -433,8 +440,10 @@ public ResponseEntity getVoltageLevelBusBarSections(
@PathVariable("rootNetworkUuid") UUID rootNetworkUuid,
@PathVariable("nodeUuid") UUID nodeUuid,
@PathVariable("voltageLevelId") String voltageLevelId,
- @Parameter(description = "Should get in upstream built node ?") @RequestParam(value = "inUpstreamBuiltParentNode", required = false, defaultValue = "false") boolean inUpstreamBuiltParentNode) {
- return ResponseEntity.ok().contentType(MediaType.APPLICATION_JSON).body(studyService.getVoltageLevelTopologyInfos(nodeUuid, rootNetworkUuid, voltageLevelId, inUpstreamBuiltParentNode, "bus-bar-sections"));
+ @Parameter(description = "Should get in upstream built node ?") @RequestParam(value = "inUpstreamBuiltParentNode", required = false,
+ defaultValue = "false") boolean inUpstreamBuiltParentNode) {
+ return ResponseEntity.ok().contentType(MediaType.APPLICATION_JSON).body(studyService.getVoltageLevelTopologyInfos(nodeUuid, rootNetworkUuid, voltageLevelId, inUpstreamBuiltParentNode,
+ "bus-bar-sections"));
}
@GetMapping(value = "/studies/{studyUuid}/root-networks/{rootNetworkUuid}/nodes/{nodeUuid}/network/voltage-levels/{voltageLevelId}/feeder-bays")
@@ -445,8 +454,10 @@ public ResponseEntity getVoltageLevelFeederBays(
@PathVariable("rootNetworkUuid") UUID rootNetworkUuid,
@PathVariable("nodeUuid") UUID nodeUuid,
@PathVariable("voltageLevelId") String voltageLevelId,
- @Parameter(description = "Should get in upstream built node ?") @RequestParam(value = "inUpstreamBuiltParentNode", required = false, defaultValue = "false") boolean inUpstreamBuiltParentNode) {
- return ResponseEntity.ok().contentType(MediaType.APPLICATION_JSON).body(studyService.getVoltageLevelTopologyInfos(nodeUuid, rootNetworkUuid, voltageLevelId, inUpstreamBuiltParentNode, "feeder-bays"));
+ @Parameter(description = "Should get in upstream built node ?") @RequestParam(value = "inUpstreamBuiltParentNode", required = false,
+ defaultValue = "false") boolean inUpstreamBuiltParentNode) {
+ return ResponseEntity.ok().contentType(MediaType.APPLICATION_JSON).body(studyService.getVoltageLevelTopologyInfos(nodeUuid, rootNetworkUuid, voltageLevelId, inUpstreamBuiltParentNode,
+ "feeder-bays"));
}
@GetMapping(value = "/studies/{studyUuid}/root-networks/{rootNetworkUuid}/nodes/{nodeUuid}/network/voltage-levels/{voltageLevelId}/substation-id")
@@ -457,7 +468,8 @@ public ResponseEntity getVoltageLevelSubstationId(
@Parameter(description = "Root network uuid") @PathVariable("rootNetworkUuid") UUID rootNetworkUuid,
@Parameter(description = "Node uuid") @PathVariable("nodeUuid") UUID nodeUuid,
@Parameter(description = "voltageLevelId") @PathVariable("voltageLevelId") String voltageLevelId,
- @Parameter(description = "Should get in upstream built node ?") @RequestParam(value = "inUpstreamBuiltParentNode", required = false, defaultValue = "false") boolean inUpstreamBuiltParentNode) {
+ @Parameter(description = "Should get in upstream built node ?") @RequestParam(value = "inUpstreamBuiltParentNode", required = false,
+ defaultValue = "false") boolean inUpstreamBuiltParentNode) {
return ResponseEntity.ok().body(studyService.getVoltageLevelSubstationId(studyUuid, nodeUuid, rootNetworkUuid, voltageLevelId, inUpstreamBuiltParentNode));
}
@@ -469,12 +481,14 @@ public ResponseEntity getHvdcLineShuntCompensators(
@PathVariable("rootNetworkUuid") UUID rootNetworkUuid,
@PathVariable("nodeUuid") UUID nodeUuid,
@PathVariable("hvdcId") String hvdcId,
- @Parameter(description = "Should get in upstream built node ?") @RequestParam(value = "inUpstreamBuiltParentNode", required = false, defaultValue = "false") boolean inUpstreamBuiltParentNode) {
+ @Parameter(description = "Should get in upstream built node ?") @RequestParam(value = "inUpstreamBuiltParentNode", required = false,
+ defaultValue = "false") boolean inUpstreamBuiltParentNode) {
String hvdcInfos = studyService.getHvdcLineShuntCompensators(nodeUuid, rootNetworkUuid, inUpstreamBuiltParentNode, hvdcId);
return ResponseEntity.ok().contentType(MediaType.APPLICATION_JSON).body(hvdcInfos);
}
- @PostMapping(value = "/studies/{studyUuid}/root-networks/{rootNetworkUuid}/nodes/{nodeUuid}/geo-data/lines", consumes = MediaType.APPLICATION_JSON_VALUE, produces = MediaType.APPLICATION_JSON_VALUE)
+ @PostMapping(value = "/studies/{studyUuid}/root-networks/{rootNetworkUuid}/nodes/{nodeUuid}/geo-data/lines", consumes = MediaType.APPLICATION_JSON_VALUE,
+ produces = MediaType.APPLICATION_JSON_VALUE)
@Operation(summary = "Get Network lines graphics")
@ApiResponses(value = {@ApiResponse(responseCode = "200", description = "The list of line graphics with the given ids, all otherwise")})
public ResponseEntity getLineGraphics(
@@ -485,7 +499,8 @@ public ResponseEntity getLineGraphics(
return ResponseEntity.ok().contentType(MediaType.APPLICATION_JSON).body(studyService.getLinesGraphics(rootNetworkService.getNetworkUuid(rootNetworkUuid), nodeUuid, rootNetworkUuid, linesIds));
}
- @PostMapping(value = "/studies/{studyUuid}/root-networks/{rootNetworkUuid}/nodes/{nodeUuid}/geo-data/substations", consumes = MediaType.APPLICATION_JSON_VALUE, produces = MediaType.APPLICATION_JSON_VALUE)
+ @PostMapping(value = "/studies/{studyUuid}/root-networks/{rootNetworkUuid}/nodes/{nodeUuid}/geo-data/substations", consumes = MediaType.APPLICATION_JSON_VALUE,
+ produces = MediaType.APPLICATION_JSON_VALUE)
@Operation(summary = "Get Network substations graphics")
@ApiResponses(value = {@ApiResponse(responseCode = "200", description = "The list of substation graphics with the given ids, all otherwise")})
public ResponseEntity getSubstationGraphics(
@@ -493,7 +508,8 @@ public ResponseEntity getSubstationGraphics(
@PathVariable("rootNetworkUuid") UUID rootNetworkUuid,
@PathVariable("nodeUuid") UUID nodeUuid,
@RequestBody(required = false) List substationsIds) {
- return ResponseEntity.ok().contentType(MediaType.APPLICATION_JSON).body(studyService.getSubstationsGraphics(rootNetworkService.getNetworkUuid(rootNetworkUuid), nodeUuid, rootNetworkUuid, substationsIds));
+ return ResponseEntity.ok().contentType(MediaType.APPLICATION_JSON).body(studyService.getSubstationsGraphics(rootNetworkService.getNetworkUuid(rootNetworkUuid), nodeUuid, rootNetworkUuid,
+ substationsIds));
}
@PostMapping(value = "/studies/{studyUuid}/root-networks/{rootNetworkUuid}/nodes/{nodeUuid}/network-map/equipments-ids")
@@ -504,11 +520,13 @@ public ResponseEntity getNetworkElementsIds(
@PathVariable("rootNetworkUuid") UUID rootNetworkUuid,
@PathVariable("nodeUuid") UUID nodeUuid,
@RequestBody(required = false) List substationsIds,
- @Parameter(description = "Should get in upstream built node ?") @RequestParam(value = "inUpstreamBuiltParentNode", required = false, defaultValue = "false") boolean inUpstreamBuiltParentNode,
+ @Parameter(description = "Should get in upstream built node ?") @RequestParam(value = "inUpstreamBuiltParentNode", required = false,
+ defaultValue = "false") boolean inUpstreamBuiltParentNode,
@Parameter(description = "equipment type") @RequestParam(name = "equipmentType") String equipmentType,
@Parameter(description = "Nominal Voltages") @RequestParam(name = "nominalVoltages", required = false) List nominalVoltages) {
- return ResponseEntity.ok().contentType(MediaType.APPLICATION_JSON).body(studyService.getNetworkElementsIds(nodeUuid, rootNetworkUuid, substationsIds, inUpstreamBuiltParentNode, equipmentType, nominalVoltages));
+ return ResponseEntity.ok().contentType(MediaType.APPLICATION_JSON).body(studyService.getNetworkElementsIds(nodeUuid, rootNetworkUuid, substationsIds, inUpstreamBuiltParentNode, equipmentType,
+ nominalVoltages));
}
@PostMapping(value = "/studies/{studyUuid}/root-networks/{rootNetworkUuid}/nodes/{nodeUuid}/network/elements")
@@ -525,7 +543,8 @@ public ResponseEntity getNetworkElementsInfos(
@RequestParam(value = "inUpstreamBuiltParentNode", required = false, defaultValue = "false") boolean inUpstreamBuiltParentNode,
@Parameter(description = "Nominal Voltages") @RequestParam(name = "nominalVoltages", required = false) List nominalVoltages) {
- return ResponseEntity.ok().contentType(MediaType.APPLICATION_JSON).body(studyService.getNetworkElementsInfos(studyUuid, nodeUuid, rootNetworkUuid, substationsIds, infoType, elementType, inUpstreamBuiltParentNode, nominalVoltages));
+ return ResponseEntity.ok().contentType(MediaType.APPLICATION_JSON).body(studyService.getNetworkElementsInfos(studyUuid, nodeUuid, rootNetworkUuid, substationsIds, infoType, elementType,
+ inUpstreamBuiltParentNode, nominalVoltages));
}
@PostMapping(value = "/studies/{studyUuid}/root-networks/{rootNetworkUuid}/nodes/{nodeUuid}/network/elements-by-global-filter")
@@ -555,9 +574,11 @@ public ResponseEntity getNetworkElementInfos(
@Parameter(description = "Node uuid") @PathVariable("nodeUuid") UUID nodeUuid,
@Parameter(description = "Element id") @PathVariable("elementId") String elementId,
@Parameter(description = "Element type") @RequestParam(name = "elementType") String elementType,
- @Parameter(description = "Should get in upstream built node ?") @RequestParam(value = "inUpstreamBuiltParentNode", required = false, defaultValue = "false") boolean inUpstreamBuiltParentNode,
+ @Parameter(description = "Should get in upstream built node ?") @RequestParam(value = "inUpstreamBuiltParentNode", required = false,
+ defaultValue = "false") boolean inUpstreamBuiltParentNode,
@Parameter(description = "Info type parameters") InfoTypeParameters infoTypeParameters) {
- return ResponseEntity.ok().contentType(MediaType.APPLICATION_JSON).body(studyService.getNetworkElementInfos(studyUuid, nodeUuid, rootNetworkUuid, elementType, infoTypeParameters, elementId, inUpstreamBuiltParentNode));
+ return ResponseEntity.ok().contentType(MediaType.APPLICATION_JSON).body(studyService.getNetworkElementInfos(studyUuid, nodeUuid, rootNetworkUuid, elementType, infoTypeParameters, elementId,
+ inUpstreamBuiltParentNode));
}
@GetMapping(value = "/studies/{studyUuid}/root-networks/{rootNetworkUuid}/nodes/{nodeUuid}/network-map/countries")
@@ -567,7 +588,8 @@ public ResponseEntity getNetworkCountries(
@Parameter(description = "Study uuid") @PathVariable("studyUuid") UUID studyUuid,
@Parameter(description = "Root network uuid") @PathVariable("rootNetworkUuid") UUID rootNetworkUuid,
@Parameter(description = "Node uuid") @PathVariable("nodeUuid") UUID nodeUuid,
- @Parameter(description = "Should get in upstream built node ?") @RequestParam(value = "inUpstreamBuiltParentNode", required = false, defaultValue = "false") boolean inUpstreamBuiltParentNode) {
+ @Parameter(description = "Should get in upstream built node ?") @RequestParam(value = "inUpstreamBuiltParentNode", required = false,
+ defaultValue = "false") boolean inUpstreamBuiltParentNode) {
return ResponseEntity.ok().contentType(MediaType.APPLICATION_JSON).body(studyService.getNetworkCountries(nodeUuid, rootNetworkUuid, inUpstreamBuiltParentNode));
}
@@ -579,14 +601,16 @@ public ResponseEntity getNetworkNominalVoltages(
@Parameter(description = "Study uuid") @PathVariable("studyUuid") UUID studyUuid,
@Parameter(description = "Root network uuid") @PathVariable("rootNetworkUuid") UUID rootNetworkUuid,
@Parameter(description = "Node uuid") @PathVariable("nodeUuid") UUID nodeUuid,
- @Parameter(description = "Should get in upstream built node ?") @RequestParam(value = "inUpstreamBuiltParentNode", required = false, defaultValue = "false") boolean inUpstreamBuiltParentNode) {
+ @Parameter(description = "Should get in upstream built node ?") @RequestParam(value = "inUpstreamBuiltParentNode", required = false,
+ defaultValue = "false") boolean inUpstreamBuiltParentNode) {
return ResponseEntity.ok().contentType(MediaType.APPLICATION_JSON).body(studyService.getNetworkNominalVoltages(nodeUuid, rootNetworkUuid, inUpstreamBuiltParentNode));
}
@GetMapping(value = "/studies/{studyUuid}/root-networks/{rootNetworkUuid}/nodes/{nodeUuid}/network-map/branch-or-3wt/{equipmentId}/voltage-level-id")
@Operation(summary = "Get Voltage level ID for a specific line or 2WT or 3WT and a given side")
- @ApiResponses(value = {@ApiResponse(responseCode = "200", description = "The voltage level id attached to line or 2WT or 3WT"), @ApiResponse(responseCode = "204", description = "No voltageLevel ID found")})
+ @ApiResponses(value = {@ApiResponse(responseCode = "200", description = "The voltage level id attached to line or 2WT or 3WT"), @ApiResponse(responseCode = "204",
+ description = "No voltageLevel ID found")})
public ResponseEntity getBranchOr3WTVoltageLevelId(
@PathVariable("studyUuid") UUID studyUuid,
@PathVariable("rootNetworkUuid") UUID rootNetworkUuid,
@@ -606,7 +630,8 @@ public ResponseEntity getVoltageLevelEquipments(
@PathVariable("rootNetworkUuid") UUID rootNetworkUuid,
@PathVariable("nodeUuid") UUID nodeUuid,
@Parameter(description = "voltage level id") @PathVariable("voltageLevelId") String voltageLevelId,
- @Parameter(description = "Should get in upstream built node ?") @RequestParam(value = "inUpstreamBuiltParentNode", required = false, defaultValue = "false") boolean inUpstreamBuiltParentNode) {
+ @Parameter(description = "Should get in upstream built node ?") @RequestParam(value = "inUpstreamBuiltParentNode", required = false,
+ defaultValue = "false") boolean inUpstreamBuiltParentNode) {
return ResponseEntity.ok().contentType(MediaType.APPLICATION_JSON).body(studyService.getVoltageLevelEquipments(nodeUuid, rootNetworkUuid, inUpstreamBuiltParentNode, voltageLevelId));
}
@@ -719,7 +744,8 @@ public ResponseEntity insertCompositeModifications(@PathVariable("studyUui
return ResponseEntity.ok().build();
}
- private void handleInsertCompositeNetworkModifications(UUID targetStudyUuid, UUID targetNodeUuid, List> modificationsToCopy, String userId, CompositeModificationsActionType action) {
+ private void handleInsertCompositeNetworkModifications(UUID targetStudyUuid, UUID targetNodeUuid, List> modificationsToCopy, String userId,
+ CompositeModificationsActionType action) {
studyService.assertNoBlockedNodeInStudy(targetStudyUuid, targetNodeUuid);
studyService.invalidateNodeTreeWithLF(targetStudyUuid, targetNodeUuid);
try {
@@ -877,7 +903,8 @@ public ResponseEntity getShortCircuitResult(@Parameter(description = "st
@Parameter(description = "type") @RequestParam(value = "type", required = false, defaultValue = "ALL_BUSES") ShortcircuitAnalysisType type,
@Parameter(description = "JSON array of filters") @RequestParam(name = "filters", required = false) String filters,
@Parameter(description = "JSON array of global filters") @RequestParam(name = "globalFilters", required = false) String globalFilters,
- @Parameter(description = "If we wanted the paged version of the results or not") @RequestParam(name = "paged", required = false, defaultValue = "false") boolean paged,
+ @Parameter(description = "If we wanted the paged version of the results or not") @RequestParam(name = "paged", required = false,
+ defaultValue = "false") boolean paged,
Pageable pageable) {
String result = rootNetworkNodeInfoService.getShortCircuitAnalysisResult(new ResultParameters(rootNetworkUuid, nodeUuid), mode, type, filters, globalFilters, paged, pageable);
return result != null ? ResponseEntity.ok().body(result) :
@@ -892,7 +919,8 @@ public ResponseEntity getShortCircuitResult(@Parameter(description = "st
public ResponseEntity getShortCircuitAnalysisStatus(@Parameter(description = "Study UUID") @PathVariable("studyUuid") UUID studyUuid,
@PathVariable("rootNetworkUuid") UUID rootNetworkUuid,
@Parameter(description = "nodeUuid") @PathVariable("nodeUuid") UUID nodeUuid,
- @Parameter(description = "type") @RequestParam(value = "type", required = false, defaultValue = "ALL_BUSES") ShortcircuitAnalysisType type) {
+ @Parameter(description = "type") @RequestParam(value = "type", required = false,
+ defaultValue = "ALL_BUSES") ShortcircuitAnalysisType type) {
String result = rootNetworkNodeInfoService.getShortCircuitAnalysisStatus(nodeUuid, rootNetworkUuid, type);
return result != null ? ResponseEntity.ok().body(result) :
ResponseEntity.noContent().build();
@@ -1111,8 +1139,10 @@ public byte[] getSecurityAnalysisResult(@Parameter(description = "study UUID") @
public ResponseEntity getContingencyCount(@Parameter(description = "Study UUID") @PathVariable("studyUuid") UUID studyUuid,
@Parameter(description = "rootNetworkUuid") @PathVariable("rootNetworkUuid") UUID rootNetworkUuid,
@Parameter(description = "Node UUID") @PathVariable("nodeUuid") UUID nodeUuid,
- @Parameter(description = "Contingency list UUIDs") @RequestParam(name = "contingencyListIds", required = false) List contingencyListIds) {
- return ResponseEntity.ok().body(CollectionUtils.isEmpty(contingencyListIds) ? ActionsService.EMPTY_CONTINGENCY_COUNT : studyService.getContingencyCount(studyUuid, contingencyListIds, nodeUuid, rootNetworkUuid));
+ @Parameter(description = "Contingency list UUIDs") @RequestParam(name = "contingencyListIds",
+ required = false) List contingencyListIds) {
+ return ResponseEntity.ok().body(CollectionUtils.isEmpty(contingencyListIds) ? ActionsService.EMPTY_CONTINGENCY_COUNT : studyService.getContingencyCount(studyUuid, contingencyListIds, nodeUuid,
+ rootNetworkUuid));
}
@GetMapping(value = "/studies/{studyUuid}/root-networks/{rootNetworkUuid}/nodes/{nodeUuid}/limit-violations")
@@ -1280,7 +1310,8 @@ public ResponseEntity stopSecurityAnalysis(@Parameter(description = "Study
public ResponseEntity> getParentNodesReport(@Parameter(description = "Study uuid") @PathVariable("studyUuid") UUID studyUuid,
@Parameter(description = "Root network uuid") @PathVariable("rootNetworkUuid") UUID rootNetworkUuid,
@Parameter(description = "Node uuid") @PathVariable("nodeUuid") UUID nodeUuid,
- @Parameter(description = "Node only report") @RequestParam(value = "nodeOnlyReport", required = false, defaultValue = "true") boolean nodeOnlyReport,
+ @Parameter(description = "Node only report") @RequestParam(value = "nodeOnlyReport", required = false,
+ defaultValue = "true") boolean nodeOnlyReport,
@Parameter(description = "The report Type") @RequestParam(name = "reportType") StudyService.ReportType reportType,
@Parameter(description = "Severity levels") @RequestParam(name = "severityLevels", required = false) Set severityLevels) {
studyService.assertIsStudyAndNodeExist(studyUuid, nodeUuid);
@@ -1289,14 +1320,17 @@ public ResponseEntity> getParentNodesReport(@Parameter(description
@GetMapping(value = "/studies/{studyUuid}/root-networks/{rootNetworkUuid}/nodes/{nodeUuid}/report/logs", produces = MediaType.APPLICATION_JSON_VALUE)
@Operation(summary = "Get the report logs of the given node and all its parents")
- @ApiResponses(value = {@ApiResponse(responseCode = "200", description = "The report logs of the node and all its parent"), @ApiResponse(responseCode = "404", description = "The study/node is not found")})
+ @ApiResponses(value = {@ApiResponse(responseCode = "200", description = "The report logs of the node and all its parent"), @ApiResponse(responseCode = "404",
+ description = "The study/node is not found")})
public ResponseEntity getReportLogs(@Parameter(description = "Study uuid") @PathVariable("studyUuid") UUID studyUuid,
@Parameter(description = "root network id") @PathVariable("rootNetworkUuid") UUID rootNetworkUuid,
@Parameter(description = "node id") @PathVariable("nodeUuid") UUID nodeUuid,
@Parameter(description = "report id") @RequestParam(name = "reportId", required = false) UUID reportId,
@Parameter(description = "The message filter") @RequestParam(name = "message", required = false) String messageFilter,
- @Parameter(description = "Severity levels filter") @RequestParam(name = "severityLevels", required = false) Set severityLevels,
- @Parameter(description = "If we wanted the paged version of the results or not") @RequestParam(name = "paged", required = false, defaultValue = "false") boolean paged,
+ @Parameter(description = "Severity levels filter") @RequestParam(name = "severityLevels",
+ required = false) Set severityLevels,
+ @Parameter(description = "If we wanted the paged version of the results or not") @RequestParam(name = "paged", required = false,
+ defaultValue = "false") boolean paged,
Pageable pageable) {
studyService.assertIsStudyAndNodeExist(studyUuid, nodeUuid);
rootNetworkService.assertIsRootNetworkInStudy(studyUuid, rootNetworkUuid);
@@ -1327,7 +1361,8 @@ public ResponseEntity getSearchTermMatchesInFilteredLogs(
@GetMapping(value = "/studies/{studyUuid}/root-networks/{rootNetworkUuid}/nodes/{nodeUuid}/report/aggregated-severities", produces = MediaType.APPLICATION_JSON_VALUE)
@Operation(summary = "Get the report severities of the given node and all its parents")
- @ApiResponses(value = {@ApiResponse(responseCode = "200", description = "The report severities of the node and all its parent"), @ApiResponse(responseCode = "404", description = "The study/node is not found")})
+ @ApiResponses(value = {@ApiResponse(responseCode = "200", description = "The report severities of the node and all its parent"), @ApiResponse(responseCode = "404",
+ description = "The study/node is not found")})
public ResponseEntity> getParentNodesAggregatedReportSeverities(@Parameter(description = "Study uuid") @PathVariable("studyUuid") UUID studyUuid,
@Parameter(description = "root network id") @PathVariable("rootNetworkUuid") UUID rootNetworkUuid,
@Parameter(description = "node id") @PathVariable("nodeUuid") UUID nodeUuid,
@@ -1351,14 +1386,16 @@ public ResponseEntity> getAvailableSvgComponentLibraries() {
public ResponseEntity getNetworkModifications(@Parameter(description = "Study UUID") @PathVariable("studyUuid") UUID studyUuid,
@Parameter(description = "Node UUID") @PathVariable("nodeUuid") UUID nodeUuid,
@RequestParam(name = "onlyStashed", required = false, defaultValue = "false") Boolean onlyStashed,
- @Parameter(description = "Only metadata") @RequestParam(name = "onlyMetadata", required = false, defaultValue = "false") Boolean onlyMetadata) {
+ @Parameter(description = "Only metadata") @RequestParam(name = "onlyMetadata", required = false,
+ defaultValue = "false") Boolean onlyMetadata) {
studyService.assertIsStudyAndNodeExist(studyUuid, nodeUuid);
return ResponseEntity.ok().contentType(MediaType.TEXT_PLAIN).body(networkModificationTreeService.getNetworkModifications(nodeUuid, onlyStashed, onlyMetadata));
}
@GetMapping(value = "/studies/{studyUuid}/nodes/{nodeUuid}/network-modifications/export", produces = MediaType.APPLICATION_JSON_VALUE)
@Operation(summary = "Get network modifications to export for a given node")
- @ApiResponses(value = {@ApiResponse(responseCode = "200", description = "The network modifications to export was returned"), @ApiResponse(responseCode = "404", description = "The study/node is not found")})
+ @ApiResponses(value = {@ApiResponse(responseCode = "200", description = "The network modifications to export was returned"), @ApiResponse(responseCode = "404",
+ description = "The study/node is not found")})
public ResponseEntity getExportedNetworkModifications(@Parameter(description = "Study UUID") @PathVariable("studyUuid") UUID studyUuid,
@Parameter(description = "Node UUID") @PathVariable("nodeUuid") UUID nodeUuid) {
studyService.assertIsStudyAndNodeExist(studyUuid, nodeUuid);
@@ -1367,8 +1404,9 @@ public ResponseEntity getExportedNetworkModifications(@Parameter(descrip
@GetMapping(value = "/studies/{studyUuid}/nodes/{nodeUuid}/excluded-network-modifications", produces = MediaType.APPLICATION_JSON_VALUE)
@Operation(summary = "Get excluded network modifications from a node")
- @ApiResponses(value = {@ApiResponse(responseCode = "200", description = "The excluded network modifications were returned"), @ApiResponse(responseCode = "404", description = "The study/node is not found")})
- public ResponseEntity< List> getNetworkModificationsToExclude(@Parameter(description = "Study UUID") @PathVariable("studyUuid") UUID studyUuid,
+ @ApiResponses(value = {@ApiResponse(responseCode = "200", description = "The excluded network modifications were returned"), @ApiResponse(responseCode = "404",
+ description = "The study/node is not found")})
+ public ResponseEntity> getNetworkModificationsToExclude(@Parameter(description = "Study UUID") @PathVariable("studyUuid") UUID studyUuid,
@Parameter(description = "Node UUID") @PathVariable("nodeUuid") UUID nodeUuid) {
studyService.assertIsStudyAndNodeExist(studyUuid, nodeUuid);
@@ -1417,7 +1455,8 @@ public ResponseEntity deleteNetworkModifications(@Parameter(description =
@PutMapping(value = "/studies/{studyUuid}/nodes/{nodeUuid}/network-modifications", params = "stashed")
@Operation(summary = "Stash network modifications for a node")
- @ApiResponses(value = {@ApiResponse(responseCode = "200", description = "The network modifications were stashed / restored "), @ApiResponse(responseCode = "404", description = "The study/node is not found")})
+ @ApiResponses(value = {@ApiResponse(responseCode = "200", description = "The network modifications were stashed / restored "), @ApiResponse(responseCode = "404",
+ description = "The study/node is not found")})
public ResponseEntity stashNetworkModifications(@Parameter(description = "Study UUID") @PathVariable("studyUuid") UUID studyUuid,
@Parameter(description = "Node UUID") @PathVariable("nodeUuid") UUID nodeUuid,
@Parameter(description = "Network modification UUIDs") @RequestParam("uuids") List networkModificationUuids,
@@ -1435,7 +1474,8 @@ public ResponseEntity stashNetworkModifications(@Parameter(description = "
@PutMapping(value = "/studies/{studyUuid}/nodes/{nodeUuid}/network-modifications")
@Operation(summary = "Updates the metadata of a network modification")
- @ApiResponses(value = {@ApiResponse(responseCode = "200", description = "Update the metadata of a network modification"), @ApiResponse(responseCode = "404", description = "The study/node is not found")})
+ @ApiResponses(value = {@ApiResponse(responseCode = "200", description = "Update the metadata of a network modification"), @ApiResponse(responseCode = "404",
+ description = "The study/node is not found")})
public ResponseEntity updateNetworkModificationsMetadata(@Parameter(description = "Study UUID") @PathVariable("studyUuid") UUID studyUuid,
@Parameter(description = "Node UUID") @PathVariable("nodeUuid") UUID nodeUuid,
@Parameter(description = "Network modification UUIDs") @RequestParam("uuids") List networkModificationUuids,
@@ -1449,7 +1489,8 @@ public ResponseEntity updateNetworkModificationsMetadata(@Parameter(descri
@PutMapping(value = "/studies/{studyUuid}/root-networks/{rootNetworkUuid}/nodes/{nodeUuid}/network-modifications", params = "activated")
@Operation(summary = "Update 'activated' value for a network modifications for a node in a specific root network")
- @ApiResponses(value = {@ApiResponse(responseCode = "200", description = "Update the activation status for network modifications on a node in a specific root network"), @ApiResponse(responseCode = "404", description = "The study/root network/node is not found")})
+ @ApiResponses(value = {@ApiResponse(responseCode = "200", description = "Update the activation status for network modifications on a node in a specific root network"),
+ @ApiResponse(responseCode = "404", description = "The study/root network/node is not found")})
public ResponseEntity updateNetworkModificationsActivation(@Parameter(description = "Study UUID") @PathVariable("studyUuid") UUID studyUuid,
@Parameter(description = "Root network UUID") @PathVariable("rootNetworkUuid") UUID rootNetworkUuid,
@Parameter(description = "Node UUID") @PathVariable("nodeUuid") UUID nodeUuid,
@@ -1512,7 +1553,8 @@ public ResponseEntity> searchModifications
public ResponseEntity createNode(@RequestBody NetworkModificationNode node,
@Parameter(description = "study uuid") @PathVariable("studyUuid") UUID studyUuid,
@Parameter(description = "parent id of the node created") @PathVariable(name = "id") UUID referenceId,
- @Parameter(description = "node is inserted before the given node ID") @RequestParam(name = "mode", required = false, defaultValue = "CHILD") InsertMode insertMode,
+ @Parameter(description = "node is inserted before the given node ID") @RequestParam(name = "mode", required = false,
+ defaultValue = "CHILD") InsertMode insertMode,
@RequestHeader(HEADER_USER_ID) String userId) {
NetworkModificationNode newNode = studyService.createNode(studyUuid, referenceId, node, insertMode, userId);
@@ -1750,7 +1792,8 @@ public ResponseEntity notify(@PathVariable("studyUuid") UUID studyUuid) {
@PostMapping(value = "/studies/{studyUuid}/root-networks/{rootNetworkUuid}/nodes/{nodeUuid}/sensitivity-analysis/run")
@Operation(summary = "run sensitivity analysis on study")
- @ApiResponses(value = {@ApiResponse(responseCode = "200", description = "The sensitivity analysis has started"), @ApiResponse(responseCode = "403", description = "The study node is not a model node")})
+ @ApiResponses(value = {@ApiResponse(responseCode = "200", description = "The sensitivity analysis has started"), @ApiResponse(responseCode = "403",
+ description = "The study node is not a model node")})
public ResponseEntity runSensitivityAnalysis(@Parameter(description = "studyUuid") @PathVariable("studyUuid") UUID studyUuid,
@Parameter(description = "rootNetworkUuid") @PathVariable("rootNetworkUuid") UUID rootNetworkUuid,
@Parameter(description = "nodeUuid") @PathVariable("nodeUuid") UUID nodeUuid,
@@ -1963,7 +2006,8 @@ public ResponseEntity> getDynamicSimulationTimeSer
public ResponseEntity> getDynamicSimulationTimeSeriesResult(@Parameter(description = "study UUID") @PathVariable("studyUuid") UUID studyUuid,
@Parameter(description = "rootNetworkUuid") @PathVariable("rootNetworkUuid") UUID rootNetworkUuid,
@Parameter(description = "nodeUuid") @PathVariable("nodeUuid") UUID nodeUuid,
- @Parameter(description = "timeSeriesNames") @RequestParam(name = "timeSeriesNames", required = false) List timeSeriesNames) {
+ @Parameter(description = "timeSeriesNames") @RequestParam(name = "timeSeriesNames",
+ required = false) List timeSeriesNames) {
List result = rootNetworkNodeInfoService.getDynamicSimulationTimeSeries(nodeUuid, rootNetworkUuid, timeSeriesNames);
return CollectionUtils.isEmpty(result) ? ResponseEntity.noContent().build() :
ResponseEntity.ok().contentType(MediaType.APPLICATION_JSON).body(result);
@@ -2119,7 +2163,8 @@ public ResponseEntity setSecurityAnalysisParametersValues(
@GetMapping(value = "/studies/{studyUuid}/root-networks/{rootNetworkUuid}/nodes/{nodeUuid}/network-modifications/voltage-init", produces = MediaType.APPLICATION_JSON_VALUE)
@Operation(summary = "Get the voltage init modifications from a node")
- @ApiResponses(value = {@ApiResponse(responseCode = "200", description = "The voltage init modifications was returned"), @ApiResponse(responseCode = "404", description = "The study/node is not found, or has no voltage init result")})
+ @ApiResponses(value = {@ApiResponse(responseCode = "200", description = "The voltage init modifications was returned"), @ApiResponse(responseCode = "404",
+ description = "The study/node is not found, or has no voltage init result")})
public ResponseEntity getVoltageInitModifications(@Parameter(description = "Study UUID") @PathVariable("studyUuid") UUID studyUuid,
@Parameter(description = "rootNetworkUuid") @PathVariable("rootNetworkUuid") UUID rootNetworkUuid,
@Parameter(description = "Node UUID") @PathVariable("nodeUuid") UUID nodeUuid) {
@@ -2170,7 +2215,7 @@ public ResponseEntity> getOptionalServices() {
static class MyEnumConverter> extends PropertyEditorSupport {
private final Class enumClass;
- public MyEnumConverter(Class enumClass) {
+ MyEnumConverter(Class enumClass) {
this.enumClass = enumClass;
}
@@ -2188,7 +2233,7 @@ public void setAsText(final String text) throws IllegalArgumentException {
static class MyModificationTypeConverter extends PropertyEditorSupport {
- public MyModificationTypeConverter() {
+ MyModificationTypeConverter() {
super();
}
@@ -2266,7 +2311,8 @@ public ResponseEntity evaluateFilter(
@Parameter(description = "Study uuid") @PathVariable("studyUuid") UUID studyUuid,
@Parameter(description = "Root network uuid") @PathVariable("rootNetworkUuid") UUID rootNetworkUuid,
@Parameter(description = "Node uuid") @PathVariable("nodeUuid") UUID nodeUuid,
- @Parameter(description = "Should get in upstream built node ?") @RequestParam(value = "inUpstreamBuiltParentNode", required = false, defaultValue = "false") boolean inUpstreamBuiltParentNode,
+ @Parameter(description = "Should get in upstream built node ?") @RequestParam(value = "inUpstreamBuiltParentNode", required = false,
+ defaultValue = "false") boolean inUpstreamBuiltParentNode,
@RequestBody String filter) {
return ResponseEntity.ok().contentType(MediaType.APPLICATION_JSON).body(studyService.evaluateFilter(nodeUuid, rootNetworkUuid, inUpstreamBuiltParentNode, filter));
}
@@ -2324,7 +2370,8 @@ public ResponseEntity exportFilters(
@Parameter(description = "Root network uuid") @PathVariable("rootNetworkUuid") UUID rootNetworkUuid,
@Parameter(description = "nodeUuid") @PathVariable("nodeUuid") UUID nodeUuid,
@Parameter(description = "Filters uuid to be resolved") @RequestParam("filtersUuid") List filtersUuid,
- @Parameter(description = "Should get in upstream built node ?") @RequestParam(value = "inUpstreamBuiltParentNode", required = false, defaultValue = "false") boolean inUpstreamBuiltParentNode) {
+ @Parameter(description = "Should get in upstream built node ?") @RequestParam(value = "inUpstreamBuiltParentNode", required = false,
+ defaultValue = "false") boolean inUpstreamBuiltParentNode) {
return ResponseEntity.ok().contentType(MediaType.APPLICATION_JSON).body(studyService.exportFilters(rootNetworkUuid, filtersUuid, nodeUuid, inUpstreamBuiltParentNode));
}
diff --git a/src/main/java/org/gridsuite/study/server/controller/SupervisionController.java b/src/main/java/org/gridsuite/study/server/controller/SupervisionController.java
index 5219d1b904..329c028fcc 100644
--- a/src/main/java/org/gridsuite/study/server/controller/SupervisionController.java
+++ b/src/main/java/org/gridsuite/study/server/controller/SupervisionController.java
@@ -44,7 +44,8 @@ public class SupervisionController {
private final RestClient restClient;
- public SupervisionController(SupervisionService supervisionService, StudyService studyService, RootNetworkService rootNetworkService, EquipmentInfosService equipmentInfosService, RestClient restClient) {
+ public SupervisionController(SupervisionService supervisionService, StudyService studyService, RootNetworkService rootNetworkService, EquipmentInfosService equipmentInfosService, RestClient
+ restClient) {
this.supervisionService = supervisionService;
this.studyService = studyService;
this.rootNetworkService = rootNetworkService;
diff --git a/src/main/java/org/gridsuite/study/server/dto/CaseInfos.java b/src/main/java/org/gridsuite/study/server/dto/CaseInfos.java
index b2582f074d..b902846e8f 100644
--- a/src/main/java/org/gridsuite/study/server/dto/CaseInfos.java
+++ b/src/main/java/org/gridsuite/study/server/dto/CaseInfos.java
@@ -14,7 +14,7 @@
import java.util.UUID;
/**
- * @author Slimane amar
*/
@AllArgsConstructor
@NoArgsConstructor
diff --git a/src/main/java/org/gridsuite/study/server/dto/CreatedStudyBasicInfos.java b/src/main/java/org/gridsuite/study/server/dto/CreatedStudyBasicInfos.java
index b49d7c0c68..520b16285b 100644
--- a/src/main/java/org/gridsuite/study/server/dto/CreatedStudyBasicInfos.java
+++ b/src/main/java/org/gridsuite/study/server/dto/CreatedStudyBasicInfos.java
@@ -9,12 +9,10 @@
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;
import lombok.experimental.SuperBuilder;
-
import org.gridsuite.study.server.elasticsearch.ESConfig;
import org.springframework.data.annotation.TypeAlias;
import org.springframework.data.elasticsearch.annotations.Document;
-
/**
* @author Chamseddine Benhamed
* @author Slimane Amar
diff --git a/src/main/java/org/gridsuite/study/server/dto/InvalidateNodeTreeParameters.java b/src/main/java/org/gridsuite/study/server/dto/InvalidateNodeTreeParameters.java
index 7478123792..15f119ffcc 100644
--- a/src/main/java/org/gridsuite/study/server/dto/InvalidateNodeTreeParameters.java
+++ b/src/main/java/org/gridsuite/study/server/dto/InvalidateNodeTreeParameters.java
@@ -10,7 +10,7 @@
import lombok.Builder;
/**
- * @author Slimane amar
*/
@Schema(description = "Invalidation node parameters")
@Builder
@@ -20,8 +20,11 @@ public record InvalidateNodeTreeParameters(
ComputationsInvalidationMode computationsInvalidationMode // Only for the first node (root node)
) {
public static InvalidateNodeTreeParameters ALL = new InvalidateNodeTreeParameters(InvalidationMode.ALL, false, ComputationsInvalidationMode.ALL);
+ @SuppressWarnings("checkstyle:AbbreviationAsWordInName")
public static InvalidateNodeTreeParameters ALL_WITH_BLOCK_NODES = new InvalidateNodeTreeParameters(InvalidationMode.ALL, true, ComputationsInvalidationMode.ALL);
+ @SuppressWarnings("checkstyle:AbbreviationAsWordInName")
public static InvalidateNodeTreeParameters ONLY_CHILDREN = new InvalidateNodeTreeParameters(InvalidationMode.ONLY_CHILDREN, false, ComputationsInvalidationMode.ALL);
+ @SuppressWarnings("checkstyle:AbbreviationAsWordInName")
public static InvalidateNodeTreeParameters ONLY_CHILDREN_BUILD_STATUS = new InvalidateNodeTreeParameters(InvalidationMode.ONLY_CHILDREN_BUILD_STATUS, false, ComputationsInvalidationMode.ALL);
public enum InvalidationMode {
diff --git a/src/main/java/org/gridsuite/study/server/dto/LoadFlowParametersInfos.java b/src/main/java/org/gridsuite/study/server/dto/LoadFlowParametersInfos.java
index 6c85be11c2..66f53b6e64 100644
--- a/src/main/java/org/gridsuite/study/server/dto/LoadFlowParametersInfos.java
+++ b/src/main/java/org/gridsuite/study/server/dto/LoadFlowParametersInfos.java
@@ -13,7 +13,7 @@
import java.util.Map;
/**
- * @author David Braquart
+ * @author David Braquart
*/
@Getter
@AllArgsConstructor
@@ -31,5 +31,4 @@ public class LoadFlowParametersInfos {
private List limitReductions;
-
}
diff --git a/src/main/java/org/gridsuite/study/server/dto/UserProfileInfos.java b/src/main/java/org/gridsuite/study/server/dto/UserProfileInfos.java
index ca5f10ca6c..d5136b2922 100644
--- a/src/main/java/org/gridsuite/study/server/dto/UserProfileInfos.java
+++ b/src/main/java/org/gridsuite/study/server/dto/UserProfileInfos.java
@@ -14,7 +14,7 @@
import java.util.UUID;
/**
- * @author David Braquart
+ * @author David Braquart
*/
@Getter
@AllArgsConstructor
diff --git a/src/main/java/org/gridsuite/study/server/dto/caseimport/CaseImportReceiver.java b/src/main/java/org/gridsuite/study/server/dto/caseimport/CaseImportReceiver.java
index 6d6b3d3a5e..a9ca608ed1 100644
--- a/src/main/java/org/gridsuite/study/server/dto/caseimport/CaseImportReceiver.java
+++ b/src/main/java/org/gridsuite/study/server/dto/caseimport/CaseImportReceiver.java
@@ -11,11 +11,10 @@
* @author Kevin Le Saulnier
*/
-import java.util.UUID;
-
import lombok.AllArgsConstructor;
import lombok.Getter;
import lombok.NoArgsConstructor;
+import java.util.UUID;
@Getter
@AllArgsConstructor
diff --git a/src/main/java/org/gridsuite/study/server/dto/elasticsearch/EquipmentInfos.java b/src/main/java/org/gridsuite/study/server/dto/elasticsearch/EquipmentInfos.java
index dc3ff7af2c..10f6e7f515 100644
--- a/src/main/java/org/gridsuite/study/server/dto/elasticsearch/EquipmentInfos.java
+++ b/src/main/java/org/gridsuite/study/server/dto/elasticsearch/EquipmentInfos.java
@@ -9,7 +9,6 @@
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;
import lombok.experimental.SuperBuilder;
-
import org.gridsuite.study.server.dto.VoltageLevelInfos;
import org.gridsuite.study.server.elasticsearch.ESConfig;
import org.springframework.data.annotation.TypeAlias;
@@ -19,7 +18,6 @@
import org.springframework.data.elasticsearch.annotations.InnerField;
import org.springframework.data.elasticsearch.annotations.MultiField;
import org.springframework.data.elasticsearch.annotations.Setting;
-
import java.util.Set;
/**
diff --git a/src/main/java/org/gridsuite/study/server/dto/elasticsearch/TombstonedEquipmentInfos.java b/src/main/java/org/gridsuite/study/server/dto/elasticsearch/TombstonedEquipmentInfos.java
index a69341e60d..cede747cd1 100644
--- a/src/main/java/org/gridsuite/study/server/dto/elasticsearch/TombstonedEquipmentInfos.java
+++ b/src/main/java/org/gridsuite/study/server/dto/elasticsearch/TombstonedEquipmentInfos.java
@@ -9,7 +9,6 @@
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;
import lombok.experimental.SuperBuilder;
-
import org.gridsuite.study.server.elasticsearch.ESConfig;
import org.springframework.data.annotation.TypeAlias;
import org.springframework.data.elasticsearch.annotations.Document;
diff --git a/src/main/java/org/gridsuite/study/server/dto/impacts/AbstractBaseImpact.java b/src/main/java/org/gridsuite/study/server/dto/impacts/AbstractBaseImpact.java
index dca0c00cc9..a52059e68f 100644
--- a/src/main/java/org/gridsuite/study/server/dto/impacts/AbstractBaseImpact.java
+++ b/src/main/java/org/gridsuite/study/server/dto/impacts/AbstractBaseImpact.java
@@ -10,7 +10,6 @@
import com.fasterxml.jackson.annotation.JsonSubTypes;
import com.fasterxml.jackson.annotation.JsonTypeInfo;
import com.powsybl.iidm.network.IdentifiableType;
-
import lombok.*;
import lombok.experimental.SuperBuilder;
diff --git a/src/main/java/org/gridsuite/study/server/dto/impacts/SimpleElementImpact.java b/src/main/java/org/gridsuite/study/server/dto/impacts/SimpleElementImpact.java
index 180c36442e..303650aeee 100644
--- a/src/main/java/org/gridsuite/study/server/dto/impacts/SimpleElementImpact.java
+++ b/src/main/java/org/gridsuite/study/server/dto/impacts/SimpleElementImpact.java
@@ -6,13 +6,11 @@
*/
package org.gridsuite.study.server.dto.impacts;
+import com.fasterxml.jackson.annotation.JsonIgnore;
import lombok.*;
import lombok.experimental.SuperBuilder;
-
import java.util.Set;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-
/**
* This class describes an element type network impact
* This type of network impact only describes an individual impacted item and the list of associated substations
diff --git a/src/main/java/org/gridsuite/study/server/dto/modification/NetworkModificationResult.java b/src/main/java/org/gridsuite/study/server/dto/modification/NetworkModificationResult.java
index af2ed93a09..ea0bbdb119 100644
--- a/src/main/java/org/gridsuite/study/server/dto/modification/NetworkModificationResult.java
+++ b/src/main/java/org/gridsuite/study/server/dto/modification/NetworkModificationResult.java
@@ -8,12 +8,10 @@
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;
-
-import java.util.*;
-import java.util.stream.Collectors;
-
import org.gridsuite.study.server.dto.impacts.AbstractBaseImpact;
import org.gridsuite.study.server.dto.impacts.SimpleElementImpact;
+import java.util.*;
+import java.util.stream.Collectors;
/**
* @author Slimane Amar
diff --git a/src/main/java/org/gridsuite/study/server/dto/supervision/SupervisionStudyInfos.java b/src/main/java/org/gridsuite/study/server/dto/supervision/SupervisionStudyInfos.java
index 7da21414b2..a85600cdf0 100644
--- a/src/main/java/org/gridsuite/study/server/dto/supervision/SupervisionStudyInfos.java
+++ b/src/main/java/org/gridsuite/study/server/dto/supervision/SupervisionStudyInfos.java
@@ -21,7 +21,7 @@
/**
* More detailed version of {@code StudyInfos} used for supervision and admin tools operations.
*
- * @author Mathieu Deharbe
+ * @author Mathieu Deharbe
*/
@SuperBuilder
@NoArgsConstructor
diff --git a/src/main/java/org/gridsuite/study/server/elasticsearch/EquipmentInfosService.java b/src/main/java/org/gridsuite/study/server/elasticsearch/EquipmentInfosService.java
index 2c06b33b84..1b7f82aff0 100644
--- a/src/main/java/org/gridsuite/study/server/elasticsearch/EquipmentInfosService.java
+++ b/src/main/java/org/gridsuite/study/server/elasticsearch/EquipmentInfosService.java
@@ -11,9 +11,8 @@
import co.elastic.clients.elasticsearch._types.aggregations.Aggregation;
import co.elastic.clients.elasticsearch._types.query_dsl.*;
import co.elastic.clients.json.JsonData;
-import lombok.Getter;
-
import com.powsybl.iidm.network.VariantManagerConstants;
+import lombok.Getter;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.tuple.Pair;
import org.gridsuite.study.server.dto.elasticsearch.BasicEquipmentInfos;
@@ -29,12 +28,10 @@
import org.springframework.data.elasticsearch.core.SearchHits;
import org.springframework.lang.NonNull;
import org.springframework.stereotype.Service;
-
import java.util.*;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicReference;
import java.util.stream.Collectors;
-
import static java.util.Map.entry;
/**
@@ -99,7 +96,8 @@ public enum FieldSelector {
@Getter
private String tombstonedEquipmentsIndexName;
- public EquipmentInfosService(EquipmentInfosRepository equipmentInfosRepository, TombstonedEquipmentInfosRepository tombstonedEquipmentInfosRepository, ElasticsearchOperations elasticsearchOperations) {
+ public EquipmentInfosService(EquipmentInfosRepository equipmentInfosRepository, TombstonedEquipmentInfosRepository tombstonedEquipmentInfosRepository, ElasticsearchOperations
+ elasticsearchOperations) {
this.equipmentInfosRepository = equipmentInfosRepository;
this.tombstonedEquipmentInfosRepository = tombstonedEquipmentInfosRepository;
this.elasticsearchOperations = elasticsearchOperations;
@@ -313,7 +311,8 @@ private BoolQuery buildSearchEquipmentsQuery(String userInput, EquipmentInfosSer
TermQuery networkUuidSearchQuery = Queries.termQuery(NETWORK_UUID, networkUuid.toString());
TermsQuery variantIdSearchQuery = variantId.equals(VariantManagerConstants.INITIAL_VARIANT_ID) ?
new TermsQuery.Builder().field(VARIANT_ID).terms(new TermsQueryField.Builder().value(List.of(FieldValue.of(VariantManagerConstants.INITIAL_VARIANT_ID))).build()).build() :
- new TermsQuery.Builder().field(VARIANT_ID).terms(new TermsQueryField.Builder().value(List.of(FieldValue.of(VariantManagerConstants.INITIAL_VARIANT_ID), FieldValue.of(variantId))).build()).build();
+ new TermsQuery.Builder().field(VARIANT_ID).terms(new TermsQueryField.Builder().value(List.of(FieldValue.of(VariantManagerConstants.INITIAL_VARIANT_ID), FieldValue.of(
+ variantId))).build()).build();
BoolQuery.Builder boolQueryBuilder = new BoolQuery.Builder()
.filter(
@@ -405,7 +404,8 @@ private List cleanModifiedAndRemovedEquipments(UUID networkUuid,
return cleanRemovedEquipments(networkUuid, variantId, equipmentInfos);
}
- public List searchEquipments(@lombok.NonNull UUID networkUuid, @lombok.NonNull String variantId, @lombok.NonNull String userInput, @lombok.NonNull FieldSelector fieldSelector, String equipmentType) {
+ public List searchEquipments(@lombok.NonNull UUID networkUuid, @lombok.NonNull String variantId, @lombok.NonNull String userInput, @lombok.NonNull FieldSelector fieldSelector,
+ String equipmentType) {
String effectiveVariantId = variantId.isEmpty() ? VariantManagerConstants.INITIAL_VARIANT_ID : variantId;
BoolQuery query = buildSearchEquipmentsQuery(userInput, fieldSelector, networkUuid,
diff --git a/src/main/java/org/gridsuite/study/server/elasticsearch/StudyInfosService.java b/src/main/java/org/gridsuite/study/server/elasticsearch/StudyInfosService.java
index c6e5197caf..8eec8e989e 100644
--- a/src/main/java/org/gridsuite/study/server/elasticsearch/StudyInfosService.java
+++ b/src/main/java/org/gridsuite/study/server/elasticsearch/StudyInfosService.java
@@ -7,7 +7,6 @@
package org.gridsuite.study.server.elasticsearch;
import co.elastic.clients.elasticsearch._types.query_dsl.QueryStringQuery;
-
import org.gridsuite.study.server.dto.CreatedStudyBasicInfos;
import org.springframework.data.elasticsearch.client.elc.NativeQuery;
import org.springframework.data.elasticsearch.core.ElasticsearchOperations;
@@ -15,7 +14,6 @@
import org.springframework.data.elasticsearch.core.SearchHits;
import org.springframework.lang.NonNull;
import org.springframework.stereotype.Service;
-
import java.util.List;
import java.util.UUID;
import java.util.stream.Collectors;
diff --git a/src/main/java/org/gridsuite/study/server/error/RequestLoggingExceptionHandler.java b/src/main/java/org/gridsuite/study/server/error/RequestLoggingExceptionHandler.java
index e7c86510d1..7026137332 100644
--- a/src/main/java/org/gridsuite/study/server/error/RequestLoggingExceptionHandler.java
+++ b/src/main/java/org/gridsuite/study/server/error/RequestLoggingExceptionHandler.java
@@ -8,9 +8,6 @@
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
-import java.util.Map;
-import java.util.StringJoiner;
-
import lombok.NonNull;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -21,6 +18,8 @@
import org.springframework.web.method.annotation.MethodArgumentTypeMismatchException;
import org.springframework.web.servlet.HandlerExceptionResolver;
import org.springframework.web.servlet.ModelAndView;
+import java.util.Map;
+import java.util.StringJoiner;
/**
* @author Abdelsalem Hedhili
diff --git a/src/main/java/org/gridsuite/study/server/networkmodificationtree/dto/InsertMode.java b/src/main/java/org/gridsuite/study/server/networkmodificationtree/dto/InsertMode.java
index 687571eb53..16bf86ff25 100644
--- a/src/main/java/org/gridsuite/study/server/networkmodificationtree/dto/InsertMode.java
+++ b/src/main/java/org/gridsuite/study/server/networkmodificationtree/dto/InsertMode.java
@@ -8,10 +8,10 @@
package org.gridsuite.study.server.networkmodificationtree.dto;
/**
- * @author Jacques Borsenberger
*/
public enum InsertMode {
BEFORE,
AFTER,
- CHILD;
+ CHILD
}
diff --git a/src/main/java/org/gridsuite/study/server/networkmodificationtree/dto/RootNode.java b/src/main/java/org/gridsuite/study/server/networkmodificationtree/dto/RootNode.java
index d886292564..260acc06f8 100644
--- a/src/main/java/org/gridsuite/study/server/networkmodificationtree/dto/RootNode.java
+++ b/src/main/java/org/gridsuite/study/server/networkmodificationtree/dto/RootNode.java
@@ -7,13 +7,12 @@
package org.gridsuite.study.server.networkmodificationtree.dto;
import lombok.AllArgsConstructor;
+import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
-import lombok.EqualsAndHashCode;
import lombok.experimental.SuperBuilder;
import org.gridsuite.study.server.networkmodificationtree.entities.NodeType;
-
import java.util.UUID;
/**
diff --git a/src/main/java/org/gridsuite/study/server/networkmodificationtree/entities/NodeBuildStatusEmbeddable.java b/src/main/java/org/gridsuite/study/server/networkmodificationtree/entities/NodeBuildStatusEmbeddable.java
index 839fe22b04..1277fbd117 100644
--- a/src/main/java/org/gridsuite/study/server/networkmodificationtree/entities/NodeBuildStatusEmbeddable.java
+++ b/src/main/java/org/gridsuite/study/server/networkmodificationtree/entities/NodeBuildStatusEmbeddable.java
@@ -6,14 +6,13 @@
*/
package org.gridsuite.study.server.networkmodificationtree.entities;
-import lombok.*;
-import org.gridsuite.study.server.networkmodificationtree.dto.BuildStatus;
-import org.gridsuite.study.server.networkmodificationtree.dto.NodeBuildStatus;
-
import jakarta.persistence.Column;
import jakarta.persistence.Embeddable;
import jakarta.persistence.EnumType;
import jakarta.persistence.Enumerated;
+import lombok.*;
+import org.gridsuite.study.server.networkmodificationtree.dto.BuildStatus;
+import org.gridsuite.study.server.networkmodificationtree.dto.NodeBuildStatus;
/**
* @author Hugo Marcellin
diff --git a/src/main/java/org/gridsuite/study/server/networkmodificationtree/entities/RootNodeInfoEntity.java b/src/main/java/org/gridsuite/study/server/networkmodificationtree/entities/RootNodeInfoEntity.java
index 460b99c576..81c5990953 100644
--- a/src/main/java/org/gridsuite/study/server/networkmodificationtree/entities/RootNodeInfoEntity.java
+++ b/src/main/java/org/gridsuite/study/server/networkmodificationtree/entities/RootNodeInfoEntity.java
@@ -11,7 +11,6 @@
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
-
import lombok.experimental.SuperBuilder;
import org.gridsuite.study.server.networkmodificationtree.dto.RootNode;
diff --git a/src/main/java/org/gridsuite/study/server/notification/NotificationService.java b/src/main/java/org/gridsuite/study/server/notification/NotificationService.java
index 334be2d848..a57a004422 100644
--- a/src/main/java/org/gridsuite/study/server/notification/NotificationService.java
+++ b/src/main/java/org/gridsuite/study/server/notification/NotificationService.java
@@ -27,7 +27,7 @@
import java.util.*;
/**
- * @author Nicolas Noir
*/
@Service
public class NotificationService {
diff --git a/src/main/java/org/gridsuite/study/server/notification/dto/NetworkImpactsInfos.java b/src/main/java/org/gridsuite/study/server/notification/dto/NetworkImpactsInfos.java
index 6260b8cd1f..8866fd87a1 100644
--- a/src/main/java/org/gridsuite/study/server/notification/dto/NetworkImpactsInfos.java
+++ b/src/main/java/org/gridsuite/study/server/notification/dto/NetworkImpactsInfos.java
@@ -7,11 +7,9 @@
package org.gridsuite.study.server.notification.dto;
-import java.util.Set;
-
import com.fasterxml.jackson.annotation.JsonInclude;
-
import lombok.*;
+import java.util.Set;
@AllArgsConstructor
@Setter
diff --git a/src/main/java/org/gridsuite/study/server/repository/AbstractManuallyAssignedIdentifierEntity.java b/src/main/java/org/gridsuite/study/server/repository/AbstractManuallyAssignedIdentifierEntity.java
index a3249666d0..3103a027ad 100644
--- a/src/main/java/org/gridsuite/study/server/repository/AbstractManuallyAssignedIdentifierEntity.java
+++ b/src/main/java/org/gridsuite/study/server/repository/AbstractManuallyAssignedIdentifierEntity.java
@@ -10,7 +10,6 @@
import jakarta.persistence.PostLoad;
import jakarta.persistence.PrePersist;
import jakarta.persistence.Transient;
-
import lombok.NoArgsConstructor;
import lombok.experimental.SuperBuilder;
import org.springframework.data.domain.Persistable;
diff --git a/src/main/java/org/gridsuite/study/server/repository/NodeAliasEmbeddable.java b/src/main/java/org/gridsuite/study/server/repository/NodeAliasEmbeddable.java
index da1505d47f..961b8f3bfe 100644
--- a/src/main/java/org/gridsuite/study/server/repository/NodeAliasEmbeddable.java
+++ b/src/main/java/org/gridsuite/study/server/repository/NodeAliasEmbeddable.java
@@ -6,14 +6,13 @@
*/
package org.gridsuite.study.server.repository;
-import java.util.UUID;
-
import jakarta.persistence.Column;
import jakarta.persistence.Embeddable;
import lombok.AllArgsConstructor;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
+import java.util.UUID;
/**
* @author Franck Lecuyer
diff --git a/src/main/java/org/gridsuite/study/server/repository/StudyCreationRequestEntity.java b/src/main/java/org/gridsuite/study/server/repository/StudyCreationRequestEntity.java
index 082ae25416..a1709cbf3b 100644
--- a/src/main/java/org/gridsuite/study/server/repository/StudyCreationRequestEntity.java
+++ b/src/main/java/org/gridsuite/study/server/repository/StudyCreationRequestEntity.java
@@ -6,11 +6,9 @@
*/
package org.gridsuite.study.server.repository;
-import java.util.UUID;
-
-import lombok.*;
-
import jakarta.persistence.*;
+import lombok.*;
+import java.util.UUID;
/**
* @author Slimane Amar
diff --git a/src/main/java/org/gridsuite/study/server/repository/dynamicsimulation/entity/EventPropertyEntity.java b/src/main/java/org/gridsuite/study/server/repository/dynamicsimulation/entity/EventPropertyEntity.java
index e34204a11c..7f96b81d9e 100644
--- a/src/main/java/org/gridsuite/study/server/repository/dynamicsimulation/entity/EventPropertyEntity.java
+++ b/src/main/java/org/gridsuite/study/server/repository/dynamicsimulation/entity/EventPropertyEntity.java
@@ -6,13 +6,11 @@
*/
package org.gridsuite.study.server.repository.dynamicsimulation.entity;
+import jakarta.persistence.*;
import lombok.*;
import org.gridsuite.study.server.dto.dynamicsimulation.event.EventPropertyInfos;
import org.gridsuite.study.server.repository.AbstractManuallyAssignedIdentifierEntity;
import org.gridsuite.study.server.utils.PropertyType;
-
-import jakarta.persistence.*;
-
import java.io.Serializable;
import java.util.UUID;
diff --git a/src/main/java/org/gridsuite/study/server/repository/networkmodificationtree/NetworkModificationNodeInfoRepository.java b/src/main/java/org/gridsuite/study/server/repository/networkmodificationtree/NetworkModificationNodeInfoRepository.java
index 12bc076252..5f4dcf7556 100644
--- a/src/main/java/org/gridsuite/study/server/repository/networkmodificationtree/NetworkModificationNodeInfoRepository.java
+++ b/src/main/java/org/gridsuite/study/server/repository/networkmodificationtree/NetworkModificationNodeInfoRepository.java
@@ -16,7 +16,7 @@
import java.util.UUID;
/**
- * @author Jacques Borsenberger
*/
public interface NetworkModificationNodeInfoRepository extends NodeInfoRepository {
List findAllByNodeStudyIdAndName(UUID studyUuid, String name);
diff --git a/src/main/java/org/gridsuite/study/server/repository/networkmodificationtree/RootNodeInfoRepository.java b/src/main/java/org/gridsuite/study/server/repository/networkmodificationtree/RootNodeInfoRepository.java
index 017cd7e666..bd1233a280 100644
--- a/src/main/java/org/gridsuite/study/server/repository/networkmodificationtree/RootNodeInfoRepository.java
+++ b/src/main/java/org/gridsuite/study/server/repository/networkmodificationtree/RootNodeInfoRepository.java
@@ -10,7 +10,7 @@
import org.gridsuite.study.server.networkmodificationtree.entities.RootNodeInfoEntity;
/**
- * @author Jacques Borsenberger
*/
public interface RootNodeInfoRepository extends NodeInfoRepository {
}
diff --git a/src/main/java/org/gridsuite/study/server/service/ConsumerService.java b/src/main/java/org/gridsuite/study/server/service/ConsumerService.java
index a256da6fb8..c682995a97 100644
--- a/src/main/java/org/gridsuite/study/server/service/ConsumerService.java
+++ b/src/main/java/org/gridsuite/study/server/service/ConsumerService.java
@@ -126,6 +126,7 @@ private void handleBuildResultWorkflow(UUID studyUuid, UUID nodeUuid, UUID rootN
}
@Bean
+ @SuppressWarnings("checkstyle:LambdaBodyLength")
public Consumer> consumeBuildStopped() {
return message -> {
String receiver = message.getHeaders().get(HEADER_RECEIVER, String.class);
@@ -151,6 +152,7 @@ public Consumer> consumeBuildStopped() {
}
@Bean
+ @SuppressWarnings("checkstyle:LambdaBodyLength")
public Consumer> consumeBuildFailed() {
return message -> {
String receiver = message.getHeaders().get(HEADER_RECEIVER, String.class);
@@ -166,7 +168,8 @@ public Consumer> consumeBuildFailed() {
// send notification
UUID studyUuid = networkModificationTreeService.getStudyUuidForNodeId(receiverObj.getNodeUuid());
- notificationService.emitNodeBuildFailed(studyUuid, receiverObj.getNodeUuid(), receiverObj.getRootNetworkUuid(), message.getHeaders().get(StudyConstants.HEADER_ERROR_MESSAGE, String.class));
+ notificationService.emitNodeBuildFailed(studyUuid, receiverObj.getNodeUuid(), receiverObj.getRootNetworkUuid(), message.getHeaders().get(StudyConstants.HEADER_ERROR_MESSAGE,
+ String.class));
handleBuildCanceledOrFailedWorkflow(studyUuid, receiverObj.getNodeUuid(), receiverObj.getRootNetworkUuid(), message);
} catch (JsonProcessingException e) {
LOGGER.error(e.toString());
@@ -188,6 +191,7 @@ private void handleBuildCanceledOrFailedWorkflow(UUID studyUuid, UUID nodeUuid,
}
@Bean
+ @SuppressWarnings("checkstyle:LambdaBodyLength")
public Consumer> consumeCaseImportSucceeded() {
return message -> {
String receiverString = message.getHeaders().get(HEADER_RECEIVER, String.class);
@@ -313,6 +317,7 @@ private UUID createDefaultSpreadsheetConfigCollection(String userId, UserProfile
}
}
+ @SuppressWarnings("checkstyle:LambdaBodyLength")
private UUID createWorkspacesConfig(UserProfileInfos userProfileInfos) {
try {
List workspaceIds = new ArrayList<>();
@@ -331,6 +336,7 @@ private UUID createWorkspacesConfig(UserProfileInfos userProfileInfos) {
}
@Bean
+ @SuppressWarnings("checkstyle:LambdaBodyLength")
public Consumer> consumeCaseImportFailed() {
return message -> {
String receiverString = message.getHeaders().get(HEADER_RECEIVER, String.class);
@@ -467,6 +473,7 @@ public void consumeCalculationDebug(Message msg, ComputationType computa
}));
}
+ @SuppressWarnings("checkstyle:LambdaBodyLength")
public void consumeCalculationResult(Message msg, ComputationType computationType) {
Optional.ofNullable(msg.getHeaders().get(RESULT_UUID, String.class))
.map(UUID::fromString)
diff --git a/src/main/java/org/gridsuite/study/server/service/LoadFlowService.java b/src/main/java/org/gridsuite/study/server/service/LoadFlowService.java
index 57355c2d5a..6c58f53fcb 100644
--- a/src/main/java/org/gridsuite/study/server/service/LoadFlowService.java
+++ b/src/main/java/org/gridsuite/study/server/service/LoadFlowService.java
@@ -11,8 +11,8 @@
import com.fasterxml.jackson.databind.ObjectMapper;
import org.apache.commons.lang3.StringUtils;
import org.gridsuite.study.server.RemoteServicesProperties;
-import org.gridsuite.study.server.error.StudyException;
import org.gridsuite.study.server.dto.*;
+import org.gridsuite.study.server.error.StudyException;
import org.gridsuite.study.server.repository.StudyEntity;
import org.gridsuite.study.server.service.common.AbstractComputationService;
import org.gridsuite.study.server.service.common.ComputationParameters;
@@ -23,7 +23,6 @@
import org.springframework.stereotype.Service;
import org.springframework.web.client.RestTemplate;
import org.springframework.web.util.UriComponentsBuilder;
-
import java.io.UncheckedIOException;
import java.net.URLEncoder;
import java.nio.charset.StandardCharsets;
@@ -31,7 +30,6 @@
import java.util.List;
import java.util.Objects;
import java.util.UUID;
-
import static org.gridsuite.study.server.StudyConstants.*;
import static org.gridsuite.study.server.error.StudyBusinessErrorCode.COMPUTATION_RUNNING;
diff --git a/src/main/java/org/gridsuite/study/server/service/NetworkConversionService.java b/src/main/java/org/gridsuite/study/server/service/NetworkConversionService.java
index a50f2c6037..63e6317325 100644
--- a/src/main/java/org/gridsuite/study/server/service/NetworkConversionService.java
+++ b/src/main/java/org/gridsuite/study/server/service/NetworkConversionService.java
@@ -64,11 +64,13 @@ public NetworkConversionService(@Value("${powsybl.services.network-conversion-se
* - one variant for root node - INITIAL_VARIANT
* - one variant cloned from the previous one for the 1st node - *variantId*
*/
- public void persistNetwork(RootNetworkInfos rootNetworkInfos, UUID studyUuid, String variantId, String userId, UUID importReportUuid, Map importParameters, CaseImportAction caseImportAction) {
+ public void persistNetwork(RootNetworkInfos rootNetworkInfos, UUID studyUuid, String variantId, String userId, UUID importReportUuid, Map importParameters,
+ CaseImportAction caseImportAction) {
String receiver;
try {
receiver = URLEncoder.encode(objectMapper.writeValueAsString(
- new CaseImportReceiver(studyUuid, rootNetworkInfos.getId(), rootNetworkInfos.getCaseInfos().getCaseUuid(), rootNetworkInfos.getCaseInfos().getOriginalCaseUuid(), importReportUuid, userId, System.nanoTime(), caseImportAction
+ new CaseImportReceiver(studyUuid, rootNetworkInfos.getId(), rootNetworkInfos.getCaseInfos().getCaseUuid(), rootNetworkInfos.getCaseInfos().getOriginalCaseUuid(),
+ importReportUuid, userId, System.nanoTime(), caseImportAction
)), StandardCharsets.UTF_8);
} catch (JsonProcessingException e) {
throw new UncheckedIOException(e);
diff --git a/src/main/java/org/gridsuite/study/server/service/NetworkModificationService.java b/src/main/java/org/gridsuite/study/server/service/NetworkModificationService.java
index d38dbff800..291f5402db 100644
--- a/src/main/java/org/gridsuite/study/server/service/NetworkModificationService.java
+++ b/src/main/java/org/gridsuite/study/server/service/NetworkModificationService.java
@@ -38,7 +38,7 @@
import static org.gridsuite.study.server.utils.JsonUtils.getModificationContextJsonString;
/**
- * @author Slimane amar
* @author Franck Lecuyer
*/
@Service
@@ -257,7 +257,8 @@ public void stopBuild(@NonNull UUID nodeUuid, @NonNull UUID rootNetworkUuid) {
restTemplate.put(getNetworkModificationServerURI(false) + path, null);
}
- public NetworkModificationsResult moveModifications(UUID originGroupUuid, UUID targetGroupUuid, UUID beforeUuid, Pair, List> modificationContextInfos, boolean buildTargetNode) {
+ public NetworkModificationsResult moveModifications(UUID originGroupUuid, UUID targetGroupUuid, UUID beforeUuid, Pair, List> modificationContextInfos,
+ boolean buildTargetNode) {
var path = UriComponentsBuilder.fromPath(GROUP_PATH)
.queryParam(QUERY_PARAM_ACTION, ModificationsActionType.MOVE.name())
.queryParam("originGroupUuid", originGroupUuid)
diff --git a/src/main/java/org/gridsuite/study/server/service/NetworkModificationTreeService.java b/src/main/java/org/gridsuite/study/server/service/NetworkModificationTreeService.java
index a54e19a98b..a6a2bfa117 100644
--- a/src/main/java/org/gridsuite/study/server/service/NetworkModificationTreeService.java
+++ b/src/main/java/org/gridsuite/study/server/service/NetworkModificationTreeService.java
@@ -37,7 +37,7 @@
import static org.gridsuite.study.server.error.StudyBusinessErrorCode.*;
/**
- * @author Jacques Borsenberger
*/
@Service
public class NetworkModificationTreeService {
@@ -147,7 +147,8 @@ public NetworkModificationNode createNode(@NonNull StudyEntity study, @NonNull U
return newNode;
}
- private NetworkModificationNode duplicateNode(@NonNull StudyEntity targetStudy, @NonNull UUID referenceNodeId, @NonNull NetworkModificationNode newNodeInfo, @NonNull UUID originNodeUuid, @NonNull InsertMode insertMode, Map mappingModificationUuids) {
+ private NetworkModificationNode duplicateNode(@NonNull StudyEntity targetStudy, @NonNull UUID referenceNodeId, @NonNull NetworkModificationNode newNodeInfo, @NonNull UUID originNodeUuid,
+ @NonNull InsertMode insertMode, Map mappingModificationUuids) {
// create new node
NetworkModificationNode newNode = createAndInsertNode(targetStudy, referenceNodeId, newNodeInfo, insertMode);
@@ -347,6 +348,7 @@ private void insertNodesToParent(NodeEntity parent, Integer position, List optNodeToDelete = nodesRepository.findById(id);
optNodeToDelete.ifPresent(nodeToDelete -> {
@@ -465,7 +467,8 @@ private void completeNodeInfos(List nodes, UUID rootNetworkUuid) {
if (nodeInfo instanceof RootNode rootNode) {
rootNode.setReportUuid(rootNetworkEntity.getReportUuid());
} else {
- ((NetworkModificationNode) nodeInfo).completeDtoFromRootNetworkNodeInfo(rootNetworkNodeInfoService.getRootNetworkNodeInfo(nodeInfo.getId(), rootNetworkEntity.getId()).orElseThrow(() -> new StudyException(NOT_FOUND, "Root network not found")));
+ ((NetworkModificationNode) nodeInfo).completeDtoFromRootNetworkNodeInfo(rootNetworkNodeInfoService.getRootNetworkNodeInfo(nodeInfo.getId(),
+ rootNetworkEntity.getId()).orElseThrow(() -> new StudyException(NOT_FOUND, "Root network not found")));
}
});
}
@@ -713,7 +716,8 @@ public void assertMoveOrDuplicateSubtree(UUID nodeTreeUuid, UUID referenceNodeUu
@Transactional(readOnly = true)
public boolean isNodeNameExists(UUID studyUuid, String nodeName) {
- return ROOT_NODE_NAME.equals(nodeName) || !networkModificationNodeInfoRepository.findAllByNodeStudyIdAndName(studyUuid, nodeName).stream().filter(abstractNodeInfoEntity -> !abstractNodeInfoEntity.getNode().isStashed()).toList().isEmpty();
+ return ROOT_NODE_NAME.equals(nodeName) || !networkModificationNodeInfoRepository.findAllByNodeStudyIdAndName(studyUuid,
+ nodeName).stream().filter(abstractNodeInfoEntity -> !abstractNodeInfoEntity.getNode().isStashed()).toList().isEmpty();
}
@Transactional(readOnly = true)
@@ -834,7 +838,8 @@ public void restoreNode(UUID studyId, List nodeIds, UUID anchorNodeId) {
for (UUID nodeId : nodeIds) {
NodeEntity nodeToRestore = getNodeEntity(nodeId);
NodeEntity anchorNode = getNodeEntity(anchorNodeId);
- NetworkModificationNodeInfoEntity modificationNodeToRestore = networkModificationNodeInfoRepository.findById(nodeToRestore.getIdNode()).orElseThrow(() -> new StudyException(NOT_FOUND, "Node not found"));
+ NetworkModificationNodeInfoEntity modificationNodeToRestore = networkModificationNodeInfoRepository.findById(nodeToRestore.getIdNode()).orElseThrow(() -> new StudyException(NOT_FOUND,
+ "Node not found"));
if (self.isNodeNameExists(studyId, modificationNodeToRestore.getName())) {
String newName = getSuffixedNodeName(studyId, modificationNodeToRestore.getName());
modificationNodeToRestore.setName(newName);
@@ -880,7 +885,8 @@ public Map getModificationReports(UUID nodeUuid, UUID rootNetworkUui
private void restoreNodeChildren(UUID studyId, UUID parentNodeId) {
getChildren(parentNodeId).forEach(nodeEntity -> {
- NetworkModificationNodeInfoEntity modificationNodeToRestore = networkModificationNodeInfoRepository.findById(nodeEntity.getIdNode()).orElseThrow(() -> new StudyException(NOT_FOUND, "Node not found"));
+ NetworkModificationNodeInfoEntity modificationNodeToRestore = networkModificationNodeInfoRepository.findById(nodeEntity.getIdNode()).orElseThrow(() -> new StudyException(NOT_FOUND,
+ "Node not found"));
if (self.isNodeNameExists(studyId, modificationNodeToRestore.getName())) {
String newName = getSuffixedNodeName(studyId, modificationNodeToRestore.getName());
modificationNodeToRestore.setName(newName);
@@ -989,7 +995,8 @@ private void getBuildInfos(NodeEntity nodeEntity, UUID rootNetworkUuid, BuildInf
AbstractNode node = getSimpleNode(nodeEntity.getIdNode());
if (node.getType() == NodeType.NETWORK_MODIFICATION) {
NetworkModificationNode modificationNode = (NetworkModificationNode) node;
- RootNetworkNodeInfoEntity rootNetworkNodeInfoEntity = rootNetworkNodeInfoService.getRootNetworkNodeInfo(nodeEntity.getIdNode(), rootNetworkUuid).orElseThrow(() -> new StudyException(NOT_FOUND, "Root network not found"));
+ RootNetworkNodeInfoEntity rootNetworkNodeInfoEntity = rootNetworkNodeInfoService.getRootNetworkNodeInfo(nodeEntity.getIdNode(),
+ rootNetworkUuid).orElseThrow(() -> new StudyException(NOT_FOUND, "Root network not found"));
if (!rootNetworkNodeInfoEntity.getNodeBuildStatus().toDto().isBuilt()) {
UUID reportUuid = getModificationReportUuid(nodeEntity.getIdNode(), rootNetworkUuid, nodeToBuildUuid);
ReportInfos reportInfos = new ReportInfos(reportUuid, modificationNode.getId(), ReportMode.REPLACE);
@@ -1050,7 +1057,8 @@ public InvalidateNodeInfos invalidateNodeTree(UUID nodeUuid, UUID rootNetworkUui
// Invalidate indexed nodes
if (shouldInvalidateIndexedInfos) {
- fillIndexedNodeTreeInfosToInvalidate(nodeEntity, rootNetworkUuid, invalidateNodeInfos, isNodeBuilt && (invalidateTreeParameters.isOnlyChildren() || invalidateTreeParameters.isOnlyChildrenBuildStatus()));
+ fillIndexedNodeTreeInfosToInvalidate(nodeEntity, rootNetworkUuid, invalidateNodeInfos,
+ isNodeBuilt && (invalidateTreeParameters.isOnlyChildren() || invalidateTreeParameters.isOnlyChildrenBuildStatus()));
}
// Children
@@ -1169,7 +1177,8 @@ private void fillIndexedNodeTreeInfosToInvalidate(NodeEntity nodeEntity, UUID ro
@Transactional
public void updateNodeBuildStatus(UUID nodeUuid, UUID rootNetworkUuid, NodeBuildStatus nodeBuildStatus) {
UUID studyId = self.getStudyUuidForNodeId(nodeUuid);
- RootNetworkNodeInfoEntity rootNetworkNodeInfoEntity = rootNetworkNodeInfoService.getRootNetworkNodeInfo(nodeUuid, rootNetworkUuid).orElseThrow(() -> new StudyException(NOT_FOUND, "Root network not found"));
+ RootNetworkNodeInfoEntity rootNetworkNodeInfoEntity = rootNetworkNodeInfoService.getRootNetworkNodeInfo(nodeUuid, rootNetworkUuid).orElseThrow(() -> new StudyException(NOT_FOUND,
+ "Root network not found"));
NodeEntity nodeEntity = getNodeEntity(nodeUuid);
NodeBuildStatusEmbeddable currentNodeStatus = rootNetworkNodeInfoEntity.getNodeBuildStatus();
@@ -1203,7 +1212,8 @@ public NodeBuildStatus getNodeBuildStatus(UUID nodeUuid, UUID rootNetworkUuid) {
return NodeBuildStatus.from(BuildStatus.NOT_BUILT);
}
- RootNetworkNodeInfoEntity rootNetworkNodeInfoEntity = rootNetworkNodeInfoService.getRootNetworkNodeInfo(nodeUuid, rootNetworkUuid).orElseThrow(() -> new StudyException(NOT_FOUND, "Root network not found"));
+ RootNetworkNodeInfoEntity rootNetworkNodeInfoEntity = rootNetworkNodeInfoService.getRootNetworkNodeInfo(nodeUuid, rootNetworkUuid).orElseThrow(() -> new StudyException(NOT_FOUND,
+ "Root network not found"));
return rootNetworkNodeInfoEntity.getNodeBuildStatus().toDto();
}
diff --git a/src/main/java/org/gridsuite/study/server/service/NetworkService.java b/src/main/java/org/gridsuite/study/server/service/NetworkService.java
index 9074ad48fa..6de2919176 100644
--- a/src/main/java/org/gridsuite/study/server/service/NetworkService.java
+++ b/src/main/java/org/gridsuite/study/server/service/NetworkService.java
@@ -26,7 +26,7 @@
import java.util.stream.Collectors;
/**
- * @author Slimane amar
*/
@Service
@ComponentScan(basePackageClasses = {NetworkStoreService.class})
diff --git a/src/main/java/org/gridsuite/study/server/service/PccMinService.java b/src/main/java/org/gridsuite/study/server/service/PccMinService.java
index af3d071ca7..6e3a88b2fa 100644
--- a/src/main/java/org/gridsuite/study/server/service/PccMinService.java
+++ b/src/main/java/org/gridsuite/study/server/service/PccMinService.java
@@ -11,21 +11,21 @@
import lombok.Setter;
import org.apache.commons.lang3.StringUtils;
import org.gridsuite.study.server.RemoteServicesProperties;
-import org.gridsuite.study.server.error.StudyException;
import org.gridsuite.study.server.dto.*;
+import org.gridsuite.study.server.error.StudyException;
import org.gridsuite.study.server.repository.StudyEntity;
import org.gridsuite.study.server.service.common.AbstractComputationService;
import org.gridsuite.study.server.service.common.ComputationParameters;
import org.gridsuite.study.server.utils.ResultParameters;
import org.gridsuite.study.server.utils.StudyUtils;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Pageable;
import org.springframework.data.domain.Sort;
import org.springframework.http.*;
import org.springframework.lang.Nullable;
import org.springframework.stereotype.Service;
import org.springframework.web.client.RestTemplate;
import org.springframework.web.util.UriComponentsBuilder;
-
import java.io.UncheckedIOException;
import java.net.URI;
import java.net.URLEncoder;
@@ -33,9 +33,6 @@
import java.util.List;
import java.util.Objects;
import java.util.UUID;
-
-import org.springframework.data.domain.Pageable;
-
import static org.gridsuite.study.server.StudyConstants.*;
import static org.gridsuite.study.server.error.StudyBusinessErrorCode.COMPUTATION_RUNNING;
import static org.gridsuite.study.server.error.StudyBusinessErrorCode.NOT_FOUND;
diff --git a/src/main/java/org/gridsuite/study/server/service/RemoteServicesInspector.java b/src/main/java/org/gridsuite/study/server/service/RemoteServicesInspector.java
index 387a7c729a..8942f44e0f 100644
--- a/src/main/java/org/gridsuite/study/server/service/RemoteServicesInspector.java
+++ b/src/main/java/org/gridsuite/study/server/service/RemoteServicesInspector.java
@@ -159,6 +159,7 @@ public Map getServicesInfo(@Nullable FrontService view) throws
* @return {@code Map} in JSON format
*/
@Async
+ @SuppressWarnings("checkstyle:IllegalCatch")
public CompletableFuture getServiceInfo(@NonNull final RemoteServiceName service) {
try {
if (service == RemoteServiceName.STUDY_SERVER) {
diff --git a/src/main/java/org/gridsuite/study/server/service/ReportService.java b/src/main/java/org/gridsuite/study/server/service/ReportService.java
index 63b194594a..54a1e1727b 100644
--- a/src/main/java/org/gridsuite/study/server/service/ReportService.java
+++ b/src/main/java/org/gridsuite/study/server/service/ReportService.java
@@ -39,7 +39,7 @@
import static org.gridsuite.study.server.StudyConstants.REPORT_API_VERSION;
/**
- * @author Slimane amar
*/
@Service
public class ReportService {
diff --git a/src/main/java/org/gridsuite/study/server/service/RootNetworkNodeInfoService.java b/src/main/java/org/gridsuite/study/server/service/RootNetworkNodeInfoService.java
index a6c37e1488..1638385567 100644
--- a/src/main/java/org/gridsuite/study/server/service/RootNetworkNodeInfoService.java
+++ b/src/main/java/org/gridsuite/study/server/service/RootNetworkNodeInfoService.java
@@ -52,10 +52,13 @@
import static org.gridsuite.study.server.error.StudyBusinessErrorCode.*;
/**
- * @author Slimane amar
*/
@Service
public class RootNetworkNodeInfoService {
+
+ private static final String ROOT_NETWORK_NOT_FOUND = "Root network not found";
+
private final RootNetworkNodeInfoRepository rootNetworkNodeInfoRepository;
private final NetworkModificationNodeInfoRepository networkModificationNodeInfoRepository;
private final StudyServerExecutionService studyServerExecutionService;
@@ -122,7 +125,8 @@ public void createNodeLinksFromTags(@NonNull StudyEntity targetStudy,
@NonNull Map mappingModificationUuids) {
Map mappingRootNetworksFromTag = new HashMap<>();
targetStudy.getRootNetworks().forEach(targetRootNetwork -> {
- Optional originRootNetworkNodeInfo = originNodeInfo.getRootNetworkNodeInfos().stream().filter(originRootNetworkNode -> originRootNetworkNode.getRootNetwork().getTag().equals(targetRootNetwork.getTag())).findFirst();
+ Optional originRootNetworkNodeInfo = originNodeInfo.getRootNetworkNodeInfos().stream().filter(
+ originRootNetworkNode -> originRootNetworkNode.getRootNetwork().getTag().equals(targetRootNetwork.getTag())).findFirst();
originRootNetworkNodeInfo.ifPresent(originRootNetworkNodeInfoEntity ->
mappingRootNetworksFromTag.put(targetRootNetwork.getId(), originRootNetworkNodeInfoEntity)
);
@@ -158,14 +162,16 @@ private static RootNetworkNodeInfoEntity createDefaultEntity(UUID nodeUuid, Set<
@Transactional
public void updateLoadflowResultUuid(UUID nodeUuid, UUID rootNetworkUuid, UUID loadflowResultUuid, Boolean withRatioTapChangers) {
- RootNetworkNodeInfoEntity rootNetworkNodeInfoEntity = rootNetworkNodeInfoRepository.findByNodeInfoIdAndRootNetworkId(nodeUuid, rootNetworkUuid).orElseThrow(() -> new StudyException(NOT_FOUND, "Root network not found"));
+ RootNetworkNodeInfoEntity rootNetworkNodeInfoEntity = rootNetworkNodeInfoRepository.findByNodeInfoIdAndRootNetworkId(nodeUuid, rootNetworkUuid).orElseThrow(() -> new StudyException(NOT_FOUND,
+ ROOT_NETWORK_NOT_FOUND));
rootNetworkNodeInfoEntity.setLoadFlowResultUuid(loadflowResultUuid);
rootNetworkNodeInfoEntity.setLoadFlowWithRatioTapChangers(withRatioTapChangers);
}
@Transactional
public void updateComputationResultUuid(UUID nodeUuid, UUID rootNetworkUuid, UUID computationResultUuid, ComputationType computationType) {
- RootNetworkNodeInfoEntity rootNetworkNodeInfoEntity = rootNetworkNodeInfoRepository.findByNodeInfoIdAndRootNetworkId(nodeUuid, rootNetworkUuid).orElseThrow(() -> new StudyException(NOT_FOUND, "Root network not found"));
+ RootNetworkNodeInfoEntity rootNetworkNodeInfoEntity = rootNetworkNodeInfoRepository.findByNodeInfoIdAndRootNetworkId(nodeUuid, rootNetworkUuid).orElseThrow(() -> new StudyException(NOT_FOUND,
+ ROOT_NETWORK_NOT_FOUND));
switch (computationType) {
case LOAD_FLOW -> rootNetworkNodeInfoEntity.setLoadFlowResultUuid(computationResultUuid);
case SECURITY_ANALYSIS -> rootNetworkNodeInfoEntity.setSecurityAnalysisResultUuid(computationResultUuid);
@@ -187,6 +193,7 @@ public List getAllWithRootNetworkByNodeInfoId(UUID no
return rootNetworkNodeInfoRepository.findAllWithRootNetworkByNodeInfoId(nodeUuid);
}
+ @SuppressWarnings("checkstyle:LambdaBodyLength")
public void fillDeleteNodeInfo(UUID nodeUuid, DeleteNodeInfos deleteNodeInfos) {
//get all rootNetworkNodeInfo info linked to node
List rootNetworkNodeInfoEntities = rootNetworkNodeInfoRepository.findAllWithRootNetworkByNodeInfoId(nodeUuid);
@@ -258,7 +265,8 @@ public void fillDeleteNodeInfo(UUID nodeUuid, DeleteNodeInfos deleteNodeInfos) {
}
public InvalidateNodeInfos invalidateRootNetworkNode(UUID nodeUuid, UUID rootNetworUuid, InvalidateNodeTreeParameters invalidateTreeParameters) {
- RootNetworkNodeInfoEntity rootNetworkNodeInfoEntity = rootNetworkNodeInfoRepository.findByNodeInfoIdAndRootNetworkId(nodeUuid, rootNetworUuid).orElseThrow(() -> new StudyException(NOT_FOUND, "Root network not found"));
+ RootNetworkNodeInfoEntity rootNetworkNodeInfoEntity = rootNetworkNodeInfoRepository.findByNodeInfoIdAndRootNetworkId(nodeUuid, rootNetworUuid).orElseThrow(() -> new StudyException(NOT_FOUND,
+ ROOT_NETWORK_NOT_FOUND));
return invalidateRootNetworkNode(rootNetworkNodeInfoEntity, invalidateTreeParameters);
}
@@ -514,7 +522,7 @@ private void addLink(NetworkModificationNodeInfoEntity nodeInfoEntity, RootNetwo
public void updateModificationsToExclude(UUID nodeUuid, UUID rootNetworkUuid, Set modificationUuids, boolean activated) {
RootNetworkNodeInfoEntity rootNetworkNodeInfoEntity = rootNetworkNodeInfoRepository
.findByNodeInfoIdAndRootNetworkId(nodeUuid, rootNetworkUuid)
- .orElseThrow(() -> new StudyException(NOT_FOUND, "Root network not found"));
+ .orElseThrow(() -> new StudyException(NOT_FOUND, ROOT_NETWORK_NOT_FOUND));
if (activated) {
rootNetworkNodeInfoEntity.removeModificationsFromExclude(modificationUuids);
} else {
@@ -537,7 +545,8 @@ public void copyModificationsToExcludeFromTags(UUID originNodeUuid, UUID targetN
List targetRootNetworksNodeInfos = rootNetworkNodeInfoRepository.findAllWithRootNetworkByNodeInfoId(targetNodeUuid);
originRootNetworksNodeInfos.forEach(originRootNetworkNodeInfo -> {
- Optional targetRootNetworkNodeInfo = targetRootNetworksNodeInfos.stream().filter(targetRootNetworkNode -> targetRootNetworkNode.getRootNetwork().getTag().equals(originRootNetworkNodeInfo.getRootNetwork().getTag())).findFirst();
+ Optional targetRootNetworkNodeInfo = targetRootNetworksNodeInfos.stream().filter(
+ targetRootNetworkNode -> targetRootNetworkNode.getRootNetwork().getTag().equals(originRootNetworkNodeInfo.getRootNetwork().getTag())).findFirst();
targetRootNetworkNodeInfo.ifPresent(targetRootNetworkNodeInfoEntity ->
mappingRootNetworksFromTag.put(originRootNetworkNodeInfo.getId(), targetRootNetworkNodeInfoEntity)
);
@@ -545,7 +554,8 @@ public void copyModificationsToExcludeFromTags(UUID originNodeUuid, UUID targetN
originRootNetworksNodeInfos.forEach(originRootNetworkNodeInfo -> {
if (mappingRootNetworksFromTag.containsKey(originRootNetworkNodeInfo.getId())) {
- Set modificationsToCopy = originRootNetworkNodeInfo.getModificationsUuidsToExclude().stream().map(mappingModificationsUuids::get).filter(Objects::nonNull).collect(Collectors.toSet());
+ Set modificationsToCopy = originRootNetworkNodeInfo.getModificationsUuidsToExclude().stream().map(mappingModificationsUuids::get).filter(Objects::nonNull).collect(
+ Collectors.toSet());
mappingRootNetworksFromTag.get(originRootNetworkNodeInfo.getId()).addModificationsToExclude(modificationsToCopy);
}
});
@@ -553,7 +563,8 @@ public void copyModificationsToExcludeFromTags(UUID originNodeUuid, UUID targetN
@Transactional
public void updateRootNetworkNode(UUID nodeUuid, UUID rootNetworkUuid, RootNetworkNodeInfo rootNetworkNodeInfo) {
- RootNetworkNodeInfoEntity rootNetworkNodeInfoEntity = rootNetworkNodeInfoRepository.findByNodeInfoIdAndRootNetworkId(nodeUuid, rootNetworkUuid).orElseThrow(() -> new StudyException(NOT_FOUND, "Root network not found"));
+ RootNetworkNodeInfoEntity rootNetworkNodeInfoEntity = rootNetworkNodeInfoRepository.findByNodeInfoIdAndRootNetworkId(nodeUuid, rootNetworkUuid).orElseThrow(() -> new StudyException(NOT_FOUND,
+ ROOT_NETWORK_NOT_FOUND));
if (rootNetworkNodeInfo.getVariantId() != null) {
rootNetworkNodeInfoEntity.setVariantId(rootNetworkNodeInfo.getVariantId());
}
@@ -622,11 +633,13 @@ public RemoteDeletionInfos getRemoteDeletionInfos(List root
infos.setSecurityAnalysisResultUuids(rootNetworkNodeInfos.stream().map(RootNetworkNodeInfo::getSecurityAnalysisResultUuid).filter(Objects::nonNull).collect(Collectors.toSet()));
infos.setSensitivityAnalysisResultUuids(rootNetworkNodeInfos.stream().map(RootNetworkNodeInfo::getSensitivityAnalysisResultUuid).filter(Objects::nonNull).collect(Collectors.toSet()));
infos.setShortCircuitAnalysisResultUuids(rootNetworkNodeInfos.stream().map(RootNetworkNodeInfo::getShortCircuitAnalysisResultUuid).filter(Objects::nonNull).collect(Collectors.toSet()));
- infos.setOneBusShortCircuitAnalysisResultUuids(rootNetworkNodeInfos.stream().map(RootNetworkNodeInfo::getOneBusShortCircuitAnalysisResultUuid).filter(Objects::nonNull).collect(Collectors.toSet()));
+ infos.setOneBusShortCircuitAnalysisResultUuids(
+ rootNetworkNodeInfos.stream().map(RootNetworkNodeInfo::getOneBusShortCircuitAnalysisResultUuid).filter(Objects::nonNull).collect(Collectors.toSet()));
infos.setVoltageInitResultUuids(rootNetworkNodeInfos.stream().map(RootNetworkNodeInfo::getVoltageInitResultUuid).filter(Objects::nonNull).collect(Collectors.toSet()));
infos.setDynamicSimulationResultUuids(rootNetworkNodeInfos.stream().map(RootNetworkNodeInfo::getDynamicSimulationResultUuid).filter(Objects::nonNull).collect(Collectors.toSet()));
infos.setDynamicSecurityAnalysisResultUuids(rootNetworkNodeInfos.stream().map(RootNetworkNodeInfo::getDynamicSecurityAnalysisResultUuid).filter(Objects::nonNull).collect(Collectors.toSet()));
- infos.setDynamicMarginCalculationResultUuids(rootNetworkNodeInfos.stream().map(RootNetworkNodeInfo::getDynamicMarginCalculationResultUuid).filter(Objects::nonNull).collect(Collectors.toSet()));
+ infos.setDynamicMarginCalculationResultUuids(
+ rootNetworkNodeInfos.stream().map(RootNetworkNodeInfo::getDynamicMarginCalculationResultUuid).filter(Objects::nonNull).collect(Collectors.toSet()));
infos.setStateEstimationResultUuids(rootNetworkNodeInfos.stream().map(RootNetworkNodeInfo::getStateEstimationResultUuid).filter(Objects::nonNull).collect(Collectors.toSet()));
infos.setPccMinResultUuids(rootNetworkNodeInfos.stream().map(RootNetworkNodeInfo::getPccMinResultUuid).filter(Objects::nonNull).collect(Collectors.toSet()));
return infos;
@@ -642,7 +655,8 @@ public void deleteRootNetworkNodeRemoteInfos(List rootNetwo
@Transactional
public ModificationApplicationContext getNetworkModificationApplicationContext(UUID rootNetworkUuid, UUID nodeUuid, UUID networkUuid) {
- RootNetworkNodeInfoEntity rootNetworkNodeInfoEntity = rootNetworkNodeInfoRepository.findWithModificationsToExcludeByNodeInfoIdAndRootNetworkId(nodeUuid, rootNetworkUuid).orElseThrow(() -> new StudyException(NOT_FOUND, "Root network not found"));
+ RootNetworkNodeInfoEntity rootNetworkNodeInfoEntity = rootNetworkNodeInfoRepository.findWithModificationsToExcludeByNodeInfoIdAndRootNetworkId(nodeUuid,
+ rootNetworkUuid).orElseThrow(() -> new StudyException(NOT_FOUND, ROOT_NETWORK_NOT_FOUND));
String variantId = rootNetworkNodeInfoEntity.getVariantId();
UUID reportUuid = rootNetworkNodeInfoEntity.getModificationReports().get(nodeUuid);
return new ModificationApplicationContext(networkUuid, variantId, reportUuid, nodeUuid, rootNetworkNodeInfoEntity.getModificationsUuidsToExclude());
@@ -663,7 +677,8 @@ public void assertComputationNotRunning(UUID nodeUuid, UUID rootNetworkUuid) {
dynamicSecurityAnalysisService.assertDynamicSecurityAnalysisNotRunning(getComputationResultUuid(nodeUuid, rootNetworkUuid, DYNAMIC_SECURITY_ANALYSIS));
dynamicMarginCalculationService.assertDynamicMarginCalculationNotRunning(getComputationResultUuid(nodeUuid, rootNetworkUuid, DYNAMIC_MARGIN_CALCULATION));
sensitivityAnalysisService.assertSensitivityAnalysisNotRunning(getComputationResultUuid(nodeUuid, rootNetworkUuid, SENSITIVITY_ANALYSIS));
- shortCircuitService.assertShortCircuitAnalysisNotRunning(getComputationResultUuid(nodeUuid, rootNetworkUuid, SHORT_CIRCUIT), getComputationResultUuid(nodeUuid, rootNetworkUuid, SHORT_CIRCUIT_ONE_BUS));
+ shortCircuitService.assertShortCircuitAnalysisNotRunning(getComputationResultUuid(nodeUuid, rootNetworkUuid, SHORT_CIRCUIT), getComputationResultUuid(nodeUuid, rootNetworkUuid,
+ SHORT_CIRCUIT_ONE_BUS));
voltageInitService.assertVoltageInitNotRunning(getComputationResultUuid(nodeUuid, rootNetworkUuid, VOLTAGE_INITIALIZATION));
stateEstimationService.assertStateEstimationNotRunning(getComputationResultUuid(nodeUuid, rootNetworkUuid, STATE_ESTIMATION));
pccMinService.assertPccMinNotRunning(getComputationResultUuid(nodeUuid, rootNetworkUuid, PCC_MIN));
@@ -681,7 +696,7 @@ public String getLoadFlowResult(UUID nodeUuid, UUID rootNetworkUuid, String filt
@Transactional(readOnly = true)
public String getSecurityAnalysisResult(UUID nodeUuid, UUID rootNetworkUuid, SecurityAnalysisResultType resultType, String filters, String globalFilters, Pageable pageable) {
RootNetworkNodeInfoEntity rootNetworkNodeInfoEntity = rootNetworkNodeInfoRepository.findByNodeInfoIdAndRootNetworkId(nodeUuid, rootNetworkUuid).orElseThrow(()
- -> new StudyException(NOT_FOUND, "Root network not found"));
+ -> new StudyException(NOT_FOUND, ROOT_NETWORK_NOT_FOUND));
String variantId = rootNetworkNodeInfoEntity.getVariantId();
UUID networkUuid = rootNetworkNodeInfoEntity.getRootNetwork().getNetworkUuid();
UUID resultUuid = getComputationResultUuid(nodeUuid, rootNetworkUuid, SECURITY_ANALYSIS);
@@ -691,7 +706,7 @@ public String getSecurityAnalysisResult(UUID nodeUuid, UUID rootNetworkUuid, Sec
@Transactional(readOnly = true)
public byte[] getSecurityAnalysisResultCsv(UUID nodeUuid, UUID rootNetworkUuid, SecurityAnalysisResultType resultType, String globalFilters, String filters, Sort sort, String csvTranslations) {
RootNetworkNodeInfoEntity rootNetworkNodeInfoEntity = rootNetworkNodeInfoRepository.findByNodeInfoIdAndRootNetworkId(nodeUuid, rootNetworkUuid).orElseThrow(()
- -> new StudyException(NOT_FOUND, "Root network not found"));
+ -> new StudyException(NOT_FOUND, ROOT_NETWORK_NOT_FOUND));
String variantId = rootNetworkNodeInfoEntity.getVariantId();
UUID networkUuid = rootNetworkNodeInfoEntity.getRootNetwork().getNetworkUuid();
UUID resultUuid = getComputationResultUuid(nodeUuid, rootNetworkUuid, SECURITY_ANALYSIS);
@@ -718,7 +733,8 @@ public List getDynamicSimulationTimeline(UUID nodeUuid, UUID
@Transactional(readOnly = true)
public String getSensitivityAnalysisResult(UUID nodeUuid, UUID rootNetworkUuid, String selector, String filters, String globalFilters) {
- RootNetworkNodeInfoEntity rootNetworkNodeInfoEntity = rootNetworkNodeInfoRepository.findByNodeInfoIdAndRootNetworkId(nodeUuid, rootNetworkUuid).orElseThrow(() -> new StudyException(NOT_FOUND, "Root network not found"));
+ RootNetworkNodeInfoEntity rootNetworkNodeInfoEntity = rootNetworkNodeInfoRepository.findByNodeInfoIdAndRootNetworkId(nodeUuid, rootNetworkUuid).orElseThrow(() -> new StudyException(NOT_FOUND,
+ ROOT_NETWORK_NOT_FOUND));
String variantId = rootNetworkNodeInfoEntity.getVariantId();
UUID networkUuid = rootNetworkNodeInfoEntity.getRootNetwork().getNetworkUuid();
UUID resultUuid = getComputationResultUuid(nodeUuid, rootNetworkUuid, SENSITIVITY_ANALYSIS);
@@ -726,8 +742,10 @@ public String getSensitivityAnalysisResult(UUID nodeUuid, UUID rootNetworkUuid,
}
@Transactional(readOnly = true)
- public byte[] exportSensitivityResultsAsCsv(UUID nodeUuid, UUID rootNetworkUuid, SensitivityAnalysisCsvFileInfos sensitivityAnalysisCsvFileInfos, String selector, String filters, String globalFilters) {
- RootNetworkNodeInfoEntity rootNetworkNodeInfoEntity = rootNetworkNodeInfoRepository.findByNodeInfoIdAndRootNetworkId(nodeUuid, rootNetworkUuid).orElseThrow(() -> new StudyException(NOT_FOUND, "Root network not found"));
+ public byte[] exportSensitivityResultsAsCsv(UUID nodeUuid, UUID rootNetworkUuid, SensitivityAnalysisCsvFileInfos sensitivityAnalysisCsvFileInfos, String selector, String filters,
+ String globalFilters) {
+ RootNetworkNodeInfoEntity rootNetworkNodeInfoEntity = rootNetworkNodeInfoRepository.findByNodeInfoIdAndRootNetworkId(nodeUuid, rootNetworkUuid).orElseThrow(() -> new StudyException(NOT_FOUND,
+ ROOT_NETWORK_NOT_FOUND));
String variantId = rootNetworkNodeInfoEntity.getVariantId();
UUID networkUuid = rootNetworkNodeInfoEntity.getRootNetwork().getNetworkUuid();
UUID resultUuid = getComputationResultUuid(nodeUuid, rootNetworkUuid, SENSITIVITY_ANALYSIS);
@@ -736,7 +754,8 @@ public byte[] exportSensitivityResultsAsCsv(UUID nodeUuid, UUID rootNetworkUuid,
@Transactional(readOnly = true)
public byte[] exportPccMinResultsAsCsv(UUID nodeUuid, UUID rootNetworkUuid, String csvHeaders, Sort sort, String filters, String globalFilters) {
- RootNetworkNodeInfoEntity rootNetworkNodeInfoEntity = rootNetworkNodeInfoRepository.findByNodeInfoIdAndRootNetworkId(nodeUuid, rootNetworkUuid).orElseThrow(() -> new StudyException(NOT_FOUND, "Root network not found"));
+ RootNetworkNodeInfoEntity rootNetworkNodeInfoEntity = rootNetworkNodeInfoRepository.findByNodeInfoIdAndRootNetworkId(nodeUuid, rootNetworkUuid).orElseThrow(() -> new StudyException(NOT_FOUND,
+ ROOT_NETWORK_NOT_FOUND));
String variantId = rootNetworkNodeInfoEntity.getVariantId();
UUID networkUuid = rootNetworkNodeInfoEntity.getRootNetwork().getNetworkUuid();
UUID resultUuid = getComputationResultUuid(nodeUuid, rootNetworkUuid, PCC_MIN);
@@ -750,8 +769,10 @@ public String getSensitivityResultsFilterOptions(UUID nodeUuid, UUID rootNetwork
}
@Transactional(readOnly = true)
- public String getShortCircuitAnalysisResult(ResultParameters resultParameters, FaultResultsMode mode, ShortcircuitAnalysisType type, String filters, String globalFilters, boolean paged, Pageable pageable) {
- RootNetworkNodeInfoEntity rootNetworkNodeInfoEntity = rootNetworkNodeInfoRepository.findByNodeInfoIdAndRootNetworkId(resultParameters.getNodeUuid(), resultParameters.getRootNetworkUuid()).orElse(null);
+ public String getShortCircuitAnalysisResult(ResultParameters resultParameters, FaultResultsMode mode, ShortcircuitAnalysisType type, String filters, String globalFilters, boolean paged,
+ Pageable pageable) {
+ RootNetworkNodeInfoEntity rootNetworkNodeInfoEntity = rootNetworkNodeInfoRepository.findByNodeInfoIdAndRootNetworkId(resultParameters.getNodeUuid(),
+ resultParameters.getRootNetworkUuid()).orElse(null);
ResultParameters resultParametersEnriched = new ResultParameters(
resultParameters.getRootNetworkUuid(),
resultParameters.getNodeUuid(),
@@ -763,7 +784,8 @@ public String getShortCircuitAnalysisResult(ResultParameters resultParameters, F
@Transactional(readOnly = true)
public byte[] getShortCircuitAnalysisCsvResult(UUID nodeUuid, UUID rootNetworkUuid, ShortcircuitAnalysisType type, String filters, String globalFilters, Sort sort, String headerCsv) {
- RootNetworkNodeInfoEntity rootNetworkNodeInfoEntity = rootNetworkNodeInfoRepository.findByNodeInfoIdAndRootNetworkId(nodeUuid, rootNetworkUuid).orElseThrow(() -> new StudyException(NOT_FOUND, "Root network not found"));
+ RootNetworkNodeInfoEntity rootNetworkNodeInfoEntity = rootNetworkNodeInfoRepository.findByNodeInfoIdAndRootNetworkId(nodeUuid, rootNetworkUuid).orElseThrow(() -> new StudyException(NOT_FOUND,
+ ROOT_NETWORK_NOT_FOUND));
String variantId = rootNetworkNodeInfoEntity.getVariantId();
UUID networkUuid = rootNetworkNodeInfoEntity.getRootNetwork().getNetworkUuid();
UUID resultUuid = getComputationResultUuid(nodeUuid, rootNetworkUuid,
@@ -780,7 +802,7 @@ public String getStateEstimationResult(UUID nodeUuid, UUID rootNetworkUuid) {
@Transactional(readOnly = true)
public String getPccMinResult(UUID nodeUuid, UUID rootNetworkUuid, String filters, String globalFilters, Pageable pageable) {
RootNetworkNodeInfoEntity rootNetworkNodeInfoEntity = rootNetworkNodeInfoRepository.findByNodeInfoIdAndRootNetworkId(nodeUuid, rootNetworkUuid).orElseThrow(()
- -> new StudyException(NOT_FOUND, "Root network not found"));
+ -> new StudyException(NOT_FOUND, ROOT_NETWORK_NOT_FOUND));
String variantId = rootNetworkNodeInfoEntity.getVariantId();
UUID networkUuid = rootNetworkNodeInfoEntity.getRootNetwork().getNetworkUuid();
UUID resultUuid = getComputationResultUuid(nodeUuid, rootNetworkUuid, PCC_MIN);
diff --git a/src/main/java/org/gridsuite/study/server/service/RootNetworkService.java b/src/main/java/org/gridsuite/study/server/service/RootNetworkService.java
index bb7b6c537f..f875dee49f 100644
--- a/src/main/java/org/gridsuite/study/server/service/RootNetworkService.java
+++ b/src/main/java/org/gridsuite/study/server/service/RootNetworkService.java
@@ -18,9 +18,9 @@
import org.gridsuite.study.server.repository.StudyEntity;
import org.gridsuite.study.server.repository.rootnetwork.RootNetworkEntity;
import org.gridsuite.study.server.repository.rootnetwork.RootNetworkRepository;
-import org.gridsuite.study.server.utils.JsonUtils;
import org.gridsuite.study.server.repository.rootnetwork.RootNetworkRequestEntity;
import org.gridsuite.study.server.repository.rootnetwork.RootNetworkRequestRepository;
+import org.gridsuite.study.server.utils.JsonUtils;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -30,10 +30,7 @@
import java.util.stream.Collectors;
import java.util.stream.Stream;
-import static org.gridsuite.study.server.error.StudyBusinessErrorCode.MAXIMUM_ROOT_NETWORK_BY_STUDY_REACHED;
-import static org.gridsuite.study.server.error.StudyBusinessErrorCode.MAXIMUM_TAG_LENGTH_EXCEEDED;
-import static org.gridsuite.study.server.error.StudyBusinessErrorCode.NOT_ALLOWED;
-import static org.gridsuite.study.server.error.StudyBusinessErrorCode.NOT_FOUND;
+import static org.gridsuite.study.server.error.StudyBusinessErrorCode.*;
/**
* @author Le Saulnier Kevin
@@ -175,14 +172,18 @@ public String getCaseName(UUID rootNetworkUuid) {
}
public Map getImportParameters(UUID rootNetworkUuid) {
- return rootNetworkRepository.findWithImportParametersById(rootNetworkUuid).map(RootNetworkEntity::getImportParameters).map(params -> JsonUtils.deserializeImportParameters(params, objectMapper)).orElseThrow(() -> new StudyException(NOT_FOUND, "Root network not found"));
+ return rootNetworkRepository.findWithImportParametersById(rootNetworkUuid)
+ .map(RootNetworkEntity::getImportParameters).map(params -> JsonUtils.deserializeImportParameters(params, objectMapper))
+ .orElseThrow(() -> new StudyException(NOT_FOUND, "Root network not found"));
}
public List getRootNetworkInfosWithLinksInfos(UUID studyUuid) {
- return rootNetworkRepository.findAllWithInfosByStudyId(studyUuid).stream().map(rootNetworkEntity -> rootNetworkEntity.toDto(objectMapper)).toList();
+ return rootNetworkRepository.findAllWithInfosByStudyId(studyUuid).stream()
+ .map(rootNetworkEntity -> rootNetworkEntity.toDto(objectMapper)).toList();
}
@Transactional
+ @SuppressWarnings("checkstyle:LambdaBodyLength")
public void duplicateStudyRootNetworks(StudyEntity newStudyEntity, StudyEntity sourceStudyEntity) {
List rootNetworkEntities = sourceStudyEntity.getRootNetworks();
rootNetworkEntities.forEach(rootNetworkEntityToDuplicate -> {
@@ -202,7 +203,8 @@ public void duplicateStudyRootNetworks(StudyEntity newStudyEntity, StudyEntity s
.id(UUID.randomUUID())
.name(rootNetworkEntityToDuplicate.getName())
.importParameters(newImportParameters)
- .caseInfos(new CaseInfos(clonedCaseUuid, rootNetworkEntityToDuplicate.getOriginalCaseUuid(), rootNetworkEntityToDuplicate.getCaseName(), rootNetworkEntityToDuplicate.getCaseFormat()))
+ .caseInfos(new CaseInfos(clonedCaseUuid, rootNetworkEntityToDuplicate.getOriginalCaseUuid(), rootNetworkEntityToDuplicate.getCaseName(),
+ rootNetworkEntityToDuplicate.getCaseFormat()))
.networkInfos(new NetworkInfos(clonedNetworkUuid, rootNetworkEntityToDuplicate.getNetworkId()))
.reportUuid(clonedRootNodeReportUuid)
.tag(rootNetworkEntityToDuplicate.getTag())
@@ -213,7 +215,8 @@ public void duplicateStudyRootNetworks(StudyEntity newStudyEntity, StudyEntity s
}
private RootNetworkRequestEntity insertRootNetworkRequest(UUID studyUuid, RootNetworkInfos rootNetworkInfos, RootNetworkAction action, String userId) {
- return rootNetworkRequestRepository.save(RootNetworkRequestEntity.builder().id(rootNetworkInfos.getId()).name(rootNetworkInfos.getName()).tag(rootNetworkInfos.getTag()).description(rootNetworkInfos.getDescription()).studyUuid(studyUuid).actionRequest(action).userId(userId).build());
+ return rootNetworkRequestRepository.save(RootNetworkRequestEntity.builder().id(rootNetworkInfos.getId()).name(rootNetworkInfos.getName()).tag(rootNetworkInfos.getTag()).description(
+ rootNetworkInfos.getDescription()).studyUuid(studyUuid).actionRequest(action).userId(userId).build());
}
public RootNetworkRequestEntity insertCreationRequest(UUID studyUuid, RootNetworkInfos rootNetworkInfos, String userId) {
@@ -254,8 +257,10 @@ public void invalidateRootNetworkRemoteInfos(List rootNetworkI
ArrayList> futures = new ArrayList<>();
// delete remote data ids set in root network
futures.add(studyServerExecutionService.runAsync(() -> reportService.deleteReports(rootNetworkInfos.stream().map(RootNetworkInfos::getReportUuid).toList())));
- futures.add(studyServerExecutionService.runAsync(() -> rootNetworkInfos.stream().map(rni -> rni.getNetworkInfos().getNetworkUuid()).filter(Objects::nonNull).forEach(equipmentInfosService::deleteEquipmentIndexes)));
- futures.add(studyServerExecutionService.runAsync(() -> rootNetworkInfos.stream().map(rni -> rni.getNetworkInfos().getNetworkUuid()).filter(Objects::nonNull).forEach(networkStoreService::deleteNetwork)));
+ futures.add(studyServerExecutionService.runAsync(() -> rootNetworkInfos.stream().map(rni -> rni.getNetworkInfos().getNetworkUuid())
+ .filter(Objects::nonNull).forEach(equipmentInfosService::deleteEquipmentIndexes)));
+ futures.add(studyServerExecutionService.runAsync(() -> rootNetworkInfos.stream().map(rni -> rni.getNetworkInfos().getNetworkUuid())
+ .filter(Objects::nonNull).forEach(networkStoreService::deleteNetwork)));
if (deleteCase) {
studyServerExecutionService.runAsync(() -> rootNetworkInfos.stream().map(rni -> rni.getCaseInfos().getCaseUuid()).filter(Objects::nonNull).forEach(caseService::deleteCase));
}
@@ -263,7 +268,8 @@ public void invalidateRootNetworkRemoteInfos(List rootNetworkI
CompletableFuture.allOf(futures.toArray(CompletableFuture[]::new)).join();
}
// delete remote data ids set in root network node infos
- rootNetworkNodeInfoService.deleteRootNetworkNodeRemoteInfos(rootNetworkInfos.stream().map(RootNetworkInfos::getRootNetworkNodeInfos).filter(Objects::nonNull).flatMap(Collection::stream).toList());
+ rootNetworkNodeInfoService.deleteRootNetworkNodeRemoteInfos(rootNetworkInfos.stream().map(RootNetworkInfos::getRootNetworkNodeInfos).filter(Objects::nonNull).flatMap(
+ Collection::stream).toList());
}
public Optional getRootNetworkRequest(UUID rootNetworkUuid) {
diff --git a/src/main/java/org/gridsuite/study/server/service/SecurityAnalysisService.java b/src/main/java/org/gridsuite/study/server/service/SecurityAnalysisService.java
index 4ebf611275..2082b9ad31 100644
--- a/src/main/java/org/gridsuite/study/server/service/SecurityAnalysisService.java
+++ b/src/main/java/org/gridsuite/study/server/service/SecurityAnalysisService.java
@@ -11,11 +11,11 @@
import lombok.Setter;
import org.apache.commons.lang3.StringUtils;
import org.gridsuite.study.server.RemoteServicesProperties;
-import org.gridsuite.study.server.error.StudyException;
import org.gridsuite.study.server.dto.NodeReceiver;
import org.gridsuite.study.server.dto.ReportInfos;
import org.gridsuite.study.server.dto.RunSecurityAnalysisParametersInfos;
import org.gridsuite.study.server.dto.SecurityAnalysisStatus;
+import org.gridsuite.study.server.error.StudyException;
import org.gridsuite.study.server.repository.StudyEntity;
import org.gridsuite.study.server.service.common.AbstractComputationService;
import org.gridsuite.study.server.service.common.ComputationParameters;
@@ -28,14 +28,12 @@
import org.springframework.stereotype.Service;
import org.springframework.web.client.RestTemplate;
import org.springframework.web.util.UriComponentsBuilder;
-
import java.io.UncheckedIOException;
import java.net.URLEncoder;
import java.nio.charset.StandardCharsets;
import java.util.List;
import java.util.Objects;
import java.util.UUID;
-
import static org.gridsuite.study.server.StudyConstants.*;
import static org.gridsuite.study.server.error.StudyBusinessErrorCode.*;
@@ -79,7 +77,8 @@ public String getSecurityAnalysisResult(UUID resultUuid, UUID networkUuid, Strin
return restTemplate.getForObject(securityAnalysisServerBaseUri + path, String.class);
}
- public byte[] getSecurityAnalysisResultCsv(UUID resultUuid, UUID networkUuid, String variantId, SecurityAnalysisResultType resultType, String globalFilters, String filters, Sort sort, String csvTranslations) {
+ public byte[] getSecurityAnalysisResultCsv(UUID resultUuid, UUID networkUuid, String variantId, SecurityAnalysisResultType resultType, String globalFilters, String filters, Sort sort, String
+ csvTranslations) {
if (resultUuid == null) {
throw new StudyException(NOT_FOUND, "Result for security analysis not found");
}
diff --git a/src/main/java/org/gridsuite/study/server/service/SensitivityAnalysisService.java b/src/main/java/org/gridsuite/study/server/service/SensitivityAnalysisService.java
index 20803e9ec5..bc1f368792 100644
--- a/src/main/java/org/gridsuite/study/server/service/SensitivityAnalysisService.java
+++ b/src/main/java/org/gridsuite/study/server/service/SensitivityAnalysisService.java
@@ -10,15 +10,18 @@
import com.fasterxml.jackson.databind.ObjectMapper;
import org.apache.commons.lang3.StringUtils;
import org.gridsuite.study.server.RemoteServicesProperties;
-import org.gridsuite.study.server.error.StudyException;
import org.gridsuite.study.server.dto.NodeReceiver;
import org.gridsuite.study.server.dto.SensitivityAnalysisStatus;
import org.gridsuite.study.server.dto.sensianalysis.SensitivityAnalysisCsvFileInfos;
+import org.gridsuite.study.server.error.StudyException;
import org.gridsuite.study.server.repository.StudyEntity;
import org.gridsuite.study.server.service.common.AbstractComputationService;
import org.gridsuite.study.server.service.common.ComputationParameters;
import org.springframework.core.ParameterizedTypeReference;
-import org.springframework.http.*;
+import org.springframework.http.HttpEntity;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpMethod;
+import org.springframework.http.MediaType;
import org.springframework.lang.Nullable;
import org.springframework.stereotype.Service;
import org.springframework.web.client.RestClientException;
@@ -29,10 +32,14 @@
import java.net.URI;
import java.net.URLEncoder;
import java.nio.charset.StandardCharsets;
-import java.util.*;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.UUID;
import static org.gridsuite.study.server.StudyConstants.*;
-import static org.gridsuite.study.server.error.StudyBusinessErrorCode.*;
+import static org.gridsuite.study.server.error.StudyBusinessErrorCode.COMPUTATION_RUNNING;
+import static org.gridsuite.study.server.error.StudyBusinessErrorCode.NOT_FOUND;
/**
* @author Franck Lecuyer
@@ -129,7 +136,8 @@ public String getSensitivityAnalysisResult(UUID resultUuid, UUID networkUuid, St
return restTemplate.getForObject(uri, String.class);
}
- public byte[] exportSensitivityResultsAsCsv(UUID resultUuid, SensitivityAnalysisCsvFileInfos sensitivityAnalysisCsvFileInfos, UUID networkUuid, String variantId, String selector, String filters, String globalFilters) {
+ public byte[] exportSensitivityResultsAsCsv(UUID resultUuid, SensitivityAnalysisCsvFileInfos sensitivityAnalysisCsvFileInfos, UUID networkUuid, String variantId, String selector, String filters,
+ String globalFilters) {
if (resultUuid == null) {
throw new StudyException(NOT_FOUND, "Result of sensitivity analysis was not found");
}
diff --git a/src/main/java/org/gridsuite/study/server/service/StateEstimationService.java b/src/main/java/org/gridsuite/study/server/service/StateEstimationService.java
index 65777796cd..e4c659facb 100644
--- a/src/main/java/org/gridsuite/study/server/service/StateEstimationService.java
+++ b/src/main/java/org/gridsuite/study/server/service/StateEstimationService.java
@@ -11,10 +11,10 @@
import lombok.Setter;
import org.apache.commons.lang3.StringUtils;
import org.gridsuite.study.server.RemoteServicesProperties;
-import org.gridsuite.study.server.error.StudyException;
import org.gridsuite.study.server.dto.NodeReceiver;
import org.gridsuite.study.server.dto.ReportInfos;
import org.gridsuite.study.server.dto.StateEstimationStatus;
+import org.gridsuite.study.server.error.StudyException;
import org.gridsuite.study.server.repository.StudyEntity;
import org.gridsuite.study.server.service.common.AbstractComputationService;
import org.gridsuite.study.server.service.common.ComputationParameters;
@@ -27,14 +27,12 @@
import org.springframework.stereotype.Service;
import org.springframework.web.client.RestTemplate;
import org.springframework.web.util.UriComponentsBuilder;
-
import java.io.UncheckedIOException;
import java.net.URLEncoder;
import java.nio.charset.StandardCharsets;
import java.util.List;
import java.util.Objects;
import java.util.UUID;
-
import static org.gridsuite.study.server.StudyConstants.*;
import static org.gridsuite.study.server.error.StudyBusinessErrorCode.COMPUTATION_RUNNING;
diff --git a/src/main/java/org/gridsuite/study/server/service/StudyConfigService.java b/src/main/java/org/gridsuite/study/server/service/StudyConfigService.java
index b307336a7c..f7b47df351 100644
--- a/src/main/java/org/gridsuite/study/server/service/StudyConfigService.java
+++ b/src/main/java/org/gridsuite/study/server/service/StudyConfigService.java
@@ -410,7 +410,8 @@ public UUID saveWorkspacePanelNadConfig(UUID configId, UUID workspaceId, UUID pa
Objects.requireNonNull(configId);
Objects.requireNonNull(workspaceId);
Objects.requireNonNull(panelId);
- String path = UriComponentsBuilder.fromPath(DELIMITER + STUDY_CONFIG_API_VERSION + WORKSPACES_CONFIG_WITH_ID_URI + WORKSPACE_WITH_ID_URI + WORKSPACE_PANELS_URI + "/{panelId}/current-nad-config")
+ String path = UriComponentsBuilder.fromPath(DELIMITER + STUDY_CONFIG_API_VERSION + WORKSPACES_CONFIG_WITH_ID_URI + WORKSPACE_WITH_ID_URI + WORKSPACE_PANELS_URI
+ + "/{panelId}/current-nad-config")
.buildAndExpand(configId, workspaceId, panelId).toUriString();
HttpHeaders headers = new HttpHeaders();
headers.setContentType(MediaType.APPLICATION_JSON);
@@ -422,7 +423,8 @@ public void deleteWorkspacePanelNadConfig(UUID configId, UUID workspaceId, UUID
Objects.requireNonNull(configId);
Objects.requireNonNull(workspaceId);
Objects.requireNonNull(panelId);
- String path = UriComponentsBuilder.fromPath(DELIMITER + STUDY_CONFIG_API_VERSION + WORKSPACES_CONFIG_WITH_ID_URI + WORKSPACE_WITH_ID_URI + WORKSPACE_PANELS_URI + "/{panelId}/current-nad-config")
+ String path = UriComponentsBuilder.fromPath(DELIMITER + STUDY_CONFIG_API_VERSION + WORKSPACES_CONFIG_WITH_ID_URI + WORKSPACE_WITH_ID_URI + WORKSPACE_PANELS_URI
+ + "/{panelId}/current-nad-config")
.buildAndExpand(configId, workspaceId, panelId).toUriString();
restTemplate.delete(studyConfigServerBaseUri + path);
}
diff --git a/src/main/java/org/gridsuite/study/server/service/StudyService.java b/src/main/java/org/gridsuite/study/server/service/StudyService.java
index c8dba0254f..d838d07c6f 100644
--- a/src/main/java/org/gridsuite/study/server/service/StudyService.java
+++ b/src/main/java/org/gridsuite/study/server/service/StudyService.java
@@ -549,7 +549,8 @@ private Optional doDeleteStudyIfNotCreationInProgress(UUID stu
if (studyCreationRequestEntity.isEmpty() && studyEntity.isPresent()) {
List rootNetworkInfos = getStudyRootNetworksInfos(studyUuid);
// get all modification groups related to the study
- List modificationGroupUuids = networkModificationTreeService.getAllStudyNetworkModificationNodeInfo(studyUuid).stream().map(NetworkModificationNodeInfoEntity::getModificationGroupUuid).toList();
+ List modificationGroupUuids = networkModificationTreeService.getAllStudyNetworkModificationNodeInfo(studyUuid).stream()
+ .map(NetworkModificationNodeInfoEntity::getModificationGroupUuid).toList();
StudyEntity s = studyEntity.get();
networkModificationTreeService.doDeleteTree(studyUuid);
studyRepository.deleteById(studyUuid);
@@ -750,7 +751,8 @@ public String generateVoltageLevelSvgAndMetadata(String voltageLevelId, UUID nod
}
String variantId = networkModificationTreeService.getVariantId(nodeUuid, rootNetworkUuid);
if (networkStoreService.existVariant(networkUuid, variantId)) {
- return singleLineDiagramService.generateVoltageLevelSvgAndMetadata(networkUuid, variantId, voltageLevelId, populateSldRequestInfos(sldRequestInfos, voltageLevelId, nodeUuid, rootNetworkUuid));
+ return singleLineDiagramService.generateVoltageLevelSvgAndMetadata(networkUuid, variantId, voltageLevelId, populateSldRequestInfos(sldRequestInfos, voltageLevelId, nodeUuid,
+ rootNetworkUuid));
} else {
return null;
}
@@ -826,10 +828,11 @@ public String getNetworkElementInfos(UUID studyUuid,
elementId);
}
- private Map getSingleElementOptionalParameters(String elementId, String elementType, StudyEntity studyEntity, UUID nodeUuid, UUID rootNetworkUuid, LoadFlowParameters loadFlowParameters) {
+ private Map getSingleElementOptionalParameters(String elementId, String elementType, StudyEntity studyEntity, UUID nodeUuid, UUID rootNetworkUuid,
+ LoadFlowParameters loadFlowParameters) {
Map additionalParameters = getOptionalParameters(elementType, studyEntity, loadFlowParameters);
- if (elementType.equalsIgnoreCase("voltage_level")) {
+ if ("voltage_level".equalsIgnoreCase(elementType)) {
try {
additionalParameters.put(
InfoTypeParameters.QUERY_PARAM_BUS_ID_TO_ICC_VALUES,
@@ -1002,7 +1005,8 @@ private void handleLoadflowRequest(StudyEntity studyEntity, UUID nodeUuid, UUID
boolean isSecurityNode = networkModificationTreeService.isSecurityNode(nodeUuid);
networkModificationTreeService.updateComputationReportUuid(nodeUuid, rootNetworkUuid, LOAD_FLOW, lfReportUuid);
- UUID result = loadflowService.runLoadFlow(new NodeReceiver(nodeUuid, rootNetworkUuid), loadflowResultUuid, new VariantInfos(networkUuid, variantId), new LoadFlowService.ParametersInfos(lfParametersUuid, withRatioTapChangers, isSecurityNode), lfReportUuid, userId);
+ UUID result = loadflowService.runLoadFlow(new NodeReceiver(nodeUuid, rootNetworkUuid), loadflowResultUuid, new VariantInfos(networkUuid, variantId),
+ new LoadFlowService.ParametersInfos(lfParametersUuid, withRatioTapChangers, isSecurityNode), lfReportUuid, userId);
rootNetworkNodeInfoService.updateLoadflowResultUuid(nodeUuid, rootNetworkUuid, result, withRatioTapChangers);
notificationService.emitStudyChanged(studyEntity.getId(), nodeUuid, rootNetworkUuid, LOAD_FLOW.getUpdateStatusType());
@@ -1493,7 +1497,8 @@ private StudyEntity updateRootNetworkIndexationStatus(StudyEntity studyEntity, R
}
public StudyEntity updateRootNetworkIndexationStatus(UUID studyUuid, UUID rootNetworkUuid, RootNetworkIndexationStatus indexationStatus) {
- return updateRootNetworkIndexationStatus(getStudy(studyUuid), rootNetworkService.getRootNetwork(rootNetworkUuid).orElseThrow(() -> new StudyException(NOT_FOUND, "Root network not found")), indexationStatus);
+ return updateRootNetworkIndexationStatus(getStudy(studyUuid), rootNetworkService.getRootNetwork(rootNetworkUuid).orElseThrow(() -> new StudyException(NOT_FOUND, "Root network not found")),
+ indexationStatus);
}
private StudyEntity saveStudyThenCreateBasicTree(UUID studyUuid, NetworkInfos networkInfos,
@@ -1528,7 +1533,9 @@ private StudyEntity saveStudyThenCreateBasicTree(UUID studyUuid, NetworkInfos ne
// in this case, the first root network's name is the name the user entered when selecting the case.
firstRootNetworkName = studyCreationRequestEntity.get().getFirstRootNetworkName();
}
- rootNetworkService.createRootNetwork(studyEntity, RootNetworkInfos.builder().id(UUID.randomUUID()).name(firstRootNetworkName).networkInfos(networkInfos).caseInfos(caseInfos).reportUuid(importReportUuid).importParameters(importParameters).tag("1").build());
+ rootNetworkService.createRootNetwork(studyEntity,
+ RootNetworkInfos.builder().id(UUID.randomUUID()).name(firstRootNetworkName).networkInfos(networkInfos).caseInfos(caseInfos).reportUuid(importReportUuid).importParameters(
+ importParameters).tag("1").build());
networkModificationTreeService.createBasicTree(study);
return study;
@@ -1995,7 +2002,8 @@ public void deleteNetworkModifications(UUID studyUuid, UUID nodeUuid, List
UUID groupId = networkModificationTreeService.getModificationGroupUuid(nodeUuid);
networkModificationService.deleteModifications(groupId, modificationsUuids);
// for each root network, remove modifications from excluded ones
- studyEntity.getRootNetworks().forEach(rootNetworkEntity -> rootNetworkNodeInfoService.updateModificationsToExclude(nodeUuid, rootNetworkEntity.getId(), new HashSet<>(modificationsUuids), true));
+ studyEntity.getRootNetworks().forEach(rootNetworkEntity -> rootNetworkNodeInfoService.updateModificationsToExclude(nodeUuid, rootNetworkEntity.getId(), new HashSet<>(modificationsUuids),
+ true));
} finally {
notificationService.emitEndDeletionEquipmentNotification(studyUuid, nodeUuid, childrenUuids);
}
@@ -2222,7 +2230,8 @@ private StudyEntity getStudy(UUID studyUuid) {
public Map getNodeBuildStatusByRootNetwork(UUID studyUuid, UUID nodeUuid) {
return getStudyRootNetworks(studyUuid).stream().collect(Collectors.toMap(
RootNetworkEntity::getId,
- rn -> rootNetworkNodeInfoService.getRootNetworkNodeInfo(nodeUuid, rn.getId()).map(rni -> rni.getNodeBuildStatus().toDto()).orElseThrow(() -> new StudyException(NOT_FOUND, "Root network not found"))
+ rn -> rootNetworkNodeInfoService.getRootNetworkNodeInfo(nodeUuid, rn.getId()).map(rni -> rni.getNodeBuildStatus().toDto()).orElseThrow(() -> new StudyException(NOT_FOUND,
+ "Root network not found"))
));
}
@@ -2267,7 +2276,8 @@ public void moveNetworkModifications(
.map(rootNetworkEntity -> rootNetworkNodeInfoService.getNetworkModificationApplicationContext(rootNetworkEntity.getId(), targetNodeUuid, rootNetworkEntity.getNetworkUuid()))
.toList();
- NetworkModificationsResult networkModificationsResult = networkModificationService.moveModifications(originGroupUuid, targetGroupUuid, beforeUuid, Pair.of(modificationUuidList, modificationApplicationContexts), isTargetInDifferentNodeTree);
+ NetworkModificationsResult networkModificationsResult = networkModificationService.moveModifications(originGroupUuid, targetGroupUuid, beforeUuid,
+ Pair.of(modificationUuidList, modificationApplicationContexts), isTargetInDifferentNodeTree);
Set allMovedUuids = networkModificationService.expandToLeafUuids(networkModificationsResult.modificationUuids());
rootNetworkNodeInfoService.moveModificationsToExclude(originNodeUuid, targetNodeUuid, new ArrayList<>(allMovedUuids));
@@ -2610,8 +2620,8 @@ private UUID handleSensitivityAnalysisRequest(StudyEntity study, UUID nodeUuid,
// and retrieve their names, as they are needed in the results
List elementIds = sensitivityAnalysisService.getElementIds(sensiParamsUuid);
Map elementsIdNameMap = directoryService.getElementNames(new HashSet<>(elementIds));
-
- UUID result = sensitivityAnalysisService.runSensitivityAnalysis(nodeUuid, rootNetworkUuid, networkUuid, variantId, sensiReportUuid, userId, sensiParamsUuid, study.getLoadFlowParametersUuid(), elementsIdNameMap);
+ UUID result = sensitivityAnalysisService.runSensitivityAnalysis(nodeUuid, rootNetworkUuid, networkUuid, variantId,
+ sensiReportUuid, userId, sensiParamsUuid, study.getLoadFlowParametersUuid(), elementsIdNameMap);
updateComputationResultUuid(nodeUuid, rootNetworkUuid, result, SENSITIVITY_ANALYSIS);
notificationService.emitStudyChanged(study.getId(), nodeUuid, rootNetworkUuid, NotificationService.UPDATE_TYPE_SENSITIVITY_ANALYSIS_STATUS);
@@ -2637,7 +2647,8 @@ private UUID handleShortCircuitRequest(StudyEntity studyEntity, UUID nodeUuid, U
UUID networkUuid = rootNetworkService.getNetworkUuid(rootNetworkUuid);
String variantId = networkModificationTreeService.getVariantId(nodeUuid, rootNetworkUuid);
networkModificationTreeService.updateComputationReportUuid(nodeUuid, rootNetworkUuid, computationType, scReportUuid);
- final UUID result = shortCircuitService.runShortCircuit(rootNetworkUuid, new VariantInfos(networkUuid, variantId), busId.orElse(null), studyEntity.getShortCircuitParametersUuid(), new ReportInfos(scReportUuid, nodeUuid), userId, debug);
+ final UUID result = shortCircuitService.runShortCircuit(rootNetworkUuid, new VariantInfos(networkUuid, variantId), busId.orElse(null), studyEntity.getShortCircuitParametersUuid(),
+ new ReportInfos(scReportUuid, nodeUuid), userId, debug);
updateComputationResultUuid(nodeUuid, rootNetworkUuid, result, computationType);
notificationService.emitStudyChanged(studyEntity.getId(), nodeUuid, rootNetworkUuid,
busId.isEmpty() ? NotificationService.UPDATE_TYPE_SHORT_CIRCUIT_STATUS : NotificationService.UPDATE_TYPE_ONE_BUS_SHORT_CIRCUIT_STATUS);
@@ -2965,7 +2976,8 @@ private UUID handleDynamicSimulationRequest(StudyEntity studyEntity, UUID nodeUu
// launch dynamic simulation
UUID networkUuid = rootNetworkService.getNetworkUuid(rootNetworkUuid);
String variantId = networkModificationTreeService.getVariantId(nodeUuid, rootNetworkUuid);
- UUID dynamicSimulationResultUuid = dynamicSimulationService.runDynamicSimulation(nodeUuid, rootNetworkUuid, networkUuid, variantId, reportUuid, dynamicSimulationParametersUuid, events, userId, debug);
+ UUID dynamicSimulationResultUuid = dynamicSimulationService.runDynamicSimulation(nodeUuid, rootNetworkUuid, networkUuid, variantId, reportUuid, dynamicSimulationParametersUuid, events, userId,
+ debug);
// update result uuid and notification
updateComputationResultUuid(nodeUuid, rootNetworkUuid, dynamicSimulationResultUuid, DYNAMIC_SIMULATION);
@@ -3180,7 +3192,8 @@ public void insertVoltageInitModifications(UUID studyUuid, UUID nodeUuid, UUID r
}
});
// duplicate the modification created by voltageInit server into the current node
- NetworkModificationsResult networkModificationResults = networkModificationService.duplicateModificationsFromGroup(networkModificationTreeService.getModificationGroupUuid(nodeUuid), voltageInitModificationsGroupUuid, Pair.of(List.of(), modificationApplicationContexts));
+ NetworkModificationsResult networkModificationResults = networkModificationService.duplicateModificationsFromGroup(networkModificationTreeService.getModificationGroupUuid(nodeUuid),
+ voltageInitModificationsGroupUuid, Pair.of(List.of(), modificationApplicationContexts));
// We expect a single voltageInit modification in the result list
if (networkModificationResults != null && networkModificationResults.modificationUuids().size() == 1) {
diff --git a/src/main/java/org/gridsuite/study/server/service/VoltageInitResultConsumer.java b/src/main/java/org/gridsuite/study/server/service/VoltageInitResultConsumer.java
index 33153d766c..a4f0455912 100644
--- a/src/main/java/org/gridsuite/study/server/service/VoltageInitResultConsumer.java
+++ b/src/main/java/org/gridsuite/study/server/service/VoltageInitResultConsumer.java
@@ -50,7 +50,8 @@ private void checkReactiveSlacksOverThreshold(Message msg, UUID studyUui
if (Boolean.TRUE.equals(alert)) {
String userId = msg.getHeaders().get(HEADER_USER_ID, String.class);
Double alertThreshold = msg.getHeaders().get(HEADER_REACTIVE_SLACKS_THRESHOLD_VALUE, Double.class);
- notificationService.emitStudyAlert(studyUuid, nodeReceiver.getNodeUuid(), nodeReceiver.getRootNetworkUuid(), userId, new StudyAlert(AlertLevel.WARNING, HEADER_REACTIVE_SLACKS_OVER_THRESHOLD, Map.of("threshold", alertThreshold.toString())));
+ notificationService.emitStudyAlert(studyUuid, nodeReceiver.getNodeUuid(), nodeReceiver.getRootNetworkUuid(), userId, new StudyAlert(AlertLevel.WARNING,
+ HEADER_REACTIVE_SLACKS_OVER_THRESHOLD, Map.of("threshold", alertThreshold.toString())));
}
});
}
@@ -60,7 +61,8 @@ private void checkVoltageLevelLimitsOutOfNominalVoltageRange(Message msg
Boolean alert = msg.getHeaders().get(HEADER_VOLTAGE_LEVEL_LIMITS_OUT_OF_NOMINAL_VOLTAGE_RANGE, Boolean.class);
if (Boolean.TRUE.equals(alert)) {
String userId = msg.getHeaders().get(HEADER_USER_ID, String.class);
- notificationService.emitStudyAlert(studyUuid, nodeReceiver.getNodeUuid(), nodeReceiver.getRootNetworkUuid(), userId, new StudyAlert(AlertLevel.WARNING, HEADER_VOLTAGE_LEVEL_LIMITS_OUT_OF_NOMINAL_VOLTAGE_RANGE, null));
+ notificationService.emitStudyAlert(studyUuid, nodeReceiver.getNodeUuid(), nodeReceiver.getRootNetworkUuid(), userId, new StudyAlert(AlertLevel.WARNING,
+ HEADER_VOLTAGE_LEVEL_LIMITS_OUT_OF_NOMINAL_VOLTAGE_RANGE, null));
}
});
}
diff --git a/src/main/java/org/gridsuite/study/server/service/VoltageInitService.java b/src/main/java/org/gridsuite/study/server/service/VoltageInitService.java
index 5f5290f75c..0500a14fbb 100644
--- a/src/main/java/org/gridsuite/study/server/service/VoltageInitService.java
+++ b/src/main/java/org/gridsuite/study/server/service/VoltageInitService.java
@@ -11,13 +11,13 @@
import com.fasterxml.jackson.databind.ObjectMapper;
import org.apache.commons.lang3.StringUtils;
import org.gridsuite.study.server.RemoteServicesProperties;
-import org.gridsuite.study.server.dto.voltageinit.ContextInfos;
-import org.gridsuite.study.server.error.StudyException;
import org.gridsuite.study.server.dto.NodeReceiver;
import org.gridsuite.study.server.dto.ReportInfos;
import org.gridsuite.study.server.dto.VariantInfos;
import org.gridsuite.study.server.dto.VoltageInitStatus;
+import org.gridsuite.study.server.dto.voltageinit.ContextInfos;
import org.gridsuite.study.server.dto.voltageinit.parameters.VoltageInitParametersInfos;
+import org.gridsuite.study.server.error.StudyException;
import org.gridsuite.study.server.service.common.AbstractComputationService;
import org.gridsuite.study.server.service.common.ComputationParameters;
import org.springframework.http.*;
@@ -25,14 +25,12 @@
import org.springframework.stereotype.Service;
import org.springframework.web.client.RestTemplate;
import org.springframework.web.util.UriComponentsBuilder;
-
import java.io.UncheckedIOException;
import java.net.URLEncoder;
import java.nio.charset.StandardCharsets;
import java.util.List;
import java.util.Objects;
import java.util.UUID;
-
import static org.gridsuite.study.server.StudyConstants.*;
import static org.gridsuite.study.server.error.StudyBusinessErrorCode.*;
diff --git a/src/main/java/org/gridsuite/study/server/service/client/timeseries/impl/TimeSeriesClientImpl.java b/src/main/java/org/gridsuite/study/server/service/client/timeseries/impl/TimeSeriesClientImpl.java
index 1d853b5e13..e161b0556c 100644
--- a/src/main/java/org/gridsuite/study/server/service/client/timeseries/impl/TimeSeriesClientImpl.java
+++ b/src/main/java/org/gridsuite/study/server/service/client/timeseries/impl/TimeSeriesClientImpl.java
@@ -25,7 +25,6 @@
import static org.gridsuite.study.server.service.client.util.UrlUtil.buildEndPointUrl;
-
/**
* @author Thang PHAM
*/
diff --git a/src/main/java/org/gridsuite/study/server/service/dynamicmargincalculation/DynamicMarginCalculationService.java b/src/main/java/org/gridsuite/study/server/service/dynamicmargincalculation/DynamicMarginCalculationService.java
index 5c86e5c28f..e139bbac31 100644
--- a/src/main/java/org/gridsuite/study/server/service/dynamicmargincalculation/DynamicMarginCalculationService.java
+++ b/src/main/java/org/gridsuite/study/server/service/dynamicmargincalculation/DynamicMarginCalculationService.java
@@ -70,7 +70,8 @@ public void deleteParameters(UUID parametersUuid) {
}
public UUID runDynamicMarginCalculation(UUID nodeUuid, UUID rootNetworkUuid, UUID networkUuid,
- String variantId, UUID reportUuid, UUID dynamicSimulationParametersUuid, UUID dynamicSecurityAnalysisParametersUuid, UUID parametersUuid, String userId, boolean debug) {
+ String variantId, UUID reportUuid, UUID dynamicSimulationParametersUuid, UUID dynamicSecurityAnalysisParametersUuid, UUID parametersUuid, String userId,
+ boolean debug) {
// create receiver for getting back the notification in rabbitmq
String receiver;
@@ -82,7 +83,8 @@ public UUID runDynamicMarginCalculation(UUID nodeUuid, UUID rootNetworkUuid, UUI
throw new UncheckedIOException(e);
}
- return dynamicMarginCalculationClient.run(receiver, networkUuid, variantId, new ReportInfos(reportUuid, nodeUuid), dynamicSimulationParametersUuid, dynamicSecurityAnalysisParametersUuid, parametersUuid, userId, debug);
+ return dynamicMarginCalculationClient.run(receiver, networkUuid, variantId, new ReportInfos(reportUuid, nodeUuid), dynamicSimulationParametersUuid, dynamicSecurityAnalysisParametersUuid,
+ parametersUuid, userId, debug);
}
public DynamicMarginCalculationStatus getStatus(UUID resultUuid) {
diff --git a/src/main/java/org/gridsuite/study/server/service/shortcircuit/FaultResultsMode.java b/src/main/java/org/gridsuite/study/server/service/shortcircuit/FaultResultsMode.java
index 79f75fd9ec..fbcb33b394 100644
--- a/src/main/java/org/gridsuite/study/server/service/shortcircuit/FaultResultsMode.java
+++ b/src/main/java/org/gridsuite/study/server/service/shortcircuit/FaultResultsMode.java
@@ -8,7 +8,7 @@
/**
* Specify if the faults are present in the result DTO and if so what they contain
- * @author Sylvain Bouzols
*/
public enum FaultResultsMode {
/**
diff --git a/src/main/java/org/gridsuite/study/server/service/shortcircuit/ShortCircuitService.java b/src/main/java/org/gridsuite/study/server/service/shortcircuit/ShortCircuitService.java
index 480db529a5..2fb9c90c20 100644
--- a/src/main/java/org/gridsuite/study/server/service/shortcircuit/ShortCircuitService.java
+++ b/src/main/java/org/gridsuite/study/server/service/shortcircuit/ShortCircuitService.java
@@ -13,11 +13,11 @@
import lombok.Setter;
import org.apache.commons.lang3.StringUtils;
import org.gridsuite.study.server.RemoteServicesProperties;
-import org.gridsuite.study.server.error.StudyException;
import org.gridsuite.study.server.dto.NodeReceiver;
import org.gridsuite.study.server.dto.ReportInfos;
import org.gridsuite.study.server.dto.ShortCircuitStatus;
import org.gridsuite.study.server.dto.VariantInfos;
+import org.gridsuite.study.server.error.StudyException;
import org.gridsuite.study.server.service.StudyService;
import org.gridsuite.study.server.service.common.AbstractComputationService;
import org.gridsuite.study.server.service.common.ComputationParameters;
@@ -31,7 +31,6 @@
import org.springframework.stereotype.Service;
import org.springframework.web.client.RestTemplate;
import org.springframework.web.util.UriComponentsBuilder;
-
import java.io.UncheckedIOException;
import java.net.URI;
import java.net.URLEncoder;
@@ -40,7 +39,6 @@
import java.util.Map;
import java.util.Objects;
import java.util.UUID;
-
import static org.gridsuite.study.server.StudyConstants.*;
import static org.gridsuite.study.server.error.StudyBusinessErrorCode.*;
import static org.gridsuite.study.server.utils.StudyUtils.*;
@@ -132,7 +130,8 @@ private String getShortCircuitAnalysisResultsPageResourcePath(UUID resultUuid, S
return resultPath + "/paged";
}
- public String getShortCircuitAnalysisResult(ResultParameters resultParameters, FaultResultsMode mode, ShortcircuitAnalysisType type, String filters, String globalFilters, boolean paged, Pageable pageable) {
+ public String getShortCircuitAnalysisResult(ResultParameters resultParameters, FaultResultsMode mode, ShortcircuitAnalysisType type, String filters, String globalFilters, boolean paged, Pageable
+ pageable) {
if (paged) {
return getShortCircuitAnalysisResultsPage(resultParameters, mode, type, filters, globalFilters, pageable);
} else {
diff --git a/src/main/java/org/gridsuite/study/server/utils/PropertyUtils.java b/src/main/java/org/gridsuite/study/server/utils/PropertyUtils.java
index a37390c0f0..60a5639196 100644
--- a/src/main/java/org/gridsuite/study/server/utils/PropertyUtils.java
+++ b/src/main/java/org/gridsuite/study/server/utils/PropertyUtils.java
@@ -16,7 +16,7 @@
import java.util.Arrays;
/**
- * @author Jacques Borsenberger
*/
public final class PropertyUtils {
private PropertyUtils() {
diff --git a/src/main/java/org/gridsuite/study/server/utils/StudyUtils.java b/src/main/java/org/gridsuite/study/server/utils/StudyUtils.java
index 69e25d4090..f7daee99a1 100644
--- a/src/main/java/org/gridsuite/study/server/utils/StudyUtils.java
+++ b/src/main/java/org/gridsuite/study/server/utils/StudyUtils.java
@@ -14,7 +14,7 @@
import static org.gridsuite.study.server.StudyConstants.*;
/**
- * @author Slimane amar
*/
public final class StudyUtils {
diff --git a/src/main/java/org/gridsuite/study/server/utils/annotations/PostCompletion.java b/src/main/java/org/gridsuite/study/server/utils/annotations/PostCompletion.java
index 8f0bbc751f..9f59e92352 100644
--- a/src/main/java/org/gridsuite/study/server/utils/annotations/PostCompletion.java
+++ b/src/main/java/org/gridsuite/study/server/utils/annotations/PostCompletion.java
@@ -12,7 +12,7 @@
import java.lang.annotation.Target;
/**
- * @author Nicolas Noir
*/
@Target(ElementType.METHOD)
@Retention(RetentionPolicy.RUNTIME)
diff --git a/src/main/java/org/gridsuite/study/server/utils/annotations/PostCompletionAdapter.java b/src/main/java/org/gridsuite/study/server/utils/annotations/PostCompletionAdapter.java
index dafa5af119..58a8f2a140 100644
--- a/src/main/java/org/gridsuite/study/server/utils/annotations/PostCompletionAdapter.java
+++ b/src/main/java/org/gridsuite/study/server/utils/annotations/PostCompletionAdapter.java
@@ -15,7 +15,7 @@
import java.util.List;
/**
- * @author Nicolas Noir
*/
@Component
public class PostCompletionAdapter implements TransactionSynchronization {
diff --git a/src/main/java/org/gridsuite/study/server/utils/annotations/PostCompletionAnnotationAspect.java b/src/main/java/org/gridsuite/study/server/utils/annotations/PostCompletionAnnotationAspect.java
index 36522505b9..2aaf5b7cbf 100644
--- a/src/main/java/org/gridsuite/study/server/utils/annotations/PostCompletionAnnotationAspect.java
+++ b/src/main/java/org/gridsuite/study/server/utils/annotations/PostCompletionAnnotationAspect.java
@@ -13,7 +13,7 @@
import org.springframework.stereotype.Component;
/**
- * @author Nicolas Noir
*/
@Aspect
@AllArgsConstructor
@@ -30,7 +30,7 @@ public Object executePostCompletion(final ProceedingJoinPoint pjp) {
private static final class PjpAfterCompletionRunnable implements Runnable {
private final ProceedingJoinPoint pjp;
- public PjpAfterCompletionRunnable(ProceedingJoinPoint pjp) {
+ PjpAfterCompletionRunnable(ProceedingJoinPoint pjp) {
this.pjp = pjp;
}
diff --git a/src/main/resources/org/gridsuite/study/server/reports_fr.properties b/src/main/resources/org/gridsuite/study/server/reports_fr.properties
new file mode 100644
index 0000000000..8afa470eae
--- /dev/null
+++ b/src/main/resources/org/gridsuite/study/server/reports_fr.properties
@@ -0,0 +1 @@
+study.server.modificationNodeId = ${modificationNodeId}
diff --git a/src/test/java/org/gridsuite/study/server/EquipmentInfosServiceTests.java b/src/test/java/org/gridsuite/study/server/EquipmentInfosServiceTests.java
index 076ee92adb..17fe3cfcd9 100644
--- a/src/test/java/org/gridsuite/study/server/EquipmentInfosServiceTests.java
+++ b/src/test/java/org/gridsuite/study/server/EquipmentInfosServiceTests.java
@@ -26,8 +26,8 @@
import org.gridsuite.study.server.elasticsearch.EquipmentInfosService;
import org.gridsuite.study.server.service.NetworkModificationTreeService;
import org.gridsuite.study.server.service.NetworkService;
-import org.gridsuite.study.server.service.StudyService;
import org.gridsuite.study.server.service.RootNetworkService;
+import org.gridsuite.study.server.service.StudyService;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@@ -36,10 +36,8 @@
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.data.elasticsearch.client.elc.Queries;
import org.springframework.test.context.bean.override.mockito.MockitoBean;
-
import java.util.*;
import java.util.stream.Stream;
-
import static org.gridsuite.study.server.elasticsearch.EquipmentInfosService.EQUIPMENT_TYPE_SCORES;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -88,7 +86,7 @@ class EquipmentInfosServiceTests implements WithAssertions {
@BeforeEach
void setup() {
-// when(networkStoreService.getNetworkUuid(NETWORK_UUID)).thenReturn(NETWORK_UUID);
+ // when(networkStoreService.getNetworkUuid(NETWORK_UUID)).thenReturn(NETWORK_UUID);
when(networkModificationTreeService.getVariantId(NODE_UUID, ROOTNETWORK_UUID)).thenReturn(VariantManagerConstants.INITIAL_VARIANT_ID);
when(rootNetworkService.getNetworkUuid(ROOTNETWORK_UUID)).thenReturn(NETWORK_UUID);
}
@@ -105,7 +103,8 @@ private static BoolQuery buildBoolQueryEquipmentType(String equipmentType) {
@Test
void testAddDeleteEquipmentInfos() {
- EquipmentInfos loadInfos = EquipmentInfos.builder().networkUuid(NETWORK_UUID).id("id").name("name").type("LOAD").voltageLevels(Set.of(VoltageLevelInfos.builder().id("vl").name("vl").build())).build();
+ EquipmentInfos loadInfos = EquipmentInfos.builder().networkUuid(NETWORK_UUID).id("id").name("name").type("LOAD").voltageLevels(Set.of(VoltageLevelInfos.builder().id("vl").name("vl").build(
+ ))).build();
equipmentInfosService.addEquipmentInfos(loadInfos);
assertEquals(1, equipmentInfosService.findAllEquipmentInfos(NETWORK_UUID).size());
EquipmentInfos loadInfosDB = equipmentInfosService.findAllEquipmentInfos(NETWORK_UUID).get(0);
@@ -113,7 +112,8 @@ void testAddDeleteEquipmentInfos() {
assertEquals(loadInfos.getNetworkUuid() + "_" + loadInfos.getVariantId() + "_" + loadInfos.getId(), loadInfosDB.getUniqueId());
assertEquals(1, equipmentInfosService.getEquipmentInfosCount(NETWORK_UUID));
- EquipmentInfos loadInfos2 = EquipmentInfos.builder().networkUuid(NETWORK_UUID_2).id("id").name("name").type("LOAD").voltageLevels(Set.of(VoltageLevelInfos.builder().id("vl").name("vl").build())).build();
+ EquipmentInfos loadInfos2 = EquipmentInfos.builder().networkUuid(NETWORK_UUID_2).id("id").name("name").type("LOAD").voltageLevels(Set.of(VoltageLevelInfos.builder().id("vl").name("vl").build(
+ ))).build();
equipmentInfosService.addEquipmentInfos(loadInfos2);
assertEquals(1, equipmentInfosService.findAllEquipmentInfos(NETWORK_UUID_2).size());
EquipmentInfos loadInfosDB2 = equipmentInfosService.findAllEquipmentInfos(NETWORK_UUID_2).get(0);
@@ -138,8 +138,10 @@ void testAddDeleteEquipmentInfos() {
assertEquals(0, equipmentInfosService.findAllEquipmentInfos(NETWORK_UUID).size());
assertEquals(0, equipmentInfosService.getEquipmentInfosCount(NETWORK_UUID));
- equipmentInfosService.addEquipmentInfos(EquipmentInfos.builder().networkUuid(NETWORK_UUID).id("id1").name("name1").type("LOAD").voltageLevels(Set.of(VoltageLevelInfos.builder().id("vl1").name("vl1").build())).build());
- equipmentInfosService.addEquipmentInfos(EquipmentInfos.builder().networkUuid(NETWORK_UUID).id("id2").name("name2").type("GENERATOR").voltageLevels(Set.of(VoltageLevelInfos.builder().id("vl2").name("vl2").build())).build());
+ equipmentInfosService.addEquipmentInfos(EquipmentInfos.builder().networkUuid(NETWORK_UUID).id("id1").name("name1").type("LOAD").voltageLevels(Set.of(VoltageLevelInfos.builder().id(
+ "vl1").name("vl1").build())).build());
+ equipmentInfosService.addEquipmentInfos(EquipmentInfos.builder().networkUuid(NETWORK_UUID).id("id2").name("name2").type("GENERATOR").voltageLevels(Set.of(VoltageLevelInfos.builder().id(
+ "vl2").name("vl2").build())).build());
assertEquals(2, equipmentInfosService.findAllEquipmentInfos(NETWORK_UUID).size());
assertEquals(2, equipmentInfosService.getEquipmentInfosCount(NETWORK_UUID));
@@ -178,7 +180,8 @@ void testAddDeleteTombstonedEquipmentInfos() {
@Test
void testDeleteAllEquipmentInfos() {
TombstonedEquipmentInfos tsLoadInfos = TombstonedEquipmentInfos.builder().networkUuid(NETWORK_UUID).id("id").build();
- EquipmentInfos loadInfos = EquipmentInfos.builder().networkUuid(NETWORK_UUID).id("id").name("name").type("LOAD").voltageLevels(Set.of(VoltageLevelInfos.builder().id("vl").name("vl").build())).build();
+ EquipmentInfos loadInfos = EquipmentInfos.builder().networkUuid(NETWORK_UUID).id("id").name("name").type("LOAD").voltageLevels(Set.of(VoltageLevelInfos.builder().id("vl").name("vl").build(
+ ))).build();
assertEquals(equipmentInfosService.addTombstonedEquipmentInfos(tsLoadInfos), tsLoadInfos);
assertEquals(equipmentInfosService.addEquipmentInfos(loadInfos), loadInfos);
@@ -196,12 +199,15 @@ void testDeleteAllEquipmentInfos() {
void testGetOrphanEquipmentInfosNetworkUuids() {
// index some equipment infos as orphan
UUID orphanNetworkUuid = UUID.randomUUID();
- EquipmentInfos orphanLoadInfos = EquipmentInfos.builder().networkUuid(orphanNetworkUuid).id("id").name("name").type("LOAD").voltageLevels(Set.of(VoltageLevelInfos.builder().id("vl").name("vl").build())).build();
+ EquipmentInfos orphanLoadInfos = EquipmentInfos.builder().networkUuid(orphanNetworkUuid).id("id").name("name").type("LOAD").voltageLevels(Set.of(VoltageLevelInfos.builder().id("vl").name(
+ "vl").build())).build();
UUID orphanNetworkUuid2 = UUID.randomUUID();
- EquipmentInfos orphanVlInfos = EquipmentInfos.builder().networkUuid(orphanNetworkUuid2).id("id").name("name").type("VOLTAGE_LEVEL").voltageLevels(Set.of(VoltageLevelInfos.builder().id("vl").name("vl").build())).build();
+ EquipmentInfos orphanVlInfos = EquipmentInfos.builder().networkUuid(orphanNetworkUuid2).id("id").name("name").type("VOLTAGE_LEVEL").voltageLevels(
+ Set.of(VoltageLevelInfos.builder().id("vl").name("vl").build())).build();
// index an equipment infos for the existing network
- EquipmentInfos loadInfos = EquipmentInfos.builder().networkUuid(NETWORK_UUID).id("id2").name("name2").type("LOAD").voltageLevels(Set.of(VoltageLevelInfos.builder().id("vl").name("vl").build())).build();
+ EquipmentInfos loadInfos = EquipmentInfos.builder().networkUuid(NETWORK_UUID).id("id2").name("name2").type("LOAD").voltageLevels(Set.of(VoltageLevelInfos.builder().id("vl").name("vl").build(
+ ))).build();
equipmentInfosService.addEquipmentInfos(loadInfos);
equipmentInfosService.addEquipmentInfos(orphanLoadInfos);
@@ -226,7 +232,8 @@ void testGetOrphanEquipmentInfosNetworkUuids() {
@Test
void testCloneVariant() {
- equipmentInfosService.addEquipmentInfos(EquipmentInfos.builder().networkUuid(NETWORK_UUID).id("id1").name("name1").type(IdentifiableType.LOAD.name()).variantId("variant1").voltageLevels(Set.of(VoltageLevelInfos.builder().id("vl1").name("vl1").build())).build());
+ equipmentInfosService.addEquipmentInfos(EquipmentInfos.builder().networkUuid(NETWORK_UUID).id("id1").name("name1").type(IdentifiableType.LOAD.name()).variantId("variant1").voltageLevels(
+ Set.of(VoltageLevelInfos.builder().id("vl1").name("vl1").build())).build());
assertEquals(1, equipmentInfosService.findAllEquipmentInfos(NETWORK_UUID).size());
equipmentInfosService.deleteVariants(NETWORK_UUID, List.of("variant1", "variant2"));
@@ -235,13 +242,16 @@ void testCloneVariant() {
@Test
void testDeleteVariants() {
- equipmentInfosService.addEquipmentInfos(EquipmentInfos.builder().networkUuid(NETWORK_UUID).id("id1").name("name1").type(IdentifiableType.LOAD.name()).variantId("variant1").voltageLevels(Set.of(VoltageLevelInfos.builder().id("vl1").name("vl1").build())).build());
+ equipmentInfosService.addEquipmentInfos(EquipmentInfos.builder().networkUuid(NETWORK_UUID).id("id1").name("name1").type(IdentifiableType.LOAD.name()).variantId("variant1").voltageLevels(
+ Set.of(VoltageLevelInfos.builder().id("vl1").name("vl1").build())).build());
assertEquals(1, equipmentInfosService.findAllEquipmentInfos(NETWORK_UUID).size());
- equipmentInfosService.addEquipmentInfos(EquipmentInfos.builder().networkUuid(NETWORK_UUID).id("id2").name("name2").type(IdentifiableType.GENERATOR.name()).variantId("variant2").voltageLevels(Set.of(VoltageLevelInfos.builder().id("vl2").name("vl2").build())).build());
+ equipmentInfosService.addEquipmentInfos(EquipmentInfos.builder().networkUuid(NETWORK_UUID).id("id2").name("name2").type(IdentifiableType.GENERATOR.name()).variantId("variant2").voltageLevels(
+ Set.of(VoltageLevelInfos.builder().id("vl2").name("vl2").build())).build());
assertEquals(2, equipmentInfosService.findAllEquipmentInfos(NETWORK_UUID).size());
- equipmentInfosService.addEquipmentInfos(EquipmentInfos.builder().networkUuid(NETWORK_UUID).id("id3").name("name3").type(IdentifiableType.BATTERY.name()).variantId("variant3").voltageLevels(Set.of(VoltageLevelInfos.builder().id("vl3").name("vl3").build())).build());
+ equipmentInfosService.addEquipmentInfos(EquipmentInfos.builder().networkUuid(NETWORK_UUID).id("id3").name("name3").type(IdentifiableType.BATTERY.name()).variantId("variant3").voltageLevels(
+ Set.of(VoltageLevelInfos.builder().id("vl3").name("vl3").build())).build());
assertEquals(3, equipmentInfosService.findAllEquipmentInfos(NETWORK_UUID).size());
equipmentInfosService.deleteVariants(NETWORK_UUID, List.of("variant1", "variant3"));
@@ -255,13 +265,20 @@ void testDeleteVariants() {
@Test
void searchEquipmentInfos() {
- EquipmentInfos generatorInfos = EquipmentInfos.builder().networkUuid(NETWORK_UUID).id("id_g1").name("name_g1").type("GENERATOR").voltageLevels(Set.of(VoltageLevelInfos.builder().id("vl1").name("vl1").build())).build();
- EquipmentInfos line1Infos = EquipmentInfos.builder().networkUuid(NETWORK_UUID).id("id_l1").name("name_l1").type("LINE").voltageLevels(Set.of(VoltageLevelInfos.builder().id("vl2").name("vl2").build())).build();
- EquipmentInfos line2Infos = EquipmentInfos.builder().networkUuid(NETWORK_UUID).id("id_l2").name("name_l2").type("LINE").voltageLevels(Set.of(VoltageLevelInfos.builder().id("vl3").name("vl3").build())).build();
- EquipmentInfos otherLineInfos = EquipmentInfos.builder().networkUuid(NETWORK_UUID).id("id_other_line").name("name_other_line").type("LINE").voltageLevels(Set.of(VoltageLevelInfos.builder().id("vl4").name("vl4").build())).build();
- EquipmentInfos tw1Infos = EquipmentInfos.builder().networkUuid(NETWORK_UUID).id("id_tw1").name("name_tw1").type("TWO_WINDINGS_TRANSFORMER").voltageLevels(Set.of(VoltageLevelInfos.builder().id("vl5").name("vl5").build())).build();
- EquipmentInfos tw2Infos = EquipmentInfos.builder().networkUuid(NETWORK_UUID).id("id_tw2").name("name_tw2").type("TWO_WINDINGS_TRANSFORMER").voltageLevels(Set.of(VoltageLevelInfos.builder().id("vl6").name("vl6").build())).build();
- EquipmentInfos configuredBus = EquipmentInfos.builder().networkUuid(NETWORK_UUID).id("id_bus").name("name_bus").type("CONFIGURED_BUS").voltageLevels(Set.of(VoltageLevelInfos.builder().id("vl7").name("vl7").build())).build();
+ EquipmentInfos generatorInfos = EquipmentInfos.builder().networkUuid(NETWORK_UUID).id("id_g1").name("name_g1").type("GENERATOR").voltageLevels(Set.of(VoltageLevelInfos.builder().id(
+ "vl1").name("vl1").build())).build();
+ EquipmentInfos line1Infos = EquipmentInfos.builder().networkUuid(NETWORK_UUID).id("id_l1").name("name_l1").type("LINE").voltageLevels(Set.of(VoltageLevelInfos.builder().id("vl2").name(
+ "vl2").build())).build();
+ EquipmentInfos line2Infos = EquipmentInfos.builder().networkUuid(NETWORK_UUID).id("id_l2").name("name_l2").type("LINE").voltageLevels(
+ Set.of(VoltageLevelInfos.builder().id("vl3").name("vl3").build())).build();
+ EquipmentInfos otherLineInfos = EquipmentInfos.builder().networkUuid(NETWORK_UUID).id("id_other_line").name("name_other_line").type("LINE").voltageLevels(
+ Set.of(VoltageLevelInfos.builder().id("vl4").name("vl4").build())).build();
+ EquipmentInfos tw1Infos = EquipmentInfos.builder().networkUuid(NETWORK_UUID).id("id_tw1").name("name_tw1").type("TWO_WINDINGS_TRANSFORMER").voltageLevels(
+ Set.of(VoltageLevelInfos.builder().id("vl5").name("vl5").build())).build();
+ EquipmentInfos tw2Infos = EquipmentInfos.builder().networkUuid(NETWORK_UUID).id("id_tw2").name("name_tw2").type("TWO_WINDINGS_TRANSFORMER").voltageLevels(
+ Set.of(VoltageLevelInfos.builder().id("vl6").name("vl6").build())).build();
+ EquipmentInfos configuredBus = EquipmentInfos.builder().networkUuid(NETWORK_UUID).id("id_bus").name("name_bus").type("CONFIGURED_BUS").voltageLevels(
+ Set.of(VoltageLevelInfos.builder().id("vl7").name("vl7").build())).build();
Stream.of(generatorInfos, line1Infos, line2Infos, otherLineInfos, tw1Infos, tw2Infos, configuredBus).forEach(equipmentInfosService::addEquipmentInfos);
@@ -293,13 +310,20 @@ void searchEquipmentInfos() {
@Test
void searchEquipmentInfosWithPattern() {
BoolQuery query;
- EquipmentInfos generatorInfos = EquipmentInfos.builder().networkUuid(NETWORK_UUID).id("id_g1").name("name_g1").type("GENERATOR").voltageLevels(Set.of(VoltageLevelInfos.builder().id("vl1").name("vl1").build())).build();
- EquipmentInfos line1Infos = EquipmentInfos.builder().networkUuid(NETWORK_UUID).id("id_l1").name("name_l1").type("LINE").voltageLevels(Set.of(VoltageLevelInfos.builder().id("vl2").name("vl2").build())).build();
- EquipmentInfos line2Infos = EquipmentInfos.builder().networkUuid(NETWORK_UUID).id("id_l2").name("name_l2").type("LINE").voltageLevels(Set.of(VoltageLevelInfos.builder().id("vl3").name("vl3").build())).build();
- EquipmentInfos otherLineInfos = EquipmentInfos.builder().networkUuid(NETWORK_UUID).id("id_other_line").name("name_other_line").type("LINE").voltageLevels(Set.of(VoltageLevelInfos.builder().id("vl4").name("vl4").build())).build();
- EquipmentInfos tw1Infos = EquipmentInfos.builder().networkUuid(NETWORK_UUID).id("id_tw1").name("name_tw1").type("TWO_WINDINGS_TRANSFORMER").voltageLevels(Set.of(VoltageLevelInfos.builder().id("vl5").name("vl5").build())).build();
- EquipmentInfos tw2Infos = EquipmentInfos.builder().networkUuid(NETWORK_UUID).id("id_tw2").name("name_tw2").type("TWO_WINDINGS_TRANSFORMER").voltageLevels(Set.of(VoltageLevelInfos.builder().id("vl6").name("vl6").build())).build();
- EquipmentInfos configuredBus = EquipmentInfos.builder().networkUuid(NETWORK_UUID).id("id_bus").name("name_bus").type("CONFIGURED_BUS").voltageLevels(Set.of(VoltageLevelInfos.builder().id("vl7").name("vl7").build())).build();
+ EquipmentInfos generatorInfos = EquipmentInfos.builder().networkUuid(NETWORK_UUID).id("id_g1").name("name_g1").type("GENERATOR").voltageLevels(Set.of(VoltageLevelInfos.builder().id(
+ "vl1").name("vl1").build())).build();
+ EquipmentInfos line1Infos = EquipmentInfos.builder().networkUuid(NETWORK_UUID).id("id_l1").name("name_l1").type("LINE").voltageLevels(Set.of(VoltageLevelInfos.builder().id("vl2").name(
+ "vl2").build())).build();
+ EquipmentInfos line2Infos = EquipmentInfos.builder().networkUuid(NETWORK_UUID).id("id_l2").name("name_l2").type("LINE").voltageLevels(
+ Set.of(VoltageLevelInfos.builder().id("vl3").name("vl3").build())).build();
+ EquipmentInfos otherLineInfos = EquipmentInfos.builder().networkUuid(NETWORK_UUID).id("id_other_line").name("name_other_line").type("LINE").voltageLevels(
+ Set.of(VoltageLevelInfos.builder().id("vl4").name("vl4").build())).build();
+ EquipmentInfos tw1Infos = EquipmentInfos.builder().networkUuid(NETWORK_UUID).id("id_tw1").name("name_tw1").type("TWO_WINDINGS_TRANSFORMER").voltageLevels(
+ Set.of(VoltageLevelInfos.builder().id("vl5").name("vl5").build())).build();
+ EquipmentInfos tw2Infos = EquipmentInfos.builder().networkUuid(NETWORK_UUID).id("id_tw2").name("name_tw2").type("TWO_WINDINGS_TRANSFORMER").voltageLevels(
+ Set.of(VoltageLevelInfos.builder().id("vl6").name("vl6").build())).build();
+ EquipmentInfos configuredBus = EquipmentInfos.builder().networkUuid(NETWORK_UUID).id("id_bus").name("name_bus").type("CONFIGURED_BUS").voltageLevels(
+ Set.of(VoltageLevelInfos.builder().id("vl7").name("vl7").build())).build();
Stream.of(generatorInfos, line1Infos, line2Infos, otherLineInfos, tw1Infos, tw2Infos, configuredBus).forEach(equipmentInfosService::addEquipmentInfos);
query = new BoolQuery.Builder().must(Queries.wildcardQuery(EQUIPMENT_ID_FIELD, "*")._toQuery()).build();
@@ -335,7 +359,8 @@ void searchEquipmentInfosWithPattern() {
query = new BoolQuery.Builder().must(Queries.wildcardQuery(EQUIPMENT_ID_FIELD, "id_l*")._toQuery(), Queries.wildcardQuery(EQUIPMENT_ID_FIELD, "id_tw*")._toQuery()).build();
hits = new HashSet<>(equipmentInfosService.searchEquipments(query, List.of()));
assertEquals(0, hits.size());
- hits = new HashSet<>(equipmentInfosService.searchEquipments(new BoolQuery.Builder().must(Queries.wildcardQuery(EQUIPMENT_ID_FIELD, "*other*")._toQuery(), Queries.termQuery(EQUIPMENT_TYPE_FIELD, "LINE")._toQuery()).build(), List.of()));
+ hits = new HashSet<>(equipmentInfosService.searchEquipments(new BoolQuery.Builder().must(Queries.wildcardQuery(EQUIPMENT_ID_FIELD, "*other*")._toQuery(), Queries.termQuery(
+ EQUIPMENT_TYPE_FIELD, "LINE")._toQuery()).build(), List.of()));
assertEquals(1, hits.size());
assertTrue(hits.contains(otherLineInfos));
}
@@ -456,13 +481,16 @@ void testSearchGlobalOrder() {
EquipmentInfos tw2Infos = EquipmentInfos.builder().variantId(VARIANT_ID).networkUuid(NETWORK_UUID).id("id_tw2").name("name_tw2").type("TWO_WINDINGS_TRANSFORMER").build();
EquipmentInfos substation2Infos = EquipmentInfos.builder().variantId(VARIANT_ID).networkUuid(NETWORK_UUID).id("id_substation_2").name("name_sub_1").type("SUBSTATION").build();
EquipmentInfos substation1Infos = EquipmentInfos.builder().variantId(VARIANT_ID).networkUuid(NETWORK_UUID).id("id_substation_1").name("name_sub_2").type("SUBSTATION").build();
- EquipmentInfos alphabeticallySecondSubstation1Infos = EquipmentInfos.builder().variantId(VARIANT_ID).networkUuid(NETWORK_UUID).id("def_substation_id").name("name_sub_def").type("SUBSTATION").build();
- EquipmentInfos alphabeticallyFirstSubstation1Infos = EquipmentInfos.builder().variantId(VARIANT_ID).networkUuid(NETWORK_UUID).id("abc_substation_id").name("name_sub_abc").type("SUBSTATION").build();
+ EquipmentInfos alphabeticallySecondSubstation1Infos = EquipmentInfos.builder().variantId(VARIANT_ID).networkUuid(NETWORK_UUID).id("def_substation_id").name("name_sub_def").type(
+ "SUBSTATION").build();
+ EquipmentInfos alphabeticallyFirstSubstation1Infos = EquipmentInfos.builder().variantId(VARIANT_ID).networkUuid(NETWORK_UUID).id("abc_substation_id").name("name_sub_abc").type(
+ "SUBSTATION").build();
EquipmentInfos filteredOutSubstation = EquipmentInfos.builder().variantId(VARIANT_ID).networkUuid(NETWORK_UUID).id("filtered").name("filtered_name ").type("SUBSTATION").build();
String userinput = "id";
- List equipmentInfosList = List.of(generatorInfos, line1Infos, line2Infos, otherLineInfos, tw1Infos, tw2Infos, substation2Infos, substation1Infos, alphabeticallySecondSubstation1Infos, alphabeticallyFirstSubstation1Infos, filteredOutSubstation);
+ List equipmentInfosList = List.of(generatorInfos, line1Infos, line2Infos, otherLineInfos, tw1Infos, tw2Infos, substation2Infos, substation1Infos,
+ alphabeticallySecondSubstation1Infos, alphabeticallyFirstSubstation1Infos, filteredOutSubstation);
equipmentInfosList.forEach(equipmentInfosService::addEquipmentInfos);
List result = equipmentInfosService.searchEquipments(NETWORK_UUID, VARIANT_ID, userinput, EquipmentInfosService.FieldSelector.ID, null);
diff --git a/src/test/java/org/gridsuite/study/server/FilterServiceTest.java b/src/test/java/org/gridsuite/study/server/FilterServiceTest.java
index 2cf8165f48..2845814f21 100644
--- a/src/test/java/org/gridsuite/study/server/FilterServiceTest.java
+++ b/src/test/java/org/gridsuite/study/server/FilterServiceTest.java
@@ -19,8 +19,8 @@
import org.gridsuite.study.server.service.FilterService;
import org.gridsuite.study.server.service.NetworkModificationTreeService;
import org.gridsuite.study.server.utils.TestUtils;
-import org.gridsuite.study.server.utils.wiremock.WireMockStubs;
import org.gridsuite.study.server.utils.elasticsearch.DisableElasticsearch;
+import org.gridsuite.study.server.utils.wiremock.WireMockStubs;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeEach;
@@ -35,11 +35,9 @@
import org.springframework.test.context.bean.override.mockito.MockitoSpyBean;
import org.springframework.test.web.servlet.MockMvc;
import org.springframework.test.web.servlet.MvcResult;
-
import java.util.List;
import java.util.UUID;
import java.util.stream.Collectors;
-
import static com.github.tomakehurst.wiremock.core.WireMockConfiguration.wireMockConfig;
import static org.gridsuite.study.server.utils.TestUtils.createModificationNodeInfo;
import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -414,7 +412,8 @@ void testExportFilters() throws Exception {
""";
UUID stubUuid = wireMockStubs.stubFiltersExport(NETWORK_UUID_STRING, FILTERS_UUID_STRING, responseBody);
- MvcResult mvcResult = mockMvc.perform(get("/v1/studies/{studyUuid}/root-networks/{rootNetworkUuid}/nodes/{nodeUuid}/filters/elements?filtersUuid=" + FILTERS_UUID_STRING.stream().collect(Collectors.joining(",")),
+ MvcResult mvcResult = mockMvc.perform(get("/v1/studies/{studyUuid}/root-networks/{rootNetworkUuid}/nodes/{nodeUuid}/filters/elements?filtersUuid=" + FILTERS_UUID_STRING.stream().collect(
+ Collectors.joining(",")),
studyUuid, firstRootNetworkUuid, rootNodeUuid))
.andExpect(status().isOk())
.andReturn();
@@ -424,7 +423,8 @@ void testExportFilters() throws Exception {
wireMockStubs.verifyFiltersExport(stubUuid, FILTERS_UUID_STRING, NETWORK_UUID_STRING);
// export on first node
- mvcResult = mockMvc.perform(get("/v1/studies/{studyUuid}/root-networks/{rootNetworkUuid}/nodes/{nodeUuid}/filters/elements?filtersUuid=" + FILTERS_UUID_STRING.stream().collect(Collectors.joining(",")),
+ mvcResult = mockMvc.perform(get("/v1/studies/{studyUuid}/root-networks/{rootNetworkUuid}/nodes/{nodeUuid}/filters/elements?filtersUuid=" + FILTERS_UUID_STRING.stream().collect(
+ Collectors.joining(",")),
studyUuid, firstRootNetworkUuid, firstNode.getId()))
.andExpect(status().isOk())
.andReturn();
diff --git a/src/test/java/org/gridsuite/study/server/JsonUtilsTest.java b/src/test/java/org/gridsuite/study/server/JsonUtilsTest.java
index bb8a69b7ca..0a8a5a4d79 100644
--- a/src/test/java/org/gridsuite/study/server/JsonUtilsTest.java
+++ b/src/test/java/org/gridsuite/study/server/JsonUtilsTest.java
@@ -19,7 +19,7 @@
import static org.junit.jupiter.api.Assertions.*;
/**
- * @author Etienne HOMER
+ * @author Etienne HOMER
*/
class JsonUtilsTest {
private static final ObjectMapper MAPPER = new ObjectMapper();
diff --git a/src/test/java/org/gridsuite/study/server/ModificationSearchTest.java b/src/test/java/org/gridsuite/study/server/ModificationSearchTest.java
index db661298ea..5844675e44 100644
--- a/src/test/java/org/gridsuite/study/server/ModificationSearchTest.java
+++ b/src/test/java/org/gridsuite/study/server/ModificationSearchTest.java
@@ -18,24 +18,22 @@
import org.gridsuite.study.server.service.NetworkModificationTreeService;
import org.gridsuite.study.server.service.RootNetworkService;
import org.gridsuite.study.server.utils.TestUtils;
-import org.gridsuite.study.server.utils.wiremock.WireMockStubs;
import org.gridsuite.study.server.utils.elasticsearch.DisableElasticsearch;
+import org.gridsuite.study.server.utils.wiremock.WireMockStubs;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
+import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.web.servlet.MockMvc;
import org.springframework.test.web.servlet.MvcResult;
-
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.UUID;
-
import static com.github.tomakehurst.wiremock.core.WireMockConfiguration.wireMockConfig;
import static org.gridsuite.study.server.utils.TestUtils.createModificationNodeInfo;
import static org.junit.jupiter.api.Assertions.assertTrue;
diff --git a/src/test/java/org/gridsuite/study/server/NadConfigTest.java b/src/test/java/org/gridsuite/study/server/NadConfigTest.java
index 05ed0bd483..029bd3e2db 100644
--- a/src/test/java/org/gridsuite/study/server/NadConfigTest.java
+++ b/src/test/java/org/gridsuite/study/server/NadConfigTest.java
@@ -8,7 +8,6 @@
import com.github.tomakehurst.wiremock.WireMockServer;
import com.github.tomakehurst.wiremock.client.WireMock;
-import org.springframework.web.client.HttpServerErrorException;
import org.gridsuite.study.server.service.NadConfigService;
import org.gridsuite.study.server.service.SingleLineDiagramService;
import org.gridsuite.study.server.utils.elasticsearch.DisableElasticsearch;
@@ -18,8 +17,8 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.web.client.HttpServerErrorException;
import java.util.*;
-
import static com.github.tomakehurst.wiremock.core.WireMockConfiguration.wireMockConfig;
import static org.gridsuite.study.server.StudyConstants.DELIMITER;
import static org.junit.jupiter.api.Assertions.*;
diff --git a/src/test/java/org/gridsuite/study/server/NetworkAreaDiagramTest.java b/src/test/java/org/gridsuite/study/server/NetworkAreaDiagramTest.java
index 1fef3096bd..12413e8a68 100644
--- a/src/test/java/org/gridsuite/study/server/NetworkAreaDiagramTest.java
+++ b/src/test/java/org/gridsuite/study/server/NetworkAreaDiagramTest.java
@@ -6,7 +6,6 @@
import com.powsybl.iidm.network.VariantManagerConstants;
import com.powsybl.network.store.client.NetworkStoreService;
import com.powsybl.network.store.model.VariantInfos;
-
import org.gridsuite.study.server.dto.ComputationType;
import org.gridsuite.study.server.dto.CurrentLimitViolationInfos;
import org.gridsuite.study.server.dto.LimitViolationInfos;
@@ -26,12 +25,10 @@
import org.springframework.http.MediaType;
import org.springframework.test.context.bean.override.mockito.MockitoBean;
import org.springframework.test.web.servlet.MockMvc;
-
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.UUID;
-
import static com.github.tomakehurst.wiremock.client.WireMock.equalTo;
import static com.github.tomakehurst.wiremock.core.WireMockConfiguration.wireMockConfig;
import static org.gridsuite.study.server.StudyConstants.CURRENT_LIMIT_VIOLATIONS_INFOS;
diff --git a/src/test/java/org/gridsuite/study/server/NetworkMapTest.java b/src/test/java/org/gridsuite/study/server/NetworkMapTest.java
index ab7fc08028..3e470759ee 100644
--- a/src/test/java/org/gridsuite/study/server/NetworkMapTest.java
+++ b/src/test/java/org/gridsuite/study/server/NetworkMapTest.java
@@ -22,8 +22,8 @@
import mockwebserver3.junit5.internal.MockWebServerExtension;
import okhttp3.Headers;
import okhttp3.HttpUrl;
-import org.gridsuite.study.server.dto.ComputationType;
import org.gridsuite.filter.utils.EquipmentType;
+import org.gridsuite.study.server.dto.ComputationType;
import org.gridsuite.study.server.dto.IdentifiableInfos;
import org.gridsuite.study.server.dto.LoadFlowParametersInfos;
import org.gridsuite.study.server.networkmodificationtree.dto.AbstractNode;
@@ -34,8 +34,8 @@
import org.gridsuite.study.server.service.shortcircuit.ShortCircuitService;
import org.gridsuite.study.server.utils.MatcherJson;
import org.gridsuite.study.server.utils.TestUtils;
-import org.gridsuite.study.server.utils.wiremock.WireMockStubs;
import org.gridsuite.study.server.utils.elasticsearch.DisableElasticsearch;
+import org.gridsuite.study.server.utils.wiremock.WireMockStubs;
import org.gridsuite.study.server.utils.wiremock.WireMockUtils;
import org.jetbrains.annotations.NotNull;
import org.junit.jupiter.api.AfterEach;
@@ -56,7 +56,6 @@
import org.springframework.test.web.servlet.MvcResult;
import org.springframework.test.web.servlet.request.MockHttpServletRequestBuilder;
import org.springframework.util.LinkedMultiValueMap;
-
import java.net.URLEncoder;
import java.nio.charset.StandardCharsets;
import java.util.List;
@@ -64,7 +63,6 @@
import java.util.Objects;
import java.util.UUID;
import java.util.stream.Collectors;
-
import static com.github.tomakehurst.wiremock.core.WireMockConfiguration.wireMockConfig;
import static org.gridsuite.study.server.StudyConstants.*;
import static org.gridsuite.study.server.dto.InfoTypeParameters.QUERY_PARAM_DC_POWERFACTOR;
@@ -100,12 +98,23 @@ class NetworkMapTest {
private static final String SUBSTATION_ID_1 = "SUBSTATION_ID_1";
private static final String VL_ID_1 = "VL_ID_1";
private static final String VOLTAGE_LEVEL_ID = "VOLTAGE_LEVEL_ID";
- private static final String VOLTAGE_LEVEL_EQUIPMENTS_JSON = "[{\"id\":\"GEN\",\"name\":null,\"type\":\"GENERATOR\"},{\"id\":\"GEN2\",\"name\":null,\"type\":\"GENERATOR\"},{\"id\":\"LCC1\",\"name\":\"LCC1\",\"type\":\"HVDC_CONVERTER_STATION\"},{\"id\":\"SVC1\",\"name\":\"SVC1\",\"type\":\"STATIC_VAR_COMPENSATOR\"},{\"id\":\"NGEN_NHV1\",\"name\":null,\"type\":\"TWO_WINDINGS_TRANSFORMER\"},{\"id\":\"TWT\",\"name\":\"TWT\",\"type\":\"THREE_WINDINGS_TRANSFORMER\"},{\"id\":\"TWT21\",\"name\":\"TWT21\",\"type\":\"THREE_WINDINGS_TRANSFORMER\"},{\"id\":\"TWT32\",\"name\":\"TWT32\",\"type\":\"THREE_WINDINGS_TRANSFORMER\"},{\"id\":\"BL1\",\"name\":\"BL1\",\"type\":\"BOUNDARY_LINE\"},{\"id\":\"LINE3\",\"name\":null,\"type\":\"LINE\"}]";
+ private static final String VOLTAGE_LEVEL_EQUIPMENTS_JSON =
+ "[{\"id\":\"GEN\",\"name\":null,\"type\":\"GENERATOR\"},{\"id\":\"GEN2\",\"name\":null,\"type\":\"GENERATOR\"},{\"id\":\"LCC1\",\"name\":\"LCC1\",\"type\":\"HVDC_CONVERTER_STATION\"},"
+ + "{\"id\":\"SVC1\",\"name\":\"SVC1\",\"type\":\"STATIC_VAR_COMPENSATOR\"},{\"id\":\"NGEN_NHV1\",\"name\":null,\"type\":\"TWO_WINDINGS_TRANSFORMER\"},{\"id\":\"TWT\","
+ + "\"name\":\"TWT\",\"type\":\"THREE_WINDINGS_TRANSFORMER\"},{\"id\":\"TWT21\",\"name\":\"TWT21\",\"type\":\"THREE_WINDINGS_TRANSFORMER\"},{\"id\":\"TWT32\","
+ + "\"name\":\"TWT32\",\"type\":\"THREE_WINDINGS_TRANSFORMER\"},{\"id\":\"BL1\",\"name\":\"BL1\",\"type\":\"BOUNDARY_LINE\"},{\"id\":\"LINE3\",\"name\":null,"
+ + "\"type\":\"LINE\"}]";
private static final String LOADFLOW_PARAMETERS_UUID_STRING = "0c0f1efd-bd22-4a75-83d3-9e530245c7f4";
private static final UUID LOADFLOW_PARAMETERS_UUID = UUID.fromString(LOADFLOW_PARAMETERS_UUID_STRING);
private static final String SWITCHES_INFOS_JSON = "[{\"id\":\".ABRE 6_.ABRE6TR615 SA.1_OC\",\"open\":false\"},{\"id\":\".ABRE 6_.ABRE6SEC..12 SS.1.12_OC\",\"open\":false\"}]";
- private static final String BUSBAR_SECTIONS_INFO_JSON = "{\"topologyKind\":\"NODE_BREAKER\",\"switchKinds\":[\"DISCONNECTOR\"],\"isSymmetrical\":true,\"isBusbarSectionPositionFound\":true,\"busBarSections\":{\"1\":[\"NGEN4\"]}}";
- private static final String FEEDER_BAYS_BUSBAR_SECTIONS_INFO_JSON = "{\"feederBaysInfos\":{\"SHUNT_VLNB\":[{\"busbarSectionId\":\"NGEN4\",\"connectablePositionInfos\":{\"connectionDirection\":null},\"connectionSide\":null}],\"LINE7\":[{\"busbarSectionId\":\"NGEN4\",\"connectablePositionInfos\":{\"connectionDirection\":\"BOTTOM\",\"connectionPosition\":5,\"connectionName\":\"LINE7_Side_VLGEN4\"},\"connectionSide\":\"ONE\"}],\"SHUNT_NON_LINEAR\":[{\"busbarSectionId\":\"NGEN4\",\"connectablePositionInfos\":{\"connectionDirection\":null},\"connectionSide\":null}]},\"busBarSectionsInfos\":{\"topologyKind\":\"NODE_BREAKER\",\"switchKinds\":[\"DISCONNECTOR\"],\"isSymmetrical\":true,\"isBusbarSectionPositionFound\":true,\"busBarSections\":{\"1\":[\"NGEN4\"]}}}";
+ private static final String BUSBAR_SECTIONS_INFO_JSON =
+ "{\"topologyKind\":\"NODE_BREAKER\",\"switchKinds\":[\"DISCONNECTOR\"],\"isSymmetrical\":true,\"isBusbarSectionPositionFound\":true,\"busBarSections\":{\"1\":[\"NGEN4\"]}}";
+ private static final String FEEDER_BAYS_BUSBAR_SECTIONS_INFO_JSON =
+ "{\"feederBaysInfos\":{\"SHUNT_VLNB\":[{\"busbarSectionId\":\"NGEN4\",\"connectablePositionInfos\":{\"connectionDirection\":null},\"connectionSide\":null}],"
+ + "\"LINE7\":[{\"busbarSectionId\":\"NGEN4\",\"connectablePositionInfos\":{\"connectionDirection\":\"BOTTOM\",\"connectionPosition\":5,"
+ + "\"connectionName\":\"LINE7_Side_VLGEN4\"},\"connectionSide\":\"ONE\"}],\"SHUNT_NON_LINEAR\":[{\"busbarSectionId\":\"NGEN4\","
+ + "\"connectablePositionInfos\":{\"connectionDirection\":null},\"connectionSide\":null}]},\"busBarSectionsInfos\":{\"topologyKind\":\"NODE_BREAKER\","
+ + "\"switchKinds\":[\"DISCONNECTOR\"],\"isSymmetrical\":true,\"isBusbarSectionPositionFound\":true,\"busBarSections\":{\"1\":[\"NGEN4\"]}}}";
@Autowired
private MockMvc mockMvc;
@@ -382,7 +391,8 @@ void testGetVoltageLevelsTopology(final MockWebServer server) throws Exception {
AbstractNode node = getRootNode(studyEntity.getId()).getChildren().stream().findFirst().orElseThrow();
//get the voltage levels and its equipments
- getNetworkElementsInfos(studyEntity.getId(), firstRootNetworkUuid, node.getId(), "LIST", "VOLTAGE_LEVEL", List.of(24.0), mapper.writeValueAsString(List.of()), "[{\"id\":\"MTAUBP3\",\"nominalVoltage\":24.0,\"topologyKind\":\"NODE_BREAKER\"}]");
+ getNetworkElementsInfos(studyEntity.getId(), firstRootNetworkUuid, node.getId(), "LIST", "VOLTAGE_LEVEL", List.of(24.0), mapper.writeValueAsString(List.of()),
+ "[{\"id\":\"MTAUBP3\",\"nominalVoltage\":24.0,\"topologyKind\":\"NODE_BREAKER\"}]");
assertTrue(TestUtils.getRequestsDone(1, server).stream().anyMatch(r -> r.matches("/v1/parameters/" + LOADFLOW_PARAMETERS_UUID_STRING)));
}
@@ -484,7 +494,8 @@ void testGetBranchOr3WTVoltageLevelId(final MockWebServer server) throws Excepti
AbstractNode node = getRootNode(studyEntity.getId()).getChildren().stream().findFirst().orElseThrow();
MvcResult mvcResult = mockMvc
- .perform(get("/v1/studies/{studyUuid}/root-networks/{rootNetworkUuid}/nodes/{nodeUuid}/network-map/branch-or-3wt/{equipmentId}/voltage-level-id", studyEntity.getId(), firstRootNetworkUuid, node.getId(), LINE_ID_1)
+ .perform(get("/v1/studies/{studyUuid}/root-networks/{rootNetworkUuid}/nodes/{nodeUuid}/network-map/branch-or-3wt/{equipmentId}/voltage-level-id", studyEntity.getId(),
+ firstRootNetworkUuid, node.getId(), LINE_ID_1)
.queryParam(QUERY_PARAM_SIDE, TwoSides.ONE.name()))
.andExpect(status().isOk())
.andReturn();
@@ -774,7 +785,8 @@ private RootNode getRootNode(UUID study) throws Exception {
.getContentAsString(), new TypeReference<>() { });
}
- private MvcResult getNetworkElementsIds(UUID studyUuid, UUID rootNetworkUuid, UUID rootNodeUuid, String elementType, List nominalVoltages, String responseBody, String requestBody) throws Exception {
+ private MvcResult getNetworkElementsIds(UUID studyUuid, UUID rootNetworkUuid, UUID rootNodeUuid, String elementType, List nominalVoltages, String responseBody, String requestBody) throws
+ Exception {
UUID stubUuid = wireMockStubs.stubNetworkElementsIdsPost(NETWORK_UUID_STRING, responseBody);
LinkedMultiValueMap queryParams = new LinkedMultiValueMap<>();
queryParams.add(QUERY_PARAM_EQUIPMENT_TYPE, elementType);
@@ -784,7 +796,8 @@ private MvcResult getNetworkElementsIds(UUID studyUuid, UUID rootNetworkUuid, UU
.collect(Collectors.toList());
queryParams.addAll(QUERY_PARAM_NOMINAL_VOLTAGES, nominalVoltageStrings);
}
- MockHttpServletRequestBuilder mockHttpServletRequestBuilder = post("/v1/studies/{studyUuid}/root-networks/{rootNetworkUuid}/nodes/{nodeUuid}/network-map/equipments-ids", studyUuid, rootNetworkUuid, rootNodeUuid)
+ MockHttpServletRequestBuilder mockHttpServletRequestBuilder = post("/v1/studies/{studyUuid}/root-networks/{rootNetworkUuid}/nodes/{nodeUuid}/network-map/equipments-ids", studyUuid,
+ rootNetworkUuid, rootNodeUuid)
.queryParams(queryParams)
.contentType(MediaType.APPLICATION_JSON)
.content(requestBody);
@@ -795,10 +808,12 @@ private MvcResult getNetworkElementsIds(UUID studyUuid, UUID rootNetworkUuid, UU
return mvcResult;
}
- private MvcResult getNetworkElementsInfos(UUID studyUuid, UUID rootNetworkUuid, UUID rootNodeUuid, String infoType, String elementType, List nominalVoltages, String requestBody, String responseBody) throws Exception {
+ private MvcResult getNetworkElementsInfos(UUID studyUuid, UUID rootNetworkUuid, UUID rootNodeUuid, String infoType, String elementType, List nominalVoltages, String requestBody, String
+ responseBody) throws Exception {
UUID stubUuid = wireMockStubs.stubNetworkElementsInfosPost(NETWORK_UUID_STRING, infoType, elementType, nominalVoltages, responseBody);
- MockHttpServletRequestBuilder mockHttpServletRequestBuilder = post("/v1/studies/{studyUuid}/root-networks/{rootNetworkUuid}/nodes/{nodeUuid}/network/elements", studyUuid, rootNetworkUuid, rootNodeUuid)
+ MockHttpServletRequestBuilder mockHttpServletRequestBuilder = post("/v1/studies/{studyUuid}/root-networks/{rootNetworkUuid}/nodes/{nodeUuid}/network/elements", studyUuid, rootNetworkUuid,
+ rootNodeUuid)
.queryParam(QUERY_PARAM_INFO_TYPE, infoType)
.queryParam(QUERY_PARAM_ELEMENT_TYPE, elementType)
.queryParam(String.format(QUERY_FORMAT_OPTIONAL_PARAMS, QUERY_PARAM_DC_POWERFACTOR), Double.toString(LoadFlowParameters.DEFAULT_DC_POWER_FACTOR));
@@ -818,7 +833,8 @@ private MvcResult getNetworkElementsInfos(UUID studyUuid, UUID rootNetworkUuid,
private MvcResult getNetworkElementInfos(UUID studyUuid, UUID rootNetworkUuid, UUID rootNodeUuid, String elementType, String infoType, String elementId, String responseBody) throws Exception {
UUID stubUuid = wireMockStubs.stubNetworkElementInfosGet(NETWORK_UUID_STRING, elementType, infoType, elementId, responseBody);
- MvcResult mvcResult = mockMvc.perform(get("/v1/studies/{studyUuid}/root-networks/{rootNetworkUuid}/nodes/{nodeUuid}/network/elements/{elementId}", studyUuid, rootNetworkUuid, rootNodeUuid, elementId)
+ MvcResult mvcResult = mockMvc.perform(get("/v1/studies/{studyUuid}/root-networks/{rootNetworkUuid}/nodes/{nodeUuid}/network/elements/{elementId}", studyUuid, rootNetworkUuid, rootNodeUuid,
+ elementId)
.queryParam(QUERY_PARAM_ELEMENT_TYPE, elementType)
.queryParam(QUERY_PARAM_INFO_TYPE, infoType)
)
@@ -830,7 +846,8 @@ private MvcResult getNetworkElementInfos(UUID studyUuid, UUID rootNetworkUuid, U
private MvcResult getNetworkElementInfosNotFound(UUID studyUuid, UUID rootNetworkUuid, UUID rootNodeUuid, String elementType, String infoType, String elementId) throws Exception {
UUID stubUuid = wireMockStubs.stubNetworkElementInfosGetNotFound(NETWORK_UUID_STRING, elementType, infoType, elementId);
- MvcResult mvcResult = mockMvc.perform(get("/v1/studies/{studyUuid}/root-networks/{rootNetworkUuid}/nodes/{nodeUuid}/network/elements/{elementId}", studyUuid, rootNetworkUuid, rootNodeUuid, elementId)
+ MvcResult mvcResult = mockMvc.perform(get("/v1/studies/{studyUuid}/root-networks/{rootNetworkUuid}/nodes/{nodeUuid}/network/elements/{elementId}", studyUuid, rootNetworkUuid, rootNodeUuid,
+ elementId)
.queryParam(QUERY_PARAM_ELEMENT_TYPE, elementType)
.queryParam(QUERY_PARAM_INFO_TYPE, infoType)
.queryParam(String.format(QUERY_FORMAT_OPTIONAL_PARAMS, QUERY_PARAM_DC_POWERFACTOR), Double.toString(LoadFlowParameters.DEFAULT_DC_POWER_FACTOR))
diff --git a/src/test/java/org/gridsuite/study/server/NetworkModificationTest.java b/src/test/java/org/gridsuite/study/server/NetworkModificationTest.java
index 8394d4b7af..823d25a96d 100644
--- a/src/test/java/org/gridsuite/study/server/NetworkModificationTest.java
+++ b/src/test/java/org/gridsuite/study/server/NetworkModificationTest.java
@@ -167,7 +167,8 @@ class NetworkModificationTest {
private static final String URI_NETWORK_MODIF = "/v1/studies/{studyUuid}/nodes/{nodeUuid}/network-modifications";
private static final String URI_NETWORK_MODIF_WITH_ID = "/v1/studies/{studyUuid}/nodes/{nodeUuid}/network-modifications/{uuid}";
- private static final NetworkModificationResult DEFAULT_BUILD_RESULT = createModificationResultWithElementImpact(SimpleImpactType.CREATION, IdentifiableType.LINE, "lineId", Set.of("s1", "s2")).get();
+ private static final NetworkModificationResult DEFAULT_BUILD_RESULT = createModificationResultWithElementImpact(SimpleImpactType.CREATION, IdentifiableType.LINE, "lineId", Set.of("s1",
+ "s2")).get();
@Autowired
private MockMvc mockMvc;
@@ -446,28 +447,32 @@ void testBuild() throws Exception {
assertEquals(List.of(modificationGroupUuid1, modificationGroupUuid2, modificationGroupUuid3, modificationGroupUuid4, modificationGroupUuid5), buildInfos.getModificationGroupUuids());
// Mark the node 3 status as built
- RootNetworkNodeInfoEntity rootNetworkNodeInfo3Entity = rootNetworkNodeInfoRepository.findByNodeInfoIdAndRootNetworkId(modificationNode3.getId(), studyTestUtils.getOneRootNetworkUuid(studyNameUserIdUuid)).orElseThrow(() -> new StudyException(NOT_FOUND, "Root network not found"));
+ RootNetworkNodeInfoEntity rootNetworkNodeInfo3Entity = rootNetworkNodeInfoRepository.findByNodeInfoIdAndRootNetworkId(modificationNode3.getId(),
+ studyTestUtils.getOneRootNetworkUuid(studyNameUserIdUuid)).orElseThrow(() -> new StudyException(NOT_FOUND, "Root network not found"));
rootNetworkNodeInfo3Entity.setNodeBuildStatus(NodeBuildStatusEmbeddable.from(BuildStatus.BUILT));
rootNetworkNodeInfoRepository.save(rootNetworkNodeInfo3Entity);
buildInfos = networkModificationTreeService.getBuildInfos(modificationNode4.getId(), rootNetworkUuid);
assertEquals("variant_3", buildInfos.getOriginVariantId()); // variant to clone is variant associated to node
- // modificationNode3
+ // modificationNode3
assertEquals("variant_4", buildInfos.getDestinationVariantId());
assertEquals(List.of(modificationGroupUuid4), buildInfos.getModificationGroupUuids());
// Mark the node 2 status as not built
- RootNetworkNodeInfoEntity rootNetworkNodeInfo2Entity = rootNetworkNodeInfoRepository.findByNodeInfoIdAndRootNetworkId(modificationNode2.getId(), studyTestUtils.getOneRootNetworkUuid(studyNameUserIdUuid)).orElseThrow(() -> new StudyException(NOT_FOUND, "Root network not found"));
+ RootNetworkNodeInfoEntity rootNetworkNodeInfo2Entity = rootNetworkNodeInfoRepository.findByNodeInfoIdAndRootNetworkId(modificationNode2.getId(),
+ studyTestUtils.getOneRootNetworkUuid(studyNameUserIdUuid)).orElseThrow(() -> new StudyException(NOT_FOUND, "Root network not found"));
rootNetworkNodeInfo2Entity.setNodeBuildStatus(NodeBuildStatusEmbeddable.from(BuildStatus.NOT_BUILT));
rootNetworkNodeInfoRepository.save(rootNetworkNodeInfo2Entity);
// Mark the node 4 status as not built
- RootNetworkNodeInfoEntity rootNetworkNodeInfo4Entity = rootNetworkNodeInfoRepository.findByNodeInfoIdAndRootNetworkId(modificationNode4.getId(), studyTestUtils.getOneRootNetworkUuid(studyNameUserIdUuid)).orElseThrow(() -> new StudyException(NOT_FOUND, "Root network not found"));
+ RootNetworkNodeInfoEntity rootNetworkNodeInfo4Entity = rootNetworkNodeInfoRepository.findByNodeInfoIdAndRootNetworkId(modificationNode4.getId(),
+ studyTestUtils.getOneRootNetworkUuid(studyNameUserIdUuid)).orElseThrow(() -> new StudyException(NOT_FOUND, "Root network not found"));
rootNetworkNodeInfo4Entity.setNodeBuildStatus(NodeBuildStatusEmbeddable.from(BuildStatus.NOT_BUILT));
rootNetworkNodeInfoRepository.save(rootNetworkNodeInfo4Entity);
// Mark the node 5 status as built
- RootNetworkNodeInfoEntity rootNetworkNodeInfo5Entity = rootNetworkNodeInfoRepository.findByNodeInfoIdAndRootNetworkId(modificationNode5.getId(), studyTestUtils.getOneRootNetworkUuid(studyNameUserIdUuid)).orElseThrow(() -> new StudyException(NOT_FOUND, "Root network not found"));
+ RootNetworkNodeInfoEntity rootNetworkNodeInfo5Entity = rootNetworkNodeInfoRepository.findByNodeInfoIdAndRootNetworkId(modificationNode5.getId(),
+ studyTestUtils.getOneRootNetworkUuid(studyNameUserIdUuid)).orElseThrow(() -> new StudyException(NOT_FOUND, "Root network not found"));
rootNetworkNodeInfo5Entity.setNodeBuildStatus(NodeBuildStatusEmbeddable.from(BuildStatus.BUILT));
rootNetworkNodeInfoRepository.save(rootNetworkNodeInfo5Entity);
@@ -479,7 +484,8 @@ void testBuild() throws Exception {
assertEquals(BuildStatus.BUILT, networkModificationTreeService.getNodeBuildStatus(modificationNode5.getId(), rootNetworkUuid).getGlobalBuildStatus());
// Mark the node 3 status as not built
- rootNetworkNodeInfo3Entity = rootNetworkNodeInfoRepository.findByNodeInfoIdAndRootNetworkId(modificationNode3.getId(), studyTestUtils.getOneRootNetworkUuid(studyNameUserIdUuid)).orElseThrow(() -> new StudyException(NOT_FOUND, "Root network not found"));
+ rootNetworkNodeInfo3Entity = rootNetworkNodeInfoRepository.findByNodeInfoIdAndRootNetworkId(modificationNode3.getId(),
+ studyTestUtils.getOneRootNetworkUuid(studyNameUserIdUuid)).orElseThrow(() -> new StudyException(NOT_FOUND, "Root network not found"));
rootNetworkNodeInfo3Entity.setNodeBuildStatus(NodeBuildStatusEmbeddable.from(BuildStatus.NOT_BUILT));
rootNetworkNodeInfoRepository.save(rootNetworkNodeInfo3Entity);
@@ -507,7 +513,8 @@ void testLocalBuildValue() throws Exception {
wireMockStubs.stubNetworkModificationPost(mapper.writeValueAsString(new NetworkModificationsResult(List.of(UUID.randomUUID()), List.of(Optional.empty()))));
// Mark the node status as built
- RootNetworkNodeInfoEntity rootNetworkNodeInfoEntity = rootNetworkNodeInfoRepository.findByNodeInfoIdAndRootNetworkId(modificationNode.getId(), studyTestUtils.getOneRootNetworkUuid(studyNameUserIdUuid)).orElseThrow(() -> new StudyException(NOT_FOUND, "Root network not found"));
+ RootNetworkNodeInfoEntity rootNetworkNodeInfoEntity = rootNetworkNodeInfoRepository.findByNodeInfoIdAndRootNetworkId(modificationNode.getId(),
+ studyTestUtils.getOneRootNetworkUuid(studyNameUserIdUuid)).orElseThrow(() -> new StudyException(NOT_FOUND, "Root network not found"));
rootNetworkNodeInfoEntity.setNodeBuildStatus(NodeBuildStatusEmbeddable.from(BuildStatus.BUILT));
rootNetworkNodeInfoRepository.save(rootNetworkNodeInfoEntity);
@@ -537,7 +544,8 @@ void testLocalBuildValue() throws Exception {
checkEquipmentMessagesReceived(studyNameUserIdUuid, modificationNodeUuid, expectedPayload);
checkEquipmentUpdatingFinishedMessagesReceived(studyNameUserIdUuid, modificationNodeUuid);
assertEquals(BuildStatus.BUILT_WITH_ERROR, networkModificationTreeService.getNodeBuildStatus(modificationNodeUuid, rootNetworkUuid).getGlobalBuildStatus());
- Pair> modificationBody = Pair.of(jsonCreateLoadInfos, List.of(rootNetworkNodeInfoService.getNetworkModificationApplicationContext(firstRootNetworkUuid, modificationNodeUuid, NETWORK_UUID)));
+ Pair> modificationBody = Pair.of(jsonCreateLoadInfos,
+ List.of(rootNetworkNodeInfoService.getNetworkModificationApplicationContext(firstRootNetworkUuid, modificationNodeUuid, NETWORK_UUID)));
wireMockStubs.verifyNetworkModificationPostWithVariant(getModificationContextJsonString(mapper, modificationBody));
// Build second node is OK
@@ -604,7 +612,8 @@ void testBuildAsserts() throws Exception {
Set.of());
// Mark the node 1 status as building
- RootNetworkNodeInfoEntity rootNetworkNodeInfo1Entity = rootNetworkNodeInfoRepository.findByNodeInfoIdAndRootNetworkId(modificationNode1.getId(), studyTestUtils.getOneRootNetworkUuid(studyNameUserIdUuid)).orElseThrow(() -> new StudyException(NOT_FOUND, "Root network not found"));
+ RootNetworkNodeInfoEntity rootNetworkNodeInfo1Entity = rootNetworkNodeInfoRepository.findByNodeInfoIdAndRootNetworkId(modificationNode1.getId(),
+ studyTestUtils.getOneRootNetworkUuid(studyNameUserIdUuid)).orElseThrow(() -> new StudyException(NOT_FOUND, "Root network not found"));
rootNetworkNodeInfo1Entity.setNodeBuildStatus(NodeBuildStatusEmbeddable.from(BuildStatus.BUILDING));
rootNetworkNodeInfoRepository.save(rootNetworkNodeInfo1Entity);
@@ -616,7 +625,8 @@ void testBuildAsserts() throws Exception {
);
// Mark the node 2 status as building
- RootNetworkNodeInfoEntity rootNetworkNodeInfo2Entity = rootNetworkNodeInfoRepository.findByNodeInfoIdAndRootNetworkId(modificationNode2.getId(), studyTestUtils.getOneRootNetworkUuid(studyNameUserIdUuid)).orElseThrow(() -> new StudyException(NOT_FOUND, "Root network not found"));
+ RootNetworkNodeInfoEntity rootNetworkNodeInfo2Entity = rootNetworkNodeInfoRepository.findByNodeInfoIdAndRootNetworkId(modificationNode2.getId(),
+ studyTestUtils.getOneRootNetworkUuid(studyNameUserIdUuid)).orElseThrow(() -> new StudyException(NOT_FOUND, "Root network not found"));
rootNetworkNodeInfo1Entity.setNodeBuildStatus(NodeBuildStatusEmbeddable.from(BuildStatus.NOT_BUILT));
rootNetworkNodeInfo2Entity.setNodeBuildStatus(NodeBuildStatusEmbeddable.from(BuildStatus.BUILDING));
rootNetworkNodeInfoRepository.saveAll(List.of(rootNetworkNodeInfo1Entity, rootNetworkNodeInfo2Entity));
@@ -629,7 +639,8 @@ void testBuildAsserts() throws Exception {
);
// Mark the node 4 status as building
- RootNetworkNodeInfoEntity rootNetworkNodeInfo4Entity = rootNetworkNodeInfoRepository.findByNodeInfoIdAndRootNetworkId(modificationNode4.getId(), studyTestUtils.getOneRootNetworkUuid(studyNameUserIdUuid)).orElseThrow(() -> new StudyException(NOT_FOUND, "Root network not found"));
+ RootNetworkNodeInfoEntity rootNetworkNodeInfo4Entity = rootNetworkNodeInfoRepository.findByNodeInfoIdAndRootNetworkId(modificationNode4.getId(),
+ studyTestUtils.getOneRootNetworkUuid(studyNameUserIdUuid)).orElseThrow(() -> new StudyException(NOT_FOUND, "Root network not found"));
rootNetworkNodeInfo2Entity.setNodeBuildStatus(NodeBuildStatusEmbeddable.from(BuildStatus.NOT_BUILT));
rootNetworkNodeInfo4Entity.setNodeBuildStatus(NodeBuildStatusEmbeddable.from(BuildStatus.BUILDING));
rootNetworkNodeInfoRepository.saveAll(List.of(rootNetworkNodeInfo2Entity, rootNetworkNodeInfo4Entity));
@@ -699,7 +710,8 @@ void testNetworkModificationSwitch() throws Exception {
checkEquipmentCreatingMessagesReceived(studyNameUserIdUuid, modificationNode1Uuid);
checkEquipmentUpdatingFinishedMessagesReceived(studyNameUserIdUuid, modificationNode1Uuid);
checkElementUpdatedMessageSent(studyNameUserIdUuid, userId);
- Pair> modificationBody = Pair.of(bodyJson, List.of(rootNetworkNodeInfoService.getNetworkModificationApplicationContext(firstRootNetworkUuid, modificationNode1Uuid, NETWORK_UUID)));
+ Pair> modificationBody = Pair.of(bodyJson, List.of(rootNetworkNodeInfoService.getNetworkModificationApplicationContext(firstRootNetworkUuid,
+ modificationNode1Uuid, NETWORK_UUID)));
wireMockStubs.verifyNetworkModificationPostWithVariant(getModificationContextJsonString(mapper, modificationBody));
List csbiListResult = studyService.getStudies();
@@ -719,10 +731,12 @@ void testNetworkModificationSwitch() throws Exception {
wireMockStubs.verifyNetworkModificationPostWithVariant(getModificationContextJsonString(mapper, modificationBody));
// test build status on switch modification
- RootNetworkNodeInfoEntity rootNetworkNodeInfo1Entity = rootNetworkNodeInfoRepository.findByNodeInfoIdAndRootNetworkId(modificationNode1.getId(), studyTestUtils.getOneRootNetworkUuid(studyNameUserIdUuid)).orElseThrow(() -> new StudyException(NOT_FOUND, "Root network not found"));
+ RootNetworkNodeInfoEntity rootNetworkNodeInfo1Entity = rootNetworkNodeInfoRepository.findByNodeInfoIdAndRootNetworkId(modificationNode1.getId(),
+ studyTestUtils.getOneRootNetworkUuid(studyNameUserIdUuid)).orElseThrow(() -> new StudyException(NOT_FOUND, "Root network not found"));
rootNetworkNodeInfo1Entity.setNodeBuildStatus(NodeBuildStatusEmbeddable.from(BuildStatus.BUILT));
rootNetworkNodeInfoRepository.save(rootNetworkNodeInfo1Entity);
- RootNetworkNodeInfoEntity rootNetworkNodeInfo2Entity = rootNetworkNodeInfoRepository.findByNodeInfoIdAndRootNetworkId(modificationNode2.getId(), studyTestUtils.getOneRootNetworkUuid(studyNameUserIdUuid)).orElseThrow(() -> new StudyException(NOT_FOUND, "Root network not found"));
+ RootNetworkNodeInfoEntity rootNetworkNodeInfo2Entity = rootNetworkNodeInfoRepository.findByNodeInfoIdAndRootNetworkId(modificationNode2.getId(),
+ studyTestUtils.getOneRootNetworkUuid(studyNameUserIdUuid)).orElseThrow(() -> new StudyException(NOT_FOUND, "Root network not found"));
rootNetworkNodeInfo2Entity.setNodeBuildStatus(NodeBuildStatusEmbeddable.from(BuildStatus.BUILT));
rootNetworkNodeInfoRepository.save(rootNetworkNodeInfo2Entity);
@@ -790,7 +804,8 @@ void testNetworkModificationEquipment() throws Exception {
checkUpdateStatusMessagesReceived(studyNameUserIdUuid, modificationNodeUuid, output);
checkEquipmentCreatingMessagesReceived(studyNameUserIdUuid, modificationNodeUuid);
checkEquipmentUpdatingFinishedMessagesReceived(studyNameUserIdUuid, modificationNodeUuid);
- Pair> modificationBody = Pair.of(bodyJson, List.of(rootNetworkNodeInfoService.getNetworkModificationApplicationContext(firstRootNetworkUuid, modificationNodeUuid, NETWORK_UUID)));
+ Pair> modificationBody = Pair.of(bodyJson, List.of(rootNetworkNodeInfoService.getNetworkModificationApplicationContext(firstRootNetworkUuid,
+ modificationNodeUuid, NETWORK_UUID)));
wireMockStubs.verifyNetworkModificationPostWithVariant(getModificationContextJsonString(mapper, modificationBody));
List csbiListResponse = studyService.getStudies();
@@ -856,7 +871,8 @@ void testCreateGenerator() throws Exception {
checkEquipmentCreatingMessagesReceived(studyNameUserIdUuid, modificationNode1Uuid);
checkEquipmentUpdatingFinishedMessagesReceived(studyNameUserIdUuid, modificationNode1Uuid);
checkElementUpdatedMessageSent(studyNameUserIdUuid, userId);
- Pair> modificationBody = Pair.of(bodyJsonCreate, List.of(rootNetworkNodeInfoService.getNetworkModificationApplicationContext(firstRootNetworkUuid, modificationNode1Uuid, NETWORK_UUID)));
+ Pair> modificationBody = Pair.of(bodyJsonCreate, List.of(rootNetworkNodeInfoService.getNetworkModificationApplicationContext(firstRootNetworkUuid,
+ modificationNode1Uuid, NETWORK_UUID)));
wireMockStubs.verifyNetworkModificationPostWithVariant(getModificationContextJsonString(mapper, modificationBody));
// create generator on second modification node
@@ -914,7 +930,8 @@ void testCreateShuntsCompensator() throws Exception {
UUID.randomUUID(), VARIANT_ID, "node 1", userId);
UUID modificationNode1Uuid = modificationNode1.getId();
- String createShuntCompensatorAttributes = "{\"type\":\"" + ModificationType.SHUNT_COMPENSATOR_CREATION + "\",\"shuntCompensatorId\":\"shuntCompensatorId1\",\"shuntCompensatorName\":\"shuntCompensatorName1\",\"voltageLevelId\":\"idVL1\",\"busOrBusbarSectionId\":\"idBus1\"}";
+ String createShuntCompensatorAttributes = "{\"type\":\"" + ModificationType.SHUNT_COMPENSATOR_CREATION
+ + "\",\"shuntCompensatorId\":\"shuntCompensatorId1\",\"shuntCompensatorName\":\"shuntCompensatorName1\",\"voltageLevelId\":\"idVL1\",\"busOrBusbarSectionId\":\"idBus1\"}";
// create shuntCompensator on root node (not allowed)
mockMvc.perform(post(URI_NETWORK_MODIF, studyNameUserIdUuid, rootNodeUuid)
@@ -932,12 +949,14 @@ void testCreateShuntsCompensator() throws Exception {
checkEquipmentCreatingMessagesReceived(studyNameUserIdUuid, modificationNode1Uuid);
checkEquipmentUpdatingFinishedMessagesReceived(studyNameUserIdUuid, modificationNode1Uuid);
checkElementUpdatedMessageSent(studyNameUserIdUuid, userId);
- Pair> modificationBody = Pair.of(createShuntCompensatorAttributes, List.of(rootNetworkNodeInfoService.getNetworkModificationApplicationContext(firstRootNetworkUuid, modificationNode1Uuid, NETWORK_UUID)));
+ Pair> modificationBody = Pair.of(createShuntCompensatorAttributes,
+ List.of(rootNetworkNodeInfoService.getNetworkModificationApplicationContext(firstRootNetworkUuid, modificationNode1Uuid, NETWORK_UUID)));
wireMockStubs.verifyNetworkModificationPostWithVariant(getModificationContextJsonString(mapper, modificationBody));
// update shunt compensator creation
UUID stubPutId = wireMockStubs.stubNetworkModificationPut(MODIFICATION_UUID);
- String shuntCompensatorAttributesUpdated = "{\"type\":\"" + ModificationType.SHUNT_COMPENSATOR_CREATION + "\",\"shuntCompensatorId\":\"shuntCompensatorId2\",\"shuntCompensatorName\":\"shuntCompensatorName2\",\"voltageLevelId\":\"idVL2\",\"busOrBusbarSectionId\":\"idBus1\"}";
+ String shuntCompensatorAttributesUpdated = "{\"type\":\"" + ModificationType.SHUNT_COMPENSATOR_CREATION
+ + "\",\"shuntCompensatorId\":\"shuntCompensatorId2\",\"shuntCompensatorName\":\"shuntCompensatorName2\",\"voltageLevelId\":\"idVL2\",\"busOrBusbarSectionId\":\"idBus1\"}";
mockMvc.perform(put(URI_NETWORK_MODIF_WITH_ID, studyNameUserIdUuid, modificationNode1Uuid, MODIFICATION_UUID)
.content(shuntCompensatorAttributesUpdated).contentType(MediaType.APPLICATION_JSON)
.header(USER_ID_HEADER, userId))
@@ -948,7 +967,8 @@ void testCreateShuntsCompensator() throws Exception {
checkElementUpdatedMessageSent(studyNameUserIdUuid, userId);
wireMockStubs.verifyNetworkModificationPut(stubPutId, MODIFICATION_UUID, shuntCompensatorAttributesUpdated);
- String createShuntCompensatorAttributes2 = "{\"type\":\"" + ModificationType.SHUNT_COMPENSATOR_CREATION + "\",\"shuntCompensatorId\":\"shuntCompensatorId3\",\"shuntCompensatorName\":\"shuntCompensatorName3\",\"voltageLevelId\":\"idVL1\",\"busOrBusbarSectionId\":\"idBus1\"}";
+ String createShuntCompensatorAttributes2 = "{\"type\":\"" + ModificationType.SHUNT_COMPENSATOR_CREATION
+ + "\",\"shuntCompensatorId\":\"shuntCompensatorId3\",\"shuntCompensatorName\":\"shuntCompensatorName3\",\"voltageLevelId\":\"idVL1\",\"busOrBusbarSectionId\":\"idBus1\"}";
when(rootNetworkNodeInfoRepository.existsByNodeUuidsAndBuildStatus(firstRootNetworkUuid, List.of(modificationNode1Uuid), BuildStatus.BUILDING)).thenReturn(true);
// create shunt compensator on building node
@@ -996,7 +1016,8 @@ void testCreateLine() throws Exception {
checkEquipmentCreatingMessagesReceived(studyNameUserIdUuid, modificationNode1Uuid);
checkEquipmentUpdatingFinishedMessagesReceived(studyNameUserIdUuid, modificationNode1Uuid);
checkElementUpdatedMessageSent(studyNameUserIdUuid, userId);
- Pair> modificationBody = Pair.of(createLineAttributes, List.of(rootNetworkNodeInfoService.getNetworkModificationApplicationContext(firstRootNetworkUuid, modificationNode1Uuid, NETWORK_UUID)));
+ Pair> modificationBody = Pair.of(createLineAttributes,
+ List.of(rootNetworkNodeInfoService.getNetworkModificationApplicationContext(firstRootNetworkUuid, modificationNode1Uuid, NETWORK_UUID)));
wireMockStubs.verifyNetworkModificationPostWithVariant(getModificationContextJsonString(mapper, modificationBody));
// create line on second modification node
@@ -1037,7 +1058,8 @@ void testCreateLine() throws Exception {
+ "\"voltageLevelId1\":\"idVL1\"," + "\"busOrBusbarSectionId1\":\"idBus1\","
+ "\"voltageLevelId2\":\"idVL2\"," + "\"busOrBusbarSectionId2\":\"idBus2\"}";
// Mark the node 1 status as building
- RootNetworkNodeInfoEntity rootNetworkNodeInfo1Entity = rootNetworkNodeInfoRepository.findByNodeInfoIdAndRootNetworkId(modificationNode1Uuid, studyTestUtils.getOneRootNetworkUuid(studyNameUserIdUuid)).orElseThrow(() -> new StudyException(NOT_FOUND, "Root network not found"));
+ RootNetworkNodeInfoEntity rootNetworkNodeInfo1Entity = rootNetworkNodeInfoRepository.findByNodeInfoIdAndRootNetworkId(modificationNode1Uuid,
+ studyTestUtils.getOneRootNetworkUuid(studyNameUserIdUuid)).orElseThrow(() -> new StudyException(NOT_FOUND, "Root network not found"));
rootNetworkNodeInfo1Entity.setNodeBuildStatus(NodeBuildStatusEmbeddable.from(BuildStatus.BUILDING));
rootNetworkNodeInfoRepository.save(rootNetworkNodeInfo1Entity);
// create line on building node
@@ -1061,7 +1083,10 @@ void testCreateTwoWindingsTransformer() throws Exception {
modificationNode1Uuid, UUID.randomUUID(), VARIANT_ID_2, "node 2", userId);
UUID modificationNode2Uuid = modificationNode2.getId();
- String createTwoWindingsTransformerAttributes = "{\"type\":\"" + ModificationType.TWO_WINDINGS_TRANSFORMER_CREATION + "\",\"equipmentId\":\"2wtId\",\"equipmentName\":\"2wtName\",\"seriesResistance\":\"10\",\"seriesReactance\":\"10\",\"magnetizingConductance\":\"100\",\"magnetizingSusceptance\":\"100\",\"ratedVoltage1\":\"480\",\"ratedVoltage2\":\"380\",\"voltageLevelId1\":\"CHOO5P6\",\"busOrBusbarSectionId1\":\"CHOO5P6_1\",\"voltageLevelId2\":\"CHOO5P6\",\"busOrBusbarSectionId2\":\"CHOO5P6_1\"}";
+ String createTwoWindingsTransformerAttributes = "{\"type\":\"" + ModificationType.TWO_WINDINGS_TRANSFORMER_CREATION
+ + "\",\"equipmentId\":\"2wtId\",\"equipmentName\":\"2wtName\",\"seriesResistance\":\"10\",\"seriesReactance\":\"10\",\"magnetizingConductance\":\"100\","
+ + "\"magnetizingSusceptance\":\"100\",\"ratedVoltage1\":\"480\",\"ratedVoltage2\":\"380\",\"voltageLevelId1\":\"CHOO5P6\",\"busOrBusbarSectionId1\":\"CHOO5P6_1\","
+ + "\"voltageLevelId2\":\"CHOO5P6\",\"busOrBusbarSectionId2\":\"CHOO5P6_1\"}";
// create 2WT on root node (not allowed)
mockMvc.perform(post(URI_NETWORK_MODIF, studyNameUserIdUuid, rootNodeUuid)
@@ -1079,7 +1104,8 @@ void testCreateTwoWindingsTransformer() throws Exception {
checkEquipmentCreatingMessagesReceived(studyNameUserIdUuid, modificationNode1Uuid);
checkEquipmentUpdatingFinishedMessagesReceived(studyNameUserIdUuid, modificationNode1Uuid);
checkElementUpdatedMessageSent(studyNameUserIdUuid, userId);
- Pair> modificationBody = Pair.of(createTwoWindingsTransformerAttributes, List.of(rootNetworkNodeInfoService.getNetworkModificationApplicationContext(firstRootNetworkUuid, modificationNode1Uuid, NETWORK_UUID)));
+ Pair> modificationBody = Pair.of(createTwoWindingsTransformerAttributes,
+ List.of(rootNetworkNodeInfoService.getNetworkModificationApplicationContext(firstRootNetworkUuid, modificationNode1Uuid, NETWORK_UUID)));
wireMockStubs.verifyNetworkModificationPostWithVariant(getModificationContextJsonString(mapper, modificationBody));
// create 2WT on second modification node
@@ -1091,11 +1117,15 @@ void testCreateTwoWindingsTransformer() throws Exception {
checkEquipmentCreatingMessagesReceived(studyNameUserIdUuid, modificationNode2Uuid);
checkEquipmentUpdatingFinishedMessagesReceived(studyNameUserIdUuid, modificationNode2Uuid);
checkElementUpdatedMessageSent(studyNameUserIdUuid, userId);
- modificationBody = Pair.of(createTwoWindingsTransformerAttributes, List.of(rootNetworkNodeInfoService.getNetworkModificationApplicationContext(firstRootNetworkUuid, modificationNode2Uuid, NETWORK_UUID)));
+ modificationBody = Pair.of(createTwoWindingsTransformerAttributes, List.of(rootNetworkNodeInfoService.getNetworkModificationApplicationContext(firstRootNetworkUuid, modificationNode2Uuid,
+ NETWORK_UUID)));
wireMockStubs.verifyNetworkModificationPostWithVariant(getModificationContextJsonString(mapper, modificationBody));
// update Two Windings Transformer creation
- String twoWindingsTransformerAttributesUpdated = "{\"type\":\"" + ModificationType.TWO_WINDINGS_TRANSFORMER_CREATION + "\",\"equipmentId\":\"2wtId\",\"equipmentName\":\"2wtName\",\"seriesResistance\":\"10\",\"seriesReactance\":\"10\",\"magnetizingConductance\":\"100\",\"magnetizingSusceptance\":\"100\",\"ratedVoltage1\":\"480\",\"ratedVoltage2\":\"380\",\"voltageLevelId1\":\"CHOO5P6\",\"busOrBusbarSectionId1\":\"CHOO5P6_1\",\"voltageLevelId2\":\"CHOO5P6\",\"busOrBusbarSectionId2\":\"CHOO5P6_1\"}";
+ String twoWindingsTransformerAttributesUpdated = "{\"type\":\"" + ModificationType.TWO_WINDINGS_TRANSFORMER_CREATION
+ + "\",\"equipmentId\":\"2wtId\",\"equipmentName\":\"2wtName\",\"seriesResistance\":\"10\",\"seriesReactance\":\"10\",\"magnetizingConductance\":\"100\","
+ + "\"magnetizingSusceptance\":\"100\",\"ratedVoltage1\":\"480\",\"ratedVoltage2\":\"380\",\"voltageLevelId1\":\"CHOO5P6\",\"busOrBusbarSectionId1\":\"CHOO5P6_1\","
+ + "\"voltageLevelId2\":\"CHOO5P6\",\"busOrBusbarSectionId2\":\"CHOO5P6_1\"}";
UUID stubPutId = wireMockStubs.stubNetworkModificationPut(MODIFICATION_UUID);
mockMvc.perform(put(URI_NETWORK_MODIF_WITH_ID, studyNameUserIdUuid, modificationNode1Uuid, MODIFICATION_UUID)
.content(twoWindingsTransformerAttributesUpdated).contentType(MediaType.APPLICATION_JSON)
@@ -1107,9 +1137,13 @@ void testCreateTwoWindingsTransformer() throws Exception {
checkElementUpdatedMessageSent(studyNameUserIdUuid, userId);
wireMockStubs.verifyNetworkModificationPut(stubPutId, MODIFICATION_UUID, twoWindingsTransformerAttributesUpdated);
- String createTwoWindingsTransformerAttributes2 = "{\"type\":\"" + ModificationType.TWO_WINDINGS_TRANSFORMER_CREATION + "\",\"equipmentId\":\"2wtId3\",\"equipmentName\":\"2wtName3\",\"seriesResistance\":\"10\",\"seriesReactance\":\"10\",\"magnetizingConductance\":\"100\",\"magnetizingSusceptance\":\"100\",\"ratedVoltage1\":\"480\",\"ratedVoltage2\":\"380\",\"voltageLevelId1\":\"CHOO5P6\",\"busOrBusbarSectionId1\":\"CHOO5P6_1\",\"voltageLevelId2\":\"CHOO5P6\",\"busOrBusbarSectionId2\":\"CHOO5P6_1\"}";
+ String createTwoWindingsTransformerAttributes2 = "{\"type\":\"" + ModificationType.TWO_WINDINGS_TRANSFORMER_CREATION
+ + "\",\"equipmentId\":\"2wtId3\",\"equipmentName\":\"2wtName3\",\"seriesResistance\":\"10\",\"seriesReactance\":\"10\",\"magnetizingConductance\":\"100\","
+ + "\"magnetizingSusceptance\":\"100\",\"ratedVoltage1\":\"480\",\"ratedVoltage2\":\"380\",\"voltageLevelId1\":\"CHOO5P6\",\"busOrBusbarSectionId1\":\"CHOO5P6_1\","
+ + "\"voltageLevelId2\":\"CHOO5P6\",\"busOrBusbarSectionId2\":\"CHOO5P6_1\"}";
// Mark the node 1 status as building
- RootNetworkNodeInfoEntity rootNetworkNodeInfo1Entity = rootNetworkNodeInfoRepository.findByNodeInfoIdAndRootNetworkId(modificationNode1Uuid, studyTestUtils.getOneRootNetworkUuid(studyNameUserIdUuid)).orElseThrow(() -> new StudyException(NOT_FOUND, "Root network not found"));
+ RootNetworkNodeInfoEntity rootNetworkNodeInfo1Entity = rootNetworkNodeInfoRepository.findByNodeInfoIdAndRootNetworkId(modificationNode1Uuid,
+ studyTestUtils.getOneRootNetworkUuid(studyNameUserIdUuid)).orElseThrow(() -> new StudyException(NOT_FOUND, "Root network not found"));
rootNetworkNodeInfo1Entity.setNodeBuildStatus(NodeBuildStatusEmbeddable.from(BuildStatus.BUILDING));
rootNetworkNodeInfoRepository.save(rootNetworkNodeInfo1Entity);
// create Two Windings Transformer on building node
@@ -1201,12 +1235,14 @@ void testUpdateLines() throws Exception {
checkEquipmentCreatingMessagesReceived(studyNameUserIdUuid, modificationNode1Uuid);
checkEquipmentUpdatingFinishedMessagesReceived(studyNameUserIdUuid, modificationNode1Uuid);
checkElementUpdatedMessageSent(studyNameUserIdUuid, userId);
- Pair> modificationBody = Pair.of(bodyJsonCreate1, List.of(rootNetworkNodeInfoService.getNetworkModificationApplicationContext(firstRootNetworkUuid, modificationNode1Uuid, NETWORK_UUID)));
+ Pair> modificationBody = Pair.of(bodyJsonCreate1, List.of(rootNetworkNodeInfoService.getNetworkModificationApplicationContext(firstRootNetworkUuid,
+ modificationNode1Uuid, NETWORK_UUID)));
wireMockStubs.verifyNetworkModificationPostWithVariant(getModificationContextJsonString(mapper, modificationBody));
bodyLineInfos.put("equipmentId", "lineFailedId");
String bodyJsonCreate2 = mapper.writeValueAsString(bodyLineInfos);
- String modificationBodyJson = getModificationContextJsonString(mapper, Pair.of(bodyJsonCreate2, List.of(rootNetworkNodeInfoService.getNetworkModificationApplicationContext(firstRootNetworkUuid, modificationNode1Uuid, NETWORK_UUID))));
+ String modificationBodyJson = getModificationContextJsonString(mapper, Pair.of(bodyJsonCreate2,
+ List.of(rootNetworkNodeInfoService.getNetworkModificationApplicationContext(firstRootNetworkUuid, modificationNode1Uuid, NETWORK_UUID))));
wireMockStubs.stubNetworkModificationPostWithError(modificationBodyJson);
mockMvc.perform(post(URI_NETWORK_MODIF, studyNameUserIdUuid, modificationNode1Uuid)
.content(bodyJsonCreate2).contentType(MediaType.APPLICATION_JSON)
@@ -1235,7 +1271,8 @@ void testUpdateLines() throws Exception {
bodyLineInfos.put("equipmentId", "lineFailedId");
String bodyJsonCreate4 = mapper.writeValueAsString(bodyLineInfos);
- modificationBodyJson = getModificationContextJsonString(mapper, Pair.of(bodyJsonCreate4, List.of(rootNetworkNodeInfoService.getNetworkModificationApplicationContext(firstRootNetworkUuid, modificationNode1Uuid, NETWORK_UUID))));
+ modificationBodyJson = getModificationContextJsonString(mapper, Pair.of(bodyJsonCreate4, List.of(rootNetworkNodeInfoService.getNetworkModificationApplicationContext(firstRootNetworkUuid,
+ modificationNode1Uuid, NETWORK_UUID))));
wireMockStubs.stubNetworkModificationPostWithError(modificationBodyJson);
mockMvc.perform(post(URI_NETWORK_MODIF, studyNameUserIdUuid, modificationNode1Uuid)
.content(bodyJsonCreate4).contentType(MediaType.APPLICATION_JSON)
@@ -1264,7 +1301,8 @@ void testUpdateLines() throws Exception {
bodyLineInfos.put("equipmentId", "lineFailedId");
String bodyJsonCreate6 = mapper.writeValueAsString(bodyLineInfos);
- modificationBodyJson = getModificationContextJsonString(mapper, Pair.of(bodyJsonCreate6, List.of(rootNetworkNodeInfoService.getNetworkModificationApplicationContext(firstRootNetworkUuid, modificationNode1Uuid, NETWORK_UUID))));
+ modificationBodyJson = getModificationContextJsonString(mapper, Pair.of(bodyJsonCreate6, List.of(rootNetworkNodeInfoService.getNetworkModificationApplicationContext(firstRootNetworkUuid,
+ modificationNode1Uuid, NETWORK_UUID))));
wireMockStubs.stubNetworkModificationPostWithError(modificationBodyJson);
mockMvc.perform(post(URI_NETWORK_MODIF, studyNameUserIdUuid, modificationNode1Uuid)
.content(bodyJsonCreate6).contentType(MediaType.APPLICATION_JSON)
@@ -1293,7 +1331,8 @@ void testUpdateLines() throws Exception {
bodyLineInfos.put("equipmentId", "lineFailedId");
String bodyJsonCreate8 = mapper.writeValueAsString(bodyLineInfos);
- modificationBodyJson = getModificationContextJsonString(mapper, Pair.of(bodyJsonCreate8, List.of(rootNetworkNodeInfoService.getNetworkModificationApplicationContext(firstRootNetworkUuid, modificationNode1Uuid, NETWORK_UUID))));
+ modificationBodyJson = getModificationContextJsonString(mapper, Pair.of(bodyJsonCreate8, List.of(rootNetworkNodeInfoService.getNetworkModificationApplicationContext(firstRootNetworkUuid,
+ modificationNode1Uuid, NETWORK_UUID))));
wireMockStubs.stubNetworkModificationPostWithError(modificationBodyJson);
mockMvc.perform(post(URI_NETWORK_MODIF, studyNameUserIdUuid, modificationNode1Uuid)
.content(bodyJsonCreate8).contentType(MediaType.APPLICATION_JSON)
@@ -1336,7 +1375,9 @@ void testCreateLoad() throws Exception {
UUID.randomUUID(), VARIANT_ID, "node 3", userId);
UUID modificationNode3Uuid = modificationNode3.getId();
- String createLoadAttributes = "{\"type\":\"" + ModificationType.LOAD_CREATION + "\",\"loadId\":\"loadId1\",\"loadName\":\"loadName1\",\"loadType\":\"UNDEFINED\",\"activePower\":\"100.0\",\"reactivePower\":\"50.0\",\"voltageLevelId\":\"idVL1\",\"busId\":\"idBus1\"}";
+ String createLoadAttributes = "{\"type\":\"" + ModificationType.LOAD_CREATION
+ + "\",\"loadId\":\"loadId1\",\"loadName\":\"loadName1\",\"loadType\":\"UNDEFINED\",\"activePower\":\"100.0\",\"reactivePower\":\"50.0\",\"voltageLevelId\":\"idVL1\","
+ + "\"busId\":\"idBus1\"}";
// create load on root node (not allowed)
mockMvc.perform(post(URI_NETWORK_MODIF, studyNameUserIdUuid, rootNodeUuid)
@@ -1354,7 +1395,8 @@ void testCreateLoad() throws Exception {
checkEquipmentCreatingMessagesReceived(studyNameUserIdUuid, modificationNode1Uuid);
checkEquipmentUpdatingFinishedMessagesReceived(studyNameUserIdUuid, modificationNode1Uuid);
checkElementUpdatedMessageSent(studyNameUserIdUuid, userId);
- Pair> modificationBody = Pair.of(createLoadAttributes, List.of(rootNetworkNodeInfoService.getNetworkModificationApplicationContext(firstRootNetworkUuid, modificationNode1Uuid, NETWORK_UUID)));
+ Pair> modificationBody = Pair.of(createLoadAttributes,
+ List.of(rootNetworkNodeInfoService.getNetworkModificationApplicationContext(firstRootNetworkUuid, modificationNode1Uuid, NETWORK_UUID)));
wireMockStubs.verifyNetworkModificationPostWithVariant(getModificationContextJsonString(mapper, modificationBody));
// create load on second modification node
@@ -1370,7 +1412,9 @@ void testCreateLoad() throws Exception {
wireMockStubs.verifyNetworkModificationPostWithVariant(getModificationContextJsonString(mapper, modificationBody));
// update load creation
- String loadAttributesUpdated = "{\"type\":\"" + ModificationType.LOAD_CREATION + "\",\"loadId\":\"loadId2\",\"loadName\":\"loadName2\",\"loadType\":\"UNDEFINED\",\"activePower\":\"50.0\",\"reactivePower\":\"25.0\",\"voltageLevelId\":\"idVL2\",\"busId\":\"idBus2\"}";
+ String loadAttributesUpdated = "{\"type\":\"" + ModificationType.LOAD_CREATION
+ + "\",\"loadId\":\"loadId2\",\"loadName\":\"loadName2\",\"loadType\":\"UNDEFINED\",\"activePower\":\"50.0\",\"reactivePower\":\"25.0\",\"voltageLevelId\":\"idVL2\","
+ + "\"busId\":\"idBus2\"}";
UUID stubPostId = wireMockStubs.stubNetworkModificationPutWithBody(MODIFICATION_UUID, loadAttributesUpdated);
mockMvc.perform(put(URI_NETWORK_MODIF_WITH_ID, studyNameUserIdUuid, modificationNode1Uuid, MODIFICATION_UUID)
.content(loadAttributesUpdated).contentType(MediaType.APPLICATION_JSON)
@@ -1382,9 +1426,12 @@ void testCreateLoad() throws Exception {
checkElementUpdatedMessageSent(studyNameUserIdUuid, userId);
wireMockStubs.verifyNetworkModificationPut(stubPostId, MODIFICATION_UUID, loadAttributesUpdated);
- String createLoadAttributes2 = "{\"type\":\"" + ModificationType.LOAD_CREATION + "\",\"loadId\":\"loadId3\",\"loadName\":\"loadName3\",\"loadType\":\"UNDEFINED\",\"activePower\":\"100.0\",\"reactivePower\":\"50.0\",\"voltageLevelId\":\"idVL1\",\"busId\":\"idBus1\"}";
+ String createLoadAttributes2 = "{\"type\":\"" + ModificationType.LOAD_CREATION
+ + "\",\"loadId\":\"loadId3\",\"loadName\":\"loadName3\",\"loadType\":\"UNDEFINED\",\"activePower\":\"100.0\",\"reactivePower\":\"50.0\",\"voltageLevelId\":\"idVL1\","
+ + "\"busId\":\"idBus1\"}";
// Mark the node 3 status as built
- RootNetworkNodeInfoEntity rootNetworkNodeInfo3Entity = rootNetworkNodeInfoRepository.findByNodeInfoIdAndRootNetworkId(modificationNode3Uuid, studyTestUtils.getOneRootNetworkUuid(studyNameUserIdUuid)).orElseThrow(() -> new StudyException(NOT_FOUND, "Root network not found"));
+ RootNetworkNodeInfoEntity rootNetworkNodeInfo3Entity = rootNetworkNodeInfoRepository.findByNodeInfoIdAndRootNetworkId(modificationNode3Uuid,
+ studyTestUtils.getOneRootNetworkUuid(studyNameUserIdUuid)).orElseThrow(() -> new StudyException(NOT_FOUND, "Root network not found"));
rootNetworkNodeInfo3Entity.setNodeBuildStatus(NodeBuildStatusEmbeddable.from(BuildStatus.BUILDING));
rootNetworkNodeInfoRepository.save(rootNetworkNodeInfo3Entity);
@@ -1409,7 +1456,8 @@ void testModifyLoad() throws Exception {
modificationNodeUuid, UUID.randomUUID(), VARIANT_ID_2, "node 2", userId);
UUID modificationNodeUuid2 = modificationNode2.getId();
- String loadModificationAttributes = "{\"type\":\"" + ModificationType.LOAD_MODIFICATION + "\",\"equipmentId\":\"loadId1\",\"loadName\":\"loadName1\",\"loadType\":\"AUXILIARY\",\"activePower\":\"100.0\"}";
+ String loadModificationAttributes = "{\"type\":\"" + ModificationType.LOAD_MODIFICATION
+ + "\",\"equipmentId\":\"loadId1\",\"loadName\":\"loadName1\",\"loadType\":\"AUXILIARY\",\"activePower\":\"100.0\"}";
// modify load on root node (not allowed)
mockMvc.perform(post(URI_NETWORK_MODIF, studyNameUserIdUuid, rootNodeUuid)
@@ -1427,7 +1475,8 @@ void testModifyLoad() throws Exception {
checkEquipmentCreatingMessagesReceived(studyNameUserIdUuid, modificationNodeUuid);
checkEquipmentUpdatingFinishedMessagesReceived(studyNameUserIdUuid, modificationNodeUuid);
checkElementUpdatedMessageSent(studyNameUserIdUuid, userId);
- Pair> modificationBody = Pair.of(loadModificationAttributes, List.of(rootNetworkNodeInfoService.getNetworkModificationApplicationContext(firstRootNetworkUuid, modificationNodeUuid, NETWORK_UUID)));
+ Pair> modificationBody = Pair.of(loadModificationAttributes,
+ List.of(rootNetworkNodeInfoService.getNetworkModificationApplicationContext(firstRootNetworkUuid, modificationNodeUuid, NETWORK_UUID)));
wireMockStubs.verifyNetworkModificationPostWithVariant(getModificationContextJsonString(mapper, modificationBody));
// modify load on second modification node
@@ -1485,7 +1534,8 @@ void testModifyEquipment() throws Exception {
checkEquipmentCreatingMessagesReceived(studyNameUserIdUuid, modificationNodeUuid);
checkEquipmentUpdatingFinishedMessagesReceived(studyNameUserIdUuid, modificationNodeUuid);
checkElementUpdatedMessageSent(studyNameUserIdUuid, userId);
- Pair> modificationBody = Pair.of(equipmentModificationAttribute, List.of(rootNetworkNodeInfoService.getNetworkModificationApplicationContext(firstRootNetworkUuid, modificationNodeUuid, NETWORK_UUID)));
+ Pair> modificationBody = Pair.of(equipmentModificationAttribute,
+ List.of(rootNetworkNodeInfoService.getNetworkModificationApplicationContext(firstRootNetworkUuid, modificationNodeUuid, NETWORK_UUID)));
wireMockStubs.verifyNetworkModificationPostWithVariant(getModificationContextJsonString(mapper, modificationBody));
// modify generator on second modification node
@@ -1497,7 +1547,8 @@ void testModifyEquipment() throws Exception {
checkEquipmentCreatingMessagesReceived(studyNameUserIdUuid, modificationNodeUuid2);
checkEquipmentUpdatingFinishedMessagesReceived(studyNameUserIdUuid, modificationNodeUuid2);
checkElementUpdatedMessageSent(studyNameUserIdUuid, userId);
- modificationBody = Pair.of(equipmentModificationAttribute, List.of(rootNetworkNodeInfoService.getNetworkModificationApplicationContext(firstRootNetworkUuid, modificationNodeUuid2, NETWORK_UUID)));
+ modificationBody = Pair.of(equipmentModificationAttribute, List.of(rootNetworkNodeInfoService.getNetworkModificationApplicationContext(firstRootNetworkUuid, modificationNodeUuid2,
+ NETWORK_UUID)));
wireMockStubs.verifyNetworkModificationPostWithVariant(getModificationContextJsonString(mapper, modificationBody));
// update generator modification
@@ -1546,7 +1597,8 @@ void testCreateSubstation() throws Exception {
checkEquipmentCreatingMessagesReceived(studyNameUserIdUuid, modificationNode1Uuid);
checkEquipmentUpdatingFinishedMessagesReceived(studyNameUserIdUuid, modificationNode1Uuid);
checkElementUpdatedMessageSent(studyNameUserIdUuid, userId);
- Pair> modificationBody = Pair.of(createSubstationAttributes, List.of(rootNetworkNodeInfoService.getNetworkModificationApplicationContext(firstRootNetworkUuid, modificationNode1Uuid, NETWORK_UUID)));
+ Pair> modificationBody = Pair.of(createSubstationAttributes,
+ List.of(rootNetworkNodeInfoService.getNetworkModificationApplicationContext(firstRootNetworkUuid, modificationNode1Uuid, NETWORK_UUID)));
wireMockStubs.verifyNetworkModificationPostWithVariant(getModificationContextJsonString(mapper, modificationBody));
// create substation on second modification node
@@ -1576,7 +1628,8 @@ void testCreateSubstation() throws Exception {
String createSubstationAttributes2 = "{\"type\":\"" + ModificationType.SUBSTATION_CREATION + "\",\"substationId\":\"substationId2\",\"substationName\":\"substationName2\",\"country\":\"AD\"}";
// Mark the node 1 status as built
- RootNetworkNodeInfoEntity rootNetworkNodeInfo1Entity = rootNetworkNodeInfoRepository.findByNodeInfoIdAndRootNetworkId(modificationNode1Uuid, studyTestUtils.getOneRootNetworkUuid(studyNameUserIdUuid)).orElseThrow(() -> new StudyException(NOT_FOUND, "Root network not found"));
+ RootNetworkNodeInfoEntity rootNetworkNodeInfo1Entity = rootNetworkNodeInfoRepository.findByNodeInfoIdAndRootNetworkId(modificationNode1Uuid,
+ studyTestUtils.getOneRootNetworkUuid(studyNameUserIdUuid)).orElseThrow(() -> new StudyException(NOT_FOUND, "Root network not found"));
rootNetworkNodeInfo1Entity.setNodeBuildStatus(NodeBuildStatusEmbeddable.from(BuildStatus.BUILDING));
rootNetworkNodeInfoRepository.save(rootNetworkNodeInfo1Entity);
// create substation on building node
@@ -1618,7 +1671,8 @@ void testCreateVoltageLevel() throws Exception {
checkEquipmentCreatingMessagesReceived(studyNameUserIdUuid, modificationNode1Uuid);
checkEquipmentUpdatingFinishedMessagesReceived(studyNameUserIdUuid, modificationNode1Uuid);
checkElementUpdatedMessageSent(studyNameUserIdUuid, userId);
- Pair> modificationBody = Pair.of(createVoltageLevelAttributes, List.of(rootNetworkNodeInfoService.getNetworkModificationApplicationContext(firstRootNetworkUuid, modificationNode1Uuid, NETWORK_UUID)));
+ Pair> modificationBody = Pair.of(createVoltageLevelAttributes,
+ List.of(rootNetworkNodeInfoService.getNetworkModificationApplicationContext(firstRootNetworkUuid, modificationNode1Uuid, NETWORK_UUID)));
wireMockStubs.verifyNetworkModificationPostWithVariant(getModificationContextJsonString(mapper, modificationBody));
// create voltage level on second modification node
@@ -1630,7 +1684,8 @@ void testCreateVoltageLevel() throws Exception {
checkEquipmentCreatingMessagesReceived(studyNameUserIdUuid, modificationNode2Uuid);
checkEquipmentUpdatingFinishedMessagesReceived(studyNameUserIdUuid, modificationNode2Uuid);
checkElementUpdatedMessageSent(studyNameUserIdUuid, userId);
- modificationBody = Pair.of(createVoltageLevelAttributes, List.of(rootNetworkNodeInfoService.getNetworkModificationApplicationContext(firstRootNetworkUuid, modificationNode2Uuid, NETWORK_UUID)));
+ modificationBody = Pair.of(createVoltageLevelAttributes, List.of(rootNetworkNodeInfoService.getNetworkModificationApplicationContext(firstRootNetworkUuid, modificationNode2Uuid,
+ NETWORK_UUID)));
wireMockStubs.verifyNetworkModificationPostWithVariant(getModificationContextJsonString(mapper, modificationBody));
// update voltage level creation
@@ -1650,7 +1705,8 @@ void testCreateVoltageLevel() throws Exception {
String createVoltageLevelAttributes2 = "{\"type\":\"" + ModificationType.VOLTAGE_LEVEL_CREATION + "\",\"voltageLevelId\":\"voltageLevelId3\",\"voltageLevelName\":\"voltageLevelName3\""
+ ",\"nominalVoltage\":\"379.1\", \"substationId\":\"s2\"}";
// Mark the node 1 status as building
- RootNetworkNodeInfoEntity rootNetworkNodeInfo1Entity = rootNetworkNodeInfoRepository.findByNodeInfoIdAndRootNetworkId(modificationNode1Uuid, studyTestUtils.getOneRootNetworkUuid(studyNameUserIdUuid)).orElseThrow(() -> new StudyException(NOT_FOUND, "Root network not found"));
+ RootNetworkNodeInfoEntity rootNetworkNodeInfo1Entity = rootNetworkNodeInfoRepository.findByNodeInfoIdAndRootNetworkId(modificationNode1Uuid,
+ studyTestUtils.getOneRootNetworkUuid(studyNameUserIdUuid)).orElseThrow(() -> new StudyException(NOT_FOUND, "Root network not found"));
rootNetworkNodeInfo1Entity.setNodeBuildStatus(NodeBuildStatusEmbeddable.from(BuildStatus.BUILDING));
rootNetworkNodeInfoRepository.save(rootNetworkNodeInfo1Entity);
// create voltage level on building node
@@ -1692,7 +1748,8 @@ void testLineSplitWithVoltageLevel() throws Exception {
checkEquipmentCreatingMessagesReceived(studyNameUserIdUuid, modificationNodeUuid);
checkEquipmentUpdatingFinishedMessagesReceived(studyNameUserIdUuid, modificationNodeUuid);
checkElementUpdatedMessageSent(studyNameUserIdUuid, userId);
- Pair> modificationBody = Pair.of(lineSplitWoVLasJSON, List.of(rootNetworkNodeInfoService.getNetworkModificationApplicationContext(firstRootNetworkUuid, modificationNodeUuid, NETWORK_UUID)));
+ Pair> modificationBody = Pair.of(lineSplitWoVLasJSON,
+ List.of(rootNetworkNodeInfoService.getNetworkModificationApplicationContext(firstRootNetworkUuid, modificationNodeUuid, NETWORK_UUID)));
wireMockStubs.verifyNetworkModificationPostWithVariant(getModificationContextJsonString(mapper, modificationBody));
UUID stubPutId = wireMockStubs.stubNetworkModificationPutWithBody(MODIFICATION_UUID, lineSplitWoVLasJSON);
@@ -1707,7 +1764,8 @@ void testLineSplitWithVoltageLevel() throws Exception {
wireMockStubs.verifyNetworkModificationPut(stubPutId, MODIFICATION_UUID, lineSplitWoVLasJSON);
String badBody = "{\"type\":\"" + ModificationType.LINE_SPLIT_WITH_VOLTAGE_LEVEL + "\",\"bogus\":\"bogus\"}";
- String modificationBodyJson = getModificationContextJsonString(mapper, Pair.of(badBody, List.of(rootNetworkNodeInfoService.getNetworkModificationApplicationContext(firstRootNetworkUuid, modificationNodeUuid, NETWORK_UUID))));
+ String modificationBodyJson = getModificationContextJsonString(mapper, Pair.of(badBody, List.of(rootNetworkNodeInfoService.getNetworkModificationApplicationContext(firstRootNetworkUuid,
+ modificationNodeUuid, NETWORK_UUID))));
wireMockStubs.stubNetworkModificationPostWithBodyAndError(modificationBodyJson);
stubPutId = wireMockStubs.stubNetworkModificationPutWithBodyAndError(MODIFICATION_UUID, badBody);
mockMvc.perform(post(URI_NETWORK_MODIF, studyNameUserIdUuid, modificationNodeUuid)
@@ -1740,7 +1798,8 @@ void testLineAttachToVoltageLevel() throws Exception {
String createVoltageLevelAttributes = "{\"voltageLevelId\":\"vl1\",\"voltageLevelName\":\"voltageLevelName1\""
+ ",\"nominalVoltage\":\"379.1\",\"substationId\":\"s1\"}";
String createLineAttributes = "{\"seriesResistance\":\"25\",\"seriesReactance\":\"12\"}";
- String createLineAttachToVoltageLevelAttributes = "{\"type\":\"" + ModificationType.LINE_ATTACH_TO_VOLTAGE_LEVEL + "\",\"lineToAttachToId\":\"line3\",\"percent\":\"10\",\"mayNewVoltageLevelInfos\":" +
+ String createLineAttachToVoltageLevelAttributes = "{\"type\":\"" + ModificationType.LINE_ATTACH_TO_VOLTAGE_LEVEL
+ + "\",\"lineToAttachToId\":\"line3\",\"percent\":\"10\",\"mayNewVoltageLevelInfos\":" +
createVoltageLevelAttributes + ",\"attachmentLine\":" + createLineAttributes + "}";
wireMockStubs.stubNetworkModificationPost(mapper.writeValueAsString(new NetworkModificationsResult(List.of(UUID.randomUUID()), List.of(Optional.empty()))));
@@ -1752,7 +1811,8 @@ void testLineAttachToVoltageLevel() throws Exception {
checkEquipmentCreatingMessagesReceived(studyNameUserIdUuid, modificationNodeUuid);
checkEquipmentUpdatingFinishedMessagesReceived(studyNameUserIdUuid, modificationNodeUuid);
checkElementUpdatedMessageSent(studyNameUserIdUuid, userId);
- Pair> modificationBody = Pair.of(createLineAttachToVoltageLevelAttributes, List.of(rootNetworkNodeInfoService.getNetworkModificationApplicationContext(firstRootNetworkUuid, modificationNodeUuid, NETWORK_UUID)));
+ Pair> modificationBody = Pair.of(createLineAttachToVoltageLevelAttributes,
+ List.of(rootNetworkNodeInfoService.getNetworkModificationApplicationContext(firstRootNetworkUuid, modificationNodeUuid, NETWORK_UUID)));
wireMockStubs.verifyNetworkModificationPostWithVariant(getModificationContextJsonString(mapper, modificationBody));
UUID stubPutId = wireMockStubs.stubNetworkModificationPutWithBody(MODIFICATION_UUID, createLineAttachToVoltageLevelAttributes);
@@ -1777,7 +1837,10 @@ void testLinesAttachToSplitLines() throws Exception {
NetworkModificationNode modificationNode = createNetworkModificationNode(studyNameUserIdUuid, rootNodeUuid, VARIANT_ID, "node", "userId");
UUID modificationNodeUuid = modificationNode.getId();
- String createLinesAttachToSplitLinesAttributes = "{\"type\":\"" + ModificationType.LINES_ATTACH_TO_SPLIT_LINES + "\",\"lineToAttachTo1Id\":\"line1\",\"lineToAttachTo2Id\":\"line2\",\"attachedLineId\":\"line3\",\"voltageLevelId\":\"vl1\",\"bbsBusId\":\"v1bbs\",\"replacingLine1Id\":\"replacingLine1Id\",\"replacingLine1Name\":\"replacingLine1Name\",\"replacingLine2Id\":\"replacingLine2Id\",\"replacingLine2Name\":\"replacingLine2Name\"}";
+ String createLinesAttachToSplitLinesAttributes = "{\"type\":\"" + ModificationType.LINES_ATTACH_TO_SPLIT_LINES
+ + "\",\"lineToAttachTo1Id\":\"line1\",\"lineToAttachTo2Id\":\"line2\",\"attachedLineId\":\"line3\",\"voltageLevelId\":\"vl1\",\"bbsBusId\":\"v1bbs\","
+ + "\"replacingLine1Id\":\"replacingLine1Id\",\"replacingLine1Name\":\"replacingLine1Name\",\"replacingLine2Id\":\"replacingLine2Id\","
+ + "\"replacingLine2Name\":\"replacingLine2Name\"}";
wireMockStubs.stubNetworkModificationPost(mapper.writeValueAsString(new NetworkModificationsResult(List.of(UUID.randomUUID()), List.of(Optional.empty()))));
mockMvc.perform(post(URI_NETWORK_MODIF, studyNameUserIdUuid, modificationNodeUuid)
.content(createLinesAttachToSplitLinesAttributes).contentType(MediaType.APPLICATION_JSON)
@@ -1787,7 +1850,8 @@ void testLinesAttachToSplitLines() throws Exception {
checkEquipmentCreatingMessagesReceived(studyNameUserIdUuid, modificationNodeUuid);
checkEquipmentUpdatingFinishedMessagesReceived(studyNameUserIdUuid, modificationNodeUuid);
checkElementUpdatedMessageSent(studyNameUserIdUuid, userId);
- Pair> modificationBody = Pair.of(createLinesAttachToSplitLinesAttributes, List.of(rootNetworkNodeInfoService.getNetworkModificationApplicationContext(firstRootNetworkUuid, modificationNodeUuid, NETWORK_UUID)));
+ Pair> modificationBody = Pair.of(createLinesAttachToSplitLinesAttributes,
+ List.of(rootNetworkNodeInfoService.getNetworkModificationApplicationContext(firstRootNetworkUuid, modificationNodeUuid, NETWORK_UUID)));
wireMockStubs.verifyNetworkModificationPostWithVariant(getModificationContextJsonString(mapper, modificationBody));
UUID stubPutId = wireMockStubs.stubNetworkModificationPutWithBody(MODIFICATION_UUID, createLinesAttachToSplitLinesAttributes);
@@ -1802,7 +1866,8 @@ void testLinesAttachToSplitLines() throws Exception {
wireMockStubs.verifyNetworkModificationPut(stubPutId, MODIFICATION_UUID, createLinesAttachToSplitLinesAttributes);
String badBody = "{\"type\":\"" + ModificationType.LINES_ATTACH_TO_SPLIT_LINES + "\",\"bogus\":\"bogus\"}";
- String modificationBodyJson = getModificationContextJsonString(mapper, Pair.of(badBody, List.of(rootNetworkNodeInfoService.getNetworkModificationApplicationContext(firstRootNetworkUuid, modificationNodeUuid, NETWORK_UUID))));
+ String modificationBodyJson = getModificationContextJsonString(mapper, Pair.of(badBody, List.of(rootNetworkNodeInfoService.getNetworkModificationApplicationContext(firstRootNetworkUuid,
+ modificationNodeUuid, NETWORK_UUID))));
wireMockStubs.stubNetworkModificationPostWithBodyAndError(modificationBodyJson);
stubPutId = wireMockStubs.stubNetworkModificationPutWithBodyAndError(MODIFICATION_UUID, badBody);
mockMvc.perform(post(URI_NETWORK_MODIF, studyNameUserIdUuid, modificationNodeUuid)
@@ -1845,7 +1910,8 @@ void testScaling(ModificationType scalingType) throws Exception {
checkEquipmentCreatingMessagesReceived(studyNameUserIdUuid, modificationNodeUuid);
checkEquipmentUpdatingFinishedMessagesReceived(studyNameUserIdUuid, modificationNodeUuid);
checkElementUpdatedMessageSent(studyNameUserIdUuid, userId);
- Pair> modificationBody = Pair.of(requestBody, List.of(rootNetworkNodeInfoService.getNetworkModificationApplicationContext(firstRootNetworkUuid, modificationNodeUuid, NETWORK_UUID)));
+ Pair> modificationBody = Pair.of(requestBody, List.of(rootNetworkNodeInfoService.getNetworkModificationApplicationContext(firstRootNetworkUuid,
+ modificationNodeUuid, NETWORK_UUID)));
wireMockStubs.verifyNetworkModificationPostWithVariant(getModificationContextJsonString(mapper, modificationBody));
UUID stubPutId = wireMockStubs.stubNetworkModificationPutWithBody(MODIFICATION_UUID, requestBody);
@@ -1860,7 +1926,8 @@ void testScaling(ModificationType scalingType) throws Exception {
wireMockStubs.verifyNetworkModificationPut(stubPutId, MODIFICATION_UUID, requestBody);
// test with errors
- String modificationBodyJson = getModificationContextJsonString(mapper, Pair.of(requestBody, List.of(rootNetworkNodeInfoService.getNetworkModificationApplicationContext(firstRootNetworkUuid, modificationNodeUuid, NETWORK_UUID))));
+ String modificationBodyJson = getModificationContextJsonString(mapper, Pair.of(requestBody, List.of(rootNetworkNodeInfoService.getNetworkModificationApplicationContext(firstRootNetworkUuid,
+ modificationNodeUuid, NETWORK_UUID))));
wireMockStubs.stubNetworkModificationPostWithBodyAndError(modificationBodyJson);
mockMvc.perform(post(URI_NETWORK_MODIF, studyNameUserIdUuid, modificationNodeUuid)
.content(requestBody).contentType(MediaType.APPLICATION_JSON)
@@ -1891,7 +1958,8 @@ void testDeleteVoltageLevelOnline() throws Exception {
NetworkModificationNode modificationNode = createNetworkModificationNode(studyNameUserIdUuid, rootNodeUuid, VARIANT_ID, "node", "userId");
UUID modificationNodeUuid = modificationNode.getId();
- String createDeleteVoltageLevelOnlineAttributes = "{\"type\":\"" + ModificationType.DELETE_VOLTAGE_LEVEL_ON_LINE + "\",\"lineToAttachTo1Id\":\"line1\",\"lineToAttachTo2Id\":\"line2\",\"replacingLine1Id\":\"replacingLine1Id\",\"replacingLine1Name\":\"replacingLine1Name\"}";
+ String createDeleteVoltageLevelOnlineAttributes = "{\"type\":\"" + ModificationType.DELETE_VOLTAGE_LEVEL_ON_LINE
+ + "\",\"lineToAttachTo1Id\":\"line1\",\"lineToAttachTo2Id\":\"line2\",\"replacingLine1Id\":\"replacingLine1Id\",\"replacingLine1Name\":\"replacingLine1Name\"}";
wireMockStubs.stubNetworkModificationPost(mapper.writeValueAsString(new NetworkModificationsResult(List.of(UUID.randomUUID()), List.of(Optional.empty()))));
mockMvc.perform(post(URI_NETWORK_MODIF, studyNameUserIdUuid, modificationNodeUuid)
.content(createDeleteVoltageLevelOnlineAttributes).contentType(MediaType.APPLICATION_JSON)
@@ -1900,7 +1968,8 @@ void testDeleteVoltageLevelOnline() throws Exception {
checkUpdateStatusMessagesReceived(studyNameUserIdUuid, modificationNodeUuid, output);
checkEquipmentCreatingMessagesReceived(studyNameUserIdUuid, modificationNodeUuid);
checkEquipmentUpdatingFinishedMessagesReceived(studyNameUserIdUuid, modificationNodeUuid);
- Pair> modificationBody = Pair.of(createDeleteVoltageLevelOnlineAttributes, List.of(rootNetworkNodeInfoService.getNetworkModificationApplicationContext(firstRootNetworkUuid, modificationNodeUuid, NETWORK_UUID)));
+ Pair> modificationBody = Pair.of(createDeleteVoltageLevelOnlineAttributes,
+ List.of(rootNetworkNodeInfoService.getNetworkModificationApplicationContext(firstRootNetworkUuid, modificationNodeUuid, NETWORK_UUID)));
wireMockStubs.verifyNetworkModificationPostWithVariant(getModificationContextJsonString(mapper, modificationBody));
UUID stubIdPut = wireMockStubs.stubNetworkModificationPutWithBody(MODIFICATION_UUID, createDeleteVoltageLevelOnlineAttributes);
@@ -1914,7 +1983,8 @@ void testDeleteVoltageLevelOnline() throws Exception {
wireMockStubs.verifyNetworkModificationPut(stubIdPut, MODIFICATION_UUID, createDeleteVoltageLevelOnlineAttributes);
String badBody = "{\"type\":\"" + ModificationType.DELETE_VOLTAGE_LEVEL_ON_LINE + "\",\"bogus\":\"bogus\"}";
- String modificationBodyJson = getModificationContextJsonString(mapper, Pair.of(badBody, List.of(rootNetworkNodeInfoService.getNetworkModificationApplicationContext(firstRootNetworkUuid, modificationNodeUuid, NETWORK_UUID))));
+ String modificationBodyJson = getModificationContextJsonString(mapper, Pair.of(badBody, List.of(rootNetworkNodeInfoService.getNetworkModificationApplicationContext(firstRootNetworkUuid,
+ modificationNodeUuid, NETWORK_UUID))));
wireMockStubs.stubNetworkModificationPostWithBodyAndError(modificationBodyJson);
UUID stubIdPutErr = wireMockStubs.stubNetworkModificationPutWithBodyAndError(MODIFICATION_UUID, badBody);
mockMvc.perform(post(URI_NETWORK_MODIF, studyNameUserIdUuid, modificationNodeUuid).header(USER_ID_HEADER, userId)
@@ -1944,7 +2014,9 @@ void testDeleteAttachingline() throws Exception {
NetworkModificationNode modificationNode = createNetworkModificationNode(studyNameUserIdUuid, rootNodeUuid, VARIANT_ID, "node", "userId");
UUID modificationNodeUuid = modificationNode.getId();
- String createDeleteAttachingLineAttributes = "{\"type\":\"" + ModificationType.DELETE_ATTACHING_LINE + "\",\"lineToAttachTo1Id\":\"line1\",\"lineToAttachTo2Id\":\"line2\",\"attachedLineId\":\"line3\",\"replacingLine1Id\":\"replacingLine1Id\",\"replacingLine1Name\":\"replacingLine1Name\"}";
+ String createDeleteAttachingLineAttributes = "{\"type\":\"" + ModificationType.DELETE_ATTACHING_LINE
+ + "\",\"lineToAttachTo1Id\":\"line1\",\"lineToAttachTo2Id\":\"line2\",\"attachedLineId\":\"line3\",\"replacingLine1Id\":\"replacingLine1Id\","
+ + "\"replacingLine1Name\":\"replacingLine1Name\"}";
wireMockStubs.stubNetworkModificationPost(mapper.writeValueAsString(new NetworkModificationsResult(List.of(UUID.randomUUID()), List.of(Optional.empty()))));
mockMvc.perform(post(URI_NETWORK_MODIF, studyNameUserIdUuid, modificationNodeUuid)
.content(createDeleteAttachingLineAttributes).contentType(MediaType.APPLICATION_JSON)
@@ -1953,7 +2025,8 @@ void testDeleteAttachingline() throws Exception {
checkUpdateStatusMessagesReceived(studyNameUserIdUuid, modificationNodeUuid, output);
checkEquipmentCreatingMessagesReceived(studyNameUserIdUuid, modificationNodeUuid);
checkEquipmentUpdatingFinishedMessagesReceived(studyNameUserIdUuid, modificationNodeUuid);
- Pair> modificationBody = Pair.of(createDeleteAttachingLineAttributes, List.of(rootNetworkNodeInfoService.getNetworkModificationApplicationContext(firstRootNetworkUuid, modificationNodeUuid, NETWORK_UUID)));
+ Pair> modificationBody = Pair.of(createDeleteAttachingLineAttributes,
+ List.of(rootNetworkNodeInfoService.getNetworkModificationApplicationContext(firstRootNetworkUuid, modificationNodeUuid, NETWORK_UUID)));
wireMockStubs.verifyNetworkModificationPostWithVariant(getModificationContextJsonString(mapper, modificationBody));
UUID stubIdPut = wireMockStubs.stubNetworkModificationPutWithBody(MODIFICATION_UUID, createDeleteAttachingLineAttributes);
@@ -1967,7 +2040,8 @@ void testDeleteAttachingline() throws Exception {
wireMockStubs.verifyNetworkModificationPut(stubIdPut, MODIFICATION_UUID, createDeleteAttachingLineAttributes);
String badBody = "{\"type\":\"" + ModificationType.DELETE_ATTACHING_LINE + "\",\"bogus\":\"bogus\"}";
- String modificationBodyJson = getModificationContextJsonString(mapper, Pair.of(badBody, List.of(rootNetworkNodeInfoService.getNetworkModificationApplicationContext(firstRootNetworkUuid, modificationNodeUuid, NETWORK_UUID))));
+ String modificationBodyJson = getModificationContextJsonString(mapper, Pair.of(badBody, List.of(rootNetworkNodeInfoService.getNetworkModificationApplicationContext(firstRootNetworkUuid,
+ modificationNodeUuid, NETWORK_UUID))));
wireMockStubs.stubNetworkModificationPostWithBodyAndError(modificationBodyJson);
UUID stubIdPutErr = wireMockStubs.stubNetworkModificationPutWithBodyAndError(MODIFICATION_UUID, badBody);
mockMvc.perform(post(URI_NETWORK_MODIF, studyNameUserIdUuid, modificationNodeUuid)
@@ -2024,7 +2098,8 @@ void testReorderModification() throws Exception {
checkEquipmentUpdatingFinishedMessagesReceived(studyNameUserIdUuid, modificationNodeUuid);
checkElementUpdatedMessageSent(studyNameUserIdUuid, userId);
- Pair, List> expectedBody = Pair.of(Collections.singletonList(modification1), List.of(rootNetworkNodeInfoService.getNetworkModificationApplicationContext(firstRootNetworkUuid, modificationNodeUuid, NETWORK_UUID)));
+ Pair, List> expectedBody = Pair.of(Collections.singletonList(modification1),
+ List.of(rootNetworkNodeInfoService.getNetworkModificationApplicationContext(firstRootNetworkUuid, modificationNodeUuid, NETWORK_UUID)));
String expectedBodyStr = mapper.writeValueAsString(expectedBody);
String url = "/v1/groups/" + modificationNode.getModificationGroupUuid();
WireMockUtils.verifyPutRequest(wireMockServer, groupStubId, url, true, Map.of(
@@ -2216,7 +2291,8 @@ void testDuplicateModification() throws Exception {
checkEquipmentUpdatingFinishedMessagesReceived(studyUuid, nodeUuid1);
checkElementUpdatedMessageSent(studyUuid, userId);
- Pair, List> modificationBody = Pair.of(modificationUuids, List.of(rootNetworkNodeInfoService.getNetworkModificationApplicationContext(firstRootNetworkUuid, node1.getId(), NETWORK_UUID)));
+ Pair, List> modificationBody = Pair.of(modificationUuids,
+ List.of(rootNetworkNodeInfoService.getNetworkModificationApplicationContext(firstRootNetworkUuid, node1.getId(), NETWORK_UUID)));
String expectedBody = mapper.writeValueAsString(modificationBody);
String url = "/v1/groups/" + node1.getModificationGroupUuid();
WireMockUtilsCriteria.verifyPutRequest(wireMockServer, url, Map.of("action", WireMock.equalTo("COPY")), expectedBody);
@@ -2227,7 +2303,8 @@ void testDuplicateModification() throws Exception {
verify(rootNetworkNodeInfoService, times(1)).copyModificationsToExcludeFromTags(any(), any(), any());
// now we do the same but on a built node
- RootNetworkNodeInfoEntity rootNetworkNodeInfo1Entity = rootNetworkNodeInfoRepository.findByNodeInfoIdAndRootNetworkId(nodeUuid1, studyTestUtils.getOneRootNetworkUuid(studyUuid)).orElseThrow(() -> new StudyException(NOT_FOUND, "Root network not found"));
+ RootNetworkNodeInfoEntity rootNetworkNodeInfo1Entity = rootNetworkNodeInfoRepository.findByNodeInfoIdAndRootNetworkId(nodeUuid1,
+ studyTestUtils.getOneRootNetworkUuid(studyUuid)).orElseThrow(() -> new StudyException(NOT_FOUND, "Root network not found"));
rootNetworkNodeInfo1Entity.setNodeBuildStatus(NodeBuildStatusEmbeddable.from(BuildStatus.BUILT));
rootNetworkNodeInfoRepository.save(rootNetworkNodeInfo1Entity);
@@ -2313,8 +2390,10 @@ void testDuplicateModificationReplicateChildExcludedUuids() throws Exception {
checkEquipmentUpdatingFinishedMessagesReceived(studyUuid, nodeUuid1);
checkElementUpdatedMessageSent(studyUuid, userId);
- Pair, List> modificationBody = Pair.of(modificationUuids, List.of(rootNetworkNodeInfoService.getNetworkModificationApplicationContext(studyTestUtils.getOneRootNetworkUuid(studyUuid), node1.getId(), NETWORK_UUID)));
- WireMockUtilsCriteria.verifyPutRequest(wireMockServer, "/v1/groups/" + node1.getModificationGroupUuid(), Map.of("action", WireMock.equalTo("COPY")), mapper.writeValueAsString(modificationBody));
+ Pair, List> modificationBody = Pair.of(modificationUuids,
+ List.of(rootNetworkNodeInfoService.getNetworkModificationApplicationContext(studyTestUtils.getOneRootNetworkUuid(studyUuid), node1.getId(), NETWORK_UUID)));
+ WireMockUtilsCriteria.verifyPutRequest(wireMockServer, "/v1/groups/" + node1.getModificationGroupUuid(), Map.of("action", WireMock.equalTo("COPY")),
+ mapper.writeValueAsString(modificationBody));
WireMockUtilsCriteria.verifyGetRequest(wireMockServer, "/v1/network-composite-modifications/children-uuids", Map.of("uuids", WireMock.matching(".*")), 2);
// The mapping must contain both the root-level pair AND the child pair
@@ -2365,7 +2444,8 @@ void testDuplicateModificationBetweenStudies() throws Exception {
checkEquipmentUpdatingFinishedMessagesReceived(studyEntity1.getId(), node1.getId());
checkElementUpdatedMessageSent(studyEntity1.getId(), userId);
- Pair, List> modificationBody = Pair.of(modifications, List.of(rootNetworkNodeInfoService.getNetworkModificationApplicationContext(studyTestUtils.getOneRootNetworkUuid(studyEntity1.getId()), node1.getId(), NETWORK_UUID)));
+ Pair, List> modificationBody = Pair.of(modifications,
+ List.of(rootNetworkNodeInfoService.getNetworkModificationApplicationContext(studyTestUtils.getOneRootNetworkUuid(studyEntity1.getId()), node1.getId(), NETWORK_UUID)));
String expectedBody = mapper.writeValueAsString(modificationBody);
String url = "/v1/groups/" + node1.getModificationGroupUuid();
WireMockUtilsCriteria.verifyPutRequest(wireMockServer, url, Map.of("action", WireMock.equalTo("COPY")), expectedBody);
@@ -2454,7 +2534,8 @@ void testCutAndPasteModification() throws Exception {
checkEquipmentUpdatingMessagesReceived(studyUuid, nodeUuid1);
checkEquipmentUpdatingFinishedMessagesReceived(studyUuid, nodeUuid1);
- Pair, List> expectedBody = Pair.of(List.of(modification1, modification2), List.of(rootNetworkNodeInfoService.getNetworkModificationApplicationContext(firstRootNetworkUuid, node1.getId(), NETWORK_UUID)));
+ Pair, List> expectedBody = Pair.of(List.of(modification1, modification2),
+ List.of(rootNetworkNodeInfoService.getNetworkModificationApplicationContext(firstRootNetworkUuid, node1.getId(), NETWORK_UUID)));
String expectedBodyStr = mapper.writeValueAsString(expectedBody);
String url = "/v1/groups/" + node1.getModificationGroupUuid();
WireMockUtils.verifyPutRequest(wireMockServer, groupStubId, url, true, Map.of(
@@ -2568,7 +2649,8 @@ void testDeleteEquipment() throws Exception {
checkEquipmentCreatingMessagesReceived(studyNameUserIdUuid, modificationNode1Uuid);
checkEquipmentUpdatingFinishedMessagesReceived(studyNameUserIdUuid, modificationNode1Uuid);
checkElementUpdatedMessageSent(studyNameUserIdUuid, userId);
- Pair> modificationBody = Pair.of(bodyJson, List.of(rootNetworkNodeInfoService.getNetworkModificationApplicationContext(firstRootNetworkUuid, modificationNode1Uuid, NETWORK_UUID)));
+ Pair> modificationBody = Pair.of(bodyJson, List.of(rootNetworkNodeInfoService.getNetworkModificationApplicationContext(firstRootNetworkUuid,
+ modificationNode1Uuid, NETWORK_UUID)));
wireMockStubs.verifyNetworkModificationPostWithVariant(getModificationContextJsonString(mapper, modificationBody));
// delete equipment on second modification node
@@ -2606,14 +2688,18 @@ void testNodesInvalidation() throws Exception {
UUID firstRootNetworkUuid = studyTestUtils.getOneRootNetworkUuid(studyEntity.getId());
UUID studyNameUserIdUuid = studyEntity.getId();
UUID rootNodeUuid = getRootNode(studyNameUserIdUuid).getId();
- NetworkModificationNode modificationNode1 = createNetworkModificationNode(studyNameUserIdUuid, rootNodeUuid, UUID.randomUUID(), VARIANT_ID, "node 1", NetworkModificationNodeType.CONSTRUCTION, BuildStatus.BUILT, userId);
+ NetworkModificationNode modificationNode1 = createNetworkModificationNode(studyNameUserIdUuid, rootNodeUuid, UUID.randomUUID(), VARIANT_ID, "node 1", NetworkModificationNodeType.CONSTRUCTION,
+ BuildStatus.BUILT, userId);
UUID modificationNode1Uuid = modificationNode1.getId();
- NetworkModificationNode modificationNode2 = createNetworkModificationNode(studyNameUserIdUuid, modificationNode1Uuid, UUID.randomUUID(), VARIANT_ID_2, "node 2", NetworkModificationNodeType.SECURITY, BuildStatus.BUILT, userId);
+ NetworkModificationNode modificationNode2 = createNetworkModificationNode(studyNameUserIdUuid, modificationNode1Uuid, UUID.randomUUID(), VARIANT_ID_2, "node 2",
+ NetworkModificationNodeType.SECURITY, BuildStatus.BUILT, userId);
UUID modificationNode2Uuid = modificationNode2.getId();
- NetworkModificationNode modificationNode3 = createNetworkModificationNode(studyNameUserIdUuid, modificationNode2Uuid, UUID.randomUUID(), VARIANT_ID_3, "node 3", NetworkModificationNodeType.SECURITY, BuildStatus.BUILT, userId);
+ NetworkModificationNode modificationNode3 = createNetworkModificationNode(studyNameUserIdUuid, modificationNode2Uuid, UUID.randomUUID(), VARIANT_ID_3, "node 3",
+ NetworkModificationNodeType.SECURITY, BuildStatus.BUILT, userId);
UUID modificationNode3Uuid = modificationNode3.getId();
- RootNetworkNodeInfoEntity rootNetworkNodeInfoEntity = rootNetworkNodeInfoRepository.findByNodeInfoIdAndRootNetworkId(modificationNode1Uuid, studyTestUtils.getOneRootNetworkUuid(studyNameUserIdUuid)).orElseThrow(() -> new StudyException(NOT_FOUND, "Root network not found"));
+ RootNetworkNodeInfoEntity rootNetworkNodeInfoEntity = rootNetworkNodeInfoRepository.findByNodeInfoIdAndRootNetworkId(modificationNode1Uuid,
+ studyTestUtils.getOneRootNetworkUuid(studyNameUserIdUuid)).orElseThrow(() -> new StudyException(NOT_FOUND, "Root network not found"));
rootNetworkNodeInfoEntity.setSecurityAnalysisResultUuid(UUID.fromString(SECURITY_ANALYSIS_RESULT_UUID));
rootNetworkNodeInfoEntity.setSensitivityAnalysisResultUuid(UUID.fromString(SENSITIVITY_ANALYSIS_RESULT_UUID));
rootNetworkNodeInfoEntity.setShortCircuitAnalysisResultUuid(UUID.fromString(SHORTCIRCUIT_ANALYSIS_RESULT_UUID));
@@ -2661,10 +2747,12 @@ void testNodesInvalidation() throws Exception {
});
// Mark nodes 2 and 3 status as built
- rootNetworkNodeInfoEntity = rootNetworkNodeInfoRepository.findByNodeInfoIdAndRootNetworkId(modificationNode2Uuid, studyTestUtils.getOneRootNetworkUuid(studyNameUserIdUuid)).orElseThrow(() -> new StudyException(NOT_FOUND, "Root network not found"));
+ rootNetworkNodeInfoEntity = rootNetworkNodeInfoRepository.findByNodeInfoIdAndRootNetworkId(modificationNode2Uuid,
+ studyTestUtils.getOneRootNetworkUuid(studyNameUserIdUuid)).orElseThrow(() -> new StudyException(NOT_FOUND, "Root network not found"));
rootNetworkNodeInfoEntity.setNodeBuildStatus(NodeBuildStatusEmbeddable.from(BuildStatus.BUILT));
rootNetworkNodeInfoRepository.save(rootNetworkNodeInfoEntity);
- rootNetworkNodeInfoEntity = rootNetworkNodeInfoRepository.findByNodeInfoIdAndRootNetworkId(modificationNode3Uuid, studyTestUtils.getOneRootNetworkUuid(studyNameUserIdUuid)).orElseThrow(() -> new StudyException(NOT_FOUND, "Root network not found"));
+ rootNetworkNodeInfoEntity = rootNetworkNodeInfoRepository.findByNodeInfoIdAndRootNetworkId(modificationNode3Uuid,
+ studyTestUtils.getOneRootNetworkUuid(studyNameUserIdUuid)).orElseThrow(() -> new StudyException(NOT_FOUND, "Root network not found"));
rootNetworkNodeInfoEntity.setNodeBuildStatus(NodeBuildStatusEmbeddable.from(BuildStatus.BUILT));
rootNetworkNodeInfoRepository.save(rootNetworkNodeInfoEntity);
@@ -2684,7 +2772,8 @@ void testNodesInvalidation() throws Exception {
checkEquipmentUpdatingFinishedMessagesReceived(studyNameUserIdUuid, modificationNode2Uuid);
checkElementUpdatedMessageSent(studyNameUserIdUuid, userId);
assertEquals(BuildStatus.NOT_BUILT, networkModificationTreeService.getNodeBuildStatus(modificationNode3Uuid, firstRootNetworkUuid).getGlobalBuildStatus());
- Pair> modificationBody = Pair.of(jsonCreateLoadInfos, List.of(rootNetworkNodeInfoService.getNetworkModificationApplicationContext(firstRootNetworkUuid, modificationNode2Uuid, NETWORK_UUID)));
+ Pair> modificationBody = Pair.of(jsonCreateLoadInfos,
+ List.of(rootNetworkNodeInfoService.getNetworkModificationApplicationContext(firstRootNetworkUuid, modificationNode2Uuid, NETWORK_UUID)));
wireMockStubs.verifyNetworkModificationPostWithVariant(getModificationContextJsonString(mapper, modificationBody));
}
@@ -2698,10 +2787,12 @@ void testRemoveLoadFlowComputationReport() throws Exception {
UUID studyNameUserIdUuid = studyEntity.getId();
UUID firstRootNetworkUuid = studyTestUtils.getOneRootNetworkUuid(studyNameUserIdUuid);
UUID rootNodeUuid = getRootNode(studyNameUserIdUuid).getId();
- NetworkModificationNode modificationNode1 = createNetworkModificationNode(studyNameUserIdUuid, rootNodeUuid, UUID.randomUUID(), VARIANT_ID, "node 1", NetworkModificationNodeType.SECURITY, BuildStatus.BUILT, userId);
+ NetworkModificationNode modificationNode1 = createNetworkModificationNode(studyNameUserIdUuid, rootNodeUuid, UUID.randomUUID(), VARIANT_ID, "node 1", NetworkModificationNodeType.SECURITY,
+ BuildStatus.BUILT, userId);
UUID modificationNode1Uuid = modificationNode1.getId();
// In this node, let's say we have all computation results
- RootNetworkNodeInfoEntity rootNetworkNodeInfoEntity = rootNetworkNodeInfoRepository.findByNodeInfoIdAndRootNetworkId(modificationNode1Uuid, studyTestUtils.getOneRootNetworkUuid(studyNameUserIdUuid)).orElseThrow(() -> new StudyException(NOT_FOUND, "Root network not found"));
+ RootNetworkNodeInfoEntity rootNetworkNodeInfoEntity = rootNetworkNodeInfoRepository.findByNodeInfoIdAndRootNetworkId(modificationNode1Uuid,
+ studyTestUtils.getOneRootNetworkUuid(studyNameUserIdUuid)).orElseThrow(() -> new StudyException(NOT_FOUND, "Root network not found"));
rootNetworkNodeInfoEntity.setLoadFlowResultUuid(UUID.fromString(LOADFLOW_RESULT_UUID));
rootNetworkNodeInfoEntity.setSecurityAnalysisResultUuid(UUID.fromString(SECURITY_ANALYSIS_RESULT_UUID));
rootNetworkNodeInfoEntity.setDynamicSimulationResultUuid(UUID.fromString(DYNAMIC_SIMULATION_RESULT_UUID));
@@ -2713,7 +2804,7 @@ void testRemoveLoadFlowComputationReport() throws Exception {
rootNetworkNodeInfoEntity.setVoltageInitResultUuid(UUID.fromString(VOLTAGE_INIT_RESULT_UUID));
rootNetworkNodeInfoEntity.setStateEstimationResultUuid(UUID.fromString(STATE_ESTIMATION_RESULT_UUID));
rootNetworkNodeInfoEntity.setPccMinResultUuid(UUID.fromString(PCC_MIN_RESULT_UUID));
- Map