fix: prevent ImportAnnotationVisitor walking non-visible classes (#540)

Closes #521
micronaut-projects · Feb 13, 2024 · d30b917 · d30b917
1 parent 1cba81c
commit d30b917
Showing 1 changed file with 15 additions and 10 deletions.
diff --git a/...nnotation/src/main/java/io/micronaut/spring/annotation/beans/ImportAnnotationVisitor.java b/...nnotation/src/main/java/io/micronaut/spring/annotation/beans/ImportAnnotationVisitor.java
@@ -58,8 +58,7 @@
 import io.micronaut.spring.core.type.ClassElementSpringMetadata;
 
 /**
- * Handles the import importDeclaration allowing importing of additional Spring beans into a Micronaut
- application.
+ * Handles the import importDeclaration allowing importing of additional Spring beans into a Micronaut application.
  *
  * @author graemerocher
  * @since 4.3.0
@@ -75,15 +74,21 @@ public void visitClass(ClassElement element, VisitorContext context) {
         if (annType != null && element.hasStereotype(annType)) {
             List<AnnotationValue<? extends Annotation>> values = element.getAnnotationValuesByType(annType);
             if (!values.isEmpty()) {
-                for (AnnotationValue<?> av : values) {
-                    AnnotationClassValue<?>[] acv = av.annotationClassValues(AnnotationMetadata.VALUE_MEMBER);
-                    for (AnnotationClassValue<?> a : acv) {
-                        String className = a.getName();
-                        context.getClassElement(className).ifPresent(typeToImport -> {
-                            handleImport(element, context, typeToImport);
-                        });
+                visitValues(element, context, values);
+            }
+        }
+    }
+
+    private void visitValues(ClassElement element, VisitorContext context, List<AnnotationValue<? extends Annotation>> values) {
+        for (AnnotationValue<?> av : values) {
+            AnnotationClassValue<?>[] acv = av.annotationClassValues(AnnotationMetadata.VALUE_MEMBER);
+            for (AnnotationClassValue<?> a : acv) {
+                String className = a.getName();
+                context.getClassElement(className).ifPresent(typeToImport -> {
+                    if (typeToImport.isPublic()) {
+                        handleImport(element, context, typeToImport);
                     }
-                }
+                });
             }
         }
     }