From e5317bfeaa46bea1e8ad91374862860080d2d860 Mon Sep 17 00:00:00 2001 From: asha15 <165079T@uom.lk> Date: Tue, 20 Feb 2024 22:59:25 +0530 Subject: [PATCH 1/7] get totalResults by user count --- .../core/common/AbstractUserStoreManager.java | 49 ++++++++++++++ .../user/core/jdbc/JDBCRealmConstants.java | 8 +++ .../jdbc/UniqueIDJDBCUserStoreManager.java | 66 +++++++++++++++++++ .../carbon/user/core/util/JDBCRealmUtil.java | 4 ++ 4 files changed, 127 insertions(+) diff --git a/core/org.wso2.carbon.user.core/src/main/java/org/wso2/carbon/user/core/common/AbstractUserStoreManager.java b/core/org.wso2.carbon.user.core/src/main/java/org/wso2/carbon/user/core/common/AbstractUserStoreManager.java index 689a87363ab..7dad85e1b87 100644 --- a/core/org.wso2.carbon.user.core/src/main/java/org/wso2/carbon/user/core/common/AbstractUserStoreManager.java +++ b/core/org.wso2.carbon.user.core/src/main/java/org/wso2/carbon/user/core/common/AbstractUserStoreManager.java @@ -9481,6 +9481,22 @@ protected List doGetUserListOfRoleWithID(String roleName, String filter) t "doGetUserListOfRoleWithID operation is not implemented in: " + this.getClass()); } + /** + * Return the count of users belong to the given role for the given filter. + * @param roleName role name. + * @param filter filter. + * @return + * @throws UserStoreException + */ + protected int doGetUserCountOfRole(String roleName, String filter) throws UserStoreException { + + if (log.isDebugEnabled()) { + log.debug("doGetUserCountOfRole operation is not implemented in: " + this.getClass()); + } + throw new NotImplementedException( + "doGetUserCountOfRole operation is not implemented in: " + this.getClass()); + } + /** * Return the list of users belong to the given role for the given filter. * @@ -19161,4 +19177,37 @@ public UserUniqueIDDomainResolver getUserUniqueIDDomainResolver() { return userUniqueIDDomainResolver; } + + public int getUserCountForRole(String roleName) throws UserStoreException { + + if (!isSecureCall.get()) { + Class argTypes[] = new Class[] { String.class, String.class }; + Object object = callSecure("getUserCountByRole", new Object[] { roleName, QUERY_FILTER_STRING_ANY }, argTypes); + return (int) object; + } + + return getUserCountByRole(roleName, QUERY_FILTER_STRING_ANY); + } + + public int getUserCountByRole(String roleName, String filter) throws UserStoreException { + + int count = 0; + + if (!isSecureCall.get()) { + Class argTypes[] = new Class[] { String.class, String.class }; + Object object = callSecure("getUserCountByRole", new Object[] { roleName, filter }, argTypes); + return (int) object; + } + + // If role does not exit, just return + if (!isExistingRole(roleName)) { + return count; + } + + if (readGroupsEnabled) { + count += doGetUserCountOfRole(roleName, filter); + } + + return count; + } } diff --git a/core/org.wso2.carbon.user.core/src/main/java/org/wso2/carbon/user/core/jdbc/JDBCRealmConstants.java b/core/org.wso2.carbon.user.core/src/main/java/org/wso2/carbon/user/core/jdbc/JDBCRealmConstants.java index a8d3f499e39..bc8500efe4a 100644 --- a/core/org.wso2.carbon.user.core/src/main/java/org/wso2/carbon/user/core/jdbc/JDBCRealmConstants.java +++ b/core/org.wso2.carbon.user.core/src/main/java/org/wso2/carbon/user/core/jdbc/JDBCRealmConstants.java @@ -55,6 +55,7 @@ public final class JDBCRealmConstants { public static final String GET_USERS_IN_ROLE = "GetUserListOfRoleSQL"; public static final String GET_USERS_IN_ROLE_FILTER = "GetUserListOfRoleFilterSQL"; public static final String GET_USERS_IN_ROLE_FILTER_WITH_ID = "GetUserListOfRoleFilterWithIDSQL"; + public static final String GET_USERS_COUNT_WITH_FILTER_ROLE = "GetUserCountWithFilterRoleSQL"; public static final String GET_USERS_IN_SHARED_ROLE = "GetUserListOfSharedRoleSQL"; public static final String GET_USERS_IN_SHARED_ROLE_FILTER = "GetUserListOfSharedRoleFilterSQL"; public static final String GET_USERS_IN_SHARED_ROLE_FILTER_WITH_ID = "GetUserListOfSharedRoleFilterWithIDSQL"; @@ -267,6 +268,13 @@ public final class JDBCRealmConstants { + ".UM_USER_NAME LIKE ? AND UM_ROLE.UM_ROLE_NAME=? AND UM_USER.UM_ID=UM_USER_ROLE.UM_USER_ID AND " + "UM_ROLE.UM_ID=UM_USER_ROLE.UM_ROLE_ID AND UM_USER_ROLE.UM_TENANT_ID=? AND UM_ROLE" + ".UM_TENANT_ID=? AND UM_USER.UM_TENANT_ID=?"; + + public static final String GET_USERS_COUNT_WITH_FILTER_ROLE_SQL = + "SELECT count (UM_USER_ROLE.UM_ID) " + + "FROM UM_USER_ROLE " + + "JOIN UM_ROLE ON UM_ROLE.UM_ID = UM_USER_ROLE.UM_ROLE_ID " + + "WHERE UM_ROLE.UM_ROLE_NAME = ? AND UM_USER_ROLE.UM_TENANT_ID = ? AND UM_ROLE.UM_TENANT_ID = ?"; + public static final String GET_USERS_IN_SHARED_ROLE_SQL = "SELECT UM_USER_NAME FROM UM_SHARED_USER_ROLE INNER JOIN UM_USER ON " + "UM_SHARED_USER_ROLE.UM_USER_ID = UM_USER.UM_ID INNER JOIN UM_ROLE ON " diff --git a/core/org.wso2.carbon.user.core/src/main/java/org/wso2/carbon/user/core/jdbc/UniqueIDJDBCUserStoreManager.java b/core/org.wso2.carbon.user.core/src/main/java/org/wso2/carbon/user/core/jdbc/UniqueIDJDBCUserStoreManager.java index 0db943fe8a6..1dd3e556579 100644 --- a/core/org.wso2.carbon.user.core/src/main/java/org/wso2/carbon/user/core/jdbc/UniqueIDJDBCUserStoreManager.java +++ b/core/org.wso2.carbon.user.core/src/main/java/org/wso2/carbon/user/core/jdbc/UniqueIDJDBCUserStoreManager.java @@ -351,6 +351,14 @@ public List doGetUserListOfRoleWithID(String roleName, String filter) thro return getUserListOfJDBCRoleWithID(roleContext, filter); } + @Override + public int doGetUserCountOfRole(String roleName, String filter) + throws UserStoreException { + + RoleContext roleContext = createRoleContext(roleName); + return getUserCountByRole(roleContext, filter); + } + public List getUserListOfJDBCRoleWithID(RoleContext ctx, String filter) throws UserStoreException { return getUserListOfJDBCRoleWithID(ctx, filter, QUERY_MAX_ITEM_LIMIT_ANY); @@ -417,6 +425,64 @@ public List getUserListOfJDBCRoleWithID(RoleContext ctx, String filter, in return users; } + /** + * Return the count of users belong to the given role for the given {@link RoleContext} and filter. + * + * @param ctx {@link RoleContext} corresponding to the role. + * @param filter String filter for the users. + */ + public int getUserCountByRole(RoleContext ctx, String filter) throws UserStoreException { + + String roleName = ctx.getRoleName(); + + if (StringUtils.isNotEmpty(filter)) { + filter = filter.trim(); + filter = filter.replace("*", "%"); + filter = filter.replace("?", "_"); + } else { + filter = "%"; + } + return getUserCountByRoleFromDatabase(roleName, filter); + } + + /** + * Return the count of users belong to the given role for the given {@link RoleContext} and filter. + * + * @param roleName Name of the role. + * @param filter String filter for the users. + * @return The count of users matching the provided constraints. + * @throws UserStoreException + */ + public int getUserCountByRoleFromDatabase(String roleName, String filter) throws UserStoreException { + + Connection dbConnection = null; + PreparedStatement prepStmt = null; + ResultSet rs = null; + int count = 0 ; + String sqlStmt = realmConfig.getUserStoreProperty(JDBCRealmConstants.GET_USERS_COUNT_WITH_FILTER_ROLE); + try { + dbConnection = getDBConnection(); + prepStmt = dbConnection.prepareStatement(sqlStmt); + prepStmt.setString(1, roleName); + prepStmt.setInt(2, tenantId); + prepStmt.setInt(3, tenantId); + rs = prepStmt.executeQuery(); + while (rs.next()) { + count = rs.getInt(1); + } + return count; + } catch (SQLException e) { + String errorMessage = + "Error occurred while getting the count of users in the role : " + roleName; + if (log.isDebugEnabled()) { + log.debug(errorMessage, e); + } + throw new UserStoreException(errorMessage, e); + } finally { + DatabaseUtil.closeAllConnections(dbConnection, rs, prepStmt); + } + } + @Override public String[] getProfileNames(String userName) throws UserStoreException { diff --git a/core/org.wso2.carbon.user.core/src/main/java/org/wso2/carbon/user/core/util/JDBCRealmUtil.java b/core/org.wso2.carbon.user.core/src/main/java/org/wso2/carbon/user/core/util/JDBCRealmUtil.java index 01e2d9395d8..d9c11fe87e8 100644 --- a/core/org.wso2.carbon.user.core/src/main/java/org/wso2/carbon/user/core/util/JDBCRealmUtil.java +++ b/core/org.wso2.carbon.user.core/src/main/java/org/wso2/carbon/user/core/util/JDBCRealmUtil.java @@ -535,6 +535,10 @@ public static Map getSQL(Map properties) { JDBCRealmConstants.GET_USERS_PROPS_FOR_PROFILE_WITH_ID_SQL); } + if (!properties.containsKey(JDBCRealmConstants.GET_USERS_COUNT_WITH_FILTER_ROLE)) { + properties.put(JDBCRealmConstants.GET_USERS_COUNT_WITH_FILTER_ROLE, JDBCRealmConstants.GET_USERS_COUNT_WITH_FILTER_ROLE_SQL); + } + if (!properties.containsKey(JDBCCaseInsensitiveConstants.GET_USERS_PROPS_FOR_PROFILE_CASE_INSENSITIVE)) { properties.put(JDBCCaseInsensitiveConstants.GET_USERS_PROPS_FOR_PROFILE_CASE_INSENSITIVE, JDBCCaseInsensitiveConstants.GET_USERS_PROPS_FOR_PROFILE_SQL_CASE_INSENSITIVE); From 9604eb94f59d27e10d58c470673b4cffce8d480c Mon Sep 17 00:00:00 2001 From: asha15 <165079T@uom.lk> Date: Wed, 21 Feb 2024 09:36:11 +0530 Subject: [PATCH 2/7] get RoleID by name --- .../user/core/jdbc/JDBCRealmConstants.java | 11 +++--- .../jdbc/UniqueIDJDBCUserStoreManager.java | 36 +++++++++++++++++-- .../carbon/user/core/util/JDBCRealmUtil.java | 4 +++ 3 files changed, 43 insertions(+), 8 deletions(-) diff --git a/core/org.wso2.carbon.user.core/src/main/java/org/wso2/carbon/user/core/jdbc/JDBCRealmConstants.java b/core/org.wso2.carbon.user.core/src/main/java/org/wso2/carbon/user/core/jdbc/JDBCRealmConstants.java index bc8500efe4a..46a7e117b25 100644 --- a/core/org.wso2.carbon.user.core/src/main/java/org/wso2/carbon/user/core/jdbc/JDBCRealmConstants.java +++ b/core/org.wso2.carbon.user.core/src/main/java/org/wso2/carbon/user/core/jdbc/JDBCRealmConstants.java @@ -30,6 +30,7 @@ public final class JDBCRealmConstants { public static final String GET_ROLE_LIST_H2 = "GetRoleListSQLH2"; public static final String GET_ROLE_LIST_WITH_ESCAPE = "GetRoleListSQLWithEscape"; public static final String GET_ROLE_LIST_WITH_ESCAPE_H2 = "GetRoleListSQLWithEscapeH2"; + public static final String GET_ROLE_ID_BY_NAME = "GetRoleIDByNameSQL"; public static final String GET_SHARED_ROLE_LIST = "GetSharedRoleListSQL"; public static final String GET_SHARED_ROLE_LIST_H2 = "GetSharedRoleListSQLH2"; public static final String GET_USER_FILTER = "UserFilterSQL"; @@ -269,11 +270,11 @@ public final class JDBCRealmConstants { + "UM_ROLE.UM_ID=UM_USER_ROLE.UM_ROLE_ID AND UM_USER_ROLE.UM_TENANT_ID=? AND UM_ROLE" + ".UM_TENANT_ID=? AND UM_USER.UM_TENANT_ID=?"; - public static final String GET_USERS_COUNT_WITH_FILTER_ROLE_SQL = - "SELECT count (UM_USER_ROLE.UM_ID) " - + "FROM UM_USER_ROLE " - + "JOIN UM_ROLE ON UM_ROLE.UM_ID = UM_USER_ROLE.UM_ROLE_ID " - + "WHERE UM_ROLE.UM_ROLE_NAME = ? AND UM_USER_ROLE.UM_TENANT_ID = ? AND UM_ROLE.UM_TENANT_ID = ?"; + public static final String GET_USERS_COUNT_WITH_FILTER_ROLE_SQL = "SELECT count(UM_ID) FROM UM_USER_ROLE " + + "WHERE UM_ROLE_ID = ? AND UM_TENANT_ID = ?"; + + public static final String Get_Role_ID_By_Name_SQL = "SELECT UM_ID FROM UM_ROLE " + + "WHERE UM_ROLE_NAME = ? AND UM_TENANT_ID = ? "; public static final String GET_USERS_IN_SHARED_ROLE_SQL = "SELECT UM_USER_NAME FROM UM_SHARED_USER_ROLE INNER JOIN UM_USER ON " diff --git a/core/org.wso2.carbon.user.core/src/main/java/org/wso2/carbon/user/core/jdbc/UniqueIDJDBCUserStoreManager.java b/core/org.wso2.carbon.user.core/src/main/java/org/wso2/carbon/user/core/jdbc/UniqueIDJDBCUserStoreManager.java index 1dd3e556579..5c711c61ba5 100644 --- a/core/org.wso2.carbon.user.core/src/main/java/org/wso2/carbon/user/core/jdbc/UniqueIDJDBCUserStoreManager.java +++ b/core/org.wso2.carbon.user.core/src/main/java/org/wso2/carbon/user/core/jdbc/UniqueIDJDBCUserStoreManager.java @@ -453,8 +453,10 @@ public int getUserCountByRole(RoleContext ctx, String filter) throws UserStoreEx * @return The count of users matching the provided constraints. * @throws UserStoreException */ - public int getUserCountByRoleFromDatabase(String roleName, String filter) throws UserStoreException { + public int getUserCountByRoleFromDatabase(String roleName, String filter) + throws UserStoreException { + String roleId = getRoleIdByName(roleName, tenantId); Connection dbConnection = null; PreparedStatement prepStmt = null; ResultSet rs = null; @@ -463,9 +465,8 @@ public int getUserCountByRoleFromDatabase(String roleName, String filter) throws try { dbConnection = getDBConnection(); prepStmt = dbConnection.prepareStatement(sqlStmt); - prepStmt.setString(1, roleName); + prepStmt.setString(1, roleId); prepStmt.setInt(2, tenantId); - prepStmt.setInt(3, tenantId); rs = prepStmt.executeQuery(); while (rs.next()) { count = rs.getInt(1); @@ -483,6 +484,35 @@ public int getUserCountByRoleFromDatabase(String roleName, String filter) throws } } + private String getRoleIdByName(String roleName, int tenantId) throws UserStoreException { + + String roleID = null; + Connection dbConnection = null; + PreparedStatement prepStmt = null; + ResultSet rs = null; + String sqlStmt = realmConfig.getUserStoreProperty(JDBCRealmConstants.GET_ROLE_ID_BY_NAME); + try { + dbConnection = getDBConnection(); + prepStmt = dbConnection.prepareStatement(sqlStmt); + prepStmt.setString(1, roleName); + prepStmt.setInt(2, tenantId); + rs = prepStmt.executeQuery(); + while (rs.next()) { + roleID = rs.getString(1); + } + return roleID; + } catch (SQLException e) { + String errorMessage = + "Error occurred while getting the role id for the role : " + roleName; + if (log.isDebugEnabled()) { + log.debug(errorMessage, e); + } + throw new UserStoreException(errorMessage, e); + } finally { + DatabaseUtil.closeAllConnections(dbConnection, rs, prepStmt); + } + } + @Override public String[] getProfileNames(String userName) throws UserStoreException { diff --git a/core/org.wso2.carbon.user.core/src/main/java/org/wso2/carbon/user/core/util/JDBCRealmUtil.java b/core/org.wso2.carbon.user.core/src/main/java/org/wso2/carbon/user/core/util/JDBCRealmUtil.java index d9c11fe87e8..3ca1f3ddcba 100644 --- a/core/org.wso2.carbon.user.core/src/main/java/org/wso2/carbon/user/core/util/JDBCRealmUtil.java +++ b/core/org.wso2.carbon.user.core/src/main/java/org/wso2/carbon/user/core/util/JDBCRealmUtil.java @@ -539,6 +539,10 @@ public static Map getSQL(Map properties) { properties.put(JDBCRealmConstants.GET_USERS_COUNT_WITH_FILTER_ROLE, JDBCRealmConstants.GET_USERS_COUNT_WITH_FILTER_ROLE_SQL); } + if (!properties.containsKey(JDBCRealmConstants.GET_ROLE_ID_BY_NAME)) { + properties.put(JDBCRealmConstants.GET_ROLE_ID_BY_NAME, JDBCRealmConstants.Get_Role_ID_By_Name_SQL); + } + if (!properties.containsKey(JDBCCaseInsensitiveConstants.GET_USERS_PROPS_FOR_PROFILE_CASE_INSENSITIVE)) { properties.put(JDBCCaseInsensitiveConstants.GET_USERS_PROPS_FOR_PROFILE_CASE_INSENSITIVE, JDBCCaseInsensitiveConstants.GET_USERS_PROPS_FOR_PROFILE_SQL_CASE_INSENSITIVE); From d4e5e3d24d1c01d1fe8fb009ad8b6e3b8d2547a1 Mon Sep 17 00:00:00 2001 From: asha15 <165079T@uom.lk> Date: Wed, 21 Feb 2024 09:50:50 +0530 Subject: [PATCH 3/7] update sql constant name --- .../java/org/wso2/carbon/user/core/jdbc/JDBCRealmConstants.java | 2 +- .../main/java/org/wso2/carbon/user/core/util/JDBCRealmUtil.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core/org.wso2.carbon.user.core/src/main/java/org/wso2/carbon/user/core/jdbc/JDBCRealmConstants.java b/core/org.wso2.carbon.user.core/src/main/java/org/wso2/carbon/user/core/jdbc/JDBCRealmConstants.java index 46a7e117b25..5f32db0413d 100644 --- a/core/org.wso2.carbon.user.core/src/main/java/org/wso2/carbon/user/core/jdbc/JDBCRealmConstants.java +++ b/core/org.wso2.carbon.user.core/src/main/java/org/wso2/carbon/user/core/jdbc/JDBCRealmConstants.java @@ -273,7 +273,7 @@ public final class JDBCRealmConstants { public static final String GET_USERS_COUNT_WITH_FILTER_ROLE_SQL = "SELECT count(UM_ID) FROM UM_USER_ROLE " + "WHERE UM_ROLE_ID = ? AND UM_TENANT_ID = ?"; - public static final String Get_Role_ID_By_Name_SQL = "SELECT UM_ID FROM UM_ROLE " + + public static final String GET_ROLE_ID_BY_NAME_SQL = "SELECT UM_ID FROM UM_ROLE " + "WHERE UM_ROLE_NAME = ? AND UM_TENANT_ID = ? "; public static final String GET_USERS_IN_SHARED_ROLE_SQL = diff --git a/core/org.wso2.carbon.user.core/src/main/java/org/wso2/carbon/user/core/util/JDBCRealmUtil.java b/core/org.wso2.carbon.user.core/src/main/java/org/wso2/carbon/user/core/util/JDBCRealmUtil.java index 3ca1f3ddcba..7603468c133 100644 --- a/core/org.wso2.carbon.user.core/src/main/java/org/wso2/carbon/user/core/util/JDBCRealmUtil.java +++ b/core/org.wso2.carbon.user.core/src/main/java/org/wso2/carbon/user/core/util/JDBCRealmUtil.java @@ -540,7 +540,7 @@ public static Map getSQL(Map properties) { } if (!properties.containsKey(JDBCRealmConstants.GET_ROLE_ID_BY_NAME)) { - properties.put(JDBCRealmConstants.GET_ROLE_ID_BY_NAME, JDBCRealmConstants.Get_Role_ID_By_Name_SQL); + properties.put(JDBCRealmConstants.GET_ROLE_ID_BY_NAME, JDBCRealmConstants.GET_ROLE_ID_BY_NAME_SQL); } if (!properties.containsKey(JDBCCaseInsensitiveConstants.GET_USERS_PROPS_FOR_PROFILE_CASE_INSENSITIVE)) { From b580dafe46c71c08cdc6bc6be2a15afc51ceb453 Mon Sep 17 00:00:00 2001 From: Asha Sulaiman <165079T@uom.lk> Date: Tue, 5 Mar 2024 22:20:08 +0530 Subject: [PATCH 4/7] Update core/org.wso2.carbon.user.core/src/main/java/org/wso2/carbon/user/core/common/AbstractUserStoreManager.java Co-authored-by: Kayathiri --- .../wso2/carbon/user/core/common/AbstractUserStoreManager.java | 1 + 1 file changed, 1 insertion(+) diff --git a/core/org.wso2.carbon.user.core/src/main/java/org/wso2/carbon/user/core/common/AbstractUserStoreManager.java b/core/org.wso2.carbon.user.core/src/main/java/org/wso2/carbon/user/core/common/AbstractUserStoreManager.java index 7dad85e1b87..bfcf31af050 100644 --- a/core/org.wso2.carbon.user.core/src/main/java/org/wso2/carbon/user/core/common/AbstractUserStoreManager.java +++ b/core/org.wso2.carbon.user.core/src/main/java/org/wso2/carbon/user/core/common/AbstractUserStoreManager.java @@ -9483,6 +9483,7 @@ protected List doGetUserListOfRoleWithID(String roleName, String filter) t /** * Return the count of users belong to the given role for the given filter. + * @param roleName role name. * @param filter filter. * @return From 660c686e2b8641418ba33d89478bf5e216490fda Mon Sep 17 00:00:00 2001 From: Asha Sulaiman <165079T@uom.lk> Date: Tue, 5 Mar 2024 22:20:18 +0530 Subject: [PATCH 5/7] Update core/org.wso2.carbon.user.core/src/main/java/org/wso2/carbon/user/core/common/AbstractUserStoreManager.java Co-authored-by: Kayathiri --- .../wso2/carbon/user/core/common/AbstractUserStoreManager.java | 1 - 1 file changed, 1 deletion(-) diff --git a/core/org.wso2.carbon.user.core/src/main/java/org/wso2/carbon/user/core/common/AbstractUserStoreManager.java b/core/org.wso2.carbon.user.core/src/main/java/org/wso2/carbon/user/core/common/AbstractUserStoreManager.java index bfcf31af050..d4ac180fd96 100644 --- a/core/org.wso2.carbon.user.core/src/main/java/org/wso2/carbon/user/core/common/AbstractUserStoreManager.java +++ b/core/org.wso2.carbon.user.core/src/main/java/org/wso2/carbon/user/core/common/AbstractUserStoreManager.java @@ -19193,7 +19193,6 @@ public int getUserCountForRole(String roleName) throws UserStoreException { public int getUserCountByRole(String roleName, String filter) throws UserStoreException { int count = 0; - if (!isSecureCall.get()) { Class argTypes[] = new Class[] { String.class, String.class }; Object object = callSecure("getUserCountByRole", new Object[] { roleName, filter }, argTypes); From 7e10bee66497932df70a998d5b6456529a581903 Mon Sep 17 00:00:00 2001 From: Asha Sulaiman <165079T@uom.lk> Date: Tue, 5 Mar 2024 22:20:32 +0530 Subject: [PATCH 6/7] Update core/org.wso2.carbon.user.core/src/main/java/org/wso2/carbon/user/core/common/AbstractUserStoreManager.java Co-authored-by: Kayathiri --- .../wso2/carbon/user/core/common/AbstractUserStoreManager.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/org.wso2.carbon.user.core/src/main/java/org/wso2/carbon/user/core/common/AbstractUserStoreManager.java b/core/org.wso2.carbon.user.core/src/main/java/org/wso2/carbon/user/core/common/AbstractUserStoreManager.java index d4ac180fd96..b3c01eec85f 100644 --- a/core/org.wso2.carbon.user.core/src/main/java/org/wso2/carbon/user/core/common/AbstractUserStoreManager.java +++ b/core/org.wso2.carbon.user.core/src/main/java/org/wso2/carbon/user/core/common/AbstractUserStoreManager.java @@ -19199,7 +19199,7 @@ public int getUserCountByRole(String roleName, String filter) throws UserStoreEx return (int) object; } - // If role does not exit, just return + // If role does not exit, just return. if (!isExistingRole(roleName)) { return count; } From 392b660b455a700da59198a4549d34190516027e Mon Sep 17 00:00:00 2001 From: Asha Sulaiman <165079T@uom.lk> Date: Tue, 5 Mar 2024 22:26:33 +0530 Subject: [PATCH 7/7] add description for exception and return value --- .../carbon/user/core/common/AbstractUserStoreManager.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/core/org.wso2.carbon.user.core/src/main/java/org/wso2/carbon/user/core/common/AbstractUserStoreManager.java b/core/org.wso2.carbon.user.core/src/main/java/org/wso2/carbon/user/core/common/AbstractUserStoreManager.java index b3c01eec85f..cc4d5f36c2a 100644 --- a/core/org.wso2.carbon.user.core/src/main/java/org/wso2/carbon/user/core/common/AbstractUserStoreManager.java +++ b/core/org.wso2.carbon.user.core/src/main/java/org/wso2/carbon/user/core/common/AbstractUserStoreManager.java @@ -9483,11 +9483,11 @@ protected List doGetUserListOfRoleWithID(String roleName, String filter) t /** * Return the count of users belong to the given role for the given filter. - + * * @param roleName role name. - * @param filter filter. - * @return - * @throws UserStoreException + * @param filter filter. + * @return user count for the given role. + * @throws UserStoreException Thrown by the underlying UserStoreManager. */ protected int doGetUserCountOfRole(String roleName, String filter) throws UserStoreException {