Merge pull request #3050 from somindatommy/impl_pagination

Implementing pagination support for listing groups with user id
wso2 · Aug 27, 2021 · beac9bc · beac9bc
2 parents e37d719 + e3517de
commit beac9bc
Show file tree

Hide file tree

Showing 4 changed files with 672 additions and 7 deletions.
diff --git a/...user.core/src/main/java/org/wso2/carbon/user/core/common/GroupUniqueIDDomainResolver.java b/...user.core/src/main/java/org/wso2/carbon/user/core/common/GroupUniqueIDDomainResolver.java
@@ -37,8 +37,6 @@
  * Purpose of this class is to keep a mapping between group unique id and the domain of that group to reduce the
  * userstore lookups by resolving the correct domain when the group id is provided. This is will act as persisted
  * cache.
- *
- * @since 4.6.3
  */
 public class GroupUniqueIDDomainResolver {
 

diff --git a/...n.user.core/src/main/java/org/wso2/carbon/user/core/constants/UserCoreErrorConstants.java b/...n.user.core/src/main/java/org/wso2/carbon/user/core/constants/UserCoreErrorConstants.java
@@ -230,6 +230,8 @@ public enum ErrorMessages {
         ERROR_SORTING_NOT_SUPPORTED("60004", "Sorting is not supported"),
         ERROR_NO_GROUP_FOUND_WITH_ID("60005", "No group found with the id: %s in tenant: %s"),
         ERROR_EMPTY_USER_ID("60006", "User id cannot be empty"),
+        ERROR_NO_USER_WITH_USERNAME("60007", "No user found with username: %s in " +
+                "userstore domain: %s"),
 
         // Server error codes related to group operations.
         ERROR_DURING_PRE_GET_GROUP_BY_ID("65001",
@@ -258,10 +260,13 @@ public enum ErrorMessages {
                 "Un-expected error during post list groups with condition, %s"),
         ERROR_WHILE_GETTING_GROUP_BY_NAME("65013", "Error occurred while getting the group: %s " +
                 "in userstore: %s in tenant: %s"),
-        ERROR_WHILE_GETTING_GROUP_BY_ID("65013", "Error occurred while getting the group id: %s " +
+        ERROR_WHILE_GETTING_GROUP_BY_ID("65014", "Error occurred while getting the group id: %s " +
                 "in userstore: %s in tenant: %s"),
-        ERROR_WHILE_BUILDING_GROUP_RESPONSE("65014", "Error occurred while building the group " +
-                "response in userstore: %s in tenant: %s");
+        ERROR_WHILE_BUILDING_GROUP_RESPONSE("65015", "Error occurred while building the group " +
+                "response in userstore: %s in tenant: %s"),
+        ERROR_WHILE_GETTING_GROUPS("65016", "Error occurred while getting the groups"),
+        ERROR_WHILE_PERFORMING_PAGINATED_SEARCH("65017", "Error occurred while performing the " +
+                "paginated search");
 
         private final String code;
         private final String message;

diff --git a/...org.wso2.carbon.user.core/src/main/java/org/wso2/carbon/user/core/ldap/LDAPConstants.java b/...org.wso2.carbon.user.core/src/main/java/org/wso2/carbon/user/core/ldap/LDAPConstants.java
@@ -111,5 +111,5 @@ public class LDAPConstants {
      * 199412161032Z`, 20090813145607-0200.
      */
     public static final String DEFAULT_LDAP_TIME_FORMATS_PATTERN = "[uuuuMMddHHmmss[,SSS][.SSS]X]" +
-            "[uuuuMMddHHmmss[,S][.S]X][uuuuMMddHHmm[,S][.S]X]";
+            "[uuuuMMddHHmmss[,SS][.SS]X][uuuuMMddHHmm[,S][.S]X]";
 }