inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-14 17:58:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged HEAD (5.2) to 5.2.N (5.2.1)

Browse Source 
127600 jkaabimofrad: Merged API-STRIKES-BACK (5.2.0) to HEAD (5.2)
      127329 jvonka: Node Associations - initial paging (for secondary child assocs & parents)
      - as per review comment for RA-920


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@127692 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2016-06-03 14:48:31 +00:00
parent af69b25674
commit eb8cf53b69
2 changed files with 196 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
source/java/org/alfresco/rest/api/nodes/AbstractNodeRelation.java
View File

@@ -49,6 +49,7 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -195,7 +196,7 @@ public class AbstractNodeRelation implements InitializingBean
List<String> includeParam = parameters.getInclude();
List<Node> collection = new ArrayList<Node>(childAssocRefs.size());
List<Node> result = new ArrayList<Node>(childAssocRefs.size());
for (ChildAssociationRef childAssocRef : childAssocRefs)
{
if (isPrimary == null || (isPrimary == childAssocRef.isPrimary()))
@@ -219,12 +220,37 @@ public class AbstractNodeRelation implements InitializingBean
node.setAssociation(new AssocChild(assocType, childAssocRef.isPrimary()));
collection.add(node);
result.add(node);
}
}
}
Paging paging = parameters.getPaging();
return CollectionWithPagingInfo.asPaged(paging, collection, false, collection.size());
// return 'page' of results (note: depends on in-built/natural sort order of results)
int skipCount = paging.getSkipCount();
int pageSize = paging.getMaxItems();
int pageEnd = skipCount + pageSize;
final List<Node> page = new ArrayList<>(pageSize);
Iterator<Node> it = result.iterator();
for (int counter = 0; counter < pageEnd && it.hasNext(); counter++)
{
Node element = it.next();
if (counter < skipCount)
{
continue;
}
if (counter > pageEnd - 1)
{
break;
}
page.add(element);
}
int totalCount = result.size();
boolean hasMoreItems = ((skipCount + page.size()) < totalCount);
return CollectionWithPagingInfo.asPaged(paging, page, hasMoreItems, totalCount);
}
}