[jboss-cvs] JBossAS SVN: r70826 - in projects/aop/trunk/aop/src: main/org/jboss/aop/advice/annotation and 3 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Mar 13 12:02:26 EDT 2008
Author: kabir.khan at jboss.com
Date: 2008-03-13 12:02:26 -0400 (Thu, 13 Mar 2008)
New Revision: 70826
Modified:
projects/aop/trunk/aop/src/main/org/jboss/aop/advice/AbstractAdvice.java
projects/aop/trunk/aop/src/main/org/jboss/aop/advice/AdviceBinding.java
projects/aop/trunk/aop/src/main/org/jboss/aop/advice/AdviceMethodProperties.java
projects/aop/trunk/aop/src/main/org/jboss/aop/advice/AspectDefinition.java
projects/aop/trunk/aop/src/main/org/jboss/aop/advice/DynamicCFlowDefinition.java
projects/aop/trunk/aop/src/main/org/jboss/aop/advice/GenericAspectFactory.java
projects/aop/trunk/aop/src/main/org/jboss/aop/advice/GenericInterceptorFactory.java
projects/aop/trunk/aop/src/main/org/jboss/aop/advice/NoMatchingAdviceException.java
projects/aop/trunk/aop/src/main/org/jboss/aop/advice/PrecedenceSorter.java
projects/aop/trunk/aop/src/main/org/jboss/aop/advice/SecurityActions.java
projects/aop/trunk/aop/src/main/org/jboss/aop/advice/annotation/AdviceInfo.java
projects/aop/trunk/aop/src/main/org/jboss/aop/advice/annotation/AdviceMethodFactory.java
projects/aop/trunk/aop/src/main/org/jboss/aop/advice/annotation/ParameterAnnotationRule.java
projects/aop/trunk/aop/src/main/org/jboss/aop/advice/annotation/assignability/ArgumentContextualizer.java
projects/aop/trunk/aop/src/main/org/jboss/aop/advice/annotation/assignability/AssignabilityAlgorithm.java
projects/aop/trunk/aop/src/main/org/jboss/aop/advice/annotation/assignability/ChoiceBound.java
projects/aop/trunk/aop/src/main/org/jboss/aop/advice/annotation/assignability/DegreeAlgorithm.java
projects/aop/trunk/aop/src/main/org/jboss/aop/advice/annotation/assignability/VariableHierarchy.java
projects/aop/trunk/aop/src/main/org/jboss/aop/advice/annotation/assignability/VariableNode.java
projects/aop/trunk/aop/src/main/org/jboss/aop/expressions/ConstructorExpression.java
projects/aop/trunk/aop/src/main/org/jboss/aop/expressions/ParameterExpression.java
projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/TargetCallerInvalidPOJO.java
projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/TargetInvalidTestCase.java
projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/TargetTestCase.java
Log:
Tidyup, add generics and get rid of warnings
Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/advice/AbstractAdvice.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/advice/AbstractAdvice.java 2008-03-13 15:37:22 UTC (rev 70825)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/advice/AbstractAdvice.java 2008-03-13 16:02:26 UTC (rev 70826)
@@ -44,17 +44,17 @@
*/
public abstract class AbstractAdvice implements Interceptor, Untransformable
{
- private static final Class[] INVOCATION_SIGNATURE = {Invocation.class};
- private static final Class[] METHOD_SIGNATURE = {MethodInvocation.class};
- private static final Class[] CONSTRUCTOR_SIGNATURE = {ConstructorInvocation.class};
- private static final Class[] CONSTRUCTION_SIGNATURE = {ConstructionInvocation.class};
- private static final Class[] FIELD_SIGNATURE = {FieldInvocation.class};
- private static final Class[] FIELD_READ_SIGNATURE = {FieldReadInvocation.class};
- private static final Class[] FIELD_WRITE_SIGNATURE = {FieldWriteInvocation.class};
- private static final Class[] METHOD_CALLED_BY_METHOD_SIGNATURE = {MethodCalledByMethodInvocation.class};
- private static final Class[] METHOD_CALLED_BY_CONSTRUCTOR_SIGNATURE = {MethodCalledByConstructorInvocation.class};
- private static final Class[] CON_CALLED_BY_METHOD_SIGNATURE = {ConstructorCalledByMethodInvocation.class};
- private static final Class[] CON_CALLED_BY_CONSTRUCTOR_SIGNATURE = {ConstructorCalledByConstructorInvocation.class};
+ private static final Class<?>[] INVOCATION_SIGNATURE = {Invocation.class};
+ private static final Class<?>[] METHOD_SIGNATURE = {MethodInvocation.class};
+ private static final Class<?>[] CONSTRUCTOR_SIGNATURE = {ConstructorInvocation.class};
+ private static final Class<?>[] CONSTRUCTION_SIGNATURE = {ConstructionInvocation.class};
+ private static final Class<?>[] FIELD_SIGNATURE = {FieldInvocation.class};
+ private static final Class<?>[] FIELD_READ_SIGNATURE = {FieldReadInvocation.class};
+ private static final Class<?>[] FIELD_WRITE_SIGNATURE = {FieldWriteInvocation.class};
+ private static final Class<?>[] METHOD_CALLED_BY_METHOD_SIGNATURE = {MethodCalledByMethodInvocation.class};
+ private static final Class<?>[] METHOD_CALLED_BY_CONSTRUCTOR_SIGNATURE = {MethodCalledByConstructorInvocation.class};
+ private static final Class<?>[] CON_CALLED_BY_METHOD_SIGNATURE = {ConstructorCalledByMethodInvocation.class};
+ private static final Class<?>[] CON_CALLED_BY_CONSTRUCTOR_SIGNATURE = {ConstructorCalledByConstructorInvocation.class};
protected Method invocationAdvice;
protected Method methodAdvice;
protected Method constructorAdvice;
@@ -66,10 +66,10 @@
protected Method methodCalledByConstructorAdvice;
protected Method conCalledByMethodAdvice;
protected Method conCalledByConstructorAdvice;
- protected Class aspectClass;
+ protected Class<?> aspectClass;
protected String adviceName;
- protected void init(String advice, Class aspectClass)
+ protected void init(String advice, Class<?> aspectClass)
{
if (aspectClass == null)
{
@@ -98,7 +98,7 @@
}
}
- protected static Method findByInvocation(String adviceName, Class clazz)
+ protected static Method findByInvocation(String adviceName, Class<?> clazz)
{
try
{
@@ -111,7 +111,7 @@
return null;
}
- protected static Method findByMethodInvocation(String adviceName, Class clazz)
+ protected static Method findByMethodInvocation(String adviceName, Class<?> clazz)
{
try
{
@@ -124,7 +124,7 @@
return null;
}
- protected static Method findByFieldInvocation(String adviceName, Class clazz)
+ protected static Method findByFieldInvocation(String adviceName, Class<?> clazz)
{
try
{
@@ -137,7 +137,7 @@
return null;
}
- protected static Method findByFieldReadInvocation(String adviceName, Class clazz)
+ protected static Method findByFieldReadInvocation(String adviceName, Class<?> clazz)
{
try
{
@@ -150,7 +150,7 @@
return null;
}
- protected static Method findByFieldWriteInvocation(String adviceName, Class clazz)
+ protected static Method findByFieldWriteInvocation(String adviceName, Class<?> clazz)
{
try
{
@@ -163,7 +163,7 @@
return null;
}
- protected static Method findByConstructorInvocation(String adviceName, Class clazz)
+ protected static Method findByConstructorInvocation(String adviceName, Class<?> clazz)
{
try
{
@@ -176,7 +176,7 @@
return null;
}
- protected static Method findByConstructionInvocation(String adviceName, Class clazz)
+ protected static Method findByConstructionInvocation(String adviceName, Class<?> clazz)
{
try
{
@@ -189,7 +189,7 @@
return null;
}
- protected static Method findByMethodCalledByMethodInvocation(String adviceName, Class clazz)
+ protected static Method findByMethodCalledByMethodInvocation(String adviceName, Class<?> clazz)
{
try
{
@@ -202,7 +202,7 @@
return null;
}
- protected static Method findByMethodCalledByConstructorInvocation(String adviceName, Class clazz)
+ protected static Method findByMethodCalledByConstructorInvocation(String adviceName, Class<?> clazz)
{
try
{
@@ -215,7 +215,7 @@
return null;
}
- protected static Method findByConstructorCalledByMethodInvocation(String adviceName, Class clazz)
+ protected static Method findByConstructorCalledByMethodInvocation(String adviceName, Class<?> clazz)
{
try
{
@@ -228,7 +228,7 @@
return null;
}
- protected static Method findByConstructorCalledByConstructorInvocation(String adviceName, Class clazz)
+ protected static Method findByConstructorCalledByConstructorInvocation(String adviceName, Class<?> clazz)
{
try
{
Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/advice/AdviceBinding.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/advice/AdviceBinding.java 2008-03-13 15:37:22 UTC (rev 70825)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/advice/AdviceBinding.java 2008-03-13 16:02:26 UTC (rev 70826)
@@ -24,7 +24,6 @@
import java.io.StringReader;
import java.util.ArrayList;
import java.util.Arrays;
-import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.WeakHashMap;
@@ -240,7 +239,7 @@
* interceptor instances.
* @see GenericInterceptorFactory
*/
- public void addInterceptor(Class clazz)
+ public void addInterceptor(Class<?> clazz)
{
addInterceptorFactory(new GenericInterceptorFactory(clazz));
}
@@ -376,9 +375,8 @@
{
synchronized (advisors)
{
- for (Iterator it = advisors.keySet().iterator(); it.hasNext();)
+ for (Advisor advisor : advisors.keySet())
{
- Advisor advisor = (Advisor) it.next();
if (advisor.getManager().isAdvisorRegistered(advisor))
{
advisor.removeAdviceBinding(this);
Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/advice/AdviceMethodProperties.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/advice/AdviceMethodProperties.java 2008-03-13 15:37:22 UTC (rev 70825)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/advice/AdviceMethodProperties.java 2008-03-13 16:02:26 UTC (rev 70826)
@@ -54,11 +54,11 @@
private JoinPointBean joinPoint;
//find properties
- private Class aspectClass;
+ private Class<?> aspectClass;
private String adviceName;
- private Class thrownType;
- private Class joinPointBeanType;
- private Class invocationType;
+ private Class<?> thrownType;
+ private Class<?> joinPointBeanType;
+ private Class<?> invocationType;
private Type target;
private Type caller;
private Type joinpointReturnType;
@@ -77,13 +77,13 @@
// TODO remove
public AdviceMethodProperties(
JoinPointBean joinPoint,
- Class aspectClass,
+ Class<?> aspectClass,
String adviceName,
- Class joinPointBeanType,
- Class invocationType,
+ Class<?> joinPointBeanType,
+ Class<?> invocationType,
Type joinpointReturnType,
Type[] joinpointParameters,
- Class[] joinpointParameterClassTypes,
+ Class<?>[] joinpointParameterClassTypes,
Type[] joinpointExceptions,
Type target,
boolean targetAvailable)
@@ -95,14 +95,14 @@
public AdviceMethodProperties(
JoinPointBean joinPoint,
- Class aspectClass,
+ Class<?> aspectClass,
String adviceName,
- Class thrownType,
- Class joinPointBeanType,
- Class invocationType,
+ Class<?> thrownType,
+ Class<?> joinPointBeanType,
+ Class<?> invocationType,
Type joinpointReturnType,
Type[] joinpointParameters,
- Class[] joinpointParameterClassTypes,
+ Class<?>[] joinpointParameterClassTypes,
Type[] joinpointExceptions,
Type target,
boolean targetAvailable)
@@ -123,10 +123,10 @@
// TODO remove
public AdviceMethodProperties(
JoinPointBean joinPoint,
- Class aspectClass,
+ Class<?> aspectClass,
String adviceName,
- Class joinPointBeanType,
- Class invocationType,
+ Class<?> joinPointBeanType,
+ Class<?> invocationType,
Type joinpointReturnType,
Type[] joinpointParameters,
Class<?>[] joinpointParameterClassTypes,
@@ -144,11 +144,11 @@
public AdviceMethodProperties(
JoinPointBean joinPoint,
- Class aspectClass,
+ Class<?> aspectClass,
String adviceName,
- Class thrownType,
- Class joinPointBeanType,
- Class invocationType,
+ Class<?> thrownType,
+ Class<?> joinPointBeanType,
+ Class<?> invocationType,
Type joinpointReturnType,
Type[] joinpointParameters,
Class<?>[] joinpointParameterClassTypes,
@@ -183,23 +183,23 @@
}
- public Class getAspectClass()
+ public Class<?> getAspectClass()
{
return aspectClass;
}
- public Class getThrownType()
+ public Class<?> getThrownType()
{
return this.thrownType;
}
- public Class getJoinPointBeanType()
+ public Class<?> getJoinPointBeanType()
{
return joinPointBeanType;
}
- public Class getInvocationType()
+ public Class<?> getInvocationType()
{
return invocationType;
}
Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/advice/AspectDefinition.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/advice/AspectDefinition.java 2008-03-13 15:37:22 UTC (rev 70825)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/advice/AspectDefinition.java 2008-03-13 16:02:26 UTC (rev 70826)
@@ -104,9 +104,9 @@
{
if (advisors.size() > 0)
{
- for (Iterator it = advisors.keySet().iterator() ; it.hasNext() ; )
+ for (Iterator<Advisor> it = advisors.keySet().iterator() ; it.hasNext() ; )
{
- Advisor advisor = (Advisor)it.next();
+ Advisor advisor = it.next();
if (advisor != null)
{
it.remove();
Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/advice/DynamicCFlowDefinition.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/advice/DynamicCFlowDefinition.java 2008-03-13 15:37:22 UTC (rev 70825)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/advice/DynamicCFlowDefinition.java 2008-03-13 16:02:26 UTC (rev 70826)
@@ -36,7 +36,7 @@
private String name;
private String className;
private Element element;
- private Class pClass;
+ private Class<?> pClass;
public DynamicCFlowDefinition(Element element, String className, String name)
{
Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/advice/GenericAspectFactory.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/advice/GenericAspectFactory.java 2008-03-13 15:37:22 UTC (rev 70825)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/advice/GenericAspectFactory.java 2008-03-13 16:02:26 UTC (rev 70826)
@@ -48,9 +48,9 @@
{
private static final Logger logger = AOPLogger.getLogger(GenericAspectFactory.class);
- final static Class[] ADVISOR_INJECTOR_SIGNATURE = new Class[]{Advisor.class};
- final static Class[] INSTANCE_ADVISOR_INJECTOR_SIGNATURE = new Class[]{InstanceAdvisor.class};
- final static Class[] JOINPOINT_INJECTOR_SIGNATURE = new Class[]{Joinpoint.class};
+ final static Class<?>[] ADVISOR_INJECTOR_SIGNATURE = new Class[]{Advisor.class};
+ final static Class<?>[] INSTANCE_ADVISOR_INJECTOR_SIGNATURE = new Class[]{InstanceAdvisor.class};
+ final static Class<?>[] JOINPOINT_INJECTOR_SIGNATURE = new Class[]{Joinpoint.class};
private String classname;
private Element element;
@@ -100,7 +100,7 @@
/**
* @deprecated Not public API
*/
- public Class getClazz()
+ public Class<?> getClazz()
{
try
{
@@ -112,7 +112,7 @@
}
}
- private Class getClazz(Advisor advisor)
+ private Class<?> getClazz(Advisor advisor)
{
try
{
@@ -120,7 +120,7 @@
if (advisor != null)
{
//Get the correct classloader based on the class of the advisor
- Class clazz = advisor.getClazz();
+ Class<?> clazz = advisor.getClazz();
cl = (clazz != null) ? clazz.getClassLoader() : advisor.getClass().getClassLoader();
}
if (cl != null)
@@ -273,7 +273,7 @@
if (attributeName.equalsIgnoreCase(descriptors[i].getName()))
{
foundProperty = true;
- Class typeClass = descriptors[i].getPropertyType();
+ Class<?> typeClass = descriptors[i].getPropertyType();
Object value;
PropertyEditor editor = PropertyEditorManager.findEditor(typeClass);
Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/advice/GenericInterceptorFactory.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/advice/GenericInterceptorFactory.java 2008-03-13 15:37:22 UTC (rev 70825)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/advice/GenericInterceptorFactory.java 2008-03-13 16:02:26 UTC (rev 70826)
@@ -30,7 +30,7 @@
public class GenericInterceptorFactory implements InterceptorFactory
{
- private WeakReference<Class> classRef = null;
+ private WeakReference<Class<?>> classRef = null;
private String classname;
private Element element;
private boolean deployed = true;
@@ -45,9 +45,9 @@
this.element = element;
}
- public GenericInterceptorFactory(Class clazz)
+ public GenericInterceptorFactory(Class<?> clazz)
{
- this.classRef = new WeakReference<Class>(clazz);
+ this.classRef = new WeakReference<Class<?>>(clazz);
this.classname = clazz.getName();
}
@@ -78,7 +78,7 @@
{
try
{
- Class clazz = null;
+ Class<?> clazz = null;
synchronized (this)
{
if (classRef != null)
@@ -89,7 +89,7 @@
{
// FIXME ClassLoader - why should the class be visible from the context classloader?
clazz = SecurityActions.getContextClassLoader().loadClass(classname);
- classRef = new WeakReference<Class>(clazz);
+ classRef = new WeakReference<Class<?>>(clazz);
}
}
Interceptor interceptor = (Interceptor)clazz.newInstance();
Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/advice/NoMatchingAdviceException.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/advice/NoMatchingAdviceException.java 2008-03-13 15:37:22 UTC (rev 70825)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/advice/NoMatchingAdviceException.java 2008-03-13 16:02:26 UTC (rev 70826)
@@ -67,7 +67,7 @@
* @param adviceType the type of the queried advice
* @param message message explaining why no matching advice was found
*/
- public NoMatchingAdviceException(Class aspectClass, String adviceName)
+ public NoMatchingAdviceException(Class<?> aspectClass, String adviceName)
{
super("No matching advice called '" + adviceName + "' could be found in " +
aspectClass.getName() + ": method was not found");
Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/advice/PrecedenceSorter.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/advice/PrecedenceSorter.java 2008-03-13 15:37:22 UTC (rev 70825)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/advice/PrecedenceSorter.java 2008-03-13 16:02:26 UTC (rev 70826)
@@ -36,12 +36,12 @@
*/
public class PrecedenceSorter
{
- static Comparator interceptorComparator = new Comparator()
+ static Comparator<InterceptorEntry> interceptorComparator = new Comparator<InterceptorEntry>()
{
- public int compare(Object objA, Object objB)
+ public int compare(InterceptorEntry objA, InterceptorEntry objB)
{
- InterceptorEntry entryA = (InterceptorEntry)objA;
- InterceptorEntry entryB = (InterceptorEntry)objB;
+ InterceptorEntry entryA = objA;
+ InterceptorEntry entryB = objB;
return entryA.precedenceOrder - entryB.precedenceOrder;
}
@@ -159,13 +159,12 @@
public static PrecedenceDefEntry[] createOverallPrecedence(AspectManager manager)
{
- ArrayList overall = new ArrayList();
+ ArrayList<PrecedenceDefEntry> overall = new ArrayList<PrecedenceDefEntry>();
- LinkedHashMap precedenceDefs = manager.getPrecedenceDefs();
+ LinkedHashMap<String, PrecedenceDef> precedenceDefs = manager.getPrecedenceDefs();
boolean first = true;
- for (Iterator it = precedenceDefs.values().iterator() ; it.hasNext(); )
+ for (PrecedenceDef precedenceDef : precedenceDefs.values())
{
- PrecedenceDef precedenceDef = (PrecedenceDef)it.next();
PrecedenceDefEntry[] entries = precedenceDef.getEntries();
if (first)
@@ -181,11 +180,10 @@
overall = mergePrecedenceDef(overall, precedenceDef);
}
- //System.out.println("OVERALL PRECEDENCE: " + overall);
- return (PrecedenceDefEntry[])overall.toArray(new PrecedenceDefEntry[overall.size()]);
+ return overall.toArray(new PrecedenceDefEntry[overall.size()]);
}
- public static ArrayList mergePrecedenceDef(ArrayList overall, PrecedenceDef precedenceDef)
+ public static ArrayList<PrecedenceDefEntry> mergePrecedenceDef(ArrayList<PrecedenceDefEntry> overall, PrecedenceDef precedenceDef)
{
//TODO This can be improved. If you have the precedences
// 1) A, D
@@ -202,7 +200,7 @@
int size = overall.size();
for (int i = 0 ; i < size ; i++)
{
- PrecedenceDefEntry global = (PrecedenceDefEntry)overall.get(i);
+ PrecedenceDefEntry global = overall.get(i);
boolean found = false;
//find current overall precedence entry in the new set of defs
@@ -245,8 +243,8 @@
if (interceptors.length == 0)
return interceptors;
- ArrayList all = new ArrayList(interceptors.length);
- ArrayList precedence = new ArrayList(interceptors.length);
+ ArrayList<InterceptorEntry> all = new ArrayList<InterceptorEntry>(interceptors.length);
+ ArrayList<InterceptorEntry> precedence = new ArrayList<InterceptorEntry>(interceptors.length);
PrecedenceDefEntry[] precedenceEntries = manager.getSortedPrecedenceDefEntries();
//Figure out what interceptors have precedence
@@ -278,11 +276,11 @@
for (int i = 0 ; i < allSize ; i++)
{
- InterceptorEntry entry = (InterceptorEntry)all.get(i);
+ InterceptorEntry entry = all.get(i);
if (entry.precedenceOrder >= 0 && prec < precedenceSize)
{
- entry = (InterceptorEntry)precedence.get(prec++);
+ entry = precedence.get(prec++);
}
sortedInterceptors[i] = entry.interceptor;
}
@@ -292,8 +290,8 @@
public static GeneratedAdvisorInterceptor[] applyPrecedence(GeneratedAdvisorInterceptor[] interceptors, AspectManager manager)
{
- ArrayList all = new ArrayList(interceptors.length);
- ArrayList precedence = new ArrayList(interceptors.length);
+ ArrayList<InterceptorEntry> all = new ArrayList<InterceptorEntry>(interceptors.length);
+ ArrayList<InterceptorEntry> precedence = new ArrayList<InterceptorEntry>(interceptors.length);
PrecedenceDefEntry[] precedenceEntries = manager.getSortedPrecedenceDefEntries();
//Figure out what interceptors have precedence
@@ -325,11 +323,11 @@
for (int i = 0 ; i < allSize ; i++)
{
- InterceptorEntry entry = (InterceptorEntry)all.get(i);
+ InterceptorEntry entry = all.get(i);
if (entry.precedenceOrder >= 0 && prec < precedenceSize)
{
- entry = (InterceptorEntry)precedence.get(prec++);
+ entry = precedence.get(prec++);
}
sortedInterceptors[i] = entry.factoryWrapper;
}
Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/advice/SecurityActions.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/advice/SecurityActions.java 2008-03-13 15:37:22 UTC (rev 70825)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/advice/SecurityActions.java 2008-03-13 16:02:26 UTC (rev 70826)
@@ -48,7 +48,7 @@
{
try
{
- AccessController.doPrivileged(new PrivilegedExceptionAction()
+ AccessController.doPrivileged(new PrivilegedExceptionAction<Object>()
{
public Object run() throws Exception
{
@@ -89,11 +89,14 @@
class name to editor name algorithm. For example, the type String[] has
a name '[Ljava.lang.String;' which does not map to a XXXEditor name.
*/
- Class strArrayType = String[].class;
+ Class<String[]> strArrayType = String[].class;
PropertyEditorManager.registerEditor(strArrayType, StringArrayEditor.class);
- Class clsArrayType = Class[].class;
+
+ @SuppressWarnings("unchecked")
+ Class<Class[]> clsArrayType = Class[].class;
PropertyEditorManager.registerEditor(clsArrayType, ClassArrayEditor.class);
- Class intArrayType = int[].class;
+
+ Class<int[]> intArrayType = int[].class;
PropertyEditorManager.registerEditor(intArrayType, IntArrayEditor.class);
}
Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/advice/annotation/AdviceInfo.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/advice/annotation/AdviceInfo.java 2008-03-13 15:37:22 UTC (rev 70825)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/advice/annotation/AdviceInfo.java 2008-03-13 16:02:26 UTC (rev 70826)
@@ -47,7 +47,7 @@
*/
public final short getReturnAssignabilityDegree(AdviceMethodProperties properties)
{
- Class returnType = this.method.getReturnType();
+ Class<?> returnType = this.method.getReturnType();
if (returnType == void.class)
{
return DegreeAlgorithm.NOT_ASSIGNABLE_DEGREE;
@@ -78,7 +78,7 @@
*/
public int compareTo(AdviceInfo o)
{
- return ((AdviceInfo)o).rank - rank;
+ return o.rank - rank;
}
public String toString()
Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/advice/annotation/AdviceMethodFactory.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/advice/annotation/AdviceMethodFactory.java 2008-03-13 15:37:22 UTC (rev 70825)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/advice/annotation/AdviceMethodFactory.java 2008-03-13 16:02:26 UTC (rev 70826)
@@ -115,7 +115,7 @@
+ method.getReturnType() + " instead of java.lang.Object");
}
// throws Throwable
- for (Class exceptionType: method.getExceptionTypes())
+ for (Class<?> exceptionType: method.getExceptionTypes())
{
if (exceptionType == Throwable.class)
{
Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/advice/annotation/ParameterAnnotationRule.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/advice/annotation/ParameterAnnotationRule.java 2008-03-13 15:37:22 UTC (rev 70825)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/advice/annotation/ParameterAnnotationRule.java 2008-03-13 16:02:26 UTC (rev 70826)
@@ -1,5 +1,7 @@
package org.jboss.aop.advice.annotation;
+import java.lang.annotation.Annotation;
+
import org.jboss.aop.advice.AdviceMethodProperties;
import org.jboss.aop.joinpoint.FieldReadInvocation;
import org.jboss.aop.joinpoint.Invocation;
@@ -123,8 +125,8 @@
}
};
- private Class annotation;
- private Class assignableFrom;
+ private Class<? extends Annotation> annotation;
+ private Class<?> assignableFrom;
private int rankGrade;
private boolean mandatory;
private boolean singleEnforced;
@@ -146,7 +148,7 @@
* annotation</code> in the advice method parameters is
* forbidden
*/
- private ParameterAnnotationRule(Class annotation, Class assignableFrom, int property,
+ private ParameterAnnotationRule(Class<? extends Annotation> annotation, Class<?> assignableFrom, int property,
int rankGrade, boolean mandatory, boolean singleEnforced)
{
this.annotation = annotation;
@@ -161,7 +163,7 @@
* Returns the annotation associated with this rule.
* @return the annotation associated with this rule.
*/
- public final Class getAnnotation()
+ public final Class<? extends Annotation> getAnnotation()
{
return annotation;
}
Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/advice/annotation/assignability/ArgumentContextualizer.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/advice/annotation/assignability/ArgumentContextualizer.java 2008-03-13 15:37:22 UTC (rev 70825)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/advice/annotation/assignability/ArgumentContextualizer.java 2008-03-13 16:02:26 UTC (rev 70826)
@@ -36,7 +36,7 @@
class ArgumentContextualizer
{
public static final Type[] getContextualizedArguments(ParameterizedType paramType,
- Class rawType, Class desiredType)
+ Class<?> rawType, Class<?> desiredType)
{
ArgumentContextualizer contextualizedArguments = getContextualizedArgumentsInternal(
desiredType, rawType);
@@ -151,7 +151,7 @@
* @return <code>true</code> if the contextualization process was successfully
* performed; </code>false</code> otherwise.
*/
- private boolean contextualizeVariables(Class subClass, Type superType)
+ private boolean contextualizeVariables(Class<?> subClass, Type superType)
{
if (!initialized || variableReplacements.isEmpty())
{
@@ -227,9 +227,9 @@
{
return null;
}
- String paramName = ((TypeVariable) argument).getName();
+ String paramName = ((TypeVariable<?>) argument).getName();
int index = 0;
- TypeVariable[] typeVariables = declaringClass.getTypeParameters();
+ TypeVariable<?>[] typeVariables = declaringClass.getTypeParameters();
for (index = 0; index < typeVariables.length; index ++)
{
if (typeVariables[index].getName().equals(paramName)){
Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/advice/annotation/assignability/AssignabilityAlgorithm.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/advice/annotation/assignability/AssignabilityAlgorithm.java 2008-03-13 15:37:22 UTC (rev 70825)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/advice/annotation/assignability/AssignabilityAlgorithm.java 2008-03-13 16:02:26 UTC (rev 70826)
@@ -49,14 +49,14 @@
protected boolean assignValue(Type type, Type fromType,
VariableHierarchy variableHierarchy)
{
- VariableNode node = variableHierarchy.getVariableNode((TypeVariable) type);
+ VariableNode node = variableHierarchy.getVariableNode((TypeVariable<?>) type);
return node.assignValue(fromType);
}
protected boolean addBound(Type type, Type fromType,
VariableHierarchy variableHierarchy)
{
- VariableNode node = variableHierarchy.getVariableNode((TypeVariable) type);
+ VariableNode node = variableHierarchy.getVariableNode((TypeVariable<?>) type);
return node.addLowerBound(fromType);
}
},
@@ -75,14 +75,14 @@
protected boolean assignValue(Type type, Type fromType,
VariableHierarchy variableHierarchy)
{
- VariableNode fromNode = variableHierarchy.getVariableNode((TypeVariable) fromType);
+ VariableNode fromNode = variableHierarchy.getVariableNode((TypeVariable<?>) fromType);
return fromNode.addMaximumUpperBound(type);
}
protected boolean addBound(Type type, Type fromType,
VariableHierarchy variableHierarchy)
{
- VariableNode fromNode = variableHierarchy.getVariableNode((TypeVariable) fromType);
+ VariableNode fromNode = variableHierarchy.getVariableNode((TypeVariable<?>) fromType);
return fromNode.addUpperBound(type);
}
};
@@ -216,11 +216,11 @@
*/
public static Type[] getConcreteBounds(Type type)
{
- TypeVariable current = (TypeVariable) type;
+ TypeVariable<?> current = (TypeVariable<?>) type;
Type[] bounds = current.getBounds();
while (bounds.length == 1 && bounds[0] instanceof TypeVariable)
{
- current = (TypeVariable) bounds[0];
+ current = (TypeVariable<?>) bounds[0];
bounds = current.getBounds();
}
return bounds;
@@ -231,7 +231,7 @@
{
if (fromType instanceof TypeVariable)
{
- Type[] concreteBounds = getConcreteBounds((TypeVariable) fromType);
+ Type[] concreteBounds = getConcreteBounds(fromType);
try
{
variableHierarchy.startRealBoundComparation();
Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/advice/annotation/assignability/ChoiceBound.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/advice/annotation/assignability/ChoiceBound.java 2008-03-13 15:37:22 UTC (rev 70825)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/advice/annotation/assignability/ChoiceBound.java 2008-03-13 16:02:26 UTC (rev 70826)
@@ -33,12 +33,12 @@
*/
class ChoiceBound implements Type
{
- public ChoiceBound(TypeVariable variable, Type[] bounds)
+ public ChoiceBound(TypeVariable<?> variable, Type[] bounds)
{
this.variable = variable;
this.bounds = new LinkedList<Type>();
Collections.addAll(this.bounds, bounds);
}
- TypeVariable variable;
+ TypeVariable<?> variable;
Collection<Type> bounds;
}
\ No newline at end of file
Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/advice/annotation/assignability/DegreeAlgorithm.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/advice/annotation/assignability/DegreeAlgorithm.java 2008-03-13 15:37:22 UTC (rev 70825)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/advice/annotation/assignability/DegreeAlgorithm.java 2008-03-13 16:02:26 UTC (rev 70826)
@@ -81,7 +81,7 @@
return null;
}
Type componentType = ((GenericArrayType) type).getGenericComponentType();
- Class componentClass = getClassType(componentType);
+ Class<?> componentClass = getClassType(componentType);
try
{
return componentClass.getClassLoader().loadClass(
@@ -136,9 +136,9 @@
// if is object, the degree is the size of this interface hierarchy + 1
if (toType.getName() == "java.lang.Object")
{
- ArrayList<Class[]> list1 = new ArrayList<Class[]>();
- ArrayList<Class[]> list2 = new ArrayList<Class[]>();
- Class[] fromTypeInterfaces = fromType.getInterfaces();
+ ArrayList<Class<?>[]> list1 = new ArrayList<Class<?>[]>();
+ ArrayList<Class<?>[]> list2 = new ArrayList<Class<?>[]>();
+ Class<?>[] fromTypeInterfaces = fromType.getInterfaces();
if (fromTypeInterfaces.length == 0)
{
return 1;
@@ -147,11 +147,11 @@
short degree = 2;
while (true)
{
- for (Class[] interfaces : list1)
+ for (Class<?>[] interfaces : list1)
{
for (int i = 0; i < interfaces.length; i++)
{
- Class[] superInterfaces = interfaces[i].getInterfaces();
+ Class<?>[] superInterfaces = interfaces[i].getInterfaces();
if (superInterfaces.length == 0)
{
return degree;
@@ -161,7 +161,7 @@
}
degree ++;
list1.clear();
- ArrayList<Class[]> temp = list1;
+ ArrayList<Class<?>[]> temp = list1;
list1 = list2;
list2 = temp;
}
@@ -195,7 +195,7 @@
return DegreeAlgorithm.NOT_ASSIGNABLE_DEGREE;
}
- Class[] interfaces = fromClassType.getInterfaces();
+ Class<?>[] interfaces = fromClassType.getInterfaces();
for (int i = 0 ; i < interfaces.length ; i++)
{
if(interfaces[i] == toInterfaceType)
@@ -235,7 +235,7 @@
private short getInterfaceInheritanceAD(Class<?> fromInterfaceType,
Class<?> toInterfaceType, short currentDegree)
{
- Class[] interfaces = fromInterfaceType.getInterfaces();
+ Class<?>[] interfaces = fromInterfaceType.getInterfaces();
currentDegree ++;
for (int i = 0; i < interfaces.length; i++)
{
Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/advice/annotation/assignability/VariableHierarchy.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/advice/annotation/assignability/VariableHierarchy.java 2008-03-13 15:37:22 UTC (rev 70825)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/advice/annotation/assignability/VariableHierarchy.java 2008-03-13 16:02:26 UTC (rev 70826)
@@ -49,7 +49,7 @@
this.realBoundComparation = 0;
}
- VariableNode getVariableNode(TypeVariable typeVariable)
+ VariableNode getVariableNode(TypeVariable<?> typeVariable)
{
String key = typeVariable.getName();
if (map.containsKey(key))
Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/advice/annotation/assignability/VariableNode.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/advice/annotation/assignability/VariableNode.java 2008-03-13 15:37:22 UTC (rev 70825)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/advice/annotation/assignability/VariableNode.java 2008-03-13 16:02:26 UTC (rev 70826)
@@ -43,10 +43,10 @@
private VariableNode next;
private Collection<Type> lowerBounds;
private Collection<Type> upperBounds;
- private TypeVariable variable;
+ private TypeVariable<?> variable;
private Type assignedValue;
- public VariableNode(TypeVariable content, VariableHierarchy hierarchy)
+ public VariableNode(TypeVariable<?> content, VariableHierarchy hierarchy)
{
this.hierarchy = hierarchy;
this.variable = content;
@@ -55,7 +55,7 @@
Type[] bounds = content.getBounds();
if (bounds.length == 1 && bounds[0] instanceof TypeVariable)
{
- TypeVariable typeVariable = (TypeVariable) bounds[0];
+ TypeVariable<?> typeVariable = (TypeVariable<?>) bounds[0];
next = hierarchy.getVariableNode(typeVariable);
next.previous = this;
}
@@ -90,8 +90,8 @@
}
if (lowerBound instanceof TypeVariable)
{
- Type[] bounds = ((TypeVariable) lowerBound).getBounds();
- this.lowerBounds.add(new ChoiceBound((TypeVariable) lowerBound, bounds));
+ Type[] bounds = ((TypeVariable<?>) lowerBound).getBounds();
+ this.lowerBounds.add(new ChoiceBound((TypeVariable<?>) lowerBound, bounds));
}
else
{
@@ -118,8 +118,8 @@
{
if (upperBound instanceof TypeVariable)
{
- Type[] bounds = ((TypeVariable) upperBound).getBounds();
- this.upperBounds.add(new ChoiceBound((TypeVariable) upperBound, bounds));
+ Type[] bounds = ((TypeVariable<?>) upperBound).getBounds();
+ this.upperBounds.add(new ChoiceBound((TypeVariable<?>) upperBound, bounds));
}
else
{
@@ -296,7 +296,7 @@
}
if(fromArgument instanceof TypeVariable)
{
- if (!isAssignable(upperBounds, ((TypeVariable) fromArgument).getBounds()))
+ if (!isAssignable(upperBounds, ((TypeVariable<?>) fromArgument).getBounds()))
{
return false;
}
@@ -350,7 +350,7 @@
{
if (fromType instanceof TypeVariable)
{
- TypeVariable fromVariable = (TypeVariable) fromType;
+ TypeVariable<?> fromVariable = (TypeVariable<?>) fromType;
if (type instanceof TypeVariable)
{
if (type == fromType)
@@ -364,7 +364,7 @@
{
return true;
}
- fromVariable = (TypeVariable) fromBounds[0];
+ fromVariable = (TypeVariable<?>) fromBounds[0];
fromBounds = fromVariable.getBounds();
}
return false;
@@ -383,7 +383,7 @@
{
ChoiceBound fromChoiceBound = (ChoiceBound) fromType;
if (type instanceof TypeVariable &&
- !isAssignable((TypeVariable) type, fromChoiceBound.variable))
+ !isAssignable(type, fromChoiceBound.variable))
{
return false;
}
@@ -439,7 +439,7 @@
}
if (fromType instanceof TypeVariable)
{
- for (Type upperBound: ((TypeVariable) fromType).getBounds())
+ for (Type upperBound: ((TypeVariable<?>) fromType).getBounds())
{
if (isAssignable(type, upperBound))
{
@@ -458,7 +458,7 @@
}
if (type instanceof TypeVariable)
{
- for (Type bound: ((TypeVariable) type).getBounds())
+ for (Type bound: ((TypeVariable<?>) type).getBounds())
{
if (!isAssignable(bound, fromType))
{
@@ -488,7 +488,7 @@
}
ChoiceBound choiceBound = (ChoiceBound) type;
if (fromType instanceof TypeVariable &&
- !isAssignable(choiceBound.variable, (TypeVariable) fromType))
+ !isAssignable(choiceBound.variable, fromType))
{
return false;
}
Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/expressions/ConstructorExpression.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/expressions/ConstructorExpression.java 2008-03-13 15:37:22 UTC (rev 70825)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/expressions/ConstructorExpression.java 2008-03-13 16:02:26 UTC (rev 70826)
@@ -55,7 +55,7 @@
}
- public boolean matches(Constructor con)
+ public boolean matches(Constructor<?> con)
{
Matcher cm = classExpr.matcher(con.getDeclaringClass().getName());
if (cm.matches() == false) return false;
@@ -63,7 +63,7 @@
return params.matches(con.getParameterTypes());
}
- public boolean matchParamsOnly(Constructor con)
+ public boolean matchParamsOnly(Constructor<?> con)
{
return params.matches(con.getParameterTypes());
}
Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/expressions/ParameterExpression.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/expressions/ParameterExpression.java 2008-03-13 15:37:22 UTC (rev 70825)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/expressions/ParameterExpression.java 2008-03-13 16:02:26 UTC (rev 70826)
@@ -52,12 +52,12 @@
public Pattern[] parameterPatterns;
public boolean isAll = false;
- protected static String simpleType(Class type)
+ protected static String simpleType(Class<?> type)
{
- Class ret = type;
+ Class<?> ret = type;
if (ret.isArray())
{
- Class arr = ret;
+ Class<?> arr = ret;
String array = "";
while (arr.isArray())
{
@@ -85,7 +85,7 @@
throw new RuntimeException("Illegal parameter list expression: " + expression);
}
StringTokenizer tokenizer = new StringTokenizer(expression, ",");
- ArrayList paramList = new ArrayList();
+ ArrayList<Pattern> paramList = new ArrayList<Pattern>();
while (tokenizer.hasMoreTokens())
{
String token = tokenizer.nextToken().trim();
@@ -95,11 +95,11 @@
token = token.replaceAll("\\]", "\\\\]");
paramList.add(Pattern.compile(token));
}
- parameterPatterns = (Pattern[])paramList.toArray(new Pattern[paramList.size()]);
+ parameterPatterns = paramList.toArray(new Pattern[paramList.size()]);
}
}
- public boolean matches(Class[] params)
+ public boolean matches(Class<?>[] params)
{
if (isAll)
{
Modified: projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/TargetCallerInvalidPOJO.java
===================================================================
--- projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/TargetCallerInvalidPOJO.java 2008-03-13 15:37:22 UTC (rev 70825)
+++ projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/TargetCallerInvalidPOJO.java 2008-03-13 16:02:26 UTC (rev 70826)
@@ -33,6 +33,7 @@
*
* @author <a href="flavia.rainone at jboss.com">Flavia Rainone</a>
*/
+ at SuppressWarnings({"unused", "cast"})
public class TargetCallerInvalidPOJO
{
public TargetCallerInvalidPOJO(){}
Modified: projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/TargetInvalidTestCase.java
===================================================================
--- projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/TargetInvalidTestCase.java 2008-03-13 15:37:22 UTC (rev 70825)
+++ projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/TargetInvalidTestCase.java 2008-03-13 16:02:26 UTC (rev 70826)
@@ -33,6 +33,7 @@
*
* @author <a href="flavia.rainone at jboss.com">Flavia Rainone</a>
*/
+ at SuppressWarnings("unused")
public class TargetInvalidTestCase extends AOPTestWithSetup
{
private TargetCallerInvalidPOJO pojo;
Modified: projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/TargetTestCase.java
===================================================================
--- projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/TargetTestCase.java 2008-03-13 15:37:22 UTC (rev 70825)
+++ projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/TargetTestCase.java 2008-03-13 16:02:26 UTC (rev 70826)
@@ -32,6 +32,7 @@
*
* @author <a href="flavia.rainone at jboss.com">Flavia Rainone</a>
*/
+ at SuppressWarnings("unused")
public class TargetTestCase extends AOPTestWithSetup
{
private TargetCallerPOJO pojo;
More information about the jboss-cvs-commits
mailing list