You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by st...@apache.org on 2015/03/11 12:56:23 UTC
[07/50] tomee git commit: taking into account CDI
@PostConstruct/@PreDestroy interceptors (only) for EJB + fixing ordering of
interceptors for CDI-EJB
taking into account CDI @PostConstruct/@PreDestroy interceptors (only) for EJB + fixing ordering of interceptors for CDI-EJB
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/788b74f0
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/788b74f0
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/788b74f0
Branch: refs/heads/master
Commit: 788b74f0aadc279429d7ad3f9ce962b5004f1067
Parents: a1ec5e3
Author: Romain Manni-Bucau <rm...@apache.org>
Authored: Wed Mar 4 23:00:46 2015 +0100
Committer: Romain Manni-Bucau <rm...@apache.org>
Committed: Wed Mar 4 23:00:46 2015 +0100
----------------------------------------------------------------------
.../java/org/apache/openejb/BeanContext.java | 105 ++++++++-----------
tck/cdi-embedded/src/test/resources/failing.xml | 2 +-
2 files changed, 47 insertions(+), 60 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/788b74f0/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 beba15d..c2f70ff 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
@@ -124,7 +124,22 @@ public class BeanContext extends DeploymentContext {
return;
}
- boolean hasInterceptor = false;
+ final Collection<Interceptor<?>> postConstructInterceptors = Collection.class.cast(Reflections.get(injectionTarget, "postConstructInterceptors"));
+ final Collection<Interceptor<?>> preDestroyInterceptors = Collection.class.cast(Reflections.get(injectionTarget, "preDestroyInterceptors"));
+ for (final Interceptor<?> pc : postConstructInterceptors) {
+ final InterceptorData interceptorData = createInterceptorData(pc);
+ instanceScopedInterceptors.add(interceptorData);
+ cdiInterceptors.add(interceptorData);
+ }
+ for (final Interceptor<?> pd : preDestroyInterceptors) {
+ if (postConstructInterceptors.contains(pd)) {
+ continue;
+ }
+ final InterceptorData interceptorData = createInterceptorData(pd);
+ instanceScopedInterceptors.add(interceptorData);
+ cdiInterceptors.add(interceptorData);
+ }
+
for (final Map.Entry<Method, InterceptorResolutionService.BusinessMethodInterceptorInfo> entry : info.getBusinessMethodsInfo().entrySet()) {
final Interceptor<?>[] interceptors = entry.getValue().getCdiInterceptors();
if (interceptors == null) {
@@ -132,65 +147,19 @@ public class BeanContext extends DeploymentContext {
}
for (final Interceptor<?> i : interceptors) {
- 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());
+ // already at class level, since we merge "hooks" in InterceptorData no need to add it again
+ if (postConstructInterceptors.contains(i) || preDestroyInterceptors.contains(i)) {
+ continue;
}
+ final InterceptorData data = createInterceptorData(i);
addCdiMethodInterceptor(entry.getKey(), data);
}
- hasInterceptor = hasInterceptor || interceptors.length > 0;
entry.getValue().setEjbInterceptors(new ArrayList<Interceptor<?>>());
entry.getValue().setCdiInterceptors(new ArrayList<Interceptor<?>>());
}
- /* Was a TCK bug :)
- if (hasInterceptor) { // 100% for TCKs, doesn't make any sense
- for (final Method m : getManagedClass().getDeclaredMethods()) {
- boolean inApi = false;
- final Set<Type> types = cdiEjbBean.getTypes();
- for (final Type t : types) {
- if (t == Object.class || t == Serializable.class) {
- continue;
- }
- if (m.getDeclaringClass() == t) {
- inApi = true;
- break;
- }
- if (Class.class.isInstance(t)) {
- try {
- Class.class.cast(t).getMethod(m.getName(), m.getParameterTypes());
- inApi = true;
- break;
- } catch (final NoSuchMethodException e) {
- // no-op
- }
- }
- }
- if (inApi) {
- continue;
- }
- final int modifiers = m.getModifiers();
- if (Modifier.isFinal(modifiers) && !Modifier.isStatic(modifiers) && Modifier.isPublic(modifiers)) {
- throw new DeploymentException("We need to proxy " + getManagedClass() + " but " + m + " is final");
- }
- }
- }
- */
-
- if (info.getSelfInterceptorBean() != null) { // handled by openejb
+ // handled by OpenEJB now so clean up all duplication from OWB
+ if (info.getSelfInterceptorBean() != null) {
try {
final Field field = InterceptorResolutionService.BeanInterceptorInfo.class.getDeclaredField("selfInterceptorBean");
field.setAccessible(true);
@@ -199,18 +168,36 @@ public class BeanContext extends DeploymentContext {
// no-op
}
}
-
- // handled by OpenEJB so clean up from OWB
Map.class.cast(Reflections.get(injectionTarget, "methodInterceptors")).clear();
- clear(Collection.class.cast(Reflections.get(injectionTarget, "postConstructInterceptors")));
+ clear(Collection.class.cast(postConstructInterceptors));
+ clear(Collection.class.cast(preDestroyInterceptors));
clear(Collection.class.cast(Reflections.get(injectionTarget, "postConstructMethods")));
- clear(Collection.class.cast(Reflections.get(injectionTarget, "preDestroyInterceptors")));
clear(Collection.class.cast(Reflections.get(injectionTarget, "preDestroyMethods")));
-
clear(Collection.class.cast(Reflections.get(info, "ejbInterceptors")));
clear(Collection.class.cast(Reflections.get(info, "cdiInterceptors")));
}
+ private InterceptorData createInterceptorData(final Interceptor<?> i) {
+ 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 since we loose inheritance for instance
+ data = InterceptorData.scan(i.getBeanClass());
+ }
+ return data;
+ }
+
private List<Method> getInterceptionMethodAsListOrEmpty(final CdiInterceptorBean cdiInterceptorBean, final InterceptionType aroundInvoke) {
final Method[] methods = cdiInterceptorBean.getInterceptorMethods(aroundInvoke);
return methods == null ? Collections.<Method>emptyList() : asList(methods);
@@ -1116,8 +1103,8 @@ public class BeanContext extends DeploymentContext {
public List<InterceptorData> getCallbackInterceptors() {
final List<InterceptorData> datas = getInterceptorData();
- datas.addAll(callbackInterceptors);
datas.addAll(cdiInterceptors);
+ datas.addAll(callbackInterceptors);
return datas;
}
http://git-wip-us.apache.org/repos/asf/tomee/blob/788b74f0/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 09755fc..01cc8b3 100644
--- a/tck/cdi-embedded/src/test/resources/failing.xml
+++ b/tck/cdi-embedded/src/test/resources/failing.xml
@@ -31,7 +31,7 @@
-Dopenejb.embedded.try-jsp=true
-->
<classes>
- <class name="org.jboss.cdi.tck.tests.definition.bean.types.enterprise.SessionBeanTypesTest" />
+ <class name="org.jboss.cdi.tck.interceptors.tests.contract.lifecycleCallback.bindings.ejb.SessionBeanLifecycleInterceptorDefinitionTest" />
</classes>
</test>
</suite>