Revert "Merge pull request #1291 from Alfresco/hotfix-3.2.0.11/MNT-22062_diplay_cat_retention_poor_performance"

This reverts commit 2f0b1c997f, reversing
changes made to ea7b125fda.
This commit is contained in:
ehardon
2020-12-08 12:06:01 +02:00
parent f793f0ae7f
commit e7b3724d44

View File

@@ -503,52 +503,7 @@ public class DispositionServiceImpl extends ServiceBaseImpl
@Override
public boolean hasDisposableItems(DispositionSchedule dispositionSchdule)
{
ParameterCheck.mandatory("dispositionSchedule", dispositionSchdule);
// Get the associated container
NodeRef rmContainer = getAssociatedRecordsManagementContainer(dispositionSchdule);
return hasDisposableItemsImpl(dispositionSchdule.isRecordLevelDisposition(), rmContainer);
}
/**
* Method that provides a boolean if given Records Management Container has disposable items.
* This method is similar to getDisposableItemsImpl(boolean isRecordLevelDisposition, NodeRef rmContainer) but with improved performance:
* For RecordLevelDisposition it will limit Record retrieval to 1.
* Early returns once the first occurrence is found.
* @param isRecordLevelDisposition
* @param rmContainer
* @return
*/
private boolean hasDisposableItemsImpl(boolean isRecordLevelDisposition, NodeRef rmContainer)
{
List<NodeRef> items = filePlanService.getAllContained(rmContainer);
for (NodeRef item : items)
{
if (recordFolderService.isRecordFolder(item))
{
if (isRecordLevelDisposition)
{
List<ChildAssociationRef> assocs = nodeService.getChildAssocs(item, ContentModel.ASSOC_CONTAINS, RegexQNamePattern.MATCH_ALL, 1, true);
if (!assocs.isEmpty())
{
return true;
}
}
else
{
return true;
}
}
else if (filePlanService.isRecordCategory(item) && getAssociatedDispositionScheduleImpl(item) == null)
{
if (hasDisposableItemsImpl(isRecordLevelDisposition, item));
{
return true;
}
}
}
return false;
return !getDisposableItems(dispositionSchdule).isEmpty();
}
/**