Minor changes to StratosUserManager
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/4c09e786 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/4c09e786 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/4c09e786 Branch: refs/heads/docker-integration Commit: 4c09e7865ac9998ae2a9bf681eac0374889f2d40 Parents: 38d7f72 Author: lasinducharith <[email protected]> Authored: Mon Sep 15 21:50:38 2014 +0530 Committer: Nirmal Fernando <[email protected]> Committed: Wed Sep 24 17:00:43 2014 +0530 ---------------------------------------------------------------------- .../stratos/manager/user/mgt/StratosUserManager.java | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/4c09e786/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/user/mgt/StratosUserManager.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/user/mgt/StratosUserManager.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/user/mgt/StratosUserManager.java index 75996df..1dcf8de 100644 --- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/user/mgt/StratosUserManager.java +++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/user/mgt/StratosUserManager.java @@ -40,7 +40,8 @@ import java.util.Map; public class StratosUserManager { private transient static final Log log = LogFactory.getLog(StratosUserManager.class); - private String internalEveryoneRole = "Internal/everyone"; + private static final String INTERNAL_EVERYONE_ROLE = "Internal/everyone"; + private static final String GET_ALL_USERS_WILD_CARD = "*"; /** * Add a user to the user store @@ -128,16 +129,16 @@ public class StratosUserManager { */ public List<UserInfoBean> getAllUsers(UserStoreManager userStoreManager) throws UserManagementException{ - String[] userRoles = null; + String[] users = null; List<UserInfoBean> userList = new ArrayList<UserInfoBean>(); try { - userRoles = userStoreManager.getRoleNames(); + users = userStoreManager.listUsers(GET_ALL_USERS_WILD_CARD, -1); - for(String userRole: userRoles){ + for(String user: users){ UserInfoBean userInfoBean = new UserInfoBean(); - userInfoBean.setUserName(userRole); - userInfoBean.setRole(getRefinedListOfRolesOfUser(userStoreManager, userRole)[0]); + userInfoBean.setUserName(user); + userInfoBean.setRole(getRefinedListOfRolesOfUser(userStoreManager, user)[0]); userList.add(userInfoBean); } @@ -164,7 +165,7 @@ public class StratosUserManager { String[] allUserRoles = userStoreManager.getRoleListOfUser(username); for(String role: allUserRoles){ - if(!role.equals(internalEveryoneRole)){ + if(!role.equals(INTERNAL_EVERYONE_ROLE)){ rolesWithoutEveryoneRole.add(role); } }
