Merge remote-tracking branch 'upstream/master' into postConstructBeans

Author: SentryMan

.gitignore

@@ -13,3 +13,5 @@ build/
 inject-generator/avaje-inject
 inject-generator/avaje-inject-generator
 inject-generator/avaje-processors.txt
+inject-generator/avaje-module-dependencies.csv
+inject-generator/avaje-plugins.csv

blackbox-other/src/main/java/org/other/one/OtherComponent3.java

@@ -0,0 +1,3 @@
+package org.other.one;
+
+public class OtherComponent3 {}

blackbox-test-inject/pom.xml

@@ -59,7 +59,7 @@
     <dependency>
       <groupId>io.github.resilience4j</groupId>
       <artifactId>resilience4j-annotations</artifactId>
-      <version>2.2.0</version>
+      <version>2.3.0</version>
     </dependency>
 
     <!-- annotation processor -->

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

@@ -2,15 +2,18 @@
 
 import io.avaje.config.Config;
 import io.avaje.inject.Component;
+import io.avaje.inject.Component.Import.Kind;
 import io.avaje.inject.spi.ConfigPropertyPlugin;
 
 import io.avaje.spi.ServiceProvider;
 import org.other.one.OtherComponent2;
+import org.other.one.OtherComponent3;
 
 import java.util.Optional;
 
 @ServiceProvider
 @Component.Import(value = OtherComponent2.class)
+@Component.Import(value = OtherComponent3.class, kind = Kind.LAZY)
 public class ConfigPropertiesPlugin implements ConfigPropertyPlugin {
 
   @Override

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

@@ -0,0 +1,29 @@
+package org.example.myapp;
+
+import java.util.concurrent.atomic.AtomicInteger;
+
+public class MyNestedDestroy {
+
+  public static AtomicInteger started = new AtomicInteger();
+  public static AtomicInteger stopped = new AtomicInteger();
+
+  public static void reset() {
+    started.set(0);
+    stopped.set(0);
+  }
+
+  public void start() {
+    started.incrementAndGet();
+  }
+
+  public Reaper reaper() {
+    return new Reaper();
+  }
+
+  public static class Reaper {
+
+    public void stop() {
+      stopped.incrementAndGet();
+    }
+  }
+}

blackbox-test-inject/src/main/java/org/example/myapp/config/AFactory.java

@@ -2,12 +2,18 @@
 
 import io.avaje.inject.Bean;
 import io.avaje.inject.Factory;
+import org.example.myapp.MyNestedDestroy;
 
 import java.io.IOException;
 
 @Factory
 class AFactory {
 
+  @Bean(initMethod = "start", destroyMethod = "reaper().stop()")
+  MyNestedDestroy lifecycle2() {
+    return new MyNestedDestroy();
+  }
+
   @Bean
   A0.Builder build0() {
     return new I0();

blackbox-test-inject/src/test/java/org/example/myapp/HelloServiceTest.java

@@ -14,6 +14,17 @@
 
 class HelloServiceTest {
 
+  @Test
+  void lifecycles() {
+    MyNestedDestroy.reset();
+    try (BeanScope beanScope = BeanScope.builder().build()) {
+      assertThat(beanScope.get(MyNestedDestroy.class)).isNotNull();
+      assertThat(MyNestedDestroy.started.get()).isEqualTo(1);
+      assertThat(MyNestedDestroy.stopped.get()).isEqualTo(0);
+    }
+    assertThat(MyNestedDestroy.stopped.get()).isEqualTo(1);
+  }
+
   /**
    * No mocking, no use of <code>@TestScope</code> so just like main.
    */

blackbox-test-inject/src/test/java/org/example/myapp/testconfig/CountTestScopeStart.java

@@ -13,6 +13,5 @@ public void onStart() {
 
   public void onStop() {
     stopped.incrementAndGet();
-    System.out.println("STOPPED !! ");
   }
 }

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

@@ -211,12 +211,23 @@ private Set<TypeElement> importedElements(RoundEnvironment roundEnv) {
     return maybeElements(roundEnv, ImportPrism.PRISM_TYPE).stream()
       .flatMap(Set::stream)
       .map(ImportPrism::getInstanceOn)
-      .flatMap(p -> p.value().stream())
-      .map(ProcessingContext::asElement)
-      .filter(this::notAlreadyProvided)
+      .flatMap(p -> {
+        var kind = p.kind();
+        return p.value().stream()
+          .map(ProcessingContext::asElement)
+          .filter(this::notAlreadyProvided)
+          .map(e -> registerImportedKind(e, kind));
+      })
       .collect(Collectors.toSet());
   }
 
+  private static TypeElement registerImportedKind(TypeElement e, String kind) {
+    if (!"SINGLETON".equals(kind)) {
+      ProcessingContext.addImportedKind(e, kind);
+    }
+    return e;
+  }
+
   private boolean notAlreadyProvided(TypeElement e) {
     final String type = e.getQualifiedName().toString();
     return !moduleFileProvided.contains(type) && !pluginFileProvided.contains(type);

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

@@ -287,7 +287,7 @@ void builderBuildAddBean(Append writer) {
       if (hasInitMethod) {
         var addPostConstruct =
           multiRegister
-            ? "    .peek(b -> builder.addPostConstruct(b::%s))"
+            ? "    .peek($bean -> builder.addPostConstruct($bean::%s))"
             : "builder.addPostConstruct($bean::%s);";
         writer.indent(indent).append(addPostConstruct, initMethod).eol();
       }
@@ -296,14 +296,14 @@ void builderBuildAddBean(Append writer) {
       if (notEmpty(destroyMethod)) {
         var addPreDestroy =
           multiRegister
-            ? "    .forEach(b -> builder.addPreDestroy(b::%s%s));"
-            : "builder.addPreDestroy($bean::%s%s);";
-        writer.indent(indent).append(addPreDestroy, destroyMethod, priority).eol();
+            ? "    .forEach($bean -> builder.addPreDestroy(%s%s));"
+            : "builder.addPreDestroy(%s%s);";
+        writer.indent(indent).append(addPreDestroy, addPreDestroy(destroyMethod), priority).eol();
 
       } else if (typeReader != null && typeReader.isClosable()) {
         var addPreDestroy =
           multiRegister
-            ? "    .forEach(b -> builder.addPreDestroy(b::close%s));"
+            ? "    .forEach($bean -> builder.addPreDestroy($bean::close%s));"
             : "builder.addPreDestroy($bean::close%s);";
         writer.indent(indent).append(addPreDestroy, priority).eol();
 
@@ -324,6 +324,13 @@ void builderBuildAddBean(Append writer) {
     }
   }
 
+  static String addPreDestroy(String destroyMethod) {
+    if (!destroyMethod.contains(".")) {
+      return "$bean::" + destroyMethod;
+    }
+    return "() -> $bean." + destroyMethod;
+  }
+
   private boolean hasLifecycleMethods() {
     return notEmpty(initMethod) || notEmpty(destroyMethod) || (typeReader != null && typeReader.isClosable() || beanCloseable);
   }

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

@@ -27,6 +27,7 @@ private ProcessingContext() {}
   static final class Ctx {
     private final Set<String> uniqueModuleNames = new HashSet<>();
     private final Set<String> providedTypes = new HashSet<>();
+    private final Map<String, String> importedProtoTypes = new HashMap<>();
     private final Set<String> optionalTypes = new LinkedHashSet<>();
     private final Map<String, AspectImportPrism> aspectImportPrisms = new HashMap<>();
     private final List<ModuleData> modules = new ArrayList<>();
@@ -154,6 +155,22 @@ static void addOptionalType(String paramType, String name) {
     }
   }
 
+  static void addImportedKind(TypeElement element, String kind) {
+    CTX.get().importedProtoTypes.put(element.getQualifiedName().toString(), kind);
+  }
+
+  static boolean isImportedPrototype(TypeElement element) {
+    return "prototype".equalsIgnoreCase(importedTypeKind(element));
+  }
+
+  static boolean isImportedLazy(TypeElement element) {
+    return "lazy".equalsIgnoreCase(importedTypeKind(element));
+  }
+
+  private static String importedTypeKind(TypeElement element) {
+    return CTX.get().importedProtoTypes.get(element.getQualifiedName().toString());
+  }
+
   static void addImportedAspects(Map<String, AspectImportPrism> importedMap) {
     CTX.get().aspectImportPrisms.putAll(importedMap);
   }

inject-generator/src/test/java/io/avaje/inject/generator/MethodReaderTest.java

@@ -0,0 +1,19 @@
+package io.avaje.inject.generator;
+
+import org.junit.jupiter.api.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+class MethodReaderTest {
+
+  @Test
+  void addPreDestroy() {
+    assertThat(MethodReader.addPreDestroy("close")).isEqualTo("$bean::close");
+    assertThat(MethodReader.addPreDestroy("foo")).isEqualTo("$bean::foo");
+  }
+
+  @Test
+  void addPreDestroyNested() {
+    assertThat(MethodReader.addPreDestroy("foo().bar()")).isEqualTo("() -> $bean.foo().bar()");
+  }
+}

inject-generator/src/test/java/io/avaje/inject/generator/models/valid/imported/ImportedProtoType.java

@@ -0,0 +1,7 @@
+package io.avaje.inject.generator.models.valid.imported;
+
+import io.avaje.inject.Component;
+import io.avaje.inject.Component.Import.Kind;
+
+@Component.Import(value = ImportedProtoType.class, kind =  Kind.PROTOTYPE)
+public class ImportedProtoType {}

inject-test/pom.xml

@@ -12,7 +12,7 @@
 
   <properties>
     <jupiter.version>5.11.4</jupiter.version>
-    <mockito.version>5.14.2</mockito.version>
+    <mockito.version>5.15.2</mockito.version>
   </properties>
 
   <dependencies>

inject/pom.xml

@@ -53,7 +53,7 @@
     <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-core</artifactId>
-      <version>5.14.2</version>
+      <version>5.15.2</version>
       <optional>true</optional>
     </dependency>
 

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

@@ -1,11 +1,12 @@
 package io.avaje.inject;
 
+import java.lang.annotation.Repeatable;
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
 import static java.lang.annotation.ElementType.*;
-import static java.lang.annotation.RetentionPolicy.CLASS;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
+import static java.lang.annotation.RetentionPolicy.SOURCE;
 
 /**
  * Identify a bean as component with singleton scope that avaje-inject will use.
@@ -63,13 +64,26 @@
    *
    * }</pre>
    */
-  @Retention(CLASS)
+  @Retention(SOURCE)
   @Target({TYPE, PACKAGE, MODULE})
+  @Repeatable(Imports.class)
   @interface Import {
 
-    /**
-     * Types to generate DI classes for.
-     */
+    /** Types to generate DI classes for. */
     Class<?>[] value();
+
+    /** What kind of bean */
+    Kind kind() default Kind.SINGLETON;
+
+    enum Kind { SINGLETON, PROTOTYPE, LAZY }
+  }
+
+  /**
+   * @see Import
+   */
+  @Retention(SOURCE)
+  @Target({TYPE, PACKAGE, MODULE})
+  @interface Imports {
+    Import[] value();
   }
 }

pom.xml

@@ -73,7 +73,7 @@
     <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-core</artifactId>
-      <version>5.14.2</version>
+      <version>5.15.2</version>
       <scope>test</scope>
     </dependency>
   </dependencies>