+ internal clean up

Author: q3769

pom.xml

@@ -27,7 +27,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>io.github.q3769</groupId>
     <artifactId>conseq4j</artifactId>
-    <version>20231102.0.20231104</version>
+    <version>20231102.0.20231105</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/summon/ConseqServiceFactory.java

@@ -31,7 +31,10 @@
 import java.util.Collection;
 import java.util.List;
 import java.util.Objects;
-import java.util.concurrent.*;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
 import java.util.stream.Collectors;
 import javax.annotation.Nonnull;
 import javax.annotation.concurrent.ThreadSafe;
@@ -102,10 +105,8 @@ public ExecutorService getExecutorService(@NonNull Object sequenceKey) {
      */
     @Override
     public void close() {
-        Collection<ShutdownDisabledExecutorService> shutdownDisabledExecutorServices = sequentialExecutors.values();
-        shutdownDisabledExecutorServices.forEach(ShutdownDisabledExecutorService::closeDelegate);
-        awaitForever().until(() -> shutdownDisabledExecutorServices.stream()
-                .allMatch(ShutdownDisabledExecutorService::isTerminated));
+        sequentialExecutors.values().forEach(ShutdownDisabledExecutorService::shutdownDelegate);
+        awaitForever().until(this::isTerminated);
     }
 
     private int bucketOf(Object sequenceKey) {
@@ -169,27 +170,6 @@ public void shutdown() {
             throw new UnsupportedOperationException(SHUTDOWN_UNSUPPORTED_MESSAGE);
         }
 
-        void closeDelegate() {
-            boolean terminated = isTerminated();
-            if (!terminated) {
-                shutdownDelegate();
-                boolean interrupted = false;
-                while (!terminated) {
-                    try {
-                        terminated = awaitTermination(1L, TimeUnit.DAYS);
-                    } catch (InterruptedException e) {
-                        if (!interrupted) {
-                            shutdownDelegateNow();
-                            interrupted = true;
-                        }
-                    }
-                }
-                if (interrupted) {
-                    Thread.currentThread().interrupt();
-                }
-            }
-        }
-
         void shutdownDelegate() {
             this.delegate.shutdown();
         }