Weld SVN: r6906 - in core/trunk/impl/src/main: java/org/jboss/weld/bootstrap and 5 other directories.
by weld-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2010-08-04 15:14:27 -0400 (Wed, 04 Aug 2010)
New Revision: 6906
Removed:
core/trunk/impl/src/main/java/org/jboss/weld/util/NamesStringBuilder.java
Modified:
core/trunk/impl/src/main/java/org/jboss/weld/bean/builtin/InstanceImpl.java
core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/Validator.java
core/trunk/impl/src/main/java/org/jboss/weld/event/EventImpl.java
core/trunk/impl/src/main/java/org/jboss/weld/introspector/jlr/WeldClassImpl.java
core/trunk/impl/src/main/java/org/jboss/weld/introspector/jlr/WeldConstructorImpl.java
core/trunk/impl/src/main/java/org/jboss/weld/introspector/jlr/WeldFieldImpl.java
core/trunk/impl/src/main/java/org/jboss/weld/introspector/jlr/WeldMethodImpl.java
core/trunk/impl/src/main/java/org/jboss/weld/introspector/jlr/WeldParameterImpl.java
core/trunk/impl/src/main/java/org/jboss/weld/util/Names.java
core/trunk/impl/src/main/java/org/jboss/weld/util/reflection/Reflections.java
core/trunk/impl/src/main/resources/org/jboss/weld/messages/validator_en.properties
Log:
WELD-581, start on WELD-542
Modified: core/trunk/impl/src/main/java/org/jboss/weld/bean/builtin/InstanceImpl.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/bean/builtin/InstanceImpl.java 2010-08-04 17:36:38 UTC (rev 6905)
+++ core/trunk/impl/src/main/java/org/jboss/weld/bean/builtin/InstanceImpl.java 2010-08-04 19:14:27 UTC (rev 6906)
@@ -92,7 +92,7 @@
@Override
public String toString()
{
- return new StringBuilder().append(Names.annotationsToString(getQualifiers())).append(" Instance<").append(getType()).append(">").toString();
+ return new StringBuilder().append(Names.toString(getQualifiers())).append(" Instance<").append(getType()).append(">").toString();
}
private Set<Bean<?>> getBeans()
Modified: core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/Validator.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/Validator.java 2010-08-04 17:36:38 UTC (rev 6905)
+++ core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/Validator.java 2010-08-04 19:14:27 UTC (rev 6906)
@@ -103,6 +103,7 @@
import org.jboss.weld.metadata.cache.MetaAnnotationStore;
import org.jboss.weld.serialization.spi.helpers.SerializableContextual;
import org.jboss.weld.util.Beans;
+import org.jboss.weld.util.Names;
import org.jboss.weld.util.Proxies;
import org.jboss.weld.util.reflection.Reflections;
import org.slf4j.cal10n.LocLogger;
@@ -288,7 +289,7 @@
Set<?> resolvedBeans = beanManager.getBeanResolver().resolve(beanManager.getBeans(ij));
if (!isInjectionPointSatisfied(ij, resolvedBeans, beanManager))
{
- throw new DeploymentException(INJECTION_POINT_HAS_UNSATISFIED_DEPENDENCIES, ij, Arrays.toString(bindings));
+ throw new DeploymentException(INJECTION_POINT_HAS_UNSATISFIED_DEPENDENCIES, ij, Names.toString(bindings), Names.toString(ij.getType()));
}
if (resolvedBeans.size() > 1 && !ij.isDelegate())
{
Modified: core/trunk/impl/src/main/java/org/jboss/weld/event/EventImpl.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/event/EventImpl.java 2010-08-04 17:36:38 UTC (rev 6905)
+++ core/trunk/impl/src/main/java/org/jboss/weld/event/EventImpl.java 2010-08-04 19:14:27 UTC (rev 6906)
@@ -86,7 +86,7 @@
@Override
public String toString()
{
- return new StringBuilder().append(Names.annotationsToString(getQualifiers())).append(" Event<").append(getType()).append(">").toString();
+ return new StringBuilder().append(Names.toString(getQualifiers())).append(" Event<").append(getType()).append(">").toString();
}
public void fire(T event)
Modified: core/trunk/impl/src/main/java/org/jboss/weld/introspector/jlr/WeldClassImpl.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/introspector/jlr/WeldClassImpl.java 2010-08-04 17:36:38 UTC (rev 6905)
+++ core/trunk/impl/src/main/java/org/jboss/weld/introspector/jlr/WeldClassImpl.java 2010-08-04 19:14:27 UTC (rev 6906)
@@ -579,7 +579,7 @@
@Override
public String toString()
{
- return Names.classToString(getJavaClass(), getAnnotations(), getActualTypeArguments());
+ return Names.toString(this);
}
public String getSimpleName()
Modified: core/trunk/impl/src/main/java/org/jboss/weld/introspector/jlr/WeldConstructorImpl.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/introspector/jlr/WeldConstructorImpl.java 2010-08-04 17:36:38 UTC (rev 6905)
+++ core/trunk/impl/src/main/java/org/jboss/weld/introspector/jlr/WeldConstructorImpl.java 2010-08-04 19:14:27 UTC (rev 6906)
@@ -293,7 +293,7 @@
@Override
public String toString()
{
- return Names.constructorToString(getDelegate(), getAnnotations(), getActualTypeArguments(), getParameters());
+ return Names.toString(this);
}
public ConstructorSignature getSignature()
Modified: core/trunk/impl/src/main/java/org/jboss/weld/introspector/jlr/WeldFieldImpl.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/introspector/jlr/WeldFieldImpl.java 2010-08-04 17:36:38 UTC (rev 6905)
+++ core/trunk/impl/src/main/java/org/jboss/weld/introspector/jlr/WeldFieldImpl.java 2010-08-04 19:14:27 UTC (rev 6906)
@@ -133,7 +133,7 @@
@Override
public String toString()
{
- return Names.fieldToString(getDelegate(), getAnnotations(), getActualTypeArguments());
+ return Names.toString(this);
}
public boolean isGeneric()
Modified: core/trunk/impl/src/main/java/org/jboss/weld/introspector/jlr/WeldMethodImpl.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/introspector/jlr/WeldMethodImpl.java 2010-08-04 17:36:38 UTC (rev 6905)
+++ core/trunk/impl/src/main/java/org/jboss/weld/introspector/jlr/WeldMethodImpl.java 2010-08-04 19:14:27 UTC (rev 6906)
@@ -214,7 +214,7 @@
@Override
public String toString()
{
- return Names.methodToString(getDelegate(), getAnnotations(), getActualTypeArguments(), getParameters());
+ return Names.toString(this);
}
public MethodSignature getSignature()
Modified: core/trunk/impl/src/main/java/org/jboss/weld/introspector/jlr/WeldParameterImpl.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/introspector/jlr/WeldParameterImpl.java 2010-08-04 17:36:38 UTC (rev 6905)
+++ core/trunk/impl/src/main/java/org/jboss/weld/introspector/jlr/WeldParameterImpl.java 2010-08-04 19:14:27 UTC (rev 6906)
@@ -140,7 +140,7 @@
@Override
public String toString()
{
- return Names.parameterToString(getPosition(), getDeclaringCallable().getJavaMember(), getJavaClass(), getAnnotations(), getActualTypeArguments());
+ return Names.toString(this);
}
public AnnotatedCallable<X> getDeclaringCallable()
Modified: core/trunk/impl/src/main/java/org/jboss/weld/util/Names.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/util/Names.java 2010-08-04 17:36:38 UTC (rev 6905)
+++ core/trunk/impl/src/main/java/org/jboss/weld/util/Names.java 2010-08-04 19:14:27 UTC (rev 6906)
@@ -17,20 +17,23 @@
package org.jboss.weld.util;
import java.lang.annotation.Annotation;
-import java.lang.reflect.Constructor;
-import java.lang.reflect.Field;
import java.lang.reflect.Member;
-import java.lang.reflect.Method;
import java.lang.reflect.Modifier;
import java.lang.reflect.Type;
import java.util.ArrayList;
import java.util.Arrays;
-import java.util.Iterator;
import java.util.List;
-import java.util.Set;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
+import org.jboss.weld.introspector.WeldCallable;
+import org.jboss.weld.introspector.WeldClass;
+import org.jboss.weld.introspector.WeldConstructor;
+import org.jboss.weld.introspector.WeldField;
+import org.jboss.weld.introspector.WeldMethod;
+import org.jboss.weld.introspector.WeldParameter;
+import org.jboss.weld.util.reflection.Reflections;
+
/**
* Utility class to produce friendly names e.g. for debugging
*
@@ -70,53 +73,84 @@
}
return result.toString();
}
-
- public static String classToString(Class<?> rawType, Set<Annotation> annotations, Type[] actualTypeArguments)
+
+ public static String toString(Type baseType)
{
- return new NamesStringBuilder("class").add(modifiersToString(rawType.getModifiers())).add(annotationsToString(annotations)).add(rawType.getName()).add(typesToString(actualTypeArguments)).toString();
+ return new StringBuilder().append(Reflections.getRawType(baseType).getSimpleName()).append(toString(Reflections.getActualTypeArguments(baseType))).toString();
+
}
-
- public static String fieldToString(Field field, Set<Annotation> annotations, Type[] actualTypeArguments)
+
+ public static String toString(WeldClass<?> clazz)
{
- return new NamesStringBuilder("field in " + field.getDeclaringClass().getName()).add(modifiersToString(field.getModifiers())).add(annotationsToString(annotations)).add(field.getType().getName()).add(typesToString(actualTypeArguments)).add(field.getName()).toString();
+ return new StringBuilder().append(modifiersToString(clazz.getJavaClass().getModifiers())).append(toString(clazz.getAnnotations())).append(" class ").append(clazz.getName()).append(toString(clazz.getActualTypeArguments())).toString().trim();
}
- public static String methodToString(Method method, Set<Annotation> annotations, Type[] actualTypeArguments, List<?> parameters)
+ public static String toString(WeldField<?, ?> field)
{
- return new NamesStringBuilder("method in " + method.getDeclaringClass().getName()).add(modifiersToString(method.getModifiers())).add(annotationsToString(annotations)).add(method.getName()).add(typesToString(actualTypeArguments)).add(parametersToString(parameters)).toString();
+ return new StringBuilder().append("[field] ").append(addSpaceIfNeeded(toString(field.getAnnotations()))).append(addSpaceIfNeeded(modifiersToString(field.getJavaMember().getModifiers()))).append(field.getDeclaringType().getName()).append(".").append(field.getName()).toString().trim();
}
-
- private static String parametersToString(List<?> parameters)
+
+ public static String toString(WeldCallable<?, ?, ? extends Member> callable)
{
- return "(" + iterableToString(parameters, ", ") + ")";
+ if (callable instanceof WeldMethod<?, ?>)
+ {
+ return toString((WeldMethod<?, ?>) callable);
+ }
+ else if (callable instanceof WeldConstructor<?>)
+ {
+ return toString((WeldConstructor<?>) callable);
+ }
+ else
+ {
+ throw new IllegalArgumentException("Unable to produce a toString representation of classes of type " + callable.getClass().getName());
+ }
}
-
- public static String constructorToString(Constructor<?> constructor, Set<Annotation> annotations, Type[] actualTypeArguments, List<?> parameters)
+
+ public static String toString(WeldMethod<?, ?> method)
{
- return new NamesStringBuilder("constructor for " + constructor.getDeclaringClass().getName()).add(modifiersToString(constructor.getModifiers())).add(annotationsToString(annotations)).add(constructor.getName()).add(typesToString(actualTypeArguments)).add(parametersToString(parameters)).toString();
+ return new StringBuilder().append("[method] ").append(addSpaceIfNeeded(toString(method.getAnnotations()))).append(addSpaceIfNeeded(modifiersToString(method.getJavaMember().getModifiers()))).append(method.getDeclaringType().getName()).append(".").append(method.getName()).append(parametersToTypeString(method.getWeldParameters())).toString().trim();
}
-
- public static String parameterToString(int position, Member member, Class<?> rawType, Set<Annotation> annotations, Type[] actualTypeArguments)
+
+ public static String toString(WeldConstructor<?> constructor)
{
- return new NamesStringBuilder().add("parameter " + position + " on " + member + "; " + modifiersToString(rawType.getModifiers())).add(annotationsToString(annotations)).add(rawType.getName()).add(typesToString(actualTypeArguments)).toString();
+ return new StringBuilder().append("[constructor] ").append(addSpaceIfNeeded(toString(constructor.getAnnotations()))).append(addSpaceIfNeeded(modifiersToString(constructor.getJavaMember().getModifiers()))).append(constructor.getDeclaringType().getName()).append(parametersToTypeString(constructor.getWeldParameters())).toString().trim();
}
-
- /**
- * Counts item in an iteratble
- *
- * @param iterable The iteraboe
- * @return The count
- */
- public static int count(final Iterable<?> iterable)
+
+ private static String addSpaceIfNeeded(String string)
{
- int count = 0;
- for (Iterator<?> i = iterable.iterator(); i.hasNext();)
+ if (string.length() > 0)
{
- count++;
+ return new StringBuilder().append(string).append(" ").toString();
}
- return count;
+ else
+ {
+ return string;
+ }
}
+
+
+ private static String parametersToTypeString(Iterable<? extends WeldParameter<?, ?>> parameters)
+ {
+ StringBuilder stringBuilder = new StringBuilder();
+ stringBuilder.append("(");
+ int i = 0;
+ for (WeldParameter<?, ?> parameter : parameters)
+ {
+ if (i > 0)
+ {
+ stringBuilder.append(", ");
+ }
+ stringBuilder.append(toString(parameter.getBaseType()));
+ i++;
+ }
+ return stringBuilder.append(")").toString();
+ }
+ public static String toString(WeldParameter<?, ?> parameter)
+ {
+ return new StringBuilder().append("[parameter ").append(parameter.getPosition() + 1).append("] of ").append(toString(parameter.getDeclaringWeldCallable())).toString();
+ }
+
private static String modifiersToString(int modifiers)
{
return iterableToString(parseModifiers(modifiers), " ");
@@ -124,18 +158,18 @@
private static String iterableToString(Iterable<?> items, String delimiter)
{
- StringBuffer stringBuffer = new StringBuffer();
+ StringBuilder stringBuilder = new StringBuilder();
int i = 0;
for (Object item : items)
{
if (i > 0)
{
- stringBuffer.append(delimiter);
+ stringBuilder.append(delimiter);
}
- stringBuffer.append(item);
+ stringBuilder.append(item);
i++;
}
- return stringBuffer.toString();
+ return stringBuilder.toString();
}
/**
@@ -198,7 +232,7 @@
return modifiers;
}
- public static String typesToString(Type[] actualTypeArguments)
+ public static String toString(Type[] actualTypeArguments)
{
if (actualTypeArguments.length == 0)
{
@@ -227,7 +261,7 @@
return buffer.toString();
}
- public static String annotationsToString(Iterable<Annotation> annotations)
+ public static String toString(Iterable<Annotation> annotations)
{
StringBuilder builder = new StringBuilder();
for (Annotation annotation : annotations)
@@ -244,9 +278,9 @@
* @param annotations The annotations
* @return The string representation
*/
- public static String annotationsToString(Annotation[] annotations)
+ public static String toString(Annotation[] annotations)
{
- return annotationsToString(Arrays.asList(annotations));
+ return toString(Arrays.asList(annotations));
}
public static String version(Package pkg)
Deleted: core/trunk/impl/src/main/java/org/jboss/weld/util/NamesStringBuilder.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/util/NamesStringBuilder.java 2010-08-04 17:36:38 UTC (rev 6905)
+++ core/trunk/impl/src/main/java/org/jboss/weld/util/NamesStringBuilder.java 2010-08-04 19:14:27 UTC (rev 6906)
@@ -1,48 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., and individual contributors
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jboss.weld.util;
-
-public class NamesStringBuilder
-{
- private StringBuilder stringBuilder = new StringBuilder();
-
- public NamesStringBuilder(String context)
- {
- stringBuilder.append("[");
- stringBuilder.append(context);
- stringBuilder.append("]");
- }
-
- public NamesStringBuilder()
- {
- }
-
- public NamesStringBuilder add(String text)
- {
- if (text != null && !"".equals(text))
- {
- stringBuilder.append(" ");
- stringBuilder.append(text);
- }
- return this;
- }
-
- public String toString()
- {
- return stringBuilder.toString().trim();
- }
-}
Modified: core/trunk/impl/src/main/java/org/jboss/weld/util/reflection/Reflections.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/util/reflection/Reflections.java 2010-08-04 17:36:38 UTC (rev 6905)
+++ core/trunk/impl/src/main/java/org/jboss/weld/util/reflection/Reflections.java 2010-08-04 19:14:27 UTC (rev 6906)
@@ -241,6 +241,25 @@
return EMPTY_TYPES;
}
}
+
+ /**
+ * Gets the actual type arguments of a Type
+ *
+ * @param type The type to examine
+ * @return The type arguments
+ */
+ public static Type[] getActualTypeArguments(Type type)
+ {
+ Type resolvedType = new HierarchyDiscovery(type).getResolvedType();
+ if (resolvedType instanceof ParameterizedType)
+ {
+ return ((ParameterizedType) resolvedType).getActualTypeArguments();
+ }
+ else
+ {
+ return EMPTY_TYPES;
+ }
+ }
/**
* Checks if raw type is array type
Modified: core/trunk/impl/src/main/resources/org/jboss/weld/messages/validator_en.properties
===================================================================
--- core/trunk/impl/src/main/resources/org/jboss/weld/messages/validator_en.properties 2010-08-04 17:36:38 UTC (rev 6905)
+++ core/trunk/impl/src/main/resources/org/jboss/weld/messages/validator_en.properties 2010-08-04 19:14:27 UTC (rev 6906)
@@ -5,7 +5,7 @@
INJECTION_INTO_NON_BEAN=Cannot inject {0} in a class which isn't a bean
INJECTION_INTO_NON_DEPENDENT_BEAN=Cannot inject {0} in a non @Dependent scoped bean
INJECTION_POINT_WITH_TYPE_VARIABLE=Cannot declare an injection point with a type variable: {0}
-INJECTION_POINT_HAS_UNSATISFIED_DEPENDENCIES=Injection point has unsatisfied dependencies. Injection point: {0}; Qualifiers: {1}
+INJECTION_POINT_HAS_UNSATISFIED_DEPENDENCIES=Unsatisfied dependencies for type [{2}] with qualifiers [{1}] at injection point [{0}]
INJECTION_POINT_HAS_AMBIGUOUS_DEPENDENCIES=Injection point has ambiguous dependencies. Injection point: {0}; Qualifiers: {1}
INJECTION_POINT_HAS_NON_PROXYABLE_DEPENDENCIES=The injection point {0} has non-proxyable dependencies
INJECTION_POINT_HAS_NULLABLE_DEPENDENCIES=Injection point {0} has nullable dependencies
15 years, 8 months
- 1
- 0
Weld SVN: r6905 - in core/trunk: tests-arquillian/src/test/java/org/jboss/weld/tests/resolution and 1 other directory.
by weld-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2010-08-04 13:36:38 -0400 (Wed, 04 Aug 2010)
New Revision: 6905
Added:
core/trunk/tests-arquillian/src/test/java/org/jboss/weld/tests/resolution/InstanceTest.java
Modified:
core/trunk/impl/src/main/java/org/jboss/weld/bean/builtin/InstanceImpl.java
Log:
WELD-501
Modified: core/trunk/impl/src/main/java/org/jboss/weld/bean/builtin/InstanceImpl.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/bean/builtin/InstanceImpl.java 2010-08-04 17:16:22 UTC (rev 6904)
+++ core/trunk/impl/src/main/java/org/jboss/weld/bean/builtin/InstanceImpl.java 2010-08-04 17:36:38 UTC (rev 6905)
@@ -105,12 +105,16 @@
Collection<T> instances = new ArrayList<T>();
for (Bean<?> bean : getBeans())
{
- Object object = getBeanManager().getReference(bean, getType(), getBeanManager().createCreationalContext(bean));
-
- @SuppressWarnings("unchecked")
- T instance = (T) object;
-
- instances.add(instance);
+ // Don't return the InjectionPoint bean, it's not a possible to inject an instance of that!
+ if (!InjectionPoint.class.isAssignableFrom(bean.getBeanClass()))
+ {
+ Object object = getBeanManager().getReference(bean, getType(), getBeanManager().createCreationalContext(bean));
+
+ @SuppressWarnings("unchecked")
+ T instance = (T) object;
+
+ instances.add(instance);
+ }
}
return instances.iterator();
}
Added: core/trunk/tests-arquillian/src/test/java/org/jboss/weld/tests/resolution/InstanceTest.java
===================================================================
--- core/trunk/tests-arquillian/src/test/java/org/jboss/weld/tests/resolution/InstanceTest.java (rev 0)
+++ core/trunk/tests-arquillian/src/test/java/org/jboss/weld/tests/resolution/InstanceTest.java 2010-08-04 17:36:38 UTC (rev 6905)
@@ -0,0 +1,42 @@
+package org.jboss.weld.tests.resolution;
+
+import static org.junit.Assert.assertNotNull;
+
+import java.util.Iterator;
+
+import javax.enterprise.inject.Instance;
+import javax.inject.Inject;
+
+import org.jboss.arquillian.api.Deployment;
+import org.jboss.arquillian.junit.Arquillian;
+import org.jboss.shrinkwrap.api.Archive;
+import org.jboss.shrinkwrap.api.BeanArchive;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+(a)RunWith(Arquillian.class)
+public class InstanceTest
+{
+
+ @Deployment
+ public static Archive<?> deploy()
+ {
+ return ShrinkWrap.create(BeanArchive.class)
+ .addPackage(InstanceTest.class.getPackage());
+ }
+
+ @Inject
+ private Instance<Object> instance;
+
+ @Test
+ public void testSelect() throws Exception
+ {
+ Iterator<Object> iter = instance.select().iterator();
+ while (iter.hasNext())
+ {
+ assertNotNull(iter.next());
+ }
+ }
+
+}
Property changes on: core/trunk/tests-arquillian/src/test/java/org/jboss/weld/tests/resolution/InstanceTest.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
15 years, 8 months
- 1
- 0
Weld SVN: r6904 - in core/trunk: impl/src/test/java/org/jboss/weld/tests/unit and 2 other directories.
by weld-commits＠lists.jboss.org
Author: aslak
Date: 2010-08-04 13:16:22 -0400 (Wed, 04 Aug 2010)
New Revision: 6904
Added:
core/trunk/impl/src/test/java/org/jboss/weld/tests/unit/reflection/
core/trunk/impl/src/test/java/org/jboss/weld/tests/unit/reflection/method/
Removed:
core/trunk/tests-arquillian/src/test/java/org/jboss/weld/tests/unit/reflection/method/
Modified:
core/trunk/impl/pom.xml
Log:
WELD-493 Moved pure Unit test to impl
Modified: core/trunk/impl/pom.xml
===================================================================
--- core/trunk/impl/pom.xml 2010-08-04 17:08:05 UTC (rev 6903)
+++ core/trunk/impl/pom.xml 2010-08-04 17:16:22 UTC (rev 6904)
@@ -137,6 +137,12 @@
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ <scope>test</scope>
+ </dependency>
+
</dependencies>
<build>
Copied: core/trunk/impl/src/test/java/org/jboss/weld/tests/unit/reflection/method (from rev 6902, core/trunk/tests-arquillian/src/test/java/org/jboss/weld/tests/unit/reflection/method)
15 years, 8 months
- 1
- 0
Weld SVN: r6903 - in core/trunk: tests-arquillian/src/test/java/org/jboss/weld/tests/extensions and 1 other directory.
by weld-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2010-08-04 13:08:05 -0400 (Wed, 04 Aug 2010)
New Revision: 6903
Added:
core/trunk/tests-arquillian/src/test/java/org/jboss/weld/tests/extensions/EnterpriseExtensionTest.java
Modified:
core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/events/AbstractProcessProducerBean.java
core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/events/ProcessBeanInjectionTarget.java
core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/events/ProcessProducerFieldImpl.java
core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/events/ProcessProducerImpl.java
core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/events/ProcessProducerMethodImpl.java
core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/events/ProcessSimpleInjectionTarget.java
core/trunk/tests-arquillian/src/test/java/org/jboss/weld/tests/extensions/ExtensionObserver.java
core/trunk/tests-arquillian/src/test/java/org/jboss/weld/tests/extensions/ExtensionTest.java
core/trunk/tests-arquillian/src/test/java/org/jboss/weld/tests/extensions/Foo.java
Log:
standardize parameter type names, WELD-572
Modified: core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/events/AbstractProcessProducerBean.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/events/AbstractProcessProducerBean.java 2010-08-04 15:02:12 UTC (rev 6902)
+++ core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/events/AbstractProcessProducerBean.java 2010-08-04 17:08:05 UTC (rev 6903)
@@ -24,7 +24,7 @@
import org.jboss.weld.bean.AbstractProducerBean;
import org.jboss.weld.manager.BeanManagerImpl;
-public abstract class AbstractProcessProducerBean<X, T, B extends AbstractProducerBean<X, T, ? >> extends AbstractDefinitionContainerEvent implements ProcessBean<T>
+public abstract class AbstractProcessProducerBean<T, X, B extends AbstractProducerBean<T, X, ? >> extends AbstractDefinitionContainerEvent implements ProcessBean<X>
{
private final B bean;
Modified: core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/events/ProcessBeanInjectionTarget.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/events/ProcessBeanInjectionTarget.java 2010-08-04 15:02:12 UTC (rev 6902)
+++ core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/events/ProcessBeanInjectionTarget.java 2010-08-04 17:08:05 UTC (rev 6903)
@@ -23,23 +23,23 @@
import org.jboss.weld.manager.BeanManagerImpl;
-public class ProcessBeanInjectionTarget<T> extends AbstractProcessInjectionTarget<T> implements ProcessInjectionTarget<T>
+public class ProcessBeanInjectionTarget<X> extends AbstractProcessInjectionTarget<X> implements ProcessInjectionTarget<X>
{
- private final AbstractClassBean<T> classBean;
+ private final AbstractClassBean<X> classBean;
- public ProcessBeanInjectionTarget(BeanManagerImpl beanManager, AbstractClassBean<T> bean)
+ public ProcessBeanInjectionTarget(BeanManagerImpl beanManager, AbstractClassBean<X> bean)
{
super(beanManager, bean.getWeldAnnotated());
this.classBean = bean;
}
- public InjectionTarget<T> getInjectionTarget()
+ public InjectionTarget<X> getInjectionTarget()
{
return classBean.getInjectionTarget();
}
- public void setInjectionTarget(InjectionTarget<T> injectionTarget)
+ public void setInjectionTarget(InjectionTarget<X> injectionTarget)
{
classBean.setInjectionTarget(injectionTarget);
}
Modified: core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/events/ProcessProducerFieldImpl.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/events/ProcessProducerFieldImpl.java 2010-08-04 15:02:12 UTC (rev 6902)
+++ core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/events/ProcessProducerFieldImpl.java 2010-08-04 17:08:05 UTC (rev 6903)
@@ -24,23 +24,30 @@
import org.jboss.weld.bean.ProducerField;
import org.jboss.weld.manager.BeanManagerImpl;
-public class ProcessProducerFieldImpl<X, T> extends AbstractProcessProducerBean<X, T, ProducerField<X, T>> implements ProcessProducerField<X, T>
+public class ProcessProducerFieldImpl<T, X> extends AbstractProcessProducerBean<T, X, ProducerField<T, X>> implements ProcessProducerField<T, X>
{
-
- public static <X, T> void fire(BeanManagerImpl beanManager, ProducerField<X, T> bean)
+ public static <T, X> void fire(BeanManagerImpl beanManager, ProducerField<T, X> bean)
{
- new ProcessProducerFieldImpl<X, T>(beanManager, bean) {}.fire();
+ new ProcessProducerFieldImpl<T, X>(beanManager, bean) {}.fire();
}
- public ProcessProducerFieldImpl(BeanManagerImpl beanManager, ProducerField<X, T> bean)
+ public ProcessProducerFieldImpl(BeanManagerImpl beanManager, ProducerField<T, X> bean)
{
super(beanManager, ProcessProducerField.class, new Type[] { bean.getWeldAnnotated().getDeclaringType().getBaseType(), bean.getWeldAnnotated().getBaseType() }, bean);
}
- public AnnotatedField<X> getAnnotatedProducerField()
+ @SuppressWarnings("unchecked")
+ public AnnotatedField<T> getAnnotatedProducerField()
{
- return (AnnotatedField<X>) getBean().getWeldAnnotated();
+ if (getBean().getWeldAnnotated() != null)
+ {
+ return (AnnotatedField<T>) getBean().getWeldAnnotated();
+ }
+ else
+ {
+ return null;
+ }
}
}
Modified: core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/events/ProcessProducerImpl.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/events/ProcessProducerImpl.java 2010-08-04 15:02:12 UTC (rev 6902)
+++ core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/events/ProcessProducerImpl.java 2010-08-04 17:08:05 UTC (rev 6903)
@@ -27,18 +27,19 @@
import org.jboss.weld.manager.BeanManagerImpl;
-public class ProcessProducerImpl<X, T> extends AbstractDefinitionContainerEvent implements ProcessProducer<X, T>
+public class ProcessProducerImpl<T, X> extends AbstractDefinitionContainerEvent implements ProcessProducer<T, X>
{
- public static <X, T> void fire(BeanManagerImpl beanManager, AbstractProducerBean<X, T, Member> producer)
+ @SuppressWarnings("unchecked")
+ public static <T, X> void fire(BeanManagerImpl beanManager, AbstractProducerBean<T, X, Member> producer)
{
- new ProcessProducerImpl<X, T>(beanManager, (AnnotatedMember<X>) producer.getWeldAnnotated(), producer) {}.fire();
+ new ProcessProducerImpl<T, X>(beanManager, (AnnotatedMember<T>) producer.getWeldAnnotated(), producer) {}.fire();
}
- private final AnnotatedMember<X> annotatedMember;
- private AbstractProducerBean<X, T, ?> bean;
+ private final AnnotatedMember<T> annotatedMember;
+ private AbstractProducerBean<T, X, ?> bean;
- public ProcessProducerImpl(BeanManagerImpl beanManager, AnnotatedMember<X> annotatedMember, AbstractProducerBean<X, T, ?> bean)
+ public ProcessProducerImpl(BeanManagerImpl beanManager, AnnotatedMember<T> annotatedMember, AbstractProducerBean<T, X, ?> bean)
{
super(beanManager, ProcessProducer.class, new Type[] { bean.getWeldAnnotated().getDeclaringType().getBaseType(), bean.getWeldAnnotated().getBaseType() });
this.bean = bean;
@@ -50,17 +51,17 @@
getErrors().add(t);
}
- public AnnotatedMember<X> getAnnotatedMember()
+ public AnnotatedMember<T> getAnnotatedMember()
{
return annotatedMember;
}
- public Producer<T> getProducer()
+ public Producer<X> getProducer()
{
return bean.getProducer();
}
- public void setProducer(Producer<T> producer)
+ public void setProducer(Producer<X> producer)
{
this.bean.setProducer(producer);
}
Modified: core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/events/ProcessProducerMethodImpl.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/events/ProcessProducerMethodImpl.java 2010-08-04 15:02:12 UTC (rev 6902)
+++ core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/events/ProcessProducerMethodImpl.java 2010-08-04 17:08:05 UTC (rev 6903)
@@ -25,28 +25,44 @@
import org.jboss.weld.bean.ProducerMethod;
import org.jboss.weld.manager.BeanManagerImpl;
-public class ProcessProducerMethodImpl<X, T> extends AbstractProcessProducerBean<X, T, ProducerMethod<X, T>> implements ProcessProducerMethod<X, T>
+public class ProcessProducerMethodImpl<T, X> extends AbstractProcessProducerBean<T, X, ProducerMethod<T, X>> implements ProcessProducerMethod<T, X>
{
- public static <X, T> void fire(BeanManagerImpl beanManager, ProducerMethod<X, T> bean)
+ public static <T, X> void fire(BeanManagerImpl beanManager, ProducerMethod<T, X> bean)
{
- new ProcessProducerMethodImpl<X, T>(beanManager, bean) {}.fire();
+ new ProcessProducerMethodImpl<T, X>(beanManager, bean) {}.fire();
}
- public ProcessProducerMethodImpl(BeanManagerImpl beanManager, ProducerMethod<X, T> bean)
+ public ProcessProducerMethodImpl(BeanManagerImpl beanManager, ProducerMethod<T, X> bean)
{
super(beanManager, ProcessProducerMethod.class, new Type[] { bean.getWeldAnnotated().getDeclaringType().getBaseType(), bean.getWeldAnnotated().getBaseType() }, bean);
}
- public AnnotatedParameter<X> getAnnotatedDisposedParameter()
+ @SuppressWarnings("unchecked")
+ public AnnotatedParameter<T> getAnnotatedDisposedParameter()
{
- return (AnnotatedParameter<X>) getBean().getDisposalMethod().getDisposesParameter();
+ if (getBean().getDisposalMethod() != null)
+ {
+ return (AnnotatedParameter<T>) getBean().getDisposalMethod().getDisposesParameter();
+ }
+ else
+ {
+ return null;
+ }
}
- public AnnotatedMethod<X> getAnnotatedProducerMethod()
+ @SuppressWarnings("unchecked")
+ public AnnotatedMethod<T> getAnnotatedProducerMethod()
{
- return (AnnotatedMethod<X>) getBean().getWeldAnnotated();
+ if (getBean().getWeldAnnotated() != null)
+ {
+ return (AnnotatedMethod<T>) getBean().getWeldAnnotated();
+ }
+ else
+ {
+ return null;
+ }
}
Modified: core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/events/ProcessSimpleInjectionTarget.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/events/ProcessSimpleInjectionTarget.java 2010-08-04 15:02:12 UTC (rev 6902)
+++ core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/events/ProcessSimpleInjectionTarget.java 2010-08-04 17:08:05 UTC (rev 6903)
@@ -23,23 +23,23 @@
import org.jboss.weld.manager.BeanManagerImpl;
-public class ProcessSimpleInjectionTarget<T> extends AbstractProcessInjectionTarget<T> implements ProcessInjectionTarget<T>
+public class ProcessSimpleInjectionTarget<X> extends AbstractProcessInjectionTarget<X> implements ProcessInjectionTarget<X>
{
- private InjectionTarget<T> injectionTarget;
+ private InjectionTarget<X> injectionTarget;
- public ProcessSimpleInjectionTarget(BeanManagerImpl beanManager, AnnotatedType<T> annotatedType, InjectionTarget<T> injectionTarget)
+ public ProcessSimpleInjectionTarget(BeanManagerImpl beanManager, AnnotatedType<X> annotatedType, InjectionTarget<X> injectionTarget)
{
super(beanManager, annotatedType);
this.injectionTarget = injectionTarget;
}
- public InjectionTarget<T> getInjectionTarget()
+ public InjectionTarget<X> getInjectionTarget()
{
return injectionTarget;
}
- public void setInjectionTarget(InjectionTarget<T> injectionTarget)
+ public void setInjectionTarget(InjectionTarget<X> injectionTarget)
{
this.injectionTarget = injectionTarget;
}
Copied: core/trunk/tests-arquillian/src/test/java/org/jboss/weld/tests/extensions/EnterpriseExtensionTest.java (from rev 6897, core/trunk/tests-arquillian/src/test/java/org/jboss/weld/tests/extensions/ExtensionTest.java)
===================================================================
--- core/trunk/tests-arquillian/src/test/java/org/jboss/weld/tests/extensions/EnterpriseExtensionTest.java (rev 0)
+++ core/trunk/tests-arquillian/src/test/java/org/jboss/weld/tests/extensions/EnterpriseExtensionTest.java 2010-08-04 17:08:05 UTC (rev 6903)
@@ -0,0 +1,120 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jboss.weld.tests.extensions;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import javax.enterprise.inject.spi.Extension;
+
+import org.jboss.arquillian.api.Deployment;
+import org.jboss.arquillian.junit.Arquillian;
+import org.jboss.shrinkwrap.api.Archive;
+import org.jboss.shrinkwrap.api.BeanArchive;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
+import org.jboss.weld.tests.category.Integration;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+import org.junit.runner.RunWith;
+
+(a)Category(Integration.class)
+(a)RunWith(Arquillian.class)
+public class EnterpriseExtensionTest
+{
+ @Deployment
+ public static Archive<?> deploy()
+ {
+ return ShrinkWrap.create(EnterpriseArchive.class, "test.ear")
+ .addModule(
+ ShrinkWrap.create(BeanArchive.class)
+ .addPackage(EnterpriseExtensionTest.class.getPackage())
+ .addServiceProvider(Extension.class,
+ SimpleExtension.class,
+ ExtensionObserver.class,
+ WoodlandExtension.class)
+ );
+ }
+
+ /*
+ * description = "WELD-243"
+ */
+ @Test
+ public void testContainerEventsOnlySentToExtensionBeans(ExtensionObserver extensionObserver, OtherObserver otherObserver)
+ {
+ assertTrue(extensionObserver.isBeforeBeanDiscovery());
+ assertTrue(extensionObserver.isAllBeforeBeanDiscovery());
+ assertFalse(otherObserver.isBeforeBeanDiscovery());
+ assertFalse(otherObserver.isAllBeforeBeanDiscovery());
+
+ assertTrue(extensionObserver.isAfterBeanDiscovery());
+ assertTrue(extensionObserver.isAllAfterBeanDiscovery());
+ assertFalse(otherObserver.isAfterBeanDiscovery());
+ assertFalse(otherObserver.isAllAfterBeanDiscovery());
+
+ assertTrue(extensionObserver.isProcessAnnotatedType());
+ assertTrue(extensionObserver.isAllProcessAnnnotatedType());
+ assertFalse(otherObserver.isProcessAnnotatedType());
+ assertFalse(otherObserver.isAllProcessAnnotatedType());
+
+ assertTrue(extensionObserver.isProcessBean());
+ assertTrue(extensionObserver.isAllProcessBean());
+ assertFalse(otherObserver.isProcessBean());
+ assertFalse(otherObserver.isAllProcessBean());
+
+ assertTrue(extensionObserver.isProcessInjectionTarget());
+ assertTrue(extensionObserver.isAllProcessInjectionTarget());
+ assertFalse(otherObserver.isProcessInjectionTarget());
+ assertFalse(otherObserver.isAllProcessInjectionTarget());
+
+ assertTrue(extensionObserver.isProcessManagedBean());
+ assertTrue(extensionObserver.isAllProcessManagedBean());
+ assertFalse(otherObserver.isProcessManagedBean());
+ assertFalse(otherObserver.isAllProcessManagedBean());
+
+ assertTrue(extensionObserver.isProcessObserverMethod());
+ assertTrue(extensionObserver.isAllProcessObserverMethod());
+ assertFalse(otherObserver.isProcessObserverMethod());
+ assertFalse(otherObserver.isAllProcessObserverMethod());
+
+ assertTrue(extensionObserver.isProcessProducer());
+ assertTrue(extensionObserver.isAllProcessProducer());
+ assertFalse(otherObserver.isProcessProducer());
+ assertFalse(otherObserver.isAllProcessProducer());
+
+ assertTrue(extensionObserver.isProcessProducerField());
+ assertTrue(extensionObserver.isAllProcessProducerField());
+ assertFalse(otherObserver.isProcessProducerField());
+ assertFalse(otherObserver.isAllProcessProducerField());
+
+ assertTrue(extensionObserver.isProcessProducerMethod());
+ assertTrue(extensionObserver.isAllProcessProducerField());
+ assertFalse(otherObserver.isProcessProducerMethod());
+ assertFalse(otherObserver.isAllProcessProducerMethod());
+
+ assertTrue(extensionObserver.isProcessSessionBean());
+ assertTrue(extensionObserver.isAllProcessSessionBean());
+ assertFalse(otherObserver.isProcessSessionBean());
+ assertFalse(otherObserver.isAllProcessSessionBean());
+
+ assertTrue(extensionObserver.isAfterDeploymentValidation());
+ assertTrue(extensionObserver.isAllAfterDeploymentValidation());
+ assertFalse(otherObserver.isAfterDeploymentValidation());
+ assertFalse(otherObserver.isAllAfterDeploymentValidation());
+ }
+
+}
Modified: core/trunk/tests-arquillian/src/test/java/org/jboss/weld/tests/extensions/ExtensionObserver.java
===================================================================
--- core/trunk/tests-arquillian/src/test/java/org/jboss/weld/tests/extensions/ExtensionObserver.java 2010-08-04 15:02:12 UTC (rev 6902)
+++ core/trunk/tests-arquillian/src/test/java/org/jboss/weld/tests/extensions/ExtensionObserver.java 2010-08-04 17:08:05 UTC (rev 6903)
@@ -59,6 +59,8 @@
private boolean processProducerMethod;
private boolean processSessionBean;
private boolean processAnnotatedType;
+
+ private ProcessProducerMethod<?, ?> processProducerMethodInstance;
public void observeAll(@Observes Object event)
{
@@ -145,6 +147,7 @@
public void observeProcessProducerMethod(@Observes ProcessProducerMethod<?, ?> event)
{
processProducerMethod = true;
+ this.processProducerMethodInstance = event;
}
public void observeProcessProducerField(@Observes ProcessProducerField<?, ?> event)
@@ -281,6 +284,11 @@
{
return processProducerMethod;
}
+
+ public ProcessProducerMethod<?, ?> getProcessProducerMethodInstance()
+ {
+ return processProducerMethodInstance;
+ }
public boolean isProcessSessionBean()
{
Modified: core/trunk/tests-arquillian/src/test/java/org/jboss/weld/tests/extensions/ExtensionTest.java
===================================================================
--- core/trunk/tests-arquillian/src/test/java/org/jboss/weld/tests/extensions/ExtensionTest.java 2010-08-04 15:02:12 UTC (rev 6902)
+++ core/trunk/tests-arquillian/src/test/java/org/jboss/weld/tests/extensions/ExtensionTest.java 2010-08-04 17:08:05 UTC (rev 6903)
@@ -16,6 +16,9 @@
*/
package org.jboss.weld.tests.extensions;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+
import javax.enterprise.inject.spi.Extension;
import org.jboss.arquillian.api.Deployment;
@@ -23,114 +26,48 @@
import org.jboss.shrinkwrap.api.Archive;
import org.jboss.shrinkwrap.api.BeanArchive;
import org.jboss.shrinkwrap.api.ShrinkWrap;
-import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
-import org.jboss.weld.tests.category.Integration;
-import org.junit.Assert;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith;
-(a)Category(Integration.class)
@RunWith(Arquillian.class)
public class ExtensionTest
{
@Deployment
public static Archive<?> deploy()
{
- return ShrinkWrap.create(EnterpriseArchive.class, "test.ear")
- .addModule(
- ShrinkWrap.create(BeanArchive.class)
- .addPackage(ExtensionTest.class.getPackage())
- .addServiceProvider(Extension.class,
- SimpleExtension.class,
- ExtensionObserver.class,
- WoodlandExtension.class)
- );
+ return ShrinkWrap.create(BeanArchive.class)
+ .addPackage(ExtensionTest.class.getPackage())
+ .addServiceProvider(Extension.class,
+ SimpleExtension.class,
+ ExtensionObserver.class,
+ WoodlandExtension.class);
}
/*
* description = "WELD-234"
*/
- @Test
+ @Test
public void testExtensionInjectableAsBean(SimpleExtension extension)
{
- Assert.assertTrue(extension.isObservedBeforeBeanDiscovery());
+ assertTrue(extension.isObservedBeforeBeanDiscovery());
}
/*
- * description = "WELD-243"
+ * description = "WELD-572"
*/
@Test
- public void testContainerEventsOnlySentToExtensionBeans(ExtensionObserver extensionObserver, OtherObserver otherObserver)
+ public void testGetNonExistentDisposalMethod(ExtensionObserver extensionObserver)
{
- Assert.assertTrue(extensionObserver.isBeforeBeanDiscovery());
- Assert.assertTrue(extensionObserver.isAllBeforeBeanDiscovery());
- Assert.assertFalse(otherObserver.isBeforeBeanDiscovery());
- Assert.assertFalse(otherObserver.isAllBeforeBeanDiscovery());
-
- Assert.assertTrue(extensionObserver.isAfterBeanDiscovery());
- Assert.assertTrue(extensionObserver.isAllAfterBeanDiscovery());
- Assert.assertFalse(otherObserver.isAfterBeanDiscovery());
- Assert.assertFalse(otherObserver.isAllAfterBeanDiscovery());
-
- Assert.assertTrue(extensionObserver.isProcessAnnotatedType());
- Assert.assertTrue(extensionObserver.isAllProcessAnnnotatedType());
- Assert.assertFalse(otherObserver.isProcessAnnotatedType());
- Assert.assertFalse(otherObserver.isAllProcessAnnotatedType());
-
- Assert.assertTrue(extensionObserver.isProcessBean());
- Assert.assertTrue(extensionObserver.isAllProcessBean());
- Assert.assertFalse(otherObserver.isProcessBean());
- Assert.assertFalse(otherObserver.isAllProcessBean());
-
- Assert.assertTrue(extensionObserver.isProcessInjectionTarget());
- Assert.assertTrue(extensionObserver.isAllProcessInjectionTarget());
- Assert.assertFalse(otherObserver.isProcessInjectionTarget());
- Assert.assertFalse(otherObserver.isAllProcessInjectionTarget());
-
- Assert.assertTrue(extensionObserver.isProcessManagedBean());
- Assert.assertTrue(extensionObserver.isAllProcessManagedBean());
- Assert.assertFalse(otherObserver.isProcessManagedBean());
- Assert.assertFalse(otherObserver.isAllProcessManagedBean());
-
- Assert.assertTrue(extensionObserver.isProcessObserverMethod());
- Assert.assertTrue(extensionObserver.isAllProcessObserverMethod());
- Assert.assertFalse(otherObserver.isProcessObserverMethod());
- Assert.assertFalse(otherObserver.isAllProcessObserverMethod());
-
- Assert.assertTrue(extensionObserver.isProcessProducer());
- Assert.assertTrue(extensionObserver.isAllProcessProducer());
- Assert.assertFalse(otherObserver.isProcessProducer());
- Assert.assertFalse(otherObserver.isAllProcessProducer());
-
- Assert.assertTrue(extensionObserver.isProcessProducerField());
- Assert.assertTrue(extensionObserver.isAllProcessProducerField());
- Assert.assertFalse(otherObserver.isProcessProducerField());
- Assert.assertFalse(otherObserver.isAllProcessProducerField());
-
- Assert.assertTrue(extensionObserver.isProcessProducerMethod());
- Assert.assertTrue(extensionObserver.isAllProcessProducerField());
- Assert.assertFalse(otherObserver.isProcessProducerMethod());
- Assert.assertFalse(otherObserver.isAllProcessProducerMethod());
-
- Assert.assertTrue(extensionObserver.isProcessSessionBean());
- Assert.assertTrue(extensionObserver.isAllProcessSessionBean());
- Assert.assertFalse(otherObserver.isProcessSessionBean());
- Assert.assertFalse(otherObserver.isAllProcessSessionBean());
-
- Assert.assertTrue(extensionObserver.isAfterDeploymentValidation());
- Assert.assertTrue(extensionObserver.isAllAfterDeploymentValidation());
- Assert.assertFalse(otherObserver.isAfterDeploymentValidation());
- Assert.assertFalse(otherObserver.isAllAfterDeploymentValidation());
+ assertNull(extensionObserver.getProcessProducerMethodInstance().getAnnotatedDisposedParameter());
}
-
+
@Test
public void testInjectionTargetWrapped(Capercaillie capercaillie)
{
- Assert.assertTrue(Woodland.isPostConstructCalled());
- Assert.assertTrue(WoodlandExtension.isInjectCalled());
- Assert.assertTrue(WoodlandExtension.isPostConstructCalled());
- Assert.assertTrue(WoodlandExtension.isPreDestroyCalled());
- Assert.assertTrue(WoodlandExtension.isProduceCalled());
+ assertTrue(Woodland.isPostConstructCalled());
+ assertTrue(WoodlandExtension.isInjectCalled());
+ assertTrue(WoodlandExtension.isPostConstructCalled());
+ assertTrue(WoodlandExtension.isPreDestroyCalled());
+ assertTrue(WoodlandExtension.isProduceCalled());
}
}
Modified: core/trunk/tests-arquillian/src/test/java/org/jboss/weld/tests/extensions/Foo.java
===================================================================
--- core/trunk/tests-arquillian/src/test/java/org/jboss/weld/tests/extensions/Foo.java 2010-08-04 15:02:12 UTC (rev 6902)
+++ core/trunk/tests-arquillian/src/test/java/org/jboss/weld/tests/extensions/Foo.java 2010-08-04 17:08:05 UTC (rev 6903)
@@ -1,5 +1,5 @@
/*
- * JBoss, Home of Professional Open Source
+c * JBoss, Home of Professional Open Source
* Copyright 2010, Red Hat, Inc., and individual contributors
* by the @authors tag. See the copyright.txt in the distribution for a
* full listing of individual contributors.
15 years, 8 months
- 1
- 0
[weld/extensions] 2a331a: update to arqullian alpha3
by noreply＠github.com
Branch: refs/heads/master
Home: http://github.com/weld/extensions
Commit: 2a331ae2e117fb75454b6cd279373acc8df6e424
http://github.com/weld/extensions/commit/2a331ae2e117fb75454b6cd279373acc...
Author: Pete Muir <pmuir(a)bleepbleep.org.uk>
Date: 2010-08-04 (Wed, 04 Aug 2010)
Changed paths:
M impl/pom.xml
M impl/src/test/java/org/jboss/weld/extensions/test/bean/generic/field/GenericBeanTest.java
M impl/src/test/java/org/jboss/weld/extensions/test/bean/generic/field/GenericProductTest.java
M impl/src/test/java/org/jboss/weld/extensions/test/bean/generic/field/ObserversOnGenericBeanTest.java
M impl/src/test/java/org/jboss/weld/extensions/test/bean/generic/field/ProducersOnGenericBeanTest.java
M impl/src/test/java/org/jboss/weld/extensions/test/bean/generic/method/GenericBeanTest.java
M impl/src/test/java/org/jboss/weld/extensions/test/bean/generic/method/GenericProductTest.java
M impl/src/test/java/org/jboss/weld/extensions/test/bean/generic/method/ProducersOnGenericBeanTest.java
M impl/src/test/java/org/jboss/weld/extensions/test/core/CoreTest.java
M impl/src/test/java/org/jboss/weld/extensions/test/defaultbean/DefaultBeanTest.java
M impl/src/test/java/org/jboss/weld/extensions/test/el/ElTest.java
M impl/src/test/java/org/jboss/weld/extensions/test/log/LoggerInjectionTest.java
M impl/src/test/java/org/jboss/weld/extensions/test/managedproducer/ManagedProducerTest.java
M impl/src/test/java/org/jboss/weld/extensions/test/resourceLoader/ResourceLoaderTest.java
M impl/src/test/java/org/jboss/weld/extensions/test/servicehandler/ServiceHandlerTest.java
M impl/src/test/java/org/jboss/weld/extensions/test/util/AnnotationInspectorTest.java
M pom.xml
Log Message:
-----------
update to arqullian alpha3
Commit: 0ed4acbf1c71d699311b29997017bdf609d73e6f
http://github.com/weld/extensions/commit/0ed4acbf1c71d699311b29997017bdf6...
Author: Pete Muir <pmuir(a)bleepbleep.org.uk>
Date: 2010-08-04 (Wed, 04 Aug 2010)
Changed paths:
M impl/src/test/java/org/jboss/weld/extensions/test/bean/generic/field/Baz.java
M impl/src/test/java/org/jboss/weld/extensions/test/bean/generic/field/ObserversOnGenericBeanTest.java
Log Message:
-----------
fix observers test for generic beans
15 years, 8 months
- 1
- 0
Weld SVN: r6902 - core/trunk/parent.
by weld-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2010-08-04 11:02:12 -0400 (Wed, 04 Aug 2010)
New Revision: 6902
Modified:
core/trunk/parent/pom.xml
Log:
use Weld conventions
Modified: core/trunk/parent/pom.xml
===================================================================
--- core/trunk/parent/pom.xml 2010-08-04 13:50:51 UTC (rev 6901)
+++ core/trunk/parent/pom.xml 2010-08-04 15:02:12 UTC (rev 6902)
@@ -85,9 +85,8 @@
<junit.version>4.8.1</junit.version>
<htmlunit.version>2.4</htmlunit.version>
- <version.jbossas_server_manager>1.0.3.GA</version.jbossas_server_manager>
- <!-- <version.jbossas_client>6.0.0.20100429-M3</version.jbossas_client> -->
- <version.jbossas_client>6.0.0.20100721-M4</version.jbossas_client>
+ <jbossas.server.manager.version>1.0.3.GA</jbossas.server.manager.version>
+ <jbossas.client.version>6.0.0.20100721-M4</jbossas.client.version>
</properties>
@@ -172,12 +171,12 @@
<dependency>
<groupId>org.jboss.jbossas</groupId>
<artifactId>jboss-server-manager</artifactId>
- <version>${version.jbossas_server_manager}</version>
+ <version>${jbossas.server.manager.version}</version>
</dependency>
<dependency>
<groupId>org.jboss.jbossas</groupId>
<artifactId>jboss-as-client</artifactId>
- <version>${version.jbossas_client}</version>
+ <version>${jbossas.client.version}</version>
<type>pom</type>
</dependency>
15 years, 8 months
- 1
- 0
Weld SVN: r6901 - core/trunk/impl/src/main/java/org/jboss/weld/util.
by weld-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2010-08-04 09:50:51 -0400 (Wed, 04 Aug 2010)
New Revision: 6901
Modified:
core/trunk/impl/src/main/java/org/jboss/weld/util/Beans.java
Log:
fix up declaration names
Modified: core/trunk/impl/src/main/java/org/jboss/weld/util/Beans.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/util/Beans.java 2010-08-04 13:50:22 UTC (rev 6900)
+++ core/trunk/impl/src/main/java/org/jboss/weld/util/Beans.java 2010-08-04 13:50:51 UTC (rev 6901)
@@ -507,12 +507,12 @@
{
for (Annotation requiredQualifier : requiredQualifiers)
{
- QualifierModel<?> bindingType = beanManager.getServices().get(MetaAnnotationStore.class).getBindingTypeModel(requiredQualifier.annotationType());
+ QualifierModel<?> qualifierModel = beanManager.getServices().get(MetaAnnotationStore.class).getBindingTypeModel(requiredQualifier.annotationType());
boolean matchFound = false;
// Do a full check as we need to consider @NonBinding
for (Annotation qualifier : qualifiers)
{
- if (bindingType.isEqual(requiredQualifier, qualifier))
+ if (qualifierModel.isEqual(requiredQualifier, qualifier))
{
matchFound = true;
}
15 years, 8 months
- 1
- 0
Weld SVN: r6900 - in core/trunk/impl/src/main/java/org/jboss/weld: util and 1 other directory.
by weld-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2010-08-04 09:50:22 -0400 (Wed, 04 Aug 2010)
New Revision: 6900
Modified:
core/trunk/impl/src/main/java/org/jboss/weld/resolution/TypeSafeBeanResolver.java
core/trunk/impl/src/main/java/org/jboss/weld/resolution/TypeSafeDecoratorResolver.java
core/trunk/impl/src/main/java/org/jboss/weld/resolution/TypeSafeDisposerResolver.java
core/trunk/impl/src/main/java/org/jboss/weld/resolution/TypeSafeObserverResolver.java
core/trunk/impl/src/main/java/org/jboss/weld/util/Beans.java
Log:
fix up declaration names
Modified: core/trunk/impl/src/main/java/org/jboss/weld/resolution/TypeSafeBeanResolver.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/resolution/TypeSafeBeanResolver.java 2010-08-04 13:26:13 UTC (rev 6899)
+++ core/trunk/impl/src/main/java/org/jboss/weld/resolution/TypeSafeBeanResolver.java 2010-08-04 13:50:22 UTC (rev 6900)
@@ -91,7 +91,7 @@
@Override
protected boolean matches(Resolvable resolvable, T bean)
{
- return Reflections.matches(resolvable.getTypes(), bean.getTypes()) && Beans.containsAllBindings(resolvable.getQualifiers(), bean.getQualifiers(), beanManager);
+ return Reflections.matches(resolvable.getTypes(), bean.getTypes()) && Beans.containsAllQualifiers(resolvable.getQualifiers(), bean.getQualifiers(), beanManager);
}
/**
Modified: core/trunk/impl/src/main/java/org/jboss/weld/resolution/TypeSafeDecoratorResolver.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/resolution/TypeSafeDecoratorResolver.java 2010-08-04 13:26:13 UTC (rev 6899)
+++ core/trunk/impl/src/main/java/org/jboss/weld/resolution/TypeSafeDecoratorResolver.java 2010-08-04 13:50:22 UTC (rev 6900)
@@ -44,7 +44,7 @@
protected boolean matches(Resolvable resolvable, Decorator<?> bean)
{
return Reflections.matches(Collections.singleton(bean.getDelegateType()), resolvable.getTypes())
- && Beans.containsAllBindings(bean.getDelegateQualifiers(), resolvable.getQualifiers(), getBeanManager())
+ && Beans.containsAllQualifiers(bean.getDelegateQualifiers(), resolvable.getQualifiers(), getBeanManager())
&& getBeanManager().getEnabledClasses().getDecorators().contains(bean.getBeanClass());
}
Modified: core/trunk/impl/src/main/java/org/jboss/weld/resolution/TypeSafeDisposerResolver.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/resolution/TypeSafeDisposerResolver.java 2010-08-04 13:26:13 UTC (rev 6899)
+++ core/trunk/impl/src/main/java/org/jboss/weld/resolution/TypeSafeDisposerResolver.java 2010-08-04 13:50:22 UTC (rev 6900)
@@ -41,7 +41,7 @@
@Override
protected boolean matches(Resolvable resolvable, DisposalMethod<?, ?> disposer)
{
- return resolvable.getDeclaringBean().equals(disposer.getDeclaringBean()) && Reflections.isAssignableFrom(disposer.getType(), resolvable.getTypes()) && Beans.containsAllBindings(disposer.getQualifiers(), resolvable.getQualifiers(), manager);
+ return resolvable.getDeclaringBean().equals(disposer.getDeclaringBean()) && Reflections.isAssignableFrom(disposer.getType(), resolvable.getTypes()) && Beans.containsAllQualifiers(disposer.getQualifiers(), resolvable.getQualifiers(), manager);
}
/**
Modified: core/trunk/impl/src/main/java/org/jboss/weld/resolution/TypeSafeObserverResolver.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/resolution/TypeSafeObserverResolver.java 2010-08-04 13:26:13 UTC (rev 6899)
+++ core/trunk/impl/src/main/java/org/jboss/weld/resolution/TypeSafeObserverResolver.java 2010-08-04 13:50:22 UTC (rev 6900)
@@ -42,7 +42,7 @@
@Override
protected boolean matches(Resolvable resolvable, ObserverMethod<?> observer)
{
- return Reflections.isAssignableFrom(observer.getObservedType(), resolvable.getTypes()) && Beans.containsAllBindings(observer.getObservedQualifiers(), resolvable.getQualifiers(), manager);
+ return Reflections.isAssignableFrom(observer.getObservedType(), resolvable.getTypes()) && Beans.containsAllQualifiers(observer.getObservedQualifiers(), resolvable.getQualifiers(), manager);
}
/**
Modified: core/trunk/impl/src/main/java/org/jboss/weld/util/Beans.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/util/Beans.java 2010-08-04 13:26:13 UTC (rev 6899)
+++ core/trunk/impl/src/main/java/org/jboss/weld/util/Beans.java 2010-08-04 13:50:22 UTC (rev 6900)
@@ -109,13 +109,13 @@
* @author Pete Muir
* @author David Allen
* @author Marius Bogoevici
- *
+ *
*/
public class Beans
{
// TODO Convert messages
private static final LocLogger log = loggerFactory().getLogger(BEAN);
-
+
/**
* Indicates if a bean's scope type is passivating
*
@@ -156,7 +156,7 @@
return Reflections.isSerializable(bean.getBeanClass());
}
}
-
+
/**
* Tests if a bean is capable of having its state temporarily stored to
* secondary storage
@@ -211,7 +211,7 @@
WeldClass<?> t = type;
while (t != null && !t.getJavaClass().equals(Object.class))
{
- Set<FieldInjectionPoint<?, ?>> fields = new HashSet<FieldInjectionPoint<?,?>>();
+ Set<FieldInjectionPoint<?, ?>> fields = new HashSet<FieldInjectionPoint<?, ?>>();
injectableFieldsList.add(0, fields);
for (WeldField<?, ?> annotatedField : t.getDeclaredWeldFields(Inject.class))
{
@@ -224,17 +224,17 @@
}
return injectableFieldsList;
}
-
+
public static Set<FieldInjectionPoint<?, ?>> getFieldInjectionPoints(Bean<?> declaringBean, List<? extends Set<? extends FieldInjectionPoint<?, ?>>> fieldInjectionPoints)
{
- Set<FieldInjectionPoint<?, ?>> injectionPoints = new HashSet<FieldInjectionPoint<?,?>>();
+ Set<FieldInjectionPoint<?, ?>> injectionPoints = new HashSet<FieldInjectionPoint<?, ?>>();
for (Set<? extends FieldInjectionPoint<?, ?>> i : fieldInjectionPoints)
{
injectionPoints.addAll(i);
}
return injectionPoints;
}
-
+
public static <T> List<WeldMethod<?, ? super T>> getPostConstructMethods(WeldClass<T> type)
{
WeldClass<?> t = type;
@@ -257,7 +257,7 @@
}
return methods;
}
-
+
public static <T> List<WeldMethod<?, ? super T>> getPreDestroyMethods(WeldClass<T> type)
{
WeldClass<?> t = type;
@@ -281,14 +281,13 @@
return methods;
}
- public static List<WeldMethod<?,?>> getInterceptableMethods(WeldClass<?> type)
+ public static List<WeldMethod<?, ?>> getInterceptableMethods(WeldClass<?> type)
{
List<WeldMethod<?, ?>> annotatedMethods = new ArrayList<WeldMethod<?, ?>>();
for (WeldMethod<?, ?> annotatedMethod : type.getWeldMethods())
{
int modifiers = ((WeldMember) annotatedMethod).getJavaMember().getModifiers();
- boolean businessMethod = !annotatedMethod.isStatic()
- && !annotatedMethod.isAnnotationPresent(Inject.class);
+ boolean businessMethod = !annotatedMethod.isStatic() && !annotatedMethod.isAnnotationPresent(Inject.class);
if (businessMethod)
{
@@ -304,7 +303,6 @@
}
return annotatedMethods;
}
-
public static Set<WeldInjectionPoint<?, ?>> getEjbInjectionPoints(Bean<?> declaringBean, WeldClass<?> type, BeanManagerImpl manager)
{
@@ -341,7 +339,7 @@
return Collections.emptySet();
}
}
-
+
public static Set<WeldInjectionPoint<?, ?>> getPersistenceUnitInjectionPoints(Bean<?> declaringBean, WeldClass<?> type, BeanManagerImpl manager)
{
if (manager.getServices().contains(JpaInjectionServices.class))
@@ -377,7 +375,7 @@
return Collections.emptySet();
}
}
-
+
public static List<Set<MethodInjectionPoint<?, ?>>> getInitializerMethods(Bean<?> declaringBean, WeldClass<?> type)
{
List<Set<MethodInjectionPoint<?, ?>>> initializerMethodsList = new ArrayList<Set<MethodInjectionPoint<?, ?>>>();
@@ -389,12 +387,12 @@
{
return new HashSet<Package>();
}
-
+
});
WeldClass<?> t = type;
while (t != null && !t.getJavaClass().equals(Object.class))
{
- Set<MethodInjectionPoint<?, ?>> initializerMethods = new HashSet<MethodInjectionPoint<?,?>>();
+ Set<MethodInjectionPoint<?, ?>> initializerMethods = new HashSet<MethodInjectionPoint<?, ?>>();
initializerMethodsList.add(0, initializerMethods);
for (WeldMethod<?, ?> method : t.getDeclaredWeldMethods())
{
@@ -420,7 +418,7 @@
{
if (!isOverridden(method, seenMethods))
{
- MethodInjectionPoint<?, ?> initializerMethod = MethodInjectionPoint.of(declaringBean, method);
+ MethodInjectionPoint<?, ?> initializerMethod = MethodInjectionPoint.of(declaringBean, method);
initializerMethods.add(initializerMethod);
}
}
@@ -431,7 +429,7 @@
}
return initializerMethodsList;
}
-
+
private static boolean isOverridden(WeldMethod<?, ?> method, Multimap<MethodSignature, Package> seenMethods)
{
if (method.isPrivate())
@@ -447,30 +445,30 @@
return seenMethods.containsKey(method.getSignature());
}
}
-
+
public static Set<ParameterInjectionPoint<?, ?>> getParameterInjectionPoints(Bean<?> declaringBean, WeldConstructor<?> constructor)
{
- Set<ParameterInjectionPoint<?,?>> injectionPoints = new HashSet<ParameterInjectionPoint<?,?>>();
+ Set<ParameterInjectionPoint<?, ?>> injectionPoints = new HashSet<ParameterInjectionPoint<?, ?>>();
for (WeldParameter<?, ?> parameter : constructor.getWeldParameters())
{
injectionPoints.add(ParameterInjectionPoint.of(declaringBean, parameter));
}
return injectionPoints;
}
-
+
public static Set<ParameterInjectionPoint<?, ?>> getParameterInjectionPoints(Bean<?> declaringBean, MethodInjectionPoint<?, ?> method)
{
- Set<ParameterInjectionPoint<?,?>> injectionPoints = new HashSet<ParameterInjectionPoint<?,?>>();
+ Set<ParameterInjectionPoint<?, ?>> injectionPoints = new HashSet<ParameterInjectionPoint<?, ?>>();
for (WeldParameter<?, ?> parameter : method.getWeldParameters())
{
injectionPoints.add(ParameterInjectionPoint.of(declaringBean, parameter));
}
return injectionPoints;
}
-
+
public static Set<ParameterInjectionPoint<?, ?>> getParameterInjectionPoints(Bean<?> declaringBean, List<Set<MethodInjectionPoint<?, ?>>> methodInjectionPoints)
{
- Set<ParameterInjectionPoint<?, ?>> injectionPoints = new HashSet<ParameterInjectionPoint<?,?>>();
+ Set<ParameterInjectionPoint<?, ?>> injectionPoints = new HashSet<ParameterInjectionPoint<?, ?>>();
for (Set<MethodInjectionPoint<?, ?>> i : methodInjectionPoints)
{
for (MethodInjectionPoint<?, ?> method : i)
@@ -483,7 +481,7 @@
}
return injectionPoints;
}
-
+
private static void addFieldInjectionPoint(WeldField<?, ?> annotatedField, Set<FieldInjectionPoint<?, ?>> injectableFields, Bean<?> declaringBean)
{
if (!annotatedField.isAnnotationPresent(Produces.class))
@@ -496,24 +494,25 @@
injectableFields.add(fieldInjectionPoint);
}
}
-
+
/**
- * Checks if binding criteria fulfill all binding types
+ * Checks that all the qualifiers in the set requiredQualifiers are in the set
+ * of qualifiers. Qualifier equality rules for annotation members are followed.
*
- * @param element The binding criteria to check
- * @param bindings2 The binding types to check
+ * @param requiredQualifiers The required qualifiers
+ * @param qualifiers The set of qualifiers to check
* @return True if all matches, false otherwise
*/
- public static boolean containsAllBindings(Set<Annotation> bindings1, Set<Annotation> bindings2, BeanManagerImpl manager)
+ public static boolean containsAllQualifiers(Set<Annotation> requiredQualifiers, Set<Annotation> qualifiers, BeanManagerImpl beanManager)
{
- for (Annotation binding : bindings1)
+ for (Annotation requiredQualifier : requiredQualifiers)
{
- QualifierModel<?> bindingType = manager.getServices().get(MetaAnnotationStore.class).getBindingTypeModel(binding.annotationType());
+ QualifierModel<?> bindingType = beanManager.getServices().get(MetaAnnotationStore.class).getBindingTypeModel(requiredQualifier.annotationType());
boolean matchFound = false;
- // TODO Something wrong with annotation proxy hashcode in JDK/AnnotationLiteral hashcode, so always do a full check, don't use contains
- for (Annotation otherBinding : bindings2)
+ // Do a full check as we need to consider @NonBinding
+ for (Annotation qualifier : qualifiers)
{
- if (bindingType.isEqual(binding, otherBinding))
+ if (bindingType.isEqual(requiredQualifier, qualifier))
{
matchFound = true;
}
@@ -551,14 +550,14 @@
public static boolean findInterceptorBindingConflicts(BeanManagerImpl manager, Set<Annotation> bindings)
{
Map<Class<? extends Annotation>, Annotation> foundAnnotations = new HashMap<Class<? extends Annotation>, Annotation>();
- for (Annotation binding: bindings)
+ for (Annotation binding : bindings)
{
if (foundAnnotations.containsKey(binding.annotationType()))
{
InterceptorBindingModel<?> bindingType = manager.getServices().get(MetaAnnotationStore.class).getInterceptorBindingModel(binding.annotationType());
if (!bindingType.isEqual(binding, foundAnnotations.get(binding.annotationType()), false))
{
- return true;
+ return true;
}
}
else
@@ -566,9 +565,8 @@
foundAnnotations.put(binding.annotationType(), binding);
}
}
- return false;
+ return false;
}
-
/**
* Retains only beans which have deployment type X.
@@ -599,7 +597,7 @@
return result;
}
}
-
+
public static boolean isBeanEnabled(Bean<?> bean, Collection<Class<?>> enabledAlternativeClasses, Collection<Class<? extends Annotation>> enabledAlternativeSterotypes)
{
if (bean.isAlternative())
@@ -625,7 +623,7 @@
}
return false;
}
-
+
/**
* Check if any of the beans is an alternative
*
@@ -643,7 +641,7 @@
}
return false;
}
-
+
public static boolean isAlternative(WeldAnnotated<?, ?> annotated, MergedStereotypes<?, ?> mergedStereotypes)
{
if (annotated.isAnnotationPresent(Alternative.class))
@@ -655,7 +653,7 @@
return mergedStereotypes.isAlternative();
}
}
-
+
/**
* Check if bean is specialized by any of beans
*
@@ -676,12 +674,12 @@
{
return true;
}
- }
+ }
}
}
return false;
}
-
+
public static <T> ConstructorInjectionPoint<T> getBeanConstructor(Bean<T> declaringBean, WeldClass<T> type)
{
ConstructorInjectionPoint<T> constructor = null;
@@ -705,7 +703,7 @@
constructor = ConstructorInjectionPoint.of(declaringBean, type.getNoArgsWeldConstructor());
log.trace(FOUND_DEFAULT_CONSTRUCTOR, constructor, type);
}
-
+
if (constructor == null)
{
throw new DefinitionException(UNABLE_TO_FIND_CONSTRUCTOR, type);
@@ -715,7 +713,7 @@
return constructor;
}
}
-
+
/**
* Injects EJBs and common fields
*/
@@ -724,7 +722,7 @@
EjbInjectionServices ejbServices = manager.getServices().get(EjbInjectionServices.class);
JpaInjectionServices jpaServices = manager.getServices().get(JpaInjectionServices.class);
ResourceInjectionServices resourceServices = manager.getServices().get(ResourceInjectionServices.class);
-
+
if (ejbServices != null)
{
for (WeldInjectionPoint<?, ?> injectionPoint : ejbInjectionPoints)
@@ -757,7 +755,6 @@
}
}
}
-
/**
* Gets the declared bean type
@@ -776,7 +773,6 @@
return null;
}
}
-
/**
* Injects bound fields
@@ -790,12 +786,12 @@
injectableField.inject(instance, manager, creationalContext);
}
}
-
- public static<T> void injectFieldsAndInitializers(T instance, CreationalContext<T> ctx, BeanManagerImpl beanManager, List<? extends Iterable<? extends FieldInjectionPoint<?, ?>>> injectableFields, List<? extends Iterable<? extends MethodInjectionPoint<?, ?>>>initializerMethods)
+
+ public static <T> void injectFieldsAndInitializers(T instance, CreationalContext<T> ctx, BeanManagerImpl beanManager, List<? extends Iterable<? extends FieldInjectionPoint<?, ?>>> injectableFields, List<? extends Iterable<? extends MethodInjectionPoint<?, ?>>> initializerMethods)
{
if (injectableFields.size() != initializerMethods.size())
{
- throw new IllegalArgumentException(INVALID_QUANTITY_INJECTABLE_FIELDS_AND_INITIALIZER_METHODS, injectableFields, initializerMethods);
+ throw new IllegalArgumentException(INVALID_QUANTITY_INJECTABLE_FIELDS_AND_INITIALIZER_METHODS, injectableFields, initializerMethods);
}
for (int i = 0; i < injectableFields.size(); i++)
{
@@ -803,7 +799,7 @@
callInitializers(instance, ctx, beanManager, initializerMethods.get(i));
}
}
-
+
/**
* Calls all initializers of the bean
*
@@ -826,7 +822,7 @@
{
return annotatedItem.isAnnotationPresent(Decorator.class);
}
-
+
public static Annotation[] mergeInQualifiers(Annotation[] qualifiers, Annotation[] newQualifiers)
{
Set<Annotation> result = new HashSet<Annotation>();
@@ -852,11 +848,11 @@
{
if (decorator instanceof DecoratorImpl<?>)
{
- return ((DecoratorImpl<?>)decorator).getDelegateInjectionPoint();
+ return ((DecoratorImpl<?>) decorator).getDelegateInjectionPoint();
}
else
{
- for (InjectionPoint injectionPoint: decorator.getInjectionPoints())
+ for (InjectionPoint injectionPoint : decorator.getInjectionPoints())
{
if (injectionPoint.isDelegate())
return injectionPoint;
15 years, 8 months
- 1
- 0
Weld SVN: r6899 - in core/trunk/tests/src/test/java/org/jboss/weld/tests: ejb/mdb and 3 other directories.
by weld-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2010-08-04 09:26:13 -0400 (Wed, 04 Aug 2010)
New Revision: 6899
Modified:
core/trunk/tests/src/test/java/org/jboss/weld/tests/ejb/EJBTest.java
core/trunk/tests/src/test/java/org/jboss/weld/tests/ejb/mdb/EJBTest.java
core/trunk/tests/src/test/java/org/jboss/weld/tests/interceptors/ejb/EnterpriseBeanInterceptionTest.java
core/trunk/tests/src/test/java/org/jboss/weld/tests/interceptors/generic/SimpleWeldClassTest.java
core/trunk/tests/src/test/java/org/jboss/weld/tests/interceptors/hierarchical/InterceptorsWithHierarchyTest.java
core/trunk/tests/src/test/java/org/jboss/weld/tests/interceptors/hierarchical/SimpleWeldClassTest.java
Log:
enable a couple of working tests
Modified: core/trunk/tests/src/test/java/org/jboss/weld/tests/ejb/EJBTest.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/ejb/EJBTest.java 2010-08-04 13:19:55 UTC (rev 6898)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/ejb/EJBTest.java 2010-08-04 13:26:13 UTC (rev 6899)
@@ -29,7 +29,7 @@
public class EJBTest extends AbstractWeldTest
{
- @Test(groups="broken")
+ @Test
public void testNoInterface()
{
Cow cow = getReference(Cow.class);
Modified: core/trunk/tests/src/test/java/org/jboss/weld/tests/ejb/mdb/EJBTest.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/ejb/mdb/EJBTest.java 2010-08-04 13:19:55 UTC (rev 6898)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/ejb/mdb/EJBTest.java 2010-08-04 13:26:13 UTC (rev 6899)
@@ -41,6 +41,7 @@
@Test(groups="broken")
// TODO Need a way to deploy test-destinations-service.xml to JBoss AS
+ // Port the test as broken
public void testMdbUsable() throws Exception
{
InitialContext ctx = new InitialContext();
Modified: core/trunk/tests/src/test/java/org/jboss/weld/tests/interceptors/ejb/EnterpriseBeanInterceptionTest.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/interceptors/ejb/EnterpriseBeanInterceptionTest.java 2010-08-04 13:19:55 UTC (rev 6898)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/interceptors/ejb/EnterpriseBeanInterceptionTest.java 2010-08-04 13:26:13 UTC (rev 6899)
@@ -40,7 +40,7 @@
public class EnterpriseBeanInterceptionTest extends AbstractWeldTest
{
- @Test(groups = { "interceptors", "incontainer-broken"})
+ @Test(groups = { "interceptors" })
public void testInterceptors() throws Exception
{
SessionBean<Ball> ballSessionBean = (SessionBean<Ball>)getCurrentManager().getBeans(Ball.class).iterator().next();
Modified: core/trunk/tests/src/test/java/org/jboss/weld/tests/interceptors/generic/SimpleWeldClassTest.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/interceptors/generic/SimpleWeldClassTest.java 2010-08-04 13:19:55 UTC (rev 6898)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/interceptors/generic/SimpleWeldClassTest.java 2010-08-04 13:26:13 UTC (rev 6899)
@@ -37,6 +37,7 @@
{
@Test(groups = "broken")
+ // Aslak Issue is still open, so test can be ported as is
public void testWeldClassForGenericSuperclass()
{
WeldClass<StringProcessor> weldClass = WeldClassImpl.of(StringProcessor.class, new ClassTransformer(new TypeStore()));
Modified: core/trunk/tests/src/test/java/org/jboss/weld/tests/interceptors/hierarchical/InterceptorsWithHierarchyTest.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/interceptors/hierarchical/InterceptorsWithHierarchyTest.java 2010-08-04 13:19:55 UTC (rev 6898)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/interceptors/hierarchical/InterceptorsWithHierarchyTest.java 2010-08-04 13:26:13 UTC (rev 6899)
@@ -37,6 +37,7 @@
}
@Test(groups = "broken")
+ // Aslak Issue is still open, so test can be ported as is
public void testInterceptorsWithHierarchy()
{
Attacker player = this.getReference(Attacker.class);
Modified: core/trunk/tests/src/test/java/org/jboss/weld/tests/interceptors/hierarchical/SimpleWeldClassTest.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/interceptors/hierarchical/SimpleWeldClassTest.java 2010-08-04 13:19:55 UTC (rev 6898)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/interceptors/hierarchical/SimpleWeldClassTest.java 2010-08-04 13:26:13 UTC (rev 6899)
@@ -37,12 +37,13 @@
{
@Test(groups = "broken")
+ // Aslak Issue is still open, so test can be ported as is
public void testWeldClassForCovariantReturnType()
{
WeldClass<Attacker> weldClass = WeldClassImpl.of(Attacker.class, new ClassTransformer(new TypeStore()));
Collection methods = weldClass.getWeldMethods();
assert methods.size() == 4;
- List<WeldMethod<?,?>> interceptableMethods = Beans.getInterceptableMethods(weldClass);
+ List<WeldMethod<?, ?>> interceptableMethods = Beans.getInterceptableMethods(weldClass);
assert interceptableMethods.size() == 4;
}
15 years, 8 months
- 1
- 0
Weld SVN: r6898 - in core/trunk/tests/src/test/java/org/jboss/weld/tests: unit and 1 other directory.
by weld-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2010-08-04 09:19:55 -0400 (Wed, 04 Aug 2010)
New Revision: 6898
Removed:
core/trunk/tests/src/test/java/org/jboss/weld/tests/beanDeployment/
core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/
core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/
core/trunk/tests/src/test/java/org/jboss/weld/tests/producer/
core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/
core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/deployment/
Log:
cleanup
15 years, 8 months
- 1
- 0