[webbeans-commits] Webbeans SVN: r3685 - in ri/branches/kabir-builder/impl/src/main/java/org/jboss/webbeans/bean/builder: spi and 1 other directory.

Author: kabir.khan(a)jboss.com Date: 2009-09-16 14:35:18 -0400 (Wed, 16 Sep 2009) New Revision: 3685 Modified: ri/branches/kabir-builder/impl/src/main/java/org/jboss/webbeans/bean/builder/BeanBuilderImpl.java ri/branches/kabir-builder/impl/src/main/java/org/jboss/webbeans/bean/builder/spi/ManagedBeanBuilder.java Log: Undo last commit, wrong message Modified: ri/branches/kabir-builder/impl/src/main/java/org/jboss/webbeans/bean/builder/BeanBuilderImpl.java =================================================================== --- ri/branches/kabir-builder/impl/src/main/java/org/jboss/webbeans/bean/builder/BeanBuilderImpl.java 2009-09-16 18:32:33 UTC (rev 3684) +++ ri/branches/kabir-builder/impl/src/main/java/org/jboss/webbeans/bean/builder/BeanBuilderImpl.java 2009-09-16 18:35:18 UTC (rev 3685) @@ -22,9 +22,7 @@ package org.jboss.webbeans.bean.builder; import java.util.ArrayList; -import java.util.Collections; import java.util.HashSet; -import java.util.LinkedHashSet; import java.util.List; import java.util.Set; @@ -70,30 +68,26 @@ */ public class BeanBuilderImpl<T> implements SimpleBeanBuilder<T>, EnterpriseBeanBuilder<T>, DecoratorBeanBuilder<T>, InternalObserverMethodBuilder<T> { - private final BeanManagerImpl beanManager; - - private final BeanDeployerEnvironment beanDeployerEnvironment; - private final AnnotatedType<T> type; private final EjbDescriptor<T> ejbDescriptor; private final boolean decorator; - private final boolean delayInitialization; - private Bean<T> mainBean; - private Bean<T> newBean; - - private Set<Bean<?>> producers; - private Set<Bean<?>> beans; private Set<ObserverMethod<T, ?>> observerMethods; + private final BeanManagerImpl beanManager; + + private final BeanDeployerEnvironment beanDeployerEnvironment; + private final List<Throwable> definitionErrors = new ArrayList<Throwable>(); + private final boolean delayInitialization; + private BeanBuilderImpl(BeanManager beanManager, BeanDeployerEnvironment beanDeployerEnvironment, AnnotatedType<T> type, EjbDescriptor<T> ejbDescriptor, boolean decorator, boolean delayInitialization) { if (beanManager != beanManager) @@ -141,19 +135,6 @@ return beans; } - public Bean<T> getNewBean() - { - return newBean; - } - - public Set<Bean<?>> getProducerBeans() - { - if (producers == null) - return Collections.emptySet(); - - return producers; - } - private void createBeans() { if (decorator) @@ -181,7 +162,7 @@ private Set<Bean<?>> createSimpleBeans(WBClass<T> clazz) { - beans = new LinkedHashSet<Bean<?>>(); + beans = new HashSet<Bean<?>>(); ManagedBean<T> bean = ManagedBean.of(clazz, beanManager); mainBean = bean; @@ -196,8 +177,6 @@ NewManagedBean<T> newBean = NewManagedBean.of(clazz, beanManager); beanDeployerEnvironment.addBean(newBean); beans.add(newBean); - this.newBean = newBean; - if (!delayInitialization) newBean.initialize(beanDeployerEnvironment); @@ -206,7 +185,7 @@ private Set<Bean<?>> createEnterpriseBeans(InternalEjbDescriptor<T> ejbDescriptor) { - beans = new LinkedHashSet<Bean<?>>(); + beans = new HashSet<Bean<?>>(); SessionBean<T> bean = SessionBean.of(ejbDescriptor, beanManager); mainBean = bean; @@ -220,8 +199,6 @@ NewSessionBean<T> newBean = NewSessionBean.of(ejbDescriptor, beanManager); beanDeployerEnvironment.addBean(newBean); beans.add(newBean); - this.newBean = newBean; - if (!delayInitialization) newBean.initialize(beanDeployerEnvironment); @@ -249,32 +226,25 @@ */ protected void createSubBeans(Set<Bean<?>> beans, AbstractClassBean<T> bean) { - //Register the disposal methods before the producer methods - createDisposalMethods(bean, bean.getAnnotatedItem()); - - producers = createProducerMethods(beans, bean, bean.getAnnotatedItem()); + createProducerMethods(beans, bean, bean.getAnnotatedItem()); if (beanManager.isBeanEnabled(bean)) { observerMethods = createObserverMethods(bean, bean.getAnnotatedItem()); } createProducerFields(beans, bean, bean.getAnnotatedItem()); + createDisposalMethods(beans, bean, bean.getAnnotatedItem()); } - protected Set<Bean<?>> createProducerMethods(Set<Bean<?>> beans, AbstractClassBean<?> declaringBean, WBClass<?> annotatedClass) + protected void createProducerMethods(Set<Bean<?>> beans, AbstractClassBean<?> declaringBean, WBClass<?> annotatedClass) { - Set<Bean<?>> producers = null; for (WBMethod<?, ?> method : annotatedClass.getDeclaredWBAnnotatedMethods(Produces.class)) { - if (producers == null) - producers = new HashSet<Bean<?>>(); - createProducerMethod(beans, declaringBean, method); } - return producers; } - protected void createDisposalMethods(AbstractClassBean<?> declaringBean, WBClass<?> annotatedClass) + protected void createDisposalMethods(Set<Bean<?>> beans, AbstractClassBean<?> declaringBean, WBClass<?> annotatedClass) { for (WBMethod<?, ?> method : annotatedClass.getWBDeclaredMethodsWithAnnotatedParameters(Disposes.class)) { @@ -282,6 +252,7 @@ beanDeployerEnvironment.addBean(disposalBean); //Do not delay initialization of decorator beans, they get initialized right away in the original impl disposalBean.initialize(beanDeployerEnvironment); + beans.add(disposalBean); } } @@ -313,11 +284,9 @@ public Set<ObserverMethod<T, ?>> createObserverMethods(RIBean<T> declaringBean, WBClass<T> annotatedClass) { - Set<ObserverMethod<T, ?>> methods = null; + Set<ObserverMethod<T, ?>> methods = new HashSet<ObserverMethod<T, ?>>(); for (WBMethod<?, T> method : annotatedClass.getWBDeclaredMethodsWithAnnotatedParameters(Observes.class)) { - if (methods == null) - methods = new HashSet<ObserverMethod<T, ?>>(); methods.add(createObserverMethod(declaringBean, method)); } return methods; Modified: ri/branches/kabir-builder/impl/src/main/java/org/jboss/webbeans/bean/builder/spi/ManagedBeanBuilder.java =================================================================== --- ri/branches/kabir-builder/impl/src/main/java/org/jboss/webbeans/bean/builder/spi/ManagedBeanBuilder.java 2009-09-16 18:32:33 UTC (rev 3684) +++ ri/branches/kabir-builder/impl/src/main/java/org/jboss/webbeans/bean/builder/spi/ManagedBeanBuilder.java 2009-09-16 18:35:18 UTC (rev 3685) @@ -34,12 +34,5 @@ public interface ManagedBeanBuilder<T> { Set<Bean<?>> getBeans(); - - Bean<T> getBean(); - - Bean<T> getNewBean(); - - Set<Bean<?>> getProducerBeans(); - Set<ObserverMethod<T, ?>> getObserverMethods(); }