Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add a limit for the group listing query #6576

Merged
merged 2 commits into from
Mar 3, 2025
+10 −3
Merged

Add a limit for the group listing query #6576

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f7eacd1
add limit to the group listing query
DilshanSenarath Mar 3, 2025
977cbc2
update the unit tests
DilshanSenarath Mar 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions ...tion.mgt/src/main/java/org/wso2/carbon/identity/application/mgt/ApplicationConstants.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,7 @@ private ApplicationConstants() {

// Filtering operations.
public static final String FILTER_CO = "co";
public static final int MAX_NUMBER_OF_GROUPS_FROM_META_ENDPOINT = 100;

// System application config elements
public static final String SYSTEM_APPLICATIONS_CONFIG_ELEMENT = "SystemApplications";
Expand Down
10 changes: 8 additions & 2 deletions .../main/java/org/wso2/carbon/identity/application/mgt/ApplicationManagementServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3283,8 +3283,14 @@ public List<GroupBasicInfo> getGroups(String tenantDomain, String domainName, No
String.format(INVALID_USER_STORE_DOMAIN.getDescription(), domainName, tenantDomain));
}
List<GroupBasicInfo> groupBasicInfos = new ArrayList<>();
// Group endpoint does not support pagination.
List<Group> groups = userStoreManager.listGroups(filterCondition, domainName, 0, 0, null, null);
/*
* JDBC user store does not support pagination.
* LDAP and AD require a limit greater than zero to retrieve groups.
* Since the meta endpoint supports searching, the group limit will be set to a constant,
* allowing users to find relevant groups by searching.
*/
List<Group> groups = userStoreManager.listGroups(filterCondition, domainName,
ApplicationConstants.MAX_NUMBER_OF_GROUPS_FROM_META_ENDPOINT, 0, null, null);
for (Group group : groups) {
GroupBasicInfo groupBasicInfo = new GroupBasicInfo();
groupBasicInfo.setId(group.getGroupID());
Expand Down
2 changes: 1 addition & 1 deletion ...t/java/org/wso2/carbon/identity/application/mgt/ApplicationManagementServiceImplTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1937,7 +1937,7 @@ public void testGetGroups(String tenantDomain, String domainName, Node filter, L
ArgumentCaptor<String> userDomainArgumentCaptor = ArgumentCaptor.forClass(String.class);
verify(mockAbstractUserStoreManager).listGroups(conditionArgumentCaptor.capture(),
userDomainArgumentCaptor.capture(),
eq(0), eq(0), nullable(String.class), nullable(String.class));
eq(100), eq(0), nullable(String.class), nullable(String.class));
if (filter == null) {
assertEquals(conditionArgumentCaptor.getValue().getOperation(), "SW");
assertEquals(((ExpressionCondition) conditionArgumentCaptor.getValue()).getAttributeName(),
Expand Down