#189 - Change such that when using a Provider the provider controls the scope of the returned bean/instance

Author: rbygrave

inject-test/src/test/java/org/example/coffee/ProviderTest.java

@@ -17,7 +17,7 @@ void test() {
       assertThat(other).isEqualTo("mush mush beans");
 
       ProvOther2 bean2 = context.get(ProvOther2.class);
-      assertThat(bean2.getaProv()).isSameAs(bean.getaProv());
+      assertThat(bean2.getaProv()).isNotSameAs(bean.getaProv());
     }
 
   }

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

@@ -9,13 +9,11 @@ class FieldInjectProviderTest {
 
   @Test
   void test() {
-
     FieldInjectProvider bean = ApplicationScope.get(FieldInjectProvider.class);
     AProv aProv = bean.testGet();
-
     assertThat(aProv).isNotNull();
 
     AProv beanDirect = ApplicationScope.get(AProv.class);
-    assertThat(aProv).isSameAs(beanDirect);
+    assertThat(aProv).isNotSameAs(beanDirect);
   }
 }

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

@@ -9,14 +9,12 @@ class MethodInjectProviderTest {
 
   @Test
   void test() {
-
     MethodInjectProvider bean = ApplicationScope.get(MethodInjectProvider.class);
     AProv aProv = bean.testGet();
-
     assertThat(aProv).isNotNull();
 
     AProv beanDirect = ApplicationScope.get(AProv.class);
-    assertThat(aProv).isSameAs(beanDirect);
+    assertThat(aProv).isNotSameAs(beanDirect);
   }
 
   @Test

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

@@ -67,7 +67,7 @@ void register(int flag, Object bean) {
   }
 
   void register(int flag, Provider<?> provider) {
-    DContextEntryBean entryBean = DContextEntryBean.prototype(provider, nextBean.name, flag);
+    DContextEntryBean entryBean = DContextEntryBean.provider(provider, nextBean.name, flag);
     for (Type type : nextBean.types) {
       beans.computeIfAbsent(type.getTypeName(), s -> new DContextEntry()).add(entryBean);
     }

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

@@ -19,14 +19,14 @@ class DContextEntryBean {
    */
   static DContextEntryBean of(Object bean, String name, int flag) {
     if (bean instanceof Provider) {
-      return new DContextEntryBean.Prov((Provider<?>)bean, name, flag);
+      return new Prov((Provider<?>)bean, name, flag);
     } else {
       return new DContextEntryBean(bean, name, flag);
     }
   }
 
-  static DContextEntryBean prototype(Provider<?> provider, String name, int flag) {
-      return new Prototype(provider, name, flag);
+  static DContextEntryBean provider(Provider<?> provider, String name, int flag) {
+      return new Prov(provider, name, flag);
   }
 
   protected final Object source;
@@ -91,40 +91,17 @@ final boolean isSupplied(String qualifierName) {
   }
 
   /**
-   * Provider based entry - get it once.
+   * Provider based entry - provider controls the scope of the provided bean.
    */
   static final class Prov extends DContextEntryBean {
 
-    private Object actualBean;
     private final Provider<?> provider;
 
     private Prov(Provider<?> provider, String name, int flag) {
       super(provider, name, flag);
       this.provider = provider;
     }
 
-    @Override
-    Object getBean() {
-      // it's a provider, get it once
-      if (actualBean == null) {
-        actualBean = provider.get();
-      }
-      return actualBean;// provider.get();
-    }
-  }
-
-  /**
-   * Prototype based entry - new every time.
-   */
-  static final class Prototype extends DContextEntryBean {
-
-    private final Provider<?> provider;
-
-    private Prototype(Provider<?> provider, String name, int flag) {
-      super(provider, name, flag);
-      this.provider = provider;
-    }
-
     @Override
     Provider<?> provider() {
       return provider;