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 2014/12/26 19:00:11 UTC
tomee git commit: we can't add self interception in ejb interceptors
otherwise interceptor chain is broken,
adding it next to other interceptors to control its position
Repository: tomee
Updated Branches:
refs/heads/develop b1442ea28 -> a3ee92eda
we can't add self interception in ejb interceptors otherwise interceptor chain is broken, adding it next to other interceptors to control its position
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/a3ee92ed
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/a3ee92ed
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/a3ee92ed
Branch: refs/heads/develop
Commit: a3ee92eda10b14cb5427fb877d53b08e0222c1b8
Parents: b1442ea
Author: Romain Manni-Bucau <rm...@apache.org>
Authored: Fri Dec 26 18:55:37 2014 +0100
Committer: Romain Manni-Bucau <rm...@apache.org>
Committed: Fri Dec 26 18:55:37 2014 +0100
----------------------------------------------------------------------
.../java/org/apache/openejb/BeanContext.java | 29 +++++++++++++++++++-
.../java/org/apache/openejb/MethodContext.java | 8 ++++++
.../classic/InterceptorBindingBuilder.java | 2 +-
tck/cdi-embedded/src/test/resources/failing.xml | 2 +-
4 files changed, 38 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/a3ee92ed/container/openejb-core/src/main/java/org/apache/openejb/BeanContext.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/BeanContext.java b/container/openejb-core/src/main/java/org/apache/openejb/BeanContext.java
index 9ba9c73..d59fb0f 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/BeanContext.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/BeanContext.java
@@ -44,6 +44,7 @@ import org.apache.openejb.util.Logger;
import org.apache.openejb.util.proxy.DynamicProxyImplFactory;
import org.apache.openejb.util.proxy.LocalBeanProxyFactory;
import org.apache.openejb.util.reflection.Reflections;
+import org.apache.webbeans.component.CdiInterceptorBean;
import org.apache.webbeans.component.InjectionTargetBean;
import org.apache.webbeans.config.WebBeansContext;
import org.apache.webbeans.context.creational.CreationalContextImpl;
@@ -71,6 +72,7 @@ import javax.enterprise.context.ConversationScoped;
import javax.enterprise.context.spi.CreationalContext;
import javax.enterprise.inject.spi.Decorator;
import javax.enterprise.inject.spi.DeploymentException;
+import javax.enterprise.inject.spi.InterceptionType;
import javax.enterprise.inject.spi.Interceptor;
import javax.naming.Context;
import javax.persistence.EntityManagerFactory;
@@ -82,6 +84,7 @@ import java.lang.reflect.Modifier;
import java.lang.reflect.Type;
import java.util.ArrayList;
import java.util.Collection;
+import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
@@ -95,6 +98,8 @@ import java.util.TreeSet;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.Future;
+import static java.util.Arrays.asList;
+
@SuppressWarnings("unchecked")
public class BeanContext extends DeploymentContext {
@@ -130,7 +135,24 @@ public class BeanContext extends DeploymentContext {
}
for (final Interceptor<?> i : interceptors) {
- addCdiMethodInterceptor(entry.getKey(), InterceptorData.scan(i.getBeanClass()));
+ final InterceptorData data;
+ if (CdiInterceptorBean.class.isInstance(i)) {
+ final CdiInterceptorBean cdiInterceptorBean = CdiInterceptorBean.class.cast(i);
+
+ data = new InterceptorData(i.getBeanClass());
+ data.getAroundInvoke().addAll(getInterceptionMethodAsListOrEmpty(cdiInterceptorBean, InterceptionType.AROUND_INVOKE));
+ data.getPostConstruct().addAll(getInterceptionMethodAsListOrEmpty(cdiInterceptorBean, InterceptionType.POST_CONSTRUCT));
+ data.getPreDestroy().addAll(getInterceptionMethodAsListOrEmpty(cdiInterceptorBean, InterceptionType.PRE_DESTROY));
+ data.getPostActivate().addAll(getInterceptionMethodAsListOrEmpty(cdiInterceptorBean, InterceptionType.POST_ACTIVATE));
+ data.getPrePassivate().addAll(getInterceptionMethodAsListOrEmpty(cdiInterceptorBean, InterceptionType.PRE_PASSIVATE));
+ data.getAroundTimeout().addAll(getInterceptionMethodAsListOrEmpty(cdiInterceptorBean, InterceptionType.AROUND_TIMEOUT));
+ /*
+ AfterBegin, BeforeCompletion and AfterCompletion are ignored since not handled by CDI
+ */
+ } else { // TODO: here we are not as good as in previous if since we loose inheritance etc
+ data = InterceptorData.scan(i.getBeanClass());
+ }
+ addCdiMethodInterceptor(entry.getKey(), data);
}
hasInterceptor = hasInterceptor || interceptors.length > 0;
entry.getValue().setEjbInterceptors(new ArrayList<Interceptor<?>>());
@@ -190,6 +212,11 @@ public class BeanContext extends DeploymentContext {
clear(Collection.class.cast(Reflections.get(info, "cdiInterceptors")));
}
+ private List<Method> getInterceptionMethodAsListOrEmpty(final CdiInterceptorBean cdiInterceptorBean, final InterceptionType aroundInvoke) {
+ final Method[] methods = cdiInterceptorBean.getInterceptorMethods(aroundInvoke);
+ return methods == null ? Collections.<Method>emptyList() : asList(methods);
+ }
+
private static void clear(final Collection<?> c) {
if (c != null) { // yeah can be null with dynamically impl beans
c.clear();
http://git-wip-us.apache.org/repos/asf/tomee/blob/a3ee92ed/container/openejb-core/src/main/java/org/apache/openejb/MethodContext.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/MethodContext.java b/container/openejb-core/src/main/java/org/apache/openejb/MethodContext.java
index 83946c2..6814605 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/MethodContext.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/MethodContext.java
@@ -38,6 +38,7 @@ public class MethodContext {
private final List<ScheduleData> schedules = new ArrayList<ScheduleData>();
private final List<InterceptorData> interceptors = new ArrayList<InterceptorData>();
private final Set<InterceptorData> cdiInterceptors = new LinkedHashSet<InterceptorData>();
+ private InterceptorData self = null;
private LockType lockType;
private TransactionType transactionType;
private Duration accessTimeout;
@@ -48,6 +49,10 @@ public class MethodContext {
this.beanMethod = beanMethod;
}
+ public void setSelfInterception(final InterceptorData data) {
+ self = data;
+ }
+
public void setAccessTimeout(final Duration accessTimeout) {
this.accessTimeout = accessTimeout;
}
@@ -78,6 +83,9 @@ public class MethodContext {
datas.addAll(interceptors);
datas.addAll(beanContext.getCdiInterceptors());
datas.addAll(cdiInterceptors);
+ if (self != null) {
+ datas.add(self); // always last, that's why putting it in interceptors doesn't work
+ }
return datas;
}
http://git-wip-us.apache.org/repos/asf/tomee/blob/a3ee92ed/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/InterceptorBindingBuilder.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/InterceptorBindingBuilder.java b/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/InterceptorBindingBuilder.java
index 7660cfc..7ae4875 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/InterceptorBindingBuilder.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/InterceptorBindingBuilder.java
@@ -144,8 +144,8 @@ public class InterceptorBindingBuilder {
for (final Method method : clazz.getDeclaredMethods()) {
final List<InterceptorData> methodInterceptors = createInterceptorDatas(method, beanInfo.ejbName, this.bindings);
// The bean itself gets to intercept too and is always last.
- methodInterceptors.add(beanAsInterceptor);
beanContext.setMethodInterceptors(method, methodInterceptors);
+ beanContext.getMethodContext(method).setSelfInterception(beanAsInterceptor);
}
clazz = clazz.getSuperclass();
}
http://git-wip-us.apache.org/repos/asf/tomee/blob/a3ee92ed/tck/cdi-embedded/src/test/resources/failing.xml
----------------------------------------------------------------------
diff --git a/tck/cdi-embedded/src/test/resources/failing.xml b/tck/cdi-embedded/src/test/resources/failing.xml
index 30674b2..b8a90f6 100644
--- a/tck/cdi-embedded/src/test/resources/failing.xml
+++ b/tck/cdi-embedded/src/test/resources/failing.xml
@@ -26,7 +26,7 @@
-Dopenejb.deploymentId.format={appId}/{ejbJarId}/{ejbName}
-->
<classes>
- <class name="org.jboss.cdi.tck.tests.context.application.ejb.ApplicationContextSharedTest" />
+ <class name="org.jboss.cdi.tck.interceptors.tests.contract.aroundInvoke.bindings.ejb.SessionBeanAroundInvokeInterceptorTest" />
</classes>
</test>
</suite>