Author: struberg
Date: Sat Jan 19 23:45:14 2013
New Revision: 1435761
URL: http://svn.apache.org/viewvc?rev=1435761&view=rev
Log:
OWB-735 remove WrappedCreationalContext
The container is not required to support 'foreign' CreationalContexts
Removed:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/creational/WrappedCreationalContext.java
Modified:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/AbstractOwbBean.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/BeanManagerImpl.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/creational/CreationalContextFactory.java
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/events/injectiontarget/ReplaceInjectionTargetTest.java
Modified:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/AbstractOwbBean.java
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/AbstractOwbBean.java?rev=1435761&r1=1435760&r2=1435761&view=diff
==============================================================================
---
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/AbstractOwbBean.java
(original)
+++
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/AbstractOwbBean.java
Sat Jan 19 23:45:14 2013
@@ -40,7 +40,6 @@ import javax.enterprise.inject.spi.Produ
import org.apache.webbeans.config.OWBLogConst;
import org.apache.webbeans.config.WebBeansContext;
import org.apache.webbeans.container.BeanManagerImpl;
-import org.apache.webbeans.context.creational.CreationalContextImpl;
import org.apache.webbeans.exception.WebBeansConfigurationException;
import org.apache.webbeans.logger.WebBeansLoggerFacade;
@@ -150,13 +149,7 @@ public abstract class AbstractOwbBean<T>
public T create(CreationalContext<T> creationalContext)
{
try
- {
- if(!(creationalContext instanceof CreationalContextImpl))
- {
- creationalContext =
webBeansContext.getCreationalContextFactory().wrappedCreationalContext(
- creationalContext, this);
- }
-
+ {
T instance = producer.produce(creationalContext);
if (producer instanceof InjectionTarget)
{
Modified:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/BeanManagerImpl.java
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/BeanManagerImpl.java?rev=1435761&r1=1435760&r2=1435761&view=diff
==============================================================================
---
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/BeanManagerImpl.java
(original)
+++
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/BeanManagerImpl.java
Sat Jan 19 23:45:14 2013
@@ -677,12 +677,6 @@ public class BeanManagerImpl implements
}
}
-
- if(!(creationalContext instanceof CreationalContextImpl))
- {
- creationalContext =
webBeansContext.getCreationalContextFactory().wrappedCreationalContext(creationalContext,
bean);
- }
-
//Scope is normal
if
(webBeansContext.getWebBeansUtil().isScopeTypeNormal(bean.getScope()))
Modified:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/creational/CreationalContextFactory.java
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/creational/CreationalContextFactory.java?rev=1435761&r1=1435760&r2=1435761&view=diff
==============================================================================
---
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/creational/CreationalContextFactory.java
(original)
+++
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/creational/CreationalContextFactory.java
Sat Jan 19 23:45:14 2013
@@ -53,10 +53,5 @@ public final class CreationalContextFact
{
return new CreationalContextImpl<T>(contextual, webBeansContext);
}
-
- public CreationalContext<T> wrappedCreationalContext(CreationalContext<T>
creationalContext, Contextual<T> contextual)
- {
- return new WrappedCreationalContext<T>(contextual, creationalContext,
webBeansContext);
- }
-
+
}
Modified:
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/events/injectiontarget/ReplaceInjectionTargetTest.java
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/events/injectiontarget/ReplaceInjectionTargetTest.java?rev=1435761&r1=1435760&r2=1435761&view=diff
==============================================================================
---
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/events/injectiontarget/ReplaceInjectionTargetTest.java
(original)
+++
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/events/injectiontarget/ReplaceInjectionTargetTest.java
Sat Jan 19 23:45:14 2013
@@ -92,18 +92,18 @@ public class ReplaceInjectionTargetTest
public void checkCustomWrapperIsUsed() {
addExtension(new InjectionTargetReplacer());
- final Collection<String> beanXmls = new ArrayList<String>();
-
final Collection<Class<?>> beanClasses = new ArrayList<Class<?>>();
beanClasses.add(IJBean.class);
beanClasses.add(InjectedBean.class);
- startContainer(beanClasses, beanXmls);
+ startContainer(beanClasses, null);
final Set<Bean<?>> beans = getBeanManager().getBeans(IJBean.class);
assertNotNull(beans);
assertFalse(beans.isEmpty());
- assertNotNull(getBeanManager().getReference(beans.iterator().next(),
IJBean.class, null));
+ Bean<?> bean = getBeanManager().resolve(beans);
+ CreationalContext<?> cc =
getBeanManager().createCreationalContext(bean);
+ assertNotNull(getBeanManager().getReference(beans.iterator().next(),
IJBean.class, cc));
assertTrue(MyInjectionTarget.injected);
shutDownContainer();
