solve with regex

Author: SentryMan

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

@@ -1,10 +1,14 @@
 package io.avaje.inject.generator;
 
+import static java.util.stream.Collectors.toList;
+
 import java.util.List;
+import java.util.Map.Entry;
 
 import javax.lang.model.element.AnnotationMirror;
 import javax.lang.model.element.AnnotationValue;
 import javax.lang.model.element.Element;
+import javax.lang.model.element.ExecutableElement;
 import javax.lang.model.element.VariableElement;
 
 final class AnnotationCopier {
@@ -14,27 +18,15 @@ public static void copyAnnotations(Append writer, Element element, boolean newLi
     copyAnnotations(writer, element, "", newLines);
   }
 
-  public static void copyAnnotations(Append writer, Element element, String indent, boolean newLines) {
+  public static void copyAnnotations(
+      Append writer, Element element, String indent, boolean newLines) {
     for (final AnnotationMirror annotationMirror : element.getAnnotationMirrors()) {
       final var type = annotationMirror.getAnnotationType().asElement().asType().toString();
       if (type.startsWith("io.avaje.inject.Assist")) {
         continue;
       }
-      final String annotationName = annotationMirror.getAnnotationType().toString();
-      final StringBuilder sb =  new StringBuilder(indent).append("@").append(annotationName).append("(");
-      boolean first = true;
 
-      for (final var entry : annotationMirror.getElementValues().entrySet()) {
-        if (!first) {
-          sb.append(", ");
-        }
-        sb.append(entry.getKey().getSimpleName()).append("=");
-        writeVal(sb, entry.getValue());
-        first = false;
-      }
-
-      sb.append(")");
-      final String annotationString = sb.toString();
+      final String annotationString = getAnnotationString(indent, annotationMirror, false);
       writer.append(annotationString);
 
       if (newLines) {
@@ -45,8 +37,45 @@ public static void copyAnnotations(Append writer, Element element, String indent
     }
   }
 
+  static String getSimpleAnnotationString(AnnotationMirror annotationMirror) {
+    return Util.trimAnnotationString(getAnnotationString("", annotationMirror, true)).substring(1);
+  }
+
+  static String getAnnotationString(
+      String indent, AnnotationMirror annotationMirror, boolean simpleEnums) {
+    final String annotationName = annotationMirror.getAnnotationType().toString();
+
+    final StringBuilder sb =
+        new StringBuilder(indent).append("@").append(annotationName).append("(");
+    boolean first = true;
+
+    for (final var entry : sortedValues(annotationMirror)) {
+      if (!first) {
+        sb.append(", ");
+      }
+      sb.append(entry.getKey().getSimpleName()).append("=");
+      writeVal(sb, entry.getValue(), simpleEnums);
+      first = false;
+    }
+
+    return sb.append(")").toString().replace("()", "");
+  }
+
+  private static List<Entry<? extends ExecutableElement, ? extends AnnotationValue>> sortedValues(
+      AnnotationMirror annotationMirror) {
+    return APContext.elements().getElementValuesWithDefaults(annotationMirror).entrySet().stream()
+        .sorted(
+            (e1, e2) ->
+                e1.getKey()
+                    .getSimpleName()
+                    .toString()
+                    .compareTo(e2.getKey().getSimpleName().toString()))
+        .collect(toList());
+  }
+
   @SuppressWarnings("unchecked")
-  private static void writeVal(final StringBuilder sb, final AnnotationValue annotationValue) {
+  private static void writeVal(
+      final StringBuilder sb, final AnnotationValue annotationValue, boolean simpleEnums) {
     final var value = annotationValue.getValue();
     if (value instanceof List) {
       // handle array values
@@ -56,7 +85,7 @@ private static void writeVal(final StringBuilder sb, final AnnotationValue annot
         if (!first) {
           sb.append(", ");
         }
-        writeVal(sb, listValue);
+        writeVal(sb, listValue, first);
         first = false;
       }
       sb.append("}");
@@ -65,7 +94,8 @@ private static void writeVal(final StringBuilder sb, final AnnotationValue annot
       // Handle enum values
       final var element = (VariableElement) value;
       final var type = element.asType();
-      sb.append(type.toString() + "." + element);
+      final var str = simpleEnums ? element : type.toString() + "." + element;
+      sb.append(str);
 
     } else if (value instanceof AnnotationMirror) {
       // handle annotation values
@@ -74,12 +104,12 @@ private static void writeVal(final StringBuilder sb, final AnnotationValue annot
       sb.append("@").append(annotationName).append("(");
       boolean first = true;
 
-      for (final var entry : mirror.getElementValues().entrySet()) {
+      for (final var entry : sortedValues(mirror)) {
         if (!first) {
           sb.append(", ");
         }
         sb.append(entry.getKey().getSimpleName()).append("=");
-        writeVal(sb, entry.getValue());
+        writeVal(sb, entry.getValue(), first);
         first = false;
       }
       sb.append(")");

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

@@ -8,6 +8,7 @@
 import javax.lang.model.element.AnnotationMirror;
 import javax.lang.model.element.Element;
 import javax.lang.model.element.ElementKind;
+import javax.lang.model.element.ExecutableElement;
 import javax.lang.model.element.TypeElement;
 import javax.lang.model.util.ElementFilter;
 import javax.lang.model.util.Elements;
@@ -35,7 +36,8 @@
   Constants.TESTSCOPE,
   Constants.CONTROLLER,
   ImportPrism.PRISM_TYPE,
-  AspectImportPrism.PRISM_TYPE
+  AspectImportPrism.PRISM_TYPE,
+  QualifierPrism.PRISM_TYPE
 })
 public final class Processor extends AbstractProcessor {
 
@@ -103,6 +105,11 @@ public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment
 
     readBeans(delayedElements());
     addImportedAspects(importedAspects(roundEnv));
+    maybeElements(roundEnv, QualifierPrism.PRISM_TYPE).stream()
+        .flatMap(Set::stream)
+        .flatMap(e -> ElementFilter.methodsIn(e.getEnclosedElements()).stream())
+        .forEach(this::validateQualifier);
+
     maybeElements(roundEnv, ScopePrism.PRISM_TYPE).ifPresent(this::readScopes);
     maybeElements(roundEnv, FactoryPrism.PRISM_TYPE).ifPresent(this::readFactories);
 
@@ -128,7 +135,23 @@ public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment
     return false;
   }
 
-  // Optional because these annotations are not guaranteed to exist
+  private void validateQualifier(ExecutableElement method) {
+    var type = APContext.asTypeElement(method.getReturnType());
+
+    if (type == null || type.getKind() != ElementKind.ANNOTATION_TYPE) {
+      return;
+    }
+
+    var enclosedMethods = ElementFilter.methodsIn(type.getEnclosedElements());
+
+    if (enclosedMethods.size() > 1) {
+      APContext.logError(method, "Qualifier annotation members can only have a single attribute");
+    }
+
+    enclosedMethods.stream().forEach(this::validateQualifier);
+  }
+
+// Optional because these annotations are not guaranteed to exist
   private static Optional<? extends Set<? extends Element>> maybeElements(RoundEnvironment round, String name) {
     return Optional.ofNullable(typeElement(name)).map(round::getElementsAnnotatedWith);
   }

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

@@ -8,7 +8,6 @@
 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.
@@ -42,13 +41,10 @@ void process() {
 
       if (QualifierPrism.isPresent(annotationType.asElement())) {
 
-        final var shortName = Util.shortName(annotationType.toString());
-        var fqn = APContext.asTypeElement(annotationType).getQualifiedName().toString();
+        var shortName = Util.shortName(annotationType.toString());
         qualifierName =
-            annotationMirror
-                .toString()
-                .substring(1)
-                .replace(fqn, shortName)
+            AnnotationCopier.getSimpleAnnotationString(annotationMirror)
+                .replaceFirst(annotationType.toString(), shortName)
                 .replace("\"", "\\\"")
                 .toLowerCase();
 

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

@@ -1,11 +1,8 @@
 package io.avaje.inject.generator;
 
 import static io.avaje.inject.generator.APContext.logWarn;
-import static io.avaje.inject.generator.APContext.typeElement;
 import static io.avaje.inject.generator.APContext.types;
 import static io.avaje.inject.generator.ProcessingContext.asElement;
-import static java.util.stream.Collectors.toList;
-
 import java.lang.annotation.Annotation;
 import java.util.ArrayList;
 import java.util.List;
@@ -33,7 +30,6 @@ final class TypeExtendsReader {
   private final List<UType> interfaceTypes = new ArrayList<>();
   private final List<UType> providesTypes = new ArrayList<>();
   private final String beanSimpleName;
-  private final String baseTypeRaw;
   private final boolean baseTypeIsInterface;
   private final boolean publicAccess;
   private final boolean autoProvide;
@@ -50,7 +46,6 @@ final class TypeExtendsReader {
     this.baseType = baseType;
     this.extendsInjection = new TypeExtendsInjection(baseType, factory, importTypes);
     this.beanSimpleName = baseType.getSimpleName().toString();
-    this.baseTypeRaw = Util.unwrapProvider(baseUType.toString());
     this.baseTypeIsInterface = baseType.getKind() == ElementKind.INTERFACE;
     this.publicAccess = baseType.getModifiers().contains(Modifier.PUBLIC);
     this.autoProvide = autoProvide();

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

@@ -1,13 +1,14 @@
 package io.avaje.inject.generator;
 
 import java.util.Optional;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 import javax.lang.model.element.AnnotationMirror;
 import javax.lang.model.element.Element;
 import javax.lang.model.type.DeclaredType;
 import javax.lang.model.type.TypeKind;
 import javax.lang.model.type.TypeMirror;
-import javax.lang.model.util.ElementFilter;
 
 final class Util {
   static final String ASPECT_PROVIDER_PREFIX = "io.avaje.inject.aop.AspectProvider<";
@@ -274,13 +275,10 @@ public static String getNamed(Element p) {
       final DeclaredType annotationType = annotationMirror.getAnnotationType();
       final var hasQualifier = QualifierPrism.isPresent(annotationType.asElement());
       if (hasQualifier) {
-        final var shortName = Util.shortName(annotationType.toString());
+        var shortName = Util.shortName(annotationType.toString());
 
-        var fqn = APContext.asTypeElement(annotationType).getQualifiedName().toString();
-        return annotationMirror
-            .toString()
-            .substring(1)
-            .replace(fqn, shortName)
+        return AnnotationCopier.getSimpleAnnotationString(annotationMirror)
+            .replaceFirst(annotationType.toString(), shortName)
             .replace("\"", "\\\"")
             .toLowerCase();
       }
@@ -317,4 +315,11 @@ public static String addForInterface(String interfaceType) {
   public static String trimMethod(String method) {
     return shortMethod(method).replace('.', '_').replace(Constants.DI, "");
   }
+
+  private static final Pattern ANNOTATION_TYPE_PATTERN = Pattern.compile("@([\\w.]+)\\.");
+
+  public static String trimAnnotationString(String input) {
+
+    return ANNOTATION_TYPE_PATTERN.matcher(input).replaceAll("@");
+  }
 }

inject-generator/src/test/java/io/avaje/inject/generator/models/valid/qualifier/ImperialMeter.java

@@ -0,0 +1,14 @@
+package io.avaje.inject.generator.models.valid.qualifier;
+
+import io.avaje.inject.generator.models.valid.qualifier.TempQualifier.Scale;
+import jakarta.inject.Singleton;
+
+@Singleton
+@TempQualifier(value = Scale.FAHRENHEIT, someOtherString = "far")
+public class ImperialMeter implements Thermometer {
+
+  @Override
+  public boolean freezing(float temp) {
+    return temp <= 32;
+  }
+}

inject-generator/src/test/java/io/avaje/inject/generator/models/valid/qualifier/Meters.java

@@ -0,0 +1,19 @@
+package io.avaje.inject.generator.models.valid.qualifier;
+
+import io.avaje.inject.generator.models.valid.qualifier.TempQualifier.Scale;
+import jakarta.inject.Singleton;
+
+@Singleton
+public class Meters {
+
+  Thermometer imperial;
+
+  Thermometer metric;
+
+  public Meters(
+      @TempQualifier(value = Scale.FAHRENHEIT, someOtherString = "far") Thermometer imperial,
+      @TempQualifier(value = Scale.CELSIUS, someOtherString = "celsi") Thermometer metric) {
+    this.imperial = imperial;
+    this.metric = metric;
+  }
+}

inject-generator/src/test/java/io/avaje/inject/generator/models/valid/qualifier/MetricMeter.java

@@ -0,0 +1,14 @@
+package io.avaje.inject.generator.models.valid.qualifier;
+
+import io.avaje.inject.generator.models.valid.qualifier.TempQualifier.Scale;
+import jakarta.inject.Singleton;
+
+@Singleton
+@TempQualifier(value = Scale.CELSIUS, someOtherString = "celsi")
+public class MetricMeter implements Thermometer {
+
+  @Override
+  public boolean freezing(float temp) {
+    return temp <= 0;
+  }
+}

inject-generator/src/test/java/io/avaje/inject/generator/models/valid/qualifier/TempQualifier.java

@@ -0,0 +1,29 @@
+package io.avaje.inject.generator.models.valid.qualifier;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+import jakarta.inject.Inject;
+import jakarta.inject.Qualifier;
+
+@Qualifier
+@Retention(RetentionPolicy.RUNTIME)
+public @interface TempQualifier {
+  Scale[] value();
+
+  String someOtherString();
+
+  int defaultVal() default 0;
+
+  NestedAnnotation[] inject() default {@NestedAnnotation()};
+
+  enum Scale {
+    CELSIUS,
+    FAHRENHEIT,
+  }
+
+  @interface NestedAnnotation {
+
+    Inject[] inject() default {};
+  }
+}

inject-generator/src/test/java/io/avaje/inject/generator/models/valid/qualifier/Thermometer.java

@@ -0,0 +1,6 @@
+package io.avaje.inject.generator.models.valid.qualifier;
+
+public interface Thermometer {
+
+  boolean freezing(float temp);
+}