svn commit: r1430613 - in /archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-ldap/src/main/java/org/apache/archiva/redback/users/ldap/ctl: DefaultLdapController.java LdapController.java

[olamy]

Author: olamy
Date: Tue Jan  8 22:47:59 2013
New Revision: 1430613

URL: http://svn.apache.org/viewvc?rev=1430613&view=rev
Log:
this parameter is a String not Object

Modified:
    
archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-ldap/src/main/java/org/apache/archiva/redback/users/ldap/ctl/DefaultLdapController.java
    
archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-ldap/src/main/java/org/apache/archiva/redback/users/ldap/ctl/LdapController.java

Modified: 
archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-ldap/src/main/java/org/apache/archiva/redback/users/ldap/ctl/DefaultLdapController.java
URL: 
http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-ldap/src/main/java/org/apache/archiva/redback/users/ldap/ctl/DefaultLdapController.java?rev=1430613&r1=1430612&r2=1430613&view=diff
==============================================================================
--- 
archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-ldap/src/main/java/org/apache/archiva/redback/users/ldap/ctl/DefaultLdapController.java
 (original)
+++ 
archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-ldap/src/main/java/org/apache/archiva/redback/users/ldap/ctl/DefaultLdapController.java
 Tue Jan  8 22:47:59 2013
@@ -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 );
 

Modified: 
archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-ldap/src/main/java/org/apache/archiva/redback/users/ldap/ctl/LdapController.java
URL: 
http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-ldap/src/main/java/org/apache/archiva/redback/users/ldap/ctl/LdapController.java?rev=1430613&r1=1430612&r2=1430613&view=diff
==============================================================================
--- 
archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-ldap/src/main/java/org/apache/archiva/redback/users/ldap/ctl/LdapController.java
 (original)
+++ 
archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-ldap/src/main/java/org/apache/archiva/redback/users/ldap/ctl/LdapController.java
 Tue Jan  8 22:47:59 2013
@@ -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 )