Add PostInit annotation, fix list dependency handler

ogesaku · ogesaku · commit 5a4103306267 · 2024-05-08T09:16:31.000+02:00
diff --git a/src/integrationTest/groovy/annotated/BeanLifecycleSpec.groovy b/src/integrationTest/groovy/annotated/BeanLifecycleSpec.groovy
@@ -11,31 +11,35 @@ class BeanLifecycleSpec extends Specification {
             Context context = Context.scanPackage(ConfigLifecycle)
         then:
             annotated.samples.beans_lifecycle.Bar.initialized == false
+            annotated.samples.beans_lifecycle.Bar.postInitialized == false
             annotated.samples.beans_lifecycle.Baz.initialized == false
+            annotated.samples.beans_lifecycle.Baz.postInitialized == false
 
         when:
             context.get(annotated.samples.beans_lifecycle.Bar)
         then:
             annotated.samples.beans_lifecycle.Bar.initialized
+            annotated.samples.beans_lifecycle.Bar.postInitialized
 
         when:
             context.get(annotated.samples.beans_lifecycle.Baz)
         then:
             annotated.samples.beans_lifecycle.Baz.initialized
+            annotated.samples.beans_lifecycle.Baz.postInitialized
     }
 
     def "should initialize eager bean right after context is built"() {
         when:
             Context.scanPackage(EagerBar)
         then:
             EagerBar.initialized == true
+            EagerBar.postInitialized == true
     }
 
     def "should finalize beans when closing the context"() {
         given:
             Context context = Context.builder()
                     .scanPackage(ConfigLifecycle)
-                    .registerConfigurationBeans()
                     .build()
         and:
             ConfigLifecycle config = context.get(ConfigLifecycle)
diff --git a/src/integrationTest/groovy/annotated/ConfigurationRegistrationSpec.groovy b/src/integrationTest/groovy/annotated/ConfigurationRegistrationSpec.groovy
@@ -3,6 +3,7 @@ package annotated
 import annotated.samples.config_init.ConfigEagerInit
 import annotated.samples.config_init.ConfigInit
 import annotated.samples.config_inject.ConfigInject
+import annotated.samples.config_post_init.ConfigPostInit
 import com.coditory.quark.context.Context
 import spock.lang.Specification
 
@@ -65,4 +66,16 @@ class ConfigurationRegistrationSpec extends Specification {
             ConfigEagerInit.initialized == true
             ConfigEagerInit.bar != null
     }
+
+    def "should post initialize configuration with dependency on internal bean"() {
+        when:
+            Context.builder()
+                    .scanPackage(ConfigPostInit)
+                    .build()
+                    .get(annotated.samples.config_post_init.Foo)
+        then:
+            ConfigPostInit.postInitialized == true
+            ConfigPostInit.bar != null
+            ConfigPostInit.baz != null
+    }
 }
diff --git a/src/integrationTest/groovy/annotated/samples/beans_lifecycle/Bar.groovy b/src/integrationTest/groovy/annotated/samples/beans_lifecycle/Bar.groovy
@@ -3,17 +3,24 @@ package annotated.samples.beans_lifecycle
 import com.coditory.quark.context.annotations.Bean
 import com.coditory.quark.context.annotations.Close
 import com.coditory.quark.context.annotations.Init
+import com.coditory.quark.context.annotations.PostInit
 
 @Bean
 class Bar {
     static boolean initialized = false
+    static boolean postInitialized = false
     static boolean finalized = false
 
     @Init
     void init() {
         Bar.initialized = true
     }
 
+    @PostInit
+    void postInit() {
+        Bar.postInitialized = true
+    }
+
     @Close
     void close() {
         Bar.finalized = true
diff --git a/src/integrationTest/groovy/annotated/samples/beans_lifecycle/Baz.groovy b/src/integrationTest/groovy/annotated/samples/beans_lifecycle/Baz.groovy
@@ -2,9 +2,11 @@ package annotated.samples.beans_lifecycle
 
 import com.coditory.quark.context.annotations.Close
 import com.coditory.quark.context.annotations.Init
+import com.coditory.quark.context.annotations.PostInit
 
 class Baz {
     static boolean initialized = false
+    static boolean postInitialized = false
     static boolean finalized = false
     final Bar bar
 
@@ -17,6 +19,11 @@ class Baz {
         Baz.initialized = true
     }
 
+    @PostInit
+    void postInit() {
+        Baz.postInitialized = true
+    }
+
     @Close
     void close() {
         Baz.finalized = true
diff --git a/src/integrationTest/groovy/annotated/samples/beans_lifecycle/EagerBar.groovy b/src/integrationTest/groovy/annotated/samples/beans_lifecycle/EagerBar.groovy
@@ -2,18 +2,25 @@ package annotated.samples.beans_lifecycle
 
 import com.coditory.quark.context.annotations.Bean
 import com.coditory.quark.context.annotations.Close
-import com.coditory.quark.context.annotations.Init;
+import com.coditory.quark.context.annotations.Init
+import com.coditory.quark.context.annotations.PostInit;
 
 @Bean(eager = true)
 class EagerBar {
     static boolean initialized = false
+    static boolean postInitialized = false
     static boolean finalized = false
 
     @Init
     void init() {
         EagerBar.initialized = true
     }
 
+    @PostInit
+    void postInit() {
+        EagerBar.postInitialized = true
+    }
+
     @Close
     void close() {
         EagerBar.finalized = true
diff --git a/src/integrationTest/groovy/annotated/samples/config_post_init/Bar.groovy b/src/integrationTest/groovy/annotated/samples/config_post_init/Bar.groovy
@@ -0,0 +1,7 @@
+package annotated.samples.config_post_init
+
+import com.coditory.quark.context.annotations.Bean
+
+@Bean
+class Bar {
+}
diff --git a/src/integrationTest/groovy/annotated/samples/config_post_init/Baz.groovy b/src/integrationTest/groovy/annotated/samples/config_post_init/Baz.groovy
@@ -0,0 +1,4 @@
+package annotated.samples.config_post_init
+
+class Baz {
+}
diff --git a/src/integrationTest/groovy/annotated/samples/config_post_init/ConfigPostInit.groovy b/src/integrationTest/groovy/annotated/samples/config_post_init/ConfigPostInit.groovy
@@ -0,0 +1,30 @@
+package annotated.samples.config_post_init
+
+
+import com.coditory.quark.context.annotations.Bean
+import com.coditory.quark.context.annotations.Configuration
+import com.coditory.quark.context.annotations.PostInit
+
+@Configuration
+class ConfigPostInit {
+    static boolean postInitialized = false
+    static Baz baz
+    static Bar bar
+
+    @PostInit
+    void postInit(Baz baz, Bar bar) {
+        ConfigPostInit.postInitialized = true
+        ConfigPostInit.baz = baz
+        ConfigPostInit.bar = bar
+    }
+
+    @Bean
+    Baz baz() {
+        return new Baz()
+    }
+
+    @Bean
+    Foo foo() {
+        return new Foo()
+    }
+}
diff --git a/src/integrationTest/groovy/annotated/samples/config_post_init/Foo.groovy b/src/integrationTest/groovy/annotated/samples/config_post_init/Foo.groovy
@@ -0,0 +1,4 @@
+package annotated.samples.config_post_init
+
+class Foo {
+}
diff --git a/src/main/java/com/coditory/quark/context/BeanHolder.java b/src/main/java/com/coditory/quark/context/BeanHolder.java
@@ -10,6 +10,8 @@
 
 import static com.coditory.quark.context.BeanFinalizer.closeBean;
 import static com.coditory.quark.context.BeanInitializer.initializeBean;
+import static com.coditory.quark.context.BeanPostInitializer.postInitializeBean;
+import static com.coditory.quark.context.ResolutionPath.emptyResolutionPath;
 import static java.util.Objects.requireNonNull;
 import static java.util.stream.Collectors.toSet;
 
@@ -30,6 +32,7 @@ static <T> BeanHolder<T> holder(BeanDescriptor<T> descriptor, BeanCreator<T> cre
     private EventEmitter eventEmitter;
     private T bean;
     private boolean initialized = false;
+    private boolean postInitialized = false;
     private boolean closed = false;
 
     private BeanHolder(BeanDescriptor<T> descriptor, BeanCreator<T> creator, boolean eager) {
@@ -54,6 +57,20 @@ public boolean isInitialized() {
         return initialized;
     }
 
+    boolean isPostInitialized() {
+        return postInitialized;
+    }
+
+    void postInitialize(Context context) {
+        if (postInitialized) return;
+        if (bean == null) {
+            throw new IllegalStateException("Expected bean to exist before post initialization");
+        }
+        ResolutionContext resolutionContext = new ResolutionContext(context, ResolutionPath.of(descriptor));
+        postInitialized = true;
+        postInitializeBean(bean, descriptor, resolutionContext);
+    }
+
     Class<T> getBeanType() {
         return descriptor.type();
     }
@@ -100,9 +117,6 @@ public T get(ResolutionContext context) {
     private void createBean(ResolutionContext context) {
         Timer timer = Timer.start();
         bean = creator.create(context);
-        if (bean == null) {
-            throw new ContextException("Expected non-null bean: " + descriptor);
-        }
         log.debug("Created bean {} in {}", descriptor.toShortString(), timer.measureAndFormat());
         if (!initialized) {
             initializeBean(bean, descriptor, context);
diff --git a/src/main/java/com/coditory/quark/context/BeanPostInitializer.java b/src/main/java/com/coditory/quark/context/BeanPostInitializer.java
@@ -0,0 +1,51 @@
+package com.coditory.quark.context;
+
+import com.coditory.quark.context.annotations.PostInit;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.lang.reflect.Method;
+
+import static com.coditory.quark.context.DependencyResolver.resolveArguments;
+import static com.coditory.quark.context.MethodBasedBeanCreator.simplifyMethodName;
+
+final class BeanPostInitializer {
+    private static final Logger log = LoggerFactory.getLogger(BeanPostInitializer.class);
+
+    private BeanPostInitializer() {
+        throw new UnsupportedOperationException("Do not instantiate utility class");
+    }
+
+    static void postInitializeBean(Object bean, BeanDescriptor<?> descriptor, ResolutionContext context) {
+        if (bean instanceof PostInitializable) {
+            postInitializeBean((PostInitializable) bean, descriptor);
+        }
+        for (Method method : bean.getClass().getDeclaredMethods()) {
+            if (method.isAnnotationPresent(PostInit.class)) {
+                method.setAccessible(true);
+                postInitializeBean(bean, descriptor, method, context);
+            }
+        }
+    }
+
+    private static void postInitializeBean(Object bean, BeanDescriptor<?> descriptor, Method method, ResolutionContext context) {
+        Timer timer = Timer.start();
+        try {
+            Object[] args = resolveArguments(method, context);
+            method.invoke(bean, args);
+        } catch (Exception e) {
+            throw new BeanInitializationException("Could not post initialize bean: " + descriptor.toShortString() + " using method: " + simplifyMethodName(method), e);
+        }
+        log.debug("Post initialized bean {} using method {} in {}", descriptor.toShortString(), simplifyMethodName(method), timer.measureAndFormat());
+    }
+
+    private static void postInitializeBean(PostInitializable bean, BeanDescriptor<?> descriptor) {
+        Timer timer = Timer.start();
+        try {
+            bean.postInit();
+        } catch (Exception e) {
+            throw new BeanInitializationException("Could not post initialize bean: " + descriptor.toShortString(), e);
+        }
+        log.debug("Post initialized bean {} in {}", descriptor.toShortString(), timer.measureAndFormat());
+    }
+}
diff --git a/src/main/java/com/coditory/quark/context/Context.java b/src/main/java/com/coditory/quark/context/Context.java
@@ -39,23 +39,23 @@ public static ContextBuilder builder() {
         return new ContextBuilder();
     }
 
-    static Context create(String name, Set<BeanHolder<?>> beanHolders, Set<BeanHolder<?>> initBeanHolders, Map<String, Object> properties, EventBus eventBus) {
+    static Context create(String name, Set<BeanHolder<?>> beanHolders, Map<String, Object> properties, EventBus eventBus) {
         eventBus.emit(new ContextEvent.ContextPreCreateEvent());
         Timer totalTimer = Timer.start();
         Map<BeanDescriptor<?>, List<BeanHolder<?>>> holders = ContextResolver.resolve(beanHolders, properties);
         Context context = new Context(name, holders, properties, eventBus);
-        context.init(initBeanHolders);
+        context.init();
         log.info("Created context in {}", totalTimer.measureAndFormat());
         eventBus.emit(new ContextEvent.ContextPostCreateEvent());
         return context;
     }
 
-    static Context createEager(String name, Set<BeanHolder<?>> beanHolders, Set<BeanHolder<?>> initBeanHolders, Map<String, Object> properties, EventBus eventBus) {
+    static Context createEager(String name, Set<BeanHolder<?>> beanHolders, Map<String, Object> properties, EventBus eventBus) {
         eventBus.emit(new ContextEvent.ContextPreCreateEvent());
         Timer totalTimer = Timer.start();
         Map<BeanDescriptor<?>, List<BeanHolder<?>>> holders = ContextResolver.resolve(beanHolders, properties);
         Context context = new Context(name, holders, properties, eventBus);
-        context.init(initBeanHolders);
+        context.init();
         try {
             holders.forEach((descriptor, creator) -> {
                 if (descriptor.name() != null) {
@@ -84,7 +84,6 @@ static Context createEager(String name, Set<BeanHolder<?>> beanHolders, Set<Bean
     private final Map<BeanDescriptor<?>, List<BeanHolder<?>>> beanHolders;
     private final Set<BeanHolder<?>> holders;
     private final Set<String> beanNames;
-    private final Map<String, Object> properties;
     private final EventBus eventBus;
     private boolean closed = false;
 
@@ -96,7 +95,6 @@ private Context(String name, Map<BeanDescriptor<?>, List<BeanHolder<?>>> beanHol
         this.name = name;
         this.eventBus = eventBus;
         this.beanHolders = beanHolders;
-        this.properties = Map.copyOf(properties);
         this.beanHoldersByType = groupBeanCreatorsByType(beanHolders);
         this.holders = beanHolders.values().stream()
                 .flatMap(Collection::stream)
@@ -111,12 +109,9 @@ public String getName() {
         return name;
     }
 
-    private void init(Set<BeanHolder<?>> initBeanHolders) {
+    private void init() {
         ResolutionContext context = new ResolutionContext(this, emptyResolutionPath());
-        initBeanHolders.stream()
-                .filter(BeanHolder::isEager)
-                .forEach(holder -> holder.get(context));
-        this.holders.stream()
+        holders.stream()
                 .filter(BeanHolder::isEager)
                 .forEach(holder -> holder.get(context));
     }
@@ -196,14 +191,23 @@ <T> T getOrNull(BeanDescriptor<T> descriptor, ResolutionPath path) {
                     + ". Found " + holders.size() + " beans.");
         }
         BeanHolder<?> holder = unnamedHolders.size() == 1
-                ? unnamedHolders.get(0)
-                : namedHolders.get(0);
+                ? unnamedHolders.getFirst()
+                : namedHolders.getFirst();
+        T bean;
         try {
-            return createBean(holder, descriptor, path);
+            bean = createBean(holder, descriptor, path);
         } catch (Exception e) {
             Throwable cause = simplifyException(e, path);
             throw new ContextException("Could not create bean: " + descriptor.toShortString(), cause);
         }
+        postInitBeans();
+        return bean;
+    }
+
+    private void postInitBeans() {
+        holders.stream()
+                .filter(BeanHolder::isInitialized)
+                .forEach(h -> h.postInitialize(this));
     }
 
     public boolean contains(@NotNull Class<?> type) {
@@ -248,14 +252,17 @@ <T> List<T> getAllOrEmpty(Class<T> type, ResolutionPath path) {
         if (creators == null || creators.isEmpty()) {
             return List.of();
         }
+        List<T> beans;
         try {
-            return creators.stream()
+            beans = creators.stream()
                     .map(creator -> createBean(creator, descriptor, path))
                     .collect(toList());
         } catch (Exception e) {
             Throwable cause = simplifyException(e, path);
             throw new ContextException("Could not create beans: " + descriptor.toShortString(), cause);
         }
+        postInitBeans();
+        return beans;
     }
 
     @SuppressWarnings("unchecked")
diff --git a/src/main/java/com/coditory/quark/context/ContextBuilder.java b/src/main/java/com/coditory/quark/context/ContextBuilder.java
diff --git a/src/main/java/com/coditory/quark/context/PostInitializable.java b/src/main/java/com/coditory/quark/context/PostInitializable.java
diff --git a/src/main/java/com/coditory/quark/context/ResolutionContext.java b/src/main/java/com/coditory/quark/context/ResolutionContext.java
diff --git a/src/main/java/com/coditory/quark/context/ResolutionPath.java b/src/main/java/com/coditory/quark/context/ResolutionPath.java
diff --git a/src/main/java/com/coditory/quark/context/annotations/PostInit.java b/src/main/java/com/coditory/quark/context/annotations/PostInit.java
diff --git a/src/test/groovy/com/coditory/quark/context/events/ConfigurationEventEmissionSpec.groovy b/src/test/groovy/com/coditory/quark/context/events/ConfigurationEventEmissionSpec.groovy

-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
 +package annotated.samples.config_post_init
++
 +class Baz {
 +}