Author: struberg
Date: Sat Jul 28 16:07:31 2012
New Revision: 1366701
URL: http://svn.apache.org/viewvc?rev=1366701&view=rev
Log:
OWB-689 make OWBInjector a utility class and inject a static helper
Removed:
openwebbeans/trunk/webbeans-ejb/src/main/java/org/apache/webbeans/ejb/common/util/CdiDefaultEjbInjector.java
Modified:
openwebbeans/trunk/webbeans-ejb/src/main/java/org/apache/webbeans/ejb/common/interceptor/OpenWebBeansEjbInterceptor.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/OWBInjector.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorDataImpl.java
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/portable/javaee/JavaEeInjectionTest.java
Modified:
openwebbeans/trunk/webbeans-ejb/src/main/java/org/apache/webbeans/ejb/common/interceptor/OpenWebBeansEjbInterceptor.java
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-ejb/src/main/java/org/apache/webbeans/ejb/common/interceptor/OpenWebBeansEjbInterceptor.java?rev=1366701&r1=1366700&r2=1366701&view=diff
==============================================================================
---
openwebbeans/trunk/webbeans-ejb/src/main/java/org/apache/webbeans/ejb/common/interceptor/OpenWebBeansEjbInterceptor.java
(original)
+++
openwebbeans/trunk/webbeans-ejb/src/main/java/org/apache/webbeans/ejb/common/interceptor/OpenWebBeansEjbInterceptor.java
Sat Jul 28 16:07:31 2012
@@ -300,10 +300,9 @@ public class OpenWebBeansEjbInterceptor
if
(webBeansContext.getOpenWebBeansConfiguration().isUseEJBInterceptorInjection())
{
Object instance = context.getTarget();
- OWBInjector injector = new OWBInjector(webBeansContext);
try
{
- injector.inject(instance, this.cc);
+ OWBInjector.inject(webBeansContext.getBeanManagerImpl(),
instance, this.cc);
}
catch (Exception e)
{
Modified:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/OWBInjector.java
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/OWBInjector.java?rev=1366701&r1=1366700&r2=1366701&view=diff
==============================================================================
---
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/OWBInjector.java
(original)
+++
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/OWBInjector.java
Sat Jul 28 16:07:31 2012
@@ -21,7 +21,6 @@ package org.apache.webbeans.inject;
import javax.enterprise.context.spi.CreationalContext;
import javax.enterprise.inject.spi.AnnotatedType;
import javax.enterprise.inject.spi.BeanManager;
-import org.apache.webbeans.config.WebBeansContext;
/**
* Injects dependencies of the given Java EE component
@@ -32,40 +31,31 @@ import org.apache.webbeans.config.WebBea
*/
public final class OWBInjector
{
- private final WebBeansContext webBeansContext;
-
- /**
- * Creates a new instance
- * @param webBeansContext
- */
- public OWBInjector(WebBeansContext webBeansContext)
+ private OWBInjector()
{
//No operation
- this.webBeansContext = webBeansContext;
}
/**
* Inject dependencies of given instance.
+ * @param beamManager the BeanManager to use
* @param instanceUnderInjection instance
* @param ownerCreationalContext CreationalContext of the owner
* @return this injector
* @throws Exception if exception occurs
*/
@SuppressWarnings("unchecked")
- public OWBInjector inject(Object instanceUnderInjection,
CreationalContext<?> ownerCreationalContext) throws Exception
+ public static void inject(BeanManager beamManager, Object
instanceUnderInjection, CreationalContext<?> ownerCreationalContext)
+ throws Exception
{
CreationalContext<?> creationalContext = ownerCreationalContext;
- BeanManager bm = webBeansContext.getBeanManagerImpl();
-
if(creationalContext == null)
{
- creationalContext = bm.createCreationalContext(null);
+ creationalContext = beamManager.createCreationalContext(null);
}
- AnnotatedType annotatedType =
bm.createAnnotatedType(instanceUnderInjection.getClass());
- bm.createInjectionTarget(annotatedType).inject(instanceUnderInjection,
creationalContext);
-
- return this;
+ AnnotatedType annotatedType =
beamManager.createAnnotatedType(instanceUnderInjection.getClass());
+
beamManager.createInjectionTarget(annotatedType).inject(instanceUnderInjection,
creationalContext);
}
Modified:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorDataImpl.java
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorDataImpl.java?rev=1366701&r1=1366700&r2=1366701&view=diff
==============================================================================
---
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorDataImpl.java
(original)
+++
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorDataImpl.java
Sat Jul 28 16:07:31 2012
@@ -448,8 +448,7 @@ public class InterceptorDataImpl impleme
interceptor =
webBeansContext.getWebBeansUtil().newInstanceForced(interceptorClass);
try
{
- OWBInjector injector = new OWBInjector(webBeansContext);
- injector.inject(interceptor, ownerCreationalContext);
+ OWBInjector.inject(webBeansContext.getBeanManagerImpl(),
interceptor, ownerCreationalContext);
ejbInterceptorContext = new EjbInterceptorContext();
ejbInterceptorContext.setInterceptorInstance(interceptor);
Modified:
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/portable/javaee/JavaEeInjectionTest.java
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/portable/javaee/JavaEeInjectionTest.java?rev=1366701&r1=1366700&r2=1366701&view=diff
==============================================================================
---
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/portable/javaee/JavaEeInjectionTest.java
(original)
+++
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/portable/javaee/JavaEeInjectionTest.java
Sat Jul 28 16:07:31 2012
@@ -23,7 +23,6 @@ import java.util.Collection;
import junit.framework.Assert;
-import org.apache.webbeans.config.WebBeansContext;
import org.apache.webbeans.inject.OWBInjector;
import org.apache.webbeans.newtests.AbstractUnitTest;
import org.junit.Test;
@@ -38,9 +37,7 @@ public class JavaEeInjectionTest extends
startContainer(classes);
MockInstance instance = new MockInstance();
- WebBeansContext webBeansContext = WebBeansContext.getInstance();
- OWBInjector injector = new OWBInjector(webBeansContext);
- injector.inject(instance, null);
+ OWBInjector.inject(getBeanManager(), instance, null);
Assert.assertNotNull(instance.getBeanManager());
Assert.assertNotNull(instance.getSample());
