diff options
| author | Olivier Lamy <olamy@apache.org> | 2013-01-08 22:47:59 +0000 |
|---|---|---|
| committer | Olivier Lamy <olamy@apache.org> | 2013-01-08 22:47:59 +0000 |
| commit | df8c0522561a9a4a87acf667830f89f03ce85205 (patch) | |
| tree | a415d4bc5d4f27a88b09c6b332c529eca090da58 | |
| parent | c5c9a51959a4cab00b4180f9a8594a02724d7dbd (diff) | |
| download | archiva-df8c0522561a9a4a87acf667830f89f03ce85205.tar.gz archiva-df8c0522561a9a4a87acf667830f89f03ce85205.zip | |
this parameter is a String not Object
git-svn-id: https://svn.apache.org/repos/asf/archiva/redback/redback-core/trunk@1430613 13f79535-47bb-0310-9956-ffa450edef68
2 files changed, 13 insertions, 14 deletions
diff --git a/redback-users/redback-users-providers/redback-users-ldap/src/main/java/org/apache/archiva/redback/users/ldap/ctl/DefaultLdapController.java b/redback-users/redback-users-providers/redback-users-ldap/src/main/java/org/apache/archiva/redback/users/ldap/ctl/DefaultLdapController.java index 62f6fb38c..1b5b7ebdf 100644 --- a/redback-users/redback-users-providers/redback-users-ldap/src/main/java/org/apache/archiva/redback/users/ldap/ctl/DefaultLdapController.java +++ b/redback-users/redback-users-providers/redback-users-ldap/src/main/java/org/apache/archiva/redback/users/ldap/ctl/DefaultLdapController.java @@ -59,12 +59,12 @@ public class DefaultLdapController private UserMapper mapper; /** - * @see org.apache.archiva.redback.users.ldap.ctl.LdapController#removeUser(java.lang.Object, javax.naming.directory.DirContext) + * @see org.apache.archiva.redback.users.ldap.ctl.LdapController#removeUser(String, javax.naming.directory.DirContext) */ - public void removeUser( Object principal, DirContext context ) + public void removeUser( String principal, DirContext context ) throws LdapControllerException { - + // no op } /** @@ -73,13 +73,13 @@ public class DefaultLdapController public void updateUser( User user, DirContext context ) throws LdapControllerException, MappingException { - + // no op } /** - * @see org.apache.archiva.redback.users.ldap.ctl.LdapController#userExists(java.lang.Object, javax.naming.directory.DirContext) + * @see org.apache.archiva.redback.users.ldap.ctl.LdapController#userExists(String, javax.naming.directory.DirContext) */ - public boolean userExists( Object key, DirContext context ) + public boolean userExists( String key, DirContext context ) throws LdapControllerException { NamingEnumeration<SearchResult> results = null; @@ -108,11 +108,11 @@ public class DefaultLdapController } } - protected NamingEnumeration<SearchResult> searchUsers( Object key, DirContext context ) + protected NamingEnumeration<SearchResult> searchUsers( String key, DirContext context ) throws NamingException { LdapUserQuery query = new LdapUserQuery(); - query.setUsername( "" + key ); + query.setUsername( key ); return searchUsers( context, null, query ); } @@ -257,12 +257,11 @@ public class DefaultLdapController } /** - * @see org.apache.archiva.redback.users.ldap.ctl.LdapController#getUser(java.lang.Object, javax.naming.directory.DirContext) + * @see org.apache.archiva.redback.users.ldap.ctl.LdapController#getUser(String, javax.naming.directory.DirContext) */ - public LdapUser getUser( Object key, DirContext context ) + public LdapUser getUser( String username, DirContext context ) throws LdapControllerException, MappingException { - String username = key.toString(); log.debug( "Searching for user: {}", username ); diff --git a/redback-users/redback-users-providers/redback-users-ldap/src/main/java/org/apache/archiva/redback/users/ldap/ctl/LdapController.java b/redback-users/redback-users-providers/redback-users-ldap/src/main/java/org/apache/archiva/redback/users/ldap/ctl/LdapController.java index f09ef98da..5fac661fd 100644 --- a/redback-users/redback-users-providers/redback-users-ldap/src/main/java/org/apache/archiva/redback/users/ldap/ctl/LdapController.java +++ b/redback-users/redback-users-providers/redback-users-ldap/src/main/java/org/apache/archiva/redback/users/ldap/ctl/LdapController.java @@ -34,13 +34,13 @@ import java.util.List; public interface LdapController { - void removeUser( Object principal, DirContext context ) + void removeUser( String principal, DirContext context ) throws LdapControllerException; void updateUser( User user, DirContext context ) throws LdapControllerException, MappingException; - boolean userExists( Object key, DirContext context ) + boolean userExists( String key, DirContext context ) throws LdapControllerException; Collection<User> getUsers( DirContext context ) @@ -49,7 +49,7 @@ public interface LdapController void createUser( User user, DirContext context, boolean encodePasswordIfChanged ) throws LdapControllerException, MappingException; - LdapUser getUser( Object key, DirContext context ) + LdapUser getUser( String key, DirContext context ) throws LdapControllerException, MappingException; List<User> getUsersByQuery( LdapUserQuery query, DirContext context ) |