[jboss-cvs] JBossAS SVN: r70048 - in projects/security/security-xacml/trunk/jboss-xacml/src/main/org/jboss/security/xacml: core and 2 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Feb 22 23:34:13 EST 2008
Author: anil.saldhana at jboss.com
Date: 2008-02-22 23:34:13 -0500 (Fri, 22 Feb 2008)
New Revision: 70048
Modified:
projects/security/security-xacml/trunk/jboss-xacml/src/main/org/jboss/security/xacml/bridge/PolicySetFinderModule.java
projects/security/security-xacml/trunk/jboss-xacml/src/main/org/jboss/security/xacml/core/JBossPDP.java
projects/security/security-xacml/trunk/jboss-xacml/src/main/org/jboss/security/xacml/core/JBossRequestContext.java
projects/security/security-xacml/trunk/jboss-xacml/src/main/org/jboss/security/xacml/core/JBossResponseContext.java
projects/security/security-xacml/trunk/jboss-xacml/src/main/org/jboss/security/xacml/core/JBossXACMLPolicy.java
projects/security/security-xacml/trunk/jboss-xacml/src/main/org/jboss/security/xacml/core/SecurityActions.java
projects/security/security-xacml/trunk/jboss-xacml/src/main/org/jboss/security/xacml/factories/PolicyFactory.java
projects/security/security-xacml/trunk/jboss-xacml/src/main/org/jboss/security/xacml/locators/AbstractJBossPolicyLocator.java
projects/security/security-xacml/trunk/jboss-xacml/src/main/org/jboss/security/xacml/locators/JBossPolicyLocator.java
projects/security/security-xacml/trunk/jboss-xacml/src/main/org/jboss/security/xacml/locators/JBossPolicySetLocator.java
Log:
generics type
Modified: projects/security/security-xacml/trunk/jboss-xacml/src/main/org/jboss/security/xacml/bridge/PolicySetFinderModule.java
===================================================================
--- projects/security/security-xacml/trunk/jboss-xacml/src/main/org/jboss/security/xacml/bridge/PolicySetFinderModule.java 2008-02-23 04:33:56 UTC (rev 70047)
+++ projects/security/security-xacml/trunk/jboss-xacml/src/main/org/jboss/security/xacml/bridge/PolicySetFinderModule.java 2008-02-23 04:34:13 UTC (rev 70048)
@@ -94,7 +94,7 @@
// see if we previously found another match
if (selectedPolicy != null) {
// we found a match before, so this is an error
- ArrayList code = new ArrayList();
+ ArrayList<String> code = new ArrayList<String>();
code.add(Status.STATUS_PROCESSING_ERROR);
Status status = new Status(code, "too many applicable "
+ "top-level policies");
Modified: projects/security/security-xacml/trunk/jboss-xacml/src/main/org/jboss/security/xacml/core/JBossPDP.java
===================================================================
--- projects/security/security-xacml/trunk/jboss-xacml/src/main/org/jboss/security/xacml/core/JBossPDP.java 2008-02-23 04:33:56 UTC (rev 70047)
+++ projects/security/security-xacml/trunk/jboss-xacml/src/main/org/jboss/security/xacml/core/JBossPDP.java 2008-02-23 04:34:13 UTC (rev 70048)
@@ -195,6 +195,7 @@
/**
* @see PolicyDecisionPoint#evaluate(RequestContext)
*/
+ @SuppressWarnings("unchecked")
public ResponseContext evaluate(RequestContext request)
{
HashSet<PolicyFinderModule> policyModules = new HashSet<PolicyFinderModule>();
@@ -304,7 +305,7 @@
return is;
}
- private Class loadClass(String fqn) throws Exception
+ private Class<?> loadClass(String fqn) throws Exception
{
ClassLoader tcl = SecurityActions.getContextClassLoader();
return tcl.loadClass(fqn);
Modified: projects/security/security-xacml/trunk/jboss-xacml/src/main/org/jboss/security/xacml/core/JBossRequestContext.java
===================================================================
--- projects/security/security-xacml/trunk/jboss-xacml/src/main/org/jboss/security/xacml/core/JBossRequestContext.java 2008-02-23 04:33:56 UTC (rev 70047)
+++ projects/security/security-xacml/trunk/jboss-xacml/src/main/org/jboss/security/xacml/core/JBossRequestContext.java 2008-02-23 04:34:13 UTC (rev 70048)
@@ -59,6 +59,7 @@
/**
* @see ContextMapOp#get(String)
*/
+ @SuppressWarnings("unchecked")
public <T> T get(String key)
{
return (T) map.get(key);
Modified: projects/security/security-xacml/trunk/jboss-xacml/src/main/org/jboss/security/xacml/core/JBossResponseContext.java
===================================================================
--- projects/security/security-xacml/trunk/jboss-xacml/src/main/org/jboss/security/xacml/core/JBossResponseContext.java 2008-02-23 04:33:56 UTC (rev 70047)
+++ projects/security/security-xacml/trunk/jboss-xacml/src/main/org/jboss/security/xacml/core/JBossResponseContext.java 2008-02-23 04:34:13 UTC (rev 70048)
@@ -51,6 +51,7 @@
/**
* @see ContextMapOp#get(String)
*/
+ @SuppressWarnings("unchecked")
public <T> T get(String key)
{
return (T) map.get(key);
@@ -67,6 +68,7 @@
/**
* @see ResponseContext#getDecision()
*/
+ @SuppressWarnings("unchecked")
public int getDecision()
{
ResponseCtx response = (ResponseCtx) map.get(XACMLConstants.RESPONSE_CTX);
Modified: projects/security/security-xacml/trunk/jboss-xacml/src/main/org/jboss/security/xacml/core/JBossXACMLPolicy.java
===================================================================
--- projects/security/security-xacml/trunk/jboss-xacml/src/main/org/jboss/security/xacml/core/JBossXACMLPolicy.java 2008-02-23 04:33:56 UTC (rev 70047)
+++ projects/security/security-xacml/trunk/jboss-xacml/src/main/org/jboss/security/xacml/core/JBossXACMLPolicy.java 2008-02-23 04:34:13 UTC (rev 70048)
@@ -153,6 +153,7 @@
/**
* @see ContextMapOp#get(String)
*/
+ @SuppressWarnings("unchecked")
public <T> T get(String key)
{
return (T) map.get(key);
Modified: projects/security/security-xacml/trunk/jboss-xacml/src/main/org/jboss/security/xacml/core/SecurityActions.java
===================================================================
--- projects/security/security-xacml/trunk/jboss-xacml/src/main/org/jboss/security/xacml/core/SecurityActions.java 2008-02-23 04:33:56 UTC (rev 70047)
+++ projects/security/security-xacml/trunk/jboss-xacml/src/main/org/jboss/security/xacml/core/SecurityActions.java 2008-02-23 04:34:13 UTC (rev 70048)
@@ -40,9 +40,9 @@
*/
public static ClassLoader getContextClassLoader()
{
- return (ClassLoader) AccessController.doPrivileged(new PrivilegedAction()
+ return AccessController.doPrivileged(new PrivilegedAction<ClassLoader>()
{
- public Object run()
+ public ClassLoader run()
{
return Thread.currentThread().getContextClassLoader();
}
Modified: projects/security/security-xacml/trunk/jboss-xacml/src/main/org/jboss/security/xacml/factories/PolicyFactory.java
===================================================================
--- projects/security/security-xacml/trunk/jboss-xacml/src/main/org/jboss/security/xacml/factories/PolicyFactory.java 2008-02-23 04:33:56 UTC (rev 70047)
+++ projects/security/security-xacml/trunk/jboss-xacml/src/main/org/jboss/security/xacml/factories/PolicyFactory.java 2008-02-23 04:34:13 UTC (rev 70048)
@@ -48,9 +48,9 @@
*/
public class PolicyFactory
{
- public static Class constructingClass = JBossXACMLPolicy.class;
+ public static Class<?> constructingClass = JBossXACMLPolicy.class;
- public static void setConstructingClass(Class clazz)
+ public static void setConstructingClass(Class<?> clazz)
{
if(XACMLPolicy.class.isAssignableFrom(clazz) == false)
throw new RuntimeException("clazz is not of type XACMLPolicy");
@@ -112,16 +112,18 @@
);
}
+ @SuppressWarnings("unchecked")
private static Constructor<XACMLPolicy> getCtr() throws Exception
{
- return constructingClass.getConstructor(new Class[] {
+ return (Constructor<XACMLPolicy>) constructingClass.getConstructor(new Class[] {
InputStream.class,
Integer.TYPE });
}
+ @SuppressWarnings("unchecked")
private static Constructor<XACMLPolicy> getCtrWithFinder() throws Exception
{
- return constructingClass.getConstructor(new Class[] {
+ return (Constructor<XACMLPolicy>) constructingClass.getConstructor(new Class[] {
InputStream.class,
Integer.TYPE ,
JBossPolicyFinder.class});
Modified: projects/security/security-xacml/trunk/jboss-xacml/src/main/org/jboss/security/xacml/locators/AbstractJBossPolicyLocator.java
===================================================================
--- projects/security/security-xacml/trunk/jboss-xacml/src/main/org/jboss/security/xacml/locators/AbstractJBossPolicyLocator.java 2008-02-23 04:33:56 UTC (rev 70047)
+++ projects/security/security-xacml/trunk/jboss-xacml/src/main/org/jboss/security/xacml/locators/AbstractJBossPolicyLocator.java 2008-02-23 04:34:13 UTC (rev 70048)
@@ -56,6 +56,7 @@
/**
* @see ContextMapOp#get(String)
*/
+ @SuppressWarnings("unchecked")
public <T> T get(String key)
{
return (T)map.get(key);
Modified: projects/security/security-xacml/trunk/jboss-xacml/src/main/org/jboss/security/xacml/locators/JBossPolicyLocator.java
===================================================================
--- projects/security/security-xacml/trunk/jboss-xacml/src/main/org/jboss/security/xacml/locators/JBossPolicyLocator.java 2008-02-23 04:33:56 UTC (rev 70047)
+++ projects/security/security-xacml/trunk/jboss-xacml/src/main/org/jboss/security/xacml/locators/JBossPolicyLocator.java 2008-02-23 04:34:13 UTC (rev 70048)
@@ -41,8 +41,7 @@
* @version $Revision$
*/
public class JBossPolicyLocator extends AbstractJBossPolicyLocator
-{
- private XACMLPolicy policy = null;
+{
private List<PolicyFinderModule> pfml = new ArrayList<PolicyFinderModule>();
public JBossPolicyLocator()
Modified: projects/security/security-xacml/trunk/jboss-xacml/src/main/org/jboss/security/xacml/locators/JBossPolicySetLocator.java
===================================================================
--- projects/security/security-xacml/trunk/jboss-xacml/src/main/org/jboss/security/xacml/locators/JBossPolicySetLocator.java 2008-02-23 04:33:56 UTC (rev 70047)
+++ projects/security/security-xacml/trunk/jboss-xacml/src/main/org/jboss/security/xacml/locators/JBossPolicySetLocator.java 2008-02-23 04:34:13 UTC (rev 70048)
@@ -41,9 +41,7 @@
* @version $Revision$
*/
public class JBossPolicySetLocator extends AbstractJBossPolicyLocator
-{
- private XACMLPolicy thePolicySet;
-
+{
private List<PolicySetFinderModule> pfml = new ArrayList<PolicySetFinderModule>();
public JBossPolicySetLocator()
More information about the jboss-cvs-commits
mailing list