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

release v2.3.4

Browse Source 
remove basic wrapper methods
This commit is contained in:
tommyskeff
2024-10-31 17:18:35 +00:00
parent b869ca04c0
commit 18d334a530
8 changed files with 2 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
build.gradle
View File

@@ -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'

42
futur-api/.gitignore vendored
View File

@@ -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

0
futur-api/build.gradle
View File

12
futur-api/src/main/java/dev/tommyjs/futur/promise/AbstractPromiseFactory.java
View File

@@ -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<F> implements PromiseFactory {
return promise;
}
@Override
public <T> @NotNull Promise<T> wrapMono(@NotNull Mono<T> mono) {
return wrap(mono.toFuture());
}
@Override
public <T> @NotNull Promise<T> wrap(@NotNull CompletableFuture<T> future) {
return wrap(future, future);
}
@Override
public <T> @NotNull Promise<T> wrapRedisson(@NotNull RFuture<T> future) {
return wrap(future, future);
}
private <T> @NotNull Promise<T> wrap(@NotNull CompletionStage<T> completion, Future<T> future) {
Promise<T> promise = unresolved();

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

@@ -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);
}
<T> @NotNull Promise<T> wrapMono(@NotNull Mono<T> mono);
<T> @NotNull Promise<T> wrapRedisson(@NotNull RFuture<T> future);
<T> @NotNull Promise<T> wrap(@NotNull CompletableFuture<T> future);
default @NotNull Promise<Void> start() {

18
futur-api/src/test/java/dev/tommyjs/futur/PromiseTests.java
View File

@@ -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();

10
futur-static/src/main/java/dev/tommyjs/futur/lazy/PromiseUtil.java
View File

@@ -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 <T> Promise<T> wrapMono(@NotNull Mono<T> mono) {
return pfac.wrapMono(mono);
}
public static @NotNull <T> Promise<T> wrap(@NotNull CompletableFuture<T> future) {
return pfac.wrap(future);
}
public static @NotNull <T> Promise<T> wrapRedisson(@NotNull RFuture<T> future) {
return pfac.wrapRedisson(future);
}
public static @NotNull <T> Promise<T> resolve(T value) {
return pfac.resolve(value);
}

1
futur-static/src/main/java/dev/tommyjs/futur/lazy/StaticPromiseFactory.java
View File

@@ -18,7 +18,6 @@ public final class StaticPromiseFactory extends AbstractPromiseFactory<Future<?>
private final static @NotNull Logger LOGGER = LoggerFactory.getLogger(StaticPromiseFactory.class);
private StaticPromiseFactory() {
}
@Override