@@ -128,7 +128,7 @@ private NetworkModificationNode createAndInsertNode(StudyEntity study, UUID node
128
128
if (insertMode .equals (InsertMode .BEFORE )) {
129
129
reference .setParentNode (node );
130
130
} else if (insertMode .equals (InsertMode .AFTER )) {
131
- nodesRepository . findAllByParentNodeIdNode (nodeId ).stream ()
131
+ getChildren (nodeId ).stream ()
132
132
.filter (n -> !n .getIdNode ().equals (node .getIdNode ()))
133
133
.forEach (child -> child .setParentNode (node ));
134
134
}
@@ -238,7 +238,7 @@ public void moveStudyNode(UUID nodeToMoveUuid, UUID anchorNodeUuid, InsertMode i
238
238
private UUID moveNode (UUID nodeToMoveUuid , UUID anchorNodeUuid , InsertMode insertMode ) {
239
239
NodeEntity nodeToMoveEntity = getNodeEntity (nodeToMoveUuid );
240
240
241
- nodesRepository . findAllByParentNodeIdNode (nodeToMoveUuid )
241
+ getChildren (nodeToMoveUuid )
242
242
.forEach (child -> child .setParentNode (nodeToMoveEntity .getParentNode ()));
243
243
244
244
NodeEntity anchorNodeEntity = getNodeEntity (anchorNodeUuid );
@@ -253,7 +253,7 @@ private UUID moveNode(UUID nodeToMoveUuid, UUID anchorNodeUuid, InsertMode inser
253
253
if (insertMode .equals (InsertMode .BEFORE )) {
254
254
anchorNodeEntity .setParentNode (nodeToMoveEntity );
255
255
} else if (insertMode .equals (InsertMode .AFTER )) {
256
- nodesRepository . findAllByParentNodeIdNode (anchorNodeUuid ).stream ()
256
+ getChildren (anchorNodeUuid ).stream ()
257
257
.filter (n -> !n .getIdNode ().equals (nodeToMoveEntity .getIdNode ()))
258
258
.forEach (child -> child .setParentNode (nodeToMoveEntity ));
259
259
}
@@ -299,9 +299,9 @@ private void stashNodes(UUID id, boolean stashChildren, List<UUID> stashedNodes,
299
299
UUID modificationGroupUuid = self .getModificationGroupUuid (nodeToStash .getIdNode ());
300
300
networkModificationService .deleteStashedModifications (modificationGroupUuid );
301
301
if (!stashChildren ) {
302
- nodesRepository . findAllByParentNodeIdNode (id ).forEach (node -> node .setParentNode (nodeToStash .getParentNode ()));
302
+ getChildren (id ).forEach (node -> node .setParentNode (nodeToStash .getParentNode ()));
303
303
} else {
304
- nodesRepository . findAllByParentNodeIdNode (id )
304
+ getChildren (id )
305
305
.forEach (child -> stashNodes (child .getIdNode (), true , stashedNodes , false ));
306
306
}
307
307
stashedNodes .add (id );
@@ -329,9 +329,9 @@ private void deleteNodes(UUID id, boolean deleteChildren, boolean allowDeleteRoo
329
329
rootNetworkNodeInfoService .fillDeleteNodeInfo (id , deleteNodeInfos );
330
330
331
331
if (!deleteChildren ) {
332
- nodesRepository . findAllByParentNodeIdNode (id ).forEach (node -> node .setParentNode (nodeToDelete .getParentNode ()));
332
+ getChildren (id ).forEach (node -> node .setParentNode (nodeToDelete .getParentNode ()));
333
333
} else {
334
- nodesRepository . findAllByParentNodeIdNode (id )
334
+ getChildren (id )
335
335
.forEach (child -> deleteNodes (child .getIdNode (), true , false , removedNodes , deleteNodeInfos ));
336
336
}
337
337
removedNodes .add (id );
@@ -361,7 +361,7 @@ public List<UUID> getChildrenUuids(UUID parentUuid) {
361
361
362
362
private void doGetChildrenUuids (UUID parentUuid , List <UUID > children ) {
363
363
Optional <NodeEntity > optNode = nodesRepository .findById (parentUuid );
364
- optNode .ifPresent (node -> nodesRepository . findAllByParentNodeIdNode (parentUuid )
364
+ optNode .ifPresent (node -> getChildren (parentUuid )
365
365
.forEach (child -> {
366
366
children .add (child .getIdNode ());
367
367
doGetChildrenUuids (child .getIdNode (), children );
@@ -574,7 +574,7 @@ private AbstractNode getSimpleNode(UUID nodeId) {
574
574
@ Transactional
575
575
public AbstractNode getNode (UUID nodeId , UUID rootNetworkUuid ) {
576
576
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 );
578
578
if (rootNetworkUuid != null ) {
579
579
completeNodeInfos (List .of (node ), rootNetworkUuid );
580
580
}
@@ -759,7 +759,7 @@ public Map<UUID, UUID> getModificationReports(UUID nodeUuid, UUID rootNetworkUui
759
759
}
760
760
761
761
private void restoreNodeChildren (UUID studyId , UUID parentNodeId ) {
762
- nodesRepository . findAllByParentNodeIdNode (parentNodeId ).forEach (nodeEntity -> {
762
+ getChildren (parentNodeId ).forEach (nodeEntity -> {
763
763
NetworkModificationNodeInfoEntity modificationNodeToRestore = networkModificationNodeInfoRepository .findById (nodeEntity .getIdNode ()).orElseThrow (() -> new StudyException (NODE_NOT_FOUND ));
764
764
if (self .isNodeNameExists (studyId , modificationNodeToRestore .getName ())) {
765
765
String newName = getSuffixedNodeName (studyId , modificationNodeToRestore .getName ());
0 commit comments