[jboss-cvs] JBossAS SVN: r69888 - in projects/microcontainer/trunk: container/src/main/org/jboss/annotation/factory and 48 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Feb 18 11:09:13 EST 2008
Author: adrian at jboss.org
Date: 2008-02-18 11:09:12 -0500 (Mon, 18 Feb 2008)
New Revision: 69888
Modified:
projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/integration/AOPDependencyBuilder.java
projects/microcontainer/trunk/container/src/main/org/jboss/annotation/factory/AnnotationCreator.java
projects/microcontainer/trunk/container/src/main/org/jboss/annotation/factory/AnnotationProxy.java
projects/microcontainer/trunk/container/src/main/org/jboss/annotation/factory/AnnotationValidator.java
projects/microcontainer/trunk/container/src/main/org/jboss/annotation/factory/SimpleAnnotationValidator.java
projects/microcontainer/trunk/container/src/main/org/jboss/annotation/factory/ast/AnnotationParser.java
projects/microcontainer/trunk/container/src/main/org/jboss/annotation/factory/ast/JJTAnnotationParserState.java
projects/microcontainer/trunk/container/src/main/org/jboss/annotation/factory/javassist/AnnotationProxy.java
projects/microcontainer/trunk/container/src/main/org/jboss/annotation/factory/javassist/DefaultValueAnnotationValidator.java
projects/microcontainer/trunk/container/src/main/org/jboss/annotation/factory/javassist/MemberValueGetter.java
projects/microcontainer/trunk/container/src/main/org/jboss/annotation/factory/javassist/ProxyMapCreator.java
projects/microcontainer/trunk/container/src/main/org/jboss/beans/info/plugins/AbstractBeanInfo.java
projects/microcontainer/trunk/container/src/main/org/jboss/beans/info/spi/BeanInfo.java
projects/microcontainer/trunk/container/src/main/org/jboss/beans/info/spi/helpers/UnmodifiableBeanInfo.java
projects/microcontainer/trunk/container/src/main/org/jboss/classadapter/plugins/BasicClassAdapter.java
projects/microcontainer/trunk/container/src/main/org/jboss/classadapter/plugins/BasicClassAdapterFactory.java
projects/microcontainer/trunk/container/src/main/org/jboss/classadapter/plugins/dependency/AbstractDependencyBuilder.java
projects/microcontainer/trunk/container/src/main/org/jboss/classadapter/spi/ClassAdapter.java
projects/microcontainer/trunk/container/src/main/org/jboss/classadapter/spi/ClassAdapterFactory.java
projects/microcontainer/trunk/container/src/main/org/jboss/classadapter/spi/DependencyBuilder.java
projects/microcontainer/trunk/container/src/main/org/jboss/classloading/spi/ClassLoadingDomain.java
projects/microcontainer/trunk/container/src/main/org/jboss/classloading/spi/DomainClassLoader.java
projects/microcontainer/trunk/container/src/main/org/jboss/config/plugins/AbstractConfiguration.java
projects/microcontainer/trunk/container/src/main/org/jboss/config/plugins/property/PropertyConfiguration.java
projects/microcontainer/trunk/container/src/main/org/jboss/config/spi/Configuration.java
projects/microcontainer/trunk/container/src/main/org/jboss/javabean/plugins/xml/ConfigurationUtil.java
projects/microcontainer/trunk/container/src/main/org/jboss/metadata/generic/GenericMatcher.java
projects/microcontainer/trunk/container/src/main/org/jboss/metadata/plugins/context/AbstractMetaDataContext.java
projects/microcontainer/trunk/container/src/main/org/jboss/metadata/plugins/context/CachingMetaDataContext.java
projects/microcontainer/trunk/container/src/main/org/jboss/metadata/plugins/loader/BasicMetaDataLoader.java
projects/microcontainer/trunk/container/src/main/org/jboss/metadata/plugins/loader/memory/MemoryMetaDataLoader.java
projects/microcontainer/trunk/container/src/main/org/jboss/metadata/plugins/loader/thread/ThreadLocalMetaDataLoader.java
projects/microcontainer/trunk/container/src/main/org/jboss/metadata/spi/retrieval/AnnotationsItem.java
projects/microcontainer/trunk/container/src/main/org/jboss/metadata/spi/retrieval/MetaDataRetrieval.java
projects/microcontainer/trunk/container/src/main/org/jboss/metadata/spi/retrieval/MetaDataRetrievalToMetaDataBridge.java
projects/microcontainer/trunk/container/src/main/org/jboss/metadata/spi/retrieval/MetaDatasItem.java
projects/microcontainer/trunk/container/src/main/org/jboss/metadata/spi/retrieval/basic/BasicAnnotationItem.java
projects/microcontainer/trunk/container/src/main/org/jboss/metadata/spi/retrieval/basic/BasicAnnotationsItem.java
projects/microcontainer/trunk/container/src/main/org/jboss/metadata/spi/retrieval/basic/BasicMetaDataItem.java
projects/microcontainer/trunk/container/src/main/org/jboss/metadata/spi/retrieval/basic/BasicMetaDatasItem.java
projects/microcontainer/trunk/container/src/main/org/jboss/metadata/spi/retrieval/cummulative/CummulativeAnnotationsItem.java
projects/microcontainer/trunk/container/src/main/org/jboss/metadata/spi/retrieval/cummulative/CummulativeMetaDatasItem.java
projects/microcontainer/trunk/container/src/main/org/jboss/metadata/spi/retrieval/helper/AnnotationToMetaDataBridge.java
projects/microcontainer/trunk/container/src/main/org/jboss/metadata/spi/retrieval/helper/AnnotationsToMetaDatasBridge.java
projects/microcontainer/trunk/container/src/main/org/jboss/metadata/spi/retrieval/helper/MetaDataToAnnotationBridge.java
projects/microcontainer/trunk/container/src/main/org/jboss/metadata/spi/retrieval/simple/SimpleAnnotationItem.java
projects/microcontainer/trunk/container/src/main/org/jboss/metadata/spi/retrieval/simple/SimpleAnnotationsItem.java
projects/microcontainer/trunk/container/src/main/org/jboss/metadata/spi/retrieval/simple/SimpleMetaDataItem.java
projects/microcontainer/trunk/container/src/main/org/jboss/metadata/spi/retrieval/simple/SimpleMetaDatasItem.java
projects/microcontainer/trunk/container/src/main/org/jboss/metadata/spi/scope/ScopeFactoryLookup.java
projects/microcontainer/trunk/container/src/main/org/jboss/metadata/spi/scope/ScopeKeyFactoryLookup.java
projects/microcontainer/trunk/container/src/main/org/jboss/reflect/plugins/AnnotationValueFactory.java
projects/microcontainer/trunk/container/src/main/org/jboss/reflect/plugins/ClassInfoHelper.java
projects/microcontainer/trunk/container/src/main/org/jboss/reflect/plugins/ClassInfoImpl.java
projects/microcontainer/trunk/container/src/main/org/jboss/reflect/plugins/TypeInfoAttachments.java
projects/microcontainer/trunk/container/src/main/org/jboss/reflect/plugins/introspection/IntrospectionTypeInfoFactory.java
projects/microcontainer/trunk/container/src/main/org/jboss/reflect/plugins/introspection/IntrospectionTypeInfoFactoryImpl.java
projects/microcontainer/trunk/container/src/main/org/jboss/reflect/plugins/introspection/ReflectConstructorInfoImpl.java
projects/microcontainer/trunk/container/src/main/org/jboss/reflect/plugins/introspection/ReflectionUtils.java
projects/microcontainer/trunk/container/src/main/org/jboss/reflect/plugins/javassist/JavassistAnnotatedParameterInfo.java
projects/microcontainer/trunk/container/src/main/org/jboss/reflect/plugins/javassist/JavassistReflectionFactory.java
projects/microcontainer/trunk/container/src/main/org/jboss/reflect/plugins/javassist/JavassistTypeInfo.java
projects/microcontainer/trunk/container/src/main/org/jboss/reflect/plugins/javassist/JavassistTypeInfoFactory.java
projects/microcontainer/trunk/container/src/main/org/jboss/reflect/plugins/javassist/JavassistTypeInfoFactoryImpl.java
projects/microcontainer/trunk/container/src/main/org/jboss/reflect/spi/DelegateClassInfo.java
projects/microcontainer/trunk/container/src/main/org/jboss/reflect/spi/PrimitiveInfo.java
projects/microcontainer/trunk/container/src/main/org/jboss/reflect/spi/TypeInfo.java
projects/microcontainer/trunk/container/src/main/org/jboss/reflect/spi/TypeInfoFactory.java
projects/microcontainer/trunk/container/src/tests/org/jboss/test/ContainerTest.java
projects/microcontainer/trunk/container/src/tests/org/jboss/test/annotation/factory/support/Complex.java
projects/microcontainer/trunk/container/src/tests/org/jboss/test/annotation/factory/support/ComplexWithDefault.java
projects/microcontainer/trunk/container/src/tests/org/jboss/test/beaninfo/support/BeanInfoConstructors.java
projects/microcontainer/trunk/container/src/tests/org/jboss/test/beaninfo/test/AbstractBeanInfoTest.java
projects/microcontainer/trunk/container/src/tests/org/jboss/test/beaninfo/test/BeanInfoUnitTestCase.java
projects/microcontainer/trunk/container/src/tests/org/jboss/test/classinfo/support/ClassInfoConstructorClass.java
projects/microcontainer/trunk/container/src/tests/org/jboss/test/classinfo/support/ClassInfoGenericExtendsCollectionNotGeneric.java
projects/microcontainer/trunk/container/src/tests/org/jboss/test/classinfo/support/ClassInfoGenericExtendsMapNotGeneric.java
projects/microcontainer/trunk/container/src/tests/org/jboss/test/classinfo/support/ClassInfoGenericImplementsCollectionNotGeneric.java
projects/microcontainer/trunk/container/src/tests/org/jboss/test/classinfo/support/ClassInfoGenericImplementsMapNotGeneric.java
projects/microcontainer/trunk/container/src/tests/org/jboss/test/classinfo/support/ComplexAnnotation.java
projects/microcontainer/trunk/container/src/tests/org/jboss/test/classinfo/support/ExpectedAnnotations.java
projects/microcontainer/trunk/container/src/tests/org/jboss/test/classinfo/support/JDK14ExpectedAnnotations.java
projects/microcontainer/trunk/container/src/tests/org/jboss/test/classinfo/support/JDK50ExpectedAnnotations.java
projects/microcontainer/trunk/container/src/tests/org/jboss/test/classinfo/test/AbstractClassInfoTest.java
projects/microcontainer/trunk/container/src/tests/org/jboss/test/classinfo/test/AnnotatedClassInfoTest.java
projects/microcontainer/trunk/container/src/tests/org/jboss/test/classinfo/test/ByteArrayUnitTestCase.java
projects/microcontainer/trunk/container/src/tests/org/jboss/test/classinfo/test/ClassInfoClassTest.java
projects/microcontainer/trunk/container/src/tests/org/jboss/test/classinfo/test/ClassInfoEnumTest.java
projects/microcontainer/trunk/container/src/tests/org/jboss/test/classinfo/test/ClassInfoGenericClassTest.java
projects/microcontainer/trunk/container/src/tests/org/jboss/test/classinfo/test/ClassInfoGenericInterfaceTest.java
projects/microcontainer/trunk/container/src/tests/org/jboss/test/classinfo/test/ClassInfoInterfaceTest.java
projects/microcontainer/trunk/container/src/tests/org/jboss/test/classinfo/test/ClassInfoTest.java
projects/microcontainer/trunk/container/src/tests/org/jboss/test/ioc/test/AbstractIoCTest.java
projects/microcontainer/trunk/container/src/tests/org/jboss/test/ioc/test/IoCTestDelegate.java
projects/microcontainer/trunk/container/src/tests/org/jboss/test/javabean/test/AbstractJavaBeanTest.java
projects/microcontainer/trunk/container/src/tests/org/jboss/test/javabean/test/JavaBeanTestDelegate.java
projects/microcontainer/trunk/container/src/tests/org/jboss/test/javabean/test/OldAbstractJavaBeanTest.java
projects/microcontainer/trunk/container/src/tests/org/jboss/test/joinpoint/test/JoinpointTest.java
projects/microcontainer/trunk/container/src/tests/org/jboss/test/memorytests/ClassInfoMemoryTestCase.java
projects/microcontainer/trunk/container/src/tests/org/jboss/test/metadata/AbstractMetaDataTest.java
projects/microcontainer/trunk/container/src/tests/org/jboss/test/metadata/SignatureMetaDataTest.java
projects/microcontainer/trunk/container/src/tests/org/jboss/test/metadata/context/cache/support/TestMetaDataLoader.java
projects/microcontainer/trunk/container/src/tests/org/jboss/test/metadata/context/cache/test/SimpleCacheMetaDataContextUnitTestCase.java
projects/microcontainer/trunk/container/src/tests/org/jboss/test/metadata/context/cache/test/SimpleCacheParentMetaDataContextUnitTestCase.java
projects/microcontainer/trunk/container/src/tests/org/jboss/test/metadata/loader/memory/test/MemoryLoaderComponentMutableUnitTestCase.java
projects/microcontainer/trunk/container/src/tests/org/jboss/test/metadata/loader/reflection/support/ConstructorBean.java
projects/microcontainer/trunk/container/src/tests/org/jboss/test/metadata/loader/reflection/support/MethodBean.java
projects/microcontainer/trunk/container/src/tests/org/jboss/test/metadata/loader/reflection/support/MethodParamBean.java
projects/microcontainer/trunk/container/src/tests/org/jboss/test/metadata/retrieval/support/TestMetaDataRetrieval.java
projects/microcontainer/trunk/container/src/tests/org/jboss/test/metadata/retrieval/test/BasicUnitTestCase.java
projects/microcontainer/trunk/container/src/tests/org/jboss/test/metadata/retrieval/test/CummulativeUnitTestCase.java
projects/microcontainer/trunk/container/src/tests/org/jboss/test/metadata/retrieval/test/HelpersUnitTestCase.java
projects/microcontainer/trunk/container/src/tests/org/jboss/test/metadata/retrieval/test/SimpleUnitTestCase.java
projects/microcontainer/trunk/container/src/tests/org/jboss/test/xb/builder/AbstractBuilderTest.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/CallbackCreatorUtil.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/dependency/DescribeAction.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/dependency/PreInstallAction.java
Log:
Source code tidyup in the container project
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 16:07:07 UTC (rev 69887)
+++ projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/integration/AOPDependencyBuilder.java 2008-02-18 16:09:12 UTC (rev 69888)
@@ -76,7 +76,7 @@
private static final IntrospectionAnnotationHelper helper = new IntrospectionAnnotationHelper();
@SuppressWarnings("unchecked")
- public List<DependencyBuilderListItem> getDependencies(ClassAdapter classAdapter, MetaData metaData)
+ public List<DependencyBuilderListItem<?>> getDependencies(ClassAdapter classAdapter, MetaData metaData)
{
AspectManager manager = AspectManagerFactory.getAspectManager(metaData);
try
@@ -101,7 +101,7 @@
ReflectiveAspectBinder binder = new ReflectiveAspectBinder(clazz, advisor);
Set aspects = binder.getAspects();
- ArrayList<DependencyBuilderListItem> depends = new ArrayList<DependencyBuilderListItem>();
+ ArrayList<DependencyBuilderListItem<?>> depends = new ArrayList<DependencyBuilderListItem<?>>();
if (aspects != null && aspects.size() > 0)
{
Iterator it = aspects.iterator();
Modified: projects/microcontainer/trunk/container/src/main/org/jboss/annotation/factory/AnnotationCreator.java
===================================================================
--- projects/microcontainer/trunk/container/src/main/org/jboss/annotation/factory/AnnotationCreator.java 2008-02-18 16:07:07 UTC (rev 69887)
+++ projects/microcontainer/trunk/container/src/main/org/jboss/annotation/factory/AnnotationCreator.java 2008-02-18 16:09:12 UTC (rev 69888)
@@ -55,8 +55,8 @@
*/
public class AnnotationCreator implements AnnotationParserVisitor
{
- private Class annotation;
- private Class type;
+ private Class<?> annotation;
+ private Class<?> type;
public Object typeValue;
static final AnnotationValidator defaultAnnotationReader;
@@ -83,7 +83,7 @@
}
- public AnnotationCreator(Class annotation, Class type)
+ public AnnotationCreator(Class<?> annotation, Class<?> type)
{
this.type = type;
this.annotation = annotation;
@@ -199,7 +199,7 @@
if (index == -1) throw new RuntimeException("Enum must be fully qualified: " + node.getValue());
String className = node.getValue().substring(0, index);
String en = node.getValue().substring(index + 1);
- Class enumClass = Thread.currentThread().getContextClassLoader().loadClass(className);
+ Class<?> enumClass = Thread.currentThread().getContextClassLoader().loadClass(className);
if (enumClass.getSuperclass().getName().equals("java.lang.Enum"))
{
@@ -260,7 +260,7 @@
public Object visit(ASTMemberValueArrayInitializer node, Object data)
{
if (!type.isArray()) throw new RuntimeException(annotation.getName() + "." + data + " is not an array");
- Class baseType = type.getComponentType();
+ Class<?> baseType = type.getComponentType();
int size = node.jjtGetNumChildren();
typeValue = Array.newInstance(baseType, size);
@@ -277,7 +277,7 @@
{
try
{
- Class subAnnotation = Thread.currentThread().getContextClassLoader().loadClass(node.getIdentifier());
+ Class<?> subAnnotation = Thread.currentThread().getContextClassLoader().loadClass(node.getIdentifier());
typeValue = createAnnotation(node, subAnnotation);
}
catch (Exception e)
@@ -299,7 +299,7 @@
return null;
}
- private static Class getMemberType(Class annotation, String member)
+ private static Class<?> getMemberType(Class<?> annotation, String member)
{
Method[] methods = annotation.getMethods();
for (int i = 0; i < methods.length; i++)
@@ -334,7 +334,7 @@
}
- public static Object createAnnotation(ASTAnnotation node, Class annotation, ClassLoader cl) throws Exception
+ public static Object createAnnotation(ASTAnnotation node, Class<?> annotation, ClassLoader cl) throws Exception
{
HashMap<String, Object> map = new HashMap<String, Object>();
if (annotation == null)
@@ -348,7 +348,7 @@
Node contained = node.jjtGetChild(0);
if (contained instanceof ASTSingleMemberValue)
{
- Class type = getMemberType(annotation, "value");
+ Class<?> type = getMemberType(annotation, "value");
AnnotationCreator creator = new AnnotationCreator(annotation, type);
contained.jjtAccept(creator, "value");
map.put("value", creator.typeValue);
@@ -359,7 +359,7 @@
for (int i = 0; i < pairs.jjtGetNumChildren(); i++)
{
ASTMemberValuePair member = (ASTMemberValuePair) pairs.jjtGetChild(i);
- Class type = getMemberType(annotation, member.getIdentifier().getValue());
+ Class<?> type = getMemberType(annotation, member.getIdentifier().getValue());
AnnotationCreator creator = new AnnotationCreator(annotation, type);
member.jjtAccept(creator, null);
map.put(member.getIdentifier().getValue(), creator.typeValue);
@@ -371,12 +371,12 @@
return AnnotationProxy.createProxy(map, annotation);
}
- public static Object createAnnotation(ASTAnnotation node, Class annotation) throws Exception
+ public static Object createAnnotation(ASTAnnotation node, Class<?> annotation) throws Exception
{
return createAnnotation(node, annotation, null);
}
- public static Object createAnnotation(final String annotationExpr, final Class annotation) throws Exception
+ public static Object createAnnotation(final String annotationExpr, final Class<?> annotation) throws Exception
{
return createAnnotation(getRootExpr(annotationExpr), annotation, null);
}
Modified: projects/microcontainer/trunk/container/src/main/org/jboss/annotation/factory/AnnotationProxy.java
===================================================================
--- projects/microcontainer/trunk/container/src/main/org/jboss/annotation/factory/AnnotationProxy.java 2008-02-18 16:07:07 UTC (rev 69887)
+++ projects/microcontainer/trunk/container/src/main/org/jboss/annotation/factory/AnnotationProxy.java 2008-02-18 16:09:12 UTC (rev 69888)
@@ -37,10 +37,12 @@
public class AnnotationProxy implements InvocationHandler, Serializable
{
private static final long serialVersionUID = 1;
+ @SuppressWarnings("unchecked")
private Map map;
- private Class annotationType;
+ private Class<?> annotationType;
- public AnnotationProxy(Class annotationType, Map valueMap)
+ @SuppressWarnings("unchecked")
+ public AnnotationProxy(Class<?> annotationType, Map valueMap)
{
this.annotationType = annotationType;
map = valueMap;
@@ -119,7 +121,8 @@
* @return an instance implementing the annotation
* @throws Exception for any error
*/
- public static Object createProxy(Map map, Class annotation) throws Exception
+ @SuppressWarnings("unchecked")
+ public static Object createProxy(Map map, Class<?> annotation) throws Exception
{
AnnotationProxy proxyHandler = new AnnotationProxy(annotation, map);
return java.lang.reflect.Proxy.newProxyInstance(annotation.getClassLoader(), new Class[]{annotation}, proxyHandler);
Modified: projects/microcontainer/trunk/container/src/main/org/jboss/annotation/factory/AnnotationValidator.java
===================================================================
--- projects/microcontainer/trunk/container/src/main/org/jboss/annotation/factory/AnnotationValidator.java 2008-02-18 16:07:07 UTC (rev 69887)
+++ projects/microcontainer/trunk/container/src/main/org/jboss/annotation/factory/AnnotationValidator.java 2008-02-18 16:09:12 UTC (rev 69888)
@@ -39,5 +39,5 @@
* @param annotation The annotation type
* @throws AnnotationValidationException if some attributes were not filled in and no default value exists for that attribute
*/
- void validate(Map<String, Object> map, Class annotation);
+ void validate(Map<String, Object> map, Class<?> annotation);
}
Modified: projects/microcontainer/trunk/container/src/main/org/jboss/annotation/factory/SimpleAnnotationValidator.java
===================================================================
--- projects/microcontainer/trunk/container/src/main/org/jboss/annotation/factory/SimpleAnnotationValidator.java 2008-02-18 16:07:07 UTC (rev 69887)
+++ projects/microcontainer/trunk/container/src/main/org/jboss/annotation/factory/SimpleAnnotationValidator.java 2008-02-18 16:09:12 UTC (rev 69888)
@@ -36,8 +36,7 @@
*/
public class SimpleAnnotationValidator implements AnnotationValidator
{
-
- public void validate(Map map, Class annotation)
+ public void validate(Map<String, Object> map, Class<?> annotation)
{
ArrayList<String> notAssignedAttributes = null;
Method[] methods = getDeclaredMethods(annotation);
@@ -59,7 +58,7 @@
}
}
- private Method[] getDeclaredMethods(final Class clazz)
+ private Method[] getDeclaredMethods(final Class<?> clazz)
{
return AccessController.doPrivileged(new PrivilegedAction<Method[]>()
{
Modified: projects/microcontainer/trunk/container/src/main/org/jboss/annotation/factory/ast/AnnotationParser.java
===================================================================
--- projects/microcontainer/trunk/container/src/main/org/jboss/annotation/factory/ast/AnnotationParser.java 2008-02-18 16:07:07 UTC (rev 69887)
+++ projects/microcontainer/trunk/container/src/main/org/jboss/annotation/factory/ast/AnnotationParser.java 2008-02-18 16:09:12 UTC (rev 69888)
@@ -634,7 +634,7 @@
return (jj_ntk = jj_nt.kind);
}
- private java.util.Vector jj_expentries = new java.util.Vector();
+ private java.util.Vector<int[]> jj_expentries = new java.util.Vector<int[]>();
private int[] jj_expentry;
private int jj_kind = -1;
private int[] jj_lasttokens = new int[100];
@@ -701,7 +701,7 @@
jj_add_error_token(0, 0);
int[][] exptokseq = new int[jj_expentries.size()][];
for (int i = 0; i < jj_expentries.size(); i++) {
- exptokseq[i] = (int[])jj_expentries.elementAt(i);
+ exptokseq[i] = jj_expentries.elementAt(i);
}
return new ParseException(token, exptokseq, tokenImage);
}
Modified: projects/microcontainer/trunk/container/src/main/org/jboss/annotation/factory/ast/JJTAnnotationParserState.java
===================================================================
--- projects/microcontainer/trunk/container/src/main/org/jboss/annotation/factory/ast/JJTAnnotationParserState.java 2008-02-18 16:07:07 UTC (rev 69887)
+++ projects/microcontainer/trunk/container/src/main/org/jboss/annotation/factory/ast/JJTAnnotationParserState.java 2008-02-18 16:09:12 UTC (rev 69888)
@@ -23,16 +23,16 @@
package org.jboss.annotation.factory.ast;
class JJTAnnotationParserState {
- private java.util.Stack nodes;
- private java.util.Stack marks;
+ private java.util.Stack<Node> nodes;
+ private java.util.Stack<Integer> marks;
private int sp; // number of nodes on stack
private int mk; // current mark
private boolean node_created;
JJTAnnotationParserState() {
- nodes = new java.util.Stack();
- marks = new java.util.Stack();
+ nodes = new java.util.Stack<Node>();
+ marks = new java.util.Stack<Integer>();
sp = 0;
mk = 0;
}
@@ -56,7 +56,7 @@
/* Returns the root node of the AST. It only makes sense to call
this after a successful parse. */
Node rootNode() {
- return (Node)nodes.elementAt(0);
+ return nodes.elementAt(0);
}
/* Pushes a node on to the stack. */
@@ -70,14 +70,14 @@
stack. */
Node popNode() {
if (--sp < mk) {
- mk = ((Integer)marks.pop()).intValue();
+ mk = marks.pop().intValue();
}
- return (Node)nodes.pop();
+ return nodes.pop();
}
/* Returns the node currently on the top of the stack. */
Node peekNode() {
- return (Node)nodes.peek();
+ return nodes.peek();
}
/* Returns the number of children on the stack in the current node
@@ -91,7 +91,7 @@
while (sp > mk) {
popNode();
}
- mk = ((Integer)marks.pop()).intValue();
+ mk = marks.pop().intValue();
}
@@ -108,7 +108,7 @@
made the children of the definite node. Then the definite node
is pushed on to the stack. */
void closeNodeScope(Node n, int num) {
- mk = ((Integer)marks.pop()).intValue();
+ mk = marks.pop().intValue();
while (num-- > 0) {
Node c = popNode();
c.jjtSetParent(n);
@@ -128,7 +128,7 @@
void closeNodeScope(Node n, boolean condition) {
if (condition) {
int a = nodeArity();
- mk = ((Integer)marks.pop()).intValue();
+ mk = marks.pop().intValue();
while (a-- > 0) {
Node c = popNode();
c.jjtSetParent(n);
@@ -138,7 +138,7 @@
pushNode(n);
node_created = true;
} else {
- mk = ((Integer)marks.pop()).intValue();
+ mk = marks.pop().intValue();
node_created = false;
}
}
Modified: projects/microcontainer/trunk/container/src/main/org/jboss/annotation/factory/javassist/AnnotationProxy.java
===================================================================
--- projects/microcontainer/trunk/container/src/main/org/jboss/annotation/factory/javassist/AnnotationProxy.java 2008-02-18 16:07:07 UTC (rev 69887)
+++ projects/microcontainer/trunk/container/src/main/org/jboss/annotation/factory/javassist/AnnotationProxy.java 2008-02-18 16:09:12 UTC (rev 69888)
@@ -33,18 +33,22 @@
*/
public class AnnotationProxy extends org.jboss.annotation.factory.AnnotationProxy implements InvocationHandler
{
- public AnnotationProxy(Class annotationType, Map valueMap)
+ /** The serialVersionUID */
+ private static final long serialVersionUID = -3253810562939848082L;
+
+ @SuppressWarnings("unchecked")
+ public AnnotationProxy(Class<?> annotationType, Map valueMap)
{
super(annotationType, valueMap);
}
public static Object createProxy(javassist.bytecode.annotation.Annotation info) throws Exception
{
- Class annotation = Thread.currentThread().getContextClassLoader().loadClass(info.getTypeName());
+ Class<?> annotation = Thread.currentThread().getContextClassLoader().loadClass(info.getTypeName());
return createProxy(info, annotation);
}
- public static Object createProxy(javassist.bytecode.annotation.Annotation info, Class annotation) throws Exception
+ public static Object createProxy(javassist.bytecode.annotation.Annotation info, Class<?> annotation) throws Exception
{
Map<String, Object> map = ProxyMapCreator.createProxyMap(annotation, info);
DefaultValueAnnotationValidator reader = new DefaultValueAnnotationValidator();
Modified: projects/microcontainer/trunk/container/src/main/org/jboss/annotation/factory/javassist/DefaultValueAnnotationValidator.java
===================================================================
--- projects/microcontainer/trunk/container/src/main/org/jboss/annotation/factory/javassist/DefaultValueAnnotationValidator.java 2008-02-18 16:07:07 UTC (rev 69887)
+++ projects/microcontainer/trunk/container/src/main/org/jboss/annotation/factory/javassist/DefaultValueAnnotationValidator.java 2008-02-18 16:09:12 UTC (rev 69888)
@@ -51,7 +51,7 @@
{
ScopedClassPoolRepository repository = ScopedClassPoolRepositoryImpl.getInstance();
- public void validate(Map<String, Object> map, Class annotation)
+ public void validate(Map<String, Object> map, Class<?> annotation)
{
ArrayList<String> notAssignedAttributes = null;
CtClass ctClass = null;
@@ -110,7 +110,7 @@
}
- CtClass getCtClass(Class clazz)
+ CtClass getCtClass(Class<?> clazz)
{
try
{
@@ -123,7 +123,7 @@
}
}
- private Method[] getDeclaredMethods(final Class clazz)
+ private Method[] getDeclaredMethods(final Class<?> clazz)
{
return AccessController.doPrivileged(new PrivilegedAction<Method[]>()
{
Modified: projects/microcontainer/trunk/container/src/main/org/jboss/annotation/factory/javassist/MemberValueGetter.java
===================================================================
--- projects/microcontainer/trunk/container/src/main/org/jboss/annotation/factory/javassist/MemberValueGetter.java 2008-02-18 16:07:07 UTC (rev 69887)
+++ projects/microcontainer/trunk/container/src/main/org/jboss/annotation/factory/javassist/MemberValueGetter.java 2008-02-18 16:09:12 UTC (rev 69888)
@@ -155,9 +155,10 @@
}
}
+ @SuppressWarnings("unchecked")
private Class getAttributeType()
{
- Class rtn = method.getReturnType();
+ Class<?> rtn = method.getReturnType();
while (rtn.isArray())
{
Modified: projects/microcontainer/trunk/container/src/main/org/jboss/annotation/factory/javassist/ProxyMapCreator.java
===================================================================
--- projects/microcontainer/trunk/container/src/main/org/jboss/annotation/factory/javassist/ProxyMapCreator.java 2008-02-18 16:07:07 UTC (rev 69887)
+++ projects/microcontainer/trunk/container/src/main/org/jboss/annotation/factory/javassist/ProxyMapCreator.java 2008-02-18 16:09:12 UTC (rev 69888)
@@ -54,10 +54,10 @@
public class ProxyMapCreator implements MemberValueVisitor
{
public Object value;
- private Class type;
+ private Class<?> type;
- public ProxyMapCreator(Class type)
+ public ProxyMapCreator(Class<?> type)
{
this.type = type;
}
@@ -76,7 +76,7 @@
public void visitArrayMemberValue(ArrayMemberValue arrayMemberValue)
{
- Class baseType = type.getComponentType();
+ Class<?> baseType = type.getComponentType();
int size = 0;
if (arrayMemberValue.getValue() != null)
{
@@ -216,7 +216,7 @@
}
- public static Class getMemberType(Class annotation, String member)
+ public static Class<?> getMemberType(Class<?> annotation, String member)
{
Method[] methods = annotation.getMethods();
for (int i = 0; i < methods.length; i++)
@@ -229,7 +229,8 @@
throw new RuntimeException("unable to determine member type for annotation: " + annotation.getName() + "." + member);
}
- public static Map<String, Object> createProxyMap(Class annotation, javassist.bytecode.annotation.Annotation info)
+ @SuppressWarnings("unchecked")
+ public static Map<String, Object> createProxyMap(Class<?> annotation, javassist.bytecode.annotation.Annotation info)
{
Map<String, Object> map = new HashMap<String, Object>();
Modified: projects/microcontainer/trunk/container/src/main/org/jboss/beans/info/plugins/AbstractBeanInfo.java
===================================================================
--- projects/microcontainer/trunk/container/src/main/org/jboss/beans/info/plugins/AbstractBeanInfo.java 2008-02-18 16:07:07 UTC (rev 69887)
+++ projects/microcontainer/trunk/container/src/main/org/jboss/beans/info/plugins/AbstractBeanInfo.java 2008-02-18 16:09:12 UTC (rev 69888)
@@ -206,7 +206,7 @@
return beanInfoFactory;
}
- public List<DependencyBuilderListItem> getDependencies(MetaData metaData)
+ public List<DependencyBuilderListItem<?>> getDependencies(MetaData metaData)
{
return classAdapter.getDependencies(metaData);
}
@@ -222,7 +222,7 @@
return joinpoint.dispatch();
}
- public Object newInstance(Class[] paramTypes, Object[] params) throws Throwable
+ public Object newInstance(Class<?>[] paramTypes, Object[] params) throws Throwable
{
return newInstance(classesToStrings(paramTypes), params);
}
@@ -253,7 +253,7 @@
return joinpoint.dispatch();
}
- public Object invoke(Object bean, String name, Class[] paramTypes, Object[] params) throws Throwable
+ public Object invoke(Object bean, String name, Class<?>[] paramTypes, Object[] params) throws Throwable
{
return invoke(bean, name, classesToStrings(paramTypes), params);
}
@@ -274,7 +274,7 @@
return joinpoint.dispatch();
}
- public Object invokeStatic(String name, Class[] paramTypes, Object[] params) throws Throwable
+ public Object invokeStatic(String name, Class<?>[] paramTypes, Object[] params) throws Throwable
{
return invokeStatic(name, classesToStrings(paramTypes), params);
}
@@ -336,7 +336,7 @@
* @param classes the classes
* @return the strings
*/
- private static String[] classesToStrings(Class[] classes)
+ private static String[] classesToStrings(Class<?>[] classes)
{
if (classes == null || classes.length == 0)
return null;
Modified: projects/microcontainer/trunk/container/src/main/org/jboss/beans/info/spi/BeanInfo.java
===================================================================
--- projects/microcontainer/trunk/container/src/main/org/jboss/beans/info/spi/BeanInfo.java 2008-02-18 16:07:07 UTC (rev 69887)
+++ projects/microcontainer/trunk/container/src/main/org/jboss/beans/info/spi/BeanInfo.java 2008-02-18 16:09:12 UTC (rev 69888)
@@ -141,7 +141,7 @@
* @param metaData the metadata
* @return the list of dependencies
*/
- List<DependencyBuilderListItem> getDependencies(MetaData metaData);
+ List<DependencyBuilderListItem<?>> getDependencies(MetaData metaData);
/**
* Create a new instance
@@ -169,7 +169,7 @@
* @return the new instance
* @throws Throwable for any error
*/
- Object newInstance(Class[] paramTypes, Object[] params) throws Throwable;
+ Object newInstance(Class<?>[] paramTypes, Object[] params) throws Throwable;
/**
* Create a new instance
@@ -233,7 +233,7 @@
* @return the result
* @throws Throwable for any error
*/
- Object invoke(Object bean, String name, Class[] paramTypes, Object[] params) throws Throwable;
+ Object invoke(Object bean, String name, Class<?>[] paramTypes, Object[] params) throws Throwable;
/**
* Invoke a method
@@ -276,7 +276,7 @@
* @return the result
* @throws Throwable for any error
*/
- Object invokeStatic(String name, Class[] paramTypes, Object[] params) throws Throwable;
+ Object invokeStatic(String name, Class<?>[] paramTypes, Object[] params) throws Throwable;
/**
* Invoke a static method
Modified: projects/microcontainer/trunk/container/src/main/org/jboss/beans/info/spi/helpers/UnmodifiableBeanInfo.java
===================================================================
--- projects/microcontainer/trunk/container/src/main/org/jboss/beans/info/spi/helpers/UnmodifiableBeanInfo.java 2008-02-18 16:07:07 UTC (rev 69887)
+++ projects/microcontainer/trunk/container/src/main/org/jboss/beans/info/spi/helpers/UnmodifiableBeanInfo.java 2008-02-18 16:09:12 UTC (rev 69888)
@@ -119,7 +119,7 @@
return delegate.getBeanInfoFactory();
}
- public List<DependencyBuilderListItem> getDependencies(MetaData metaData)
+ public List<DependencyBuilderListItem<?>> getDependencies(MetaData metaData)
{
return delegate.getDependencies(metaData);
}
@@ -134,7 +134,7 @@
return delegate.newInstance(paramTypes, params);
}
- public Object newInstance(Class[] paramTypes, Object[] params) throws Throwable
+ public Object newInstance(Class<?>[] paramTypes, Object[] params) throws Throwable
{
return delegate.newInstance(paramTypes, params);
}
@@ -164,7 +164,7 @@
return delegate.invoke(bean, name, paramTypes, params);
}
- public Object invoke(Object bean, String name, Class[] paramTypes, Object[] params) throws Throwable
+ public Object invoke(Object bean, String name, Class<?>[] paramTypes, Object[] params) throws Throwable
{
return delegate.invoke(bean, name, paramTypes, params);
}
@@ -184,7 +184,7 @@
return delegate.invokeStatic(name, paramTypes, params);
}
- public Object invokeStatic(String name, Class[] paramTypes, Object[] params) throws Throwable
+ public Object invokeStatic(String name, Class<?>[] paramTypes, Object[] params) throws Throwable
{
return delegate.invokeStatic(name, paramTypes, params);
}
Modified: projects/microcontainer/trunk/container/src/main/org/jboss/classadapter/plugins/BasicClassAdapter.java
===================================================================
--- projects/microcontainer/trunk/container/src/main/org/jboss/classadapter/plugins/BasicClassAdapter.java 2008-02-18 16:07:07 UTC (rev 69887)
+++ projects/microcontainer/trunk/container/src/main/org/jboss/classadapter/plugins/BasicClassAdapter.java 2008-02-18 16:09:12 UTC (rev 69888)
@@ -74,7 +74,7 @@
return classInfo.getType().getClassLoader();
}
- public List<DependencyBuilderListItem> getDependencies(MetaData metaData)
+ public List<DependencyBuilderListItem<?>> getDependencies(MetaData metaData)
{
DependencyBuilder builder = classAdapterFactory.getConfiguration().getDependencyBuilder();
return builder.getDependencies(this, metaData);
Modified: projects/microcontainer/trunk/container/src/main/org/jboss/classadapter/plugins/BasicClassAdapterFactory.java
===================================================================
--- projects/microcontainer/trunk/container/src/main/org/jboss/classadapter/plugins/BasicClassAdapterFactory.java 2008-02-18 16:07:07 UTC (rev 69887)
+++ projects/microcontainer/trunk/container/src/main/org/jboss/classadapter/plugins/BasicClassAdapterFactory.java 2008-02-18 16:09:12 UTC (rev 69888)
@@ -48,7 +48,7 @@
this.configuration = configuration;
}
- public ClassAdapter getClassAdapter(Class clazz)
+ public ClassAdapter getClassAdapter(Class<?> clazz)
{
TypeInfoFactory typeInfoFactory = configuration.getTypeInfoFactory();
TypeInfo typeInfo = typeInfoFactory.getTypeInfo(clazz);
Modified: projects/microcontainer/trunk/container/src/main/org/jboss/classadapter/plugins/dependency/AbstractDependencyBuilder.java
===================================================================
--- projects/microcontainer/trunk/container/src/main/org/jboss/classadapter/plugins/dependency/AbstractDependencyBuilder.java 2008-02-18 16:07:07 UTC (rev 69887)
+++ projects/microcontainer/trunk/container/src/main/org/jboss/classadapter/plugins/dependency/AbstractDependencyBuilder.java 2008-02-18 16:09:12 UTC (rev 69888)
@@ -36,7 +36,7 @@
*/
public class AbstractDependencyBuilder implements DependencyBuilder
{
- public List<DependencyBuilderListItem> getDependencies(ClassAdapter classAdapter, MetaData metaData)
+ public List<DependencyBuilderListItem<?>> getDependencies(ClassAdapter classAdapter, MetaData metaData)
{
return null;
}
Modified: projects/microcontainer/trunk/container/src/main/org/jboss/classadapter/spi/ClassAdapter.java
===================================================================
--- projects/microcontainer/trunk/container/src/main/org/jboss/classadapter/spi/ClassAdapter.java 2008-02-18 16:07:07 UTC (rev 69887)
+++ projects/microcontainer/trunk/container/src/main/org/jboss/classadapter/spi/ClassAdapter.java 2008-02-18 16:09:12 UTC (rev 69888)
@@ -80,5 +80,5 @@
* @param metaData the metadata
* @return the list of dependencies
*/
- List<DependencyBuilderListItem> getDependencies(MetaData metaData);
+ List<DependencyBuilderListItem<?>> getDependencies(MetaData metaData);
}
Modified: projects/microcontainer/trunk/container/src/main/org/jboss/classadapter/spi/ClassAdapterFactory.java
===================================================================
--- projects/microcontainer/trunk/container/src/main/org/jboss/classadapter/spi/ClassAdapterFactory.java 2008-02-18 16:07:07 UTC (rev 69887)
+++ projects/microcontainer/trunk/container/src/main/org/jboss/classadapter/spi/ClassAdapterFactory.java 2008-02-18 16:09:12 UTC (rev 69888)
@@ -53,7 +53,7 @@
* @param clazz the class
* @return the class adapter
*/
- ClassAdapter getClassAdapter(Class clazz);
+ ClassAdapter getClassAdapter(Class<?> clazz);
/**
* Get a class adapter
Modified: projects/microcontainer/trunk/container/src/main/org/jboss/classadapter/spi/DependencyBuilder.java
===================================================================
--- projects/microcontainer/trunk/container/src/main/org/jboss/classadapter/spi/DependencyBuilder.java 2008-02-18 16:07:07 UTC (rev 69887)
+++ projects/microcontainer/trunk/container/src/main/org/jboss/classadapter/spi/DependencyBuilder.java 2008-02-18 16:09:12 UTC (rev 69888)
@@ -40,5 +40,5 @@
* @param metaData the metadata
* @return the dependencies
*/
- List<DependencyBuilderListItem> getDependencies(ClassAdapter classAdapter, MetaData metaData);
+ List<DependencyBuilderListItem<?>> getDependencies(ClassAdapter classAdapter, MetaData metaData);
}
Modified: projects/microcontainer/trunk/container/src/main/org/jboss/classloading/spi/ClassLoadingDomain.java
===================================================================
--- projects/microcontainer/trunk/container/src/main/org/jboss/classloading/spi/ClassLoadingDomain.java 2008-02-18 16:07:07 UTC (rev 69887)
+++ projects/microcontainer/trunk/container/src/main/org/jboss/classloading/spi/ClassLoadingDomain.java 2008-02-18 16:09:12 UTC (rev 69888)
@@ -52,7 +52,7 @@
* @return the class
* @throws ClassNotFoundException when the class is not found
*/
- Class loadClass(String name, boolean resolve, DomainClassLoader classLoader) throws ClassNotFoundException;
+ Class<?> loadClass(String name, boolean resolve, DomainClassLoader classLoader) throws ClassNotFoundException;
/**
* Get a resource
Modified: projects/microcontainer/trunk/container/src/main/org/jboss/classloading/spi/DomainClassLoader.java
===================================================================
--- projects/microcontainer/trunk/container/src/main/org/jboss/classloading/spi/DomainClassLoader.java 2008-02-18 16:07:07 UTC (rev 69887)
+++ projects/microcontainer/trunk/container/src/main/org/jboss/classloading/spi/DomainClassLoader.java 2008-02-18 16:09:12 UTC (rev 69888)
@@ -61,7 +61,7 @@
* @return the class
* @throws ClassNotFoundException
*/
- Class loadClass(String name) throws ClassNotFoundException;
+ Class<?> loadClass(String name) throws ClassNotFoundException;
/**
* Load a class
@@ -71,7 +71,7 @@
* @return the class
* @throws ClassNotFoundException when there is not class
*/
- Class loadClassLocally(String name, boolean resolve) throws ClassNotFoundException;
+ Class<?> loadClassLocally(String name, boolean resolve) throws ClassNotFoundException;
/**
* Get a resource
Modified: projects/microcontainer/trunk/container/src/main/org/jboss/config/plugins/AbstractConfiguration.java
===================================================================
--- projects/microcontainer/trunk/container/src/main/org/jboss/config/plugins/AbstractConfiguration.java 2008-02-18 16:07:07 UTC (rev 69887)
+++ projects/microcontainer/trunk/container/src/main/org/jboss/config/plugins/AbstractConfiguration.java 2008-02-18 16:09:12 UTC (rev 69888)
@@ -71,7 +71,7 @@
return getBeanInfoFactory().getBeanInfo(classAdapter);
}
- public BeanInfo getBeanInfo(Class clazz)
+ public BeanInfo getBeanInfo(Class<?> clazz)
{
ClassAdapter classAdapter = getClassAdapterFactory().getClassAdapter(clazz);
return getBeanInfoFactory().getBeanInfo(classAdapter);
@@ -89,7 +89,7 @@
return classAdapter.getClassInfo();
}
- public ClassInfo getClassInfo(Class clazz)
+ public ClassInfo getClassInfo(Class<?> clazz)
{
ClassAdapter classAdapter = getClassAdapterFactory().getClassAdapter(clazz);
return classAdapter.getClassInfo();
Modified: projects/microcontainer/trunk/container/src/main/org/jboss/config/plugins/property/PropertyConfiguration.java
===================================================================
--- projects/microcontainer/trunk/container/src/main/org/jboss/config/plugins/property/PropertyConfiguration.java 2008-02-18 16:07:07 UTC (rev 69887)
+++ projects/microcontainer/trunk/container/src/main/org/jboss/config/plugins/property/PropertyConfiguration.java 2008-02-18 16:09:12 UTC (rev 69888)
@@ -116,7 +116,7 @@
{
String value = properties.getProperty(propertyName, defaultValue);
StringTokenizer tokenizer = new StringTokenizer(value, ":");
- Class clazz = null;
+ Class<?> clazz = null;
ClassNotFoundException error = null;
while (tokenizer.hasMoreTokens())
{
Modified: projects/microcontainer/trunk/container/src/main/org/jboss/config/spi/Configuration.java
===================================================================
--- projects/microcontainer/trunk/container/src/main/org/jboss/config/spi/Configuration.java 2008-02-18 16:07:07 UTC (rev 69887)
+++ projects/microcontainer/trunk/container/src/main/org/jboss/config/spi/Configuration.java 2008-02-18 16:09:12 UTC (rev 69888)
@@ -56,7 +56,7 @@
* @param clazz the class
* @return the bean info
*/
- BeanInfo getBeanInfo(Class clazz);
+ BeanInfo getBeanInfo(Class<?> clazz);
/**
* Get the bean info
@@ -82,7 +82,7 @@
* @param clazz the class
* @return the class info
*/
- ClassInfo getClassInfo(Class clazz);
+ ClassInfo getClassInfo(Class<?> clazz);
/**
* Get the type info for a type
Modified: projects/microcontainer/trunk/container/src/main/org/jboss/javabean/plugins/xml/ConfigurationUtil.java
===================================================================
--- projects/microcontainer/trunk/container/src/main/org/jboss/javabean/plugins/xml/ConfigurationUtil.java 2008-02-18 16:07:07 UTC (rev 69887)
+++ projects/microcontainer/trunk/container/src/main/org/jboss/javabean/plugins/xml/ConfigurationUtil.java 2008-02-18 16:09:12 UTC (rev 69888)
@@ -63,7 +63,7 @@
return getBeanInfo(object.getClass());
}
- static BeanInfo getBeanInfo(Class clazz) throws Throwable
+ static BeanInfo getBeanInfo(Class<?> clazz) throws Throwable
{
return config.getBeanInfo(clazz);
}
Modified: projects/microcontainer/trunk/container/src/main/org/jboss/metadata/generic/GenericMatcher.java
===================================================================
--- projects/microcontainer/trunk/container/src/main/org/jboss/metadata/generic/GenericMatcher.java 2008-02-18 16:07:07 UTC (rev 69887)
+++ projects/microcontainer/trunk/container/src/main/org/jboss/metadata/generic/GenericMatcher.java 2008-02-18 16:09:12 UTC (rev 69888)
@@ -68,11 +68,11 @@
* @param name the type name
* @return the matched meta data item or null if no match
*/
- public static final MetaDataItem matchMetaDataItem(MetaDataItem[] metaDatas, String name)
+ public static final MetaDataItem<?> matchMetaDataItem(MetaDataItem<?>[] metaDatas, String name)
{
if (metaDatas != null)
{
- for (MetaDataItem item : metaDatas)
+ for (MetaDataItem<?> item : metaDatas)
{
Object o = item.getValue();
if (o instanceof Annotation)
Modified: projects/microcontainer/trunk/container/src/main/org/jboss/metadata/plugins/context/AbstractMetaDataContext.java
===================================================================
--- projects/microcontainer/trunk/container/src/main/org/jboss/metadata/plugins/context/AbstractMetaDataContext.java 2008-02-18 16:07:07 UTC (rev 69887)
+++ projects/microcontainer/trunk/container/src/main/org/jboss/metadata/plugins/context/AbstractMetaDataContext.java 2008-02-18 16:09:12 UTC (rev 69888)
@@ -250,11 +250,11 @@
return null;
}
- public MetaDataItem retrieveMetaData(String name)
+ public MetaDataItem<?> retrieveMetaData(String name)
{
for (MetaDataRetrieval retrieval : retrievals)
{
- MetaDataItem item = retrieval.retrieveMetaData(name);
+ MetaDataItem<?> item = retrieval.retrieveMetaData(name);
if (item != null)
return item;
}
Modified: projects/microcontainer/trunk/container/src/main/org/jboss/metadata/plugins/context/CachingMetaDataContext.java
===================================================================
--- projects/microcontainer/trunk/container/src/main/org/jboss/metadata/plugins/context/CachingMetaDataContext.java 2008-02-18 16:07:07 UTC (rev 69887)
+++ projects/microcontainer/trunk/container/src/main/org/jboss/metadata/plugins/context/CachingMetaDataContext.java 2008-02-18 16:09:12 UTC (rev 69888)
@@ -47,10 +47,10 @@
public class CachingMetaDataContext extends AbstractMetaDataContext
{
/** The annotations */
- private volatile Map<String, AnnotationItem> annotations;
+ private volatile Map<String, AnnotationItem<? extends Annotation>> annotations;
/** MetaData by name */
- private volatile Map<String, MetaDataItem> metaDataByName;
+ private volatile Map<String, MetaDataItem<?>> metaDataByName;
/** All annotations */
private volatile AnnotationsItem cachedAnnotationsItem;
@@ -130,7 +130,7 @@
if (annotations != null)
{
- AnnotationItem<T> result = annotations.get(annotationName);
+ AnnotationItem<T> result = (AnnotationItem) annotations.get(annotationName);
if (result != null)
{
if (result.isValid())
@@ -143,7 +143,7 @@
if (result != null && result.isCachable())
{
if (annotations == null)
- annotations = new ConcurrentHashMap<String, AnnotationItem>();
+ annotations = new ConcurrentHashMap<String, AnnotationItem<? extends Annotation>>();
annotations.put(annotationName, result);
}
@@ -177,7 +177,7 @@
if (metaDataByName != null)
{
- MetaDataItem<T> result = metaDataByName.get(name);
+ MetaDataItem<T> result = (MetaDataItem) metaDataByName.get(name);
if (result != null)
{
if (result.isValid())
@@ -190,14 +190,14 @@
if (result != null && result.isCachable())
{
if (metaDataByName == null)
- metaDataByName = new ConcurrentHashMap<String, MetaDataItem>();
+ metaDataByName = new ConcurrentHashMap<String, MetaDataItem<?>>();
metaDataByName.put(name, result);
}
return result;
}
- public MetaDataItem retrieveMetaData(String name)
+ public MetaDataItem<?> retrieveMetaData(String name)
{
if (name == null)
throw new IllegalArgumentException("Null name");
@@ -214,7 +214,7 @@
if (metaDataByName != null)
{
- MetaDataItem result = metaDataByName.get(name);
+ MetaDataItem<?> result = metaDataByName.get(name);
if (result != null)
{
if (result.isValid())
@@ -223,11 +223,11 @@
}
}
- MetaDataItem result = super.retrieveMetaData(name);
+ MetaDataItem<?> result = super.retrieveMetaData(name);
if (result != null && result.isCachable())
{
if (metaDataByName == null)
- metaDataByName = new ConcurrentHashMap<String, MetaDataItem>();
+ metaDataByName = new ConcurrentHashMap<String, MetaDataItem<?>>();
metaDataByName.put(name, result);
}
Modified: projects/microcontainer/trunk/container/src/main/org/jboss/metadata/plugins/loader/BasicMetaDataLoader.java
===================================================================
--- projects/microcontainer/trunk/container/src/main/org/jboss/metadata/plugins/loader/BasicMetaDataLoader.java 2008-02-18 16:07:07 UTC (rev 69887)
+++ projects/microcontainer/trunk/container/src/main/org/jboss/metadata/plugins/loader/BasicMetaDataLoader.java 2008-02-18 16:09:12 UTC (rev 69888)
@@ -58,13 +58,13 @@
public <T extends Annotation> AnnotationItem<T> retrieveAnnotation(Class<T> annotationType)
{
- AnnotationItem[] annotations = retrieveAnnotations().getAnnotations();
+ AnnotationItem<? extends Annotation>[] annotations = retrieveAnnotations().getAnnotations();
return AnnotationMatcher.matchAnnotationItem(annotations, annotationType);
}
- public MetaDataItem retrieveMetaData(String name)
+ public MetaDataItem<?> retrieveMetaData(String name)
{
- MetaDataItem[] metaDatas = retrieveMetaData().getMetaDatas();
+ MetaDataItem<?>[] metaDatas = retrieveMetaData().getMetaDatas();
return GenericMatcher.matchMetaDataItem(metaDatas, name);
}
Modified: projects/microcontainer/trunk/container/src/main/org/jboss/metadata/plugins/loader/memory/MemoryMetaDataLoader.java
===================================================================
--- projects/microcontainer/trunk/container/src/main/org/jboss/metadata/plugins/loader/memory/MemoryMetaDataLoader.java 2008-02-18 16:07:07 UTC (rev 69887)
+++ projects/microcontainer/trunk/container/src/main/org/jboss/metadata/plugins/loader/memory/MemoryMetaDataLoader.java 2008-02-18 16:09:12 UTC (rev 69888)
@@ -50,10 +50,10 @@
public class MemoryMetaDataLoader extends AbstractMutableComponentMetaDataLoader
{
/** The annotations */
- private volatile Map<String, BasicAnnotationItem> annotations;
+ private volatile Map<String, BasicAnnotationItem<? extends Annotation>> annotations;
/** MetaData by name */
- private volatile Map<String, BasicMetaDataItem> metaDataByName;
+ private volatile Map<String, BasicMetaDataItem<?>> metaDataByName;
/** All annotations */
private volatile BasicAnnotationsItem cachedAnnotationsItem;
@@ -112,21 +112,22 @@
return cachable;
}
+ @SuppressWarnings("unchecked")
public AnnotationsItem retrieveAnnotations()
{
BasicAnnotationsItem result = cachedAnnotationsItem;
if (result != null && result.isValid())
return result;
- Map<String, BasicAnnotationItem> temp = annotations;
+ Map<String, BasicAnnotationItem<? extends Annotation>> temp = annotations;
if (temp == null)
return noAnnotations();
- Collection<BasicAnnotationItem> values = temp.values();
+ Collection<BasicAnnotationItem<? extends Annotation>> values = temp.values();
if (values.isEmpty())
return noAnnotations();
- AnnotationItem[] items = values.toArray(new AnnotationItem[values.size()]);
+ AnnotationItem<? extends Annotation>[] items = values.toArray(new AnnotationItem[values.size()]);
result = new BasicAnnotationsItem(this, items);
cachedAnnotationsItem = result;
return result;
@@ -135,10 +136,10 @@
@SuppressWarnings("unchecked")
public <T extends Annotation> AnnotationItem<T> retrieveAnnotation(Class<T> annotationType)
{
- Map<String, BasicAnnotationItem> temp = annotations;
+ Map<String, BasicAnnotationItem<? extends Annotation>> temp = annotations;
if (temp == null)
return null;
- return temp.get(annotationType.getName());
+ return (AnnotationItem) temp.get(annotationType.getName());
}
@SuppressWarnings("unchecked")
@@ -151,13 +152,13 @@
synchronized (this)
{
if (annotations == null)
- annotations = new ConcurrentHashMap<String, BasicAnnotationItem>();
+ annotations = new ConcurrentHashMap<String, BasicAnnotationItem<? extends Annotation>>();
}
T result = null;
Class<? extends Annotation> annotationType = annotation.annotationType();
- BasicAnnotationItem<T> old = annotations.get(annotationType.getName());
+ BasicAnnotationItem<T> old = (BasicAnnotationItem) annotations.get(annotationType.getName());
if (old != null)
{
result = old.getAnnotation();
@@ -179,7 +180,7 @@
{
if (annotations == null)
return null;
- BasicAnnotationItem<T> annotation = annotations.remove(annotationType.getName());
+ BasicAnnotationItem<T> annotation = (BasicAnnotationItem) annotations.remove(annotationType.getName());
if (annotation == null)
return null;
annotation.invalidate();
@@ -194,27 +195,27 @@
if (result != null && result.isValid())
return result;
- Collection<BasicMetaDataItem> all = null;
- Map<String, BasicAnnotationItem> temp1 = annotations;
+ Collection<BasicMetaDataItem<?>> all = null;
+ Map<String, BasicAnnotationItem<? extends Annotation>> temp1 = annotations;
if (temp1 != null && temp1.size() > 0)
{
- all = new ArrayList<BasicMetaDataItem>();
- Collection<BasicAnnotationItem> values = temp1.values();
+ all = new ArrayList<BasicMetaDataItem<?>>();
+ Collection<BasicAnnotationItem<?>> values = temp1.values();
all.addAll(values);
}
- Map<String, BasicMetaDataItem> temp2 = metaDataByName;
+ Map<String, BasicMetaDataItem<?>> temp2 = metaDataByName;
if (temp2 != null && temp2.size() > 0)
{
if (all == null)
- all = new ArrayList<BasicMetaDataItem>();
- Collection<BasicMetaDataItem> values = temp2.values();
+ all = new ArrayList<BasicMetaDataItem<?>>();
+ Collection<BasicMetaDataItem<?>> values = temp2.values();
all.addAll(values);
}
if (all == null)
return noMetaDatas();
- MetaDataItem[] metaDataItems = all.toArray(new MetaDataItem[all.size()]);
+ MetaDataItem<?>[] metaDataItems = all.toArray(new MetaDataItem[all.size()]);
result = new BasicMetaDatasItem(this, metaDataItems);
cachedMetaDatasItem = result;
return result;
@@ -233,17 +234,17 @@
return (MetaDataItem<T>) temp.get(type.getName());
}
- public MetaDataItem retrieveMetaData(String name)
+ public MetaDataItem<?> retrieveMetaData(String name)
{
- Map<String, BasicMetaDataItem> temp = metaDataByName;
+ Map<String, BasicMetaDataItem<?>> temp = metaDataByName;
if (temp != null)
{
- MetaDataItem result = temp.get(name);
+ MetaDataItem<?> result = temp.get(name);
if (result != null)
return result;
}
- Map<String, BasicAnnotationItem> temp2 = annotations;
+ Map<String, BasicAnnotationItem<? extends Annotation>> temp2 = annotations;
if (temp2 != null)
return temp2.get(name);
@@ -266,12 +267,12 @@
synchronized (this)
{
if (metaDataByName == null)
- metaDataByName = new ConcurrentHashMap<String, BasicMetaDataItem>();
+ metaDataByName = new ConcurrentHashMap<String, BasicMetaDataItem<?>>();
}
T result = null;
- BasicMetaDataItem<T> old = metaDataByName.get(type.getName());
+ BasicMetaDataItem<T> old = (BasicMetaDataItem) metaDataByName.get(type.getName());
if (old != null)
{
result = old.getValue();
@@ -298,7 +299,7 @@
if (metaDataByName == null)
return null;
- BasicMetaDataItem<T> result = metaDataByName.remove(type.getName());
+ BasicMetaDataItem<T> result = (BasicMetaDataItem) metaDataByName.remove(type.getName());
if (result == null)
return null;
result.invalidate();
@@ -321,12 +322,12 @@
synchronized (this)
{
if (metaDataByName == null)
- metaDataByName = new ConcurrentHashMap<String, BasicMetaDataItem>();
+ metaDataByName = new ConcurrentHashMap<String, BasicMetaDataItem<?>>();
}
T result = null;
- BasicMetaDataItem<T> old = metaDataByName.get(name);
+ BasicMetaDataItem<T> old = (BasicMetaDataItem) metaDataByName.get(name);
if (old != null)
{
result = old.getValue();
@@ -347,11 +348,11 @@
if (name == null)
throw new IllegalArgumentException("Null name");
- Map<String, BasicMetaDataItem> temp = metaDataByName;
+ Map<String, BasicMetaDataItem<?>> temp = metaDataByName;
if (temp == null)
return null;
- BasicMetaDataItem<T> result = temp.remove(name);
+ BasicMetaDataItem<T> result = (BasicMetaDataItem) temp.remove(name);
if (result == null)
return null;
result.invalidate();
Modified: projects/microcontainer/trunk/container/src/main/org/jboss/metadata/plugins/loader/thread/ThreadLocalMetaDataLoader.java
===================================================================
--- projects/microcontainer/trunk/container/src/main/org/jboss/metadata/plugins/loader/thread/ThreadLocalMetaDataLoader.java 2008-02-18 16:07:07 UTC (rev 69887)
+++ projects/microcontainer/trunk/container/src/main/org/jboss/metadata/plugins/loader/thread/ThreadLocalMetaDataLoader.java 2008-02-18 16:09:12 UTC (rev 69888)
@@ -172,7 +172,7 @@
return delegate.retrieveMetaData(type);
}
- public MetaDataItem retrieveMetaData(String name)
+ public MetaDataItem<?> retrieveMetaData(String name)
{
MemoryMetaDataLoader delegate = threadLocal.get();
if (delegate == null)
Modified: projects/microcontainer/trunk/container/src/main/org/jboss/metadata/spi/retrieval/AnnotationsItem.java
===================================================================
--- projects/microcontainer/trunk/container/src/main/org/jboss/metadata/spi/retrieval/AnnotationsItem.java 2008-02-18 16:07:07 UTC (rev 69887)
+++ projects/microcontainer/trunk/container/src/main/org/jboss/metadata/spi/retrieval/AnnotationsItem.java 2008-02-18 16:09:12 UTC (rev 69888)
@@ -32,12 +32,13 @@
public interface AnnotationsItem extends Item<Annotation[]>
{
/** No annotations */
- public static final AnnotationItem[] NO_ANNOTATION_ITEMS = new AnnotationItem[0];
+ @SuppressWarnings("unchecked")
+ public static final AnnotationItem<? extends Annotation>[] NO_ANNOTATION_ITEMS = new AnnotationItem[0];
/**
* Get the annotations
*
* @return the annotations
*/
- AnnotationItem[] getAnnotations();
+ AnnotationItem<? extends Annotation>[] getAnnotations();
}
Modified: projects/microcontainer/trunk/container/src/main/org/jboss/metadata/spi/retrieval/MetaDataRetrieval.java
===================================================================
--- projects/microcontainer/trunk/container/src/main/org/jboss/metadata/spi/retrieval/MetaDataRetrieval.java 2008-02-18 16:07:07 UTC (rev 69887)
+++ projects/microcontainer/trunk/container/src/main/org/jboss/metadata/spi/retrieval/MetaDataRetrieval.java 2008-02-18 16:09:12 UTC (rev 69888)
@@ -101,7 +101,7 @@
* @param name the name of the meta data
* @return the metadata or null if not present
*/
- MetaDataItem retrieveMetaData(String name);
+ MetaDataItem<?> retrieveMetaData(String name);
/**
* Get the component metadata retrieval
Modified: projects/microcontainer/trunk/container/src/main/org/jboss/metadata/spi/retrieval/MetaDataRetrievalToMetaDataBridge.java
===================================================================
--- projects/microcontainer/trunk/container/src/main/org/jboss/metadata/spi/retrieval/MetaDataRetrievalToMetaDataBridge.java 2008-02-18 16:07:07 UTC (rev 69887)
+++ projects/microcontainer/trunk/container/src/main/org/jboss/metadata/spi/retrieval/MetaDataRetrievalToMetaDataBridge.java 2008-02-18 16:09:12 UTC (rev 69888)
@@ -114,7 +114,7 @@
throw new IllegalArgumentException("Null name");
if (type == null)
throw new IllegalArgumentException("Null type");
- MetaDataItem item = retrieval.retrieveMetaData(name);
+ MetaDataItem<?> item = retrieval.retrieveMetaData(name);
if (item == null)
return null;
return type.cast(item.getValue());
@@ -124,7 +124,7 @@
{
if (name == null)
throw new IllegalArgumentException("Null name");
- MetaDataItem item = retrieval.retrieveMetaData(name);
+ MetaDataItem<?> item = retrieval.retrieveMetaData(name);
if (item == null)
return null;
return item.getValue();
Modified: projects/microcontainer/trunk/container/src/main/org/jboss/metadata/spi/retrieval/MetaDatasItem.java
===================================================================
--- projects/microcontainer/trunk/container/src/main/org/jboss/metadata/spi/retrieval/MetaDatasItem.java 2008-02-18 16:07:07 UTC (rev 69887)
+++ projects/microcontainer/trunk/container/src/main/org/jboss/metadata/spi/retrieval/MetaDatasItem.java 2008-02-18 16:09:12 UTC (rev 69888)
@@ -30,12 +30,12 @@
public interface MetaDatasItem extends Item<Object[]>
{
/** No meta data items */
- public static final MetaDataItem[] NO_META_DATA_ITEMS = new MetaDataItem[0];
+ public static final MetaDataItem<?>[] NO_META_DATA_ITEMS = new MetaDataItem[0];
/**
* Get the meta datas
*
* @return the meta datas
*/
- MetaDataItem[] getMetaDatas();
+ MetaDataItem<?>[] getMetaDatas();
}
Modified: projects/microcontainer/trunk/container/src/main/org/jboss/metadata/spi/retrieval/basic/BasicAnnotationItem.java
===================================================================
--- projects/microcontainer/trunk/container/src/main/org/jboss/metadata/spi/retrieval/basic/BasicAnnotationItem.java 2008-02-18 16:07:07 UTC (rev 69887)
+++ projects/microcontainer/trunk/container/src/main/org/jboss/metadata/spi/retrieval/basic/BasicAnnotationItem.java 2008-02-18 16:09:12 UTC (rev 69888)
@@ -51,6 +51,7 @@
return getValue();
}
+ @SuppressWarnings("unchecked")
public boolean equals(Object object)
{
if (object == this)
Modified: projects/microcontainer/trunk/container/src/main/org/jboss/metadata/spi/retrieval/basic/BasicAnnotationsItem.java
===================================================================
--- projects/microcontainer/trunk/container/src/main/org/jboss/metadata/spi/retrieval/basic/BasicAnnotationsItem.java 2008-02-18 16:07:07 UTC (rev 69887)
+++ projects/microcontainer/trunk/container/src/main/org/jboss/metadata/spi/retrieval/basic/BasicAnnotationsItem.java 2008-02-18 16:09:12 UTC (rev 69888)
@@ -37,7 +37,7 @@
public class BasicAnnotationsItem extends BasicItem<Annotation[]> implements AnnotationsItem
{
/** The annotation items */
- private AnnotationItem[] annotationItems;
+ private AnnotationItem<? extends Annotation>[] annotationItems;
/** The annotations */
private Annotation[] annotations;
@@ -48,7 +48,7 @@
* @param loader the loader
* @param annotationItems the annotation items
*/
- public BasicAnnotationsItem(MetaDataLoader loader, AnnotationItem[] annotationItems)
+ public BasicAnnotationsItem(MetaDataLoader loader, AnnotationItem<? extends Annotation>[] annotationItems)
{
super(loader);
@@ -73,7 +73,7 @@
return annotations;
}
- public AnnotationItem[] getAnnotations()
+ public AnnotationItem<? extends Annotation>[] getAnnotations()
{
return annotationItems;
}
@@ -83,7 +83,7 @@
if (super.isCachable() == false)
return false;
- for (AnnotationItem item : annotationItems)
+ for (AnnotationItem<? extends Annotation> item : annotationItems)
{
if (item.isCachable() == false)
return false;
@@ -97,7 +97,7 @@
if (super.isValid() == false)
return false;
- for (AnnotationItem item : annotationItems)
+ for (AnnotationItem<? extends Annotation> item : annotationItems)
{
if (item.isValid() == false)
return false;
Modified: projects/microcontainer/trunk/container/src/main/org/jboss/metadata/spi/retrieval/basic/BasicMetaDataItem.java
===================================================================
--- projects/microcontainer/trunk/container/src/main/org/jboss/metadata/spi/retrieval/basic/BasicMetaDataItem.java 2008-02-18 16:07:07 UTC (rev 69887)
+++ projects/microcontainer/trunk/container/src/main/org/jboss/metadata/spi/retrieval/basic/BasicMetaDataItem.java 2008-02-18 16:09:12 UTC (rev 69888)
@@ -74,7 +74,7 @@
if (object == null || object instanceof MetaDataItem == false)
return false;
- MetaDataItem other = (MetaDataItem) object;
+ MetaDataItem<?> other = (MetaDataItem<?>) object;
return getName().equals(other.getName());
}
Modified: projects/microcontainer/trunk/container/src/main/org/jboss/metadata/spi/retrieval/basic/BasicMetaDatasItem.java
===================================================================
--- projects/microcontainer/trunk/container/src/main/org/jboss/metadata/spi/retrieval/basic/BasicMetaDatasItem.java 2008-02-18 16:07:07 UTC (rev 69887)
+++ projects/microcontainer/trunk/container/src/main/org/jboss/metadata/spi/retrieval/basic/BasicMetaDatasItem.java 2008-02-18 16:09:12 UTC (rev 69888)
@@ -35,7 +35,7 @@
public class BasicMetaDatasItem extends BasicItem<Object[]> implements MetaDatasItem
{
/** The meta data items */
- private MetaDataItem[] metaDataItems;
+ private MetaDataItem<?>[] metaDataItems;
/** The meta data */
private Object[] metaDatas;
@@ -46,7 +46,7 @@
* @param loader the loader
* @param metaDataItems the meta data items
*/
- public BasicMetaDatasItem(MetaDataLoader loader, MetaDataItem[] metaDataItems)
+ public BasicMetaDatasItem(MetaDataLoader loader, MetaDataItem<?>[] metaDataItems)
{
super(loader);
@@ -71,7 +71,7 @@
return metaDatas;
}
- public MetaDataItem[] getMetaDatas()
+ public MetaDataItem<?>[] getMetaDatas()
{
return metaDataItems;
}
@@ -81,7 +81,7 @@
if (super.isCachable() == false)
return false;
- for (MetaDataItem item : metaDataItems)
+ for (MetaDataItem<?> item : metaDataItems)
{
if (item.isCachable() == false)
return false;
@@ -95,7 +95,7 @@
if (super.isValid() == false)
return false;
- for (MetaDataItem item : metaDataItems)
+ for (MetaDataItem<?> item : metaDataItems)
{
if (item.isValid() == false)
return false;
Modified: projects/microcontainer/trunk/container/src/main/org/jboss/metadata/spi/retrieval/cummulative/CummulativeAnnotationsItem.java
===================================================================
--- projects/microcontainer/trunk/container/src/main/org/jboss/metadata/spi/retrieval/cummulative/CummulativeAnnotationsItem.java 2008-02-18 16:07:07 UTC (rev 69887)
+++ projects/microcontainer/trunk/container/src/main/org/jboss/metadata/spi/retrieval/cummulative/CummulativeAnnotationsItem.java 2008-02-18 16:09:12 UTC (rev 69888)
@@ -71,7 +71,7 @@
return super.getValue();
}
- public AnnotationItem[] getAnnotations()
+ public AnnotationItem<? extends Annotation>[] getAnnotations()
{
checkValid();
return super.getAnnotations();
@@ -92,7 +92,7 @@
*/
protected void checkValid()
{
- AnnotationItem[] items = super.getAnnotations();
+ AnnotationItem<? extends Annotation>[] items = super.getAnnotations();
boolean valid = (items != null);
long newValidTime = context.getValidTime().getValidTime();
@@ -101,7 +101,7 @@
if (valid && items != null)
{
- for (AnnotationItem item : items)
+ for (AnnotationItem<? extends Annotation> item : items)
{
if (item.isValid() == false)
valid = false;
@@ -117,9 +117,10 @@
*
* @param validTime the valid time
*/
+ @SuppressWarnings("unchecked")
protected void init(long validTime)
{
- Set<AnnotationItem> temp = null;
+ Set<AnnotationItem<? extends Annotation>> temp = null;
List<MetaDataRetrieval> retrievals;
@@ -133,17 +134,17 @@
AnnotationsItem item = retrieval.retrieveAnnotations();
if (item != null)
{
- AnnotationItem[] items = item.getAnnotations();
- for (AnnotationItem it : items)
+ AnnotationItem<? extends Annotation>[] items = item.getAnnotations();
+ for (AnnotationItem<? extends Annotation> it : items)
{
if (temp == null)
- temp = new HashSet<AnnotationItem>();
+ temp = new HashSet<AnnotationItem<? extends Annotation>>();
temp.add(it);
}
}
}
- AnnotationItem[] items = NO_ANNOTATION_ITEMS;
+ AnnotationItem<? extends Annotation>[] items = NO_ANNOTATION_ITEMS;
if (temp != null)
items = temp.toArray(new AnnotationItem[temp.size()]);
setAnnotationItems(items);
Modified: projects/microcontainer/trunk/container/src/main/org/jboss/metadata/spi/retrieval/cummulative/CummulativeMetaDatasItem.java
===================================================================
--- projects/microcontainer/trunk/container/src/main/org/jboss/metadata/spi/retrieval/cummulative/CummulativeMetaDatasItem.java 2008-02-18 16:07:07 UTC (rev 69887)
+++ projects/microcontainer/trunk/container/src/main/org/jboss/metadata/spi/retrieval/cummulative/CummulativeMetaDatasItem.java 2008-02-18 16:09:12 UTC (rev 69888)
@@ -70,7 +70,7 @@
return super.getValue();
}
- public MetaDataItem[] getMetaDatas()
+ public MetaDataItem<?>[] getMetaDatas()
{
checkValid();
return super.getMetaDatas();
@@ -91,7 +91,7 @@
*/
protected void checkValid()
{
- MetaDataItem[] items = super.getMetaDatas();
+ MetaDataItem<?>[] items = super.getMetaDatas();
boolean valid = (items != null);
long newValidTime = context.getValidTime().getValidTime();
@@ -100,7 +100,7 @@
if (items != null)
{
- for (MetaDataItem item : items)
+ for (MetaDataItem<?> item : items)
{
if (item.isValid() == false)
valid = false;
@@ -118,7 +118,7 @@
*/
protected void init(long validTime)
{
- Set<MetaDataItem> temp = null;
+ Set<MetaDataItem<?>> temp = null;
List<MetaDataRetrieval> retrievals;
@@ -132,17 +132,17 @@
MetaDatasItem item = retrieval.retrieveMetaData();
if (item != null)
{
- MetaDataItem[] items = item.getMetaDatas();
- for (MetaDataItem it : items)
+ MetaDataItem<?>[] items = item.getMetaDatas();
+ for (MetaDataItem<?> it : items)
{
if (temp == null)
- temp = new HashSet<MetaDataItem>();
+ temp = new HashSet<MetaDataItem<?>>();
temp.add(it);
}
}
}
- MetaDataItem[] items = NO_META_DATA_ITEMS;
+ MetaDataItem<?>[] items = NO_META_DATA_ITEMS;
if (temp != null)
items = temp.toArray(new MetaDataItem[temp.size()]);
setMetaDataItems(items);
Modified: projects/microcontainer/trunk/container/src/main/org/jboss/metadata/spi/retrieval/helper/AnnotationToMetaDataBridge.java
===================================================================
--- projects/microcontainer/trunk/container/src/main/org/jboss/metadata/spi/retrieval/helper/AnnotationToMetaDataBridge.java 2008-02-18 16:07:07 UTC (rev 69887)
+++ projects/microcontainer/trunk/container/src/main/org/jboss/metadata/spi/retrieval/helper/AnnotationToMetaDataBridge.java 2008-02-18 16:09:12 UTC (rev 69888)
@@ -21,6 +21,8 @@
*/
package org.jboss.metadata.spi.retrieval.helper;
+import java.lang.annotation.Annotation;
+
import org.jboss.metadata.spi.retrieval.AnnotationItem;
import org.jboss.metadata.spi.retrieval.MetaDataItem;
@@ -34,14 +36,14 @@
public class AnnotationToMetaDataBridge<T> implements MetaDataItem<T>
{
/** The annotation */
- private AnnotationItem annotation;
+ private AnnotationItem<? extends Annotation> annotation;
/**
* Create a new AnnotationToMetaDataBridge.
*
* @param annotation the annotation
*/
- public AnnotationToMetaDataBridge(AnnotationItem annotation)
+ public AnnotationToMetaDataBridge(AnnotationItem<? extends Annotation> annotation)
{
if (annotation == null)
throw new IllegalArgumentException("Null annotation");
Modified: projects/microcontainer/trunk/container/src/main/org/jboss/metadata/spi/retrieval/helper/AnnotationsToMetaDatasBridge.java
===================================================================
--- projects/microcontainer/trunk/container/src/main/org/jboss/metadata/spi/retrieval/helper/AnnotationsToMetaDatasBridge.java 2008-02-18 16:07:07 UTC (rev 69887)
+++ projects/microcontainer/trunk/container/src/main/org/jboss/metadata/spi/retrieval/helper/AnnotationsToMetaDatasBridge.java 2008-02-18 16:09:12 UTC (rev 69888)
@@ -64,7 +64,7 @@
return annotations.getValue();
}
- public MetaDataItem[] getMetaDatas()
+ public MetaDataItem<?>[] getMetaDatas()
{
return annotations.getAnnotations();
}
Modified: projects/microcontainer/trunk/container/src/main/org/jboss/metadata/spi/retrieval/helper/MetaDataToAnnotationBridge.java
===================================================================
--- projects/microcontainer/trunk/container/src/main/org/jboss/metadata/spi/retrieval/helper/MetaDataToAnnotationBridge.java 2008-02-18 16:07:07 UTC (rev 69887)
+++ projects/microcontainer/trunk/container/src/main/org/jboss/metadata/spi/retrieval/helper/MetaDataToAnnotationBridge.java 2008-02-18 16:09:12 UTC (rev 69888)
@@ -36,14 +36,14 @@
public class MetaDataToAnnotationBridge<T extends Annotation> implements AnnotationItem<T>
{
/** The meta data */
- private MetaDataItem metaData;
+ private MetaDataItem<?> metaData;
/**
* Create a new MetaDataToAnnotationBridge.
*
* @param metaData the meta data
*/
- public MetaDataToAnnotationBridge(MetaDataItem metaData)
+ public MetaDataToAnnotationBridge(MetaDataItem<?> metaData)
{
if (metaData == null)
throw new IllegalArgumentException("Null metaData");
Modified: projects/microcontainer/trunk/container/src/main/org/jboss/metadata/spi/retrieval/simple/SimpleAnnotationItem.java
===================================================================
--- projects/microcontainer/trunk/container/src/main/org/jboss/metadata/spi/retrieval/simple/SimpleAnnotationItem.java 2008-02-18 16:07:07 UTC (rev 69887)
+++ projects/microcontainer/trunk/container/src/main/org/jboss/metadata/spi/retrieval/simple/SimpleAnnotationItem.java 2008-02-18 16:09:12 UTC (rev 69888)
@@ -49,6 +49,7 @@
return getValue();
}
+ @SuppressWarnings("unchecked")
public boolean equals(Object object)
{
if (object == this)
Modified: projects/microcontainer/trunk/container/src/main/org/jboss/metadata/spi/retrieval/simple/SimpleAnnotationsItem.java
===================================================================
--- projects/microcontainer/trunk/container/src/main/org/jboss/metadata/spi/retrieval/simple/SimpleAnnotationsItem.java 2008-02-18 16:07:07 UTC (rev 69887)
+++ projects/microcontainer/trunk/container/src/main/org/jboss/metadata/spi/retrieval/simple/SimpleAnnotationsItem.java 2008-02-18 16:09:12 UTC (rev 69888)
@@ -39,7 +39,7 @@
public static final SimpleAnnotationsItem NO_ANNOTATIONS = new SimpleAnnotationsItem();
/** The annotation items */
- private AnnotationItem[] annotationItems;
+ private AnnotationItem<? extends Annotation>[] annotationItems;
/** The annotations */
private Annotation[] annotations;
@@ -57,7 +57,7 @@
*
* @param annotationItems the annotation items
*/
- public SimpleAnnotationsItem(AnnotationItem[] annotationItems)
+ public SimpleAnnotationsItem(AnnotationItem<? extends Annotation>[] annotationItems)
{
setAnnotationItems(annotationItems);
}
@@ -74,7 +74,7 @@
return annotations;
}
- public AnnotationItem[] getAnnotations()
+ public AnnotationItem<? extends Annotation>[] getAnnotations()
{
return annotationItems;
}
@@ -84,7 +84,7 @@
*
* @param annotationItems the annotation items
*/
- protected void setAnnotationItems(AnnotationItem[] annotationItems)
+ protected void setAnnotationItems(AnnotationItem<? extends Annotation>[] annotationItems)
{
if (annotationItems == null)
throw new IllegalArgumentException("Null annotation items");
Modified: projects/microcontainer/trunk/container/src/main/org/jboss/metadata/spi/retrieval/simple/SimpleMetaDataItem.java
===================================================================
--- projects/microcontainer/trunk/container/src/main/org/jboss/metadata/spi/retrieval/simple/SimpleMetaDataItem.java 2008-02-18 16:07:07 UTC (rev 69887)
+++ projects/microcontainer/trunk/container/src/main/org/jboss/metadata/spi/retrieval/simple/SimpleMetaDataItem.java 2008-02-18 16:09:12 UTC (rev 69888)
@@ -70,7 +70,7 @@
if (object == null || object instanceof MetaDataItem == false)
return false;
- MetaDataItem other = (MetaDataItem) object;
+ MetaDataItem<?> other = (MetaDataItem<?>) object;
return getName().equals(other.getName());
}
Modified: projects/microcontainer/trunk/container/src/main/org/jboss/metadata/spi/retrieval/simple/SimpleMetaDatasItem.java
===================================================================
--- projects/microcontainer/trunk/container/src/main/org/jboss/metadata/spi/retrieval/simple/SimpleMetaDatasItem.java 2008-02-18 16:07:07 UTC (rev 69887)
+++ projects/microcontainer/trunk/container/src/main/org/jboss/metadata/spi/retrieval/simple/SimpleMetaDatasItem.java 2008-02-18 16:09:12 UTC (rev 69888)
@@ -37,7 +37,7 @@
public static final SimpleMetaDatasItem NO_META_DATA = new SimpleMetaDatasItem();
/** The meta data items */
- private MetaDataItem[] metaDataItems;
+ private MetaDataItem<?>[] metaDataItems;
/** The meta data */
private Object[] metaDatas;
@@ -55,7 +55,7 @@
*
* @param metaDataItems the meta data items
*/
- public SimpleMetaDatasItem(MetaDataItem[] metaDataItems)
+ public SimpleMetaDatasItem(MetaDataItem<?>[] metaDataItems)
{
setMetaDataItems(metaDataItems);
}
@@ -72,7 +72,7 @@
return metaDatas;
}
- public MetaDataItem[] getMetaDatas()
+ public MetaDataItem<?>[] getMetaDatas()
{
return metaDataItems;
}
@@ -82,7 +82,7 @@
*
* @param metaDataItems the meta data items
*/
- protected void setMetaDataItems(MetaDataItem[] metaDataItems)
+ protected void setMetaDataItems(MetaDataItem<?>[] metaDataItems)
{
if (metaDataItems == null)
throw new IllegalArgumentException("Null metaDataItems");
Modified: projects/microcontainer/trunk/container/src/main/org/jboss/metadata/spi/scope/ScopeFactoryLookup.java
===================================================================
--- projects/microcontainer/trunk/container/src/main/org/jboss/metadata/spi/scope/ScopeFactoryLookup.java 2008-02-18 16:07:07 UTC (rev 69887)
+++ projects/microcontainer/trunk/container/src/main/org/jboss/metadata/spi/scope/ScopeFactoryLookup.java 2008-02-18 16:09:12 UTC (rev 69888)
@@ -21,6 +21,7 @@
*/
package org.jboss.metadata.spi.scope;
+import java.lang.annotation.Annotation;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
@@ -36,5 +37,5 @@
@Target({ElementType.ANNOTATION_TYPE})
public @interface ScopeFactoryLookup
{
- Class<? extends ScopeFactory> value();
+ Class<? extends ScopeFactory<? extends Annotation>> value();
}
Modified: projects/microcontainer/trunk/container/src/main/org/jboss/metadata/spi/scope/ScopeKeyFactoryLookup.java
===================================================================
--- projects/microcontainer/trunk/container/src/main/org/jboss/metadata/spi/scope/ScopeKeyFactoryLookup.java 2008-02-18 16:07:07 UTC (rev 69887)
+++ projects/microcontainer/trunk/container/src/main/org/jboss/metadata/spi/scope/ScopeKeyFactoryLookup.java 2008-02-18 16:09:12 UTC (rev 69888)
@@ -21,6 +21,7 @@
*/
package org.jboss.metadata.spi.scope;
+import java.lang.annotation.Annotation;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
@@ -36,5 +37,5 @@
@Target({ElementType.ANNOTATION_TYPE})
public @interface ScopeKeyFactoryLookup
{
- Class<? extends ScopeKeyFactory> value();
+ Class<? extends ScopeKeyFactory<? extends Annotation>> value();
}
Modified: projects/microcontainer/trunk/container/src/main/org/jboss/reflect/plugins/AnnotationValueFactory.java
===================================================================
--- projects/microcontainer/trunk/container/src/main/org/jboss/reflect/plugins/AnnotationValueFactory.java 2008-02-18 16:07:07 UTC (rev 69887)
+++ projects/microcontainer/trunk/container/src/main/org/jboss/reflect/plugins/AnnotationValueFactory.java 2008-02-18 16:09:12 UTC (rev 69888)
@@ -76,7 +76,7 @@
else if (type instanceof ClassInfo)
{
// TODO JBMICROCONT-118 do not depend on Class
- rtnValue = new ClassValueImpl(((Class)value).getName(), type);
+ rtnValue = new ClassValueImpl(((Class<?>)value).getName(), type);
}
return rtnValue;
@@ -85,7 +85,7 @@
public static AnnotationValue createAnnotationValue(TypeInfoFactory typeInfoFactory, AnnotationHelper annotationHelper, AnnotationInfo info, Object ann)
{
Annotation annotation = (Annotation)ann;
- Class clazz = annotation.annotationType();
+ Class<?> clazz = annotation.annotationType();
ClassInfo clazzInfo = (ClassInfo) typeInfoFactory.getTypeInfo(clazz);
HashMap<String, Value> attributes = new HashMap<String, Value>();
Modified: projects/microcontainer/trunk/container/src/main/org/jboss/reflect/plugins/ClassInfoHelper.java
===================================================================
--- projects/microcontainer/trunk/container/src/main/org/jboss/reflect/plugins/ClassInfoHelper.java 2008-02-18 16:07:07 UTC (rev 69887)
+++ projects/microcontainer/trunk/container/src/main/org/jboss/reflect/plugins/ClassInfoHelper.java 2008-02-18 16:09:12 UTC (rev 69888)
@@ -97,7 +97,7 @@
* @param clazz the class
* @return the type info
*/
- TypeInfo getTypeInfo(Class clazz);
+ TypeInfo getTypeInfo(Class<?> clazz);
/**
* Get the actual type parameters
Modified: projects/microcontainer/trunk/container/src/main/org/jboss/reflect/plugins/ClassInfoImpl.java
===================================================================
--- projects/microcontainer/trunk/container/src/main/org/jboss/reflect/plugins/ClassInfoImpl.java 2008-02-18 16:07:07 UTC (rev 69887)
+++ projects/microcontainer/trunk/container/src/main/org/jboss/reflect/plugins/ClassInfoImpl.java 2008-02-18 16:09:12 UTC (rev 69888)
@@ -256,7 +256,7 @@
* @param clazz the class
* @return the array class
*/
- public static Class getArrayClass(Class clazz)
+ public static Class<?> getArrayClass(Class<?> clazz)
{
return Array.newInstance(clazz, 0).getClass();
}
@@ -266,7 +266,7 @@
*
* @param type the class
*/
- public void setType(Class type)
+ public void setType(Class<?> type)
{
setAnnotatedElement(type);
if (type != null)
@@ -470,6 +470,7 @@
}
@Deprecated
+ @SuppressWarnings("unchecked")
public Class<? extends Object> getType()
{
return (Class<? extends Object>) annotatedElement;
@@ -522,7 +523,7 @@
public TypeInfo getArrayType()
{
- Class arrayClass = getArrayClass(getType());
+ Class<?> arrayClass = getArrayClass(getType());
return classInfoHelper.getTypeInfo(arrayClass);
}
Modified: projects/microcontainer/trunk/container/src/main/org/jboss/reflect/plugins/TypeInfoAttachments.java
===================================================================
--- projects/microcontainer/trunk/container/src/main/org/jboss/reflect/plugins/TypeInfoAttachments.java 2008-02-18 16:07:07 UTC (rev 69887)
+++ projects/microcontainer/trunk/container/src/main/org/jboss/reflect/plugins/TypeInfoAttachments.java 2008-02-18 16:09:12 UTC (rev 69888)
@@ -108,7 +108,7 @@
{
try
{
- return ((Future) result).get();
+ return ((Future<?>) result).get();
}
catch (RuntimeException e)
{
Modified: projects/microcontainer/trunk/container/src/main/org/jboss/reflect/plugins/introspection/IntrospectionTypeInfoFactory.java
===================================================================
--- projects/microcontainer/trunk/container/src/main/org/jboss/reflect/plugins/introspection/IntrospectionTypeInfoFactory.java 2008-02-18 16:07:07 UTC (rev 69887)
+++ projects/microcontainer/trunk/container/src/main/org/jboss/reflect/plugins/introspection/IntrospectionTypeInfoFactory.java 2008-02-18 16:09:12 UTC (rev 69888)
@@ -44,7 +44,7 @@
return delegate;
}
- public TypeInfo getTypeInfo(Class clazz)
+ public TypeInfo getTypeInfo(Class<?> clazz)
{
return delegate.getTypeInfo(clazz);
}
Modified: projects/microcontainer/trunk/container/src/main/org/jboss/reflect/plugins/introspection/IntrospectionTypeInfoFactoryImpl.java
===================================================================
--- projects/microcontainer/trunk/container/src/main/org/jboss/reflect/plugins/introspection/IntrospectionTypeInfoFactoryImpl.java 2008-02-18 16:07:07 UTC (rev 69887)
+++ projects/microcontainer/trunk/container/src/main/org/jboss/reflect/plugins/introspection/IntrospectionTypeInfoFactoryImpl.java 2008-02-18 16:09:12 UTC (rev 69888)
@@ -74,18 +74,18 @@
* @param clazz the class
* @param info the class info
*/
- public void generateTypeInfo(Class clazz, ClassInfoImpl info)
+ public void generateTypeInfo(Class<?> clazz, ClassInfoImpl info)
{
// Everything is done lazily
}
public ClassInfoImpl getSuperClass(ClassInfoImpl classInfo)
{
- Class clazz = classInfo.getType();
+ Class<?> clazz = classInfo.getType();
ClassInfoImpl superType = null;
if (clazz.isInterface() == false)
{
- Class superClazz = clazz.getSuperclass();
+ Class<?> superClazz = clazz.getSuperclass();
if (superClazz != null)
superType = (ClassInfoImpl) getTypeInfo(superClazz);
}
@@ -94,7 +94,7 @@
public ClassInfo getGenericSuperClass(ClassInfoImpl classInfo)
{
- Class clazz = classInfo.getType();
+ Class<?> clazz = classInfo.getType();
ClassInfo superType = null;
if (clazz.isInterface() == false)
{
@@ -136,11 +136,11 @@
public ConstructorInfoImpl[] getConstructors(ClassInfoImpl classInfo)
{
- Class clazz = classInfo.getType();
+ Class<?> clazz = classInfo.getType();
ReflectConstructorInfoImpl[] infos = null;
if (clazz.isInterface() == false)
{
- Constructor[] constructors = getDeclaredConstructors(clazz);
+ Constructor<?>[] constructors = getDeclaredConstructors(clazz);
if (constructors != null && constructors.length > 0)
{
infos = new ReflectConstructorInfoImpl[constructors.length];
@@ -166,7 +166,7 @@
public FieldInfoImpl[] getFields(ClassInfoImpl classInfo)
{
- Class clazz = classInfo.getType();
+ Class<?> clazz = classInfo.getType();
Field[] fields = getDeclaredFields(clazz);
if (fields == null || fields.length == 0)
return null;
@@ -184,7 +184,7 @@
public MethodInfoImpl[] getMethods(ClassInfoImpl classInfo)
{
- Class clazz = classInfo.getType();
+ Class<?> clazz = classInfo.getType();
Method[] methods = getDeclaredMethods(clazz);
if (methods == null || methods.length == 0)
return null;
@@ -201,8 +201,8 @@
public InterfaceInfo[] getInterfaces(ClassInfoImpl classInfo)
{
- Class clazz = classInfo.getType();
- Class[] interfaces = clazz.getInterfaces();
+ Class<?> clazz = classInfo.getType();
+ Class<?>[] interfaces = clazz.getInterfaces();
if (interfaces == null || interfaces.length == 0)
return null;
@@ -215,7 +215,7 @@
public InterfaceInfo[] getGenericInterfaces(ClassInfoImpl classInfo)
{
- Class clazz = classInfo.getType();
+ Class<?> clazz = classInfo.getType();
Type[] interfaces = clazz.getGenericInterfaces();
if (interfaces == null || interfaces.length == 0)
return null;
@@ -229,7 +229,7 @@
public PackageInfoImpl getPackage(ClassInfoImpl classInfo)
{
- Class clazz = classInfo.getType();
+ Class<?> clazz = classInfo.getType();
Package pkg = clazz.getPackage();
if (pkg == null)
return null;
@@ -272,7 +272,7 @@
return result;
}
- public TypeInfo getTypeInfo(Class clazz)
+ public TypeInfo getTypeInfo(Class<?> clazz)
{
if (clazz == null)
throw new IllegalArgumentException("Null class");
@@ -301,7 +301,7 @@
String name = null;
if (type instanceof Class)
- name = ((Class) type).getName();
+ name = ((Class<?>) type).getName();
if (name != null)
{
TypeInfo primitive = PrimitiveInfo.valueOf(name);
@@ -372,7 +372,7 @@
if (cl == null)
cl = Thread.currentThread().getContextClassLoader();
- Class clazz = Class.forName(name, false, cl);
+ Class<?> clazz = Class.forName(name, false, cl);
return getTypeInfo(clazz);
}
@@ -422,7 +422,7 @@
protected TypeInfo instantiate(ParameterizedType type)
{
- Class rawType = (Class) type.getRawType();
+ Class<?> rawType = (Class<?>) type.getRawType();
ClassInfo rawTypeInfo = (ClassInfo) getTypeInfo(rawType);
if (rawTypeInfo instanceof ArrayInfo)
return new ParameterizedArrayInfo(this, (ArrayInfo) rawTypeInfo, type);
@@ -439,15 +439,15 @@
// Everything is lazy
}
- protected Constructor[] getDeclaredConstructors(final Class clazz)
+ protected Constructor<?>[] getDeclaredConstructors(final Class<?> clazz)
{
if (System.getSecurityManager() == null)
return clazz.getDeclaredConstructors();
else
{
- PrivilegedAction<Constructor[]> action = new PrivilegedAction<Constructor[]>()
+ PrivilegedAction<Constructor<?>[]> action = new PrivilegedAction<Constructor<?>[]>()
{
- public Constructor[] run()
+ public Constructor<?>[] run()
{
return clazz.getDeclaredConstructors();
}
@@ -456,7 +456,7 @@
}
}
- protected Field[] getDeclaredFields(final Class clazz)
+ protected Field[] getDeclaredFields(final Class<?> clazz)
{
if (System.getSecurityManager() == null)
return clazz.getDeclaredFields();
@@ -473,7 +473,7 @@
}
}
- protected Method[] getDeclaredMethods(final Class clazz)
+ protected Method[] getDeclaredMethods(final Class<?> clazz)
{
if (System.getSecurityManager() == null)
return clazz.getDeclaredMethods();
@@ -568,7 +568,7 @@
return findActualType(classInfo, Map.class, 1);
}
- protected TypeInfo findActualType(ClassInfo classInfo, Class reference, int parameter)
+ protected TypeInfo findActualType(ClassInfo classInfo, Class<?> reference, int parameter)
{
Type type = classInfo.getType();
if (classInfo instanceof ParameterizedClassInfo)
@@ -577,7 +577,7 @@
Type result = locateActualType(reference, parameter, classInfo.getType(), type);
if (result instanceof TypeVariable)
{
- TypeVariable typeVariable = (TypeVariable) result;
+ TypeVariable<?> typeVariable = (TypeVariable<?>) result;
result = typeVariable.getBounds()[0];
}
return getTypeInfo(result);
@@ -635,9 +635,9 @@
return result;
}
- private static Type getParameter(Class clazz, Type type, TypeVariable variable)
+ private static Type getParameter(Class<?> clazz, Type type, TypeVariable<?> variable)
{
- TypeVariable[] variables = clazz.getTypeParameters();
+ TypeVariable<?>[] variables = clazz.getTypeParameters();
for (int i = 0; i < variables.length; ++i)
{
if (variables[i].getName().equals(variable.getName()))
Modified: projects/microcontainer/trunk/container/src/main/org/jboss/reflect/plugins/introspection/ReflectConstructorInfoImpl.java
===================================================================
--- projects/microcontainer/trunk/container/src/main/org/jboss/reflect/plugins/introspection/ReflectConstructorInfoImpl.java 2008-02-18 16:07:07 UTC (rev 69887)
+++ projects/microcontainer/trunk/container/src/main/org/jboss/reflect/plugins/introspection/ReflectConstructorInfoImpl.java 2008-02-18 16:09:12 UTC (rev 69888)
@@ -43,7 +43,7 @@
private static final long serialVersionUID = 2;
/** The constructor */
- protected transient Constructor constructor;
+ protected transient Constructor<?> constructor;
/**
* Create a new ConstructorInfo.
@@ -86,7 +86,7 @@
*
* @param constructor the constructor
*/
- public void setConstructor(Constructor constructor)
+ public void setConstructor(Constructor<?> constructor)
{
this.constructor = constructor;
}
@@ -96,7 +96,7 @@
*
* @return the constructor
*/
- public Constructor getConstructor()
+ public Constructor<?> getConstructor()
{
return constructor;
}
Modified: projects/microcontainer/trunk/container/src/main/org/jboss/reflect/plugins/introspection/ReflectionUtils.java
===================================================================
--- projects/microcontainer/trunk/container/src/main/org/jboss/reflect/plugins/introspection/ReflectionUtils.java 2008-02-18 16:07:07 UTC (rev 69887)
+++ projects/microcontainer/trunk/container/src/main/org/jboss/reflect/plugins/introspection/ReflectionUtils.java 2008-02-18 16:09:12 UTC (rev 69888)
@@ -68,7 +68,7 @@
* @return the constructed object
* @throws Throwable for any error
*/
- public static Object newInstance(Class clazz) throws Throwable
+ public static Object newInstance(Class<?> clazz) throws Throwable
{
if (clazz == null)
throw new IllegalArgumentException("Null clazz");
@@ -96,7 +96,7 @@
throw new IllegalArgumentException("Null class name");
if (cl == null)
throw new IllegalArgumentException("Null classloader");
- Class clazz = Class.forName(className, false, cl);
+ Class<?> clazz = Class.forName(className, false, cl);
try
{
return clazz.newInstance();
@@ -128,7 +128,7 @@
* @return the constructed object
* @throws Throwable for any error
*/
- public static Object newInstance(Constructor constructor, Object[] arguments) throws Throwable
+ public static Object newInstance(Constructor<?> constructor, Object[] arguments) throws Throwable
{
if (constructor == null)
throw new IllegalArgumentException("Null constructor");
@@ -208,7 +208,7 @@
* @param parameterTypes the types
* @return method or null if not found
*/
- public static Method findMethod(Class clazz, String name, Class<?>... parameterTypes)
+ public static Method findMethod(Class<?> clazz, String name, Class<?>... parameterTypes)
{
if (clazz == null)
return null;
@@ -232,7 +232,7 @@
* @return method or throw exception if not found
* @throws NoSuchMethodException for no such method
*/
- public static Method findExactMethod(Class clazz, String name, Class<?>... parameterTypes)
+ public static Method findExactMethod(Class<?> clazz, String name, Class<?>... parameterTypes)
throws NoSuchMethodException
{
Method method = findMethod(clazz, name, parameterTypes);
@@ -248,7 +248,7 @@
* @param name the name
* @return field or null if not found
*/
- public static Field findField(Class clazz, String name)
+ public static Field findField(Class<?> clazz, String name)
{
if (clazz == null)
return null;
@@ -271,7 +271,7 @@
* @return field or throw exception if not found
* @throws NoSuchFieldException for no such field
*/
- public static Field findExactField(Class clazz, String name)
+ public static Field findExactField(Class<?> clazz, String name)
throws NoSuchFieldException
{
Field field = findField(clazz, name);
@@ -287,7 +287,7 @@
* @param parameterTypes the types
* @return constructor or null if not found
*/
- public static Constructor findConstructor(Class clazz, Class<?>... parameterTypes)
+ public static Constructor<?> findConstructor(Class<?> clazz, Class<?>... parameterTypes)
{
if (clazz == null)
return null;
@@ -310,10 +310,10 @@
* @return method or throw exception if not found
* @throws NoSuchMethodException for no such method
*/
- public static Constructor findExactConstructor(Class clazz, Class<?>... parameterTypes)
+ public static Constructor<?> findExactConstructor(Class<?> clazz, Class<?>... parameterTypes)
throws NoSuchMethodException
{
- Constructor constructor = findConstructor(clazz, parameterTypes);
+ Constructor<?> constructor = findConstructor(clazz, parameterTypes);
if (constructor == null)
throw new NoSuchMethodException(clazz + " - " + arrayInfo(parameterTypes));
return constructor;
@@ -330,7 +330,7 @@
* @return never
* @throws Throwable always
*/
- public static Throwable handleErrors(String context, Object target, Class[] parameters, Object[] arguments, Throwable t) throws Throwable
+ public static Throwable handleErrors(String context, Object target, Class<?>[] parameters, Object[] arguments, Throwable t) throws Throwable
{
if (t instanceof IllegalArgumentException)
{
Modified: projects/microcontainer/trunk/container/src/main/org/jboss/reflect/plugins/javassist/JavassistAnnotatedParameterInfo.java
===================================================================
--- projects/microcontainer/trunk/container/src/main/org/jboss/reflect/plugins/javassist/JavassistAnnotatedParameterInfo.java 2008-02-18 16:07:07 UTC (rev 69887)
+++ projects/microcontainer/trunk/container/src/main/org/jboss/reflect/plugins/javassist/JavassistAnnotatedParameterInfo.java 2008-02-18 16:09:12 UTC (rev 69888)
@@ -61,7 +61,7 @@
AnnotationValue[] annotationValues = new AnnotationValue[annotations[param].length];
for (int ann = 0 ; ann < annotationValues.length ; ann++)
{
- Class clazz = ((Annotation)annotations[param][ann]).annotationType();
+ Class<?> clazz = ((Annotation)annotations[param][ann]).annotationType();
AnnotationInfo info = (AnnotationInfo)((JavassistTypeInfoFactoryImpl)annotationHelper).getTypeInfo(clazz);
annotationValues[ann] = annotationHelper.createAnnotationValue(info, annotations[param][ann]);
Modified: projects/microcontainer/trunk/container/src/main/org/jboss/reflect/plugins/javassist/JavassistReflectionFactory.java
===================================================================
--- projects/microcontainer/trunk/container/src/main/org/jboss/reflect/plugins/javassist/JavassistReflectionFactory.java 2008-02-18 16:07:07 UTC (rev 69887)
+++ projects/microcontainer/trunk/container/src/main/org/jboss/reflect/plugins/javassist/JavassistReflectionFactory.java 2008-02-18 16:09:12 UTC (rev 69888)
@@ -234,7 +234,7 @@
{
public JavassistMethod run() throws Exception
{
- Class clazz = result.toClass();
+ Class<?> clazz = result.toClass();
return (JavassistMethod) clazz.newInstance();
}
});
@@ -359,7 +359,7 @@
{
public JavassistConstructor run() throws Exception
{
- Class clazz = result.toClass();
+ Class<?> clazz = result.toClass();
return (JavassistConstructor) clazz.newInstance();
}
});
@@ -560,7 +560,7 @@
{
public JavassistField run() throws Exception
{
- Class clazz = result.toClass();
+ Class<?> clazz = result.toClass();
return (JavassistField) clazz.newInstance();
}
});
Modified: projects/microcontainer/trunk/container/src/main/org/jboss/reflect/plugins/javassist/JavassistTypeInfo.java
===================================================================
--- projects/microcontainer/trunk/container/src/main/org/jboss/reflect/plugins/javassist/JavassistTypeInfo.java 2008-02-18 16:07:07 UTC (rev 69887)
+++ projects/microcontainer/trunk/container/src/main/org/jboss/reflect/plugins/javassist/JavassistTypeInfo.java 2008-02-18 16:09:12 UTC (rev 69888)
@@ -357,14 +357,14 @@
* @param clazz the class
* @return the array class
*/
- public static Class getArrayClass(Class clazz)
+ public static Class<?> getArrayClass(Class<?> clazz)
{
return Array.newInstance(clazz, 0).getClass();
}
public TypeInfo getArrayType()
{
- Class arrayClass = getArrayClass(getType());
+ Class<?> arrayClass = getArrayClass(getType());
return factory.getTypeInfo(arrayClass);
}
Modified: projects/microcontainer/trunk/container/src/main/org/jboss/reflect/plugins/javassist/JavassistTypeInfoFactory.java
===================================================================
--- projects/microcontainer/trunk/container/src/main/org/jboss/reflect/plugins/javassist/JavassistTypeInfoFactory.java 2008-02-18 16:07:07 UTC (rev 69887)
+++ projects/microcontainer/trunk/container/src/main/org/jboss/reflect/plugins/javassist/JavassistTypeInfoFactory.java 2008-02-18 16:09:12 UTC (rev 69888)
@@ -44,7 +44,7 @@
return delegate;
}
- public TypeInfo getTypeInfo(Class clazz)
+ public TypeInfo getTypeInfo(Class<?> clazz)
{
return delegate.getTypeInfo(clazz);
}
Modified: projects/microcontainer/trunk/container/src/main/org/jboss/reflect/plugins/javassist/JavassistTypeInfoFactoryImpl.java
===================================================================
--- projects/microcontainer/trunk/container/src/main/org/jboss/reflect/plugins/javassist/JavassistTypeInfoFactoryImpl.java 2008-02-18 16:07:07 UTC (rev 69887)
+++ projects/microcontainer/trunk/container/src/main/org/jboss/reflect/plugins/javassist/JavassistTypeInfoFactoryImpl.java 2008-02-18 16:09:12 UTC (rev 69888)
@@ -245,12 +245,13 @@
}
}
+ @SuppressWarnings("unchecked")
protected void generate(Class clazz, Object result)
{
// Everything is done lazily
}
- public TypeInfo getTypeInfo(Class clazz)
+ public TypeInfo getTypeInfo(Class<?> clazz)
{
if (clazz == null)
throw new IllegalArgumentException("Null class");
@@ -293,14 +294,14 @@
return number;
}
- Class clazz = Class.forName(name, false, cl);
+ Class<?> clazz = Class.forName(name, false, cl);
return getTypeInfo(clazz);
}
public TypeInfo getTypeInfo(Type type)
{
if (type instanceof Class)
- return getTypeInfo((Class) type);
+ return getTypeInfo((Class<?>) type);
// TODO JBMICROCONT-129 getTypeInfo + NumberInfo
throw new org.jboss.util.NotImplementedException("getTypeInfo");
@@ -332,7 +333,7 @@
AnnotationValue[] annotationValues = new AnnotationValueImpl[annotations.length];
for (int i = 0 ; i < annotations.length ; i++)
{
- Class clazz = ((Annotation)annotations[i]).annotationType();
+ Class<?> clazz = ((Annotation)annotations[i]).annotationType();
AnnotationInfo info = (AnnotationInfo)getTypeInfo(clazz);
annotationValues[i] = AnnotationValueFactory.createAnnotationValue(this, this, info, annotations[i]);
Modified: projects/microcontainer/trunk/container/src/main/org/jboss/reflect/spi/DelegateClassInfo.java
===================================================================
--- projects/microcontainer/trunk/container/src/main/org/jboss/reflect/spi/DelegateClassInfo.java 2008-02-18 16:07:07 UTC (rev 69887)
+++ projects/microcontainer/trunk/container/src/main/org/jboss/reflect/spi/DelegateClassInfo.java 2008-02-18 16:09:12 UTC (rev 69888)
@@ -242,7 +242,7 @@
}
@Deprecated
- public Class getType()
+ public Class<?> getType()
{
return delegate.getType();
}
Modified: projects/microcontainer/trunk/container/src/main/org/jboss/reflect/spi/PrimitiveInfo.java
===================================================================
--- projects/microcontainer/trunk/container/src/main/org/jboss/reflect/spi/PrimitiveInfo.java 2008-02-18 16:07:07 UTC (rev 69887)
+++ projects/microcontainer/trunk/container/src/main/org/jboss/reflect/spi/PrimitiveInfo.java 2008-02-18 16:09:12 UTC (rev 69888)
@@ -187,7 +187,7 @@
public TypeInfo getArrayType()
{
- Class arrayClass = ClassInfoImpl.getArrayClass(getType());
+ Class<?> arrayClass = ClassInfoImpl.getArrayClass(getType());
return typeInfoFactory.getTypeInfo(arrayClass);
}
Modified: projects/microcontainer/trunk/container/src/main/org/jboss/reflect/spi/TypeInfo.java
===================================================================
--- projects/microcontainer/trunk/container/src/main/org/jboss/reflect/spi/TypeInfo.java 2008-02-18 16:07:07 UTC (rev 69887)
+++ projects/microcontainer/trunk/container/src/main/org/jboss/reflect/spi/TypeInfo.java 2008-02-18 16:09:12 UTC (rev 69888)
@@ -51,7 +51,7 @@
* @deprecated I'm not sure this should be here?
* @return the class
*/
- Class getType();
+ Class<?> getType();
/**
* Convert a value
Modified: projects/microcontainer/trunk/container/src/main/org/jboss/reflect/spi/TypeInfoFactory.java
===================================================================
--- projects/microcontainer/trunk/container/src/main/org/jboss/reflect/spi/TypeInfoFactory.java 2008-02-18 16:07:07 UTC (rev 69887)
+++ projects/microcontainer/trunk/container/src/main/org/jboss/reflect/spi/TypeInfoFactory.java 2008-02-18 16:09:12 UTC (rev 69888)
@@ -46,7 +46,7 @@
* @param clazz the class
* @return the type info
*/
- TypeInfo getTypeInfo(Class clazz);
+ TypeInfo getTypeInfo(Class<?> clazz);
/**
* Get a type info
Modified: projects/microcontainer/trunk/container/src/tests/org/jboss/test/ContainerTest.java
===================================================================
--- projects/microcontainer/trunk/container/src/tests/org/jboss/test/ContainerTest.java 2008-02-18 16:07:07 UTC (rev 69887)
+++ projects/microcontainer/trunk/container/src/tests/org/jboss/test/ContainerTest.java 2008-02-18 16:09:12 UTC (rev 69888)
@@ -46,7 +46,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
{
AbstractTestDelegate delegate = new AbstractTestDelegate(clazz);
//delegate.enableSecurity = true;
Modified: projects/microcontainer/trunk/container/src/tests/org/jboss/test/annotation/factory/support/Complex.java
===================================================================
--- projects/microcontainer/trunk/container/src/tests/org/jboss/test/annotation/factory/support/Complex.java 2008-02-18 16:07:07 UTC (rev 69887)
+++ projects/microcontainer/trunk/container/src/tests/org/jboss/test/annotation/factory/support/Complex.java 2008-02-18 16:09:12 UTC (rev 69888)
@@ -48,7 +48,7 @@
String[] array();
- Class clazz();
+ Class<?> clazz();
MyEnum enumVal();
}
Modified: projects/microcontainer/trunk/container/src/tests/org/jboss/test/annotation/factory/support/ComplexWithDefault.java
===================================================================
--- projects/microcontainer/trunk/container/src/tests/org/jboss/test/annotation/factory/support/ComplexWithDefault.java 2008-02-18 16:07:07 UTC (rev 69887)
+++ projects/microcontainer/trunk/container/src/tests/org/jboss/test/annotation/factory/support/ComplexWithDefault.java 2008-02-18 16:09:12 UTC (rev 69888)
@@ -48,7 +48,7 @@
String[] array() default {"The", "defaults"};
- Class clazz() default String.class;
+ Class<?> clazz() default String.class;
MyEnum enumVal() default MyEnum.ONE;
Modified: projects/microcontainer/trunk/container/src/tests/org/jboss/test/beaninfo/support/BeanInfoConstructors.java
===================================================================
--- projects/microcontainer/trunk/container/src/tests/org/jboss/test/beaninfo/support/BeanInfoConstructors.java 2008-02-18 16:07:07 UTC (rev 69887)
+++ projects/microcontainer/trunk/container/src/tests/org/jboss/test/beaninfo/support/BeanInfoConstructors.java 2008-02-18 16:09:12 UTC (rev 69888)
@@ -29,6 +29,7 @@
*/
public class BeanInfoConstructors
{
+ @SuppressWarnings("unused")
private BeanInfoConstructors() {}
BeanInfoConstructors(int p1) {}
protected BeanInfoConstructors(int p1, String p2) {}
Modified: projects/microcontainer/trunk/container/src/tests/org/jboss/test/beaninfo/test/AbstractBeanInfoTest.java
===================================================================
--- projects/microcontainer/trunk/container/src/tests/org/jboss/test/beaninfo/test/AbstractBeanInfoTest.java 2008-02-18 16:07:07 UTC (rev 69887)
+++ projects/microcontainer/trunk/container/src/tests/org/jboss/test/beaninfo/test/AbstractBeanInfoTest.java 2008-02-18 16:09:12 UTC (rev 69888)
@@ -73,19 +73,19 @@
assertBeanProperties(beanInfo, clazz);
}
- protected void assertBeanConstructors(BeanInfo beanInfo, Class clazz)
+ protected void assertBeanConstructors(BeanInfo beanInfo, Class<?> clazz)
{
ClassInfo classInfo = beanInfo.getClassInfo();
TypeInfoFactory factory = getTypeInfoFactory();
Set<ConstructorInfo> expected = new HashSet<ConstructorInfo>();
- for (Constructor constructor : clazz.getConstructors())
+ for (Constructor<?> constructor : clazz.getConstructors())
{
- Class[] paramClasses = constructor.getParameterTypes();
+ Class<?>[] paramClasses = constructor.getParameterTypes();
TypeInfo[] paramTypes = new TypeInfo[paramClasses.length];
AnnotationValue[][] paramAnnotations = new AnnotationValue[paramClasses.length][0];
int i = 0;
- for (Class c : paramClasses)
+ for (Class<?> c : paramClasses)
paramTypes[i++] = factory.getTypeInfo(c);
ConstructorInfo c = new ConstructorInfoImpl(null, paramTypes, paramAnnotations, null, constructor.getModifiers(), classInfo);
expected.add(c);
@@ -117,11 +117,11 @@
for (Method method : methods)
{
TypeInfo returnType = factory.getTypeInfo(method.getReturnType());
- Class[] paramClasses = method.getParameterTypes();
+ Class<?>[] paramClasses = method.getParameterTypes();
TypeInfo[] paramTypes = new TypeInfo[paramClasses.length];
AnnotationValue[][] paramAnnotations = new AnnotationValue[paramClasses.length][0];
int i = 0;
- for (Class c : paramClasses)
+ for (Class<?> c : paramClasses)
paramTypes[i++] = factory.getTypeInfo(c);
ClassInfo classInfo = (ClassInfo) factory.getTypeInfo(method.getDeclaringClass());
MethodInfo m = new MethodInfoImpl(null, method.getName(), returnType, paramTypes, paramAnnotations, null, method.getModifiers(), classInfo);
@@ -181,7 +181,7 @@
}
}
- protected Set<PropertyInfo> getExpectedProperties(Class clazz)
+ protected Set<PropertyInfo> getExpectedProperties(Class<?> clazz)
{
TypeInfoFactory factory = getTypeInfoFactory();
Method[] methods = clazz.getMethods();
@@ -304,7 +304,7 @@
for (Method method : methods)
{
TypeInfo returnType = factory.getTypeInfo(method.getGenericReturnType());
- Class[] parameters = method.getParameterTypes();
+ Class<?>[] parameters = method.getParameterTypes();
if (parameters.length == 0 && PrimitiveInfo.VOID.equals(returnType) == false)
{
String name = method.getName();
@@ -347,8 +347,8 @@
protected static boolean isGetter(Method method)
{
String name = method.getName();
- Class returnType = method.getReturnType();
- Class[] parameters = method.getParameterTypes();
+ Class<?> returnType = method.getReturnType();
+ Class<?>[] parameters = method.getParameterTypes();
if ((name.length() > 3 && name.startsWith("get")) || (name.length() > 2 && name.startsWith("is")))
{
// isBoolean() is not a getter for java.lang.Boolean
@@ -363,8 +363,8 @@
protected static boolean isSetter(Method method)
{
String name = method.getName();
- Class returnType = method.getReturnType();
- Class[] parameters = method.getParameterTypes();
+ Class<?> returnType = method.getReturnType();
+ Class<?>[] parameters = method.getParameterTypes();
if ((name.length() > 3 && name.startsWith("set")))
{
if (parameters.length == 1 && Void.TYPE.equals(returnType))
@@ -378,7 +378,7 @@
return configuration.getTypeInfoFactory();
}
- protected BeanInfo getBeanInfo(Class clazz) throws Throwable
+ protected BeanInfo getBeanInfo(Class<?> clazz) throws Throwable
{
return configuration.getBeanInfo(clazz);
}
Modified: projects/microcontainer/trunk/container/src/tests/org/jboss/test/beaninfo/test/BeanInfoUnitTestCase.java
===================================================================
--- projects/microcontainer/trunk/container/src/tests/org/jboss/test/beaninfo/test/BeanInfoUnitTestCase.java 2008-02-18 16:07:07 UTC (rev 69887)
+++ projects/microcontainer/trunk/container/src/tests/org/jboss/test/beaninfo/test/BeanInfoUnitTestCase.java 2008-02-18 16:09:12 UTC (rev 69888)
@@ -249,7 +249,7 @@
assertEquals("java.lang.Double", property.getType().getName());
}
- protected void testBean(Class clazz, String[] beanNames) throws Throwable
+ protected void testBean(Class<?> clazz, String[] beanNames) throws Throwable
{
BeanInfo beanInfo = getBeanInfo(clazz);
assertBeanInfo(beanInfo, clazz);
Modified: projects/microcontainer/trunk/container/src/tests/org/jboss/test/classinfo/support/ClassInfoConstructorClass.java
===================================================================
--- projects/microcontainer/trunk/container/src/tests/org/jboss/test/classinfo/support/ClassInfoConstructorClass.java 2008-02-18 16:07:07 UTC (rev 69887)
+++ projects/microcontainer/trunk/container/src/tests/org/jboss/test/classinfo/support/ClassInfoConstructorClass.java 2008-02-18 16:09:12 UTC (rev 69888)
@@ -29,6 +29,7 @@
*/
public class ClassInfoConstructorClass
{
+ @SuppressWarnings("unused")
private ClassInfoConstructorClass() {}
ClassInfoConstructorClass(int p1) {}
protected ClassInfoConstructorClass(int p1, String p2) {}
Modified: projects/microcontainer/trunk/container/src/tests/org/jboss/test/classinfo/support/ClassInfoGenericExtendsCollectionNotGeneric.java
===================================================================
--- projects/microcontainer/trunk/container/src/tests/org/jboss/test/classinfo/support/ClassInfoGenericExtendsCollectionNotGeneric.java 2008-02-18 16:07:07 UTC (rev 69887)
+++ projects/microcontainer/trunk/container/src/tests/org/jboss/test/classinfo/support/ClassInfoGenericExtendsCollectionNotGeneric.java 2008-02-18 16:09:12 UTC (rev 69888)
@@ -30,6 +30,7 @@
* @author <a href="adrian at jboss.com">Adrian Brock</a>
* @version $Revision: 1.1 $
*/
+ at SuppressWarnings("unchecked")
public class ClassInfoGenericExtendsCollectionNotGeneric extends AbstractCollection
{
public Iterator iterator()
Modified: projects/microcontainer/trunk/container/src/tests/org/jboss/test/classinfo/support/ClassInfoGenericExtendsMapNotGeneric.java
===================================================================
--- projects/microcontainer/trunk/container/src/tests/org/jboss/test/classinfo/support/ClassInfoGenericExtendsMapNotGeneric.java 2008-02-18 16:07:07 UTC (rev 69887)
+++ projects/microcontainer/trunk/container/src/tests/org/jboss/test/classinfo/support/ClassInfoGenericExtendsMapNotGeneric.java 2008-02-18 16:09:12 UTC (rev 69888)
@@ -30,6 +30,7 @@
* @author <a href="adrian at jboss.com">Adrian Brock</a>
* @version $Revision: 1.1 $
*/
+ at SuppressWarnings("unchecked")
public class ClassInfoGenericExtendsMapNotGeneric extends AbstractMap
{
public Set entrySet()
Modified: projects/microcontainer/trunk/container/src/tests/org/jboss/test/classinfo/support/ClassInfoGenericImplementsCollectionNotGeneric.java
===================================================================
--- projects/microcontainer/trunk/container/src/tests/org/jboss/test/classinfo/support/ClassInfoGenericImplementsCollectionNotGeneric.java 2008-02-18 16:07:07 UTC (rev 69887)
+++ projects/microcontainer/trunk/container/src/tests/org/jboss/test/classinfo/support/ClassInfoGenericImplementsCollectionNotGeneric.java 2008-02-18 16:09:12 UTC (rev 69888)
@@ -30,6 +30,7 @@
* @author <a href="adrian at jboss.com">Adrian Brock</a>
* @version $Revision: 1.1 $
*/
+ at SuppressWarnings("unchecked")
public class ClassInfoGenericImplementsCollectionNotGeneric implements Collection
{
public boolean add(Object o)
Modified: projects/microcontainer/trunk/container/src/tests/org/jboss/test/classinfo/support/ClassInfoGenericImplementsMapNotGeneric.java
===================================================================
--- projects/microcontainer/trunk/container/src/tests/org/jboss/test/classinfo/support/ClassInfoGenericImplementsMapNotGeneric.java 2008-02-18 16:07:07 UTC (rev 69887)
+++ projects/microcontainer/trunk/container/src/tests/org/jboss/test/classinfo/support/ClassInfoGenericImplementsMapNotGeneric.java 2008-02-18 16:09:12 UTC (rev 69888)
@@ -31,6 +31,7 @@
* @author <a href="adrian at jboss.com">Adrian Brock</a>
* @version $Revision: 1.1 $
*/
+ at SuppressWarnings("unchecked")
public class ClassInfoGenericImplementsMapNotGeneric implements Map
{
public void clear()
Modified: projects/microcontainer/trunk/container/src/tests/org/jboss/test/classinfo/support/ComplexAnnotation.java
===================================================================
--- projects/microcontainer/trunk/container/src/tests/org/jboss/test/classinfo/support/ComplexAnnotation.java 2008-02-18 16:07:07 UTC (rev 69887)
+++ projects/microcontainer/trunk/container/src/tests/org/jboss/test/classinfo/support/ComplexAnnotation.java 2008-02-18 16:09:12 UTC (rev 69888)
@@ -40,12 +40,12 @@
String stringValue() default "The answer is";
int intValue() default 42;
ValueAnnotation annotationValue() default @ValueAnnotation("method_");
- Class clazzValue() default Integer.class;
+ Class<?> clazzValue() default Integer.class;
TestEnum enumValue() default TestEnum.METHOD;
String[] stringArrayValue() default {"The", "answer", "is"};
int[] intArrayValue() default {4, 2};
ValueAnnotation[] annotationArrayValue() default {@ValueAnnotation("Ann1"), @ValueAnnotation("Ann2")};
- Class[] clazzArrayValue() default {Integer.class, Long.class};
+ Class<?>[] clazzArrayValue() default {Integer.class, Long.class};
TestEnum[] enumArrayValue() default {TestEnum.ARRAY_STUFF, TestEnum.METHOD};
}
Modified: projects/microcontainer/trunk/container/src/tests/org/jboss/test/classinfo/support/ExpectedAnnotations.java
===================================================================
--- projects/microcontainer/trunk/container/src/tests/org/jboss/test/classinfo/support/ExpectedAnnotations.java 2008-02-18 16:07:07 UTC (rev 69887)
+++ projects/microcontainer/trunk/container/src/tests/org/jboss/test/classinfo/support/ExpectedAnnotations.java 2008-02-18 16:09:12 UTC (rev 69888)
@@ -28,14 +28,14 @@
*/
public abstract class ExpectedAnnotations
{
- public abstract Class[] getAnnotationExpectedAnnotations();
+ public abstract Class<?>[] getAnnotationExpectedAnnotations();
- public abstract Class[] getComplexExpectedAnnotations();
+ public abstract Class<?>[] getComplexExpectedAnnotations();
- public abstract Class[] getExpectedAnnotations();
+ public abstract Class<?>[] getExpectedAnnotations();
- public abstract Class[] getFirstParamExpectedAnnotations();
+ public abstract Class<?>[] getFirstParamExpectedAnnotations();
- public abstract Class[] getSecondParamExpectedAnnotations();
+ public abstract Class<?>[] getSecondParamExpectedAnnotations();
}
Modified: projects/microcontainer/trunk/container/src/tests/org/jboss/test/classinfo/support/JDK14ExpectedAnnotations.java
===================================================================
--- projects/microcontainer/trunk/container/src/tests/org/jboss/test/classinfo/support/JDK14ExpectedAnnotations.java 2008-02-18 16:07:07 UTC (rev 69887)
+++ projects/microcontainer/trunk/container/src/tests/org/jboss/test/classinfo/support/JDK14ExpectedAnnotations.java 2008-02-18 16:09:12 UTC (rev 69888)
@@ -31,29 +31,29 @@
*/
public class JDK14ExpectedAnnotations extends ExpectedAnnotations
{
- final static Class[] EXPECTED_ANNOTATIONS = {SimpleAnnotation.class, ComplexAnnotation.class};
- final static Class[] ANNOTATION_EXPECTED_ANNOTATIONS = {Inherited.class};
- final static Class[] COMPLEXANNOTATION_EXPECTED_ANNOTATIONS = {SimpleAnnotation.class, ValueAnnotation.class};
- final static Class[] FIRST_PARAM_EXPECTED_ANNOTATIONS = {ValueAnnotation.class, ComplexAnnotation.class};
- final static Class[] SECOND_PARAM_EXPECTED_ANNOTATIONS = {ValueAnnotation.class, SimpleAnnotation.class};
+ final static Class<?>[] EXPECTED_ANNOTATIONS = {SimpleAnnotation.class, ComplexAnnotation.class};
+ final static Class<?>[] ANNOTATION_EXPECTED_ANNOTATIONS = {Inherited.class};
+ final static Class<?>[] COMPLEXANNOTATION_EXPECTED_ANNOTATIONS = {SimpleAnnotation.class, ValueAnnotation.class};
+ final static Class<?>[] FIRST_PARAM_EXPECTED_ANNOTATIONS = {ValueAnnotation.class, ComplexAnnotation.class};
+ final static Class<?>[] SECOND_PARAM_EXPECTED_ANNOTATIONS = {ValueAnnotation.class, SimpleAnnotation.class};
- public Class[] getAnnotationExpectedAnnotations()
+ public Class<?>[] getAnnotationExpectedAnnotations()
{
return ANNOTATION_EXPECTED_ANNOTATIONS;
}
- public Class[] getComplexExpectedAnnotations()
+ public Class<?>[] getComplexExpectedAnnotations()
{
return COMPLEXANNOTATION_EXPECTED_ANNOTATIONS;
}
- public Class[] getExpectedAnnotations()
+ public Class<?>[] getExpectedAnnotations()
{
return EXPECTED_ANNOTATIONS;
}
- public Class[] getFirstParamExpectedAnnotations()
+ public Class<?>[] getFirstParamExpectedAnnotations()
{
return FIRST_PARAM_EXPECTED_ANNOTATIONS;
}
- public Class[] getSecondParamExpectedAnnotations()
+ public Class<?>[] getSecondParamExpectedAnnotations()
{
return SECOND_PARAM_EXPECTED_ANNOTATIONS;
}
Modified: projects/microcontainer/trunk/container/src/tests/org/jboss/test/classinfo/support/JDK50ExpectedAnnotations.java
===================================================================
--- projects/microcontainer/trunk/container/src/tests/org/jboss/test/classinfo/support/JDK50ExpectedAnnotations.java 2008-02-18 16:07:07 UTC (rev 69887)
+++ projects/microcontainer/trunk/container/src/tests/org/jboss/test/classinfo/support/JDK50ExpectedAnnotations.java 2008-02-18 16:09:12 UTC (rev 69888)
@@ -33,29 +33,29 @@
*/
public class JDK50ExpectedAnnotations extends ExpectedAnnotations
{
- final static Class[] EXPECTED_ANNOTATIONS = {SimpleAnnotation.class, ComplexAnnotation.class};
- final static Class[] ANNOTATION_EXPECTED_ANNOTATIONS = {Target.class, Retention.class, Inherited.class};
- final static Class[] COMPLEXANNOTATION_EXPECTED_ANNOTATIONS = {Target.class, Retention.class, SimpleAnnotation.class, ValueAnnotation.class};
- final static Class[] FIRST_PARAM_EXPECTED_ANNOTATIONS = {ValueAnnotation.class, ComplexAnnotation.class};
- final static Class[] SECOND_PARAM_EXPECTED_ANNOTATIONS = {ValueAnnotation.class, SimpleAnnotation.class};
+ final static Class<?>[] EXPECTED_ANNOTATIONS = {SimpleAnnotation.class, ComplexAnnotation.class};
+ final static Class<?>[] ANNOTATION_EXPECTED_ANNOTATIONS = {Target.class, Retention.class, Inherited.class};
+ final static Class<?>[] COMPLEXANNOTATION_EXPECTED_ANNOTATIONS = {Target.class, Retention.class, SimpleAnnotation.class, ValueAnnotation.class};
+ final static Class<?>[] FIRST_PARAM_EXPECTED_ANNOTATIONS = {ValueAnnotation.class, ComplexAnnotation.class};
+ final static Class<?>[] SECOND_PARAM_EXPECTED_ANNOTATIONS = {ValueAnnotation.class, SimpleAnnotation.class};
- public Class[] getAnnotationExpectedAnnotations()
+ public Class<?>[] getAnnotationExpectedAnnotations()
{
return ANNOTATION_EXPECTED_ANNOTATIONS;
}
- public Class[] getComplexExpectedAnnotations()
+ public Class<?>[] getComplexExpectedAnnotations()
{
return COMPLEXANNOTATION_EXPECTED_ANNOTATIONS;
}
- public Class[] getExpectedAnnotations()
+ public Class<?>[] getExpectedAnnotations()
{
return EXPECTED_ANNOTATIONS;
}
- public Class[] getFirstParamExpectedAnnotations()
+ public Class<?>[] getFirstParamExpectedAnnotations()
{
return FIRST_PARAM_EXPECTED_ANNOTATIONS;
}
- public Class[] getSecondParamExpectedAnnotations()
+ public Class<?>[] getSecondParamExpectedAnnotations()
{
return SECOND_PARAM_EXPECTED_ANNOTATIONS;
}
Modified: projects/microcontainer/trunk/container/src/tests/org/jboss/test/classinfo/test/AbstractClassInfoTest.java
===================================================================
--- projects/microcontainer/trunk/container/src/tests/org/jboss/test/classinfo/test/AbstractClassInfoTest.java 2008-02-18 16:07:07 UTC (rev 69887)
+++ projects/microcontainer/trunk/container/src/tests/org/jboss/test/classinfo/test/AbstractClassInfoTest.java 2008-02-18 16:09:12 UTC (rev 69888)
@@ -176,7 +176,7 @@
protected void assertSuperClass(Class<?> clazz, ClassInfo classInfo) throws Throwable
{
TypeInfoFactory factory = getTypeInfoFactory();
- Class superClass = clazz.getSuperclass();
+ Class<?> superClass = clazz.getSuperclass();
TypeInfo superType = classInfo.getSuperclass();
getLog().debug(clazz + " superClass: " + superClass + " superType=" + superType);
if (superClass == null)
@@ -194,7 +194,7 @@
{
TypeInfoFactory factory = getTypeInfoFactory();
Set<TypeInfo> expected = new HashSet<TypeInfo>();
- for (Class c : clazz.getInterfaces())
+ for (Class<?> c : clazz.getInterfaces())
{
TypeInfo type = factory.getTypeInfo(c);
expected.add(type);
@@ -266,11 +266,11 @@
for (Method method : clazz.getDeclaredMethods())
{
TypeInfo returnType = factory.getTypeInfo(method.getReturnType());
- Class[] paramClasses = method.getParameterTypes();
+ Class<?>[] paramClasses = method.getParameterTypes();
TypeInfo[] paramTypes = new TypeInfo[paramClasses.length];
AnnotationValue[][] paramAnnotations = new AnnotationValue[paramClasses.length][0];
int i = 0;
- for (Class c : paramClasses)
+ for (Class<?> c : paramClasses)
paramTypes[i++] = factory.getTypeInfo(c);
MethodInfo m = new MethodInfoImpl(null, method.getName(), returnType, paramTypes, paramAnnotations, null, method.getModifiers(), classInfo);
expected.add(m);
@@ -310,7 +310,7 @@
TypeInfo[] actualParamTypes = methodInfo.getParameterTypes();
for (int i = 0; i < paramTypes.length; ++i)
assertTypeEquals(method.getName() + " param" + i, paramTypes[i], actualParamTypes[i]);
- Class[] exceptionClasses = method.getExceptionTypes();
+ Class<?>[] exceptionClasses = method.getExceptionTypes();
TypeInfo[] expectedExceptionTypes = new TypeInfo[exceptionClasses.length];
for (int i = 0; i < exceptionClasses.length; ++i)
expectedExceptionTypes[i] = factory.getTypeInfo(exceptionClasses[i]);
@@ -328,13 +328,13 @@
{
TypeInfoFactory factory = getTypeInfoFactory();
Set<ConstructorInfo> expected = new HashSet<ConstructorInfo>();
- for (Constructor constructor : clazz.getDeclaredConstructors())
+ for (Constructor<?> constructor : clazz.getDeclaredConstructors())
{
- Class[] paramClasses = constructor.getParameterTypes();
+ Class<?>[] paramClasses = constructor.getParameterTypes();
TypeInfo[] paramTypes = new TypeInfo[paramClasses.length];
AnnotationValue[][] paramAnnotations = new AnnotationValue[paramClasses.length][0];
int i = 0;
- for (Class c : paramClasses)
+ for (Class<?> c : paramClasses)
paramTypes[i++] = factory.getTypeInfo(c);
ConstructorInfo c = new ConstructorInfoImpl(null, paramTypes, paramAnnotations, null, constructor.getModifiers(), classInfo);
expected.add(c);
@@ -354,11 +354,11 @@
getLog().debug(clazz + " expected constructors=" + expected + " actual=" + actual);
assertEquals(expected, actual);
- for (Constructor constructor : clazz.getDeclaredConstructors())
+ for (Constructor<?> constructor : clazz.getDeclaredConstructors())
assertDeclaredConstructor(clazz, constructor, classInfo);
}
- protected void assertDeclaredConstructor(Class<?> clazz, Constructor constructor, ClassInfo classInfo) throws Throwable
+ protected void assertDeclaredConstructor(Class<?> clazz, Constructor<?> constructor, ClassInfo classInfo) throws Throwable
{
getLog().debug("Checking constructor " + Arrays.asList(constructor.getParameterTypes()));
@@ -380,7 +380,7 @@
TypeInfo[] actualParamTypes = constructorInfo.getParameterTypes();
for (int i = 0; i < paramTypes.length; ++i)
assertTypeEquals(clazz + " constructorParameter" + i, paramTypes[i], actualParamTypes[i]);
- Class[] exceptionClasses = constructor.getExceptionTypes();
+ Class<?>[] exceptionClasses = constructor.getExceptionTypes();
TypeInfo[] expectedExceptionTypes = new TypeInfo[exceptionClasses.length];
for (int i = 0; i < exceptionClasses.length; ++i)
expectedExceptionTypes[i] = factory.getTypeInfo(exceptionClasses[i]);
@@ -458,7 +458,7 @@
assertParameterAnnotations(annotations[i], parameters[i]);
}
- protected void assertConstructorAnnotations(Constructor constructor, ConstructorInfo constructorInfo) throws Throwable
+ protected void assertConstructorAnnotations(Constructor<?> constructor, ConstructorInfo constructorInfo) throws Throwable
{
Set<AnnotationValue> expected = getExpectedAnnotations(constructor.getDeclaredAnnotations());
@@ -496,7 +496,7 @@
assertEquals(expected, actual);
}
- protected void assertParameterAnnotations(Constructor constructor, ConstructorInfo constructorInfo) throws Throwable
+ protected void assertParameterAnnotations(Constructor<?> constructor, ConstructorInfo constructorInfo) throws Throwable
{
Annotation[][] annotations = constructor.getParameterAnnotations();
ParameterInfo[] parameters = constructorInfo.getParameters();
@@ -528,7 +528,7 @@
Set<AnnotationValue> expected = new HashSet<AnnotationValue>();
for (Annotation annotation : annotations)
{
- Class type = annotation.annotationType();
+ Class<?> type = annotation.annotationType();
AnnotationInfoImpl info = new AnnotationInfoImpl(type.getName(), type.getModifiers());
// TODO JBMICROCONT-127 attributes
AnnotationValue a = new AnnotationValueImpl(info, new HashMap<String, Value>(), annotation);
Modified: projects/microcontainer/trunk/container/src/tests/org/jboss/test/classinfo/test/AnnotatedClassInfoTest.java
===================================================================
--- projects/microcontainer/trunk/container/src/tests/org/jboss/test/classinfo/test/AnnotatedClassInfoTest.java 2008-02-18 16:07:07 UTC (rev 69887)
+++ projects/microcontainer/trunk/container/src/tests/org/jboss/test/classinfo/test/AnnotatedClassInfoTest.java 2008-02-18 16:09:12 UTC (rev 69888)
@@ -83,11 +83,11 @@
expected = new JDK14ExpectedAnnotations();
}
}
- final static Class[] EXPECTED_ANNOTATIONS = expected.getExpectedAnnotations();
- final static Class[] ANNOTATION_EXPECTED_ANNOTATIONS = expected.getAnnotationExpectedAnnotations();
- final static Class[] COMPLEXANNOTATION_EXPECTED_ANNOTATIONS = expected.getComplexExpectedAnnotations();
- final static Class[] FIRST_PARAM_EXPECTED_ANNOTATIONS = expected.getFirstParamExpectedAnnotations();
- final static Class[] SECOND_PARAM_EXPECTED_ANNOTATIONS = expected.getSecondParamExpectedAnnotations();
+ final static Class<?>[] EXPECTED_ANNOTATIONS = expected.getExpectedAnnotations();
+ final static Class<?>[] ANNOTATION_EXPECTED_ANNOTATIONS = expected.getAnnotationExpectedAnnotations();
+ final static Class<?>[] COMPLEXANNOTATION_EXPECTED_ANNOTATIONS = expected.getComplexExpectedAnnotations();
+ final static Class<?>[] FIRST_PARAM_EXPECTED_ANNOTATIONS = expected.getFirstParamExpectedAnnotations();
+ final static Class<?>[] SECOND_PARAM_EXPECTED_ANNOTATIONS = expected.getSecondParamExpectedAnnotations();
final static ExpectedComplexAnnotationData CLASS_DATA =
@@ -198,13 +198,13 @@
public void testClassArrayAnnotations() throws Exception
{
- Class classArray = new AnnotatedClass[0].getClass();
+ Class<?> classArray = new AnnotatedClass[0].getClass();
ClassInfo info = getClassInfo(classArray);
assertTrue(ArrayInfo.class.isAssignableFrom(info.getClass()));
assertTrue(info.getAnnotations().length == 0);
- for (Class annotation : EXPECTED_ANNOTATIONS)
+ for (Class <?>annotation : EXPECTED_ANNOTATIONS)
{
assertNull(info.getAnnotation(annotation.getName()));
assertFalse(info.isAnnotationPresent(annotation.getName()));
@@ -216,7 +216,7 @@
public void testSubClassArrayAnnotations() throws Exception
{
- Class classArray = new AnnotatedSubClass[0].getClass();
+ Class<?> classArray = new AnnotatedSubClass[0].getClass();
ClassInfo info = getClassInfo(classArray);
assertTrue(ArrayInfo.class.isAssignableFrom(info.getClass()));
@@ -410,7 +410,7 @@
}
}
- private void checkClassValue(Value value, Class expected)
+ private void checkClassValue(Value value, Class<?> expected)
{
assertNotNull(value);
ClassValue theVal = (ClassValue)value;
@@ -419,7 +419,7 @@
assertEquals(val, expected.getName());
}
- private void checkClassArrayValue(Value value, Class[] expected)
+ private void checkClassArrayValue(Value value, Class<?>[] expected)
{
Value[] values = getArrayValuesWithCheck(value, expected);
for (int i = 0 ; i < values.length ; i++)
@@ -499,7 +499,7 @@
return annotation;
}
- private void checkExpectedAnnotations(AnnotationValue[] values, Class[] expected)
+ private void checkExpectedAnnotations(AnnotationValue[] values, Class<?>[] expected)
{
assertEquals(expected.length, values.length);
@@ -518,7 +518,7 @@
}
}
- protected ClassInfo getClassInfo(Class clazz)
+ protected ClassInfo getClassInfo(Class<?> clazz)
{
TypeInfoFactory factory = getTypeInfoFactory();
TypeInfo info = factory.getTypeInfo(clazz);
@@ -565,25 +565,25 @@
String stringAttribute;
Integer intAttribute;
String containedValueAnnotationString;
- Class classAttribute;
+ Class<?> classAttribute;
String enumAttribute;
String[] stringArrayAttribute;
Integer[] intArrayAttribute;
String[] containedValueAnnotationArrayString;
- Class[] classArrayAttribute;
+ Class<?>[] classArrayAttribute;
String[] enumArrayAttribute;
public ExpectedComplexAnnotationData(
String stringAttribute,
int intAttribute,
String containedValueAnnotationString,
- Class classAttribute,
+ Class<?> classAttribute,
String enumAttribute,
String[] stringArrayAttribute,
Integer[] intArrayAttribute,
String[] containedValueAnnotationArrayString,
- Class[] classArrayAttribute,
+ Class<?>[] classArrayAttribute,
String[] enumArrayAttribute)
{
// this.annotationValueAnnotationString = annotationValueAnnotationString;
Modified: projects/microcontainer/trunk/container/src/tests/org/jboss/test/classinfo/test/ByteArrayUnitTestCase.java
===================================================================
--- projects/microcontainer/trunk/container/src/tests/org/jboss/test/classinfo/test/ByteArrayUnitTestCase.java 2008-02-18 16:07:07 UTC (rev 69887)
+++ projects/microcontainer/trunk/container/src/tests/org/jboss/test/classinfo/test/ByteArrayUnitTestCase.java 2008-02-18 16:09:12 UTC (rev 69888)
@@ -27,13 +27,10 @@
import org.jboss.reflect.plugins.introspection.IntrospectionTypeInfoFactory;
import org.jboss.reflect.spi.ArrayInfo;
import org.jboss.reflect.spi.ClassInfo;
-import org.jboss.reflect.spi.MethodInfo;
import org.jboss.reflect.spi.PrimitiveInfo;
import org.jboss.reflect.spi.TypeInfo;
import org.jboss.reflect.spi.TypeInfoFactory;
-import junit.framework.TestCase;
-
/**
* Tests of the TypeInfo for byte[] types
*
@@ -63,7 +60,7 @@
throws Exception
{
byte[] x = {};
- Class[] parameterTypes = {x.getClass(), int.class, int.class};
+ Class<?>[] parameterTypes = {x.getClass(), int.class, int.class};
Method defineClass = ClassLoader.class.getDeclaredMethod("defineClass", parameterTypes);
assertNotNull(defineClass);
Class<?>[] types = defineClass.getParameterTypes();
@@ -79,7 +76,7 @@
throws Exception
{
byte[] x = {};
- Class[] parameterTypes = {x.getClass(), int.class, int.class};
+ Class<?>[] parameterTypes = {x.getClass(), int.class, int.class};
Method defineClass = ClassLoader.class.getDeclaredMethod("defineClass", parameterTypes);
assertNotNull(defineClass);
Type[] types = defineClass.getGenericParameterTypes();
@@ -92,7 +89,7 @@
assertEquals(PrimitiveInfo.BYTE, compType);
}
- protected ClassInfo getClassInfo(Class clazz)
+ protected ClassInfo getClassInfo(Class<?> clazz)
{
TypeInfoFactory factory = getTypeInfoFactory();
TypeInfo info = factory.getTypeInfo(clazz);
Modified: projects/microcontainer/trunk/container/src/tests/org/jboss/test/classinfo/test/ClassInfoClassTest.java
===================================================================
--- projects/microcontainer/trunk/container/src/tests/org/jboss/test/classinfo/test/ClassInfoClassTest.java 2008-02-18 16:07:07 UTC (rev 69887)
+++ projects/microcontainer/trunk/container/src/tests/org/jboss/test/classinfo/test/ClassInfoClassTest.java 2008-02-18 16:09:12 UTC (rev 69888)
@@ -118,7 +118,7 @@
testClass(ClassInfoConstructorParameterAnnotationClass.class);
}
- private void testClass(Class clazz) throws Throwable
+ private void testClass(Class<?> clazz) throws Throwable
{
ClassInfoImpl expected = new ClassInfoImpl(clazz.getName(), Modifier.PUBLIC);
TypeInfo info = testBasics(clazz, expected);
Modified: projects/microcontainer/trunk/container/src/tests/org/jboss/test/classinfo/test/ClassInfoEnumTest.java
===================================================================
--- projects/microcontainer/trunk/container/src/tests/org/jboss/test/classinfo/test/ClassInfoEnumTest.java 2008-02-18 16:07:07 UTC (rev 69887)
+++ projects/microcontainer/trunk/container/src/tests/org/jboss/test/classinfo/test/ClassInfoEnumTest.java 2008-02-18 16:09:12 UTC (rev 69888)
@@ -80,11 +80,11 @@
assertClassInfo(enumInfo, enumClass);
}
- protected void assertEnumConstants(Class<Enum> enumClass, EnumInfo enumInfo) throws Throwable
+ protected void assertEnumConstants(Class<Enum<?>> enumClass, EnumInfo enumInfo) throws Throwable
{
HashSet<EnumConstantInfo> expected = new HashSet<EnumConstantInfo>();
- for (Enum enumeration : enumClass.getEnumConstants())
+ for (Enum<?> enumeration : enumClass.getEnumConstants())
{
EnumConstantInfo constant = new EnumConstantInfoImpl(enumeration.name(), enumInfo);
expected.add(constant);
@@ -97,7 +97,7 @@
actual.add(c);
assertEquals(expected, actual);
- for (Enum enumeration : enumClass.getEnumConstants())
+ for (Enum<?> enumeration : enumClass.getEnumConstants())
{
String name = enumeration.name();
Field field = enumClass.getField(name);
Modified: projects/microcontainer/trunk/container/src/tests/org/jboss/test/classinfo/test/ClassInfoGenericClassTest.java
===================================================================
--- projects/microcontainer/trunk/container/src/tests/org/jboss/test/classinfo/test/ClassInfoGenericClassTest.java 2008-02-18 16:07:07 UTC (rev 69887)
+++ projects/microcontainer/trunk/container/src/tests/org/jboss/test/classinfo/test/ClassInfoGenericClassTest.java 2008-02-18 16:09:12 UTC (rev 69888)
@@ -93,7 +93,7 @@
testGenericSuperInterface(ClassInfoGenericSuperInterfaceEmptyClass.class, ClassInfoGenericInterface.class, new Class[] { ClassInfoEmptyClass.class });
}
- public void testGenericSuperClass(Class clazz, Class genericClass, Class[] genericTypes)
+ public void testGenericSuperClass(Class<?> clazz, Class<?> genericClass, Class<?>[] genericTypes)
{
TypeInfoFactory factory = getTypeInfoFactory();
ClassInfo typeInfo = (ClassInfo) factory.getTypeInfo(clazz);
@@ -112,7 +112,7 @@
assertEquals(types[i], actualTypes[i]);
}
- public void testGenericSuperInterface(Class clazz, Class genericClass, Class[] genericTypes)
+ public void testGenericSuperInterface(Class<?> clazz, Class<?> genericClass, Class<?>[] genericTypes)
{
TypeInfoFactory factory = getTypeInfoFactory();
ClassInfo typeInfo = (ClassInfo) factory.getTypeInfo(clazz);
@@ -289,14 +289,14 @@
assertKeyValueType(ClassInfoGenericExtendsMapInComplicatedWayWIthSpecificType.class, Double.class, Short.class);
}
- private void assertComponentType(String methodName, Class expected) throws Exception
+ private void assertComponentType(String methodName, Class<?> expected) throws Exception
{
Method method = ClassInfoGenericClassTest.class.getMethod(methodName, null);
Type type = method.getGenericReturnType();
assertComponentType(type, expected);
}
- private void assertComponentType(Type type, Class expected) throws Exception
+ private void assertComponentType(Type type, Class<?> expected) throws Exception
{
TypeInfoFactory factory = getTypeInfoFactory();
TypeInfo typeInfo = factory.getTypeInfo(type);
@@ -307,14 +307,14 @@
assertEquals(expectedInfo, classInfo.getComponentType());
}
- private void assertKeyValueType(String methodName, Class keyExpected, Class valueExpected) throws Exception
+ private void assertKeyValueType(String methodName, Class<?> keyExpected, Class<?> valueExpected) throws Exception
{
Method method = ClassInfoGenericClassTest.class.getMethod(methodName, null);
Type type = method.getGenericReturnType();
assertKeyValueType(type, keyExpected, valueExpected);
}
- private void assertKeyValueType(Type type, Class keyExpected, Class valueExpected) throws Exception
+ private void assertKeyValueType(Type type, Class<?> keyExpected, Class<?> valueExpected) throws Exception
{
TypeInfoFactory factory = getTypeInfoFactory();
TypeInfo typeInfo = factory.getTypeInfo(type);
@@ -328,7 +328,7 @@
assertEquals(expectedInfo, classInfo.getValueType());
}
- private void testGenericClass(Class clazz) throws Throwable
+ private void testGenericClass(Class<?> clazz) throws Throwable
{
ClassInfoImpl expected = new ClassInfoImpl(clazz.getName(), Modifier.PUBLIC);
TypeInfo info = testBasics(clazz, expected);
Modified: projects/microcontainer/trunk/container/src/tests/org/jboss/test/classinfo/test/ClassInfoGenericInterfaceTest.java
===================================================================
--- projects/microcontainer/trunk/container/src/tests/org/jboss/test/classinfo/test/ClassInfoGenericInterfaceTest.java 2008-02-18 16:07:07 UTC (rev 69887)
+++ projects/microcontainer/trunk/container/src/tests/org/jboss/test/classinfo/test/ClassInfoGenericInterfaceTest.java 2008-02-18 16:09:12 UTC (rev 69888)
@@ -52,7 +52,7 @@
testGenericInterface(ClassInfoGenericFieldsInterface.class);
}
- private void testGenericInterface(Class clazz) throws Throwable
+ private void testGenericInterface(Class<?> clazz) throws Throwable
{
ClassInfoImpl expected = new ClassInfoImpl(clazz.getName(), Modifier.PUBLIC);
TypeInfo info = testBasics(clazz, expected);
Modified: projects/microcontainer/trunk/container/src/tests/org/jboss/test/classinfo/test/ClassInfoInterfaceTest.java
===================================================================
--- projects/microcontainer/trunk/container/src/tests/org/jboss/test/classinfo/test/ClassInfoInterfaceTest.java 2008-02-18 16:07:07 UTC (rev 69887)
+++ projects/microcontainer/trunk/container/src/tests/org/jboss/test/classinfo/test/ClassInfoInterfaceTest.java 2008-02-18 16:09:12 UTC (rev 69888)
@@ -88,7 +88,7 @@
testInterface(ClassInfoMethodParameterAnnotationInterface.class);
}
- private void testInterface(Class clazz) throws Throwable
+ private void testInterface(Class<?> clazz) throws Throwable
{
ClassInfoImpl expected = new ClassInfoImpl(clazz.getName(), Modifier.PUBLIC);
TypeInfo info = testBasics(clazz, expected);
Modified: projects/microcontainer/trunk/container/src/tests/org/jboss/test/classinfo/test/ClassInfoTest.java
===================================================================
--- projects/microcontainer/trunk/container/src/tests/org/jboss/test/classinfo/test/ClassInfoTest.java 2008-02-18 16:07:07 UTC (rev 69887)
+++ projects/microcontainer/trunk/container/src/tests/org/jboss/test/classinfo/test/ClassInfoTest.java 2008-02-18 16:09:12 UTC (rev 69888)
@@ -135,7 +135,7 @@
checkConstructors(getSimpleBeanConstructors(), cinfo.getDeclaredConstructors());
}
- protected ClassInfo getClassInfo(Class clazz)
+ protected ClassInfo getClassInfo(Class<?> clazz)
{
TypeInfoFactory factory = getTypeInfoFactory();
TypeInfo info = factory.getTypeInfo(clazz);
@@ -221,9 +221,9 @@
expectClone = new HashSet<FieldInfo>(expected);
actualClone = new ArrayList<FieldInfo>(Arrays.asList(actually));
- for (Iterator i = expectClone.iterator(); i.hasNext();)
+ for (Iterator<FieldInfo> i = expectClone.iterator(); i.hasNext();)
{
- FieldInfo expect = (FieldInfo) i.next();
+ FieldInfo expect = i.next();
int j = actualClone.indexOf(expect);
FieldInfo actual = actualClone.get(j);
compareField(expect, actual);
@@ -257,9 +257,9 @@
expectClone = new HashSet<MethodInfo>(expected);
actualClone = new ArrayList<MethodInfo>(Arrays.asList(actually));
- for (Iterator i = expectClone.iterator(); i.hasNext();)
+ for (Iterator<MethodInfo> i = expectClone.iterator(); i.hasNext();)
{
- MethodInfo expect = (MethodInfo) i.next();
+ MethodInfo expect = i.next();
int j = actualClone.indexOf(expect);
MethodInfo actual = actualClone.get(j);
compareMethod(expect, actual);
@@ -297,9 +297,9 @@
expectClone = new HashSet<ConstructorInfo>(expected);
actualClone = new ArrayList<ConstructorInfo>(Arrays.asList(actually));
- for (Iterator i = expectClone.iterator(); i.hasNext();)
+ for (Iterator<ConstructorInfo> i = expectClone.iterator(); i.hasNext();)
{
- ConstructorInfo expect = (ConstructorInfo) i.next();
+ ConstructorInfo expect = i.next();
int j = actualClone.indexOf(expect);
ConstructorInfo actual = actualClone.get(j);
compareConstructor(expect, actual);
Modified: projects/microcontainer/trunk/container/src/tests/org/jboss/test/ioc/test/AbstractIoCTest.java
===================================================================
--- projects/microcontainer/trunk/container/src/tests/org/jboss/test/ioc/test/AbstractIoCTest.java 2008-02-18 16:07:07 UTC (rev 69887)
+++ projects/microcontainer/trunk/container/src/tests/org/jboss/test/ioc/test/AbstractIoCTest.java 2008-02-18 16:09:12 UTC (rev 69888)
@@ -100,7 +100,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 IoCTestDelegate(clazz);
}
Modified: projects/microcontainer/trunk/container/src/tests/org/jboss/test/ioc/test/IoCTestDelegate.java
===================================================================
--- projects/microcontainer/trunk/container/src/tests/org/jboss/test/ioc/test/IoCTestDelegate.java 2008-02-18 16:07:07 UTC (rev 69887)
+++ projects/microcontainer/trunk/container/src/tests/org/jboss/test/ioc/test/IoCTestDelegate.java 2008-02-18 16:09:12 UTC (rev 69888)
@@ -45,7 +45,7 @@
*
* @param clazz the test class
*/
- public IoCTestDelegate(Class clazz)
+ public IoCTestDelegate(Class<?> clazz)
{
super(clazz);
}
Modified: projects/microcontainer/trunk/container/src/tests/org/jboss/test/javabean/test/AbstractJavaBeanTest.java
===================================================================
--- projects/microcontainer/trunk/container/src/tests/org/jboss/test/javabean/test/AbstractJavaBeanTest.java 2008-02-18 16:07:07 UTC (rev 69887)
+++ projects/microcontainer/trunk/container/src/tests/org/jboss/test/javabean/test/AbstractJavaBeanTest.java 2008-02-18 16:09:12 UTC (rev 69888)
@@ -38,7 +38,7 @@
super(name);
}
- protected <T> T unmarshalJavaBean(Class<T> expected, Class... others) throws Exception
+ protected <T> T unmarshalJavaBean(Class<T> expected, Class<?>... others) throws Exception
{
return unmarshalObject(expected, JavaBean.class, others);
}
Modified: projects/microcontainer/trunk/container/src/tests/org/jboss/test/javabean/test/JavaBeanTestDelegate.java
===================================================================
--- projects/microcontainer/trunk/container/src/tests/org/jboss/test/javabean/test/JavaBeanTestDelegate.java 2008-02-18 16:07:07 UTC (rev 69887)
+++ projects/microcontainer/trunk/container/src/tests/org/jboss/test/javabean/test/JavaBeanTestDelegate.java 2008-02-18 16:09:12 UTC (rev 69888)
@@ -36,7 +36,7 @@
*
* @param clazz the test class
*/
- public JavaBeanTestDelegate(Class clazz)
+ public JavaBeanTestDelegate(Class<?> clazz)
{
super(clazz);
}
Modified: projects/microcontainer/trunk/container/src/tests/org/jboss/test/javabean/test/OldAbstractJavaBeanTest.java
===================================================================
--- projects/microcontainer/trunk/container/src/tests/org/jboss/test/javabean/test/OldAbstractJavaBeanTest.java 2008-02-18 16:07:07 UTC (rev 69887)
+++ projects/microcontainer/trunk/container/src/tests/org/jboss/test/javabean/test/OldAbstractJavaBeanTest.java 2008-02-18 16:09:12 UTC (rev 69888)
@@ -49,7 +49,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 JavaBeanTestDelegate(clazz);
}
Modified: projects/microcontainer/trunk/container/src/tests/org/jboss/test/joinpoint/test/JoinpointTest.java
===================================================================
--- projects/microcontainer/trunk/container/src/tests/org/jboss/test/joinpoint/test/JoinpointTest.java 2008-02-18 16:07:07 UTC (rev 69887)
+++ projects/microcontainer/trunk/container/src/tests/org/jboss/test/joinpoint/test/JoinpointTest.java 2008-02-18 16:09:12 UTC (rev 69888)
@@ -113,7 +113,7 @@
assertEquals(bean.toString(), joinpoint.dispatch());
}
- protected JoinpointFactory getJointpointFactory(Class clazz)
+ protected JoinpointFactory getJointpointFactory(Class<?> clazz)
{
TypeInfoFactory typeFactory = getTypeInfoFactory();
ClassInfo info = (ClassInfo) typeFactory.getTypeInfo(clazz);
Modified: projects/microcontainer/trunk/container/src/tests/org/jboss/test/memorytests/ClassInfoMemoryTestCase.java
===================================================================
--- projects/microcontainer/trunk/container/src/tests/org/jboss/test/memorytests/ClassInfoMemoryTestCase.java 2008-02-18 16:07:07 UTC (rev 69887)
+++ projects/microcontainer/trunk/container/src/tests/org/jboss/test/memorytests/ClassInfoMemoryTestCase.java 2008-02-18 16:09:12 UTC (rev 69888)
@@ -55,13 +55,13 @@
ClassLoader oldloader = Thread.currentThread().getContextClassLoader();
System.out.println("+++oldloader =" + oldloader.toString());
ClassLoader loader = newClassLoader(ClassInfoMemoryTestCase.class);
- WeakReference weakReferenceOnLoader = new WeakReference<ClassLoader>(loader);
+ WeakReference<ClassLoader> weakReferenceOnLoader = new WeakReference<ClassLoader>(loader);
System.out.println("+++newloader =" + loader.toString());
//step1
- Class simpleBeanClass = loader.loadClass("org.jboss.test.classinfo.support.SimpleBean");
- Class simpleBeanInterface = loader.loadClass("org.jboss.test.classinfo.support.SimpleInterface");
+ Class<?> simpleBeanClass = loader.loadClass("org.jboss.test.classinfo.support.SimpleBean");
+ Class<?> simpleBeanInterface = loader.loadClass("org.jboss.test.classinfo.support.SimpleInterface");
ClassInfo cinfo = getClassInfo(loader,simpleBeanClass);
cinfo=null;
@@ -97,7 +97,7 @@
checkUnload( weakReferenceOnLoader,"org.jboss.test.classinfo.support.SimpleBean","./leak-report.html");
}
- protected ClassInfo getClassInfo(ClassLoader loader,Class clazz)
+ protected ClassInfo getClassInfo(ClassLoader loader,Class<?> clazz)
{
TypeInfoFactory factory = getTypeInfoFactory();
TypeInfo info=null;
Modified: projects/microcontainer/trunk/container/src/tests/org/jboss/test/metadata/AbstractMetaDataTest.java
===================================================================
--- projects/microcontainer/trunk/container/src/tests/org/jboss/test/metadata/AbstractMetaDataTest.java 2008-02-18 16:07:07 UTC (rev 69887)
+++ projects/microcontainer/trunk/container/src/tests/org/jboss/test/metadata/AbstractMetaDataTest.java 2008-02-18 16:09:12 UTC (rev 69888)
@@ -329,7 +329,7 @@
* @param result the annotation
* @throws Exception for any error
*/
- protected void checkAnnotation(Class expected, Object result) throws Exception
+ protected void checkAnnotation(Class<?> expected, Object result) throws Exception
{
assertNotNull("Annotation should not be null", result);
assertTrue(result.getClass().getName() + " should be an instance of " + expected.getName(), expected.isInstance(result));
@@ -342,7 +342,7 @@
* @param result the annotation
* @throws Exception for any error
*/
- protected void checkAnnotation(Class expected, AnnotationItem result) throws Exception
+ protected void checkAnnotation(Class<?> expected, AnnotationItem<? extends Annotation> result) throws Exception
{
assertNotNull("AnnotationItem should not be null", result);
assertTrue(result.isValid());
@@ -357,7 +357,7 @@
* @param result the annotation
* @throws Exception for any error
*/
- protected void checkAnnotation(Class expected, MetaDataItem result) throws Exception
+ protected void checkAnnotation(Class<?> expected, MetaDataItem<?> result) throws Exception
{
assertNotNull("MetaDataItem should not be null", result);
assertTrue(result.isValid());
@@ -372,7 +372,7 @@
* @param result the meta data
* @throws Exception for any error
*/
- protected void checkMetaData(Class expected, Object result) throws Exception
+ protected void checkMetaData(Class<?> expected, Object result) throws Exception
{
assertNotNull("MetaData should not be null", result);
assertTrue(result.getClass().getName() + " should be an instance of " + expected.getName(), expected.isInstance(result));
@@ -385,7 +385,7 @@
* @param result the meta data
* @throws Exception for any error
*/
- protected void checkMetaData(Class expected, MetaDataItem result) throws Exception
+ protected void checkMetaData(Class<?> expected, MetaDataItem<?> result) throws Exception
{
assertNotNull("MetaDataItem should not be null", result);
assertTrue(result.isValid());
@@ -703,11 +703,11 @@
assertNotNull(annotation);
Class<? extends Annotation> expected = annotation.annotationType();
- AnnotationItem annotationItem = mutable.retrieveAnnotation(expected);
+ AnnotationItem<? extends Annotation> annotationItem = mutable.retrieveAnnotation(expected);
checkAnnotation(expected, annotationItem);
- MetaDataItem metaDataItem1 = mutable.retrieveMetaData(expected);
+ MetaDataItem<?> metaDataItem1 = mutable.retrieveMetaData(expected);
checkAnnotation(expected, metaDataItem1);
- MetaDataItem metaDataItem2 = mutable.retrieveMetaData(expected.getName());
+ MetaDataItem<?> metaDataItem2 = mutable.retrieveMetaData(expected.getName());
checkAnnotation(expected, metaDataItem2);
Annotation result = mutable.addAnnotation(annotation);
@@ -768,11 +768,11 @@
assertNotNull(annotation);
Class<? extends Annotation> expected = annotation.annotationType();
- AnnotationItem annotationItem = mutable.retrieveAnnotation(expected);
+ AnnotationItem<? extends Annotation> annotationItem = mutable.retrieveAnnotation(expected);
checkAnnotation(expected, annotationItem);
- MetaDataItem metaDataItem1 = mutable.retrieveMetaData(expected);
+ MetaDataItem<?> metaDataItem1 = mutable.retrieveMetaData(expected);
checkAnnotation(expected, metaDataItem1);
- MetaDataItem metaDataItem2 = mutable.retrieveMetaData(expected.getName());
+ MetaDataItem<?> metaDataItem2 = mutable.retrieveMetaData(expected.getName());
checkAnnotation(expected, metaDataItem2);
Annotation result = mutable.addAnnotation(annotation);
@@ -1135,11 +1135,11 @@
assertNotNull(expected);
expectedAnnotations.remove(expected);
- AnnotationItem annotationItem = mutable.retrieveAnnotation(expected);
+ AnnotationItem<? extends Annotation> annotationItem = mutable.retrieveAnnotation(expected);
checkAnnotation(expected, annotationItem);
- MetaDataItem metaDataItem1 = mutable.retrieveMetaData(expected);
+ MetaDataItem<?> metaDataItem1 = mutable.retrieveMetaData(expected);
checkAnnotation(expected, metaDataItem1);
- MetaDataItem metaDataItem2 = mutable.retrieveMetaData(expected.getName());
+ MetaDataItem<?> metaDataItem2 = mutable.retrieveMetaData(expected.getName());
checkAnnotation(expected, metaDataItem2);
Annotation result = mutable.removeAnnotation(expected);
@@ -1688,10 +1688,10 @@
AnnotationsItem result = metaData.retrieveAnnotations();
assertNotNull("Null result", result);
- AnnotationItem[] items = result.getAnnotations();
+ AnnotationItem<? extends Annotation>[] items = result.getAnnotations();
assertNotNull("Null items", items);
ExpectedAnnotations actual = emptyExpectedAnnotations();
- for (AnnotationItem item : items)
+ for (AnnotationItem<? extends Annotation> item : items)
{
assertNotNull("Null annotation item " + Arrays.asList(items), item);
Annotation annotation = item.getAnnotation();
@@ -1716,10 +1716,10 @@
AnnotationsItem result = metaData.retrieveLocalAnnotations();
assertNotNull("Null result", result);
- AnnotationItem[] items = result.getAnnotations();
+ AnnotationItem<? extends Annotation>[] items = result.getAnnotations();
assertNotNull("Null items", items);
ExpectedAnnotations actual = emptyExpectedAnnotations();
- for (AnnotationItem item : items)
+ for (AnnotationItem<? extends Annotation> item : items)
{
assertNotNull("Null annotation item " + Arrays.asList(items), item);
Annotation annotation = item.getAnnotation();
@@ -1846,10 +1846,10 @@
MetaDatasItem result = metaData.retrieveMetaData();
assertNotNull("Null result", result);
- MetaDataItem[] items = result.getMetaDatas();
+ MetaDataItem<?>[] items = result.getMetaDatas();
assertNotNull("Null items", items);
ExpectedMetaData actual = emptyExpectedMetaData();
- for (MetaDataItem item : items)
+ for (MetaDataItem<?> item : items)
{
assertNotNull("Null meta data item " + Arrays.asList(items), item);
Object object = item.getValue();
@@ -1874,10 +1874,10 @@
MetaDatasItem result = metaData.retrieveLocalMetaData();
assertNotNull("Null result", result);
- MetaDataItem[] items = result.getMetaDatas();
+ MetaDataItem<?>[] items = result.getMetaDatas();
assertNotNull("Null items", items);
ExpectedMetaData actual = emptyExpectedMetaData();
- for (MetaDataItem item : items)
+ for (MetaDataItem<?> item : items)
{
assertNotNull("Null meta data item " + Arrays.asList(items), item);
Object object = item.getValue();
@@ -1894,10 +1894,10 @@
* @param object the object
* @return the type
*/
- protected Class getType(Object object)
+ protected Class<?> getType(Object object)
{
- Class type = object.getClass();
- Class[] interfaces = type.getInterfaces();
+ Class<?> type = object.getClass();
+ Class<?>[] interfaces = type.getInterfaces();
if (interfaces.length == 1)
return interfaces[0];
return type;
@@ -1969,10 +1969,10 @@
MetaDatasItem result = metaData.retrieveMetaData();
assertNotNull("Null result", result);
- MetaDataItem[] items = result.getMetaDatas();
+ MetaDataItem<?>[] items = result.getMetaDatas();
assertNotNull("Null items", items);
ExpectedAnnotations actual = emptyExpectedAnnotations();
- for (MetaDataItem item : items)
+ for (MetaDataItem<?> item : items)
{
assertNotNull("Null item " + Arrays.asList(items), item);
Object object = item.getValue();
@@ -1999,10 +1999,10 @@
MetaDatasItem result = metaData.retrieveLocalMetaData();
assertNotNull("Null result", result);
- MetaDataItem[] items = result.getMetaDatas();
+ MetaDataItem<?>[] items = result.getMetaDatas();
assertNotNull("Null items", items);
ExpectedAnnotations actual = emptyExpectedAnnotations();
- for (MetaDataItem item : items)
+ for (MetaDataItem<?> item : items)
{
assertNotNull("Null item " + Arrays.asList(items), item);
Object object = item.getValue();
@@ -2068,6 +2068,7 @@
* @param expected the expected
* @param actual the actual
*/
+ @SuppressWarnings("unchecked")
private void fail(String context, Collection expected, Collection actual)
{
assertTrue("Unexpected " + context + " expected=" + expected + " actual=" + actual, false);
Modified: projects/microcontainer/trunk/container/src/tests/org/jboss/test/metadata/SignatureMetaDataTest.java
===================================================================
--- projects/microcontainer/trunk/container/src/tests/org/jboss/test/metadata/SignatureMetaDataTest.java 2008-02-18 16:07:07 UTC (rev 69887)
+++ projects/microcontainer/trunk/container/src/tests/org/jboss/test/metadata/SignatureMetaDataTest.java 2008-02-18 16:09:12 UTC (rev 69888)
@@ -130,7 +130,7 @@
return new MethodParametersSignature(getMethodInfo(), 0);
}
- protected Constructor getConstructor() throws Exception
+ protected Constructor<?> getConstructor() throws Exception
{
return SignatureTester.class.getDeclaredConstructor(Calendar.class);
}
Modified: projects/microcontainer/trunk/container/src/tests/org/jboss/test/metadata/context/cache/support/TestMetaDataLoader.java
===================================================================
--- projects/microcontainer/trunk/container/src/tests/org/jboss/test/metadata/context/cache/support/TestMetaDataLoader.java 2008-02-18 16:07:07 UTC (rev 69887)
+++ projects/microcontainer/trunk/container/src/tests/org/jboss/test/metadata/context/cache/support/TestMetaDataLoader.java 2008-02-18 16:09:12 UTC (rev 69888)
@@ -36,6 +36,7 @@
{
private boolean retrieved = false;
+ @SuppressWarnings("unchecked")
private final AnnotationsItem NO_ANNOTATIONS = new BasicAnnotationsItem(this, new AnnotationItem[0]);
private AnnotationsItem item = NO_ANNOTATIONS;
Modified: projects/microcontainer/trunk/container/src/tests/org/jboss/test/metadata/context/cache/test/SimpleCacheMetaDataContextUnitTestCase.java
===================================================================
--- projects/microcontainer/trunk/container/src/tests/org/jboss/test/metadata/context/cache/test/SimpleCacheMetaDataContextUnitTestCase.java 2008-02-18 16:07:07 UTC (rev 69887)
+++ projects/microcontainer/trunk/container/src/tests/org/jboss/test/metadata/context/cache/test/SimpleCacheMetaDataContextUnitTestCase.java 2008-02-18 16:09:12 UTC (rev 69888)
@@ -84,6 +84,7 @@
return new BasicAnnotationItem<T>(loader, annotation);
}
+ @SuppressWarnings("unchecked")
protected <T extends Annotation> void setAnnotations(TestMetaDataLoader loader, AnnotationItem<T> annotationItem)
{
AnnotationItem[] items = { annotationItem };
Modified: projects/microcontainer/trunk/container/src/tests/org/jboss/test/metadata/context/cache/test/SimpleCacheParentMetaDataContextUnitTestCase.java
===================================================================
--- projects/microcontainer/trunk/container/src/tests/org/jboss/test/metadata/context/cache/test/SimpleCacheParentMetaDataContextUnitTestCase.java 2008-02-18 16:07:07 UTC (rev 69887)
+++ projects/microcontainer/trunk/container/src/tests/org/jboss/test/metadata/context/cache/test/SimpleCacheParentMetaDataContextUnitTestCase.java 2008-02-18 16:09:12 UTC (rev 69888)
@@ -90,6 +90,7 @@
return new BasicAnnotationItem<T>(loader, annotation);
}
+ @SuppressWarnings("unchecked")
protected <T extends Annotation> void setAnnotations(TestMetaDataLoader loader, AnnotationItem<T> annotationItem)
{
AnnotationItem[] items = { annotationItem };
Modified: projects/microcontainer/trunk/container/src/tests/org/jboss/test/metadata/loader/memory/test/MemoryLoaderComponentMutableUnitTestCase.java
===================================================================
--- projects/microcontainer/trunk/container/src/tests/org/jboss/test/metadata/loader/memory/test/MemoryLoaderComponentMutableUnitTestCase.java 2008-02-18 16:07:07 UTC (rev 69887)
+++ projects/microcontainer/trunk/container/src/tests/org/jboss/test/metadata/loader/memory/test/MemoryLoaderComponentMutableUnitTestCase.java 2008-02-18 16:09:12 UTC (rev 69888)
@@ -102,7 +102,7 @@
assertSame(annotation, cmmd.removeAnnotation(sig, TestAnnotation.class));
}
}
- Constructor c = getConstructor();
+ Constructor<?> c = getConstructor();
ConstructorInfo ci = getConstructorInfo();
Signature sc = new ConstructorSignature(c);
checkAnnotationCycle(sc, c, ci);
@@ -130,7 +130,7 @@
assertSame(metadata, object);
}
}
- Constructor c = getConstructor();
+ Constructor<?> c = getConstructor();
ConstructorInfo ci = getConstructorInfo();
Signature sc = new ConstructorSignature(c);
checkMetaDataCycle(sc, c, ci);
Modified: projects/microcontainer/trunk/container/src/tests/org/jboss/test/metadata/loader/reflection/support/ConstructorBean.java
===================================================================
--- projects/microcontainer/trunk/container/src/tests/org/jboss/test/metadata/loader/reflection/support/ConstructorBean.java 2008-02-18 16:07:07 UTC (rev 69887)
+++ projects/microcontainer/trunk/container/src/tests/org/jboss/test/metadata/loader/reflection/support/ConstructorBean.java 2008-02-18 16:09:12 UTC (rev 69888)
@@ -44,7 +44,7 @@
@TestAnnotation1
@TestAnnotation2
- public ConstructorBean(String p1, Class p2)
+ public ConstructorBean(String p1, Class<?> p2)
{
}
}
Modified: projects/microcontainer/trunk/container/src/tests/org/jboss/test/metadata/loader/reflection/support/MethodBean.java
===================================================================
--- projects/microcontainer/trunk/container/src/tests/org/jboss/test/metadata/loader/reflection/support/MethodBean.java 2008-02-18 16:07:07 UTC (rev 69887)
+++ projects/microcontainer/trunk/container/src/tests/org/jboss/test/metadata/loader/reflection/support/MethodBean.java 2008-02-18 16:09:12 UTC (rev 69888)
@@ -44,7 +44,7 @@
@TestAnnotation1
@TestAnnotation2
- public void testAnnotation12(String p1, Class p2)
+ public void testAnnotation12(String p1, Class<?> p2)
{
}
}
Modified: projects/microcontainer/trunk/container/src/tests/org/jboss/test/metadata/loader/reflection/support/MethodParamBean.java
===================================================================
--- projects/microcontainer/trunk/container/src/tests/org/jboss/test/metadata/loader/reflection/support/MethodParamBean.java 2008-02-18 16:07:07 UTC (rev 69887)
+++ projects/microcontainer/trunk/container/src/tests/org/jboss/test/metadata/loader/reflection/support/MethodParamBean.java 2008-02-18 16:09:12 UTC (rev 69888)
@@ -41,7 +41,7 @@
{
}
- public void testAnnotation12(String p1, @TestAnnotation1 @TestAnnotation2 Class p2)
+ public void testAnnotation12(String p1, @TestAnnotation1 @TestAnnotation2 Class<?> p2)
{
}
}
Modified: projects/microcontainer/trunk/container/src/tests/org/jboss/test/metadata/retrieval/support/TestMetaDataRetrieval.java
===================================================================
--- projects/microcontainer/trunk/container/src/tests/org/jboss/test/metadata/retrieval/support/TestMetaDataRetrieval.java 2008-02-18 16:07:07 UTC (rev 69887)
+++ projects/microcontainer/trunk/container/src/tests/org/jboss/test/metadata/retrieval/support/TestMetaDataRetrieval.java 2008-02-18 16:09:12 UTC (rev 69888)
@@ -94,7 +94,7 @@
return null;
}
- public MetaDataItem retrieveMetaData(String name)
+ public MetaDataItem<?> retrieveMetaData(String name)
{
lastMethod = "retrieveMetaData(String)";
return null;
Modified: projects/microcontainer/trunk/container/src/tests/org/jboss/test/metadata/retrieval/test/BasicUnitTestCase.java
===================================================================
--- projects/microcontainer/trunk/container/src/tests/org/jboss/test/metadata/retrieval/test/BasicUnitTestCase.java 2008-02-18 16:07:07 UTC (rev 69887)
+++ projects/microcontainer/trunk/container/src/tests/org/jboss/test/metadata/retrieval/test/BasicUnitTestCase.java 2008-02-18 16:09:12 UTC (rev 69888)
@@ -82,10 +82,12 @@
BasicAnnotationItem<TestAnnotation1> item1 = new BasicAnnotationItem<TestAnnotation1>(loader, annotation1);
BasicAnnotationItem<TestAnnotation2> item2 = new BasicAnnotationItem<TestAnnotation2>(loader, annotation2);
+ @SuppressWarnings("unchecked")
AnnotationItem[] items = { item1, item2 };
+ @SuppressWarnings("unchecked")
BasicAnnotationsItem item = new BasicAnnotationsItem(loader, items);
- AnnotationItem[] result = item.getAnnotations();
+ AnnotationItem<? extends Annotation>[] result = item.getAnnotations();
assertUnorderedArrayEquals(items, result);
Annotation[] expected = { annotation1, annotation2 };
@@ -134,10 +136,10 @@
BasicMetaDataItem<Object> item1 = new BasicMetaDataItem<Object>(loader, Object.class.getName(), object1);
BasicMetaDataItem<String> item2 = new BasicMetaDataItem<String>(loader, String.class.getName(), object2);
- MetaDataItem[] items = { item1, item2 };
+ MetaDataItem<?>[] items = { item1, item2 };
BasicMetaDatasItem item = new BasicMetaDatasItem(loader, items);
- MetaDataItem[] result = item.getMetaDatas();
+ MetaDataItem<?>[] result = item.getMetaDatas();
assertUnorderedArrayEquals(items, result);
Object[] expected = { object1, object2 };
Modified: projects/microcontainer/trunk/container/src/tests/org/jboss/test/metadata/retrieval/test/CummulativeUnitTestCase.java
===================================================================
--- projects/microcontainer/trunk/container/src/tests/org/jboss/test/metadata/retrieval/test/CummulativeUnitTestCase.java 2008-02-18 16:07:07 UTC (rev 69887)
+++ projects/microcontainer/trunk/container/src/tests/org/jboss/test/metadata/retrieval/test/CummulativeUnitTestCase.java 2008-02-18 16:09:12 UTC (rev 69888)
@@ -65,8 +65,9 @@
TestAnnotation1Impl annotation1 = new TestAnnotation1Impl();
parentLoader.addAnnotation(annotation1);
- AnnotationItem annotationItem1Parent = parentLoader.retrieveAnnotation(TestAnnotation1.class);
+ AnnotationItem<? extends Annotation> annotationItem1Parent = parentLoader.retrieveAnnotation(TestAnnotation1.class);
+ @SuppressWarnings("unchecked")
AnnotationItem[] expectedItems = { annotationItem1Parent };
assertUnorderedArrayEquals(expectedItems, item.getAnnotations());
Annotation[] expected = { annotation1 };
@@ -74,7 +75,7 @@
TestAnnotation2Impl annotation2 = new TestAnnotation2Impl();
childLoader.addAnnotation(annotation2);
- AnnotationItem annotationItem2Child = childLoader.retrieveAnnotation(TestAnnotation2.class);
+ AnnotationItem<? extends Annotation> annotationItem2Child = childLoader.retrieveAnnotation(TestAnnotation2.class);
expectedItems = new AnnotationItem[] { annotationItem1Parent, annotationItem2Child };
assertUnorderedArrayEquals(expectedItems, item.getAnnotations());
@@ -83,7 +84,7 @@
TestAnnotation1Impl annotation1Child = new TestAnnotation1Impl();
childLoader.addAnnotation(annotation1Child);
- AnnotationItem annotationItem1Child = childLoader.retrieveAnnotation(TestAnnotation1.class);
+ AnnotationItem<? extends Annotation> annotationItem1Child = childLoader.retrieveAnnotation(TestAnnotation1.class);
expectedItems = new AnnotationItem[] { annotationItem1Child, annotationItem2Child };
assertUnorderedArrayEquals(expectedItems, item.getAnnotations());
@@ -129,7 +130,7 @@
parentLoader.addMetaData(object1, Object.class);
MetaDataItem<Object> metaDataItem1Parent = parentLoader.retrieveMetaData(Object.class);
- MetaDataItem[] expectedItems = { metaDataItem1Parent };
+ MetaDataItem<?>[] expectedItems = { metaDataItem1Parent };
assertUnorderedArrayEquals(expectedItems, item.getMetaDatas());
Object[] expected = { object1 };
assertUnorderedArrayEquals(expected, item.getValue());
@@ -189,16 +190,16 @@
Object object1 = new Object();
parentLoader.addMetaData("Object", object1, Object.class);
- MetaDataItem metaDataItem1Parent = parentLoader.retrieveMetaData("Object");
+ MetaDataItem<?> metaDataItem1Parent = parentLoader.retrieveMetaData("Object");
- MetaDataItem[] expectedItems = { metaDataItem1Parent };
+ MetaDataItem<?>[] expectedItems = { metaDataItem1Parent };
assertUnorderedArrayEquals(expectedItems, item.getMetaDatas());
Object[] expected = { object1 };
assertUnorderedArrayEquals(expected, item.getValue());
String object2 = "Hello";
childLoader.addMetaData("String", object2, String.class);
- MetaDataItem metaDataItem2Child = childLoader.retrieveMetaData("String");
+ MetaDataItem<?> metaDataItem2Child = childLoader.retrieveMetaData("String");
expectedItems = new MetaDataItem[] { metaDataItem1Parent, metaDataItem2Child };
assertUnorderedArrayEquals(expectedItems, item.getMetaDatas());
@@ -207,7 +208,7 @@
Object object1Child = new Object();
childLoader.addMetaData("Object", object1Child, Object.class);
- MetaDataItem metaDataItem1Child = childLoader.retrieveMetaData("Object");
+ MetaDataItem<?> metaDataItem1Child = childLoader.retrieveMetaData("Object");
expectedItems = new MetaDataItem[] { metaDataItem1Child, metaDataItem2Child };
assertUnorderedArrayEquals(expectedItems, item.getMetaDatas());
Modified: projects/microcontainer/trunk/container/src/tests/org/jboss/test/metadata/retrieval/test/HelpersUnitTestCase.java
===================================================================
--- projects/microcontainer/trunk/container/src/tests/org/jboss/test/metadata/retrieval/test/HelpersUnitTestCase.java 2008-02-18 16:07:07 UTC (rev 69887)
+++ projects/microcontainer/trunk/container/src/tests/org/jboss/test/metadata/retrieval/test/HelpersUnitTestCase.java 2008-02-18 16:09:12 UTC (rev 69888)
@@ -125,11 +125,13 @@
SimpleAnnotationItem<TestAnnotation1> item1 = new SimpleAnnotationItem<TestAnnotation1>(annotation1);
SimpleAnnotationItem<TestAnnotation2> item2 = new SimpleAnnotationItem<TestAnnotation2>(annotation2);
+ @SuppressWarnings("unchecked")
AnnotationItem[] items = new AnnotationItem[] { item1, item2 };
+ @SuppressWarnings("unchecked")
SimpleAnnotationsItem item = new SimpleAnnotationsItem(items);
AnnotationsToMetaDatasBridge bridge = new AnnotationsToMetaDatasBridge(item);
- MetaDataItem[] result = bridge.getMetaDatas();
+ MetaDataItem<?>[] result = bridge.getMetaDatas();
assertTrue(Arrays.equals(items, result));
Object[] expected = new Object[] { annotation1, annotation2 };
@@ -145,7 +147,7 @@
TestAnnotation annotation = new TestAnnotationImpl();
SimpleAnnotationItem<TestAnnotation> item = new SimpleAnnotationItem<TestAnnotation>(annotation);
- AnnotationToMetaDataBridge bridge = new AnnotationToMetaDataBridge(item);
+ AnnotationToMetaDataBridge<TestAnnotation> bridge = new AnnotationToMetaDataBridge<TestAnnotation>(item);
assertEquals(annotation, bridge.getValue());
@@ -158,7 +160,7 @@
TestAnnotation annotation = new TestAnnotationImpl();
SimpleMetaDataItem<TestAnnotation> item = new SimpleMetaDataItem<TestAnnotation>(annotation.annotationType().getName(), annotation);
- MetaDataToAnnotationBridge bridge = new MetaDataToAnnotationBridge(item);
+ MetaDataToAnnotationBridge<TestAnnotation> bridge = new MetaDataToAnnotationBridge<TestAnnotation>(item);
assertEquals(annotation, bridge.getAnnotation());
assertEquals(annotation, bridge.getValue());
Modified: projects/microcontainer/trunk/container/src/tests/org/jboss/test/metadata/retrieval/test/SimpleUnitTestCase.java
===================================================================
--- projects/microcontainer/trunk/container/src/tests/org/jboss/test/metadata/retrieval/test/SimpleUnitTestCase.java 2008-02-18 16:07:07 UTC (rev 69887)
+++ projects/microcontainer/trunk/container/src/tests/org/jboss/test/metadata/retrieval/test/SimpleUnitTestCase.java 2008-02-18 16:09:12 UTC (rev 69888)
@@ -71,10 +71,12 @@
SimpleAnnotationItem<TestAnnotation1> item1 = new SimpleAnnotationItem<TestAnnotation1>(annotation1);
SimpleAnnotationItem<TestAnnotation2> item2 = new SimpleAnnotationItem<TestAnnotation2>(annotation2);
+ @SuppressWarnings("unchecked")
AnnotationItem[] items = { item1, item2 };
+ @SuppressWarnings("unchecked")
SimpleAnnotationsItem item = new SimpleAnnotationsItem(items);
- AnnotationItem[] result = item.getAnnotations();
+ AnnotationItem<? extends Annotation>[] result = item.getAnnotations();
assertUnorderedArrayEquals(items, result);
Annotation[] expected = { annotation1, annotation2 };
@@ -89,7 +91,7 @@
{
AnnotationsItem item = SimpleAnnotationsItem.NO_ANNOTATIONS;
- AnnotationItem[] items = item.getAnnotations();
+ AnnotationItem<? extends Annotation>[] items = item.getAnnotations();
assertNotNull(items);
assertEquals(0, items.length);
@@ -119,10 +121,10 @@
SimpleMetaDataItem<Object> item1 = new SimpleMetaDataItem<Object>(Object.class.getName(), object1);
SimpleMetaDataItem<String> item2 = new SimpleMetaDataItem<String>(String.class.getName(), object2);
- MetaDataItem[] items = { item1, item2 };
+ MetaDataItem<?>[] items = { item1, item2 };
SimpleMetaDatasItem item = new SimpleMetaDatasItem(items);
- MetaDataItem[] result = item.getMetaDatas();
+ MetaDataItem<?>[] result = item.getMetaDatas();
assertUnorderedArrayEquals(items, result);
Object[] expected = { object1, object2 };
@@ -137,7 +139,7 @@
{
MetaDatasItem item = SimpleMetaDatasItem.NO_META_DATA;
- MetaDataItem[] items = item.getMetaDatas();
+ MetaDataItem<?>[] items = item.getMetaDatas();
assertNotNull(items);
assertEquals(0, items.length);
Modified: projects/microcontainer/trunk/container/src/tests/org/jboss/test/xb/builder/AbstractBuilderTest.java
===================================================================
--- projects/microcontainer/trunk/container/src/tests/org/jboss/test/xb/builder/AbstractBuilderTest.java 2008-02-18 16:07:07 UTC (rev 69887)
+++ projects/microcontainer/trunk/container/src/tests/org/jboss/test/xb/builder/AbstractBuilderTest.java 2008-02-18 16:09:12 UTC (rev 69888)
@@ -121,7 +121,7 @@
return expected.cast(o);
}
- protected <T, U> T unmarshalObject(Class<T> expected, Class<U> reference, Class... others) throws Exception
+ protected <T, U> T unmarshalObject(Class<T> expected, Class<U> reference, Class<?>... others) throws Exception
{
TestSchemaResolver resolver = new TestSchemaResolver();
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/CallbackCreatorUtil.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/CallbackCreatorUtil.java 2008-02-18 16:07:07 UTC (rev 69887)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/CallbackCreatorUtil.java 2008-02-18 16:09:12 UTC (rev 69888)
@@ -23,6 +23,7 @@
import java.security.AccessController;
import java.security.PrivilegedAction;
+import java.util.Collection;
import org.jboss.beans.info.spi.PropertyInfo;
import org.jboss.dependency.spi.CallbackItem;
@@ -89,7 +90,7 @@
Class clazz = componentType.getType();
if (Object.class.equals(clazz))
throw new IllegalArgumentException("Component type too general - equals Object: " + info);
- return getCollectionFactory().createCollectionCallbackItem(info.getType(), clazz, whenRequired, dependentState, cardinality, context, attribute);
+ return getCollectionFactory().createCollectionCallbackItem((Class<Collection<?>>) info.getType(), clazz, whenRequired, dependentState, cardinality, context, attribute);
}
else
throw new IllegalArgumentException("Unable to determine collection element class type: " + info);
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/dependency/DescribeAction.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/dependency/DescribeAction.java 2008-02-18 16:07:07 UTC (rev 69887)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/dependency/DescribeAction.java 2008-02-18 16:09:12 UTC (rev 69888)
@@ -50,7 +50,7 @@
KernelMetaDataRepository repository = controller.getKernel().getMetaDataRepository();
MetaData md = repository.getMetaData(context);
// add custom dependencies (e.g. AOP layer).
- List<DependencyBuilderListItem> dependencies = info.getDependencies(md);
+ List<DependencyBuilderListItem> dependencies = (List) info.getDependencies(md);
log.trace("Extra dependencies for " + context.getName() + " " + dependencies);
if (dependencies != null && dependencies.isEmpty() == false)
{
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/dependency/PreInstallAction.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/dependency/PreInstallAction.java 2008-02-18 16:07:07 UTC (rev 69887)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/dependency/PreInstallAction.java 2008-02-18 16:09:12 UTC (rev 69888)
@@ -40,6 +40,7 @@
import org.jboss.metadata.spi.retrieval.MetaDataItem;
import org.jboss.metadata.spi.retrieval.MetaDataRetrieval;
import org.jboss.metadata.spi.scope.Scope;
+import org.jboss.metadata.spi.scope.ScopeFactory;
import org.jboss.metadata.spi.scope.ScopeFactoryLookup;
import org.jboss.metadata.spi.scope.ScopeKey;
@@ -94,7 +95,8 @@
if (annotation.annotationType().isAnnotationPresent(ScopeFactoryLookup.class))
{
ScopeFactoryLookup sfl = annotation.annotationType().getAnnotation(ScopeFactoryLookup.class);
- Scope scope = sfl.value().newInstance().create(annotation);
+ ScopeFactory<Annotation> scf = (ScopeFactory) sfl.value().newInstance();
+ Scope scope = scf.create(annotation);
scopes.add(scope);
}
}
More information about the jboss-cvs-commits
mailing list