WFLY-19355 AnnotationScanner implementations are not stateless and ca…

…nnot be shared between deployments.
rhusar · May 22, 2024 · f727e3e · f727e3e
1 parent cc98d8b
commit f727e3e
Showing 1 changed file with 8 additions and 7 deletions.
diff --git a/...rg/wildfly/extension/microprofile/openapi/deployment/OpenAPIModelServiceConfigurator.java b/...rg/wildfly/extension/microprofile/openapi/deployment/OpenAPIModelServiceConfigurator.java
@@ -82,12 +82,6 @@ public class OpenAPIModelServiceConfigurator extends SimpleServiceNameProvider i
     private static final String RELATIVE_SERVER_URLS = "mp.openapi.extensions.servers.relative";
     private static final String DEFAULT_TITLE = "Generated API";
     private static final Set<String> REQUISITE_LISTENERS = Collections.singleton("http");
-    private static final Iterable<AnnotationScanner> SCANNERS = WildFlySecurityManager.doUnchecked(new PrivilegedAction<>() {
-        @Override
-        public Iterable<AnnotationScanner> run() {
-            return ServiceLoader.load(AnnotationScanner.class, AnnotationScanner.class.getClassLoader()).stream().map(ServiceLoader.Provider::get).collect(Collectors.toList());
-        }
-    });
 
     static {
         // Set the static OASFactoryResolver eagerly avoiding the need perform TCCL service loading later
@@ -159,7 +153,14 @@ public OpenAPI get() {
             }
         }
 
-        document.modelFromAnnotations(OpenApiProcessor.modelFromAnnotations(config, this.module.getClassLoader(), indexView, Functions.constantSupplier(SCANNERS)));
+        // AnnotationScanner implementations are not stateless, so we must create new instances per deployment
+        Iterable<AnnotationScanner> scanners = WildFlySecurityManager.doUnchecked(new PrivilegedAction<>() {
+            @Override
+            public Iterable<AnnotationScanner> run() {
+                return ServiceLoader.load(AnnotationScanner.class, AnnotationScanner.class.getClassLoader()).stream().map(ServiceLoader.Provider::get).collect(Collectors.toList());
+            }
+        });
+        document.modelFromAnnotations(OpenApiProcessor.modelFromAnnotations(config, this.module.getClassLoader(), indexView, Functions.constantSupplier(scanners)));
         document.filter(OpenApiProcessor.getFilter(config, this.module.getClassLoader(), indexView));
         document.initialize();
         OpenAPI model = document.get();