#234 - Support factory with qualifiers

Author: rbygrave

inject-generator/src/main/java/io/avaje/inject/generator/MethodReader.java

@@ -1,9 +1,11 @@
 package io.avaje.inject.generator;
 
 import io.avaje.inject.Bean;
-import jakarta.inject.Named;
 
-import javax.lang.model.element.*;
+import javax.lang.model.element.ExecutableElement;
+import javax.lang.model.element.Modifier;
+import javax.lang.model.element.TypeElement;
+import javax.lang.model.element.VariableElement;
 import javax.lang.model.type.TypeMirror;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -35,7 +37,7 @@ class MethodReader {
     this(context, element, beanType, null, null, false);
   }
 
-  MethodReader(ProcessingContext context, ExecutableElement element, TypeElement beanType, Bean bean, Named named, boolean prototype) {
+  MethodReader(ProcessingContext context, ExecutableElement element, TypeElement beanType, Bean bean, String qualifierName, boolean prototype) {
     this.isFactory = bean != null;
     this.prototype = prototype;
     this.element = element;
@@ -57,7 +59,7 @@ class MethodReader {
     this.isVoid = Util.isVoid(topType);
     String initMethod = (bean == null) ? null : bean.initMethod();
     String destroyMethod = (bean == null) ? null : bean.destroyMethod();
-    this.name = (named == null) ? null : named.value().toLowerCase();
+    this.name = qualifierName;
     TypeElement returnElement = (TypeElement)context.asElement(returnMirror);
     if (returnElement == null) {
       this.typeReader = null;

inject-generator/src/main/java/io/avaje/inject/generator/TypeExtendsInjection.java

@@ -3,7 +3,6 @@
 import io.avaje.inject.Bean;
 import io.avaje.inject.Prototype;
 import jakarta.inject.Inject;
-import jakarta.inject.Named;
 
 import javax.lang.model.element.Element;
 import javax.lang.model.element.ExecutableElement;
@@ -146,10 +145,9 @@ private void checkForAspect(ExecutableElement methodElement) {
 
 
   private void addFactoryMethod(ExecutableElement methodElement, Bean bean) {
-    // Not yet reading Qualifier annotations, Named only at this stage
-    Named named = methodElement.getAnnotation(Named.class);
+    String qualifierName = Util.getNamed(methodElement);
     boolean prototype = methodElement.getAnnotation(Prototype.class) != null;
-    factoryMethods.add(new MethodReader(context, methodElement, baseType, bean, named, prototype).read());
+    factoryMethods.add(new MethodReader(context, methodElement, baseType, bean, qualifierName, prototype).read());
   }
 
   BeanAspects hasAspects() {

inject-test/src/test/java/org/example/optional/Frodo.java

@@ -0,0 +1,11 @@
+package org.example.optional;
+
+import jakarta.inject.Qualifier;
+import java.lang.annotation.Retention;
+
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+@Qualifier
+@Retention(RUNTIME)
+public @interface Frodo {
+}

inject-test/src/test/java/org/example/optional/OptFactory.java

@@ -9,7 +9,7 @@
 @Factory
 class OptFactory {
 
-  @Named("frodo")
+  @Frodo
   @Bean
   Que frodoQueue() {
     return new BasicQue("frodo");