Merge branch 'avaje:master' into andponlin-error-for-missing-dep

Author: andponlin

inject-events/pom.xml

@@ -12,7 +12,7 @@
     <dependency>
       <groupId>io.avaje</groupId>
       <artifactId>avaje-inject</artifactId>
-      <version>10.0</version>
+      <version>12.0</version>
       <scope>provided</scope>
     </dependency>
     <dependency>

inject-events/src/main/java/io/avaje/inject/events/spi/DObserverManager.java renamed to inject-events/src/main/java/io/avaje/inject/events/DObserverManager.java

@@ -1,17 +1,20 @@
-package io.avaje.inject.events.spi;
+package io.avaje.inject.events;
 
 import java.lang.reflect.Type;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-
-import io.avaje.inject.events.Observer;
-import io.avaje.inject.events.ObserverManager;
+import java.util.concurrent.Executor;
 
 final class DObserverManager implements ObserverManager {
 
- private final Map<Type, List<Observer<?>>> observeMap = new HashMap<>();
+  private final Map<Type, List<Observer<?>>> observeMap = new HashMap<>();
+  private final Executor executor;
+
+  DObserverManager(Executor executor) {
+    this.executor = executor;
+  }
 
   @Override
   public <T> void registerObserver(Type type, Observer<T> observer) {
@@ -23,4 +26,9 @@ public <T> void registerObserver(Type type, Observer<T> observer) {
   public List<Observer<?>> observersByType(Type eventType) {
     return observeMap.computeIfAbsent(eventType, k -> new ArrayList<>());
   }
+
+  @Override
+  public Executor asyncExecutor() {
+    return executor;
+  }
 }

inject-events/src/main/java/io/avaje/inject/events/Event.java

@@ -15,20 +15,18 @@
  * injected:
  *
  * <pre>{@code
- *
- *   @Inject
- *   Event<LoggedInEvent> loggedInEvent;
+ * @Inject
+ * Event<LoggedInEvent> loggedInEvent;
  *
  * }</pre>
  *
  * <p>The <code>fire()</code> method accepts an event object:
  *
  * <pre>{@code
- *
- *   public void login() {
- *     ...
- *     loggedInEvent.fire(new LoggedInEvent(user));
- *   }
+ * public void login() {
+ *   ...
+ *   loggedInEvent.fire(new LoggedInEvent(user));
+ * }
  *
  * }</pre>
  *
@@ -37,7 +35,7 @@
 public abstract class Event<T> {
 
   private static final Comparator<Observer<?>> PRIORITY = Comparator.comparing(Observer::priority);
-
+  protected final ObserverManager manager;
   protected final List<Observer<T>> observers;
   protected final String defaultQualifier;
 
@@ -46,6 +44,7 @@ protected Event(ObserverManager manager, Type type) {
   }
 
   protected Event(ObserverManager manager, Type type, String qualifier) {
+    this.manager = manager;
     this.observers = manager.observersByType(type);
     this.defaultQualifier = qualifier;
   }
@@ -72,7 +71,6 @@ public void fire(T event, String qualifier) {
    */
   public CompletionStage<T> fireAsync(T event, String qualifier) {
     var exceptionHandler = new CollectingExceptionHandler();
-
     return observers.stream()
       .sorted(PRIORITY)
       .reduce(CompletableFuture.<Void>completedFuture(null), (future, observer) ->
@@ -82,7 +80,7 @@ public CompletionStage<T> fireAsync(T event, String qualifier) {
             } catch (Exception e) {
               exceptionHandler.handle(e);
             }
-          }),
+          }, manager.asyncExecutor()),
         (future1, future2) -> future1)
       .thenApply(v -> {
         handleExceptions(exceptionHandler);

inject-events/src/main/java/io/avaje/inject/events/ObserverManager.java

@@ -2,29 +2,59 @@
 
 import java.lang.reflect.Type;
 import java.util.List;
+import java.util.concurrent.Executor;
 
 /**
  * Manages all {@link Observer} instances in the BeanScope.
- * <p>
- * A default implementation is provided by avaje-inject.
+ *
+ * <p>A default implementation is provided by avaje-inject.
  */
 public interface ObserverManager {
 
+  /**
+   * Return a builder for the default ObserverManager implementation.
+   */
+  static Builder builder() {
+    return new ObserverManagerBuilder();
+  }
+
   /**
    * Registers the given Consumer as an observer.
    *
-   * @param <T>       the type of the event
+   * @param <T> the type of the event
    * @param eventType the type of the event ()
-   * @param observer  the consumer to execute when a matching event is found
+   * @param observer the consumer to execute when a matching event is found
    */
   <T> void registerObserver(Type eventType, Observer<T> observer);
 
   /**
    * Retrieves a list of all Observers registered by the given type
    *
-   * @param <T>       the Type of the Event
+   * @param <T> the Type of the Event
    * @param eventType the type of the event
    * @return all observers registered
    */
   <T> List<Observer<T>> observersByType(Type eventType);
+
+  /**
+   * The Executor used for sending async events
+   */
+  Executor asyncExecutor();
+
+  /**
+   * Builder for the default ObserverManager implementation.
+   */
+  interface Builder {
+
+    /**
+     * Specify an Executor to run asynchronous events. Defaults to using
+     * the Fork join common pool when not specified.
+     */
+    Builder asyncExecutor(Executor executor);
+
+    /**
+     * Build the ObserverManager.
+     */
+    ObserverManager build();
+  }
 }

inject-events/src/main/java/io/avaje/inject/events/ObserverManagerBuilder.java

@@ -0,0 +1,21 @@
+package io.avaje.inject.events;
+
+import java.util.Objects;
+import java.util.concurrent.Executor;
+import java.util.concurrent.ForkJoinPool;
+
+final class ObserverManagerBuilder implements ObserverManager.Builder {
+
+  private Executor executor = ForkJoinPool.commonPool();
+
+  @Override
+  public ObserverManager.Builder asyncExecutor(Executor executor) {
+    this.executor = Objects.requireNonNull(executor);
+    return this;
+  }
+
+  @Override
+  public ObserverManager build() {
+    return new DObserverManager(executor);
+  }
+}

inject-events/src/main/java/io/avaje/inject/events/spi/ObserverManagerPlugin.java

@@ -1,18 +1,19 @@
 package io.avaje.inject.events.spi;
 
 import io.avaje.inject.BeanScopeBuilder;
+import io.avaje.inject.events.ObserverManager;
 import io.avaje.inject.spi.InjectPlugin;
 
 /** Plugin for avaje inject that provides a default ObserverManager instance. */
 public final class ObserverManagerPlugin implements InjectPlugin {
 
   @Override
   public Class<?>[] provides() {
-    return new Class<?>[] {DObserverManager.class};
+    return new Class<?>[] {ObserverManager.class};
   }
 
   @Override
   public void apply(BeanScopeBuilder builder) {
-    builder.provideDefault(null, DObserverManager.class, DObserverManager::new);
+    builder.provideDefault(null, ObserverManager.class, () -> ObserverManager.builder().build());
   }
 }

inject-events/src/test/java/io/avaje/inject/events/spi/DObserverManagerTest.java

@@ -6,20 +6,20 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.CompletionException;
-import java.util.concurrent.ExecutionException;
+import java.util.concurrent.Executors;
 import java.util.concurrent.atomic.AtomicBoolean;
 
+import io.avaje.inject.events.ObserverManager;
 import org.junit.jupiter.api.Test;
 
 import io.avaje.inject.events.Observer;
-import io.avaje.inject.events.ObserverManager;
 import io.avaje.inject.events.events.TestEvent;
 import io.avaje.inject.events.events.TestGenericEvent;
 import io.avaje.inject.spi.GenericType;
 
 class DObserverManagerTest {
 
-  ObserverManager manager = new DObserverManager();
+  ObserverManager manager = ObserverManager.builder().build();
 
   @Test
   void test() {
@@ -36,7 +36,7 @@ void test() {
   }
 
   @Test
-  void testPriority() throws InterruptedException, ExecutionException {
+  void testPriority() {
     var l = new ArrayList<String>();
 
     manager.<String>registerObserver(String.class, new Observer<>(0, false, s -> l.add("1"), ""));
@@ -48,42 +48,57 @@ void testPriority() throws InterruptedException, ExecutionException {
   }
 
   @Test
-  void testAsync() throws InterruptedException, ExecutionException {
+  void testAsync() {
     AtomicBoolean aBoolean = new AtomicBoolean();
 
     manager.<String>registerObserver(
         String.class, new Observer<>(0, true, s -> aBoolean.set(true), ""));
 
-    new TestEvent(manager).fireAsync("str").toCompletableFuture().get();
+    new TestEvent(manager).fireAsync("str").toCompletableFuture().join();
     assertThat(aBoolean.get()).isTrue();
   }
 
   @Test
-  void testAsyncPriority() throws InterruptedException, ExecutionException {
-    var l = new ArrayList<String>();
+  void testAsyncExecutor() {
+    AtomicBoolean aBoolean = new AtomicBoolean();
+    var exec = Executors.newSingleThreadScheduledExecutor();
+    var manager = ObserverManager.builder()
+      .asyncExecutor(exec)
+      .build();
+
+    assertThat(exec).isSameAs(manager.asyncExecutor());
+    manager.<String>registerObserver(
+        String.class, new Observer<>(0, true, s -> aBoolean.set(true), ""));
+
+    new TestEvent(manager).fireAsync("str").toCompletableFuture().join();
+    assertThat(aBoolean.get()).isTrue();
+  }
 
+  @Test
+  void testAsyncPriority() {
+    var l = new ArrayList<String>();
     manager.<String>registerObserver(String.class, new Observer<>(0, true, s -> l.add("1"), ""));
     manager.<String>registerObserver(String.class, new Observer<>(5, true, s -> l.add("5"), ""));
     manager.<String>registerObserver(String.class, new Observer<>(2, true, s -> l.add("2"), ""));
 
-    new TestEvent(manager).fireAsync("str").toCompletableFuture().get();
+    new TestEvent(manager).fireAsync("str").toCompletableFuture().join();
     assertThat(l).containsExactly("1", "2", "5");
   }
 
   @Test
-  void testGenericAsync() throws InterruptedException, ExecutionException {
+  void testGenericAsync() {
     AtomicBoolean aBoolean = new AtomicBoolean();
 
     manager.<List<String>>registerObserver(
         new GenericType<List<String>>() {}.type(),
         new Observer<>(0, true, s -> aBoolean.set(true), ""));
 
-    new TestGenericEvent(manager).fireAsync(List.of("str")).toCompletableFuture().get();
+    new TestGenericEvent(manager).fireAsync(List.of("str")).toCompletableFuture().join();
     assertThat(aBoolean.get()).isTrue();
   }
 
   @Test
-  void testError() throws InterruptedException {
+  void testError() {
     final var testEvent = new TestEvent(manager);
     testEvent.fire("sus");
 
@@ -102,7 +117,7 @@ void testError() throws InterruptedException {
   }
 
   @Test
-  void testAsyncError() throws InterruptedException, ExecutionException {
+  void testAsyncError() {
     final var testEvent = new TestEvent(manager);
 
     manager.<String>registerObserver(