svn commit: r1440552 - in /archiva/redback/redback-core/trunk/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/role: DefaultLdapRoleMapperConfiguration.java LdapRoleMapperConfiguration.java

[ol...@apache.org]

Author: olamy
Date: Wed Jan 30 17:46:43 2013
New Revision: 1440552

URL: http://svn.apache.org/viewvc?rev=1440552&view=rev
Log:
add default in memory implementation for testing purpose

Modified:
    archiva/redback/redback-core/trunk/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/role/DefaultLdapRoleMapperConfiguration.java
    archiva/redback/redback-core/trunk/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/role/LdapRoleMapperConfiguration.java

Modified: archiva/redback/redback-core/trunk/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/role/DefaultLdapRoleMapperConfiguration.java
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/role/DefaultLdapRoleMapperConfiguration.java?rev=1440552&r1=1440551&r2=1440552&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/role/DefaultLdapRoleMapperConfiguration.java (original)
+++ archiva/redback/redback-core/trunk/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/role/DefaultLdapRoleMapperConfiguration.java Wed Jan 30 17:46:43 2013
@@ -31,6 +31,7 @@ import org.springframework.stereotype.Se
 import javax.inject.Inject;
 import javax.inject.Named;
 import java.util.Collection;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -45,6 +46,8 @@ public class DefaultLdapRoleMapperConfig
 
     private Logger log = LoggerFactory.getLogger( getClass() );
 
+    private Map<String, List<String>> ldapMappings = new HashMap<String, List<String>>();
+
     @Inject
     @Named( value = "userConfiguration#default" )
     private UserConfiguration userConf;
@@ -52,24 +55,27 @@ public class DefaultLdapRoleMapperConfig
     public void addLdapMapping( String ldapGroup, List<String> roles )
         throws MappingException
     {
-        log.warn( "addLdapMapping not implemented" );
+        ldapMappings.put( ldapGroup, roles );
+        log.warn( "addLdapMapping implemented but only in memory save" );
     }
 
     public void removeLdapMapping( String group )
     {
-        log.warn( "removeLdapMapping not implemented" );
+        ldapMappings.remove( group );
     }
 
     public void updateLdapMapping( String ldapGroup, List<String> roles )
         throws MappingException
     {
-        log.warn( "removeLdapMapping not implemented" );
+        ldapMappings.put( ldapGroup, roles );
+        log.warn( "updateLdapMapping implemented but only in memory save" );
     }
 
-    public void setLdapGroupMappings( Map<String, Collection<String>> mappings )
+    public void setLdapGroupMappings( Map<String, List<String>> mappings )
         throws MappingException
     {
-        log.warn( "setLdapGroupMappings not implemented" );
+        log.warn( "setLdapGroupMappings implemented but only in memory save" );
+        this.ldapMappings = mappings;
     }
 
     public Map<String, Collection<String>> getLdapGroupMappings()
@@ -92,6 +98,12 @@ public class DefaultLdapRoleMapperConfig
             }
         }
 
-        return map.asMap();
+        for ( Map.Entry<String, List<String>> entry : this.ldapMappings.entrySet() )
+        {
+            map.putAll( entry.getKey(), entry.getValue() );
+        }
+
+        Map<String, Collection<String>> mappings = map.asMap();
+        return mappings;
     }
 }

Modified: archiva/redback/redback-core/trunk/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/role/LdapRoleMapperConfiguration.java
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/role/LdapRoleMapperConfiguration.java?rev=1440552&r1=1440551&r2=1440552&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/role/LdapRoleMapperConfiguration.java (original)
+++ archiva/redback/redback-core/trunk/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/role/LdapRoleMapperConfiguration.java Wed Jan 30 17:46:43 2013
@@ -62,6 +62,6 @@ public interface LdapRoleMapperConfigura
     Map<String, Collection<String>> getLdapGroupMappings()
         throws MappingException;
 
-    void setLdapGroupMappings( Map<String, Collection<String>> mappings )
+    void setLdapGroupMappings( Map<String, List<String>> mappings )
         throws MappingException;
 }