[jboss-cvs] JBossAS SVN: r57954 - in projects/security/trunk/src/main/org/jboss/security/mapping: . providers

[jboss-cvs-commits at lists.jboss.org]

Author: anil.saldhana at jboss.com
Date: 2006-10-31 16:45:59 -0500 (Tue, 31 Oct 2006)
New Revision: 57954

Modified:
   projects/security/trunk/src/main/org/jboss/security/mapping/MappingContext.java
   projects/security/trunk/src/main/org/jboss/security/mapping/MappingProvider.java
   projects/security/trunk/src/main/org/jboss/security/mapping/providers/OptionsRoleMappingProvider.java
   projects/security/trunk/src/main/org/jboss/security/mapping/providers/PolicyContextIdRoleMappingProvider.java
   projects/security/trunk/src/main/org/jboss/security/mapping/providers/PrincipalToRoleMappingProvider.java
Log:
Allow multiple mapping providers to work on the object that needs to be mapped

Modified: projects/security/trunk/src/main/org/jboss/security/mapping/MappingContext.java
===================================================================
--- projects/security/trunk/src/main/org/jboss/security/mapping/MappingContext.java	2006-10-31 21:40:26 UTC (rev 57953)
+++ projects/security/trunk/src/main/org/jboss/security/mapping/MappingContext.java	2006-10-31 21:45:59 UTC (rev 57954)
@@ -27,20 +27,17 @@
    
    /**
     * Apply mapping semantics on the passed object
-    * @param obj Generic Object
-    * @return Mapped Object
+    * @param obj Read-only Contextual Map
+    * @param mappedObject an object on which mapping will be applied 
     */
-   public Object performMapping(Map obj)
+   public void performMapping(Map obj, Object mappedObject)
    {
-      int len = modules.size();
-      Object returnObj = null;
+      int len = modules.size(); 
       
       for(int i = 0 ; i < len; i++)
       {
          MappingProvider mp = (MappingProvider)modules.get(i);
-         returnObj = mp.performMapping(obj);
-      }
-      
-      return returnObj; 
+         mp.performMapping(obj, mappedObject);
+      } 
    } 
 }

Modified: projects/security/trunk/src/main/org/jboss/security/mapping/MappingProvider.java
===================================================================
--- projects/security/trunk/src/main/org/jboss/security/mapping/MappingProvider.java	2006-10-31 21:40:26 UTC (rev 57953)
+++ projects/security/trunk/src/main/org/jboss/security/mapping/MappingProvider.java	2006-10-31 21:45:59 UTC (rev 57954)
@@ -24,8 +24,10 @@
    
    /**
     * Map the passed object
-    * @param map A contextual map that can provide information to the provider
-    * @return mapped result
+    * @param map A read-only contextual map that can provide information to the provider
+    * @param mappedObject an Object on which the mapping will be applied 
+    * @throws IllegalArgumentException if the mappedObject is not understood by the 
+    * provider.
     */
-   Object performMapping(Map map);
+   void performMapping(Map map, Object mappedObject);
 }

Modified: projects/security/trunk/src/main/org/jboss/security/mapping/providers/OptionsRoleMappingProvider.java
===================================================================
--- projects/security/trunk/src/main/org/jboss/security/mapping/providers/OptionsRoleMappingProvider.java	2006-10-31 21:40:26 UTC (rev 57953)
+++ projects/security/trunk/src/main/org/jboss/security/mapping/providers/OptionsRoleMappingProvider.java	2006-10-31 21:45:59 UTC (rev 57954)
@@ -58,7 +58,7 @@
      } 
    }
 
-   public Object performMapping(Map contextMap)
+   public void performMapping(Map contextMap, Object mappedObject)
    { 
       ArrayList<Principal> removeMembers = new ArrayList<Principal>();
       ArrayList<Principal> addMembers = new ArrayList<Principal>();
@@ -97,6 +97,6 @@
          roles.addMember(p);
       }
 
-      return roles;
+      mappedObject = roles; 
    }   
 }

Modified: projects/security/trunk/src/main/org/jboss/security/mapping/providers/PolicyContextIdRoleMappingProvider.java
===================================================================
--- projects/security/trunk/src/main/org/jboss/security/mapping/providers/PolicyContextIdRoleMappingProvider.java	2006-10-31 21:40:26 UTC (rev 57953)
+++ projects/security/trunk/src/main/org/jboss/security/mapping/providers/PolicyContextIdRoleMappingProvider.java	2006-10-31 21:45:59 UTC (rev 57954)
@@ -85,7 +85,7 @@
       }
    }
 
-   public Object performMapping(Map contextMap)
+   public void performMapping(Map contextMap, Object mappedObject)
    { 
       ArrayList <Principal> tempPrincipalList = new ArrayList<Principal>();
       
@@ -146,7 +146,7 @@
               log.trace("Exception:",e);
         }
       } 
-      return roles;
+      mappedObject = roles;
    } 
    
    private Properties loadProperties(String filename) throws IOException

Modified: projects/security/trunk/src/main/org/jboss/security/mapping/providers/PrincipalToRoleMappingProvider.java
===================================================================
--- projects/security/trunk/src/main/org/jboss/security/mapping/providers/PrincipalToRoleMappingProvider.java	2006-10-31 21:40:26 UTC (rev 57953)
+++ projects/security/trunk/src/main/org/jboss/security/mapping/providers/PrincipalToRoleMappingProvider.java	2006-10-31 21:45:59 UTC (rev 57954)
@@ -63,7 +63,7 @@
       } 
    }
 
-   public Object performMapping(Map contextMap)
+   public void performMapping(Map contextMap, Object mappedObject)
    {  
       Group roles = (Group)contextMap.get(SecurityConstants.ROLES_IDENTIFIER);
       if(roles == null)
@@ -86,6 +86,6 @@
             roles.addMember(MappingProviderUtil.instantiatePrincipal(p.getClass(),tokens[i]));
          }
       } 
-      return roles;
+      mappedObject = roles;
    }  
 }