add a method to find user without using caching: jdo update need the object detach from database not a cached one

git-svn-id: https://svn.apache.org/repos/asf/archiva/redback/redback-core/trunk@1551098 13f79535-47bb-0310-9956-ffa450edef68

redback-common/redback-common-ldap/src/test/java/org/apache/archiva/redback/common/ldap/user/MockUserManager.java

@@ -102,6 +102,13 @@ public class MockUserManager
         return null;  //To change body of implemented methods use File | Settings | File Templates.
     }
 
+    @Override
+    public User findUser( String username, boolean useCache )
+        throws UserNotFoundException, UserManagerException
+    {
+        return null;
+    }
+
     public User getGuestUser()
         throws UserNotFoundException, UserManagerException
     {

redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/DefaultPasswordService.java

@@ -107,7 +107,7 @@ public class DefaultPasswordService
 
             String encodedPassword = passwordValidator.validatePassword( password, principal );
 
-            User user = securitySystem.getUserManager().findUser( principal );
+            User user = securitySystem.getUserManager().findUser( principal, false );
             user.setPassword( password );
             user.setEncodedPassword( encodedPassword );
             user = securitySystem.getUserManager().updateUser( user );

redback-system/src/test/java/org/apache/archiva/redback/system/MockUserManager.java

@@ -100,6 +100,13 @@ public class MockUserManager
         return null;  //To change body of implemented methods use File | Settings | File Templates.
     }
 
+    @Override
+    public User findUser( String username, boolean useCache )
+        throws UserNotFoundException, UserManagerException
+    {
+        return null;
+    }
+
     public User getGuestUser()
         throws UserNotFoundException, UserManagerException
     {

redback-users/redback-users-api/src/main/java/org/apache/archiva/redback/users/UserManager.java

@@ -136,6 +136,9 @@ public interface UserManager
     User findUser( String username )
         throws UserNotFoundException, UserManagerException;
 
+    User findUser( String username, boolean useCache )
+        throws UserNotFoundException, UserManagerException;
+
     /**
      * Get the guest user.
      *

redback-users/redback-users-providers/redback-users-cached/src/main/java/org/apache/archiva/redback/users/cached/CachedUserManager.java

@@ -137,6 +137,14 @@ public class CachedUserManager
         }
     }
 
+    @Override
+    public User findUser( String username, boolean useCache )
+        throws UserNotFoundException, UserManagerException
+    {
+        // force use of cache here :-)
+        return findUser( username );
+    }
+
     public User getGuestUser()
         throws UserNotFoundException, UserManagerException
     {

redback-users/redback-users-providers/redback-users-configurable/src/main/java/org/apache/archiva/redback/users/configurable/ConfigurableUserManager.java

@@ -106,6 +106,13 @@ public class ConfigurableUserManager
         return userManagerImpl.findUser( username );
     }
 
+    @Override
+    public User findUser( String username, boolean useCache )
+        throws UserNotFoundException, UserManagerException
+    {
+        return userManagerImpl.findUser( username, useCache );
+    }
+
     @Override
     public User getGuestUser()
         throws UserNotFoundException, UserManagerException

redback-users/redback-users-providers/redback-users-jdo/src/main/java/org/apache/archiva/redback/users/jdo/JdoUserManager.java

@@ -300,6 +300,13 @@ public class JdoUserManager
         return (User) getObjectById( username, null );
     }
 
+    @Override
+    public User findUser( String username, boolean useCache )
+        throws UserNotFoundException, UserManagerException
+    {
+        return findUser( username );
+    }
+
     public boolean userExists( String principal )
         throws UserManagerException
     {

redback-users/redback-users-providers/redback-users-ldap/src/main/java/org/apache/archiva/redback/users/ldap/LdapUserManager.java

@@ -51,24 +51,24 @@ import java.util.List;
 /**
  * @author <a href="jesse@codehaus.org"> jesse
  */
-@Service( "userManager#ldap" )
+@Service("userManager#ldap")
 public class LdapUserManager
     extends AbstractUserManager
     implements UserManager
 {
     @Inject
-    @Named( value = "ldapConnectionFactory#configurable" )
+    @Named(value = "ldapConnectionFactory#configurable")
     private LdapConnectionFactory connectionFactory;
 
     @Inject
     private LdapController controller;
 
     @Inject
-    @Named( value = "userMapper#ldap" )
+    @Named(value = "userMapper#ldap")
     private UserMapper mapper;
 
     @Inject
-    @Named( value = "userConfiguration#default" )
+    @Named(value = "userConfiguration#default")
     private UserConfiguration userConf;
 
     @Inject
@@ -195,7 +195,8 @@ public class LdapUserManager
         // TODO Implement erase!
     }
 
-    public User findUser( String username )
+    @Override
+    public User findUser( String username, boolean useCache )
         throws UserNotFoundException, UserManagerException
     {
         if ( username == null )
@@ -203,15 +204,17 @@ public class LdapUserManager
             throw new UserNotFoundException( "Unable to find user based on null username." );
         }
 
-        // REDBACK-289/MRM-1488
-        // look for the user in the cache first
-        LdapUser ldapUser = ldapCacheService.getUser( username );
-        if ( ldapUser != null )
+        if ( useCache )
         {
-            log.debug( "User {} found in cache.", username );
-            return ldapUser;
+            // REDBACK-289/MRM-1488
+            // look for the user in the cache first
+            LdapUser ldapUser = ldapCacheService.getUser( username );
+            if ( ldapUser != null )
+            {
+                log.debug( "User {} found in cache.", username );
+                return ldapUser;
+            }
         }
-
         LdapConnection ldapConnection = null;
 
         try
@@ -251,6 +254,12 @@ public class LdapUserManager
         }
     }
 
+    public User findUser( String username )
+        throws UserNotFoundException, UserManagerException
+    {
+        return findUser( username, true );
+    }
+
     public List<User> findUsersByEmailKey( String emailKey, boolean orderAscending )
         throws UserManagerException
     {

redback-users/redback-users-providers/redback-users-memory/src/main/java/org/apache/archiva/redback/users/memory/MemoryUserManager.java

@@ -212,6 +212,13 @@ public class MemoryUserManager
         return user;
     }
 
+    @Override
+    public User findUser( String username, boolean useCache )
+        throws UserNotFoundException, UserManagerException
+    {
+        return findUser( username );
+    }
+
     public List<User> findUsersByUsernameKey( String usernameKey, boolean orderAscending )
     {
         triggerInit();