-
Notifications
You must be signed in to change notification settings - Fork 93
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
This allows navigating from `ClassInfo` to its member classes. The `memberClasses()` method returns a set of `DotName` objects, because member classes don't necessarily have to be present in the index. It is a responsibility of the caller to retrieve a `ClassInfo` of each member class from the index and handle possible absence. This change requires persistent format version bump. That has already happened on the `smallrye` branch, so this commit doesn't bump again, but note that this commit can't be backported to Jandex 2.x.
- Loading branch information
Showing
5 changed files
with
246 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
188 changes: 188 additions & 0 deletions
188
core/src/test/java/org/jboss/jandex/test/NestedClassesTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,188 @@ | ||
| package org.jboss.jandex.test; | ||
|
|
||
| import static org.junit.jupiter.api.Assertions.assertEquals; | ||
| import static org.junit.jupiter.api.Assertions.assertNotNull; | ||
| import static org.junit.jupiter.api.Assertions.assertNull; | ||
|
|
||
| import java.io.IOException; | ||
| import java.util.Arrays; | ||
| import java.util.HashSet; | ||
| import java.util.Set; | ||
|
|
||
| import org.jboss.jandex.ClassInfo; | ||
| import org.jboss.jandex.DotName; | ||
| import org.jboss.jandex.Index; | ||
| import org.jboss.jandex.test.util.IndexingUtil; | ||
| import org.junit.jupiter.api.Test; | ||
|
|
||
| public class NestedClassesTest { | ||
| static class A { | ||
| static class B { | ||
| static class C { | ||
| } | ||
| } | ||
|
|
||
| static class D { | ||
| } | ||
|
|
||
| static Class<?>[] localClass() { | ||
| class E { | ||
| class F { | ||
| } | ||
| } | ||
|
|
||
| return new Class<?>[] { E.class, E.F.class }; | ||
| } | ||
|
|
||
| static Class<?>[] anonymousClass() { | ||
| return new Object() { | ||
| class G { | ||
| } | ||
|
|
||
| Class<?>[] get() { | ||
| return new Class<?>[] { this.getClass(), G.class }; | ||
| } | ||
| }.get(); | ||
| } | ||
|
|
||
| interface H { | ||
| class I { | ||
| } | ||
| } | ||
|
|
||
| enum J { | ||
| ; | ||
| static class K { | ||
| } | ||
| } | ||
|
|
||
| @interface L { | ||
| class M { | ||
| } | ||
| } | ||
| } | ||
|
|
||
| @Test | ||
| public void test() throws IOException { | ||
| Index index = Index.of(A.class, A.B.class, A.B.C.class, A.D.class, | ||
| A.localClass()[0], A.localClass()[1], A.anonymousClass()[0], A.anonymousClass()[1], | ||
| A.H.class, A.H.I.class, A.J.class, A.J.K.class, A.L.class, A.L.M.class); | ||
| test(index); | ||
|
|
||
| test(IndexingUtil.roundtrip(index)); | ||
| } | ||
|
|
||
| private void test(Index index) { | ||
| checkNestingType(index, A.class, ClassInfo.NestingType.INNER); | ||
| checkMemberClasses(index, A.class, "B", "D", "H", "J", "L"); | ||
| checkEnclosingClass(index, A.class, "NestedClassesTest"); | ||
| checkEnclosingMethod(index, A.class, null, null); | ||
|
|
||
| checkNestingType(index, A.B.class, ClassInfo.NestingType.INNER); | ||
| checkMemberClasses(index, A.B.class, "C"); | ||
| checkEnclosingClass(index, A.B.class, "A"); | ||
| checkEnclosingMethod(index, A.B.class, null, null); | ||
|
|
||
| checkNestingType(index, A.B.C.class, ClassInfo.NestingType.INNER); | ||
| checkMemberClasses(index, A.B.C.class); // empty | ||
| checkEnclosingClass(index, A.B.C.class, "B"); | ||
| checkEnclosingMethod(index, A.B.C.class, null, null); | ||
|
|
||
| checkNestingType(index, A.D.class, ClassInfo.NestingType.INNER); | ||
| checkMemberClasses(index, A.D.class); // empty | ||
| checkEnclosingClass(index, A.D.class, "A"); | ||
| checkEnclosingMethod(index, A.D.class, null, null); | ||
|
|
||
| checkNestingType(index, A.localClass()[0], ClassInfo.NestingType.LOCAL); | ||
| checkMemberClasses(index, A.localClass()[0], "F"); | ||
| checkEnclosingClass(index, A.localClass()[0], null); | ||
| checkEnclosingMethod(index, A.localClass()[0], "localClass", "A"); | ||
|
|
||
| checkNestingType(index, A.localClass()[1], ClassInfo.NestingType.INNER); | ||
| checkMemberClasses(index, A.localClass()[1]); // empty | ||
| checkEnclosingClass(index, A.localClass()[1], "not-null"); | ||
| checkEnclosingMethod(index, A.localClass()[1], null, null); | ||
|
|
||
| checkNestingType(index, A.anonymousClass()[0], ClassInfo.NestingType.ANONYMOUS); | ||
| checkMemberClasses(index, A.anonymousClass()[0], "G"); | ||
| checkEnclosingClass(index, A.anonymousClass()[0], null); | ||
| checkEnclosingMethod(index, A.anonymousClass()[0], "anonymousClass", "A"); | ||
|
|
||
| checkNestingType(index, A.anonymousClass()[1], ClassInfo.NestingType.INNER); | ||
| checkMemberClasses(index, A.anonymousClass()[1]); // empty | ||
| checkEnclosingClass(index, A.anonymousClass()[1], "not-null"); | ||
| checkEnclosingMethod(index, A.anonymousClass()[1], null, null); | ||
|
|
||
| checkNestingType(index, A.H.class, ClassInfo.NestingType.INNER); | ||
| checkMemberClasses(index, A.H.class, "I"); | ||
| checkEnclosingClass(index, A.H.class, "A"); | ||
| checkEnclosingMethod(index, A.H.class, null, null); | ||
|
|
||
| checkNestingType(index, A.H.I.class, ClassInfo.NestingType.INNER); | ||
| checkMemberClasses(index, A.H.I.class); // empty | ||
| checkEnclosingClass(index, A.H.I.class, "H"); | ||
| checkEnclosingMethod(index, A.H.I.class, null, null); | ||
|
|
||
| checkNestingType(index, A.J.class, ClassInfo.NestingType.INNER); | ||
| checkMemberClasses(index, A.J.class, "K"); | ||
| checkEnclosingClass(index, A.J.class, "A"); | ||
| checkEnclosingMethod(index, A.J.class, null, null); | ||
|
|
||
| checkNestingType(index, A.J.K.class, ClassInfo.NestingType.INNER); | ||
| checkMemberClasses(index, A.J.K.class); // empty | ||
| checkEnclosingClass(index, A.J.K.class, "J"); | ||
| checkEnclosingMethod(index, A.J.K.class, null, null); | ||
|
|
||
| checkNestingType(index, A.L.class, ClassInfo.NestingType.INNER); | ||
| checkMemberClasses(index, A.L.class, "M"); | ||
| checkEnclosingClass(index, A.L.class, "A"); | ||
| checkEnclosingMethod(index, A.L.class, null, null); | ||
|
|
||
| checkNestingType(index, A.L.M.class, ClassInfo.NestingType.INNER); | ||
| checkMemberClasses(index, A.L.M.class); // empty | ||
| checkEnclosingClass(index, A.L.M.class, "L"); | ||
| checkEnclosingMethod(index, A.L.M.class, null, null); | ||
| } | ||
|
|
||
| private void checkNestingType(Index index, Class<?> clazz, ClassInfo.NestingType expectedNestingType) { | ||
| ClassInfo classInfo = index.getClassByName(DotName.createSimple(clazz.getName())); | ||
| assertEquals(expectedNestingType, classInfo.nestingType()); | ||
| } | ||
|
|
||
| private void checkMemberClasses(Index index, Class<?> clazz, String... expectedMemberClasses) { | ||
| Set<DotName> foundMemberClasses = index.getClassByName(DotName.createSimple(clazz.getName())).memberClasses(); | ||
| Set<String> names = new HashSet<>(); | ||
| for (DotName foundMemberClass : foundMemberClasses) { | ||
| names.add(foundMemberClass.local()); | ||
| } | ||
| assertEquals(new HashSet<>(Arrays.asList(expectedMemberClasses)), names); | ||
| } | ||
|
|
||
| private void checkEnclosingClass(Index index, Class<?> clazz, String expectedEnclosingClassName) { | ||
| ClassInfo classInfo = index.getClassByName(DotName.createSimple(clazz.getName())); | ||
| DotName enclosingClass = classInfo.enclosingClass(); | ||
| if (expectedEnclosingClassName == null) { | ||
| assertNull(enclosingClass); | ||
| } else { | ||
| assertNotNull(enclosingClass); | ||
| if (!"not-null".equals(expectedEnclosingClassName)) { | ||
| assertEquals(expectedEnclosingClassName, enclosingClass.local()); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| private void checkEnclosingMethod(Index index, Class<?> clazz, String expectedEnclosingMethodName, | ||
| String expectedEnclosingClassName) { | ||
| ClassInfo classInfo = index.getClassByName(DotName.createSimple(clazz.getName())); | ||
| ClassInfo.EnclosingMethodInfo enclosingMethod = classInfo.enclosingMethod(); | ||
|
|
||
| if (expectedEnclosingMethodName == null) { | ||
| assertNull(enclosingMethod); | ||
| } else { | ||
| assertNotNull(enclosingMethod); | ||
| assertEquals(expectedEnclosingMethodName, enclosingMethod.name()); | ||
| assertNotNull(enclosingMethod.enclosingClass()); | ||
| assertEquals(expectedEnclosingClassName, enclosingMethod.enclosingClass().local()); | ||
| } | ||
| } | ||
| } |