[jboss-cvs] JBossAS SVN: r69906 - in projects/microcontainer/trunk/metatype/src: main/org/jboss/metatype/api/values and 12 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Feb 18 15:12:07 EST 2008
Author: adrian at jboss.org
Date: 2008-02-18 15:12:07 -0500 (Mon, 18 Feb 2008)
New Revision: 69906
Modified:
projects/microcontainer/trunk/metatype/src/main/org/jboss/metatype/api/types/ArrayMetaType.java
projects/microcontainer/trunk/metatype/src/main/org/jboss/metatype/api/types/CollectionMetaType.java
projects/microcontainer/trunk/metatype/src/main/org/jboss/metatype/api/types/CompositeMetaType.java
projects/microcontainer/trunk/metatype/src/main/org/jboss/metatype/api/types/EnumMetaType.java
projects/microcontainer/trunk/metatype/src/main/org/jboss/metatype/api/types/ImmutableCompositeMetaType.java
projects/microcontainer/trunk/metatype/src/main/org/jboss/metatype/api/types/ImmutableTableMetaType.java
projects/microcontainer/trunk/metatype/src/main/org/jboss/metatype/api/types/MapCompositeMetaType.java
projects/microcontainer/trunk/metatype/src/main/org/jboss/metatype/api/types/MetaTypeFactory.java
projects/microcontainer/trunk/metatype/src/main/org/jboss/metatype/api/types/SimpleMetaType.java
projects/microcontainer/trunk/metatype/src/main/org/jboss/metatype/api/types/TableMetaType.java
projects/microcontainer/trunk/metatype/src/main/org/jboss/metatype/api/values/ArrayValue.java
projects/microcontainer/trunk/metatype/src/main/org/jboss/metatype/api/values/ArrayValueSupport.java
projects/microcontainer/trunk/metatype/src/main/org/jboss/metatype/api/values/CollectionValue.java
projects/microcontainer/trunk/metatype/src/main/org/jboss/metatype/api/values/CollectionValueSupport.java
projects/microcontainer/trunk/metatype/src/main/org/jboss/metatype/api/values/CompositeValueSupport.java
projects/microcontainer/trunk/metatype/src/main/org/jboss/metatype/api/values/EnumValueSupport.java
projects/microcontainer/trunk/metatype/src/main/org/jboss/metatype/api/values/MapCompositeValueSupport.java
projects/microcontainer/trunk/metatype/src/main/org/jboss/metatype/api/values/MetaValue.java
projects/microcontainer/trunk/metatype/src/main/org/jboss/metatype/api/values/MetaValueFactory.java
projects/microcontainer/trunk/metatype/src/main/org/jboss/metatype/api/values/SimpleValueSupport.java
projects/microcontainer/trunk/metatype/src/main/org/jboss/metatype/api/values/TableValueSupport.java
projects/microcontainer/trunk/metatype/src/main/org/jboss/metatype/plugins/types/AbstractCompositeMetaType.java
projects/microcontainer/trunk/metatype/src/main/org/jboss/metatype/plugins/types/ClassMetaTypeBuilder.java
projects/microcontainer/trunk/metatype/src/main/org/jboss/metatype/plugins/types/DefaultMetaTypeFactory.java
projects/microcontainer/trunk/metatype/src/main/org/jboss/metatype/plugins/types/MutableCompositeMetaType.java
projects/microcontainer/trunk/metatype/src/main/org/jboss/metatype/plugins/values/CompositeValueInvocationHandler.java
projects/microcontainer/trunk/metatype/src/main/org/jboss/metatype/plugins/values/DefaultMetaValueFactory.java
projects/microcontainer/trunk/metatype/src/main/org/jboss/metatype/plugins/values/ListInstanceFactory.java
projects/microcontainer/trunk/metatype/src/main/org/jboss/metatype/plugins/values/SetInstanceFactory.java
projects/microcontainer/trunk/metatype/src/main/org/jboss/metatype/plugins/values/SortedSetInstanceFactory.java
projects/microcontainer/trunk/metatype/src/main/org/jboss/metatype/spi/types/MetaTypeBuilder.java
projects/microcontainer/trunk/metatype/src/main/org/jboss/metatype/spi/values/MetaValueBuilder.java
projects/microcontainer/trunk/metatype/src/tests/org/jboss/test/metatype/AbstractMetaTypeTest.java
projects/microcontainer/trunk/metatype/src/tests/org/jboss/test/metatype/types/factory/support/TestOverrideCompositeBuilder.java
projects/microcontainer/trunk/metatype/src/tests/org/jboss/test/metatype/types/factory/test/AbstractMetaTypeFactoryTest.java
projects/microcontainer/trunk/metatype/src/tests/org/jboss/test/metatype/types/factory/test/AnnotationMetaTypeFactoryUnitTestCase.java
projects/microcontainer/trunk/metatype/src/tests/org/jboss/test/metatype/types/factory/test/ArrayMetaTypeFactoryUnitTestCase.java
projects/microcontainer/trunk/metatype/src/tests/org/jboss/test/metatype/types/factory/test/CompositeMetaTypeFactoryUnitTestCase.java
projects/microcontainer/trunk/metatype/src/tests/org/jboss/test/metatype/types/factory/test/EnumMetaTypeFactoryUnitTestCase.java
projects/microcontainer/trunk/metatype/src/tests/org/jboss/test/metatype/types/factory/test/MapMetaTypeFactoryUnitTestCase.java
projects/microcontainer/trunk/metatype/src/tests/org/jboss/test/metatype/types/factory/test/SimpleMetaTypeFactoryUnitTestCase.java
projects/microcontainer/trunk/metatype/src/tests/org/jboss/test/metatype/types/factory/test/SpecialMetaTypeFactoryUnitTestCase.java
projects/microcontainer/trunk/metatype/src/tests/org/jboss/test/metatype/types/support/MockMetaValue.java
projects/microcontainer/trunk/metatype/src/tests/org/jboss/test/metatype/types/support/MockSimpleValue.java
projects/microcontainer/trunk/metatype/src/tests/org/jboss/test/metatype/types/test/ArrayMetaTypeUnitTestCase.java
projects/microcontainer/trunk/metatype/src/tests/org/jboss/test/metatype/types/test/ImmutableCompositeMetaTypeUnitTestCase.java
projects/microcontainer/trunk/metatype/src/tests/org/jboss/test/metatype/types/test/ImmutableTableMetaTypeUnitTestCase.java
projects/microcontainer/trunk/metatype/src/tests/org/jboss/test/metatype/types/test/MetaTypeUnitTestCase.java
projects/microcontainer/trunk/metatype/src/tests/org/jboss/test/metatype/types/test/SimpleMetaTypeUnitTestCase.java
projects/microcontainer/trunk/metatype/src/tests/org/jboss/test/metatype/values/factory/support/TestOverrideCompositeBuilder.java
projects/microcontainer/trunk/metatype/src/tests/org/jboss/test/metatype/values/factory/test/AbstractMetaValueFactoryTest.java
projects/microcontainer/trunk/metatype/src/tests/org/jboss/test/metatype/values/factory/test/ArrayValueFactoryUnitTestCase.java
projects/microcontainer/trunk/metatype/src/tests/org/jboss/test/metatype/values/factory/test/CollectionValueFactoryUnitTestCase.java
projects/microcontainer/trunk/metatype/src/tests/org/jboss/test/metatype/values/factory/test/MapValueFactoryUnitTestCase.java
projects/microcontainer/trunk/metatype/src/tests/org/jboss/test/metatype/values/factory/test/SimpleValueFactoryUnitTestCase.java
projects/microcontainer/trunk/metatype/src/tests/org/jboss/test/metatype/values/factory/test/SpecialValueFactoryUnitTestCase.java
projects/microcontainer/trunk/metatype/src/tests/org/jboss/test/metatype/values/factory/test/UnwrapValueUnitTestCase.java
projects/microcontainer/trunk/metatype/src/tests/org/jboss/test/metatype/values/test/ArrayValueSupportUnitTestCase.java
projects/microcontainer/trunk/metatype/src/tests/org/jboss/test/metatype/values/test/SimpleValueSupportUnitTestCase.java
Log:
Source code tidyup in the metatype project
Modified: projects/microcontainer/trunk/metatype/src/main/org/jboss/metatype/api/types/ArrayMetaType.java
===================================================================
--- projects/microcontainer/trunk/metatype/src/main/org/jboss/metatype/api/types/ArrayMetaType.java 2008-02-18 19:57:14 UTC (rev 69905)
+++ projects/microcontainer/trunk/metatype/src/main/org/jboss/metatype/api/types/ArrayMetaType.java 2008-02-18 20:12:07 UTC (rev 69906)
@@ -32,7 +32,7 @@
* @author <a href="adrian at jboss.com">Adrian Brock</a>
* @version $Revision: 1.1 $
*/
-public class ArrayMetaType<T extends Serializable> extends AbstractMetaType
+public class ArrayMetaType<T extends Serializable> extends AbstractMetaType<T>
{
/** The serialVersionUID */
private static final long serialVersionUID = -2062790692152055156L;
@@ -41,7 +41,7 @@
private int dimension = 0;
/** The element type for the array */
- private MetaType elementType;
+ private MetaType<?> elementType;
/** Is elementType a primative array */
private boolean primitiveArray;
@@ -137,6 +137,7 @@
/**
* Get array meta type.
*
+ * @param <E> the element type
* @param elementType the element meta type
* @return array meta type
*/
@@ -148,9 +149,11 @@
/**
* Get primitive array meta type.
*
+ * @param <T> the array type
* @param arrayClass array class
* @return array meta type
*/
+ @SuppressWarnings("unchecked")
public static <T extends Serializable> ArrayMetaType<T> getPrimitiveArrayType(Class<T> arrayClass)
{
if (!arrayClass.isArray())
@@ -191,7 +194,7 @@
* @param isPrimitive is this a primitive type
* @return the class name
*/
- private static String genName(int dimension, MetaType elementType, boolean isPrimitive)
+ private static String genName(int dimension, MetaType<?> elementType, boolean isPrimitive)
{
if (dimension < 1)
throw new IllegalArgumentException("negative dimension");
@@ -223,7 +226,7 @@
* @param isPrimitive is this a primitive type
* @return the type name
*/
- private static String genType(int dimension, MetaType elementType, boolean isPrimitive)
+ private static String genType(int dimension, MetaType<?> elementType, boolean isPrimitive)
{
if (dimension < 1)
throw new IllegalArgumentException("negative dimension");
@@ -255,7 +258,7 @@
* @param isPrimitive is this a primitive type
* @return the description
*/
- private static String genDesc(int dimension, MetaType elementType, boolean isPrimitive)
+ private static String genDesc(int dimension, MetaType<?> elementType, boolean isPrimitive)
{
StringBuilder buffer = new StringBuilder();
buffer.append(new Integer(dimension));
@@ -274,7 +277,7 @@
* @param elementType the open type of the array elements
* @throws IllegalArgumentException for a null argument or non-negative dimension or when meta type is an ArrayMetaType
*/
- public ArrayMetaType(int dimension, MetaType elementType)
+ public ArrayMetaType(int dimension, MetaType<?> elementType)
{
super(genName(dimension, elementType, false),
genType(dimension, elementType, false),
@@ -328,7 +331,7 @@
*
* @return the element type
*/
- public MetaType getElementType()
+ public MetaType<?> getElementType()
{
return elementType;
}
@@ -390,7 +393,7 @@
return true;
if (obj == null || obj instanceof ArrayMetaType == false)
return false;
- ArrayMetaType other = (ArrayMetaType) obj;
+ ArrayMetaType<?> other = (ArrayMetaType<?>) obj;
return getDimension() == other.getDimension() && getElementType().equals(other.getElementType());
}
Modified: projects/microcontainer/trunk/metatype/src/main/org/jboss/metatype/api/types/CollectionMetaType.java
===================================================================
--- projects/microcontainer/trunk/metatype/src/main/org/jboss/metatype/api/types/CollectionMetaType.java 2008-02-18 19:57:14 UTC (rev 69905)
+++ projects/microcontainer/trunk/metatype/src/main/org/jboss/metatype/api/types/CollectionMetaType.java 2008-02-18 20:12:07 UTC (rev 69906)
@@ -32,13 +32,13 @@
* @param <T> exact type
* @author <a href="ales.justin at jboss.com">Ales Justin</a>
*/
-public class CollectionMetaType<T extends Serializable> extends AbstractMetaType
+public class CollectionMetaType<T extends Serializable> extends AbstractMetaType<T>
{
/** The serialVersionUID */
private static final long serialVersionUID = -2062790692152055156L;
/** The element type for the array */
- private MetaType elementType;
+ private MetaType<?> elementType;
/** Cached hash code */
private transient int cachedHashCode = Integer.MIN_VALUE;
@@ -78,6 +78,7 @@
/**
* Get collection meta type.
*
+ * @param <E> the element type
* @param collectionType the element meta type
* @param elementType the element meta type
* @return collection meta type
@@ -92,7 +93,7 @@
*
* @return the element type
*/
- public MetaType getElementType()
+ public MetaType<?> getElementType()
{
return elementType;
}
@@ -130,7 +131,7 @@
return true;
if (obj == null || obj instanceof CollectionMetaType == false)
return false;
- CollectionMetaType other = (CollectionMetaType) obj;
+ CollectionMetaType<?> other = (CollectionMetaType<?>) obj;
return getTypeName().equals(other.getTypeName()) && getElementType().equals(other.getElementType());
}
Modified: projects/microcontainer/trunk/metatype/src/main/org/jboss/metatype/api/types/CompositeMetaType.java
===================================================================
--- projects/microcontainer/trunk/metatype/src/main/org/jboss/metatype/api/types/CompositeMetaType.java 2008-02-18 19:57:14 UTC (rev 69905)
+++ projects/microcontainer/trunk/metatype/src/main/org/jboss/metatype/api/types/CompositeMetaType.java 2008-02-18 20:12:07 UTC (rev 69906)
@@ -21,6 +21,7 @@
*/
package org.jboss.metatype.api.types;
+import java.io.Serializable;
import java.util.Set;
/**
@@ -29,7 +30,7 @@
* @author <a href="adrian at jboss.com">Adrian Brock</a>
* @version $Revision: 1.1 $
*/
-public interface CompositeMetaType extends MetaType
+public interface CompositeMetaType extends MetaType<Serializable>
{
/**
* Determine whether this CompositeMetaType contains the itemName
@@ -53,7 +54,7 @@
* @param itemName the item name
* @return the open type or null when there is no such item name
*/
- MetaType getType(String itemName);
+ MetaType<?> getType(String itemName);
/**
* Retrieve an unmodifiable Set view of all the item names in ascending order.
Modified: projects/microcontainer/trunk/metatype/src/main/org/jboss/metatype/api/types/EnumMetaType.java
===================================================================
--- projects/microcontainer/trunk/metatype/src/main/org/jboss/metatype/api/types/EnumMetaType.java 2008-02-18 19:57:14 UTC (rev 69905)
+++ projects/microcontainer/trunk/metatype/src/main/org/jboss/metatype/api/types/EnumMetaType.java 2008-02-18 20:12:07 UTC (rev 69906)
@@ -33,7 +33,7 @@
* @author <a href="adrian at jboss.com">Adrian Brock</a>
* @version $Revision: 1.1 $
*/
-public class EnumMetaType extends AbstractMetaType
+public class EnumMetaType extends AbstractMetaType<String>
{
/** The serialVersionUID */
private static final long serialVersionUID = 6786422588217893696L;
@@ -59,7 +59,7 @@
*
* @param validValues the valid Enum values
*/
- public EnumMetaType(Enum[] validValues)
+ public EnumMetaType(Enum<?>[] validValues)
{
super(
String.class.getName(),
@@ -69,7 +69,7 @@
if (isValid(validValues) == false)
throw new IllegalArgumentException("Null or empty valid values");
ArrayList<String> values = new ArrayList<String>();
- for (Enum e : validValues)
+ for (Enum<?> e : validValues)
values.add(e.name());
this.validValues = values;
}
@@ -80,7 +80,7 @@
* @param values the enums
* @return true if not null and not empty
*/
- protected static boolean isValid(Enum[] values)
+ protected static boolean isValid(Enum<?>[] values)
{
return values != null && values.length > 0;
}
@@ -107,7 +107,7 @@
if (obj == null || obj instanceof SimpleValue == false)
return false;
- SimpleValue value = (SimpleValue) obj;
+ SimpleValue<?> value = (SimpleValue<?>) obj;
if (SimpleMetaType.STRING == value.getMetaType() == false)
return false;
return validValues.contains(value.getValue());
Modified: projects/microcontainer/trunk/metatype/src/main/org/jboss/metatype/api/types/ImmutableCompositeMetaType.java
===================================================================
--- projects/microcontainer/trunk/metatype/src/main/org/jboss/metatype/api/types/ImmutableCompositeMetaType.java 2008-02-18 19:57:14 UTC (rev 69905)
+++ projects/microcontainer/trunk/metatype/src/main/org/jboss/metatype/api/types/ImmutableCompositeMetaType.java 2008-02-18 20:12:07 UTC (rev 69906)
@@ -68,7 +68,7 @@
* The names are case sensitive, leading and trailing whitespace
* is ignored.
*/
- public ImmutableCompositeMetaType(String typeName, String description, String[] itemNames, String[] itemDescriptions, MetaType[] itemTypes)
+ public ImmutableCompositeMetaType(String typeName, String description, String[] itemNames, String[] itemDescriptions, MetaType<?>[] itemTypes)
{
super(typeName, description, itemNames, itemDescriptions, itemTypes, false);
}
Modified: projects/microcontainer/trunk/metatype/src/main/org/jboss/metatype/api/types/ImmutableTableMetaType.java
===================================================================
--- projects/microcontainer/trunk/metatype/src/main/org/jboss/metatype/api/types/ImmutableTableMetaType.java 2008-02-18 19:57:14 UTC (rev 69905)
+++ projects/microcontainer/trunk/metatype/src/main/org/jboss/metatype/api/types/ImmutableTableMetaType.java 2008-02-18 20:12:07 UTC (rev 69906)
@@ -21,6 +21,7 @@
*/
package org.jboss.metatype.api.types;
+import java.io.Serializable;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Iterator;
@@ -34,7 +35,7 @@
* @author <a href="adrian at jboss.com">Adrian Brock</a>
* @version $Revision: 1.1 $
*/
-public class ImmutableTableMetaType extends AbstractMetaType implements TableMetaType
+public class ImmutableTableMetaType extends AbstractMetaType<Serializable> implements TableMetaType
{
/** The serialVersionUID */
private static final long serialVersionUID = 5791103660662775558L;
@@ -149,7 +150,7 @@
return cachedHashCode;
cachedHashCode = getTypeName().hashCode();
cachedHashCode += getRowType().hashCode();
- for (Iterator i = indexNames.iterator(); i.hasNext();)
+ for (Iterator<String> i = indexNames.iterator(); i.hasNext();)
cachedHashCode += i.next().hashCode();
return cachedHashCode;
}
@@ -165,7 +166,7 @@
buffer.append("] rowType=[");
buffer.append(getRowType());
buffer.append("] indexNames=[");
- Iterator thisNames = getIndexNames().iterator();
+ Iterator<String> thisNames = getIndexNames().iterator();
while(thisNames.hasNext())
{
buffer.append(thisNames.next());
Modified: projects/microcontainer/trunk/metatype/src/main/org/jboss/metatype/api/types/MapCompositeMetaType.java
===================================================================
--- projects/microcontainer/trunk/metatype/src/main/org/jboss/metatype/api/types/MapCompositeMetaType.java 2008-02-18 19:57:14 UTC (rev 69905)
+++ projects/microcontainer/trunk/metatype/src/main/org/jboss/metatype/api/types/MapCompositeMetaType.java 2008-02-18 20:12:07 UTC (rev 69906)
@@ -32,13 +32,13 @@
public class MapCompositeMetaType extends AbstractCompositeMetaType
{
private static final long serialVersionUID = 1;
- private MetaType valueType;
+ private MetaType<?> valueType;
/**
* Create a MapCompositeMetaType with the given value metatype.
* @param valueType the value meta type
*/
- public MapCompositeMetaType(MetaType valueType)
+ public MapCompositeMetaType(MetaType<?> valueType)
{
super("java.lang.Map", "Map<String,MetaValue>");
this.valueType = valueType;
Modified: projects/microcontainer/trunk/metatype/src/main/org/jboss/metatype/api/types/MetaTypeFactory.java
===================================================================
--- projects/microcontainer/trunk/metatype/src/main/org/jboss/metatype/api/types/MetaTypeFactory.java 2008-02-18 19:57:14 UTC (rev 69905)
+++ projects/microcontainer/trunk/metatype/src/main/org/jboss/metatype/api/types/MetaTypeFactory.java 2008-02-18 20:12:07 UTC (rev 69906)
@@ -55,7 +55,7 @@
* @return the metatype
* @throws IllegalArgumentException for a null type
*/
- public abstract MetaType resolve(Type type);
+ public abstract MetaType<?> resolve(Type type);
/**
* Resolve a metatype
@@ -64,7 +64,7 @@
* @return the metatype
* @throws IllegalArgumentException for a null type
*/
- public abstract MetaType resolve(TypeInfo type);
+ public abstract MetaType<?> resolve(TypeInfo type);
/**
* Resolve a metatype
@@ -75,13 +75,13 @@
* @throws IllegalArgumentException for a null className or classloader
* @throws ClassNotFoundException when the class is not found
*/
- public MetaType resolve(String className, ClassLoader classLoader) throws ClassNotFoundException
+ public MetaType<?> resolve(String className, ClassLoader classLoader) throws ClassNotFoundException
{
if (className == null)
throw new IllegalArgumentException("Null className");
if (classLoader == null)
throw new IllegalArgumentException("Null classLoader");
- Class clazz = Class.forName(className, false, classLoader);
+ Class<?> clazz = Class.forName(className, false, classLoader);
return resolve(clazz);
}
Modified: projects/microcontainer/trunk/metatype/src/main/org/jboss/metatype/api/types/SimpleMetaType.java
===================================================================
--- projects/microcontainer/trunk/metatype/src/main/org/jboss/metatype/api/types/SimpleMetaType.java 2008-02-18 19:57:14 UTC (rev 69905)
+++ projects/microcontainer/trunk/metatype/src/main/org/jboss/metatype/api/types/SimpleMetaType.java 2008-02-18 20:12:07 UTC (rev 69906)
@@ -87,7 +87,7 @@
public static final SimpleMetaType<Name> NAMEDOBJECT;
/** The simple type for java.lang.Void */
- public static final SimpleMetaType VOID;
+ public static final SimpleMetaType<?> VOID;
static
{
@@ -104,8 +104,14 @@
SHORT = new SimpleMetaType<Short>(Short.class.getName());
STRING = new SimpleMetaType<String>(String.class.getName());
NAMEDOBJECT = new SimpleMetaType<Name>(Name.class.getName());
- VOID = new SimpleMetaType(Void.class.getName());
+ VOID = createVoid();
}
+
+ @SuppressWarnings("unchecked")
+ private static SimpleMetaType<?> createVoid()
+ {
+ return new SimpleMetaType(Void.class.getName());
+ }
/**
* Resolve a simple type
@@ -114,9 +120,9 @@
* @return the simple type
* @throws IllegalArgumentException for a null className or if it is not a simple type
*/
- public static SimpleMetaType resolve(String className)
+ public static SimpleMetaType<?> resolve(String className)
{
- SimpleMetaType result = isSimpleType(className);
+ SimpleMetaType<?> result = isSimpleType(className);
if (result != null)
return result;
throw new IllegalArgumentException("Class is not a simple type: " + className);
@@ -130,7 +136,7 @@
* @return the simple type
* @throws IllegalArgumentException for a null className
*/
- public static SimpleMetaType isSimpleType(String className)
+ public static SimpleMetaType<?> isSimpleType(String className)
{
if (className == null)
throw new IllegalArgumentException("Null class name");
@@ -194,7 +200,7 @@
if (obj == null || obj instanceof SimpleValue == false)
return false;
- SimpleValue value = (SimpleValue) obj;
+ SimpleValue<?> value = (SimpleValue<?>) obj;
return equals(value.getMetaType());
}
@@ -205,7 +211,7 @@
return true;
if (obj == null || obj instanceof SimpleMetaType == false)
return false;
- SimpleMetaType other = (SimpleMetaType) obj;
+ SimpleMetaType<?> other = (SimpleMetaType<?>) obj;
return getClassName().equals(other.getClassName());
}
Modified: projects/microcontainer/trunk/metatype/src/main/org/jboss/metatype/api/types/TableMetaType.java
===================================================================
--- projects/microcontainer/trunk/metatype/src/main/org/jboss/metatype/api/types/TableMetaType.java 2008-02-18 19:57:14 UTC (rev 69905)
+++ projects/microcontainer/trunk/metatype/src/main/org/jboss/metatype/api/types/TableMetaType.java 2008-02-18 20:12:07 UTC (rev 69906)
@@ -21,6 +21,7 @@
*/
package org.jboss.metatype.api.types;
+import java.io.Serializable;
import java.util.List;
/**
@@ -29,7 +30,7 @@
* @author <a href="adrian at jboss.com">Adrian Brock</a>
* @version $Revision: 1.1 $
*/
-public interface TableMetaType extends MetaType
+public interface TableMetaType extends MetaType<Serializable>
{
/**
* Retrieve the row type
Modified: projects/microcontainer/trunk/metatype/src/main/org/jboss/metatype/api/values/ArrayValue.java
===================================================================
--- projects/microcontainer/trunk/metatype/src/main/org/jboss/metatype/api/values/ArrayValue.java 2008-02-18 19:57:14 UTC (rev 69905)
+++ projects/microcontainer/trunk/metatype/src/main/org/jboss/metatype/api/values/ArrayValue.java 2008-02-18 20:12:07 UTC (rev 69906)
@@ -28,6 +28,7 @@
/**
* ArrayValue.
*
+ * @param <T> the array type
* @author <a href="adrian at jboss.com">Adrian Brock</a>
* @author Scott.Stark at jboss.org
* @version $Revision: 1.1 $
Modified: projects/microcontainer/trunk/metatype/src/main/org/jboss/metatype/api/values/ArrayValueSupport.java
===================================================================
--- projects/microcontainer/trunk/metatype/src/main/org/jboss/metatype/api/values/ArrayValueSupport.java 2008-02-18 19:57:14 UTC (rev 69905)
+++ projects/microcontainer/trunk/metatype/src/main/org/jboss/metatype/api/values/ArrayValueSupport.java 2008-02-18 20:12:07 UTC (rev 69906)
@@ -32,6 +32,7 @@
* ArrayValue.
*
* TODO tests
+ * @param <T> the array type
* @author <a href="adrian at jboss.com">Adrian Brock</a>
* @version $Revision: 1.1 $
*/
@@ -126,7 +127,7 @@
if (obj == null || obj instanceof ArrayValue == false)
return false;
- ArrayValue<T> other = (ArrayValue<T>) obj;
+ ArrayValue<?> other = (ArrayValue<?>) obj;
if (metaType.equals(other.getMetaType()) == false)
return false;
@@ -178,7 +179,7 @@
@Override
public MetaValue clone()
{
- ArrayValueSupport result = (ArrayValueSupport) super.clone();
+ ArrayValueSupport<?> result = (ArrayValueSupport<?>) super.clone();
int length = getLength();
if (value != null && length > 0)
{
@@ -191,7 +192,7 @@
/**
*
- * @return
+ * @return the deep string
*/
protected String deepToString()
{
Modified: projects/microcontainer/trunk/metatype/src/main/org/jboss/metatype/api/values/CollectionValue.java
===================================================================
--- projects/microcontainer/trunk/metatype/src/main/org/jboss/metatype/api/values/CollectionValue.java 2008-02-18 19:57:14 UTC (rev 69905)
+++ projects/microcontainer/trunk/metatype/src/main/org/jboss/metatype/api/values/CollectionValue.java 2008-02-18 20:12:07 UTC (rev 69906)
@@ -30,7 +30,7 @@
*/
public interface CollectionValue extends MetaValue, Iterable<MetaValue>
{
- CollectionMetaType getMetaType();
+ CollectionMetaType<?> getMetaType();
/**
* Get the underlying elements.
Modified: projects/microcontainer/trunk/metatype/src/main/org/jboss/metatype/api/values/CollectionValueSupport.java
===================================================================
--- projects/microcontainer/trunk/metatype/src/main/org/jboss/metatype/api/values/CollectionValueSupport.java 2008-02-18 19:57:14 UTC (rev 69905)
+++ projects/microcontainer/trunk/metatype/src/main/org/jboss/metatype/api/values/CollectionValueSupport.java 2008-02-18 20:12:07 UTC (rev 69906)
@@ -37,7 +37,7 @@
private static final long serialVersionUID = 1131827130033538066L;
/** The collection meta type */
- private CollectionMetaType metaType;
+ private CollectionMetaType<?> metaType;
/** The elements */
private MetaValue[] elements;
@@ -48,7 +48,7 @@
* @param metaType the collection meta type
* @throws IllegalArgumentException for a null array MetaType
*/
- public CollectionValueSupport(CollectionMetaType metaType)
+ public CollectionValueSupport(CollectionMetaType<?> metaType)
{
if (metaType == null)
throw new IllegalArgumentException("Null collection meta type");
@@ -62,13 +62,13 @@
* @param elements the elements
* @throws IllegalArgumentException for a null array MetaType
*/
- public CollectionValueSupport(CollectionMetaType metaType, MetaValue[] elements)
+ public CollectionValueSupport(CollectionMetaType<?> metaType, MetaValue[] elements)
{
this(metaType);
this.elements = elements;
}
- public CollectionMetaType getMetaType()
+ public CollectionMetaType<?> getMetaType()
{
return metaType;
}
Modified: projects/microcontainer/trunk/metatype/src/main/org/jboss/metatype/api/values/CompositeValueSupport.java
===================================================================
--- projects/microcontainer/trunk/metatype/src/main/org/jboss/metatype/api/values/CompositeValueSupport.java 2008-02-18 19:57:14 UTC (rev 69905)
+++ projects/microcontainer/trunk/metatype/src/main/org/jboss/metatype/api/values/CompositeValueSupport.java 2008-02-18 20:12:07 UTC (rev 69906)
@@ -99,7 +99,7 @@
throw new IllegalArgumentException("Item name " + i + " is null or empty");
if (contents.get(itemNames[i]) != null)
throw new IllegalArgumentException("duplicate item name " + itemNames[i]);
- MetaType itemType = metaType.getType(itemNames[i]);
+ MetaType<?> itemType = metaType.getType(itemNames[i]);
if (itemType == null)
throw new IllegalArgumentException("item name not in composite type: " + itemNames[i]);
if (itemValues[i] != null && itemType.isValue(itemValues[i]) == false)
@@ -160,7 +160,7 @@
*/
public void set(String key, MetaValue value)
{
- MetaType itemType = validateKey(key);
+ MetaType<?> itemType = validateKey(key);
if (value != null && itemType.isValue(value) == false)
throw new IllegalArgumentException("item value " + value + " for item name " + key + " is not a " + itemType);
contents.put(key, value);
@@ -245,7 +245,7 @@
buffer.append(": metaType=[");
buffer.append(metaType);
buffer.append("] items=[");
- Iterator keys = metaType.keySet().iterator();
+ Iterator<String> keys = metaType.keySet().iterator();
while(keys.hasNext())
{
Object key = keys.next();
@@ -267,12 +267,12 @@
* @throws IllegalArgumentException for a null or empty key or when
* the key not a valid item name for the composite type
*/
- private MetaType validateKey(String key)
+ private MetaType<?> validateKey(String key)
{
if (key == null || key.length() == 0)
throw new IllegalArgumentException("null or empty key");
CompositeMetaType metaType = getMetaType();
- MetaType result = metaType.getType(key);
+ MetaType<?> result = metaType.getType(key);
if (result == null)
throw new IllegalArgumentException("no such item name " + key + " for composite type " + metaType);
return result;
@@ -305,7 +305,7 @@
String key = entry.getKey();
if (key == null || key.length() == 0)
throw new IllegalArgumentException("Key is null or empty");
- MetaType itemType = metaType.getType(key);
+ MetaType<?> itemType = metaType.getType(key);
if (itemType == null)
throw new IllegalArgumentException("item name not in composite type " + key);
MetaValue value = items.get(key);
Modified: projects/microcontainer/trunk/metatype/src/main/org/jboss/metatype/api/values/EnumValueSupport.java
===================================================================
--- projects/microcontainer/trunk/metatype/src/main/org/jboss/metatype/api/values/EnumValueSupport.java 2008-02-18 19:57:14 UTC (rev 69905)
+++ projects/microcontainer/trunk/metatype/src/main/org/jboss/metatype/api/values/EnumValueSupport.java 2008-02-18 20:12:07 UTC (rev 69906)
@@ -61,7 +61,7 @@
* @param value the enum instance
* @throws IllegalArgumentException for a null enum MetaType
*/
- public EnumValueSupport(EnumMetaType metaType, Enum value)
+ public EnumValueSupport(EnumMetaType metaType, Enum<?> value)
{
this(metaType, value.name());
}
Modified: projects/microcontainer/trunk/metatype/src/main/org/jboss/metatype/api/values/MapCompositeValueSupport.java
===================================================================
--- projects/microcontainer/trunk/metatype/src/main/org/jboss/metatype/api/values/MapCompositeValueSupport.java 2008-02-18 19:57:14 UTC (rev 69905)
+++ projects/microcontainer/trunk/metatype/src/main/org/jboss/metatype/api/values/MapCompositeValueSupport.java 2008-02-18 20:12:07 UTC (rev 69906)
@@ -43,12 +43,12 @@
private Map<String, MetaValue> map;
private MapCompositeMetaType mapType;
- public MapCompositeValueSupport(MetaType valueType)
+ public MapCompositeValueSupport(MetaType<?> valueType)
{
this(null, valueType);
}
- public MapCompositeValueSupport(Map<String, MetaValue> map, MetaType valueType)
+ public MapCompositeValueSupport(Map<String, MetaValue> map, MetaType<?> valueType)
{
this.map = createMap();
this.mapType = new MapCompositeMetaType(valueType);
Modified: projects/microcontainer/trunk/metatype/src/main/org/jboss/metatype/api/values/MetaValue.java
===================================================================
--- projects/microcontainer/trunk/metatype/src/main/org/jboss/metatype/api/values/MetaValue.java 2008-02-18 19:57:14 UTC (rev 69905)
+++ projects/microcontainer/trunk/metatype/src/main/org/jboss/metatype/api/values/MetaValue.java 2008-02-18 20:12:07 UTC (rev 69906)
@@ -38,7 +38,7 @@
*
* @return the metatype
*/
- MetaType getMetaType();
+ MetaType<?> getMetaType();
/**
* Clone the meta value
Modified: projects/microcontainer/trunk/metatype/src/main/org/jboss/metatype/api/values/MetaValueFactory.java
===================================================================
--- projects/microcontainer/trunk/metatype/src/main/org/jboss/metatype/api/values/MetaValueFactory.java 2008-02-18 19:57:14 UTC (rev 69905)
+++ projects/microcontainer/trunk/metatype/src/main/org/jboss/metatype/api/values/MetaValueFactory.java 2008-02-18 20:12:07 UTC (rev 69906)
@@ -80,7 +80,7 @@
* @param clazz the class
* @param builder the builder
*/
- public abstract void setBuilder(Class<?> clazz, MetaValueBuilder builder);
+ public abstract void setBuilder(Class<?> clazz, MetaValueBuilder<?> builder);
/**
* Set an instance factory.
Modified: projects/microcontainer/trunk/metatype/src/main/org/jboss/metatype/api/values/SimpleValueSupport.java
===================================================================
--- projects/microcontainer/trunk/metatype/src/main/org/jboss/metatype/api/values/SimpleValueSupport.java 2008-02-18 19:57:14 UTC (rev 69905)
+++ projects/microcontainer/trunk/metatype/src/main/org/jboss/metatype/api/values/SimpleValueSupport.java 2008-02-18 20:12:07 UTC (rev 69906)
@@ -56,7 +56,7 @@
if (object == null)
return null;
String className = object.getClass().getName();
- SimpleMetaType<T> metaType = SimpleMetaType.resolve(className);
+ SimpleMetaType<T> metaType = (SimpleMetaType) SimpleMetaType.resolve(className);
return new SimpleValueSupport<T>(metaType, object);
}
@@ -109,7 +109,7 @@
if (obj == null || obj instanceof SimpleValue == false)
return false;
- SimpleValue other = (SimpleValue) obj;
+ SimpleValue<?> other = (SimpleValue<?>) obj;
if (metaType.equals(other.getMetaType()) == false)
return false;
Modified: projects/microcontainer/trunk/metatype/src/main/org/jboss/metatype/api/values/TableValueSupport.java
===================================================================
--- projects/microcontainer/trunk/metatype/src/main/org/jboss/metatype/api/values/TableValueSupport.java 2008-02-18 19:57:14 UTC (rev 69905)
+++ projects/microcontainer/trunk/metatype/src/main/org/jboss/metatype/api/values/TableValueSupport.java 2008-02-18 20:12:07 UTC (rev 69906)
@@ -224,7 +224,7 @@
Iterator<Entry<List<MetaValue>, CompositeValue>> entries = dataMap.entrySet().iterator();
while(entries.hasNext())
{
- Entry entry = entries.next();
+ Entry<List<MetaValue>, CompositeValue> entry = entries.next();
buffer.append(entry.getKey());
buffer.append("=");
buffer.append(entry.getValue());
@@ -293,7 +293,7 @@
throw new IllegalArgumentException("key has " + key.length + " elements, " + "should be " + indexNames.length);
for (int i = 0; i < key.length; i++)
{
- MetaType metaType = tableType.getRowType().getType(indexNames[i]);
+ MetaType<?> metaType = tableType.getRowType().getType(indexNames[i]);
if (key[i] != null && metaType.isValue(key[i]) == false)
throw new IllegalArgumentException("key element " + i + " " + key + " is not a value for " + metaType);
}
Modified: projects/microcontainer/trunk/metatype/src/main/org/jboss/metatype/plugins/types/AbstractCompositeMetaType.java
===================================================================
--- projects/microcontainer/trunk/metatype/src/main/org/jboss/metatype/plugins/types/AbstractCompositeMetaType.java 2008-02-18 19:57:14 UTC (rev 69905)
+++ projects/microcontainer/trunk/metatype/src/main/org/jboss/metatype/plugins/types/AbstractCompositeMetaType.java 2008-02-18 20:12:07 UTC (rev 69906)
@@ -21,6 +21,7 @@
*/
package org.jboss.metatype.plugins.types;
+import java.io.Serializable;
import java.util.Collections;
import java.util.Iterator;
import java.util.Set;
@@ -37,7 +38,7 @@
* @author <a href="adrian at jboss.com">Adrian Brock</a>
* @version $Revision: 1.1 $
*/
-public abstract class AbstractCompositeMetaType extends AbstractMetaType implements CompositeMetaType
+public abstract class AbstractCompositeMetaType extends AbstractMetaType<Serializable> implements CompositeMetaType
{
/** The serialVersionUID */
private static final long serialVersionUID = -7421421680257307598L;
@@ -46,7 +47,7 @@
private TreeMap<String, String> nameToDescription;
/** Item names to meta types */
- private TreeMap<String, MetaType> nameToType;
+ private TreeMap<String, MetaType<?>> nameToType;
/** The keys */
private Set<String> keys;
@@ -79,13 +80,13 @@
* The names are case sensitive, leading and trailing whitespace
* is ignored.
*/
- protected AbstractCompositeMetaType(String typeName, String description, String[] itemNames, String[] itemDescriptions, MetaType[] itemTypes, boolean ignoreItems)
+ protected AbstractCompositeMetaType(String typeName, String description, String[] itemNames, String[] itemDescriptions, MetaType<?>[] itemTypes, boolean ignoreItems)
{
super(CompositeValue.class.getName(), typeName, description);
if (ignoreItems)
{
nameToDescription = new TreeMap<String, String>();
- nameToType = new TreeMap<String, MetaType>();
+ nameToType = new TreeMap<String, MetaType<?>>();
return;
}
if (itemNames == null || itemNames.length == 0)
@@ -99,7 +100,7 @@
if (itemNames.length != itemTypes.length)
throw new IllegalArgumentException("wrong number of itemTypes");
nameToDescription = new TreeMap<String, String>();
- nameToType = new TreeMap<String, MetaType>();
+ nameToType = new TreeMap<String, MetaType<?>>();
for (int i = 0; i < itemNames.length; ++i)
{
try
@@ -153,7 +154,7 @@
* @param itemType the item type
* @throws IllegalArgumentException for a null or empty item name, description or type or duplicate item
*/
- protected void addItem(String itemName, String itemDescription, MetaType itemType)
+ protected void addItem(String itemName, String itemDescription, MetaType<?> itemType)
{
if (itemName == null)
throw new IllegalArgumentException("null item name");
@@ -193,7 +194,7 @@
return true;
}
- public MetaType getType(String itemName)
+ public MetaType<?> getType(String itemName)
{
if (itemName == null)
return null;
Modified: projects/microcontainer/trunk/metatype/src/main/org/jboss/metatype/plugins/types/ClassMetaTypeBuilder.java
===================================================================
--- projects/microcontainer/trunk/metatype/src/main/org/jboss/metatype/plugins/types/ClassMetaTypeBuilder.java 2008-02-18 19:57:14 UTC (rev 69905)
+++ projects/microcontainer/trunk/metatype/src/main/org/jboss/metatype/plugins/types/ClassMetaTypeBuilder.java 2008-02-18 20:12:07 UTC (rev 69906)
@@ -38,7 +38,7 @@
public static final ClassMetaTypeBuilder INSTANCE = new ClassMetaTypeBuilder();
/** The MetaType for Class */
- public static final MetaType CLASS_META_TYPE = new ImmutableCompositeMetaType(
+ public static final MetaType<?> CLASS_META_TYPE = new ImmutableCompositeMetaType(
Class.class.getName(),
Class.class.getName(),
new String[] { "name" },
@@ -46,7 +46,7 @@
new MetaType[] { SimpleMetaType.STRING }
);
- public MetaType buildMetaType()
+ public MetaType<?> buildMetaType()
{
return CLASS_META_TYPE;
}
Modified: projects/microcontainer/trunk/metatype/src/main/org/jboss/metatype/plugins/types/DefaultMetaTypeFactory.java
===================================================================
--- projects/microcontainer/trunk/metatype/src/main/org/jboss/metatype/plugins/types/DefaultMetaTypeFactory.java 2008-02-18 19:57:14 UTC (rev 69905)
+++ projects/microcontainer/trunk/metatype/src/main/org/jboss/metatype/plugins/types/DefaultMetaTypeFactory.java 2008-02-18 20:12:07 UTC (rev 69906)
@@ -95,7 +95,7 @@
private TypeInfo objectTypeInfo = configuration.getTypeInfo(Object.class);
/** The builders */
- private Map<Class, WeakReference<MetaTypeBuilder>> builders = new WeakHashMap<Class, WeakReference<MetaTypeBuilder>>();
+ private Map<Class<?>, WeakReference<MetaTypeBuilder>> builders = new WeakHashMap<Class<?>, WeakReference<MetaTypeBuilder>>();
/**
* Create a new DefaultMetaTypeFactory.
@@ -107,7 +107,7 @@
}
@Override
- public MetaType resolve(Type type)
+ public MetaType<?> resolve(Type type)
{
TypeInfo typeInfo = configuration.getTypeInfo(type);
return resolve(typeInfo);
@@ -119,10 +119,10 @@
* @param typeInfo the type
* @return the meta type
*/
- public MetaType resolve(TypeInfo typeInfo)
+ public MetaType<?> resolve(TypeInfo typeInfo)
{
// Look for a cached value
- MetaType result = typeInfo.getAttachment(MetaType.class);
+ MetaType<?> result = typeInfo.getAttachment(MetaType.class);
if (result == null)
{
// Generate it
@@ -152,9 +152,9 @@
* @param typeInfo the type info
* @return the metatype
*/
- public MetaType generate(TypeInfo typeInfo)
+ public MetaType<?> generate(TypeInfo typeInfo)
{
- MetaType result = isBuilder(typeInfo);
+ MetaType<?> result = isBuilder(typeInfo);
if (result != null)
return result;
@@ -246,7 +246,8 @@
* @param typeInfo the type info
* @return the metatype
*/
- public ArrayMetaType generateArray(ArrayInfo typeInfo)
+ @SuppressWarnings("unchecked")
+ public ArrayMetaType<?> generateArray(ArrayInfo typeInfo)
{
int dimension = 1;
TypeInfo componentType = typeInfo.getComponentType();
@@ -255,7 +256,7 @@
++dimension;
componentType = ((ArrayInfo) componentType).getComponentType();
}
- MetaType componentMetaType = resolve(componentType);
+ MetaType<?> componentMetaType = resolve(componentType);
return new ArrayMetaType(dimension, componentMetaType, componentType.isPrimitive());
}
@@ -308,7 +309,7 @@
public TableMetaType createMapType(TypeInfo keyType, TypeInfo valueType)
{
String name = Map.class.getName();
- MetaType[] itemTypes = { resolve(keyType), resolve(valueType) };
+ MetaType<?>[] itemTypes = { resolve(keyType), resolve(valueType) };
CompositeMetaType entryType = createMapEntryType(itemTypes);
return new ImmutableTableMetaType(name, name, entryType, MAP_INDEX_NAMES);
}
@@ -319,7 +320,7 @@
* @param itemTypes the item types
* @return the map entry type
*/
- public static CompositeMetaType createMapEntryType(MetaType[] itemTypes)
+ public static CompositeMetaType createMapEntryType(MetaType<?>[] itemTypes)
{
String entryName = Map.Entry.class.getName();
return new ImmutableCompositeMetaType(entryName, entryName, MAP_ITEM_NAMES, MAP_ITEM_NAMES, itemTypes);
@@ -347,7 +348,7 @@
if ("class".equals(name) == false)
{
TypeInfo itemTypeInfo = property.getType();
- MetaType metaType = resolve(itemTypeInfo);
+ MetaType<?> metaType = resolve(itemTypeInfo);
result.addItem(name, name, metaType);
if (property.isAnnotationPresent(CompositeKey.class))
{
@@ -370,7 +371,7 @@
* @param typeInfo the type info
* @return the meta type when it is special
*/
- public MetaType isBuilder(TypeInfo typeInfo)
+ public MetaType<?> isBuilder(TypeInfo typeInfo)
{
MetaTypeBuilder builder = null;
synchronized (builders)
Modified: projects/microcontainer/trunk/metatype/src/main/org/jboss/metatype/plugins/types/MutableCompositeMetaType.java
===================================================================
--- projects/microcontainer/trunk/metatype/src/main/org/jboss/metatype/plugins/types/MutableCompositeMetaType.java 2008-02-18 19:57:14 UTC (rev 69905)
+++ projects/microcontainer/trunk/metatype/src/main/org/jboss/metatype/plugins/types/MutableCompositeMetaType.java 2008-02-18 20:12:07 UTC (rev 69906)
@@ -60,7 +60,7 @@
}
@Override
- public void addItem(String itemName, String itemDescription, MetaType itemType)
+ public void addItem(String itemName, String itemDescription, MetaType<?> itemType)
{
if (frozen)
throw new IllegalStateException("The type is frozen");
Modified: projects/microcontainer/trunk/metatype/src/main/org/jboss/metatype/plugins/values/CompositeValueInvocationHandler.java
===================================================================
--- projects/microcontainer/trunk/metatype/src/main/org/jboss/metatype/plugins/values/CompositeValueInvocationHandler.java 2008-02-18 19:57:14 UTC (rev 69905)
+++ projects/microcontainer/trunk/metatype/src/main/org/jboss/metatype/plugins/values/CompositeValueInvocationHandler.java 2008-02-18 20:12:07 UTC (rev 69906)
@@ -120,8 +120,8 @@
StringBuilder fieldName = null;
- Class returnType = method.getReturnType();
- Class[] paramTypes = method.getParameterTypes();
+ Class<?> returnType = method.getReturnType();
+ Class<?>[] paramTypes = method.getParameterTypes();
if (Void.TYPE.equals(returnType) == false && paramTypes.length == 0)
{
String name = method.getName();
Modified: projects/microcontainer/trunk/metatype/src/main/org/jboss/metatype/plugins/values/DefaultMetaValueFactory.java
===================================================================
--- projects/microcontainer/trunk/metatype/src/main/org/jboss/metatype/plugins/values/DefaultMetaValueFactory.java 2008-02-18 19:57:14 UTC (rev 69905)
+++ projects/microcontainer/trunk/metatype/src/main/org/jboss/metatype/plugins/values/DefaultMetaValueFactory.java 2008-02-18 20:12:07 UTC (rev 69906)
@@ -114,13 +114,13 @@
};
/** The builders */
- private Map<Class, WeakReference<MetaValueBuilder>> builders = new WeakHashMap<Class, WeakReference<MetaValueBuilder>>();
+ private Map<Class<?>, WeakReference<MetaValueBuilder<?>>> builders = new WeakHashMap<Class<?>, WeakReference<MetaValueBuilder<?>>>();
/** The Object type info */
private static final TypeInfo OBJECT_TYPE_INFO = configuration.getTypeInfo(Object.class);
/** The instance factory builders */
- private Map<Class, InstanceFactory> instanceFactoryMap = new WeakHashMap<Class, InstanceFactory>();
+ private Map<Class<?>, InstanceFactory<?>> instanceFactoryMap = new WeakHashMap<Class<?>, InstanceFactory<?>>();
public DefaultMetaValueFactory()
{
@@ -130,13 +130,13 @@
setInstanceFactory(SortedSet.class, SortedSetInstanceFactory.INSTANCE);
}
- public void setBuilder(Class<?> clazz, MetaValueBuilder builder)
+ public void setBuilder(Class<?> clazz, MetaValueBuilder<?> builder)
{
synchronized (builders)
{
if (builder == null)
builders.remove(clazz);
- builders.put(clazz, new WeakReference<MetaValueBuilder>(builder));
+ builders.put(clazz, new WeakReference<MetaValueBuilder<?>>(builder));
}
}
@@ -175,7 +175,7 @@
* @param value the value
* @return the enum value
*/
- public static <T extends Enum> EnumValue createEnumValue(EnumMetaType type, T value)
+ public static <T extends Enum<?>> EnumValue createEnumValue(EnumMetaType type, T value)
{
if (value == null)
return null;
@@ -212,19 +212,19 @@
* @param mapping the mapping
* @return the generic value
*/
- public CollectionValue createCollectionValue(CollectionMetaType type, Object value, Map<Object, MetaValue> mapping)
+ public CollectionValue createCollectionValue(CollectionMetaType<?> type, Object value, Map<Object, MetaValue> mapping)
{
if (value == null)
return null;
- Collection collection = (Collection)value;
+ Collection<?> collection = (Collection<?>)value;
MetaValue[] elements = new MetaValue[collection.size()];
int i = 0;
for(Object ce : collection)
{
// recalculate element info, since usually more deterministic
TypeInfo typeInfo = configuration.getTypeInfo(ce.getClass());
- MetaType metaType = metaTypeFactory.resolve(typeInfo);
+ MetaType<?> metaType = metaTypeFactory.resolve(typeInfo);
elements[i++] = internalCreate(ce, typeInfo, metaType);
}
CollectionValue result = new CollectionValueSupport(type, elements);
@@ -294,17 +294,18 @@
* @param mapping the mapping
* @return the composite value
*/
- public ArrayValue createArrayValue(ArrayMetaType type, Object value, Map<Object, MetaValue> mapping)
+ @SuppressWarnings("unchecked")
+ public ArrayValue<?> createArrayValue(ArrayMetaType<?> type, Object value, Map<Object, MetaValue> mapping)
{
if (value == null)
return null;
- ArrayValueSupport result = new ArrayValueSupport(type);
+ ArrayValueSupport<?> result = new ArrayValueSupport(type);
mapping.put(value, result);
Object[] array;
- MetaType elementType = type.getElementType();
+ MetaType<?> elementType = type.getElementType();
int dimension = type.getDimension();
Object[] oldArray;
@@ -352,7 +353,7 @@
* @param oldArray the old array
* @return the array
*/
- protected Object[] createArray(MetaType elementType, Class<?> componentType, int dimension, Object[] oldArray)
+ protected Object[] createArray(MetaType<?> elementType, Class<?> componentType, int dimension, Object[] oldArray)
{
if (oldArray == null)
return null;
@@ -413,7 +414,7 @@
for (String name : type.keySet())
{
- MetaType itemType = type.getType(name);
+ MetaType<?> itemType = type.getType(name);
Object itemValue;
try
{
@@ -522,11 +523,11 @@
if (metaValue == null)
return null;
- MetaType metaType = metaValue.getMetaType();
+ MetaType<?> metaType = metaValue.getMetaType();
if (metaType.isSimple())
{
- Serializable value = ((SimpleValue)metaValue).getValue();
+ Serializable value = ((SimpleValue<?>)metaValue).getValue();
return getValue(metaType, type, value);
}
else if (metaType.isEnum())
@@ -541,7 +542,7 @@
}
else if (metaType.isArray())
{
- ArrayValue arrayValue = (ArrayValue)metaValue;
+ ArrayValue<?> arrayValue = (ArrayValue<?>)metaValue;
if (type == null)
type= getTypeInfo(metaType, arrayValue.getValue());
Object array = newArrayInstance(type, arrayValue.getLength());
@@ -587,7 +588,7 @@
* @param metaType the meta type
* @return type info
*/
- protected TypeInfo checkTypeInfo(TypeInfo type, Object value, MetaType metaType)
+ protected TypeInfo checkTypeInfo(TypeInfo type, Object value, MetaType<?> metaType)
{
if (type == null && value != null)
type = getTypeInfo(metaType, value);
@@ -603,7 +604,7 @@
* @param value the value
* @return the converted value
*/
- protected Object getValue(MetaType metaType, TypeInfo typeInfo, Object value)
+ protected Object getValue(MetaType<?> metaType, TypeInfo typeInfo, Object value)
{
typeInfo = checkTypeInfo(typeInfo, value, metaType);
return convertValue(value, typeInfo);
@@ -675,8 +676,8 @@
if (classInfo.isInterface())
{
InvocationHandler handler = createCompositeValueInvocationHandler(compositeValue);
- Class clazz = classInfo.getType();
- Class[] interfaces = new Class[]{clazz};
+ Class<?> clazz = classInfo.getType();
+ Class<?>[] interfaces = new Class[]{clazz};
return Proxy.newProxyInstance(clazz.getClassLoader(), interfaces, handler);
}
Object bean = createNewInstance(beanInfo);
@@ -780,7 +781,7 @@
* @param valueType the value type
* @return the map
*/
- protected Map createMap(TableValue tableValue, TypeInfo keyType, TypeInfo valueType)
+ protected Map<?,?> createMap(TableValue tableValue, TypeInfo keyType, TypeInfo valueType)
{
if (tableValue == null)
return null;
@@ -808,7 +809,7 @@
ClassInfo classInfo = beanInfo.getClassInfo();
if (classInfo.isInterface())
{
- InstanceFactory instanceFactory = instanceFactoryMap.get(classInfo.getType());
+ InstanceFactory<?> instanceFactory = instanceFactoryMap.get(classInfo.getType());
if (instanceFactory == null)
throw new IllegalArgumentException("Cannot instantiate interface BeanInfo, missing InstanceFactory: " + classInfo);
@@ -846,7 +847,7 @@
* @param value the value which can provide classloader
* @return type info
*/
- protected TypeInfo getTypeInfo(MetaType metaType, Object value)
+ protected TypeInfo getTypeInfo(MetaType<?> metaType, Object value)
{
if (metaType == null)
throw new IllegalArgumentException("Null meta type, cannot determine class name.");
@@ -865,7 +866,7 @@
* @param cl the classloader
* @return class info
*/
- protected TypeInfo getTypeInfo(MetaType metaType, ClassLoader cl)
+ protected TypeInfo getTypeInfo(MetaType<?> metaType, ClassLoader cl)
{
if (cl == null)
cl = Thread.currentThread().getContextClassLoader();
@@ -875,8 +876,8 @@
TypeInfoFactory tif = configuration.getTypeInfoFactory();
if (metaType.isArray())
{
- ArrayMetaType arrayMetaType = (ArrayMetaType)metaType;
- MetaType elementMetaType = arrayMetaType.getElementType();
+ ArrayMetaType<?> arrayMetaType = (ArrayMetaType<?>)metaType;
+ MetaType<?> elementMetaType = arrayMetaType.getElementType();
String elementTypeName = elementMetaType.getTypeName();
if (arrayMetaType.isPrimitiveArray())
elementTypeName = ArrayMetaType.getPrimitiveName(elementTypeName);
@@ -906,7 +907,8 @@
* @param metaType the metaType
* @return the meta value
*/
- protected MetaValue internalCreate(Object value, TypeInfo type, MetaType metaType)
+ @SuppressWarnings("unchecked")
+ protected MetaValue internalCreate(Object value, TypeInfo type, MetaType<?> metaType)
{
if (value == null)
return null;
@@ -950,17 +952,17 @@
if (metaType.isSimple())
result = createSimpleValue((SimpleMetaType<Serializable>) metaType, (Serializable) value);
else if (metaType.isEnum())
- result = createEnumValue((EnumMetaType) metaType, (Enum) value);
+ result = createEnumValue((EnumMetaType) metaType, (Enum<?>) value);
else if (metaType.isArray())
- result = createArrayValue((ArrayMetaType) metaType, value, mapping);
+ result = createArrayValue((ArrayMetaType<?>) metaType, value, mapping);
else if (metaType.isComposite())
result = createCompositeValue((CompositeMetaType) metaType, value, mapping);
else if (metaType.isTable())
- result = createTableValue((TableMetaType) metaType, (Map) value, mapping);
+ result = createTableValue((TableMetaType) metaType, (Map<?,?>) value, mapping);
else if (metaType.isGeneric())
result = createGenericValue((GenericMetaType) metaType, value, mapping);
else if (metaType.isCollection())
- result = createCollectionValue((CollectionMetaType) metaType, value, mapping);
+ result = createCollectionValue((CollectionMetaType<?>) metaType, value, mapping);
else
throw new IllegalStateException("Unknown metaType: " + metaType);
}
@@ -1009,7 +1011,7 @@
MetaValueBuilder builder = null;
synchronized (builders)
{
- WeakReference<MetaValueBuilder> weak = builders.get(type.getType());
+ WeakReference<MetaValueBuilder<?>> weak = builders.get(type.getType());
if (weak != null)
builder = weak.get();
}
Modified: projects/microcontainer/trunk/metatype/src/main/org/jboss/metatype/plugins/values/ListInstanceFactory.java
===================================================================
--- projects/microcontainer/trunk/metatype/src/main/org/jboss/metatype/plugins/values/ListInstanceFactory.java 2008-02-18 19:57:14 UTC (rev 69905)
+++ projects/microcontainer/trunk/metatype/src/main/org/jboss/metatype/plugins/values/ListInstanceFactory.java 2008-02-18 20:12:07 UTC (rev 69906)
@@ -32,6 +32,7 @@
*
* @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
*/
+ at SuppressWarnings("unchecked")
public class ListInstanceFactory implements InstanceFactory<List>
{
public static ListInstanceFactory INSTANCE = new ListInstanceFactory();
Modified: projects/microcontainer/trunk/metatype/src/main/org/jboss/metatype/plugins/values/SetInstanceFactory.java
===================================================================
--- projects/microcontainer/trunk/metatype/src/main/org/jboss/metatype/plugins/values/SetInstanceFactory.java 2008-02-18 19:57:14 UTC (rev 69905)
+++ projects/microcontainer/trunk/metatype/src/main/org/jboss/metatype/plugins/values/SetInstanceFactory.java 2008-02-18 20:12:07 UTC (rev 69906)
@@ -32,6 +32,7 @@
*
* @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
*/
+ at SuppressWarnings("unchecked")
public class SetInstanceFactory implements InstanceFactory<Set>
{
public static SetInstanceFactory INSTANCE = new SetInstanceFactory();
Modified: projects/microcontainer/trunk/metatype/src/main/org/jboss/metatype/plugins/values/SortedSetInstanceFactory.java
===================================================================
--- projects/microcontainer/trunk/metatype/src/main/org/jboss/metatype/plugins/values/SortedSetInstanceFactory.java 2008-02-18 19:57:14 UTC (rev 69905)
+++ projects/microcontainer/trunk/metatype/src/main/org/jboss/metatype/plugins/values/SortedSetInstanceFactory.java 2008-02-18 20:12:07 UTC (rev 69906)
@@ -32,6 +32,7 @@
*
* @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
*/
+ at SuppressWarnings("unchecked")
public class SortedSetInstanceFactory implements InstanceFactory<SortedSet>
{
public static SortedSetInstanceFactory INSTANCE = new SortedSetInstanceFactory();
Modified: projects/microcontainer/trunk/metatype/src/main/org/jboss/metatype/spi/types/MetaTypeBuilder.java
===================================================================
--- projects/microcontainer/trunk/metatype/src/main/org/jboss/metatype/spi/types/MetaTypeBuilder.java 2008-02-18 19:57:14 UTC (rev 69905)
+++ projects/microcontainer/trunk/metatype/src/main/org/jboss/metatype/spi/types/MetaTypeBuilder.java 2008-02-18 20:12:07 UTC (rev 69906)
@@ -36,5 +36,5 @@
*
* @return the meta type
*/
- MetaType buildMetaType();
+ MetaType<?> buildMetaType();
}
Modified: projects/microcontainer/trunk/metatype/src/main/org/jboss/metatype/spi/values/MetaValueBuilder.java
===================================================================
--- projects/microcontainer/trunk/metatype/src/main/org/jboss/metatype/spi/values/MetaValueBuilder.java 2008-02-18 19:57:14 UTC (rev 69905)
+++ projects/microcontainer/trunk/metatype/src/main/org/jboss/metatype/spi/values/MetaValueBuilder.java 2008-02-18 20:12:07 UTC (rev 69906)
@@ -40,5 +40,5 @@
* @param object the object
* @return the meta value
*/
- MetaValue buildMetaValue(MetaType metaType, T object);
+ MetaValue buildMetaValue(MetaType<?> metaType, T object);
}
Modified: projects/microcontainer/trunk/metatype/src/tests/org/jboss/test/metatype/AbstractMetaTypeTest.java
===================================================================
--- projects/microcontainer/trunk/metatype/src/tests/org/jboss/test/metatype/AbstractMetaTypeTest.java 2008-02-18 19:57:14 UTC (rev 69905)
+++ projects/microcontainer/trunk/metatype/src/tests/org/jboss/test/metatype/AbstractMetaTypeTest.java 2008-02-18 20:12:07 UTC (rev 69906)
@@ -255,7 +255,7 @@
{
String[] itemNames = new String[] { "name1", "name2" };
String[] itemDescriptions = new String[] { "desc1", "desc2" };
- MetaType[] itemTypes = new MetaType[] { SimpleMetaType.STRING, SimpleMetaType.INTEGER };
+ MetaType<?>[] itemTypes = new MetaType[] { SimpleMetaType.STRING, SimpleMetaType.INTEGER };
CompositeMetaType compositeMetaType = new ImmutableCompositeMetaType("typeName", "description", itemNames, itemDescriptions, itemTypes);
return compositeMetaType;
}
@@ -269,7 +269,7 @@
{
String[] itemNames = new String[] { "name1", "name2" };
String[] itemDescriptions = new String[] { "desc1", "desc2" };
- MetaType[] itemTypes = new MetaType[] { SimpleMetaType.STRING, SimpleMetaType.INTEGER };
+ MetaType<?>[] itemTypes = new MetaType[] { SimpleMetaType.STRING, SimpleMetaType.INTEGER };
CompositeMetaType compositeMetaType = new ImmutableCompositeMetaType("typeName2", "description", itemNames, itemDescriptions, itemTypes);
return compositeMetaType;
}
@@ -292,7 +292,7 @@
* @param actual the actual
* @throws Exception for any problem
*/
- protected void testArray(ArrayMetaType expected, ArrayMetaType actual) throws Exception
+ protected void testArray(ArrayMetaType<?> expected, ArrayMetaType<?> actual) throws Exception
{
getLog().debug("Array MetaType: className=" + actual.getClassName() + " typeName=" + actual.getTypeName() + " description=" + actual.getDescription() + " dim=" + actual.getDimension());
assertEquals(expected, actual);
@@ -305,7 +305,7 @@
* @param actual the actual
* @throws Exception for any problem
*/
- protected void testCollection(CollectionMetaType expected, CollectionMetaType actual) throws Exception
+ protected void testCollection(CollectionMetaType<?> expected, CollectionMetaType<?> actual) throws Exception
{
getLog().debug("Collection MetaType: className=" + actual.getClassName() + " typeName=" + actual.getTypeName() + " description=" + actual.getDescription());
assertEquals(expected, actual);
Modified: projects/microcontainer/trunk/metatype/src/tests/org/jboss/test/metatype/types/factory/support/TestOverrideCompositeBuilder.java
===================================================================
--- projects/microcontainer/trunk/metatype/src/tests/org/jboss/test/metatype/types/factory/support/TestOverrideCompositeBuilder.java 2008-02-18 19:57:14 UTC (rev 69905)
+++ projects/microcontainer/trunk/metatype/src/tests/org/jboss/test/metatype/types/factory/support/TestOverrideCompositeBuilder.java 2008-02-18 20:12:07 UTC (rev 69906)
@@ -34,7 +34,7 @@
*/
public class TestOverrideCompositeBuilder implements MetaTypeBuilder
{
- public MetaType buildMetaType()
+ public MetaType<?> buildMetaType()
{
MutableCompositeMetaType result = new MutableCompositeMetaType(TestOverrideComposite.class.getName(), TestOverrideComposite.class.getName());
result.addItem("somethingElse", "somethingElse", SimpleMetaType.STRING);
Modified: projects/microcontainer/trunk/metatype/src/tests/org/jboss/test/metatype/types/factory/test/AbstractMetaTypeFactoryTest.java
===================================================================
--- projects/microcontainer/trunk/metatype/src/tests/org/jboss/test/metatype/types/factory/test/AbstractMetaTypeFactoryTest.java 2008-02-18 19:57:14 UTC (rev 69905)
+++ projects/microcontainer/trunk/metatype/src/tests/org/jboss/test/metatype/types/factory/test/AbstractMetaTypeFactoryTest.java 2008-02-18 20:12:07 UTC (rev 69906)
@@ -55,7 +55,7 @@
* @param clazz the clazz
* @param builder the builder
*/
- protected void setBuilder(Class clazz, MetaTypeBuilder builder)
+ protected void setBuilder(Class<?> clazz, MetaTypeBuilder builder)
{
metaTypeFactory.setBuilder(clazz, builder);
}
@@ -66,7 +66,7 @@
* @param type the type
* @return the meta type
*/
- protected MetaType resolve(Type type)
+ protected MetaType<?> resolve(Type type)
{
return metaTypeFactory.resolve(type);
}
Modified: projects/microcontainer/trunk/metatype/src/tests/org/jboss/test/metatype/types/factory/test/AnnotationMetaTypeFactoryUnitTestCase.java
===================================================================
--- projects/microcontainer/trunk/metatype/src/tests/org/jboss/test/metatype/types/factory/test/AnnotationMetaTypeFactoryUnitTestCase.java 2008-02-18 19:57:14 UTC (rev 69905)
+++ projects/microcontainer/trunk/metatype/src/tests/org/jboss/test/metatype/types/factory/test/AnnotationMetaTypeFactoryUnitTestCase.java 2008-02-18 20:12:07 UTC (rev 69906)
@@ -64,7 +64,7 @@
*/
public void testSimpleAnnotation() throws Exception
{
- MetaType result = resolve(TestSimpleAnnotation.class);
+ MetaType<?> result = resolve(TestSimpleAnnotation.class);
CompositeMetaType actual = assertInstanceOf(result, CompositeMetaType.class);
MutableCompositeMetaType expected = new MutableCompositeMetaType(TestSimpleAnnotation.class.getName(), TestSimpleAnnotation.class.getName());
Modified: projects/microcontainer/trunk/metatype/src/tests/org/jboss/test/metatype/types/factory/test/ArrayMetaTypeFactoryUnitTestCase.java
===================================================================
--- projects/microcontainer/trunk/metatype/src/tests/org/jboss/test/metatype/types/factory/test/ArrayMetaTypeFactoryUnitTestCase.java 2008-02-18 19:57:14 UTC (rev 69905)
+++ projects/microcontainer/trunk/metatype/src/tests/org/jboss/test/metatype/types/factory/test/ArrayMetaTypeFactoryUnitTestCase.java 2008-02-18 20:12:07 UTC (rev 69906)
@@ -61,15 +61,17 @@
*
* @throws Exception for any problem
*/
+ @SuppressWarnings("unchecked")
public void testSimpleArray() throws Exception
{
String[] array = new String[0];
- MetaType result = resolve(array.getClass());
- ArrayMetaType actual = assertInstanceOf(result, ArrayMetaType.class);
- ArrayMetaType expected = new ArrayMetaType(1, SimpleMetaType.STRING);
+ MetaType<?> result = resolve(array.getClass());
+ ArrayMetaType<String> actual = assertInstanceOf(result, ArrayMetaType.class);
+ ArrayMetaType<String> expected = new ArrayMetaType<String>(1, SimpleMetaType.STRING);
testArray(expected, actual);
}
+ @SuppressWarnings("unchecked")
public void testCharArray()
throws Exception
{
@@ -80,6 +82,7 @@
ArrayMetaType expected = new ArrayMetaType(1, SimpleMetaType.CHARACTER);
testArray(expected, actual);
}
+ @SuppressWarnings("unchecked")
public void testChar2DArray()
throws Exception
{
@@ -95,6 +98,7 @@
*
* @throws Exception for any problem
*/
+ @SuppressWarnings("unchecked")
public void testSimpleCompositeArray() throws Exception
{
TestSimpleComposite[] array = new TestSimpleComposite[0];
@@ -110,6 +114,7 @@
*
* @throws Exception for any problem
*/
+ @SuppressWarnings("unchecked")
public void testMultiSimpleArray() throws Exception
{
String[][] array = new String[0][0];
@@ -124,6 +129,7 @@
*
* @throws Exception for any problem
*/
+ @SuppressWarnings("unchecked")
public void testMultiSimpleCompositeArray() throws Exception
{
TestSimpleComposite[][] array = new TestSimpleComposite[0][0];
Modified: projects/microcontainer/trunk/metatype/src/tests/org/jboss/test/metatype/types/factory/test/CompositeMetaTypeFactoryUnitTestCase.java
===================================================================
--- projects/microcontainer/trunk/metatype/src/tests/org/jboss/test/metatype/types/factory/test/CompositeMetaTypeFactoryUnitTestCase.java 2008-02-18 19:57:14 UTC (rev 69905)
+++ projects/microcontainer/trunk/metatype/src/tests/org/jboss/test/metatype/types/factory/test/CompositeMetaTypeFactoryUnitTestCase.java 2008-02-18 20:12:07 UTC (rev 69906)
@@ -68,7 +68,7 @@
*/
public void testSimpleComposite() throws Exception
{
- MetaType result = resolve(TestSimpleComposite.class);
+ MetaType<?> result = resolve(TestSimpleComposite.class);
CompositeMetaType actual = assertInstanceOf(result, CompositeMetaType.class);
MutableCompositeMetaType expected = new MutableCompositeMetaType(TestSimpleComposite.class.getName(), TestSimpleComposite.class.getName());
@@ -85,7 +85,7 @@
*/
public void testRecursiveComposite() throws Exception
{
- MetaType result = resolve(TestRecursiveComposite.class);
+ MetaType<?> result = resolve(TestRecursiveComposite.class);
CompositeMetaType actual = assertInstanceOf(result, CompositeMetaType.class);
MutableCompositeMetaType expected = new MutableCompositeMetaType(TestRecursiveComposite.class.getName(), TestRecursiveComposite.class.getName());
Modified: projects/microcontainer/trunk/metatype/src/tests/org/jboss/test/metatype/types/factory/test/EnumMetaTypeFactoryUnitTestCase.java
===================================================================
--- projects/microcontainer/trunk/metatype/src/tests/org/jboss/test/metatype/types/factory/test/EnumMetaTypeFactoryUnitTestCase.java 2008-02-18 19:57:14 UTC (rev 69905)
+++ projects/microcontainer/trunk/metatype/src/tests/org/jboss/test/metatype/types/factory/test/EnumMetaTypeFactoryUnitTestCase.java 2008-02-18 20:12:07 UTC (rev 69906)
@@ -64,7 +64,7 @@
*/
public void testEnumType() throws Exception
{
- MetaType result = resolve(TestEnum.class);
+ MetaType<?> result = resolve(TestEnum.class);
EnumMetaType actual = assertInstanceOf(result, EnumMetaType.class);
ArrayList<String> expectedValues = new ArrayList<String>(3);
expectedValues.add("ONE");
Modified: projects/microcontainer/trunk/metatype/src/tests/org/jboss/test/metatype/types/factory/test/MapMetaTypeFactoryUnitTestCase.java
===================================================================
--- projects/microcontainer/trunk/metatype/src/tests/org/jboss/test/metatype/types/factory/test/MapMetaTypeFactoryUnitTestCase.java 2008-02-18 19:57:14 UTC (rev 69905)
+++ projects/microcontainer/trunk/metatype/src/tests/org/jboss/test/metatype/types/factory/test/MapMetaTypeFactoryUnitTestCase.java 2008-02-18 20:12:07 UTC (rev 69906)
@@ -135,11 +135,11 @@
{
Method method = getClass().getMethod(methodName, null);
Type collectionType = method.getGenericReturnType();
- MetaType result = resolve(collectionType);
+ MetaType<?> result = resolve(collectionType);
TableMetaType actual = assertInstanceOf(result, TableMetaType.class);
- MetaType keyType = resolve(keyClass);
- MetaType valueType = resolve(valueClass);
- MetaType[] itemTypes = { keyType, valueType };
+ MetaType<?> keyType = resolve(keyClass);
+ MetaType<?> valueType = resolve(valueClass);
+ MetaType<?>[] itemTypes = { keyType, valueType };
String entryName = Map.Entry.class.getName();
CompositeMetaType entryType = new ImmutableCompositeMetaType(entryName, entryName, DefaultMetaTypeFactory.MAP_ITEM_NAMES, DefaultMetaTypeFactory.MAP_ITEM_NAMES, itemTypes);
TableMetaType expected = new ImmutableTableMetaType(Map.class.getName(), Map.class.getName(), entryType, DefaultMetaTypeFactory.MAP_INDEX_NAMES);
Modified: projects/microcontainer/trunk/metatype/src/tests/org/jboss/test/metatype/types/factory/test/SimpleMetaTypeFactoryUnitTestCase.java
===================================================================
--- projects/microcontainer/trunk/metatype/src/tests/org/jboss/test/metatype/types/factory/test/SimpleMetaTypeFactoryUnitTestCase.java 2008-02-18 19:57:14 UTC (rev 69905)
+++ projects/microcontainer/trunk/metatype/src/tests/org/jboss/test/metatype/types/factory/test/SimpleMetaTypeFactoryUnitTestCase.java 2008-02-18 20:12:07 UTC (rev 69906)
@@ -58,7 +58,7 @@
super(name);
}
- SimpleMetaType[] expected = new SimpleMetaType[]
+ SimpleMetaType<?>[] expected = new SimpleMetaType[]
{
SimpleMetaType.BIGDECIMAL,
SimpleMetaType.BIGINTEGER,
@@ -83,7 +83,7 @@
SimpleMetaType.VOID
};
- Class[] classes = new Class[]
+ Class<?>[] classes = new Class<?>[]
{
BigDecimal.class,
BigInteger.class,
@@ -118,7 +118,7 @@
for (int i = 0; i < expected.length; ++i)
{
String className = classes[i].getName();
- MetaType actual = resolve(classes[i]);
+ MetaType<?> actual = resolve(classes[i]);
getLog().debug("SimpleMetaType: " + className + " className=" + actual.getClassName() + " typeName=" + actual.getTypeName() + " description=" + actual.getDescription());
assertEquals(expected[i], actual);
}
Modified: projects/microcontainer/trunk/metatype/src/tests/org/jboss/test/metatype/types/factory/test/SpecialMetaTypeFactoryUnitTestCase.java
===================================================================
--- projects/microcontainer/trunk/metatype/src/tests/org/jboss/test/metatype/types/factory/test/SpecialMetaTypeFactoryUnitTestCase.java 2008-02-18 19:57:14 UTC (rev 69905)
+++ projects/microcontainer/trunk/metatype/src/tests/org/jboss/test/metatype/types/factory/test/SpecialMetaTypeFactoryUnitTestCase.java 2008-02-18 20:12:07 UTC (rev 69906)
@@ -68,7 +68,7 @@
*/
public void testClass() throws Exception
{
- MetaType actual = resolve(Class.class);
+ MetaType<?> actual = resolve(Class.class);
getLog().debug("Class MetaType: " + " className=" + actual.getClassName() + " typeName=" + actual.getTypeName() + " description=" + actual.getDescription());
assertEquals(ClassMetaTypeBuilder.CLASS_META_TYPE, actual);
}
@@ -80,7 +80,7 @@
*/
public void testGeneric() throws Exception
{
- MetaType actual = resolve(TestGeneric.class);
+ MetaType<?> actual = resolve(TestGeneric.class);
getLog().debug("Generic MetaType: " + " className=" + actual.getClassName() + " typeName=" + actual.getTypeName() + " description=" + actual.getDescription());
GenericMetaType expected = new GenericMetaType(TestGeneric.class.getName(), TestGeneric.class.getName());
assertEquals(expected, actual);
@@ -93,7 +93,7 @@
*/
public void testGenericComposite() throws Exception
{
- MetaType actual = resolve(TestGenericComposite.class);
+ MetaType<?> actual = resolve(TestGenericComposite.class);
printComposite("GenericComposite MetaType: ", assertInstanceOf(actual, CompositeMetaType.class));
MutableCompositeMetaType expected = new MutableCompositeMetaType(TestGenericComposite.class.getName(), TestGenericComposite.class.getName());
GenericMetaType generic = new GenericMetaType(TestGeneric.class.getName(), TestGeneric.class.getName());
@@ -113,8 +113,8 @@
setBuilder(TestOverrideComposite.class, builder);
try
{
- MetaType expected = builder.buildMetaType();
- MetaType actual = resolve(TestOverrideComposite.class);
+ MetaType<?> expected = builder.buildMetaType();
+ MetaType<?> actual = resolve(TestOverrideComposite.class);
getLog().debug("Builder: " + actual);
assertEquals(expected, actual);
}
Modified: projects/microcontainer/trunk/metatype/src/tests/org/jboss/test/metatype/types/support/MockMetaValue.java
===================================================================
--- projects/microcontainer/trunk/metatype/src/tests/org/jboss/test/metatype/types/support/MockMetaValue.java 2008-02-18 19:57:14 UTC (rev 69905)
+++ projects/microcontainer/trunk/metatype/src/tests/org/jboss/test/metatype/types/support/MockMetaValue.java 2008-02-18 20:12:07 UTC (rev 69906)
@@ -35,19 +35,19 @@
/** The serialVersionUID */
private static final long serialVersionUID = 1L;
- private MetaType metaType;
+ private MetaType<?> metaType;
/**
* Create a new MockMetaValue.
*
* @param metaType the meta type
*/
- public MockMetaValue(MetaType metaType)
+ public MockMetaValue(MetaType<?> metaType)
{
this.metaType = metaType;
}
- public MetaType getMetaType()
+ public MetaType<?> getMetaType()
{
return metaType;
}
Modified: projects/microcontainer/trunk/metatype/src/tests/org/jboss/test/metatype/types/support/MockSimpleValue.java
===================================================================
--- projects/microcontainer/trunk/metatype/src/tests/org/jboss/test/metatype/types/support/MockSimpleValue.java 2008-02-18 19:57:14 UTC (rev 69905)
+++ projects/microcontainer/trunk/metatype/src/tests/org/jboss/test/metatype/types/support/MockSimpleValue.java 2008-02-18 20:12:07 UTC (rev 69906)
@@ -48,9 +48,10 @@
super(metaType);
}
+ @SuppressWarnings("unchecked")
public SimpleMetaType<T> getMetaType()
{
- return (SimpleMetaType<T>) super.getMetaType();
+ return (SimpleMetaType) super.getMetaType();
}
public T getValue()
Modified: projects/microcontainer/trunk/metatype/src/tests/org/jboss/test/metatype/types/test/ArrayMetaTypeUnitTestCase.java
===================================================================
--- projects/microcontainer/trunk/metatype/src/tests/org/jboss/test/metatype/types/test/ArrayMetaTypeUnitTestCase.java 2008-02-18 19:57:14 UTC (rev 69905)
+++ projects/microcontainer/trunk/metatype/src/tests/org/jboss/test/metatype/types/test/ArrayMetaTypeUnitTestCase.java 2008-02-18 20:12:07 UTC (rev 69906)
@@ -69,6 +69,7 @@
*
* @throws Exception for any problem
*/
+ @SuppressWarnings("unchecked")
public void testArrayTypeMetaType() throws Exception
{
ArrayMetaType arrayType = new ArrayMetaType(3, SimpleMetaType.STRING);
@@ -78,6 +79,7 @@
assertTrue("Type should be an array", arrayType.isArray());
}
+ @SuppressWarnings("unchecked")
public void testCharArrayType()
{
ArrayMetaType arrayType = ArrayMetaType.getPrimitiveArrayType(char[].class);
@@ -93,6 +95,7 @@
*
* @throws Exception for any problem
*/
+ @SuppressWarnings("unchecked")
public void testGetDimension() throws Exception
{
ArrayMetaType arrayType = new ArrayMetaType(3, SimpleMetaType.STRING);
@@ -104,6 +107,7 @@
*
* @throws Exception for any problem
*/
+ @SuppressWarnings("unchecked")
public void testElementType() throws Exception
{
ArrayMetaType arrayType = new ArrayMetaType(3, SimpleMetaType.STRING);
@@ -118,20 +122,20 @@
public void testIsValueSimpleValue() throws Exception
{
SimpleMetaType<String> simpleType = SimpleMetaType.STRING;
- MockSimpleValue sv = new MockSimpleValue<String>(simpleType);
- MockSimpleValue[][] compData1 = new MockSimpleValue[][]
+ MockSimpleValue<?> sv = new MockSimpleValue<String>(simpleType);
+ MockSimpleValue<?>[][] compData1 = new MockSimpleValue[][]
{
{ sv, null }, { sv, sv }
};
- ArrayMetaType compArrayType1 = new ArrayMetaType(2, SimpleMetaType.STRING);
+ ArrayMetaType<String> compArrayType1 = new ArrayMetaType<String>(2, SimpleMetaType.STRING);
assertTrue("compData1 should be a value of array type", compArrayType1.isValue(compData1));
- ArrayMetaType compArrayType2 = new ArrayMetaType(1, SimpleMetaType.STRING);
+ ArrayMetaType<String> compArrayType2 = new ArrayMetaType<String>(1, SimpleMetaType.STRING);
assertFalse("compData1 should not be a value of array type, wrong dimension", compArrayType2.isValue(compData1));
SimpleMetaType<Integer> simpleType2 = SimpleMetaType.INTEGER;
- ArrayMetaType compArrayType3 = new ArrayMetaType(2, simpleType2);
+ ArrayMetaType<Integer> compArrayType3 = new ArrayMetaType<Integer>(2, simpleType2);
assertFalse("compData1 should not be a value of array type, wrong element type", compArrayType3.isValue(compData1));
}
@@ -140,11 +144,12 @@
*
* @throws Exception for any problem
*/
+ @SuppressWarnings("unchecked")
public void testIsValueComposite() throws Exception
{
String[] itemNames = new String[] { "name1", "name2" };
String[] itemDescriptions = new String[] { "desc1", "desc2" };
- MetaType[] itemTypes = new MetaType[] { SimpleMetaType.STRING, SimpleMetaType.INTEGER };
+ MetaType<?>[] itemTypes = new MetaType<?>[] { SimpleMetaType.STRING, SimpleMetaType.INTEGER };
CompositeMetaType compositeType = new ImmutableCompositeMetaType("typeName", "description", itemNames, itemDescriptions, itemTypes);
MockCompositeValue cv = new MockCompositeValue(compositeType);
MockCompositeValue[][] compData1 = new MockCompositeValue[][]
@@ -168,6 +173,7 @@
*
* @throws Exception for any problem
*/
+ @SuppressWarnings("unchecked")
public void testIsValueTable() throws Exception
{
String[] itemNames = new String[] { "name1", "name2" };
@@ -197,6 +203,7 @@
*
* @throws Exception for any problem
*/
+ @SuppressWarnings("unchecked")
public void testEquals() throws Exception
{
ArrayMetaType arrayType = new ArrayMetaType(3, SimpleMetaType.STRING);
@@ -224,6 +231,7 @@
*
* @throws Exception for any problem
*/
+ @SuppressWarnings("unchecked")
public void testHashCode() throws Exception
{
ArrayMetaType arrayType = new ArrayMetaType(3, SimpleMetaType.STRING);
@@ -237,6 +245,7 @@
*
* @throws Exception for any problem
*/
+ @SuppressWarnings("unchecked")
public void testToString() throws Exception
{
ArrayMetaType arrayType = new ArrayMetaType(3, SimpleMetaType.STRING);
@@ -253,6 +262,7 @@
*
* @throws Exception for any problem
*/
+ @SuppressWarnings("unchecked")
public void testSerialization() throws Exception
{
ArrayMetaType arrayType = new ArrayMetaType(3, SimpleMetaType.STRING);
@@ -268,6 +278,7 @@
*
* @throws Exception for any problem
*/
+ @SuppressWarnings("unchecked")
public void testErrors() throws Exception
{
try
Modified: projects/microcontainer/trunk/metatype/src/tests/org/jboss/test/metatype/types/test/ImmutableCompositeMetaTypeUnitTestCase.java
===================================================================
--- projects/microcontainer/trunk/metatype/src/tests/org/jboss/test/metatype/types/test/ImmutableCompositeMetaTypeUnitTestCase.java 2008-02-18 19:57:14 UTC (rev 69905)
+++ projects/microcontainer/trunk/metatype/src/tests/org/jboss/test/metatype/types/test/ImmutableCompositeMetaTypeUnitTestCase.java 2008-02-18 20:12:07 UTC (rev 69906)
@@ -231,7 +231,7 @@
{
String[] itemNames = new String[] { "name1", "name2" };
String[] itemDescriptions = new String[] { "desc1", "desc2" };
- MetaType[] itemTypes = new MetaType[] { SimpleMetaType.STRING, SimpleMetaType.INTEGER };
+ MetaType<?>[] itemTypes = new MetaType[] { SimpleMetaType.STRING, SimpleMetaType.INTEGER };
try
{
@@ -325,7 +325,7 @@
checkThrowable(IllegalArgumentException.class, t);
}
- MetaType[] nullItemTypes = new MetaType[] { SimpleMetaType.STRING, null };
+ MetaType<?>[] nullItemTypes = new MetaType[] { SimpleMetaType.STRING, null };
try
{
new ImmutableCompositeMetaType("typeName", "description", itemNames, itemDescriptions, nullItemTypes);
@@ -358,7 +358,7 @@
checkThrowable(IllegalArgumentException.class, t);
}
- MetaType[] wrongItemTypes = new MetaType[] { SimpleMetaType.STRING };
+ MetaType<?>[] wrongItemTypes = new MetaType[] { SimpleMetaType.STRING };
try
{
new ImmutableCompositeMetaType("typeName", "description", itemNames, itemDescriptions, wrongItemTypes);
@@ -401,7 +401,7 @@
{
String[] itemNames = new String[] { "name1", "name2" };
String[] itemDescriptions = new String[] { "desc1", "desc2" };
- MetaType[] itemTypes = new MetaType[] { SimpleMetaType.STRING, SimpleMetaType.INTEGER };
+ MetaType<?>[] itemTypes = new MetaType[] { SimpleMetaType.STRING, SimpleMetaType.INTEGER };
CompositeMetaType compositeType = new ImmutableCompositeMetaType("typeName", "description", itemNames, itemDescriptions, itemTypes);
return compositeType;
}
@@ -415,7 +415,7 @@
{
String[] itemNames = new String[] { "name1", "name2" };
String[] itemDescriptions = new String[] { "desc1", "desc2" };
- MetaType[] itemTypes = new MetaType[] { SimpleMetaType.STRING, SimpleMetaType.LONG };
+ MetaType<?>[] itemTypes = new MetaType[] { SimpleMetaType.STRING, SimpleMetaType.LONG };
CompositeMetaType compositeType = new ImmutableCompositeMetaType("typeName", "description", itemNames, itemDescriptions, itemTypes);
return compositeType;
}
@@ -429,7 +429,7 @@
{
String[] itemNames = new String[] { "name1", "name2" };
String[] itemDescriptions = new String[] { "desc1", "desc2" };
- MetaType[] itemTypes = new MetaType[] { SimpleMetaType.STRING, SimpleMetaType.INTEGER };
+ MetaType<?>[] itemTypes = new MetaType[] { SimpleMetaType.STRING, SimpleMetaType.INTEGER };
CompositeMetaType compositeType = new ImmutableCompositeMetaType("typeName2", "description", itemNames, itemDescriptions, itemTypes);
return compositeType;
}
@@ -443,7 +443,7 @@
{
String[] itemNames = new String[] { "nameX", "name2" };
String[] itemDescriptions = new String[] { "desc1", "desc2" };
- MetaType[] itemTypes = new MetaType[] { SimpleMetaType.STRING, SimpleMetaType.INTEGER };
+ MetaType<?>[] itemTypes = new MetaType[] { SimpleMetaType.STRING, SimpleMetaType.INTEGER };
CompositeMetaType compositeType = new ImmutableCompositeMetaType("typeName", "description", itemNames, itemDescriptions, itemTypes);
return compositeType;
}
Modified: projects/microcontainer/trunk/metatype/src/tests/org/jboss/test/metatype/types/test/ImmutableTableMetaTypeUnitTestCase.java
===================================================================
--- projects/microcontainer/trunk/metatype/src/tests/org/jboss/test/metatype/types/test/ImmutableTableMetaTypeUnitTestCase.java 2008-02-18 19:57:14 UTC (rev 69905)
+++ projects/microcontainer/trunk/metatype/src/tests/org/jboss/test/metatype/types/test/ImmutableTableMetaTypeUnitTestCase.java 2008-02-18 20:12:07 UTC (rev 69906)
@@ -314,7 +314,7 @@
{
String[] itemNames = new String[] { "name1", "name2" };
String[] itemDescriptions = new String[] { "desc1", "desc2" };
- MetaType[] itemTypes = new MetaType[] { SimpleMetaType.STRING, SimpleMetaType.INTEGER };
+ MetaType<?>[] itemTypes = new MetaType[] { SimpleMetaType.STRING, SimpleMetaType.INTEGER };
CompositeMetaType rowType = new ImmutableCompositeMetaType("rowTypeName", "rowDescription", itemNames, itemDescriptions, itemTypes);
return rowType;
}
@@ -359,7 +359,7 @@
{
String[] itemNames = new String[] { "name1", "name2" };
String[] itemDescriptions = new String[] { "desc1", "desc2" };
- MetaType[] itemTypes = new MetaType[] { SimpleMetaType.STRING, SimpleMetaType.INTEGER };
+ MetaType<?>[] itemTypes = new MetaType[] { SimpleMetaType.STRING, SimpleMetaType.INTEGER };
CompositeMetaType rowType = new ImmutableCompositeMetaType("rowTypeName2", "rowDescription", itemNames, itemDescriptions, itemTypes);
return rowType;
}
Modified: projects/microcontainer/trunk/metatype/src/tests/org/jboss/test/metatype/types/test/MetaTypeUnitTestCase.java
===================================================================
--- projects/microcontainer/trunk/metatype/src/tests/org/jboss/test/metatype/types/test/MetaTypeUnitTestCase.java 2008-02-18 19:57:14 UTC (rev 69905)
+++ projects/microcontainer/trunk/metatype/src/tests/org/jboss/test/metatype/types/test/MetaTypeUnitTestCase.java 2008-02-18 20:12:07 UTC (rev 69906)
@@ -103,9 +103,10 @@
*
* @throws Exception for any problem
*/
+ @SuppressWarnings("unchecked")
public void testConstructorSimple() throws Exception
{
- MetaType test = new MockMetaType("java.lang.Void", "type", "description");
+ MetaType<?> test = new MockMetaType("java.lang.Void", "type", "description");
assertEquals("java.lang.Void", test.getClassName());
assertEquals("type", test.getTypeName());
assertEquals("description", test.getDescription());
@@ -117,6 +118,7 @@
*
* @throws Exception for any problem
*/
+ @SuppressWarnings("unchecked")
public void testConstructorArray() throws Exception
{
MetaType test = new MockMetaType("[[Ljava.lang.Void;", "type", "description");
@@ -151,6 +153,7 @@
*
* @throws Exception for any problem
*/
+ @SuppressWarnings("unchecked")
public void testErrors() throws Exception
{
try
@@ -254,6 +257,7 @@
}
}
+ @SuppressWarnings("unchecked")
private void testSerialization(String className, String type, String description) throws Exception
{
MetaType original = new MockMetaType(className, type, description);
@@ -265,6 +269,7 @@
assertEquals(original.isArray(), result.isArray());
}
+ @SuppressWarnings("unchecked")
private void checkMetaType(List names, Class clazz) throws Exception
{
String name = clazz.getName();
Modified: projects/microcontainer/trunk/metatype/src/tests/org/jboss/test/metatype/types/test/SimpleMetaTypeUnitTestCase.java
===================================================================
--- projects/microcontainer/trunk/metatype/src/tests/org/jboss/test/metatype/types/test/SimpleMetaTypeUnitTestCase.java 2008-02-18 19:57:14 UTC (rev 69905)
+++ projects/microcontainer/trunk/metatype/src/tests/org/jboss/test/metatype/types/test/SimpleMetaTypeUnitTestCase.java 2008-02-18 20:12:07 UTC (rev 69906)
@@ -62,7 +62,7 @@
super(name);
}
- SimpleMetaType[] types = new SimpleMetaType[]
+ SimpleMetaType<?>[] types = new SimpleMetaType<?>[]
{
SimpleMetaType.BIGDECIMAL,
SimpleMetaType.BIGINTEGER,
@@ -80,7 +80,7 @@
SimpleMetaType.NAMEDOBJECT
};
- Class[] classes = new Class[]
+ Class<?>[] classes = new Class[]
{
BigDecimal.class,
BigInteger.class,
@@ -261,7 +261,7 @@
{
getLog().debug("serialization: " + types[i].getClassName() + " original=" + types[i]);
byte[] bytes = serialize(types[i]);
- SimpleMetaType result = (SimpleMetaType) deserialize(bytes);
+ SimpleMetaType<?> result = (SimpleMetaType<?>) deserialize(bytes);
getLog().debug("serialization: " + types[i].getClassName() + " result =" + types[i]);
assertTrue("Should resolve to same object after serialization " + types[i], types[i] == result);
Modified: projects/microcontainer/trunk/metatype/src/tests/org/jboss/test/metatype/values/factory/support/TestOverrideCompositeBuilder.java
===================================================================
--- projects/microcontainer/trunk/metatype/src/tests/org/jboss/test/metatype/values/factory/support/TestOverrideCompositeBuilder.java 2008-02-18 19:57:14 UTC (rev 69905)
+++ projects/microcontainer/trunk/metatype/src/tests/org/jboss/test/metatype/values/factory/support/TestOverrideCompositeBuilder.java 2008-02-18 20:12:07 UTC (rev 69906)
@@ -39,7 +39,7 @@
*/
public class TestOverrideCompositeBuilder implements MetaTypeBuilder, MetaValueBuilder<TestOverrideComposite>
{
- public MetaType buildMetaType()
+ public MetaType<?> buildMetaType()
{
MutableCompositeMetaType result = new MutableCompositeMetaType(TestOverrideComposite.class.getName(), TestOverrideComposite.class.getName());
result.addItem("somethingElse", "somethingElse", SimpleMetaType.STRING);
@@ -47,7 +47,7 @@
return result;
}
- public MetaValue buildMetaValue(MetaType metaType, TestOverrideComposite object)
+ public MetaValue buildMetaValue(MetaType<?> metaType, TestOverrideComposite object)
{
CompositeMetaType compositeType = (CompositeMetaType) metaType;
CompositeValueSupport result = new CompositeValueSupport(compositeType);
Modified: projects/microcontainer/trunk/metatype/src/tests/org/jboss/test/metatype/values/factory/test/AbstractMetaValueFactoryTest.java
===================================================================
--- projects/microcontainer/trunk/metatype/src/tests/org/jboss/test/metatype/values/factory/test/AbstractMetaValueFactoryTest.java 2008-02-18 19:57:14 UTC (rev 69905)
+++ projects/microcontainer/trunk/metatype/src/tests/org/jboss/test/metatype/values/factory/test/AbstractMetaValueFactoryTest.java 2008-02-18 20:12:07 UTC (rev 69906)
@@ -61,7 +61,7 @@
* @param clazz the clazz
* @param builder the builder
*/
- protected void setBuilder(Class clazz, MetaValueBuilder builder)
+ protected void setBuilder(Class<?> clazz, MetaValueBuilder<?> builder)
{
metaTypeFactory.setBuilder(clazz, (MetaTypeBuilder) builder);
metaValueFactory.setBuilder(clazz, builder);
@@ -73,7 +73,7 @@
* @param type the type
* @return the meta type
*/
- protected MetaType resolve(Type type)
+ protected MetaType<?> resolve(Type type)
{
return metaTypeFactory.resolve(type);
}
Modified: projects/microcontainer/trunk/metatype/src/tests/org/jboss/test/metatype/values/factory/test/ArrayValueFactoryUnitTestCase.java
===================================================================
--- projects/microcontainer/trunk/metatype/src/tests/org/jboss/test/metatype/values/factory/test/ArrayValueFactoryUnitTestCase.java 2008-02-18 19:57:14 UTC (rev 69905)
+++ projects/microcontainer/trunk/metatype/src/tests/org/jboss/test/metatype/values/factory/test/ArrayValueFactoryUnitTestCase.java 2008-02-18 20:12:07 UTC (rev 69906)
@@ -66,19 +66,21 @@
*
* @throws Exception for any problem
*/
+ @SuppressWarnings("unchecked")
public void testSimpleArray() throws Exception
{
String[] array = { "Hello", "Goodbye" };
- ArrayMetaType arrayType = assertInstanceOf(resolve(array.getClass()), ArrayMetaType.class);
+ ArrayMetaType<String> arrayType = assertInstanceOf(resolve(array.getClass()), ArrayMetaType.class);
MetaValue[] metaArray = { SimpleValueSupport.wrap("Hello"), SimpleValueSupport.wrap("Goodbye") };
- ArrayValueSupport expected = new ArrayValueSupport(arrayType, metaArray);
+ ArrayValueSupport<String> expected = new ArrayValueSupport<String>(arrayType, metaArray);
MetaValue result = createMetaValue(array);
- ArrayValue actual = assertInstanceOf(result, ArrayValue.class);
+ ArrayValue<String> actual = assertInstanceOf(result, ArrayValue.class);
getLog().debug("Array Value: " + actual);
assertEquals(expected, actual);
}
+ @SuppressWarnings("unchecked")
public void testCharArray()
throws Exception
{
@@ -97,6 +99,8 @@
getLog().debug("Array Value: " + actual);
assertEquals(expected, actual);
}
+
+ @SuppressWarnings("unchecked")
public void test2DCharArray()
{
char[][] array = {"Hello".toCharArray(), "World".toCharArray()};
@@ -126,6 +130,7 @@
*
* @throws Exception for any problem
*/
+ @SuppressWarnings("unchecked")
public void testCompositeArray() throws Exception
{
TestSimpleComposite hello = new TestSimpleComposite("Hello");
@@ -152,6 +157,7 @@
*
* @throws Exception for any problem
*/
+ @SuppressWarnings("unchecked")
public void testMultipleArray() throws Exception
{
String[][] array = { { "Hello" }, { "Goodbye" } };
Modified: projects/microcontainer/trunk/metatype/src/tests/org/jboss/test/metatype/values/factory/test/CollectionValueFactoryUnitTestCase.java
===================================================================
--- projects/microcontainer/trunk/metatype/src/tests/org/jboss/test/metatype/values/factory/test/CollectionValueFactoryUnitTestCase.java 2008-02-18 19:57:14 UTC (rev 69905)
+++ projects/microcontainer/trunk/metatype/src/tests/org/jboss/test/metatype/values/factory/test/CollectionValueFactoryUnitTestCase.java 2008-02-18 20:12:07 UTC (rev 69906)
@@ -218,7 +218,7 @@
Method method = getClass().getMethod(methodName);
Type type = method.getGenericReturnType();
- CollectionMetaType arrayType = assertInstanceOf(resolve(type), CollectionMetaType.class);
+ CollectionMetaType<?> arrayType = assertInstanceOf(resolve(type), CollectionMetaType.class);
MetaValue[] metaArray = { SimpleValueSupport.wrap("Hello"), SimpleValueSupport.wrap("Goodbye") };
CollectionValueSupport expected = new CollectionValueSupport(arrayType, metaArray);
@@ -240,7 +240,7 @@
Method method = getClass().getMethod(methodName);
Type type = method.getGenericReturnType();
- CollectionMetaType arrayType = assertInstanceOf(resolve(type), CollectionMetaType.class);
+ CollectionMetaType<?> arrayType = assertInstanceOf(resolve(type), CollectionMetaType.class);
CompositeMetaType compositeType = assertInstanceOf(resolve(TestSimpleComposite.class), CompositeMetaType.class);
String[] itemNames = { "something" };
MetaValue[] itemValues = { SimpleValueSupport.wrap("Hello") };
Modified: projects/microcontainer/trunk/metatype/src/tests/org/jboss/test/metatype/values/factory/test/MapValueFactoryUnitTestCase.java
===================================================================
--- projects/microcontainer/trunk/metatype/src/tests/org/jboss/test/metatype/values/factory/test/MapValueFactoryUnitTestCase.java 2008-02-18 19:57:14 UTC (rev 69905)
+++ projects/microcontainer/trunk/metatype/src/tests/org/jboss/test/metatype/values/factory/test/MapValueFactoryUnitTestCase.java 2008-02-18 20:12:07 UTC (rev 69906)
@@ -122,9 +122,9 @@
Type collectionType = method.getGenericReturnType();
Map<String, Integer> map = simpleMap();
- MetaType keyType = resolve(String.class);
- MetaType valueType = resolve(Integer.class);
- MetaType[] itemTypes = { keyType, valueType };
+ MetaType<?> keyType = resolve(String.class);
+ MetaType<?> valueType = resolve(Integer.class);
+ MetaType<?>[] itemTypes = { keyType, valueType };
String entryName = Map.Entry.class.getName();
CompositeMetaType entryType = new ImmutableCompositeMetaType(entryName, entryName, DefaultMetaTypeFactory.MAP_ITEM_NAMES, DefaultMetaTypeFactory.MAP_ITEM_NAMES, itemTypes);
TableMetaType tableType = new ImmutableTableMetaType(Map.class.getName(), Map.class.getName(), entryType, DefaultMetaTypeFactory.MAP_INDEX_NAMES);
@@ -156,9 +156,9 @@
Type collectionType = method.getGenericReturnType();
Map<TestSimpleComposite, Integer> map = compositeKeyMap();
- MetaType keyType = resolve(TestSimpleComposite.class);
- MetaType valueType = resolve(Integer.class);
- MetaType[] itemTypes = { keyType, valueType };
+ MetaType<?> keyType = resolve(TestSimpleComposite.class);
+ MetaType<?> valueType = resolve(Integer.class);
+ MetaType<?>[] itemTypes = { keyType, valueType };
String entryName = Map.Entry.class.getName();
CompositeMetaType entryType = new ImmutableCompositeMetaType(entryName, entryName, DefaultMetaTypeFactory.MAP_ITEM_NAMES, DefaultMetaTypeFactory.MAP_ITEM_NAMES, itemTypes);
TableMetaType tableType = new ImmutableTableMetaType(Map.class.getName(), Map.class.getName(), entryType, DefaultMetaTypeFactory.MAP_INDEX_NAMES);
@@ -198,9 +198,9 @@
Type collectionType = method.getGenericReturnType();
Map<String, TestSimpleComposite> map = compositeValueMap();
- MetaType keyType = resolve(String.class);
- MetaType valueType = resolve(TestSimpleComposite.class);
- MetaType[] itemTypes = { keyType, valueType };
+ MetaType<?> keyType = resolve(String.class);
+ MetaType<?> valueType = resolve(TestSimpleComposite.class);
+ MetaType<?>[] itemTypes = { keyType, valueType };
String entryName = Map.Entry.class.getName();
CompositeMetaType entryType = new ImmutableCompositeMetaType(entryName, entryName, DefaultMetaTypeFactory.MAP_ITEM_NAMES, DefaultMetaTypeFactory.MAP_ITEM_NAMES, itemTypes);
TableMetaType tableType = new ImmutableTableMetaType(Map.class.getName(), Map.class.getName(), entryType, DefaultMetaTypeFactory.MAP_INDEX_NAMES);
Modified: projects/microcontainer/trunk/metatype/src/tests/org/jboss/test/metatype/values/factory/test/SimpleValueFactoryUnitTestCase.java
===================================================================
--- projects/microcontainer/trunk/metatype/src/tests/org/jboss/test/metatype/values/factory/test/SimpleValueFactoryUnitTestCase.java 2008-02-18 19:57:14 UTC (rev 69905)
+++ projects/microcontainer/trunk/metatype/src/tests/org/jboss/test/metatype/values/factory/test/SimpleValueFactoryUnitTestCase.java 2008-02-18 20:12:07 UTC (rev 69906)
@@ -117,8 +117,8 @@
{
Object value = values[i];
MetaValue result = createMetaValue(value);
- SimpleValue actual = assertInstanceOf(result, SimpleValue.class);
- SimpleValue expected = metaValues[i];
+ SimpleValue<?> actual = assertInstanceOf(result, SimpleValue.class);
+ SimpleValue<?> expected = metaValues[i];
getLog().debug("Simple Value: expected=" + expected + " actual=" + actual);
assertEquals(expected, actual);
}
Modified: projects/microcontainer/trunk/metatype/src/tests/org/jboss/test/metatype/values/factory/test/SpecialValueFactoryUnitTestCase.java
===================================================================
--- projects/microcontainer/trunk/metatype/src/tests/org/jboss/test/metatype/values/factory/test/SpecialValueFactoryUnitTestCase.java 2008-02-18 19:57:14 UTC (rev 69905)
+++ projects/microcontainer/trunk/metatype/src/tests/org/jboss/test/metatype/values/factory/test/SpecialValueFactoryUnitTestCase.java 2008-02-18 20:12:07 UTC (rev 69906)
@@ -154,7 +154,7 @@
{
TestOverrideComposite value = new TestOverrideComposite("Hello");
- MetaType metaType = builder.buildMetaType();
+ MetaType<?> metaType = builder.buildMetaType();
MetaValue expected = builder.buildMetaValue(metaType, value);
MetaValue actual = createMetaValue(value);
Modified: projects/microcontainer/trunk/metatype/src/tests/org/jboss/test/metatype/values/factory/test/UnwrapValueUnitTestCase.java
===================================================================
--- projects/microcontainer/trunk/metatype/src/tests/org/jboss/test/metatype/values/factory/test/UnwrapValueUnitTestCase.java 2008-02-18 19:57:14 UTC (rev 69905)
+++ projects/microcontainer/trunk/metatype/src/tests/org/jboss/test/metatype/values/factory/test/UnwrapValueUnitTestCase.java 2008-02-18 20:12:07 UTC (rev 69906)
@@ -316,6 +316,7 @@
boolean assertArray(final Object original, final Object unwrapped);
}
+ @SuppressWarnings("unchecked")
protected Type getType(String type, Class<? extends Collection> clazz) throws Exception
{
Method method = getClass().getDeclaredMethod("get" + type + "s" + clazz.getSimpleName());
Modified: projects/microcontainer/trunk/metatype/src/tests/org/jboss/test/metatype/values/test/ArrayValueSupportUnitTestCase.java
===================================================================
--- projects/microcontainer/trunk/metatype/src/tests/org/jboss/test/metatype/values/test/ArrayValueSupportUnitTestCase.java 2008-02-18 19:57:14 UTC (rev 69905)
+++ projects/microcontainer/trunk/metatype/src/tests/org/jboss/test/metatype/values/test/ArrayValueSupportUnitTestCase.java 2008-02-18 20:12:07 UTC (rev 69906)
@@ -58,6 +58,7 @@
super(name);
}
+ @SuppressWarnings("unchecked")
static <T> T[] convert(Object array, T[] t)
{
int length = Array.getLength(array);
@@ -94,6 +95,8 @@
assertEquals(value[n], raw[n]);
}
}
+
+ @SuppressWarnings("unchecked")
public void testCharacterArray() throws Exception
{
ArrayMetaType type = new ArrayMetaType(1, SimpleMetaType.CHARACTER);
Modified: projects/microcontainer/trunk/metatype/src/tests/org/jboss/test/metatype/values/test/SimpleValueSupportUnitTestCase.java
===================================================================
--- projects/microcontainer/trunk/metatype/src/tests/org/jboss/test/metatype/values/test/SimpleValueSupportUnitTestCase.java 2008-02-18 19:57:14 UTC (rev 69905)
+++ projects/microcontainer/trunk/metatype/src/tests/org/jboss/test/metatype/values/test/SimpleValueSupportUnitTestCase.java 2008-02-18 20:12:07 UTC (rev 69906)
@@ -115,7 +115,7 @@
assertNotSame("data should not equal empty value", v, initStringEmpty());
assertNotSame("data should not equal non SimpleValue", v, new Object());
- SimpleValue v2 = initStringValue1();
+ SimpleValue<?> v2 = initStringValue1();
assertEquals("data should equal with data2 with different instance of the same simple type", v, v2);
assertEquals("data should equal with data2 with different instance of the same simple type", v2, v);
More information about the jboss-cvs-commits
mailing list