Fix for eagerInitSingletons attempting to instantiate prototype facto…

…ry methods (#4950) * Fix eagerInitSingletons attempting to create factory prototypes. Fixes #4929 * Add expectation no exception is thrown * Add @SInCE javadoc
micronaut-projects · Feb 18, 2021 · 8d931d4 · 8d931d4
1 parent 29158f0
commit 8d931d4
Show file tree

Hide file tree

Showing 42 changed files with 177 additions and 34 deletions.
diff --git a/core/src/main/java/io/micronaut/core/annotation/AnnotationMetadata.java b/core/src/main/java/io/micronaut/core/annotation/AnnotationMetadata.java
@@ -225,6 +225,26 @@ default boolean hasDeclaredStereotype(@Nullable String annotation) {
         return false;
     }
 
+    /**
+     * Checks whether this object has any of the given stereotype directly declared on the object.
+     *
+     * @param annotations The annotations
+     * @return True if any of the given stereotypes are present
+     * @since 2.3.3
+     */
+    @SuppressWarnings("unchecked")
+    default boolean hasDeclaredStereotype(@Nullable String... annotations) {
+        if (ArrayUtils.isEmpty(annotations)) {
+            return false;
+        }
+        for (String annotation : annotations) {
+            if (hasDeclaredStereotype(annotation)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
     /**
      * Return the default values for the given annotation name.
      * @param annotation The annotation name

diff --git a/inject-java/src/test/groovy/io/micronaut/inject/configproperties/ValidatedConfig.java b/inject-java/src/test/groovy/io/micronaut/inject/configproperties/ValidatedConfig.java
@@ -16,11 +16,13 @@
 package io.micronaut.inject.configproperties;
 
 import io.micronaut.context.annotation.ConfigurationProperties;
+import io.micronaut.context.annotation.Requires;
 
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.NotBlank;
 import java.net.URL;
 
+@Requires(property = "spec.name", value = "ValidatedConfigurationSpec")
 @ConfigurationProperties("foo.bar")
 public class ValidatedConfig {
 

diff --git a/...va/src/test/groovy/io/micronaut/inject/configproperties/ValidatedConfigurationSpec.groovy b/...va/src/test/groovy/io/micronaut/inject/configproperties/ValidatedConfigurationSpec.groovy
@@ -30,8 +30,7 @@ class ValidatedConfigurationSpec extends AbstractTypeElementSpec {
 
     void "test validated config with invalid config"() {
         given:
-        ApplicationContext applicationContext = new DefaultApplicationContext("test")
-        applicationContext.start()
+        ApplicationContext applicationContext = ApplicationContext.run(["spec.name": getClass().simpleName], "test")
 
         when:
         ValidatedConfig config = applicationContext.getBean(ValidatedConfig)
@@ -47,7 +46,10 @@ class ValidatedConfigurationSpec extends AbstractTypeElementSpec {
 
     void "test validated config with valid config"() {
         given:
-        ApplicationContext applicationContext = new DefaultApplicationContext("test")
+        ApplicationContext applicationContext = ApplicationContext.builder()
+            .properties(["spec.name": getClass().simpleName])
+            .environments("test")
+            .build()
         applicationContext.environment.addPropertySource(PropertySource.of(
                 'foo.bar.url':'http://localhost',
                 'foo.bar.name':'test'

diff --git a/inject-java/src/test/groovy/io/micronaut/inject/configproperties/ValidatedGetterConfig.java b/inject-java/src/test/groovy/io/micronaut/inject/configproperties/ValidatedGetterConfig.java
@@ -16,11 +16,13 @@
 package io.micronaut.inject.configproperties;
 
 import io.micronaut.context.annotation.ConfigurationProperties;
+import io.micronaut.context.annotation.Requires;
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import java.net.URL;
 
+@Requires(property = "spec.name", value = "ValidatedGetterConfigurationSpec")
 @ConfigurationProperties("foo.bar")
 public class ValidatedGetterConfig {
 

diff --git a/.../test/groovy/io/micronaut/inject/configproperties/ValidatedGetterConfigurationSpec.groovy b/.../test/groovy/io/micronaut/inject/configproperties/ValidatedGetterConfigurationSpec.groovy
@@ -27,8 +27,7 @@ class ValidatedGetterConfigurationSpec extends Specification {
 
     void "test validated config with invalid config"() {
         given:
-        ApplicationContext applicationContext = new DefaultApplicationContext("test")
-        applicationContext.start()
+        ApplicationContext applicationContext = ApplicationContext.run(["spec.name": getClass().simpleName], "test")
 
         when:
         ValidatedGetterConfig config = applicationContext.getBean(ValidatedGetterConfig)
@@ -44,7 +43,10 @@ class ValidatedGetterConfigurationSpec extends Specification {
 
     void "test validated config with valid config"() {
         given:
-        ApplicationContext applicationContext = new DefaultApplicationContext("test")
+        ApplicationContext applicationContext = ApplicationContext.builder()
+                .properties(["spec.name": getClass().simpleName])
+                .environments("test")
+                .build()
         applicationContext.environment.addPropertySource(PropertySource.of(
                 'foo.bar.url':'http://localhost',
                 'foo.bar.name':'test'

diff --git a/inject-java/src/test/groovy/io/micronaut/inject/context/EagerInitSingletonsSpec.groovy b/inject-java/src/test/groovy/io/micronaut/inject/context/EagerInitSingletonsSpec.groovy
@@ -0,0 +1,21 @@
+package io.micronaut.inject.context
+
+import io.micronaut.context.ApplicationContext
+import spock.lang.Specification
+
+class EagerInitSingletonsSpec extends Specification {
+
+    void "test eager init works with prototype factories"() {
+        when:
+        def context = ApplicationContext.builder()
+                .eagerInitSingletons(true)
+                .start()
+
+        then:
+        noExceptionThrown()
+        !Pojo.instantiated
+
+        cleanup:
+        context.close()
+    }
+}
diff --git a/inject-java/src/test/groovy/io/micronaut/inject/context/Pojo.java b/inject-java/src/test/groovy/io/micronaut/inject/context/Pojo.java
@@ -0,0 +1,10 @@
+package io.micronaut.inject.context;
+
+public class Pojo {
+
+    public static boolean instantiated;
+
+    public Pojo() {
+        instantiated = true;
+    }
+}
diff --git a/inject-java/src/test/groovy/io/micronaut/inject/context/PrototypeFactory.java b/inject-java/src/test/groovy/io/micronaut/inject/context/PrototypeFactory.java
@@ -0,0 +1,13 @@
+package io.micronaut.inject.context;
+
+import io.micronaut.context.annotation.Factory;
+import io.micronaut.context.annotation.Prototype;
+
+@Factory
+public class PrototypeFactory {
+
+    @Prototype
+    Pojo prototype() {
+        return new Pojo();
+    }
+}
diff --git a/...-java/src/test/groovy/io/micronaut/inject/factory/inject/InjectExistingFactorySpec.groovy b/...-java/src/test/groovy/io/micronaut/inject/factory/inject/InjectExistingFactorySpec.groovy
@@ -15,18 +15,17 @@
  */
 package io.micronaut.inject.factory.inject
 
-import io.micronaut.context.BeanContext
+import io.micronaut.context.ApplicationContext
 import spock.lang.Specification
 import spock.lang.Unroll
 
 class InjectExistingFactorySpec extends Specification {
 
     @Unroll
     void "test that it is possible inject an existing factory instance without a circular dependency issue"() {
-
         given:
         MyFactory myFactory = new MyFactory()
-        BeanContext ctx = BeanContext.run()
+        ApplicationContext ctx = ApplicationContext.run(["spec.name": getClass().simpleName])
         ctx.inject(myFactory)
 
         expect:
@@ -37,7 +36,5 @@ class InjectExistingFactorySpec extends Specification {
 
         where:
         times << [1,2,3,4,5,6,7,9,10]
-
-
     }
 }
diff --git a/inject-java/src/test/groovy/io/micronaut/inject/factory/inject/MyFactory.java b/inject-java/src/test/groovy/io/micronaut/inject/factory/inject/MyFactory.java
@@ -17,9 +17,11 @@
 
 import io.micronaut.context.annotation.Factory;
 import io.micronaut.context.annotation.Prototype;
+import io.micronaut.context.annotation.Requires;
 
 import javax.inject.Inject;
 
+@Requires(property = "spec.name", value = "InjectExistingFactorySpec")
 @Factory
 public class MyFactory {
 

diff --git a/inject-java/src/test/groovy/io/micronaut/inject/factory/nullreturn/FactoryConstructor.java b/inject-java/src/test/groovy/io/micronaut/inject/factory/nullreturn/FactoryConstructor.java
@@ -16,7 +16,9 @@
 package io.micronaut.inject.factory.nullreturn;
 
 import io.micronaut.context.annotation.Factory;
+import io.micronaut.context.annotation.Requires;
 
+@Requires(property = "spec.name", value = "NullReturnFactorySpec")
 @Factory
 public class FactoryConstructor {
 

diff --git a/...-java/src/test/groovy/io/micronaut/inject/factory/nullreturn/NullReturnFactorySpec.groovy b/...-java/src/test/groovy/io/micronaut/inject/factory/nullreturn/NullReturnFactorySpec.groovy
@@ -57,7 +57,7 @@ class Test2 {}
 
     void "test factory that returns null"() {
         given:
-        BeanContext beanContext = ApplicationContext.run()
+        BeanContext beanContext = ApplicationContext.run(["spec.name": getClass().simpleName])
         NullableFactory factory = beanContext.getBean(NullableFactory)
 
         when:
@@ -124,7 +124,7 @@ class Test2 {}
 
     void "test it works as expected nested resolution"() {
         given:
-        BeanContext beanContext = ApplicationContext.run()
+        BeanContext beanContext = ApplicationContext.run(["spec.name": getClass().simpleName])
         NullableFactory factory = beanContext.getBean(NullableFactory)
 
         expect:
@@ -141,7 +141,7 @@ class Test2 {}
 
     void "test each bean on a class with null factory"() {
         given:
-        BeanContext beanContext = ApplicationContext.run()
+        BeanContext beanContext = ApplicationContext.run(["spec.name": getClass().simpleName])
 
         expect:
         beanContext.getBeansOfType(DProcessor).size() == 1

diff --git a/inject-java/src/test/groovy/io/micronaut/inject/failures/ctorcirculardependency/A.java b/inject-java/src/test/groovy/io/micronaut/inject/failures/ctorcirculardependency/A.java
@@ -15,8 +15,11 @@
  */
 package io.micronaut.inject.failures.ctorcirculardependency;
 
+import io.micronaut.context.annotation.Requires;
+
 import javax.inject.Singleton;
 
+@Requires(property = "spec.name", value = "ConstructorCircularDependencyFailureSpec")
 @Singleton
 public class A {
     public A(C c) {}

diff --git a/inject-java/src/test/groovy/io/micronaut/inject/failures/ctorcirculardependency/B.java b/inject-java/src/test/groovy/io/micronaut/inject/failures/ctorcirculardependency/B.java
@@ -15,9 +15,12 @@
  */
 package io.micronaut.inject.failures.ctorcirculardependency;
 
+import io.micronaut.context.annotation.Requires;
+
 import javax.inject.Inject;
 import javax.inject.Singleton;
 
+@Requires(property = "spec.name", value = "ConstructorCircularDependencyFailureSpec")
 @Singleton
 public class B {
     @Inject

diff --git a/...ut/inject/failures/ctorcirculardependency/ConstructorCircularDependencyFailureSpec.groovy b/...ut/inject/failures/ctorcirculardependency/ConstructorCircularDependencyFailureSpec.groovy
@@ -28,8 +28,7 @@ class ConstructorCircularDependencyFailureSpec extends Specification {
 
     void "test simple constructor circular dependency failure"() {
         given:
-        BeanContext context = new DefaultBeanContext()
-        context.start()
+        ApplicationContext context = ApplicationContext.run(["spec.name": getClass().simpleName])
 
         when:"A bean is obtained that has a setter with @Inject"
         B b =  context.getBean(B)

diff --git a/inject-java/src/test/groovy/io/micronaut/inject/failures/ctorexception/A.java b/inject-java/src/test/groovy/io/micronaut/inject/failures/ctorexception/A.java
@@ -15,8 +15,11 @@
  */
 package io.micronaut.inject.failures.ctorexception;
 
+import io.micronaut.context.annotation.Requires;
+
 import javax.inject.Singleton;
 
+@Requires(property = "spec.name", value = "ConstructorExceptionSpec")
 @Singleton
 public class A {
     public A(C c) {

diff --git a/inject-java/src/test/groovy/io/micronaut/inject/failures/ctorexception/C.java b/inject-java/src/test/groovy/io/micronaut/inject/failures/ctorexception/C.java
@@ -15,8 +15,11 @@
  */
 package io.micronaut.inject.failures.ctorexception;
 
+import io.micronaut.context.annotation.Requires;
+
 import javax.inject.Singleton;
 
+@Requires(property = "spec.name", value = "ConstructorExceptionSpec")
 @Singleton
 public class C {
     public C() {

diff --git a/...rc/test/groovy/io/micronaut/inject/failures/ctorexception/ConstructorExceptionSpec.groovy b/...rc/test/groovy/io/micronaut/inject/failures/ctorexception/ConstructorExceptionSpec.groovy
@@ -15,18 +15,15 @@
  */
 package io.micronaut.inject.failures.ctorexception
 
-import io.micronaut.context.BeanContext
-import io.micronaut.context.DefaultBeanContext
+import io.micronaut.context.ApplicationContext
 import io.micronaut.context.exceptions.BeanInstantiationException
-import io.micronaut.context.exceptions.DependencyInjectionException
 import spock.lang.Specification
 
 class ConstructorExceptionSpec extends Specification {
 
     void "test error message when exception occurs in constructor"() {
         given:
-        BeanContext context = new DefaultBeanContext()
-        context.start()
+        ApplicationContext context = ApplicationContext.run(["spec.name": getClass().simpleName])
 
         when:"A bean is obtained that has a setter with @Inject"
         B b =  context.getBean(B)
@@ -39,6 +36,9 @@ Error instantiating bean of type  [io.micronaut.inject.failures.ctorexception.A]
 
 Message: bad
 Path Taken: B.a --> new A([C c])'''
+
+        cleanup:
+        context.close()
     }
 
 }
diff --git a/inject-java/src/test/groovy/io/micronaut/inject/failures/fieldcirculardependency/A.java b/inject-java/src/test/groovy/io/micronaut/inject/failures/fieldcirculardependency/A.java
@@ -15,9 +15,13 @@
  */
 package io.micronaut.inject.failures.fieldcirculardependency;
 
+import io.micronaut.context.annotation.Requires;
+
 import javax.inject.Singleton;
 
+@Requires(property = "spec.name", value = "FieldCircularDependencyFailureSpec")
 @Singleton
 public class A {
+
     public A(C c) {}
 }
diff --git a/inject-java/src/test/groovy/io/micronaut/inject/failures/fieldcirculardependency/B.java b/inject-java/src/test/groovy/io/micronaut/inject/failures/fieldcirculardependency/B.java
@@ -15,9 +15,12 @@
  */
 package io.micronaut.inject.failures.fieldcirculardependency;
 
+import io.micronaut.context.annotation.Requires;
+
 import javax.inject.Inject;
 import javax.inject.Singleton;
 
+@Requires(property = "spec.name", value = "FieldCircularDependencyFailureSpec")
 @Singleton
 public class B {
     @Inject

diff --git a/...cronaut/inject/failures/fieldcirculardependency/FieldCircularDependencyFailureSpec.groovy b/...cronaut/inject/failures/fieldcirculardependency/FieldCircularDependencyFailureSpec.groovy
@@ -15,6 +15,7 @@
  */
 package io.micronaut.inject.failures.fieldcirculardependency
 
+import io.micronaut.context.ApplicationContext
 import io.micronaut.context.BeanContext
 import io.micronaut.context.DefaultBeanContext
 import io.micronaut.context.exceptions.CircularDependencyException
@@ -24,8 +25,7 @@ class FieldCircularDependencyFailureSpec extends Specification {
 
     void "test simple field circular dependency failure"() {
         given:
-        BeanContext context = new DefaultBeanContext()
-        context.start()
+        ApplicationContext context = ApplicationContext.run(["spec.name": getClass().simpleName])
 
         when:"A bean is obtained that has a setter with @Inject"
         B b =  context.getBean(B)
@@ -42,5 +42,8 @@ B.a --> new A([C c]) --> C.b
 |                         |
 |                         |
 +-------------------------+'''
+
+        cleanup:
+        context.close()
     }
 }
diff --git a/...micronaut/inject/failures/fielddependencymissing/FieldDependencyMissingFailureSpec.groovy b/...micronaut/inject/failures/fielddependencymissing/FieldDependencyMissingFailureSpec.groovy
@@ -37,6 +37,9 @@ class FieldDependencyMissingFailureSpec extends Specification {
 Failed to inject value for field [a] of class: io.micronaut.inject.failures.fielddependencymissing.B
 
 Path Taken: B.a'''
+
+        cleanup:
+        context.close()
     }
 }
 
diff --git a/inject-java/src/test/groovy/io/micronaut/inject/failures/nesteddependency/A.java b/inject-java/src/test/groovy/io/micronaut/inject/failures/nesteddependency/A.java
@@ -15,8 +15,11 @@
  */
 package io.micronaut.inject.failures.nesteddependency;
 
+import io.micronaut.context.annotation.Requires;
+
 import javax.inject.Singleton;
 
+@Requires(property = "spec.name", value = "NestedDependencyFailureSpec")
 @Singleton
 public class A {
     public A(C c) {