start

Author: SentryMan

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

@@ -8,6 +8,7 @@
 import javax.lang.model.element.AnnotationMirror;
 import javax.lang.model.element.TypeElement;
 import javax.lang.model.type.DeclaredType;
+import javax.lang.model.util.ElementFilter;
 
 /**
  * Read the annotations on the type.
@@ -38,9 +39,19 @@ void process() {
     for (AnnotationMirror annotationMirror : beanType.getAnnotationMirrors()) {
       DeclaredType annotationType = annotationMirror.getAnnotationType();
       String annType = annotationType.toString();
-      
+
       if (QualifierPrism.isPresent(annotationType.asElement())) {
-        qualifierName = Util.shortName(annType).toLowerCase();
+
+        final var shortName = Util.shortName(annotationType.toString());
+        var fqn = APContext.asTypeElement(annotationType).getQualifiedName().toString();
+        qualifierName =
+            annotationMirror
+                .toString()
+                .substring(1)
+                .replace(fqn, shortName)
+                .replace("\"", "\\\"")
+                .toLowerCase();
+
       } else if (annType.indexOf('.') == -1) {
         logWarn("skip when no package on annotation " + annType);
       } else if (IncludeAnnotations.include(annType)) {

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

@@ -8,6 +8,7 @@
 import javax.lang.model.element.Element;
 import javax.lang.model.type.DeclaredType;
 import javax.lang.model.type.TypeMirror;
+import javax.lang.model.util.ElementFilter;
 
 final class Util {
   // whitespace not in quotes
@@ -250,7 +251,15 @@ public static String getNamed(Element p) {
       final DeclaredType annotationType = annotationMirror.getAnnotationType();
       final var hasQualifier = QualifierPrism.isPresent(annotationType.asElement());
       if (hasQualifier) {
-        return Util.shortName(annotationType.toString()).toLowerCase();
+        final var shortName = Util.shortName(annotationType.toString());
+
+        var fqn = APContext.asTypeElement(annotationType).getQualifiedName().toString();
+        return annotationMirror
+            .toString()
+            .substring(1)
+            .replace(fqn, shortName)
+            .replace("\"", "\\\"")
+            .toLowerCase();
       }
     }
     return null;

inject-test/src/main/java/io/avaje/inject/test/MetaReader.java

@@ -119,9 +119,18 @@ private String name(Field field) {
       return named.value().toLowerCase();
     }
     for (Annotation annotation : field.getAnnotations()) {
-      for (Annotation metaAnnotation : annotation.annotationType().getAnnotations()) {
+      final var annotationType = annotation.annotationType();
+      for (Annotation metaAnnotation : annotationType.getAnnotations()) {
         if (metaAnnotation.annotationType().equals(Qualifier.class)) {
-          return annotation.annotationType().getSimpleName().toLowerCase();
+          var toString =
+              annotation
+                  .toString()
+                  .substring(1)
+                  .replace(annotationType.getCanonicalName(), annotationType.getSimpleName());
+          if (toString.endsWith("()")) {
+            toString = toString.substring(0, toString.length() - 2);
+          }
+          return toString.toLowerCase();
         }
       }
     }