[jboss-cvs] JBossAS SVN: r71916 - in projects/microcontainer/trunk: guice-int/src/tests/org/jboss/test/guice/test and 6 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Apr 10 09:11:43 EDT 2008
Author: adrian at jboss.org
Date: 2008-04-10 09:11:43 -0400 (Thu, 10 Apr 2008)
New Revision: 71916
Modified:
projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/metadata/AOPDeployment.java
projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/metadata/MetaDataBeanMetaDataFactory.java
projects/microcontainer/trunk/guice-int/src/tests/org/jboss/test/guice/test/GuiceToMCTestCase.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/CloneUtil.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/builder/StopLifecycleMetaDataBuilder.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/support/container/BaseContext.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/support/container/BeanContext.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/support/container/BeanContextFactory.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/support/container/BeanPool.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/support/container/TestInjectionMetaData.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/support/container/plugin/GenericComponentFactory.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/support/container/plugin/GenericComponentInstance.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/support/container/spi/ComponentFactory.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/support/container/spi/ComponentInstance.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/test/BeanContainerUsageMDTestCase.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/test/BeanContainerUsageTestCase.java
Log:
Source code tidyup
Modified: projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/metadata/AOPDeployment.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/metadata/AOPDeployment.java 2008-04-10 12:53:51 UTC (rev 71915)
+++ projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/metadata/AOPDeployment.java 2008-04-10 13:11:43 UTC (rev 71916)
@@ -35,7 +35,6 @@
import org.jboss.managed.api.annotation.ManagementObject;
import org.jboss.managed.api.annotation.ManagementProperties;
import org.jboss.xb.annotations.JBossXmlSchema;
-import org.w3c.dom.Element;
/**
*
Modified: projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/metadata/MetaDataBeanMetaDataFactory.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/metadata/MetaDataBeanMetaDataFactory.java 2008-04-10 12:53:51 UTC (rev 71915)
+++ projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/metadata/MetaDataBeanMetaDataFactory.java 2008-04-10 13:11:43 UTC (rev 71916)
@@ -148,6 +148,7 @@
/**
* Here to match the @XMLType.propOrder
+ * @param ignored ???
*/
public void setNon$$existant$$property(String ignored)
{
Modified: projects/microcontainer/trunk/guice-int/src/tests/org/jboss/test/guice/test/GuiceToMCTestCase.java
===================================================================
--- projects/microcontainer/trunk/guice-int/src/tests/org/jboss/test/guice/test/GuiceToMCTestCase.java 2008-04-10 12:53:51 UTC (rev 71915)
+++ projects/microcontainer/trunk/guice-int/src/tests/org/jboss/test/guice/test/GuiceToMCTestCase.java 2008-04-10 13:11:43 UTC (rev 71916)
@@ -23,11 +23,8 @@
import java.util.Collections;
-import com.google.inject.AbstractModule;
-import com.google.inject.Module;
-import com.google.inject.Key;
-import com.google.inject.name.Names;
import junit.framework.Test;
+
import org.jboss.beans.metadata.plugins.AbstractArrayMetaData;
import org.jboss.beans.metadata.plugins.AbstractBeanMetaData;
import org.jboss.beans.metadata.plugins.AbstractConstructorMetaData;
@@ -37,13 +34,16 @@
import org.jboss.beans.metadata.spi.ParameterMetaData;
import org.jboss.dependency.spi.ControllerContext;
import org.jboss.guice.spi.GuiceKernelRegistryEntryPlugin;
-import org.jboss.kernel.plugins.bootstrap.basic.BasicBootstrap;
import org.jboss.kernel.spi.dependency.KernelController;
+import org.jboss.test.guice.support.Prototype;
import org.jboss.test.guice.support.Singleton;
import org.jboss.test.guice.support.SingletonHolder;
-import org.jboss.test.guice.support.Prototype;
-import org.jboss.test.kernel.junit.MicrocontainerTest;
+import com.google.inject.AbstractModule;
+import com.google.inject.Key;
+import com.google.inject.Module;
+import com.google.inject.name.Names;
+
/**
* Inject Guice objects into MC test.
*
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/CloneUtil.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/CloneUtil.java 2008-04-10 12:53:51 UTC (rev 71915)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/CloneUtil.java 2008-04-10 13:11:43 UTC (rev 71916)
@@ -37,6 +37,7 @@
/**
* Simple clone object.
*
+ * @param <T> the type
* @param original the original
* @param expectedClass the expected class
* @return clone
@@ -57,6 +58,8 @@
/**
* Simple collection clone.
*
+ * @param <T> the collection type
+ * @param <U> the component type
* @param collection the collection to be cloned
* @param expectedClass expected collection class
* @param componentType expected component class
@@ -84,6 +87,8 @@
/**
* Simple map clone.
*
+ * @param <T> the collection type
+ * @param <U> the component type
* @param map the map to clone
* @param keyClass the key class
* @param valueClass the value class
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/builder/StopLifecycleMetaDataBuilder.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/builder/StopLifecycleMetaDataBuilder.java 2008-04-10 12:53:51 UTC (rev 71915)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/builder/StopLifecycleMetaDataBuilder.java 2008-04-10 13:11:43 UTC (rev 71916)
@@ -22,7 +22,6 @@
package org.jboss.beans.metadata.plugins.builder;
import org.jboss.beans.metadata.plugins.AbstractBeanMetaData;
-import org.jboss.beans.metadata.plugins.AbstractLifecycleMetaData;
import org.jboss.beans.metadata.spi.LifecycleMetaData;
/**
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/support/container/BaseContext.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/support/container/BaseContext.java 2008-04-10 12:53:51 UTC (rev 71915)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/support/container/BaseContext.java 2008-04-10 13:11:43 UTC (rev 71916)
@@ -28,6 +28,8 @@
import org.jboss.logging.Logger;
/**
+ * @param <B> the bean type
+ * @param <C> the container type
* @author Scott.Stark at jboss.org
* @version $Revision:$
*/
@@ -38,7 +40,7 @@
protected C container;
protected B bean;
- protected List<Object> interceptorInstances = new ArrayList();
+ protected List<Object> interceptorInstances = new ArrayList<Object>();
public BaseContext(C container)
{
@@ -62,11 +64,11 @@
}
- public HashMap<Class, Object> getInterceptorInstances()
+ public HashMap<Class<?>, Object> getInterceptorInstances()
{
return null;
}
- public List getInterceptors()
+ public List<Object> getInterceptors()
{
return interceptorInstances;
}
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/support/container/BeanContext.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/support/container/BeanContext.java 2008-04-10 12:53:51 UTC (rev 71915)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/support/container/BeanContext.java 2008-04-10 13:11:43 UTC (rev 71916)
@@ -22,10 +22,11 @@
package org.jboss.test.kernel.deployment.support.container;
/**
+ * @param <C> the container type
* @author Scott.Stark at jboss.org
* @version $Revision:$
*/
-public interface BeanContext<C extends BeanContainer>
+public interface BeanContext<C extends BeanContainer<?>>
{
Object getInstance();
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/support/container/BeanContextFactory.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/support/container/BeanContextFactory.java 2008-04-10 12:53:51 UTC (rev 71915)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/support/container/BeanContextFactory.java 2008-04-10 13:11:43 UTC (rev 71916)
@@ -23,8 +23,6 @@
import java.util.ArrayList;
import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -32,19 +30,9 @@
import org.jboss.beans.info.spi.BeanAccessMode;
import org.jboss.beans.info.spi.BeanInfo;
import org.jboss.beans.info.spi.PropertyInfo;
-import org.jboss.beans.metadata.plugins.AbstractBeanMetaData;
-import org.jboss.beans.metadata.plugins.AbstractConstructorMetaData;
-import org.jboss.beans.metadata.plugins.AbstractPropertyMetaData;
-import org.jboss.beans.metadata.plugins.builder.ParameterMetaDataBuilderImpl;
-import org.jboss.beans.metadata.plugins.factory.GenericBeanFactory;
import org.jboss.beans.metadata.spi.BeanMetaData;
-import org.jboss.beans.metadata.spi.BeanMetaDataFactory;
-import org.jboss.beans.metadata.spi.MetaDataVisitor;
-import org.jboss.beans.metadata.spi.MetaDataVisitorNode;
-import org.jboss.beans.metadata.spi.PropertyMetaData;
import org.jboss.beans.metadata.spi.ValueMetaData;
import org.jboss.beans.metadata.spi.builder.BeanMetaDataBuilder;
-import org.jboss.kernel.plugins.bootstrap.basic.KernelConstants;
import org.jboss.kernel.spi.config.KernelConfigurator;
import org.jboss.kernel.spi.dependency.KernelControllerContext;
import org.jboss.kernel.spi.dependency.KernelControllerContextAware;
@@ -54,6 +42,7 @@
import org.jboss.test.kernel.deployment.support.container.spi.ComponentVisitor;
/**
+ * @param <T> the type
* @author Scott.Stark at jboss.org
* @version $Revision:$
*/
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/support/container/BeanPool.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/support/container/BeanPool.java 2008-04-10 12:53:51 UTC (rev 71915)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/support/container/BeanPool.java 2008-04-10 13:11:43 UTC (rev 71916)
@@ -94,6 +94,7 @@
log.debug("End createBean, size: "+pool.size()+", bean: "+bean);
return bean;
}
+ @SuppressWarnings("unchecked")
public void destroyBean(T bean)
throws Throwable
{
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/support/container/TestInjectionMetaData.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/support/container/TestInjectionMetaData.java 2008-04-10 12:53:51 UTC (rev 71915)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/support/container/TestInjectionMetaData.java 2008-04-10 13:11:43 UTC (rev 71916)
@@ -93,7 +93,7 @@
* An unmanaged runtime jndi name for the resource. Used by deployers to
* propagate resolved resource location.
*
- * @return
+ * @return the resolved jndi name
*/
public String getResolvedJndiName()
{
@@ -140,7 +140,7 @@
/**
* Set the ignoreDependency.
*
- * @param ignoreDependency the ignoreDependency.
+ * @param flag the ignoreDependency.
* @throws IllegalArgumentException for a null ignoreDependency
*/
public void setIgnoreDependency(boolean flag)
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/support/container/plugin/GenericComponentFactory.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/support/container/plugin/GenericComponentFactory.java 2008-04-10 12:53:51 UTC (rev 71915)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/support/container/plugin/GenericComponentFactory.java 2008-04-10 13:11:43 UTC (rev 71916)
@@ -10,7 +10,6 @@
import org.jboss.beans.metadata.api.model.AutowireType;
import org.jboss.beans.metadata.spi.AnnotationMetaData;
import org.jboss.beans.metadata.spi.BeanMetaData;
-import org.jboss.beans.metadata.spi.BeanMetaDataFactory;
import org.jboss.beans.metadata.spi.CallbackMetaData;
import org.jboss.beans.metadata.spi.ClassLoaderMetaData;
import org.jboss.beans.metadata.spi.ConstructorMetaData;
@@ -61,6 +60,7 @@
factoryContext = null;
}
+ @SuppressWarnings("unchecked")
public ComponentInstance<T> createComponents(String baseName)
throws Throwable
{
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/support/container/plugin/GenericComponentInstance.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/support/container/plugin/GenericComponentInstance.java 2008-04-10 12:53:51 UTC (rev 71915)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/support/container/plugin/GenericComponentInstance.java 2008-04-10 13:11:43 UTC (rev 71916)
@@ -26,6 +26,7 @@
import org.jboss.test.kernel.deployment.support.container.spi.ComponentInstance;
/**
+ * @param <T> the instance type
* @author Scott.Stark at jboss.org
* @version $Revision:$
*/
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/support/container/spi/ComponentFactory.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/support/container/spi/ComponentFactory.java 2008-04-10 12:53:51 UTC (rev 71915)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/support/container/spi/ComponentFactory.java 2008-04-10 13:11:43 UTC (rev 71916)
@@ -21,14 +21,12 @@
*/
package org.jboss.test.kernel.deployment.support.container.spi;
-import java.util.List;
-import org.jboss.beans.metadata.spi.BeanMetaDataFactory;
-
/**
* A factory for creating a collection of related mc beans based on a
* template of BeanMetaData[] from a BeanMetaDataFactory.
*
+ * @param <T> the instance type
* @author Scott.Stark at jboss.org
* @version $Revision:$
*/
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/support/container/spi/ComponentInstance.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/support/container/spi/ComponentInstance.java 2008-04-10 12:53:51 UTC (rev 71915)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/support/container/spi/ComponentInstance.java 2008-04-10 13:11:43 UTC (rev 71916)
@@ -27,6 +27,7 @@
* The component context instance. This is the bean that acts as the container
* for the component bean instances.
*
+ * @param <T> the context type
* @author Scott.Stark at jboss.org
* @version $Revision:$
*/
@@ -34,22 +35,22 @@
{
/**
* Get the name of the bean for the component context instance
- * @return
+ * @return the context name
*/
public String getContextName();
/**
* Get the component bean names
- * @return
+ * @return the component names
*/
public List<String> getComponentNames();
/**
* Get the id associated with this component
- * @return
+ * @return the component id
*/
public long getComponentID();
/**
* Get the component context instance
- * @return
+ * @return the context
*/
public T getContext();
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/test/BeanContainerUsageMDTestCase.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/test/BeanContainerUsageMDTestCase.java 2008-04-10 12:53:51 UTC (rev 71915)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/test/BeanContainerUsageMDTestCase.java 2008-04-10 13:11:43 UTC (rev 71916)
@@ -70,6 +70,7 @@
super(name);
}
+ @SuppressWarnings("unchecked")
public void testComponentBeanFactory()
throws Throwable
{
@@ -82,9 +83,9 @@
factory.createComponents("ComponentBeanFactory");
List<String> beanNames = contextInstance.getComponentNames();
getLog().info("createComponents(ComponentBeanFactory): "+beanNames);
- long compID = contextInstance.getComponentID();
- BaseContext<Bean1Type, BeanContainer<Bean1Type>> context = contextInstance.getContext();
- String contextName = contextInstance.getContextName();
+ // ??? long compID = contextInstance.getComponentID();
+ // ??? BaseContext<Bean1Type, BeanContainer<Bean1Type>> context = contextInstance.getContext();
+ // ??? String contextName = contextInstance.getContextName();
Object interceptor = getBean("ComponentBeanFactory at Interceptor:0#1");
assertNotNull(interceptor);
@@ -221,8 +222,9 @@
/**
* MetaData version of testComponentBeanFactory
*
- * @return
+ * @return the kernel deployment
*/
+ @SuppressWarnings("unchecked")
protected KernelDeployment getDeploymentForComponentBeanFactory()
{
AbstractKernelDeployment deployment = new AbstractKernelDeployment();
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/test/BeanContainerUsageTestCase.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/test/BeanContainerUsageTestCase.java 2008-04-10 12:53:51 UTC (rev 71915)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/test/BeanContainerUsageTestCase.java 2008-04-10 13:11:43 UTC (rev 71916)
@@ -23,11 +23,9 @@
import java.lang.reflect.Method;
import java.net.URL;
-import java.util.HashMap;
-import java.util.List;
import junit.framework.Test;
-import org.jboss.beans.metadata.spi.factory.BeanFactory;
+
import org.jboss.dependency.spi.ControllerMode;
import org.jboss.dependency.spi.ControllerState;
import org.jboss.dependency.spi.ControllerStateModel;
@@ -37,13 +35,10 @@
import org.jboss.kernel.spi.dependency.KernelControllerContext;
import org.jboss.kernel.spi.deployment.KernelDeployment;
import org.jboss.test.kernel.AbstractKernelTest;
-import org.jboss.test.kernel.deployment.support.container.BaseContext;
import org.jboss.test.kernel.deployment.support.container.Bean1Type;
import org.jboss.test.kernel.deployment.support.container.Bean2Type;
import org.jboss.test.kernel.deployment.support.container.BeanContainer;
import org.jboss.test.kernel.deployment.support.container.BeanPool;
-import org.jboss.test.kernel.deployment.support.container.spi.ComponentFactory;
-import org.jboss.test.kernel.deployment.support.container.spi.ComponentInstance;
/**
* Bean Container Test Case.
@@ -70,7 +65,8 @@
public void testDependencyInjectionOfBean() throws Throwable
{
bootstrap();
- BeanContainer<Bean1Type> container1 = (BeanContainer<Bean1Type>) getBean("BeanContainer1Type");
+ // ???? BeanContainer<Bean1Type> container1 = (BeanContainer<Bean1Type>) getBean("BeanContainer1Type");
+ getBean("BeanContainer1Type");
BeanPool<Bean1Type> pool1 = (BeanPool<Bean1Type>) getBean("Bean1TypePool");
BeanContainer<Bean2Type> container2 = (BeanContainer<Bean2Type>) getBean("BeanContainer2Type");
Bean2Type bean21 = container2.getBean();
@@ -97,6 +93,7 @@
assertNotNull(bean13Injected);
deployer.shutdown();
}
+ @SuppressWarnings("unchecked")
public void testDependencyInjectionOfBeanWithMismatchedPoolSizes()
throws Throwable
{
@@ -104,8 +101,7 @@
BeanContainer<Bean2Type> container2 = (BeanContainer<Bean2Type>) getBean("BeanContainer2Type");
try
{
- Bean2Type bean21 = container2.getBean();
- fail("Should not have been able to create a Bean2Type");
+ fail("Should not have been able to create a Bean2Type: " + container2.getBean());
}
catch(IllegalStateException e)
{
@@ -116,7 +112,7 @@
/**
* There is no xml version of ?
- * @return
+ * @return ???
*/
protected KernelDeployment getDeploymentForDependencyInjectionOfBean()
{
More information about the jboss-cvs-commits
mailing list