Merge branch 'factory-types-bugfix'

# Conflicts:
#	inject-generator/src/main/java/io/avaje/inject/generator/MethodReader.java

Author: Markus Ritter

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

@@ -7,6 +7,7 @@
 import javax.lang.model.element.Element;
 import javax.lang.model.element.TypeElement;
 import java.util.*;
+import java.util.stream.Collectors;
 
 class BeanReader {
 
@@ -187,6 +188,9 @@ private Set<String> importTypes() {
       importTypes.add(type);
     }
     typeReader.extraImports(importTypes);
+    factoryMethods.forEach(methodReader -> {
+      methodReader.factoryImports(importTypes);
+    });
     requestParams.addImports(importTypes);
     aspects.extraImports(importTypes);
 

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

@@ -9,6 +9,8 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.Set;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 class MethodReader {
 
@@ -179,7 +181,21 @@ void addImports(Set<String> importTypes) {
   }
 
   Set<GenericType> getGenericTypes() {
-    return typeReader == null ? Collections.emptySet() : typeReader.getGenericTypes();
+    return typeReader != null ? typeReader.getGenericTypes() : Collections.emptySet();
+  }
+
+  void factoryImports(Set<String> importTypes) {
+    Set<GenericType> genericTypes = getGenericTypes();
+    if (!genericTypes.isEmpty()) {
+      importTypes.add(Constants.TYPE);
+      importTypes.add(Constants.GENERICTYPE);
+      importTypes.addAll(genericTypes
+        .stream()
+        .flatMap(g-> Stream.concat(
+          Stream.of(g.getMainType()),
+          g.getParams().stream().map(GenericType::getMainType)))
+        .collect(Collectors.toSet()));
+    }
   }
 
   void buildAddFor(Append writer) {
@@ -269,6 +285,7 @@ void writeAspectAround(Append writer, String targetName) {
     writer.eol();
   }
 
+
   static class MethodParam {
 
     private final String named;

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

@@ -77,11 +77,13 @@ private void writeGenericProviders() {
   private void writeGenericTypeFields() {
     // collect all types to prevent duplicates
     Set<GenericType> genericTypes = new HashSet<>();
-    if (beanReader.getGenericTypes()!=null) {
+    if (beanReader.getGenericTypes() != null) {
       genericTypes.addAll(beanReader.getGenericTypes());
     }
-    for (MethodReader factoryMethod : beanReader.getFactoryMethods()) {
-      genericTypes.addAll(factoryMethod.getGenericTypes());
+    if (beanReader.getFactoryMethods() != null) {
+      for (MethodReader factoryMethod : beanReader.getFactoryMethods()) {
+        genericTypes.addAll(factoryMethod.getGenericTypes());
+      }
     }
     if (!genericTypes.isEmpty()) {
       for (GenericType type : genericTypes) {

inject-test/src/test/java/org/example/coffee/FactoryTest.java

@@ -2,6 +2,7 @@
 
 import io.avaje.inject.BeanScope;
 import org.example.coffee.factory.BFact;
+import org.example.coffee.factory.BeanWithGenericInterface;
 import org.junit.jupiter.api.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -17,4 +18,13 @@ void test() {
     }
 
   }
+
+  @Test
+  void testBeanWithGenericInterface() {
+    try (BeanScope context = BeanScope.newBuilder().build()) {
+      BeanWithGenericInterface bean = context.get(BeanWithGenericInterface.class);
+      assertThat(bean).isNotNull();
+    }
+
+  }
 }

inject-test/src/test/java/org/example/coffee/factory/BeanWithGenericInterface.java

@@ -0,0 +1,11 @@
+package org.example.coffee.factory;
+
+import java.io.File;
+import java.util.function.Consumer;
+
+public class BeanWithGenericInterface implements Consumer<File> {
+  @Override
+  public void accept(File o) {
+    // do nothing
+  }
+}

inject-test/src/test/java/org/example/coffee/factory/FactoryForBeanWithGenericInterface.java

@@ -0,0 +1,12 @@
+package org.example.coffee.factory;
+
+import io.avaje.inject.Bean;
+import io.avaje.inject.Factory;
+
+@Factory
+public class FactoryForBeanWithGenericInterface {
+  @Bean
+  public BeanWithGenericInterface create() {
+    return new BeanWithGenericInterface();
+  }
+}