fix generic wildcard field injection (#956)

Author: SentryMan

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

@@ -1,9 +1,11 @@
 package io.avaje.inject.generator;
 
-import javax.lang.model.element.Element;
 import java.util.List;
 import java.util.Set;
 
+import javax.lang.model.element.Element;
+import javax.lang.model.type.TypeKind;
+
 final class FieldReader {
 
   private final Element element;
@@ -54,12 +56,13 @@ void addImports(ImportTypeMap importTypes) {
 
   String builderGetDependency(String builder) {
     final var sb = new StringBuilder();
-    sb.append(builder).append(".").append(utype.getMethod(nullable, isBeanMap));
-    if (isGenericParam()) {
+    final boolean wildcard = isWildcard();
+    final var wildParam = wildcard ? String.format("<%s>", type.shortWithoutAnnotations()) : "";
+    sb.append(builder).append(".").append(wildParam).append(utype.getMethod(nullable, isBeanMap));
+    if (!wildcard && isGenericParam()) {
       sb.append("TYPE_").append(Util.shortName(type).replace(".", "_"));
     } else {
-      var trimmed = ProcessorUtils.trimAnnotations(fieldType);
-      sb.append(Util.shortName(trimmed)).append(".class");
+      sb.append(Util.shortName(type.mainType())).append(".class");
     }
     if (name != null) {
       sb.append(",\"").append(name).append("\"");
@@ -68,6 +71,12 @@ String builderGetDependency(String builder) {
     return sb.toString();
   }
 
+
+  private boolean isWildcard() {
+    return type.isGeneric()
+      && type.componentTypes().stream().allMatch(g -> g.kind() == TypeKind.WILDCARD);
+  }
+
   void removeFromProvides(List<UType> provides) {
     provides.remove(type);
   }

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

@@ -28,6 +28,7 @@
 import java.util.TreeSet;
 
 import javax.annotation.processing.FilerException;
+import javax.lang.model.element.ModuleElement;
 import javax.lang.model.element.TypeElement;
 import javax.lang.model.type.TypeMirror;
 import javax.tools.FileObject;
@@ -154,9 +155,8 @@ static FileObject createMetaInfWriterFor(String interfaceType) throws IOExceptio
   static TypeElement elementMaybe(String rawType) {
     if (rawType == null) {
       return null;
-    } else {
-      return elements().getTypeElement(rawType);
     }
+    return elements().getTypeElement(rawType);
   }
 
   static TypeElement asElement(TypeMirror returnType) {
@@ -290,10 +290,17 @@ static void writeSPIServicesFile() {
   }
 
   private static boolean isOnModulePath(String service) {
-    var module = APContext.elements().getModuleOf(APContext.typeElement(service)).getQualifiedName().toString();
-
-    return CTX.get().hasProvidesPlugin && AVAJE_PROVIDED_PLUGIN.contains(module)
-      || APContext.moduleInfoReader().orElseThrow().containsOnModulePath(module);
+    var module =
+      Optional.ofNullable(APContext.typeElement(service))
+        .map(APContext.elements()::getModuleOf)
+        .map(ModuleElement::getQualifiedName)
+        .map(Object::toString);
+
+    return module.isPresent()
+      && (CTX.get().hasProvidesPlugin && AVAJE_PROVIDED_PLUGIN.contains(module.orElseThrow())
+      || module
+      .map(APContext.moduleInfoReader().orElseThrow()::containsOnModulePath)
+      .orElseThrow());
   }
 
   private static void readExistingMetaInfServices() {

inject-test/src/test/java/org/example/coffee/generic/MultiGenericConsumer.java

@@ -4,6 +4,7 @@
 
 import org.example.coffee.grind.AMusher;
 
+import jakarta.inject.Inject;
 import jakarta.inject.Singleton;
 
 /**
@@ -20,6 +21,8 @@ class MultiGenericConsumer {
 
   private List<SomeGeneric<?>> list;
 
+  @Inject List<SomeGeneric<?>> list2;
+
   MultiGenericConsumer(
       Repository<Haz, Long> hazRepo,
       AMusher aMusher,

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

@@ -176,15 +176,17 @@ private void checkMatch(DContextEntryBean entry) {
       if (impliedName || (match.isNameEqual(name) && !entry.isNameEqual(name))) {
         ignoredSecondaryMatch = entry;
         return;
-      } else if (!match.isNameEqual(name) && entry.isNameEqual(name)) {
+      }
+      if (!match.isNameEqual(name) && entry.isNameEqual(name)) {
         match = entry;
         return;
       }
       // if all else fails use the one provided by the current module
       if (entry.sourceModule() != currentModule) {
         ignoredSecondaryMatch = entry;
         return;
-      } else if (entry.sourceModule() == currentModule && match.sourceModule() != currentModule) {
+      }
+      if (entry.sourceModule() == currentModule && match.sourceModule() != currentModule) {
         // match on module
         match = entry;
         return;