[webbeans-commits] Webbeans SVN: r3714 - ri/branches/kabir-builder/impl/src/main/java/org/jboss/webbeans/bean/builder.
webbeans-commits at lists.jboss.org
webbeans-commits at lists.jboss.org
Mon Sep 21 13:08:54 EDT 2009
Author: kabir.khan at jboss.com
Date: 2009-09-21 13:08:54 -0400 (Mon, 21 Sep 2009)
New Revision: 3714
Modified:
ri/branches/kabir-builder/impl/src/main/java/org/jboss/webbeans/bean/builder/AbstractBeanBuilder.java
ri/branches/kabir-builder/impl/src/main/java/org/jboss/webbeans/bean/builder/AbstractClassBeanBuilder.java
ri/branches/kabir-builder/impl/src/main/java/org/jboss/webbeans/bean/builder/AbstractProducerBeanBuilder.java
ri/branches/kabir-builder/impl/src/main/java/org/jboss/webbeans/bean/builder/AbstractReceiverBeanBuilder.java
ri/branches/kabir-builder/impl/src/main/java/org/jboss/webbeans/bean/builder/DecoratorBuilder.java
ri/branches/kabir-builder/impl/src/main/java/org/jboss/webbeans/bean/builder/DisposalMethodBuilder.java
ri/branches/kabir-builder/impl/src/main/java/org/jboss/webbeans/bean/builder/ManagedBeanBuilder.java
ri/branches/kabir-builder/impl/src/main/java/org/jboss/webbeans/bean/builder/NewManagedBeanBuilder.java
ri/branches/kabir-builder/impl/src/main/java/org/jboss/webbeans/bean/builder/NewSessionBeanBuilder.java
ri/branches/kabir-builder/impl/src/main/java/org/jboss/webbeans/bean/builder/ProducerMethodBuilder.java
ri/branches/kabir-builder/impl/src/main/java/org/jboss/webbeans/bean/builder/RIBeanBuilder.java
ri/branches/kabir-builder/impl/src/main/java/org/jboss/webbeans/bean/builder/SessionBeanBuilder.java
Log:
Package protected builders, which no longer implement Bean
Modified: ri/branches/kabir-builder/impl/src/main/java/org/jboss/webbeans/bean/builder/AbstractBeanBuilder.java
===================================================================
--- ri/branches/kabir-builder/impl/src/main/java/org/jboss/webbeans/bean/builder/AbstractBeanBuilder.java 2009-09-21 16:33:40 UTC (rev 3713)
+++ ri/branches/kabir-builder/impl/src/main/java/org/jboss/webbeans/bean/builder/AbstractBeanBuilder.java 2009-09-21 17:08:54 UTC (rev 3714)
@@ -23,7 +23,6 @@
import javax.decorator.Decorates;
import javax.enterprise.context.Dependent;
-import javax.enterprise.context.spi.CreationalContext;
import javax.enterprise.inject.Alternative;
import javax.enterprise.inject.Specializes;
import javax.enterprise.inject.spi.Bean;
@@ -87,13 +86,13 @@
// The Web Beans manager
protected BeanManagerImpl manager;
- private boolean _serializable;
+ private boolean serializable;
private boolean initialized;
- protected boolean isInitialized()
+ boolean isInitialized()
{
return initialized;
}
@@ -103,7 +102,7 @@
*
* @param manager The Web Beans manager
*/
- public AbstractBeanBuilder(BeanManagerImpl manager)
+ AbstractBeanBuilder(BeanManagerImpl manager)
{
super(manager);
this.manager = manager;
@@ -115,7 +114,7 @@
* Initializes the bean and its metadata
*/
@Override
- public void initialize(BeanDeployerEnvironment environment)
+ void initialize(BeanDeployerEnvironment environment)
{
if (isSpecializing())
{
@@ -133,12 +132,12 @@
checkDelegateInjectionPoints();
}
- protected void initStereotypes()
+ void initStereotypes()
{
mergedStereotypes = new MergedStereotypes<T, E>(getAnnotatedItem().getMetaAnnotations(Stereotype.class), manager);
}
- protected void checkDelegateInjectionPoints()
+ void checkDelegateInjectionPoints()
{
if (this.delegateInjectionPoints.size() > 0)
{
@@ -146,7 +145,7 @@
}
}
- protected void addInjectionPoint(WBInjectionPoint<?, ?> injectionPoint)
+ void addInjectionPoint(WBInjectionPoint<?, ?> injectionPoint)
{
if (injectionPoint.isAnnotationPresent(Decorates.class))
{
@@ -155,7 +154,7 @@
injectionPoints.add(injectionPoint);
}
- protected void addInjectionPoints(Iterable<? extends WBInjectionPoint<?, ?>> injectionPoints)
+ void addInjectionPoints(Iterable<? extends WBInjectionPoint<?, ?>> injectionPoints)
{
for (WBInjectionPoint<?, ?> injectionPoint : injectionPoints)
{
@@ -163,7 +162,7 @@
}
}
- protected Set<WBInjectionPoint<?, ?>> getDelegateInjectionPoints()
+ Set<WBInjectionPoint<?, ?>> getDelegateInjectionPoints()
{
return delegateInjectionPoints;
}
@@ -171,7 +170,7 @@
/**
* Initializes the API types
*/
- protected void initTypes()
+ void initTypes()
{
types = getAnnotatedItem().getTypeClosure();
}
@@ -179,7 +178,7 @@
/**
* Initializes the binding types
*/
- protected void initBindings()
+ void initBindings()
{
this.bindings = new HashSet<Annotation>();
this.bindings.addAll(getAnnotatedItem().getMetaAnnotations(Qualifier.class));
@@ -187,7 +186,7 @@
log.trace("Using binding types " + bindings + " specified by annotations");
}
- protected void initDefaultBindings()
+ void initDefaultBindings()
{
if (bindings.size() == 0)
{
@@ -197,7 +196,7 @@
this.bindings.add(ANY_LITERAL);
}
- protected void initPolicy()
+ void initPolicy()
{
if (getAnnotatedItem().isAnnotationPresent(Alternative.class))
{
@@ -212,7 +211,7 @@
/**
* Initializes the name
*/
- protected void initName()
+ void initName()
{
boolean beanNameDefaulted = false;
if (getAnnotatedItem().isAnnotationPresent(Named.class))
@@ -239,7 +238,7 @@
}
}
- protected void initProxyable()
+ void initProxyable()
{
proxyable = getAnnotatedItem().isProxyable();
}
@@ -247,12 +246,12 @@
/**
* Initializes the primitive flag
*/
- protected void initPrimitive()
+ void initPrimitive()
{
this.primitive = Reflections.isPrimitive(getType());
}
- private boolean checkInjectionPointsAreSerializable()
+ boolean checkInjectionPointsAreSerializable()
{
boolean passivating = manager.getServices().get(MetaAnnotationStore.class).getScopeModel(this.getScope()).isPassivating();
for (WBInjectionPoint<?, ?> injectionPoint : getAnnotatedInjectionPoints())
@@ -273,9 +272,9 @@
/**
* Initializes the scope type
*/
- protected abstract void initScopeType();
+ abstract void initScopeType();
- protected boolean initScopeTypeFromStereotype()
+ boolean initScopeTypeFromStereotype()
{
Set<Annotation> possibleScopeTypes = getMergedStereotypes().getPossibleScopeTypes();
if (possibleScopeTypes.size() == 1)
@@ -295,7 +294,7 @@
}
}
- protected void postSpecialize()
+ void postSpecialize()
{
if (getAnnotatedItem().isAnnotationPresent(Named.class) && getSpecializedBean().getAnnotatedItem().isAnnotationPresent(Named.class))
{
@@ -308,25 +307,31 @@
}
throw new RuntimeException("Next line commented");
-// manager.getSpecializedBeans().put(getSpecializedBean(), this);
+ //manager.getSpecializedBeans().put(getSpecializedBean(), this);
}
- protected void preSpecialize(BeanDeployerEnvironment environment)
+ void preSpecialize(BeanDeployerEnvironment environment)
{
}
- protected void specialize(BeanDeployerEnvironment environment)
+ void specialize(BeanDeployerEnvironment environment)
{
}
+
+ void registerSpecializedBean(Bean<T> bean)
+ {
+ if (isSpecializing())
+ manager.getSpecializedBeans().put(getSpecializedBean(), bean);
+ }
/**
* Returns the annotated time the bean represents
*
* @return The annotated item
*/
- protected abstract WBAnnotated<T, E> getAnnotatedItem();
+ abstract WBAnnotated<T, E> getAnnotatedItem();
/**
* Gets the binding types
@@ -335,7 +340,7 @@
*
* @see org.jboss.webbeans.bean.BaseBean#getQualifiers()
*/
- public Set<Annotation> getQualifiers()
+ Set<Annotation> getQualifiers()
{
return bindings;
}
@@ -345,13 +350,13 @@
*
* @return The default name
*/
- protected abstract String getDefaultName();
+ abstract String getDefaultName();
@Override
- public abstract AbstractBean<?, ?> getSpecializedBean();
+ abstract AbstractBean<?, ?> getSpecializedBean();
@Override
- public Set<WBInjectionPoint<?, ?>> getAnnotatedInjectionPoints()
+ Set<WBInjectionPoint<?, ?>> getAnnotatedInjectionPoints()
{
return injectionPoints;
}
@@ -361,7 +366,7 @@
*
* @return The set of merged stereotypes
*/
- protected MergedStereotypes<T, E> getMergedStereotypes()
+ MergedStereotypes<T, E> getMergedStereotypes()
{
return mergedStereotypes;
}
@@ -373,7 +378,7 @@
*
* @see org.jboss.webbeans.bean.BaseBean#getName()
*/
- public String getName()
+ String getName()
{
return name;
}
@@ -385,7 +390,7 @@
*
* @see org.jboss.webbeans.bean.BaseBean#getScope()
*/
- public Class<? extends Annotation> getScope()
+ Class<? extends Annotation> getScope()
{
return scopeType;
}
@@ -396,7 +401,7 @@
* @return The type
*/
@Override
- public Class<T> getType()
+ Class<T> getType()
{
return type;
}
@@ -408,7 +413,7 @@
*
* @see org.jboss.webbeans.bean.BaseBean#getTypeClosure()
*/
- public Set<Type> getTypes()
+ Set<Type> getTypes()
{
return types;
}
@@ -420,7 +425,7 @@
* @param annotatedItem The other annotation to check
* @return True if assignable, otherwise false
*/
- public boolean isAssignableFrom(WBAnnotated<?, ?> annotatedItem)
+ boolean isAssignableFrom(WBAnnotated<?, ?> annotatedItem)
{
return this.getAnnotatedItem().isAssignableFrom(annotatedItem);
}
@@ -432,7 +437,7 @@
*
* @see org.jboss.webbeans.bean.BaseBean#isNullable()
*/
- public boolean isNullable()
+ boolean isNullable()
{
return !isPrimitive();
}
@@ -443,21 +448,21 @@
* @return True if primitive, false otherwise
*/
@Override
- public boolean isPrimitive()
+ boolean isPrimitive()
{
return primitive;
}
- public boolean isSerializable()
+ boolean isSerializable()
{
// TODO WTF - why are we not caching the serializability of injection
// points!
- return _serializable && checkInjectionPointsAreSerializable();
+ return serializable && checkInjectionPointsAreSerializable();
}
- protected void initSerializable()
+ void initSerializable()
{
- _serializable = Reflections.isSerializable(type);
+ serializable = Reflections.isSerializable(type);
}
/**
@@ -472,41 +477,30 @@
}
@Override
- public boolean isProxyable()
+ boolean isProxyable()
{
return proxyable;
}
- public boolean isAlternative()
+ boolean isAlternative()
{
return policy;
}
@Override
- public boolean isSpecializing()
+ boolean isSpecializing()
{
return getAnnotatedItem().isAnnotationPresent(Specializes.class);
}
- public Set<Class<? extends Annotation>> getStereotypes()
+ Set<Class<? extends Annotation>> getStereotypes()
{
return mergedStereotypes.getStereotypes();
}
@Override
- public String getId()
+ String getId()
{
return null;
}
-
- public T create(CreationalContext<T> creationalContext)
- {
- throw new IllegalStateException("Should not call create() on builder " + this);
- }
-
- public void destroy(T instance, CreationalContext<T> creationalContext)
- {
- throw new IllegalStateException("Should not call destroy() on builder " + this);
- }
-
}
Modified: ri/branches/kabir-builder/impl/src/main/java/org/jboss/webbeans/bean/builder/AbstractClassBeanBuilder.java
===================================================================
--- ri/branches/kabir-builder/impl/src/main/java/org/jboss/webbeans/bean/builder/AbstractClassBeanBuilder.java 2009-09-21 16:33:40 UTC (rev 3713)
+++ ri/branches/kabir-builder/impl/src/main/java/org/jboss/webbeans/bean/builder/AbstractClassBeanBuilder.java 2009-09-21 17:08:54 UTC (rev 3714)
@@ -82,7 +82,7 @@
* @param type The type
* @param manager The Web Beans manager
*/
- protected AbstractClassBeanBuilder(WBClass<T> type, BeanManagerImpl manager)
+ AbstractClassBeanBuilder(WBClass<T> type, BeanManagerImpl manager)
{
super(manager);
this.annotatedItem = type;
@@ -105,10 +105,8 @@
* Initializes the bean and its metadata
*/
@Override
- public void initialize(BeanDeployerEnvironment environment)
+ void initialize(BeanDeployerEnvironment environment)
{
- initInitializerMethods();
- initInjectableFields();
super.initialize(environment);
checkBeanImplementation();
initDecorators();
@@ -116,22 +114,22 @@
initProxyClassForDecoratedBean();
}
- protected void checkType()
+ void checkType()
{
}
- protected void initDecorators()
+ void initDecorators()
{
this.decorators = getManager().resolveDecorators(getTypes(), getQualifiers());
}
- public boolean hasDecorators()
+ boolean hasDecorators()
{
return this.decorators != null && this.decorators.size() > 0;
}
- protected void initProxyClassForDecoratedBean()
+ void initProxyClassForDecoratedBean()
{
if (hasDecorators())
{
@@ -144,7 +142,7 @@
}
}
- protected T applyDecorators(T instance, CreationalContext<T> creationalContext, InjectionPoint originalInjectionPoint)
+ T applyDecorators(T instance, CreationalContext<T> creationalContext, InjectionPoint originalInjectionPoint)
{
throw new RuntimeException("NYI");
// List<SerializableBeanInstance<DecoratorImpl<Object>, Object>> decoratorInstances = new ArrayList<SerializableBeanInstance<DecoratorImpl<Object>,Object>>();
@@ -196,31 +194,25 @@
// }
}
- public List<Decorator<?>> getDecorators()
+ List<Decorator<?>> getDecorators()
{
return Collections.unmodifiableList(decorators);
}
- public Class<T> getProxyClassForDecorators()
+ Class<T> getProxyClassForDecorators()
{
return proxyClassForDecorators;
}
- public void setProxyClassForDecorators(Class<T> proxyClassForDecorators)
+ void setProxyClassForDecorators(Class<T> proxyClassForDecorators)
{
this.proxyClassForDecorators = proxyClassForDecorators;
}
- public void dispose(T instance)
- {
- // No-op for class beans
- }
-
-
/**
* Initializes the bean type
*/
- protected void initType()
+ void initType()
{
log.trace("Bean type specified in Java");
this.type = getAnnotatedItem().getJavaClass();
@@ -231,26 +223,8 @@
}
}
- /**
- * Initializes the injection points
- */
- protected void initInjectableFields()
- {
- injectableFields = new HashSet<FieldInjectionPoint<?, ?>>(Beans.getFieldInjectionPoints(this, annotatedItem));
- addInjectionPoints(injectableFields);
- }
-
- /**
- * Initializes the initializer methods
- */
- protected void initInitializerMethods()
- {
- initializerMethods = Beans.getInitializerMethods(this, getAnnotatedItem());
- addInjectionPoints(Beans.getParameterInjectionPoints(this, initializerMethods));
- }
-
@Override
- protected void initScopeType()
+ void initScopeType()
{
for (WBClass<?> clazz = getAnnotatedItem(); clazz != null; clazz = clazz.getWBSuperclass())
{
@@ -287,10 +261,10 @@
/**
* Validates the bean implementation
*/
- protected void checkBeanImplementation() {}
+ void checkBeanImplementation() {}
@Override
- protected void preSpecialize(BeanDeployerEnvironment environment)
+ void preSpecialize(BeanDeployerEnvironment environment)
{
super.preSpecialize(environment);
if (getAnnotatedItem().getWBSuperclass() == null || getAnnotatedItem().getWBSuperclass().getJavaClass().equals(Object.class))
@@ -305,7 +279,7 @@
* @return The annotated item
*/
@Override
- public WBClass<T> getAnnotatedItem()
+ WBClass<T> getAnnotatedItem()
{
return annotatedItem;
}
@@ -316,7 +290,7 @@
* @return The default name
*/
@Override
- protected String getDefaultName()
+ String getDefaultName()
{
String name = Strings.decapitalize(getAnnotatedItem().getSimpleName());
log.trace("Default name of " + type + " is " + name);
@@ -328,7 +302,7 @@
*
* @return The set of annotated methods
*/
- public Set<? extends MethodInjectionPoint<?, ?>> getInitializerMethods()
+ Set<? extends MethodInjectionPoint<?, ?>> getInitializerMethods()
{
return Collections.unmodifiableSet(initializerMethods);
}
@@ -336,13 +310,13 @@
/**
* @return the injectableFields
*/
- public Set<FieldInjectionPoint<?, ?>> getInjectableFields()
+ Set<FieldInjectionPoint<?, ?>> getInjectableFields()
{
return Collections.unmodifiableSet(injectableFields);
}
// TODO maybe a better way to expose this?
- public Set<String> getSuperclasses()
+ Set<String> getSuperclasses()
{
return dependencies;
}
@@ -359,7 +333,7 @@
}
@Override
- public String getId()
+ String getId()
{
return id;
}
@@ -367,7 +341,7 @@
/**
* Initializes the post-construct method
*/
- protected void initPostConstruct()
+ void initPostConstruct()
{
this.postConstruct = Beans.getPostConstruct(getAnnotatedItem());
}
@@ -375,7 +349,7 @@
/**
* Initializes the pre-destroy method
*/
- protected void initPreDestroy()
+ void initPreDestroy()
{
this.preDestroy = Beans.getPreDestroy(getAnnotatedItem());
}
@@ -385,7 +359,7 @@
*
* @return The post-construct method
*/
- public WBMethod<?, ?> getPostConstruct()
+ WBMethod<?, ?> getPostConstruct()
{
return postConstruct;
}
@@ -395,13 +369,13 @@
*
* @return The pre-destroy method
*/
- public WBMethod<?, ?> getPreDestroy()
+ WBMethod<?, ?> getPreDestroy()
{
return preDestroy;
}
@Override
- public AbstractBean<?, ?> getSpecializedBean()
+ AbstractBean<?, ?> getSpecializedBean()
{
return null;
}
Modified: ri/branches/kabir-builder/impl/src/main/java/org/jboss/webbeans/bean/builder/AbstractProducerBeanBuilder.java
===================================================================
--- ri/branches/kabir-builder/impl/src/main/java/org/jboss/webbeans/bean/builder/AbstractProducerBeanBuilder.java 2009-09-21 16:33:40 UTC (rev 3713)
+++ ri/branches/kabir-builder/impl/src/main/java/org/jboss/webbeans/bean/builder/AbstractProducerBeanBuilder.java 2009-09-21 17:08:54 UTC (rev 3714)
@@ -30,11 +30,9 @@
import javax.enterprise.context.Dependent;
import javax.enterprise.context.NormalScope;
-import javax.enterprise.context.spi.CreationalContext;
import javax.enterprise.inject.IllegalProductException;
import javax.enterprise.inject.Produces;
import javax.enterprise.inject.spi.InjectionPoint;
-import javax.enterprise.inject.spi.Producer;
import javax.inject.Inject;
import javax.inject.Scope;
@@ -58,7 +56,7 @@
* @param <T>
* @param <S>
*/
-abstract class AbstractProducerBeanBuilder<T, S extends Member> extends AbstractReceiverBeanBuilder<T, S> implements Producer<T>
+abstract class AbstractProducerBeanBuilder<T, S extends Member> extends AbstractReceiverBeanBuilder<T, S>
{
private static final LogProvider log = Logging.getLogProvider(AbstractProducerBeanBuilder.class);
@@ -68,17 +66,17 @@
* @param declaringBean The declaring bean
* @param manager The Web Beans manager
*/
- public AbstractProducerBeanBuilder(AbstractClassBean<?> declaringBean, BeanManagerImpl manager)
+ AbstractProducerBeanBuilder(AbstractClassBean<?> declaringBean, BeanManagerImpl manager)
{
super(declaringBean, manager);
}
@Override
- public abstract WBMember<T, ?, S> getAnnotatedItem();
+ abstract WBMember<T, ?, S> getAnnotatedItem();
@Override
// Overriden to provide the class of the bean that declares the producer method/field
- public Class<?> getBeanClass()
+ Class<?> getBeanClass()
{
return getDeclaringBean().getBeanClass();
}
@@ -87,7 +85,7 @@
* Initializes the API types
*/
@Override
- protected void initTypes()
+ void initTypes()
{
if (getType().isArray() || getType().isPrimitive())
{
@@ -113,7 +111,7 @@
/**
* Initializes the type
*/
- protected void initType()
+ void initType()
{
try
{
@@ -130,7 +128,7 @@
*
* @return The bean type
*/
- protected Type getDeclaredBeanType()
+ Type getDeclaredBeanType()
{
Type type = getClass();
if (type instanceof ParameterizedType)
@@ -147,7 +145,7 @@
/**
* Validates the producer method
*/
- protected void checkProducerReturnType()
+ void checkProducerReturnType()
{
if (getAnnotatedItem().getBaseType() instanceof TypeVariable<?>)
{
@@ -170,7 +168,7 @@
* Initializes the bean and its metadata
*/
@Override
- public void initialize(BeanDeployerEnvironment environment)
+ void initialize(BeanDeployerEnvironment environment)
{
getDeclaringBean().initialize(environment);
super.initialize(environment);
@@ -182,7 +180,7 @@
*
* @param instance The instance to validate
*/
- protected void checkReturnValue(T instance)
+ void checkReturnValue(T instance)
{
if (instance == null && !isDependent())
{
@@ -230,7 +228,7 @@
}
@Override
- protected void initScopeType()
+ void initScopeType()
{
Set<Annotation> scopeAnnotations = new HashSet<Annotation>();
scopeAnnotations.addAll(getAnnotatedItem().getMetaAnnotations(Scope.class));
@@ -256,13 +254,13 @@
}
@Override
- protected void initSerializable()
+ void initSerializable()
{
// No-op
}
@Override
- public boolean isSerializable()
+ boolean isSerializable()
{
return true;
}
@@ -287,16 +285,5 @@
}
buffer.append(" [" + getBeanClass().getName() + "] for class type [" + getType().getName() + "] API types " + getTypes() + ", binding types " + getQualifiers());
return buffer.toString();
- }
-
- public void dispose(T instance)
- {
- throw new IllegalStateException("Should not call dispose() on builder " + this);
- }
-
- public T produce(CreationalContext<T> ctx)
- {
- throw new IllegalStateException("Should not call produce() on builder " + this);
- }
-
+ }
}
\ No newline at end of file
Modified: ri/branches/kabir-builder/impl/src/main/java/org/jboss/webbeans/bean/builder/AbstractReceiverBeanBuilder.java
===================================================================
--- ri/branches/kabir-builder/impl/src/main/java/org/jboss/webbeans/bean/builder/AbstractReceiverBeanBuilder.java 2009-09-21 16:33:40 UTC (rev 3713)
+++ ri/branches/kabir-builder/impl/src/main/java/org/jboss/webbeans/bean/builder/AbstractReceiverBeanBuilder.java 2009-09-21 17:08:54 UTC (rev 3714)
@@ -39,14 +39,14 @@
private AbstractClassBean<?> declaringBean;
private boolean policy;
- public AbstractReceiverBeanBuilder(AbstractClassBean<?> declaringBean, BeanManagerImpl manager)
+ AbstractReceiverBeanBuilder(AbstractClassBean<?> declaringBean, BeanManagerImpl manager)
{
super(manager);
this.declaringBean = declaringBean;
}
@Override
- public void initialize(BeanDeployerEnvironment environment)
+ void initialize(BeanDeployerEnvironment environment)
{
super.initialize(environment);
}
@@ -56,7 +56,7 @@
*
* @return The receiver
*/
- protected Object getReceiver(CreationalContext<?> creationalContext)
+ Object getReceiver(CreationalContext<?> creationalContext)
{
// This is a bit dangerous, as it means that producer methods can end of
// executing on partially constructed instances. Also, it's not required
@@ -86,7 +86,7 @@
*
* @return The bean representation
*/
- public AbstractClassBean<?> getDeclaringBean()
+ AbstractClassBean<?> getDeclaringBean()
{
return declaringBean;
}
@@ -95,13 +95,13 @@
* @see org.jboss.webbeans.bean.AbstractBean#isPolicy()
*/
@Override
- public boolean isAlternative()
+ boolean isAlternative()
{
return policy;
}
@Override
- protected void initPolicy()
+ void initPolicy()
{
if (getDeclaringBean().isAlternative())
{
Modified: ri/branches/kabir-builder/impl/src/main/java/org/jboss/webbeans/bean/builder/DecoratorBuilder.java
===================================================================
--- ri/branches/kabir-builder/impl/src/main/java/org/jboss/webbeans/bean/builder/DecoratorBuilder.java 2009-09-21 16:33:40 UTC (rev 3713)
+++ ri/branches/kabir-builder/impl/src/main/java/org/jboss/webbeans/bean/builder/DecoratorBuilder.java 2009-09-21 17:08:54 UTC (rev 3714)
@@ -35,7 +35,7 @@
import org.jboss.webbeans.injection.WBInjectionPoint;
import org.jboss.webbeans.introspector.WBClass;
-class DecoratorBuilder<T> extends ManagedBeanBuilder<T> implements Decorator<T>
+class DecoratorBuilder<T> extends ManagedBeanBuilder<T>
{
public static <T> Decorator<T> wrapForResolver(final Decorator<T> decorator)
@@ -72,7 +72,7 @@
* @param manager the current manager
* @return a Bean
*/
- public static <T> DecoratorBuilder<T> of(WBClass<T> clazz, BeanManagerImpl manager)
+ static <T> DecoratorBuilder<T> of(WBClass<T> clazz, BeanManagerImpl manager)
{
return new DecoratorBuilder<T>(clazz, manager);
}
@@ -83,13 +83,13 @@
private Set<Type> delegateTypes;
private Set<Type> decoratedTypes;
- protected DecoratorBuilder(WBClass<T> type, BeanManagerImpl manager)
+ DecoratorBuilder(WBClass<T> type, BeanManagerImpl manager)
{
super(type, manager);
}
@Override
- public void initialize(BeanDeployerEnvironment environment)
+ void initialize(BeanDeployerEnvironment environment)
{
if (!isInitialized())
{
@@ -102,20 +102,20 @@
}
}
- protected void initDecoratedTypes()
+ void initDecoratedTypes()
{
this.decoratedTypes = new HashSet<Type>();
this.decoratedTypes.addAll(getAnnotatedItem().getInterfaceOnlyFlattenedTypeHierarchy());
this.decoratedTypes.remove(Serializable.class);
}
- protected void initDelegateInjectionPoint()
+ void initDelegateInjectionPoint()
{
this.delegateInjectionPoint = getDelegateInjectionPoints().iterator().next();
}
@Override
- protected void checkDelegateInjectionPoints()
+ void checkDelegateInjectionPoints()
{
for (WBInjectionPoint<?, ?> injectionPoint : getDelegateInjectionPoints())
{
@@ -134,20 +134,20 @@
}
}
- protected void initDelegateBindings()
+ void initDelegateBindings()
{
this.delegateBindings = new HashSet<Annotation>();
this.delegateBindings.addAll(this.delegateInjectionPoint.getQualifiers());
}
- protected void initDelegateType()
+ void initDelegateType()
{
this.delegateType = this.delegateInjectionPoint.getBaseType();
this.delegateTypes = new HashSet<Type>();
delegateTypes.add(delegateType);
}
- protected void checkDelegateType()
+ void checkDelegateType()
{
for (Type decoratedType : getDecoratedTypes())
{
@@ -180,22 +180,22 @@
}
}
- public Set<Annotation> getDelegateQualifiers()
+ Set<Annotation> getDelegateQualifiers()
{
return delegateBindings;
}
- public Type getDelegateType()
+ Type getDelegateType()
{
return delegateType;
}
- public Set<Type> getDecoratedTypes()
+ Set<Type> getDecoratedTypes()
{
return decoratedTypes;
}
- public WBInjectionPoint<?, ?> getDelegateInjectionPoint()
+ WBInjectionPoint<?, ?> getDelegateInjectionPoint()
{
return delegateInjectionPoint;
}
@@ -205,13 +205,13 @@
*
* @return the delegateTypes
*/
- public Set<Type> getDelegateTypes()
+ Set<Type> getDelegateTypes()
{
return delegateTypes;
}
@Override
- protected void initDecorators()
+ void initDecorators()
{
// No-op, decorators can't have decorators
}
@@ -227,7 +227,7 @@
}
@Override
- public DecoratorImpl<T> createBean()
+ DecoratorImpl<T> createBean()
{
return DecoratorImpl.of(getAnnotatedItem(),
getManager(),
Modified: ri/branches/kabir-builder/impl/src/main/java/org/jboss/webbeans/bean/builder/DisposalMethodBuilder.java
===================================================================
--- ri/branches/kabir-builder/impl/src/main/java/org/jboss/webbeans/bean/builder/DisposalMethodBuilder.java 2009-09-21 16:33:40 UTC (rev 3713)
+++ ri/branches/kabir-builder/impl/src/main/java/org/jboss/webbeans/bean/builder/DisposalMethodBuilder.java 2009-09-21 17:08:54 UTC (rev 3714)
@@ -46,7 +46,7 @@
//protected MethodInjectionPoint<T, ?> disposalMethodInjectionPoint;
private final String id;
- protected DisposalMethodBuilder(BeanManagerImpl manager, WBMethod<T, ?> disposalMethod, AbstractClassBean<?> declaringBean)
+ DisposalMethodBuilder(BeanManagerImpl manager, WBMethod<T, ?> disposalMethod, AbstractClassBean<?> declaringBean)
{
super(declaringBean, manager);
this.disposalMethod = disposalMethod;
@@ -60,31 +60,31 @@
}
@Override
- public void initialize(BeanDeployerEnvironment environment)
+ void initialize(BeanDeployerEnvironment environment)
{
super.initialize(environment);
checkDisposalMethod();
}
- protected void initType()
+ void initType()
{
disposalMethod.getAnnotatedWBParameters(Disposes.class).get(0).getJavaClass();
this.type = (Class<T>) disposalMethod.getAnnotatedWBParameters(Disposes.class).get(0).getJavaClass();
}
@Override
- public WBMethod<T, ?> getAnnotatedItem()
+ WBMethod<T, ?> getAnnotatedItem()
{
return disposalMethod;
}
- public static <T> DisposalMethodBuilder<T> of(BeanManagerImpl manager, WBMethod<T, ?> disposalMethod, AbstractClassBean<?> declaringBean)
+ static <T> DisposalMethodBuilder<T> of(BeanManagerImpl manager, WBMethod<T, ?> disposalMethod, AbstractClassBean<?> declaringBean)
{
return new DisposalMethodBuilder<T>(manager, disposalMethod, declaringBean);
}
@Override
- protected void initBindings()
+ void initBindings()
{
// At least 1 parameter exists, already checked in constructor
this.bindings = new HashSet<Annotation>();
@@ -97,7 +97,7 @@
* Initializes the API types
*/
@Override
- protected void initTypes()
+ void initTypes()
{
Set<Type> types = new HashSet<Type>();
types = new HashSet<Type>();
@@ -108,19 +108,19 @@
}
@Override
- public String getName()
+ String getName()
{
return null;
}
@Override
- public Class<? extends Annotation> getScope()
+ Class<? extends Annotation> getScope()
{
return null;
}
@Override
- public Set<Type> getTypes()
+ Set<Type> getTypes()
{
return types;
}
@@ -132,31 +132,25 @@
}
@Override
- public boolean isNullable()
+ boolean isNullable()
{
// Not relevant
return false;
}
@Override
- public boolean isSerializable()
+ boolean isSerializable()
{
// Not relevant
return false;
}
@Override
- public boolean isProxyable()
+ boolean isProxyable()
{
return true;
}
- public T create(CreationalContext<T> creationalContext)
- {
- // Not Relevant
- return null;
- }
-
private void checkDisposalMethod()
{
if (!disposalMethod.getWBParameters().get(0).isAnnotationPresent(Disposes.class))
@@ -207,47 +201,42 @@
}
@Override
- public Class<T> getType()
+ Class<T> getType()
{
return type;
}
@Override
- protected String getDefaultName()
+ String getDefaultName()
{
return disposalMethod.getPropertyName();
}
- public void destroy(T instance, CreationalContext<T> creationalContext)
- {
- // No-op. Producer method dependent objects are destroyed in producer method bean
- }
-
@Override
- public String getId()
+ String getId()
{
return id;
}
@Override
- public AbstractBean<?, ?> getSpecializedBean()
+ AbstractBean<?, ?> getSpecializedBean()
{
// Doesn't support specialization
return null;
}
@Override
- protected void initScopeType()
+ void initScopeType()
{
// Disposal methods aren't scoped
}
- public Set<Class<? extends Annotation>> getStereotypes()
+ Set<Class<? extends Annotation>> getStereotypes()
{
return Collections.emptySet();
}
- public DisposalMethod<T> createBean()
+ DisposalMethod<T> createBean()
{
return DisposalMethod.of(manager,
name,
Modified: ri/branches/kabir-builder/impl/src/main/java/org/jboss/webbeans/bean/builder/ManagedBeanBuilder.java
===================================================================
--- ri/branches/kabir-builder/impl/src/main/java/org/jboss/webbeans/bean/builder/ManagedBeanBuilder.java 2009-09-21 16:33:40 UTC (rev 3713)
+++ ri/branches/kabir-builder/impl/src/main/java/org/jboss/webbeans/bean/builder/ManagedBeanBuilder.java 2009-09-21 17:08:54 UTC (rev 3714)
@@ -16,10 +16,6 @@
*/
package org.jboss.webbeans.bean.builder;
-import java.util.Set;
-
-import javax.enterprise.event.Observes;
-import javax.enterprise.inject.Disposes;
import javax.enterprise.inject.spi.Decorator;
import javax.enterprise.inject.spi.InjectionPoint;
@@ -28,16 +24,12 @@
import org.jboss.webbeans.bean.AbstractClassBean;
import org.jboss.webbeans.bean.ManagedBean;
import org.jboss.webbeans.bootstrap.BeanDeployerEnvironment;
-import org.jboss.webbeans.injection.ConstructorInjectionPoint;
-import org.jboss.webbeans.injection.WBInjectionPoint;
import org.jboss.webbeans.introspector.WBClass;
-import org.jboss.webbeans.introspector.WBConstructor;
import org.jboss.webbeans.introspector.WBField;
import org.jboss.webbeans.introspector.WBMethod;
import org.jboss.webbeans.log.LogProvider;
import org.jboss.webbeans.log.Logging;
import org.jboss.webbeans.metadata.cache.MetaAnnotationStore;
-import org.jboss.webbeans.util.Beans;
import org.jboss.webbeans.util.Names;
import org.jboss.webbeans.util.Reflections;
@@ -53,13 +45,6 @@
// Logger
private static LogProvider log = Logging.getLogProvider(ManagedBeanBuilder.class);
- // The constructor
- private ConstructorInjectionPoint<T> constructor;
- private Set<WBInjectionPoint<?, ?>> ejbInjectionPoints;
- private Set<WBInjectionPoint<?, ?>> persistenceContextInjectionPoints;
- private Set<WBInjectionPoint<?, ?>> persistenceUnitInjectionPoints;
- private Set<WBInjectionPoint<?, ?>> resourceInjectionPoints;
-
private ManagedBean<?> specializedBean;
@@ -72,7 +57,7 @@
* @param manager the current manager
* @return A Web Bean
*/
- public static <T> ManagedBeanBuilder<T> of(WBClass<T> clazz, BeanManagerImpl manager)
+ static <T> ManagedBeanBuilder<T> of(WBClass<T> clazz, BeanManagerImpl manager)
{
return new ManagedBeanBuilder<T>(clazz, manager);
}
@@ -83,7 +68,7 @@
* @param type The type of the bean
* @param manager The Web Beans manager
*/
- protected ManagedBeanBuilder(WBClass<T> type, BeanManagerImpl manager)
+ ManagedBeanBuilder(WBClass<T> type, BeanManagerImpl manager)
{
super(type, manager);
initType();
@@ -91,7 +76,7 @@
initBindings();
}
- protected InjectionPoint attachCorrectInjectionPoint()
+ InjectionPoint attachCorrectInjectionPoint()
{
Decorator<?> decorator = getDecorators().get(getDecorators().size() - 1);
if (decorator instanceof DecoratorBuilder<?>)
@@ -110,31 +95,20 @@
* Initializes the bean and its metadata
*/
@Override
- public void initialize(BeanDeployerEnvironment environment)
+ void initialize(BeanDeployerEnvironment environment)
{
if (!isInitialized())
{
- initConstructor();
- checkConstructor();
super.initialize(environment);
initPostConstruct();
initPreDestroy();
- initEEInjectionPoints();
}
}
- private void initEEInjectionPoints()
- {
- this.ejbInjectionPoints = Beans.getEjbInjectionPoints(this, getAnnotatedItem(), getManager());
- this.persistenceContextInjectionPoints = Beans.getPersistenceContextInjectionPoints(this, getAnnotatedItem(), getManager());
- this.persistenceUnitInjectionPoints = Beans.getPersistenceUnitInjectionPoints(this, getAnnotatedItem(), getManager());
- this.resourceInjectionPoints = Beans.getResourceInjectionPoints(this, getAnnotatedItem(), manager);
- }
-
/**
* Validates the type
*/
- protected void checkType()
+ void checkType()
{
if (getAnnotatedItem().isNonStaticMemberClass())
{
@@ -178,7 +152,7 @@
}
@Override
- protected void checkBeanImplementation()
+ void checkBeanImplementation()
{
super.checkBeanImplementation();
if (!isDependent())
@@ -193,20 +167,8 @@
}
}
- protected void checkConstructor()
- {
- if (!constructor.getAnnotatedWBParameters(Disposes.class).isEmpty())
- {
- throw new DefinitionException("Managed bean constructor must not have a parameter annotated @Disposes " + constructor);
- }
- if (!constructor.getAnnotatedWBParameters(Observes.class).isEmpty())
- {
- throw new DefinitionException("Managed bean constructor must not have a parameter annotated @Observes " + constructor);
- }
- }
-
@Override
- protected void preSpecialize(BeanDeployerEnvironment environment)
+ void preSpecialize(BeanDeployerEnvironment environment)
{
super.preSpecialize(environment);
if (environment.getEjbDescriptors().contains(getAnnotatedItem().getWBSuperclass().getJavaClass()))
@@ -216,7 +178,7 @@
}
@Override
- protected void specialize(BeanDeployerEnvironment environment)
+ void specialize(BeanDeployerEnvironment environment)
{
if (environment.getClassBean(getAnnotatedItem().getWBSuperclass()) == null)
{
@@ -233,28 +195,7 @@
}
}
-
/**
- * Initializes the constructor
- */
- protected void initConstructor()
- {
- this.constructor = Beans.getBeanConstructor(this, getAnnotatedItem());
- // TODO We loop unecessarily many times here, I want to probably introduce some callback mechanism. PLM.
- addInjectionPoints(Beans.getParameterInjectionPoints(this, constructor));
- }
-
- /**
- * Returns the constructor
- *
- * @return The constructor
- */
- public WBConstructor<T> getConstructor()
- {
- return constructor;
- }
-
- /**
* Gets a string representation
*
* @return The string representation
@@ -265,7 +206,7 @@
return toString("simple bean");
}
- protected String toString(String beanType)
+ String toString(String beanType)
{
StringBuilder buffer = new StringBuilder();
buffer.append(Names.scopeTypeToString(getScope()));
@@ -283,13 +224,13 @@
}
@Override
- public ManagedBean<?> getSpecializedBean()
+ ManagedBean<?> getSpecializedBean()
{
return specializedBean;
}
@Override
- public ManagedBean<T> createBean()
+ ManagedBean<T> createBean()
{
return ManagedBean.of(
getAnnotatedItem(),
Modified: ri/branches/kabir-builder/impl/src/main/java/org/jboss/webbeans/bean/builder/NewManagedBeanBuilder.java
===================================================================
--- ri/branches/kabir-builder/impl/src/main/java/org/jboss/webbeans/bean/builder/NewManagedBeanBuilder.java 2009-09-21 16:33:40 UTC (rev 3713)
+++ ri/branches/kabir-builder/impl/src/main/java/org/jboss/webbeans/bean/builder/NewManagedBeanBuilder.java 2009-09-21 17:08:54 UTC (rev 3714)
@@ -42,7 +42,7 @@
* @param manager The Web Beans manager
* @return a new NewSimpleBean instance
*/
- public static <T> NewManagedBeanBuilder<T> of(WBClass<T> clazz, BeanManagerImpl manager)
+ static <T> NewManagedBeanBuilder<T> of(WBClass<T> clazz, BeanManagerImpl manager)
{
return new NewManagedBeanBuilder<T>(clazz, manager);
}
@@ -55,7 +55,7 @@
* @param type An annotated class
* @param manager The Web Beans manager
*/
- protected NewManagedBeanBuilder(final WBClass<T> type, BeanManagerImpl manager)
+ NewManagedBeanBuilder(final WBClass<T> type, BeanManagerImpl manager)
{
super(type, manager);
this.bindings = new HashSet<Annotation>();
@@ -76,13 +76,13 @@
* @return @Dependent
*/
@Override
- public Class<? extends Annotation> getScope()
+ Class<? extends Annotation> getScope()
{
return Dependent.class;
}
@Override
- public boolean isAlternative()
+ boolean isAlternative()
{
return false;
}
@@ -93,7 +93,7 @@
* @return null
*/
@Override
- public String getName()
+ String getName()
{
return null;
}
@@ -104,19 +104,19 @@
* @returns @New
*/
@Override
- public Set<Annotation> getQualifiers()
+ Set<Annotation> getQualifiers()
{
return bindings;
}
@Override
- public boolean isSpecializing()
+ boolean isSpecializing()
{
return false;
}
@Override
- public NewManagedBean<T> createBean()
+ NewManagedBean<T> createBean()
{
return NewManagedBean.of(
getAnnotatedItem(),
Modified: ri/branches/kabir-builder/impl/src/main/java/org/jboss/webbeans/bean/builder/NewSessionBeanBuilder.java
===================================================================
--- ri/branches/kabir-builder/impl/src/main/java/org/jboss/webbeans/bean/builder/NewSessionBeanBuilder.java 2009-09-21 16:33:40 UTC (rev 3713)
+++ ri/branches/kabir-builder/impl/src/main/java/org/jboss/webbeans/bean/builder/NewSessionBeanBuilder.java 2009-09-21 17:08:54 UTC (rev 3714)
@@ -44,7 +44,7 @@
* @param manager The Web Beans manager
* @return a new NewEnterpriseBean instance
*/
- public static <T> NewSessionBeanBuilder<T> of(InternalEjbDescriptor<T> ejbDescriptor, BeanManagerImpl manager)
+ static <T> NewSessionBeanBuilder<T> of(InternalEjbDescriptor<T> ejbDescriptor, BeanManagerImpl manager)
{
WBClass<T> type = manager.getServices().get(ClassTransformer.class).loadClass(ejbDescriptor.getBeanClass());
return new NewSessionBeanBuilder<T>(type, ejbDescriptor, manager);
@@ -58,7 +58,7 @@
* @param type An annotated class
* @param manager The Web Beans manager
*/
- protected NewSessionBeanBuilder(final WBClass<T> type, InternalEjbDescriptor<T> ejbDescriptor, BeanManagerImpl manager)
+ NewSessionBeanBuilder(final WBClass<T> type, InternalEjbDescriptor<T> ejbDescriptor, BeanManagerImpl manager)
{
super(type, ejbDescriptor, manager);
this.bindings = new HashSet<Annotation>();
@@ -79,13 +79,13 @@
* @return @Dependent
*/
@Override
- public Class<? extends Annotation> getScope()
+ Class<? extends Annotation> getScope()
{
return Dependent.class;
}
@Override
- public boolean isAlternative()
+ boolean isAlternative()
{
return false;
}
@@ -96,7 +96,7 @@
* @return null
*/
@Override
- public String getName()
+ String getName()
{
return null;
}
@@ -107,25 +107,25 @@
* @returns @New
*/
@Override
- public Set<Annotation> getQualifiers()
+ Set<Annotation> getQualifiers()
{
return bindings;
}
@Override
- public boolean isSpecializing()
+ boolean isSpecializing()
{
return false;
}
@Override
- protected void checkScopeAllowed()
+ void checkScopeAllowed()
{
// No-op
}
@Override
- public NewSessionBean<T> createBean()
+ NewSessionBean<T> createBean()
{
return NewSessionBean.of(getEjbDescriptor(),
getManager(),
Modified: ri/branches/kabir-builder/impl/src/main/java/org/jboss/webbeans/bean/builder/ProducerMethodBuilder.java
===================================================================
--- ri/branches/kabir-builder/impl/src/main/java/org/jboss/webbeans/bean/builder/ProducerMethodBuilder.java 2009-09-21 16:33:40 UTC (rev 3713)
+++ ri/branches/kabir-builder/impl/src/main/java/org/jboss/webbeans/bean/builder/ProducerMethodBuilder.java 2009-09-21 17:08:54 UTC (rev 3714)
@@ -22,9 +22,7 @@
import java.util.Collections;
import java.util.Set;
-import javax.enterprise.context.spi.CreationalContext;
import javax.enterprise.event.Observes;
-import javax.enterprise.inject.CreationException;
import javax.enterprise.inject.Disposes;
import org.jboss.webbeans.BeanManagerImpl;
@@ -35,11 +33,7 @@
import org.jboss.webbeans.bean.ProducerMethod;
import org.jboss.webbeans.bean.SessionBean;
import org.jboss.webbeans.bootstrap.BeanDeployerEnvironment;
-import org.jboss.webbeans.injection.MethodInjectionPoint;
-import org.jboss.webbeans.injection.ParameterInjectionPoint;
import org.jboss.webbeans.introspector.WBMethod;
-import org.jboss.webbeans.introspector.WBParameter;
-import org.jboss.webbeans.metadata.cache.MergedStereotypes;
import org.jboss.webbeans.util.Names;
/**
@@ -52,7 +46,7 @@
class ProducerMethodBuilder<T> extends AbstractProducerBeanBuilder<T, Method>
{
// The underlying method
- private MethodInjectionPoint<T, ?> method;
+ private WBMethod<T, ?> method;
private DisposalMethod<?> disposalMethodBean;
@@ -76,7 +70,7 @@
protected ProducerMethodBuilder(WBMethod<T, ?> method, AbstractClassBean<?> declaringBean, BeanManagerImpl manager)
{
super(declaringBean, manager);
- this.method = MethodInjectionPoint.of(this, method);
+ this.method = method;
initType();
initTypes();
initBindings();
@@ -94,7 +88,6 @@
{
if (!isInitialized())
{
- initProducerMethodInjectableParameters();
super.initialize(environment);
checkProducerMethod();
initDisposalMethod(environment);
@@ -102,17 +95,6 @@
}
/**
- * Initializes the injection points
- */
- protected void initProducerMethodInjectableParameters()
- {
- for (WBParameter<?, ?> parameter : method.getWBParameters())
- {
- addInjectionPoint(ParameterInjectionPoint.of(this, parameter));
- }
- }
-
- /**
* Validates the producer method
*/
protected void checkProducerMethod()
Modified: ri/branches/kabir-builder/impl/src/main/java/org/jboss/webbeans/bean/builder/RIBeanBuilder.java
===================================================================
--- ri/branches/kabir-builder/impl/src/main/java/org/jboss/webbeans/bean/builder/RIBeanBuilder.java 2009-09-21 16:33:40 UTC (rev 3713)
+++ ri/branches/kabir-builder/impl/src/main/java/org/jboss/webbeans/bean/builder/RIBeanBuilder.java 2009-09-21 17:08:54 UTC (rev 3714)
@@ -16,13 +16,13 @@
*/
package org.jboss.webbeans.bean.builder;
+import java.lang.annotation.Annotation;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
import java.util.concurrent.atomic.AtomicInteger;
import javax.enterprise.context.Dependent;
-import javax.enterprise.inject.spi.Bean;
import javax.enterprise.inject.spi.InjectionPoint;
import org.jboss.webbeans.BeanManagerImpl;
@@ -35,62 +35,64 @@
*
* @author Pete Muir
*/
-abstract class RIBeanBuilder<T> implements Bean<T>
+abstract class RIBeanBuilder<T>
{
private static final ConcurrentMap<String, AtomicInteger> ids = new ConcurrentHashMap<String, AtomicInteger>();
private final BeanManagerImpl manager;
- protected RIBeanBuilder(BeanManagerImpl manager)
+ RIBeanBuilder(BeanManagerImpl manager)
{
this.manager = manager;
// TODO better ID strategy (human readable)
}
- protected static String createId(String prefix)
+ static String createId(String prefix)
{
ids.putIfAbsent(prefix, new AtomicInteger());
int i = ids.get(prefix).getAndIncrement();
return prefix + "-" + i;
}
- protected BeanManagerImpl getManager()
+ BeanManagerImpl getManager()
{
return manager;
}
- public abstract Class<T> getType();
+ abstract Class<T> getType();
- public Class<?> getBeanClass()
+ Class<?> getBeanClass()
{
return getType();
}
- public abstract void initialize(BeanDeployerEnvironment environment);
+ abstract void initialize(BeanDeployerEnvironment environment);
- public abstract boolean isSpecializing();
+ abstract boolean isSpecializing();
- public boolean isDependent()
+ boolean isDependent()
{
return getScope().equals(Dependent.class);
}
- public abstract boolean isProxyable();
+ abstract Class<? extends Annotation> getScope();
+
+ abstract boolean isProxyable();
- public abstract boolean isPrimitive();
+ abstract boolean isPrimitive();
- public abstract Set<WBInjectionPoint<?, ?>> getAnnotatedInjectionPoints();
+ abstract Set<WBInjectionPoint<?, ?>> getAnnotatedInjectionPoints();
@SuppressWarnings("unchecked")
- public Set<InjectionPoint> getInjectionPoints()
+ Set<InjectionPoint> getInjectionPoints()
{
return (Set) getAnnotatedInjectionPoints();
}
- public abstract RIBean<?> getSpecializedBean();
+ abstract RIBean<?> getSpecializedBean();
- public abstract String getId();
+ abstract String getId();
@Override
public boolean equals(Object obj)
@@ -112,5 +114,5 @@
return getId().hashCode();
}
- public abstract RIBean<T> createBean();
+ abstract RIBean<T> createBean();
}
Modified: ri/branches/kabir-builder/impl/src/main/java/org/jboss/webbeans/bean/builder/SessionBeanBuilder.java
===================================================================
--- ri/branches/kabir-builder/impl/src/main/java/org/jboss/webbeans/bean/builder/SessionBeanBuilder.java 2009-09-21 16:33:40 UTC (rev 3713)
+++ ri/branches/kabir-builder/impl/src/main/java/org/jboss/webbeans/bean/builder/SessionBeanBuilder.java 2009-09-21 17:08:54 UTC (rev 3714)
@@ -74,7 +74,7 @@
* @param manager the current manager
* @return An Enterprise Web Bean
*/
- public static <T> SessionBeanBuilder<T> of(InternalEjbDescriptor<T> ejbDescriptor, BeanManagerImpl manager)
+ static <T> SessionBeanBuilder<T> of(InternalEjbDescriptor<T> ejbDescriptor, BeanManagerImpl manager)
{
WBClass<T> type = manager.getServices().get(ClassTransformer.class).loadClass(ejbDescriptor.getBeanClass());
return new SessionBeanBuilder<T>(type, ejbDescriptor, manager);
@@ -86,7 +86,7 @@
* @param type The type of the bean
* @param manager The Web Beans manager
*/
- protected SessionBeanBuilder(WBClass<T> type, InternalEjbDescriptor<T> ejbDescriptor, BeanManagerImpl manager)
+ SessionBeanBuilder(WBClass<T> type, InternalEjbDescriptor<T> ejbDescriptor, BeanManagerImpl manager)
{
super(type, manager);
initType();
@@ -99,7 +99,7 @@
* Initializes the bean and its metadata
*/
@Override
- public void initialize(BeanDeployerEnvironment environment)
+ void initialize(BeanDeployerEnvironment environment)
{
if (!isInitialized())
{
@@ -113,7 +113,7 @@
}
@Override
- protected void initTypes()
+ void initTypes()
{
Set<Type> types = new HashSet<Type>();
types = new LinkedHashSet<Type>();
@@ -125,7 +125,7 @@
super.types = types;
}
- protected void initProxyClass()
+ void initProxyClass()
{
Set<Type> types = new LinkedHashSet<Type>(getTypes());
types.add(EnterpriseBeanInstance.class);
@@ -140,7 +140,7 @@
/**
* Validates for non-conflicting roles
*/
- protected void checkConflictingRoles()
+ void checkConflictingRoles()
{
if (getType().isAnnotationPresent(Interceptor.class))
{
@@ -156,7 +156,7 @@
* Check that the scope type is allowed by the stereotypes on the bean and
* the bean type
*/
- protected void checkScopeAllowed()
+ void checkScopeAllowed()
{
if (ejbDescriptor.isStateless() && !isDependent())
{
@@ -172,7 +172,7 @@
* Validates specialization
*/
@Override
- protected void preSpecialize(BeanDeployerEnvironment environment)
+ void preSpecialize(BeanDeployerEnvironment environment)
{
super.preSpecialize(environment);
// We appear to check this twice?
@@ -183,7 +183,7 @@
}
@Override
- protected void specialize(BeanDeployerEnvironment environment)
+ void specialize(BeanDeployerEnvironment environment)
{
if (environment.getClassBean(getAnnotatedItem().getWBSuperclass()) == null)
{
@@ -235,41 +235,30 @@
return buffer.toString();
}
- public void postConstruct(T instance, CreationalContext<T> creationalContext)
- {
- Beans.injectBoundFields(instance, creationalContext, getManager(), getInjectableFields());
- Beans.callInitializers(instance, creationalContext, getManager(), getInitializerMethods());
- }
-
- public void preDestroy(CreationalContext<T> creationalContext)
- {
- creationalContext.release();
- }
-
@Override
- protected void initSerializable()
+ void initSerializable()
{
// No-op
}
@Override
- public boolean isSerializable()
+ boolean isSerializable()
{
return true;
}
- public InternalEjbDescriptor<T> getEjbDescriptor()
+ InternalEjbDescriptor<T> getEjbDescriptor()
{
return ejbDescriptor;
}
- public boolean isClientCanCallRemoveMethods()
+ boolean isClientCanCallRemoveMethods()
{
return getEjbDescriptor().isStateful() && isDependent();
}
@Override
- public SessionBean<?> getSpecializedBean()
+ SessionBean<?> getSpecializedBean()
{
return specializedBean;
}
@@ -278,7 +267,7 @@
* If there are any observer methods, they must be static or business
* methods.
*/
- protected void checkObserverMethods()
+ void checkObserverMethods()
{
for (WBMethod<?, ?> method : this.annotatedItem.getWBDeclaredMethodsWithAnnotatedParameters(Observes.class))
{
@@ -293,7 +282,7 @@
}
// TODO must be a nicer way to do this!
- public boolean isMethodExistsOnTypes(WBMethod<?, ?> method)
+ boolean isMethodExistsOnTypes(WBMethod<?, ?> method)
{
for (Type type : getTypes())
{
@@ -311,23 +300,18 @@
return false;
}
- public SessionObjectReference createReference()
+ Set<Class<? extends Annotation>> getStereotypes()
{
- return manager.getServices().get(EjbServices.class).resolveEjb(getEjbDescriptor().delegate());
- }
-
- public Set<Class<? extends Annotation>> getStereotypes()
- {
return Collections.emptySet();
}
- public Class<T> getProxyClass()
+ Class<T> getProxyClass()
{
return proxyClass;
}
@Override
- public SessionBean<T> createBean()
+ SessionBean<T> createBean()
{
return SessionBean.of(getEjbDescriptor(),
getManager(),
More information about the weld-commits
mailing list