8000 Merge #3303 into 3.5.1 · reactor/reactor-core@69450bb · GitHub
[go: up one dir, main page]

Skip to content

Commit 69450bb

Browse files
author
Oleh Dokuka
committed
Merge #3303 into 3.5.1
Signed-off-by: OlegDokuka <odokuka@vmware.com>
2 parents 56f8e1f + a8d4cbd commit 69450bb

File tree

2 files changed

+6
-16
lines changed

2 files changed

+6
-16
lines changed

reactor-core/src/test/java/reactor/core/publisher/FluxFlattenIterableTest.java

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
import java.util.stream.IntStream;
3030

3131
import org.assertj.core.api.Assertions;
32-
import org.jetbrains.annotations.NotNull;
3332
import org.junit.jupiter.api.Test;
3433
import org.reactivestreams.Subscription;
3534
import reactor.core.CoreSubscriber;
@@ -148,13 +147,9 @@ public void useIterableOncePerSubscriber() {
148147
AtomicInteger calls = new AtomicInteger();
149148

150149
Flux.range(1, 5)
151-
.concatMapIterable(v -> new Iterable<String>() {
152-
@NotNull
153-
@Override
154-
public Iterator<String> iterator() {
155-
calls.incrementAndGet();
156-
return Arrays.asList("hello " + v).iterator();
157-
}
150+
.concatMapIterable(v -> (Iterable<String>) () -> {
151+
calls.incrementAndGet();
152+
return Arrays.asList("hello " + v).iterator();
158153
})
159154
.as(StepVerifier::create)
160155
.expectNext("hello 1", "hello 2", "hello 3", "hello 4", "hello 5")

reactor-core/src/test/java/reactor/core/publisher/FluxIterableTest.java

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525

2626
import org.assertj.core.api.Assertions;
2727
import org.assertj.core.api.InstanceOfAssertFactories;
28-
import org.jetbrains.annotations.NotNull;
2928
import org.junit.jupiter.api.Test;
3029
import org.junit.jupiter.api.Timeout;
3130
import org.mockito.Mockito;
@@ -54,13 +53,9 @@ public class FluxIterableTest {
5453
//https://github.com/reactor/reactor-core/issues/3295
5554
public void useIterableOncePerSubscriber() {
5655
AtomicInteger calls = new AtomicInteger();
57-
Iterable<String> strings = new Iterable<String>() {
58-
@NotNull
59-
@Override
60-
public Iterator<String> iterator() {
61-
calls.incrementAndGet();
62-
return Arrays.asList("hello").iterator();
63-
}
56+
Iterable<String> strings = () -> {
57+
calls.incrementAndGet();
58+
return Arrays.asList("hello").iterator();
6459
};
6560
StepVerifier.create(Flux.fromIterable(strings))
6661
.expectNext("hello")

0 commit comments

Comments
 (0)
0