Merge pull request #437 from Ladicek/fix-index-singleclass-for-modules

Fix Index.singleClass() when the passed class file is in fact a module descriptor
smallrye · Sep 9, 2024 · f6434fb · f6434fb
2 parents 90dd417 + 1268fd0
commit f6434fb
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 2 deletions.
diff --git a/core/src/main/java/org/jboss/jandex/Index.java b/core/src/main/java/org/jboss/jandex/Index.java
@@ -279,7 +279,14 @@ public static ClassInfo singleClass(Class<?> clazz) throws IOException {
         Indexer indexer = new Indexer();
         indexer.indexClass(clazz);
         Index index = indexer.complete();
-        return index.getKnownClasses().iterator().next();
+
+        if (!index.getKnownClasses().isEmpty()) {
+            return index.getKnownClasses().iterator().next();
+        } else if (!index.getKnownModules().isEmpty()) {
+            return index.getKnownModules().iterator().next().moduleInfoClass();
+        } else {
+            return null;
+        }
     }
 
     /**
@@ -305,7 +312,14 @@ public static ClassInfo singleClass(InputStream classData) throws IOException {
         Indexer indexer = new Indexer();
         indexer.index(classData);
         Index index = indexer.complete();
-        return index.getKnownClasses().iterator().next();
+
+        if (!index.getKnownClasses().isEmpty()) {
+            return index.getKnownClasses().iterator().next();
+        } else if (!index.getKnownModules().isEmpty()) {
+            return index.getKnownModules().iterator().next().moduleInfoClass();
+        } else {
+            return null;
+        }
     }
 
     // ---

diff --git a/core/src/test/java/org/jboss/jandex/test/ModuleInfoTestCase.java b/core/src/test/java/org/jboss/jandex/test/ModuleInfoTestCase.java
@@ -22,6 +22,7 @@
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.io.IOException;
+import java.io.InputStream;
 import java.net.URL;
 import java.util.Arrays;
 import java.util.Enumeration;
@@ -128,6 +129,16 @@ public void testModuleVersion() {
         assertEquals("1.0", mod.version());
     }
 
+    @Test
+    public void testIndexSingleClassModuleInfo() throws IOException {
+        Enumeration<URL> modules = ModuleInfoTestCase.class.getClassLoader().getResources("module-info.class");
+        while (modules.hasMoreElements()) {
+            try (InputStream in = modules.nextElement().openStream()) {
+                assertNotNull(Index.singleClass(in));
+            }
+        }
+    }
+
     private ModuleInfo indexModuleInfo() throws IOException {
         Index index = buildIndex();
         return index.getModuleByName(DotName.createSimple("org.jboss.jandex.typeannotationtest"));