From 1339dd59a982eb81ae5cd99d4f0b87421dcf25fa Mon Sep 17 00:00:00 2001 From: pjoshi31 Date: Wed, 2 Nov 2022 14:52:35 +0530 Subject: [PATCH 01/11] [MNT-22353]- Removed Hold cases to be processed. --- .../job/DispositionLifecycleJobExecuter.java | 28 ++++++++++--------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/amps/ags/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/job/DispositionLifecycleJobExecuter.java b/amps/ags/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/job/DispositionLifecycleJobExecuter.java index 9dcc126f20..231f06facf 100644 --- a/amps/ags/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/job/DispositionLifecycleJobExecuter.java +++ b/amps/ags/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/job/DispositionLifecycleJobExecuter.java @@ -30,6 +30,7 @@ package org.alfresco.module.org_alfresco_module_rm.job; import static org.alfresco.module.org_alfresco_module_rm.action.RMDispositionActionExecuterAbstractBase.PARAM_NO_ERROR_CHECK; import java.io.Serializable; +import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -194,6 +195,7 @@ public class DispositionLifecycleJobExecuter extends RecordsManagementJobExecute boolean hasMore = true; int skipCount = 0; + List resultList = new ArrayList<>(); if (batchSize < 1) { @@ -214,17 +216,23 @@ public class DispositionLifecycleJobExecuter extends RecordsManagementJobExecute // execute search ResultSet results = searchService.query(params); - List resultNodes = results.getNodeRefs(); - hasMore = results.hasMore(); - skipCount += resultNodes.size(); // increase by page size + if(results.length() != 0) { + for (NodeRef nodeRef : results.getNodeRefs()) { + log.info("Freeze service: "+(freezeService.isFrozenOrHasFrozenChildren(nodeService.getPrimaryParent(nodeRef).getParentRef())? MSG_NODE_FROZEN: "Node is not freezed")); + if (!freezeService.isFrozenOrHasFrozenChildren(nodeService.getPrimaryParent(nodeRef).getParentRef())) { + resultList.add(nodeRef); + } + } + hasMore = results.hasMore(); + } + skipCount += resultList.size(); // increase by page size results.close(); - log.debug("Processing " + resultNodes.size() + " nodes"); - + log.debug("Processing " + resultList.size() + " nodes"); // process search results - if (!resultNodes.isEmpty()) + if (!resultList.isEmpty()) { - executeAction(resultNodes); + executeAction(resultList); } } log.debug("Job Finished"); @@ -265,12 +273,6 @@ public class DispositionLifecycleJobExecuter extends RecordsManagementJobExecute } Map props = Map.of(PARAM_NO_ERROR_CHECK, false); - if (freezeService.isFrozenOrHasFrozenChildren(parent.getParentRef())) - { - log.debug(I18NUtil.getMessage(MSG_NODE_FROZEN, dispAction)); - continue; - } - try { // execute disposition action From 4ad2bda8b9aa89746be049809414c12f55f3d910 Mon Sep 17 00:00:00 2001 From: pjoshi31 Date: Wed, 2 Nov 2022 15:37:08 +0530 Subject: [PATCH 02/11] [MNT-22353]- Added debug logs. --- .../job/DispositionLifecycleJobExecuter.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/amps/ags/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/job/DispositionLifecycleJobExecuter.java b/amps/ags/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/job/DispositionLifecycleJobExecuter.java index 231f06facf..a9e0a4726c 100644 --- a/amps/ags/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/job/DispositionLifecycleJobExecuter.java +++ b/amps/ags/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/job/DispositionLifecycleJobExecuter.java @@ -218,7 +218,7 @@ public class DispositionLifecycleJobExecuter extends RecordsManagementJobExecute ResultSet results = searchService.query(params); if(results.length() != 0) { for (NodeRef nodeRef : results.getNodeRefs()) { - log.info("Freeze service: "+(freezeService.isFrozenOrHasFrozenChildren(nodeService.getPrimaryParent(nodeRef).getParentRef())? MSG_NODE_FROZEN: "Node is not freezed")); + log.debug("Freeze service: "+freezeService.isFrozenOrHasFrozenChildren(nodeService.getPrimaryParent(nodeRef).getParentRef())); if (!freezeService.isFrozenOrHasFrozenChildren(nodeService.getPrimaryParent(nodeRef).getParentRef())) { resultList.add(nodeRef); } From a3615965122d041b402ac2554f31d7917ec4e9d6 Mon Sep 17 00:00:00 2001 From: pjoshi31 Date: Wed, 2 Nov 2022 16:07:59 +0530 Subject: [PATCH 03/11] [MNT-22353]- Added Parallel Streams for filtering frozen nodes. --- .../job/DispositionLifecycleJobExecuter.java | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/amps/ags/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/job/DispositionLifecycleJobExecuter.java b/amps/ags/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/job/DispositionLifecycleJobExecuter.java index a9e0a4726c..d1920edc84 100644 --- a/amps/ags/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/job/DispositionLifecycleJobExecuter.java +++ b/amps/ags/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/job/DispositionLifecycleJobExecuter.java @@ -33,6 +33,7 @@ import java.io.Serializable; import java.util.ArrayList; import java.util.List; import java.util.Map; +import java.util.stream.Collectors; import lombok.extern.slf4j.Slf4j; import org.alfresco.error.AlfrescoRuntimeException; @@ -48,7 +49,6 @@ import org.alfresco.service.cmr.search.ResultSet; import org.alfresco.service.cmr.search.SearchParameters; import org.alfresco.service.cmr.search.SearchService; import org.alfresco.service.cmr.security.PersonService; -import org.springframework.extensions.surf.util.I18NUtil; /** @@ -65,7 +65,6 @@ public class DispositionLifecycleJobExecuter extends RecordsManagementJobExecute /** batching properties */ private int batchSize; public static final int DEFAULT_BATCH_SIZE = 500; - private static final String MSG_NODE_FROZEN = "rm.action.node.frozen.error-message"; /** list of disposition actions to automatically execute */ private List dispositionActions; @@ -216,19 +215,15 @@ public class DispositionLifecycleJobExecuter extends RecordsManagementJobExecute // execute search ResultSet results = searchService.query(params); + hasMore = results.hasMore(); if(results.length() != 0) { - for (NodeRef nodeRef : results.getNodeRefs()) { - log.debug("Freeze service: "+freezeService.isFrozenOrHasFrozenChildren(nodeService.getPrimaryParent(nodeRef).getParentRef())); - if (!freezeService.isFrozenOrHasFrozenChildren(nodeService.getPrimaryParent(nodeRef).getParentRef())) { - resultList.add(nodeRef); - } - } - hasMore = results.hasMore(); + resultList=results.getNodeRefs().parallelStream().filter(node ->!freezeService.isFrozenOrHasFrozenChildren(nodeService.getPrimaryParent(node).getParentRef())).collect(Collectors.toList()); } skipCount += resultList.size(); // increase by page size results.close(); log.debug("Processing " + resultList.size() + " nodes"); + // process search results if (!resultList.isEmpty()) { From 3f10227c0f416d90bbb958fd48ec16f9ff73921f Mon Sep 17 00:00:00 2001 From: pjoshi31 Date: Wed, 2 Nov 2022 18:05:11 +0530 Subject: [PATCH 04/11] [MNT-22353]- Added Streams for filtering frozen nodes. --- .../job/DispositionLifecycleJobExecuter.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/amps/ags/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/job/DispositionLifecycleJobExecuter.java b/amps/ags/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/job/DispositionLifecycleJobExecuter.java index d1920edc84..d6fb0d0c4e 100644 --- a/amps/ags/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/job/DispositionLifecycleJobExecuter.java +++ b/amps/ags/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/job/DispositionLifecycleJobExecuter.java @@ -217,7 +217,7 @@ public class DispositionLifecycleJobExecuter extends RecordsManagementJobExecute ResultSet results = searchService.query(params); hasMore = results.hasMore(); if(results.length() != 0) { - resultList=results.getNodeRefs().parallelStream().filter(node ->!freezeService.isFrozenOrHasFrozenChildren(nodeService.getPrimaryParent(node).getParentRef())).collect(Collectors.toList()); + resultList=results.getNodeRefs().stream().filter(node ->!freezeService.isFrozenOrHasFrozenChildren(nodeService.getPrimaryParent(node).getParentRef())).collect(Collectors.toList()); } skipCount += resultList.size(); // increase by page size results.close(); From f71f243b9b03bf86d9f9ca2fb1c98a86e292ceef Mon Sep 17 00:00:00 2001 From: pjoshi31 Date: Thu, 3 Nov 2022 11:21:07 +0530 Subject: [PATCH 05/11] [MNT-22353]- Changed variable. --- .../job/DispositionLifecycleJobExecuter.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/amps/ags/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/job/DispositionLifecycleJobExecuter.java b/amps/ags/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/job/DispositionLifecycleJobExecuter.java index d6fb0d0c4e..d9b635d442 100644 --- a/amps/ags/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/job/DispositionLifecycleJobExecuter.java +++ b/amps/ags/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/job/DispositionLifecycleJobExecuter.java @@ -194,7 +194,7 @@ public class DispositionLifecycleJobExecuter extends RecordsManagementJobExecute boolean hasMore = true; int skipCount = 0; - List resultList = new ArrayList<>(); + List resultNodes = new ArrayList<>(); if (batchSize < 1) { @@ -217,17 +217,17 @@ public class DispositionLifecycleJobExecuter extends RecordsManagementJobExecute ResultSet results = searchService.query(params); hasMore = results.hasMore(); if(results.length() != 0) { - resultList=results.getNodeRefs().stream().filter(node ->!freezeService.isFrozenOrHasFrozenChildren(nodeService.getPrimaryParent(node).getParentRef())).collect(Collectors.toList()); + resultNodes=results.getNodeRefs().stream().filter(node ->!freezeService.isFrozenOrHasFrozenChildren(nodeService.getPrimaryParent(node).getParentRef())).collect(Collectors.toList()); } - skipCount += resultList.size(); // increase by page size + skipCount += resultNodes.size(); // increase by page size results.close(); - log.debug("Processing " + resultList.size() + " nodes"); + log.debug("Processing " + resultNodes.size() + " nodes"); // process search results - if (!resultList.isEmpty()) + if (!resultNodes.isEmpty()) { - executeAction(resultList); + executeAction(resultNodes); } } log.debug("Job Finished"); From 4c2d9ef64ddf4e62e5c57cd1070b77f3113fbdd1 Mon Sep 17 00:00:00 2001 From: pjoshi31 Date: Thu, 3 Nov 2022 11:45:49 +0530 Subject: [PATCH 06/11] [MNT-22353]- Added comment. --- .../job/DispositionLifecycleJobExecuter.java | 1 + 1 file changed, 1 insertion(+) diff --git a/amps/ags/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/job/DispositionLifecycleJobExecuter.java b/amps/ags/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/job/DispositionLifecycleJobExecuter.java index d9b635d442..b9481d2178 100644 --- a/amps/ags/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/job/DispositionLifecycleJobExecuter.java +++ b/amps/ags/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/job/DispositionLifecycleJobExecuter.java @@ -217,6 +217,7 @@ public class DispositionLifecycleJobExecuter extends RecordsManagementJobExecute ResultSet results = searchService.query(params); hasMore = results.hasMore(); if(results.length() != 0) { + // filtering out the hold/freezed cases from the result set resultNodes=results.getNodeRefs().stream().filter(node ->!freezeService.isFrozenOrHasFrozenChildren(nodeService.getPrimaryParent(node).getParentRef())).collect(Collectors.toList()); } skipCount += resultNodes.size(); // increase by page size From a5977fedb2b264c8c398b65806d5cbaabdca8bc7 Mon Sep 17 00:00:00 2001 From: pjoshi31 Date: Mon, 7 Nov 2022 12:19:27 +0530 Subject: [PATCH 07/11] [MNT-22353]- Removed length condition. --- .../job/DispositionLifecycleJobExecuter.java | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/amps/ags/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/job/DispositionLifecycleJobExecuter.java b/amps/ags/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/job/DispositionLifecycleJobExecuter.java index b9481d2178..d98f5e0340 100644 --- a/amps/ags/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/job/DispositionLifecycleJobExecuter.java +++ b/amps/ags/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/job/DispositionLifecycleJobExecuter.java @@ -204,8 +204,7 @@ public class DispositionLifecycleJobExecuter extends RecordsManagementJobExecute log.trace("Using batch size of " + batchSize); - while (hasMore) - { + while (hasMore) { SearchParameters params = new SearchParameters(); params.addStore(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE); params.setLanguage(SearchService.LANGUAGE_FTS_ALFRESCO); @@ -215,11 +214,9 @@ public class DispositionLifecycleJobExecuter extends RecordsManagementJobExecute // execute search ResultSet results = searchService.query(params); + // filtering out the hold/freezed cases from the result set + resultNodes = results.getNodeRefs().stream().filter(node -> !freezeService.isFrozenOrHasFrozenChildren(node)).collect(Collectors.toList()); hasMore = results.hasMore(); - if(results.length() != 0) { - // filtering out the hold/freezed cases from the result set - resultNodes=results.getNodeRefs().stream().filter(node ->!freezeService.isFrozenOrHasFrozenChildren(nodeService.getPrimaryParent(node).getParentRef())).collect(Collectors.toList()); - } skipCount += resultNodes.size(); // increase by page size results.close(); From 162264a8d786e1b25831076dfaa5319b88e8415e Mon Sep 17 00:00:00 2001 From: pjoshi31 Date: Mon, 7 Nov 2022 18:32:17 +0530 Subject: [PATCH 08/11] [MNT-22353]- Added UnitTest Changes. --- .../job/DispositionLifecycleJobExecuter.java | 9 +++++++-- .../job/DispositionLifecycleJobExecuterUnitTest.java | 10 +++++----- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/amps/ags/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/job/DispositionLifecycleJobExecuter.java b/amps/ags/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/job/DispositionLifecycleJobExecuter.java index d98f5e0340..69db66dabb 100644 --- a/amps/ags/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/job/DispositionLifecycleJobExecuter.java +++ b/amps/ags/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/job/DispositionLifecycleJobExecuter.java @@ -214,8 +214,13 @@ public class DispositionLifecycleJobExecuter extends RecordsManagementJobExecute // execute search ResultSet results = searchService.query(params); - // filtering out the hold/freezed cases from the result set - resultNodes = results.getNodeRefs().stream().filter(node -> !freezeService.isFrozenOrHasFrozenChildren(node)).collect(Collectors.toList()); + if(results != null) { + // filtering out the hold/freezed cases from the result set + resultNodes = + results.getNodeRefs().stream().filter(node -> nodeService.getPrimaryParent(node) == null ? + !freezeService.isFrozenOrHasFrozenChildren(node) : + !freezeService.isFrozenOrHasFrozenChildren(nodeService.getPrimaryParent(node).getParentRef())).collect(Collectors.toList()); + } hasMore = results.hasMore(); skipCount += resultNodes.size(); // increase by page size results.close(); diff --git a/amps/ags/rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/job/DispositionLifecycleJobExecuterUnitTest.java b/amps/ags/rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/job/DispositionLifecycleJobExecuterUnitTest.java index fa5df76e58..027610f97d 100644 --- a/amps/ags/rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/job/DispositionLifecycleJobExecuterUnitTest.java +++ b/amps/ags/rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/job/DispositionLifecycleJobExecuterUnitTest.java @@ -170,7 +170,7 @@ public class DispositionLifecycleJobExecuterUnitTest extends BaseUnitTest executer.executeImpl(); // then - + verify(mockedNodeService, times(2)).getPrimaryParent(any(NodeRef.class)); // ensure the query is executed and closed verifyQueryTimes(2); @@ -206,7 +206,7 @@ public class DispositionLifecycleJobExecuterUnitTest extends BaseUnitTest executer.executeImpl(); // then - + verify(mockedNodeService, times(1)).getPrimaryParent(any(NodeRef.class)); // ensure the query is executed and closed verifyQueryTimes(1); @@ -262,11 +262,11 @@ public class DispositionLifecycleJobExecuterUnitTest extends BaseUnitTest // ensure each node is process correctly // node1 verify(mockedNodeService, times(1)).getProperty(node1, RecordsManagementModel.PROP_DISPOSITION_ACTION); - verify(mockedNodeService, times(1)).getPrimaryParent(node1); + verify(mockedNodeService, times(3)).getPrimaryParent(node1); verify(mockedRecordsManagementActionService, times(1)).executeRecordsManagementAction(eq(parent), eq(CUTOFF), anyMap()); // node2 verify(mockedNodeService, times(1)).getProperty(node2, RecordsManagementModel.PROP_DISPOSITION_ACTION); - verify(mockedNodeService, times(1)).getPrimaryParent(node2); + verify(mockedNodeService, times(3)).getPrimaryParent(node2); verify(mockedRecordsManagementActionService, times(1)).executeRecordsManagementAction(eq(parent), eq(RETAIN), anyMap()); // ensure no more interactions @@ -329,7 +329,7 @@ public class DispositionLifecycleJobExecuterUnitTest extends BaseUnitTest // call the service executer.executeImpl(); - // check the loop iterated trough all the elements + // check the loop iterated through all the elements verify(mockedNodeService).exists(node1); verify(mockedNodeService).exists(node2); verify(mockedNodeService).exists(node3); From 4998f19da9c2722933a6354eefd4e899786a789f Mon Sep 17 00:00:00 2001 From: Piyush Joshi <89912489+pjoshi31@users.noreply.github.com> Date: Mon, 7 Nov 2022 21:24:10 +0530 Subject: [PATCH 09/11] Update DispositionLifecycleJobExecuter.java --- .../job/DispositionLifecycleJobExecuter.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/amps/ags/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/job/DispositionLifecycleJobExecuter.java b/amps/ags/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/job/DispositionLifecycleJobExecuter.java index 69db66dabb..81506c09ad 100644 --- a/amps/ags/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/job/DispositionLifecycleJobExecuter.java +++ b/amps/ags/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/job/DispositionLifecycleJobExecuter.java @@ -204,7 +204,8 @@ public class DispositionLifecycleJobExecuter extends RecordsManagementJobExecute log.trace("Using batch size of " + batchSize); - while (hasMore) { + while (hasMore) + { SearchParameters params = new SearchParameters(); params.addStore(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE); params.setLanguage(SearchService.LANGUAGE_FTS_ALFRESCO); From c76d3b99c454ee7e970ff257b1e8dfc8ad306ec2 Mon Sep 17 00:00:00 2001 From: Piyush Joshi <89912489+pjoshi31@users.noreply.github.com> Date: Mon, 7 Nov 2022 21:25:03 +0530 Subject: [PATCH 10/11] Update DispositionLifecycleJobExecuter.java --- .../job/DispositionLifecycleJobExecuter.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/amps/ags/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/job/DispositionLifecycleJobExecuter.java b/amps/ags/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/job/DispositionLifecycleJobExecuter.java index 81506c09ad..7408efe822 100644 --- a/amps/ags/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/job/DispositionLifecycleJobExecuter.java +++ b/amps/ags/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/job/DispositionLifecycleJobExecuter.java @@ -204,7 +204,7 @@ public class DispositionLifecycleJobExecuter extends RecordsManagementJobExecute log.trace("Using batch size of " + batchSize); - while (hasMore) + while (hasMore) { SearchParameters params = new SearchParameters(); params.addStore(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE); From 3bbaabd7556435d718b5fa69a2e48a9a946a90d7 Mon Sep 17 00:00:00 2001 From: pjoshi31 Date: Wed, 9 Nov 2022 12:48:16 +0530 Subject: [PATCH 11/11] [MNT-22353]- Formatting Changes. --- .../job/DispositionLifecycleJobExecuter.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/amps/ags/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/job/DispositionLifecycleJobExecuter.java b/amps/ags/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/job/DispositionLifecycleJobExecuter.java index 7408efe822..3217505fa5 100644 --- a/amps/ags/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/job/DispositionLifecycleJobExecuter.java +++ b/amps/ags/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/job/DispositionLifecycleJobExecuter.java @@ -215,7 +215,8 @@ public class DispositionLifecycleJobExecuter extends RecordsManagementJobExecute // execute search ResultSet results = searchService.query(params); - if(results != null) { + if(results != null) + { // filtering out the hold/freezed cases from the result set resultNodes = results.getNodeRefs().stream().filter(node -> nodeService.getPrimaryParent(node) == null ?