You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openwebbeans.apache.org by ar...@apache.org on 2013/01/13 23:46:12 UTC
svn commit: r1432758 [2/3] - in /openwebbeans/trunk:
webbeans-ee-common/src/main/java/org/apache/webbeans/ee/common/beans/
webbeans-ee/src/main/java/org/apache/webbeans/ee/beans/
webbeans-ejb/src/main/java/org/apache/webbeans/ejb/common/component/ webb...
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ProducerMethodBean.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ProducerMethodBean.java?rev=1432758&r1=1432757&r2=1432758&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ProducerMethodBean.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ProducerMethodBean.java Sun Jan 13 22:46:11 2013
@@ -18,8 +18,11 @@
*/
package org.apache.webbeans.component;
+import java.io.Serializable;
+import java.lang.annotation.Annotation;
import java.lang.reflect.Method;
import java.lang.reflect.Modifier;
+import java.lang.reflect.Type;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
@@ -37,6 +40,7 @@ import org.apache.webbeans.exception.Web
import org.apache.webbeans.inject.AbstractInjectable;
import org.apache.webbeans.inject.InjectableMethod;
import org.apache.webbeans.portable.InjectionTargetImpl;
+import org.apache.webbeans.util.ClassUtil;
import org.apache.webbeans.util.WebBeansUtil;
/**
@@ -49,6 +53,7 @@ import org.apache.webbeans.util.WebBeans
*/
public class ProducerMethodBean<T> extends AbstractProducerBean<T>
{
+
/** Creator method of the parent component */
protected Method creatorMethod;
@@ -63,9 +68,17 @@ public class ProducerMethodBean<T> exten
* @param parent parent bean
* @param returnType producer method return type
*/
- public ProducerMethodBean(InjectionTargetBean<?> parent, Class<T> returnType)
+ public ProducerMethodBean(InjectionTargetBean<?> ownerComponent,
+ Set<Type> types,
+ Set<Annotation> qualifiers,
+ Class<? extends Annotation> scope,
+ String name,
+ boolean nullable,
+ Class<T> returnType,
+ Set<Class<? extends Annotation>> stereotypes,
+ boolean alternative)
{
- super(WebBeansType.PRODUCERMETHOD, returnType, parent);
+ super(ownerComponent, WebBeansType.PRODUCERMETHOD, types, qualifiers, scope, name, nullable, returnType, stereotypes, alternative);
}
/**
@@ -358,7 +371,7 @@ public class ProducerMethodBean<T> exten
" with passivating scope @%s" +
" must be Serializable";
getWebBeansContext().getWebBeansUtil().checkSerializableScopeType(getScope(),
- isSerializable(), errorMessage, creatorMethod.getName(), ownerComponent.getReturnType().getName(),
+ ClassUtil.isClassAssignable(Serializable.class, getReturnType()), errorMessage, creatorMethod.getName(), ownerComponent.getReturnType().getName(),
getScope().getName());
}
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ResourceBean.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ResourceBean.java?rev=1432758&r1=1432757&r2=1432758&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ResourceBean.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ResourceBean.java Sun Jan 13 22:46:11 2013
@@ -20,6 +20,8 @@ package org.apache.webbeans.component;
import java.lang.annotation.Annotation;
import java.lang.reflect.Modifier;
+import java.lang.reflect.Type;
+import java.util.Set;
import javax.enterprise.context.spi.CreationalContext;
import org.apache.webbeans.exception.WebBeansException;
@@ -29,12 +31,21 @@ import org.apache.webbeans.spi.api.Resou
public class ResourceBean<X, T extends Annotation> extends ProducerFieldBean<X>
{
- private ResourceReference<X,T> resourceReference = null;
- public ResourceBean(Class<X> returnType, InjectionTargetBean<?> ownerBean,
- ResourceReference<X, T> resourceReference)
+ private ResourceReference<X,T> resourceReference = null;
+
+ public ResourceBean(InjectionTargetBean<?> ownerComponent,
+ ResourceReference<X, T> resourceReference,
+ Set<Type> types,
+ Set<Annotation> qualifiers,
+ Class<? extends Annotation> scope,
+ String name,
+ boolean nullable,
+ Class<X> beanClass,
+ Set<Class<? extends Annotation>> stereotypes,
+ boolean alternative)
{
- super(ownerBean, returnType);
+ super(ownerComponent, types, qualifiers, scope, name, nullable, beanClass, stereotypes, alternative);
this.resourceReference = resourceReference;
}
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/SelfInterceptorBean.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/SelfInterceptorBean.java?rev=1432758&r1=1432757&r2=1432758&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/SelfInterceptorBean.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/SelfInterceptorBean.java Sun Jan 13 22:46:11 2013
@@ -20,9 +20,13 @@ package org.apache.webbeans.component;
import javax.enterprise.context.spi.CreationalContext;
import javax.enterprise.inject.spi.AnnotatedType;
+import javax.enterprise.inject.spi.InterceptionType;
import javax.enterprise.inject.spi.Interceptor;
import java.lang.annotation.Annotation;
+import java.lang.reflect.Method;
+import java.lang.reflect.Type;
import java.util.Collections;
+import java.util.Map;
import java.util.Set;
import org.apache.webbeans.config.WebBeansContext;
@@ -37,14 +41,14 @@ import org.apache.webbeans.exception.Web
*/
public class SelfInterceptorBean<T> extends InterceptorBean<T> implements Interceptor<T>
{
- /**
- *
- * @param annotatedType AnnotatedType will be returned by some methods in the SPI
- * @param webBeansContext
- */
- public SelfInterceptorBean(WebBeansContext webBeansContext, AnnotatedType<T> annotatedType)
+
+ public SelfInterceptorBean(WebBeansContext webBeansContext,
+ AnnotatedType<T> annotatedType,
+ Set<Type> types,
+ Class<T> beanClass,
+ Map<InterceptionType, Method[]> interceptionMethods)
{
- super(webBeansContext, annotatedType);
+ super(webBeansContext, annotatedType, types, beanClass, interceptionMethods);
}
/**
@@ -60,5 +64,4 @@ public class SelfInterceptorBean<T> exte
{
throw new WebBeansException("You must not create an Interceptor instance of a self-intercepted bean!");
}
-
}
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/AbstractBeanBuilder.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/AbstractBeanBuilder.java?rev=1432758&r1=1432757&r2=1432758&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/AbstractBeanBuilder.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/AbstractBeanBuilder.java Sun Jan 13 22:46:11 2013
@@ -20,7 +20,6 @@ package org.apache.webbeans.component.cr
import static org.apache.webbeans.util.InjectionExceptionUtil.throwUnproxyableResolutionException;
-import java.io.Serializable;
import java.lang.annotation.Annotation;
import java.lang.reflect.Constructor;
import java.lang.reflect.Method;
@@ -35,10 +34,12 @@ import java.util.Set;
import javax.enterprise.context.Dependent;
import javax.enterprise.context.NormalScope;
import javax.enterprise.inject.Any;
+import javax.enterprise.inject.Specializes;
import javax.enterprise.inject.spi.Annotated;
import javax.enterprise.inject.spi.AnnotatedField;
import javax.enterprise.inject.spi.AnnotatedMember;
import javax.enterprise.inject.spi.AnnotatedMethod;
+import javax.enterprise.inject.spi.Bean;
import javax.enterprise.inject.spi.InjectionPoint;
import javax.enterprise.util.Nonbinding;
import javax.inject.Named;
@@ -48,7 +49,6 @@ import org.apache.webbeans.annotation.An
import org.apache.webbeans.annotation.AnyLiteral;
import org.apache.webbeans.annotation.DefaultLiteral;
import org.apache.webbeans.annotation.NamedLiteral;
-import org.apache.webbeans.component.AbstractOwbBean;
import org.apache.webbeans.component.OwbBean;
import org.apache.webbeans.config.WebBeansContext;
import org.apache.webbeans.container.ExternalScope;
@@ -67,12 +67,9 @@ import org.apache.webbeans.util.WebBeans
*
* @param <T> bean class info
*/
-public abstract class AbstractBeanBuilder<T>
+public abstract class AbstractBeanBuilder<T, A extends Annotated, B extends Bean<T>>
{
- /**Bean instance*/
- private final AbstractOwbBean<T> bean;
-
- private Annotated annotated;
+ private A annotated;
private WebBeansContext webBeansContext;
@@ -86,27 +83,18 @@ public abstract class AbstractBeanBuilde
private Set<Class<? extends Annotation>> stereotypes = new HashSet<Class<? extends Annotation>>();
- private boolean serializable = false;
-
private Set<AnnotatedMember<? super T>> injectionPoints = new HashSet<AnnotatedMember<? super T>>();
- public AbstractBeanBuilder(AbstractOwbBean<T> bean, Annotated annotated)
- {
- this(bean, annotated, null);
- }
-
/**
* Creates a bean instance.
*
* @param bean bean instance
* @param annotated
*/
- public AbstractBeanBuilder(AbstractOwbBean<T> bean, Annotated annotated, Class<? extends Annotation> scopeType)
+ public AbstractBeanBuilder(WebBeansContext webBeansContext, A annotated)
{
- this.bean = bean;
this.annotated = annotated;
- this.scope = scopeType;
- this.webBeansContext = bean.getWebBeansContext();
+ this.webBeansContext = webBeansContext;
}
public Class<? extends Annotation> getScope()
@@ -217,15 +205,24 @@ public abstract class AbstractBeanBuilde
*/
public void defineApiType()
{
- Set<Type> types = annotated.getTypeClosure();
- apiTypes.addAll(types);
- Set<String> ignored = webBeansContext.getOpenWebBeansConfiguration().getIgnoredInterfaces();
- for (Iterator<Type> i = apiTypes.iterator(); i.hasNext();)
+ if (getBeanType().isArray())
+ {
+ // 3.3.1
+ apiTypes.add(Object.class);
+ apiTypes.add(getBeanType());
+ }
+ else
{
- Type t = i.next();
- if (t instanceof Class && ignored.contains(((Class<?>)t).getName()))
+ Set<Type> types = annotated.getTypeClosure();
+ apiTypes.addAll(types);
+ Set<String> ignored = webBeansContext.getOpenWebBeansConfiguration().getIgnoredInterfaces();
+ for (Iterator<Type> i = apiTypes.iterator(); i.hasNext();)
{
- i.remove();
+ Type t = i.next();
+ if (t instanceof Class && ignored.contains(((Class<?>)t).getName()))
+ {
+ i.remove();
+ }
}
}
}
@@ -278,6 +275,21 @@ public abstract class AbstractBeanBuilde
*/
public void defineQualifiers()
{
+ HashSet<Class<? extends Annotation>> qualifiedTypes = new HashSet<Class<? extends Annotation>>();
+ if (annotated.isAnnotationPresent(Specializes.class))
+ {
+ // in this case first define qualifiers of supertype
+ Class<?> superclass = ClassUtil.getClass(annotated.getBaseType()).getSuperclass();
+ if (superclass != null)
+ {
+ defineQualifiers(webBeansContext.getAnnotatedElementFactory().getAnnotatedType(superclass), qualifiedTypes);
+ }
+ }
+ defineQualifiers(annotated, qualifiedTypes);
+ }
+
+ private void defineQualifiers(Annotated annotated, Set<Class<? extends Annotation>> qualifiedTypes)
+ {
Annotation[] annotations = AnnotationUtil.asArray(annotated.getAnnotations());
final AnnotationManager annotationManager = webBeansContext.getAnnotationManager();
@@ -303,6 +315,14 @@ public abstract class AbstractBeanBuilde
}
}
+ if (qualifiedTypes.contains(annotation.annotationType()))
+ {
+ continue;
+ }
+ else
+ {
+ qualifiedTypes.add(annotation.annotationType());
+ }
if (annotation.annotationType().equals(Named.class) && beanName != null)
{
qualifiers.add(new NamedLiteral(beanName));
@@ -567,17 +587,6 @@ public abstract class AbstractBeanBuilde
/**
* {@inheritDoc}
*/
- public void defineSerializable()
- {
- if (ClassUtil.isClassAssignable(Serializable.class, getBeanType()))
- {
- serializable = true;
- }
- }
-
- /**
- * {@inheritDoc}
- */
public void defineStereoTypes()
{
Annotation[] anns = AnnotationUtil.asArray(annotated.getAnnotations());
@@ -622,36 +631,40 @@ public abstract class AbstractBeanBuilde
}
}
+ protected abstract B createBean(Set<Type> types,
+ Set<Annotation> qualifiers,
+ Class<? extends Annotation> scope,
+ String name,
+ boolean nullable,
+ Class<T> returnType,
+ Set<Class<? extends Annotation>> stereotypes,
+ boolean alternative);
+
/**
* {@inheritDoc}
*/
- public AbstractOwbBean<T> getBean()
+ public B getBean()
{
- bean.setName(beanName);
- bean.setImplScopeType(scope);
- bean.getTypes().addAll(apiTypes);
- bean.getQualifiers().addAll(qualifiers);
- bean.getStereotypes().addAll(stereotypes);
- bean.setSerializable(serializable);
+ B bean = createBean(apiTypes, qualifiers, scope, beanName, false, getBeanType(), stereotypes, false);
for (Iterator<AnnotatedMember<? super T>> memberIterator = injectionPoints.iterator(); memberIterator.hasNext();)
{
AnnotatedMember<? super T> member = memberIterator.next();
if (member instanceof AnnotatedField)
{
- addFieldInjectionPointMetaData(bean, (AnnotatedField<?>) member);
+ addFieldInjectionPointMetaData((OwbBean<T>)bean, (AnnotatedField<?>) member);
}
else if (member instanceof AnnotatedMethod)
{
- addMethodInjectionPointMetaData(bean, (AnnotatedMethod<?>) member);
+ addMethodInjectionPointMetaData((OwbBean<T>)bean, (AnnotatedMethod<?>) member);
}
}
return bean;
}
- protected Annotated getAnnotated()
+ protected A getAnnotated()
{
return annotated;
}
- protected abstract Class<?> getBeanType();
+ protected abstract Class<T> getBeanType();
}
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/AbstractInjectionTargetBeanBuilder.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/AbstractInjectionTargetBeanBuilder.java?rev=1432758&r1=1432757&r2=1432758&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/AbstractInjectionTargetBeanBuilder.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/AbstractInjectionTargetBeanBuilder.java Sun Jan 13 22:46:11 2013
@@ -43,6 +43,7 @@ import javax.enterprise.inject.spi.Annot
import javax.enterprise.inject.spi.AnnotatedParameter;
import javax.enterprise.inject.spi.AnnotatedType;
import javax.enterprise.inject.spi.Bean;
+import javax.enterprise.inject.spi.InjectionPoint;
import javax.enterprise.inject.spi.ObserverMethod;
import javax.inject.Inject;
import javax.inject.Named;
@@ -69,7 +70,7 @@ import org.apache.webbeans.util.WebBeans
*
* @param <T> bean class type
*/
-public abstract class AbstractInjectionTargetBeanBuilder<T> extends AbstractBeanBuilder<T>
+public abstract class AbstractInjectionTargetBeanBuilder<T, I extends InjectionTargetBean<T>> extends AbstractBeanBuilder<T, AnnotatedType<T>, I>
{
private boolean enabled = true;
@@ -80,15 +81,10 @@ public abstract class AbstractInjectionT
*
* @param bean bean instance
*/
- public AbstractInjectionTargetBeanBuilder(AbstractInjectionTargetBean<T> bean, Class<? extends Annotation> scopeType)
+ public AbstractInjectionTargetBeanBuilder(WebBeansContext webBeansContext, AnnotatedType<T> annotatedType)
{
- super(bean, bean.getAnnotatedType(), scopeType);
- webBeansContext = bean.getWebBeansContext();
- }
-
- public AbstractInjectionTargetBeanBuilder(AbstractInjectionTargetBean<T> bean)
- {
- this(bean, null);
+ super(webBeansContext, annotatedType);
+ this.webBeansContext = webBeansContext;
}
/**
@@ -99,8 +95,6 @@ public abstract class AbstractInjectionT
defineName(WebBeansUtil.getManagedBeanDefaultName(getAnnotated().getJavaClass().getSimpleName()));
}
-
-
protected AnnotatedConstructor<T> getBeanConstructor()
{
Asserts.assertNotNull(getAnnotated(),"Type is null");
@@ -163,33 +157,38 @@ public abstract class AbstractInjectionT
return result;
}
+ public void defineDisposalMethods()
+ {
+ Set<AnnotatedMethod<? super T>> annotatedMethods = getAnnotated().getMethods();
+
+ for (AnnotatedMethod<? super T> annotatedMethod : annotatedMethods)
+ {
+ for (AnnotatedParameter<? super T> annotatedParameter : annotatedMethod.getParameters())
+ {
+ if (annotatedParameter.isAnnotationPresent(Disposes.class))
+ {
+ addInjectionPoint(annotatedMethod);
+ }
+ }
+ }
+ }
/**
* {@inheritDoc}
*/
- public void defineDisposalMethods()
+ public void validateDisposalMethods(InjectionTargetBean<T> bean)
{
final AnnotationManager annotationManager = webBeansContext.getAnnotationManager();
Set<AnnotatedMethod<? super T>> annotatedMethods = getAnnotated().getMethods();
ProducerMethodBean<?> previous = null;
- for (AnnotatedMethod<? super T> annotatedMethod : annotatedMethods)
+ for (InjectionPoint injectionPoint : bean.getInjectionPoints())
{
- Method declaredMethod = annotatedMethod.getJavaMember();
- AnnotatedMethod<T> annt = (AnnotatedMethod<T>)annotatedMethod;
- List<AnnotatedParameter<T>> parameters = annt.getParameters();
- boolean found = false;
- for(AnnotatedParameter<T> parameter : parameters)
+ if (injectionPoint.getAnnotated().isAnnotationPresent(Disposes.class))
{
- if(parameter.isAnnotationPresent(Disposes.class))
- {
- found = true;
- break;
- }
- }
-
- if(found)
- {
- checkProducerMethodDisposal((AnnotatedMethod<T>) annotatedMethod);
+ AnnotatedParameter<T> annotatedParameter = (AnnotatedParameter<T>) injectionPoint.getAnnotated();
+ AnnotatedMethod<T> annotatedMethod = (AnnotatedMethod<T>) annotatedParameter.getDeclaringCallable();
+ Method declaredMethod = annotatedMethod.getJavaMember();
+ checkProducerMethodDisposal(annotatedMethod);
Type type = AnnotationUtil.getAnnotatedMethodFirstParameterWithAnnotation(annotatedMethod, Disposes.class);
Annotation[] annot = annotationManager.getAnnotatedMethodFirstParameterQualifierWithGivenAnnotation(annotatedMethod, Disposes.class);
@@ -234,10 +233,6 @@ public abstract class AbstractInjectionT
}
pr.setDisposalMethod(declaredMethod);
-
- addInjectionPoint(annotatedMethod);
- getBean(); // to force creating the injection point
-
}
}
}
@@ -434,7 +429,7 @@ public abstract class AbstractInjectionT
if(found)
{
checkObserverMethodConditions((AnnotatedMethod<T>) annotatedMethod, annotatedMethod.getDeclaringType().getJavaClass());
- if (getScope().equals(Dependent.class))
+ if (bean.getScope().equals(Dependent.class))
{
//Check Reception
AnnotationUtil.getAnnotatedMethodFirstParameterWithAnnotation(annotatedMethod, Observes.class);
@@ -541,8 +536,6 @@ public abstract class AbstractInjectionT
resourceBeanCreator.defineQualifiers();
ResourceBean<T, Annotation> resourceBean = resourceBeanCreator.getBean();
- resourceBean.getTypes().addAll(annotatedField.getTypeClosure());
- resourceBean.setImplScopeType(Dependent.class);
resourceBean.setProducerField(field);
producerBeans.add(resourceBean);
@@ -550,8 +543,8 @@ public abstract class AbstractInjectionT
}
else
{
- ProducerFieldBeanBuilder<T> producerFieldBeanCreator = new ProducerFieldBeanBuilder<T>(bean, annotatedField);
- producerFieldBeanCreator.defineSerializable();
+ ProducerFieldBeanBuilder<T, ProducerFieldBean<T>> producerFieldBeanCreator = new ProducerFieldBeanBuilder<T, ProducerFieldBean<T>>(bean, annotatedField);
+ producerFieldBeanCreator.defineApiType();
producerFieldBeanCreator.defineStereoTypes();
producerFieldBeanCreator.defineScopeType("Annotated producer field: " + annotatedField + "must declare default @Scope annotation");
producerFieldBeanCreator.checkUnproxiableApiType();
@@ -566,16 +559,6 @@ public abstract class AbstractInjectionT
}
webBeansContext.getWebBeansUtil().setBeanEnableFlagForProducerBean(bean, producerFieldBean, anns);
- if (producerFieldBean.getReturnType().isArray())
- {
- // 3.3.1
- producerFieldBean.getTypes().add(Object.class);
- producerFieldBean.getTypes().add(producerFieldBean.getReturnType());
- }
- else
- {
- producerFieldBean.getTypes().addAll(annotatedField.getTypeClosure());
- }
WebBeansUtil.checkProducerGenericType(producerFieldBean, annotatedField.getJavaMember());
producerBeans.add(producerFieldBean);
@@ -617,7 +600,6 @@ public abstract class AbstractInjectionT
producerMethodBeanCreator.configureProducerSpecialization((AnnotatedMethod<T>) annotatedMethod);
}
- producerMethodBeanCreator.defineSerializable();
producerMethodBeanCreator.defineStereoTypes();
producerMethodBeanCreator.defineScopeType("Annotated producer method : " + annotatedMethod
+ "must declare default @Scope annotation");
@@ -625,6 +607,8 @@ public abstract class AbstractInjectionT
producerMethodBeanCreator.defineQualifiers();
producerMethodBeanCreator.addInjectionPoint(annotatedMethod);
+ producerMethodBeanCreator.defineApiType();
+ producerMethodBeanCreator.defineName(WebBeansUtil.getProducerDefaultName(annotatedMethod.getJavaMember().getName()));
ProducerMethodBean<T> producerMethodBean = producerMethodBeanCreator.getBean();
producerMethodBean.setCreatorMethod(annotatedMethod.getJavaMember());
if (ClassUtil.getClass(annotatedMethod.getBaseType()).isPrimitive())
@@ -635,20 +619,8 @@ public abstract class AbstractInjectionT
webBeansContext.getWebBeansUtil().setBeanEnableFlagForProducerBean(bean,
producerMethodBean,
AnnotationUtil.asArray(annotatedMethod.getAnnotations()));
-
- if (producerMethodBean.getReturnType().isArray())
- {
- // 3.3.1
- producerMethodBean.getTypes().add(Object.class);
- producerMethodBean.getTypes().add(producerMethodBean.getReturnType());
- }
- else
- {
- producerMethodBean.getTypes().addAll(annotatedMethod.getTypeClosure());
- }
WebBeansUtil.checkProducerGenericType(producerMethodBean, annotatedMethod.getJavaMember());
- producerMethodBeanCreator.defineName(WebBeansUtil.getProducerDefaultName(annotatedMethod.getJavaMember().getName()));
- producerBeans.add(producerMethodBeanCreator.getBean());
+ producerBeans.add(producerMethodBean);
}
@@ -675,19 +647,27 @@ public abstract class AbstractInjectionT
}
}
- /**
- * Return type-safe bean instance.
- */
- public AbstractInjectionTargetBean<T> getBean()
- {
- AbstractInjectionTargetBean<T> bean = (AbstractInjectionTargetBean<T>)super.getBean();
- bean.setEnabled(enabled);
- return bean;
- }
+ protected abstract I createBean(Set<Type> types,
+ Set<Annotation> qualifiers,
+ Class<? extends Annotation> scope,
+ String name,
+ boolean nullable,
+ Class<T> beanClass,
+ Set<Class<? extends Annotation>> stereotypes,
+ boolean alternative,
+ boolean enabled);
- protected AnnotatedType<T> getAnnotated()
+ @Override
+ protected I createBean(Set<Type> types,
+ Set<Annotation> qualifiers,
+ Class<? extends Annotation> scope,
+ String name,
+ boolean nullable,
+ Class<T> beanClass,
+ Set<Class<? extends Annotation>> stereotypes,
+ boolean alternative)
{
- return (AnnotatedType<T>) super.getAnnotated();
+ return createBean(types, qualifiers, scope, name, nullable, beanClass, stereotypes, alternative, enabled);
}
protected boolean isEnabled()
@@ -701,7 +681,7 @@ public abstract class AbstractInjectionT
}
@Override
- protected Class<?> getBeanType()
+ protected Class<T> getBeanType()
{
return getAnnotated().getJavaClass();
}
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/AbstractProducerBeanBuilder.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/AbstractProducerBeanBuilder.java?rev=1432758&r1=1432757&r2=1432758&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/AbstractProducerBeanBuilder.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/AbstractProducerBeanBuilder.java Sun Jan 13 22:46:11 2013
@@ -18,16 +18,45 @@
*/
package org.apache.webbeans.component.creation;
-import javax.enterprise.inject.spi.Annotated;
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Type;
+import java.util.Set;
+
+import javax.enterprise.inject.spi.AnnotatedMember;
import org.apache.webbeans.component.AbstractProducerBean;
+import org.apache.webbeans.component.InjectionTargetBean;
-public abstract class AbstractProducerBeanBuilder<T> extends AbstractBeanBuilder<T>
+public abstract class AbstractProducerBeanBuilder<T, A extends AnnotatedMember<?>, P extends AbstractProducerBean<T>> extends AbstractBeanBuilder<T, A, P>
{
- public AbstractProducerBeanBuilder(AbstractProducerBean<T> bean, Annotated annotated)
+ private InjectionTargetBean<?> parent;
+
+ public AbstractProducerBeanBuilder(InjectionTargetBean<?> parent, A annotated)
{
- super(bean, annotated);
+ super(parent.getWebBeansContext(), annotated);
+ this.parent = parent;
}
+ protected abstract P createBean(InjectionTargetBean<?> parent,
+ Set<Type> types,
+ Set<Annotation> qualifiers,
+ Class<? extends Annotation> scope,
+ String name,
+ boolean nullable,
+ Class<T> beanClass,
+ Set<Class<? extends Annotation>> stereotypes,
+ boolean alternative);
+ @Override
+ protected P createBean(Set<Type> types,
+ Set<Annotation> qualifiers,
+ Class<? extends Annotation> scope,
+ String name,
+ boolean nullable,
+ Class<T> beanClass,
+ Set<Class<? extends Annotation>> stereotypes,
+ boolean alternative)
+ {
+ return createBean(parent, types, qualifiers, scope, name, nullable, beanClass, stereotypes, alternative);
+ }
}
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/AnnotatedTypeBeanBuilder.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/AnnotatedTypeBeanBuilder.java?rev=1432758&r1=1432757&r2=1432758&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/AnnotatedTypeBeanBuilder.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/AnnotatedTypeBeanBuilder.java Sun Jan 13 22:46:11 2013
@@ -23,11 +23,12 @@ import java.util.logging.Logger;
import javax.enterprise.inject.spi.AnnotatedType;
+import org.apache.webbeans.component.ManagedBean;
import org.apache.webbeans.config.OWBLogConst;
import org.apache.webbeans.config.WebBeansContext;
import org.apache.webbeans.logger.WebBeansLoggerFacade;
-public class AnnotatedTypeBeanBuilder<T> extends ManagedBeanBuilder<T>
+public class AnnotatedTypeBeanBuilder<T> extends ManagedBeanBuilder<T, ManagedBean<T>>
{
private final static Logger logger = WebBeansLoggerFacade.getLogger(AnnotatedTypeBeanBuilder.class);
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/CdiInterceptorBeanBuilder.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/CdiInterceptorBeanBuilder.java?rev=1432758&r1=1432757&r2=1432758&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/CdiInterceptorBeanBuilder.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/CdiInterceptorBeanBuilder.java Sun Jan 13 22:46:11 2013
@@ -20,8 +20,13 @@ package org.apache.webbeans.component.cr
import javax.enterprise.inject.spi.AnnotatedType;
+import javax.enterprise.inject.spi.InterceptionType;
import java.lang.annotation.Annotation;
+import java.lang.reflect.Method;
+import java.lang.reflect.Type;
+import java.util.Map;
+import java.util.Set;
import org.apache.webbeans.component.CdiInterceptorBean;
import org.apache.webbeans.config.WebBeansContext;
@@ -31,12 +36,14 @@ import org.apache.webbeans.util.ArrayUti
/**
* Bean builder for {@link org.apache.webbeans.component.InterceptorBean}s.
*/
-public class CdiInterceptorBeanBuilder<T> extends InterceptorBeanBuilder<T>
+public class CdiInterceptorBeanBuilder<T> extends InterceptorBeanBuilder<T, CdiInterceptorBean<T>>
{
+ private Set<Annotation> interceptorBindings;
+
public CdiInterceptorBeanBuilder(WebBeansContext webBeansContext, AnnotatedType<T> annotatedType)
{
- super(new CdiInterceptorBean<T>(webBeansContext, annotatedType));
+ super(webBeansContext, annotatedType);
}
public void defineCdiInterceptorRules()
@@ -61,11 +68,12 @@ public class CdiInterceptorBeanBuilder<T
+ " must have at least one @InterceptorBinding annotation");
}
- getBean().setInterceptorBindings(ArrayUtil.asSet(bindings));
+ interceptorBindings = ArrayUtil.asSet(bindings);
}
- public CdiInterceptorBean<T> getBean()
+ @Override
+ protected CdiInterceptorBean<T> createBean(Set<Type> types, Class<T> beanClass, boolean enabled, Map<InterceptionType, Method[]> interceptionMethods)
{
- return (CdiInterceptorBean<T>)super.getBean();
+ return new CdiInterceptorBean<T>(webBeansContext, getAnnotated(), types, beanClass, interceptorBindings, enabled, interceptionMethods);
}
}
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/EjbInterceptorBeanBuilder.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/EjbInterceptorBeanBuilder.java?rev=1432758&r1=1432757&r2=1432758&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/EjbInterceptorBeanBuilder.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/EjbInterceptorBeanBuilder.java Sun Jan 13 22:46:11 2013
@@ -19,7 +19,13 @@
package org.apache.webbeans.component.creation;
+import java.lang.reflect.Method;
+import java.lang.reflect.Type;
+import java.util.Map;
+import java.util.Set;
+
import javax.enterprise.inject.spi.AnnotatedType;
+import javax.enterprise.inject.spi.InterceptionType;
import org.apache.webbeans.component.EjbInterceptorBean;
import org.apache.webbeans.config.WebBeansContext;
@@ -27,12 +33,12 @@ import org.apache.webbeans.config.WebBea
/**
* Bean builder for {@link org.apache.webbeans.component.InterceptorBean}s.
*/
-public class EjbInterceptorBeanBuilder<T> extends InterceptorBeanBuilder<T>
+public class EjbInterceptorBeanBuilder<T> extends InterceptorBeanBuilder<T, EjbInterceptorBean<T>>
{
public EjbInterceptorBeanBuilder(WebBeansContext webBeansContext, AnnotatedType<T> annotatedType)
{
- super(new EjbInterceptorBean<T>(webBeansContext, annotatedType));
+ super(webBeansContext, annotatedType);
}
public void defineEjbInterceptorRules()
@@ -47,9 +53,9 @@ public class EjbInterceptorBeanBuilder<T
return true;
}
-
- public EjbInterceptorBean<T> getBean()
+ @Override
+ protected EjbInterceptorBean<T> createBean(Set<Type> types, Class<T> beanClass, boolean enabled, Map<InterceptionType, Method[]> interceptionMethods)
{
- return (EjbInterceptorBean<T>)super.getBean();
+ return new EjbInterceptorBean<T>(webBeansContext, getAnnotated(), types, beanClass, interceptionMethods);
}
}
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ExtensionBeanBuilder.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ExtensionBeanBuilder.java?rev=1432758&r1=1432757&r2=1432758&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ExtensionBeanBuilder.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ExtensionBeanBuilder.java Sun Jan 13 22:46:11 2013
@@ -18,24 +18,32 @@
*/
package org.apache.webbeans.component.creation;
-import javax.enterprise.context.ApplicationScoped;
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Type;
+import java.util.Set;
import org.apache.webbeans.component.ExtensionBean;
import org.apache.webbeans.config.WebBeansContext;
-public class ExtensionBeanBuilder<T> extends AbstractInjectionTargetBeanBuilder<T>
+public class ExtensionBeanBuilder<T> extends AbstractInjectionTargetBeanBuilder<T, ExtensionBean<T>>
{
public ExtensionBeanBuilder(WebBeansContext webBeansContext, Class<T> type)
{
- super(new ExtensionBean<T>(webBeansContext, type), ApplicationScoped.class);
+ super(webBeansContext, webBeansContext.getAnnotatedElementFactory().newAnnotatedType(type));
}
- /**
- * {@inheritDoc}
- */
- public ExtensionBean<T> getBean()
+ @Override
+ protected ExtensionBean<T> createBean(Set<Type> types,
+ Set<Annotation> qualifiers,
+ Class<? extends Annotation> scope,
+ String name,
+ boolean nullable,
+ Class<T> beanClass,
+ Set<Class<? extends Annotation>> stereotypes,
+ boolean alternative,
+ boolean enabled)
{
- return (ExtensionBean<T>)super.getBean();
+ return new ExtensionBean<T>(webBeansContext, beanClass);
}
}
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/InterceptorBeanBuilder.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/InterceptorBeanBuilder.java?rev=1432758&r1=1432757&r2=1432758&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/InterceptorBeanBuilder.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/InterceptorBeanBuilder.java Sun Jan 13 22:46:11 2013
@@ -20,11 +20,11 @@ package org.apache.webbeans.component.cr
import javax.annotation.PostConstruct;
import javax.annotation.PreDestroy;
-import javax.enterprise.context.Dependent;
import javax.enterprise.inject.Produces;
import javax.enterprise.inject.spi.AnnotatedConstructor;
import javax.enterprise.inject.spi.AnnotatedMethod;
import javax.enterprise.inject.spi.AnnotatedParameter;
+import javax.enterprise.inject.spi.AnnotatedType;
import javax.enterprise.inject.spi.InjectionPoint;
import javax.enterprise.inject.spi.InterceptionType;
import javax.interceptor.AroundInvoke;
@@ -32,12 +32,15 @@ import javax.interceptor.AroundTimeout;
import java.lang.annotation.Annotation;
import java.lang.reflect.Method;
+import java.lang.reflect.Type;
import java.util.ArrayList;
-import java.util.HashSet;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
import java.util.Set;
import org.apache.webbeans.component.InterceptorBean;
+import org.apache.webbeans.config.WebBeansContext;
import org.apache.webbeans.exception.WebBeansConfigurationException;
import org.apache.webbeans.inject.impl.InjectionPointFactory;
import org.apache.webbeans.plugins.OpenWebBeansEjbLCAPlugin;
@@ -46,9 +49,8 @@ import org.apache.webbeans.plugins.OpenW
/**
* Bean builder for {@link org.apache.webbeans.component.InterceptorBean}s.
*/
-public abstract class InterceptorBeanBuilder<T> extends AbstractInjectionTargetBeanBuilder<T>
+public abstract class InterceptorBeanBuilder<T, B extends InterceptorBean<T>> extends AbstractInjectionTargetBeanBuilder<T, B>
{
- private final InterceptorBean<T> bean;
private final OpenWebBeansEjbLCAPlugin ejbPlugin;
private final Class<? extends Annotation> prePassivateClass;
@@ -56,10 +58,11 @@ public abstract class InterceptorBeanBui
private AnnotatedConstructor<T> constructor;
- protected InterceptorBeanBuilder(InterceptorBean<T> bean)
+ private Map<InterceptionType, Method[]> interceptionMethods;
+
+ protected InterceptorBeanBuilder(WebBeansContext webBeansContext, AnnotatedType<T> annotatedType)
{
- super(bean, Dependent.class);
- this.bean = bean;
+ super(webBeansContext, annotatedType);
ejbPlugin = webBeansContext.getPluginLoader().getEjbLCAPlugin();
if (ejbPlugin != null)
{
@@ -76,17 +79,15 @@ public abstract class InterceptorBeanBui
public void defineConstructor()
{
constructor = getBeanConstructor();
- addConstructorInjectionPointMetaData();
}
- protected void addConstructorInjectionPointMetaData()
+ protected void addConstructorInjectionPointMetaData(B bean)
{
if (constructor == null)
{
return;
}
- InterceptorBean<T> bean = (InterceptorBean<T>) getBean();
InjectionPointFactory injectionPointFactory = webBeansContext.getInjectionPointFactory();
List<InjectionPoint> injectionPoints = injectionPointFactory.getConstructorInjectionPointData(bean, constructor);
for (InjectionPoint injectionPoint : injectionPoints)
@@ -208,7 +209,6 @@ public abstract class InterceptorBeanBui
// and now the EJB related interceptors
if (ejbPlugin != null)
{
- // AroundTimeout
if (m.getAnnotation(prePassivateClass) != null)
{
checkSameClassInterceptors(prePassivateMethods, m);
@@ -219,6 +219,14 @@ public abstract class InterceptorBeanBui
// AroundTimeout
if (m.getAnnotation(AroundTimeout.class) != null)
{
+ checkSameClassInterceptors(aroundTimeoutMethods, m);
+ postActivateMethods.add(m); // add at last position
+ }
+ removeOverriddenMethod(postActivateMethods, m);
+
+ // AroundTimeout
+ if (m.getAnnotation(postActivateClass) != null)
+ {
checkSameClassInterceptors(postActivateMethods, m);
postActivateMethods.add(m); // add at last position
}
@@ -230,42 +238,34 @@ public abstract class InterceptorBeanBui
// and now for setting the bean info
- Set<InterceptionType> intercepts = new HashSet<InterceptionType>();
+ interceptionMethods = new HashMap<InterceptionType, Method[]>();
if (aroundInvokeMethod != null)
{
- bean.setAroundInvokeMethods(new Method[]{aroundInvokeMethod.getJavaMember()});
- intercepts.add(InterceptionType.AROUND_INVOKE);
+ interceptionMethods.put(InterceptionType.AROUND_INVOKE, new Method[]{aroundInvokeMethod.getJavaMember()});
}
if (postConstructMethods.size() > 0)
{
- bean.setPostConstructMethods(getMethodArray(postConstructMethods));
- intercepts.add(InterceptionType.POST_CONSTRUCT);
+ interceptionMethods.put(InterceptionType.POST_CONSTRUCT, getMethodArray(postConstructMethods));
}
if (preDestroyMethods.size() > 0)
{
- bean.setPreDestroyMethods(getMethodArray(preDestroyMethods));
- intercepts.add(InterceptionType.PRE_DESTROY);
+ interceptionMethods.put(InterceptionType.PRE_DESTROY, getMethodArray(preDestroyMethods));
}
if (aroundTimeoutMethods.size() > 0)
{
- bean.setAroundTimeoutMethods(getMethodArray(aroundTimeoutMethods));
- intercepts.add(InterceptionType.AROUND_TIMEOUT);
+ interceptionMethods.put(InterceptionType.AROUND_TIMEOUT, getMethodArray(aroundTimeoutMethods));
}
if (prePassivateMethods.size() > 0)
{
- bean.setPrePassivateMethods(getMethodArray(prePassivateMethods));
- intercepts.add(InterceptionType.PRE_PASSIVATE);
+ interceptionMethods.put(InterceptionType.PRE_PASSIVATE, getMethodArray(prePassivateMethods));
}
if (postActivateMethods.size() > 0)
{
- bean.setPostActivateMethods(getMethodArray(postActivateMethods));
- intercepts.add(InterceptionType.POST_ACTIVATE);
+ interceptionMethods.put(InterceptionType.POST_ACTIVATE, getMethodArray(postActivateMethods));
}
-
- bean.setIntercepts(intercepts);
}
/**
@@ -307,5 +307,24 @@ public abstract class InterceptorBeanBui
}
}
-
+ protected abstract B createBean(Set<Type> types,
+ Class<T> beanClass,
+ boolean enabled,
+ Map<InterceptionType, Method[]> interceptionMethods);
+
+ @Override
+ protected B createBean(Set<Type> types,
+ Set<Annotation> qualifiers,
+ Class<? extends Annotation> scope,
+ String name,
+ boolean nullable,
+ Class<T> beanClass,
+ Set<Class<? extends Annotation>> stereotypes,
+ boolean alternative,
+ boolean enabled)
+ {
+ B bean = createBean(types, beanClass, enabled, interceptionMethods);
+ addConstructorInjectionPointMetaData(bean);
+ return bean;
+ }
}
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ManagedBeanBuilder.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ManagedBeanBuilder.java?rev=1432758&r1=1432757&r2=1432758&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ManagedBeanBuilder.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ManagedBeanBuilder.java Sun Jan 13 22:46:11 2013
@@ -19,8 +19,8 @@
package org.apache.webbeans.component.creation;
import java.lang.annotation.Annotation;
-import java.lang.reflect.Constructor;
import java.lang.reflect.Modifier;
+import java.lang.reflect.Type;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
@@ -39,6 +39,7 @@ import javax.enterprise.inject.spi.Produ
import org.apache.webbeans.component.ManagedBean;
import org.apache.webbeans.component.ProducerFieldBean;
import org.apache.webbeans.component.ProducerMethodBean;
+import org.apache.webbeans.component.WebBeansType;
import org.apache.webbeans.config.OWBLogConst;
import org.apache.webbeans.config.WebBeansContext;
import org.apache.webbeans.container.BeanManagerImpl;
@@ -48,6 +49,7 @@ import org.apache.webbeans.event.Observe
import org.apache.webbeans.exception.inject.DeploymentException;
import org.apache.webbeans.inject.impl.InjectionPointFactory;
import org.apache.webbeans.logger.WebBeansLoggerFacade;
+import org.apache.webbeans.portable.creation.InjectionTargetProducer;
import org.apache.webbeans.portable.events.ProcessBeanImpl;
import org.apache.webbeans.portable.events.ProcessProducerImpl;
import org.apache.webbeans.portable.events.generics.GProcessManagedBean;
@@ -61,9 +63,8 @@ import org.apache.webbeans.util.WebBeans
*
* @param <T> bean type info
*/
-public class ManagedBeanBuilder<T> extends AbstractInjectionTargetBeanBuilder<T>
+public class ManagedBeanBuilder<T, M extends ManagedBean<T>> extends AbstractInjectionTargetBeanBuilder<T, M>
{
- private final WebBeansContext webBeansContext;
private AnnotatedConstructor<T> constructor;
/**
@@ -71,13 +72,7 @@ public class ManagedBeanBuilder<T> exten
*/
public ManagedBeanBuilder(WebBeansContext webBeansContext, AnnotatedType<T> annotatedType)
{
- this(new ManagedBean<T>(webBeansContext, annotatedType.getJavaClass(), annotatedType), null);
- }
-
- protected ManagedBeanBuilder(ManagedBean<T> managedBean, Class<? extends Annotation> scopeType)
- {
- super(managedBean, scopeType);
- webBeansContext = managedBean.getWebBeansContext();
+ super(webBeansContext, annotatedType);
}
/**
@@ -104,9 +99,9 @@ public class ManagedBeanBuilder<T> exten
/**
* {@inheritDoc}
*/
- public ManagedBean<T> getBean()
+ public M getBean()
{
- ManagedBean<T> bean = (ManagedBean<T>)super.getBean();
+ M bean = super.getBean();
addConstructorInjectionPointMetaData(bean);
return bean;
}
@@ -127,8 +122,6 @@ public class ManagedBeanBuilder<T> exten
defineScopeType(WebBeansLoggerFacade.getTokenString(OWBLogConst.TEXT_MB_IMPL) + clazz.getName() +
WebBeansLoggerFacade.getTokenString(OWBLogConst.TEXT_SAME_SCOPE));
- defineSerializable();
-
//Check for Enabled via Alternative
defineEnabled();
@@ -139,9 +132,11 @@ public class ManagedBeanBuilder<T> exten
defineConstructor();
defineInjectedFields();
defineInjectedMethods();
+ defineDisposalMethods();
Set<ObserverMethod<?>> observerMethods = new HashSet<ObserverMethod<?>>();
ManagedBean<T> managedBean = getBean();
+ ((InjectionTargetProducer)processInjectionTargetEvent.getInjectionTarget()).setBean(managedBean);
if(isEnabled())
{
observerMethods = defineObserverMethods(managedBean);
@@ -223,7 +218,7 @@ public class ManagedBeanBuilder<T> exten
// add them one after the other to enable serialization handling et al
beanManager.addBean(producerMethod);
}
- defineDisposalMethods();//Define disposal method after adding producers
+ validateDisposalMethods(managedBean);//Define disposal method after adding producers
for (ProducerFieldBean<?> producerField : producerFields)
{
// add them one after the other to enable serialization handling et al
@@ -237,7 +232,7 @@ public class ManagedBeanBuilder<T> exten
/**
* @deprecated replaced via the various {@link InterceptorBeanBuilder}s
*/
- public void defineInterceptor(ProcessInjectionTarget<T> injectionTargetEvent)
+ public ManagedBean<T> defineInterceptor(ProcessInjectionTarget<T> injectionTargetEvent)
{
Class<?> clazz = injectionTargetEvent.getAnnotatedType().getJavaClass();
AnnotatedType annotatedType = injectionTargetEvent.getAnnotatedType();
@@ -260,8 +255,12 @@ public class ManagedBeanBuilder<T> exten
// TODO could probably be a bit more descriptive
throw new DeploymentException("Cannot create Interceptor for class" + injectionTargetEvent.getAnnotatedType());
}
+ return component;
+ }
+ else
+ {
+ return null;
}
-
}
protected void addConstructorInjectionPointMetaData(ManagedBean<T> bean)
@@ -280,21 +279,11 @@ public class ManagedBeanBuilder<T> exten
bean.setConstructor(constructor.getJavaMember());
}
- public void addConstructorInjectionPointMetaData(Constructor<T> constructor)
- {
- List<InjectionPoint> injectionPoints = webBeansContext.getInjectionPointFactory().getConstructorInjectionPointData(getBean(), constructor);
- for (InjectionPoint injectionPoint : injectionPoints)
- {
- addImplicitComponentForInjectionPoint(injectionPoint);
- getBean().addInjectionPoint(injectionPoint);
- }
- }
-
/**
* Define decorator bean.
* @param processInjectionTargetEvent
*/
- public void defineDecorator(ProcessInjectionTarget<T> processInjectionTargetEvent)
+ public ManagedBean<T> defineDecorator(ProcessInjectionTarget<T> processInjectionTargetEvent)
{
Class<T> clazz = processInjectionTargetEvent.getAnnotatedType().getJavaClass();
if (webBeansContext.getDecoratorsManager().isDecoratorEnabled(clazz))
@@ -321,6 +310,11 @@ public class ManagedBeanBuilder<T> exten
// TODO could probably be a bit more descriptive
throw new DeploymentException("Cannot create Decorator for class" + processInjectionTargetEvent.getAnnotatedType());
}
+ return delegate;
+ }
+ else
+ {
+ return null;
}
}
@@ -341,4 +335,20 @@ public class ManagedBeanBuilder<T> exten
bean.setIsAbstractDecorator(true);
return bean;
}
+
+ @Override
+ protected M createBean(Set<Type> types,
+ Set<Annotation> qualifiers,
+ Class<? extends Annotation> scope,
+ String name,
+ boolean nullable,
+ Class<T> beanClass,
+ Set<Class<? extends Annotation>> stereotypes,
+ boolean alternative,
+ boolean enabled)
+ {
+ M managedBean = (M)new ManagedBean<T>(webBeansContext, WebBeansType.MANAGED, getAnnotated(), types, qualifiers, scope, name, beanClass, stereotypes, alternative);
+ managedBean.setEnabled(enabled);
+ return managedBean;
+ }
}
Added: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/NewEjbBeanBuilder.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/NewEjbBeanBuilder.java?rev=1432758&view=auto
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/NewEjbBeanBuilder.java (added)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/NewEjbBeanBuilder.java Sun Jan 13 22:46:11 2013
@@ -0,0 +1,56 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.apache.webbeans.component.creation;
+
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Type;
+import java.util.HashSet;
+import java.util.Set;
+
+import javax.enterprise.inject.spi.AnnotatedType;
+
+import org.apache.webbeans.annotation.NewLiteral;
+import org.apache.webbeans.component.NewManagedBean;
+import org.apache.webbeans.component.WebBeansType;
+import org.apache.webbeans.config.WebBeansContext;
+
+public class NewEjbBeanBuilder<T> extends ManagedBeanBuilder<T, NewManagedBean<T>>
+{
+
+ public NewEjbBeanBuilder(WebBeansContext webBeansContext, AnnotatedType<T> annotatedType)
+ {
+ super(webBeansContext, annotatedType);
+ }
+
+ @Override
+ protected NewManagedBean<T> createBean(Set<Type> types,
+ Set<Annotation> qualifiers,
+ Class<? extends Annotation> scope,
+ String name,
+ boolean nullable,
+ Class<T> beanClass,
+ Set<Class<? extends Annotation>> stereotypes,
+ boolean alternative,
+ boolean enabled)
+ {
+ Set<Annotation> newQualifiers = new HashSet<Annotation>(qualifiers);
+ newQualifiers.add(new NewLiteral(getAnnotated().getJavaClass()));
+ return new NewManagedBean<T>(webBeansContext, WebBeansType.ENTERPRISE, getAnnotated(), types, newQualifiers, beanClass, stereotypes);
+ }
+}
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/NewManagedBeanBuilder.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/NewManagedBeanBuilder.java?rev=1432758&r1=1432757&r2=1432758&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/NewManagedBeanBuilder.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/NewManagedBeanBuilder.java Sun Jan 13 22:46:11 2013
@@ -18,26 +18,39 @@
*/
package org.apache.webbeans.component.creation;
-import javax.enterprise.context.Dependent;
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Type;
+import java.util.HashSet;
+import java.util.Set;
+
import javax.enterprise.inject.spi.AnnotatedType;
+import org.apache.webbeans.annotation.NewLiteral;
import org.apache.webbeans.component.NewManagedBean;
import org.apache.webbeans.component.WebBeansType;
import org.apache.webbeans.config.WebBeansContext;
-public class NewManagedBeanBuilder<T> extends ManagedBeanBuilder<T>
+public class NewManagedBeanBuilder<T> extends ManagedBeanBuilder<T, NewManagedBean<T>>
{
public NewManagedBeanBuilder(WebBeansContext webBeansContext, AnnotatedType<T> annotatedType)
{
- super(new NewManagedBean<T>(webBeansContext, annotatedType.getJavaClass(), WebBeansType.MANAGED, annotatedType), Dependent.class);
+ super(webBeansContext, annotatedType);
}
- /**
- * {@inheritDoc}
- */
- public NewManagedBean<T> getBean()
+ @Override
+ protected NewManagedBean<T> createBean(Set<Type> types,
+ Set<Annotation> qualifiers,
+ Class<? extends Annotation> scope,
+ String name,
+ boolean nullable,
+ Class<T> beanClass,
+ Set<Class<? extends Annotation>> stereotypes,
+ boolean alternative,
+ boolean enabled)
{
- return (NewManagedBean<T>)super.getBean();
+ Set<Annotation> newQualifiers = new HashSet<Annotation>(qualifiers);
+ newQualifiers.add(new NewLiteral(getAnnotated().getJavaClass()));
+ return new NewManagedBean<T>(webBeansContext, WebBeansType.MANAGED, getAnnotated(), types, newQualifiers, beanClass, stereotypes);
}
}
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ProducerFieldBeanBuilder.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ProducerFieldBeanBuilder.java?rev=1432758&r1=1432757&r2=1432758&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ProducerFieldBeanBuilder.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ProducerFieldBeanBuilder.java Sun Jan 13 22:46:11 2013
@@ -18,36 +18,40 @@
*/
package org.apache.webbeans.component.creation;
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Type;
+import java.util.Set;
+
import javax.enterprise.inject.spi.AnnotatedField;
import org.apache.webbeans.component.InjectionTargetBean;
import org.apache.webbeans.component.ProducerFieldBean;
-import org.apache.webbeans.util.ClassUtil;
-public class ProducerFieldBeanBuilder<T> extends AbstractProducerBeanBuilder<T>
+public class ProducerFieldBeanBuilder<T, P extends ProducerFieldBean<T>> extends AbstractProducerBeanBuilder<T, AnnotatedField<?>, P>
{
- public ProducerFieldBeanBuilder(InjectionTargetBean<T> parent, AnnotatedField<? super T> annotatedField)
+ public ProducerFieldBeanBuilder(InjectionTargetBean<?> owner, AnnotatedField<?> annotated)
{
- super(new ProducerFieldBean<T>(parent, (Class<T>)ClassUtil.getClass(annotatedField.getBaseType())), annotatedField);
+ super(owner, annotated);
}
- protected ProducerFieldBeanBuilder(ProducerFieldBean<T> bean, AnnotatedField<? super T> annotatedField)
- {
- super(bean, annotatedField);
- }
-
- /**
- * {@inheritDoc}
- */
- public ProducerFieldBean<T> getBean()
+ @Override
+ protected Class<T> getBeanType()
{
- return (ProducerFieldBean<T>) super.getBean();
+ return (Class<T>) getAnnotated().getJavaMember().getType();
}
@Override
- protected Class<?> getBeanType()
+ protected P createBean(InjectionTargetBean<?> owner,
+ Set<Type> types,
+ Set<Annotation> qualifiers,
+ Class<? extends Annotation> scope,
+ String name,
+ boolean nullable,
+ Class<T> beanClass,
+ Set<Class<? extends Annotation>> stereotypes,
+ boolean alternative)
{
- return ((AnnotatedField<T>)getAnnotated()).getJavaMember().getType();
+ return (P) new ProducerFieldBean<T>(owner, types, qualifiers, scope, name, nullable, beanClass, stereotypes, alternative);
}
}
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ProducerMethodBeanBuilder.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ProducerMethodBeanBuilder.java?rev=1432758&r1=1432757&r2=1432758&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ProducerMethodBeanBuilder.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ProducerMethodBeanBuilder.java Sun Jan 13 22:46:11 2013
@@ -18,9 +18,12 @@
*/
package org.apache.webbeans.component.creation;
+import java.lang.annotation.Annotation;
import java.lang.reflect.Method;
+import java.lang.reflect.Type;
import java.util.ArrayList;
import java.util.List;
+import java.util.Set;
import javax.enterprise.inject.Produces;
import javax.enterprise.inject.spi.AnnotatedMethod;
@@ -32,20 +35,12 @@ import org.apache.webbeans.exception.Web
import org.apache.webbeans.util.AnnotationUtil;
import org.apache.webbeans.util.ClassUtil;
-public class ProducerMethodBeanBuilder<T> extends AbstractProducerBeanBuilder<T>
+public class ProducerMethodBeanBuilder<T> extends AbstractProducerBeanBuilder<T, AnnotatedMethod<?>, ProducerMethodBean<T>>
{
- public ProducerMethodBeanBuilder(InjectionTargetBean<T> parent, AnnotatedMethod<? super T> annotatedMethod)
+ public ProducerMethodBeanBuilder(InjectionTargetBean<T> parent, AnnotatedMethod<?> annotatedMethod)
{
- super(new ProducerMethodBean<T>(parent, (Class<T>)ClassUtil.getClass(annotatedMethod.getBaseType())), annotatedMethod);
- }
-
- /**
- * {@inheritDoc}
- */
- public ProducerMethodBean<T> getBean()
- {
- return (ProducerMethodBean<T>)super.getBean();
+ super(parent, annotatedMethod);
}
public void configureProducerSpecialization(AnnotatedMethod<T> annotatedMethod)
@@ -89,8 +84,22 @@ public class ProducerMethodBeanBuilder<T
}
@Override
- protected Class<?> getBeanType()
+ protected Class<T> getBeanType()
+ {
+ return (Class<T>) getAnnotated().getJavaMember().getReturnType();
+ }
+
+ @Override
+ protected ProducerMethodBean<T> createBean(InjectionTargetBean<?> parent,
+ Set<Type> types,
+ Set<Annotation> qualifiers,
+ Class<? extends Annotation> scope,
+ String name,
+ boolean nullable,
+ Class<T> beanClass,
+ Set<Class<? extends Annotation>> stereotypes,
+ boolean alternative)
{
- return ((AnnotatedMethod<T>)getAnnotated()).getJavaMember().getReturnType();
+ return new ProducerMethodBean<T>(parent, types, qualifiers, scope, name, nullable, beanClass, stereotypes, alternative);
}
}
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ResourceBeanBuilder.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ResourceBeanBuilder.java?rev=1432758&r1=1432757&r2=1432758&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ResourceBeanBuilder.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ResourceBeanBuilder.java Sun Jan 13 22:46:11 2013
@@ -19,6 +19,8 @@
package org.apache.webbeans.component.creation;
import java.lang.annotation.Annotation;
+import java.lang.reflect.Type;
+import java.util.Set;
import javax.enterprise.inject.spi.AnnotatedField;
@@ -26,16 +28,28 @@ import org.apache.webbeans.component.Inj
import org.apache.webbeans.component.ResourceBean;
import org.apache.webbeans.spi.api.ResourceReference;
-public class ResourceBeanBuilder<T, R extends Annotation> extends ProducerFieldBeanBuilder<T>
+public class ResourceBeanBuilder<T, R extends Annotation> extends ProducerFieldBeanBuilder<T, ResourceBean<T, R>>
{
- public ResourceBeanBuilder(InjectionTargetBean<T> parent, ResourceReference<T, R> resourceRef, AnnotatedField<? super T> annotatedField)
+ private ResourceReference<T, R> resourceRef;
+
+ public ResourceBeanBuilder(InjectionTargetBean<?> parent, ResourceReference<T, R> resourceRef, AnnotatedField<?> annotatedField)
{
- super(new ResourceBean<T, R>((Class<T>)annotatedField.getJavaMember().getType(), parent, resourceRef), annotatedField);
+ super(parent, annotatedField);
+ this.resourceRef = resourceRef;
}
- public ResourceBean<T, R> getBean()
+ @Override
+ protected ResourceBean<T, R> createBean(InjectionTargetBean<?> owner,
+ Set<Type> types,
+ Set<Annotation> qualifiers,
+ Class<? extends Annotation> scope,
+ String name,
+ boolean nullable,
+ Class<T> beanClass,
+ Set<Class<? extends Annotation>> stereotypes,
+ boolean alternative)
{
- return (ResourceBean<T, R>) super.getBean();
+ return new ResourceBean<T, R>(owner, resourceRef, types, qualifiers, scope, name, nullable, beanClass, stereotypes, alternative);
}
}
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/SelfInterceptorBeanBuilder.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/SelfInterceptorBeanBuilder.java?rev=1432758&r1=1432757&r2=1432758&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/SelfInterceptorBeanBuilder.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/SelfInterceptorBeanBuilder.java Sun Jan 13 22:46:11 2013
@@ -19,7 +19,13 @@
package org.apache.webbeans.component.creation;
+import java.lang.reflect.Method;
+import java.lang.reflect.Type;
+import java.util.Map;
+import java.util.Set;
+
import javax.enterprise.inject.spi.AnnotatedType;
+import javax.enterprise.inject.spi.InterceptionType;
import org.apache.webbeans.component.SelfInterceptorBean;
import org.apache.webbeans.config.WebBeansContext;
@@ -27,12 +33,12 @@ import org.apache.webbeans.config.WebBea
/**
* Bean builder for {@link org.apache.webbeans.component.InterceptorBean}s.
*/
-public class SelfInterceptorBeanBuilder<T> extends InterceptorBeanBuilder<T>
+public class SelfInterceptorBeanBuilder<T> extends InterceptorBeanBuilder<T, SelfInterceptorBean<T>>
{
public SelfInterceptorBeanBuilder(WebBeansContext webBeansContext, AnnotatedType<T> annotatedType)
{
- super(new SelfInterceptorBean<T>(webBeansContext, annotatedType));
+ super(webBeansContext, annotatedType);
}
public void defineSelfInterceptorRules()
@@ -46,9 +52,9 @@ public class SelfInterceptorBeanBuilder<
return true;
}
-
- public SelfInterceptorBean<T> getBean()
+ @Override
+ protected SelfInterceptorBean<T> createBean(Set<Type> types, Class<T> beanClass, boolean enabled, Map<InterceptionType, Method[]> interceptionMethods)
{
- return (SelfInterceptorBean<T>)super.getBean();
+ return new SelfInterceptorBean<T>(webBeansContext, getAnnotated(), types, beanClass, interceptionMethods);
}
}
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/third/ThirdpartyBeanImpl.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/third/ThirdpartyBeanImpl.java?rev=1432758&r1=1432757&r2=1432758&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/third/ThirdpartyBeanImpl.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/third/ThirdpartyBeanImpl.java Sun Jan 13 22:46:11 2013
@@ -36,10 +36,18 @@ public class ThirdpartyBeanImpl<T> exten
{
private Bean<T> bean = null;
-
public ThirdpartyBeanImpl(WebBeansContext webBeansContext, Bean<T> bean)
{
- super(webBeansContext, WebBeansType.THIRDPARTY);
+ super(webBeansContext,
+ WebBeansType.THIRDPARTY,
+ bean.getTypes(),
+ bean.getQualifiers(),
+ bean.getScope(),
+ bean.getName(),
+ bean.isNullable(),
+ bean.getBeanClass(),
+ bean.getStereotypes(),
+ bean.isAlternative());
this.bean = bean;
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/BeansDeployer.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/BeansDeployer.java?rev=1432758&r1=1432757&r2=1432758&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/BeansDeployer.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/BeansDeployer.java Sun Jan 13 22:46:11 2013
@@ -48,6 +48,7 @@ import org.apache.webbeans.component.Abs
import org.apache.webbeans.component.EnterpriseBeanMarker;
import org.apache.webbeans.component.InjectionTargetBean;
import org.apache.webbeans.component.InterceptedMarker;
+import org.apache.webbeans.component.ManagedBean;
import org.apache.webbeans.component.NewBean;
import org.apache.webbeans.component.OwbBean;
import org.apache.webbeans.component.creation.ManagedBeanBuilder;
@@ -831,7 +832,7 @@ public class BeansDeployer
//Check conditions
webBeansContext.getWebBeansUtil().checkManagedBeanCondition(clazz);
- ManagedBeanBuilder<T> managedBeanCreator = new ManagedBeanBuilder<T>(webBeansContext, annotatedType);
+ ManagedBeanBuilder<T, ManagedBean<T>> managedBeanCreator = new ManagedBeanBuilder<T, ManagedBean<T>>(webBeansContext, annotatedType);
boolean annotationTypeSet = false;
if(processAnnotatedEvent.isModifiedAnnotatedType())
@@ -847,7 +848,7 @@ public class BeansDeployer
processInjectionTargetEvent = processInjectionTarget;
}
-
+ InjectionTargetBean<T> bean;
if(WebBeansUtil.isDecorator(annotatedType))
{
if (logger.isLoggable(Level.FINE))
@@ -856,11 +857,11 @@ public class BeansDeployer
}
if(annotationTypeSet)
{
- webBeansContext.getWebBeansUtil().defineDecorator(annotatedType);
+ bean = webBeansContext.getWebBeansUtil().defineDecorator(annotatedType);
}
else
{
- managedBeanCreator.defineDecorator(processInjectionTargetEvent);
+ bean = managedBeanCreator.defineDecorator(processInjectionTargetEvent);
}
}
else if(WebBeansUtil.isCdiInterceptor(annotatedType))
@@ -871,11 +872,11 @@ public class BeansDeployer
}
if(annotationTypeSet)
{
- webBeansContext.getWebBeansUtil().defineInterceptor(annotatedType);
+ bean = webBeansContext.getWebBeansUtil().defineInterceptor(annotatedType);
}
else
{
- managedBeanCreator.defineInterceptor(processInjectionTargetEvent);
+ bean = managedBeanCreator.defineInterceptor(processInjectionTargetEvent);
}
}
else
@@ -890,7 +891,7 @@ public class BeansDeployer
{
logger.log(Level.FINE, "Found Managed Bean with class name : [{0}]", annotatedType.getJavaClass().getName());
}
- managedBeanCreator.defineManagedBean(processInjectionTargetEvent);
+ bean = managedBeanCreator.defineManagedBean(processInjectionTargetEvent);
}
if(processInjectionTarget != null)
@@ -900,9 +901,9 @@ public class BeansDeployer
final InjectionTarget originalInjectionTarget = processInjectionTargetEvent.getInjectionTarget();
final InjectionTarget updatedInjectionTarget = webBeansContext.getWebBeansUtil()
.fireProcessInjectionTargetEvent(processInjectionTarget).getInjectionTarget();
- if (updatedInjectionTarget != originalInjectionTarget)
+ if (updatedInjectionTarget != originalInjectionTarget && bean != null)
{
- managedBeanCreator.getBean().setProducer(updatedInjectionTarget);
+ bean.setProducer(updatedInjectionTarget);
}
}
}
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/InjectionResolver.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/InjectionResolver.java?rev=1432758&r1=1432757&r2=1432758&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/InjectionResolver.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/InjectionResolver.java Sun Jan 13 22:46:11 2013
@@ -241,7 +241,7 @@ public class InjectionResolver
{
injectionPointClass = injectionPoint.getBean().getBeanClass();
}
- Set<Bean<?>> beanSet = implResolveByType(type, injectionPointClass, qualifiers);
+ Set<Bean<?>> beanSet = implResolveByType(type, clazz, qualifiers);
if (beanSet.isEmpty())
{
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/decorator/WebBeansDecorator.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/decorator/WebBeansDecorator.java?rev=1432758&r1=1432757&r2=1432758&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/decorator/WebBeansDecorator.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/decorator/WebBeansDecorator.java Sun Jan 13 22:46:11 2013
@@ -34,6 +34,7 @@ import org.apache.webbeans.util.Annotati
import org.apache.webbeans.util.ClassUtil;
import javax.decorator.Delegate;
+import javax.enterprise.context.Dependent;
import javax.enterprise.context.spi.Context;
import javax.enterprise.context.spi.CreationalContext;
import javax.enterprise.inject.spi.Bean;
@@ -96,7 +97,14 @@ public class WebBeansDecorator<T> extend
*/
public WebBeansDecorator(AbstractInjectionTargetBean<T> wrappedBean, Decorator<T> customDecorator)
{
- super(wrappedBean.getWebBeansContext(), WebBeansType.DECORATOR, wrappedBean.getReturnType(), wrappedBean.getAnnotatedType());
+ super(wrappedBean.getWebBeansContext(),
+ WebBeansType.DECORATOR,
+ wrappedBean.getAnnotatedType(),
+ wrappedBean.getTypes(),
+ wrappedBean.getQualifiers(),
+ Dependent.class,
+ wrappedBean.getReturnType(),
+ wrappedBean.getStereotypes());
this.wrappedBean = wrappedBean;
this.customDecorator = customDecorator;
ignoredDecoratorInterfaces = getIgnoredDecoratorInterfaces(wrappedBean);
@@ -109,7 +117,14 @@ public class WebBeansDecorator<T> extend
*/
public WebBeansDecorator(AbstractInjectionTargetBean<T> wrappedBean)
{
- super(wrappedBean.getWebBeansContext(), WebBeansType.DECORATOR,wrappedBean.getReturnType(), wrappedBean.getAnnotatedType());
+ super(wrappedBean.getWebBeansContext(),
+ WebBeansType.DECORATOR,
+ wrappedBean.getAnnotatedType(),
+ wrappedBean.getTypes(),
+ wrappedBean.getQualifiers(),
+ Dependent.class,
+ wrappedBean.getReturnType(),
+ wrappedBean.getStereotypes());
this.wrappedBean = wrappedBean;
clazz = wrappedBean.getReturnType();
@@ -241,7 +256,7 @@ public class WebBeansDecorator<T> extend
}
else
{
- Field[] fields = ClassUtil.getFieldsWithType(wrappedBean.getWebBeansContext(), returnType, delegateType);
+ Field[] fields = ClassUtil.getFieldsWithType(wrappedBean.getWebBeansContext(), getReturnType(), delegateType);
if(fields.length == 0)
{
throw new WebBeansConfigurationException("Delegate injection field is not found for decorator : " + toString());
@@ -478,12 +493,6 @@ public class WebBeansDecorator<T> extend
return wrappedBean.isNullable();
}
- @Override
- public boolean isSerializable()
- {
- return wrappedBean.isSerializable();
- }
-
public Set<InjectionPoint> getInjectionPoints()
{
if(customDecorator != null)
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/impl/InjectionPointImpl.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/impl/InjectionPointImpl.java?rev=1432758&r1=1432757&r2=1432758&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/impl/InjectionPointImpl.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/impl/InjectionPointImpl.java Sun Jan 13 22:46:11 2013
@@ -63,7 +63,7 @@ class InjectionPointImpl implements Inje
private boolean transientt;
private boolean delegate;
-
+
InjectionPointImpl(Bean<?> ownerBean, Type type, Member member, Annotated annotated)
{
this.ownerBean = ownerBean;
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/webbeans/WebBeansInterceptorBeanPleaseRemove.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/webbeans/WebBeansInterceptorBeanPleaseRemove.java?rev=1432758&r1=1432757&r2=1432758&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/webbeans/WebBeansInterceptorBeanPleaseRemove.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/webbeans/WebBeansInterceptorBeanPleaseRemove.java Sun Jan 13 22:46:11 2013
@@ -32,6 +32,7 @@ import org.apache.webbeans.intercept.Owb
import org.apache.webbeans.portable.InjectionTargetImpl;
import org.apache.webbeans.util.AnnotationUtil;
+import javax.enterprise.context.Dependent;
import javax.enterprise.context.spi.Context;
import javax.enterprise.context.spi.CreationalContext;
import javax.enterprise.inject.spi.AnnotatedType;
@@ -87,8 +88,13 @@ public class WebBeansInterceptorBeanPlea
public WebBeansInterceptorBeanPleaseRemove(AbstractInjectionTargetBean<T> delegateBean)
{
- super(delegateBean.getWebBeansContext(), WebBeansType.INTERCEPTOR,delegateBean.getReturnType());
-
+ super(delegateBean.getWebBeansContext(),
+ WebBeansType.INTERCEPTOR,
+ delegateBean.getTypes(),
+ delegateBean.getQualifiers(),
+ Dependent.class,
+ delegateBean.getBeanClass(),
+ delegateBean.getStereotypes());
this.delegateBean = delegateBean;
clazz = getDelegate().getReturnType();
@@ -355,12 +361,6 @@ public class WebBeansInterceptorBeanPlea
}
@Override
- public boolean isSerializable()
- {
- return delegateBean.isSerializable();
- }
-
- @Override
public Class<?> getBeanClass()
{
return delegateBean.getBeanClass();
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/creation/AbstractProducer.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/creation/AbstractProducer.java?rev=1432758&r1=1432757&r2=1432758&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/creation/AbstractProducer.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/creation/AbstractProducer.java Sun Jan 13 22:46:11 2013
@@ -103,4 +103,9 @@ public abstract class AbstractProducer<T
{
return clazz.cast(bean);
}
+
+ public void setBean(OwbBean<T> bean)
+ {
+ this.bean = bean;
+ }
}
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/AnnotationUtil.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/AnnotationUtil.java?rev=1432758&r1=1432757&r2=1432758&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/AnnotationUtil.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/AnnotationUtil.java Sun Jan 13 22:46:11 2013
@@ -25,6 +25,7 @@ import java.lang.reflect.Type;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
+import java.util.HashSet;
import java.util.List;
import java.util.Set;
@@ -32,6 +33,8 @@ import javax.enterprise.inject.spi.Annot
import javax.enterprise.inject.spi.AnnotatedParameter;
import javax.enterprise.util.Nonbinding;
+import org.apache.webbeans.annotation.AnyLiteral;
+import org.apache.webbeans.annotation.DefaultLiteral;
import org.apache.webbeans.exception.WebBeansException;
/**
@@ -45,6 +48,8 @@ public final class AnnotationUtil
public static final Annotation[] EMPTY_ANNOTATION_ARRAY = new Annotation[0];
public static final Object[] EMPTY_OBJECT_ARRAY = new Object[0];
+
+ public static final Set<Annotation> DEFAULT_AND_ANY_ANNOTATION = Collections.unmodifiableSet(new HashSet<Annotation>(Arrays.asList(new DefaultLiteral(), new AnyLiteral())));
// No instantiate
private AnnotationUtil()
Added: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/CollectionUtil.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/CollectionUtil.java?rev=1432758&view=auto
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/CollectionUtil.java (added)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/CollectionUtil.java Sun Jan 13 22:46:11 2013
@@ -0,0 +1,34 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.apache.webbeans.util;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Set;
+
+public class CollectionUtil
+{
+
+ public static <T> Set<T> unmodifiableSet(T... entries)
+ {
+ Set<T> set = new HashSet<T>(Arrays.asList(entries));
+ return Collections.unmodifiableSet(set);
+ }
+}