[jboss-cvs] JBossAS SVN: r79872 - in projects/jboss-man/trunk/managed/src: main/java/org/jboss/managed/api/factory and 4 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Oct 21 16:16:14 EDT 2008
Author: scott.stark at jboss.org
Date: 2008-10-21 16:16:14 -0400 (Tue, 21 Oct 2008)
New Revision: 79872
Modified:
projects/jboss-man/trunk/managed/src/main/java/org/jboss/managed/api/ManagedObject.java
projects/jboss-man/trunk/managed/src/main/java/org/jboss/managed/api/factory/ManagedObjectFactory.java
projects/jboss-man/trunk/managed/src/main/java/org/jboss/managed/plugins/DelegateManagedObjectImpl.java
projects/jboss-man/trunk/managed/src/main/java/org/jboss/managed/plugins/ManagedObjectImpl.java
projects/jboss-man/trunk/managed/src/main/java/org/jboss/managed/plugins/WritethroughManagedPropertyImpl.java
projects/jboss-man/trunk/managed/src/main/java/org/jboss/managed/plugins/factory/AbstractInstanceClassFactory.java
projects/jboss-man/trunk/managed/src/main/java/org/jboss/managed/plugins/factory/AbstractManagedObjectFactory.java
projects/jboss-man/trunk/managed/src/main/java/org/jboss/managed/plugins/factory/AbstractManagedObjectPopulator.java
projects/jboss-man/trunk/managed/src/main/java/org/jboss/managed/spi/factory/InstanceClassFactory.java
projects/jboss-man/trunk/managed/src/main/java/org/jboss/managed/spi/factory/ManagedObjectBuilder.java
projects/jboss-man/trunk/managed/src/main/java/org/jboss/managed/spi/factory/ManagedObjectPopulator.java
projects/jboss-man/trunk/managed/src/test/java/org/jboss/test/managed/factory/support/amof/ManagementObjectWithRuntimeRefICF.java
projects/jboss-man/trunk/managed/src/test/java/org/jboss/test/managed/factory/support/amof/TestMOP.java
Log:
JBMAN-25, drop the java.io.Serialization api requirement
Modified: projects/jboss-man/trunk/managed/src/main/java/org/jboss/managed/api/ManagedObject.java
===================================================================
--- projects/jboss-man/trunk/managed/src/main/java/org/jboss/managed/api/ManagedObject.java 2008-10-21 20:12:36 UTC (rev 79871)
+++ projects/jboss-man/trunk/managed/src/main/java/org/jboss/managed/api/ManagedObject.java 2008-10-21 20:16:14 UTC (rev 79872)
@@ -49,7 +49,7 @@
*
* @return the underlying object
*/
- Serializable getAttachment();
+ Object getAttachment();
/**
* Get the annotations associated with the property
Modified: projects/jboss-man/trunk/managed/src/main/java/org/jboss/managed/api/factory/ManagedObjectFactory.java
===================================================================
--- projects/jboss-man/trunk/managed/src/main/java/org/jboss/managed/api/factory/ManagedObjectFactory.java 2008-10-21 20:12:36 UTC (rev 79871)
+++ projects/jboss-man/trunk/managed/src/main/java/org/jboss/managed/api/factory/ManagedObjectFactory.java 2008-10-21 20:16:14 UTC (rev 79872)
@@ -74,7 +74,7 @@
* @return the managed object
* @throws IllegalArgumentException for a null class
*/
- public abstract <T extends Serializable> ManagedObject createManagedObject(Class<T> clazz);
+ public abstract <T> ManagedObject createManagedObject(Class<T> clazz);
/**
* Set a managed object builder
@@ -92,7 +92,7 @@
* @param factory - the factory used to obtain the class to scan for
* management annotations.
*/
- public abstract <T extends Serializable> void setInstanceClassFactory(Class<T> clazz, InstanceClassFactory<T> factory);
+ public abstract <X> void setInstanceClassFactory(Class<X> clazz, InstanceClassFactory<X> factory);
/**
* Get the InstanceClassFactory for an instance type.
@@ -102,5 +102,5 @@
* @return the factory used to obtain the class to scan for
* management annotations.
*/
- public abstract <T extends Serializable> InstanceClassFactory<T> getInstanceClassFactory(Class<T> clazz);
+ public abstract <T> InstanceClassFactory<T> getInstanceClassFactory(Class<T> clazz);
}
Modified: projects/jboss-man/trunk/managed/src/main/java/org/jboss/managed/plugins/DelegateManagedObjectImpl.java
===================================================================
--- projects/jboss-man/trunk/managed/src/main/java/org/jboss/managed/plugins/DelegateManagedObjectImpl.java 2008-10-21 20:12:36 UTC (rev 79871)
+++ projects/jboss-man/trunk/managed/src/main/java/org/jboss/managed/plugins/DelegateManagedObjectImpl.java 2008-10-21 20:16:14 UTC (rev 79872)
@@ -50,7 +50,7 @@
return delegate.getAnnotations();
}
- public Serializable getAttachment()
+ public Object getAttachment()
{
return delegate.getAttachment();
}
Modified: projects/jboss-man/trunk/managed/src/main/java/org/jboss/managed/plugins/ManagedObjectImpl.java
===================================================================
--- projects/jboss-man/trunk/managed/src/main/java/org/jboss/managed/plugins/ManagedObjectImpl.java 2008-10-21 20:12:36 UTC (rev 79871)
+++ projects/jboss-man/trunk/managed/src/main/java/org/jboss/managed/plugins/ManagedObjectImpl.java 2008-10-21 20:16:14 UTC (rev 79872)
@@ -53,7 +53,7 @@
private String attachmentName;
/** The attachment */
- private transient Serializable attachment;
+ private transient Object attachment;
/** The object annotations <Class name, Annotation> */
private Map<String, Annotation> annotations = Collections.emptyMap();
/** The properties */
@@ -224,7 +224,7 @@
this.properties = properties;
}
- public Serializable getAttachment()
+ public Object getAttachment()
{
return attachment;
}
@@ -234,7 +234,7 @@
*
* @param attachment the attachment.
*/
- public void setAttachment(Serializable attachment)
+ public void setAttachment(Object attachment)
{
this.attachment = attachment;
}
Modified: projects/jboss-man/trunk/managed/src/main/java/org/jboss/managed/plugins/WritethroughManagedPropertyImpl.java
===================================================================
--- projects/jboss-man/trunk/managed/src/main/java/org/jboss/managed/plugins/WritethroughManagedPropertyImpl.java 2008-10-21 20:12:36 UTC (rev 79871)
+++ projects/jboss-man/trunk/managed/src/main/java/org/jboss/managed/plugins/WritethroughManagedPropertyImpl.java 2008-10-21 20:16:14 UTC (rev 79872)
@@ -95,7 +95,7 @@
PropertyInfo propertyInfo = getField(Fields.PROPERTY_INFO, PropertyInfo.class);
if (propertyInfo != null)
{
- Serializable attachment = getManagedObject().getAttachment();
+ Object attachment = getManagedObject().getAttachment();
if (attachment != null)
{
MetaValue metaValue;
Modified: projects/jboss-man/trunk/managed/src/main/java/org/jboss/managed/plugins/factory/AbstractInstanceClassFactory.java
===================================================================
--- projects/jboss-man/trunk/managed/src/main/java/org/jboss/managed/plugins/factory/AbstractInstanceClassFactory.java 2008-10-21 20:12:36 UTC (rev 79871)
+++ projects/jboss-man/trunk/managed/src/main/java/org/jboss/managed/plugins/factory/AbstractInstanceClassFactory.java 2008-10-21 20:16:14 UTC (rev 79872)
@@ -65,7 +65,7 @@
* @author Scott.Stark at jboss.org
* @version $Revision$
*/
-public class AbstractInstanceClassFactory<T extends Serializable>
+public class AbstractInstanceClassFactory<T>
implements InstanceClassFactory<T>
{
/** The configuration */
@@ -149,7 +149,7 @@
* Default InstanceClassFactory implementation simply returns the
* attachment class.
*/
- public Class<? extends Serializable> getManagedObjectClass(T attachment)
+ public Class<?> getManagedObjectClass(T attachment)
throws ClassNotFoundException
{
return attachment.getClass();
@@ -187,19 +187,6 @@
return null;
}
- /**
- * Default InstanceClassFactory implementation simply returns the
- * instance class.
- *
- * @param instance the instance
- * @return the class
- */
- public Class<? extends Serializable> getManagedObjectClass(Object instance)
- {
- Serializable s = (Serializable) instance;
- return s.getClass();
- }
-
public MetaValue getValue(BeanInfo beanInfo, ManagedProperty property, T object)
{
String name = getPropertyName(property);
Modified: projects/jboss-man/trunk/managed/src/main/java/org/jboss/managed/plugins/factory/AbstractManagedObjectFactory.java
===================================================================
--- projects/jboss-man/trunk/managed/src/main/java/org/jboss/managed/plugins/factory/AbstractManagedObjectFactory.java 2008-10-21 20:12:36 UTC (rev 79871)
+++ projects/jboss-man/trunk/managed/src/main/java/org/jboss/managed/plugins/factory/AbstractManagedObjectFactory.java 2008-10-21 20:16:14 UTC (rev 79872)
@@ -103,15 +103,15 @@
/** The meta value factory */
private MetaValueFactory metaValueFactory = MetaValueFactory.getInstance();
/** A default InstanceClassFactory used when there is no explicit ICF for a given class */
- private InstanceClassFactory<? extends Serializable> defaultInstanceFactory;
+ private InstanceClassFactory<?> defaultInstanceFactory;
/** A default ManagedObjectPopulator used when there is no explicit ManagedObjectBuilder for a given class */
- private ManagedObjectPopulator<? extends Serializable> defaultManagedObjectPopulator;
+ private ManagedObjectPopulator<?> defaultManagedObjectPopulator;
/** The managed object builders */
private Map<Class<?>, ManagedObjectBuilder> builders = new WeakHashMap<Class<?>, ManagedObjectBuilder>();
/** The instance to class factories */
- private Map<Class<?>, InstanceClassFactory<? extends Serializable>> instanceFactories = new WeakHashMap<Class<?>, InstanceClassFactory<? extends Serializable>>();
+ private Map<Class<?>, InstanceClassFactory<?>> instanceFactories = new WeakHashMap<Class<?>, InstanceClassFactory<?>>();
/**
* Create a ManagedProperty by looking to the factory for ctor(Fields)
@@ -164,10 +164,10 @@
*/
public AbstractManagedObjectFactory(MetaTypeFactory metaTypeFactory,
MetaValueFactory metaValueFactory,
- InstanceClassFactory<? extends Serializable> defaultInstanceFactory,
- ManagedObjectPopulator<? extends Serializable> defaultManagedObjectPopulator,
+ InstanceClassFactory<?> defaultInstanceFactory,
+ ManagedObjectPopulator<?> defaultManagedObjectPopulator,
Map<Class<?>, ManagedObjectBuilder> builders,
- Map<Class<?>, InstanceClassFactory<? extends Serializable>> instanceFactories)
+ Map<Class<?>, InstanceClassFactory<?>> instanceFactories)
{
this.metaTypeFactory = metaTypeFactory;
this.metaValueFactory = metaValueFactory;
@@ -218,13 +218,13 @@
this.builders = builders;
}
- public Map<Class<?>, InstanceClassFactory<? extends Serializable>> getInstanceFactories()
+ public Map<Class<?>, InstanceClassFactory<?>> getInstanceFactories()
{
return instanceFactories;
}
public void setInstanceFactories(
- Map<Class<?>, InstanceClassFactory<? extends Serializable>> instanceFactories)
+ Map<Class<?>, InstanceClassFactory<?>> instanceFactories)
{
this.instanceFactories = instanceFactories;
}
@@ -233,7 +233,7 @@
* Get the default InstanceClassFactory
* @return the current default InstanceClassFactory
*/
- public InstanceClassFactory<? extends Serializable> getDefaultInstanceFactory()
+ public InstanceClassFactory<?> getDefaultInstanceFactory()
{
return defaultInstanceFactory;
}
@@ -252,7 +252,7 @@
}
- public ManagedObjectPopulator<? extends Serializable> getDefaultManagedObjectPopulator()
+ public ManagedObjectPopulator<?> getDefaultManagedObjectPopulator()
{
return defaultManagedObjectPopulator;
}
@@ -270,7 +270,7 @@
}
@Override
- public <T extends Serializable> ManagedObject createManagedObject(Class<T> clazz)
+ public <T> ManagedObject createManagedObject(Class<T> clazz)
{
if (clazz == null)
throw new IllegalArgumentException("Null class");
@@ -325,7 +325,7 @@
}
@Override
- public <T extends Serializable> void setInstanceClassFactory(Class<T> clazz, InstanceClassFactory<T> factory)
+ public <T> void setInstanceClassFactory(Class<T> clazz, InstanceClassFactory<T> factory)
{
synchronized (instanceFactories)
{
@@ -345,7 +345,7 @@
* marked as a ManagementObject.
* {@linkplain ManagementObject}
*/
- protected <T extends Serializable> ManagedObject createSkeletonManagedObject(Class<T> clazz)
+ protected <T> ManagedObject createSkeletonManagedObject(Class<T> clazz)
{
if (clazz == null)
throw new IllegalArgumentException("Null class");
@@ -362,7 +362,7 @@
* it does not have a ManagementObject annotation.
*/
@SuppressWarnings("unchecked")
- public ManagedObject buildManagedObject(Class<? extends Serializable> clazz)
+ public ManagedObject buildManagedObject(Class<?> clazz)
{
boolean trace = log.isTraceEnabled();
BeanInfo beanInfo = configuration.getBeanInfo(clazz);
@@ -741,7 +741,7 @@
* @return the InstanceClassFactory
*/
@SuppressWarnings("unchecked")
- public <T extends Serializable> InstanceClassFactory<T> getInstanceClassFactory(Class<T> clazz)
+ public <X> InstanceClassFactory<X> getInstanceClassFactory(Class<X> clazz)
{
synchronized (instanceFactories)
{
@@ -755,7 +755,7 @@
if (factory != null)
return factory;
}
- InstanceClassFactory<T> factory = (InstanceClassFactory<T>) defaultInstanceFactory;
+ InstanceClassFactory<X> factory = (InstanceClassFactory<X>) defaultInstanceFactory;
return factory;
}
@@ -766,7 +766,7 @@
* @return the populator
*/
@SuppressWarnings("unchecked")
- protected <X extends Serializable> ManagedObjectPopulator<X> getPopulator(Class<X> clazz)
+ protected <X> ManagedObjectPopulator<X> getPopulator(Class<X> clazz)
{
ManagedObjectBuilder builder = getBuilder(clazz);
if (builder instanceof ManagedObjectPopulator)
Modified: projects/jboss-man/trunk/managed/src/main/java/org/jboss/managed/plugins/factory/AbstractManagedObjectPopulator.java
===================================================================
--- projects/jboss-man/trunk/managed/src/main/java/org/jboss/managed/plugins/factory/AbstractManagedObjectPopulator.java 2008-10-21 20:12:36 UTC (rev 79871)
+++ projects/jboss-man/trunk/managed/src/main/java/org/jboss/managed/plugins/factory/AbstractManagedObjectPopulator.java 2008-10-21 20:16:14 UTC (rev 79872)
@@ -48,16 +48,16 @@
* @author Scott.Stark at jboss.org
* @version $Revision$
*/
-public class AbstractManagedObjectPopulator<T extends Serializable>
+public class AbstractManagedObjectPopulator<T>
implements ManagedObjectPopulator<T>
{
private static Logger log = Logger.getLogger(AbstractManagedObjectPopulator.class);
/** The configuration */
private Configuration configuration;
- private InstanceClassFactory<? extends Serializable> defaultInstanceFactory;
+ private InstanceClassFactory<?> defaultInstanceFactory;
/** The instance to class factories */
- private Map<Class<?>, InstanceClassFactory<? extends Serializable>> instanceFactories;
+ private Map<Class<?>, InstanceClassFactory<?>> instanceFactories;
public AbstractManagedObjectPopulator(Configuration configuration)
@@ -66,8 +66,8 @@
}
public AbstractManagedObjectPopulator(
Configuration configuration,
- InstanceClassFactory<? extends Serializable> defaultInstanceFactory,
- Map<Class<?>, InstanceClassFactory<? extends Serializable>> instanceFactories)
+ InstanceClassFactory<?> defaultInstanceFactory,
+ Map<Class<?>, InstanceClassFactory<?>> instanceFactories)
{
super();
this.configuration = configuration;
@@ -84,20 +84,20 @@
this.configuration = configuration;
}
- public InstanceClassFactory<? extends Serializable> getDefaultInstanceFactory()
+ public InstanceClassFactory<?> getDefaultInstanceFactory()
{
return defaultInstanceFactory;
}
- public void setDefaultInstanceFactory(InstanceClassFactory<? extends Serializable> defaultInstanceFactory)
+ public void setDefaultInstanceFactory(InstanceClassFactory<?> defaultInstanceFactory)
{
this.defaultInstanceFactory = defaultInstanceFactory;
}
- public Map<Class<?>, InstanceClassFactory<? extends Serializable>> getInstanceFactories()
+ public Map<Class<?>, InstanceClassFactory<?>> getInstanceFactories()
{
return instanceFactories;
}
- public void setInstanceFactories(Map<Class<?>, InstanceClassFactory<? extends Serializable>> instanceFactories)
+ public void setInstanceFactories(Map<Class<?>, InstanceClassFactory<?>> instanceFactories)
{
this.instanceFactories = instanceFactories;
}
@@ -133,7 +133,7 @@
* @return the InstanceClassFactory
*/
@SuppressWarnings("unchecked")
- public <X extends Serializable> InstanceClassFactory<X> getInstanceClassFactory(Class<X> clazz)
+ public <X> InstanceClassFactory<X> getInstanceClassFactory(Class<X> clazz)
{
synchronized (instanceFactories)
{
Modified: projects/jboss-man/trunk/managed/src/main/java/org/jboss/managed/spi/factory/InstanceClassFactory.java
===================================================================
--- projects/jboss-man/trunk/managed/src/main/java/org/jboss/managed/spi/factory/InstanceClassFactory.java 2008-10-21 20:12:36 UTC (rev 79871)
+++ projects/jboss-man/trunk/managed/src/main/java/org/jboss/managed/spi/factory/InstanceClassFactory.java 2008-10-21 20:16:14 UTC (rev 79872)
@@ -21,8 +21,6 @@
*/
package org.jboss.managed.spi.factory;
-import java.io.Serializable;
-
import org.jboss.beans.info.spi.BeanInfo;
import org.jboss.managed.api.ManagedProperty;
import org.jboss.metatype.api.values.MetaValue;
@@ -37,7 +35,7 @@
* @author Ales.Justin at jboss.org
* @version $Revision$
*/
-public interface InstanceClassFactory<T extends Serializable>
+public interface InstanceClassFactory<T>
{
/**
* Return the Class that represents the root ManagedObject to scan
@@ -47,7 +45,7 @@
* @return the Class that represents the root ManagedObject.
* @throws ClassNotFoundException if MO class not found
*/
- Class<? extends Serializable> getManagedObjectClass(T attachment) throws ClassNotFoundException;
+ Class<?> getManagedObjectClass(T attachment) throws ClassNotFoundException;
/**
* Get the value from object.
Modified: projects/jboss-man/trunk/managed/src/main/java/org/jboss/managed/spi/factory/ManagedObjectBuilder.java
===================================================================
--- projects/jboss-man/trunk/managed/src/main/java/org/jboss/managed/spi/factory/ManagedObjectBuilder.java 2008-10-21 20:12:36 UTC (rev 79871)
+++ projects/jboss-man/trunk/managed/src/main/java/org/jboss/managed/spi/factory/ManagedObjectBuilder.java 2008-10-21 20:16:14 UTC (rev 79872)
@@ -39,5 +39,5 @@
* @param clazz the class
* @return the managed object
*/
- ManagedObject buildManagedObject(Class<? extends Serializable> clazz);
+ ManagedObject buildManagedObject(Class<?> clazz);
}
Modified: projects/jboss-man/trunk/managed/src/main/java/org/jboss/managed/spi/factory/ManagedObjectPopulator.java
===================================================================
--- projects/jboss-man/trunk/managed/src/main/java/org/jboss/managed/spi/factory/ManagedObjectPopulator.java 2008-10-21 20:12:36 UTC (rev 79871)
+++ projects/jboss-man/trunk/managed/src/main/java/org/jboss/managed/spi/factory/ManagedObjectPopulator.java 2008-10-21 20:16:14 UTC (rev 79872)
@@ -32,7 +32,7 @@
* @author <a href="adrian at jboss.com">Adrian Brock</a>
* @version $Revision: 1.1 $
*/
-public interface ManagedObjectPopulator<T extends Serializable>
+public interface ManagedObjectPopulator<T>
{
/**
* Create a new underlying object
Modified: projects/jboss-man/trunk/managed/src/test/java/org/jboss/test/managed/factory/support/amof/ManagementObjectWithRuntimeRefICF.java
===================================================================
--- projects/jboss-man/trunk/managed/src/test/java/org/jboss/test/managed/factory/support/amof/ManagementObjectWithRuntimeRefICF.java 2008-10-21 20:12:36 UTC (rev 79871)
+++ projects/jboss-man/trunk/managed/src/test/java/org/jboss/test/managed/factory/support/amof/ManagementObjectWithRuntimeRefICF.java 2008-10-21 20:16:14 UTC (rev 79872)
@@ -21,8 +21,6 @@
*/
package org.jboss.test.managed.factory.support.amof;
-import java.io.Serializable;
-
import org.jboss.beans.info.spi.BeanInfo;
import org.jboss.beans.info.spi.PropertyInfo;
import org.jboss.managed.api.ManagedProperty;
@@ -41,7 +39,7 @@
private MetaValueFactory metaValueFactory = MetaValueFactory.getInstance();
@SuppressWarnings("unchecked")
- public Class<? extends Serializable> getManagedObjectClass(ManagementObjectWithRuntimeRef instance)
+ public Class<?> getManagedObjectClass(ManagementObjectWithRuntimeRef instance)
throws ClassNotFoundException
{
return instance.getClass();
Modified: projects/jboss-man/trunk/managed/src/test/java/org/jboss/test/managed/factory/support/amof/TestMOP.java
===================================================================
--- projects/jboss-man/trunk/managed/src/test/java/org/jboss/test/managed/factory/support/amof/TestMOP.java 2008-10-21 20:12:36 UTC (rev 79871)
+++ projects/jboss-man/trunk/managed/src/test/java/org/jboss/test/managed/factory/support/amof/TestMOP.java 2008-10-21 20:16:14 UTC (rev 79872)
@@ -41,8 +41,8 @@
private boolean populateManagedObjectCalled;
public TestMOP(Configuration configuration,
- InstanceClassFactory<? extends Serializable> defaultInstanceFactory,
- Map<Class<?>, InstanceClassFactory<? extends Serializable>> instanceFactories)
+ InstanceClassFactory<?> defaultInstanceFactory,
+ Map<Class<?>, InstanceClassFactory<?>> instanceFactories)
{
super(configuration, defaultInstanceFactory, instanceFactories);
}
More information about the jboss-cvs-commits
mailing list