#102 - Tidy generated code for field injection

rbygrave · rbygrave · commit b23b50510b1d · 2021-05-12T01:29:31.000+12:00
diff --git a/inject-generator/src/main/java/io/avaje/inject/generator/BeanReader.java b/inject-generator/src/main/java/io/avaje/inject/generator/BeanReader.java
@@ -108,6 +108,7 @@ void read(boolean factory) {
       constructor.checkRequest(requestParams);
     }
     for (FieldReader fields : injectFields) {
+      fields.addImports(importTypes);
       fields.checkRequest(requestParams);
     }
     for (MethodReader methods : injectMethods) {
diff --git a/inject-generator/src/main/java/io/avaje/inject/generator/FieldReader.java b/inject-generator/src/main/java/io/avaje/inject/generator/FieldReader.java
@@ -1,13 +1,15 @@
 package io.avaje.inject.generator;
 
 import javax.lang.model.element.Element;
+import java.util.Set;
 
 class FieldReader {
 
   private final Element element;
   private final String name;
   private final UtilType type;
   private final boolean nullable;
+  private final String fieldType;
   private boolean requestParam;
   private String requestParamName;
 
@@ -16,27 +18,28 @@ class FieldReader {
     this.name = Util.getNamed(element);
     this.nullable = Util.isNullable(element);
     this.type = Util.determineType(element.asType());
+    this.fieldType = Util.unwrapProvider(type.rawType());
   }
 
   String getFieldName() {
     return element.getSimpleName().toString();
   }
 
+  void addImports(Set<String> importTypes) {
+    importTypes.add(fieldType);
+  }
+
   String builderGetDependency() {
     StringBuilder sb = new StringBuilder();
     sb.append("b.").append(type.getMethod(nullable));
-    sb.append(getFieldType()).append(".class");
+    sb.append(nm(fieldType)).append(".class");
     if (name != null) {
       sb.append(",\"").append(name).append("\"");
     }
     sb.append(")");
     return sb.toString();
   }
 
-  private String getFieldType() {
-    return Util.unwrapProvider(type.rawType());
-  }
-
   /**
    * Check for request scoped dependency.
    */
@@ -53,7 +56,7 @@ void checkRequest(BeanRequestParams requestParams) {
   void writeRequestDependency(Append writer) {
     if (!requestParam) {
       // just add as field dependency
-      requestParamName = writer.nextName(getFieldName().toLowerCase());//"dep");
+      requestParamName = writer.nextName(getFieldName().toLowerCase());
       final String shortType = nm(type.rawType());
       writer.append("  @Inject").eol();
       writer.append("  %s %s;", shortType, requestParamName).eol().eol();
diff --git a/inject-generator/src/main/java/io/avaje/inject/generator/Util.java b/inject-generator/src/main/java/io/avaje/inject/generator/Util.java
@@ -125,13 +125,13 @@ static String commonParent(String currentTop, String aPackage) {
   public static String getNamed(Element p) {
     Named named = p.getAnnotation(Named.class);
     if (named != null) {
-      return named.value();
+      return named.value().toLowerCase();
     }
     for (AnnotationMirror annotationMirror : p.getAnnotationMirrors()) {
       DeclaredType annotationType = annotationMirror.getAnnotationType();
       Qualifier qualifier = annotationType.asElement().getAnnotation(Qualifier.class);
       if (qualifier != null) {
-        return Util.shortName(annotationType.toString());
+        return Util.shortName(annotationType.toString()).toLowerCase();
       }
     }
     return null;
