Skip to content

Commit b9f7b0d

Browse files
committed
Upgrade to Reactor 2020.0-RC2
See gh-25884
1 parent 809851c commit b9f7b0d

File tree

2 files changed

+16
-8
lines changed

2 files changed

+16
-8
lines changed

build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ configure(allprojects) { project ->
2727
imports {
2828
mavenBom "com.fasterxml.jackson:jackson-bom:2.11.3"
2929
mavenBom "io.netty:netty-bom:4.1.52.Final"
30-
mavenBom "io.projectreactor:reactor-bom:2020.0.0-SNAPSHOT"
30+
mavenBom "io.projectreactor:reactor-bom:2020.0.0-RC2"
3131
mavenBom "io.r2dbc:r2dbc-bom:Arabba-SR7"
3232
mavenBom "io.rsocket:rsocket-bom:1.1.0-M2"
3333
mavenBom "org.eclipse.jetty:jetty-bom:9.4.31.v20200723"
@@ -291,7 +291,7 @@ configure(allprojects) { project ->
291291
repositories {
292292
mavenCentral()
293293
maven { url "https://repo.spring.io/libs-spring-framework-build" }
294-
maven { url "https://repo.spring.io/snapshot" } // Reactor
294+
maven { url "https://repo.spring.io/milestone" } // Reactor
295295
}
296296
}
297297
configurations.all {

spring-core/src/test/java/org/springframework/core/ReactiveAdapterRegistryTests.java

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@
2525
import org.junit.jupiter.api.Nested;
2626
import org.junit.jupiter.api.Test;
2727
import org.reactivestreams.Publisher;
28+
import reactor.core.CoreSubscriber;
2829
import reactor.core.publisher.Flux;
29-
import reactor.core.publisher.FluxProcessor;
3030
import reactor.core.publisher.Mono;
3131

3232
import static org.assertj.core.api.Assertions.assertThat;
@@ -45,16 +45,16 @@ class ReactiveAdapterRegistryTests {
4545
void getAdapterForReactiveSubType() {
4646

4747
ReactiveAdapter adapter1 = getAdapter(Flux.class);
48-
ReactiveAdapter adapter2 = getAdapter(FluxProcessor.class);
48+
ReactiveAdapter adapter2 = getAdapter(ExtendedFlux.class);
4949

5050
assertThat(adapter2).isSameAs(adapter1);
5151

5252
this.registry.registerReactiveType(
53-
ReactiveTypeDescriptor.multiValue(FluxProcessor.class, FluxProcessor::empty),
54-
o -> (FluxProcessor<?, ?>) o,
55-
FluxProcessor::from);
53+
ReactiveTypeDescriptor.multiValue(ExtendedFlux.class, ExtendedFlux::empty),
54+
o -> (ExtendedFlux<?>) o,
55+
ExtendedFlux::from);
5656

57-
ReactiveAdapter adapter3 = getAdapter(FluxProcessor.class);
57+
ReactiveAdapter adapter3 = getAdapter(ExtendedFlux.class);
5858

5959
assertThat(adapter3).isNotNull();
6060
assertThat(adapter3).isNotSameAs(adapter1);
@@ -363,4 +363,12 @@ private ReactiveAdapter getAdapter(Class<?> reactiveType) {
363363
return adapter;
364364
}
365365

366+
367+
private static class ExtendedFlux<T> extends Flux<T> {
368+
369+
@Override
370+
public void subscribe(CoreSubscriber actual) {
371+
throw new UnsupportedOperationException();
372+
}
373+
}
366374
}

0 commit comments

Comments
 (0)