[webbeans-commits] Webbeans SVN: r2789 - ri/trunk/impl/src/main/java/org/jboss/webbeans and 9 other directories.

webbeans-commits at lists.jboss.org webbeans-commits at lists.jboss.org
Mon Jun 8 14:05:57 EDT 2009


Author: pete.muir at jboss.org
Date: 2009-06-08 14:05:57 -0400 (Mon, 08 Jun 2009)
New Revision: 2789

Added:
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/ShoeFactory.java
Modified:
   ri/trunk/api/src/main/java/javax/enterprise/inject/spi/BeanManager.java
   ri/trunk/api/src/main/java/javax/enterprise/inject/spi/InjectionTarget.java
   ri/trunk/impl/src/main/java/org/jboss/webbeans/InstanceImpl.java
   ri/trunk/impl/src/main/java/org/jboss/webbeans/ManagerImpl.java
   ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/DisposalMethodBean.java
   ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/ProducerMethodBean.java
   ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/proxy/ClientProxyMethodHandler.java
   ri/trunk/impl/src/main/java/org/jboss/webbeans/context/CreationalContextImpl.java
   ri/trunk/impl/src/main/java/org/jboss/webbeans/context/DependentContext.java
   ri/trunk/impl/src/main/java/org/jboss/webbeans/conversation/ServletConversationManager.java
   ri/trunk/impl/src/main/java/org/jboss/webbeans/event/ObserverImpl.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/MockCreationalContext.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/activities/ActivitiesTest.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/SimpleBeanLifecycleTest.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dependency/resolution/DependencyResolutionTest.java
Log:
Various fixes to TCK, start to use new SPI

Modified: ri/trunk/api/src/main/java/javax/enterprise/inject/spi/BeanManager.java
===================================================================
--- ri/trunk/api/src/main/java/javax/enterprise/inject/spi/BeanManager.java	2009-06-08 17:25:30 UTC (rev 2788)
+++ ri/trunk/api/src/main/java/javax/enterprise/inject/spi/BeanManager.java	2009-06-08 18:05:57 UTC (rev 2789)
@@ -117,7 +117,7 @@
     * 			The Bean representation of the bean.
     * @return the mest specialized enabled bean
     */
-   public <X> Bean<? extends X> getMostSpecializedBean(Bean<X> bean); 
+   public <X> Bean<X> getMostSpecializedBean(Bean<X> bean); 
 
    /**
     * Returns the PassivationCapableBean with the given identifier.

Modified: ri/trunk/api/src/main/java/javax/enterprise/inject/spi/InjectionTarget.java
===================================================================
--- ri/trunk/api/src/main/java/javax/enterprise/inject/spi/InjectionTarget.java	2009-06-08 17:25:30 UTC (rev 2788)
+++ ri/trunk/api/src/main/java/javax/enterprise/inject/spi/InjectionTarget.java	2009-06-08 18:05:57 UTC (rev 2789)
@@ -4,10 +4,16 @@
 
 import javax.enterprise.context.spi.CreationalContext;
 
-public interface InjectionTarget<X> {
+public interface InjectionTarget<X> 
+{
     public X produce(CreationalContext<X> ctx);
+    
     public void inject(X instance, CreationalContext<X> ctx);
+    
     public void dispose(X instance);
+    
     public void destroy(X instance);
+    
     public Set<InjectionPoint> getInjectionPoints();
+    
 }

Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/InstanceImpl.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/InstanceImpl.java	2009-06-08 17:25:30 UTC (rev 2788)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/InstanceImpl.java	2009-06-08 18:05:57 UTC (rev 2789)
@@ -22,6 +22,7 @@
 import java.util.Set;
 
 import javax.enterprise.inject.Instance;
+import javax.enterprise.inject.spi.Bean;
 
 import org.jboss.webbeans.injection.resolution.ResolvableAnnotatedClass;
 
@@ -31,7 +32,6 @@
  * @author Gavin King
  * 
  * @param <T>
- * @see javax.webbeans.Instace
  */
 public class InstanceImpl<T> extends FacadeImpl<T> implements Instance<T>
 {
@@ -43,31 +43,19 @@
       return new InstanceImpl<I>(type, manager, annotations);
    }
    
-   /**
-    * Constructor
-    * 
-    * @param type The obtainable type
-    * @param manager The Web Beans manager
-    * @param bindings The binding types
-    */
    private InstanceImpl(Type type, ManagerImpl manager, Set<Annotation> bindings)
    {
       super(type, manager, bindings);
    }
 
-   /**
-    * Gets an instance with the matching binding types
-    * 
-    * @param bindings The binding types
-    * @return The instance
-    * 
-    * @see javax.enterprise.inject.Instance#get(Annotation...)
-    * @see javax.enterprise.inject.spi.BeanManager#getInstanceByType(Class, Annotation...)
-    */
    public T get(Annotation... bindings) 
    {
       Annotation[] annotations = mergeInBindings(bindings);
-      return getManager().getInstanceByType(ResolvableAnnotatedClass.<T>of(getType(), annotations), annotations);
+      Bean<T> bean = getManager().getBean(ResolvableAnnotatedClass.<T>of(getType(), annotations), annotations);
+      
+      @SuppressWarnings("unchecked")
+      T instance = (T) getManager().getReference(bean, getType());
+      return instance;
    }
 
    /**

Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/ManagerImpl.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/ManagerImpl.java	2009-06-08 17:25:30 UTC (rev 2788)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/ManagerImpl.java	2009-06-08 18:05:57 UTC (rev 2789)
@@ -711,27 +711,22 @@
    {
       if (create)
       {
-         return getInstance(bean, new CreationalContextImpl<T>(bean));
+         return (T) getInjectableReference(bean, CreationalContextImpl.of(bean));
       }
       else
       {
-         return getInstance(bean, null);
+         return (T) getInjectableReference(bean, null);
       }
    }
-
-   @SuppressWarnings("unchecked")
-   @Deprecated
-   private <T> T getInstance(Bean<T> bean, CreationalContextImpl<?> creationalContext)
+   
+   public Object getInjectableReference(Bean<?> bean, CreationalContext<?> creationalContext)
    {
-      if (specializedBeans.containsKey(bean))
+      bean = getMostSpecializedBean(bean);
+      if (getServices().get(MetaDataCache.class).getScopeModel(bean.getScopeType()).isNormal())
       {
-         return getInstance((Bean<T>) specializedBeans.get(bean), creationalContext);
-      }
-      else if (getServices().get(MetaDataCache.class).getScopeModel(bean.getScopeType()).isNormal())
-      {
          if (creationalContext != null || (creationalContext == null && getContext(bean.getScopeType()).get(bean) != null))
          {
-            return (T) clientProxyProvider.getClientProxy(this, bean);
+            return clientProxyProvider.getClientProxy(this, bean);
          }
          else
          {
@@ -740,7 +735,7 @@
       }
       else
       {
-         return getContext(bean.getScopeType()).get((Bean<T>)bean, (CreationalContext<T>)creationalContext);
+         return getContext(bean.getScopeType()).get((Bean) bean, creationalContext);
       }
    }
    
@@ -780,12 +775,12 @@
             }
             else
             {
-               return getInstance(resolvedBean, ctx.getCreationalContext(resolvedBean));
+               return getInjectableReference(resolvedBean, ctx.getCreationalContext(resolvedBean));
             }
          }
          else
          {
-            return getInstance(resolvedBean);
+            return getInjectableReference(resolvedBean, creationalContext);
          }
       }
       finally
@@ -870,7 +865,7 @@
       return getInstance(getBean(element, bindings));
    }
 
-   private <T> Bean<T> getBean(AnnotatedItem<T, ?> element, Annotation... bindings)
+   public <T> Bean<T> getBean(AnnotatedItem<T, ?> element, Annotation... bindings)
    {
       Set<Bean<?>> beans = getBeans(element, bindings);
       if (beans.size() == 0)
@@ -1143,9 +1138,18 @@
 
 
 
-   public <X> Bean<? extends X> getMostSpecializedBean(Bean<X> bean)
+   public <X> Bean<X> getMostSpecializedBean(Bean<X> bean)
    {
-      throw new RuntimeException("Not yet implemented");
+      Bean<?> key = bean;
+      while (specializedBeans.containsKey(key))
+      {
+         if (key == null)
+         {
+            System.out.println("null key " + bean);
+         }
+         key = specializedBeans.get(key);
+      }
+      return (Bean<X>) key;
    }
 
 

Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/DisposalMethodBean.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/DisposalMethodBean.java	2009-06-08 17:25:30 UTC (rev 2788)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/DisposalMethodBean.java	2009-06-08 18:05:57 UTC (rev 2789)
@@ -20,7 +20,6 @@
 import java.lang.reflect.Method;
 import java.lang.reflect.Type;
 import java.util.HashSet;
-import java.util.LinkedList;
 import java.util.List;
 import java.util.Set;
 
@@ -31,7 +30,6 @@
 import javax.enterprise.inject.Initializer;
 import javax.enterprise.inject.Produces;
 import javax.enterprise.inject.deployment.DeploymentType;
-import javax.enterprise.inject.spi.InjectionPoint;
 import javax.event.Observes;
 import javax.inject.DefinitionException;
 
@@ -182,26 +180,10 @@
       return null;
    }
 
-   public void invokeDisposeMethod(Object instance)
+   public void invokeDisposeMethod(Object instance, CreationalContext<?> creationalContext)
    {
-
-      List<Object> parameters = new LinkedList<Object>();
-
-      parameters.add(instance);
-
-      for (InjectionPoint injectionPoint : disposalInjectionPoints)
-      {
-         // TODO this seems very wrong, we should be passing a creational context here
-         Object injectionObject = getManager().getInjectableReference(injectionPoint, null);
-         parameters.add(injectionObject);
-      }
-      
-
       Object beanInstance = disposalMethodInjectionPoint.isStatic() ? declaringBean : getManager().getInstance(declaringBean);
-
-      disposalMethodInjectionPoint.invokeWithSpecialValue(beanInstance, Disposes.class, instance, manager, null, IllegalArgumentException.class);
-
-
+      disposalMethodInjectionPoint.invokeWithSpecialValue(beanInstance, Disposes.class, instance, manager, creationalContext, IllegalArgumentException.class);
    }
 
    private void checkDisposalMethod()

Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/ProducerMethodBean.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/ProducerMethodBean.java	2009-06-08 17:25:30 UTC (rev 2788)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/ProducerMethodBean.java	2009-06-08 18:05:57 UTC (rev 2789)
@@ -187,7 +187,7 @@
          }
          DependentContext.instance().setActive(true);
          if (disposalMethodBean != null)
-            disposalMethodBean.invokeDisposeMethod(instance);
+            disposalMethodBean.invokeDisposeMethod(instance, creationalContext);
       }
       finally
       {

Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/proxy/ClientProxyMethodHandler.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/proxy/ClientProxyMethodHandler.java	2009-06-08 17:25:30 UTC (rev 2788)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/proxy/ClientProxyMethodHandler.java	2009-06-08 18:05:57 UTC (rev 2789)
@@ -111,7 +111,7 @@
       CreationalContextImpl<T> creationalContext;
       if (currentCreationalContext.get() == null)
       {
-         creationalContext = new CreationalContextImpl<T>(bean);
+         creationalContext = CreationalContextImpl.of(bean);
          currentCreationalContext.set(creationalContext);
       }
       else

Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/context/CreationalContextImpl.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/context/CreationalContextImpl.java	2009-06-08 17:25:30 UTC (rev 2788)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/context/CreationalContextImpl.java	2009-06-08 18:05:57 UTC (rev 2789)
@@ -25,11 +25,16 @@
 public class CreationalContextImpl<T> implements CreationalContext<T>
 {
    
+   public static <T> CreationalContextImpl<T> of(Bean<T> bean)
+   {
+      return new CreationalContextImpl<T>(bean);
+   }
+
    private final Map<Bean<?>, Object> incompleteInstances;
    private final Bean<T> bean;
    private final boolean outer;
    
-   public CreationalContextImpl(Bean<T> bean)
+   private CreationalContextImpl(Bean<T> bean)
    {
       this.incompleteInstances = new HashMap<Bean<?>, Object>();
       this.bean = bean;

Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/context/DependentContext.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/context/DependentContext.java	2009-06-08 17:25:30 UTC (rev 2788)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/context/DependentContext.java	2009-06-08 18:05:57 UTC (rev 2789)
@@ -164,7 +164,7 @@
    {
       if (contextual instanceof Bean)
       {
-         CreationalContext<T> creationalContext = new CreationalContextImpl<T>((Bean<T>) contextual);
+         CreationalContext<T> creationalContext = CreationalContextImpl.of((Bean<T>) contextual);
          contextual.destroy(instance, creationalContext);
       }
    }

Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/conversation/ServletConversationManager.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/conversation/ServletConversationManager.java	2009-06-08 17:25:30 UTC (rev 2788)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/conversation/ServletConversationManager.java	2009-06-08 18:05:57 UTC (rev 2789)
@@ -25,16 +25,16 @@
 import java.io.Serializable;
 
 import javax.enterprise.context.SessionScoped;
+import javax.enterprise.inject.Instance;
 import javax.enterprise.inject.Produces;
+import javax.inject.Obtains;
 import javax.servlet.http.HttpSession;
 
-import org.jboss.webbeans.CurrentManager;
 import org.jboss.webbeans.WebBean;
 import org.jboss.webbeans.context.api.BeanStore;
 import org.jboss.webbeans.log.LogProvider;
 import org.jboss.webbeans.log.Logging;
 import org.jboss.webbeans.servlet.ConversationBeanStore;
-import org.jboss.webbeans.servlet.HttpSessionManager;
 
 /**
  * The HTTP session based conversation manager
@@ -53,12 +53,13 @@
    private static final long CONVERSATION_TIMEOUT_IN_MS = 10 * 60 * 1000;
    private static final long CONVERSATION_CONCURRENT_ACCESS_TIMEOUT_IN_MS = 1 * 1000;
    private static final String CONVERSATION_ID_NAME = "cid";
+   
+   @Obtains Instance<HttpSession> httpSession;
 
    @Override
    public BeanStore getBeanStore(String cid)
    {
-      HttpSession session = CurrentManager.rootManager().getInstanceByType(HttpSessionManager.class).getSession();
-      return new ConversationBeanStore(session, cid);
+      return new ConversationBeanStore(httpSession.get(), cid);
    }
    
    @Produces

Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/event/ObserverImpl.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/event/ObserverImpl.java	2009-06-08 17:25:30 UTC (rev 2788)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/event/ObserverImpl.java	2009-06-08 18:05:57 UTC (rev 2789)
@@ -23,6 +23,7 @@
 import java.util.List;
 
 import javax.enterprise.context.Dependent;
+import javax.enterprise.context.spi.CreationalContext;
 import javax.enterprise.inject.Disposes;
 import javax.enterprise.inject.Initializer;
 import javax.enterprise.inject.Produces;
@@ -35,6 +36,7 @@
 
 import org.jboss.webbeans.ManagerImpl;
 import org.jboss.webbeans.bean.RIBean;
+import org.jboss.webbeans.context.CreationalContextImpl;
 import org.jboss.webbeans.context.DependentContext;
 import org.jboss.webbeans.context.DependentInstancesStore;
 import org.jboss.webbeans.context.DependentStorageRequest;
@@ -178,13 +180,18 @@
             DependentContext.instance().startCollectingDependents(dependentStorageRequest);
          }
          // Get the most specialized instance of the component
-         instance = getInstance(observerBean);
+         CreationalContext<?> creationalContext = null;
+         if (!conditional)
+         {
+            creationalContext = CreationalContextImpl.of(observerBean);
+         }
+         instance = manager.getInjectableReference(observerBean, creationalContext);
          if (instance == null)
          {
             return;
          }
          // As we are working with the contextual instance, we may not have the actual object, but a container proxy (e.g. EJB)
-         observerMethod.invokeOnInstanceWithSpecialValue(instance, Observes.class, event, manager, null, ObserverException.class);
+         observerMethod.invokeOnInstanceWithSpecialValue(instance, Observes.class, event, manager, creationalContext, ObserverException.class);
       }
       finally
       {
@@ -205,11 +212,6 @@
       DeferredEventNotification<T> deferredEvent = new DeferredEventNotification<T>(event, this);
       manager.getTaskExecutor().execute(deferredEvent);
    }
-   
-   private <B> B getInstance(RIBean<B> observerBean)
-   {
-      return manager.getInstance(observerBean, !isConditional());
-   }
 
    /**
     * Indicates if the observer is conditional

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/MockCreationalContext.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/MockCreationalContext.java	2009-06-08 17:25:30 UTC (rev 2788)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/MockCreationalContext.java	2009-06-08 18:05:57 UTC (rev 2789)
@@ -34,6 +34,12 @@
      MockCreationalContext.pushCalled = pushCalled;
    }
    
+   public static void reset()
+   {
+      lastBeanPushed = null;
+      pushCalled = false;
+   }
+   
    public void release()
    {
       

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/activities/ActivitiesTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/activities/ActivitiesTest.java	2009-06-08 17:25:30 UTC (rev 2788)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/activities/ActivitiesTest.java	2009-06-08 18:05:57 UTC (rev 2789)
@@ -22,6 +22,7 @@
 import org.hibernate.tck.annotations.SpecAssertions;
 import org.jboss.jsr299.tck.AbstractJSR299Test;
 import org.jboss.jsr299.tck.ForwardingBean;
+import org.jboss.jsr299.tck.impl.MockCreationalContext;
 import org.jboss.jsr299.tck.literals.CurrentLiteral;
 import org.jboss.testharness.impl.packaging.Artifact;
 import org.testng.annotations.Test;
@@ -190,7 +191,7 @@
       BeanManager childActivity = getCurrentManager().createActivity();
       Bean<?> dummyBean = createDummyBean(childActivity, Cow.class);
       childActivity.addBean(dummyBean);
-      assert childActivity.getInjectableReference(dummyBean.getInjectionPoints().iterator().next(), null) != null;
+      assert childActivity.getInjectableReference(dummyBean.getInjectionPoints().iterator().next(), new MockCreationalContext<Cow>()) != null;
    }
    
    @Test

Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/ShoeFactory.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/ShoeFactory.java	                        (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/ShoeFactory.java	2009-06-08 18:05:57 UTC (rev 2789)
@@ -0,0 +1,7 @@
+package org.jboss.jsr299.tck.tests.implementation.simple.lifecycle;
+
+
+class ShoeFactory
+{
+   
+}


Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/ShoeFactory.java
___________________________________________________________________
Name: svn:mime-type
   + text/plain

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/SimpleBeanLifecycleTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/SimpleBeanLifecycleTest.java	2009-06-08 17:25:30 UTC (rev 2788)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/SimpleBeanLifecycleTest.java	2009-06-08 18:05:57 UTC (rev 2789)
@@ -82,22 +82,20 @@
    })
    public void testCreateReturnsSameBeanPushed() throws Exception
    {
-      final CreationalContext<Farm> farmCreationalContext = new MockCreationalContext<Farm>();
-      final Contextual<Farm> farmBean = getBeans(Farm.class).iterator().next();
-      MockCreationalContext.setLastBeanPushed(null);
-      MockCreationalContext.setPushCalled(false);
+      final CreationalContext<ShoeFactory> creationalContext = new MockCreationalContext<ShoeFactory>();
+      final Contextual<ShoeFactory> bean = getBeans(ShoeFactory.class).iterator().next();
+      MockCreationalContext.reset();
       new RunInDependentContext()
       {
 
          @Override
          protected void execute() throws Exception
          {
-            Farm farmInstance = getCurrentManager().getContext(Dependent.class).get(farmBean, farmCreationalContext);
+            ShoeFactory instance = getCurrentManager().getContext(Dependent.class).get(bean, creationalContext);
             if (MockCreationalContext.isPushCalled())
             {
-               assert farmInstance.equals(MockCreationalContext.getLastBeanPushed());
+               assert instance.equals(MockCreationalContext.getLastBeanPushed());
             }
-            assert farmInstance.farmOffice != null : "FarmOffice should be injected by Contextual.create()";
          }
 
       }.run();      

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dependency/resolution/DependencyResolutionTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dependency/resolution/DependencyResolutionTest.java	2009-06-08 17:25:30 UTC (rev 2788)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dependency/resolution/DependencyResolutionTest.java	2009-06-08 18:05:57 UTC (rev 2789)
@@ -12,12 +12,12 @@
 import javax.enterprise.inject.UnsatisfiedResolutionException;
 import javax.enterprise.inject.spi.Bean;
 import javax.enterprise.inject.spi.InjectionPoint;
-import javax.enterprise.inject.spi.Bean;
 
 import org.hibernate.tck.annotations.SpecAssertion;
 import org.hibernate.tck.annotations.SpecAssertions;
 import org.jboss.jsr299.tck.AbstractJSR299Test;
 import org.jboss.jsr299.tck.ForwardingBean;
+import org.jboss.jsr299.tck.impl.MockCreationalContext;
 import org.jboss.jsr299.tck.literals.CurrentLiteral;
 import org.jboss.testharness.impl.packaging.Artifact;
 import org.testng.annotations.Test;
@@ -91,7 +91,7 @@
       bindings.add(new CurrentLiteral());
       MockInjectionPoint injectionPoint = new MockInjectionPoint(vanillaBean, Vanilla.class, injectedField, bindings);
       
-      assert getCurrentManager().getInjectableReference(injectionPoint, null) instanceof Vanilla;
+      assert getCurrentManager().getInjectableReference(injectionPoint, new MockCreationalContext<Object>()) instanceof Vanilla;
    }
    
    @Test(expectedExceptions = UnsatisfiedResolutionException.class)




More information about the weld-commits mailing list