From d903b9acf5c8d90f32e5b45ab6ea3c7ab4dffebf Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Fri, 5 Jul 2019 16:25:52 +0200 Subject: [PATCH] Compatibility with RxJava 3.0 Closes gh-23208 --- .../core/ReactiveAdapterRegistryTests.java | 2 +- .../RequestMappingMessageConversionIntegrationTests.java | 9 +++------ 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/spring-core/src/test/java/org/springframework/core/ReactiveAdapterRegistryTests.java b/spring-core/src/test/java/org/springframework/core/ReactiveAdapterRegistryTests.java index d0e89ab2cb..fbf3513eeb 100644 --- a/spring-core/src/test/java/org/springframework/core/ReactiveAdapterRegistryTests.java +++ b/spring-core/src/test/java/org/springframework/core/ReactiveAdapterRegistryTests.java @@ -186,7 +186,7 @@ public class ReactiveAdapterRegistryTests { Object target = getAdapter(io.reactivex.Completable.class).fromPublisher(source); boolean condition = target instanceof io.reactivex.Completable; assertThat(condition).isTrue(); - assertThat(((io.reactivex.Completable) target).blockingGet()).isNull(); + ((io.reactivex.Completable) target).blockingAwait(); } @Test diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/RequestMappingMessageConversionIntegrationTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/RequestMappingMessageConversionIntegrationTests.java index 9f26e329d7..820ca2d95e 100644 --- a/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/RequestMappingMessageConversionIntegrationTests.java +++ b/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/RequestMappingMessageConversionIntegrationTests.java @@ -649,9 +649,8 @@ public class RequestMappingMessageConversionIntegrationTests extends AbstractReq } @PostMapping("/rxjava2-single") - @SuppressWarnings("deprecation") public io.reactivex.Completable createWithRxJava2Single(@RequestBody io.reactivex.Single single) { - return single.map(persons::add).toCompletable(); + return single.map(persons::add).ignoreElement(); } @PostMapping("/flux") @@ -665,17 +664,15 @@ public class RequestMappingMessageConversionIntegrationTests extends AbstractReq } @PostMapping("/rxjava2-observable") - @SuppressWarnings("deprecation") public io.reactivex.Completable createWithRxJava2Observable( @RequestBody io.reactivex.Observable observable) { - return observable.toList().doOnSuccess(persons::addAll).toCompletable(); + return observable.toList().doOnSuccess(persons::addAll).ignoreElement(); } @PostMapping("/flowable") - @SuppressWarnings("deprecation") public io.reactivex.Completable createWithFlowable(@RequestBody Flowable flowable) { - return flowable.toList().doOnSuccess(persons::addAll).toCompletable(); + return flowable.toList().doOnSuccess(persons::addAll).ignoreElement(); } } -- GitLab