Merge branch '4.7.x' into 4.8.x

Author: graemerocher

inject-java/src/main/java/io/micronaut/annotation/processing/BeanDefinitionInjectProcessor.java

@@ -30,7 +30,6 @@
 import io.micronaut.inject.processing.JavaModelUtils;
 import io.micronaut.inject.processing.ProcessingException;
 import io.micronaut.inject.visitor.BeanElementVisitor;
-import io.micronaut.inject.visitor.ElementPostponedToNextRoundException;
 import io.micronaut.inject.writer.AbstractBeanDefinitionBuilder;
 import io.micronaut.inject.writer.BeanDefinitionVisitor;
 import io.micronaut.inject.writer.BeanDefinitionWriter;
@@ -92,7 +91,7 @@ public class BeanDefinitionInjectProcessor extends AbstractInjectAnnotationProce
 
     private Set<String> beanDefinitions;
     private final Set<String> processed = new HashSet<>();
-    private final Map<String, Element> postponed = new HashMap<>();
+    private final Map<String, PostponeToNextRoundException> postponed = new HashMap<>();
 
     @Override
     public final synchronized void init(ProcessingEnvironment processingEnv) {
@@ -198,10 +197,7 @@ public final boolean process(Set<? extends TypeElement> annotations, RoundEnviro
                             error(((JavaNativeElement) ex.getOriginatingElement()).element(), ex.getMessage());
                         } catch (PostponeToNextRoundException e) {
                             processed.remove(className);
-                            postponed.put(className, (Element) e.getErrorElement());
-                        } catch (ElementPostponedToNextRoundException e) {
-                            processed.remove(className);
-                            postponed.put(className, ((JavaNativeElement) e.getOriginatingElement().getNativeType()).element());
+                            postponed.put(className, e);
                         }
                     }
                 }
@@ -213,9 +209,9 @@ public final boolean process(Set<? extends TypeElement> annotations, RoundEnviro
         processing round.
         */
         if (processingOver) {
-            for (Map.Entry<String, Element> e : postponed.entrySet()) {
-                javaVisitorContext.warn("Bean definition generation [" + e.getKey() + "] skipped from processing because of prior error." +
-                    " This error is normally due to missing classes on the classpath. Verify the compilation classpath is correct to resolve the problem.", e.getValue());
+            for (Map.Entry<String, PostponeToNextRoundException> e : postponed.entrySet()) {
+                javaVisitorContext.warn("Bean definition generation [" + e.getKey() + "] skipped from processing because of prior error: [" + e.getValue().getPath() + "]." +
+                    " This error is normally due to missing classes on the classpath. Verify the compilation classpath is correct to resolve the problem.", (Element) e.getValue().getErrorElement());
             }
 
             try {

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

@@ -42,7 +42,6 @@
 import io.micronaut.inject.ast.utils.AstBeanPropertiesUtils;
 import io.micronaut.inject.ast.utils.EnclosedElementsQuery;
 import io.micronaut.inject.processing.JavaModelUtils;
-import io.micronaut.inject.visitor.ElementPostponedToNextRoundException;
 
 import javax.lang.model.element.Element;
 import javax.lang.model.element.ElementKind;
@@ -272,27 +271,22 @@ public boolean isPrimitive() {
     @Override
     public Collection<ClassElement> getInterfaces() {
         if (resolvedInterfaces == null) {
-            resolvedInterfaces = classElement.getInterfaces().stream()
-                .map(mirror -> {
-                    if (mirror.getKind() == TypeKind.ERROR) {
-                        throw new ElementPostponedToNextRoundException(this);
-                    }
-                    return newClassElement(mirror, getTypeArguments());
-                }).toList();
+            resolvedInterfaces = classElement.getInterfaces().stream().filter(this::onlyAvailable).map(mirror -> newClassElement(mirror, getTypeArguments())).toList();
         }
         return resolvedInterfaces;
     }
 
+    private boolean onlyAvailable(TypeMirror mirror) {
+        return !(mirror instanceof DeclaredType declaredType) || declaredType.getKind() != TypeKind.ERROR;
+    }
+
     @Override
     public Optional<ClassElement> getSuperType() {
         if (resolvedSuperType == null) {
             final TypeMirror superclass = classElement.getSuperclass();
             if (superclass == null) {
                 return Optional.empty();
             }
-            if (superclass.getKind() == TypeKind.ERROR) {
-                throw new ElementPostponedToNextRoundException(this);
-            }
             final Element element = visitorContext.getTypes().asElement(superclass);
             if (element instanceof TypeElement superElement) {
                 if (Object.class.getName().equals(superElement.getQualifiedName().toString())) {

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

@@ -3,6 +3,7 @@ package io.micronaut.visitors
 
 import io.micronaut.annotation.processing.test.AbstractTypeElementSpec
 import io.micronaut.inject.writer.BeanDefinitionVisitor
+import spock.lang.PendingFeature
 
 class PostponedVisitorsSpec extends AbstractTypeElementSpec {
 
@@ -30,6 +31,7 @@ public record Walrus (
             definition
     }
 
+    @PendingFeature(reason = "It is currently not possible to implement a generated interface")
     void 'test postpone introduction generation implementing generated interface'() {
         when:
         def context = buildContext('test.MyIntroduction' + BeanDefinitionVisitor.PROXY_SUFFIX, '''