[jboss-cvs] JBossAS SVN: r68318 - projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/plugins.

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

Author: anil.saldhana at jboss.com
Date: 2007-12-15 15:09:14 -0500 (Sat, 15 Dec 2007)
New Revision: 68318

Modified:
   projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/plugins/JBossAuthorizationManager.java
Log:
genericize collections

Modified: projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/plugins/JBossAuthorizationManager.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/plugins/JBossAuthorizationManager.java	2007-12-15 19:59:09 UTC (rev 68317)
+++ projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/plugins/JBossAuthorizationManager.java	2007-12-15 20:09:14 UTC (rev 68318)
@@ -75,7 +75,7 @@
 {  
    private String securityDomain; 
    
-   private Map contextIdToPolicy = new HashMap(); 
+   private Map<String,Policy> contextIdToPolicy = new HashMap<String,Policy>(); 
    
    private static Logger log = Logger.getLogger(JBossAuthorizationManager.class);
    
@@ -142,7 +142,7 @@
          log.trace("doesUserHaveRole(Set), roles: "+roles);
       if(roles != null)
       {
-         Iterator iter = rolePrincipals.iterator();
+         Iterator<Principal> iter = rolePrincipals.iterator();
          while( hasRole == false && iter.hasNext() )
          {
             Principal role = (Principal) iter.next();
@@ -297,13 +297,13 @@
    }  
 
    //Private Methods
-   private HashSet getRolesAsSet(Group roles)
+   private HashSet<Principal> getRolesAsSet(Group roles)
    {
-      HashSet userRoles = null;
+      HashSet<Principal> userRoles = null;
       if( roles != null )
       {
-         userRoles = new HashSet();
-         Enumeration members = roles.members();
+         userRoles = new HashSet<Principal>();
+         Enumeration<? extends Principal> members = roles.members();
          while( members.hasMoreElements() )
          {
             Principal role = (Principal) members.nextElement();
@@ -358,7 +358,7 @@
          Group mappedUserRoles = userRoles;
          if(mc != null)
          {
-            Map contextMap = new HashMap();
+            Map<String,Object> contextMap = new HashMap<String,Object>();
             contextMap.put(SecurityConstants.ROLES_IDENTIFIER, userRoles);
             contextMap.put(SecurityConstants.PRINCIPAL_IDENTIFIER, principal);
             //Append any deployment role->principals configuration done by the user
@@ -394,7 +394,7 @@
          return source;
       if(source == null && toCopy != null) 
          source = new SimpleGroup(SecurityConstants.ROLES_IDENTIFIER);
-      Enumeration en = toCopy.members();
+      Enumeration<? extends Principal> en = toCopy.members();
       while(en.hasMoreElements())
       {
          source.addMember((Principal)en.nextElement());
@@ -406,7 +406,7 @@
    /**
     * @see AuthorizationManager#getTargetRoles(Principal, Map)
     */
-   public Group getTargetRoles(Principal targetPrincipal, Map contextMap)
+   public Group getTargetRoles(Principal targetPrincipal, Map<String,Object> contextMap)
    {
       throw new RuntimeException("Not implemented");
    }
@@ -420,8 +420,8 @@
    {
       if(theSubject == null)
          throw new IllegalArgumentException("Subject is null");
-      Set subjectGroups = theSubject.getPrincipals(Group.class);
-      Iterator iter = subjectGroups.iterator();
+      Set<Group> subjectGroups = theSubject.getPrincipals(Group.class);
+      Iterator<Group> iter = subjectGroups.iterator();
       Group roles = null;
       while( iter.hasNext() )
       {
@@ -438,4 +438,4 @@
    { 
       return null;
    } 
-}
+}
\ No newline at end of file