X-Git-Url: http://wamblee.org/gitweb/?a=blobdiff_plain;f=security%2Fsrc%2Fmain%2Fjava%2Forg%2Fwamblee%2Fusermgt%2FUserAdministrationImpl.java;h=55793da6256c04c0f2788035947d77c0b08dbd91;hb=0d8d8f24656e585ee75558cfd6a4c661f8f14985;hp=dceca930e74fcc26eeedb112e59ac723d8dabc87;hpb=da48a523c81e59fe0eac34e43d12937396161f25;p=utils

diff --git a/security/src/main/java/org/wamblee/usermgt/UserAdministrationImpl.java b/security/src/main/java/org/wamblee/usermgt/UserAdministrationImpl.java
index dceca930..55793da6 100644
--- a/security/src/main/java/org/wamblee/usermgt/UserAdministrationImpl.java
+++ b/security/src/main/java/org/wamblee/usermgt/UserAdministrationImpl.java
@@ -35,22 +35,22 @@ public class UserAdministrationImpl implements UserAdministration {
     /**
      * All known users.
      */
-    private UserSet _users;
+    private UserSet users;
 
     /**
      * All known groups.
      */
-    private GroupSet _groups;
+    private GroupSet groups;
     
     /**
      * Validator for user names. 
      */
-    private NameValidator _userValidator;
+    private NameValidator userValidator;
     
     /**
      * Validator for group names. 
      */
-    private NameValidator _groupValidator;
+    private NameValidator groupValidator;
     
     /**
      * Constructs empty user administration.
@@ -58,10 +58,10 @@ public class UserAdministrationImpl implements UserAdministration {
      */
     public UserAdministrationImpl(UserSet aUsers, GroupSet aGroups, NameValidator aUserValidator, 
               NameValidator aGroupValidator) { 
-        _users = aUsers;
-        _groups = aGroups;
-        _userValidator = aUserValidator;
-        _groupValidator = aGroupValidator;
+        users = aUsers;
+        groups = aGroups;
+        userValidator = aUserValidator;
+        groupValidator = aGroupValidator;
     }
 
     /*
@@ -72,9 +72,9 @@ public class UserAdministrationImpl implements UserAdministration {
      */
     public User createUser(String aUser, String aPassword, Group aGroup)
             throws UserMgtException {
-        _userValidator.validate(aUser);
+        userValidator.validate(aUser);
         checkGroup(aGroup);
-        User user = _users.createUser(aUser, aPassword, aGroup);
+        User user = users.createUser(aUser, aPassword, aGroup);
         return new User(user);
     }
     
@@ -84,12 +84,12 @@ public class UserAdministrationImpl implements UserAdministration {
      * @see org.wamblee.usermgt.UserAdministration#createGroup(java.lang.String)
      */
     public Group createGroup(String aName) throws UserMgtException {
-        _groupValidator.validate(aName);
+        groupValidator.validate(aName);
         Group group = new Group(aName);
-        if (_groups.contains(group)) {
+        if (groups.contains(group)) {
             throw new UserMgtException(DUPLICATE_GROUP, group);
         }
-        _groups.add(group);
+        groups.add(group);
         return new Group(group);
     }
 
@@ -99,7 +99,7 @@ public class UserAdministrationImpl implements UserAdministration {
      * @see org.wamblee.usermgt.UserAdministration#userModified(org.wamblee.usermgt.User)
      */
     public void userModified(User aUser) {
-        _users.userModified(aUser);
+        users.userModified(aUser);
     }
 
     /*
@@ -108,7 +108,7 @@ public class UserAdministrationImpl implements UserAdministration {
      * @see org.wamblee.usermgt.UserAdministration#groupModified(org.wamblee.usermgt.Group)
      */
     public void groupModified(Group aGroup) {
-        _groups.groupModified(aGroup);
+        groups.groupModified(aGroup);
     }
 
     /*
@@ -117,7 +117,7 @@ public class UserAdministrationImpl implements UserAdministration {
      * @see org.wamblee.usermgt.UserAdministration#getUser(java.lang.String)
      */
     public User getUser(String aName) {
-        return _users.find(aName);
+        return users.find(aName);
     }
 
     /*
@@ -126,7 +126,7 @@ public class UserAdministrationImpl implements UserAdministration {
      * @see org.wamblee.usermgt.UserAdministration#getGroup(java.lang.String)
      */
     public Group getGroup(String aName) {
-        return _groups.find(aName);
+        return groups.find(aName);
     }
 
     /*
@@ -135,7 +135,7 @@ public class UserAdministrationImpl implements UserAdministration {
      * @see org.wamblee.usermgt.UserAdministration#getUsers()
      */
     public Set<User> getUsers() {
-        return _users.list();
+        return users.list();
     }
 
     /*
@@ -144,7 +144,7 @@ public class UserAdministrationImpl implements UserAdministration {
      * @see org.wamblee.usermgt.UserAdministration#getUsers(org.wamblee.usermgt.Group)
      */
     public Set<User> getUsers(Group aGroup) {
-        return _users.list(aGroup);
+        return users.list(aGroup);
     }
 
     /*
@@ -153,7 +153,7 @@ public class UserAdministrationImpl implements UserAdministration {
      * @see org.wamblee.usermgt.UserAdministration#getGroups()
      */
     public Set<Group> getGroups() {
-        return _groups.list();
+        return groups.list();
     }
 
     /*
@@ -163,7 +163,7 @@ public class UserAdministrationImpl implements UserAdministration {
      */
     public void removeUser(User aUser) throws UserMgtException {
         checkUser(aUser);
-        _users.remove(aUser);
+        users.remove(aUser);
     }
 
     /*
@@ -176,7 +176,7 @@ public class UserAdministrationImpl implements UserAdministration {
         if (getUsers(aGroup).size() > 0) {
             throw new UserMgtException(GROUP_STILL_OCCUPIED, aGroup);
         }
-        _groups.remove(aGroup);
+        groups.remove(aGroup);
     }
 
     /*
@@ -191,15 +191,15 @@ public class UserAdministrationImpl implements UserAdministration {
         if (aUser.getName().equals(aUserName)) {
             throw new UserMgtException(TRIVIAL_RENAME, aUser);
         }
-        if (_users.find(aUserName) != null) {
+        if (users.find(aUserName) != null) {
             throw new UserMgtException(DUPLICATE_USER, aUser);
         }
-        _userValidator.validate(aUserName);
+        userValidator.validate(aUserName);
         // we are modifying the user so we should re-insert it into the set
         // after renaming it.
-        _users.remove(aUser);
+        users.remove(aUser);
         aUser.setName(aUserName);
-        _users.add(aUser);
+        users.add(aUser);
     }
 
     /*
@@ -214,15 +214,15 @@ public class UserAdministrationImpl implements UserAdministration {
         if (aGroup.getName().equals(aGroupName)) {
             throw new UserMgtException(TRIVIAL_RENAME, aGroup);
         }
-        if (_groups.find(aGroupName) != null) {
+        if (groups.find(aGroupName) != null) {
             throw new UserMgtException(DUPLICATE_GROUP, aGroup);
         }
-        _groupValidator.validate(aGroupName);
+        groupValidator.validate(aGroupName);
         // we are renaming the group so we should re-insert it into the set
         // after renaming it.
-        _groups.remove(aGroup);
+        groups.remove(aGroup);
         aGroup.setName(aGroupName);
-        _groups.add(aGroup);
+        groups.add(aGroup);
     }
 
     /*
@@ -236,7 +236,7 @@ public class UserAdministrationImpl implements UserAdministration {
         checkUser(aUser);
         checkGroup(aGroup);
         aUser.addGroup(aGroup);
-        _users.userModified(aUser);
+        users.userModified(aUser);
     }
 
     /*
@@ -250,7 +250,7 @@ public class UserAdministrationImpl implements UserAdministration {
         checkUser(aUser);
         checkGroup(aGroup);
         aUser.removeGroup(aGroup);
-        _users.userModified(aUser);
+        users.userModified(aUser);
     }
 
     /**
@@ -258,7 +258,7 @@ public class UserAdministrationImpl implements UserAdministration {
      * @throws UserMgtException
      */
     private void checkUser(User aUser) throws UserMgtException {
-        if (!_users.contains(aUser)) {
+        if (!users.contains(aUser)) {
             throw new UserMgtException(UNKNOWN_USER, aUser);
         }
     }
@@ -268,7 +268,7 @@ public class UserAdministrationImpl implements UserAdministration {
      * @throws UserMgtException
      */
     private void checkGroup(Group aGroup) throws UserMgtException {
-        if (!_groups.contains(aGroup)) {
+        if (!groups.contains(aGroup)) {
             throw new UserMgtException(UNKNOWN_GROUP, aGroup);
         }
     }
@@ -277,13 +277,13 @@ public class UserAdministrationImpl implements UserAdministration {
      * @see org.wamblee.usermgt.UserAdministration#getUserCount()
      */
     public int getUserCount() {
-        return _users.size(); 
+        return users.size(); 
     }
     
     /* (non-Javadoc)
      * @see org.wamblee.usermgt.UserAdministration#getGroupCount()
      */
     public int getGroupCount() {
-        return _groups.size(); 
+        return groups.size(); 
     }
 }