fix test generic injection

Author: SentryMan

blackbox-test-inject/src/main/java/org/example/myapp/generic/GenericFactory.java

@@ -9,7 +9,7 @@
 public class GenericFactory {
 
   @Bean
-  Generic<String> one() {
+  Generic<Integer> one() {
 
     return new Generic<>() {};
   }

inject-test/src/main/java/io/avaje/inject/test/MetaReader.java

@@ -15,6 +15,7 @@
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Field;
 import java.lang.reflect.Modifier;
+import java.lang.reflect.Type;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -53,14 +54,14 @@ boolean hasInstanceInjection() {
 
   @Override
   public String toString() {
-    String s = toStringAppend("mocks:", mocks);
-    s += toStringAppend("spies:", spies);
-    s += toStringAppend("inject:", injection);
-    s += toStringAppend("captors:", captors);
-    s += toStringAppend("staticMocks:", staticMocks);
-    s += toStringAppend("staticSpies:", staticSpies);
-    s += toStringAppend("staticInjection:", staticInjection);
-    return s;
+    StringBuilder s = new StringBuilder().append(toStringAppend("mocks:", mocks));
+    s.append(toStringAppend("spies:", spies));
+    s.append(toStringAppend("inject:", injection));
+    s.append(toStringAppend("captors:", captors));
+    s.append(toStringAppend("staticMocks:", staticMocks));
+    s.append(toStringAppend("staticSpies:", staticSpies));
+    s.append(toStringAppend("staticInjection:", staticInjection));
+    return s.toString();
   }
 
   private String toStringAppend(String key, List<?> entries) {
@@ -282,8 +283,8 @@ public String toString() {
       return field.getName();
     }
 
-    Class<?> type() {
-      return field.getType();
+    Type type() {
+      return field.getGenericType();
     }
 
     String name() {

inject-test/src/main/java/io/avaje/inject/test/Plugin.java

@@ -1,5 +1,7 @@
 package io.avaje.inject.test;
 
+import java.lang.reflect.Type;
+
 import io.avaje.inject.BeanScope;
 
 /**
@@ -13,7 +15,7 @@ public interface Plugin {
   /**
    * Return true if this plugin should inject for this class.
    */
-  boolean forType(Class<?> type);
+  boolean forType(Type type);
 
   /**
    * Create a plugin scope for either EACH or ALL (per test or per class)
@@ -32,7 +34,7 @@ interface Scope {
      * <p>
      * For example, avaje-jex-test will create a http client.
      */
-    Object create(Class<?> type);
+    Object create(Type type);
 
     /**
      * Close resources that are in this scope - for example, http server.

inject-test/src/test/java/io/avaje/inject/test/MetaReaderTest.java

@@ -9,6 +9,7 @@
 import org.mockito.Mock;
 import org.mockito.Mockito;
 
+import java.lang.reflect.Type;
 import java.net.http.HttpClient;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -49,7 +50,7 @@ static class HelloBean {
 
   static class MyPlugin implements Plugin {
 
-    public boolean forType(Class<?> type) {
+  public boolean forType(Type type) {
       return HttpClient.class.equals(type);
     }
 
@@ -63,7 +64,7 @@ static class Scope implements Plugin.Scope {
       HttpClient httpClient;
 
       @Override
-      public Object create(Class<?> type) {
+      public Object create(Type type) {
         this.httpClient = HttpClient.newBuilder().build();
         return httpClient;
       }

inject/src/main/java/io/avaje/inject/BeanScope.java

@@ -1,5 +1,6 @@
 package io.avaje.inject;
 
+import io.avaje.inject.spi.Types;
 import io.avaje.lang.NonNullApi;
 import io.avaje.lang.Nullable;
 
@@ -140,7 +141,51 @@ static BeanScopeBuilder builder() {
   <T> T get(Class<T> type, @Nullable String name);
 
   /**
-   * Return a single bean given the generic type and name.
+   * Return a single bean given its type and generic components.
+   *
+   * <pre>{@code
+   * Map<String, CoffeeMaker> coffeeMaker = beanScope.get(Map.class, String.class, CoffeeMaker.class);
+   *
+   * }</pre>
+   *
+   * @param base the base generic type
+   * @param type component types of the generic type
+   * @throws java.util.NoSuchElementException When no matching bean is found
+   */
+  default <T> T get(Type base, Type... types) {
+    return get(null, base, types);
+  }
+
+  /**
+   * Return a single bean given it's name, type, and generic components.
+   *
+   * <pre>{@code
+   * Heater heater = beanScope.get("electric", Set.class,  );
+   * heater.heat();
+   *
+   * }</pre>
+   *
+   * @param type an interface or bean type
+   * @param name the name qualifier of a specific bean
+   * @throws java.util.NoSuchElementException When no matching bean is found
+   */
+  default <T> T get(@Nullable String name, Type type, Type... types) {
+
+    return get(Types.parameterizedType(type, types), name);
+  }
+
+  /**
+   * Return a single bean given the full generic type.
+   *
+   * @param type The generic type
+   * @throws java.util.NoSuchElementException When no matching bean is found
+   */
+  default <T> T get(Type type) {
+    return get(type, (String) null);
+  }
+
+  /**
+   * Return a single bean given the full generic type and name.
    *
    * @param type The generic type
    * @param name the name qualifier of a specific bean

inject/src/main/java/io/avaje/inject/BeanScopeBuilder.java

@@ -325,7 +325,7 @@ interface ForTesting extends BeanScopeBuilder {
      *
      * }</pre>
      */
-    BeanScopeBuilder.ForTesting mock(Class<?> type);
+    BeanScopeBuilder.ForTesting mock(Type type);
 
     /**
      * Register as a Mockito mock with a qualifier name.
@@ -343,7 +343,7 @@ interface ForTesting extends BeanScopeBuilder {
      *
      * }</pre>
      */
-    BeanScopeBuilder.ForTesting mock(Class<?> type, String name);
+    BeanScopeBuilder.ForTesting mock(Type type, String name);
 
     /**
      * Use a mockito mock when injecting this bean type additionally
@@ -398,7 +398,7 @@ interface ForTesting extends BeanScopeBuilder {
      *
      * }</pre>
      */
-    BeanScopeBuilder.ForTesting spy(Class<?> type);
+    BeanScopeBuilder.ForTesting spy(Type type);
 
     /**
      * Register a Mockito spy with a qualifier name.
@@ -416,7 +416,7 @@ interface ForTesting extends BeanScopeBuilder {
      *
      * }</pre>
      */
-    BeanScopeBuilder.ForTesting spy(Class<?> type, String name);
+    BeanScopeBuilder.ForTesting spy(Type type, String name);
 
     /**
      * Use a mockito spy when injecting this bean type additionally

inject/src/main/java/io/avaje/inject/DBeanScopeBuilder.java

@@ -157,13 +157,14 @@ public BeanScopeBuilder parent(BeanScope parent, boolean parentOverride) {
   }
 
   @Override
-  public BeanScopeBuilder.ForTesting mock(Class<?> type) {
-    return mock(type, null, null);
+  public BeanScopeBuilder.ForTesting mock(Type type) {
+    return mock(type, null);
   }
 
   @Override
-  public BeanScopeBuilder.ForTesting mock(Class<?> type, String name) {
-    return mock(type, name, null);
+  public BeanScopeBuilder.ForTesting mock(Type type, String name) {
+    suppliedBeans.add(SuppliedBean.ofType(name, type, null));
+    return this;
   }
 
   @Override
@@ -177,12 +178,12 @@ private <D> BeanScopeBuilder.ForTesting mock(Class<D> type, @Nullable String nam
   }
 
   @Override
-  public BeanScopeBuilder.ForTesting spy(Class<?> type) {
+  public BeanScopeBuilder.ForTesting spy(Type type) {
     return spy(type, null, null);
   }
 
   @Override
-  public BeanScopeBuilder.ForTesting spy(Class<?> type, String name) {
+  public BeanScopeBuilder.ForTesting spy(Type type, String name) {
     return spy(type, name, null);
   }
 
@@ -196,6 +197,12 @@ private <D> BeanScopeBuilder.ForTesting spy(Class<D> type, @Nullable String name
     return this;
   }
 
+  private <D> BeanScopeBuilder.ForTesting spy(
+      Type type, @Nullable String name, @Nullable Consumer<D> consumer) {
+    enrichBeans.add(new EnrichBean<>(type, name, consumer));
+    return this;
+  }
+
   private void initClassLoader() {
     if (classLoader == null) {
       classLoader = Thread.currentThread().getContextClassLoader();

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

@@ -2,18 +2,19 @@
 
 import org.mockito.Mockito;
 
+import java.lang.reflect.Type;
 import java.util.function.Consumer;
 
 /**
  * Holds Spy setup consumers for dependency injection using Mockito Spy.
  */
 public final class EnrichBean<B> {
 
-  private final Class<B> type;
+  private final Type type;
   private final String name;
   private final Consumer<B> consumer;
 
-  public EnrichBean(Class<B> type, String name, Consumer<B> consumer) {
+  public EnrichBean(Type type, String name, Consumer<B> consumer) {
     this.type = type;
     this.name = KeyUtil.lower(name);
     this.consumer = consumer;