[jboss-cvs] JBossAS SVN: r66941 - in projects/security/security-spi/trunk: authorization/src/main/org/jboss/security/authorization and 6 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Nov 9 15:23:39 EST 2007
Author: anil.saldhana at jboss.com
Date: 2007-11-09 15:23:39 -0500 (Fri, 09 Nov 2007)
New Revision: 66941
Modified:
projects/security/security-spi/trunk/authorization/src/main/org/jboss/security/AuthorizationManager.java
projects/security/security-spi/trunk/authorization/src/main/org/jboss/security/authorization/AuthorizationContext.java
projects/security/security-spi/trunk/authorization/src/main/org/jboss/security/authorization/AuthorizationModule.java
projects/security/security-spi/trunk/authorization/src/main/org/jboss/security/authorization/PolicyRegistration.java
projects/security/security-spi/trunk/authorization/src/main/org/jboss/security/authorization/Resource.java
projects/security/security-spi/trunk/authorization/src/main/org/jboss/security/authorization/ResourceType.java
projects/security/security-spi/trunk/spi/src/main/org/jboss/security/RealmMapping.java
projects/security/security-spi/trunk/spi/src/main/org/jboss/security/SecurityContextFactory.java
projects/security/security-spi/trunk/spi/src/main/org/jboss/security/SecuritySPIActions.java
projects/security/security-spi/trunk/spi/src/main/org/jboss/security/audit/AuditContext.java
projects/security/security-spi/trunk/spi/src/main/org/jboss/security/audit/AuditEvent.java
projects/security/security-spi/trunk/spi/src/main/org/jboss/security/client/SecurityClientFactory.java
projects/security/security-spi/trunk/spi/src/main/org/jboss/security/factories/AuthorizationManagerFactory.java
projects/security/security-spi/trunk/spi/src/main/org/jboss/security/factories/SecurityActions.java
projects/security/security-spi/trunk/spi/src/main/org/jboss/security/identitytrust/IdentityTrustContext.java
projects/security/security-spi/trunk/spi/src/main/org/jboss/security/identitytrust/IdentityTrustModule.java
projects/security/security-spi/trunk/spi/src/main/org/jboss/security/mapping/MappingContext.java
projects/security/security-spi/trunk/spi/src/main/org/jboss/security/mapping/MappingManager.java
projects/security/security-spi/trunk/spi/src/main/org/jboss/security/mapping/MappingProvider.java
Log:
supress warnings
Modified: projects/security/security-spi/trunk/authorization/src/main/org/jboss/security/AuthorizationManager.java
===================================================================
--- projects/security/security-spi/trunk/authorization/src/main/org/jboss/security/AuthorizationManager.java 2007-11-09 20:22:58 UTC (rev 66940)
+++ projects/security/security-spi/trunk/authorization/src/main/org/jboss/security/AuthorizationManager.java 2007-11-09 20:23:39 UTC (rev 66941)
@@ -48,7 +48,7 @@
* @return
* @throws AuthorizationException
*/
- public int authorize(Resource resource) throws AuthorizationException;
+ public int authorize(final Resource resource) throws AuthorizationException;
/** Validates the application domain roles to which the operational
@@ -59,14 +59,14 @@
@return true if the principal has at least one of the roles in the roles set,
false otherwise.
*/
- public boolean doesUserHaveRole(Principal principal, Set roles);
+ public boolean doesUserHaveRole(Principal principal, Set<Principal> roles);
/** Return the set of domain roles the principal has been assigned.
@return The Set<Principal> for the application domain roles that the
principal has been assigned.
*/
- public Set getUserRoles(Principal principal);
+ public Set<Principal> getUserRoles(Principal principal);
/**
* Trust usecases may have a need to determine the roles of the target
@@ -79,5 +79,5 @@
* implementation in determining the roles.
* @return roles from the target domain
*/
- public Group getTargetRoles(Principal targetPrincipal, Map contextMap);
- }
+ public Group getTargetRoles(Principal targetPrincipal, Map<String,Object> contextMap);
+ }
\ No newline at end of file
Modified: projects/security/security-spi/trunk/authorization/src/main/org/jboss/security/authorization/AuthorizationContext.java
===================================================================
--- projects/security/security-spi/trunk/authorization/src/main/org/jboss/security/authorization/AuthorizationContext.java 2007-11-09 20:22:58 UTC (rev 66940)
+++ projects/security/security-spi/trunk/authorization/src/main/org/jboss/security/authorization/AuthorizationContext.java 2007-11-09 20:23:39 UTC (rev 66941)
@@ -27,6 +27,8 @@
import java.util.Map;
import javax.security.auth.Subject;
import javax.security.auth.callback.CallbackHandler;
+
+import org.jboss.security.config.ControlFlag;
//$Id: AuthorizationContext.java 62954 2007-05-10 04:12:18Z anil.saldhana at jboss.com $
@@ -52,14 +54,14 @@
protected String securityDomainName = null;
protected CallbackHandler callbackHandler = null;
protected Subject authenticatedSubject = null;
- protected Map sharedState = new HashMap();
+ protected Map<String,Object> sharedState = new HashMap<String,Object>();
protected List<AuthorizationModule> modules = new ArrayList<AuthorizationModule>();
/**
* Control Flags for the individual modules
*/
- protected ArrayList controlFlags = new ArrayList();
+ protected List<ControlFlag> controlFlags = new ArrayList<ControlFlag>();
public static final int PERMIT = 1;
public static final int DENY = -1;
@@ -71,4 +73,4 @@
* @throws AuthorizationException
*/
public abstract int authorize(final Resource resource) throws AuthorizationException;
-}
+}
\ No newline at end of file
Modified: projects/security/security-spi/trunk/authorization/src/main/org/jboss/security/authorization/AuthorizationModule.java
===================================================================
--- projects/security/security-spi/trunk/authorization/src/main/org/jboss/security/authorization/AuthorizationModule.java 2007-11-09 20:22:58 UTC (rev 66940)
+++ projects/security/security-spi/trunk/authorization/src/main/org/jboss/security/authorization/AuthorizationModule.java 2007-11-09 20:23:39 UTC (rev 66941)
@@ -61,7 +61,7 @@
* for this particular module
*/
void initialize(Subject subject, CallbackHandler handler,
- Map sharedState, Map options);
+ Map<String,Object> sharedState, Map<String,Object> options);
/**
* Authorize the resource
Modified: projects/security/security-spi/trunk/authorization/src/main/org/jboss/security/authorization/PolicyRegistration.java
===================================================================
--- projects/security/security-spi/trunk/authorization/src/main/org/jboss/security/authorization/PolicyRegistration.java 2007-11-09 20:22:58 UTC (rev 66940)
+++ projects/security/security-spi/trunk/authorization/src/main/org/jboss/security/authorization/PolicyRegistration.java 2007-11-09 20:23:39 UTC (rev 66941)
@@ -63,5 +63,5 @@
* @param contextMap A map that can be used by the implementation
* to determine the policy choice (typically null)
*/
- Object getPolicy(String contextID, Map contextMap);
+ Object getPolicy(String contextID, Map<String,Object> contextMap);
}
Modified: projects/security/security-spi/trunk/authorization/src/main/org/jboss/security/authorization/Resource.java
===================================================================
--- projects/security/security-spi/trunk/authorization/src/main/org/jboss/security/authorization/Resource.java 2007-11-09 20:22:58 UTC (rev 66940)
+++ projects/security/security-spi/trunk/authorization/src/main/org/jboss/security/authorization/Resource.java 2007-11-09 20:23:39 UTC (rev 66941)
@@ -37,5 +37,5 @@
public ResourceType getLayer();
//Return the contextual map
- public Map getMap();
+ public Map<String,Object> getMap();
}
Modified: projects/security/security-spi/trunk/authorization/src/main/org/jboss/security/authorization/ResourceType.java
===================================================================
--- projects/security/security-spi/trunk/authorization/src/main/org/jboss/security/authorization/ResourceType.java 2007-11-09 20:22:58 UTC (rev 66940)
+++ projects/security/security-spi/trunk/authorization/src/main/org/jboss/security/authorization/ResourceType.java 2007-11-09 20:23:39 UTC (rev 66941)
@@ -31,5 +31,5 @@
*/
public enum ResourceType
{
- WEB,EJB;
+ WEB,EJB,ACL;
}
Modified: projects/security/security-spi/trunk/spi/src/main/org/jboss/security/RealmMapping.java
===================================================================
--- projects/security/security-spi/trunk/spi/src/main/org/jboss/security/RealmMapping.java 2007-11-09 20:22:58 UTC (rev 66940)
+++ projects/security/security-spi/trunk/spi/src/main/org/jboss/security/RealmMapping.java 2007-11-09 20:23:39 UTC (rev 66941)
@@ -53,11 +53,11 @@
@return true if the principal has at least one of the roles in the roles set,
false otherwise.
*/
- public boolean doesUserHaveRole(Principal principal, Set roles);
+ public boolean doesUserHaveRole(Principal principal, Set<Principal> roles);
/** Return the set of domain roles the principal has been assigned.
@return The Set<Principal> for the application domain roles that the
principal has been assigned.
*/
- public Set getUserRoles(Principal principal);
-}
+ public Set<Principal> getUserRoles(Principal principal);
+}
\ No newline at end of file
Modified: projects/security/security-spi/trunk/spi/src/main/org/jboss/security/SecurityContextFactory.java
===================================================================
--- projects/security/security-spi/trunk/spi/src/main/org/jboss/security/SecurityContextFactory.java 2007-11-09 20:22:58 UTC (rev 66940)
+++ projects/security/security-spi/trunk/spi/src/main/org/jboss/security/SecurityContextFactory.java 2007-11-09 20:23:39 UTC (rev 66941)
@@ -65,9 +65,9 @@
throw new IllegalArgumentException("securityDomain is null");
if(fqnClass == null)
throw new IllegalArgumentException("fqnClass is null");
- Class clazz = getContextClass(fqnClass);
+ Class<SecurityContext> clazz = getContextClass(fqnClass);
//Get the CTR
- Constructor ctr = clazz.getConstructor(new Class[]{String.class});
+ Constructor<SecurityContext> ctr = clazz.getConstructor(new Class[]{String.class});
return (SecurityContext) ctr.newInstance(new Object[]{securityDomain});
}
@@ -115,9 +115,9 @@
*/
public static SecurityContextUtil createUtil(SecurityContext sc) throws Exception
{
- Class clazz = getContextClass(defaultUtilClass);
+ Class<SecurityContext> clazz = getContextClass(defaultUtilClass);
//Get the CTR
- Constructor ctr = clazz.getConstructor(new Class[]{SecurityContext.class});
+ Constructor<SecurityContext> ctr = clazz.getConstructor(new Class[]{SecurityContext.class});
return (SecurityContextUtil) ctr.newInstance(new Object[]{sc});
}
@@ -129,15 +129,16 @@
*/
public static SecurityContextUtil createUtil(SecurityContext sc, String utilFQN) throws Exception
{
- Class clazz = getContextClass(utilFQN);
+ Class<SecurityContext> clazz = getContextClass(utilFQN);
//Get the CTR
- Constructor ctr = clazz.getConstructor(new Class[]{SecurityContext.class});
+ Constructor<SecurityContext> ctr = clazz.getConstructor(new Class[]{SecurityContext.class});
return (SecurityContextUtil) ctr.newInstance(new Object[]{sc});
}
- private static Class getContextClass(String className) throws Exception
+ @SuppressWarnings("unchecked")
+ private static Class<SecurityContext> getContextClass(String className) throws Exception
{
ClassLoader tcl = SecuritySPIActions.getContextClassLoader();
- return tcl.loadClass(className);
+ return (Class<SecurityContext>) tcl.loadClass(className);
}
-}
+}
\ No newline at end of file
Modified: projects/security/security-spi/trunk/spi/src/main/org/jboss/security/SecuritySPIActions.java
===================================================================
--- projects/security/security-spi/trunk/spi/src/main/org/jboss/security/SecuritySPIActions.java 2007-11-09 20:22:58 UTC (rev 66940)
+++ projects/security/security-spi/trunk/spi/src/main/org/jboss/security/SecuritySPIActions.java 2007-11-09 20:23:39 UTC (rev 66941)
@@ -32,6 +32,7 @@
*/
class SecuritySPIActions
{
+ @SuppressWarnings("unchecked")
static ClassLoader getContextClassLoader()
{
return (ClassLoader) AccessController.doPrivileged( new PrivilegedAction()
@@ -42,4 +43,4 @@
}
});
}
-}
+}
\ No newline at end of file
Modified: projects/security/security-spi/trunk/spi/src/main/org/jboss/security/audit/AuditContext.java
===================================================================
--- projects/security/security-spi/trunk/spi/src/main/org/jboss/security/audit/AuditContext.java 2007-11-09 20:22:58 UTC (rev 66940)
+++ projects/security/security-spi/trunk/spi/src/main/org/jboss/security/audit/AuditContext.java 2007-11-09 20:23:39 UTC (rev 66941)
@@ -55,7 +55,7 @@
providerList.add(ap);
}
- public void addProviders(List list)
+ public void addProviders(List<AuditProvider> list)
{
providerList.addAll(list);
}
@@ -65,10 +65,9 @@
return providerList;
}
- public void replaceProviders(List list)
+ public void replaceProviders(List<AuditProvider> list)
{
providerList.clear();
providerList = list;
- }
-
-}
+ }
+}
\ No newline at end of file
Modified: projects/security/security-spi/trunk/spi/src/main/org/jboss/security/audit/AuditEvent.java
===================================================================
--- projects/security/security-spi/trunk/spi/src/main/org/jboss/security/audit/AuditEvent.java 2007-11-09 20:22:58 UTC (rev 66940)
+++ projects/security/security-spi/trunk/spi/src/main/org/jboss/security/audit/AuditEvent.java 2007-11-09 20:23:39 UTC (rev 66941)
@@ -55,7 +55,7 @@
* Get the Contextual Map
* @return Map that is final
*/
- public Map getContextMap()
+ public Map<String,Object> getContextMap()
{
return contextMap;
}
@@ -100,6 +100,7 @@
* the context map
* @return
*/
+ @SuppressWarnings("unchecked")
private String dissectContextMap()
{
StringBuilder sbu = new StringBuilder();
@@ -116,7 +117,7 @@
}
if(obj instanceof Collection)
{
- Collection coll = (Collection)obj;
+ Collection<Object> coll = (Collection<Object>)obj;
for(Object o:coll)
{
sbu.append(o).append(";");
@@ -128,4 +129,4 @@
}
return sbu.toString();
}
-}
+}
\ No newline at end of file
Modified: projects/security/security-spi/trunk/spi/src/main/org/jboss/security/client/SecurityClientFactory.java
===================================================================
--- projects/security/security-spi/trunk/spi/src/main/org/jboss/security/client/SecurityClientFactory.java 2007-11-09 20:22:58 UTC (rev 66940)
+++ projects/security/security-spi/trunk/spi/src/main/org/jboss/security/client/SecurityClientFactory.java 2007-11-09 20:23:39 UTC (rev 66941)
@@ -77,6 +77,7 @@
return (SecurityClient) ctr.newInstance(new Object[]{});
}
+ @SuppressWarnings("unchecked")
private static SecurityClient getSC(final String client) throws PrivilegedActionException
{
return (SecurityClient)AccessController.doPrivileged(new PrivilegedExceptionAction()
@@ -88,4 +89,4 @@
}
});
}
-}
+}
\ No newline at end of file
Modified: projects/security/security-spi/trunk/spi/src/main/org/jboss/security/factories/AuthorizationManagerFactory.java
===================================================================
--- projects/security/security-spi/trunk/spi/src/main/org/jboss/security/factories/AuthorizationManagerFactory.java 2007-11-09 20:22:58 UTC (rev 66940)
+++ projects/security/security-spi/trunk/spi/src/main/org/jboss/security/factories/AuthorizationManagerFactory.java 2007-11-09 20:23:39 UTC (rev 66941)
@@ -37,6 +37,7 @@
{
private static String fqn = "org.jboss.security.plugins.JBossAuthorizationManager";
+ @SuppressWarnings("unchecked")
public static AuthorizationManager getAuthorizationManager(String securityDomain)
throws Exception
{
Modified: projects/security/security-spi/trunk/spi/src/main/org/jboss/security/factories/SecurityActions.java
===================================================================
--- projects/security/security-spi/trunk/spi/src/main/org/jboss/security/factories/SecurityActions.java 2007-11-09 20:22:58 UTC (rev 66940)
+++ projects/security/security-spi/trunk/spi/src/main/org/jboss/security/factories/SecurityActions.java 2007-11-09 20:23:39 UTC (rev 66941)
@@ -35,6 +35,7 @@
*/
class SecurityActions
{
+ @SuppressWarnings("unchecked")
static ClassLoader getContextClassLoader() throws PrivilegedActionException
{
return (ClassLoader) AccessController.doPrivileged(new PrivilegedExceptionAction()
@@ -46,14 +47,15 @@
});
}
- static Class loadClass(final String fqn) throws PrivilegedActionException
+ @SuppressWarnings("unchecked")
+ static Class<Object> loadClass(final String fqn) throws PrivilegedActionException
{
return (Class) AccessController.doPrivileged(new PrivilegedExceptionAction()
{
public Object run() throws Exception
{
- ClassLoader tcl = Thread.currentThread().getContextClassLoader();
- return tcl.loadClass(fqn);
+ ClassLoader tcl = Thread.currentThread().getContextClassLoader();
+ return tcl.loadClass(fqn);
}
});
}
Modified: projects/security/security-spi/trunk/spi/src/main/org/jboss/security/identitytrust/IdentityTrustContext.java
===================================================================
--- projects/security/security-spi/trunk/spi/src/main/org/jboss/security/identitytrust/IdentityTrustContext.java 2007-11-09 20:22:58 UTC (rev 66940)
+++ projects/security/security-spi/trunk/spi/src/main/org/jboss/security/identitytrust/IdentityTrustContext.java 2007-11-09 20:23:39 UTC (rev 66941)
@@ -61,7 +61,7 @@
/**
* Shared State between trust modules
*/
- protected Map sharedState = new HashMap();
+ protected Map<String,Object> sharedState = new HashMap<String,Object>();
/**
* Security Domain of the Identity Trust Context
@@ -76,7 +76,7 @@
/**
* Control Flags for the individual modules
*/
- protected ArrayList controlFlags = new ArrayList();
+ protected ArrayList<Object> controlFlags = new ArrayList<Object>();
/**
* Make a trust decision
@@ -85,4 +85,4 @@
* @throws IdentityTrustException
*/
public abstract TrustDecision isTrusted() throws IdentityTrustException;
-}
+}
\ No newline at end of file
Modified: projects/security/security-spi/trunk/spi/src/main/org/jboss/security/identitytrust/IdentityTrustModule.java
===================================================================
--- projects/security/security-spi/trunk/spi/src/main/org/jboss/security/identitytrust/IdentityTrustModule.java 2007-11-09 20:22:58 UTC (rev 66940)
+++ projects/security/security-spi/trunk/spi/src/main/org/jboss/security/identitytrust/IdentityTrustModule.java 2007-11-09 20:23:39 UTC (rev 66941)
@@ -63,7 +63,7 @@
* @throws IdentityTrustException
*/
void initialize(SecurityContext securityContext, CallbackHandler handler,
- Map sharedState, Map options) throws IdentityTrustException;
+ Map<String,Object> sharedState, Map<String,Object> options) throws IdentityTrustException;
/**
* Make the trust decision
@@ -72,4 +72,4 @@
* @throws IdentityTrustException
*/
TrustDecision isTrusted() throws IdentityTrustException;
-}
+}
\ No newline at end of file
Modified: projects/security/security-spi/trunk/spi/src/main/org/jboss/security/mapping/MappingContext.java
===================================================================
--- projects/security/security-spi/trunk/spi/src/main/org/jboss/security/mapping/MappingContext.java 2007-11-09 20:22:58 UTC (rev 66940)
+++ projects/security/security-spi/trunk/spi/src/main/org/jboss/security/mapping/MappingContext.java 2007-11-09 20:23:39 UTC (rev 66941)
@@ -19,10 +19,10 @@
*/
public class MappingContext<T>
{
- private List modules = new ArrayList();
- private MappingResult result;
+ private List<MappingProvider<T>> modules = new ArrayList<MappingProvider<T>>();
+ private MappingResult<T> result;
- public MappingContext(List mod)
+ public MappingContext(List<MappingProvider<T>> mod)
{
this.modules = mod;
}
@@ -31,17 +31,17 @@
* Get the set of mapping modules
* @return
*/
- public List getModules()
+ public List<MappingProvider<T>> getModules()
{
return this.modules;
}
/**
* Apply mapping semantics on the passed object
- * @param obj Read-only Contextual Map
+ * @param contextMap Read-only Contextual Map
* @param mappedObject an object on which mapping will be applied
*/
- public void performMapping(Map obj, T mappedObject)
+ public void performMapping(Map<String,Object> contextMap, T mappedObject)
{
int len = modules.size();
@@ -51,11 +51,11 @@
{
MappingProvider<T> mp = (MappingProvider<T>)modules.get(i);
mp.setMappingResult(result);
- mp.performMapping(obj, mappedObject);
+ mp.performMapping(contextMap, mappedObject);
}
}
- public MappingResult getMappingResult()
+ public MappingResult<T> getMappingResult()
{
return result;
}
Modified: projects/security/security-spi/trunk/spi/src/main/org/jboss/security/mapping/MappingManager.java
===================================================================
--- projects/security/security-spi/trunk/spi/src/main/org/jboss/security/mapping/MappingManager.java 2007-11-09 20:22:58 UTC (rev 66940)
+++ projects/security/security-spi/trunk/spi/src/main/org/jboss/security/mapping/MappingManager.java 2007-11-09 20:23:39 UTC (rev 66941)
@@ -29,7 +29,7 @@
* @since Mar 9, 2007
* @version $Revision$
*/
-public interface MappingManager extends BaseSecurityManager
+public interface MappingManager<T> extends BaseSecurityManager
{
- MappingContext getMappingContext(Class mappingType);
+ MappingContext<T> getMappingContext(Class<T> mappingType);
}
\ No newline at end of file
Modified: projects/security/security-spi/trunk/spi/src/main/org/jboss/security/mapping/MappingProvider.java
===================================================================
--- projects/security/security-spi/trunk/spi/src/main/org/jboss/security/mapping/MappingProvider.java 2007-11-09 20:22:58 UTC (rev 66940)
+++ projects/security/security-spi/trunk/spi/src/main/org/jboss/security/mapping/MappingProvider.java 2007-11-09 20:23:39 UTC (rev 66941)
@@ -21,7 +21,7 @@
* Initialize the provider with the configured module options
* @param options
*/
- void init(Map options);
+ void init(Map<String,Object> options);
/**
* Map the passed object
@@ -30,11 +30,11 @@
* @throws IllegalArgumentException if the mappedObject is not understood by the
* provider.
*/
- void performMapping(Map map, T mappedObject);
+ void performMapping(Map<String,Object> map, T mappedObject);
/**
* Injected by the MappingContext
* @param result
*/
- void setMappingResult(MappingResult result);
+ void setMappingResult(MappingResult<T> result);
}
\ No newline at end of file
More information about the jboss-cvs-commits
mailing list