Repository: tomee Updated Branches: refs/heads/fb_tomee8 74b2cad62 -> d8bfd0565
validating @ObservesAsync in EJB contract Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/d8bfd056 Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/d8bfd056 Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/d8bfd056 Branch: refs/heads/fb_tomee8 Commit: d8bfd05659fd2915399ed5575ba015f9bb52d7e0 Parents: 74b2cad Author: Romain Manni-Bucau <rmannibu...@gmail.com> Authored: Thu Feb 1 10:05:39 2018 +0100 Committer: Romain Manni-Bucau <rmannibu...@gmail.com> Committed: Thu Feb 1 10:05:39 2018 +0100 ---------------------------------------------------------------------- .../src/main/java/org/apache/openejb/cdi/CdiPlugin.java | 4 ++++ tck/cdi-embedded/src/test/resources/failing.xml | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tomee/blob/d8bfd056/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiPlugin.java ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiPlugin.java b/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiPlugin.java index edac247..bdf7486 100644 --- a/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiPlugin.java +++ b/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiPlugin.java @@ -55,6 +55,7 @@ import javax.enterprise.context.Dependent; import javax.enterprise.context.spi.Context; import javax.enterprise.context.spi.Contextual; import javax.enterprise.context.spi.CreationalContext; +import javax.enterprise.event.ObservesAsync; import javax.enterprise.inject.Disposes; import javax.enterprise.inject.Specializes; import javax.enterprise.inject.Vetoed; @@ -480,6 +481,9 @@ public class CdiPlugin extends AbstractOwbPlugin implements OpenWebBeansJavaEEPl if (!Modifier.isStatic(method.getModifiers()) && doResolveViewMethod(bean, method) == null) { throw new WebBeansConfigurationException("@Observes " + method + " neither in the ejb view of ejb " + bean.getBeanContext().getEjbName() + " nor static"); } + if (m.getValue().getParameters().stream().anyMatch(p -> p.isAnnotationPresent(ObservesAsync.class))) { + throw new WebBeansConfigurationException("@ObservesAsync " + method + " not supported on EJB in CDI 2"); + } } } http://git-wip-us.apache.org/repos/asf/tomee/blob/d8bfd056/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 cec8f40..15aa7cc 100644 --- a/tck/cdi-embedded/src/test/resources/failing.xml +++ b/tck/cdi-embedded/src/test/resources/failing.xml @@ -39,7 +39,7 @@ TODO these are tests we finally need to pass! --> <classes> - <class name="org.jboss.cdi.tck.tests.context.conversation.determination.ConversationDeterminationTest" /> + <class name="org.jboss.cdi.tck.tests.event.observer.context.async.enterprise.EnterpriseSecurityContextPropagationInAsyncObserverTest" /> </classes> </test> </suite>