[jboss-cvs] JBossAS SVN: r69884 - in projects/microcontainer/trunk/aop-mc-int/src: main/org/jboss/aop/microcontainer/beans and 10 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Feb 18 09:42:07 EST 2008
Author: adrian at jboss.org
Date: 2008-02-18 09:42:07 -0500 (Mon, 18 Feb 2008)
New Revision: 69884
Modified:
projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/aspects/jmx/JMX.java
projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/aspects/jmx/JMXIntroduction.java
projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/ArrayBinding.java
projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/Aspect.java
projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/ClassMetaDataLoader.java
projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/beanmetadatafactory/AspectBeanMetaDataFactory.java
projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/xml/AOPBeansSchemaInitializer.java
projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/integration/AOPConstructorJoinpoint.java
projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/integration/AOPDependencyBuilder.java
projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/junit/AOPMicrocontainerTest.java
projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/junit/AOPMicrocontainerTestDelegate.java
projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/junit/AbstractProxyTest.java
projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/junit/AbstractProxyTestDelegate.java
projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/junit/ScopingAOPMicrocontainerTestDelegate.java
projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/Interceptions.java
projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/TestMetaDataLoader.java
projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/DomainProxyTest.java
projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/DomainSimpleTest.java
projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/LightweightAspectTest.java
projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/PrecedenceTest.java
projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/matrix/DynamicAspectDeployer.java
projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/support/LifecycleCallback.java
projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/support/MetaDataContextInterceptor.java
projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/test/JMXLifecycleTestCase.java
projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/test/LifecycleTestCase.java
projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/test/MethodHashingTestCase.java
projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/test/ScopingAopTestCase.java
projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/xml/test/AbstractAOPXMLTest.java
projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/xml/test/AspectTestCase.java
projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/xml/test/XMLTestDelegate.java
Log:
Source code tidyup
Modified: projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/aspects/jmx/JMX.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/aspects/jmx/JMX.java 2008-02-18 14:18:42 UTC (rev 69883)
+++ projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/aspects/jmx/JMX.java 2008-02-18 14:42:07 UTC (rev 69884)
@@ -44,7 +44,7 @@
*
* @return the mbean interface
*/
- Class exposedInterface();
+ Class<?> exposedInterface();
/**
* String form of the ObjectName for the mbean.
Modified: projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/aspects/jmx/JMXIntroduction.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/aspects/jmx/JMXIntroduction.java 2008-02-18 14:18:42 UTC (rev 69883)
+++ projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/aspects/jmx/JMXIntroduction.java 2008-02-18 14:42:07 UTC (rev 69884)
@@ -93,7 +93,7 @@
if ("setKernelControllerContext".equals(mi.getMethod().getName()))
{
- Class intfClass = null;
+ Class<?> intfClass = null;
boolean registerDirectly = false;
if (jmx != null)
{
Modified: projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/ArrayBinding.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/ArrayBinding.java 2008-02-18 14:18:42 UTC (rev 69883)
+++ projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/ArrayBinding.java 2008-02-18 14:42:07 UTC (rev 69884)
@@ -99,7 +99,6 @@
if (advices != null)
{
interceptors = new ArrayList<InterceptorFactory>();
- int i = 0;
for (BindingEntry entry : advices)
{
entry.start();
Modified: projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/Aspect.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/Aspect.java 2008-02-18 14:18:42 UTC (rev 69883)
+++ projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/Aspect.java 2008-02-18 14:42:07 UTC (rev 69884)
@@ -38,7 +38,6 @@
import org.jboss.kernel.spi.dependency.ConfigureKernelControllerContextAware;
import org.jboss.kernel.spi.dependency.KernelControllerContext;
import org.jboss.logging.Logger;
-import org.jboss.util.id.GUID;
/**
* An Aspect.
@@ -111,6 +110,8 @@
/**
* Sets if we are an aspect factory or not
+ *
+ * @param factory true if we are a factory
*/
public void setFactory(boolean factory)
{
Modified: projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/ClassMetaDataLoader.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/ClassMetaDataLoader.java 2008-02-18 14:18:42 UTC (rev 69883)
+++ projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/ClassMetaDataLoader.java 2008-02-18 14:42:07 UTC (rev 69884)
@@ -77,7 +77,7 @@
{
//FIXME Probably need to use something else
ClassLoader cl = SecurityActions.getContextClassLoader();
- Class clazz = cl.loadClass(className);
+ Class<?> clazz = cl.loadClass(className);
org.jboss.aop.metadata.ClassMetaDataLoader loader = (org.jboss.aop.metadata.ClassMetaDataLoader)clazz.newInstance();
manager.addClassMetaDataLoader(tag, loader);
Modified: projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/beanmetadatafactory/AspectBeanMetaDataFactory.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/beanmetadatafactory/AspectBeanMetaDataFactory.java 2008-02-18 14:18:42 UTC (rev 69883)
+++ projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/beanmetadatafactory/AspectBeanMetaDataFactory.java 2008-02-18 14:42:07 UTC (rev 69884)
@@ -171,13 +171,13 @@
private void getDependencies(ArrayList<AbstractDependencyValueMetaData> dependencies, MetaDataVisitorNode node)
{
- Iterator children = node.getChildren();
+ Iterator<? extends MetaDataVisitorNode> children = node.getChildren();
if (children != null)
{
while (children.hasNext())
{
- MetaDataVisitorNode child = (MetaDataVisitorNode)children.next();
+ MetaDataVisitorNode child = children.next();
if (child instanceof AbstractDependencyValueMetaData)
{
dependencies.add((AbstractDependencyValueMetaData)child);
Modified: projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/xml/AOPBeansSchemaInitializer.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/xml/AOPBeansSchemaInitializer.java 2008-02-18 14:18:42 UTC (rev 69883)
+++ projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/xml/AOPBeansSchemaInitializer.java 2008-02-18 14:42:07 UTC (rev 69884)
@@ -265,7 +265,7 @@
private void initDomainType(SchemaBinding schema)
{
TypeBinding type = schema.getType(domainTypeQName);
- type.setHandler(DomainHandler.HANDLER);
+ type.setHandler(DomainHandler.DOMAIN_HANDLER);
type.pushInterceptor(interceptorQName, DomainAspectManagerAwareBeanMetaDataFactoryInterceptor.INTERCEPTOR);
type.pushInterceptor(aspectQName, DomainAspectManagerAwareBeanMetaDataFactoryInterceptor.INTERCEPTOR);
type.pushInterceptor(bindQName, DomainAspectManagerAwareBeanMetaDataFactoryInterceptor.INTERCEPTOR);
@@ -341,7 +341,7 @@
TypeBinding type = schema.getType(cflowStackTypeQName);
type.pushInterceptor(calledQName, CFlowStackCalledInterceptor.INTERCEPTOR);
type.pushInterceptor(notCalledQName, CFlowStackNotCalledInterceptor.INTERCEPTOR);
- type.setHandler(CFlowStackHandler.HANDLER);
+ type.setHandler(CFlowStackHandler.CFLOW_STACK_HANDLER);
}
private void initDynamicCFlowStackType(SchemaBinding schema)
@@ -353,7 +353,7 @@
private void initPointcutType(SchemaBinding schema)
{
TypeBinding type = schema.getType(pointcutTypeQName);
- type.setHandler(PointcutHandler.HANDLER);
+ type.setHandler(PointcutHandler.POINTCUT_HANDLER);
}
private void initPrepareType(SchemaBinding schema)
@@ -378,14 +378,14 @@
private void initAnnotationType(SchemaBinding schema)
{
TypeBinding type = schema.getType(annotationTypeQName);
- type.setHandler(AnnotationOverrideHandler.HANDLER);
+ type.setHandler(AnnotationOverrideHandler.ANNOTATION_OVERRIDE_HANDLER);
type.setSimpleType(AnnotationCharactersHandler.HANDLER);
}
private void initPrecedenceType(SchemaBinding schema)
{
TypeBinding type = schema.getType(precedenceTypeQName);
- type.setHandler(PrecedenceHandler.HANDLER);
+ type.setHandler(PrecedenceHandler.PRECEDENCE_HANDLER);
type.pushInterceptor(adviceQName, PrecedenceInterceptor.INTERCEPTOR);
type.pushInterceptor(interceptorRefQName, PrecedenceInterceptor.INTERCEPTOR);
}
@@ -395,7 +395,7 @@
TypeBinding type = schema.getType(introductionTypeQName);
type.pushInterceptor(interfacesQName, IntroductionInterfacesInterceptor.INTERCEPTOR);
type.pushInterceptor(mixinQName, IntroductionMixinInterceptor.INTERCEPTOR);
- type.setHandler(IntroductionHandler.HANDLER);
+ type.setHandler(IntroductionHandler.INTRODUCTION_HANDLER);
}
private void initLifecycleType(SchemaBinding schema)
@@ -426,25 +426,25 @@
private void initBeforeType(SchemaBinding schema)
{
TypeBinding type = schema.getType(beforeTypeQName);
- type.setHandler(BeforeHandler.HANDLER);
+ type.setHandler(BeforeHandler.BEFORE_HANDLER);
}
private void initAfterType(SchemaBinding schema)
{
TypeBinding type = schema.getType(afterTypeQName);
- type.setHandler(AfterHandler.HANDLER);
+ type.setHandler(AfterHandler.AFTER_HANDLER);
}
private void initThrowingType(SchemaBinding schema)
{
TypeBinding type = schema.getType(throwingTypeQName);
- type.setHandler(ThrowingHandler.HANDLER);
+ type.setHandler(ThrowingHandler.THROWING_HANDLER);
}
private void initFinallyType(SchemaBinding schema)
{
TypeBinding type = schema.getType(finallyTypeQName);
- type.setHandler(FinallyHandler.HANDLER);
+ type.setHandler(FinallyHandler.FINALLY_HANDLER);
}
private void initCFlowStackEntryType(SchemaBinding schema)
@@ -519,7 +519,7 @@
private static class DomainHandler extends AspectManagerAwareBeanFactoryHandler
{
- public static final DomainHandler HANDLER = new DomainHandler();
+ public static final DomainHandler DOMAIN_HANDLER = new DomainHandler();
@Override
public Object startElement(Object parent, QName name, ElementBinding element)
@@ -733,7 +733,7 @@
private static class CFlowStackHandler extends AspectManagerAwareBeanFactoryHandler
{
- public static final CFlowStackHandler HANDLER = new CFlowStackHandler();
+ public static final CFlowStackHandler CFLOW_STACK_HANDLER = new CFlowStackHandler();
@Override
public Object startElement(Object parent, QName name, ElementBinding element)
@@ -744,7 +744,7 @@
private static class PrecedenceHandler extends AspectManagerAwareBeanFactoryHandler
{
- public static final PrecedenceHandler HANDLER = new PrecedenceHandler();
+ public static final PrecedenceHandler PRECEDENCE_HANDLER = new PrecedenceHandler();
@Override
public Object startElement(Object parent, QName name, ElementBinding element)
@@ -755,7 +755,7 @@
private static class IntroductionHandler extends AspectManagerAwareBeanFactoryHandler
{
- public static final IntroductionHandler HANDLER = new IntroductionHandler();
+ public static final IntroductionHandler INTRODUCTION_HANDLER = new IntroductionHandler();
@Override
public Object startElement(Object parent, QName name, ElementBinding element)
@@ -923,7 +923,7 @@
private static class BeforeHandler extends AdviceHandler
{
- public static final BeforeHandler HANDLER = new BeforeHandler();
+ public static final BeforeHandler BEFORE_HANDLER = new BeforeHandler();
@Override
public void attributes(Object o, QName elementName, ElementBinding element, Attributes attrs, NamespaceContext nsCtx)
@@ -936,7 +936,7 @@
private static class AfterHandler extends AdviceHandler
{
- public static final AfterHandler HANDLER = new AfterHandler();
+ public static final AfterHandler AFTER_HANDLER = new AfterHandler();
@Override
public void attributes(Object o, QName elementName, ElementBinding element, Attributes attrs, NamespaceContext nsCtx)
@@ -949,7 +949,7 @@
private static class ThrowingHandler extends AdviceHandler
{
- public static final ThrowingHandler HANDLER = new ThrowingHandler();
+ public static final ThrowingHandler THROWING_HANDLER = new ThrowingHandler();
@Override
public void attributes(Object o, QName elementName, ElementBinding element, Attributes attrs, NamespaceContext nsCtx)
@@ -962,7 +962,7 @@
private static class FinallyHandler extends AdviceHandler
{
- public static final FinallyHandler HANDLER = new FinallyHandler();
+ public static final FinallyHandler FINALLY_HANDLER = new FinallyHandler();
@Override
public void attributes(Object o, QName elementName, ElementBinding element, Attributes attrs, NamespaceContext nsCtx)
@@ -1129,7 +1129,7 @@
private static class PointcutHandler extends PrepareHandler
{
- public static final PointcutHandler HANDLER = new PointcutHandler();
+ public static final PointcutHandler POINTCUT_HANDLER = new PointcutHandler();
@Override
public Object startElement(Object parent, QName name, ElementBinding element)
@@ -1189,7 +1189,7 @@
private static class AnnotationOverrideHandler extends AnnotationIntroductionHandler
{
- public static final AnnotationOverrideHandler HANDLER = new AnnotationOverrideHandler();
+ public static final AnnotationOverrideHandler ANNOTATION_OVERRIDE_HANDLER = new AnnotationOverrideHandler();
@Override
public Object startElement(Object parent, QName name, ElementBinding element)
Modified: projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/integration/AOPConstructorJoinpoint.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/integration/AOPConstructorJoinpoint.java 2008-02-18 14:18:42 UTC (rev 69883)
+++ projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/integration/AOPConstructorJoinpoint.java 2008-02-18 14:42:07 UTC (rev 69884)
@@ -67,7 +67,7 @@
public Object dispatch() throws Throwable
{
- Class clazz = constructorInfo.getDeclaringClass().getType();
+ Class<?> clazz = constructorInfo.getDeclaringClass().getType();
MetaData metaData = MetaDataStack.peek();
AspectManager manager = AspectManagerFactory.getAspectManager(metaData);
@@ -160,13 +160,13 @@
if (getConstructorInfo().getParameterTypes().length > 0)
{
- Constructor constructor = null;
+ Constructor<?> constructor = null;
if (aopinfo == null)
{
//Fall back to using the class;
- Class clazz = advisor.getClazz();
- Constructor[] ctors = clazz.getConstructors();
- for (Constructor ctor : ctors)
+ Class<?> clazz = advisor.getClazz();
+ Constructor<?>[] ctors = clazz.getConstructors();
+ for (Constructor<?> ctor : ctors)
{
if (matchConstructor(ctor))
{
@@ -199,10 +199,10 @@
return null;
}
- private boolean matchConstructor(Constructor ctor)
+ private boolean matchConstructor(Constructor<?> ctor)
{
TypeInfo[] params = constructorInfo.getParameterTypes();
- Class[] ctorParams = ctor.getParameterTypes();
+ Class<?>[] ctorParams = ctor.getParameterTypes();
if (params.length == ctorParams.length)
{
boolean match = true;
Modified: projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/integration/AOPDependencyBuilder.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/integration/AOPDependencyBuilder.java 2008-02-18 14:18:42 UTC (rev 69883)
+++ projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/integration/AOPDependencyBuilder.java 2008-02-18 14:42:07 UTC (rev 69884)
@@ -75,6 +75,7 @@
private static final String DEPENDENCY_NAME_ATTRIBUTE = "name";
private static final IntrospectionAnnotationHelper helper = new IntrospectionAnnotationHelper();
+ @SuppressWarnings("unchecked")
public List<DependencyBuilderListItem> getDependencies(ClassAdapter classAdapter, MetaData metaData)
{
AspectManager manager = AspectManagerFactory.getAspectManager(metaData);
@@ -89,7 +90,7 @@
{
loader = Thread.currentThread().getContextClassLoader();
}
- Class clazz = loader.loadClass(className);
+ Class<?> clazz = loader.loadClass(className);
Advisor advisor;
synchronized (ContainerCache.mapLock)
@@ -192,6 +193,7 @@
}
}
+ @SuppressWarnings("unchecked")
private void getMethodAnnotationDependencies(ClassInfo classInfo, MetaData metaData, HashSet<String> dependencies) throws Exception
{
Map methodMap = ClassInfoMethodHashing.getMethodMap(classInfo);
@@ -242,7 +244,7 @@
private void getDependenciesForMetaDataAnnotation(Object annotation, HashMap<String, ArrayList<String>> dependencies) throws Exception
{
AnnotationInfo info;
- Class clazz = annotation.getClass().getInterfaces()[0];
+ Class<?> clazz = annotation.getClass().getInterfaces()[0];
try
{
info = (AnnotationInfo)helper.getTypeInfo(clazz);
Modified: projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/junit/AOPMicrocontainerTest.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/junit/AOPMicrocontainerTest.java 2008-02-18 14:18:42 UTC (rev 69883)
+++ projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/junit/AOPMicrocontainerTest.java 2008-02-18 14:42:07 UTC (rev 69884)
@@ -39,7 +39,7 @@
* @return the delegate
* @throws Exception for any error
*/
- public static AbstractTestDelegate getDelegate(Class clazz) throws Exception
+ public static AbstractTestDelegate getDelegate(Class<?> clazz) throws Exception
{
String property = System.getProperty("jboss.mc.secure", "false");
boolean enableSecurity = Boolean.valueOf(property).booleanValue();
Modified: projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/junit/AOPMicrocontainerTestDelegate.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/junit/AOPMicrocontainerTestDelegate.java 2008-02-18 14:18:42 UTC (rev 69883)
+++ projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/junit/AOPMicrocontainerTestDelegate.java 2008-02-18 14:42:07 UTC (rev 69884)
@@ -38,7 +38,7 @@
public class AOPMicrocontainerTestDelegate extends MicrocontainerTestDelegate
{
/** The deployed urls */
- private static final CopyOnWriteArrayList urls = new CopyOnWriteArrayList();
+ private static final CopyOnWriteArrayList<URL> urls = new CopyOnWriteArrayList<URL>();
/**
* Create a new AOPMicrocontainerTestDelegate.
@@ -46,7 +46,7 @@
* @param clazz the class
* @throws Exception for any error
*/
- public AOPMicrocontainerTestDelegate(Class clazz) throws Exception
+ public AOPMicrocontainerTestDelegate(Class<?> clazz) throws Exception
{
super(clazz);
}
@@ -76,9 +76,9 @@
{
super.undeploy();
- for (Iterator i = urls.iterator(); i.hasNext();)
+ for (Iterator<URL> i = urls.iterator(); i.hasNext();)
{
- URL url = (URL) i.next();
+ URL url = i.next();
undeployAOP(url);
}
}
Modified: projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/junit/AbstractProxyTest.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/junit/AbstractProxyTest.java 2008-02-18 14:18:42 UTC (rev 69883)
+++ projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/junit/AbstractProxyTest.java 2008-02-18 14:42:07 UTC (rev 69884)
@@ -50,7 +50,7 @@
* @return the delegate
* @throws Exception for any error
*/
- public static AbstractTestDelegate getDelegate(Class clazz) throws Exception
+ public static AbstractTestDelegate getDelegate(Class<?> clazz) throws Exception
{
String property = System.getProperty("jboss.mc.secure", "false");
boolean enableSecurity = Boolean.valueOf(property).booleanValue();
@@ -99,7 +99,7 @@
* @return the proxy
* @throws Exception for any error
*/
- protected Object assertCreateProxy(Object target, Class expected) throws Exception
+ protected Object assertCreateProxy(Object target, Class<?> expected) throws Exception
{
Object proxy = createProxy(target);
assertNotNull(proxy);
@@ -115,7 +115,7 @@
* @return the proxy
* @throws Exception for any error
*/
- protected Object createProxy(Object target, Class[] interfaces) throws Exception
+ protected Object createProxy(Object target, Class<?>[] interfaces) throws Exception
{
AOPProxyFactoryParameters params = new AOPProxyFactoryParameters();
params.setProxiedClass(target.getClass());
@@ -150,7 +150,7 @@
* @return the proxy
* @throws Exception for any error
*/
- protected Object createProxy(Object target, Class[] interfaces, AOPProxyFactoryMixin[] mixins) throws Exception
+ protected Object createProxy(Object target, Class<?>[] interfaces, AOPProxyFactoryMixin[] mixins) throws Exception
{
AOPProxyFactoryParameters params = new AOPProxyFactoryParameters();
params.setProxiedClass(target.getClass());
@@ -168,7 +168,7 @@
* @return the proxy
* @throws Exception for any error
*/
- protected Object assertCreateProxy(Object target, AOPProxyFactoryMixin[] mixins, Class expected) throws Exception
+ protected Object assertCreateProxy(Object target, AOPProxyFactoryMixin[] mixins, Class<?> expected) throws Exception
{
Object proxy = createProxy(target, mixins);
assertNotNull(proxy);
@@ -186,7 +186,7 @@
* @return the proxy
* @throws Exception for any error
*/
- protected Object assertCreateProxy(Object target, Class[] interfaces, AOPProxyFactoryMixin[] mixins, Class[] expected) throws Exception
+ protected Object assertCreateProxy(Object target, Class<?>[] interfaces, AOPProxyFactoryMixin[] mixins, Class<?>[] expected) throws Exception
{
Object proxy = createProxy(target, interfaces, mixins);
assertNotNull(proxy);
@@ -206,7 +206,7 @@
* @return the proxy
* @throws Exception for any error
*/
- protected Object assertCreateProxy(Object target, Class[] interfaces, Class expected) throws Exception
+ protected Object assertCreateProxy(Object target, Class<?>[] interfaces, Class<?> expected) throws Exception
{
Object proxy = createProxy(target, interfaces);
assertNotNull(proxy);
@@ -223,7 +223,7 @@
* @return the proxy
* @throws Exception for any error
*/
- protected Object createProxy(Object target, Class[] interfaces, SimpleMetaData metaData) throws Exception
+ protected Object createProxy(Object target, Class<?>[] interfaces, SimpleMetaData metaData) throws Exception
{
AOPProxyFactoryParameters params = new AOPProxyFactoryParameters();
params.setProxiedClass(target.getClass());
@@ -243,7 +243,7 @@
* @return the proxy
* @throws Exception for any error
*/
- protected Object assertCreateProxy(Object target, Class[] interfaces, SimpleMetaData metaData, Class expected) throws Exception
+ protected Object assertCreateProxy(Object target, Class<?>[] interfaces, SimpleMetaData metaData, Class<?> expected) throws Exception
{
Object proxy = createProxy(target, interfaces, metaData);
assertNotNull(proxy);
@@ -259,7 +259,7 @@
* @return the proxy
* @throws Exception for any error
*/
- protected Object createHollowProxy(Class[] interfaces, SimpleMetaData metaData) throws Exception
+ protected Object createHollowProxy(Class<?>[] interfaces, SimpleMetaData metaData) throws Exception
{
AOPProxyFactoryParameters params = new AOPProxyFactoryParameters();
params.setInterfaces(interfaces);
@@ -292,7 +292,7 @@
* @return the proxy
* @throws Exception for any error
*/
- protected Object createHollowProxy(Class[] interfaces, AOPProxyFactoryMixin[] mixins, SimpleMetaData metaData) throws Exception
+ protected Object createHollowProxy(Class<?>[] interfaces, AOPProxyFactoryMixin[] mixins, SimpleMetaData metaData) throws Exception
{
AOPProxyFactoryParameters params = new AOPProxyFactoryParameters();
params.setInterfaces(interfaces);
@@ -310,7 +310,7 @@
* @return the proxy
* @throws Exception for any error
*/
- protected Object assertCreateHollowProxy(Class[] interfaces, SimpleMetaData metaData, Class expected) throws Exception
+ protected Object assertCreateHollowProxy(Class<?>[] interfaces, SimpleMetaData metaData, Class<?> expected) throws Exception
{
Object proxy = createHollowProxy(interfaces, metaData);
assertNotNull(proxy);
@@ -327,7 +327,7 @@
* @return the proxy
* @throws Exception for any error
*/
- protected Object assertCreateHollowProxy(AOPProxyFactoryMixin[] mixins, SimpleMetaData metaData, Class expected) throws Exception
+ protected Object assertCreateHollowProxy(AOPProxyFactoryMixin[] mixins, SimpleMetaData metaData, Class<?> expected) throws Exception
{
Object proxy = createHollowProxy(mixins, metaData);
assertNotNull(proxy);
@@ -345,7 +345,7 @@
* @return the proxy
* @throws Exception for any error
*/
- protected Object assertCreateHollowProxy(Class[] interfaces, AOPProxyFactoryMixin[] mixins, SimpleMetaData metaData, Class[] expected) throws Exception
+ protected Object assertCreateHollowProxy(Class<?>[] interfaces, AOPProxyFactoryMixin[] mixins, SimpleMetaData metaData, Class<?>[] expected) throws Exception
{
Object proxy = createHollowProxy(interfaces, mixins, metaData);
assertNotNull(proxy);
@@ -361,9 +361,9 @@
* @param object the object
* @return the set of interfaces
*/
- protected Set getInterfaces(Object object)
+ protected Set<Class<?>> getInterfaces(Object object)
{
- Set<Class> interfaces = new HashSet<Class>();
+ Set<Class<?>> interfaces = new HashSet<Class<?>>();
addInterfaces(interfaces, object.getClass());
return interfaces;
}
@@ -374,12 +374,12 @@
* @param interfaces the interfaces to add to
* @param clazz the class
*/
- protected void addInterfaces(Set<Class> interfaces, Class clazz)
+ protected void addInterfaces(Set<Class<?>> interfaces, Class<?> clazz)
{
- Class[] intfs = clazz.getInterfaces();
+ Class<?>[] intfs = clazz.getInterfaces();
for (int i = 0; i < intfs.length; ++i)
interfaces.add(intfs[i]);
- Class superClass = clazz.getSuperclass();
+ Class<?> superClass = clazz.getSuperclass();
if (superClass != null)
addInterfaces(interfaces, superClass);
}
Modified: projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/junit/AbstractProxyTestDelegate.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/junit/AbstractProxyTestDelegate.java 2008-02-18 14:18:42 UTC (rev 69883)
+++ projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/junit/AbstractProxyTestDelegate.java 2008-02-18 14:42:07 UTC (rev 69884)
@@ -40,7 +40,7 @@
* @param clazz the test class
* @throws Exception for any error
*/
- public AbstractProxyTestDelegate(Class clazz) throws Exception
+ public AbstractProxyTestDelegate(Class<?> clazz) throws Exception
{
super(clazz);
}
Modified: projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/junit/ScopingAOPMicrocontainerTestDelegate.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/junit/ScopingAOPMicrocontainerTestDelegate.java 2008-02-18 14:18:42 UTC (rev 69883)
+++ projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/junit/ScopingAOPMicrocontainerTestDelegate.java 2008-02-18 14:42:07 UTC (rev 69884)
@@ -35,7 +35,7 @@
*/
public class ScopingAOPMicrocontainerTestDelegate extends AOPMicrocontainerTestDelegate
{
- public ScopingAOPMicrocontainerTestDelegate(Class clazz)
+ public ScopingAOPMicrocontainerTestDelegate(Class<?> clazz)
throws Exception
{
super(clazz);
Modified: projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/Interceptions.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/Interceptions.java 2008-02-18 14:18:42 UTC (rev 69883)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/Interceptions.java 2008-02-18 14:42:07 UTC (rev 69884)
@@ -31,14 +31,14 @@
*/
public class Interceptions
{
- private static List interceptions = new ArrayList();
+ private static List<Object> interceptions = new ArrayList<Object>();
public static void add(Object o)
{
interceptions.add(o);
}
- public static List interceptions()
+ public static List<Object> interceptions()
{
return interceptions;
}
Modified: projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/TestMetaDataLoader.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/TestMetaDataLoader.java 2008-02-18 14:18:42 UTC (rev 69883)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/TestMetaDataLoader.java 2008-02-18 14:42:07 UTC (rev 69884)
@@ -63,6 +63,7 @@
}
}
+ @SuppressWarnings("unchecked")
public void bind(Advisor advisor, ClassMetaDataBinding data, Method[] methods, Field[] fields, Constructor[] constructors) throws Exception
{
for (int i = 0 ; i < methods.length ; i++)
Modified: projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/DomainProxyTest.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/DomainProxyTest.java 2008-02-18 14:18:42 UTC (rev 69883)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/DomainProxyTest.java 2008-02-18 14:42:07 UTC (rev 69884)
@@ -21,9 +21,6 @@
*/
package org.jboss.test.microcontainer.beans.test;
-import java.util.HashSet;
-import java.util.Set;
-
import org.jboss.aop.AspectManager;
import org.jboss.aop.DomainDefinition;
import org.jboss.aop.microcontainer.junit.AOPMicrocontainerTest;
Modified: projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/DomainSimpleTest.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/DomainSimpleTest.java 2008-02-18 14:18:42 UTC (rev 69883)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/DomainSimpleTest.java 2008-02-18 14:42:07 UTC (rev 69884)
@@ -77,6 +77,7 @@
checkArtifacts(manager, false);
}
+ @SuppressWarnings("unchecked")
private void checkArtifacts(AspectManager manager, boolean shouldBeThere)
{
Object o = manager.getTypedef("TypeDef");
@@ -119,6 +120,7 @@
else assertNull(o);
}
+ @SuppressWarnings("unchecked")
private void checkShouldBeThere(Collection coll, boolean shouldBeThere)
{
if (shouldBeThere)
@@ -135,6 +137,7 @@
}
}
+ @SuppressWarnings("unchecked")
private void checkShouldBeThere(Map coll, boolean shouldBeThere)
{
if (shouldBeThere)
Modified: projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/LightweightAspectTest.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/LightweightAspectTest.java 2008-02-18 14:18:42 UTC (rev 69883)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/LightweightAspectTest.java 2008-02-18 14:42:07 UTC (rev 69884)
@@ -23,16 +23,11 @@
import java.util.List;
-import org.jboss.aop.Advised;
import org.jboss.aop.advice.AdviceType;
import org.jboss.aop.microcontainer.beans.AspectBinding;
import org.jboss.aop.microcontainer.beans.BindingEntry;
import org.jboss.aop.microcontainer.beans.InterceptorEntry;
import org.jboss.aop.microcontainer.junit.AOPMicrocontainerTest;
-import org.jboss.aop.proxy.container.AspectManaged;
-import org.jboss.test.microcontainer.beans.Interceptions;
-import org.jboss.test.microcontainer.beans.POJO;
-import org.jboss.test.microcontainer.beans.TestAspect;
/**
*
Modified: projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/PrecedenceTest.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/PrecedenceTest.java 2008-02-18 14:18:42 UTC (rev 69883)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/PrecedenceTest.java 2008-02-18 14:42:07 UTC (rev 69884)
@@ -48,7 +48,7 @@
POJO pojo = (POJO)getBean("Bean");
pojo.method(2);
- List interceptions = Interceptions.interceptions();
+ List<Object> interceptions = Interceptions.interceptions();
assertEquals(2, interceptions.size());
assertEquals(TestInterceptor.class, interceptions.get(0).getClass());
Modified: projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/matrix/DynamicAspectDeployer.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/matrix/DynamicAspectDeployer.java 2008-02-18 14:18:42 UTC (rev 69883)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/matrix/DynamicAspectDeployer.java 2008-02-18 14:42:07 UTC (rev 69884)
@@ -32,7 +32,7 @@
*/
public class DynamicAspectDeployer
{
- public static String addBinding(String pointcut, Class interceptor) throws ParseException
+ public static String addBinding(String pointcut, Class<?> interceptor) throws ParseException
{
AdviceBinding binding = new AdviceBinding(pointcut, null);
String name = binding.getName();
Modified: projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/support/LifecycleCallback.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/support/LifecycleCallback.java 2008-02-18 14:18:42 UTC (rev 69883)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/support/LifecycleCallback.java 2008-02-18 14:42:07 UTC (rev 69884)
@@ -36,7 +36,8 @@
*/
public class LifecycleCallback
{
- public static Map<String, ArrayList<Class>> interceptions = new HashMap<String, ArrayList<Class>>();
+ public static Map<String, ArrayList<Class<?>>> interceptions = new HashMap<String, ArrayList<Class<?>>>();
+ @SuppressWarnings("unchecked")
Class[] lifecycleAnnotations = new Class[] {Configure.class, Create.class, Describe.class, Install.class, Instantiate.class, Start.class};
public String getName()
{
@@ -74,13 +75,13 @@
}
}
- private void addInterception(ControllerContext context, Class annotation)
+ private void addInterception(ControllerContext context, Class<?> annotation)
{
String name = (String)context.getName();
- ArrayList<Class> beanInterceptions = interceptions.get(name);
+ ArrayList<Class<?>> beanInterceptions = interceptions.get(name);
if (beanInterceptions == null)
{
- beanInterceptions = new ArrayList<Class>();
+ beanInterceptions = new ArrayList<Class<?>>();
interceptions.put(name, beanInterceptions);
}
beanInterceptions.add(annotation);
Modified: projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/support/MetaDataContextInterceptor.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/support/MetaDataContextInterceptor.java 2008-02-18 14:18:42 UTC (rev 69883)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/support/MetaDataContextInterceptor.java 2008-02-18 14:42:07 UTC (rev 69884)
@@ -34,7 +34,7 @@
public static Object classAnnotation;
public static Object joinpointAnnotation;
- private Class annotationType;
+ private Class<?> annotationType;
public static void reset()
{
Modified: projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/test/JMXLifecycleTestCase.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/test/JMXLifecycleTestCase.java 2008-02-18 14:18:42 UTC (rev 69883)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/test/JMXLifecycleTestCase.java 2008-02-18 14:42:07 UTC (rev 69884)
@@ -29,12 +29,8 @@
import junit.framework.Test;
-import org.jboss.aop.microcontainer.aspects.jmx.JMX;
import org.jboss.aop.microcontainer.junit.AOPMicrocontainerTest;
import org.jboss.test.microcontainer.support.JmxRegistrant;
-import org.jboss.test.microcontainer.support.MetaDataContextInterceptor;
-import org.jboss.test.microcontainer.support.SimpleBean;
-import org.jboss.test.microcontainer.support.SimpleBeanImplMBean;
public class JMXLifecycleTestCase extends AOPMicrocontainerTest
{
Modified: projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/test/LifecycleTestCase.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/test/LifecycleTestCase.java 2008-02-18 14:18:42 UTC (rev 69883)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/test/LifecycleTestCase.java 2008-02-18 14:42:07 UTC (rev 69884)
@@ -99,12 +99,12 @@
assertNotNull(bean);
}
- public void checkExpectedAnnotations(String name, Class annotation)
+ public void checkExpectedAnnotations(String name, Class<?> annotation)
{
- ArrayList<Class> events = LifecycleCallback.interceptions.get(name);
+ ArrayList<Class<?>> events = LifecycleCallback.interceptions.get(name);
assertNotNull(events);
assertEquals("Wrong events, expected one element only " + events, 1, events.size());
- Class actualAnnotation = events.get(0);
+ Class<?> actualAnnotation = events.get(0);
assertEquals(annotation, actualAnnotation);
}
}
Modified: projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/test/MethodHashingTestCase.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/test/MethodHashingTestCase.java 2008-02-18 14:18:42 UTC (rev 69883)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/test/MethodHashingTestCase.java 2008-02-18 14:42:07 UTC (rev 69884)
@@ -54,9 +54,10 @@
}
+ @SuppressWarnings("unchecked")
public void testDeclaredMethodHashing() throws Exception
{
- Class clazz = SubClass.class;
+ Class<?> clazz = SubClass.class;
CtClass ctclass = getCtClass(clazz);
ClassInfo classInfoReflect = getIntrospectTypeInfo(clazz);
ClassInfo classInfoJavassist = getJavassistTypeInfo(clazz);
@@ -88,6 +89,7 @@
}
}
+ @SuppressWarnings("unchecked")
public void testMethodHashing() throws Exception
{
Class clazz = SubClass.class;
@@ -122,25 +124,26 @@
}
}
- private CtClass getCtClass(Class clazz) throws Exception
+ private CtClass getCtClass(Class<?> clazz) throws Exception
{
return ReflectToJavassist.classToJavassist(clazz);
}
- private ClassInfo getIntrospectTypeInfo(Class clazz)
+ private ClassInfo getIntrospectTypeInfo(Class<?> clazz)
{
IntrospectionTypeInfoFactory typeInfoFactory = new IntrospectionTypeInfoFactory();
ClassInfo classInfo = (ClassInfo)typeInfoFactory.getTypeInfo(clazz);
return classInfo;
}
- private ClassInfo getJavassistTypeInfo(Class clazz)
+ private ClassInfo getJavassistTypeInfo(Class<?> clazz)
{
JavassistTypeInfoFactory typeInfoFactory = new JavassistTypeInfoFactory();
ClassInfo classInfo = (ClassInfo)typeInfoFactory.getTypeInfo(clazz);
return classInfo;
}
+ @SuppressWarnings("unchecked")
private void compareMaps(Map mapA, Map mapB, int expecedSize)
{
assertEquals(expecedSize, mapA.size());
Modified: projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/test/ScopingAopTestCase.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/test/ScopingAopTestCase.java 2008-02-18 14:18:42 UTC (rev 69883)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/test/ScopingAopTestCase.java 2008-02-18 14:42:07 UTC (rev 69884)
@@ -53,7 +53,7 @@
* @return the delegate
* @throws Exception for any error
*/
- public static AbstractTestDelegate getDelegate(Class clazz) throws Exception
+ public static AbstractTestDelegate getDelegate(Class<?> clazz) throws Exception
{
String property = System.getProperty("jboss.mc.secure", "false");
boolean enableSecurity = Boolean.valueOf(property);
Modified: projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/xml/test/AbstractAOPXMLTest.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/xml/test/AbstractAOPXMLTest.java 2008-02-18 14:18:42 UTC (rev 69883)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/xml/test/AbstractAOPXMLTest.java 2008-02-18 14:42:07 UTC (rev 69884)
@@ -24,6 +24,7 @@
import java.net.URL;
import java.util.List;
+import org.jboss.beans.metadata.spi.BeanMetaData;
import org.jboss.beans.metadata.spi.BeanMetaDataFactory;
import org.jboss.test.AbstractTestCaseWithSetup;
import org.jboss.test.AbstractTestDelegate;
@@ -43,7 +44,8 @@
super(name);
}
- protected Object assertType(List beans, int index, Class clazz)
+ @SuppressWarnings("unchecked")
+ protected Object assertType(List beans, int index, Class<?> clazz)
{
Object object = beans.get(index);
assertNotNull("Got null, expected bean " + index + " to be a " + clazz.getName(), object);
@@ -59,10 +61,10 @@
* @return the unmarshalled beans
* @throws Exception for any error
*/
- protected List unmarshalBeans(String name, int size) throws Exception
+ protected List<BeanMetaData> unmarshalBeans(String name, int size) throws Exception
{
BeanMetaDataFactory factory = (BeanMetaDataFactory) unmarshal(name, BeanMetaDataFactory.class);
- List beans = factory.getBeans();
+ List<BeanMetaData> beans = factory.getBeans();
assertNotNull(beans);
assertEquals(size, beans.size());
return beans;
@@ -100,7 +102,7 @@
return url.toString();
}
- protected void checkJBossXBException(Class expected, Throwable throwable)
+ protected void checkJBossXBException(Class<? extends Throwable> expected, Throwable throwable)
{
checkThrowable(JBossXBException.class, throwable);
JBossXBException e = (JBossXBException) throwable;
@@ -114,7 +116,7 @@
* @return the delegate
* @throws Exception for any error
*/
- public static AbstractTestDelegate getDelegate(Class clazz) throws Exception
+ public static AbstractTestDelegate getDelegate(Class<?> clazz) throws Exception
{
return new XMLTestDelegate(clazz);
}
Modified: projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/xml/test/AspectTestCase.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/xml/test/AspectTestCase.java 2008-02-18 14:18:42 UTC (rev 69883)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/xml/test/AspectTestCase.java 2008-02-18 14:42:07 UTC (rev 69884)
@@ -39,7 +39,7 @@
{
public void testDeployment() throws Exception
{
- List beans = unmarshalBeans("Aspect.xml", 2);
+ List<BeanMetaData> beans = unmarshalBeans("Aspect.xml", 2);
GenericBeanFactoryMetaData adviceFactory = (GenericBeanFactoryMetaData) assertType(beans, 0, GenericBeanFactoryMetaData.class);
assertEquals("Factory$TestAspect", adviceFactory.getName());
Modified: projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/xml/test/XMLTestDelegate.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/xml/test/XMLTestDelegate.java 2008-02-18 14:18:42 UTC (rev 69883)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/xml/test/XMLTestDelegate.java 2008-02-18 14:42:07 UTC (rev 69884)
@@ -46,7 +46,7 @@
*
* @param clazz the test class
*/
- public XMLTestDelegate(Class clazz)
+ public XMLTestDelegate(Class<?> clazz)
{
super(clazz);
}
More information about the jboss-cvs-commits
mailing list