Merge branch 'feature/94' into jakarta-master

Author: rbygrave

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

@@ -358,6 +358,9 @@ boolean isExtraInjectionRequired() {
 
   void buildAddFor(Append writer) {
     writer.append("    if (builder.isAddBeanFor(");
+    if (name != null) {
+      writer.append("\"%s\", ", name);
+    }
     if (addForType != null) {
       writer.append(addForType).append(".class, ");
     }

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

@@ -23,14 +23,18 @@ String getFieldName() {
   String builderGetDependency() {
     StringBuilder sb = new StringBuilder();
     sb.append("b.").append(type.getMethod());
-    sb.append(type.rawType()).append(".class");
+    sb.append(getFieldType()).append(".class");
     if (name != null) {
       sb.append(",\"").append(name).append("\"");
     }
     sb.append(")");
     return sb.toString();
   }
 
+  private String getFieldType() {
+    return Util.unwrapProvider(type.rawType());
+  }
+
   /**
    * Check for request scoped dependency.
    */

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

@@ -177,8 +177,10 @@ void addImports(Set<String> importTypes) {
   }
 
   void buildAddFor(Append writer) {
-
     writer.append("    if (builder.isAddBeanFor(");
+    if (name != null) {
+      writer.append("\"%s\", ", name);
+    }
     if (addForType != null) {
       writer.append(addForType).append(".class, ");
     }

inject-test/src/test/java/org/example/coffee/provider/FieldInjectProvider.java

@@ -0,0 +1,16 @@
+package org.example.coffee.provider;
+
+import javax.inject.Inject;
+import javax.inject.Provider;
+import javax.inject.Singleton;
+
+@Singleton
+class FieldInjectProvider {
+
+  @Inject
+  Provider<AProv> aProvProvider;
+
+  AProv testGet() {
+    return aProvProvider.get();
+  }
+}

inject-test/src/test/java/org/example/coffee/provider/FieldInjectProviderTest.java

@@ -0,0 +1,21 @@
+package org.example.coffee.provider;
+
+import io.avaje.inject.SystemContext;
+import org.junit.jupiter.api.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+class FieldInjectProviderTest {
+
+  @Test
+  void test() {
+
+    FieldInjectProvider bean = SystemContext.getBean(FieldInjectProvider.class);
+    AProv aProv = bean.testGet();
+
+    assertThat(aProv).isNotNull();
+
+    AProv beanDirect = SystemContext.getBean(AProv.class);
+    assertThat(aProv).isSameAs(beanDirect);
+  }
+}

inject-test/src/test/java/org/example/coffee/provider/MethodInjectProvider.java

@@ -0,0 +1,20 @@
+package org.example.coffee.provider;
+
+import javax.inject.Inject;
+import javax.inject.Provider;
+import javax.inject.Singleton;
+
+@Singleton
+class MethodInjectProvider {
+
+  private Provider<AProv> aProvProvider;
+
+  @Inject
+  void set(Provider<AProv> aProvProvider) {
+    this.aProvProvider = aProvProvider;
+  }
+
+  AProv testGet() {
+    return aProvProvider.get();
+  }
+}

inject-test/src/test/java/org/example/coffee/provider/MethodInjectProviderTest.java

@@ -0,0 +1,21 @@
+package org.example.coffee.provider;
+
+import io.avaje.inject.SystemContext;
+import org.junit.jupiter.api.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+class MethodInjectProviderTest {
+
+  @Test
+  void test() {
+
+    MethodInjectProvider bean = SystemContext.getBean(MethodInjectProvider.class);
+    AProv aProv = bean.testGet();
+
+    assertThat(aProv).isNotNull();
+
+    AProv beanDirect = SystemContext.getBean(AProv.class);
+    assertThat(aProv).isSameAs(beanDirect);
+  }
+}

inject-test/src/test/java/org/example/coffee/qualifier/StoreManagerWithSetterQualifierTest.java

@@ -15,4 +15,31 @@ void redStore() {
       assertThat(manager.greenStore()).isEqualTo("green");
     }
   }
+
+  @Test
+  void namedTestDouble() {
+    try (BeanContext context = BeanContext.newBuilder()
+      .withBean("Blue", SomeStore.class, () -> "TD Blue")
+      .withBean("Green", SomeStore.class, () -> "TD Green")
+      .build()) {
+
+      StoreManagerWithSetterQualifier manager = context.getBean(StoreManagerWithSetterQualifier.class);
+      assertThat(manager.blueStore()).isEqualTo("TD Blue");
+      assertThat(manager.greenStore()).isEqualTo("TD Green");
+    }
+  }
+
+  @Test
+  void namedTestDouble_expect_otherNamedStillWired() {
+    try (BeanContext context = BeanContext.newBuilder()
+      .withBean("Blue", SomeStore.class, () -> "TD Blue Only")
+      // with GreenStore still wired
+      .build()) {
+
+      StoreManagerWithSetterQualifier manager = context.getBean(StoreManagerWithSetterQualifier.class);
+      assertThat(manager.blueStore()).isEqualTo("TD Blue Only");
+      assertThat(manager.greenStore()).isEqualTo("green");
+    }
+  }
+
 }

inject-test/src/test/java/org/example/missing/MFooUser2.java

@@ -0,0 +1,30 @@
+package org.example.missing;
+
+import javax.inject.Singleton;
+
+/**
+ * Has only 1 public constructor so that is chosen for injection.
+ */
+@Singleton
+public class MFooUser2 {
+
+  private final MFoo mf;
+  private final boolean usePublicConstructor;
+
+  public MFooUser2(MFoo mf) {
+    this.mf = mf;
+    this.usePublicConstructor = true;
+  }
+
+  /**
+   * Extra protected constructor usually for unit testing purposes only.
+   */
+  MFooUser2(MFoo mf, boolean dummy) {
+    this.mf = mf;
+    this.usePublicConstructor = true;
+  }
+
+  public boolean isUsePublicConstructor() {
+    return usePublicConstructor;
+  }
+}

inject-test/src/test/java/org/example/missing/SinglePublicConstructorTest.java

@@ -0,0 +1,17 @@
+package org.example.missing;
+
+import io.avaje.inject.SystemContext;
+import org.junit.jupiter.api.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+class SinglePublicConstructorTest {
+
+  @Test
+  void beanWithSinglePublicConstructor_expect_publicConstructorChosen() {
+
+    MFooUser2 bean = SystemContext.getBean(MFooUser2.class);
+
+    assertThat(bean.isUsePublicConstructor()).isTrue();
+  }
+}

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

@@ -168,6 +168,15 @@ public interface BeanContextBuilder {
    */
   <D> BeanContextBuilder withBean(Class<D> type, D bean);
 
+  /**
+   * Add a supplied bean instance with the given name and injection type.
+   *
+   * @param name The name qualifier
+   * @param type The dependency injection type this bean is target for
+   * @param bean The supplied bean instance to use (typically a test mock)
+   */
+  <D> BeanContextBuilder withBean(String name, Class<D> type, D bean);
+
   /**
    * Use a mockito mock when injecting this bean type.
    *

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

@@ -67,14 +67,19 @@ public BeanContextBuilder withIgnoreMissingModuleDependencies() {
   @SuppressWarnings({"unchecked", "rawtypes"})
   public BeanContextBuilder withBeans(Object... beans) {
     for (Object bean : beans) {
-      suppliedBeans.add(new SuppliedBean(suppliedType(bean.getClass()), bean));
+      suppliedBeans.add(new SuppliedBean(null, suppliedType(bean.getClass()), bean));
     }
     return this;
   }
 
   @Override
-  public <D> DBeanContextBuilder withBean(Class<D> type, D bean) {
-    suppliedBeans.add(new SuppliedBean<>(type, bean));
+  public <D> BeanContextBuilder withBean(Class<D> type, D bean) {
+    return withBean(null, type, bean);
+  }
+
+  @Override
+  public <D> BeanContextBuilder withBean(String name, Class<D> type, D bean) {
+    suppliedBeans.add(new SuppliedBean<>(name, type, bean));
     return this;
   }
 
@@ -85,7 +90,7 @@ public BeanContextBuilder withMock(Class<?> type) {
 
   @Override
   public <D> DBeanContextBuilder withMock(Class<D> type, Consumer<D> consumer) {
-    suppliedBeans.add(new SuppliedBean<>(type, null, consumer));
+    suppliedBeans.add(new SuppliedBean<>(null, type, null, consumer));
     return this;
   }
 

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

@@ -63,7 +63,7 @@ static Builder newBuilder(String name, String[] provides, String[] dependsOn) {
   /**
    * Return true if the bean should be created and registered with the context.
    * <p/>
-   * Returning false means there has been a (test double) bean already registered and
+   * Returning false means there has been a supplied bean already registered and
    * that we should skip the creation and registration for this bean.
    *
    * @param addForType   The interface that the bean implements and provides
@@ -74,13 +74,36 @@ static Builder newBuilder(String name, String[] provides, String[] dependsOn) {
   /**
    * Return true if the bean should be created and registered with the context.
    * <p/>
-   * Returning false means there has been a (test double) bean already registered and
+   * Returning false means there has been a supplied bean already registered and
+   * that we should skip the creation and registration for this bean.
+   *
+   * @param name         The qualifier name
+   * @param addForType   The interface that the bean implements and provides
+   * @param injectTarget The actual bean type we are looking to create and register
+   */
+  boolean isAddBeanFor(String name, Class<?> addForType, Class<?> injectTarget);
+
+  /**
+   * Return true if the bean should be created and registered with the context.
+   * <p/>
+   * Returning false means there has been a supplied bean already registered and
    * that we should skip the creation and registration for this bean.
    *
    * @param injectTarget The actual bean type we are looking to create and register
    */
   boolean isAddBeanFor(Class<?> injectTarget);
 
+  /**
+   * Return true if the bean should be created and registered with the context.
+   * <p/>
+   * Returning false means there has been a supplied bean already registered and
+   * that we should skip the creation and registration for this bean.
+   *
+   * @param name         The qualifier name
+   * @param injectTarget The actual bean type we are looking to create and register
+   */
+  boolean isAddBeanFor(String name, Class<?> injectTarget);
+
   /**
    * Register the bean instance into the context.
    * <p>

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

@@ -39,10 +39,7 @@ void add(List<SuppliedBean> suppliedBeans) {
   @SuppressWarnings("rawtypes")
   private void addSuppliedBean(SuppliedBean supplied) {
     Class<?> suppliedType = supplied.getType();
-    Named annotation = suppliedType.getAnnotation(Named.class);
-    String name = (annotation == null) ? null : annotation.value();
-
-    DContextEntryBean entryBean = DContextEntryBean.of(supplied.getBean(), name, SUPPLIED);
+    DContextEntryBean entryBean = DContextEntryBean.of(supplied.getBean(), supplied.name(), SUPPLIED);
     beans.computeIfAbsent(suppliedType.getCanonicalName(), s -> new DContextEntry()).add(entryBean);
     for (Class<?> anInterface : suppliedType.getInterfaces()) {
       beans.computeIfAbsent(anInterface.getCanonicalName(), s -> new DContextEntry()).add(entryBean);
@@ -93,8 +90,8 @@ void addAll(Class type, List list) {
   /**
    * Return true if there is a supplied bean for this type.
    */
-  boolean isSupplied(String canonicalName) {
+  boolean isSupplied(String canonicalName, String qualifierName) {
     DContextEntry entry = beans.get(canonicalName);
-    return entry != null && entry.isSupplied();
+    return entry != null && entry.isSupplied(qualifierName);
   }
 }

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

@@ -56,6 +56,11 @@ class DBuilder implements Builder {
    */
   private Class<?> injectTarget;
 
+  /**
+   * Flag set when we are running post construct injection.
+   */
+  private boolean runningPostConstruct;
+
   Builder parent;
 
   /**
@@ -98,18 +103,28 @@ public void setParent(Builder parent) {
 
   @Override
   public boolean isAddBeanFor(Class<?> addForType, Class<?> injectTarget) {
+    return isAddBeanFor(null, addForType, injectTarget);
+  }
+
+  @Override
+  public boolean isAddBeanFor(String name, Class<?> addForType, Class<?> injectTarget) {
     if (parent == null) {
       return true;
     }
     this.injectTarget = injectTarget;
-    return parent.isAddBeanFor(addForType);
+    return parent.isAddBeanFor(name, addForType, injectTarget);
   }
 
   @Override
   public boolean isAddBeanFor(Class<?> injectTarget) {
     return isAddBeanFor(injectTarget, injectTarget);
   }
 
+  @Override
+  public boolean isAddBeanFor(String name, Class<?> injectTarget) {
+    return isAddBeanFor(name, injectTarget, injectTarget);
+  }
+
   @Override
   public <T> Set<T> getSet(Class<T> interfaceType) {
     return new LinkedHashSet<>(getList(interfaceType));
@@ -224,6 +239,9 @@ public <T> Provider<T> getProvider(Class<T> cls) {
 
   @Override
   public <T> Provider<T> getProvider(Class<T> cls, String name) {
+    if (runningPostConstruct) {
+      return new ProviderWrapper<>(get(cls, name));
+    }
     ProviderPromise<T> promise = new ProviderPromise<>(cls, name);
     injectors.add(promise);
     return promise;
@@ -256,6 +274,7 @@ private void runInjectors() {
     if (name != null) {
       log.debug("perform field injection in context:{}", name);
     }
+    runningPostConstruct = true;
     for (Consumer<Builder> injector : injectors) {
       injector.accept(this);
     }