Skip to content

Commit ad66f8f

Browse files
author
Slimane AMAR
committed
Use method getChildren and not directly the repository
1 parent 520bd8e commit ad66f8f

File tree

1 file changed

+10
-10
lines changed

1 file changed

+10
-10
lines changed

src/main/java/org/gridsuite/study/server/service/NetworkModificationTreeService.java

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ private NetworkModificationNode createAndInsertNode(StudyEntity study, UUID node
128128
if (insertMode.equals(InsertMode.BEFORE)) {
129129
reference.setParentNode(node);
130130
} else if (insertMode.equals(InsertMode.AFTER)) {
131-
nodesRepository.findAllByParentNodeIdNode(nodeId).stream()
131+
getChildren(nodeId).stream()
132132
.filter(n -> !n.getIdNode().equals(node.getIdNode()))
133133
.forEach(child -> child.setParentNode(node));
134134
}
@@ -238,7 +238,7 @@ public void moveStudyNode(UUID nodeToMoveUuid, UUID anchorNodeUuid, InsertMode i
238238
private UUID moveNode(UUID nodeToMoveUuid, UUID anchorNodeUuid, InsertMode insertMode) {
239239
NodeEntity nodeToMoveEntity = getNodeEntity(nodeToMoveUuid);
240240

241-
nodesRepository.findAllByParentNodeIdNode(nodeToMoveUuid)
241+
getChildren(nodeToMoveUuid)
242242
.forEach(child -> child.setParentNode(nodeToMoveEntity.getParentNode()));
243243

244244
NodeEntity anchorNodeEntity = getNodeEntity(anchorNodeUuid);
@@ -253,7 +253,7 @@ private UUID moveNode(UUID nodeToMoveUuid, UUID anchorNodeUuid, InsertMode inser
253253
if (insertMode.equals(InsertMode.BEFORE)) {
254254
anchorNodeEntity.setParentNode(nodeToMoveEntity);
255255
} else if (insertMode.equals(InsertMode.AFTER)) {
256-
nodesRepository.findAllByParentNodeIdNode(anchorNodeUuid).stream()
256+
getChildren(anchorNodeUuid).stream()
257257
.filter(n -> !n.getIdNode().equals(nodeToMoveEntity.getIdNode()))
258258
.forEach(child -> child.setParentNode(nodeToMoveEntity));
259259
}
@@ -299,9 +299,9 @@ private void stashNodes(UUID id, boolean stashChildren, List<UUID> stashedNodes,
299299
UUID modificationGroupUuid = self.getModificationGroupUuid(nodeToStash.getIdNode());
300300
networkModificationService.deleteStashedModifications(modificationGroupUuid);
301301
if (!stashChildren) {
302-
nodesRepository.findAllByParentNodeIdNode(id).forEach(node -> node.setParentNode(nodeToStash.getParentNode()));
302+
getChildren(id).forEach(node -> node.setParentNode(nodeToStash.getParentNode()));
303303
} else {
304-
nodesRepository.findAllByParentNodeIdNode(id)
304+
getChildren(id)
305305
.forEach(child -> stashNodes(child.getIdNode(), true, stashedNodes, false));
306306
}
307307
stashedNodes.add(id);
@@ -329,9 +329,9 @@ private void deleteNodes(UUID id, boolean deleteChildren, boolean allowDeleteRoo
329329
rootNetworkNodeInfoService.fillDeleteNodeInfo(id, deleteNodeInfos);
330330

331331
if (!deleteChildren) {
332-
nodesRepository.findAllByParentNodeIdNode(id).forEach(node -> node.setParentNode(nodeToDelete.getParentNode()));
332+
getChildren(id).forEach(node -> node.setParentNode(nodeToDelete.getParentNode()));
333333
} else {
334-
nodesRepository.findAllByParentNodeIdNode(id)
334+
getChildren(id)
335335
.forEach(child -> deleteNodes(child.getIdNode(), true, false, removedNodes, deleteNodeInfos));
336336
}
337337
removedNodes.add(id);
@@ -361,7 +361,7 @@ public List<UUID> getChildrenUuids(UUID parentUuid) {
361361

362362
private void doGetChildrenUuids(UUID parentUuid, List<UUID> children) {
363363
Optional<NodeEntity> optNode = nodesRepository.findById(parentUuid);
364-
optNode.ifPresent(node -> nodesRepository.findAllByParentNodeIdNode(parentUuid)
364+
optNode.ifPresent(node -> getChildren(parentUuid)
365365
.forEach(child -> {
366366
children.add(child.getIdNode());
367367
doGetChildrenUuids(child.getIdNode(), children);
@@ -574,7 +574,7 @@ private AbstractNode getSimpleNode(UUID nodeId) {
574574
@Transactional
575575
public AbstractNode getNode(UUID nodeId, UUID rootNetworkUuid) {
576576
AbstractNode node = getSimpleNode(nodeId);
577-
nodesRepository.findAllByParentNodeIdNode(node.getId()).stream().map(NodeEntity::getIdNode).forEach(node.getChildrenIds()::add);
577+
getChildren(node.getId()).stream().map(NodeEntity::getIdNode).forEach(node.getChildrenIds()::add);
578578
if (rootNetworkUuid != null) {
579579
completeNodeInfos(List.of(node), rootNetworkUuid);
580580
}
@@ -759,7 +759,7 @@ public Map<UUID, UUID> getModificationReports(UUID nodeUuid, UUID rootNetworkUui
759759
}
760760

761761
private void restoreNodeChildren(UUID studyId, UUID parentNodeId) {
762-
nodesRepository.findAllByParentNodeIdNode(parentNodeId).forEach(nodeEntity -> {
762+
getChildren(parentNodeId).forEach(nodeEntity -> {
763763
NetworkModificationNodeInfoEntity modificationNodeToRestore = networkModificationNodeInfoRepository.findById(nodeEntity.getIdNode()).orElseThrow(() -> new StudyException(NODE_NOT_FOUND));
764764
if (self.isNodeNameExists(studyId, modificationNodeToRestore.getName())) {
765765
String newName = getSuffixedNodeName(studyId, modificationNodeToRestore.getName());

0 commit comments

Comments
 (0)