From 3257c3fac556e3326330a338787afb584071d618 Mon Sep 17 00:00:00 2001 From: Olivier Lamy Date: Sat, 8 Dec 2012 22:32:34 +0000 Subject: [PATCH] remove non used method with parameter Object principal git-svn-id: https://svn.apache.org/repos/asf/archiva/redback/redback-core/trunk@1418771 13f79535-47bb-0310-9956-ffa450edef68 --- .../archiva/redback/users/UserManager.java | 21 +---- .../users/cached/CachedUserManager.java | 29 +------ .../configurable/ConfigurableUserManager.java | 16 +--- .../redback/users/jdo/JdoUserManager.java | 46 +---------- .../redback/users/ldap/LdapUserManager.java | 77 +------------------ .../users/memory/MemoryUserManager.java | 21 +---- .../test/AbstractUserManagerTestCase.java | 2 +- 7 files changed, 10 insertions(+), 202 deletions(-) diff --git a/redback-users/redback-users-api/src/main/java/org/apache/archiva/redback/users/UserManager.java b/redback-users/redback-users-api/src/main/java/org/apache/archiva/redback/users/UserManager.java index c5f94a03..e610f047 100644 --- a/redback-users/redback-users-api/src/main/java/org/apache/archiva/redback/users/UserManager.java +++ b/redback-users/redback-users-api/src/main/java/org/apache/archiva/redback/users/UserManager.java @@ -150,32 +150,13 @@ public interface UserManager */ List findUsersByQuery( UserQuery query ); - /** - * Find a User using the principal. - * - * @param principal the principal to look for. - * @return the user. - * @throws UserNotFoundException if the user was not found. - */ - User findUser( Object principal ) - throws UserNotFoundException; - /** * true if the user exists, false if it doesn't * * @param principal * @return true, if user exists */ - boolean userExists( Object principal ); - - /** - * Delete a user using the principal. - * - * @param principal the principal to look for. - * @throws UserNotFoundException the user was not found. - */ - void deleteUser( Object principal ) - throws UserNotFoundException; + boolean userExists( String principal ); /** * Delete a user using the username. diff --git a/redback-users/redback-users-providers/redback-users-cached/src/main/java/org/apache/archiva/redback/users/cached/CachedUserManager.java b/redback-users/redback-users-providers/redback-users-cached/src/main/java/org/apache/archiva/redback/users/cached/CachedUserManager.java index 6c3fc345..7cebc1f8 100644 --- a/redback-users/redback-users-providers/redback-users-cached/src/main/java/org/apache/archiva/redback/users/cached/CachedUserManager.java +++ b/redback-users/redback-users-providers/redback-users-cached/src/main/java/org/apache/archiva/redback/users/cached/CachedUserManager.java @@ -93,13 +93,6 @@ public class CachedUserManager return this.userImpl.createUser( username, fullName, emailAddress ); } - public void deleteUser( Object principal ) - throws UserNotFoundException - { - usersCache.remove( principal ); - this.userImpl.deleteUser( principal ); - } - public void deleteUser( String username ) throws UserNotFoundException { @@ -156,22 +149,6 @@ public class CachedUserManager } } - public User findUser( Object principal ) - throws UserNotFoundException - { - Object el = usersCache.get( principal ); - if ( el != null ) - { - return (User) el; - } - else - { - User user = this.userImpl.findUser( principal ); - usersCache.put( principal, user ); - return user; - } - } - public UserQuery createUserQuery() { return userImpl.createUserQuery(); @@ -240,14 +217,14 @@ public class CachedUserManager return this.userImpl.updateUser( user, passwordChangeRequired ); } - public boolean userExists( Object principal ) + public boolean userExists( String userName ) { - if ( usersCache.hasKey( principal ) ) + if ( usersCache.hasKey( userName ) ) { return true; } - return this.userImpl.userExists( principal ); + return this.userImpl.userExists( userName ); } public void userManagerInit( boolean freshDatabase ) diff --git a/redback-users/redback-users-providers/redback-users-configurable/src/main/java/org/apache/archiva/redback/users/configurable/ConfigurableUserManager.java b/redback-users/redback-users-providers/redback-users-configurable/src/main/java/org/apache/archiva/redback/users/configurable/ConfigurableUserManager.java index 909c831b..848aba37 100644 --- a/redback-users/redback-users-providers/redback-users-configurable/src/main/java/org/apache/archiva/redback/users/configurable/ConfigurableUserManager.java +++ b/redback-users/redback-users-providers/redback-users-configurable/src/main/java/org/apache/archiva/redback/users/configurable/ConfigurableUserManager.java @@ -85,12 +85,6 @@ public class ConfigurableUserManager return userManagerImpl.createUserQuery(); } - public void deleteUser( Object principal ) - throws UserNotFoundException - { - userManagerImpl.deleteUser( principal ); - } - public void deleteUser( String username ) throws UserNotFoundException { @@ -108,12 +102,6 @@ public class ConfigurableUserManager return userManagerImpl.findUser( username ); } - public User findUser( Object principal ) - throws UserNotFoundException - { - return userManagerImpl.findUser( principal ); - } - @Override public User getGuestUser() throws UserNotFoundException @@ -173,9 +161,9 @@ public class ConfigurableUserManager return userManagerImpl.updateUser( user, passwordChangeRequired ); } - public boolean userExists( Object principal ) + public boolean userExists( String userName ) { - return userManagerImpl.userExists( principal ); + return userManagerImpl.userExists( userName ); } public void setUserManagerImpl( UserManager userManagerImpl ) diff --git a/redback-users/redback-users-providers/redback-users-jdo/src/main/java/org/apache/archiva/redback/users/jdo/JdoUserManager.java b/redback-users/redback-users-providers/redback-users-jdo/src/main/java/org/apache/archiva/redback/users/jdo/JdoUserManager.java index 03724e06..8a68c083 100644 --- a/redback-users/redback-users-providers/redback-users-jdo/src/main/java/org/apache/archiva/redback/users/jdo/JdoUserManager.java +++ b/redback-users/redback-users-providers/redback-users-jdo/src/main/java/org/apache/archiva/redback/users/jdo/JdoUserManager.java @@ -242,27 +242,6 @@ public class JdoUserManager return (User) addObject( user ); } - public void deleteUser( Object principal ) - { - try - { - User user = findUser( principal ); - - if ( user.isPermanent() ) - { - throw new PermanentUserException( "Cannot delete permanent user [" + user.getUsername() + "]." ); - } - - fireUserManagerUserRemoved( user ); - - removeObject( user ); - } - catch ( UserNotFoundException e ) - { - log.warn( "Unable to delete user " + principal + ", user not found.", e ); - } - } - public void deleteUser( String username ) { try @@ -307,29 +286,6 @@ public class JdoUserManager RedbackJdoUtils.removeAll( getPersistenceManager(), UsersManagementModelloMetadata.class ); } - public User findUser( Object principal ) - throws UserNotFoundException - { - if ( principal == null ) - { - throw new UserNotFoundException( "Unable to find user based on null principal." ); - } - - try - { - return (User) RedbackJdoUtils.getObjectById( getPersistenceManager(), JdoUser.class, principal.toString(), - null ); - } - catch ( RedbackObjectNotFoundException e ) - { - throw new UserNotFoundException( "Unable to find user: " + e.getMessage(), e ); - } - catch ( RedbackStoreException e ) - { - throw new UserNotFoundException( "Unable to find user: " + e.getMessage(), e ); - } - } - public User findUser( String username ) throws UserNotFoundException { @@ -341,7 +297,7 @@ public class JdoUserManager return (User) getObjectById( username, null ); } - public boolean userExists( Object principal ) + public boolean userExists( String principal ) { try { diff --git a/redback-users/redback-users-providers/redback-users-ldap/src/main/java/org/apache/archiva/redback/users/ldap/LdapUserManager.java b/redback-users/redback-users-providers/redback-users-ldap/src/main/java/org/apache/archiva/redback/users/ldap/LdapUserManager.java index c069eddf..8d2ed7e8 100644 --- a/redback-users/redback-users-providers/redback-users-ldap/src/main/java/org/apache/archiva/redback/users/ldap/LdapUserManager.java +++ b/redback-users/redback-users-providers/redback-users-ldap/src/main/java/org/apache/archiva/redback/users/ldap/LdapUserManager.java @@ -127,29 +127,6 @@ public class LdapUserManager return new LdapUserQuery(); } - public void deleteUser( Object principal ) - throws UserNotFoundException - { - if ( principal != null ) - { - clearFromCache( principal.toString() ); - } - - LdapConnection ldapConnection = getLdapConnection(); - try - { - DirContext context = ldapConnection.getDirContext(); - controller.removeUser( principal, context ); - } - catch ( LdapControllerException e ) - { - log.error( "Failed to delete user: {}", principal, e ); - } - finally - { - closeLdapConnection( ldapConnection ); - } - } public void deleteUser( String username ) throws UserNotFoundException @@ -245,58 +222,6 @@ public class LdapUserManager return guestUser; } - public User findUser( Object principal ) - throws UserNotFoundException - { - if ( principal == null ) - { - throw new UserNotFoundException( "Unable to find user based on null principal." ); - } - - if ( GUEST_USERNAME.equals( principal.toString() ) ) - { - return getGuestUser(); - } - - // REDBACK-289/MRM-1488 - // look for the user in the cache first - LdapUser ldapUser = ldapCacheService.getUser( principal.toString() ); - if ( ldapUser != null ) - { - log.debug( "User {} found in cache.", principal ); - return ldapUser; - } - - LdapConnection ldapConnection = getLdapConnection(); - try - { - DirContext context = ldapConnection.getDirContext(); - - User user = controller.getUser( principal, context ); - - // REDBACK-289/MRM-1488 - log.debug( "Adding user {} to cache..", principal ); - - ldapCacheService.addUser( (LdapUser) user ); - - return user; - } - catch ( LdapControllerException e ) - { - log.error( "Failed to find user: {}", principal, e ); - return null; - } - catch ( MappingException e ) - { - log.error( "Failed to map user: {}", principal, e ); - return null; - } - finally - { - closeLdapConnection( ldapConnection ); - } - } - public List findUsersByEmailKey( String emailKey, boolean orderAscending ) { LdapUserQuery query = new LdapUserQuery(); @@ -437,7 +362,7 @@ public class LdapUserManager return user; } - public boolean userExists( Object principal ) + public boolean userExists( String principal ) { if ( principal == null ) { diff --git a/redback-users/redback-users-providers/redback-users-memory/src/main/java/org/apache/archiva/redback/users/memory/MemoryUserManager.java b/redback-users/redback-users-providers/redback-users-memory/src/main/java/org/apache/archiva/redback/users/memory/MemoryUserManager.java index 61861e12..c3a7526b 100644 --- a/redback-users/redback-users-providers/redback-users-memory/src/main/java/org/apache/archiva/redback/users/memory/MemoryUserManager.java +++ b/redback-users/redback-users-providers/redback-users-memory/src/main/java/org/apache/archiva/redback/users/memory/MemoryUserManager.java @@ -138,21 +138,7 @@ public class MemoryUserManager return user; } - public User findUser( Object principal ) - throws UserNotFoundException - { - triggerInit(); - User user = users.get( principal ); - - if ( user == null ) - { - throw new UserNotFoundException( "Cannot find the user with the principal '" + principal + "'." ); - } - - return user; - } - - public boolean userExists( Object principal ) + public boolean userExists( String principal ) { try { @@ -165,11 +151,6 @@ public class MemoryUserManager } } - public void deleteUser( Object principal ) - throws UserNotFoundException - { - deleteUser( principal.toString() ); - } public User createUser( String username, String fullName, String emailAddress ) { diff --git a/redback-users/redback-users-tests/src/main/java/org/apache/archiva/redback/users/provider/test/AbstractUserManagerTestCase.java b/redback-users/redback-users-tests/src/main/java/org/apache/archiva/redback/users/provider/test/AbstractUserManagerTestCase.java index d4adc137..2fa013ac 100644 --- a/redback-users/redback-users-tests/src/main/java/org/apache/archiva/redback/users/provider/test/AbstractUserManagerTestCase.java +++ b/redback-users/redback-users-tests/src/main/java/org/apache/archiva/redback/users/provider/test/AbstractUserManagerTestCase.java @@ -109,7 +109,7 @@ public class AbstractUserManagerTestCase try { Object obj = null; - getUserManager().findUser( obj ); + getUserManager().findUser( null ); fail( "findUser() with null Object Should have thrown a UserNotFoundException." ); } catch ( UserNotFoundException e )