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

fix stream closed issue

Browse Source
This commit is contained in:
tommyskeff
2025-01-09 10:17:13 +00:00
parent df9e418091
commit 18dff51617
4 changed files with 30 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -195,7 +195,8 @@ public interface PromiseFactory {
*/
default <K, V> @NotNull Promise<Map<K, V>> combineMapped(@NotNull Stream<Map.Entry<K, Promise<V>>> promises,
boolean link) {
return combineMapped(promises.iterator(), PromiseUtil.estimateSize(promises), link);
Spliterator<Map.Entry<K, Promise<V>>> spliterator = promises.spliterator();
return combineMapped(Spliterators.iterator(spliterator), PromiseUtil.estimateSize(spliterator), link);
}
/**
@@ -302,7 +303,8 @@ public interface PromiseFactory {
* @return the combined promise
*/
default <V> @NotNull Promise<List<V>> combine(@NotNull Stream<Promise<V>> promises, boolean link) {
return combine(promises.iterator(), PromiseUtil.estimateSize(promises), link);
Spliterator<Promise<V>> spliterator = promises.spliterator();
return combine(Spliterators.iterator(spliterator), PromiseUtil.estimateSize(spliterator), link);
}
/**
@@ -314,7 +316,7 @@ public interface PromiseFactory {
* @return the combined promise
*/
default <V> @NotNull Promise<List<V>> combine(@NotNull Stream<Promise<V>> promises) {
return combine(promises.iterator(), PromiseUtil.estimateSize(promises), true);
return combine(promises, true);
}
/**
@@ -369,7 +371,8 @@ public interface PromiseFactory {
*/
default @NotNull Promise<List<PromiseCompletion<?>>> allSettled(@NotNull Stream<Promise<?>> promises,
boolean link) {
return allSettled(promises.iterator(), PromiseUtil.estimateSize(promises), link);
Spliterator<Promise<?>> spliterator = promises.spliterator();
return allSettled(Spliterators.iterator(spliterator), PromiseUtil.estimateSize(spliterator), link);
}
/**
@@ -380,7 +383,7 @@ public interface PromiseFactory {
* @return the combined promise
*/
default @NotNull Promise<List<PromiseCompletion<?>>> allSettled(@NotNull Stream<Promise<?>> promises) {
return allSettled(promises.iterator(), PromiseUtil.estimateSize(promises), true);
return allSettled(promises, true);
}
/**

6
futur-api/src/main/java/dev/tommyjs/futur/util/PromiseUtil.java
View File

@@ -4,7 +4,7 @@ import dev.tommyjs.futur.promise.CompletablePromise;
import dev.tommyjs.futur.promise.Promise;
import org.jetbrains.annotations.NotNull;
import java.util.stream.Stream;
import java.util.Spliterator;
public class PromiseUtil {
@@ -44,8 +44,8 @@ public class PromiseUtil {
* @param stream the stream
* @return the estimated size
*/
public static int estimateSize(@NotNull Stream<?> stream) {
long estimate = stream.spliterator().estimateSize();
public static int estimateSize(@NotNull Spliterator<?> stream) {
long estimate = stream.estimateSize();
return estimate == Long.MAX_VALUE ? 10 : (int) estimate;
}

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

@@ -12,6 +12,7 @@ import java.util.Map;
import java.util.concurrent.*;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicReference;
import java.util.stream.Stream;
public final class PromiseTests {
@@ -210,4 +211,22 @@ public final class PromiseTests {
assert promise2.getCompletion() != null && promise2.getCompletion().getException() instanceof IllegalStateException;
}
@Test
public void testStream() {
var res = promises.combine(Stream.of(1, 2, 3).map(promises::resolve)).await();
assert res.size() == 3;
}
@Test
public void combineMappedTest() {
var res = promises.combineMapped(List.of(1, 2, 3),
n -> promises.start().thenSupplyDelayedAsync(() -> n * 2, 50, TimeUnit.MILLISECONDS)
).await();
assert res.size() == 3;
assert res.get(1) == 2;
assert res.get(2) == 4;
assert res.get(3) == 6;
}
}

2
futur-lazy/src/main/java/dev/tommyjs/futur/lazy/Promises.java
View File

@@ -6,7 +6,6 @@ import dev.tommyjs.futur.promise.Promise;
import dev.tommyjs.futur.promise.PromiseCompletion;
import dev.tommyjs.futur.promise.PromiseFactory;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -15,7 +14,6 @@ import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.concurrent.CompletableFuture;
import java.util.function.BiConsumer;
import java.util.function.Function;
import java.util.stream.Stream;