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

release 2.1.0

Browse Source
This commit is contained in:
tommyskeff
2024-03-12 07:27:51 +00:00
parent 49b701c736
commit 795ce04eb4
15 changed files with 143 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
futur-api/build.gradle.kts
View File

@@ -6,7 +6,7 @@ plugins {
}
group = "dev.tommyjs"
version = "2.0.0"
version = "2.1.0"
repositories {
mavenCentral()

33
futur-api/src/main/java/dev/tommyjs/futur/executor/DualPoolExecutor.java Normal file
View File

@@ -0,0 +1,33 @@
package dev.tommyjs.futur.executor;
import org.jetbrains.annotations.NotNull;
import java.util.concurrent.Executors;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.TimeUnit;
public class DualPoolExecutor implements PromiseExecutor {
private final @NotNull ScheduledExecutorService syncSvc;
private final @NotNull ScheduledExecutorService asyncSvc;
public DualPoolExecutor(@NotNull ScheduledExecutorService syncSvc, @NotNull ScheduledExecutorService asyncSvc) {
this.syncSvc = syncSvc;
this.asyncSvc = asyncSvc;
}
@Override
public void runSync(@NotNull Runnable task, long delay, @NotNull TimeUnit unit) {
syncSvc.schedule(task, delay, unit);
}
@Override
public void runAsync(@NotNull Runnable task, long delay, @NotNull TimeUnit unit) {
asyncSvc.schedule(task, delay, unit);
}
public static @NotNull DualPoolExecutor create(int asyncPoolSize) {
return new DualPoolExecutor(Executors.newSingleThreadScheduledExecutor(), Executors.newScheduledThreadPool(asyncPoolSize));
}
}

13
futur-api/src/main/java/dev/tommyjs/futur/executor/PromiseExecutor.java Normal file
View File

@@ -0,0 +1,13 @@
package dev.tommyjs.futur.executor;
import org.jetbrains.annotations.NotNull;
import java.util.concurrent.TimeUnit;
public interface PromiseExecutor {
void runSync(@NotNull Runnable task, long delay, @NotNull TimeUnit unit);
void runAsync(@NotNull Runnable task, long delay, @NotNull TimeUnit unit);
}

31
futur-api/src/main/java/dev/tommyjs/futur/executor/SinglePoolExecutor.java Normal file
View File

@@ -0,0 +1,31 @@
package dev.tommyjs.futur.executor;
import org.jetbrains.annotations.NotNull;
import java.util.concurrent.Executors;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.TimeUnit;
public class SinglePoolExecutor implements PromiseExecutor {
private final @NotNull ScheduledExecutorService service;
public SinglePoolExecutor(@NotNull ScheduledExecutorService service) {
this.service = service;
}
@Override
public void runSync(@NotNull Runnable task, long delay, @NotNull TimeUnit unit) {
service.schedule(task, delay, unit);
}
@Override
public void runAsync(@NotNull Runnable task, long delay, @NotNull TimeUnit unit) {
service.schedule(task, delay, unit);
}
public static @NotNull SinglePoolExecutor create(int threadPoolSize) {
return new SinglePoolExecutor(Executors.newScheduledThreadPool(threadPoolSize));
}
}

9
futur-api/src/main/java/dev/tommyjs/futur/impl/SimplePromise.java
View File

@@ -1,25 +1,24 @@
package dev.tommyjs.futur.impl;
import dev.tommyjs.futur.executor.PromiseExecutor;
import dev.tommyjs.futur.promise.AbstractPromise;
import dev.tommyjs.futur.promise.PromiseFactory;
import org.slf4j.Logger;
import java.util.concurrent.ScheduledExecutorService;
public class SimplePromise<T> extends AbstractPromise<T> {
private final ScheduledExecutorService executor;
private final PromiseExecutor executor;
private final Logger logger;
private final PromiseFactory factory;
public SimplePromise(ScheduledExecutorService executor, Logger logger, PromiseFactory factory) {
public SimplePromise(PromiseExecutor executor, Logger logger, PromiseFactory factory) {
this.executor = executor;
this.logger = logger;
this.factory = factory;
}
@Override
protected ScheduledExecutorService getExecutor() {
protected PromiseExecutor getExecutor() {
return executor;
}

7
futur-api/src/main/java/dev/tommyjs/futur/impl/SimplePromiseFactory.java
View File

@@ -1,19 +1,18 @@
package dev.tommyjs.futur.impl;
import dev.tommyjs.futur.executor.PromiseExecutor;
import dev.tommyjs.futur.promise.AbstractPromise;
import dev.tommyjs.futur.promise.Promise;
import dev.tommyjs.futur.promise.PromiseFactory;
import org.jetbrains.annotations.NotNull;
import org.slf4j.Logger;
import java.util.concurrent.ScheduledExecutorService;
public class SimplePromiseFactory implements PromiseFactory {
private final ScheduledExecutorService executor;
private final PromiseExecutor executor;
private final Logger logger;
public SimplePromiseFactory(ScheduledExecutorService executor, Logger logger) {
public SimplePromiseFactory(PromiseExecutor executor, Logger logger) {
this.executor = executor;
this.logger = logger;
}

9
futur-api/src/main/java/dev/tommyjs/futur/promise/StaticPromise.java → futur-api/src/main/java/dev/tommyjs/futur/impl/StaticPromise.java
View File

@@ -1,13 +1,14 @@
package dev.tommyjs.futur.promise;
package dev.tommyjs.futur.impl;
import dev.tommyjs.futur.executor.PromiseExecutor;
import dev.tommyjs.futur.promise.AbstractPromise;
import dev.tommyjs.futur.promise.PromiseFactory;
import org.slf4j.Logger;
import java.util.concurrent.ScheduledExecutorService;
public class StaticPromise<T> extends AbstractPromise<T> {
@Override
protected ScheduledExecutorService getExecutor() {
protected PromiseExecutor getExecutor() {
return StaticPromiseFactory.EXECUTOR;
}

14
futur-api/src/main/java/dev/tommyjs/futur/promise/StaticPromiseFactory.java → futur-api/src/main/java/dev/tommyjs/futur/impl/StaticPromiseFactory.java
View File

@@ -1,21 +1,25 @@
package dev.tommyjs.futur.promise;
package dev.tommyjs.futur.impl;
import dev.tommyjs.futur.executor.PromiseExecutor;
import dev.tommyjs.futur.executor.SinglePoolExecutor;
import dev.tommyjs.futur.promise.AbstractPromise;
import dev.tommyjs.futur.promise.Promise;
import dev.tommyjs.futur.promise.PromiseFactory;
import org.jetbrains.annotations.NotNull;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.util.concurrent.Executors;
import java.util.concurrent.ScheduledExecutorService;
public class StaticPromiseFactory implements PromiseFactory {
public static final @NotNull PromiseFactory INSTANCE;
public static final @NotNull ScheduledExecutorService EXECUTOR;
public static final @NotNull PromiseExecutor EXECUTOR;
public static final @NotNull Logger LOGGER;
static {
INSTANCE = new StaticPromiseFactory();
EXECUTOR = Executors.newSingleThreadScheduledExecutor();
EXECUTOR = SinglePoolExecutor.create(1);
LOGGER = LoggerFactory.getLogger(StaticPromiseFactory.class);
}
@@ -25,7 +29,7 @@ public class StaticPromiseFactory implements PromiseFactory {
@Override
public @NotNull <T> Promise<T> resolve(T value) {
AbstractPromise<T> promise = new StaticPromise<>();
promise.setCompletion(new PromiseCompletion<>(value));
promise.complete(value);
return promise;
}

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

@@ -1,5 +1,6 @@
package dev.tommyjs.futur.promise;
import dev.tommyjs.futur.executor.PromiseExecutor;
import dev.tommyjs.futur.function.ExceptionalConsumer;
import dev.tommyjs.futur.function.ExceptionalFunction;
import dev.tommyjs.futur.function.ExceptionalRunnable;
@@ -10,7 +11,6 @@ import org.slf4j.Logger;
import java.util.Collection;
import java.util.concurrent.ConcurrentLinkedQueue;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
import java.util.concurrent.atomic.AtomicReference;
@@ -18,15 +18,14 @@ import java.util.concurrent.atomic.AtomicReference;
public abstract class AbstractPromise<T> implements Promise<T> {
private final Collection<PromiseListener<T>> listeners;
private @Nullable PromiseCompletion<T> completion;
private final AtomicReference<PromiseCompletion<T>> completion;
public AbstractPromise() {
this.listeners = new ConcurrentLinkedQueue<>();
this.completion = null;
this.completion = new AtomicReference<>();
}
protected abstract ScheduledExecutorService getExecutor();
protected abstract PromiseExecutor getExecutor();
protected abstract Logger getLogger();
@@ -97,7 +96,7 @@ public abstract class AbstractPromise<T> implements Promise<T> {
public <V> @NotNull Promise<V> thenSupplyDelayedSync(@NotNull ExceptionalSupplier<V> task, long delay, @NotNull TimeUnit unit) {
return thenApplyDelayedSync(result -> task.get(), delay, unit);
}
@Override
public <V> @NotNull Promise<V> thenApplySync(@NotNull ExceptionalFunction<T, V> task) {
Promise<V> promise = getFactory().unresolved();
@@ -109,7 +108,7 @@ public abstract class AbstractPromise<T> implements Promise<T> {
}
Runnable runnable = createRunnable(ctx, promise, task);
getExecutor().submit(runnable);
getExecutor().runSync(runnable, 0L, TimeUnit.MILLISECONDS);
});
return promise;
@@ -126,7 +125,7 @@ public abstract class AbstractPromise<T> implements Promise<T> {
}
Runnable runnable = createRunnable(ctx, promise, task);
getExecutor().schedule(runnable, delay, unit);
getExecutor().runSync(runnable, delay, unit);
});
return promise;
@@ -216,7 +215,7 @@ public abstract class AbstractPromise<T> implements Promise<T> {
}
Runnable runnable = createRunnable(ctx, promise, task);
getExecutor().submit(runnable);
getExecutor().runAsync(runnable, 0L, TimeUnit.MILLISECONDS);
});
return promise;
@@ -227,7 +226,7 @@ public abstract class AbstractPromise<T> implements Promise<T> {
Promise<V> promise = getFactory().unresolved();
addListener(ctx -> {
Runnable runnable = createRunnable(ctx, promise, task);
getExecutor().schedule(runnable, delay, unit);
getExecutor().runAsync(runnable, delay, unit);
});
return promise;
@@ -285,14 +284,14 @@ public abstract class AbstractPromise<T> implements Promise<T> {
@Override
public @NotNull Promise<T> addListener(@NotNull PromiseListener<T> listener) {
if (isCompleted()) {
getExecutor().submit(() -> {
getExecutor().runAsync(() -> {
try {
//noinspection ConstantConditions
listener.handle(getCompletion());
} catch (Exception e) {
getLogger().error("Exception caught in promise listener", e);
}
});
}, 0L, TimeUnit.MILLISECONDS);
} else {
getListeners().add(listener);
}
@@ -302,7 +301,7 @@ public abstract class AbstractPromise<T> implements Promise<T> {
@Override
public @NotNull Promise<T> timeout(long time, @NotNull TimeUnit unit) {
getExecutor().schedule(() -> {
getExecutor().runAsync(() -> {
if (!isCompleted()) {
completeExceptionally(new TimeoutException("Promise timed out after " + time + " " + unit));
}
@@ -317,10 +316,23 @@ public abstract class AbstractPromise<T> implements Promise<T> {
}
protected void handleCompletion(@NotNull PromiseCompletion<T> ctx) {
if (this.isCompleted()) return;
setCompletion(ctx);
AtomicReference<Boolean> success = new AtomicReference<>();
completion.getAndUpdate(c -> {
if (c == null) {
return null;
} else {
success.set(true);
return ctx;
}
});
getExecutor().submit(() -> {
if (success.get()) {
handleCompletion0(ctx);
}
}
protected void handleCompletion0(@NotNull PromiseCompletion<T> ctx) {
getExecutor().runAsync(() -> {
for (PromiseListener<T> listener : getListeners()) {
if (!ctx.isActive()) return;
@@ -331,7 +343,7 @@ public abstract class AbstractPromise<T> implements Promise<T> {
getLogger().error("Exception caught in promise listener", e);
}
}
});
}, 0L, TimeUnit.MILLISECONDS);
}
@Override
@@ -346,20 +358,16 @@ public abstract class AbstractPromise<T> implements Promise<T> {
@Override
public boolean isCompleted() {
return getCompletion() != null;
return completion.get() != null;
}
@Override
public @Nullable PromiseCompletion<T> getCompletion() {
return completion.get();
}
protected Collection<PromiseListener<T>> getListeners() {
return listeners;
}
@Override
public @Nullable PromiseCompletion<T> getCompletion() {
return completion;
}
protected void setCompletion(@NotNull PromiseCompletion<T> completion) {
this.completion = completion;
}
}

9
futur-api/src/main/java/dev/tommyjs/futur/promise/PromiseFactory.java
View File

@@ -1,12 +1,13 @@
package dev.tommyjs.futur.promise;
import dev.tommyjs.futur.executor.PromiseExecutor;
import dev.tommyjs.futur.executor.SinglePoolExecutor;
import dev.tommyjs.futur.impl.SimplePromiseFactory;
import org.jetbrains.annotations.NotNull;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.util.concurrent.Executors;
import java.util.concurrent.ScheduledExecutorService;
public interface PromiseFactory {
@@ -16,16 +17,16 @@ public interface PromiseFactory {
<T> @NotNull Promise<T> error(Throwable error);
static PromiseFactory create(ScheduledExecutorService executor, Logger logger) {
static PromiseFactory create(PromiseExecutor executor, Logger logger) {
return new SimplePromiseFactory(executor, logger);
}
static PromiseFactory create(ScheduledExecutorService executor) {
static PromiseFactory create(PromiseExecutor executor) {
return create(executor, LoggerFactory.getLogger(SimplePromiseFactory.class));
}
static PromiseFactory create(int threadPoolSize) {
return create(Executors.newScheduledThreadPool(threadPoolSize));
return create(SinglePoolExecutor.create(threadPoolSize));
}
static PromiseFactory create() {