diff --git a/build.gradle b/build.gradle index 1fd0911..efb73d0 100644 --- a/build.gradle +++ b/build.gradle @@ -14,7 +14,7 @@ nexusPublishing { subprojects { group = 'dev.tommyjs' - version = '2.3.3' + version = '2.3.4' apply plugin: 'java' apply plugin: 'com.github.johnrengelman.shadow' @@ -32,9 +32,6 @@ subprojects { dependencies { implementation 'org.jetbrains:annotations:24.1.0' implementation 'org.slf4j:slf4j-api:2.0.12' - compileOnly 'io.projectreactor:reactor-core:3.6.4' - compileOnly 'org.redisson:redisson:3.2.0' - testRuntimeOnly 'org.junit.platform:junit-platform-launcher' testImplementation 'io.projectreactor:reactor-core:3.6.4' testImplementation 'org.junit.jupiter:junit-jupiter:5.8.1' diff --git a/futur-api/.gitignore b/futur-api/.gitignore deleted file mode 100644 index b63da45..0000000 --- a/futur-api/.gitignore +++ /dev/null @@ -1,42 +0,0 @@ -.gradle -build/ -!gradle/wrapper/gradle-wrapper.jar -!**/src/main/**/build/ -!**/src/test/**/build/ - -### IntelliJ IDEA ### -.idea/modules.xml -.idea/jarRepositories.xml -.idea/compiler.xml -.idea/libraries/ -*.iws -*.iml -*.ipr -out/ -!**/src/main/**/out/ -!**/src/test/**/out/ - -### Eclipse ### -.apt_generated -.classpath -.factorypath -.project -.settings -.springBeans -.sts4-cache -bin/ -!**/src/main/**/bin/ -!**/src/test/**/bin/ - -### NetBeans ### -/nbproject/private/ -/nbbuild/ -/dist/ -/nbdist/ -/.nb-gradle/ - -### VS Code ### -.vscode/ - -### Mac OS ### -.DS_Store \ No newline at end of file diff --git a/futur-api/build.gradle b/futur-api/build.gradle deleted file mode 100644 index e69de29..0000000 diff --git a/futur-api/src/main/java/dev/tommyjs/futur/promise/AbstractPromiseFactory.java b/futur-api/src/main/java/dev/tommyjs/futur/promise/AbstractPromiseFactory.java index 69179ed..80a4e52 100644 --- a/futur-api/src/main/java/dev/tommyjs/futur/promise/AbstractPromiseFactory.java +++ b/futur-api/src/main/java/dev/tommyjs/futur/promise/AbstractPromiseFactory.java @@ -3,8 +3,6 @@ package dev.tommyjs.futur.promise; import dev.tommyjs.futur.executor.PromiseExecutor; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.redisson.api.RFuture; -import reactor.core.publisher.Mono; import java.util.*; import java.util.concurrent.CompletableFuture; @@ -148,21 +146,11 @@ public abstract class AbstractPromiseFactory implements PromiseFactory { return promise; } - @Override - public @NotNull Promise wrapMono(@NotNull Mono mono) { - return wrap(mono.toFuture()); - } - @Override public @NotNull Promise wrap(@NotNull CompletableFuture future) { return wrap(future, future); } - @Override - public @NotNull Promise wrapRedisson(@NotNull RFuture future) { - return wrap(future, future); - } - private @NotNull Promise wrap(@NotNull CompletionStage completion, Future future) { Promise promise = unresolved(); diff --git a/futur-api/src/main/java/dev/tommyjs/futur/promise/PromiseFactory.java b/futur-api/src/main/java/dev/tommyjs/futur/promise/PromiseFactory.java index bac92b7..d7a3d45 100644 --- a/futur-api/src/main/java/dev/tommyjs/futur/promise/PromiseFactory.java +++ b/futur-api/src/main/java/dev/tommyjs/futur/promise/PromiseFactory.java @@ -2,9 +2,7 @@ package dev.tommyjs.futur.promise; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.redisson.api.RFuture; import org.slf4j.Logger; -import reactor.core.publisher.Mono; import java.util.Arrays; import java.util.List; @@ -89,10 +87,6 @@ public interface PromiseFactory { return race(false, promises); } - @NotNull Promise wrapMono(@NotNull Mono mono); - - @NotNull Promise wrapRedisson(@NotNull RFuture future); - @NotNull Promise wrap(@NotNull CompletableFuture future); default @NotNull Promise start() { diff --git a/futur-api/src/test/java/dev/tommyjs/futur/PromiseTests.java b/futur-api/src/test/java/dev/tommyjs/futur/PromiseTests.java index 3a9cb9e..6195924 100644 --- a/futur-api/src/test/java/dev/tommyjs/futur/PromiseTests.java +++ b/futur-api/src/test/java/dev/tommyjs/futur/PromiseTests.java @@ -1,6 +1,5 @@ package dev.tommyjs.futur; -import dev.tommyjs.futur.executor.PromiseExecutor; import dev.tommyjs.futur.executor.SinglePoolExecutor; import dev.tommyjs.futur.impl.SimplePromiseFactory; import dev.tommyjs.futur.promise.Promise; @@ -8,11 +7,9 @@ import dev.tommyjs.futur.promise.PromiseFactory; import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import reactor.core.publisher.Mono; import java.util.List; import java.util.Map; -import java.util.Objects; import java.util.concurrent.*; import java.util.concurrent.atomic.AtomicBoolean; @@ -22,22 +19,9 @@ public final class PromiseTests { private final ScheduledExecutorService executor = Executors.newScheduledThreadPool(5); private final PromiseFactory pfac = new SimplePromiseFactory<>(new SinglePoolExecutor(executor), logger); - @Test - public void testMono() { - Exception value = new Exception("Test Error"); - - var error = pfac.wrapMono(Mono.error(value)); - assert Objects.requireNonNull(error.getCompletion()).isError(); - assert error.getCompletion().getException() == value; - - var resolved = pfac.wrapMono(Mono.just(value)); - assert !Objects.requireNonNull(resolved.getCompletion()).isError(); - assert resolved.getCompletion().getResult() == value; - } - @Test public void testShutdown() { - executor.close(); + executor.shutdown(); Promise promise = pfac.resolve(null).thenSupplyAsync(() -> null); try { promise.await(); diff --git a/futur-static/src/main/java/dev/tommyjs/futur/lazy/PromiseUtil.java b/futur-static/src/main/java/dev/tommyjs/futur/lazy/PromiseUtil.java index 72a4257..abd2bdd 100644 --- a/futur-static/src/main/java/dev/tommyjs/futur/lazy/PromiseUtil.java +++ b/futur-static/src/main/java/dev/tommyjs/futur/lazy/PromiseUtil.java @@ -5,9 +5,7 @@ import dev.tommyjs.futur.promise.PromiseCompletion; import dev.tommyjs.futur.promise.PromiseFactory; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.redisson.api.RFuture; import org.slf4j.Logger; -import reactor.core.publisher.Mono; import java.util.List; import java.util.Map; @@ -110,18 +108,10 @@ public final class PromiseUtil { return pfac.race(cancelRaceLosers, promises); } - public static @NotNull Promise wrapMono(@NotNull Mono mono) { - return pfac.wrapMono(mono); - } - public static @NotNull Promise wrap(@NotNull CompletableFuture future) { return pfac.wrap(future); } - public static @NotNull Promise wrapRedisson(@NotNull RFuture future) { - return pfac.wrapRedisson(future); - } - public static @NotNull Promise resolve(T value) { return pfac.resolve(value); } diff --git a/futur-static/src/main/java/dev/tommyjs/futur/lazy/StaticPromiseFactory.java b/futur-static/src/main/java/dev/tommyjs/futur/lazy/StaticPromiseFactory.java index 0d9aebf..340b92b 100644 --- a/futur-static/src/main/java/dev/tommyjs/futur/lazy/StaticPromiseFactory.java +++ b/futur-static/src/main/java/dev/tommyjs/futur/lazy/StaticPromiseFactory.java @@ -18,7 +18,6 @@ public final class StaticPromiseFactory extends AbstractPromiseFactory private final static @NotNull Logger LOGGER = LoggerFactory.getLogger(StaticPromiseFactory.class); private StaticPromiseFactory() { - } @Override