#199 - Tests + MethodReader fix for - Parameter type import of aspect method.

Author: rbygrave

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

@@ -3,7 +3,8 @@
 import jakarta.inject.Singleton;
 import org.example.myapp.aspect.MyTimed;
 
-import java.io.IOException;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.atomic.AtomicLong;
 
 @MyTimed
 @Singleton
@@ -20,6 +21,14 @@ public String other(String param0, int param1) {//} throws IOException, IllegalS
   }
 
   public void runOnly(String param) {
-    System.out.println("runOnly "+param);
+    System.out.println("runOnly " + param);
+  }
+
+  public void withParamAtomic(AtomicLong atomicLong) {
+    System.out.println("withParamAtomic " + atomicLong);
+  }
+
+  public void withParamImport(ConcurrentHashMap<String, String> param0) {
+    System.out.println("withParamAtomic " + param0);
   }
 }

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

@@ -0,0 +1,22 @@
+package org.example.myapp;
+
+import io.avaje.inject.BeanScope;
+import org.junit.jupiter.api.Test;
+
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.atomic.AtomicLong;
+
+class ExampleServiceTest {
+
+  @Test
+  void exercise() {
+    try (BeanScope beanScope = BeanScope.newBuilder().build()) {
+      ExampleService exampleService = beanScope.get(ExampleService.class);
+
+      exampleService.other("foo", 42);
+      exampleService.runOnly("foo");
+      exampleService.withParamAtomic(new AtomicLong(42));
+      exampleService.withParamImport(new ConcurrentHashMap<>());
+    }
+  }
+}

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

@@ -398,7 +398,8 @@ void writeMethodParam(Append writer) {
 
     void writeMethodParamType(Append writer) {
       if (genericType != null) {
-        genericType.writeShort(writer);
+        // for getDeclaredMethod only need top level main type
+        writer.append(genericType.getMainType());
       } else {
         writer.append(Util.shortName(paramType));
       }

inject-generator/src/test/java/io/avaje/inject/generator/GenericTypeTest.java

@@ -4,6 +4,7 @@
 
 import java.io.StringWriter;
 import java.util.HashSet;
+import java.util.LinkedHashSet;
 import java.util.Set;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -87,6 +88,22 @@ void parse_withParams() {
     assertThat(type.getParams().get(1).getMainType()).isEqualTo("java.lang.Long");
   }
 
+  @Test
+  void parse_withParams2() {
+    GenericType type = GenericType.parse("java.util.concurrent.ConcurrentMap<java.lang.String,my.d.Has>");
+
+    assertThat(type.getMainType()).isEqualTo("java.util.concurrent.ConcurrentMap");
+    assertThat(type.getParams()).hasSize(2);
+    assertThat(type.getParams().get(0).getMainType()).isEqualTo("java.lang.String");
+    assertThat(type.getParams().get(1).getMainType()).isEqualTo("my.d.Has");
+
+    LinkedHashSet<String> importTypes = new LinkedHashSet<>();
+    type.addImports(importTypes);
+
+    assertThat(importTypes).hasSize(2);
+    assertThat(importTypes).containsExactly("java.util.concurrent.ConcurrentMap", "my.d.Has");
+  }
+
   @Test
   void parse_withExtendsParams() {
     GenericType type = new GenericTypeParser("my.exa.Repo<? extends my.d.Haz,java.lang.Long>").parse();