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/04 12:37:12 UTC
svn commit: r1428799 - in
/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans:
component/creation/ config/ util/
Author: arne
Date: Fri Jan 4 11:37:12 2013
New Revision: 1428799
URL: http://svn.apache.org/viewvc?rev=1428799&view=rev
Log:
OWB-745: Added constructor to ManagedBeanCreator
Modified:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/AnnotatedTypeBeanCreatorImpl.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ManagedBeanCreatorImpl.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/BeansDeployer.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansAnnotatedTypeUtil.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansUtil.java
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/AnnotatedTypeBeanCreatorImpl.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/AnnotatedTypeBeanCreatorImpl.java?rev=1428799&r1=1428798&r2=1428799&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/AnnotatedTypeBeanCreatorImpl.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/AnnotatedTypeBeanCreatorImpl.java Fri Jan 4 11:37:12 2013
@@ -23,9 +23,10 @@ import java.util.logging.Level;
import java.util.logging.Logger;
import javax.enterprise.inject.spi.AnnotatedConstructor;
+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;
import org.apache.webbeans.util.WebBeansAnnotatedTypeUtil;
@@ -33,9 +34,9 @@ public class AnnotatedTypeBeanCreatorImp
{
private final static Logger logger = WebBeansLoggerFacade.getLogger(AnnotatedTypeBeanCreatorImpl.class);
- public AnnotatedTypeBeanCreatorImpl(ManagedBean<T> managedBean)
+ public AnnotatedTypeBeanCreatorImpl(AnnotatedType<T> annotatedType, WebBeansContext context)
{
- super(managedBean);
+ super(annotatedType, context);
setMetaDataProvider(MetaDataProvider.THIRDPARTY);
}
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ManagedBeanCreatorImpl.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ManagedBeanCreatorImpl.java?rev=1428799&r1=1428798&r2=1428799&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ManagedBeanCreatorImpl.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ManagedBeanCreatorImpl.java Fri Jan 4 11:37:12 2013
@@ -64,16 +64,19 @@ public class ManagedBeanCreatorImpl<T> e
/**
* Creates a new creator.
- *
- * @param managedBean managed bean instance
*/
+ public ManagedBeanCreatorImpl(AnnotatedType<T> annotatedType, WebBeansContext webBeansContext)
+ {
+ super(new ManagedBean<T>(annotatedType.getJavaClass(), annotatedType, webBeansContext));
+ this.webBeansContext = webBeansContext;
+ }
+
public ManagedBeanCreatorImpl(ManagedBean<T> managedBean)
{
super(managedBean);
webBeansContext = managedBean.getWebBeansContext();
}
-
-
+
/**
* {@inheritDoc}
*/
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=1428799&r1=1428798&r2=1428799&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 Fri Jan 4 11:37:12 2013
@@ -48,7 +48,6 @@ 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.BeanCreator.MetaDataProvider;
@@ -833,9 +832,7 @@ public class BeansDeployer
//Check conditions
webBeansContext.getManagedBeanConfigurator().checkManagedBeanCondition(clazz);
- //Temporary managed bean instance creationa
- ManagedBean<T> managedBean = new ManagedBean<T>(clazz, annotatedType, webBeansContext);
- ManagedBeanCreatorImpl<T> managedBeanCreator = new ManagedBeanCreatorImpl<T>(managedBean);
+ ManagedBeanCreatorImpl<T> managedBeanCreator = new ManagedBeanCreatorImpl<T>(annotatedType, webBeansContext);
boolean annotationTypeSet = false;
if(processAnnotatedEvent.isModifiedAnnotatedType())
@@ -847,7 +844,7 @@ public class BeansDeployer
GProcessInjectionTarget processInjectionTarget = null;
if(processInjectionTargetEvent == null)
{
- processInjectionTarget = webBeansContext.getWebBeansUtil().createProcessInjectionTargetEvent(managedBean);
+ processInjectionTarget = webBeansContext.getWebBeansUtil().createProcessInjectionTargetEvent(managedBeanCreator.getBean());
processInjectionTargetEvent = processInjectionTarget;
}
@@ -908,7 +905,7 @@ public class BeansDeployer
.fireProcessInjectionTargetEvent(processInjectionTarget).getInjectionTarget();
if (updatedInjectionTarget != originalInjectionTarget)
{
- webBeansContext.getBeanManagerImpl().putProducer(managedBean, updatedInjectionTarget);
+ webBeansContext.getBeanManagerImpl().putProducer(managedBeanCreator.getBean(), updatedInjectionTarget);
}
}
}
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansAnnotatedTypeUtil.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansAnnotatedTypeUtil.java?rev=1428799&r1=1428798&r2=1428799&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansAnnotatedTypeUtil.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansAnnotatedTypeUtil.java Fri Jan 4 11:37:12 2013
@@ -23,12 +23,10 @@ import org.apache.webbeans.annotation.De
import org.apache.webbeans.component.AbstractInjectionTargetBean;
import org.apache.webbeans.component.AbstractOwbBean;
import org.apache.webbeans.component.InjectionTargetBean;
-import org.apache.webbeans.component.ManagedBean;
import org.apache.webbeans.component.OwbBean;
import org.apache.webbeans.component.ProducerFieldBean;
import org.apache.webbeans.component.ProducerMethodBean;
import org.apache.webbeans.component.ResourceBean;
-import org.apache.webbeans.component.WebBeansType;
import org.apache.webbeans.component.creation.AnnotatedTypeBeanCreatorImpl;
import org.apache.webbeans.config.DefinitionUtil;
import org.apache.webbeans.config.WebBeansContext;
@@ -717,16 +715,14 @@ public final class WebBeansAnnotatedType
Class<T> clazz = type.getJavaClass();
//Just creating temporary for getting injected fields
- ManagedBean<T> managedBean = new ManagedBean<T>(clazz,WebBeansType.MANAGED, type, webBeansContext);
- managedBean.setImplScopeType(new DependentScopeLiteral());
-
- AnnotatedTypeBeanCreatorImpl<T> managedBeanCreator = new AnnotatedTypeBeanCreatorImpl<T>(managedBean);
+ AnnotatedTypeBeanCreatorImpl<T> managedBeanCreator = new AnnotatedTypeBeanCreatorImpl<T>(type, webBeansContext);
+ managedBeanCreator.getBean().setImplScopeType(new DependentScopeLiteral());
//Just define injections
managedBeanCreator.defineInjectedFields();
managedBeanCreator.defineInjectedMethods();
- return managedBean.getInjectionPoints();
+ return managedBeanCreator.getBean().getInjectionPoints();
}
}
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansUtil.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansUtil.java?rev=1428799&r1=1428798&r2=1428799&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansUtil.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansUtil.java Fri Jan 4 11:37:12 2013
@@ -2686,8 +2686,7 @@ public final class WebBeansUtil
{
Class<T> clazz = type.getJavaClass();
- ManagedBean<T> managedBean = new ManagedBean<T>(clazz,WebBeansType.MANAGED, type, webBeansContext);
- AnnotatedTypeBeanCreatorImpl<T> managedBeanCreator = new AnnotatedTypeBeanCreatorImpl<T>(managedBean);
+ AnnotatedTypeBeanCreatorImpl<T> managedBeanCreator = new AnnotatedTypeBeanCreatorImpl<T>(type, webBeansContext);
managedBeanCreator.defineApiType();
@@ -2701,7 +2700,7 @@ public final class WebBeansUtil
managedBeanCreator.defineSerializable();
//Check for Enabled via Alternative
- setInjectionTargetBeanEnableFlag(managedBean);
+ setInjectionTargetBeanEnableFlag(managedBeanCreator.getBean());
managedBeanCreator.checkCreateConditions();
managedBeanCreator.defineName(getManagedBeanDefaultName(clazz.getSimpleName()));
managedBeanCreator.defineQualifier();
@@ -2711,12 +2710,12 @@ public final class WebBeansUtil
managedBeanCreator.defineInjectedFields();
managedBeanCreator.defineInjectedMethods();
managedBeanCreator.defineObserverMethods();
- webBeansContext.getDefinitionUtil().defineDecoratorStack(managedBean);
- webBeansContext.getDefinitionUtil().defineBeanInterceptorStack(managedBean);
+ webBeansContext.getDefinitionUtil().defineDecoratorStack(managedBeanCreator.getBean());
+ webBeansContext.getDefinitionUtil().defineBeanInterceptorStack(managedBeanCreator.getBean());
managedBeanCreator.defineDisposalMethods(); //Define disposal method after adding producers
- return managedBean;
+ return managedBeanCreator.getBean();
}
@SuppressWarnings("unchecked")