Skip to content

Commit a64e709

Browse files
committed
Deprecate support for RxJava 1.x
Closes spring-projectsgh-19628
1 parent 7f59381 commit a64e709

File tree

2 files changed

+12
-2
lines changed

2 files changed

+12
-2
lines changed

spring-core/src/main/java/org/springframework/core/ReactiveAdapterRegistry.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,9 @@
4848
* {@link CompletableFuture}, Java 9+ {@code Flow.Publisher}, and Kotlin
4949
* Coroutines' {@code Deferred} and {@code Flow}.
5050
*
51+
* <p><strong>Note:</strong> As of Spring Framework 5.3, support for RxJava 1.x
52+
* is deprecated in favor of RxJava 2 and 3.
53+
*
5154
* @author Rossen Stoyanchev
5255
* @author Sebastien Deleuze
5356
* @since 5.0
@@ -77,7 +80,7 @@ public ReactiveAdapterRegistry() {
7780
}
7881
this.reactorPresent = reactorRegistered;
7982

80-
// RxJava1
83+
// RxJava1 (deprecated)
8184
if (ClassUtils.isPresent("rx.Observable", classLoader) &&
8285
ClassUtils.isPresent("rx.RxReactiveStreams", classLoader)) {
8386
new RxJava1Registrar().registerAdapters(this);

src/docs/asciidoc/web-reactive.adoc

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,14 @@ For annotated controllers, WebFlux transparently adapts to the reactive library
5757
the application. This is done with the help of the
5858
{api-spring-framework}/core/ReactiveAdapterRegistry.html[`ReactiveAdapterRegistry`], which
5959
provides pluggable support for reactive library and other asynchronous types. The registry
60-
has built-in support for RxJava and `CompletableFuture`, but you can register others, too.
60+
has built-in support for RxJava 2/3, RxJava 1 (via RxJava Reactive Streams bridge), and
61+
`CompletableFuture`, but you can register others, too.
62+
63+
[NOTE]
64+
====
65+
As of Spring Framework 5.3, support for RxJava 1 is deprecated.
66+
====
67+
6168

6269
For functional APIs (such as <<webflux-fn>>, the `WebClient`, and others), the general rules
6370
for WebFlux APIs apply -- `Flux` and `Mono` as return values and a Reactive Streams

0 commit comments

Comments
 (0)