#175 - Interfaces with generic type parameters that extend other interfaces, don't PROVIDE those extended interfaces

Author: rbygrave

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

@@ -5,7 +5,6 @@
 import javax.lang.model.type.TypeMirror;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Set;
 
 /**
  * Read the inheritance types for a given bean type.
@@ -152,7 +151,8 @@ private void readInterfaces(TypeElement type) {
   }
 
   private void readExtendedInterfaces(String type) {
-    final TypeElement element = context.element(type);
+    GenericType genericType = GenericType.parse(type);
+    final TypeElement element = context.element(genericType.topType());
     if (element != null) {
       readInterfaces(element);
     }

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

@@ -0,0 +1,6 @@
+package org.example.generic;
+
+public interface BuildTask {
+
+  void build();
+}

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

@@ -0,0 +1,6 @@
+package org.example.generic;
+
+public interface BuildTaskWith<T> extends BuildTask {
+
+  void prepareWith(T param);
+}

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

@@ -0,0 +1,20 @@
+package org.example.generic;
+
+import jakarta.inject.Singleton;
+
+import java.nio.file.Path;
+
+@Singleton
+public class PathBuildTask implements BuildTaskWith<Path> {
+
+  @Override
+  public void prepareWith(Path param) {
+    // do nothing
+  }
+
+  @Override
+  public void build() {
+    // do nothing
+  }
+
+}

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

@@ -0,0 +1,25 @@
+package org.example.generic;
+
+import io.avaje.inject.BeanScope;
+import org.junit.jupiter.api.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+class PathBuildTaskTest {
+
+  @Test
+  void genericInterfaceWithExtends_expect_providesExtendedInterface() {
+
+    try (BeanScope beanScope = BeanScope.newBuilder().build()) {
+
+      PathBuildTask pathBuildTask = beanScope.get(PathBuildTask.class);
+      BuildTask buildTask = beanScope.get(BuildTask.class);
+
+      // PathBuildTask is registered as providing PathBuildTask.class, BuildTask.class and generic TYPE_BuildTaskWithPath
+      assertThat(pathBuildTask).isSameAs(buildTask);
+
+      Object viaType = beanScope.get(PathBuildTask$DI.TYPE_BuildTaskWithPath, null);
+      assertThat(viaType).isSameAs(buildTask);
+    }
+  }
+}