Improvements to bean context qualifiers (#12053)

Author: dstepanov

http/src/main/java/io/micronaut/http/body/DefaultMessageBodyHandlerRegistry.java

@@ -26,6 +26,7 @@
 import io.micronaut.http.codec.CodecConfiguration;
 import io.micronaut.http.codec.MediaTypeCodec;
 import io.micronaut.inject.BeanType;
+import io.micronaut.inject.QualifiedBeanType;
 import io.micronaut.inject.qualifiers.FilteringQualifier;
 import io.micronaut.inject.qualifiers.MatchArgumentQualifier;
 import io.micronaut.inject.qualifiers.Qualifiers;
@@ -156,6 +157,11 @@ public <K extends BeanType<T>> Collection<K> filter(Class<T> beanType, Collectio
             return all;
         }
 
+        @Override
+        public <BT extends QualifiedBeanType<T>> Collection<BT> filterQualified(Class<T> beanType, Collection<BT> candidates) {
+            return filter(beanType, candidates);
+        }
+
         private int findOrder(BeanType<?> beanType) {
             int order = 0;
             String[] applicableTypes = beanType.getAnnotationMetadata().stringValues(annotationType);

inject-java/src/test/groovy/io/micronaut/inject/context/processor/BeanDefinitionProcessorSpec.groovy

@@ -16,14 +16,13 @@
 package io.micronaut.inject.context.processor
 
 import io.micronaut.context.ApplicationContext
-import io.micronaut.context.BeanContext
 import spock.lang.Specification
 
 class BeanDefinitionProcessorSpec extends Specification {
 
     void "test bean processors are invoked"() {
         given:
-        ApplicationContext ctx = ApplicationContext.run()
+        ApplicationContext ctx = ApplicationContext.run(["spec.name": "BeanDefinitionProcessorSpec"])
 
         expect:
         ctx.getBean(ProcessedAnnotationProcessor).beans.size() == 1

inject-java/src/test/groovy/io/micronaut/inject/context/processor/ProcessedAnnotationProcessor.java

@@ -17,12 +17,14 @@
 
 import io.micronaut.context.BeanContext;
 import io.micronaut.context.annotation.Context;
+import io.micronaut.context.annotation.Requires;
 import io.micronaut.context.processor.BeanDefinitionProcessor;
 import io.micronaut.inject.BeanDefinition;
 
 import java.util.HashSet;
 import java.util.Set;
 
+@Requires(property = "spec.name", value = "BeanDefinitionProcessorSpec")
 @Context
 public class ProcessedAnnotationProcessor implements BeanDefinitionProcessor<ProcessedAnnotation> {
     private Set<BeanDefinition<?>> beans = new HashSet<>();

inject-java/src/test/groovy/io/micronaut/inject/context/processor/SomeBean.java

@@ -15,6 +15,9 @@
  */
 package io.micronaut.inject.context.processor;
 
+import io.micronaut.context.annotation.Requires;
+
+@Requires(property = "spec.name", value = "BeanDefinitionProcessorSpec")
 @ProcessedAnnotation
 public class SomeBean {
 }

inject-java/src/test/java/io/micronaut/inject/qualifiers/stereotype/MyBean.java

@@ -0,0 +1,10 @@
+package io.micronaut.inject.qualifiers.stereotype;
+
+import io.micronaut.context.annotation.Requires;
+import jakarta.inject.Singleton;
+
+@Requires(property = "spec.name", value = "StereotypeQualifierSpec")
+@MyStereotype
+@Singleton
+public class MyBean {
+}

inject-java/src/test/java/io/micronaut/inject/qualifiers/stereotype/MyBean2.java

@@ -0,0 +1,10 @@
+package io.micronaut.inject.qualifiers.stereotype;
+
+import io.micronaut.context.annotation.Requires;
+import jakarta.inject.Singleton;
+
+@Requires(property = "spec.name", value = "StereotypeQualifierSpec")
+@MyRepeatableStereotype
+@Singleton
+public class MyBean2 {
+}

inject-java/src/test/java/io/micronaut/inject/qualifiers/stereotype/MyRepeatableStereotype.java

@@ -0,0 +1,23 @@
+package io.micronaut.inject.qualifiers.stereotype;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Repeatable;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+@Documented
+@Retention(RUNTIME)
+@Target({ElementType.TYPE, ElementType.ANNOTATION_TYPE})
+@Repeatable(MyRepeatableStereotype.Container.class)
+public @interface MyRepeatableStereotype {
+
+    @Documented
+    @Retention(RUNTIME)
+    @Target({ElementType.TYPE, ElementType.ANNOTATION_TYPE})
+    @interface Container {
+        MyRepeatableStereotype[] value();
+    }
+}

inject-java/src/test/java/io/micronaut/inject/qualifiers/stereotype/MyStereotype.java

@@ -0,0 +1,14 @@
+package io.micronaut.inject.qualifiers.stereotype;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+@Documented
+@Retention(RUNTIME)
+@Target({ElementType.TYPE, ElementType.ANNOTATION_TYPE})
+public @interface MyStereotype {
+}

inject-java/src/test/java/io/micronaut/inject/qualifiers/stereotype/StereotypeQualifierTest.java

@@ -0,0 +1,57 @@
+package io.micronaut.inject.qualifiers.stereotype;
+
+import io.micronaut.context.ApplicationContext;
+import io.micronaut.context.Qualifier;
+import io.micronaut.inject.qualifiers.Qualifiers;
+import org.junit.jupiter.api.Test;
+
+import java.util.Map;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+class StereotypeQualifierTest {
+
+    @Test
+    void testByStereotypeQualifier() {
+        try (ApplicationContext context = ApplicationContext.run(Map.of("spec.name", "StereotypeQualifierSpec"))) {
+            Qualifier<Object> qualifier = Qualifiers.byQualifiers(Qualifiers.byStereotype(MyStereotype.class));
+            var definitions = context.getBeanDefinitions(qualifier);
+            assertEquals(1, definitions.size());
+            var beanType = definitions.iterator().next().getBeanType();
+            assertEquals(MyBean.class, beanType);
+        }
+    }
+
+    @Test
+    void testByNamedStereotypeQualifier() {
+        try (ApplicationContext context = ApplicationContext.run(Map.of("spec.name", "StereotypeQualifierSpec"))) {
+            Qualifier<Object> qualifier = Qualifiers.byQualifiers(Qualifiers.byStereotype(MyStereotype.class.getName()));
+            var definitions = context.getBeanDefinitions(qualifier);
+            assertEquals(1, definitions.size());
+            var beanType = definitions.iterator().next().getBeanType();
+            assertEquals(MyBean.class, beanType);
+        }
+    }
+
+    @Test
+    void testByRepeatableStereotypeQualifier() {
+        try (ApplicationContext context = ApplicationContext.run(Map.of("spec.name", "StereotypeQualifierSpec"))) {
+            Qualifier<Object> qualifier = Qualifiers.byQualifiers(Qualifiers.byStereotype(MyRepeatableStereotype.class));
+            var definitions = context.getBeanDefinitions(qualifier);
+            assertEquals(1, definitions.size());
+            var beanType = definitions.iterator().next().getBeanType();
+            assertEquals(MyBean2.class, beanType);
+        }
+    }
+
+    @Test
+    void testByRepeatableNamedStereotypeQualifier() {
+        try (ApplicationContext context = ApplicationContext.run(Map.of("spec.name", "StereotypeQualifierSpec"))) {
+            Qualifier<Object> qualifier = Qualifiers.byQualifiers(Qualifiers.byStereotype(MyRepeatableStereotype.class.getName()));
+            var definitions = context.getBeanDefinitions(qualifier);
+            assertEquals(1, definitions.size());
+            var beanType = definitions.iterator().next().getBeanType();
+            assertEquals(MyBean2.class, beanType);
+        }
+    }
+}

inject/src/main/java/io/micronaut/context/AbstractInitializableBeanDefinition.java

@@ -296,8 +296,19 @@ public int hashCode() {
 
     @Override
     public String toString() {
-        Class<?> declaringType = constructor == null ? type : constructor.declaringType;
-        return "Definition: " + declaringType.getName();
+        if (constructor == null) {
+            return "Definition: " + type.getName();
+        }
+        if (constructor.declaringType.equals(type)) {
+            return "Definition: " + type.getName();
+        }
+        if (constructor instanceof MethodReference methodConstructor) {
+            return "Definition: " + type.getName() + " Factory: " + constructor.declaringType.getName() + "#" + methodConstructor.methodName;
+        }
+        if (constructor instanceof FieldReference fieldReference) {
+            return "Definition: " + type.getName() + " Factory: " + constructor.declaringType.getName() + "." + fieldReference.argument.getName();
+        }
+        return "Definition: " + type.getName() + " Factory: " + constructor.declaringType.getName();
     }
 
     @Override