Merge branch '1.1.x' into 1.2.x

tardisoft · Aug 20, 2019 · 60b9a2d · 60b9a2d
2 parents 42364e9 + 21d50ce
commit 60b9a2d
Show file tree

Hide file tree

Showing 4 changed files with 78 additions and 7 deletions.
diff --git a/inject-groovy/src/main/groovy/io/micronaut/ast/groovy/InjectTransform.groovy b/inject-groovy/src/main/groovy/io/micronaut/ast/groovy/InjectTransform.groovy
@@ -333,7 +333,10 @@ class InjectTransform implements ASTTransformation, CompilationUnitAware {
             } else if (isFactoryClass || isConfigurationProperties || annotationMetadata.hasStereotype(Bean, Scope)) {
                 defineBeanDefinition(concreteClass)
             }
-            this.isDeclaredBean = isExecutableType || isConfigurationProperties || isFactoryClass || annotationMetadata.hasStereotype(Scope.class) || annotationMetadata.hasStereotype(DefaultScope.class)
+            this.isDeclaredBean = isExecutableType || isConfigurationProperties || isFactoryClass || annotationMetadata.hasStereotype(Scope.class) || annotationMetadata.hasStereotype(DefaultScope.class) || concreteClass.declaredConstructors.any {
+                AnnotationMetadata constructorMetadata = AstAnnotationUtils.getAnnotationMetadata(sourceUnit, it)
+                constructorMetadata.hasStereotype(Inject)
+            }
         }
 
         BeanDefinitionVisitor getBeanWriter() {

diff --git a/inject-groovy/src/test/groovy/io/micronaut/inject/lifecyle/PostConstructCompileSpec.groovy b/inject-groovy/src/test/groovy/io/micronaut/inject/lifecyle/PostConstructCompileSpec.groovy
@@ -7,7 +7,7 @@ class PostConstructCompileSpec extends AbstractBeanDefinitionSpec {
 
     void "test that a @PostConstruct method on a type not defined as a bean doesn't create a bean"() {
         when:
-        buildBeanDefinition('test.Test', '''
+        BeanDefinition definition = buildBeanDefinition('test.Test', '''
 package test;
 
 import javax.annotation.PostConstruct;
@@ -24,8 +24,6 @@ class Test {
 
         then:
         thrown(ClassNotFoundException)
-
-
     }
 
     void "test visit constructor @Inject"() {
@@ -48,7 +46,30 @@ class Test {
 
         then:
         definition != null
+        definition.postConstructMethods.empty
+
+    }
+
+    void "test visit constructor @Inject and @PostConstruct"() {
+        when:
+        def definition = buildBeanDefinition('test.Test', '''
+package test;
+
+import javax.annotation.PostConstruct;
+import javax.inject.Inject;
+
+class Test {
 
+    @Inject
+    Test() {  }
+    
+    @PostConstruct
+    void init() {   }
+}
+''')
 
+        then:
+        definition != null
+        definition.postConstructMethods.size() == 1
     }
 }
diff --git a/...-java/src/main/java/io/micronaut/annotation/processing/BeanDefinitionInjectProcessor.java b/...-java/src/main/java/io/micronaut/annotation/processing/BeanDefinitionInjectProcessor.java
@@ -328,8 +328,10 @@ class AnnBeanElementVisitor extends ElementScanner8<Object, Object> {
             this.isConfigurationPropertiesType = isConfigurationProperties(concreteClass);
             this.isAopProxyType = concreteClassMetadata.hasStereotype(AROUND_TYPE) && !modelUtils.isAbstract(concreteClass);
             this.aopSettings = isAopProxyType ? concreteClassMetadata.getValues(AROUND_TYPE, Boolean.class) : OptionalValues.empty();
+            ExecutableElement constructor = modelUtils.concreteConstructorFor(concreteClass, annotationUtils);
+            this.constructorParameterInfo = populateParameterData(null, constructor, Collections.emptyMap());
             this.isExecutableType = isAopProxyType || concreteClassMetadata.hasStereotype(Executable.class);
-            this.isDeclaredBean = isExecutableType || isConfigurationPropertiesType || isFactoryType || concreteClassMetadata.hasStereotype(Scope.class) || concreteClassMetadata.hasStereotype(DefaultScope.class);
+            this.isDeclaredBean = isExecutableType || isConfigurationPropertiesType || isFactoryType || concreteClassMetadata.hasStereotype(Scope.class) || concreteClassMetadata.hasStereotype(DefaultScope.class) || constructorParameterInfo.getAnnotationMetadata().hasStereotype(Inject.class);
         }
 
         /**
@@ -406,8 +408,6 @@ public Object visitType(TypeElement classElement, Object o) {
                         qualifiedName.equals(classElementQualifiedName)) {
 
                     if (qualifiedName.equals(classElementQualifiedName)) {
-                        ExecutableElement constructor = modelUtils.concreteConstructorFor(classElement, annotationUtils);
-                        this.constructorParameterInfo = populateParameterData(null, constructor, Collections.emptyMap());
                         final boolean isBean = isAopProxyType ||
                                 isConfigurationPropertiesType ||
                                 typeAnnotationMetadata.hasStereotype(ANNOTATION_STEREOTYPES) ||

diff --git a/inject-java/src/test/groovy/io/micronaut/inject/lifecycle/PostConstructCompileSpec.groovy b/inject-java/src/test/groovy/io/micronaut/inject/lifecycle/PostConstructCompileSpec.groovy
@@ -25,4 +25,51 @@ class Test {
         then:
         definition == null
     }
+
+    void "test visit constructor @Inject"() {
+        when:
+        def definition = buildBeanDefinition('test.Test', '''
+package test;
+
+import javax.annotation.PostConstruct;
+import javax.inject.Inject;
+
+class Test {
+
+    @Inject
+    Test() {
+    
+
+    }
+}
+''')
+
+        then:
+        definition != null
+        definition.postConstructMethods.empty
+
+    }
+
+    void "test visit constructor @Inject and @PostConstruct"() {
+        when:
+        def definition = buildBeanDefinition('test.Test', '''
+package test;
+
+import javax.annotation.PostConstruct;
+import javax.inject.Inject;
+
+class Test {
+
+    @Inject
+    Test() {  }
+    
+    @PostConstruct
+    void init() {   }
+}
+''')
+
+        then:
+        definition != null
+        definition.postConstructMethods.size() == 1
+    }
 }