This is an automated email from the ASF dual-hosted git repository. ilgrosso pushed a commit to branch 2_1_X in repository https://gitbox.apache.org/repos/asf/syncope.git
commit c88d429bbf878d8ba62200cc744023702b03e5ec Author: Francesco Chicchiriccò <[email protected]> AuthorDate: Tue Jun 30 12:45:09 2020 +0200 [SYNCOPE-1573] Use paged search for groups --- .../syncope/client/console/wizards/any/Groups.java | 57 +++++++++++++--------- 1 file changed, 33 insertions(+), 24 deletions(-) diff --git a/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/Groups.java b/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/Groups.java index 9f8796f..55eb044 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/Groups.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/Groups.java @@ -20,6 +20,7 @@ package org.apache.syncope.client.console.wizards.any; import java.util.ArrayList; import java.util.Collections; +import java.util.Comparator; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -57,7 +58,7 @@ public class Groups extends AbstractGroups { private static final long serialVersionUID = 552437609667518888L; - private final boolean templateMode; + protected final boolean templateMode; protected final GroupRestClient groupRestClient = new GroupRestClient(); @@ -196,13 +197,13 @@ public class Groups extends AbstractGroups { private static final long serialVersionUID = -4541954630939063927L; - private List<GroupTO> groups; + protected List<GroupTO> groups; - private List<MembershipTO> memberships; + protected List<MembershipTO> memberships; - private List<String> dynMemberships; + protected List<String> dynMemberships; - private String realm; + protected String realm; @Override public List<GroupTO> getObject() { @@ -233,22 +234,30 @@ public class Groups extends AbstractGroups { */ protected void reloadMemberships() { // this is to be sure to have group names (required to see membership details in approval page) - GroupFiqlSearchConditionBuilder searchConditionBuilder = SyncopeClient.getGroupSearchConditionBuilder(); - - List<CompleteCondition> conditions = GroupableRelatableTO.class.cast(anyTO).getMemberships(). - stream().map(membership -> searchConditionBuilder.is(Constants.KEY_FIELD_NAME). - equalTo(membership.getGroupKey()).wrap()). - collect(Collectors.toList()); - Map<String, GroupTO> assignedGroups = new HashMap<>(); - if (!conditions.isEmpty()) { - assignedGroups.putAll(groupRestClient.search( - realm, - searchConditionBuilder.isAssignable().and().or(conditions).query(), - -1, - -1, - new SortParam<>("name", true), - null).stream().collect(Collectors.toMap(GroupTO::getKey, Function.identity()))); + + int total = GroupableRelatableTO.class.cast(anyTO).getMemberships().size(); + int pages = (total / Constants.MAX_GROUP_LIST_SIZE) + 1; + SortParam<String> sort = new SortParam<>("name", true); + for (int page = 1; page <= pages; page++) { + GroupFiqlSearchConditionBuilder builder = SyncopeClient.getGroupSearchConditionBuilder(); + + List<CompleteCondition> conditions = GroupableRelatableTO.class.cast(anyTO).getMemberships(). + stream(). + skip((page - 1) * Constants.MAX_GROUP_LIST_SIZE). + limit(Constants.MAX_GROUP_LIST_SIZE). + map(m -> builder.is(Constants.KEY_FIELD_NAME).equalTo(m.getGroupKey()).wrap()). + collect(Collectors.toList()); + + if (!conditions.isEmpty()) { + assignedGroups.putAll(groupRestClient.search( + realm, + builder.isAssignable().and().or(conditions).query(), + 1, + Constants.MAX_GROUP_LIST_SIZE, + sort, + null).stream().collect(Collectors.toMap(GroupTO::getKey, Function.identity()))); + } } // set group names in membership TOs and remove membership not assignable @@ -263,6 +272,7 @@ public class Groups extends AbstractGroups { GroupableRelatableTO.class.cast(anyTO).getMemberships().removeAll(toBeRemoved); memberships = GroupableRelatableTO.class.cast(anyTO).getMemberships(); + memberships.sort(Comparator.comparing(MembershipTO::getGroupName)); } public List<String> getDynMemberships() { @@ -274,10 +284,10 @@ public class Groups extends AbstractGroups { * Retrieve dyn group memberships. */ protected void reloadDynMemberships() { - GroupFiqlSearchConditionBuilder searchConditionBuilder = SyncopeClient.getGroupSearchConditionBuilder(); + GroupFiqlSearchConditionBuilder builder = SyncopeClient.getGroupSearchConditionBuilder(); List<CompleteCondition> conditions = GroupableRelatableTO.class.cast(anyTO).getDynMemberships(). - stream().map(membership -> searchConditionBuilder.is(Constants.KEY_FIELD_NAME). + stream().map(membership -> builder.is(Constants.KEY_FIELD_NAME). equalTo(membership.getGroupKey()).wrap()). collect(Collectors.toList()); @@ -285,7 +295,7 @@ public class Groups extends AbstractGroups { if (SyncopeConsoleSession.get().owns(StandardEntitlement.GROUP_SEARCH) && !conditions.isEmpty()) { dynMemberships.addAll(groupRestClient.search( SyncopeConstants.ROOT_REALM, - searchConditionBuilder.or(conditions).query(), + builder.or(conditions).query(), -1, -1, new SortParam<>("name", true), @@ -298,7 +308,6 @@ public class Groups extends AbstractGroups { */ protected void reload() { boolean reload; - if (Groups.this.templateMode) { reload = realm == null; realm = SyncopeConstants.ROOT_REALM;
