Fixes #11838 for clearing mutated annotation metadata (#11842)

* Create another test for mutated annotation metadata

* Another test case for postponed to next round visiting

* fix caching bug by always including declaring element

---------

Co-authored-by: Graeme Rocher <[email protected]>

Author: andriy-dmytruk

inject-java/src/main/java/io/micronaut/annotation/processing/visitor/AbstractJavaElement.java

@@ -448,7 +448,7 @@ public boolean equals(Object o) {
         if (this == o) {
             return true;
         }
-        if (o == null) {
+        if (!(o instanceof io.micronaut.inject.ast.Element)) {
             return false;
         }
         io.micronaut.inject.ast.Element that = (io.micronaut.inject.ast.Element) o;

inject-java/src/main/java/io/micronaut/annotation/processing/visitor/JavaElementFactory.java

@@ -225,14 +225,14 @@ private void failIfPostponeIsNeeded(TypedElement member, ExecutableElement execu
         TypeMirror returnType = executableElement.getReturnType();
         TypeKind returnKind = returnType.getKind();
         if (returnKind == TypeKind.ERROR) {
-            throw new PostponeToNextRoundException(executableElement, member.getName() + " " + executableElement);
+            throw new PostponeToNextRoundException(member, member.getName() + " " + executableElement);
         }
     }
 
     private void failIfPostponeIsNeeded(TypedElement member, VariableElement variableElement) {
         TypeMirror type = variableElement.asType();
         if (type.getKind() == TypeKind.ERROR) {
-            throw new PostponeToNextRoundException(variableElement, member.getName() + " " + variableElement);
+            throw new PostponeToNextRoundException(member, member.getName() + " " + variableElement);
         }
     }
 

inject-java/src/test/groovy/io/micronaut/visitors/CollectingVisitor.groovy

@@ -1,6 +1,7 @@
 package io.micronaut.visitors
 
 import io.micronaut.core.annotation.Introspected
+import io.micronaut.http.annotation.Controller
 import io.micronaut.http.annotation.Get
 import io.micronaut.inject.ast.ClassElement
 import io.micronaut.inject.ast.MethodElement
@@ -15,6 +16,13 @@ class CollectingVisitor implements TypeElementVisitor<Object, Object> {
     static int numMethodVisited = 0
     static boolean hasIntrospected
     static String getPath
+    static String controllerPath
+
+    @Override
+    void start(VisitorContext visitorContext) {
+        numVisited = 0
+        numMethodVisited = 0
+    }
 
     @Override
     void visitClass(ClassElement element, VisitorContext context) {
@@ -26,6 +34,10 @@ class CollectingVisitor implements TypeElementVisitor<Object, Object> {
             throw new ElementPostponedToNextRoundException(element)
         }
 
+        controllerPath = element.stringValue(Controller.class).orElse(null)
+        if ("<error>".equalsIgnoreCase(controllerPath)) {
+            throw new ElementPostponedToNextRoundException(element)
+        }
         ++numVisited
         hasIntrospected = element.hasStereotype(Introspected)
     }
@@ -37,6 +49,8 @@ class CollectingVisitor implements TypeElementVisitor<Object, Object> {
         }
 
         ++numMethodVisited
-        getPath = element.stringValue(Get).orElse(null)
+
+        def path = element.stringValue(Get).orElse(null)
+        getPath = path
     }
 }

inject-java/src/test/groovy/io/micronaut/visitors/GeneratorVisitor.groovy

@@ -17,8 +17,23 @@ import io.micronaut.http.annotation.Get;
 @Introspected
 public interface Parent {
 
+    String BASE_PATH = "/hello";
+
     @Get("/get")
-    String hello();
+    TestModel hello();
+
+}
+"""
+
+    private static final @Language("java") String SOURCE_MODEL = """
+package example;
+
+import io.micronaut.core.annotation.Introspected;
+
+@Introspected
+public record TestModel(
+        String greeting
+) {
 
 }
 """
@@ -34,6 +49,15 @@ public interface Parent {
                             throw new RuntimeException(e)
                         }
                     })
+
+            context.visitGeneratedSourceFile("example", "TestModel", element)
+                    .ifPresent(generatedFile -> {
+                        try {
+                            generatedFile.write(writer -> writer.write(SOURCE_MODEL))
+                        } catch (IOException e) {
+                            throw new RuntimeException(e)
+                        }
+                    })
         }
 
     }

inject-java/src/test/groovy/io/micronaut/visitors/PostponedVisitorsSpec.groovy

@@ -128,15 +128,49 @@ class MyBean implements GeneratedInterface  {
 package example;
 
 import jakarta.inject.Singleton;
+import io.micronaut.http.annotation.Controller;
 
 @io.micronaut.visitors.GeneratorTrigger
 class Trigger {}
 
 // Parent is generated, we want to retrieve inherited annotations correctly
 @Singleton
+@Controller(Parent.BASE_PATH)
 class Child implements Parent {
 
     @Override
+    public TestModel hello() {
+        return new TestModel("Hola!");
+    }
+
+}
+''')
+        then:
+        CollectingVisitor.numVisited == 1
+        CollectingVisitor.numMethodVisited == 1
+        CollectingVisitor.getPath == "/get"
+        CollectingVisitor.hasIntrospected
+        CollectingVisitor.controllerPath == "/hello"
+    }
+
+    void "test information collecting visitor not through parent"() {
+        when:
+        buildClassLoader('example.Trigger', '''
+package example;
+
+import jakarta.inject.Singleton;
+import io.micronaut.http.annotation.Controller;
+import io.micronaut.http.annotation.Get;
+
+@io.micronaut.visitors.GeneratorTrigger
+class Trigger {}
+
+// Parent is generated, we want to retrieve the value correctly
+@Singleton
+@Controller(Parent.BASE_PATH)
+class Child {
+
+    @Get("/get")
     public String hello() {
         return "Hola!";
     }
@@ -147,7 +181,7 @@ class Child implements Parent {
         CollectingVisitor.numVisited == 1
         CollectingVisitor.numMethodVisited == 1
         CollectingVisitor.getPath == "/get"
-        CollectingVisitor.hasIntrospected
+        CollectingVisitor.controllerPath == "/hello"
     }
 
 }