commit f4d240bfe1079053cb2ee0a826f0eb14b970d7f9
author Romain Manni-Bucau <rmannibucau@gmail.com> Tue Nov 10 15:16:34 2020 +0100
committer Romain Manni-Bucau <rmannibucau@gmail.com> Tue Nov 10 15:16:34 2020 +0100
tree 429e7ad5972ba9af31d5c8cc528d73c4e79f6a63
parent c6df47d1d1f611e24294e70206a77f4706cea1c7

[GERONIMO-6789] ensure we don't veto the bean we add

pom.xml

diff --git a/pom.xml b/pom.xml
index 9834d80..8f63359 100644
--- a/pom.xml
+++ b/pom.xml
@@ -141,7 +141,7 @@
     <dependency>
       <groupId>org.apache.openwebbeans</groupId>
       <artifactId>openwebbeans-impl</artifactId>
-      <version>2.0.5</version>
+      <version>2.0.19</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
@@ -250,7 +250,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
-        <version>2.20.1</version>
+        <version>3.0.0-M5</version>
         <configuration>
           <systemPropertyVariables>
             <java.net.preferIPv4Stack>true</java.net.preferIPv4Stack>

src/main/java/org/apache/geronimo/jcache/simple/cdi/MakeJCacheCDIInterceptorFriendly.java

diff --git a/src/main/java/org/apache/geronimo/jcache/simple/cdi/MakeJCacheCDIInterceptorFriendly.java b/src/main/java/org/apache/geronimo/jcache/simple/cdi/MakeJCacheCDIInterceptorFriendly.java
index d56f6ec..032e358 100644
--- a/src/main/java/org/apache/geronimo/jcache/simple/cdi/MakeJCacheCDIInterceptorFriendly.java
+++ b/src/main/java/org/apache/geronimo/jcache/simple/cdi/MakeJCacheCDIInterceptorFriendly.java
@@ -45,6 +45,7 @@
 import javax.enterprise.inject.spi.InjectionTarget;
 import javax.enterprise.inject.spi.PassivationCapable;
 import javax.enterprise.inject.spi.ProcessAnnotatedType;
+import javax.enterprise.inject.spi.ProcessSyntheticAnnotatedType;
 
 // TODO: observe annotated type (or maybe sthg else) to cache data and inject this extension (used as metadata cache)
 // to get class model and this way allow to add cache annotation on the fly - == avoid java pure reflection to get metadata
@@ -57,7 +58,7 @@
 
     private boolean needHelper = true;
 
-    protected void discoverInterceptorBindings(final @Observes BeforeBeanDiscovery beforeBeanDiscovery,
+    public void discoverInterceptorBindings(final @Observes BeforeBeanDiscovery beforeBeanDiscovery,
             final BeanManager bm) {
         if (SKIP) {
             return;
@@ -71,7 +72,7 @@
                 .forEach(it -> beforeBeanDiscovery.addAnnotatedType(bm.createAnnotatedType(it)));
     }
 
-    protected void addHelper(final @Observes AfterBeanDiscovery afterBeanDiscovery, final BeanManager bm) {
+    public void addHelper(final @Observes AfterBeanDiscovery afterBeanDiscovery, final BeanManager bm) {
         if (SKIP) {
             return;
         }
@@ -84,11 +85,11 @@
         afterBeanDiscovery.addBean(bean);
     }
 
-    protected void vetoScannedCDIJCacheHelperQualifiers(final @Observes ProcessAnnotatedType<CDIJCacheHelper> pat) {
+    public void vetoScannedCDIJCacheHelperQualifiers(final @Observes ProcessAnnotatedType<CDIJCacheHelper> pat) {
         if (SKIP) {
             return;
         }
-        if (!needHelper) { // already seen, shouldn't really happen,just a protection
+        if (!needHelper && !ProcessSyntheticAnnotatedType.class.isInstance(pat)) { // already seen, shouldn't really happen,just a protection
             pat.veto();
         }
         needHelper = false;