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

Update to latest Reactor snapshot

This commit is contained in:
Rossen Stoyanchev 2016-06-03 17:55:14 -04:00
parent 03a997c9d4
commit b20ea75766
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spring-web-reactive/src/main/java/org/springframework/web/reactive/result/view/ViewResolutionResultHandler.java
View File

@ -306,7 +306,7 @@ public class ViewResolutionResultHandler extends ContentNegotiatingResultHandler
.switchIfEmpty(Mono.error( .switchIfEmpty(Mono.error(
new IllegalStateException( new IllegalStateException(
"Could not resolve view with name '" + viewName + "'."))) "Could not resolve view with name '" + viewName + "'.")))
.asList() .collectList()
.then(views -> { .then(views -> {
views.addAll(getDefaultViews()); views.addAll(getDefaultViews());

4
spring-web-reactive/src/test/java/org/springframework/web/reactive/result/method/InvocableHandlerMethodTests.java
View File

@ -75,7 +75,7 @@ public class InvocableHandlerMethodTests {
InvocableHandlerMethod hm = createHandlerMethod("noArgs"); InvocableHandlerMethod hm = createHandlerMethod("noArgs");
Mono<HandlerResult> mono = hm.invokeForRequest(this.exchange, this.model); Mono<HandlerResult> mono = hm.invokeForRequest(this.exchange, this.model);
HandlerResult value = mono.get(); HandlerResult value = mono.block();
assertNotNull(value); assertNotNull(value);
assertEquals("success", value.getReturnValue().get()); assertEquals("success", value.getReturnValue().get());
@ -204,7 +204,7 @@ public class InvocableHandlerMethodTests {
} }
private Throwable awaitErrorSignal(Publisher<?> publisher) throws Exception { private Throwable awaitErrorSignal(Publisher<?> publisher) throws Exception {
Signal<?> signal = Flux.from(publisher).materialize().toList().get().get(0); Signal<?> signal = Flux.from(publisher).materialize().collectList().block().get(0);
assertEquals("Unexpected signal: " + signal, SignalKind.onError, signal.getType()); assertEquals("Unexpected signal: " + signal, SignalKind.onError, signal.getType());
return signal.getThrowable(); return signal.getThrowable();
} }

2
spring-web-reactive/src/test/java/org/springframework/web/reactive/result/method/annotation/RequestMappingIntegrationTests.java
View File

@ -561,7 +561,7 @@ public class RequestMappingIntegrationTests extends AbstractHttpHandlerIntegrati
@RequestMapping("/stream-create") @RequestMapping("/stream-create")
public Publisher<Void> streamCreate(@RequestBody Flux<Person> personStream) { public Publisher<Void> streamCreate(@RequestBody Flux<Person> personStream) {
return personStream.asList().doOnSuccess(persons::addAll).then(); return personStream.collectList().doOnSuccess(persons::addAll).then();
} }
@RequestMapping("/person-capitalize") @RequestMapping("/person-capitalize")