Update to Jandex 3.5.2, use several new APIs for efficiency improvements

Signed-off-by: Michael Edgar <michael@xlate.io>

Author: MikeEdgar

core/src/main/java/io/smallrye/openapi/runtime/io/Names.java

@@ -74,6 +74,35 @@ public static DotName containerOf(DotName repeatable) {
         return repeatContainers.get(repeatable);
     }
 
+    /**
+     * Create componentized {@link DotName} instances for the given collection of
+     * names. The results will be returned in a map, keyed by the input element from
+     * which each entry was derived.
+     */
+    public static Map<String, DotName> componentize(Collection<String> names) {
+        Map<DotName, DotName> workingSet = new HashMap<>();
+        Map<String, DotName> results = new HashMap<>();
+
+        for (String name : names) {
+            String[] elements = name.split("\\.");
+            DotName current = null;
+
+            for (String element : elements) {
+                current = DotName.createComponentized(current, element);
+
+                if (workingSet.containsKey(current)) {
+                    current = workingSet.get(current);
+                } else {
+                    workingSet.put(current, current);
+                }
+            }
+
+            results.put(name, current);
+        }
+
+        return results;
+    }
+
     public static final DotName OPENAPI_DEFINITION = createIndexable(OpenAPIDefinition.class);
     public static final DotName API_RESPONSE = createIndexable(APIResponse.class);
     public static final DotName API_RESPONSES = createIndexable(APIResponses.class);

core/src/main/java/io/smallrye/openapi/runtime/scanner/dataobject/AugmentedIndexView.java

@@ -130,7 +130,7 @@ public Map<ClassInfo, MethodInfo> ancestry(MethodInfo method) {
     }
 
     private static boolean saveOverride(MethodInfo searchMethod, ClassInfo clazz, Map<ClassInfo, MethodInfo> results) {
-        MethodInfo classMethod = clazz.method(searchMethod.name(), searchMethod.parameterTypes());
+        MethodInfo classMethod = clazz.method(searchMethod);
 
         if (classMethod != null && !classMethod.isSynthetic()) {
             results.put(clazz, classMethod);

core/src/main/java/io/smallrye/openapi/runtime/util/Annotations.java

@@ -26,6 +26,7 @@
 import org.jboss.jandex.PrimitiveType.Primitive;
 import org.jboss.jandex.Type;
 
+import io.smallrye.openapi.runtime.io.Names;
 import io.smallrye.openapi.runtime.scanner.dataobject.AugmentedIndexView;
 import io.smallrye.openapi.runtime.scanner.spi.AnnotationScannerContext;
 
@@ -54,15 +55,12 @@ public final class Annotations {
     }
 
     private final AnnotationScannerContext context;
-    private final Set<String> excludedPackages;
+    private final Collection<DotName> excludedPackages;
 
     public Annotations(AnnotationScannerContext context) {
         this.context = context;
-        this.excludedPackages = context.getConfig()
-                .getScanCompositionExcludePackages()
-                .stream()
-                .map(pkg -> pkg.concat("."))
-                .collect(Collectors.toSet());
+        this.excludedPackages = Names.componentize(context.getConfig().getScanCompositionExcludePackages())
+                .values();
     }
 
     private static Collection<AnnotationInstance> getDeclaredAnnotations(AnnotationTarget target) {
@@ -90,10 +88,8 @@ private static List<AnnotationInstance> declaredFieldAnnotations(FieldInfo field
     }
 
     private boolean composable(DotName annotation) {
-        String name = annotation.toString();
-
-        for (String pkg : this.excludedPackages) {
-            if (name.startsWith(pkg)) {
+        for (DotName pkg : this.excludedPackages) {
+            if (annotation.startsWith(pkg)) {
                 return false;
             }
         }

pom.xml

@@ -20,7 +20,7 @@
         <version.buildhelper.plugin>3.6.1</version.buildhelper.plugin>
         <jackson-bom.version>2.20.1</jackson-bom.version>
         <version.eclipse.microprofile.config>3.0.3</version.eclipse.microprofile.config>
-        <version.io.smallrye.jandex>3.5.1</version.io.smallrye.jandex>
+        <version.io.smallrye.jandex>3.5.2</version.io.smallrye.jandex>
         <version.io.smallrye.smallrye-config>3.14.1</version.io.smallrye.smallrye-config>
         <version.io.smallrye.smallrye-common-classloader>2.14.0</version.io.smallrye.smallrye-common-classloader>
         <version.eclipse.microprofile.openapi>4.1.1</version.eclipse.microprofile.openapi>

testsuite/data/pom.xml

@@ -22,6 +22,7 @@
         <quarkus.platform.artifact-id>quarkus-bom</quarkus.platform.artifact-id>
         <quarkus.platform.group-id>io.quarkus</quarkus.platform.group-id>
         <quarkus.platform.version>3.29.2</quarkus.platform.version>
+        <version.io.smallrye.jandex>3.5.2</version.io.smallrye.jandex>
         <quarkus.package.type>uber-jar</quarkus.package.type>
         <quarkus.package.add-runner-suffix>false</quarkus.package.add-runner-suffix>
     </properties>
@@ -43,6 +44,12 @@
                 <artifactId>microprofile-openapi-api</artifactId>
                 <version>${eclipse.microprofile.openapi.version}</version>
             </dependency>
+            <dependency>
+                <!-- This can be removed when upgrading Quarkus to a version including Jandex 3.5.2+ -->
+                <groupId>io.smallrye</groupId>
+                <artifactId>jandex</artifactId>
+                <version>${version.io.smallrye.jandex}</version>
+            </dependency>
             <dependency>
                 <groupId>${quarkus.platform.group-id}</groupId>
                 <artifactId>${quarkus.platform.artifact-id}</artifactId>