svn commit: r1428613 - /archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-providers/redback-rbac-ldap/src/main/java/org/apache/archiva/redback/rbac/ldap/DefaultLdapRoleMapper.java

[olamy]

Author: olamy
Date: Thu Jan  3 21:43:12 2013
New Revision: 1428613

URL: http://svn.apache.org/viewvc?rev=1428613&view=rev
Log:
remove commented code
caching will be in LdapRbacManager.

Modified:
    
archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-providers/redback-rbac-ldap/src/main/java/org/apache/archiva/redback/rbac/ldap/DefaultLdapRoleMapper.java

Modified: 
archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-providers/redback-rbac-ldap/src/main/java/org/apache/archiva/redback/rbac/ldap/DefaultLdapRoleMapper.java
URL: 
http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-providers/redback-rbac-ldap/src/main/java/org/apache/archiva/redback/rbac/ldap/DefaultLdapRoleMapper.java?rev=1428613&r1=1428612&r2=1428613&view=diff
==============================================================================
--- 
archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-providers/redback-rbac-ldap/src/main/java/org/apache/archiva/redback/rbac/ldap/DefaultLdapRoleMapper.java
 (original)
+++ 
archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-providers/redback-rbac-ldap/src/main/java/org/apache/archiva/redback/rbac/ldap/DefaultLdapRoleMapper.java
 Thu Jan  3 21:43:12 2013
@@ -89,7 +89,6 @@ public class DefaultLdapRoleMapper
     public List<String> getAllGroups()
         throws MappingException
     {
-        // TODO caching
         LdapConnection ldapConnection = null;
 
         NamingEnumeration<SearchResult> namingEnumeration = null;
@@ -158,7 +157,6 @@ public class DefaultLdapRoleMapper
     public List<String> getGroupsMember( String group )
         throws MappingException
     {
-        // TODO caching
         LdapConnection ldapConnection = null;
 
         NamingEnumeration<SearchResult> namingEnumeration = null;
@@ -228,20 +226,6 @@ public class DefaultLdapRoleMapper
     public List<String> getGroups( String username )
         throws MappingException
     {
-        // TODO caching and a filter with uid
-
-        /*List<String> allGroups = getAllGroups();
-        List<String> userGroups = new ArrayList<String>();
-        for ( String group : allGroups )
-        {
-            List<String> users = getGroupsMember( group );
-            if ( users.contains( username ) )
-            {
-                userGroups.add( group );
-            }
-        }
-        return userGroups;
-        */
 
         List<String> userGroups = new ArrayList<String>();
 
@@ -285,8 +269,6 @@ public class DefaultLdapRoleMapper
                         // uid=blabla we only want bla bla
                         userName = StringUtils.substringAfter( userName, "=" );
                         userName = StringUtils.substringBefore( userName, "," 
);
-                        //log.debug( "found group for username {}: '{}", 
group, userName );
-
                         allMembers.add( userName );
                     }
                     close( allMembersEnum );