- * CAUTION:
- * if run on old Java 8, just return a Cffu with
- * a *normal* underlying CompletableFuture which is NOT with a *minimal* CompletionStage.
- *
* demo code about re-config methods of Cffu: * *
{@code cffu2 = cffu
- * .resetCffuFactory(cffuFactory2) // reset to use config from cffuFactory2
- * .minimalCompletionStage(); // restrict to methods of CompletionStage
+ * .resetDefaultExecutor(executor2) // reset to use executor2
+ * .minimalCompletionStage(); // restrict to methods of CompletionStage
* }
- *
- * @see #resetCffuFactory(CffuFactory)
+ *
+ * CAUTION:
+ * demo code about re-config methods of Cffu:
+ *
+ *
* CAUTION:
* CAUTION:
* CAUTION:
* CAUTION:
* CAUTION:
+ * if run on old Java 8(not support *minimal* CompletionStage), just return a Cffu with
+ * a *normal* underlying CompletableFuture which is NOT with a *minimal* CompletionStage.
*/
@Contract(pure = true)
public CompletionStage{@code cffu2 = cffu
+ * .resetDefaultExecutor(executor2) // reset to use executor2
+ * .minimalCompletionStage(); // restrict to methods of CompletionStage
+ * }
+ *
+ * @see #minimalCompletionStage()
*/
@Contract(pure = true)
public Cffu
- * if run on old Java 8, just return a Cffu with
+ * if run on old Java 8(not support *minimal* CompletionStage), just return a Cffu with
* a *normal* underlying CompletableFuture which is NOT with a *minimal* CompletionStage.
*
* @param value the value
@@ -1524,7 +1524,7 @@ public
- * if run on old Java 8, just return a Cffu with
+ * if run on old Java 8(not support *minimal* CompletionStage), just return a Cffu with
* a *normal* underlying CompletableFuture which is NOT with a *minimal* CompletionStage.
*
* @param ex the exception
diff --git a/cffu-core/src/main/java/io/foldright/cffu/CffuFactoryBuilder.java b/cffu-core/src/main/java/io/foldright/cffu/CffuFactoryBuilder.java
index f3f394d7..9eddddb6 100644
--- a/cffu-core/src/main/java/io/foldright/cffu/CffuFactoryBuilder.java
+++ b/cffu-core/src/main/java/io/foldright/cffu/CffuFactoryBuilder.java
@@ -24,6 +24,10 @@
*/
@ThreadSafe
public final class CffuFactoryBuilder {
+ ////////////////////////////////////////////////////////////////////////////////
+ // region# Internal constructor and fields
+ ////////////////////////////////////////////////////////////////////////////////
+
private final Executor defaultExecutor;
private volatile boolean forbidObtrudeMethods = false;
@@ -32,44 +36,9 @@ public final class CffuFactoryBuilder {
this.defaultExecutor = makeExecutor(defaultExecutor);
}
- private static Executor makeExecutor(Executor executor) {
- // check CffuMadeExecutor interface to avoid re-wrapping.
- if (executor instanceof CffuMadeExecutor) return executor;
-
- Executor wrapByProviders = wrapExecutorByProviders(CompletableFutureUtils.screenExecutor(executor));
- return CffuMadeExecutor.wrapMadeInterface(wrapByProviders);
- }
-
- /**
- * An interface for avoiding re-wrapping.
- */
- @VisibleForTesting
- interface CffuMadeExecutor extends Executor {
- static CffuMadeExecutor wrapMadeInterface(Executor executor) {
- return new CffuMadeExecutor() {
- @Override
- public Executor unwrap() {
- return executor;
- }
-
- @Override
- public void execute(Runnable command) {
- executor.execute(command);
- }
-
- @Override
- public String toString() {
- return "CffuMadeExecutor of executor(" + executor + ")";
- }
- };
- }
-
- @VisibleForTesting
- Executor unwrap();
- }
-
+ // endregion
////////////////////////////////////////////////////////////////////////////////
- // Builder Methods
+ // region# Builder Methods
////////////////////////////////////////////////////////////////////////////////
/**
@@ -94,11 +63,52 @@ public CffuFactory build() {
return new CffuFactory(defaultExecutor, forbidObtrudeMethods);
}
+ // endregion
+ ////////////////////////////////////////////////////////////////////////////////
+ // region# Internal helper methods and fields
+ ////////////////////////////////////////////////////////////////////////////////
+
@Contract(pure = true)
static CffuFactory resetDefaultExecutor(CffuFactory fac, Executor defaultExecutor) {
return new CffuFactory(makeExecutor(defaultExecutor), fac.forbidObtrudeMethods());
}
+ private static Executor makeExecutor(Executor executor) {
+ // check CffuMadeExecutor interface to avoid re-wrapping.
+ if (executor instanceof CffuMadeExecutor) return executor;
+
+ Executor wrapByProviders = wrapExecutorByProviders(CompletableFutureUtils.screenExecutor(executor));
+ return wrapMadeInterface(wrapByProviders);
+ }
+
+ private static CffuMadeExecutor wrapMadeInterface(Executor executor) {
+ return new CffuMadeExecutor() {
+ @Override
+ public void execute(Runnable command) {
+ executor.execute(command);
+ }
+
+ @Override
+ public Executor unwrap() {
+ return executor;
+ }
+
+ @Override
+ public String toString() {
+ return "CffuMadeExecutor of executor(" + executor + ")";
+ }
+ };
+ }
+
+ /**
+ * An interface for avoiding re-wrapping.
+ */
+ @VisibleForTesting
+ interface CffuMadeExecutor extends Executor {
+ @VisibleForTesting
+ Executor unwrap();
+ }
+
private static Executor wrapExecutorByProviders(Executor executor) {
for (ExecutorWrapperProvider provider : EXECUTOR_WRAPPER_PROVIDERS) {
Supplier
- * if run on old Java 8, just return a *normal* CompletableFuture which is NOT with a *minimal* CompletionStage.
+ * if run on old Java 8(not support *minimal* CompletionStage),
+ * just return a *normal* CompletableFuture which is NOT with a *minimal* CompletionStage.
*
* @param value the value
* @param
- * if run on old Java 8, just return a *normal* CompletableFuture which is NOT with a *minimal* CompletionStage.
+ * if run on old Java 8(not support *minimal* CompletionStage),
+ * just return a *normal* CompletableFuture which is NOT with a *minimal* CompletionStage.
*
* @param ex the exception
* @param
- * if run on old Java 8, just return a *normal* CompletableFuture which is NOT with a *minimal* CompletionStage.
+ * if run on old Java 8(not support *minimal* CompletionStage),
+ * just return a *normal* CompletableFuture which is NOT with a *minimal* CompletionStage.
*
* @return the new CompletionStage
* @see CompletableFuture#minimalCompletionStage()
diff --git a/cffu-core/src/test/archunit/io/foldright/archunit/CffuArchTest.kt b/cffu-core/src/test/archunit/io/foldright/archunit/CffuArchTest.kt
index d53f9bf8..9871e8c9 100644
--- a/cffu-core/src/test/archunit/io/foldright/archunit/CffuArchTest.kt
+++ b/cffu-core/src/test/archunit/io/foldright/archunit/CffuArchTest.kt
@@ -21,16 +21,17 @@ import io.foldright.cffu.CffuFactoryBuilder
internal object CffuArchTest {
@ArchTest
private val constructorOfCffuFactory: ArchRule = run {
- val description = ": Accessing CffuFactory constructor is only allowed by class CffuFactoryBuilder"
+ val description = "only contain the constructors that only accessed by class CffuFactoryBuilder," +
+ " aka. accessing CffuFactory constructor is only allowed by class CffuFactoryBuilder"
val condition = object : ArchCondition