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 mward/repo-1600-zonesfilter (5.2.1) to 5.2.N (5.2.1)

Browse Source 
134742 mward: REPO-1583: added isRoot filtering.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@134807 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Matt Ward
2017-01-30 10:02:31 +00:00
parent 5377a9f21a
commit 75c8ee0ae5
2 changed files with 163 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

69
source/java/org/alfresco/rest/api/impl/GroupsImpl.java
View File

@@ -181,23 +181,21 @@ public class GroupsImpl implements Groups
Pair<String, Boolean> sortProp = getGroupsSortProp(parameters);
// Parse where clause properties.
Boolean isRootParam = null;
Query q = parameters.getQuery();
Boolean isRootParam = null;
String zoneFilter = null;
if (q != null)
{
GroupsQueryWalker propertyWalker = new GroupsQueryWalker(LIST_GROUPS_EQUALS_QUERY_PROPERTIES, null);
GroupsQueryWalker propertyWalker = new GroupsQueryWalker();
QueryHelper.walk(q, propertyWalker);
isRootParam = propertyWalker.getProperty(PARAM_IS_ROOT, WhereClauseParser.EQUALS, Boolean.class);
isRootParam = propertyWalker.getIsRoot();
List<String> zonesParam = propertyWalker.getZones();
if (zonesParam != null)
{
validateZonesParam(zonesParam);
zoneFilter = zonesParam.get(0);
}
}
final AuthorityType authorityType = AuthorityType.GROUP;
@@ -272,18 +270,21 @@ public class GroupsImpl implements Groups
}
Query q = parameters.getQuery();
List<String> zonesParam = null;
Boolean isRootParam = null;
String zoneFilter = null;
if (q != null)
{
GroupsQueryWalker propertyWalker = new GroupsQueryWalker(LIST_GROUPS_EQUALS_QUERY_PROPERTIES, null);
GroupsQueryWalker propertyWalker = new GroupsQueryWalker();
QueryHelper.walk(q, propertyWalker);
zonesParam = propertyWalker.getZones();
isRootParam = propertyWalker.getIsRoot();
List<String> zonesParam = propertyWalker.getZones();
if (zonesParam != null)
{
validateZonesParam(zonesParam);
zoneFilter = zonesParam.get(0);
}
}
final String zoneFilter = zonesParam != null ? zonesParam.get(0) : null;
final List<String> includeParam = parameters.getInclude();
Paging paging = parameters.getPaging();
@@ -296,11 +297,16 @@ public class GroupsImpl implements Groups
Set<String> userAuthorities = runAsSystem(
() -> authorityService.getAuthoritiesForUser(personId));
final Set<String> rootAuthorities = getAllRootAuthorities(AuthorityType.GROUP);
// Filter, transform and sort the list of user authorities into
// a suitable list of AuthorityInfo objects.
final String finalZoneFilter = zoneFilter;
final Boolean finalIsRootParam = isRootParam;
List<AuthorityInfo> groupAuthorities = userAuthorities.stream().
filter(a -> a.startsWith(AuthorityType.GROUP.getPrefixString())).
filter(a -> zonePredicate(a, zoneFilter)).
filter(a -> isRootPredicate(finalIsRootParam, rootAuthorities, a)).
filter(a -> zonePredicate(a, finalZoneFilter)).
map(this::getAuthorityInfo).
sorted(new AuthorityInfoComparator(sortProp.getFirst(), sortProp.getSecond())).
collect(Collectors.toList());
@@ -312,8 +318,6 @@ public class GroupsImpl implements Groups
int totalItems = pagingResult.getTotalResultCount().getFirst();
// Transform the page of results into Group objects
final Set<String> rootAuthorities = getAllRootAuthorities(AuthorityType.GROUP);
List<Group> groups = page.stream().
map(authority -> getGroup(authority, includeParam, rootAuthorities)).
collect(Collectors.toList());
@@ -407,6 +411,27 @@ public class GroupsImpl implements Groups
return zonePredicate(zones, zone);
}
/**
* Test to see if a result should be included, using the isRoot parameter.
* <p>
* If isRootParam is null, then no results will be filtered. Otherwise
* results will be filtered to return only those that are root or non-root,
* depending on the value of isRootParam.
*
* @param isRootParam
* @param rootAuthorities
* @param authority
* @return
*/
private boolean isRootPredicate(Boolean isRootParam, Set<String> rootAuthorities, String authority)
{
if (isRootParam != null)
{
return isRootParam == isRootAuthority(rootAuthorities, authority);
}
return true;
}
/**
* Checks a list of zones to see if it matches the supplied zone filter
* ({@code requiredZone} parameter).
@@ -957,6 +982,11 @@ public class GroupsImpl implements Groups
{
private List<String> zones;
public GroupsQueryWalker()
{
super(LIST_GROUPS_EQUALS_QUERY_PROPERTIES, null);
}
@Override
public void and()
{
@@ -972,11 +1002,6 @@ public class GroupsImpl implements Groups
}
}
public GroupsQueryWalker(Set<String> supportedEqualsParameters, Set<String> supportedMatchesParameters)
{
super(supportedEqualsParameters, supportedMatchesParameters);
}
/**
* The list of zones specified in the where clause.
*
@@ -986,5 +1011,15 @@ public class GroupsImpl implements Groups
{
return zones;
}
/**
* Get the value of the isRoot clause, if specified.
*
* @return The isRoot param if specified, null if not.
*/
public Boolean getIsRoot()
{
return getProperty(PARAM_IS_ROOT, WhereClauseParser.EQUALS, Boolean.class);
}
}
}