now using the simplified user management interface.

[utils] / security / impl / src / main / java / org / wamblee / security / authentication / InMemoryUserSet.java

diff --git a/security/impl/src/main/java/org/wamblee/security/authentication/InMemoryUserSet.java b/security/impl/src/main/java/org/wamblee/security/authentication/InMemoryUserSet.java
index 6c29667728a80201b0025ca669d6e31f88140a99..59129213a4837ad41d8b04f55f253a73c750aadf 100644 (file)
--- a/security/impl/src/main/java/org/wamblee/security/authentication/InMemoryUserSet.java
+++ b/security/impl/src/main/java/org/wamblee/security/authentication/InMemoryUserSet.java
@@ -41,99 +41,68 @@ public class InMemoryUserSet extends AbstractUserSet {
         users = new TreeSet<User>();
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.wamblee.usermgt.UserSet#userModified(org.wamblee.usermgt.User)
-     */
+    @Override
     public void userModified(User aUser) {
         users.remove(aUser);
         setPasswordInfo(aUser);
         users.add(aUser);
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.wamblee.usermgt.UserSet#find(java.lang.String)
-     */
+    @Override
     public User find(String aName) {
         for (User user : users) {
             if (user.getName().equals(aName)) {
-                return new User(user);
+                return user;
             }
         }
 
         return null;
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.wamblee.usermgt.UserSet#add(org.wamblee.usermgt.User)
-     */
+    @Override
     public boolean add(User aUser) {
         setPasswordInfo(aUser);
 
         return users.add(aUser);
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.wamblee.usermgt.UserSet#contains(org.wamblee.usermgt.User)
-     */
+    @Override
     public boolean contains(User aUser) {
         return users.contains(aUser);
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.wamblee.usermgt.UserSet#remove(org.wamblee.usermgt.User)
-     */
+    @Override
     public boolean remove(User aUser) {
         return users.remove(aUser);
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.wamblee.usermgt.UserSet#list()
-     */
+    @Override
     public Set<User> list() {
         Set<User> list = new TreeSet<User>();
-
-        for (User user : users) {
-            list.add(new User(user));
-        }
-
+        list.addAll(users);
         return list;
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.wamblee.usermgt.UserSet#list(org.wamblee.usermgt.Group)
-     */
+    @Override
     public Set<User> list(Group aGroup) {
         Set<User> result = new TreeSet<User>();
 
         for (User user : users) {
             if (user.getGroups().contains(aGroup)) {
-                result.add(new User(user));
+                result.add(user);
             }
         }
 
         return result;
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.wamblee.usermgt.UserSet#size()
-     */
+    @Override
     public int size() {
         return users.size();
     }
+    
+    @Override
+    public void clearCache() {
+        // Empty   
+    }
 }