add supertypes to auto-provides (#504)

Author: SentryMan

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

@@ -168,7 +168,7 @@ List<String> provides() {
     return typeReader.provides();
   }
 
-  String autoProvides() {
+  List<String> autoProvides() {
     return typeReader.autoProvides();
   }
 

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

@@ -33,7 +33,7 @@ final class MetaData {
   /**
    * Type deemed to be candidate for providing to another external module.
    */
-  private String autoProvides;
+  private List<String> autoProvides;
 
   private boolean generateProxy;
   private boolean usesExternalDependency;
@@ -138,7 +138,7 @@ List<Dependency> dependsOn() {
     return dependsOn;
   }
 
-  String autoProvides() {
+  List<String> autoProvides() {
     return autoProvides;
   }
 
@@ -219,7 +219,7 @@ void buildMethod(Append append) {
       appendProvides(append, "dependsOn", dependsOn.stream().map(Dependency::dependsOn).collect(Collectors.toList()));
     }
     if (hasAutoProvides) {
-      append.append(",").eol().append("      autoProvides = \"").append(autoProvides).append("\"");
+      appendProvides(append, "autoProvides", autoProvides);
     }
     append.append(")").append(NEWLINE);
     append.append("  private void build_").append(buildName()).append("() {").append(NEWLINE);
@@ -269,7 +269,7 @@ void setMethod(String method) {
     this.method = method;
   }
 
-  void setAutoProvides(String autoProvides) {
+  void setAutoProvides(List<String> autoProvides) {
     this.autoProvides = autoProvides;
   }
 

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

@@ -144,7 +144,7 @@ MetaData createMeta() {
     }
     metaData.setDependsOn(dependsOn);
     metaData.setProvides(typeReader == null ? Collections.emptyList() : typeReader.provides());
-    metaData.setAutoProvides(typeReader == null ? null : typeReader.autoProvides());
+    metaData.setAutoProvides(typeReader == null ? List.of() : typeReader.autoProvides());
     metaData.setProvidesAspect(typeReader == null ? "" : typeReader.providesAspect());
     return metaData;
   }

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

@@ -7,6 +7,7 @@
 import java.io.IOException;
 import java.io.Writer;
 import java.util.LinkedHashSet;
+import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.TreeSet;
@@ -103,9 +104,9 @@ private void writeProvides() {
       if (aspect != null && !aspect.isEmpty()) {
         autoProvidesAspects.add(aspect);
       }
-      final String forExternal = metaData.autoProvides();
+      final var forExternal = metaData.autoProvides();
       if (forExternal != null && !forExternal.isEmpty() && !forExternal.contains("<")) {
-        autoProvides.add(forExternal);
+        autoProvides.addAll(forExternal);
       }
     }
     if (!autoProvides.isEmpty()) {

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

@@ -113,14 +113,17 @@ String providesAspect() {
     return providesAspect;
   }
 
-  UType autoProvides() {
+  List<UType> autoProvides() {
     if (!autoProvide || !providesAspect.isEmpty()) {
-      return null;
+      return List.of();
     }
-    if (baseTypeIsInterface || interfaceTypes.isEmpty()) {
-      return Util.unwrapProvider(baseType.asType());
+    if (baseTypeIsInterface) {
+      return List.of(Util.unwrapProvider(baseType.asType()));
     }
-    return interfaceTypes.get(0);
+    var autoProvides = new ArrayList<>(interfaceTypes);
+    autoProvides.addAll(extendsTypes);
+    autoProvides.add(Util.unwrapProvider(baseType.asType()));
+    return autoProvides;
   }
 
   List<UType> provides() {

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

@@ -1,10 +1,8 @@
 package io.avaje.inject.generator;
 
-
 import javax.lang.model.element.Element;
 import javax.lang.model.element.TypeElement;
 import java.util.List;
-import java.util.Optional;
 import java.util.Set;
 
 import static java.util.stream.Collectors.toList;
@@ -44,8 +42,10 @@ List<String> provides() {
     return extendsReader.provides().stream().map(UType::full).collect(toList());
   }
 
-  String autoProvides() {
-    return Optional.ofNullable(extendsReader.autoProvides()).map(UType::full).orElse(null);
+  List<String> autoProvides() {
+    return extendsReader.autoProvides().stream()
+        .map(UType::full)
+        .collect(toList());
   }
 
   String providesAspect() {

inject/src/main/java/io/avaje/inject/spi/DependencyMeta.java

@@ -48,10 +48,10 @@
   String[] dependsOn() default {};
 
   /**
-   * Type deemed to be reasonable to provide to external module.
+   * Types deemed to be reasonable to provide to external module.
    * <p>
    * Used to support multiple module wiring automatically (as alternative to using explicit InjectModule annotation).
    */
-  String autoProvides() default "";
+  String[] autoProvides() default {};
 
 }