#178 #177 Add test, add imports for factoryMethod generic types

Author: rbygrave

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

@@ -189,6 +189,19 @@ private Set<String> importTypes() {
     typeReader.extraImports(importTypes);
     requestParams.addImports(importTypes);
     aspects.extraImports(importTypes);
+
+    for (MethodReader factoryMethod : factoryMethods) {
+      Set<GenericType> genericTypes = factoryMethod.getGenericTypes();
+      if (!genericTypes.isEmpty()) {
+        importTypes.add(Constants.TYPE);
+        importTypes.add(Constants.GENERICTYPE);
+        importTypes.add(Constants.PROVIDER);
+        for (GenericType genericType : genericTypes) {
+          genericType.addImports(importTypes);
+        }
+      }
+    }
+
     return importTypes;
   }
 

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

@@ -6,6 +6,7 @@
 import javax.lang.model.element.*;
 import javax.lang.model.type.TypeMirror;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 import java.util.Set;
 
@@ -178,7 +179,7 @@ void addImports(Set<String> importTypes) {
   }
 
   Set<GenericType> getGenericTypes() {
-    return typeReader.getGenericTypes();
+    return typeReader == null ? Collections.emptySet() : typeReader.getGenericTypes();
   }
 
   void buildAddFor(Append writer) {

inject-test/src/test/java/org/example/generic/MyFunc.java

@@ -0,0 +1,11 @@
+package org.example.generic;
+
+import java.util.function.Function;
+
+public class MyFunc implements Function<Object, Object> {
+
+  @Override
+  public Object apply(Object o) {
+    return "echo: " + o;
+  }
+}

inject-test/src/test/java/org/example/generic/MyFuncFactory.java

@@ -0,0 +1,13 @@
+package org.example.generic;
+
+import io.avaje.inject.Bean;
+import io.avaje.inject.Factory;
+
+@Factory
+public class MyFuncFactory {
+
+  @Bean
+  MyFunc createTest() {
+    return new MyFunc();
+  }
+}

inject-test/src/test/java/org/example/generic/MyFuncFactoryTest.java

@@ -0,0 +1,18 @@
+package org.example.generic;
+
+import io.avaje.inject.BeanScope;
+import org.junit.jupiter.api.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+class MyFuncFactoryTest {
+
+  @Test
+  void test_does_wire() {
+    try (BeanScope beanScope = BeanScope.newBuilder().build()) {
+      MyFunc myFunc = beanScope.get(MyFunc.class);
+
+      assertThat(myFunc.apply("Hi")).isEqualTo("echo: Hi");
+    }
+  }
+}