[MNG-8249] Fix annotation processor to correctly handle inner-inner c…

…lasses
apache · Sep 16, 2024 · 30f5265 · 30f5265
1 parent 7ea795b
commit 30f5265
Showing 1 changed file with 12 additions and 6 deletions.
diff --git a/api/maven-api-di/src/main/java/org/apache/maven/di/tool/DiIndexProcessor.java b/api/maven-api-di/src/main/java/org/apache/maven/di/tool/DiIndexProcessor.java
@@ -24,6 +24,7 @@
 import javax.annotation.processing.SupportedSourceVersion;
 import javax.lang.model.SourceVersion;
 import javax.lang.model.element.Element;
+import javax.lang.model.element.PackageElement;
 import javax.lang.model.element.TypeElement;
 import javax.tools.Diagnostic;
 import javax.tools.FileObject;
@@ -71,14 +72,19 @@ public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment
     }
 
     private String getFullClassName(TypeElement typeElement) {
-        String className = typeElement.getQualifiedName().toString();
+        StringBuilder className = new StringBuilder(typeElement.getSimpleName());
         Element enclosingElement = typeElement.getEnclosingElement();
-        if (enclosingElement instanceof TypeElement) {
-            String enclosingClassName =
-                    ((TypeElement) enclosingElement).getQualifiedName().toString();
-            className = enclosingClassName + "$" + typeElement.getSimpleName();
+
+        while (enclosingElement instanceof TypeElement) {
+            className.insert(0, "$").insert(0, ((TypeElement) enclosingElement).getSimpleName());
+            enclosingElement = enclosingElement.getEnclosingElement();
+        }
+
+        if (enclosingElement instanceof PackageElement) {
+            className.insert(0, ".").insert(0, ((PackageElement) enclosingElement).getQualifiedName());
         }
-        return className;
+
+        return className.toString();
     }
 
     private void updateFileIfChanged() throws IOException {