[webbeans-commits] Webbeans SVN: r1242 - ri/trunk/webbeans-api/src/main/java/javax/inject/manager and 15 other directories.
webbeans-commits at lists.jboss.org
webbeans-commits at lists.jboss.org
Mon Jan 26 18:51:34 EST 2009
Author: pete.muir at jboss.org
Date: 2009-01-26 18:51:34 -0500 (Mon, 26 Jan 2009)
New Revision: 1242
Added:
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/context/CreationalContextImpl.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/util/MockCreationalContext.java
Modified:
ri/trunk/webbeans-api/src/main/java/javax/context/Context.java
ri/trunk/webbeans-api/src/main/java/javax/context/Contextual.java
ri/trunk/webbeans-api/src/main/java/javax/inject/manager/Bean.java
ri/trunk/webbeans-api/src/main/java/javax/inject/manager/Manager.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/ManagerImpl.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/AbstractProducerBean.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/EnterpriseBean.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/EventBean.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/ForwardingBean.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/InjectionPointBean.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/InstanceBean.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/NewSimpleBean.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/SimpleBean.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/proxy/ClientProxyMethodHandler.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bootstrap/WebBeansBootstrap.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/context/AbstractBeanMapContext.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/context/DependentContext.java
tck/trunk/api/src/main/java/org/jboss/webbeans/tck/api/Beans.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/AbstractTest.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/ContextTest.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/NormalContextTest.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/dependent/DependentContextTest.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/binding/BindingDefinitionTest.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/initializer/InitializerMethodTest.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/method/ProducerMethodLifecycleTest.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/SimpleBeanDefinitionTest.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/SimpleBeanLifecycleTest.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/injection/InjectionTest.java
Log:
Update to CreationalContext API (not yet implemented)
Modified: ri/trunk/webbeans-api/src/main/java/javax/context/Context.java
===================================================================
--- ri/trunk/webbeans-api/src/main/java/javax/context/Context.java 2009-01-26 22:55:08 UTC (rev 1241)
+++ ri/trunk/webbeans-api/src/main/java/javax/context/Context.java 2009-01-26 23:51:34 UTC (rev 1242)
@@ -32,7 +32,9 @@
public Class<? extends Annotation> getScopeType();
- public <T> T get(Contextual<T> bean, boolean create);
+ public <T> T get(Contextual<T> contextual, CreationalContext<T> creationalContext);
+
+ public <T> T get(Contextual<T> contextual);
boolean isActive();
Modified: ri/trunk/webbeans-api/src/main/java/javax/context/Contextual.java
===================================================================
--- ri/trunk/webbeans-api/src/main/java/javax/context/Contextual.java 2009-01-26 22:55:08 UTC (rev 1241)
+++ ri/trunk/webbeans-api/src/main/java/javax/context/Contextual.java 2009-01-26 23:51:34 UTC (rev 1242)
@@ -25,7 +25,7 @@
*/
public interface Contextual<T>
{
- public T create();
+ public T create(CreationalContext<T> creationalContext);
public void destroy(T instance);
}
Modified: ri/trunk/webbeans-api/src/main/java/javax/inject/manager/Bean.java
===================================================================
--- ri/trunk/webbeans-api/src/main/java/javax/inject/manager/Bean.java 2009-01-26 22:55:08 UTC (rev 1241)
+++ ri/trunk/webbeans-api/src/main/java/javax/inject/manager/Bean.java 2009-01-26 23:51:34 UTC (rev 1242)
@@ -45,10 +45,6 @@
return manager;
}
- public abstract T create();
-
- public abstract void destroy(T instance);
-
public abstract Set<Type> getTypes();
public abstract Set<Annotation> getBindings();
Modified: ri/trunk/webbeans-api/src/main/java/javax/inject/manager/Manager.java
===================================================================
--- ri/trunk/webbeans-api/src/main/java/javax/inject/manager/Manager.java 2009-01-26 22:55:08 UTC (rev 1241)
+++ ri/trunk/webbeans-api/src/main/java/javax/inject/manager/Manager.java 2009-01-26 23:51:34 UTC (rev 1242)
@@ -24,6 +24,7 @@
import java.util.Set;
import javax.context.Context;
+import javax.context.CreationalContext;
import javax.event.Observer;
import javax.inject.TypeLiteral;
@@ -50,6 +51,10 @@
public Object getInstanceByName(String name);
public <T> T getInstance(Bean<T> bean);
+
+ public <T> T getInstanceToInject(InjectionPoint injectionPoint, CreationalContext<?> creationalContext);
+
+ public <T> T getInstanceToInject(InjectionPoint injectionPoint);
public void fireEvent(Object event, Annotation... bindings);
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/ManagerImpl.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/ManagerImpl.java 2009-01-26 22:55:08 UTC (rev 1241)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/ManagerImpl.java 2009-01-26 23:51:34 UTC (rev 1242)
@@ -35,6 +35,7 @@
import javax.context.Context;
import javax.context.ContextNotActiveException;
+import javax.context.CreationalContext;
import javax.event.Observer;
import javax.inject.AmbiguousDependencyException;
import javax.inject.BindingType;
@@ -47,6 +48,7 @@
import javax.inject.UnsatisfiedDependencyException;
import javax.inject.manager.Bean;
import javax.inject.manager.Decorator;
+import javax.inject.manager.InjectionPoint;
import javax.inject.manager.InterceptionType;
import javax.inject.manager.Interceptor;
import javax.inject.manager.Manager;
@@ -56,10 +58,12 @@
import org.jboss.webbeans.bean.NewEnterpriseBean;
import org.jboss.webbeans.bean.proxy.ProxyPool;
import org.jboss.webbeans.context.ContextMap;
+import org.jboss.webbeans.context.CreationalContextImpl;
import org.jboss.webbeans.ejb.EjbDescriptorCache;
import org.jboss.webbeans.ejb.spi.EjbResolver;
import org.jboss.webbeans.event.EventManager;
import org.jboss.webbeans.event.ObserverImpl;
+import org.jboss.webbeans.injection.AnnotatedInjectionPoint;
import org.jboss.webbeans.injection.InjectionPointProvider;
import org.jboss.webbeans.introspector.AnnotatedClass;
import org.jboss.webbeans.introspector.AnnotatedItem;
@@ -84,6 +88,8 @@
{
private static final long serialVersionUID = 3021562879133838561L;
+
+ private static final Annotation[] EMPTY_ANNOTATION_ARRAY = new Annotation[0];
// The JNDI key to place the manager under
public static final String JNDI_KEY = "java:comp/Manager";
@@ -567,9 +573,25 @@
}
else
{
- return getContext(bean.getScopeType()).get(bean, create);
+ return getContext(bean.getScopeType()).get(bean, new CreationalContextImpl<T>());
}
}
+
+ public <T> T getInstanceToInject(InjectionPoint injectionPoint)
+ {
+ throw new UnsupportedOperationException();
+ }
+
+ public <T> T getInstanceToInject(InjectionPoint injectionPoint, CreationalContext<?> creationalContext)
+ {
+ throw new UnsupportedOperationException();
+ }
+
+ public <T> T getInstanceToInject(AnnotatedInjectionPoint<T, ?> injectionPoint, CreationalContext<?> creationalContext)
+ {
+ Bean<T> bean = getBeanByType(injectionPoint, injectionPoint.getBindings().toArray(EMPTY_ANNOTATION_ARRAY));
+ return getInstance(bean);
+ }
/**
* Gets an instance by name, returning null if none is found and throwing an
@@ -638,6 +660,11 @@
*/
public <T> T getInstanceByType(AnnotatedItem<T, ?> element, Annotation... bindings)
{
+ return getInstance(getBeanByType(element, bindings));
+ }
+
+ public <T> Bean<T> getBeanByType(AnnotatedItem<T, ?> element, Annotation... bindings)
+ {
Set<Bean<T>> beans = resolveByType(element, bindings);
if (beans.size() == 0)
{
@@ -653,7 +680,7 @@
{
throw new UnproxyableDependencyException("Normal scoped bean " + bean + " is not proxyable");
}
- return getInstance(bean);
+ return bean;
}
/**
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/AbstractProducerBean.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/AbstractProducerBean.java 2009-01-26 22:55:08 UTC (rev 1241)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/AbstractProducerBean.java 2009-01-26 23:51:34 UTC (rev 1242)
@@ -26,6 +26,7 @@
import java.util.HashSet;
import java.util.Set;
+import javax.context.CreationalContext;
import javax.context.Dependent;
import javax.context.ScopeType;
import javax.inject.DefinitionException;
@@ -294,8 +295,7 @@
*
* @returns The instance
*/
- @Override
- public T create()
+ public T create(CreationalContext<T> creationalContext)
{
Object dependentCollector = new Object();
try
@@ -320,7 +320,6 @@
}
}
- @Override
public void destroy(T instance)
{
try
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/EnterpriseBean.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/EnterpriseBean.java 2009-01-26 22:55:08 UTC (rev 1241)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/EnterpriseBean.java 2009-01-26 23:51:34 UTC (rev 1242)
@@ -25,6 +25,7 @@
import javassist.util.proxy.ProxyObject;
import javax.context.ApplicationScoped;
+import javax.context.CreationalContext;
import javax.context.Dependent;
import javax.decorator.Decorator;
import javax.event.Observes;
@@ -210,8 +211,7 @@
*
* @return The instance
*/
- @Override
- public T create()
+ public T create(CreationalContext<T> creationalContext)
{
try
{
@@ -245,7 +245,6 @@
*
* @param instance The instance
*/
- @Override
public void destroy(T instance)
{
EnterpriseBeanInstance enterpiseBeanInstance = (EnterpriseBeanInstance) instance;
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/EventBean.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/EventBean.java 2009-01-26 22:55:08 UTC (rev 1241)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/EventBean.java 2009-01-26 23:51:34 UTC (rev 1242)
@@ -20,6 +20,7 @@
import java.lang.reflect.Type;
+import javax.context.CreationalContext;
import javax.event.Event;
import javax.inject.DefinitionException;
@@ -116,8 +117,7 @@
*
* @return an event instance
*/
- @Override
- public Event<T> create()
+ public Event<T> create(CreationalContext<Event<T>> creationalContext)
{
try
{
@@ -144,7 +144,6 @@
}
}
- @Override
public void destroy(Event<T> instance)
{
try
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/ForwardingBean.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/ForwardingBean.java 2009-01-26 22:55:08 UTC (rev 1241)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/ForwardingBean.java 2009-01-26 23:51:34 UTC (rev 1242)
@@ -21,6 +21,7 @@
import java.lang.reflect.Type;
import java.util.Set;
+import javax.context.CreationalContext;
import javax.inject.manager.Bean;
import javax.inject.manager.Manager;
@@ -49,10 +50,9 @@
*
* @return an instance of the delegate
*/
- @Override
- public T create()
+ public T create(CreationalContext<T> creationalContext)
{
- return delegate().create();
+ return delegate().create(creationalContext);
}
/**
@@ -60,7 +60,6 @@
*
* @param instance The instance to destroy
*/
- @Override
public void destroy(T instance)
{
delegate().destroy(instance);
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/InjectionPointBean.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/InjectionPointBean.java 2009-01-26 22:55:08 UTC (rev 1241)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/InjectionPointBean.java 2009-01-26 23:51:34 UTC (rev 1242)
@@ -17,6 +17,8 @@
package org.jboss.webbeans.bean;
+import javax.context.CreationalContext;
+
import org.jboss.webbeans.ManagerImpl;
import org.jboss.webbeans.introspector.AnnotatedItem;
@@ -49,14 +51,12 @@
super(field, manager);
}
- @Override
- public T create()
+ public T create(CreationalContext<T> creationalContext)
{
// TODO Why do we need to cast here?
return getType().cast(manager.getInjectionPointProvider().getPreviousInjectionPoint());
}
- @Override
public void destroy(T instance)
{
// The instance is always in the Dependent context and can be garbage
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/InstanceBean.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/InstanceBean.java 2009-01-26 22:55:08 UTC (rev 1241)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/InstanceBean.java 2009-01-26 23:51:34 UTC (rev 1242)
@@ -18,6 +18,7 @@
package org.jboss.webbeans.bean;
+import javax.context.CreationalContext;
import javax.inject.Instance;
import org.jboss.webbeans.InstanceImpl;
@@ -65,8 +66,7 @@
*
* @return The implementation
*/
- @Override
- public Instance<T> create()
+ public Instance<T> create(CreationalContext<Instance<T>> creationalContext)
{
try
{
@@ -79,7 +79,6 @@
}
}
- @Override
public void destroy(Instance<T> instance)
{
try
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/NewSimpleBean.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/NewSimpleBean.java 2009-01-26 22:55:08 UTC (rev 1241)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/NewSimpleBean.java 2009-01-26 23:51:34 UTC (rev 1242)
@@ -26,7 +26,6 @@
import javax.inject.Standard;
import org.jboss.webbeans.ManagerImpl;
-import org.jboss.webbeans.context.DependentContext;
import org.jboss.webbeans.introspector.AnnotatedClass;
import org.jboss.webbeans.introspector.jlr.AnnotatedClassImpl;
import org.jboss.webbeans.literal.NewLiteral;
@@ -76,30 +75,6 @@
}
/**
- * Creates a new instance
- */
- @Override
- public T create()
- {
- try
- {
- DependentContext.INSTANCE.setActive(true);
- T instance = getConstructor().newInstance(manager);
- bindDecorators();
- bindInterceptors();
- injectEjbAndCommonFields(instance);
- injectBoundFields(instance);
- callInitializers(instance);
- callPostConstruct(instance);
- return instance;
- }
- finally
- {
- DependentContext.INSTANCE.setActive(false);
- }
- }
-
- /**
* Gets the scope type
*
* @return @Dependent
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/SimpleBean.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/SimpleBean.java 2009-01-26 22:55:08 UTC (rev 1241)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/SimpleBean.java 2009-01-26 23:51:34 UTC (rev 1242)
@@ -24,6 +24,7 @@
import javax.annotation.PostConstruct;
import javax.annotation.PreDestroy;
+import javax.context.CreationalContext;
import javax.context.Dependent;
import javax.inject.DefinitionException;
import javax.inject.Initializer;
@@ -118,8 +119,7 @@
*
* @return The instance
*/
- @Override
- public T create()
+ public T create(CreationalContext<T> creationalContext)
{
try
{
@@ -156,7 +156,6 @@
*
* @param instance The instance
*/
- @Override
public void destroy(T instance)
{
try
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/proxy/ClientProxyMethodHandler.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/proxy/ClientProxyMethodHandler.java 2009-01-26 22:55:08 UTC (rev 1241)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/proxy/ClientProxyMethodHandler.java 2009-01-26 23:51:34 UTC (rev 1242)
@@ -26,6 +26,7 @@
import javax.inject.manager.Bean;
import org.jboss.webbeans.CurrentManager;
+import org.jboss.webbeans.context.CreationalContextImpl;
import org.jboss.webbeans.log.LogProvider;
import org.jboss.webbeans.log.Logging;
import org.jboss.webbeans.util.Reflections;
@@ -88,12 +89,17 @@
{
bean = CurrentManager.rootManager().getBeans().get(beanIndex);
}
- Context context = CurrentManager.rootManager().getContext(bean.getScopeType());
- Object proxiedInstance = context.get(bean, true);
+ Object proxiedInstance = getProxiedInstance(bean);
Object returnValue = Reflections.lookupMethod(proxiedMethod, proxiedInstance).invoke(proxiedInstance, args);
log.trace("Executed method " + proxiedMethod + " on " + proxiedInstance + " with parameters " + args + " and got return value " + returnValue);
return returnValue;
}
+
+ private <T> T getProxiedInstance(Bean<T> bean)
+ {
+ Context context = CurrentManager.rootManager().getContext(bean.getScopeType());
+ return context.get(bean, CreationalContextImpl.<T>newInstance());
+ }
/**
* Gets a string representation
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bootstrap/WebBeansBootstrap.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bootstrap/WebBeansBootstrap.java 2009-01-26 22:55:08 UTC (rev 1241)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bootstrap/WebBeansBootstrap.java 2009-01-26 23:51:34 UTC (rev 1242)
@@ -19,6 +19,8 @@
import java.util.Collections;
+import javax.context.CreationalContext;
+
import org.jboss.webbeans.BeanValidator;
import org.jboss.webbeans.CurrentManager;
import org.jboss.webbeans.ManagerImpl;
@@ -70,8 +72,7 @@
injectionPoints = Collections.emptySet();
}
- @Override
- public ManagerImpl create()
+ public ManagerImpl create(CreationalContext<ManagerImpl> creationalContext)
{
return manager;
}
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/context/AbstractBeanMapContext.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/context/AbstractBeanMapContext.java 2009-01-26 22:55:08 UTC (rev 1241)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/context/AbstractBeanMapContext.java 2009-01-26 23:51:34 UTC (rev 1242)
@@ -21,6 +21,7 @@
import javax.context.ContextNotActiveException;
import javax.context.Contextual;
+import javax.context.CreationalContext;
import javax.inject.manager.Bean;
import org.jboss.webbeans.context.beanmap.BeanMap;
@@ -58,25 +59,33 @@
*
* @see javax.context.Context#get(Bean, boolean)
*/
- public <T> T get(Contextual<T> bean, boolean create)
+ public <T> T get(Contextual<T> contextual, CreationalContext<T> creationalContext)
{
if (!isActive())
{
throw new ContextNotActiveException();
}
- T instance = getBeanMap().get(bean);
+ T instance = getBeanMap().get(contextual);
if (instance != null)
{
return instance;
}
- if (!create)
+ else if (creationalContext != null)
{
+ instance = contextual.create(creationalContext);
+ getBeanMap().put(contextual, instance);
+ return instance;
+ }
+ else
+ {
return null;
}
- instance = bean.create();
- getBeanMap().put(bean, instance);
- return instance;
}
+
+ public <T> T get(Contextual<T> contextual)
+ {
+ return get(contextual, null);
+ }
/**
* Destroys a bean
Added: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/context/CreationalContextImpl.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/context/CreationalContextImpl.java (rev 0)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/context/CreationalContextImpl.java 2009-01-26 23:51:34 UTC (rev 1242)
@@ -0,0 +1,19 @@
+package org.jboss.webbeans.context;
+
+import javax.context.CreationalContext;
+
+public class CreationalContextImpl<T> implements CreationalContext<T>
+{
+
+ public static final <T> CreationalContextImpl<T> newInstance()
+ {
+ return new CreationalContextImpl<T>();
+ }
+
+ public void push(T incompleteInstance)
+ {
+ // TODO Auto-generated method stub
+
+ }
+
+}
Property changes on: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/context/CreationalContextImpl.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/context/DependentContext.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/context/DependentContext.java 2009-01-26 22:55:08 UTC (rev 1241)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/context/DependentContext.java 2009-01-26 23:51:34 UTC (rev 1242)
@@ -21,6 +21,7 @@
import javax.context.ContextNotActiveException;
import javax.context.Contextual;
+import javax.context.CreationalContext;
import javax.context.Dependent;
import org.jboss.webbeans.bean.AbstractClassBean;
@@ -59,23 +60,35 @@
/**
* Overridden method always creating a new instance
*
- * @param bean The bean to create
+ * @param contextual The bean to create
* @param create Should a new one be created
*/
- public <T> T get(Contextual<T> bean, boolean create)
+ public <T> T get(Contextual<T> contextual, CreationalContext<T> creationalContext)
{
if (!isActive())
{
throw new ContextNotActiveException();
}
- T instance = create == false ? null : bean.create();
- if (bean instanceof AbstractClassBean && (currentInjectionInstance.get() != null))
+ if (creationalContext != null)
{
- DependentInstancesStore dependentInstancesStore = ((AbstractClassBean<?>) bean).getDependentInstancesStore();
- dependentInstancesStore.addDependentInstance(currentInjectionInstance.get(), ContextualInstance.of(bean, instance));
+ T instance = contextual.create(creationalContext);
+ if (contextual instanceof AbstractClassBean && (currentInjectionInstance.get() != null))
+ {
+ DependentInstancesStore dependentInstancesStore = ((AbstractClassBean<?>) contextual).getDependentInstancesStore();
+ dependentInstancesStore.addDependentInstance(currentInjectionInstance.get(), ContextualInstance.of(contextual, instance));
+ }
+ return instance;
}
- return instance;
+ else
+ {
+ return null;
+ }
}
+
+ public <T> T get(Contextual<T> contextual)
+ {
+ return get(contextual, null);
+ }
@Override
public String toString()
Modified: tck/trunk/api/src/main/java/org/jboss/webbeans/tck/api/Beans.java
===================================================================
--- tck/trunk/api/src/main/java/org/jboss/webbeans/tck/api/Beans.java 2009-01-26 22:55:08 UTC (rev 1241)
+++ tck/trunk/api/src/main/java/org/jboss/webbeans/tck/api/Beans.java 2009-01-26 23:51:34 UTC (rev 1242)
@@ -13,6 +13,7 @@
* @author David Allen
*
*/
+ at Deprecated
public interface Beans
{
@@ -25,6 +26,7 @@
* @param clazz the class to create the bean
* @return the created bean
*/
+ @Deprecated
public <T> Bean<T> createSimpleBean(Class<T> clazz);
/**
@@ -35,6 +37,8 @@
* @param clazz the class to create the bean
* @return the created bean
*/
+
+ @Deprecated
public <T> Bean<T> createEnterpriseBean(Class<T> clazz);
/**
@@ -51,6 +55,7 @@
* producer method
* @return the producer bean
*/
+ @Deprecated
public <T> Bean<T> createProducerMethodBean(Method method, Bean<?> declaringBean);
/**
@@ -94,6 +99,7 @@
* @param declaringBean
* @return the producer bean
*/
+ @Deprecated
public <T> Bean<T> createProducerFieldBean(Field field, Bean<?> declaringBean);
public boolean isProxy(Object instance);
Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/AbstractTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/AbstractTest.java 2009-01-26 22:55:08 UTC (rev 1241)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/AbstractTest.java 2009-01-26 23:51:34 UTC (rev 1242)
@@ -15,11 +15,13 @@
import java.util.Collections;
import java.util.List;
+import javax.context.CreationalContext;
import javax.inject.Production;
import javax.inject.Standard;
import javax.inject.manager.Bean;
import javax.inject.manager.Manager;
+import org.jboss.webbeans.tck.impl.util.MockCreationalContext;
import org.testng.annotations.AfterMethod;
import org.testng.annotations.BeforeMethod;
@@ -84,21 +86,25 @@
manager = null;
}
+ @Deprecated
public <T> Bean<T> createSimpleBean(Class<T> beanClass)
{
return configuration().getBeans().createSimpleBean(beanClass);
}
+ @Deprecated
public <T> Bean<T> createEnterpriseBean(Class<T> beanClass)
{
return configuration().getBeans().createEnterpriseBean(beanClass);
}
+ @Deprecated
public <T> Bean<T> createProducerMethodBean(Method method, Bean<?> producerBean)
{
return configuration().getBeans().createProducerMethodBean(method, producerBean);
}
+ @Deprecated
public <T> Bean<T> createProducerFieldBean(Field field, Bean<?> producerBean)
{
return configuration().getBeans().createProducerFieldBean(field, producerBean);
@@ -155,4 +161,10 @@
{
configuration().getContexts().setInactive(configuration().getContexts().getDependentContext());
}
+
+ @Deprecated
+ public static final <T> CreationalContext<T> mockCreationalContext(Class<T> expectedType)
+ {
+ return new MockCreationalContext<T>();
+ }
}
\ No newline at end of file
Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/util/MockCreationalContext.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/util/MockCreationalContext.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/util/MockCreationalContext.java 2009-01-26 23:51:34 UTC (rev 1242)
@@ -0,0 +1,15 @@
+package org.jboss.webbeans.tck.impl.util;
+
+import javax.context.CreationalContext;
+
+ at Deprecated
+public class MockCreationalContext<T> implements CreationalContext<T>
+{
+
+
+ public void push(T incompleteInstance)
+ {
+
+ }
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/util/MockCreationalContext.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/ContextTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/ContextTest.java 2009-01-26 22:55:08 UTC (rev 1241)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/ContextTest.java 2009-01-26 23:51:34 UTC (rev 1242)
@@ -7,6 +7,7 @@
import javax.context.Context;
import javax.context.ContextNotActiveException;
import javax.context.Contextual;
+import javax.context.CreationalContext;
import javax.context.RequestScoped;
import org.jboss.webbeans.tck.AbstractTest;
@@ -29,10 +30,15 @@
private static class DummyContext implements Context
{
- public <T> T get(Contextual<T> bean, boolean create)
+ public <T> T get(Contextual<T> bean, CreationalContext<T> creationalContext)
{
throw new UnsupportedOperationException();
}
+
+ public <T> T get(Contextual<T> contextual)
+ {
+ return get(contextual, null);
+ }
public Class<? extends Annotation> getScopeType()
{
Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/NormalContextTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/NormalContextTest.java 2009-01-26 22:55:08 UTC (rev 1241)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/NormalContextTest.java 2009-01-26 23:51:34 UTC (rev 1242)
@@ -6,6 +6,7 @@
import javax.context.Context;
import javax.context.Contextual;
+import javax.context.CreationalContext;
import javax.context.ScopeType;
import org.jboss.webbeans.tck.AbstractTest;
@@ -34,10 +35,15 @@
private static class DummyContext implements Context
{
- public <T> T get(Contextual<T> bean, boolean create)
+ public <T> T get(Contextual<T> bean, CreationalContext<T> creationalContext)
{
throw new UnsupportedOperationException();
}
+
+ public <T> T get(Contextual<T> contextual)
+ {
+ return get(contextual, null);
+ }
public Class<? extends Annotation> getScopeType()
{
Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/dependent/DependentContextTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/dependent/DependentContextTest.java 2009-01-26 22:55:08 UTC (rev 1241)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/dependent/DependentContextTest.java 2009-01-26 23:51:34 UTC (rev 1242)
@@ -14,6 +14,7 @@
import org.jboss.webbeans.tck.AbstractTest;
import org.jboss.webbeans.tck.impl.SpecAssertion;
import org.jboss.webbeans.tck.impl.SpecVersion;
+import org.jboss.webbeans.tck.impl.util.MockCreationalContext;
import org.testng.annotations.Test;
@SpecVersion("20090116")
@@ -35,7 +36,7 @@
assert foxRunBeans.size() == 1;
Bean<FoxRun> foxRunBean = foxRunBeans.iterator().next();
manager.addBean(foxBean);
- FoxRun foxRun = foxRunBean.create();
+ FoxRun foxRun = foxRunBean.create(new MockCreationalContext<FoxRun>());
assert !foxRun.fox.equals(foxRun.anotherFox);
}
@@ -78,8 +79,8 @@
manager.addBean(spiderProducer);
Method method = SpiderProducer.class.getMethod("produceTarantula");
Bean<Tarantula> tarantulaBean = createProducerMethodBean(method, spiderProducer);
- Tarantula tarantula = tarantulaBean.create();
- Tarantula tarantula2 = tarantulaBean.create();
+ Tarantula tarantula = tarantulaBean.create(new MockCreationalContext<Tarantula>());
+ Tarantula tarantula2 = tarantulaBean.create(new MockCreationalContext<Tarantula>());
assert tarantula != null;
assert tarantula2 != null;
assert tarantula != tarantula2;
@@ -98,8 +99,8 @@
manager.addBean(spiderProducer);
Field field = OtherSpiderProducer.class.getField("produceTarantula");
Bean<Tarantula> tarantulaBean = createProducerFieldBean(field, spiderProducer);
- Tarantula tarantula = tarantulaBean.create();
- Tarantula tarantula2 = tarantulaBean.create();
+ Tarantula tarantula = tarantulaBean.create(new MockCreationalContext<Tarantula>());
+ Tarantula tarantula2 = tarantulaBean.create(new MockCreationalContext<Tarantula>());
assert tarantula != null;
assert tarantula2 != null;
assert tarantula != tarantula2;
@@ -149,8 +150,8 @@
assert foxBeans.size() == 1;
Bean<Fox> foxBean = foxBeans.iterator().next();
Context context = manager.getContext(Dependent.class);
- assert context.get(foxBean, true) != null;
- assert context.get(foxBean, true) instanceof Fox;
+ assert context.get(foxBean, new MockCreationalContext<Fox>()) != null;
+ assert context.get(foxBean, new MockCreationalContext<Fox>()) instanceof Fox;
}
}.run();
@@ -175,7 +176,7 @@
assert foxBeans.size() == 1;
Bean<Fox> foxBean = foxBeans.iterator().next();
Context context = manager.getContext(Dependent.class);
- assert context.get(foxBean, false) == null;
+ assert context.get(foxBean, null) == null;
}
}.run();
@@ -262,7 +263,7 @@
Bean<FoxRun> foxRunBean = createSimpleBean(FoxRun.class);
Bean<Fox> foxBean = createSimpleBean(Fox.class);
manager.addBean(foxBean);
- FoxRun foxRun = foxRunBean.create();
+ FoxRun foxRun = foxRunBean.create(new MockCreationalContext<FoxRun>());
assert foxRun.fox != null;
}
@@ -288,7 +289,7 @@
Bean<FoxRun> foxRunBean = createSimpleBean(FoxRun.class);
Bean<Fox> foxBean = createSimpleBean(Fox.class);
manager.addBean(foxBean);
- FoxRun foxRun = foxRunBean.create();
+ FoxRun foxRun = foxRunBean.create(new MockCreationalContext<FoxRun>());
assert foxRun.fox != null;
}
Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/binding/BindingDefinitionTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/binding/BindingDefinitionTest.java 2009-01-26 22:55:08 UTC (rev 1241)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/binding/BindingDefinitionTest.java 2009-01-26 23:51:34 UTC (rev 1242)
@@ -14,6 +14,7 @@
import org.jboss.webbeans.tck.impl.SpecAssertion;
import org.jboss.webbeans.tck.impl.SpecVersion;
import org.jboss.webbeans.tck.impl.literals.CurrentBinding;
+import org.jboss.webbeans.tck.impl.util.MockCreationalContext;
import org.jboss.webbeans.tck.impl.util.Reflections;
import org.testng.annotations.Test;
@@ -124,7 +125,7 @@
manager.addBean(spiderProducer);
Method method = SpiderProducer.class.getMethod("produceTameTarantula");
manager.addBean(createProducerMethodBean(method, spiderProducer));
- Barn barn = createSimpleBean(Barn.class).create();
+ Barn barn = createSimpleBean(Barn.class).create(new MockCreationalContext<Barn>());
assert barn.petSpider != null;
assert barn.petSpider instanceof DefangedTarantula;
}
@@ -151,7 +152,7 @@
manager.addBean(createProducerMethodBean(method, spiderProducer));
method = SpiderProducer.class.getMethod("produceSpiderFromInjection", Tarantula.class);
Bean<Spider> spiderBean = createProducerMethodBean(method, spiderProducer);
- Spider spider = spiderBean.create();
+ Spider spider = spiderBean.create(new MockCreationalContext<Spider>());
assert spider != null;
assert spider instanceof DefangedTarantula;
}
Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/initializer/InitializerMethodTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/initializer/InitializerMethodTest.java 2009-01-26 22:55:08 UTC (rev 1241)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/initializer/InitializerMethodTest.java 2009-01-26 23:51:34 UTC (rev 1242)
@@ -6,6 +6,7 @@
import org.jboss.webbeans.tck.AbstractTest;
import org.jboss.webbeans.tck.impl.SpecAssertion;
import org.jboss.webbeans.tck.impl.SpecVersion;
+import org.jboss.webbeans.tck.impl.util.MockCreationalContext;
import org.testng.annotations.Test;
@SpecVersion("20081206")
@@ -61,7 +62,7 @@
manager.addBean(createSimpleBean(Chicken.class));
Bean<ChickenHutch> chickenHutchBean = createSimpleBean(ChickenHutch.class);
- ChickenHutch chickenHutch = chickenHutchBean.create();
+ ChickenHutch chickenHutch = chickenHutchBean.create(new MockCreationalContext<ChickenHutch>());
assert chickenHutch.fox != null;
assert chickenHutch.chicken != null;
}
Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/method/ProducerMethodLifecycleTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/method/ProducerMethodLifecycleTest.java 2009-01-26 22:55:08 UTC (rev 1241)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/method/ProducerMethodLifecycleTest.java 2009-01-26 23:51:34 UTC (rev 1242)
@@ -8,6 +8,7 @@
import org.jboss.webbeans.tck.AbstractTest;
import org.jboss.webbeans.tck.impl.SpecAssertion;
import org.jboss.webbeans.tck.impl.SpecVersion;
+import org.jboss.webbeans.tck.impl.util.MockCreationalContext;
import org.testng.annotations.Test;
@SpecVersion("20081206")
@@ -21,7 +22,7 @@
manager.addBean(spiderProducer);
Method method = SpiderProducer.class.getMethod("produceTarantula");
Bean<Tarantula> tarantulaBean = createProducerMethodBean(method, spiderProducer);
- Tarantula tarantula = tarantulaBean.create();
+ Tarantula tarantula = tarantulaBean.create(new MockCreationalContext<Tarantula>());
assert tarantula != null;
}
@@ -54,7 +55,7 @@
manager.addBean(spiderProducer);
Method method = SpiderProducer.class.getMethod("getNullSpider");
Bean<Spider> spiderBean = createProducerMethodBean(method, spiderProducer);
- Spider spider = spiderBean.create();
+ Spider spider = spiderBean.create(new MockCreationalContext<Spider>());
assert spider == null;
}
@@ -64,7 +65,7 @@
Bean<SpiderProducer_Broken> spiderProducer = createSimpleBean(SpiderProducer_Broken.class);
manager.addBean(spiderProducer);
Method method = SpiderProducer_Broken.class.getMethod("getRequestScopedSpider");
- createProducerMethodBean(method, spiderProducer).create();
+ createProducerMethodBean(method, spiderProducer).create(new MockCreationalContext<Object>());
}
}
Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/SimpleBeanDefinitionTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/SimpleBeanDefinitionTest.java 2009-01-26 22:55:08 UTC (rev 1241)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/SimpleBeanDefinitionTest.java 2009-01-26 23:51:34 UTC (rev 1242)
@@ -9,6 +9,7 @@
import org.jboss.webbeans.tck.AbstractTest;
import org.jboss.webbeans.tck.impl.SpecAssertion;
import org.jboss.webbeans.tck.impl.SpecVersion;
+import org.jboss.webbeans.tck.impl.util.MockCreationalContext;
import org.jboss.webbeans.tck.unit.implementation.simple.OuterBean_Broken.InnerBean_Broken;
import org.jboss.webbeans.tck.unit.implementation.simple.OuterBean_Broken.StaticInnerBean_Broken;
import org.testng.annotations.Test;
@@ -176,7 +177,7 @@
@Test @SpecAssertion(section="3.2.5.1")
public void testEmptyConstructorUsed()
{
- createSimpleBean(Donkey.class).create();
+ createSimpleBean(Donkey.class).create(new MockCreationalContext<Donkey>());
assert Donkey.constructedCorrectly;
}
Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/SimpleBeanLifecycleTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/SimpleBeanLifecycleTest.java 2009-01-26 22:55:08 UTC (rev 1241)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/SimpleBeanLifecycleTest.java 2009-01-26 23:51:34 UTC (rev 1242)
@@ -8,6 +8,7 @@
import org.jboss.webbeans.tck.AbstractTest;
import org.jboss.webbeans.tck.impl.SpecAssertion;
import org.jboss.webbeans.tck.impl.SpecVersion;
+import org.jboss.webbeans.tck.impl.util.MockCreationalContext;
import org.testng.annotations.Test;
@SpecVersion("20081206")
@@ -29,7 +30,7 @@
Bean<Goldfish> goldfishBean = createSimpleBean(Goldfish.class);
manager.addBean(goldfishBean);
manager.addBean(goldfishPondBean);
- FishPond fishPond = goldfishPondBean.create();
+ FishPond fishPond = goldfishPondBean.create(new MockCreationalContext<FishPond>());
assert fishPond.goldfish != null;
}
@@ -44,7 +45,7 @@
public void testCreateReturnsInstanceOfBean()
{
Bean<RedSnapper> bean = createSimpleBean(RedSnapper.class);
- assert bean.create() instanceof RedSnapper;
+ assert bean.create(new MockCreationalContext<RedSnapper>()) instanceof RedSnapper;
}
@Test(groups={"stub", "beanLifecycle", "interceptors"}) @SpecAssertion(section="5.3")
@@ -84,7 +85,7 @@
Bean<Farm> farmBean = createSimpleBean(Farm.class);
manager.addBean(farmOfficeBean);
manager.addBean(farmBean);
- Farm farm = farmBean.create();
+ Farm farm = farmBean.create(new MockCreationalContext<Farm>());
assert farm.founded!=null;
assert farm.initialStaff==20;
assert farm.closed==null;
@@ -102,7 +103,7 @@
protected void execute() throws Exception
{
Bean<CdOrderProcessor> bean = createSimpleBean(CdOrderProcessor.class);
- bean.create();
+ bean.create(new MockCreationalContext<CdOrderProcessor>());
}
}.run();
assert OrderProcessor.postConstructCalled;
@@ -118,7 +119,7 @@
protected void execute() throws Exception
{
Bean<CdOrderProcessor> bean = createSimpleBean(CdOrderProcessor.class);
- CdOrderProcessor instance = bean.create();
+ CdOrderProcessor instance = bean.create(new MockCreationalContext<CdOrderProcessor>());
bean.destroy(instance);
}
}.run();
@@ -136,7 +137,7 @@
protected void execute() throws Exception
{
Bean<NovelOrderProcessor> bean = createSimpleBean(NovelOrderProcessor.class);
- bean.create();
+ bean.create(new MockCreationalContext<NovelOrderProcessor>());
}
}.run();
assert !OrderProcessor.postConstructCalled;
@@ -152,7 +153,7 @@
protected void execute() throws Exception
{
Bean<NovelOrderProcessor> bean = createSimpleBean(NovelOrderProcessor.class);
- NovelOrderProcessor instance = bean.create();
+ NovelOrderProcessor instance = bean.create(new MockCreationalContext<NovelOrderProcessor>());
bean.destroy(instance);
}
}.run();
@@ -166,7 +167,7 @@
Bean<TunaFarm> tunaFarmBean = createSimpleBean(TunaFarm.class);
Bean<Tuna> tunaBean = createSimpleBean(Tuna.class);
manager.addBean(tunaBean);
- TunaFarm tunaFarm = tunaFarmBean.create();
+ TunaFarm tunaFarm = tunaFarmBean.create(new MockCreationalContext<TunaFarm>());
assert tunaFarm.tuna != null;
}
@@ -176,7 +177,7 @@
Bean<TunaFarm> tunaFarmBean = createSimpleBean(TunaFarm.class);
Bean<Tuna> tunaBean = createSimpleBean(Tuna.class);
manager.addBean(tunaBean);
- TunaFarm tunaFarm = tunaFarmBean.create();
+ TunaFarm tunaFarm = tunaFarmBean.create(new MockCreationalContext<TunaFarm>());
assert tunaFarm.notInjectedTuna != manager.getInstance(tunaBean);
}
Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/injection/InjectionTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/injection/InjectionTest.java 2009-01-26 22:55:08 UTC (rev 1241)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/injection/InjectionTest.java 2009-01-26 23:51:34 UTC (rev 1242)
@@ -13,6 +13,7 @@
import org.jboss.webbeans.tck.AbstractTest;
import org.jboss.webbeans.tck.impl.SpecAssertion;
import org.jboss.webbeans.tck.impl.SpecVersion;
+import org.jboss.webbeans.tck.impl.util.MockCreationalContext;
import org.testng.annotations.Test;
@SpecVersion("20081206")
@@ -35,7 +36,7 @@
manager.addBean(spiderProducer);
Bean<SpiderNest> spiderNestBean = createSimpleBean(SpiderNest.class);
manager.addBean(createProducerMethodBean(SpiderProducer.class.getMethod("getWolfSpiderSize"), spiderProducer));
- SpiderNest spiderNest = spiderNestBean.create();
+ SpiderNest spiderNest = spiderNestBean.create(new MockCreationalContext<SpiderNest>());
assert spiderNest.numberOfSpiders != null;
assert spiderNest.numberOfSpiders.equals(4);
}
@@ -54,7 +55,7 @@
Bean<TunaFarm> tunaFarmBean = createSimpleBean(TunaFarm.class);
Bean<Tuna> tunaBean = createSimpleBean(Tuna.class);
manager.addBean(tunaBean);
- TunaFarm tunaFarm = tunaFarmBean.create();
+ TunaFarm tunaFarm = tunaFarmBean.create(new MockCreationalContext<TunaFarm>());
assert tunaFarm.tuna != null;
configuration().getContexts().setInactive(configuration().getContexts().getRequestContext());
tunaFarm.tuna.getName();
@@ -67,7 +68,7 @@
Bean<FoxRun> foxRunBean = createSimpleBean(FoxRun.class);
Bean<Fox> foxBean = createSimpleBean(Fox.class);
manager.addBean(foxBean);
- FoxRun foxRun = foxRunBean.create();
+ FoxRun foxRun = foxRunBean.create(new MockCreationalContext<FoxRun>());
assert foxRun.fox.getName().equals("gavin");
}
@@ -78,7 +79,7 @@
Bean<BeanWithStaticBoundField_Broken> bean = createSimpleBean(BeanWithStaticBoundField_Broken.class);
Bean<Tuna> tunaBean = createSimpleBean(Tuna.class);
manager.addBean(tunaBean);
- bean.create();
+ bean.create(new MockCreationalContext<BeanWithStaticBoundField_Broken>());
}
@Test(groups = "injection", expectedExceptions = DefinitionException.class)
@@ -88,7 +89,7 @@
Bean<BeanWithFinalBoundField_Broken> bean = createSimpleBean(BeanWithFinalBoundField_Broken.class);
Bean<Tuna> tunaBean = createSimpleBean(Tuna.class);
manager.addBean(tunaBean);
- bean.create();
+ bean.create(new MockCreationalContext<BeanWithFinalBoundField_Broken>());
}
@Test @SpecAssertion(section="4.2")
More information about the weld-commits
mailing list