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

Compatibility with RxJava 3.0 

Closes gh-23208
This commit is contained in:
Juergen Hoeller 2019-07-05 16:25:52 +02:00
parent 6990504d17
commit d903b9acf5
2 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spring-core/src/test/java/org/springframework/core/ReactiveAdapterRegistryTests.java
View File

@ -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

9
spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/RequestMappingMessageConversionIntegrationTests.java
View File

@ -649,9 +649,8 @@ public class RequestMappingMessageConversionIntegrationTests extends AbstractReq
}
@PostMapping("/rxjava2-single")
@SuppressWarnings("deprecation")
public io.reactivex.Completable createWithRxJava2Single(@RequestBody io.reactivex.Single<Person> 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<Person> 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<Person> flowable) {
return flowable.toList().doOnSuccess(persons::addAll).toCompletable();
return flowable.toList().doOnSuccess(persons::addAll).ignoreElement();
}
}