#251 - Adjustments for fixing Aspects on methods with generic parameters

Author: rbygrave

blackbox-test-inject/src/main/java/org/example/myapp/ExampleService.java

@@ -3,6 +3,7 @@
 import jakarta.inject.Singleton;
 import org.example.myapp.aspect.MyTimed;
 
+import java.util.List;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.atomic.AtomicLong;
 
@@ -31,4 +32,8 @@ public void withParamAtomic(AtomicLong atomicLong) {
   public void withParamImport(ConcurrentHashMap<String, String> param0) {
     System.out.println("withParamAtomic " + param0);
   }
+
+  public void withListString(List<String> param0) {
+    System.out.println("withListString " + param0);
+  }
 }

blackbox-test-inject/src/test/java/org/example/myapp/ExampleServiceTest.java

@@ -3,6 +3,7 @@
 import io.avaje.inject.BeanScope;
 import org.junit.jupiter.api.Test;
 
+import java.util.List;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.atomic.AtomicLong;
 
@@ -17,6 +18,7 @@ void exercise() {
       exampleService.runOnly("foo");
       exampleService.withParamAtomic(new AtomicLong(42));
       exampleService.withParamImport(new ConcurrentHashMap<>());
+      exampleService.withListString(List.of("a", "b"));
     }
   }
 }

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

@@ -316,6 +316,7 @@ static class MethodParam {
     private final UtilType utilType;
     private final String paramType;
     private final GenericType genericType;
+    private final GenericType fullGenericType;
     private final boolean nullable;
     private final String simpleName;
     private boolean requestParam;
@@ -328,13 +329,12 @@ static class MethodParam {
       this.utilType = Util.determineType(param.asType());
       this.paramType = utilType.rawType();
       this.genericType = GenericType.parse(paramType);
+      this.fullGenericType = GenericType.parse(utilType.full());
     }
 
     @Override
     public String toString() {
-      return "MethodParam{" +
-        "genericType=" + genericType +
-        '}';
+      return "MethodParam{" + fullGenericType + '}';
     }
 
     void addDependsOnGeneric(Set<GenericType> set) {
@@ -393,9 +393,7 @@ Dependency getDependsOn() {
     }
 
     void addImports(Set<String> importTypes) {
-    	
-      importTypes.addAll(Arrays.asList(utilType.full().split("[<|>|,]")));
-      
+      fullGenericType.addImports(importTypes);
       if (genericType.isGenericType()) {
         importTypes.add(Constants.PROVIDER);
       }
@@ -431,23 +429,17 @@ void writeMethodParam(Append writer) {
       writer.append(" ").append(simpleName);
     }
 
-    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);
+      if (fullGenericType.isGenericType()) {
+        fullGenericType.writeShort(writer);
       } else {
-        writer.append(Util.shortName(type.topType()));
+        writer.append(Util.shortName(fullGenericType.topType()));
       }
       writer.append(" ").append(simpleName);
     }
 
     void writeMethodParamTypeAspect(Append writer) {
-      final var type = GenericType.parse(utilType.full());
-      writer.append(Util.shortName(type.topType()));
+      writer.append(Util.shortName(fullGenericType.topType()));
     }
 
     void writeConstructorInit(Append writer) {

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

@@ -46,6 +46,10 @@ boolean isCollection() {
     return type == Type.LIST || type == Type.SET;
   }
 
+  String full() {
+    return rawType;
+  }
+
   String rawType() {
     switch (type) {
       case SET:
@@ -77,7 +81,4 @@ String getMethod(boolean nullable) {
     return nullable ? "getNullable(" : "get(";
   }
 
-  public String full() {
-    return rawType;
-  }
 }