root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Deprecate support for RxJava 1.x 

Closes gh-19628
This commit is contained in:
Rossen Stoyanchev 2020-05-11 08:48:08 +01:00
parent 7f59381c7d
commit a64e7091e0
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
spring-core/src/main/java/org/springframework/core/ReactiveAdapterRegistry.java
View File

@ -48,6 +48,9 @@ import org.springframework.util.ReflectionUtils;
* {@link CompletableFuture}, Java 9+ {@code Flow.Publisher}, and Kotlin * {@link CompletableFuture}, Java 9+ {@code Flow.Publisher}, and Kotlin
* Coroutines' {@code Deferred} and {@code Flow}. * Coroutines' {@code Deferred} and {@code Flow}.
* *
* <p><strong>Note:</strong> As of Spring Framework 5.3, support for RxJava 1.x
* is deprecated in favor of RxJava 2 and 3.
*
* @author Rossen Stoyanchev * @author Rossen Stoyanchev
* @author Sebastien Deleuze * @author Sebastien Deleuze
* @since 5.0 * @since 5.0
@ -77,7 +80,7 @@ public class ReactiveAdapterRegistry {
} }
this.reactorPresent = reactorRegistered; this.reactorPresent = reactorRegistered;
// RxJava1 // RxJava1 (deprecated)
if (ClassUtils.isPresent("rx.Observable", classLoader) && if (ClassUtils.isPresent("rx.Observable", classLoader) &&
ClassUtils.isPresent("rx.RxReactiveStreams", classLoader)) { ClassUtils.isPresent("rx.RxReactiveStreams", classLoader)) {
new RxJava1Registrar().registerAdapters(this); new RxJava1Registrar().registerAdapters(this);

9
src/docs/asciidoc/web-reactive.adoc
View File

@ -57,7 +57,14 @@ For annotated controllers, WebFlux transparently adapts to the reactive library
the application. This is done with the help of the the application. This is done with the help of the
{api-spring-framework}/core/ReactiveAdapterRegistry.html[`ReactiveAdapterRegistry`], which {api-spring-framework}/core/ReactiveAdapterRegistry.html[`ReactiveAdapterRegistry`], which
provides pluggable support for reactive library and other asynchronous types. The registry provides pluggable support for reactive library and other asynchronous types. The registry
has built-in support for RxJava and `CompletableFuture`, but you can register others, too. has built-in support for RxJava 2/3, RxJava 1 (via RxJava Reactive Streams bridge), and
`CompletableFuture`, but you can register others, too.
[NOTE]
====
As of Spring Framework 5.3, support for RxJava 1 is deprecated.
====
For functional APIs (such as <<webflux-fn>>, the `WebClient`, and others), the general rules For functional APIs (such as <<webflux-fn>>, the `WebClient`, and others), the general rules
for WebFlux APIs apply -- `Flux` and `Mono` as return values and a Reactive Streams for WebFlux APIs apply -- `Flux` and `Mono` as return values and a Reactive Streams