tommyskeff/futur4j
1
0
Fork 0
mirror of https://github.com/tommyskeff/futur4j.git synced 2026-01-17 23:16:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

a few more post-complete optimizations

Browse Source
This commit is contained in:
tommyskeff
2025-01-09 20:21:41 +00:00
parent ae15089b3d
commit e4e61c4b6c
2 changed files with 28 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
futur-api/src/main/java/dev/tommyjs/futur/promise/AbstractPromise.java
View File

@@ -86,9 +86,14 @@ public abstract class AbstractPromise<T, FS, FA> implements Promise<T> {
@Override
public @NotNull Promise<T> fork() {
CompletablePromise<T> fork = getFactory().unresolved();
PromiseUtil.propagateCompletion(this, fork);
return fork;
PromiseCompletion<T> completion = getCompletion();
if (completion == null) {
CompletablePromise<T> fork = getFactory().unresolved();
PromiseUtil.propagateCompletion(this, fork);
return fork;
} else {
return this;
}
}
@Override
@@ -446,9 +451,20 @@ public abstract class AbstractPromise<T, FS, FA> implements Promise<T> {
@Override
public @NotNull Promise<T> orDefault(@NotNull ExceptionalFunction<Throwable, T> function) {
CompletablePromise<T> promise = createLinked();
addDirectListener(promise::complete, e -> runCompleter(promise, () -> promise.complete(function.apply(e))));
return promise;
PromiseCompletion<T> completion = getCompletion();
if (completion == null) {
CompletablePromise<T> promise = createLinked();
addDirectListener(promise::complete, e -> runCompleter(promise, () -> promise.complete(function.apply(e))));
return promise;
} else if (completion.isSuccess()) {
return getFactory().resolve(completion.getResult());
} else {
try {
return getFactory().resolve(function.apply(completion.getException()));
} catch (Exception e) {
return getFactory().error(e);
}
}
}
@Override
@@ -457,7 +473,7 @@ public abstract class AbstractPromise<T, FS, FA> implements Promise<T> {
addDirectListener(future::complete, future::completeExceptionally);
future.whenComplete((_, e) -> {
if (e instanceof CancellationException) {
this.cancel();
cancel();
}
});

5
futur-api/src/main/java/dev/tommyjs/futur/promise/CompletedPromise.java
View File

@@ -55,6 +55,11 @@ public abstract class CompletedPromise<T, FS, FA> extends AbstractPromise<T, FS,
return null;
}
@Override
public @NotNull Promise<T> fork() {
return this;
}
@Override
public @NotNull PromiseCompletion<T> getCompletion() {
return completion;