fix factory and add test

Author: SentryMan

.gitignore

@@ -14,3 +14,5 @@ inject-generator/avaje-inject
 inject-generator/avaje-inject-generator
 inject-generator/avaje-processors.txt
 *.csv
+inject-generator/util/events/ListString$Publisher$DI.java
+inject-generator/util/events/ListString$Publisher.java

blackbox-test-inject/src/main/java/org/example/myapp/async/BackgroundBean.java

@@ -0,0 +1,24 @@
+package org.example.myapp.async;
+
+import java.util.concurrent.atomic.AtomicBoolean;
+
+import io.avaje.inject.AsyncBean;
+import io.avaje.inject.BeanScope;
+import io.avaje.inject.PostConstruct;
+import io.avaje.lang.Nullable;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
+import jakarta.inject.Singleton;
+
+@AsyncBean
+@Singleton
+@Named("single")
+public class BackgroundBean {
+
+  final long initTime;
+
+  public BackgroundBean() throws InterruptedException {
+    Thread.sleep(1000);
+    this.initTime = System.currentTimeMillis();
+  }
+}

blackbox-test-inject/src/main/java/org/example/myapp/async/BackgroundBeanFactory.java

@@ -0,0 +1,18 @@
+package org.example.myapp.async;
+
+import io.avaje.inject.AsyncBean;
+import io.avaje.inject.Bean;
+import io.avaje.inject.Factory;
+import jakarta.inject.Named;
+
+@Factory
+@AsyncBean
+public class BackgroundBeanFactory {
+
+  @Bean
+  @Named("factory")
+  BackgroundBean lazyInt() throws InterruptedException {
+
+    return new BackgroundBean();
+  }
+}

blackbox-test-inject/src/test/java/org/example/myapp/async/AsyncTest.java

@@ -0,0 +1,29 @@
+package org.example.myapp.async;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import org.junit.jupiter.api.Test;
+
+import io.avaje.inject.BeanScope;
+
+class AsyncTest {
+
+  @Test
+  void test() {
+    try (var scope = BeanScope.builder().build()) {
+      var lazy = scope.get(BackgroundBean.class, "single");
+      assertThat(lazy).isNotNull();
+
+      var lazyAgain = scope.get(BackgroundBean.class, "single");
+      assertThat(lazyAgain).isSameAs(lazy);
+    }
+  }
+
+  @Test
+  void testFactory() {
+    try (var scope = BeanScope.builder().build()) {
+      var prov = scope.get(BackgroundBean.class, "factory");
+      assertThat(prov).isNotNull();
+    }
+  }
+}

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

@@ -7,6 +7,7 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.Set;
+import java.util.concurrent.CompletableFuture;
 
 import static io.avaje.inject.generator.Constants.CONDITIONAL_DEPENDENCY;
 import static io.avaje.inject.generator.ProcessingContext.asElement;
@@ -21,6 +22,7 @@ final class MethodReader {
   private final boolean prototype;
   private final boolean primary;
   private final boolean secondary;
+  private final boolean async;
   private final boolean lazy;
   private final String returnTypeRaw;
   private final UType genericType;
@@ -49,9 +51,11 @@ final class MethodReader {
       prototype = PrototypePrism.isPresent(element);
       primary = PrimaryPrism.isPresent(element);
       secondary = SecondaryPrism.isPresent(element);
+      async = AsyncBeanPrism.isPresent(element) || AsyncBeanPrism.isPresent(element.getEnclosingElement());
       lazy = LazyPrism.isPresent(element) || LazyPrism.isPresent(element.getEnclosingElement());
       conditions.readAll(element);
     } else {
+      async = false;
       prototype = false;
       primary = false;
       secondary = false;
@@ -103,8 +107,8 @@ final class MethodReader {
       this.initMethod = lifecycleReader.initMethod();
       this.destroyMethod = lifecycleReader.destroyMethod();
     }
-    if (lazy && prototype) {
-      APContext.logError("Cannot use both @Lazy and @Prototype");
+    if ((async||lazy) && prototype) {
+      APContext.logError("Cannot use both @AsyncBean/@Lazy and @Prototype");
     }
   }
 
@@ -230,7 +234,10 @@ void builderAddBeanProvider(Append writer) {
       writer.append(".asSecondary()");
     }
 
-    writer.indent(".registerProvider(() -> {").eol();
+    writer
+        .indent(".registerProvider(")
+        .append("%s() -> {", async ? "CompletableFuture.supplyAsync(" : "")
+        .eol();
 
     startTry(writer, "  ");
     writer.indent(indent).append("  return ");
@@ -243,7 +250,7 @@ void builderAddBeanProvider(Append writer) {
     }
     writer.append(");").eol();
     endTry(writer, "  ");
-    writer.indent(indent).append("  });").eol();
+    writer.indent(indent).append("  }%s);", async ? ")::join" : "").eol();
     writer.indent(indent).append("}").eol();
   }
 
@@ -340,6 +347,10 @@ void addImports(ImportTypeMap importTypes) {
     if (optionalType) {
       importTypes.add(Constants.OPTIONAL);
     }
+
+    if (async) {
+      importTypes.add(CompletableFuture.class.getCanonicalName());
+    }
     conditions.addImports(importTypes);
   }
 
@@ -429,6 +440,10 @@ boolean isProtoType() {
     return prototype && !Util.isProvider(returnTypeRaw);
   }
 
+  boolean isAsync() {
+    return async;
+  }
+
   boolean isLazy() {
     return lazy;
   }

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

@@ -144,7 +144,7 @@ private void writeFactoryBeanMethod(MethodReader method) {
     method.buildConditional(writer);
     method.buildAddFor(writer);
     method.builderGetFactory(writer, beanReader.hasConditions());
-    if (method.isLazy() || method.isProtoType() || method.isUseProviderForSecondary()) {
+    if (method.isAsync() || method.isLazy() || method.isProtoType() || method.isUseProviderForSecondary()) {
       method.builderAddBeanProvider(writer);
     } else {
       method.startTry(writer);
@@ -198,11 +198,21 @@ private void writeAddFor(MethodReader constructor) {
     if (beanReader.registerProvider()) {
       beanReader.prototypePostConstruct(writer, indent);
       writer.indent("        return bean;").eol();
-      writer.indent("      })").append("%s;", beanReader.async() ? "::join)" : "").eol();
+      if (!constructor.methodThrows()) {
+        writer.indent("      }").append(beanReader.async() ? ")::join);" : ");").eol();
+      }
     }
     writeObserveMethods();
     constructor.endTry(writer);
-    writer.append("    }").eol();
+
+    writer.append("    }");
+
+    if (beanReader.registerProvider() && constructor.methodThrows()) {
+      writer.append("%s);", beanReader.async() ? ")::join" : "").eol();
+      writer.append("    }");
+    }
+
+    writer.eol();
   }
 
   private void writeBuildMethodStart() {

inject-generator/src/test/java/io/avaje/inject/generator/models/valid/lazy/BackgroundBean.java renamed to inject-generator/src/test/java/io/avaje/inject/generator/models/valid/async/BackgroundBean.java

@@ -1,4 +1,4 @@
-package io.avaje.inject.generator.models.valid.lazy;
+package io.avaje.inject.generator.models.valid.async;
 
 import io.avaje.inject.AsyncBean;
 import jakarta.inject.Inject;

inject-generator/src/test/java/io/avaje/inject/generator/models/valid/async/BackgroundBeanFactory.java

@@ -0,0 +1,18 @@
+package io.avaje.inject.generator.models.valid.async;
+
+import io.avaje.inject.AsyncBean;
+import io.avaje.inject.Bean;
+import io.avaje.inject.Factory;
+import jakarta.inject.Named;
+
+@Factory
+@AsyncBean
+public class BackgroundBeanFactory {
+
+  @Bean
+  @Named("factory")
+  BackgroundBean lazyInt() throws InterruptedException {
+
+    return new BackgroundBean();
+  }
+}

inject-generator/src/test/java/io/avaje/inject/generator/models/valid/lazy/LazyFactory.java

@@ -9,7 +9,7 @@
 public class LazyFactory {
 
   @Bean
-  Integer lazyInt() {
+  Integer lazyInt() throws Exception {
     return 0;
   }
 }