Resolve issue with introspection references referencing introspection…

…s in other packages. Fixes #2596
micronaut-projects · Jan 8, 2020 · 698f01f · 698f01f
1 parent 77d64f1
commit 698f01f
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 4 deletions.
diff --git a/...-java-test/src/test/groovy/io/micronaut/inject/visitor/beans/BeanIntrospectionSpec.groovy b/...-java-test/src/test/groovy/io/micronaut/inject/visitor/beans/BeanIntrospectionSpec.groovy
@@ -656,7 +656,7 @@ class Test {
         context?.close()
     }
 
-    void "test write bean introspection data for classes"() {
+    void "test write bean introspection data for class in another package"() {
         given:
         ApplicationContext context = buildContext('test.Test', '''
 package test;
@@ -666,7 +666,7 @@ import javax.validation.constraints.*;
 import java.util.*;
 import io.micronaut.inject.visitor.beans.*;
 
-@Introspected(classes=TestBean.class)
+@Introspected(classes=OtherTestBean.class)
 class Test {}
 ''')
 
@@ -676,7 +676,13 @@ class Test {}
 
         then:"The reference is valid"
         reference != null
-        reference.getBeanType() == TestBean
+        reference.getBeanType() == OtherTestBean
+
+        when:
+        reference.load()
+
+        then:
+        noExceptionThrown()
 
         cleanup:
         context?.close()

diff --git a/inject-java-test/src/test/groovy/io/micronaut/inject/visitor/beans/OtherTestBean.java b/inject-java-test/src/test/groovy/io/micronaut/inject/visitor/beans/OtherTestBean.java
@@ -0,0 +1,13 @@
+package io.micronaut.inject.visitor.beans;
+
+public class OtherTestBean {
+    private String name;
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+}
diff --git a/inject/src/main/java/io/micronaut/inject/beans/visitor/BeanIntrospectionWriter.java b/inject/src/main/java/io/micronaut/inject/beans/visitor/BeanIntrospectionWriter.java
@@ -73,6 +73,7 @@ class BeanIntrospectionWriter extends AbstractAnnotationMetadataWriter {
     private int propertyIndex = 0;
     private ParameterElement[] constructorArguments;
     private final HashMap<String, GeneratorAdapter> loadTypeMethods = new HashMap<>();
+    private final boolean publicIntrospection;
 
     /**
      * Default constructor.
@@ -88,6 +89,7 @@ class BeanIntrospectionWriter extends AbstractAnnotationMetadataWriter {
         this.introspectionName = computeIntrospectionName(className);
         this.introspectionType = getTypeReference(introspectionName);
         this.beanType = getTypeReference(className);
+        this.publicIntrospection = false;
     }
 
     /**
@@ -106,6 +108,7 @@ class BeanIntrospectionWriter extends AbstractAnnotationMetadataWriter {
         this.introspectionName = computeIntrospectionName(className);
         this.introspectionType = getTypeReference(introspectionName);
         this.beanType = getTypeReference(className);
+        this.publicIntrospection = true;
     }
 
     /**
@@ -189,7 +192,11 @@ private void writeIntrospectionClass(ClassWriterOutputVisitor classWriterOutputV
 
         try (OutputStream introspectionStream = classWriterOutputVisitor.visitClass(introspectionName)) {
 
-            startFinalClass(introspectionWriter, introspectionType.getInternalName(), superType);
+            if (publicIntrospection) {
+                startPublicFinalClass(introspectionWriter, introspectionType.getInternalName(), superType);
+            } else {
+                startFinalClass(introspectionWriter, introspectionType.getInternalName(), superType);
+            }
             final GeneratorAdapter constructorWriter = startConstructor(introspectionWriter);
 
             // writer the constructor