Fixes piranhacloud#3335 - Use the new extension

Thihup · Jun 20, 2023 · d573b52 · d573b52
1 parent fd87ae3
commit d573b52
Show file tree

Hide file tree

Showing 19 changed files with 95 additions and 16 deletions.
diff --git a/extension/coreprofile/pom.xml b/extension/coreprofile/pom.xml
@@ -31,6 +31,12 @@
             <version>${project.version}</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>cloud.piranha.extension</groupId>
+            <artifactId>piranha-extension-annotationscan-classfile</artifactId>
+            <version>${project.version}</version>
+            <scope>compile</scope>
+        </dependency>
         <dependency>
             <groupId>cloud.piranha.extension</groupId>
             <artifactId>piranha-extension-naming</artifactId>

diff --git a/...n/coreprofile/src/main/java/cloud/piranha/extension/coreprofile/CoreProfileExtension.java b/...n/coreprofile/src/main/java/cloud/piranha/extension/coreprofile/CoreProfileExtension.java
@@ -29,7 +29,8 @@
 
 import cloud.piranha.core.api.WebApplicationExtension;
 import cloud.piranha.core.api.WebApplicationExtensionContext;
-import cloud.piranha.extension.annotationscan.classfile.AnnotationScanExtension;
+import cloud.piranha.extension.annotationscan.AnnotationScanExtension;
+import cloud.piranha.extension.annotationscan.classfile.ClassfileAnnotationScanExtension;
 import cloud.piranha.extension.naming.NamingExtension;
 import cloud.piranha.extension.scinitializer.ServletContainerInitializerExtension;
 
@@ -43,7 +44,15 @@ public class CoreProfileExtension implements WebApplicationExtension {
     @Override
     public void extend(WebApplicationExtensionContext context) {
         context.add(NamingExtension.class);                         // Naming (JNDI)
-        context.add(AnnotationScanExtension.class);
+        context.add(getAnnotationScanExtensionClass());
         context.add(ServletContainerInitializerExtension.class);    // ServletContainerInitializer
     }
+
+    private static Class<? extends WebApplicationExtension> getAnnotationScanExtensionClass() {
+        if (System.getProperty(ClassfileAnnotationScanExtension.EXPERIMENTAL_PROPERTY) != null) {
+            return ClassfileAnnotationScanExtension.class;   // Annotation scanning using the new Classfile API
+        }
+        return AnnotationScanExtension.class;  // Annotation scanning
+    }
+
 }
diff --git a/extension/coreprofile/src/main/java/module-info.java b/extension/coreprofile/src/main/java/module-info.java
@@ -49,6 +49,7 @@
     opens cloud.piranha.extension.coreprofile;
     requires cloud.piranha.core.api;
     requires cloud.piranha.extension.annotationscan;
+    requires cloud.piranha.extension.annotationscan.classfile;
     requires cloud.piranha.extension.naming;
     requires cloud.piranha.extension.scinitializer;
     requires jakarta.ws.rs;

diff --git a/extension/microprofile/pom.xml b/extension/microprofile/pom.xml
@@ -31,6 +31,12 @@
             <version>${project.version}</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>cloud.piranha.extension</groupId>
+            <artifactId>piranha-extension-annotationscan-classfile</artifactId>
+            <version>${project.version}</version>
+            <scope>compile</scope>
+        </dependency>
         <dependency>
             <groupId>cloud.piranha.extension</groupId>
             <artifactId>piranha-extension-naming</artifactId>

diff --git a/...icroprofile/src/main/java/cloud/piranha/extension/microprofile/MicroProfileExtension.java b/...icroprofile/src/main/java/cloud/piranha/extension/microprofile/MicroProfileExtension.java
@@ -29,7 +29,8 @@
 
 import cloud.piranha.core.api.WebApplicationExtension;
 import cloud.piranha.core.api.WebApplicationExtensionContext;
-import cloud.piranha.extension.annotationscan.classfile.AnnotationScanExtension;
+import cloud.piranha.extension.annotationscan.AnnotationScanExtension;
+import cloud.piranha.extension.annotationscan.classfile.ClassfileAnnotationScanExtension;
 import cloud.piranha.extension.naming.NamingExtension;
 import cloud.piranha.extension.scinitializer.ServletContainerInitializerExtension;
 
@@ -43,7 +44,15 @@ public class MicroProfileExtension implements WebApplicationExtension {
     @Override
     public void extend(WebApplicationExtensionContext context) {
         context.add(NamingExtension.class);                         // Naming (JNDI)
-        context.add(AnnotationScanExtension.class);
+        context.add(getAnnotationScanExtensionClass());
         context.add(ServletContainerInitializerExtension.class);    // ServletContainerInitializer
     }
+
+    private static Class<? extends WebApplicationExtension> getAnnotationScanExtensionClass() {
+        if (System.getProperty(ClassfileAnnotationScanExtension.EXPERIMENTAL_PROPERTY) != null) {
+            return ClassfileAnnotationScanExtension.class;   // Annotation scanning using the new Classfile API
+        }
+        return AnnotationScanExtension.class;  // Annotation scanning
+    }
+
 }
diff --git a/extension/microprofile/src/main/java/module-info.java b/extension/microprofile/src/main/java/module-info.java
@@ -48,6 +48,7 @@
     opens cloud.piranha.extension.microprofile;
     requires cloud.piranha.core.api;
     requires cloud.piranha.extension.annotationscan;
+    requires cloud.piranha.extension.annotationscan.classfile;
     requires cloud.piranha.extension.naming;
     requires cloud.piranha.extension.scinitializer;
     requires jakarta.ws.rs;

diff --git a/extension/platform/pom.xml b/extension/platform/pom.xml
@@ -32,6 +32,12 @@
             <version>${project.version}</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>cloud.piranha.extension</groupId>
+            <artifactId>piranha-extension-annotationscan-classfile</artifactId>
+            <version>${project.version}</version>
+            <scope>compile</scope>
+        </dependency>
         <dependency>
             <groupId>cloud.piranha.extension</groupId>
             <artifactId>piranha-extension-naming</artifactId>

diff --git a/extension/platform/src/main/java/cloud/piranha/extension/platform/PlatformExtension.java b/extension/platform/src/main/java/cloud/piranha/extension/platform/PlatformExtension.java
@@ -29,7 +29,8 @@
 
 import cloud.piranha.core.api.WebApplicationExtension;
 import cloud.piranha.core.api.WebApplicationExtensionContext;
-import cloud.piranha.extension.annotationscan.classfile.AnnotationScanExtension;
+import cloud.piranha.extension.annotationscan.AnnotationScanExtension;
+import cloud.piranha.extension.annotationscan.classfile.ClassfileAnnotationScanExtension;
 import cloud.piranha.extension.naming.NamingExtension;
 import cloud.piranha.extension.scinitializer.ServletContainerInitializerExtension;
 
@@ -43,7 +44,15 @@ public class PlatformExtension implements WebApplicationExtension {
     @Override
     public void extend(WebApplicationExtensionContext context) {
         context.add(NamingExtension.class);                         // Naming (JNDI)
-        context.add(AnnotationScanExtension.class);                 // Annotation scanning
+        context.add(getAnnotationScanExtensionClass());                 // Annotation scanning
         context.add(ServletContainerInitializerExtension.class);    // ServletContainerInitializer
     }
+
+    private static Class<? extends WebApplicationExtension> getAnnotationScanExtensionClass() {
+        if (System.getProperty(ClassfileAnnotationScanExtension.EXPERIMENTAL_PROPERTY) != null) {
+            return ClassfileAnnotationScanExtension.class;   // Annotation scanning using the new Classfile API
+        }
+        return AnnotationScanExtension.class;  // Annotation scanning
+    }
+
 }
diff --git a/extension/platform/src/main/java/module-info.java b/extension/platform/src/main/java/module-info.java
@@ -49,6 +49,7 @@
     opens cloud.piranha.extension.platform;
     requires cloud.piranha.core.api;
     requires cloud.piranha.extension.annotationscan;
+    requires cloud.piranha.extension.annotationscan.classfile;
     requires cloud.piranha.extension.naming;
     requires cloud.piranha.extension.scinitializer;
     requires jakarta.ws.rs;

diff --git a/extension/servlet/pom.xml b/extension/servlet/pom.xml
@@ -32,6 +32,12 @@
             <version>${project.version}</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>cloud.piranha.extension</groupId>
+            <artifactId>piranha-extension-annotationscan-classfile</artifactId>
+            <version>${project.version}</version>
+            <scope>compile</scope>
+        </dependency>
         <dependency>
             <groupId>cloud.piranha.extension</groupId>
             <artifactId>piranha-extension-apache-fileupload</artifactId>

diff --git a/extension/servlet/src/main/java/cloud/piranha/extension/servlet/ServletExtension.java b/extension/servlet/src/main/java/cloud/piranha/extension/servlet/ServletExtension.java
@@ -29,7 +29,8 @@
 
 import cloud.piranha.core.api.WebApplicationExtension;
 import cloud.piranha.core.api.WebApplicationExtensionContext;
-import cloud.piranha.extension.annotationscan.classfile.AnnotationScanExtension;
+import cloud.piranha.extension.annotationscan.AnnotationScanExtension;
+import cloud.piranha.extension.annotationscan.classfile.ClassfileAnnotationScanExtension;
 import cloud.piranha.extension.apache.fileupload.ApacheMultiPartExtension;
 import cloud.piranha.extension.naming.NamingExtension;
 import cloud.piranha.extension.policy.PolicyExtension;
@@ -60,10 +61,17 @@ public void extend(WebApplicationExtensionContext context) {
         context.add(WaspJspManagerExtension.class);                 // addJspFile
         context.add(NamingExtension.class);                         // Naming (JNDI)
         context.add(WebXmlExtension.class);                         // web.xml
-        context.add(AnnotationScanExtension.class);                 // Annotation scanning
+        context.add(getAnnotationScanExtensionClass());             // Annotation scanning
         context.add(ServletAnnotationsExtension.class);             // Servlet annotations
         context.add(WaspExtension.class);                           // WaSP
         context.add(ServletContainerInitializerExtension.class);    // ServletContainerInitializer
         context.add(ServletSecurityExtension.class);                // Security implementation
     }
+
+    private static Class<? extends WebApplicationExtension> getAnnotationScanExtensionClass() {
+        if (System.getProperty(ClassfileAnnotationScanExtension.EXPERIMENTAL_PROPERTY) != null) {
+            return ClassfileAnnotationScanExtension.class;   // Annotation scanning using the new Classfile API
+        }
+        return AnnotationScanExtension.class;  // Annotation scanning
+    }
 }
diff --git a/extension/servlet/src/main/java/module-info.java b/extension/servlet/src/main/java/module-info.java
@@ -53,6 +53,7 @@
     opens cloud.piranha.extension.servlet;
     requires cloud.piranha.core.api;
     requires cloud.piranha.extension.annotationscan;
+    requires cloud.piranha.extension.annotationscan.classfile;
     requires cloud.piranha.extension.apache.fileupload;
     requires cloud.piranha.extension.naming;
     requires cloud.piranha.extension.policy;

diff --git a/...test/java/cloud/piranha/extension/servletannotations/ServletAnnotationsExtensionTest.java b/...test/java/cloud/piranha/extension/servletannotations/ServletAnnotationsExtensionTest.java
@@ -32,8 +32,8 @@
 import cloud.piranha.core.impl.DefaultWebApplication;
 import cloud.piranha.core.impl.DefaultWebApplicationClassLoader;
 import cloud.piranha.core.impl.DefaultWebApplicationExtensionContext;
-import cloud.piranha.extension.annotationscan.classfile.internal.InternalAnnotationScanAnnotationManager;
-import cloud.piranha.extension.annotationscan.classfile.AnnotationScanInitializer;
+import cloud.piranha.extension.annotationscan.internal.InternalAnnotationScanAnnotationManager;
+import cloud.piranha.extension.annotationscan.AnnotationScanInitializer;
 import cloud.piranha.resource.impl.ClassResource;
 import jakarta.servlet.FilterRegistration;
 import jakarta.servlet.ServletRegistration;

diff --git a/...tannotations/src/test/java/cloud/piranha/extension/servletannotations/WebServletTest.java b/...tannotations/src/test/java/cloud/piranha/extension/servletannotations/WebServletTest.java
@@ -33,8 +33,8 @@
 import cloud.piranha.embedded.EmbeddedRequestBuilder;
 import cloud.piranha.embedded.EmbeddedResponse;
 import cloud.piranha.embedded.EmbeddedResponseBuilder;
-import cloud.piranha.extension.annotationscan.classfile.AnnotationScanInitializer;
-import cloud.piranha.extension.annotationscan.classfile.internal.InternalAnnotationScanAnnotationManager;
+import cloud.piranha.extension.annotationscan.AnnotationScanInitializer;
+import cloud.piranha.extension.annotationscan.internal.InternalAnnotationScanAnnotationManager;
 import cloud.piranha.extension.webxml.WebXmlInitializer;
 import cloud.piranha.resource.impl.ClassResource;
 import cloud.piranha.resource.impl.DirectoryResource;

diff --git a/extension/webprofile/pom.xml b/extension/webprofile/pom.xml
@@ -32,6 +32,12 @@
             <version>${project.version}</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>cloud.piranha.extension</groupId>
+            <artifactId>piranha-extension-annotationscan-classfile</artifactId>
+            <version>${project.version}</version>
+            <scope>compile</scope>
+        </dependency>
         <dependency>
             <groupId>cloud.piranha.extension</groupId>
             <artifactId>piranha-extension-apache-fileupload</artifactId>

diff --git a/...sion/webprofile/src/main/java/cloud/piranha/extension/webprofile/WebProfileExtension.java b/...sion/webprofile/src/main/java/cloud/piranha/extension/webprofile/WebProfileExtension.java
@@ -29,7 +29,8 @@
 
 import cloud.piranha.core.api.WebApplicationExtension;
 import cloud.piranha.core.api.WebApplicationExtensionContext;
-import cloud.piranha.extension.annotationscan.classfile.AnnotationScanExtension;
+import cloud.piranha.extension.annotationscan.AnnotationScanExtension;
+import cloud.piranha.extension.annotationscan.classfile.ClassfileAnnotationScanExtension;
 import cloud.piranha.extension.apache.fileupload.ApacheMultiPartExtension;
 import cloud.piranha.extension.datasource.DefaultDatasourceExtension;
 import cloud.piranha.extension.eclipselink.EclipseLinkExtension;
@@ -64,7 +65,7 @@ public void extend(WebApplicationExtensionContext context) {
         context.add(WaspJspManagerExtension.class);                 // addJspFile
         context.add(NamingExtension.class);                         // Naming (JNDI)
         context.add(WebXmlExtension.class);                         // web.xml
-        context.add(AnnotationScanExtension.class);                 // Annotation scanning
+        context.add(getAnnotationScanExtensionClass());                 // Annotation scanning
         context.add(ServletAnnotationsExtension.class);             // Servlet annotations
         context.add(WeldExtension.class);
         context.add(DefaultDatasourceExtension.class);              // Default data source
@@ -74,4 +75,12 @@ public void extend(WebApplicationExtensionContext context) {
         context.add(EclipseLinkExtension.class);                    // Jakarta Persistence
         context.add(ServletContainerInitializerExtension.class);    // ServletContainerInitializer
     }
+
+    private static Class<? extends WebApplicationExtension> getAnnotationScanExtensionClass() {
+        if (System.getProperty(ClassfileAnnotationScanExtension.EXPERIMENTAL_PROPERTY) != null) {
+            return ClassfileAnnotationScanExtension.class;   // Annotation scanning using the new Classfile API
+        }
+        return AnnotationScanExtension.class;  // Annotation scanning
+    }
+
 }
diff --git a/extension/webprofile/src/main/java/module-info.java b/extension/webprofile/src/main/java/module-info.java
@@ -55,6 +55,7 @@
     opens cloud.piranha.extension.webprofile;
     requires cloud.piranha.core.api;
     requires cloud.piranha.extension.annotationscan;
+    requires cloud.piranha.extension.annotationscan.classfile;
     requires cloud.piranha.extension.apache.fileupload;
     requires cloud.piranha.extension.datasource;
     requires cloud.piranha.extension.eclipselink;

diff --git a/micro/core/src/main/java/cloud/piranha/micro/core/MicroInnerDeployer.java b/micro/core/src/main/java/cloud/piranha/micro/core/MicroInnerDeployer.java
@@ -77,7 +77,7 @@
 import cloud.piranha.core.api.WebApplicationExtension;
 import cloud.piranha.core.impl.DefaultWebApplication;
 import cloud.piranha.core.impl.DefaultWebApplicationExtensionContext;
-import cloud.piranha.extension.annotationscan.classfile.internal.InternalAnnotationScanAnnotationManager;
+import cloud.piranha.extension.annotationscan.internal.InternalAnnotationScanAnnotationManager;
 import cloud.piranha.http.api.HttpServer;
 import cloud.piranha.http.impl.DefaultHttpServer;
 import cloud.piranha.http.webapp.HttpWebApplicationServer;

diff --git a/...rce/impl/src/main/java/cloud/piranha/resource/impl/DefaultResourceManagerClassLoader.java b/...rce/impl/src/main/java/cloud/piranha/resource/impl/DefaultResourceManagerClassLoader.java
@@ -111,7 +111,7 @@ public DefaultResourceManagerClassLoader(ResourceManager resourceManager) {
 
     /**
      * Yet another Constructor.
-     *
+     * @param classLoader the class loader.
      * @param resourceManager the resource manager.
      */
     public DefaultResourceManagerClassLoader(ClassLoader classLoader, ResourceManager resourceManager) {