Merge pull request #47213 from Ladicek/jandex-3.3.0

Jandex: upgrade to 3.3.0

Author: gsmet

bom/application/pom.xml

@@ -22,7 +22,7 @@
         <cyclonedx.version>9.0.5</cyclonedx.version>
         <expressly.version>5.0.0</expressly.version>
         <findbugs.version>3.0.2</findbugs.version>
-        <jandex.version>3.2.7</jandex.version>
+        <jandex.version>3.3.0</jandex.version>
         <javax.annotation-api.version>1.3.2</javax.annotation-api.version>
         <javax.inject.version>1</javax.inject.version>
         <parsson.version>1.1.7</parsson.version>

build-parent/pom.xml

@@ -29,7 +29,7 @@
         <jboss-bridger-plugin.version>1.6.Final</jboss-bridger-plugin.version>
 
         <!-- Jandex versions -->
-        <jandex.version>3.2.7</jandex.version>
+        <jandex.version>3.3.0</jandex.version>
         <jandex-gradle-plugin.version>1.0.0</jandex-gradle-plugin.version>
 
         <asciidoctorj.version>2.5.13</asciidoctorj.version>

core/deployment/src/main/java/io/quarkus/deployment/index/IndexWrapper.java

@@ -171,6 +171,35 @@ public Collection<ClassInfo> getAllKnownSubinterfaces(DotName interfaceName) {
         return result;
     }
 
+    @Override
+    public Collection<ClassInfo> getKnownDirectImplementations(DotName interfaceName) {
+        if (additionalClasses.isEmpty()) {
+            return index.getKnownDirectImplementations(interfaceName);
+        }
+        Set<ClassInfo> directImplementations = new HashSet<>(index.getKnownDirectImplementations(interfaceName));
+        for (Optional<ClassInfo> additional : additionalClasses.values()) {
+            if (additional.isEmpty()) {
+                continue;
+            }
+            ClassInfo additionalClass = additional.get();
+            if (additionalClass.isInterface()) {
+                continue;
+            }
+            for (Type interfaceType : additionalClass.interfaceTypes()) {
+                if (interfaceName.equals(interfaceType.name())) {
+                    directImplementations.add(additionalClass);
+                    break;
+                }
+            }
+        }
+        return directImplementations;
+    }
+
+    @Override
+    public Collection<ClassInfo> getAllKnownImplementations(DotName interfaceName) {
+        return getAllKnownImplementors(interfaceName);
+    }
+
     @Override
     public Collection<ClassInfo> getKnownDirectImplementors(DotName className) {
         if (additionalClasses.isEmpty()) {

extensions/smallrye-graphql/deployment/src/main/java/io/quarkus/smallrye/graphql/deployment/OverridableIndex.java

@@ -65,6 +65,18 @@ public Collection<ClassInfo> getAllKnownSubinterfaces(DotName dn) {
                 classInfoComparator);
     }
 
+    @Override
+    public Collection<ClassInfo> getKnownDirectImplementations(DotName dn) {
+        return overrideCollection(original.getKnownDirectImplementations(dn), override.getKnownDirectImplementations(dn),
+                classInfoComparator);
+    }
+
+    @Override
+    public Collection<ClassInfo> getAllKnownImplementations(DotName dn) {
+        return overrideCollection(original.getAllKnownImplementations(dn), override.getAllKnownImplementations(dn),
+                classInfoComparator);
+    }
+
     @Override
     public Collection<ClassInfo> getKnownDirectImplementors(DotName dn) {
         return overrideCollection(original.getKnownDirectImplementors(dn), override.getKnownDirectImplementors(dn),

independent-projects/arc/pom.xml

@@ -45,7 +45,7 @@
         <version.jta>2.0.1</version.jta>
         <!-- main versions -->
         <version.gizmo>1.9.0</version.gizmo>
-        <version.jandex>3.2.7</version.jandex>
+        <version.jandex>3.3.0</version.jandex>
         <version.jboss-logging>3.6.1.Final</version.jboss-logging>
         <version.mutiny>2.8.0</version.mutiny>
         <version.bridger>1.6.Final</version.bridger>

independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanArchives.java

@@ -227,6 +227,35 @@ public Collection<ClassInfo> getAllKnownSubinterfaces(DotName interfaceName) {
             return result;
         }
 
+        @Override
+        public Collection<ClassInfo> getKnownDirectImplementations(DotName interfaceName) {
+            if (additionalClasses.isEmpty()) {
+                return index.getKnownDirectImplementations(interfaceName);
+            }
+            Set<ClassInfo> directImplementations = new HashSet<>(index.getKnownDirectImplementations(interfaceName));
+            for (Optional<ClassInfo> additional : additionalClasses.values()) {
+                if (additional.isEmpty()) {
+                    continue;
+                }
+                ClassInfo additionalClass = additional.get();
+                if (additionalClass.isInterface()) {
+                    continue;
+                }
+                for (Type interfaceType : additionalClass.interfaceTypes()) {
+                    if (interfaceName.equals(interfaceType.name())) {
+                        directImplementations.add(additionalClass);
+                        break;
+                    }
+                }
+            }
+            return directImplementations;
+        }
+
+        @Override
+        public Collection<ClassInfo> getAllKnownImplementations(DotName interfaceName) {
+            return getAllKnownImplementors(interfaceName);
+        }
+
         @Override
         public Collection<ClassInfo> getKnownDirectImplementors(DotName className) {
             if (additionalClasses.isEmpty()) {

independent-projects/bootstrap/pom.xml

@@ -34,7 +34,7 @@
         <javax.annotation-api.version>1.3.2</javax.annotation-api.version>
         <javax.inject.version>1</javax.inject.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <jandex.version>3.2.7</jandex.version>
+        <jandex.version>3.3.0</jandex.version>
         <jmh.version>1.37</jmh.version>
 
         <!-- Dependency versions -->

independent-projects/junit5-virtual-threads/pom.xml

@@ -41,7 +41,7 @@
         <compiler.plugin.version>3.14.0</compiler.plugin.version>
         <enforcer.plugin.version>3.2.1</enforcer.plugin.version>
         <surefire.plugin.version>3.5.2</surefire.plugin.version>
-        <jandex.version>3.2.7</jandex.version>
+        <jandex.version>3.3.0</jandex.version>
 
         <junit5.version>5.12.1</junit5.version>
         <junit.testkit.version>1.10.3</junit.testkit.version>

independent-projects/qute/pom.xml

@@ -40,7 +40,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <version.junit>5.12.1</version.junit>
         <version.assertj>3.27.3</version.assertj>
-        <version.jandex>3.2.7</version.jandex>
+        <version.jandex>3.3.0</version.jandex>
         <version.gizmo>1.9.0</version.gizmo>
         <version.jboss-logging>3.6.1.Final</version.jboss-logging>
         <version.smallrye-common>2.11.0</version.smallrye-common>

independent-projects/resteasy-reactive/common/processor/src/main/java/org/jboss/resteasy/reactive/common/processor/CalculatingIndexView.java

@@ -156,6 +156,35 @@ public Collection<ClassInfo> getAllKnownSubinterfaces(DotName interfaceName) {
         return result;
     }
 
+    @Override
+    public Collection<ClassInfo> getKnownDirectImplementations(DotName interfaceName) {
+        if (additionalClasses.isEmpty()) {
+            return index.getKnownDirectImplementations(interfaceName);
+        }
+        Set<ClassInfo> directImplementations = new HashSet<>(index.getKnownDirectImplementations(interfaceName));
+        for (Optional<ClassInfo> additional : additionalClasses.values()) {
+            if (additional.isEmpty()) {
+                continue;
+            }
+            ClassInfo additionalClass = additional.get();
+            if (additionalClass.isInterface()) {
+                continue;
+            }
+            for (Type interfaceType : additionalClass.interfaceTypes()) {
+                if (interfaceName.equals(interfaceType.name())) {
+                    directImplementations.add(additionalClass);
+                    break;
+                }
+            }
+        }
+        return directImplementations;
+    }
+
+    @Override
+    public Collection<ClassInfo> getAllKnownImplementations(DotName interfaceName) {
+        return getAllKnownImplementors(interfaceName);
+    }
+
     @Override
     public Collection<ClassInfo> getKnownDirectImplementors(DotName className) {
         if (additionalClasses.isEmpty()) {