[jboss-cvs] JBossAS SVN: r69903 - in projects/microcontainer/trunk/managed/src: main/org/jboss/managed/api/annotation and 7 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Feb 18 13:33:38 EST 2008
Author: adrian at jboss.org
Date: 2008-02-18 13:33:38 -0500 (Mon, 18 Feb 2008)
New Revision: 69903
Modified:
projects/microcontainer/trunk/managed/src/main/org/jboss/managed/api/ManagedCommon.java
projects/microcontainer/trunk/managed/src/main/org/jboss/managed/api/ManagedDeployment.java
projects/microcontainer/trunk/managed/src/main/org/jboss/managed/api/ManagedObject.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/api/annotation/ManagementObject.java
projects/microcontainer/trunk/managed/src/main/org/jboss/managed/api/annotation/ManagementObjectRef.java
projects/microcontainer/trunk/managed/src/main/org/jboss/managed/api/annotation/ManagementProperty.java
projects/microcontainer/trunk/managed/src/main/org/jboss/managed/api/annotation/ManagementRuntimeRef.java
projects/microcontainer/trunk/managed/src/main/org/jboss/managed/api/annotation/ViewUse.java
projects/microcontainer/trunk/managed/src/main/org/jboss/managed/api/factory/ManagedObjectFactory.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/main/org/jboss/managed/spi/factory/ManagedParameterConstraintsPopulator.java
projects/microcontainer/trunk/managed/src/main/org/jboss/managed/spi/factory/ManagedPropertyConstraintsPopulator.java
projects/microcontainer/trunk/managed/src/tests/org/jboss/test/managed/ManagedTest.java
projects/microcontainer/trunk/managed/src/tests/org/jboss/test/managed/ManagedTestDelegate.java
projects/microcontainer/trunk/managed/src/tests/org/jboss/test/managed/factory/AbstractManagedObjectFactoryTest.java
projects/microcontainer/trunk/managed/src/tests/org/jboss/test/managed/mock/MockDataSourceManagedObject.java
Log:
Source code tidyup in the managed project
Modified: projects/microcontainer/trunk/managed/src/main/org/jboss/managed/api/ManagedCommon.java
===================================================================
--- projects/microcontainer/trunk/managed/src/main/org/jboss/managed/api/ManagedCommon.java 2008-02-18 18:23:03 UTC (rev 69902)
+++ projects/microcontainer/trunk/managed/src/main/org/jboss/managed/api/ManagedCommon.java 2008-02-18 18:33:38 UTC (rev 69903)
@@ -25,6 +25,9 @@
import java.util.Map;
import java.util.Set;
+import org.jboss.managed.api.annotation.ManagementObject;
+import org.jboss.managed.api.annotation.ManagementObjectID;
+
/**
* ManagedCommon is used to hold common
* properties that both, server side and client side,
@@ -46,14 +49,14 @@
* Get the external name by which the ManagedObject is known
* @see {@linkplain ManagementObject#name}}
* @see {@linkplain ManagementObjectID#name}}
- * @return
+ * @return the name
*/
String getName();
/**
* Get the external name type/qualifier.
* @see {@linkplain ManagementObject#type}
* @see {@linkplain ManagementObjectID#type}
- * @return
+ * @return the name type
*/
String getNameType();
Modified: projects/microcontainer/trunk/managed/src/main/org/jboss/managed/api/ManagedDeployment.java
===================================================================
--- projects/microcontainer/trunk/managed/src/main/org/jboss/managed/api/ManagedDeployment.java 2008-02-18 18:23:03 UTC (rev 69902)
+++ projects/microcontainer/trunk/managed/src/main/org/jboss/managed/api/ManagedDeployment.java 2008-02-18 18:33:38 UTC (rev 69903)
@@ -136,13 +136,14 @@
/**
* Add a component to this deployment
- * @param name
- * @param comp
+ * @param name the name
+ * @param comp the component
*/
public void addComponent(String name, ManagedComponent comp);
/**
*
- * @param name
+ * @param name the name
+ * @return true when it was removed
*/
public boolean removeComponent(String name);
Modified: projects/microcontainer/trunk/managed/src/main/org/jboss/managed/api/ManagedObject.java
===================================================================
--- projects/microcontainer/trunk/managed/src/main/org/jboss/managed/api/ManagedObject.java 2008-02-18 18:23:03 UTC (rev 69902)
+++ projects/microcontainer/trunk/managed/src/main/org/jboss/managed/api/ManagedObject.java 2008-02-18 18:33:38 UTC (rev 69903)
@@ -25,6 +25,8 @@
import java.lang.annotation.Annotation;
import java.util.Map;
+import org.jboss.managed.api.annotation.ManagementRuntimeRef;
+
/**
* ManagedObject is an interface for a manageable element. It
* consists of:
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-18 18:23:03 UTC (rev 69902)
+++ projects/microcontainer/trunk/managed/src/main/org/jboss/managed/api/ManagedOperation.java 2008-02-18 18:33:38 UTC (rev 69903)
@@ -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-18 18:23:03 UTC (rev 69902)
+++ projects/microcontainer/trunk/managed/src/main/org/jboss/managed/api/ManagedParameter.java 2008-02-18 18:33:38 UTC (rev 69903)
@@ -79,7 +79,7 @@
*
* @return the type
*/
- MetaType getMetaType();
+ MetaType<?> getMetaType();
/**
* Get the value
@@ -107,14 +107,14 @@
*
* @return the minimum value
*/
- Comparable getMinimumValue();
+ Comparable<?> getMinimumValue();
/**
* Get the miximum value
*
* @return the maximum value
*/
- Comparable getMaximumValue();
+ Comparable<?> getMaximumValue();
/**
* Check whether this is a valid 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-18 18:23:03 UTC (rev 69902)
+++ projects/microcontainer/trunk/managed/src/main/org/jboss/managed/api/ManagedProperty.java 2008-02-18 18:33:38 UTC (rev 69903)
@@ -26,6 +26,7 @@
import java.util.Map;
import java.util.Set;
+import org.jboss.managed.api.annotation.ManagementObjectRef;
import org.jboss.metatype.api.types.MetaType;
import org.jboss.metatype.api.values.MetaValue;
@@ -109,7 +110,7 @@
*
* @return the type
*/
- MetaType getMetaType();
+ MetaType<?> getMetaType();
/**
* Get the annotations associated with the property
@@ -143,14 +144,14 @@
*
* @return the minimum value
*/
- Comparable getMinimumValue();
+ Comparable<?> getMinimumValue();
/**
* Get the miximum value
*
* @return the maximum value
*/
- Comparable getMaximumValue();
+ Comparable<?> getMaximumValue();
/**
* Check whether this is a valid value
Modified: projects/microcontainer/trunk/managed/src/main/org/jboss/managed/api/annotation/ManagementObject.java
===================================================================
--- projects/microcontainer/trunk/managed/src/main/org/jboss/managed/api/annotation/ManagementObject.java 2008-02-18 18:23:03 UTC (rev 69902)
+++ projects/microcontainer/trunk/managed/src/main/org/jboss/managed/api/annotation/ManagementObject.java 2008-02-18 18:33:38 UTC (rev 69903)
@@ -27,6 +27,7 @@
import java.lang.annotation.Target;
import org.jboss.managed.api.Fields;
+import org.jboss.managed.api.ManagedObject;
import org.jboss.managed.api.ManagedProperty;
import org.jboss.managed.api.annotation.ManagementProperty.NULL_CONSTRAINTS;
import org.jboss.managed.api.annotation.ManagementProperty.NULL_FIELDS_FACTORY;
@@ -35,7 +36,7 @@
/**
* ManagementObject annotation for describing ManagedObjects.
- * @see {@linkplain ManagedObject}
+ * {@linkplain ManagedObject}
*
* @author <a href="adrian at jboss.com">Adrian Brock</a>
* @author Scott.Stark at jboss.org
Modified: projects/microcontainer/trunk/managed/src/main/org/jboss/managed/api/annotation/ManagementObjectRef.java
===================================================================
--- projects/microcontainer/trunk/managed/src/main/org/jboss/managed/api/annotation/ManagementObjectRef.java 2008-02-18 18:23:03 UTC (rev 69902)
+++ projects/microcontainer/trunk/managed/src/main/org/jboss/managed/api/annotation/ManagementObjectRef.java 2008-02-18 18:33:38 UTC (rev 69903)
@@ -26,6 +26,8 @@
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
+import org.jboss.managed.api.ManagedObject;
+
/**
* Indicates a property that references another ManagedObject
*
Modified: projects/microcontainer/trunk/managed/src/main/org/jboss/managed/api/annotation/ManagementProperty.java
===================================================================
--- projects/microcontainer/trunk/managed/src/main/org/jboss/managed/api/annotation/ManagementProperty.java 2008-02-18 18:23:03 UTC (rev 69902)
+++ projects/microcontainer/trunk/managed/src/main/org/jboss/managed/api/annotation/ManagementProperty.java 2008-02-18 18:33:38 UTC (rev 69903)
@@ -21,6 +21,7 @@
*/
package org.jboss.managed.api.annotation;
+import java.io.Serializable;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
@@ -76,7 +77,7 @@
/** The constraints, allowed values populator factory */
Class<? extends ManagedPropertyConstraintsPopulatorFactory> constraintsFactory() default NULL_CONSTRAINTS.class;
/** The constraints, allowed values populator factory */
- Class<? extends InstanceClassFactory> marshallerFactory() default NULL_MARSHALLER_FACTORY.class;
+ Class<? extends InstanceClassFactory<? extends Serializable>> marshallerFactory() default NULL_MARSHALLER_FACTORY.class;
/**
* Used in {@link ManagementProperty#constraintsFactory()} to
@@ -111,7 +112,7 @@
* Used in {@link ManagementProperty#propertyFactory()} to
* indicate that no ManagedProperty factory is defined.
*/
- public static abstract class NULL_MARSHALLER_FACTORY implements InstanceClassFactory
+ public static abstract class NULL_MARSHALLER_FACTORY implements InstanceClassFactory<Serializable>
{
}
}
Modified: projects/microcontainer/trunk/managed/src/main/org/jboss/managed/api/annotation/ManagementRuntimeRef.java
===================================================================
--- projects/microcontainer/trunk/managed/src/main/org/jboss/managed/api/annotation/ManagementRuntimeRef.java 2008-02-18 18:23:03 UTC (rev 69902)
+++ projects/microcontainer/trunk/managed/src/main/org/jboss/managed/api/annotation/ManagementRuntimeRef.java 2008-02-18 18:33:38 UTC (rev 69903)
@@ -46,7 +46,7 @@
Class<? extends RuntimeComponentNameTransformer> transformer() default DEFAULT_NAME_TRANSFORMER.class;
/**
- * Used in {@link @ManagementRuntimeRef#transformer()} to
+ * Used in {@link ManagementRuntimeRef#transformer()} to
* indicate that no name transformation is defined.
*/
public static final class DEFAULT_NAME_TRANSFORMER implements RuntimeComponentNameTransformer
Modified: projects/microcontainer/trunk/managed/src/main/org/jboss/managed/api/annotation/ViewUse.java
===================================================================
--- projects/microcontainer/trunk/managed/src/main/org/jboss/managed/api/annotation/ViewUse.java 2008-02-18 18:23:03 UTC (rev 69902)
+++ projects/microcontainer/trunk/managed/src/main/org/jboss/managed/api/annotation/ViewUse.java 2008-02-18 18:33:38 UTC (rev 69903)
@@ -21,6 +21,8 @@
*/
package org.jboss.managed.api.annotation;
+import org.jboss.managed.api.ManagedProperty;
+
/**
* An enum for the types of management views a {@link ManagedProperty property}
* is associated with.
Modified: projects/microcontainer/trunk/managed/src/main/org/jboss/managed/api/factory/ManagedObjectFactory.java
===================================================================
--- projects/microcontainer/trunk/managed/src/main/org/jboss/managed/api/factory/ManagedObjectFactory.java 2008-02-18 18:23:03 UTC (rev 69902)
+++ projects/microcontainer/trunk/managed/src/main/org/jboss/managed/api/factory/ManagedObjectFactory.java 2008-02-18 18:33:38 UTC (rev 69903)
@@ -24,6 +24,7 @@
import java.io.Serializable;
import org.jboss.managed.api.ManagedObject;
+import org.jboss.managed.api.annotation.ManagementObjectID;
import org.jboss.managed.plugins.factory.ManagedObjectFactoryBuilder;
import org.jboss.managed.spi.factory.InstanceClassFactory;
import org.jboss.managed.spi.factory.ManagedObjectBuilder;
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-18 18:23:03 UTC (rev 69902)
+++ projects/microcontainer/trunk/managed/src/main/org/jboss/managed/plugins/DefaultFieldsImpl.java 2008-02-18 18:33:38 UTC (rev 69903)
@@ -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);
}
@@ -172,7 +172,7 @@
*
* @return the minimum value
*/
- public Comparable getMinimumValue()
+ public Comparable<?> getMinimumValue()
{
return getField(MINIMUM_VALUE, Comparable.class);
}
@@ -182,7 +182,7 @@
*
* @param value the value
*/
- public void setMinimumValue(Comparable value)
+ public void setMinimumValue(Comparable<?> value)
{
setField(MINIMUM_VALUE, (Serializable)value);
}
@@ -192,7 +192,7 @@
*
* @return the value
*/
- public Comparable getMaximumValue()
+ public Comparable<?> getMaximumValue()
{
return getField(MAXIMUM_VALUE, Comparable.class);
}
@@ -202,7 +202,7 @@
*
* @param value the value
*/
- public void setMaximumValue(Comparable value)
+ public void setMaximumValue(Comparable<?> value)
{
setField(MAXIMUM_VALUE, (Serializable)value);
}
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-18 18:23:03 UTC (rev 69902)
+++ projects/microcontainer/trunk/managed/src/main/org/jboss/managed/plugins/ManagedOperationImpl.java 2008-02-18 18:33:38 UTC (rev 69903)
@@ -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-18 18:23:03 UTC (rev 69902)
+++ projects/microcontainer/trunk/managed/src/main/org/jboss/managed/plugins/ManagedParameterImpl.java 2008-02-18 18:33:38 UTC (rev 69903)
@@ -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);
}
@@ -198,7 +198,7 @@
setField(Fields.LEGAL_VALUES, (Serializable)values);
}
- public Comparable getMinimumValue()
+ public Comparable<?> getMinimumValue()
{
return getField(Fields.MINIMUM_VALUE, Comparable.class);
}
@@ -208,12 +208,12 @@
*
* @param value the value
*/
- public void setMinimumValue(Comparable value)
+ public void setMinimumValue(Comparable<?> value)
{
setField(Fields.MINIMUM_VALUE, (Serializable)value);
}
- public Comparable getMaximumValue()
+ public Comparable<?> getMaximumValue()
{
return getField(Fields.MAXIMUM_VALUE, Comparable.class);
}
@@ -223,7 +223,7 @@
*
* @param value the value
*/
- public void setMaximumValue(Comparable value)
+ public void setMaximumValue(Comparable<?> value)
{
setField(Fields.MAXIMUM_VALUE, (Serializable)value);
}
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-18 18:23:03 UTC (rev 69902)
+++ projects/microcontainer/trunk/managed/src/main/org/jboss/managed/plugins/ManagedPropertyImpl.java 2008-02-18 18:33:38 UTC (rev 69903)
@@ -205,10 +205,11 @@
* Get the annotations associated with the property
* @return the annotations associated with the property
*/
+ @SuppressWarnings("unchecked")
public Map<String, Annotation> getAnnotations()
{
Object set = getField(Fields.ANNOTATIONS, Object.class);
- return (Map<String, Annotation>) set;
+ return (Map) set;
}
public void setAnnotations(Map<String, Annotation> annotations)
@@ -216,7 +217,7 @@
setField(Fields.ANNOTATIONS, (Serializable) annotations);
}
- public MetaType getMetaType()
+ public MetaType<?> getMetaType()
{
return getField(Fields.META_TYPE, MetaType.class);
}
@@ -226,7 +227,7 @@
*
* @param type the meta type
*/
- public void setMetaType(MetaType type)
+ public void setMetaType(MetaType<?> type)
{
setField(Fields.META_TYPE, type);
}
@@ -257,7 +258,7 @@
setField(Fields.LEGAL_VALUES, (Serializable)values);
}
- public Comparable getMinimumValue()
+ public Comparable<?> getMinimumValue()
{
return getField(Fields.MINIMUM_VALUE, Comparable.class);
}
@@ -267,12 +268,12 @@
*
* @param value the value
*/
- public void setMinimumValue(Comparable value)
+ public void setMinimumValue(Comparable<?> value)
{
setField(Fields.MINIMUM_VALUE, (Serializable)value);
}
- public Comparable getMaximumValue()
+ public Comparable<?> getMaximumValue()
{
return getField(Fields.MAXIMUM_VALUE, Comparable.class);
}
@@ -282,7 +283,7 @@
*
* @param value the value
*/
- public void setMaximumValue(Comparable value)
+ public void setMaximumValue(Comparable<?> value)
{
setField(Fields.MAXIMUM_VALUE, (Serializable)value);
}
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-18 18:23:03 UTC (rev 69902)
+++ projects/microcontainer/trunk/managed/src/main/org/jboss/managed/plugins/factory/AbstractManagedObjectFactory.java 2008-02-18 18:33:38 UTC (rev 69903)
@@ -114,10 +114,10 @@
private MetaValueFactory metaValueFactory = MetaValueFactory.getInstance();
/** The managed object builders */
- private Map<Class, ManagedObjectBuilder> builders = new WeakHashMap<Class, ManagedObjectBuilder>();
+ private Map<Class<?>, ManagedObjectBuilder> builders = new WeakHashMap<Class<?>, ManagedObjectBuilder>();
/** The instance to class factories */
- private Map<Class, InstanceClassFactory> instanceFactories = new WeakHashMap<Class, InstanceClassFactory>();
+ private Map<Class<?>, InstanceClassFactory<? extends Serializable>> instanceFactories = new WeakHashMap<Class<?>, InstanceClassFactory<? extends Serializable>>();
/** The instance to name transformers */
private Map<TypeInfo, RuntimeComponentNameTransformer> transformers = new WeakHashMap<TypeInfo, RuntimeComponentNameTransformer>();
@@ -233,7 +233,7 @@
* @param clazz the clazz
* @return the skeleton managed object, null if clazz is not
* marked as a ManagementObject.
- * @see {@linkplain ManagementObject}
+ * {@linkplain ManagementObject}
*/
protected <T extends Serializable> ManagedObject createSkeletonManagedObject(Class<T> clazz)
{
@@ -251,6 +251,7 @@
* @return the ManagementObject if clazz is properly annotated, null if
* it does not have a ManagementObject annotation.
*/
+ @SuppressWarnings("unchecked")
public ManagedObject buildManagedObject(Class<? extends Serializable> clazz)
{
boolean trace = log.isTraceEnabled();
@@ -679,6 +680,7 @@
* @param object the object
* @return the meta value
*/
+ @SuppressWarnings("unchecked")
public MetaValue getValue(BeanInfo beanInfo, ManagedProperty property, Serializable object)
{
String name = getPropertyName(property);
@@ -719,10 +721,10 @@
}
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);
+ 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);
@@ -742,7 +744,7 @@
CollectionMetaType collectionType = CollectionMetaType.class.cast(propertyType);
if (MANAGED_OBJECT_META_TYPE == collectionType.getElementType())
{
- Collection cvalue = getAsCollection(value);
+ Collection<?> cvalue = getAsCollection(value);
List<GenericValueSupport> tmp = new ArrayList<GenericValueSupport>();
for(Object element : cvalue)
{
@@ -764,7 +766,7 @@
* @param beanInfo the bean info
* @param property the property
* @param object the object
- * @param the meta value
+ * @param value the meta value
*/
public void setValue(BeanInfo beanInfo, ManagedProperty property, Serializable object, MetaValue value)
{
@@ -786,7 +788,7 @@
*
* @param methodInfo
* @param opAnnotation
- * @return
+ * @return the managed operation
*/
protected ManagedOperation getManagedOperation(MethodInfo methodInfo, ManagementOperation opAnnotation)
{
@@ -796,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();
@@ -823,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
@@ -894,7 +896,7 @@
*
* @param type the type info
* @return transformer instance
- * @throws Exception for any error
+ * @throws Throwable for any error
*/
protected RuntimeComponentNameTransformer getComponentNameTransformer(TypeInfo type) throws Throwable
{
@@ -932,7 +934,7 @@
return this;
}
- protected Collection getAsCollection(Object value)
+ protected Collection<?> getAsCollection(Object value)
{
if( value.getClass().isArray() )
return Arrays.asList(value);
@@ -945,14 +947,14 @@
* Look for ctor(Fields)
* @param factory - the ManagedProperty implementation class
* @param fields - the fields to pass to the ctor
- * @return
+ * @return the managed property
*/
protected ManagedProperty getManagedProperty(Class<? extends ManagedProperty> factory, Fields fields)
{
ManagedProperty property = null;
try
{
- Class[] sig = {Fields.class};
+ Class<?>[] sig = {Fields.class};
Constructor<? extends ManagedProperty> ctor = factory.getConstructor(sig);
Object[] args = {fields};
property = ctor.newInstance(args);
Modified: projects/microcontainer/trunk/managed/src/main/org/jboss/managed/spi/factory/ManagedParameterConstraintsPopulator.java
===================================================================
--- projects/microcontainer/trunk/managed/src/main/org/jboss/managed/spi/factory/ManagedParameterConstraintsPopulator.java 2008-02-18 18:23:03 UTC (rev 69902)
+++ projects/microcontainer/trunk/managed/src/main/org/jboss/managed/spi/factory/ManagedParameterConstraintsPopulator.java 2008-02-18 18:33:38 UTC (rev 69903)
@@ -22,6 +22,7 @@
package org.jboss.managed.spi.factory;
import org.jboss.managed.api.Fields;
+import org.jboss.managed.api.ManagedParameter;
import org.jboss.reflect.spi.ParameterInfo;
/**
Modified: projects/microcontainer/trunk/managed/src/main/org/jboss/managed/spi/factory/ManagedPropertyConstraintsPopulator.java
===================================================================
--- projects/microcontainer/trunk/managed/src/main/org/jboss/managed/spi/factory/ManagedPropertyConstraintsPopulator.java 2008-02-18 18:23:03 UTC (rev 69902)
+++ projects/microcontainer/trunk/managed/src/main/org/jboss/managed/spi/factory/ManagedPropertyConstraintsPopulator.java 2008-02-18 18:33:38 UTC (rev 69903)
@@ -38,5 +38,6 @@
* @param info - the PropertyInfo for the attachment class property
* @param fields - the fields to add the constraints to
*/
+ @SuppressWarnings("unchecked")
public void populateManagedProperty(Class attachmentClass, PropertyInfo info, Fields fields);
}
Modified: projects/microcontainer/trunk/managed/src/tests/org/jboss/test/managed/ManagedTest.java
===================================================================
--- projects/microcontainer/trunk/managed/src/tests/org/jboss/test/managed/ManagedTest.java 2008-02-18 18:23:03 UTC (rev 69902)
+++ projects/microcontainer/trunk/managed/src/tests/org/jboss/test/managed/ManagedTest.java 2008-02-18 18:33:38 UTC (rev 69903)
@@ -46,7 +46,7 @@
* @return the delegate
* @throws Exception for any error
*/
- public static AbstractTestDelegate getDelegate(Class clazz) throws Exception
+ public static AbstractTestDelegate getDelegate(Class<?> clazz) throws Exception
{
return new ManagedTestDelegate(clazz);
}
Modified: projects/microcontainer/trunk/managed/src/tests/org/jboss/test/managed/ManagedTestDelegate.java
===================================================================
--- projects/microcontainer/trunk/managed/src/tests/org/jboss/test/managed/ManagedTestDelegate.java 2008-02-18 18:23:03 UTC (rev 69902)
+++ projects/microcontainer/trunk/managed/src/tests/org/jboss/test/managed/ManagedTestDelegate.java 2008-02-18 18:33:38 UTC (rev 69903)
@@ -48,7 +48,7 @@
* @param clazz the class
* @throws Exception for any error
*/
- public ManagedTestDelegate(Class clazz) throws Exception
+ public ManagedTestDelegate(Class<?> clazz) throws Exception
{
super(clazz);
}
@@ -84,7 +84,7 @@
* false otherwise.
* @throws Exception on failure to deploy the aop descriptor.
*/
- protected boolean deployAOP(Class referenceClass) throws Exception
+ protected boolean deployAOP(Class<?> referenceClass) throws Exception
{
String testName = referenceClass.getName();
testName = testName.replace('.', '/') + "-aop.xml";
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-18 18:23:03 UTC (rev 69902)
+++ projects/microcontainer/trunk/managed/src/tests/org/jboss/test/managed/factory/AbstractManagedObjectFactoryTest.java 2008-02-18 18:33:38 UTC (rev 69903)
@@ -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/managed/src/tests/org/jboss/test/managed/mock/MockDataSourceManagedObject.java
===================================================================
--- projects/microcontainer/trunk/managed/src/tests/org/jboss/test/managed/mock/MockDataSourceManagedObject.java 2008-02-18 18:23:03 UTC (rev 69902)
+++ projects/microcontainer/trunk/managed/src/tests/org/jboss/test/managed/mock/MockDataSourceManagedObject.java 2008-02-18 18:33:38 UTC (rev 69903)
@@ -22,7 +22,6 @@
package org.jboss.test.managed.mock;
import java.util.Map;
-import java.util.Set;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
More information about the jboss-cvs-commits
mailing list