You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by rm...@apache.org on 2012/02/17 08:47:57 UTC
svn commit: r1245340 - in /openejb/trunk/openejb:
container/openejb-core/src/main/java/org/apache/openejb/cdi/
tck/cdi-embedded/src/test/java/org/apache/openejb/tck/cdi/embedded/
tck/cdi-tomee-embedded/src/main/java/org/apache/openejb/tck/cdi/tomee/emb...
Author: rmannibucau
Date: Fri Feb 17 07:47:56 2012
New Revision: 1245340
URL: http://svn.apache.org/viewvc?rev=1245340&view=rev
Log:
OWB API update
Modified:
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/cdi/OWBInjector.java
openejb/trunk/openejb/tck/cdi-embedded/src/test/java/org/apache/openejb/tck/cdi/embedded/ContextsImpl.java
openejb/trunk/openejb/tck/cdi-tomee-embedded/src/main/java/org/apache/openejb/tck/cdi/tomee/embedded/ContextsImpl.java
openejb/trunk/openejb/tck/cdi-tomee/src/main/java/org/apache/openejb/tck/cdi/tomee/ContextsImpl.java
Modified: openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/cdi/OWBInjector.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/cdi/OWBInjector.java?rev=1245340&r1=1245339&r2=1245340&view=diff
==============================================================================
--- openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/cdi/OWBInjector.java (original)
+++ openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/cdi/OWBInjector.java Fri Feb 17 07:47:56 2012
@@ -62,13 +62,13 @@ public final class OWBInjector {
private final WebBeansContext webBeansContext;
public OWBInjector() {
- this(WebBeansContext.getInstance());
+ this(WebBeansContext.currentInstance());
}
/**
* Creates a new instance
*
- * @param webBeansContext
+ * @param webBeansContext the OWB context
*/
public OWBInjector(WebBeansContext webBeansContext) {
//No operation
@@ -97,57 +97,50 @@ public final class OWBInjector {
@SuppressWarnings("unchecked")
public OWBInjector inject(Object javaEeComponentInstance, CreationalContext<?> creationalContext) throws Exception {
BeanManagerImpl beanManager = webBeansContext.getBeanManagerImpl();
- try {
- this.javaEEInstance = javaEeComponentInstance;
- if (creationalContext == null) {
- this.ownerCreationalContext = (CreationalContextImpl<?>) beanManager.createCreationalContext(null);
- }
-
- Class<Object> injectableComponentClass = (Class<Object>) javaEeComponentInstance.getClass();
-
- //Look for custom InjectionTarget
- InjectionTargetWrapper<Object> wrapper = beanManager.getInjectionTargetWrapper(injectableComponentClass);
- if (wrapper != null) {
- wrapper.inject(javaEeComponentInstance, (CreationalContext<Object>) this.ownerCreationalContext);
- return this;
- }
-
- AnnotatedType<Object> annotated = (AnnotatedType<Object>) beanManager.createAnnotatedType(injectableComponentClass);
- Set<InjectionPoint> injectionPoints = WebBeansAnnotatedTypeUtil.getJavaEeComponentInstanceInjectionPoints(webBeansContext, annotated);
- if (injectionPoints != null && injectionPoints.size() > 0) {
- for (InjectionPoint injectionPoint : injectionPoints) {
- if (injectionPoint.getMember() instanceof Method) {
- Method method = (Method) injectionPoint.getMember();
-
- //Get injected method arguments
- List<Object> parameters = getInjectedMethodParameterReferences(injectionPoint, beanManager, injectionPoints);
-
- //Set method
- ClassUtil.callInstanceMethod(method, javaEeComponentInstance, parameters.toArray(new Object[parameters.size()]));
-
- } else if (injectionPoint.getMember() instanceof Field) {
- //Get injected object ref
- Object object = getInjectedObjectReference(injectionPoint, beanManager);
-
- //Set field
- Field field = (Field) injectionPoint.getMember();
-
- try {
- field.setAccessible(true);
- field.set(javaEeComponentInstance, object);
- } catch (Exception e) {
- throw new WebBeansException(e);
- }
+ this.javaEEInstance = javaEeComponentInstance;
+ if (creationalContext == null) {
+ this.ownerCreationalContext = (CreationalContextImpl<?>) beanManager.createCreationalContext(null);
+ }
+
+ Class<Object> injectableComponentClass = (Class<Object>) javaEeComponentInstance.getClass();
+
+ //Look for custom InjectionTarget
+ InjectionTargetWrapper<Object> wrapper = beanManager.getInjectionTargetWrapper(injectableComponentClass);
+ if (wrapper != null) {
+ wrapper.inject(javaEeComponentInstance, (CreationalContext<Object>) this.ownerCreationalContext);
+ return this;
+ }
+
+ AnnotatedType<Object> annotated = beanManager.createAnnotatedType(injectableComponentClass);
+ Set<InjectionPoint> injectionPoints = WebBeansAnnotatedTypeUtil.getJavaEeComponentInstanceInjectionPoints(webBeansContext, annotated);
+ if (injectionPoints != null && injectionPoints.size() > 0) {
+ for (InjectionPoint injectionPoint : injectionPoints) {
+ if (injectionPoint.getMember() instanceof Method) {
+ Method method = (Method) injectionPoint.getMember();
+
+ //Get injected method arguments
+ List<Object> parameters = getInjectedMethodParameterReferences(injectionPoint, beanManager, injectionPoints);
+
+ //Set method
+ ClassUtil.callInstanceMethod(method, javaEeComponentInstance, parameters.toArray(new Object[parameters.size()]));
+
+ } else if (injectionPoint.getMember() instanceof Field) {
+ //Get injected object ref
+ Object object = getInjectedObjectReference(injectionPoint, beanManager);
+
+ //Set field
+ Field field = (Field) injectionPoint.getMember();
+
+ try {
+ field.setAccessible(true);
+ field.set(javaEeComponentInstance, object);
+ } catch (Exception e) {
+ throw new WebBeansException(e);
}
}
-
- return this;
}
-
- }
- catch (Exception e) {
- throw e;
+ return this;
}
return null;
@@ -182,12 +175,12 @@ public final class OWBInjector {
* @return injected reference
*/
private Object getInjectedObjectReference(InjectionPoint injectionPoint, BeanManagerImpl beanManager) {
- Object object = null;
+ Object object;
//Injected contextual beam
InjectionResolver injectionResolver = beanManager.getInjectionResolver();
- Bean<?> injectedBean = (Bean<?>) injectionResolver.getInjectionPointBean(injectionPoint);
+ Bean<?> injectedBean = injectionResolver.getInjectionPointBean(injectionPoint);
if (isInstanceProviderInjection(injectionPoint)) {
InstanceBean.local.set(injectionPoint);
@@ -195,7 +188,7 @@ public final class OWBInjector {
EventBean.local.set(injectionPoint);
} else if (WebBeansUtil.isDependent(injectedBean)) {
if (!InjectionPoint.class.isAssignableFrom(ClassUtil.getClass(injectionPoint.getType()))) {
- InjectionPointBean.local.set(injectionPoint);
+ InjectionPointBean.setThreadLocal(injectionPoint);
}
}
Modified: openejb/trunk/openejb/tck/cdi-embedded/src/test/java/org/apache/openejb/tck/cdi/embedded/ContextsImpl.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/tck/cdi-embedded/src/test/java/org/apache/openejb/tck/cdi/embedded/ContextsImpl.java?rev=1245340&r1=1245339&r2=1245340&view=diff
==============================================================================
--- openejb/trunk/openejb/tck/cdi-embedded/src/test/java/org/apache/openejb/tck/cdi/embedded/ContextsImpl.java (original)
+++ openejb/trunk/openejb/tck/cdi-embedded/src/test/java/org/apache/openejb/tck/cdi/embedded/ContextsImpl.java Fri Feb 17 07:47:56 2012
@@ -30,7 +30,7 @@ import javax.enterprise.context.RequestS
public class ContextsImpl implements org.jboss.jsr299.tck.spi.Contexts<AbstractContext> {
public AbstractContext getRequestContext() {
- ContextFactory contextFactory = WebBeansContext.getInstance().getContextFactory();
+ ContextFactory contextFactory = WebBeansContext.currentInstance().getContextFactory();
RequestContext ctx = (RequestContext) contextFactory.getStandardContext(RequestScoped.class);
if (ctx == null) {
@@ -50,7 +50,7 @@ public class ContextsImpl implements org
}
public AbstractContext getDependentContext() {
- ContextFactory contextFactory = WebBeansContext.getInstance().getContextFactory();
+ ContextFactory contextFactory = WebBeansContext.currentInstance().getContextFactory();
return (AbstractContext) contextFactory.getStandardContext(ContextTypes.DEPENDENT);
}
Modified: openejb/trunk/openejb/tck/cdi-tomee-embedded/src/main/java/org/apache/openejb/tck/cdi/tomee/embedded/ContextsImpl.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/tck/cdi-tomee-embedded/src/main/java/org/apache/openejb/tck/cdi/tomee/embedded/ContextsImpl.java?rev=1245340&r1=1245339&r2=1245340&view=diff
==============================================================================
--- openejb/trunk/openejb/tck/cdi-tomee-embedded/src/main/java/org/apache/openejb/tck/cdi/tomee/embedded/ContextsImpl.java (original)
+++ openejb/trunk/openejb/tck/cdi-tomee-embedded/src/main/java/org/apache/openejb/tck/cdi/tomee/embedded/ContextsImpl.java Fri Feb 17 07:47:56 2012
@@ -30,7 +30,7 @@ import javax.enterprise.context.RequestS
public class ContextsImpl implements org.jboss.jsr299.tck.spi.Contexts<AbstractContext> {
public AbstractContext getRequestContext() {
- ContextFactory contextFactory = WebBeansContext.getInstance().getContextFactory();
+ ContextFactory contextFactory = WebBeansContext.currentInstance().getContextFactory();
RequestContext ctx = (RequestContext) contextFactory.getStandardContext(RequestScoped.class);
if (ctx == null) {
@@ -50,7 +50,7 @@ public class ContextsImpl implements org
}
public AbstractContext getDependentContext() {
- ContextFactory contextFactory = WebBeansContext.getInstance().getContextFactory();
+ ContextFactory contextFactory = WebBeansContext.currentInstance().getContextFactory();
return (AbstractContext) contextFactory.getStandardContext(ContextTypes.DEPENDENT);
}
Modified: openejb/trunk/openejb/tck/cdi-tomee/src/main/java/org/apache/openejb/tck/cdi/tomee/ContextsImpl.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/tck/cdi-tomee/src/main/java/org/apache/openejb/tck/cdi/tomee/ContextsImpl.java?rev=1245340&r1=1245339&r2=1245340&view=diff
==============================================================================
--- openejb/trunk/openejb/tck/cdi-tomee/src/main/java/org/apache/openejb/tck/cdi/tomee/ContextsImpl.java (original)
+++ openejb/trunk/openejb/tck/cdi-tomee/src/main/java/org/apache/openejb/tck/cdi/tomee/ContextsImpl.java Fri Feb 17 07:47:56 2012
@@ -30,7 +30,7 @@ import javax.enterprise.context.RequestS
public class ContextsImpl implements org.jboss.jsr299.tck.spi.Contexts<AbstractContext> {
public AbstractContext getRequestContext() {
- ContextFactory contextFactory = WebBeansContext.getInstance().getContextFactory();
+ ContextFactory contextFactory = WebBeansContext.currentInstance().getContextFactory();
RequestContext ctx = (RequestContext) contextFactory.getStandardContext(RequestScoped.class);
if (ctx == null) {
@@ -50,7 +50,7 @@ public class ContextsImpl implements org
}
public AbstractContext getDependentContext() {
- ContextFactory contextFactory = WebBeansContext.getInstance().getContextFactory();
+ ContextFactory contextFactory = WebBeansContext.currentInstance().getContextFactory();
return (AbstractContext) contextFactory.getStandardContext(ContextTypes.DEPENDENT);
}