[jboss-cvs] JBossAS SVN: r70207 - in projects/microcontainer/trunk: classloading/src/tests/org/jboss/test/classloading/metadata/test and 21 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Feb 28 05:57:52 EST 2008
Author: adrian at jboss.org
Date: 2008-02-28 05:57:52 -0500 (Thu, 28 Feb 2008)
New Revision: 70207
Modified:
projects/microcontainer/trunk/classloading-vfs/src/tests/org/jboss/test/classloading/vfs/metadata/test/ManagedObjectVFSClassLoaderFactoryUnitTestCase.java
projects/microcontainer/trunk/classloading/src/main/org/jboss/classloading/plugins/metadata/VersionMetaMapper.java
projects/microcontainer/trunk/classloading/src/tests/org/jboss/test/classloading/metadata/test/ManagedObjectClassLoadingMetaDataUnitTestCase.java
projects/microcontainer/trunk/deployers-impl/src/tests/org/jboss/test/deployers/managed/support/MockProfileService.java
projects/microcontainer/trunk/deployers-vfs/src/tests/org/jboss/test/deployers/vfs/classloader/test/ManagedObjectClassLoadingParserUnitTestCase.java
projects/microcontainer/trunk/managed/src/main/org/jboss/managed/api/ManagedOperation.java
projects/microcontainer/trunk/managed/src/main/org/jboss/managed/api/ManagedParameter.java
projects/microcontainer/trunk/managed/src/main/org/jboss/managed/api/ManagedProperty.java
projects/microcontainer/trunk/managed/src/main/org/jboss/managed/plugins/DefaultFieldsImpl.java
projects/microcontainer/trunk/managed/src/main/org/jboss/managed/plugins/ManagedOperationImpl.java
projects/microcontainer/trunk/managed/src/main/org/jboss/managed/plugins/ManagedParameterImpl.java
projects/microcontainer/trunk/managed/src/main/org/jboss/managed/plugins/ManagedPropertyImpl.java
projects/microcontainer/trunk/managed/src/main/org/jboss/managed/plugins/factory/AbstractManagedObjectFactory.java
projects/microcontainer/trunk/managed/src/tests/org/jboss/test/managed/factory/AbstractManagedObjectFactoryTest.java
projects/microcontainer/trunk/metatype/src/main/org/jboss/metatype/api/types/AbstractMetaType.java
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/GenericMetaType.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/MetaType.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/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/SimpleValue.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/DefaultMetaValueFactory.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/MetaMapper.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/MockMetaType.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/TestMetaMapper.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/MetaMapperUnitTestCase.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/test/ArrayValueSupportUnitTestCase.java
projects/microcontainer/trunk/metatype/src/tests/org/jboss/test/metatype/values/test/CompositeValueSupportUnitTestCase.java
projects/microcontainer/trunk/metatype/src/tests/org/jboss/test/metatype/values/test/SimpleValueSupportUnitTestCase.java
Log:
Remove generics from MetaTypes
Modified: projects/microcontainer/trunk/classloading/src/main/org/jboss/classloading/plugins/metadata/VersionMetaMapper.java
===================================================================
--- projects/microcontainer/trunk/classloading/src/main/org/jboss/classloading/plugins/metadata/VersionMetaMapper.java 2008-02-28 10:21:25 UTC (rev 70206)
+++ projects/microcontainer/trunk/classloading/src/main/org/jboss/classloading/plugins/metadata/VersionMetaMapper.java 2008-02-28 10:57:52 UTC (rev 70207)
@@ -44,7 +44,7 @@
return String.class;
}
- public MetaValue createMetaValue(MetaType<?> metaType, Version object)
+ public MetaValue createMetaValue(MetaType metaType, Version object)
{
return SimpleValueSupport.wrap(object.toString());
}
@@ -54,7 +54,7 @@
if (SimpleMetaType.STRING.equals(metaValue.getMetaType()) == false)
throw new IllegalArgumentException("Not a string: " + metaValue);
- SimpleValue<?> simple = (SimpleValue<?>) metaValue;
+ SimpleValue simple = (SimpleValue) metaValue;
String value = (String) simple.getValue();
return Version.parseVersion(value);
}
Modified: projects/microcontainer/trunk/classloading/src/tests/org/jboss/test/classloading/metadata/test/ManagedObjectClassLoadingMetaDataUnitTestCase.java
===================================================================
--- projects/microcontainer/trunk/classloading/src/tests/org/jboss/test/classloading/metadata/test/ManagedObjectClassLoadingMetaDataUnitTestCase.java 2008-02-28 10:21:25 UTC (rev 70206)
+++ projects/microcontainer/trunk/classloading/src/tests/org/jboss/test/classloading/metadata/test/ManagedObjectClassLoadingMetaDataUnitTestCase.java 2008-02-28 10:57:52 UTC (rev 70207)
@@ -83,7 +83,7 @@
return result;
}
- protected ManagedProperty assertManagedProperty(ManagedObject mo, String name, MetaType<?> metaType, MetaValue metaValue)
+ protected ManagedProperty assertManagedProperty(ManagedObject mo, String name, MetaType metaType, MetaValue metaValue)
{
ManagedProperty property = mo.getProperty(name);
assertNotNull("No property " + name, property);
@@ -94,7 +94,7 @@
protected <T> ManagedProperty assertManagedProperty(ManagedObject mo, String name, Class<T> type, T value)
{
- MetaType<?> metaType = mtFactory.resolve(type);
+ MetaType metaType = mtFactory.resolve(type);
MetaValue metaValue = null;
if (value != null)
Modified: projects/microcontainer/trunk/classloading-vfs/src/tests/org/jboss/test/classloading/vfs/metadata/test/ManagedObjectVFSClassLoaderFactoryUnitTestCase.java
===================================================================
--- projects/microcontainer/trunk/classloading-vfs/src/tests/org/jboss/test/classloading/vfs/metadata/test/ManagedObjectVFSClassLoaderFactoryUnitTestCase.java 2008-02-28 10:21:25 UTC (rev 70206)
+++ projects/microcontainer/trunk/classloading-vfs/src/tests/org/jboss/test/classloading/vfs/metadata/test/ManagedObjectVFSClassLoaderFactoryUnitTestCase.java 2008-02-28 10:57:52 UTC (rev 70207)
@@ -85,7 +85,7 @@
return result;
}
- protected ManagedProperty assertManagedProperty(ManagedObject mo, String name, MetaType<?> metaType, MetaValue metaValue)
+ protected ManagedProperty assertManagedProperty(ManagedObject mo, String name, MetaType metaType, MetaValue metaValue)
{
ManagedProperty property = mo.getProperty(name);
assertNotNull("No property " + name, property);
@@ -96,7 +96,7 @@
protected ManagedProperty assertManagedProperty(ManagedObject mo, String name, Type type, Object value)
{
- MetaType<?> metaType = mtFactory.resolve(type);
+ MetaType metaType = mtFactory.resolve(type);
MetaValue metaValue = null;
if (value != null)
Modified: projects/microcontainer/trunk/deployers-impl/src/tests/org/jboss/test/deployers/managed/support/MockProfileService.java
===================================================================
--- projects/microcontainer/trunk/deployers-impl/src/tests/org/jboss/test/deployers/managed/support/MockProfileService.java 2008-02-28 10:21:25 UTC (rev 70206)
+++ projects/microcontainer/trunk/deployers-impl/src/tests/org/jboss/test/deployers/managed/support/MockProfileService.java 2008-02-28 10:57:52 UTC (rev 70207)
@@ -224,7 +224,7 @@
MetaType etype = amt.getElementType();
if (etype == AbstractManagedObjectFactory.MANAGED_OBJECT_META_TYPE)
{
- ArrayValue<GenericValue> avalue = (ArrayValue<GenericValue>) prop.getValue();
+ ArrayValue avalue = (ArrayValue) prop.getValue();
for(int n = 0; n < avalue.getLength(); n ++)
{
GenericValue gv = (GenericValue) avalue.getValue(n);
Modified: projects/microcontainer/trunk/deployers-vfs/src/tests/org/jboss/test/deployers/vfs/classloader/test/ManagedObjectClassLoadingParserUnitTestCase.java
===================================================================
--- projects/microcontainer/trunk/deployers-vfs/src/tests/org/jboss/test/deployers/vfs/classloader/test/ManagedObjectClassLoadingParserUnitTestCase.java 2008-02-28 10:21:25 UTC (rev 70206)
+++ projects/microcontainer/trunk/deployers-vfs/src/tests/org/jboss/test/deployers/vfs/classloader/test/ManagedObjectClassLoadingParserUnitTestCase.java 2008-02-28 10:57:52 UTC (rev 70207)
@@ -63,7 +63,7 @@
super(name);
}
- protected ManagedProperty assertManagedProperty(ManagedObject mo, String name, MetaType<?> metaType, MetaValue metaValue)
+ protected ManagedProperty assertManagedProperty(ManagedObject mo, String name, MetaType metaType, MetaValue metaValue)
{
ManagedProperty property = mo.getProperty(name);
assertNotNull("No property " + name, property);
@@ -74,7 +74,7 @@
protected <T> ManagedProperty assertManagedProperty(ManagedObject mo, String name, Class<T> type, T value)
{
- MetaType<?> metaType = mtFactory.resolve(type);
+ MetaType metaType = mtFactory.resolve(type);
MetaValue metaValue = null;
if (value != null)
Modified: projects/microcontainer/trunk/managed/src/main/org/jboss/managed/api/ManagedOperation.java
===================================================================
--- projects/microcontainer/trunk/managed/src/main/org/jboss/managed/api/ManagedOperation.java 2008-02-28 10:21:25 UTC (rev 70206)
+++ projects/microcontainer/trunk/managed/src/main/org/jboss/managed/api/ManagedOperation.java 2008-02-28 10:57:52 UTC (rev 70207)
@@ -69,7 +69,7 @@
* The MetaType for the operation return value.
* @return MetaType for the operation return value.
*/
- public MetaType<?> getReturnType();
+ public MetaType getReturnType();
/**
* The parameter information for the operation arguments. An empty
Modified: projects/microcontainer/trunk/managed/src/main/org/jboss/managed/api/ManagedParameter.java
===================================================================
--- projects/microcontainer/trunk/managed/src/main/org/jboss/managed/api/ManagedParameter.java 2008-02-28 10:21:25 UTC (rev 70206)
+++ projects/microcontainer/trunk/managed/src/main/org/jboss/managed/api/ManagedParameter.java 2008-02-28 10:57:52 UTC (rev 70207)
@@ -79,7 +79,7 @@
*
* @return the type
*/
- MetaType<?> getMetaType();
+ MetaType getMetaType();
/**
* Get the value
Modified: projects/microcontainer/trunk/managed/src/main/org/jboss/managed/api/ManagedProperty.java
===================================================================
--- projects/microcontainer/trunk/managed/src/main/org/jboss/managed/api/ManagedProperty.java 2008-02-28 10:21:25 UTC (rev 70206)
+++ projects/microcontainer/trunk/managed/src/main/org/jboss/managed/api/ManagedProperty.java 2008-02-28 10:57:52 UTC (rev 70207)
@@ -110,7 +110,7 @@
*
* @return the type
*/
- MetaType<?> getMetaType();
+ MetaType getMetaType();
/**
* Get the annotations associated with the property
Modified: projects/microcontainer/trunk/managed/src/main/org/jboss/managed/plugins/DefaultFieldsImpl.java
===================================================================
--- projects/microcontainer/trunk/managed/src/main/org/jboss/managed/plugins/DefaultFieldsImpl.java 2008-02-28 10:21:25 UTC (rev 70206)
+++ projects/microcontainer/trunk/managed/src/main/org/jboss/managed/plugins/DefaultFieldsImpl.java 2008-02-28 10:57:52 UTC (rev 70207)
@@ -111,7 +111,7 @@
*
* @return the meta type
*/
- public MetaType<?> getMetaType()
+ public MetaType getMetaType()
{
return getField(META_TYPE, MetaType.class);
}
@@ -121,7 +121,7 @@
*
* @param type the meta type
*/
- public void setMetaType(MetaType<?> type)
+ public void setMetaType(MetaType type)
{
setField(META_TYPE, type);
}
Modified: projects/microcontainer/trunk/managed/src/main/org/jboss/managed/plugins/ManagedOperationImpl.java
===================================================================
--- projects/microcontainer/trunk/managed/src/main/org/jboss/managed/plugins/ManagedOperationImpl.java 2008-02-28 10:21:25 UTC (rev 70206)
+++ projects/microcontainer/trunk/managed/src/main/org/jboss/managed/plugins/ManagedOperationImpl.java 2008-02-28 10:57:52 UTC (rev 70207)
@@ -40,7 +40,7 @@
private Impact impact;
private String name;
private ManagedParameter[] parameters;
- private MetaType<?> returnType;
+ private MetaType returnType;
public ManagedOperationImpl(String name, String description)
@@ -48,7 +48,7 @@
this(description, name, Impact.Unknown, new ManagedParameter[0], SimpleMetaType.VOID);
}
public ManagedOperationImpl(String name, String description, Impact impact,
- ManagedParameter[] parameters, MetaType<?> returnType)
+ ManagedParameter[] parameters, MetaType returnType)
{
super();
this.description = description;
@@ -98,12 +98,12 @@
this.parameters = parameters;
}
- public MetaType<?> getReturnType()
+ public MetaType getReturnType()
{
return returnType;
}
- public void setReturnType(MetaType<?> returnType)
+ public void setReturnType(MetaType returnType)
{
this.returnType = returnType;
}
Modified: projects/microcontainer/trunk/managed/src/main/org/jboss/managed/plugins/ManagedParameterImpl.java
===================================================================
--- projects/microcontainer/trunk/managed/src/main/org/jboss/managed/plugins/ManagedParameterImpl.java 2008-02-28 10:21:25 UTC (rev 70206)
+++ projects/microcontainer/trunk/managed/src/main/org/jboss/managed/plugins/ManagedParameterImpl.java 2008-02-28 10:57:52 UTC (rev 70207)
@@ -157,7 +157,7 @@
setField(Fields.ANNOTATIONS, (Serializable) annotations);
}
- public MetaType<?> getMetaType()
+ public MetaType getMetaType()
{
return getField(Fields.META_TYPE, MetaType.class);
}
@@ -167,7 +167,7 @@
*
* @param type the meta type
*/
- public void setMetaType(MetaType<?> type)
+ public void setMetaType(MetaType type)
{
setField(Fields.META_TYPE, type);
}
Modified: projects/microcontainer/trunk/managed/src/main/org/jboss/managed/plugins/ManagedPropertyImpl.java
===================================================================
--- projects/microcontainer/trunk/managed/src/main/org/jboss/managed/plugins/ManagedPropertyImpl.java 2008-02-28 10:21:25 UTC (rev 70206)
+++ projects/microcontainer/trunk/managed/src/main/org/jboss/managed/plugins/ManagedPropertyImpl.java 2008-02-28 10:57:52 UTC (rev 70207)
@@ -217,7 +217,7 @@
setField(Fields.ANNOTATIONS, (Serializable) annotations);
}
- public MetaType<?> getMetaType()
+ public MetaType getMetaType()
{
return getField(Fields.META_TYPE, MetaType.class);
}
@@ -227,7 +227,7 @@
*
* @param type the meta type
*/
- public void setMetaType(MetaType<?> type)
+ public void setMetaType(MetaType type)
{
setField(Fields.META_TYPE, type);
}
Modified: projects/microcontainer/trunk/managed/src/main/org/jboss/managed/plugins/factory/AbstractManagedObjectFactory.java
===================================================================
--- projects/microcontainer/trunk/managed/src/main/org/jboss/managed/plugins/factory/AbstractManagedObjectFactory.java 2008-02-28 10:21:25 UTC (rev 70206)
+++ projects/microcontainer/trunk/managed/src/main/org/jboss/managed/plugins/factory/AbstractManagedObjectFactory.java 2008-02-28 10:57:52 UTC (rev 70207)
@@ -721,13 +721,13 @@
}
else if (propertyType.isArray())
{
- ArrayMetaType<?> arrayType = ArrayMetaType.class.cast(propertyType);
+ ArrayMetaType arrayType = ArrayMetaType.class.cast(propertyType);
if (MANAGED_OBJECT_META_TYPE == arrayType.getElementType())
{
Collection<?> cvalue = getAsCollection(value);
// todo - AJ: changed some generics by best guess
- ArrayMetaType<GenericValueSupport> moType = new ArrayMetaType<GenericValueSupport>(1, MANAGED_OBJECT_META_TYPE);
- ArrayValueSupport<GenericValueSupport> moArrayValue = new ArrayValueSupport<GenericValueSupport>(moType);
+ ArrayMetaType moType = new ArrayMetaType(1, MANAGED_OBJECT_META_TYPE);
+ ArrayValueSupport moArrayValue = new ArrayValueSupport(moType);
List<GenericValueSupport> tmp = new ArrayList<GenericValueSupport>();
for(Object element : cvalue)
{
@@ -798,7 +798,7 @@
ManagementParameter[] params = opAnnotation.params();
ParameterInfo[] paramInfo = methodInfo.getParameters();
TypeInfo returnInfo = methodInfo.getReturnType();
- MetaType<?> returnType = metaTypeFactory.resolve(returnInfo);
+ MetaType returnType = metaTypeFactory.resolve(returnInfo);
ArrayList<ManagedParameter> mparams = new ArrayList<ManagedParameter>();
Class<? extends ManagedParameterConstraintsPopulatorFactory> opConstraintsFactor = opAnnotation.constraintsFactory();
@@ -825,7 +825,7 @@
Fields fields = new DefaultFieldsImpl(pname);
if (pdescription != null)
fields.setField(Fields.DESCRIPTION, pdescription);
- MetaType<?> metaType = metaTypeFactory.resolve(pinfo.getParameterType());
+ MetaType metaType = metaTypeFactory.resolve(pinfo.getParameterType());
fields.setField(Fields.META_TYPE, metaType);
// Delegate others (legal values, min/max etc.) to the constraints factory
try
Modified: projects/microcontainer/trunk/managed/src/tests/org/jboss/test/managed/factory/AbstractManagedObjectFactoryTest.java
===================================================================
--- projects/microcontainer/trunk/managed/src/tests/org/jboss/test/managed/factory/AbstractManagedObjectFactoryTest.java 2008-02-28 10:21:25 UTC (rev 70206)
+++ projects/microcontainer/trunk/managed/src/tests/org/jboss/test/managed/factory/AbstractManagedObjectFactoryTest.java 2008-02-28 10:57:52 UTC (rev 70207)
@@ -111,7 +111,7 @@
* @param clazz the class
* @return the meta type
*/
- protected MetaType<?> resolve(Class<?> clazz)
+ protected MetaType resolve(Class<?> clazz)
{
return metaTypeFactory.resolve(clazz);
}
@@ -270,7 +270,7 @@
*/
protected void checkProperty(ManagedObject managedObject, String name, Class<?> clazz, String description, boolean mandatory, Object value)
{
- MetaType<?> expectedType = resolve(clazz);
+ MetaType expectedType = resolve(clazz);
MetaValue expectedValue = metaValueFactory.create(value, clazz);
checkProperty(managedObject, name, expectedType, expectedValue, description, mandatory);
}
@@ -301,7 +301,7 @@
* @param description the property description
* @param mandatory whether the property is expected mandatory
*/
- protected void checkProperty(ManagedObject managedObject, String name, MetaType<?> expectedType, MetaValue expectedValue, String description, boolean mandatory)
+ protected void checkProperty(ManagedObject managedObject, String name, MetaType expectedType, MetaValue expectedValue, String description, boolean mandatory)
{
getLog().debug("checkProperty name=" + name + " type=" + expectedType + " desc=" + description + " mandatory=" + mandatory + " value=" + expectedValue);
ManagedProperty managedProperty = managedObject.getProperty(name);
@@ -317,7 +317,7 @@
getLog().debug("... mandatory=" + propertyMandatory);
assertEquals("Property '" + name + "' has the wrong mandatory flag", mandatory, propertyMandatory);
getLog().debug("... expected metaType=" + expectedType);
- MetaType<?> actualType = managedProperty.getMetaType();
+ MetaType actualType = managedProperty.getMetaType();
getLog().debug("..... actual metaType=" + expectedType);
assertEquals("Property '" + name + "' has the wrong type", expectedType, actualType);
getLog().debug("... expected value=" + expectedValue);
Modified: projects/microcontainer/trunk/metatype/src/main/org/jboss/metatype/api/types/AbstractMetaType.java
===================================================================
--- projects/microcontainer/trunk/metatype/src/main/org/jboss/metatype/api/types/AbstractMetaType.java 2008-02-28 10:21:25 UTC (rev 70206)
+++ projects/microcontainer/trunk/metatype/src/main/org/jboss/metatype/api/types/AbstractMetaType.java 2008-02-28 10:57:52 UTC (rev 70207)
@@ -24,16 +24,14 @@
import java.io.IOException;
import java.io.ObjectInputStream;
import java.io.ObjectStreamField;
-import java.io.Serializable;
/**
* AbstractMetaType.
*
- * @param <T> the underlying type
* @author <a href="adrian at jboss.com">Adrian Brock</a>
* @version $Revision: 1.1 $
*/
-public abstract class AbstractMetaType<T extends Serializable> implements MetaType<T>
+public abstract class AbstractMetaType implements MetaType
{
/** The serialVersionUID */
private static final long serialVersionUID = 5786422588217893696L;
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-28 10:21:25 UTC (rev 70206)
+++ projects/microcontainer/trunk/metatype/src/main/org/jboss/metatype/api/types/ArrayMetaType.java 2008-02-28 10:57:52 UTC (rev 70207)
@@ -21,18 +21,15 @@
*/
package org.jboss.metatype.api.types;
-import java.io.Serializable;
-
import org.jboss.metatype.api.values.ArrayValue;
/**
* ArrayMetaType.
*
- * @param <T> exact type
* @author <a href="adrian at jboss.com">Adrian Brock</a>
* @version $Revision: 1.1 $
*/
-public class ArrayMetaType<T extends Serializable> extends AbstractMetaType<T>
+public class ArrayMetaType extends AbstractMetaType
{
/** The serialVersionUID */
private static final long serialVersionUID = -2062790692152055156L;
@@ -41,7 +38,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;
@@ -92,12 +89,12 @@
* @param primitiveTypeName primitive type name
* @return primitive meta type or null if param is not primitive
*/
- public static SimpleMetaType<?> getPrimitiveMetaType(String primitiveTypeName)
+ public static SimpleMetaType getPrimitiveMetaType(String primitiveTypeName)
{
for (Object[] typeDescr : PRIMITIVE_ARRAY_TYPES)
{
if (primitiveTypeName.equals(typeDescr[PRIMITIVE_TYPE_NAME_INDEX]))
- return (SimpleMetaType<?>) typeDescr[PRIMITIVE_OPEN_TYPE_INDEX];
+ return (SimpleMetaType) typeDescr[PRIMITIVE_OPEN_TYPE_INDEX];
}
return null;
}
@@ -137,24 +134,22 @@
/**
* Get array meta type.
*
- * @param <E> the element type
* @param elementType the element meta type
* @return array meta type
*/
- public static <E extends Serializable> ArrayMetaType<E[]> getArrayType(MetaType<E> elementType)
+ public static ArrayMetaType getArrayType(MetaType elementType)
{
- return new ArrayMetaType<E[]>(1, elementType);
+ return new ArrayMetaType(1, elementType);
}
/**
* 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)
+ public static ArrayMetaType getPrimitiveArrayType(Class<?> arrayClass)
{
if (!arrayClass.isArray())
{
@@ -176,13 +171,13 @@
"component type of the array must be a primitive type");
}
- SimpleMetaType<?> simpleType = getPrimitiveMetaType(componentTypeName);
+ SimpleMetaType simpleType = getPrimitiveMetaType(componentTypeName);
// Build primitive array
//
ArrayMetaType at = new ArrayMetaType(simpleType, true);
if (n > 1)
- at = new ArrayMetaType<T>(n - 1, at);
+ at = new ArrayMetaType(n - 1, at);
return at;
}
@@ -194,7 +189,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");
@@ -226,7 +221,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");
@@ -258,7 +253,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));
@@ -277,7 +272,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),
@@ -293,7 +288,7 @@
* @param elementType the element type
* @param primitiveArray is primitive array
*/
- public ArrayMetaType(SimpleMetaType<?> elementType, boolean primitiveArray)
+ public ArrayMetaType(SimpleMetaType elementType, boolean primitiveArray)
{
this(1, elementType, primitiveArray);
}
@@ -306,7 +301,7 @@
* @param primitiveArray is primitive array
* @throws IllegalArgumentException for a null argument or non-negative dimension or when meta type is an ArrayMetaType
*/
- public ArrayMetaType(int dimension, MetaType<?> elementType, boolean primitiveArray)
+ public ArrayMetaType(int dimension, MetaType elementType, boolean primitiveArray)
{
super(genName(dimension, elementType, primitiveArray),
genType(dimension, elementType, primitiveArray),
@@ -331,7 +326,7 @@
*
* @return the element type
*/
- public MetaType<?> getElementType()
+ public MetaType getElementType()
{
return elementType;
}
@@ -393,7 +388,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-28 10:21:25 UTC (rev 70206)
+++ projects/microcontainer/trunk/metatype/src/main/org/jboss/metatype/api/types/CollectionMetaType.java 2008-02-28 10:57:52 UTC (rev 70207)
@@ -21,7 +21,6 @@
*/
package org.jboss.metatype.api.types;
-import java.io.Serializable;
import java.util.Collection;
import org.jboss.metatype.api.values.CollectionValue;
@@ -29,16 +28,16 @@
/**
* CollectionMetaType.
*
- * @param <T> exact type
* @author <a href="ales.justin at jboss.com">Ales Justin</a>
+ * @author <a href="adrian at jboss.com">Adrian Brock</a>
*/
-public class CollectionMetaType<T extends Serializable> extends AbstractMetaType<T>
+public class CollectionMetaType extends AbstractMetaType
{
/** 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;
@@ -46,7 +45,7 @@
/** Cached string representation */
private transient String cachedToString = null;
- public CollectionMetaType(String className, MetaType<T> elementType)
+ public CollectionMetaType(String className, MetaType elementType)
{
super(className);
if (elementType == null)
@@ -54,7 +53,7 @@
this.elementType = elementType;
}
- public CollectionMetaType(String className, String description, MetaType<T> elementType)
+ public CollectionMetaType(String className, String description, MetaType elementType)
{
super(className, description);
if (elementType == null)
@@ -62,7 +61,7 @@
this.elementType = elementType;
}
- public CollectionMetaType(String className, String typeName, String description, MetaType<T> elementType)
+ public CollectionMetaType(String className, String typeName, String description, MetaType elementType)
{
super(className, typeName, description);
if (elementType == null)
@@ -78,14 +77,13 @@
/**
* 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
*/
- public static <E extends Serializable> CollectionMetaType<E> getCollectionType(String collectionType, MetaType<E> elementType)
+ public static CollectionMetaType getCollectionType(String collectionType, MetaType elementType)
{
- return new CollectionMetaType<E>(collectionType, elementType);
+ return new CollectionMetaType(collectionType, elementType);
}
/**
@@ -93,7 +91,7 @@
*
* @return the element type
*/
- public MetaType<?> getElementType()
+ public MetaType getElementType()
{
return elementType;
}
@@ -131,7 +129,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-28 10:21:25 UTC (rev 70206)
+++ projects/microcontainer/trunk/metatype/src/main/org/jboss/metatype/api/types/CompositeMetaType.java 2008-02-28 10:57:52 UTC (rev 70207)
@@ -21,7 +21,6 @@
*/
package org.jboss.metatype.api.types;
-import java.io.Serializable;
import java.util.Set;
/**
@@ -30,7 +29,7 @@
* @author <a href="adrian at jboss.com">Adrian Brock</a>
* @version $Revision: 1.1 $
*/
-public interface CompositeMetaType extends MetaType<Serializable>
+public interface CompositeMetaType extends MetaType
{
/**
* Determine whether this CompositeMetaType contains the itemName
@@ -54,7 +53,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-28 10:21:25 UTC (rev 70206)
+++ projects/microcontainer/trunk/metatype/src/main/org/jboss/metatype/api/types/EnumMetaType.java 2008-02-28 10:57:52 UTC (rev 70207)
@@ -33,7 +33,7 @@
* @author <a href="adrian at jboss.com">Adrian Brock</a>
* @version $Revision: 1.1 $
*/
-public class EnumMetaType extends AbstractMetaType<String>
+public class EnumMetaType extends AbstractMetaType
{
/** The serialVersionUID */
private static final long serialVersionUID = 6786422588217893696L;
@@ -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/GenericMetaType.java
===================================================================
--- projects/microcontainer/trunk/metatype/src/main/org/jboss/metatype/api/types/GenericMetaType.java 2008-02-28 10:21:25 UTC (rev 70206)
+++ projects/microcontainer/trunk/metatype/src/main/org/jboss/metatype/api/types/GenericMetaType.java 2008-02-28 10:57:52 UTC (rev 70207)
@@ -21,8 +21,6 @@
*/
package org.jboss.metatype.api.types;
-import java.io.Serializable;
-
import org.jboss.metatype.api.values.GenericValue;
/**
@@ -35,7 +33,7 @@
* @author <a href="adrian at jboss.com">Adrian Brock</a>
* @version $Revision: 1.1 $
*/
-public class GenericMetaType extends AbstractMetaType<Serializable>
+public class GenericMetaType extends AbstractMetaType
{
/** The serialVersionUID */
private static final long serialVersionUID = 6783554622082477064L;
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-28 10:21:25 UTC (rev 70206)
+++ projects/microcontainer/trunk/metatype/src/main/org/jboss/metatype/api/types/ImmutableCompositeMetaType.java 2008-02-28 10:57:52 UTC (rev 70207)
@@ -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-28 10:21:25 UTC (rev 70206)
+++ projects/microcontainer/trunk/metatype/src/main/org/jboss/metatype/api/types/ImmutableTableMetaType.java 2008-02-28 10:57:52 UTC (rev 70207)
@@ -21,7 +21,6 @@
*/
package org.jboss.metatype.api.types;
-import java.io.Serializable;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Iterator;
@@ -35,7 +34,7 @@
* @author <a href="adrian at jboss.com">Adrian Brock</a>
* @version $Revision: 1.1 $
*/
-public class ImmutableTableMetaType extends AbstractMetaType<Serializable> implements TableMetaType
+public class ImmutableTableMetaType extends AbstractMetaType implements TableMetaType
{
/** The serialVersionUID */
private static final long serialVersionUID = 5791103660662775558L;
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-28 10:21:25 UTC (rev 70206)
+++ projects/microcontainer/trunk/metatype/src/main/org/jboss/metatype/api/types/MapCompositeMetaType.java 2008-02-28 10:57:52 UTC (rev 70207)
@@ -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/MetaType.java
===================================================================
--- projects/microcontainer/trunk/metatype/src/main/org/jboss/metatype/api/types/MetaType.java 2008-02-28 10:21:25 UTC (rev 70206)
+++ projects/microcontainer/trunk/metatype/src/main/org/jboss/metatype/api/types/MetaType.java 2008-02-28 10:57:52 UTC (rev 70207)
@@ -39,11 +39,10 @@
/**
* MetaType.
*
- * @param <T> the underlying type
* @author <a href="adrian at jboss.com">Adrian Brock</a>
* @version $Revision: 1.1 $
*/
-public interface MetaType<T extends Serializable> extends Serializable
+public interface MetaType extends Serializable
{
/**
* The allowed classnames.<p>
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-28 10:21:25 UTC (rev 70206)
+++ projects/microcontainer/trunk/metatype/src/main/org/jboss/metatype/api/types/MetaTypeFactory.java 2008-02-28 10:57:52 UTC (rev 70207)
@@ -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,7 +75,7 @@
* @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");
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-28 10:21:25 UTC (rev 70206)
+++ projects/microcontainer/trunk/metatype/src/main/org/jboss/metatype/api/types/SimpleMetaType.java 2008-02-28 10:57:52 UTC (rev 70207)
@@ -22,7 +22,6 @@
package org.jboss.metatype.api.types;
import java.io.ObjectStreamException;
-import java.io.Serializable;
import java.math.BigDecimal;
import java.math.BigInteger;
import java.util.Date;
@@ -32,11 +31,10 @@
/**
* SimpleMetaType.
*
- * @param <T> the underlying type
* @author <a href="adrian at jboss.com">Adrian Brock</a>
* @version $Revision: 1.1 $
*/
-public class SimpleMetaType<T extends Serializable> extends AbstractMetaType<T>
+public class SimpleMetaType extends AbstractMetaType
{
/** The serialVersionUID */
private static final long serialVersionUID = 6786422588217893696L;
@@ -48,70 +46,64 @@
private transient String cachedToString;
/** The simple type for java.math.BigDecimal */
- public static final SimpleMetaType<BigDecimal> BIGDECIMAL;
+ public static final SimpleMetaType BIGDECIMAL;
/** The simple type for java.math.BigInteger */
- public static final SimpleMetaType<BigInteger> BIGINTEGER;
+ public static final SimpleMetaType BIGINTEGER;
/** The simple type for java.lang.Boolean */
- public static final SimpleMetaType<Boolean> BOOLEAN;
+ public static final SimpleMetaType BOOLEAN;
/** The simple type for java.lang.Byte */
- public static final SimpleMetaType<Byte> BYTE;
+ public static final SimpleMetaType BYTE;
/** The simple type for java.lang.Character */
- public static final SimpleMetaType<Character> CHARACTER;
+ public static final SimpleMetaType CHARACTER;
/** The simple type for java.lang.Date */
- public static final SimpleMetaType<Date> DATE;
+ public static final SimpleMetaType DATE;
/** The simple type for java.lang.Double */
- public static final SimpleMetaType<Double> DOUBLE;
+ public static final SimpleMetaType DOUBLE;
/** The simple type for java.lang.Float */
- public static final SimpleMetaType<Float> FLOAT;
+ public static final SimpleMetaType FLOAT;
/** The simple type for java.lang.Integer */
- public static final SimpleMetaType<Integer> INTEGER;
+ public static final SimpleMetaType INTEGER;
/** The simple type for java.lang.Long */
- public static final SimpleMetaType<Long> LONG;
+ public static final SimpleMetaType LONG;
/** The simple type for java.lang.Short */
- public static final SimpleMetaType<Short> SHORT;
+ public static final SimpleMetaType SHORT;
/** The simple type for java.lang.String */
- public static final SimpleMetaType<String> STRING;
+ public static final SimpleMetaType STRING;
/** The simple type for an object name */
- public static final SimpleMetaType<Name> NAMEDOBJECT;
+ public static final SimpleMetaType NAMEDOBJECT;
/** The simple type for java.lang.Void */
- public static final SimpleMetaType<?> VOID;
+ public static final SimpleMetaType VOID;
static
{
- BIGDECIMAL = new SimpleMetaType<BigDecimal>(BigDecimal.class.getName());
- BIGINTEGER = new SimpleMetaType<BigInteger>(BigInteger.class.getName());
- BOOLEAN = new SimpleMetaType<Boolean>(Boolean.class.getName());
- BYTE = new SimpleMetaType<Byte>(Byte.class.getName());
- CHARACTER = new SimpleMetaType<Character>(Character.class.getName());
- DATE = new SimpleMetaType<Date>(Date.class.getName());
- DOUBLE = new SimpleMetaType<Double>(Double.class.getName());
- FLOAT = new SimpleMetaType<Float>(Float.class.getName());
- INTEGER = new SimpleMetaType<Integer>(Integer.class.getName());
- LONG = new SimpleMetaType<Long>(Long.class.getName());
- SHORT = new SimpleMetaType<Short>(Short.class.getName());
- STRING = new SimpleMetaType<String>(String.class.getName());
- NAMEDOBJECT = new SimpleMetaType<Name>(Name.class.getName());
- VOID = createVoid();
+ BIGDECIMAL = new SimpleMetaType(BigDecimal.class.getName());
+ BIGINTEGER = new SimpleMetaType(BigInteger.class.getName());
+ BOOLEAN = new SimpleMetaType(Boolean.class.getName());
+ BYTE = new SimpleMetaType(Byte.class.getName());
+ CHARACTER = new SimpleMetaType(Character.class.getName());
+ DATE = new SimpleMetaType(Date.class.getName());
+ DOUBLE = new SimpleMetaType(Double.class.getName());
+ FLOAT = new SimpleMetaType(Float.class.getName());
+ INTEGER = new SimpleMetaType(Integer.class.getName());
+ LONG = new SimpleMetaType(Long.class.getName());
+ SHORT = new SimpleMetaType(Short.class.getName());
+ STRING = new SimpleMetaType(String.class.getName());
+ NAMEDOBJECT = new SimpleMetaType(Name.class.getName());
+ VOID = new SimpleMetaType(Void.class.getName());
}
-
- @SuppressWarnings("unchecked")
- private static SimpleMetaType<?> createVoid()
- {
- return new SimpleMetaType(Void.class.getName());
- }
/**
* Resolve a simple type
@@ -120,9 +112,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);
@@ -136,7 +128,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");
@@ -200,7 +192,7 @@
if (obj == null || obj instanceof SimpleValue == false)
return false;
- SimpleValue<?> value = (SimpleValue<?>) obj;
+ SimpleValue value = (SimpleValue) obj;
return equals(value.getMetaType());
}
@@ -211,7 +203,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-28 10:21:25 UTC (rev 70206)
+++ projects/microcontainer/trunk/metatype/src/main/org/jboss/metatype/api/types/TableMetaType.java 2008-02-28 10:57:52 UTC (rev 70207)
@@ -21,7 +21,6 @@
*/
package org.jboss.metatype.api.types;
-import java.io.Serializable;
import java.util.List;
/**
@@ -30,7 +29,7 @@
* @author <a href="adrian at jboss.com">Adrian Brock</a>
* @version $Revision: 1.1 $
*/
-public interface TableMetaType extends MetaType<Serializable>
+public interface TableMetaType extends MetaType
{
/**
* 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-28 10:21:25 UTC (rev 70206)
+++ projects/microcontainer/trunk/metatype/src/main/org/jboss/metatype/api/values/ArrayValue.java 2008-02-28 10:57:52 UTC (rev 70207)
@@ -21,22 +21,18 @@
*/
package org.jboss.metatype.api.values;
-import java.io.Serializable;
-
import org.jboss.metatype.api.types.ArrayMetaType;
/**
* 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 $
*/
-public interface ArrayValue<T extends Serializable>
- extends MetaValue, Iterable<T>
+public interface ArrayValue extends MetaValue, Iterable<Object>
{
- ArrayMetaType<T> getMetaType();
+ ArrayMetaType getMetaType();
/**
* Get the underlying array value. This will not be an
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-28 10:21:25 UTC (rev 70206)
+++ projects/microcontainer/trunk/metatype/src/main/org/jboss/metatype/api/values/ArrayValueSupport.java 2008-02-28 10:57:52 UTC (rev 70207)
@@ -21,7 +21,6 @@
*/
package org.jboss.metatype.api.values;
-import java.io.Serializable;
import java.lang.reflect.Array;
import java.util.Arrays;
import java.util.Iterator;
@@ -32,18 +31,16 @@
* ArrayValue.
*
* TODO tests
- * @param <T> the array type
* @author <a href="adrian at jboss.com">Adrian Brock</a>
* @version $Revision: 1.1 $
*/
-public class ArrayValueSupport<T extends Serializable> extends AbstractMetaValue
- implements ArrayValue<T>
+public class ArrayValueSupport extends AbstractMetaValue implements ArrayValue
{
/** The serialVersionUID */
private static final long serialVersionUID = 1131827130033538066L;
/** The array meta type */
- private ArrayMetaType<T> metaType;
+ private ArrayMetaType metaType;
/** The value */
private Object value;
@@ -54,7 +51,7 @@
* @param metaType the array meta type
* @throws IllegalArgumentException for a null array MetaType
*/
- public ArrayValueSupport(ArrayMetaType<T> metaType)
+ public ArrayValueSupport(ArrayMetaType metaType)
{
if (metaType == null)
throw new IllegalArgumentException("Null array meta type");
@@ -68,13 +65,13 @@
* @param value the value
* @throws IllegalArgumentException for a null array MetaType
*/
- public ArrayValueSupport(ArrayMetaType<T> metaType, Object value)
+ public ArrayValueSupport(ArrayMetaType metaType, Object value)
{
this(metaType);
this.value = value;
}
- public ArrayMetaType<T> getMetaType()
+ public ArrayMetaType getMetaType()
{
return metaType;
}
@@ -103,9 +100,9 @@
return Array.get(value, index);
}
- public Iterator<T> iterator()
+ public Iterator<Object> iterator()
{
- return new ArrayValueIterator<T>(value);
+ return new ArrayValueIterator(value);
}
/**
@@ -127,7 +124,7 @@
if (obj == null || obj instanceof ArrayValue == false)
return false;
- ArrayValue<?> other = (ArrayValue<?>) obj;
+ ArrayValue other = (ArrayValue) obj;
if (metaType.equals(other.getMetaType()) == false)
return false;
@@ -179,7 +176,7 @@
@Override
public MetaValue clone()
{
- ArrayValueSupport<?> result = (ArrayValueSupport<?>) super.clone();
+ ArrayValueSupport result = (ArrayValueSupport) super.clone();
int length = getLength();
if (value != null && length > 0)
{
@@ -222,7 +219,7 @@
return deepToString;
}
- private static class ArrayValueIterator<T> implements Iterator<T>
+ private static class ArrayValueIterator implements Iterator<Object>
{
private int index;
private int length;
@@ -240,10 +237,9 @@
return index < length;
}
- @SuppressWarnings("unchecked")
- public T next()
+ public Object next()
{
- return (T) Array.get(array, index ++);
+ return Array.get(array, index ++);
}
public void remove()
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-28 10:21:25 UTC (rev 70206)
+++ projects/microcontainer/trunk/metatype/src/main/org/jboss/metatype/api/values/CollectionValue.java 2008-02-28 10:57:52 UTC (rev 70207)
@@ -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-28 10:21:25 UTC (rev 70206)
+++ projects/microcontainer/trunk/metatype/src/main/org/jboss/metatype/api/values/CollectionValueSupport.java 2008-02-28 10:57:52 UTC (rev 70207)
@@ -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-28 10:21:25 UTC (rev 70206)
+++ projects/microcontainer/trunk/metatype/src/main/org/jboss/metatype/api/values/CompositeValueSupport.java 2008-02-28 10:57:52 UTC (rev 70207)
@@ -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);
@@ -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/MapCompositeValueSupport.java
===================================================================
--- projects/microcontainer/trunk/metatype/src/main/org/jboss/metatype/api/values/MapCompositeValueSupport.java 2008-02-28 10:21:25 UTC (rev 70206)
+++ projects/microcontainer/trunk/metatype/src/main/org/jboss/metatype/api/values/MapCompositeValueSupport.java 2008-02-28 10:57:52 UTC (rev 70207)
@@ -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-28 10:21:25 UTC (rev 70206)
+++ projects/microcontainer/trunk/metatype/src/main/org/jboss/metatype/api/values/MetaValue.java 2008-02-28 10:57:52 UTC (rev 70207)
@@ -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/SimpleValue.java
===================================================================
--- projects/microcontainer/trunk/metatype/src/main/org/jboss/metatype/api/values/SimpleValue.java 2008-02-28 10:21:25 UTC (rev 70206)
+++ projects/microcontainer/trunk/metatype/src/main/org/jboss/metatype/api/values/SimpleValue.java 2008-02-28 10:57:52 UTC (rev 70207)
@@ -28,18 +28,17 @@
/**
* SimpleValue.
*
- * @param <T> the underlying type
* @author <a href="adrian at jboss.com">Adrian Brock</a>
* @version $Revision: 1.1 $
*/
-public interface SimpleValue<T extends Serializable> extends MetaValue
+public interface SimpleValue extends MetaValue
{
- SimpleMetaType<T> getMetaType();
+ SimpleMetaType getMetaType();
/**
* Get the underlying value
*
* @return the underlying value
*/
- public T getValue();
+ Serializable getValue();
}
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-28 10:21:25 UTC (rev 70206)
+++ projects/microcontainer/trunk/metatype/src/main/org/jboss/metatype/api/values/SimpleValueSupport.java 2008-02-28 10:57:52 UTC (rev 70207)
@@ -28,36 +28,33 @@
/**
* SimpleValue.
*
- * @param <T> the underlying type
* @author <a href="adrian at jboss.com">Adrian Brock</a>
* @version $Revision: 1.1 $
*/
-public class SimpleValueSupport<T extends Serializable> extends AbstractMetaValue implements SimpleValue<T>
+public class SimpleValueSupport extends AbstractMetaValue implements SimpleValue
{
/** The serialVersionUID */
private static final long serialVersionUID = 8473043036261557127L;
/** The simple meta type */
- private SimpleMetaType<T> metaType;
+ private SimpleMetaType metaType;
/** The value */
- private T value;
+ private Serializable value;
/**
* Wrap a simple object in simple value
*
- * @param <T> the underlying type
* @param object the simple object
* @return the simple value
*/
- @SuppressWarnings("unchecked")
- public static <T extends Serializable> SimpleValue<T> wrap(T object)
+ public static SimpleValue wrap(Serializable object)
{
if (object == null)
return null;
String className = object.getClass().getName();
- SimpleMetaType<T> metaType = (SimpleMetaType) SimpleMetaType.resolve(className);
- return new SimpleValueSupport<T>(metaType, object);
+ SimpleMetaType metaType = SimpleMetaType.resolve(className);
+ return new SimpleValueSupport(metaType, object);
}
/**
@@ -67,7 +64,7 @@
* @param value the value
* @throws IllegalArgumentException for a null simpleMetaType
*/
- public SimpleValueSupport(SimpleMetaType<T> metaType, T value)
+ public SimpleValueSupport(SimpleMetaType metaType, Serializable value)
{
if (metaType == null)
throw new IllegalArgumentException("Null simple meta type");
@@ -75,7 +72,7 @@
setValue(value);
}
- public SimpleMetaType<T> getMetaType()
+ public SimpleMetaType getMetaType()
{
return metaType;
}
@@ -85,7 +82,7 @@
*
* @return the value.
*/
- public T getValue()
+ public Serializable getValue()
{
return value;
}
@@ -95,7 +92,7 @@
*
* @param value the value.
*/
- public void setValue(T value)
+ public void setValue(Serializable value)
{
this.value = value;
}
@@ -109,7 +106,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-28 10:21:25 UTC (rev 70206)
+++ projects/microcontainer/trunk/metatype/src/main/org/jboss/metatype/api/values/TableValueSupport.java 2008-02-28 10:57:52 UTC (rev 70207)
@@ -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-28 10:21:25 UTC (rev 70206)
+++ projects/microcontainer/trunk/metatype/src/main/org/jboss/metatype/plugins/types/AbstractCompositeMetaType.java 2008-02-28 10:57:52 UTC (rev 70207)
@@ -21,7 +21,6 @@
*/
package org.jboss.metatype.plugins.types;
-import java.io.Serializable;
import java.util.Collections;
import java.util.Iterator;
import java.util.Set;
@@ -38,7 +37,7 @@
* @author <a href="adrian at jboss.com">Adrian Brock</a>
* @version $Revision: 1.1 $
*/
-public abstract class AbstractCompositeMetaType extends AbstractMetaType<Serializable> implements CompositeMetaType
+public abstract class AbstractCompositeMetaType extends AbstractMetaType implements CompositeMetaType
{
/** The serialVersionUID */
private static final long serialVersionUID = -7421421680257307598L;
@@ -47,7 +46,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;
@@ -80,13 +79,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)
@@ -100,7 +99,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
@@ -154,7 +153,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");
@@ -194,7 +193,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-28 10:21:25 UTC (rev 70206)
+++ projects/microcontainer/trunk/metatype/src/main/org/jboss/metatype/plugins/types/ClassMetaTypeBuilder.java 2008-02-28 10:57:52 UTC (rev 70207)
@@ -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-28 10:21:25 UTC (rev 70206)
+++ projects/microcontainer/trunk/metatype/src/main/org/jboss/metatype/plugins/types/DefaultMetaTypeFactory.java 2008-02-28 10:57:52 UTC (rev 70207)
@@ -110,7 +110,7 @@
}
@Override
- public MetaType<?> resolve(Type type)
+ public MetaType resolve(Type type)
{
TypeInfo typeInfo = configuration.getTypeInfo(type);
return resolve(typeInfo);
@@ -122,10 +122,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
@@ -155,9 +155,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;
@@ -254,7 +254,7 @@
* @return the metatype
*/
@SuppressWarnings("unchecked")
- public ArrayMetaType<?> generateArray(ArrayInfo typeInfo)
+ public ArrayMetaType generateArray(ArrayInfo typeInfo)
{
int dimension = 1;
TypeInfo componentType = typeInfo.getComponentType();
@@ -263,7 +263,7 @@
++dimension;
componentType = ((ArrayInfo) componentType).getComponentType();
}
- MetaType<?> componentMetaType = resolve(componentType);
+ MetaType componentMetaType = resolve(componentType);
return new ArrayMetaType(dimension, componentMetaType, componentType.isPrimitive());
}
@@ -316,7 +316,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);
}
@@ -327,7 +327,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);
@@ -367,7 +367,7 @@
}
TypeInfo itemTypeInfo = property.getType();
- MetaType<?> metaType = resolve(itemTypeInfo);
+ MetaType metaType = resolve(itemTypeInfo);
result.addItem(name, name, metaType);
if (property.isAnnotationPresent(CompositeKey.class))
{
@@ -390,7 +390,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-28 10:21:25 UTC (rev 70206)
+++ projects/microcontainer/trunk/metatype/src/main/org/jboss/metatype/plugins/types/MutableCompositeMetaType.java 2008-02-28 10:57:52 UTC (rev 70207)
@@ -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/DefaultMetaValueFactory.java
===================================================================
--- projects/microcontainer/trunk/metatype/src/main/org/jboss/metatype/plugins/values/DefaultMetaValueFactory.java 2008-02-28 10:21:25 UTC (rev 70206)
+++ projects/microcontainer/trunk/metatype/src/main/org/jboss/metatype/plugins/values/DefaultMetaValueFactory.java 2008-02-28 10:57:52 UTC (rev 70207)
@@ -155,17 +155,16 @@
/**
* Create a simple value
*
- * @param <T> the simple type
* @param type the type
* @param value the value
* @return the simple value
*/
- public static <T extends Serializable> SimpleValue<T> createSimpleValue(SimpleMetaType<T> type, T value)
+ public static SimpleValue createSimpleValue(SimpleMetaType type, Serializable value)
{
if (value == null)
return null;
- return new SimpleValueSupport<T>(type, value);
+ return new SimpleValueSupport(type, value);
}
/**
@@ -213,7 +212,7 @@
* @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;
@@ -225,7 +224,7 @@
{
// 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);
@@ -296,17 +295,17 @@
* @return the composite value
*/
@SuppressWarnings("unchecked")
- public ArrayValue<?> createArrayValue(ArrayMetaType<?> type, Object value, Map<Object, MetaValue> mapping)
+ 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;
@@ -354,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;
@@ -415,7 +414,7 @@
for (String name : type.itemSet())
{
- MetaType<?> itemType = type.getType(name);
+ MetaType itemType = type.getType(name);
Object itemValue;
try
{
@@ -528,11 +527,11 @@
if (mapper != null)
return mapper.unwrapMetaValue(metaValue);
- 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())
@@ -547,7 +546,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());
@@ -593,7 +592,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);
@@ -609,7 +608,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);
@@ -852,7 +851,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.");
@@ -871,7 +870,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();
@@ -881,8 +880,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);
@@ -913,7 +912,7 @@
* @return the meta value
*/
@SuppressWarnings("unchecked")
- protected MetaValue internalCreate(Object value, TypeInfo type, MetaType<?> metaType)
+ protected MetaValue internalCreate(Object value, TypeInfo type, MetaType metaType)
{
if (value == null)
return null;
@@ -963,11 +962,11 @@
if (result == null)
{
if (metaType.isSimple())
- result = createSimpleValue((SimpleMetaType<Serializable>) metaType, (Serializable) value);
+ result = createSimpleValue((SimpleMetaType) metaType, (Serializable) value);
else if (metaType.isEnum())
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())
@@ -975,7 +974,7 @@
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);
}
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-28 10:21:25 UTC (rev 70206)
+++ projects/microcontainer/trunk/metatype/src/main/org/jboss/metatype/spi/types/MetaTypeBuilder.java 2008-02-28 10:57:52 UTC (rev 70207)
@@ -36,5 +36,5 @@
*
* @return the meta type
*/
- MetaType<?> buildMetaType();
+ MetaType buildMetaType();
}
Modified: projects/microcontainer/trunk/metatype/src/main/org/jboss/metatype/spi/values/MetaMapper.java
===================================================================
--- projects/microcontainer/trunk/metatype/src/main/org/jboss/metatype/spi/values/MetaMapper.java 2008-02-28 10:21:25 UTC (rev 70206)
+++ projects/microcontainer/trunk/metatype/src/main/org/jboss/metatype/spi/values/MetaMapper.java 2008-02-28 10:57:52 UTC (rev 70207)
@@ -102,7 +102,7 @@
*
* @return the metatype
*/
- public MetaType<?> getMetaType()
+ public MetaType getMetaType()
{
Type type = mapToType();
if (type == null)
@@ -117,7 +117,7 @@
* @param object the object
* @return the meta value
*/
- public abstract MetaValue createMetaValue(MetaType<?> metaType, T object);
+ public abstract MetaValue createMetaValue(MetaType metaType, T object);
/**
* Unwrap the metavalue
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-28 10:21:25 UTC (rev 70206)
+++ projects/microcontainer/trunk/metatype/src/main/org/jboss/metatype/spi/values/MetaValueBuilder.java 2008-02-28 10:57:52 UTC (rev 70207)
@@ -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-28 10:21:25 UTC (rev 70206)
+++ projects/microcontainer/trunk/metatype/src/tests/org/jboss/test/metatype/AbstractMetaTypeTest.java 2008-02-28 10:57:52 UTC (rev 70207)
@@ -59,7 +59,7 @@
*
* @return the value
*/
- protected SimpleValue<String> initStringValue1()
+ protected SimpleValue initStringValue1()
{
return SimpleValueSupport.wrap("value1");
}
@@ -69,7 +69,7 @@
*
* @return the value
*/
- protected SimpleValue<String> initStringValue2()
+ protected SimpleValue initStringValue2()
{
return SimpleValueSupport.wrap("value2");
}
@@ -79,7 +79,7 @@
*
* @return the name
*/
- protected SimpleValue<String> initStringName1()
+ protected SimpleValue initStringName1()
{
return SimpleValueSupport.wrap("name1");
}
@@ -89,7 +89,7 @@
*
* @return the empty string
*/
- protected SimpleValue<String> initStringEmpty()
+ protected SimpleValue initStringEmpty()
{
return SimpleValueSupport.wrap("");
}
@@ -99,9 +99,9 @@
*
* @return the null string
*/
- protected SimpleValue<String> initStringNull()
+ protected SimpleValue initStringNull()
{
- return new SimpleValueSupport<String>(SimpleMetaType.STRING, null);
+ return new SimpleValueSupport(SimpleMetaType.STRING, null);
}
/**
@@ -109,7 +109,7 @@
*
* @return the wrong string
*/
- protected SimpleValue<String> initStringWrong()
+ protected SimpleValue initStringWrong()
{
return SimpleValueSupport.wrap("wrong");
}
@@ -119,7 +119,7 @@
*
* @return the value
*/
- protected SimpleValue<Integer> initInteger2()
+ protected SimpleValue initInteger2()
{
return SimpleValueSupport.wrap(new Integer(2));
}
@@ -129,7 +129,7 @@
*
* @return the value
*/
- protected SimpleValue<Integer> initInteger3()
+ protected SimpleValue initInteger3()
{
return SimpleValueSupport.wrap(new Integer(3));
}
@@ -139,7 +139,7 @@
*
* @return the value
*/
- protected SimpleValue<Integer> initInteger4()
+ protected SimpleValue initInteger4()
{
return SimpleValueSupport.wrap(new Integer(4));
}
@@ -149,9 +149,9 @@
*
* @return the value
*/
- protected SimpleValue<Integer> initIntegerNull()
+ protected SimpleValue initIntegerNull()
{
- return new SimpleValueSupport<Integer>(SimpleMetaType.INTEGER, null);
+ return new SimpleValueSupport(SimpleMetaType.INTEGER, null);
}
/**
@@ -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-28 10:21:25 UTC (rev 70206)
+++ projects/microcontainer/trunk/metatype/src/tests/org/jboss/test/metatype/types/factory/support/TestOverrideCompositeBuilder.java 2008-02-28 10:57:52 UTC (rev 70207)
@@ -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-28 10:21:25 UTC (rev 70206)
+++ projects/microcontainer/trunk/metatype/src/tests/org/jboss/test/metatype/types/factory/test/AbstractMetaTypeFactoryTest.java 2008-02-28 10:57:52 UTC (rev 70207)
@@ -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-28 10:21:25 UTC (rev 70206)
+++ projects/microcontainer/trunk/metatype/src/tests/org/jboss/test/metatype/types/factory/test/AnnotationMetaTypeFactoryUnitTestCase.java 2008-02-28 10:57:52 UTC (rev 70207)
@@ -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-28 10:21:25 UTC (rev 70206)
+++ projects/microcontainer/trunk/metatype/src/tests/org/jboss/test/metatype/types/factory/test/ArrayMetaTypeFactoryUnitTestCase.java 2008-02-28 10:57:52 UTC (rev 70207)
@@ -65,9 +65,9 @@
public void testSimpleArray() throws Exception
{
String[] array = new String[0];
- MetaType<?> result = resolve(array.getClass());
- ArrayMetaType<String> actual = assertInstanceOf(result, ArrayMetaType.class);
- ArrayMetaType<String> expected = new ArrayMetaType<String>(1, SimpleMetaType.STRING);
+ MetaType result = resolve(array.getClass());
+ ArrayMetaType actual = assertInstanceOf(result, ArrayMetaType.class);
+ ArrayMetaType expected = new ArrayMetaType(1, SimpleMetaType.STRING);
testArray(expected, actual);
}
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-28 10:21:25 UTC (rev 70206)
+++ projects/microcontainer/trunk/metatype/src/tests/org/jboss/test/metatype/types/factory/test/CompositeMetaTypeFactoryUnitTestCase.java 2008-02-28 10:57:52 UTC (rev 70207)
@@ -76,7 +76,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());
@@ -93,7 +93,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());
@@ -108,7 +108,7 @@
public void testIgnoredItem() throws Exception
{
- MetaType<?> result = resolve(TestIgnoredCompositeItem.class);
+ MetaType result = resolve(TestIgnoredCompositeItem.class);
CompositeMetaType actual = assertInstanceOf(result, CompositeMetaType.class);
MutableCompositeMetaType expected = new MutableCompositeMetaType(TestIgnoredCompositeItem.class.getName(), TestIgnoredCompositeItem.class.getName());
@@ -122,7 +122,7 @@
public void testRenamedItem() throws Exception
{
- MetaType<?> result = resolve(TestRenamedCompositeItem.class);
+ MetaType result = resolve(TestRenamedCompositeItem.class);
CompositeMetaType actual = assertInstanceOf(result, CompositeMetaType.class);
MutableCompositeMetaType expected = new MutableCompositeMetaType(TestRenamedCompositeItem.class.getName(), TestRenamedCompositeItem.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-28 10:21:25 UTC (rev 70206)
+++ projects/microcontainer/trunk/metatype/src/tests/org/jboss/test/metatype/types/factory/test/EnumMetaTypeFactoryUnitTestCase.java 2008-02-28 10:57:52 UTC (rev 70207)
@@ -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-28 10:21:25 UTC (rev 70206)
+++ projects/microcontainer/trunk/metatype/src/tests/org/jboss/test/metatype/types/factory/test/MapMetaTypeFactoryUnitTestCase.java 2008-02-28 10:57:52 UTC (rev 70207)
@@ -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-28 10:21:25 UTC (rev 70206)
+++ projects/microcontainer/trunk/metatype/src/tests/org/jboss/test/metatype/types/factory/test/SimpleMetaTypeFactoryUnitTestCase.java 2008-02-28 10:57:52 UTC (rev 70207)
@@ -58,7 +58,7 @@
super(name);
}
- SimpleMetaType<?>[] expected = new SimpleMetaType[]
+ SimpleMetaType[] expected = new SimpleMetaType[]
{
SimpleMetaType.BIGDECIMAL,
SimpleMetaType.BIGINTEGER,
@@ -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-28 10:21:25 UTC (rev 70206)
+++ projects/microcontainer/trunk/metatype/src/tests/org/jboss/test/metatype/types/factory/test/SpecialMetaTypeFactoryUnitTestCase.java 2008-02-28 10:57:52 UTC (rev 70207)
@@ -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/MockMetaType.java
===================================================================
--- projects/microcontainer/trunk/metatype/src/tests/org/jboss/test/metatype/types/support/MockMetaType.java 2008-02-28 10:21:25 UTC (rev 70206)
+++ projects/microcontainer/trunk/metatype/src/tests/org/jboss/test/metatype/types/support/MockMetaType.java 2008-02-28 10:57:52 UTC (rev 70207)
@@ -21,18 +21,15 @@
*/
package org.jboss.test.metatype.types.support;
-import java.io.Serializable;
-
import org.jboss.metatype.api.types.AbstractMetaType;
/**
* MockMetaType.
*
- * @param <T> the underlying type
* @author <a href="adrian at jboss.com">Adrian Brock</a>
* @version $Revision: 1.1 $
*/
-public class MockMetaType<T extends Serializable> extends AbstractMetaType<T>
+public class MockMetaType extends AbstractMetaType
{
private static final long serialVersionUID = -1;
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-28 10:21:25 UTC (rev 70206)
+++ projects/microcontainer/trunk/metatype/src/tests/org/jboss/test/metatype/types/support/MockMetaValue.java 2008-02-28 10:57:52 UTC (rev 70207)
@@ -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-28 10:21:25 UTC (rev 70206)
+++ projects/microcontainer/trunk/metatype/src/tests/org/jboss/test/metatype/types/support/MockSimpleValue.java 2008-02-28 10:57:52 UTC (rev 70207)
@@ -29,11 +29,10 @@
/**
* MockSimpleValue.
*
- * @param <T> the underlying type
* @author <a href="adrian at jboss.com">Adrian Brock</a>
* @version $Revision: 1.1 $
*/
-public class MockSimpleValue<T extends Serializable> extends MockMetaValue implements SimpleValue<T>
+public class MockSimpleValue extends MockMetaValue implements SimpleValue
{
/** The serialVersionUID */
private static final long serialVersionUID = 1L;
@@ -43,18 +42,18 @@
*
* @param metaType the meta type
*/
- public MockSimpleValue(SimpleMetaType<T> metaType)
+ public MockSimpleValue(SimpleMetaType metaType)
{
super(metaType);
}
@SuppressWarnings("unchecked")
- public SimpleMetaType<T> getMetaType()
+ public SimpleMetaType getMetaType()
{
return (SimpleMetaType) super.getMetaType();
}
- public T getValue()
+ public Serializable getValue()
{
throw new org.jboss.util.NotImplementedException("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-28 10:21:25 UTC (rev 70206)
+++ projects/microcontainer/trunk/metatype/src/tests/org/jboss/test/metatype/types/test/ArrayMetaTypeUnitTestCase.java 2008-02-28 10:57:52 UTC (rev 70207)
@@ -121,21 +121,21 @@
*/
public void testIsValueSimpleValue() throws Exception
{
- SimpleMetaType<String> simpleType = SimpleMetaType.STRING;
- MockSimpleValue<?> sv = new MockSimpleValue<String>(simpleType);
- MockSimpleValue<?>[][] compData1 = new MockSimpleValue[][]
+ SimpleMetaType simpleType = SimpleMetaType.STRING;
+ MockSimpleValue sv = new MockSimpleValue(simpleType);
+ MockSimpleValue[][] compData1 = new MockSimpleValue[][]
{
{ sv, null }, { sv, sv }
};
- ArrayMetaType<String> compArrayType1 = new ArrayMetaType<String>(2, SimpleMetaType.STRING);
+ ArrayMetaType compArrayType1 = new ArrayMetaType(2, SimpleMetaType.STRING);
assertTrue("compData1 should be a value of array type", compArrayType1.isValue(compData1));
- ArrayMetaType<String> compArrayType2 = new ArrayMetaType<String>(1, SimpleMetaType.STRING);
+ ArrayMetaType compArrayType2 = new ArrayMetaType(1, SimpleMetaType.STRING);
assertFalse("compData1 should not be a value of array type, wrong dimension", compArrayType2.isValue(compData1));
- SimpleMetaType<Integer> simpleType2 = SimpleMetaType.INTEGER;
- ArrayMetaType<Integer> compArrayType3 = new ArrayMetaType<Integer>(2, simpleType2);
+ SimpleMetaType simpleType2 = SimpleMetaType.INTEGER;
+ ArrayMetaType compArrayType3 = new ArrayMetaType(2, simpleType2);
assertFalse("compData1 should not be a value of array type, wrong element type", compArrayType3.isValue(compData1));
}
@@ -149,7 +149,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);
MockCompositeValue cv = new MockCompositeValue(compositeType);
MockCompositeValue[][] compData1 = new MockCompositeValue[][]
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-28 10:21:25 UTC (rev 70206)
+++ projects/microcontainer/trunk/metatype/src/tests/org/jboss/test/metatype/types/test/ImmutableCompositeMetaTypeUnitTestCase.java 2008-02-28 10:57:52 UTC (rev 70207)
@@ -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-28 10:21:25 UTC (rev 70206)
+++ projects/microcontainer/trunk/metatype/src/tests/org/jboss/test/metatype/types/test/ImmutableTableMetaTypeUnitTestCase.java 2008-02-28 10:57:52 UTC (rev 70207)
@@ -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-28 10:21:25 UTC (rev 70206)
+++ projects/microcontainer/trunk/metatype/src/tests/org/jboss/test/metatype/types/test/MetaTypeUnitTestCase.java 2008-02-28 10:57:52 UTC (rev 70207)
@@ -106,7 +106,7 @@
@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());
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-28 10:21:25 UTC (rev 70206)
+++ projects/microcontainer/trunk/metatype/src/tests/org/jboss/test/metatype/types/test/SimpleMetaTypeUnitTestCase.java 2008-02-28 10:57:52 UTC (rev 70207)
@@ -62,7 +62,7 @@
super(name);
}
- SimpleMetaType<?>[] types = new SimpleMetaType<?>[]
+ SimpleMetaType[] types = new SimpleMetaType[]
{
SimpleMetaType.BIGDECIMAL,
SimpleMetaType.BIGINTEGER,
@@ -101,39 +101,39 @@
@SuppressWarnings("unchecked")
SimpleValue[] values = new SimpleValue[]
{
- new SimpleValueSupport<BigDecimal>(SimpleMetaType.BIGDECIMAL, new BigDecimal(1)),
- new SimpleValueSupport<BigInteger>(SimpleMetaType.BIGINTEGER, BigInteger.ONE),
- new SimpleValueSupport<Boolean>(SimpleMetaType.BOOLEAN, new Boolean(false)),
- new SimpleValueSupport<Byte>(SimpleMetaType.BYTE, new Byte(Byte.MAX_VALUE)),
- new SimpleValueSupport<Character>(SimpleMetaType.CHARACTER, new Character('a')),
- new SimpleValueSupport<Date>(SimpleMetaType.DATE, new Date(System.currentTimeMillis())),
- new SimpleValueSupport<Double>(SimpleMetaType.DOUBLE, new Double(1)),
- new SimpleValueSupport<Float>(SimpleMetaType.FLOAT, new Float(1)),
- new SimpleValueSupport<Integer>(SimpleMetaType.INTEGER, new Integer(1)),
- new SimpleValueSupport<Long>(SimpleMetaType.LONG, new Long(1)),
- new SimpleValueSupport<Short>(SimpleMetaType.SHORT, new Short(Short.MAX_VALUE)),
- new SimpleValueSupport<String>(SimpleMetaType.STRING, new String("hello")),
+ new SimpleValueSupport(SimpleMetaType.BIGDECIMAL, new BigDecimal(1)),
+ new SimpleValueSupport(SimpleMetaType.BIGINTEGER, BigInteger.ONE),
+ new SimpleValueSupport(SimpleMetaType.BOOLEAN, new Boolean(false)),
+ new SimpleValueSupport(SimpleMetaType.BYTE, new Byte(Byte.MAX_VALUE)),
+ new SimpleValueSupport(SimpleMetaType.CHARACTER, new Character('a')),
+ new SimpleValueSupport(SimpleMetaType.DATE, new Date(System.currentTimeMillis())),
+ new SimpleValueSupport(SimpleMetaType.DOUBLE, new Double(1)),
+ new SimpleValueSupport(SimpleMetaType.FLOAT, new Float(1)),
+ new SimpleValueSupport(SimpleMetaType.INTEGER, new Integer(1)),
+ new SimpleValueSupport(SimpleMetaType.LONG, new Long(1)),
+ new SimpleValueSupport(SimpleMetaType.SHORT, new Short(Short.MAX_VALUE)),
+ new SimpleValueSupport(SimpleMetaType.STRING, new String("hello")),
new SimpleValueSupport(SimpleMetaType.VOID, null),
- new SimpleValueSupport<Name>(SimpleMetaType.NAMEDOBJECT, new StringName("objectref"))
+ new SimpleValueSupport(SimpleMetaType.NAMEDOBJECT, new StringName("objectref"))
};
@SuppressWarnings("unchecked")
SimpleValue[] nullValues = new SimpleValue[]
{
- new SimpleValueSupport<BigDecimal>(SimpleMetaType.BIGDECIMAL, null),
- new SimpleValueSupport<BigInteger>(SimpleMetaType.BIGINTEGER, null),
- new SimpleValueSupport<Boolean>(SimpleMetaType.BOOLEAN, null),
- new SimpleValueSupport<Byte>(SimpleMetaType.BYTE, null),
- new SimpleValueSupport<Character>(SimpleMetaType.CHARACTER, null),
- new SimpleValueSupport<Date>(SimpleMetaType.DATE, null),
- new SimpleValueSupport<Double>(SimpleMetaType.DOUBLE, null),
- new SimpleValueSupport<Float>(SimpleMetaType.FLOAT, null),
- new SimpleValueSupport<Integer>(SimpleMetaType.INTEGER, null),
- new SimpleValueSupport<Long>(SimpleMetaType.LONG, null),
- new SimpleValueSupport<Short>(SimpleMetaType.SHORT, null),
- new SimpleValueSupport<String>(SimpleMetaType.STRING, null),
+ new SimpleValueSupport(SimpleMetaType.BIGDECIMAL, null),
+ new SimpleValueSupport(SimpleMetaType.BIGINTEGER, null),
+ new SimpleValueSupport(SimpleMetaType.BOOLEAN, null),
+ new SimpleValueSupport(SimpleMetaType.BYTE, null),
+ new SimpleValueSupport(SimpleMetaType.CHARACTER, null),
+ new SimpleValueSupport(SimpleMetaType.DATE, null),
+ new SimpleValueSupport(SimpleMetaType.DOUBLE, null),
+ new SimpleValueSupport(SimpleMetaType.FLOAT, null),
+ new SimpleValueSupport(SimpleMetaType.INTEGER, null),
+ new SimpleValueSupport(SimpleMetaType.LONG, null),
+ new SimpleValueSupport(SimpleMetaType.SHORT, null),
+ new SimpleValueSupport(SimpleMetaType.STRING, null),
new SimpleValueSupport(SimpleMetaType.VOID, null),
- new SimpleValueSupport<Name>(SimpleMetaType.NAMEDOBJECT, null)
+ new SimpleValueSupport(SimpleMetaType.NAMEDOBJECT, null)
};
/**
@@ -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/TestMetaMapper.java
===================================================================
--- projects/microcontainer/trunk/metatype/src/tests/org/jboss/test/metatype/values/factory/support/TestMetaMapper.java 2008-02-28 10:21:25 UTC (rev 70206)
+++ projects/microcontainer/trunk/metatype/src/tests/org/jboss/test/metatype/values/factory/support/TestMetaMapper.java 2008-02-28 10:57:52 UTC (rev 70207)
@@ -44,7 +44,7 @@
return String.class;
}
- public MetaValue createMetaValue(MetaType<?> metaType, TestMetaMapped object)
+ public MetaValue createMetaValue(MetaType metaType, TestMetaMapped object)
{
return SimpleValueSupport.wrap(object.getValue());
}
@@ -54,7 +54,7 @@
if (SimpleMetaType.STRING.equals(metaValue.getMetaType()) == false)
throw new IllegalArgumentException("Not a string: " + metaValue);
- SimpleValue<?> simple = (SimpleValue<?>) metaValue;
+ SimpleValue simple = (SimpleValue) metaValue;
String value = (String) simple.getValue();
return new TestMetaMapped(value);
}
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-28 10:21:25 UTC (rev 70206)
+++ projects/microcontainer/trunk/metatype/src/tests/org/jboss/test/metatype/values/factory/support/TestOverrideCompositeBuilder.java 2008-02-28 10:57:52 UTC (rev 70207)
@@ -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-28 10:21:25 UTC (rev 70206)
+++ projects/microcontainer/trunk/metatype/src/tests/org/jboss/test/metatype/values/factory/test/AbstractMetaValueFactoryTest.java 2008-02-28 10:57:52 UTC (rev 70207)
@@ -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-28 10:21:25 UTC (rev 70206)
+++ projects/microcontainer/trunk/metatype/src/tests/org/jboss/test/metatype/values/factory/test/ArrayValueFactoryUnitTestCase.java 2008-02-28 10:57:52 UTC (rev 70207)
@@ -70,12 +70,12 @@
public void testSimpleArray() throws Exception
{
String[] array = { "Hello", "Goodbye" };
- ArrayMetaType<String> arrayType = assertInstanceOf(resolve(array.getClass()), ArrayMetaType.class);
+ ArrayMetaType arrayType = assertInstanceOf(resolve(array.getClass()), ArrayMetaType.class);
MetaValue[] metaArray = { SimpleValueSupport.wrap("Hello"), SimpleValueSupport.wrap("Goodbye") };
- ArrayValueSupport<String> expected = new ArrayValueSupport<String>(arrayType, metaArray);
+ ArrayValueSupport expected = new ArrayValueSupport(arrayType, metaArray);
MetaValue result = createMetaValue(array);
- ArrayValue<String> actual = assertInstanceOf(result, ArrayValue.class);
+ ArrayValue actual = assertInstanceOf(result, ArrayValue.class);
getLog().debug("Array Value: " + actual);
assertEquals(expected, actual);
}
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-28 10:21:25 UTC (rev 70206)
+++ projects/microcontainer/trunk/metatype/src/tests/org/jboss/test/metatype/values/factory/test/CollectionValueFactoryUnitTestCase.java 2008-02-28 10:57:52 UTC (rev 70207)
@@ -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-28 10:21:25 UTC (rev 70206)
+++ projects/microcontainer/trunk/metatype/src/tests/org/jboss/test/metatype/values/factory/test/MapValueFactoryUnitTestCase.java 2008-02-28 10:57:52 UTC (rev 70207)
@@ -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/MetaMapperUnitTestCase.java
===================================================================
--- projects/microcontainer/trunk/metatype/src/tests/org/jboss/test/metatype/values/factory/test/MetaMapperUnitTestCase.java 2008-02-28 10:21:25 UTC (rev 70206)
+++ projects/microcontainer/trunk/metatype/src/tests/org/jboss/test/metatype/values/factory/test/MetaMapperUnitTestCase.java 2008-02-28 10:57:52 UTC (rev 70207)
@@ -48,7 +48,7 @@
public void testMetaMapper() throws Exception
{
- MetaType<?> metaType = resolve(TestMetaMapped.class);
+ MetaType metaType = resolve(TestMetaMapped.class);
assertEquals(SimpleMetaType.STRING, metaType);
TestMetaMapped test = new TestMetaMapped("Hello");
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-28 10:21:25 UTC (rev 70206)
+++ projects/microcontainer/trunk/metatype/src/tests/org/jboss/test/metatype/values/factory/test/SimpleValueFactoryUnitTestCase.java 2008-02-28 10:57:52 UTC (rev 70207)
@@ -92,18 +92,18 @@
@SuppressWarnings("unchecked")
SimpleValue[] metaValues = new SimpleValue[]
{
- new SimpleValueSupport<BigDecimal>(SimpleMetaType.BIGDECIMAL, BIG_DECIMAL),
- new SimpleValueSupport<BigInteger>(SimpleMetaType.BIGINTEGER, BIG_INTEGER),
- new SimpleValueSupport<Boolean>(SimpleMetaType.BOOLEAN, BOOLEAN),
- new SimpleValueSupport<Byte>(SimpleMetaType.BYTE, BYTE),
- new SimpleValueSupport<Character>(SimpleMetaType.CHARACTER, CHARACTER),
- new SimpleValueSupport<Date>(SimpleMetaType.DATE, DATE),
- new SimpleValueSupport<Double>(SimpleMetaType.DOUBLE, DOUBLE),
- new SimpleValueSupport<Float>(SimpleMetaType.FLOAT, FLOAT),
- new SimpleValueSupport<Integer>(SimpleMetaType.INTEGER, INTEGER),
- new SimpleValueSupport<Long>(SimpleMetaType.LONG, LONG),
- new SimpleValueSupport<Short>(SimpleMetaType.SHORT, SHORT),
- new SimpleValueSupport<String>(SimpleMetaType.STRING, STRING),
+ new SimpleValueSupport(SimpleMetaType.BIGDECIMAL, BIG_DECIMAL),
+ new SimpleValueSupport(SimpleMetaType.BIGINTEGER, BIG_INTEGER),
+ new SimpleValueSupport(SimpleMetaType.BOOLEAN, BOOLEAN),
+ new SimpleValueSupport(SimpleMetaType.BYTE, BYTE),
+ new SimpleValueSupport(SimpleMetaType.CHARACTER, CHARACTER),
+ new SimpleValueSupport(SimpleMetaType.DATE, DATE),
+ new SimpleValueSupport(SimpleMetaType.DOUBLE, DOUBLE),
+ new SimpleValueSupport(SimpleMetaType.FLOAT, FLOAT),
+ new SimpleValueSupport(SimpleMetaType.INTEGER, INTEGER),
+ new SimpleValueSupport(SimpleMetaType.LONG, LONG),
+ new SimpleValueSupport(SimpleMetaType.SHORT, SHORT),
+ new SimpleValueSupport(SimpleMetaType.STRING, STRING),
};
/**
@@ -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-28 10:21:25 UTC (rev 70206)
+++ projects/microcontainer/trunk/metatype/src/tests/org/jboss/test/metatype/values/factory/test/SpecialValueFactoryUnitTestCase.java 2008-02-28 10:57:52 UTC (rev 70207)
@@ -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/test/ArrayValueSupportUnitTestCase.java
===================================================================
--- projects/microcontainer/trunk/metatype/src/tests/org/jboss/test/metatype/values/test/ArrayValueSupportUnitTestCase.java 2008-02-28 10:21:25 UTC (rev 70206)
+++ projects/microcontainer/trunk/metatype/src/tests/org/jboss/test/metatype/values/test/ArrayValueSupportUnitTestCase.java 2008-02-28 10:57:52 UTC (rev 70207)
@@ -73,9 +73,9 @@
public void testCharArray() throws Exception
{
- ArrayMetaType<Character> type = new ArrayMetaType<Character>(1, SimpleMetaType.CHARACTER);
+ ArrayMetaType type = new ArrayMetaType(1, SimpleMetaType.CHARACTER);
char[] value = {'h', 'e', 'l', 'l', 'o'};
- ArrayValueSupport<Character> avs = new ArrayValueSupport<Character>(type, value);
+ ArrayValueSupport avs = new ArrayValueSupport(type, value);
// Use getValue(int) accessor
for(int n = 0; n < avs.getLength(); n ++)
{
@@ -84,9 +84,9 @@
}
// Use typesafe foreach Iterable
int i = 0;
- for(Character c : avs)
+ for(Object c : avs)
{
- assertEquals("["+i+"]", (Character) value[i++], c);
+ assertEquals("["+i+"]", value[i++], c);
}
// Validate the primative array
char[] raw = (char[]) avs.getValue();
@@ -117,9 +117,9 @@
public void test2DCharArray() throws Exception
{
- ArrayMetaType<Character[]> type = new ArrayMetaType<Character[]>(2, SimpleMetaType.CHARACTER, true);
+ ArrayMetaType type = new ArrayMetaType(2, SimpleMetaType.CHARACTER, true);
char[][] value = {{'h', 'e'}, {'l', 'l', 'o'}};
- ArrayValueSupport<Character[]> avs = new ArrayValueSupport<Character[]>(type, value);
+ ArrayValueSupport avs = new ArrayValueSupport(type, value);
assertEquals(value.length, avs.getLength());
for(int m = 0; m < value.length; m ++)
{
Modified: projects/microcontainer/trunk/metatype/src/tests/org/jboss/test/metatype/values/test/CompositeValueSupportUnitTestCase.java
===================================================================
--- projects/microcontainer/trunk/metatype/src/tests/org/jboss/test/metatype/values/test/CompositeValueSupportUnitTestCase.java 2008-02-28 10:21:25 UTC (rev 70206)
+++ projects/microcontainer/trunk/metatype/src/tests/org/jboss/test/metatype/values/test/CompositeValueSupportUnitTestCase.java 2008-02-28 10:57:52 UTC (rev 70207)
@@ -112,8 +112,8 @@
*/
public void testGetAll() throws Exception
{
- SimpleValue<String> value1 = initStringValue1();
- SimpleValue<Integer> integer2 = initInteger2();
+ SimpleValue value1 = initStringValue1();
+ SimpleValue integer2 = initInteger2();
CompositeMetaType compositeMetaType = initCompositeMetaType();
Map<String, MetaValue> map = initMapValues();
CompositeValue v = new CompositeValueSupport(compositeMetaType, map);
@@ -154,12 +154,12 @@
*/
public void testContainsValue() throws Exception
{
- SimpleValue<String> value1 = initStringValue1();
- SimpleValue<Integer> integer2 = initInteger2();
- SimpleValue<String> name1 = initStringName1();
- SimpleValue<String> nullString = initStringNull();
- SimpleValue<String> emptyString = initStringEmpty();
- SimpleValue<Integer> nullInteger = initIntegerNull();
+ SimpleValue value1 = initStringValue1();
+ SimpleValue integer2 = initInteger2();
+ SimpleValue name1 = initStringName1();
+ SimpleValue nullString = initStringNull();
+ SimpleValue emptyString = initStringEmpty();
+ SimpleValue nullInteger = initIntegerNull();
CompositeMetaType compositeMetaType = initCompositeMetaType();
Map<String, MetaValue> map = initMapValues();
CompositeValue v = new CompositeValueSupport(compositeMetaType, map);
@@ -193,12 +193,12 @@
*/
public void testValues() throws Exception
{
- SimpleValue<String> value1 = initStringValue1();
- SimpleValue<Integer> integer2 = initInteger2();
- SimpleValue<String> name1 = initStringName1();
- SimpleValue<String> nullString = initStringNull();
- SimpleValue<String> emptyString = initStringEmpty();
- SimpleValue<Integer> nullInteger = initIntegerNull();
+ SimpleValue value1 = initStringValue1();
+ SimpleValue integer2 = initInteger2();
+ SimpleValue name1 = initStringName1();
+ SimpleValue nullString = initStringNull();
+ SimpleValue emptyString = initStringEmpty();
+ SimpleValue nullInteger = initIntegerNull();
CompositeMetaType compositeMetaType = initCompositeMetaType();
Map<String, MetaValue> map = initMapValues();
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-28 10:21:25 UTC (rev 70206)
+++ projects/microcontainer/trunk/metatype/src/tests/org/jboss/test/metatype/values/test/SimpleValueSupportUnitTestCase.java 2008-02-28 10:57:52 UTC (rev 70207)
@@ -73,7 +73,7 @@
*/
public void testGetSimpleMetaType() throws Exception
{
- SimpleValue<String> value = initStringValue1();
+ SimpleValue value = initStringValue1();
assertEquals(SimpleMetaType.STRING, value.getMetaType());
}
@@ -84,7 +84,7 @@
*/
public void testGetValue()throws Exception
{
- SimpleValue<String> value = initStringValue1();
+ SimpleValue value = initStringValue1();
assertEquals("value1", value.getValue());
}
@@ -95,7 +95,7 @@
*/
public void testSetValue()throws Exception
{
- SimpleValueSupport<String> value = (SimpleValueSupport<String>) initStringValue1();
+ SimpleValueSupport value = (SimpleValueSupport) initStringValue1();
value.setValue("value2");
assertEquals("value2", value.getValue());
}
@@ -107,7 +107,7 @@
*/
public void testEquals() throws Exception
{
- SimpleValue<String> v = initStringValue1();
+ SimpleValue v = initStringValue1();
assertEquals("data should equal itself", v, v);
assertNotSame("data should not equal null", v, null);
@@ -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);
@@ -138,7 +138,7 @@
*/
public void testHashCode() throws Exception
{
- SimpleValue<String> v = initStringValue1();
+ SimpleValue v = initStringValue1();
int myHashCode = "value1".hashCode();
assertEquals("Wrong hash code generated", myHashCode, v.hashCode());
@@ -151,7 +151,7 @@
*/
public void testToString() throws Exception
{
- SimpleValue<String> v = initStringValue1();
+ SimpleValue v = initStringValue1();
String toString = v.toString();
@@ -166,7 +166,7 @@
*/
public void testSerialization() throws Exception
{
- SimpleValue<String> v = initStringValue1();
+ SimpleValue v = initStringValue1();
byte[] bytes = serialize(v);
Object result = deserialize(bytes);
assertEquals(v, result);
@@ -181,7 +181,7 @@
{
try
{
- new SimpleValueSupport<String>(null, "value1");
+ new SimpleValueSupport(null, "value1");
fail("Excepted IllegalArgumentException for null simple type");
}
catch (Throwable t)
@@ -189,6 +189,6 @@
checkThrowable(IllegalArgumentException.class, t);
}
- new SimpleValueSupport<String>(SimpleMetaType.STRING, null);
+ new SimpleValueSupport(SimpleMetaType.STRING, null);
}
}
More information about the jboss-cvs-commits
mailing list