Working in general solution

Signed-off-by: Jorge Bescos Gascon <[email protected]>
jbescos · Oct 14, 2024 · 40614a9 · 40614a9
1 parent d248c30
commit 40614a9
Show file tree

Hide file tree

Showing 7 changed files with 41 additions and 40 deletions.
diff --git a/dependencies/pom.xml b/dependencies/pom.xml
@@ -87,7 +87,7 @@
         <version.lib.jakarta.websockets-api>2.1.1</version.lib.jakarta.websockets-api>
         <!-- Check Hibernate when upgrading to ensure its supplied jaxb-runtime is compatible. -->
         <version.lib.jakarta.xml.bind-api>3.0.1</version.lib.jakarta.xml.bind-api>
-        <version.lib.jandex>2.4.3.Final</version.lib.jandex>
+        <version.lib.jandex>3.0.8</version.lib.jandex>
         <version.lib.jaxb-core>3.0.2</version.lib.jaxb-core>
         <version.lib.jaxb-impl>3.0.2</version.lib.jaxb-impl>
         <version.lib.jboss.classfilewriter>1.2.5.Final</version.lib.jboss.classfilewriter>
@@ -148,7 +148,7 @@
         <version.lib.postgresql>42.4.4</version.lib.postgresql>
         <version.lib.prometheus>0.9.0</version.lib.prometheus>
         <version.lib.slf4j>2.0.9</version.lib.slf4j>
-        <version.lib.smallrye-openapi>2.1.16</version.lib.smallrye-openapi>
+        <version.lib.smallrye-openapi>2.1.24</version.lib.smallrye-openapi>
         <version.lib.snakeyaml>2.2</version.lib.snakeyaml>
         <version.lib.typesafe-config>1.4.2</version.lib.typesafe-config>
         <version.lib.tyrus>2.1.5</version.lib.tyrus>

diff --git a/microprofile/graphql/server/pom.xml b/microprofile/graphql/server/pom.xml
@@ -82,14 +82,6 @@
             <plugin>
                 <groupId>org.jboss.jandex</groupId>
                 <artifactId>jandex-maven-plugin</artifactId>
-                <!-- Temporal fix meanwhile there are no newer versions of the plugin -->
-                <dependencies>
-                    <dependency>
-                        <groupId>org.jboss</groupId>
-                        <artifactId>jandex</artifactId>
-                        <version>3.1.8</version>
-                    </dependency>
-                </dependencies>
                 <executions>
                     <execution>
                         <id>make-index</id>

diff --git a/microprofile/lra/jax-rs/src/main/java/io/helidon/microprofile/lra/InspectionService.java b/microprofile/lra/jax-rs/src/main/java/io/helidon/microprofile/lra/InspectionService.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022 Oracle and/or its affiliates.
+ * Copyright (c) 2022, 2024 Oracle and/or its affiliates.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -155,11 +155,12 @@ Set<AnnotationInstance> lookUpLraAnnotations(Method method) {
 
     Set<AnnotationInstance> lookUpLraAnnotations(MethodInfo methodInfo) {
         Map<String, AnnotationInstance> annotations = new HashMap<>();
+        Type[] types = methodInfo.parameters().stream().map(param -> param.type()).toArray(Type[]::new);
         deepScanLraMethod(
                 methodInfo.declaringClass(),
                 annotations,
                 methodInfo.name(),
-                methodInfo.parameters().toArray(new Type[0])
+                types
         );
         HashSet<AnnotationInstance> result = new HashSet<>(annotations.values());
 

diff --git a/microprofile/lra/jax-rs/src/main/java/io/helidon/microprofile/lra/LraCdiExtension.java b/microprofile/lra/jax-rs/src/main/java/io/helidon/microprofile/lra/LraCdiExtension.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Oracle and/or its affiliates.
+ * Copyright (c) 2021, 2024 Oracle and/or its affiliates.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,6 +25,7 @@
 import java.util.Enumeration;
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -69,6 +70,7 @@
 import org.jboss.jandex.ClassInfo;
 import org.jboss.jandex.CompositeIndex;
 import org.jboss.jandex.DotName;
+import org.jboss.jandex.Index;
 import org.jboss.jandex.IndexReader;
 import org.jboss.jandex.IndexView;
 import org.jboss.jandex.Indexer;
@@ -94,7 +96,8 @@ public class LraCdiExtension implements Extension {
 
     private final Set<Class<?>> beanTypesWithCdiLRAMethods = new HashSet<>();
     private final Map<Class<?>, Bean<?>> lraCdiBeanReferences = new HashMap<>();
-    private final Indexer indexer;
+    // Do not clear indexes. #index requires a strong reference to these.
+    private final List<IndexView> indexes = new LinkedList<>();
     private final ClassLoader classLoader;
     private IndexView index;
 
@@ -103,7 +106,6 @@ public class LraCdiExtension implements Extension {
      * Initialize MicroProfile Long Running Actions CDI extension.
      */
     public LraCdiExtension() {
-        indexer = new Indexer();
         classLoader = Thread.currentThread().getContextClassLoader();
         // Needs to be always indexed
         Set.of(LRA.class,
@@ -119,7 +121,9 @@ public LraCdiExtension() {
         try {
             indexFiles = findIndexFiles("META-INF/jandex.idx");
             if (!indexFiles.isEmpty()) {
-                index = CompositeIndex.create(indexer.complete(), existingIndexFileReader(indexFiles));
+                indexes.add(existingIndexFileReader(indexFiles));
+                index = CompositeIndex.create(indexes);
+                logIndexedClasses(index);
             } else {
                 index = null;
             }
@@ -137,7 +141,8 @@ private void index(
                     LRA.class,
                     AfterLRA.class, Compensate.class, Complete.class, Forget.class, Status.class
             }) ProcessAnnotatedType<?> pat) {
-        // compile time bilt index
+        // compile time built index
+        // If META-INF/jandex.idx exists we don't explore more
         if (index != null) return;
         // create runtime index when pre-built index is not available
         runtimeIndex(DotName.createSimple(pat.getAnnotatedType().getJavaClass().getName()));
@@ -227,7 +232,8 @@ private void ready(
 
         if (index == null) {
             // compile time built index
-            index = indexer.complete();
+            index = CompositeIndex.create(indexes);
+            logIndexedClasses(index);
         }
 
         // ------------- Validate LRA participant methods -------------
@@ -255,13 +261,16 @@ Map<Class<?>, Bean<?>> lraCdiBeanReferences() {
     void runtimeIndex(DotName fqdn) {
         if (fqdn == null) return;
         LOGGER.fine("Indexing " + fqdn);
-        ClassInfo classInfo;
         try {
-            classInfo = indexer.index(classLoader.getResourceAsStream(fqdn.toString().replace('.', '/') + ".class"));
+            Indexer newIndexer = new Indexer();
+            newIndexer.index(classLoader.getResourceAsStream(fqdn.toString().replace('.', '/') + ".class"));
+            Index index = newIndexer.complete();
+            indexes.add(index);
+            ClassInfo classInfo = index.getClassByName(fqdn);
             // look also for extended classes
             runtimeIndex(classInfo.superName());
             // and implemented interfaces
-            classInfo.interfaceNames().forEach(this::runtimeIndex);
+            classInfo.interfaceNames().forEach(dotName -> runtimeIndex(dotName));
         } catch (IOException e) {
             LOGGER.log(Level.SEVERE, "Unable to index referenced class.", e);
         }
@@ -313,4 +322,13 @@ static <T> T lookup(Bean<?> bean, BeanManager beanManager) {
         }
         return (T) instance;
     }
+
+    private void logIndexedClasses(IndexView index) {
+        if (LOGGER.isLoggable(Level.FINE)) {
+            LOGGER.fine(index.getKnownClasses().size() + " indexed classes.");
+            index.getKnownClasses().forEach(classInfo -> {
+                LOGGER.fine("Indexed class - " + classInfo.name().toString());
+            });
+        }
+    }
 }
diff --git a/...file/lra/jax-rs/src/main/java/io/helidon/microprofile/lra/ParticipantValidationModel.java b/...file/lra/jax-rs/src/main/java/io/helidon/microprofile/lra/ParticipantValidationModel.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Oracle and/or its affiliates.
+ * Copyright (c) 2021, 2024 Oracle and/or its affiliates.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -38,7 +38,6 @@
 import org.jboss.jandex.ClassInfo;
 import org.jboss.jandex.DotName;
 import org.jboss.jandex.MethodInfo;
-import org.jboss.jandex.Type;
 
 class ParticipantValidationModel {
 
@@ -155,7 +154,7 @@ private static class ParticipantMethod {
 
         String nameWithParams() {
             return methodInfo.name() + methodInfo.parameters().stream()
-                    .map(Type::name)
+                    .map(paramInfo -> paramInfo.type().name())
                     .map(DotName::toString)
                     .collect(Collectors.joining());
         }

diff --git a/microprofile/tests/tck/tck-openapi/pom.xml b/microprofile/tests/tck/tck-openapi/pom.xml
@@ -30,22 +30,6 @@
     <artifactId>tck-openapi</artifactId>
     <name>Helidon Microprofile Tests TCK OpenAPI</name>
 
-    <properties>
-        <selectedSnakeYamlVersion>1.32</selectedSnakeYamlVersion>
-    </properties>
-
-    <!-- The TCK uses Jackson which in turn uses SnakeYAML APIs that have disappeared in 2.0. So, for running the TCK
-         use the earlier SnakeYAML release (until an updated Jackson release becomes available). -->
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>org.yaml</groupId>
-                <artifactId>snakeyaml</artifactId>
-                <version>${selectedSnakeYamlVersion}</version>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-
     <dependencies>
         <dependency>
             <groupId>io.helidon.microprofile.tests</groupId>

diff --git a/pom.xml b/pom.xml
@@ -465,6 +465,13 @@
                     <groupId>org.jboss.jandex</groupId>
                     <artifactId>jandex-maven-plugin</artifactId>
                     <version>${version.plugin.jandex}</version>
+                    <dependencies>
+                        <dependency>
+                            <groupId>org.jboss</groupId>
+                            <artifactId>jandex</artifactId>
+                            <version>3.1.8</version>
+                        </dependency>
+                    </dependencies>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>