use short types in DI classes

Author: SentryMan

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

@@ -276,7 +276,7 @@ private Set<String> importTypes() {
       if (!genericTypes.isEmpty()) {
         importTypes.add(Constants.TYPE);
         importTypes.add(Constants.GENERICTYPE);
-        // TYPE_ generic types are fully qualified
+        genericTypes.forEach(t->t.addImports(importTypes));
       }
     }
     checkImports();

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

@@ -32,15 +32,12 @@ boolean containsShortName(String suffix) {
   String add(String fullType) {
     final String shortName = Util.shortName(fullType);
     String fullTypeActual;
-    String shortNameActual;
     final var index = shortName.lastIndexOf('.');
     if (index != -1) {
-      shortNameActual = shortName.substring(0, index);
-      fullTypeActual = fullType.replace(shortName, shortNameActual);
+      fullTypeActual = fullType.replace(shortName, shortName.substring(0, index));
 
     } else {
       fullTypeActual = fullType;
-      shortNameActual = shortName;
     }
     final String existingFull = mapByShortName.get(shortName);
     if (existingFull == null) {
@@ -51,7 +48,7 @@ String add(String fullType) {
       return shortName;
     } else {
       // must use fully qualified type
-      return fullTypeActual;
+      return fullType;
     }
   }
 

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

@@ -5,7 +5,10 @@
 
 import java.io.IOException;
 import java.io.Writer;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
+import java.util.Objects;
 import java.util.Set;
 
 import javax.lang.model.element.TypeElement;
@@ -67,16 +70,52 @@ private void writeGenericTypeFields() {
     // collect all types to prevent duplicates
     Set<GenericType> genericTypes = beanReader.allGenericTypes();
     if (!genericTypes.isEmpty()) {
-      for (GenericType type : genericTypes) {
-        writer.append("  public static final Type TYPE_%s = new GenericType<", type.shortName().replace(".", "_"));
+
+    	final Map<String, String> seenShortNames= new HashMap<>();
+
+      for (final GenericType type : genericTypes) {
+        writer
+            .append("  public static final Type TYPE_%s =", type.shortName().replace(".", "_"))
+            .eol()
+            .append("      new GenericType<");
+
+        writeGenericType(type,seenShortNames, writer);
         // use fully qualified types here rather than use type.writeShort(writer)
-        writer.append(type.toString());
+
         writer.append(">(){}.type();").eol();
       }
       writer.eol();
     }
   }
 
+  private void writeGenericType(GenericType type, Map<String, String> seenShortNames, Append writer) {
+    final var typeShortName = Util.shortName(type.topType());
+    final var topType = seenShortNames.computeIfAbsent(typeShortName, k -> type.topType());
+    if (type.isGenericType()) {
+      final var shortName =
+          Objects.equals(type.topType(), topType) ? typeShortName : type.topType();
+
+      writer.append(shortName);
+      writer.append("<");
+      boolean first = true;
+      for (final var param : type.params()) {
+        if (first) {
+          first = false;
+          writeGenericType(param, seenShortNames, writer);
+          continue;
+        }
+        writer.append(", ");
+        writeGenericType(param, seenShortNames, writer);
+      }
+      writer.append(">");
+    } else {
+      final var shortName =
+          Objects.equals(type.topType(), topType) ? typeShortName : type.topType();
+
+      writer.append(shortName);
+    }
+  }
+
   private void writeRequestCreate() {
     beanReader.writeRequestCreate(writer);
   }

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

@@ -116,7 +116,7 @@ void extraImports(ImportTypeMap importTypes) {
     if (!genericTypes.isEmpty()) {
       importTypes.add(Constants.TYPE);
       importTypes.add(Constants.GENERICTYPE);
-      // TYPE_ generic types are fully qualified
+      genericTypes.forEach(t->t.addImports(importTypes));
     }
   }
 }

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

@@ -0,0 +1,6 @@
+package io.avaje.inject.generator.models.valid;
+
+public interface A0 {
+  /** Builder name clash in generated code, use the full type for this in generated code */
+  interface Builder {}
+}

inject-generator/src/test/java/io/avaje/inject/generator/models/valid/generic/MyConsumer.java

@@ -0,0 +1,12 @@
+package io.avaje.inject.generator.models.valid.generic;
+
+import java.util.function.BiConsumer;
+import java.util.function.Function;
+
+import io.avaje.inject.generator.models.valid.A0;
+
+public class MyConsumer implements BiConsumer<A0, io.avaje.inject.generator.models.valid.nested.A0> {
+
+  @Override
+  public void accept(A0 t, io.avaje.inject.generator.models.valid.nested.A0 u) {}
+}

inject-generator/src/test/java/io/avaje/inject/generator/models/valid/generic/MyConsumerFactory.java

@@ -0,0 +1,13 @@
+package io.avaje.inject.generator.models.valid.generic;
+
+import io.avaje.inject.Bean;
+import io.avaje.inject.Factory;
+
+@Factory
+public class MyConsumerFactory {
+
+  @Bean
+  MyConsumer createTest() {
+    return new MyConsumer();
+  }
+}

inject-generator/src/test/java/io/avaje/inject/generator/models/valid/nested/AFactory.java

@@ -27,10 +27,7 @@ void ad(A0.Builder b1, A1.Builder b2) {
     b2.hashCode();
   }
 
-  static class I0 implements A0.Builder {
+  static class I0 implements A0.Builder {}
 
-  }
-  static class I1 implements A1.Builder {
-
-  }
+  static class I1 implements A1.Builder {}
 }