+ added blocking shutdown via AutoCloseable

Author: q3769

pom.xml

@@ -27,7 +27,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>io.github.q3769</groupId>
     <artifactId>conseq4j</artifactId>
-    <version>20230922.0.20230924</version>
+    <version>20230922.20230924.0</version>
     <packaging>jar</packaging>
     <name>conseq4j</name>
     <description>A Java concurrent API to sequence related tasks while concurring unrelated ones</description>

src/main/java/conseq4j/execute/ConseqExecutor.java

@@ -42,7 +42,7 @@
  */
 @ThreadSafe
 @ToString
-public final class ConseqExecutor implements SequentialExecutor {
+public final class ConseqExecutor implements SequentialExecutor, AutoCloseable {
 
     private final Map<Object, CompletableFuture<?>> activeSequentialTasks = new ConcurrentHashMap<>();
     private final ExecutorService adminService = Executors.newSingleThreadExecutor();
@@ -52,7 +52,6 @@ public final class ConseqExecutor implements SequentialExecutor {
      * max parallelism of task execution.
      */
     private final ExecutorService workerExecutorService;
-    private final ConditionFactory await = Awaitility.await().forever();
 
     private ConseqExecutor(ExecutorService workerExecutorService) {
         this.workerExecutorService = workerExecutorService;
@@ -83,6 +82,10 @@ private ConseqExecutor(ExecutorService workerExecutorService) {
         return new ConseqExecutor(workerExecutorService);
     }
 
+    private static ConditionFactory await() {
+        return Awaitility.await().forever();
+    }
+
     private static <T> T call(Callable<T> task) {
         try {
             return task.call();
@@ -156,7 +159,7 @@ public <T> CompletableFuture<T> submit(@NonNull Callable<T> task, @NonNull Objec
     public void shutdown() {
         new Thread(() -> {
             workerExecutorService.shutdown();
-            await.until(activeSequentialTasks::isEmpty);
+            await().until(activeSequentialTasks::isEmpty);
             adminService.shutdown();
         }).start();
     }
@@ -173,6 +176,14 @@ public boolean isTerminated() {
         return neverStartedTasks;
     }
 
+    @Override
+    public void close() {
+        workerExecutorService.shutdown();
+        await().until(activeSequentialTasks::isEmpty);
+        adminService.shutdown();
+        await().until(this::isTerminated);
+    }
+
     int estimateActiveExecutorCount() {
         return activeSequentialTasks.size();
     }

src/main/java/conseq4j/summon/ConseqServiceFactory.java

@@ -26,6 +26,7 @@
 import lombok.NonNull;
 import lombok.ToString;
 import lombok.experimental.Delegate;
+import org.awaitility.Awaitility;
 
 import javax.annotation.Nonnull;
 import javax.annotation.concurrent.ThreadSafe;
@@ -49,7 +50,7 @@
 
 @ThreadSafe
 @ToString
-public final class ConseqServiceFactory implements SequentialExecutorServiceFactory {
+public final class ConseqServiceFactory implements SequentialExecutorServiceFactory, AutoCloseable {
     private final int concurrency;
     private final ConcurrentMap<Object, ShutdownDisabledExecutorService> sequentialExecutors;
 
@@ -110,6 +111,12 @@ public List<Runnable> shutdownNow() {
                 .collect(Collectors.toList());
     }
 
+    @Override
+    public void close() {
+        this.shutdown();
+        Awaitility.await().forever().until(this::isTerminated);
+    }
+
     private int bucketOf(Object sequenceKey) {
         return floorMod(Objects.hash(sequenceKey), this.concurrency);
     }