mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-08-07 17:49:17 +00:00
ALF-7167: RINF 11: Canned queries
- ALF-9322: RINF 11: AbstractCannedQueryPermissions enhancements - Pulled in logic around hasMore() so that subclasses just have to obey - Added in cut-off size estimates - ALF-9337: RINF 11: Consolidate interceptor wrappers - Permissions respect PermissionCheckedValue - Added last-in-chain "afterAclMarking" to "afterInvocationManager": marks collections as checked - Added 'mixin' interfaces to handle input and output for permission checking of collections git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@28734 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
@@ -498,7 +498,6 @@ public class GetChildrenCannedQueryTest extends TestCase
|
||||
|
||||
PagingResults<NodeRef> results = list(parentNodeRef, -1, -1, 0);
|
||||
assertFalse(results.hasMoreItems());
|
||||
assertTrue(results.permissionsApplied());
|
||||
|
||||
List<NodeRef> nodeRefs = results.getPage();
|
||||
|
||||
@@ -516,7 +515,6 @@ public class GetChildrenCannedQueryTest extends TestCase
|
||||
|
||||
results = list(parentNodeRef, -1, -1, 0);
|
||||
assertFalse(results.hasMoreItems());
|
||||
assertTrue(results.permissionsApplied());
|
||||
|
||||
nodeRefs = results.getPage();
|
||||
|
||||
@@ -767,7 +765,7 @@ public class GetChildrenCannedQueryTest extends TestCase
|
||||
totalCount = results.getTotalResultCount().getFirst();
|
||||
}
|
||||
|
||||
return new PagingNodeRefResultsImpl(nodeRefs, results.hasMoreItems(), totalCount, false, true);
|
||||
return new PagingNodeRefResultsImpl(nodeRefs, results.hasMoreItems(), totalCount, false);
|
||||
}
|
||||
|
||||
private class PagingNodeRefResultsImpl implements PagingResults<NodeRef>
|
||||
@@ -775,18 +773,16 @@ public class GetChildrenCannedQueryTest extends TestCase
|
||||
private List<NodeRef> nodeRefs;
|
||||
|
||||
private boolean hasMorePages;
|
||||
private boolean permissionsApplied;
|
||||
|
||||
private Integer totalResultCount; // null => not requested (or unknown)
|
||||
private Boolean isTotalResultCountCutoff; // null => unknown
|
||||
|
||||
public PagingNodeRefResultsImpl(List<NodeRef> nodeRefs, boolean hasMorePages, Integer totalResultCount, Boolean isTotalResultCountCutoff, boolean permissionsApplied)
|
||||
public PagingNodeRefResultsImpl(List<NodeRef> nodeRefs, boolean hasMorePages, Integer totalResultCount, Boolean isTotalResultCountCutoff)
|
||||
{
|
||||
this.nodeRefs = nodeRefs;
|
||||
this.hasMorePages = hasMorePages;
|
||||
this.totalResultCount= totalResultCount;
|
||||
this.isTotalResultCountCutoff = isTotalResultCountCutoff;
|
||||
this.permissionsApplied = permissionsApplied;
|
||||
}
|
||||
|
||||
public List<NodeRef> getPage()
|
||||
@@ -799,11 +795,6 @@ public class GetChildrenCannedQueryTest extends TestCase
|
||||
return hasMorePages;
|
||||
}
|
||||
|
||||
public boolean permissionsApplied()
|
||||
{
|
||||
return permissionsApplied;
|
||||
}
|
||||
|
||||
public Pair<Integer, Integer> getTotalResultCount()
|
||||
{
|
||||
return new Pair<Integer, Integer>(totalResultCount, (isTotalResultCountCutoff ? null : totalResultCount));
|
||||
|
Reference in New Issue
Block a user