now using the simplified user management interface.

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

diff --git a/security/impl/src/main/java/org/wamblee/security/authentication/jpa/JpaUserSet.java b/security/impl/src/main/java/org/wamblee/security/authentication/jpa/JpaUserSet.java
index 9f8edb1dfa653393493e38897829fbe633f115a1..167e6f4d8472aaee8d54fb29683447f715be03d2 100644 (file)
--- a/security/impl/src/main/java/org/wamblee/security/authentication/jpa/JpaUserSet.java
+++ b/security/impl/src/main/java/org/wamblee/security/authentication/jpa/JpaUserSet.java
@@ -24,6 +24,7 @@ import javax.persistence.NoResultException;
 import javax.persistence.TypedQuery;
 
 import org.wamblee.cache.Cache;
+import org.wamblee.cache.ZeroCache;
 import org.wamblee.persistence.JpaMergeSupport;
 import org.wamblee.security.authentication.AbstractUserSet;
 import org.wamblee.security.authentication.Group;
@@ -60,11 +61,7 @@ public class JpaUserSet extends AbstractUserSet {
         entityManager = aEntityManager;
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.wamblee.usermgt.UserSet#userModified(org.wamblee.usermgt.User)
-     */
+    @Override
     public void userModified(User aUser) {
         assert aUser.getPrimaryKey() != null;
         User merged = entityManager.merge(aUser);
@@ -76,11 +73,7 @@ public class JpaUserSet extends AbstractUserSet {
         cache.put(aUser.getName(), new User(aUser));
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.wamblee.usermgt.UserSet#find(java.lang.String)
-     */
+    @Override
     public User find(String aName) {
         User user = cache.get(aName);
 
@@ -93,7 +86,6 @@ public class JpaUserSet extends AbstractUserSet {
         query.setParameter(User.NAME_PARAM, aName);
         try {
             user = query.getSingleResult();
-            user = new User(user);
             setPasswordInfo(user);
             cache.put(aName, user);
             return user;
@@ -102,20 +94,12 @@ public class JpaUserSet extends AbstractUserSet {
         }
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.wamblee.usermgt.UserSet#contains(org.wamblee.usermgt.User)
-     */
+    @Override
     public boolean contains(User aUser) {
         return find(aUser.getName()) != null;
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.wamblee.usermgt.UserSet#add(org.wamblee.usermgt.User)
-     */
+    @Override
     public boolean add(User aUser) {
         assert aUser.getPrimaryKey() == null;
 
@@ -131,11 +115,7 @@ public class JpaUserSet extends AbstractUserSet {
         return true;
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.wamblee.usermgt.UserSet#remove(org.wamblee.usermgt.User)
-     */
+    @Override
     public boolean remove(User aUser) {
         if (!contains(aUser)) {
             return false;
@@ -148,11 +128,7 @@ public class JpaUserSet extends AbstractUserSet {
         return true;
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.wamblee.usermgt.UserSet#list()
-     */
+    @Override
     public Set<User> list() {
         Set<User> users = new TreeSet<User>();
         List<User> list = entityManager.createNamedQuery(User.QUERY_ALL_USERS,
@@ -166,11 +142,7 @@ public class JpaUserSet extends AbstractUserSet {
         return users;
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.wamblee.usermgt.UserSet#list(org.wamblee.usermgt.Group)
-     */
+    @Override
     public Set<User> list(Group aGroup) {
         Set<User> users = new TreeSet<User>();
         TypedQuery<User> query = entityManager.createNamedQuery(
@@ -186,13 +158,14 @@ public class JpaUserSet extends AbstractUserSet {
         return users;
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.wamblee.usermgt.UserSet#size()
-     */
+    @Override
     public int size() {
         Long result = entityManager.createNamedQuery(User.QUERY_COUNT_USERS, Long.class).getSingleResult();
         return result.intValue();
     }
+    
+    @Override
+    public void clearCache() {
+        cache.clear();   
+    }
 }