Merge pull request #334 from SentryMan/hooks

Now can add scope hooks on the BeanScope builder

Author: rbygrave

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

@@ -199,6 +199,21 @@ default <D> BeanScopeBuilder provideDefault(Type type, Supplier<D> provider) {
    */
   <D> BeanScopeBuilder provideDefault(@Nullable String name, Type type, Supplier<D> provider);
 
+  /**
+   * Adds hooks that will execute after this scope is built.
+   *
+   * @param runnables the PostConstruct hooks to add to the bean scope
+   */
+  BeanScopeBuilder addPostConstructHooks(Runnable... runnables);
+
+  /**
+   * Adds hooks that will execute before this scope is destroyed.
+   *
+   * @param closables the PreDestroy hooks to add to the bean scope
+   */
+  BeanScopeBuilder addPreDestroyHooks(AutoCloseable... closables);
+
+
   /**
    * Set the ClassLoader to use when loading modules.
    *

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

@@ -26,6 +26,8 @@ final class DBeanScopeBuilder implements BeanScopeBuilder.ForTesting {
   @SuppressWarnings("rawtypes")
   private final List<EnrichBean> enrichBeans = new ArrayList<>();
   private final Set<Module> includeModules = new LinkedHashSet<>();
+  private final List<Runnable> postConstructList = new ArrayList<>();
+  private final List<AutoCloseable> preDestroyList = new ArrayList<>();
   private BeanScope parent;
   private boolean parentOverride = true;
   private boolean shutdownHook;
@@ -106,6 +108,18 @@ public <D> BeanScopeBuilder provideDefault(String name, Type type, Supplier<D> s
     return this;
   }
 
+  @Override
+  public BeanScopeBuilder addPostConstructHooks(Runnable... postConstructRunnable) {
+    Collections.addAll(this.postConstructList, postConstructRunnable);
+    return this;
+  }
+
+  @Override
+  public BeanScopeBuilder addPreDestroyHooks(AutoCloseable... closables) {
+    Collections.addAll(this.preDestroyList, closables);
+    return this;
+  }
+
   @Override
   public BeanScopeBuilder classLoader(ClassLoader classLoader) {
     this.classLoader = classLoader;
@@ -130,6 +144,7 @@ public BeanScopeBuilder.ForTesting mock(Class<?> type) {
     return mock(type, null, null);
   }
 
+  @Override
   public BeanScopeBuilder.ForTesting mock(Class<?> type, String name) {
     return mock(type, name, null);
   }
@@ -149,7 +164,8 @@ public BeanScopeBuilder.ForTesting spy(Class<?> type) {
     return spy(type, null, null);
   }
 
-  public BeanScopeBuilder.ForTesting spy(Class<?> type, String name) {
+  @Override
+public BeanScopeBuilder.ForTesting spy(Class<?> type, String name) {
     return spy(type, name, null);
   }
 
@@ -206,6 +222,9 @@ public BeanScope build() {
     for (Module factory : factoryOrder.factories()) {
       factory.build(builder);
     }
+
+    postConstructList.forEach(builder::addPostConstruct);
+    preDestroyList.forEach(builder::addPreDestroy);
     return builder.build(shutdownHook, start);
   }