works

Author: SentryMan

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

@@ -68,7 +68,7 @@ void writeMethod(Append writer) {
       if (i > 0) {
         writer.append(", ");
       }
-      params.get(i).writeMethodParam(writer);
+      params.get(i).writeMethodParamAspect(writer);
     }
     writer.append(")");
     writeThrowsClause(writer);
@@ -118,7 +118,7 @@ void writeSetupForMethods(Append writer, String shortName) {
     writer.append("      %s = %s.class.getDeclaredMethod(\"%s\"", localName, shortName, simpleName);
     for (MethodReader.MethodParam param : params) {
       writer.append(", ");
-      param.writeMethodParamType(writer);
+      param.writeMethodParamTypeAspect(writer);
       writer.append(".class");
     }
     writer.append(");").eol();

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

@@ -8,6 +8,7 @@
 import javax.lang.model.element.VariableElement;
 import javax.lang.model.type.TypeMirror;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 import java.util.Set;
@@ -392,11 +393,11 @@ Dependency getDependsOn() {
     }
 
     void addImports(Set<String> importTypes) {
+    	
+      importTypes.addAll(Arrays.asList(utilType.full().split("[<|>|,]")));
+      
       if (genericType.isGenericType()) {
         importTypes.add(Constants.PROVIDER);
-        genericType.addImports(importTypes);
-      } else {
-        genericType.addImports(importTypes);
       }
     }
 
@@ -434,6 +435,21 @@ void writeMethodParamType(Append writer) {
       writer.append(Util.shortName(genericType.topType()));
     }
 
+    void writeMethodParamAspect(Append writer) {
+      final var type = GenericType.parse(utilType.full());
+      if (type.isGenericType()) {
+        type.writeShort(writer);
+      } else {
+        writer.append(Util.shortName(type.topType()));
+      }
+      writer.append(" ").append(simpleName);
+    }
+
+    void writeMethodParamTypeAspect(Append writer) {
+      final var type = GenericType.parse(utilType.full());
+      writer.append(Util.shortName(type.topType()));
+    }
+
     void writeConstructorInit(Append writer) {
       writer.append(simpleName);
     }

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

@@ -77,4 +77,7 @@ String getMethod(boolean nullable) {
     return nullable ? "getNullable(" : "get(";
   }
 
+  public String full() {
+    return rawType;
+  }
 }