[jboss-cvs] JBossAS SVN: r57577 - 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-11 16:04:33 -0400 (Wed, 11 Oct 2006)
New Revision: 57577

Modified:
   projects/security/trunk/src/main/org/jboss/security/mapping/providers/OptionsRoleMappingProvider.java
   projects/security/trunk/src/main/org/jboss/security/mapping/providers/PrincipalToRoleMappingProvider.java
Log:
make use of the mapping provider util class

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-11 20:03:58 UTC (rev 57576)
+++ projects/security/trunk/src/main/org/jboss/security/mapping/providers/OptionsRoleMappingProvider.java	2006-10-11 20:04:33 UTC (rev 57577)
@@ -5,15 +5,13 @@
  * See terms of license at gnu.org.
  */ 
 package org.jboss.security.mapping.providers;
-
-import java.lang.reflect.Constructor; 
+  
 import java.security.Principal;
 import java.security.acl.Group;
 import java.util.ArrayList;
 import java.util.Enumeration;
 import java.util.Map;
-import java.util.Properties;
-import java.util.StringTokenizer;
+import java.util.Properties; 
 
 import org.jboss.logging.Logger;
 import org.jboss.security.SecurityConstants;
@@ -78,13 +76,13 @@
          String commaSeparatedRoles = roleMapProperties.getProperty(name);
          if(commaSeparatedRoles != null)
          {
-            String[] tokens = getRolesFromCommaSeparatedString(commaSeparatedRoles);
+            String[] tokens = MappingProviderUtil.getRolesFromCommaSeparatedString(commaSeparatedRoles);
             int len = tokens != null ? tokens.length : 0;
             for(int i = 0; i < len; i++)
             {
                if(this.REPLACE_ROLES)
                   removeMembers.add(p); 
-               addMembers.add(instantiatePrincipal(p.getClass(),tokens[i])); 
+               addMembers.add(MappingProviderUtil.instantiatePrincipal(p.getClass(),tokens[i])); 
             }
          } 
       }
@@ -100,33 +98,5 @@
       }
 
       return roles;
-   } 
-   
-   private String[] getRolesFromCommaSeparatedString(String str)
-   {
-      StringTokenizer st = new StringTokenizer(str,",");
-      int numTokens = st != null ? st.countTokens() : 0;
-      String[] tokens = new String[numTokens];
-      for(int i = 0; i < numTokens; i++)
-      {
-         tokens[i] = st.nextToken();
-      }
-      return tokens;
-   }
-   
-   private Principal instantiatePrincipal(Class cls, String role)
-   {
-      Principal p = null;
-      try
-      {
-         Constructor ctr = cls.getConstructor(new Class[] {String.class});
-         p = (Principal)ctr.newInstance(new Object[]{role});
-      }
-      catch (Exception e)
-      {
-         if(log.isTraceEnabled())
-            log.trace("Encountered exception in role mapping:",e);
-      } 
-      return p;
-   }
+   }   
 }

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-11 20:03:58 UTC (rev 57576)
+++ projects/security/trunk/src/main/org/jboss/security/mapping/providers/PrincipalToRoleMappingProvider.java	2006-10-11 20:04:33 UTC (rev 57577)
@@ -20,14 +20,12 @@
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
 package org.jboss.security.mapping.providers;
-
-import java.lang.reflect.Constructor; 
+ 
 import java.security.Principal;
 import java.security.acl.Group; 
 import java.util.Map;
 import java.util.Properties;
-import java.util.Set;
-import java.util.StringTokenizer;
+import java.util.Set; 
 
 import org.jboss.logging.Logger;
 import org.jboss.security.SecurityConstants;
@@ -81,43 +79,13 @@
          String commaSeparatedRoles = principalRoleMapProperties.getProperty(pname);
          if(log.isTraceEnabled())
             log.trace("Principal:"+p.getName()+":roles add="+commaSeparatedRoles);
-         String[] tokens = getRolesFromCommaSeparatedString(commaSeparatedRoles);
+         String[] tokens = MappingProviderUtil.getRolesFromCommaSeparatedString(commaSeparatedRoles);
          int len = tokens != null ? tokens.length : 0;
          for(int i = 0; i < len; i++)
          {
-            roles.addMember(instantiatePrincipal(p.getClass(),tokens[i]));
+            roles.addMember(MappingProviderUtil.instantiatePrincipal(p.getClass(),tokens[i]));
          }
       } 
       return roles;
-   } 
-
-   private String[] getRolesFromCommaSeparatedString(String str)
-   {
-      if(str == null)
-         throw new IllegalArgumentException("str is null");
-      StringTokenizer st = new StringTokenizer(str,",");
-      int numTokens = st != null ? st.countTokens() : 0;
-      String[] tokens = new String[numTokens];
-      for(int i = 0; i < numTokens; i++)
-      {
-         tokens[i] = st.nextToken();
-      }
-      return tokens;
-   }
-
-   private Principal instantiatePrincipal(Class cls, String role)
-   {
-      Principal p = null;
-      try
-      {
-         Constructor ctr = cls.getConstructor(new Class[] {String.class});
-         p = (Principal)ctr.newInstance(new Object[]{role});
-      }
-      catch (Exception e)
-      {
-         if(log.isTraceEnabled())
-            log.trace("Encountered exception in role mapping:",e);
-      } 
-      return p;
-   }
+   }  
 }