[jboss-cvs] JBossAS SVN: r101820 - in projects/kernel/trunk: aop-mc-int/src/test/java/org/jboss/test/microcontainer/support/deployers and 20 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Mar 4 08:17:39 EST 2010
Author: adrian at jboss.org
Date: 2010-03-04 08:17:36 -0500 (Thu, 04 Mar 2010)
New Revision: 101820
Modified:
projects/kernel/trunk/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/beans/AspectManagerFactory.java
projects/kernel/trunk/aop-mc-int/src/test/java/org/jboss/test/microcontainer/support/deployers/AspectManagerBean.java
projects/kernel/trunk/dependency/src/main/java/org/jboss/dependency/plugins/AbstractController.java
projects/kernel/trunk/dependency/src/main/java/org/jboss/dependency/plugins/AbstractControllerContext.java
projects/kernel/trunk/jmx-mc-int/src/main/java/org/jboss/system/ServiceMBeanSupport.java
projects/kernel/trunk/jmx-mc-int/src/main/java/org/jboss/system/microcontainer/DescribeAction.java
projects/kernel/trunk/jmx-mc-int/src/main/java/org/jboss/system/microcontainer/LifecycleInfo.java
projects/kernel/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/ControllerTestDelegate.java
projects/kernel/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/legacy/OldServiceConfigurator.java
projects/kernel/trunk/kernel/src/main/java/org/jboss/beans/metadata/plugins/AbstractCallbackMetaData.java
projects/kernel/trunk/kernel/src/main/java/org/jboss/beans/metadata/plugins/AbstractConstructorMetaData.java
projects/kernel/trunk/kernel/src/main/java/org/jboss/beans/metadata/plugins/AbstractLifecycleMetaData.java
projects/kernel/trunk/kernel/src/main/java/org/jboss/beans/metadata/spi/builder/BeanMetaDataBuilder.java
projects/kernel/trunk/kernel/src/main/java/org/jboss/kernel/plugins/annotations/CommonAnnotationAdapter.java
projects/kernel/trunk/kernel/src/main/java/org/jboss/kernel/plugins/annotations/InstallationParameterAnnotationPlugin.java
projects/kernel/trunk/kernel/src/main/java/org/jboss/kernel/plugins/annotations/Jsr330InjectFieldAnnotationPlugin.java
projects/kernel/trunk/kernel/src/main/java/org/jboss/kernel/plugins/annotations/LifecycleAnnotationPlugin.java
projects/kernel/trunk/kernel/src/main/java/org/jboss/kernel/plugins/annotations/MetaAnnotationPlugin.java
projects/kernel/trunk/kernel/src/main/java/org/jboss/kernel/plugins/annotations/PropertyAnnotationPluginFilter.java
projects/kernel/trunk/kernel/src/main/java/org/jboss/kernel/plugins/annotations/PropertyAware.java
projects/kernel/trunk/kernel/src/main/java/org/jboss/kernel/plugins/dependency/AbstractKernelController.java
projects/kernel/trunk/kernel/src/main/java/org/jboss/kernel/plugins/dependency/AbstractKernelControllerContext.java
projects/kernel/trunk/kernel/src/main/java/org/jboss/kernel/plugins/dependency/KernelScopeInfo.java
projects/kernel/trunk/kernel/src/main/java/org/jboss/kernel/plugins/dependency/QualifiersMdrUtil.java
projects/kernel/trunk/kernel/src/main/java/org/jboss/kernel/plugins/dispatch/InvokeDispatchHelper.java
projects/kernel/trunk/kernel/src/test/java/org/jboss/test/kernel/annotations/support/TestOrderPlugin.java
projects/kernel/trunk/kernel/src/test/java/org/jboss/test/kernel/annotations/test/method/AnnotatedMethodTestCase.java
projects/kernel/trunk/kernel/src/test/java/org/jboss/test/kernel/benchmark/test/CallbackBenchmark.java
projects/kernel/trunk/kernel/src/test/java/org/jboss/test/kernel/dependency/support/ScopedTestUtil.java
projects/kernel/trunk/kernel/src/test/java/org/jboss/test/kernel/dependency/test/UninstallNoOptionalContextDependencyTestCase.java
projects/kernel/trunk/kernel/src/test/java/org/jboss/test/kernel/deployment/xml/test/AnnotationJaxbTestCase.java
projects/kernel/trunk/kernel/src/test/java/org/jboss/test/kernel/deployment/xml/test/ArrayJaxbTestCase.java
projects/kernel/trunk/kernel/src/test/java/org/jboss/test/kernel/deployment/xml/test/BeanFactoryJaxbTestCase.java
projects/kernel/trunk/kernel/src/test/java/org/jboss/test/kernel/deployment/xml/test/BeanJaxbTestCase.java
projects/kernel/trunk/kernel/src/test/java/org/jboss/test/kernel/deployment/xml/test/CallbackJaxbTestCase.java
projects/kernel/trunk/kernel/src/test/java/org/jboss/test/kernel/deployment/xml/test/ClassLoaderJaxbTestCase.java
projects/kernel/trunk/kernel/src/test/java/org/jboss/test/kernel/deployment/xml/test/CollectionJaxbTestCase.java
projects/kernel/trunk/kernel/src/test/java/org/jboss/test/kernel/deployment/xml/test/ConstructorJaxbTestCase.java
projects/kernel/trunk/kernel/src/test/java/org/jboss/test/kernel/deployment/xml/test/DemandJaxbTestCase.java
projects/kernel/trunk/kernel/src/test/java/org/jboss/test/kernel/deployment/xml/test/DependencyJaxbTestCase.java
projects/kernel/trunk/kernel/src/test/java/org/jboss/test/kernel/deployment/xml/test/DeploymentJaxbTestCase.java
projects/kernel/trunk/kernel/src/test/java/org/jboss/test/kernel/deployment/xml/test/FactoryJaxbTestCase.java
projects/kernel/trunk/kernel/src/test/java/org/jboss/test/kernel/deployment/xml/test/InjectionJaxbTestCase.java
projects/kernel/trunk/kernel/src/test/java/org/jboss/test/kernel/deployment/xml/test/InstallJaxbTestCase.java
projects/kernel/trunk/kernel/src/test/java/org/jboss/test/kernel/deployment/xml/test/LifecycleJaxbTestCase.java
projects/kernel/trunk/kernel/src/test/java/org/jboss/test/kernel/deployment/xml/test/ListJaxbTestCase.java
projects/kernel/trunk/kernel/src/test/java/org/jboss/test/kernel/deployment/xml/test/MapJaxbTestCase.java
projects/kernel/trunk/kernel/src/test/java/org/jboss/test/kernel/deployment/xml/test/ParameterJaxbTestCase.java
projects/kernel/trunk/kernel/src/test/java/org/jboss/test/kernel/deployment/xml/test/PropertyJaxbTestCase.java
projects/kernel/trunk/kernel/src/test/java/org/jboss/test/kernel/deployment/xml/test/SetJaxbTestCase.java
projects/kernel/trunk/kernel/src/test/java/org/jboss/test/kernel/deployment/xml/test/SupplyJaxbTestCase.java
projects/kernel/trunk/kernel/src/test/java/org/jboss/test/kernel/deployment/xml/test/ValueJaxbTestCase.java
projects/kernel/trunk/kernel/src/test/java/org/jboss/test/kernel/event/support/TestEvent.java
projects/kernel/trunk/weld-int/src/main/java/org/jboss/kernel/weld/plugins/annotated/MDRAnnotated.java
projects/kernel/trunk/weld-int/src/test/java/org/jboss/test/kernel/weld/annotated/support/InjectAnnotatedIgnoreInjectBean.java
projects/kernel/trunk/weld-int/src/test/java/org/jboss/test/kernel/weld/annotated/test/AnnotatedTypeTestCase.java
Log:
Source code tidyup and remove redundant null checks
Modified: projects/kernel/trunk/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/beans/AspectManagerFactory.java
===================================================================
--- projects/kernel/trunk/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/beans/AspectManagerFactory.java 2010-03-04 12:46:14 UTC (rev 101819)
+++ projects/kernel/trunk/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/beans/AspectManagerFactory.java 2010-03-04 13:17:36 UTC (rev 101820)
@@ -60,29 +60,22 @@
{
JBossStringBuilder fqn = new JBossStringBuilder("/");
AspectManager sub = null;
- if (app != null)
+ String name="APPLICATION=" + app.value();
+ fqn.append(name);
+ fqn.append("/");
+ sub = manager.findManagerByName(fqn.toString());
+ if (sub == null)
{
- String name="APPLICATION=" + app.value();
- fqn.append(name);
- fqn.append("/");
- sub = manager.findManagerByName(fqn.toString());
- if (sub == null)
- {
- sub = createNewDomain(manager, name);
- }
+ sub = createNewDomain(manager, name);
}
-
- if (dep != null)
+ name="DEPLOYMENT=" + dep.value();
+ fqn.append(name);
+ fqn.append("/");
+ AspectManager parent = sub;
+ sub = manager.findManagerByName(fqn.toString());
+ if (sub == null)
{
- String name="DEPLOYMENT=" + dep.value();
- fqn.append(name);
- fqn.append("/");
- AspectManager parent = sub;
- sub = manager.findManagerByName(fqn.toString());
- if (sub == null)
- {
- sub = createNewDomain(parent, name);
- }
+ sub = createNewDomain(parent, name);
}
return sub;
}
Modified: projects/kernel/trunk/aop-mc-int/src/test/java/org/jboss/test/microcontainer/support/deployers/AspectManagerBean.java
===================================================================
--- projects/kernel/trunk/aop-mc-int/src/test/java/org/jboss/test/microcontainer/support/deployers/AspectManagerBean.java 2010-03-04 12:46:14 UTC (rev 101819)
+++ projects/kernel/trunk/aop-mc-int/src/test/java/org/jboss/test/microcontainer/support/deployers/AspectManagerBean.java 2010-03-04 13:17:36 UTC (rev 101820)
@@ -60,10 +60,7 @@
}
finally
{
- if (in != null)
- {
- in.close();
- }
+ in.close();
}
}
}
@@ -119,10 +116,7 @@
}
finally
{
- if (in != null)
- {
- in.close();
- }
+ in.close();
}
}
server.unregisterMBean(new ObjectName("jboss.aop:service=AspectManager"));
Modified: projects/kernel/trunk/dependency/src/main/java/org/jboss/dependency/plugins/AbstractController.java
===================================================================
--- projects/kernel/trunk/dependency/src/main/java/org/jboss/dependency/plugins/AbstractController.java 2010-03-04 12:46:14 UTC (rev 101819)
+++ projects/kernel/trunk/dependency/src/main/java/org/jboss/dependency/plugins/AbstractController.java 2010-03-04 13:17:36 UTC (rev 101820)
@@ -528,6 +528,7 @@
return getContextInternal(name, state, enableOnDemand, this);
}
+ @SuppressWarnings("unchecked")
public ControllerContext getContextInternal(Object name, ControllerState state, boolean enableOnDemand, Controller initiatingController)
{
if (name == null)
@@ -1064,8 +1065,7 @@
{
install(context, fromState, toState);
- if (fromContexts != null)
- fromContexts.remove(context);
+ fromContexts.remove(context);
Controller toController = context.getController();
Set<ControllerContext> toContexts = toController.getContextsByState(toState);
toContexts.add(context);
@@ -1939,24 +1939,21 @@
if (uninstalls != null)
resolveCallbacks(uninstalls, state, isInstallPhase == false, isInstallPhase, false);
- if (existingCallbacks != null)
+ if (existingCallbacks != null && existingCallbacks.isEmpty() == false)
{
// Do the installs if we are at the required state
- if (existingCallbacks != null && existingCallbacks.isEmpty() == false)
+ for(CallbackItem<?> callback : existingCallbacks)
{
- for(CallbackItem<?> callback : existingCallbacks)
+ if (state.equals(callback.getDependentState()))
{
- if (state.equals(callback.getDependentState()))
+ try
{
- try
- {
- callback.changeCallback(this, context, isInstallPhase);
- }
- catch (Throwable t)
- {
- log.warn("Broken callback: " + callback, t);
- }
+ callback.changeCallback(this, context, isInstallPhase);
}
+ catch (Throwable t)
+ {
+ log.warn("Broken callback: " + callback, t);
+ }
}
}
}
Modified: projects/kernel/trunk/dependency/src/main/java/org/jboss/dependency/plugins/AbstractControllerContext.java
===================================================================
--- projects/kernel/trunk/dependency/src/main/java/org/jboss/dependency/plugins/AbstractControllerContext.java 2010-03-04 12:46:14 UTC (rev 101819)
+++ projects/kernel/trunk/dependency/src/main/java/org/jboss/dependency/plugins/AbstractControllerContext.java 2010-03-04 13:17:36 UTC (rev 101820)
@@ -21,18 +21,16 @@
*/
package org.jboss.dependency.plugins;
+import static org.jboss.dependency.plugins.tracker.TrackerConstants.NOOP;
+
import java.io.PrintWriter;
import java.io.StringWriter;
import java.util.Collection;
import java.util.Collections;
import java.util.HashSet;
-import java.util.List;
import java.util.Set;
import java.util.TreeSet;
-import java.util.concurrent.atomic.AtomicInteger;
-import java.util.concurrent.atomic.AtomicLong;
-import static org.jboss.dependency.plugins.tracker.TrackerConstants.NOOP;
import org.jboss.dependency.spi.Controller;
import org.jboss.dependency.spi.ControllerContext;
import org.jboss.dependency.spi.ControllerContextActions;
@@ -44,16 +42,12 @@
import org.jboss.dependency.spi.tracker.ContextTracker;
import org.jboss.dependency.spi.tracker.ContextTracking;
import org.jboss.metadata.spi.MetaData;
-import org.jboss.metadata.spi.scope.CommonLevels;
-import org.jboss.metadata.spi.scope.CommonLevelsUtil;
import org.jboss.metadata.spi.scope.Scope;
import org.jboss.metadata.spi.scope.ScopeKey;
import org.jboss.metadata.spi.scope.ScopeLevel;
import org.jboss.util.JBossObject;
import org.jboss.util.JBossStringBuilder;
-import com.sun.corba.se.impl.oa.poa.AOMEntry;
-
/**
* A ControllerContext.
*
@@ -64,6 +58,7 @@
public class AbstractControllerContext extends JBossObject implements ControllerContext, ContextTracking
{
/** The default's minimal scope level */
+ @SuppressWarnings("unused") // ???
private static final ScopeLevel DEFAULT_MINIMAL;
static
Modified: projects/kernel/trunk/jmx-mc-int/src/main/java/org/jboss/system/ServiceMBeanSupport.java
===================================================================
--- projects/kernel/trunk/jmx-mc-int/src/main/java/org/jboss/system/ServiceMBeanSupport.java 2010-03-04 12:46:14 UTC (rev 101819)
+++ projects/kernel/trunk/jmx-mc-int/src/main/java/org/jboss/system/ServiceMBeanSupport.java 2010-03-04 13:17:36 UTC (rev 101820)
@@ -233,7 +233,7 @@
if (controllerContext != null)
pojoChange(ControllerState.CREATE);
else if (serviceName != null && isJBossInternalLifecycleExposed)
- server.invoke(ServiceController.OBJECT_NAME, "create", new Object[] { serviceName }, SERVICE_CONTROLLER_SIG);
+ server.invoke(ServiceControllerMBean.OBJECT_NAME, "create", new Object[] { serviceName }, SERVICE_CONTROLLER_SIG);
else
jbossInternalCreate();
}
@@ -243,7 +243,7 @@
if (controllerContext != null)
pojoChange(ControllerState.START);
else if (serviceName != null && isJBossInternalLifecycleExposed)
- server.invoke(ServiceController.OBJECT_NAME, "start", new Object[] { serviceName }, SERVICE_CONTROLLER_SIG);
+ server.invoke(ServiceControllerMBean.OBJECT_NAME, "start", new Object[] { serviceName }, SERVICE_CONTROLLER_SIG);
else
jbossInternalStart();
}
@@ -255,7 +255,7 @@
if (controllerContext != null)
pojoChange(ControllerState.CREATE);
else if (serviceName != null && isJBossInternalLifecycleExposed)
- server.invoke(ServiceController.OBJECT_NAME, "stop", new Object[] { serviceName }, SERVICE_CONTROLLER_SIG);
+ server.invoke(ServiceControllerMBean.OBJECT_NAME, "stop", new Object[] { serviceName }, SERVICE_CONTROLLER_SIG);
else
jbossInternalStop();
}
@@ -272,7 +272,7 @@
if (controllerContext != null)
pojoChange(ControllerState.CONFIGURED);
else if (serviceName != null && isJBossInternalLifecycleExposed)
- server.invoke(ServiceController.OBJECT_NAME, "destroy", new Object[] { serviceName }, SERVICE_CONTROLLER_SIG);
+ server.invoke(ServiceControllerMBean.OBJECT_NAME, "destroy", new Object[] { serviceName }, SERVICE_CONTROLLER_SIG);
else
jbossInternalDestroy();
}
Modified: projects/kernel/trunk/jmx-mc-int/src/main/java/org/jboss/system/microcontainer/DescribeAction.java
===================================================================
--- projects/kernel/trunk/jmx-mc-int/src/main/java/org/jboss/system/microcontainer/DescribeAction.java 2010-03-04 12:46:14 UTC (rev 101819)
+++ projects/kernel/trunk/jmx-mc-int/src/main/java/org/jboss/system/microcontainer/DescribeAction.java 2010-03-04 13:17:36 UTC (rev 101820)
@@ -24,7 +24,6 @@
import org.jboss.dependency.spi.ControllerState;
import org.jboss.kernel.Kernel;
import org.jboss.kernel.spi.metadata.KernelMetaDataRepository;
-import org.jboss.metadata.spi.repository.MutableMetaDataRepository;
import org.jboss.system.ServiceController;
/**
Modified: projects/kernel/trunk/jmx-mc-int/src/main/java/org/jboss/system/microcontainer/LifecycleInfo.java
===================================================================
--- projects/kernel/trunk/jmx-mc-int/src/main/java/org/jboss/system/microcontainer/LifecycleInfo.java 2010-03-04 12:46:14 UTC (rev 101819)
+++ projects/kernel/trunk/jmx-mc-int/src/main/java/org/jboss/system/microcontainer/LifecycleInfo.java 2010-03-04 13:17:36 UTC (rev 101820)
@@ -23,9 +23,9 @@
import java.security.AccessController;
import java.security.PrivilegedAction;
-import java.security.PrivilegedExceptionAction;
import java.util.HashMap;
import java.util.Map;
+
import javax.management.MBeanInfo;
import javax.management.MBeanOperationInfo;
import javax.management.MBeanServer;
Modified: projects/kernel/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/ControllerTestDelegate.java
===================================================================
--- projects/kernel/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/ControllerTestDelegate.java 2010-03-04 12:46:14 UTC (rev 101819)
+++ projects/kernel/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/ControllerTestDelegate.java 2010-03-04 13:17:36 UTC (rev 101820)
@@ -289,25 +289,22 @@
if (name.equals(ctx.objectName))
{
Throwable problem = ctx.getProblem();
- if (e != null || expected != null)
+ if (expected != null && problem == null)
+ throw new AssertionFailedError("Did not get expected " + expected.getName() + " for " + ctx);
+ if (expected == null && problem != null)
{
- if (expected != null && problem == null)
- throw new AssertionFailedError("Did not get expected " + expected.getName() + " for " + ctx);
- if (expected == null && problem != null)
- {
- if (problem instanceof Exception)
- throw (Exception) problem;
- if (problem instanceof Error)
- throw (Error) problem;
- throw new UndeclaredThrowableException(problem);
- }
- if (expected != null)
- {
- AbstractSystemTest.checkThrowableDeep(expected, problem);
- if (ServiceContext.FAILED != ctx.state)
- throw new AssertionFailedError("Context is not in the FAILED state: " + ctx);
- }
+ if (problem instanceof Exception)
+ throw (Exception) problem;
+ if (problem instanceof Error)
+ throw (Error) problem;
+ throw new UndeclaredThrowableException(problem);
}
+ if (expected != null)
+ {
+ AbstractSystemTest.checkThrowableDeep(expected, problem);
+ if (ServiceContext.FAILED != ctx.state)
+ throw new AssertionFailedError("Context is not in the FAILED state: " + ctx);
+ }
return;
}
}
Modified: projects/kernel/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/legacy/OldServiceConfigurator.java
===================================================================
--- projects/kernel/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/legacy/OldServiceConfigurator.java 2010-03-04 12:46:14 UTC (rev 101819)
+++ projects/kernel/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/legacy/OldServiceConfigurator.java 2010-03-04 13:17:36 UTC (rev 101820)
@@ -358,8 +358,6 @@
Object attribute = dependsObjectName;
if (proxyType != null)
{
- if (mbeanRefName == null)
- throw new DeploymentException("You cannot use a proxy-type without an optional-attribute-name");
if (proxyType.equals("attribute"))
{
MBeanAttributeInfo attr = attributeMap.get(mbeanRefName);
Modified: projects/kernel/trunk/kernel/src/main/java/org/jboss/beans/metadata/plugins/AbstractCallbackMetaData.java
===================================================================
--- projects/kernel/trunk/kernel/src/main/java/org/jboss/beans/metadata/plugins/AbstractCallbackMetaData.java 2010-03-04 12:46:14 UTC (rev 101819)
+++ projects/kernel/trunk/kernel/src/main/java/org/jboss/beans/metadata/plugins/AbstractCallbackMetaData.java 2010-03-04 13:17:36 UTC (rev 101820)
@@ -33,6 +33,7 @@
import org.jboss.dependency.spi.CallbackItem;
import org.jboss.dependency.spi.Cardinality;
import org.jboss.dependency.spi.ControllerState;
+import org.jboss.joinpoint.plugins.Config;
import org.jboss.kernel.plugins.config.Configurator;
import org.jboss.kernel.plugins.dependency.CallbackDependencyItem;
import org.jboss.kernel.spi.dependency.KernelControllerContext;
@@ -194,7 +195,7 @@
else if (methodName != null)
{
if (methodInfo == null)
- methodInfo = Configurator.findMethodInfo(getClassInfo(context), methodName, new String[]{signature});
+ methodInfo = Config.findMethodInfo(getClassInfo(context), methodName, new String[]{signature});
callback = CallbackCreatorUtil.createCallback(context, methodInfo, whenRequired, dependentState, cardinality);
}
else
Modified: projects/kernel/trunk/kernel/src/main/java/org/jboss/beans/metadata/plugins/AbstractConstructorMetaData.java
===================================================================
--- projects/kernel/trunk/kernel/src/main/java/org/jboss/beans/metadata/plugins/AbstractConstructorMetaData.java 2010-03-04 12:46:14 UTC (rev 101819)
+++ projects/kernel/trunk/kernel/src/main/java/org/jboss/beans/metadata/plugins/AbstractConstructorMetaData.java 2010-03-04 13:17:36 UTC (rev 101820)
@@ -38,6 +38,7 @@
import org.jboss.beans.metadata.spi.MetaDataVisitorNode;
import org.jboss.beans.metadata.spi.ParameterMetaData;
import org.jboss.beans.metadata.spi.ValueMetaData;
+import org.jboss.joinpoint.plugins.Config;
import org.jboss.kernel.plugins.config.Configurator;
import org.jboss.kernel.spi.config.KernelConfigurator;
import org.jboss.kernel.spi.dependency.KernelControllerContext;
@@ -268,7 +269,7 @@
ParameterMetaData parameter = (ParameterMetaData) previous;
String[] parameterTypes = Configurator.getParameterTypes(false, parameters);
- MethodInfo methodInfo = Configurator.findMethodInfo(classInfo, factoryMethod, parameterTypes, factoryClassName != null, true);
+ MethodInfo methodInfo = Config.findMethodInfo(classInfo, factoryMethod, parameterTypes, factoryClassName != null, true);
return applyCollectionOrMapCheck(methodInfo.getParameterTypes()[parameter.getIndex()]);
}
else
@@ -280,7 +281,7 @@
{
ParameterMetaData parameter = (ParameterMetaData) previous;
String[] paramTypes = Configurator.getParameterTypes(false, parameters);
- ConstructorInfo ci = Configurator.findConstructorInfo(beanInfo.getClassInfo(), paramTypes);
+ ConstructorInfo ci = Config.findConstructorInfo(beanInfo.getClassInfo(), paramTypes);
return applyCollectionOrMapCheck(ci.getParameterTypes()[parameter.getIndex()]);
}
else
Modified: projects/kernel/trunk/kernel/src/main/java/org/jboss/beans/metadata/plugins/AbstractLifecycleMetaData.java
===================================================================
--- projects/kernel/trunk/kernel/src/main/java/org/jboss/beans/metadata/plugins/AbstractLifecycleMetaData.java 2010-03-04 12:46:14 UTC (rev 101819)
+++ projects/kernel/trunk/kernel/src/main/java/org/jboss/beans/metadata/plugins/AbstractLifecycleMetaData.java 2010-03-04 13:17:36 UTC (rev 101820)
@@ -35,6 +35,7 @@
import org.jboss.beans.metadata.spi.MetaDataVisitorNode;
import org.jboss.beans.metadata.spi.ParameterMetaData;
import org.jboss.dependency.spi.ControllerState;
+import org.jboss.joinpoint.plugins.Config;
import org.jboss.kernel.plugins.config.Configurator;
import org.jboss.kernel.spi.dependency.KernelControllerContext;
import org.jboss.reflect.spi.ClassInfo;
@@ -188,7 +189,7 @@
KernelControllerContext context = visitor.getControllerContext();
String method = (methodName != null ? methodName : type);
String[] parameterTypes = Configurator.getParameterTypes(false, parameters);
- MethodInfo methodInfo = Configurator.findMethodInfo(getClassInfo(context), method, parameterTypes);
+ MethodInfo methodInfo = Config.findMethodInfo(getClassInfo(context), method, parameterTypes);
return applyCollectionOrMapCheck(methodInfo.getParameterTypes()[parameter.getIndex()]);
}
Modified: projects/kernel/trunk/kernel/src/main/java/org/jboss/beans/metadata/spi/builder/BeanMetaDataBuilder.java
===================================================================
--- projects/kernel/trunk/kernel/src/main/java/org/jboss/beans/metadata/spi/builder/BeanMetaDataBuilder.java 2010-03-04 12:46:14 UTC (rev 101819)
+++ projects/kernel/trunk/kernel/src/main/java/org/jboss/beans/metadata/spi/builder/BeanMetaDataBuilder.java 2010-03-04 13:17:36 UTC (rev 101820)
@@ -2169,7 +2169,7 @@
*
* @param inject the ValueMetaData containing the contextual inject
* @param qualifiers the qualifiers to use to narrow down beans of the matching type. These will override or come in addition to the bean level ones
- * specified in {@link #addRequiredQualifiers(Object...)} and {@link #addOptionalQualifiers(Object...)} and to the ones from higher
+ * specified in {@link #addQualifiers(QualifierType, Object...)} and to the ones from higher
* levels in the MDR, depending on the value of ignoreBeanQualifiers
* @return the contextual injection ValueMetaData
* @throws IllegalArgumentException if the ValueMetaData was not created using the createContextualInject() methods
@@ -2187,7 +2187,7 @@
* @param ignoreBeanQualifiers Whether we should ignore bean level qualifiers and only use the ones specified on the inject. Default is false.
* If this method is called numerous times for a contextual inject ValueMetaData, the last ignoreBeanQualifiers value overrides the previous ones
* @param qualifiers the qualifiers to use to narrow down beans of the matching type. These will override or come in addition to the bean level ones
- * specified in {@link #addRequiredQualifiers(Object...)} and {@link #addOptionalQualifiers(Object...)} and to the ones from higher
+ * specified in {@link #addQualifiers(QualifierType, Object...)} and to the ones from higher
* levels in the MDR, depending on the value of ignoreBeanQualifiers
* @return the contextual injection ValueMetaData
* @throws IllegalArgumentException if the ValueMetaData was not created using the createContextualInject() methods
Modified: projects/kernel/trunk/kernel/src/main/java/org/jboss/kernel/plugins/annotations/CommonAnnotationAdapter.java
===================================================================
--- projects/kernel/trunk/kernel/src/main/java/org/jboss/kernel/plugins/annotations/CommonAnnotationAdapter.java 2010-03-04 12:46:14 UTC (rev 101819)
+++ projects/kernel/trunk/kernel/src/main/java/org/jboss/kernel/plugins/annotations/CommonAnnotationAdapter.java 2010-03-04 13:17:36 UTC (rev 101820)
@@ -174,6 +174,7 @@
}
}
+ @SuppressWarnings("unchecked")
public void addMetaAnnotationPlugin(T plugin)
{
if (plugin == null)
Modified: projects/kernel/trunk/kernel/src/main/java/org/jboss/kernel/plugins/annotations/InstallationParameterAnnotationPlugin.java
===================================================================
--- projects/kernel/trunk/kernel/src/main/java/org/jboss/kernel/plugins/annotations/InstallationParameterAnnotationPlugin.java 2010-03-04 12:46:14 UTC (rev 101819)
+++ projects/kernel/trunk/kernel/src/main/java/org/jboss/kernel/plugins/annotations/InstallationParameterAnnotationPlugin.java 2010-03-04 13:17:36 UTC (rev 101820)
@@ -32,7 +32,7 @@
import org.jboss.beans.metadata.spi.InstallMetaData;
import org.jboss.beans.metadata.spi.MetaDataVisitorNode;
import org.jboss.beans.metadata.spi.ParameterMetaData;
-import org.jboss.kernel.plugins.config.Configurator;
+import org.jboss.joinpoint.plugins.Config;
import org.jboss.reflect.spi.MethodInfo;
import org.jboss.reflect.spi.ParameterInfo;
import org.jboss.reflect.spi.TypeInfo;
@@ -83,7 +83,7 @@
typeNames[i] = parameters.get(i).getType();
typeInfos[i] = parameterInfos[i].getParameterType();
}
- return Configurator.equals(typeNames, typeInfos);
+ return Config.equals(typeNames, typeInfos);
}
}
}
Modified: projects/kernel/trunk/kernel/src/main/java/org/jboss/kernel/plugins/annotations/Jsr330InjectFieldAnnotationPlugin.java
===================================================================
--- projects/kernel/trunk/kernel/src/main/java/org/jboss/kernel/plugins/annotations/Jsr330InjectFieldAnnotationPlugin.java 2010-03-04 12:46:14 UTC (rev 101819)
+++ projects/kernel/trunk/kernel/src/main/java/org/jboss/kernel/plugins/annotations/Jsr330InjectFieldAnnotationPlugin.java 2010-03-04 13:17:36 UTC (rev 101820)
@@ -25,7 +25,6 @@
import javax.inject.Inject;
-import org.jboss.beans.info.spi.PropertyInfo;
import org.jboss.beans.metadata.plugins.AbstractInjectionValueMetaData;
import org.jboss.beans.metadata.spi.BeanMetaData;
import org.jboss.beans.metadata.spi.MetaDataVisitorNode;
Modified: projects/kernel/trunk/kernel/src/main/java/org/jboss/kernel/plugins/annotations/LifecycleAnnotationPlugin.java
===================================================================
--- projects/kernel/trunk/kernel/src/main/java/org/jboss/kernel/plugins/annotations/LifecycleAnnotationPlugin.java 2010-03-04 12:46:14 UTC (rev 101819)
+++ projects/kernel/trunk/kernel/src/main/java/org/jboss/kernel/plugins/annotations/LifecycleAnnotationPlugin.java 2010-03-04 13:17:36 UTC (rev 101820)
@@ -33,6 +33,7 @@
/**
* Annotation plugin to handle annotations that should trigger lifecycle callbacks
*
+ * @param <C> annotation type
* @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
* @version $Revision: 1.1 $
*/
Modified: projects/kernel/trunk/kernel/src/main/java/org/jboss/kernel/plugins/annotations/MetaAnnotationPlugin.java
===================================================================
--- projects/kernel/trunk/kernel/src/main/java/org/jboss/kernel/plugins/annotations/MetaAnnotationPlugin.java 2010-03-04 12:46:14 UTC (rev 101819)
+++ projects/kernel/trunk/kernel/src/main/java/org/jboss/kernel/plugins/annotations/MetaAnnotationPlugin.java 2010-03-04 13:17:36 UTC (rev 101820)
@@ -27,6 +27,8 @@
/**
*
+ * @param <Q> annotation type
+ * @param <T> info type
* @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
* @version $Revision: 1.1 $
*/
Modified: projects/kernel/trunk/kernel/src/main/java/org/jboss/kernel/plugins/annotations/PropertyAnnotationPluginFilter.java
===================================================================
--- projects/kernel/trunk/kernel/src/main/java/org/jboss/kernel/plugins/annotations/PropertyAnnotationPluginFilter.java 2010-03-04 12:46:14 UTC (rev 101819)
+++ projects/kernel/trunk/kernel/src/main/java/org/jboss/kernel/plugins/annotations/PropertyAnnotationPluginFilter.java 2010-03-04 13:17:36 UTC (rev 101820)
@@ -30,6 +30,7 @@
*/
class PropertyAnnotationPluginFilter implements AnnotationPluginFilter
{
+ @SuppressWarnings("unchecked")
public boolean accept(MetaDataAnnotationPlugin<? extends AnnotatedInfo, ? extends Annotation> plugin)
{
return (plugin instanceof PropertyAware);
Modified: projects/kernel/trunk/kernel/src/main/java/org/jboss/kernel/plugins/annotations/PropertyAware.java
===================================================================
--- projects/kernel/trunk/kernel/src/main/java/org/jboss/kernel/plugins/annotations/PropertyAware.java 2010-03-04 12:46:14 UTC (rev 101819)
+++ projects/kernel/trunk/kernel/src/main/java/org/jboss/kernel/plugins/annotations/PropertyAware.java 2010-03-04 13:17:36 UTC (rev 101820)
@@ -30,6 +30,7 @@
/**
* Marker interface.
*
+ * @param <C> annotation type
* @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
*/
public interface PropertyAware<C extends Annotation>
Modified: projects/kernel/trunk/kernel/src/main/java/org/jboss/kernel/plugins/dependency/AbstractKernelController.java
===================================================================
--- projects/kernel/trunk/kernel/src/main/java/org/jboss/kernel/plugins/dependency/AbstractKernelController.java 2010-03-04 12:46:14 UTC (rev 101819)
+++ projects/kernel/trunk/kernel/src/main/java/org/jboss/kernel/plugins/dependency/AbstractKernelController.java 2010-03-04 13:17:36 UTC (rev 101820)
@@ -104,7 +104,6 @@
return context;
}
- @SuppressWarnings("unchecked")
public KernelRegistryEntry getEntry(Object name)
{
List<KernelControllerContext> list;
Modified: projects/kernel/trunk/kernel/src/main/java/org/jboss/kernel/plugins/dependency/AbstractKernelControllerContext.java
===================================================================
--- projects/kernel/trunk/kernel/src/main/java/org/jboss/kernel/plugins/dependency/AbstractKernelControllerContext.java 2010-03-04 12:46:14 UTC (rev 101819)
+++ projects/kernel/trunk/kernel/src/main/java/org/jboss/kernel/plugins/dependency/AbstractKernelControllerContext.java 2010-03-04 13:17:36 UTC (rev 101820)
@@ -43,6 +43,7 @@
import org.jboss.dependency.spi.DependencyInfo;
import org.jboss.dependency.spi.DependencyItem;
import org.jboss.dependency.spi.ErrorHandlingMode;
+import org.jboss.joinpoint.plugins.Config;
import org.jboss.kernel.Kernel;
import org.jboss.kernel.plugins.config.Configurator;
import org.jboss.kernel.spi.dependency.KernelController;
@@ -416,7 +417,7 @@
BeanValidatorBridge bridge = KernelControllerContextAction.getBeanValidatorBridge(this);
if (bridge != null)
{
- MethodInfo methodInfo = Configurator.findMethodInfo(getInfo().getClassInfo(), name, signature);
+ MethodInfo methodInfo = Config.findMethodInfo(getInfo().getClassInfo(), name, signature);
bridge.validateMethodValues(this, getTarget(), methodInfo, paramaters);
}
}
Modified: projects/kernel/trunk/kernel/src/main/java/org/jboss/kernel/plugins/dependency/KernelScopeInfo.java
===================================================================
--- projects/kernel/trunk/kernel/src/main/java/org/jboss/kernel/plugins/dependency/KernelScopeInfo.java 2010-03-04 12:46:14 UTC (rev 101819)
+++ projects/kernel/trunk/kernel/src/main/java/org/jboss/kernel/plugins/dependency/KernelScopeInfo.java 2010-03-04 13:17:36 UTC (rev 101820)
@@ -37,6 +37,7 @@
import org.jboss.dependency.plugins.AbstractScopeInfo;
import org.jboss.dependency.spi.Controller;
import org.jboss.dependency.spi.ControllerContext;
+import org.jboss.joinpoint.plugins.Config;
import org.jboss.kernel.plugins.config.Configurator;
import org.jboss.kernel.spi.dependency.KernelController;
import org.jboss.kernel.spi.dependency.KernelControllerContext;
@@ -297,7 +298,7 @@
List<ParameterMetaData> parameters = install.getParameters();
String[] paramTypes = parameters == null ? NO_PARAM_TYPES : new String[parameters.size()];
- MethodInfo method = Configurator.findMethodInfo(context.getBeanInfo().getClassInfo(), install.getMethodName(), paramTypes, false);
+ MethodInfo method = Config.findMethodInfo(context.getBeanInfo().getClassInfo(), install.getMethodName(), paramTypes, false);
Set<AnnotationMetaData> methodAnnotations = install.getAnnotations();
Modified: projects/kernel/trunk/kernel/src/main/java/org/jboss/kernel/plugins/dependency/QualifiersMdrUtil.java
===================================================================
--- projects/kernel/trunk/kernel/src/main/java/org/jboss/kernel/plugins/dependency/QualifiersMdrUtil.java 2010-03-04 12:46:14 UTC (rev 101819)
+++ projects/kernel/trunk/kernel/src/main/java/org/jboss/kernel/plugins/dependency/QualifiersMdrUtil.java 2010-03-04 13:17:36 UTC (rev 101820)
@@ -42,6 +42,7 @@
import org.jboss.beans.metadata.spi.factory.BeanFactory;
import org.jboss.dependency.spi.ControllerContext;
import org.jboss.dependency.spi.DependencyItem;
+import org.jboss.joinpoint.plugins.Config;
import org.jboss.kernel.plugins.config.Configurator;
import org.jboss.kernel.spi.dependency.KernelControllerContext;
import org.jboss.logging.Logger;
@@ -104,6 +105,7 @@
public final static String METHOD_SUFFIX = "#METHOD";
+ @SuppressWarnings("unchecked")
private final static Class<? extends Annotation>[] QUALIFIERS = new Class[] {Qualifier.class};
private final static TypeInfo BEAN_FACTORY_TYPE;
@@ -167,7 +169,8 @@
* Adds the qualifiers for a context's bean metadata to the context's MDR metadata,
* and checks the qualifier injection points for additional qualifiers coming from annotations
*
- * @param context the context
+ * @param context the context
+ * @throws Exception for any error
*/
public static void populateQualifiersForContext(KernelControllerContext context) throws Exception
{
@@ -206,7 +209,7 @@
* Get the qualifiers coming from annotations for an injection point
*
* @param context the kernel controller context
- * @param item the parents of the injection point
+ * @param parents the parents of the injection point
* @return the annotations specifying qualifiers
* @throws Exception if an error occurred
*/
@@ -322,6 +325,7 @@
* found at all scope levels
*
* @param context the context
+ * @param point the qualifier point
* @return the found qualifiers
*/
public static Set<Object> mergeRequiredQualifiersFromMdr(ControllerContext context, QualifierPoint point)
@@ -334,6 +338,7 @@
* found at all scope levels
*
* @param context the context
+ * @param point the qualifier point
* @return the found qualifiers
*/
public static Set<Object> mergeOptionalQualifiersFromMdr(ControllerContext context, QualifierPoint point)
@@ -469,7 +474,7 @@
String[] paramTypes = new String[lmd.getParameters().size()];
for (int i = 0 ; i < paramTypes.length ; i++)
paramTypes[i] = lmd.getParameters().get(i).getType();
- MethodInfo method = Configurator.findMethodInfo(context.getBeanInfo().getClassInfo(), lmd.getMethodName(), paramTypes, false);
+ MethodInfo method = Config.findMethodInfo(context.getBeanInfo().getClassInfo(), lmd.getMethodName(), paramTypes, false);
MetaData methodMetaData = metaData.getComponentMetaData(new DeclaredMethodSignature(method));
MetaData paramMetaData = metaData.getComponentMetaData(new MethodParametersSignature(method, pmd.getIndex()));
@@ -541,7 +546,8 @@
}
removeEmptyQualifiersSetFromMdr(qualifierSet, key, retrieval, null);
}
-
+
+ @SuppressWarnings("unchecked")
Set<Object> mergeQualifiersFromMdr(ControllerContext context, String key)
{
if (context instanceof KernelControllerContext == false)
@@ -594,6 +600,7 @@
}
}
+ @SuppressWarnings("unchecked")
Set<Object> getQualifiersSetInMdr(MetaDataRetrieval retrieval, String key, boolean create)
{
MetaDataItem<?> item = retrieval.retrieveMetaData(key);
Modified: projects/kernel/trunk/kernel/src/main/java/org/jboss/kernel/plugins/dispatch/InvokeDispatchHelper.java
===================================================================
--- projects/kernel/trunk/kernel/src/main/java/org/jboss/kernel/plugins/dispatch/InvokeDispatchHelper.java 2010-03-04 12:46:14 UTC (rev 101819)
+++ projects/kernel/trunk/kernel/src/main/java/org/jboss/kernel/plugins/dispatch/InvokeDispatchHelper.java 2010-03-04 13:17:36 UTC (rev 101820)
@@ -27,6 +27,7 @@
import org.jboss.beans.metadata.spi.ValueMetaData;
import org.jboss.dependency.spi.ControllerContext;
import org.jboss.dependency.spi.dispatch.InvokeDispatchContext;
+import org.jboss.joinpoint.plugins.Config;
import org.jboss.kernel.plugins.config.Configurator;
import org.jboss.kernel.spi.config.KernelConfigurator;
import org.jboss.logging.Logger;
@@ -77,7 +78,7 @@
if (target != null)
{
ClassInfo classInfo = configurator.getClassInfo(target.getClass());
- MethodInfo methodInfo = Configurator.findMethodInfo(classInfo, methodName, signature);
+ MethodInfo methodInfo = Config.findMethodInfo(classInfo, methodName, signature);
TypeInfo[] infos = methodInfo.getParameterTypes();
parameters = Configurator.handleParameters(log.isTraceEnabled(), classLoader, infos, params, unget);
// add some more info, if not yet set
Modified: projects/kernel/trunk/kernel/src/test/java/org/jboss/test/kernel/annotations/support/TestOrderPlugin.java
===================================================================
--- projects/kernel/trunk/kernel/src/test/java/org/jboss/test/kernel/annotations/support/TestOrderPlugin.java 2010-03-04 12:46:14 UTC (rev 101819)
+++ projects/kernel/trunk/kernel/src/test/java/org/jboss/test/kernel/annotations/support/TestOrderPlugin.java 2010-03-04 13:17:36 UTC (rev 101820)
@@ -34,6 +34,7 @@
/**
*
+ * @param <C> the annotation type
* @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
* @version $Revision: 1.1 $
*/
Modified: projects/kernel/trunk/kernel/src/test/java/org/jboss/test/kernel/annotations/test/method/AnnotatedMethodTestCase.java
===================================================================
--- projects/kernel/trunk/kernel/src/test/java/org/jboss/test/kernel/annotations/test/method/AnnotatedMethodTestCase.java 2010-03-04 12:46:14 UTC (rev 101819)
+++ projects/kernel/trunk/kernel/src/test/java/org/jboss/test/kernel/annotations/test/method/AnnotatedMethodTestCase.java 2010-03-04 13:17:36 UTC (rev 101820)
@@ -54,6 +54,7 @@
*
* @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
*/
+ at SuppressWarnings("unchecked")
public class AnnotatedMethodTestCase extends MicrocontainerTest
{
private final static String METHOD_NAME = "method";
Modified: projects/kernel/trunk/kernel/src/test/java/org/jboss/test/kernel/benchmark/test/CallbackBenchmark.java
===================================================================
--- projects/kernel/trunk/kernel/src/test/java/org/jboss/test/kernel/benchmark/test/CallbackBenchmark.java 2010-03-04 12:46:14 UTC (rev 101819)
+++ projects/kernel/trunk/kernel/src/test/java/org/jboss/test/kernel/benchmark/test/CallbackBenchmark.java 2010-03-04 13:17:36 UTC (rev 101820)
@@ -30,7 +30,6 @@
import org.jboss.dependency.spi.ControllerContext;
import org.jboss.test.kernel.benchmark.support.SimpleBean;
import org.jboss.test.kernel.benchmark.support.SimpleBeanCallback;
-import org.jboss.test.kernel.benchmark.support.ObjectWithLotsOfProperties;
/**
*
Modified: projects/kernel/trunk/kernel/src/test/java/org/jboss/test/kernel/dependency/support/ScopedTestUtil.java
===================================================================
--- projects/kernel/trunk/kernel/src/test/java/org/jboss/test/kernel/dependency/support/ScopedTestUtil.java 2010-03-04 12:46:14 UTC (rev 101819)
+++ projects/kernel/trunk/kernel/src/test/java/org/jboss/test/kernel/dependency/support/ScopedTestUtil.java 2010-03-04 13:17:36 UTC (rev 101820)
@@ -21,16 +21,11 @@
*/
package org.jboss.test.kernel.dependency.support;
-import java.net.URL;
-
-import org.jboss.beans.metadata.spi.BeanMetaData;
import org.jboss.dependency.plugins.AbstractController;
import org.jboss.dependency.spi.Controller;
import org.jboss.dependency.spi.ControllerContext;
import org.jboss.dependency.spi.ControllerState;
import org.jboss.kernel.Kernel;
-import org.jboss.kernel.spi.dependency.KernelControllerContext;
-import org.jboss.kernel.spi.deployment.KernelDeployment;
import org.jboss.test.kernel.AbstractKernelTest;
/**
Modified: projects/kernel/trunk/kernel/src/test/java/org/jboss/test/kernel/dependency/test/UninstallNoOptionalContextDependencyTestCase.java
===================================================================
--- projects/kernel/trunk/kernel/src/test/java/org/jboss/test/kernel/dependency/test/UninstallNoOptionalContextDependencyTestCase.java 2010-03-04 12:46:14 UTC (rev 101819)
+++ projects/kernel/trunk/kernel/src/test/java/org/jboss/test/kernel/dependency/test/UninstallNoOptionalContextDependencyTestCase.java 2010-03-04 13:17:36 UTC (rev 101820)
@@ -64,6 +64,7 @@
super(name, xmltest);
}
+ @SuppressWarnings("unchecked")
public void testUninstallOptionalInjectionNotPresent() throws Throwable
{
//Get hold of the ConfigureAction instance - UGLY but needed so we can replace its logger :-)
Modified: projects/kernel/trunk/kernel/src/test/java/org/jboss/test/kernel/deployment/xml/test/AnnotationJaxbTestCase.java
===================================================================
--- projects/kernel/trunk/kernel/src/test/java/org/jboss/test/kernel/deployment/xml/test/AnnotationJaxbTestCase.java 2010-03-04 12:46:14 UTC (rev 101819)
+++ projects/kernel/trunk/kernel/src/test/java/org/jboss/test/kernel/deployment/xml/test/AnnotationJaxbTestCase.java 2010-03-04 13:17:36 UTC (rev 101820)
@@ -134,7 +134,7 @@
public static Test suite()
{
- return AnnotationJaxbTestCase.suite(AnnotationJaxbTestCase.class);
+ return suite(AnnotationJaxbTestCase.class);
}
public AnnotationJaxbTestCase(String name)
Modified: projects/kernel/trunk/kernel/src/test/java/org/jboss/test/kernel/deployment/xml/test/ArrayJaxbTestCase.java
===================================================================
--- projects/kernel/trunk/kernel/src/test/java/org/jboss/test/kernel/deployment/xml/test/ArrayJaxbTestCase.java 2010-03-04 12:46:14 UTC (rev 101819)
+++ projects/kernel/trunk/kernel/src/test/java/org/jboss/test/kernel/deployment/xml/test/ArrayJaxbTestCase.java 2010-03-04 13:17:36 UTC (rev 101820)
@@ -168,7 +168,7 @@
public static Test suite()
{
- return ArrayJaxbTestCase.suite(ArrayJaxbTestCase.class);
+ return suite(ArrayJaxbTestCase.class);
}
public ArrayJaxbTestCase(String name)
Modified: projects/kernel/trunk/kernel/src/test/java/org/jboss/test/kernel/deployment/xml/test/BeanFactoryJaxbTestCase.java
===================================================================
--- projects/kernel/trunk/kernel/src/test/java/org/jboss/test/kernel/deployment/xml/test/BeanFactoryJaxbTestCase.java 2010-03-04 12:46:14 UTC (rev 101819)
+++ projects/kernel/trunk/kernel/src/test/java/org/jboss/test/kernel/deployment/xml/test/BeanFactoryJaxbTestCase.java 2010-03-04 13:17:36 UTC (rev 101820)
@@ -667,7 +667,7 @@
public static Test suite()
{
- return BeanFactoryJaxbTestCase.suite(BeanFactoryJaxbTestCase.class);
+ return suite(BeanFactoryJaxbTestCase.class);
}
public BeanFactoryJaxbTestCase(String name)
Modified: projects/kernel/trunk/kernel/src/test/java/org/jboss/test/kernel/deployment/xml/test/BeanJaxbTestCase.java
===================================================================
--- projects/kernel/trunk/kernel/src/test/java/org/jboss/test/kernel/deployment/xml/test/BeanJaxbTestCase.java 2010-03-04 12:46:14 UTC (rev 101819)
+++ projects/kernel/trunk/kernel/src/test/java/org/jboss/test/kernel/deployment/xml/test/BeanJaxbTestCase.java 2010-03-04 13:17:36 UTC (rev 101820)
@@ -923,7 +923,7 @@
public static Test suite()
{
- return BeanJaxbTestCase.suite(BeanJaxbTestCase.class);
+ return suite(BeanJaxbTestCase.class);
}
public BeanJaxbTestCase(String name)
Modified: projects/kernel/trunk/kernel/src/test/java/org/jboss/test/kernel/deployment/xml/test/CallbackJaxbTestCase.java
===================================================================
--- projects/kernel/trunk/kernel/src/test/java/org/jboss/test/kernel/deployment/xml/test/CallbackJaxbTestCase.java 2010-03-04 12:46:14 UTC (rev 101819)
+++ projects/kernel/trunk/kernel/src/test/java/org/jboss/test/kernel/deployment/xml/test/CallbackJaxbTestCase.java 2010-03-04 13:17:36 UTC (rev 101820)
@@ -47,7 +47,7 @@
public static Test suite()
{
- return CallbackJaxbTestCase.suite(CallbackJaxbTestCase.class);
+ return suite(CallbackJaxbTestCase.class);
}
protected CallbackMetaData getInstallCallback() throws Exception
Modified: projects/kernel/trunk/kernel/src/test/java/org/jboss/test/kernel/deployment/xml/test/ClassLoaderJaxbTestCase.java
===================================================================
--- projects/kernel/trunk/kernel/src/test/java/org/jboss/test/kernel/deployment/xml/test/ClassLoaderJaxbTestCase.java 2010-03-04 12:46:14 UTC (rev 101819)
+++ projects/kernel/trunk/kernel/src/test/java/org/jboss/test/kernel/deployment/xml/test/ClassLoaderJaxbTestCase.java 2010-03-04 13:17:36 UTC (rev 101820)
@@ -84,7 +84,7 @@
public static Test suite()
{
- return ClassLoaderJaxbTestCase.suite(ClassLoaderJaxbTestCase.class);
+ return suite(ClassLoaderJaxbTestCase.class);
}
public ClassLoaderJaxbTestCase(String name)
Modified: projects/kernel/trunk/kernel/src/test/java/org/jboss/test/kernel/deployment/xml/test/CollectionJaxbTestCase.java
===================================================================
--- projects/kernel/trunk/kernel/src/test/java/org/jboss/test/kernel/deployment/xml/test/CollectionJaxbTestCase.java 2010-03-04 12:46:14 UTC (rev 101819)
+++ projects/kernel/trunk/kernel/src/test/java/org/jboss/test/kernel/deployment/xml/test/CollectionJaxbTestCase.java 2010-03-04 13:17:36 UTC (rev 101820)
@@ -168,7 +168,7 @@
public static Test suite()
{
- return CollectionJaxbTestCase.suite(CollectionJaxbTestCase.class);
+ return suite(CollectionJaxbTestCase.class);
}
public CollectionJaxbTestCase(String name)
Modified: projects/kernel/trunk/kernel/src/test/java/org/jboss/test/kernel/deployment/xml/test/ConstructorJaxbTestCase.java
===================================================================
--- projects/kernel/trunk/kernel/src/test/java/org/jboss/test/kernel/deployment/xml/test/ConstructorJaxbTestCase.java 2010-03-04 12:46:14 UTC (rev 101819)
+++ projects/kernel/trunk/kernel/src/test/java/org/jboss/test/kernel/deployment/xml/test/ConstructorJaxbTestCase.java 2010-03-04 13:17:36 UTC (rev 101820)
@@ -289,7 +289,7 @@
public static Test suite()
{
- return ConstructorJaxbTestCase.suite(ConstructorJaxbTestCase.class);
+ return suite(ConstructorJaxbTestCase.class);
}
public ConstructorJaxbTestCase(String name)
Modified: projects/kernel/trunk/kernel/src/test/java/org/jboss/test/kernel/deployment/xml/test/DemandJaxbTestCase.java
===================================================================
--- projects/kernel/trunk/kernel/src/test/java/org/jboss/test/kernel/deployment/xml/test/DemandJaxbTestCase.java 2010-03-04 12:46:14 UTC (rev 101819)
+++ projects/kernel/trunk/kernel/src/test/java/org/jboss/test/kernel/deployment/xml/test/DemandJaxbTestCase.java 2010-03-04 13:17:36 UTC (rev 101820)
@@ -87,7 +87,7 @@
public static Test suite()
{
- return DemandJaxbTestCase.suite(DemandJaxbTestCase.class);
+ return suite(DemandJaxbTestCase.class);
}
public DemandJaxbTestCase(String name)
Modified: projects/kernel/trunk/kernel/src/test/java/org/jboss/test/kernel/deployment/xml/test/DependencyJaxbTestCase.java
===================================================================
--- projects/kernel/trunk/kernel/src/test/java/org/jboss/test/kernel/deployment/xml/test/DependencyJaxbTestCase.java 2010-03-04 12:46:14 UTC (rev 101819)
+++ projects/kernel/trunk/kernel/src/test/java/org/jboss/test/kernel/deployment/xml/test/DependencyJaxbTestCase.java 2010-03-04 13:17:36 UTC (rev 101820)
@@ -70,7 +70,7 @@
public static Test suite()
{
- return DependencyJaxbTestCase.suite(DependencyJaxbTestCase.class);
+ return suite(DependencyJaxbTestCase.class);
}
public DependencyJaxbTestCase(String name)
Modified: projects/kernel/trunk/kernel/src/test/java/org/jboss/test/kernel/deployment/xml/test/DeploymentJaxbTestCase.java
===================================================================
--- projects/kernel/trunk/kernel/src/test/java/org/jboss/test/kernel/deployment/xml/test/DeploymentJaxbTestCase.java 2010-03-04 12:46:14 UTC (rev 101819)
+++ projects/kernel/trunk/kernel/src/test/java/org/jboss/test/kernel/deployment/xml/test/DeploymentJaxbTestCase.java 2010-03-04 13:17:36 UTC (rev 101820)
@@ -234,7 +234,7 @@
public static Test suite()
{
- return DeploymentJaxbTestCase.suite(DeploymentJaxbTestCase.class);
+ return suite(DeploymentJaxbTestCase.class);
}
public DeploymentJaxbTestCase(String name)
Modified: projects/kernel/trunk/kernel/src/test/java/org/jboss/test/kernel/deployment/xml/test/FactoryJaxbTestCase.java
===================================================================
--- projects/kernel/trunk/kernel/src/test/java/org/jboss/test/kernel/deployment/xml/test/FactoryJaxbTestCase.java 2010-03-04 12:46:14 UTC (rev 101819)
+++ projects/kernel/trunk/kernel/src/test/java/org/jboss/test/kernel/deployment/xml/test/FactoryJaxbTestCase.java 2010-03-04 13:17:36 UTC (rev 101820)
@@ -99,7 +99,7 @@
public static Test suite()
{
- return FactoryJaxbTestCase.suite(FactoryJaxbTestCase.class);
+ return suite(FactoryJaxbTestCase.class);
}
public FactoryJaxbTestCase(String name)
Modified: projects/kernel/trunk/kernel/src/test/java/org/jboss/test/kernel/deployment/xml/test/InjectionJaxbTestCase.java
===================================================================
--- projects/kernel/trunk/kernel/src/test/java/org/jboss/test/kernel/deployment/xml/test/InjectionJaxbTestCase.java 2010-03-04 12:46:14 UTC (rev 101819)
+++ projects/kernel/trunk/kernel/src/test/java/org/jboss/test/kernel/deployment/xml/test/InjectionJaxbTestCase.java 2010-03-04 13:17:36 UTC (rev 101820)
@@ -101,7 +101,7 @@
public static Test suite()
{
- return InjectionJaxbTestCase.suite(InjectionJaxbTestCase.class);
+ return suite(InjectionJaxbTestCase.class);
}
public InjectionJaxbTestCase(String name)
Modified: projects/kernel/trunk/kernel/src/test/java/org/jboss/test/kernel/deployment/xml/test/InstallJaxbTestCase.java
===================================================================
--- projects/kernel/trunk/kernel/src/test/java/org/jboss/test/kernel/deployment/xml/test/InstallJaxbTestCase.java 2010-03-04 12:46:14 UTC (rev 101819)
+++ projects/kernel/trunk/kernel/src/test/java/org/jboss/test/kernel/deployment/xml/test/InstallJaxbTestCase.java 2010-03-04 13:17:36 UTC (rev 101820)
@@ -169,7 +169,7 @@
public static Test suite()
{
- return InstallJaxbTestCase.suite(InstallJaxbTestCase.class);
+ return suite(InstallJaxbTestCase.class);
}
public InstallJaxbTestCase(String name)
Modified: projects/kernel/trunk/kernel/src/test/java/org/jboss/test/kernel/deployment/xml/test/LifecycleJaxbTestCase.java
===================================================================
--- projects/kernel/trunk/kernel/src/test/java/org/jboss/test/kernel/deployment/xml/test/LifecycleJaxbTestCase.java 2010-03-04 12:46:14 UTC (rev 101819)
+++ projects/kernel/trunk/kernel/src/test/java/org/jboss/test/kernel/deployment/xml/test/LifecycleJaxbTestCase.java 2010-03-04 13:17:36 UTC (rev 101820)
@@ -118,7 +118,7 @@
public static Test suite()
{
- return LifecycleJaxbTestCase.suite(LifecycleJaxbTestCase.class);
+ return suite(LifecycleJaxbTestCase.class);
}
public LifecycleJaxbTestCase(String name)
Modified: projects/kernel/trunk/kernel/src/test/java/org/jboss/test/kernel/deployment/xml/test/ListJaxbTestCase.java
===================================================================
--- projects/kernel/trunk/kernel/src/test/java/org/jboss/test/kernel/deployment/xml/test/ListJaxbTestCase.java 2010-03-04 12:46:14 UTC (rev 101819)
+++ projects/kernel/trunk/kernel/src/test/java/org/jboss/test/kernel/deployment/xml/test/ListJaxbTestCase.java 2010-03-04 13:17:36 UTC (rev 101820)
@@ -168,7 +168,7 @@
public static Test suite()
{
- return ListJaxbTestCase.suite(ListJaxbTestCase.class);
+ return suite(ListJaxbTestCase.class);
}
public ListJaxbTestCase(String name)
Modified: projects/kernel/trunk/kernel/src/test/java/org/jboss/test/kernel/deployment/xml/test/MapJaxbTestCase.java
===================================================================
--- projects/kernel/trunk/kernel/src/test/java/org/jboss/test/kernel/deployment/xml/test/MapJaxbTestCase.java 2010-03-04 12:46:14 UTC (rev 101819)
+++ projects/kernel/trunk/kernel/src/test/java/org/jboss/test/kernel/deployment/xml/test/MapJaxbTestCase.java 2010-03-04 13:17:36 UTC (rev 101820)
@@ -207,7 +207,7 @@
public static Test suite()
{
- return MapJaxbTestCase.suite(MapJaxbTestCase.class);
+ return suite(MapJaxbTestCase.class);
}
public MapJaxbTestCase(String name)
Modified: projects/kernel/trunk/kernel/src/test/java/org/jboss/test/kernel/deployment/xml/test/ParameterJaxbTestCase.java
===================================================================
--- projects/kernel/trunk/kernel/src/test/java/org/jboss/test/kernel/deployment/xml/test/ParameterJaxbTestCase.java 2010-03-04 12:46:14 UTC (rev 101819)
+++ projects/kernel/trunk/kernel/src/test/java/org/jboss/test/kernel/deployment/xml/test/ParameterJaxbTestCase.java 2010-03-04 13:17:36 UTC (rev 101820)
@@ -180,7 +180,7 @@
public static Test suite()
{
- return ParameterJaxbTestCase.suite(ParameterJaxbTestCase.class);
+ return suite(ParameterJaxbTestCase.class);
}
public ParameterJaxbTestCase(String name)
Modified: projects/kernel/trunk/kernel/src/test/java/org/jboss/test/kernel/deployment/xml/test/PropertyJaxbTestCase.java
===================================================================
--- projects/kernel/trunk/kernel/src/test/java/org/jboss/test/kernel/deployment/xml/test/PropertyJaxbTestCase.java 2010-03-04 12:46:14 UTC (rev 101819)
+++ projects/kernel/trunk/kernel/src/test/java/org/jboss/test/kernel/deployment/xml/test/PropertyJaxbTestCase.java 2010-03-04 13:17:36 UTC (rev 101820)
@@ -205,7 +205,7 @@
public static Test suite()
{
- return PropertyJaxbTestCase.suite(PropertyJaxbTestCase.class);
+ return suite(PropertyJaxbTestCase.class);
}
public PropertyJaxbTestCase(String name)
Modified: projects/kernel/trunk/kernel/src/test/java/org/jboss/test/kernel/deployment/xml/test/SetJaxbTestCase.java
===================================================================
--- projects/kernel/trunk/kernel/src/test/java/org/jboss/test/kernel/deployment/xml/test/SetJaxbTestCase.java 2010-03-04 12:46:14 UTC (rev 101819)
+++ projects/kernel/trunk/kernel/src/test/java/org/jboss/test/kernel/deployment/xml/test/SetJaxbTestCase.java 2010-03-04 13:17:36 UTC (rev 101820)
@@ -168,7 +168,7 @@
public static Test suite()
{
- return SetJaxbTestCase.suite(SetJaxbTestCase.class);
+ return suite(SetJaxbTestCase.class);
}
public SetJaxbTestCase(String name)
Modified: projects/kernel/trunk/kernel/src/test/java/org/jboss/test/kernel/deployment/xml/test/SupplyJaxbTestCase.java
===================================================================
--- projects/kernel/trunk/kernel/src/test/java/org/jboss/test/kernel/deployment/xml/test/SupplyJaxbTestCase.java 2010-03-04 12:46:14 UTC (rev 101819)
+++ projects/kernel/trunk/kernel/src/test/java/org/jboss/test/kernel/deployment/xml/test/SupplyJaxbTestCase.java 2010-03-04 13:17:36 UTC (rev 101820)
@@ -70,7 +70,7 @@
public static Test suite()
{
- return SupplyJaxbTestCase.suite(SupplyJaxbTestCase.class);
+ return suite(SupplyJaxbTestCase.class);
}
public SupplyJaxbTestCase(String name)
Modified: projects/kernel/trunk/kernel/src/test/java/org/jboss/test/kernel/deployment/xml/test/ValueJaxbTestCase.java
===================================================================
--- projects/kernel/trunk/kernel/src/test/java/org/jboss/test/kernel/deployment/xml/test/ValueJaxbTestCase.java 2010-03-04 12:46:14 UTC (rev 101819)
+++ projects/kernel/trunk/kernel/src/test/java/org/jboss/test/kernel/deployment/xml/test/ValueJaxbTestCase.java 2010-03-04 13:17:36 UTC (rev 101820)
@@ -74,7 +74,7 @@
public static Test suite()
{
- return ValueJaxbTestCase.suite(ValueJaxbTestCase.class);
+ return suite(ValueJaxbTestCase.class);
}
public ValueJaxbTestCase(String name)
Modified: projects/kernel/trunk/kernel/src/test/java/org/jboss/test/kernel/event/support/TestEvent.java
===================================================================
--- projects/kernel/trunk/kernel/src/test/java/org/jboss/test/kernel/event/support/TestEvent.java 2010-03-04 12:46:14 UTC (rev 101819)
+++ projects/kernel/trunk/kernel/src/test/java/org/jboss/test/kernel/event/support/TestEvent.java 2010-03-04 13:17:36 UTC (rev 101820)
@@ -89,6 +89,7 @@
return type;
}
+ @Override
public boolean equals(Object object)
{
TestEvent other = (TestEvent) object;
@@ -109,6 +110,13 @@
return true;
}
+ @Override
+ public int hashCode()
+ {
+ return super.hashCode();
+ }
+
+ @Override
public String toString()
{
StringBuffer buffer = new StringBuffer();
Modified: projects/kernel/trunk/weld-int/src/main/java/org/jboss/kernel/weld/plugins/annotated/MDRAnnotated.java
===================================================================
--- projects/kernel/trunk/weld-int/src/main/java/org/jboss/kernel/weld/plugins/annotated/MDRAnnotated.java 2010-03-04 12:46:14 UTC (rev 101819)
+++ projects/kernel/trunk/weld-int/src/main/java/org/jboss/kernel/weld/plugins/annotated/MDRAnnotated.java 2010-03-04 13:17:36 UTC (rev 101820)
@@ -29,9 +29,7 @@
import java.util.Set;
import javax.enterprise.inject.spi.Annotated;
-import javax.inject.Inject;
-import org.jboss.kernel.weld.metadata.api.annotations.Weld;
import org.jboss.metadata.spi.MetaData;
/**
Modified: projects/kernel/trunk/weld-int/src/test/java/org/jboss/test/kernel/weld/annotated/support/InjectAnnotatedIgnoreInjectBean.java
===================================================================
--- projects/kernel/trunk/weld-int/src/test/java/org/jboss/test/kernel/weld/annotated/support/InjectAnnotatedIgnoreInjectBean.java 2010-03-04 12:46:14 UTC (rev 101819)
+++ projects/kernel/trunk/weld-int/src/test/java/org/jboss/test/kernel/weld/annotated/support/InjectAnnotatedIgnoreInjectBean.java 2010-03-04 13:17:36 UTC (rev 101820)
@@ -23,8 +23,6 @@
import javax.inject.Inject;
-import org.jboss.kernel.weld.metadata.api.annotations.Weld;
-
/**
*
* @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
Modified: projects/kernel/trunk/weld-int/src/test/java/org/jboss/test/kernel/weld/annotated/test/AnnotatedTypeTestCase.java
===================================================================
--- projects/kernel/trunk/weld-int/src/test/java/org/jboss/test/kernel/weld/annotated/test/AnnotatedTypeTestCase.java 2010-03-04 12:46:14 UTC (rev 101819)
+++ projects/kernel/trunk/weld-int/src/test/java/org/jboss/test/kernel/weld/annotated/test/AnnotatedTypeTestCase.java 2010-03-04 13:17:36 UTC (rev 101820)
@@ -446,6 +446,7 @@
checkNonWeldInjectIgnored(type);
}
+ @SuppressWarnings("unchecked")
private void checkNonWeldInjectIgnored(AnnotatedType<?> type) throws Exception
{
assertMDRAnnotated(type);
More information about the jboss-cvs-commits
mailing list