From b20ea75766d9bb75883d35c109bf60be25f28340 Mon Sep 17 00:00:00 2001 From: Rossen Stoyanchev Date: Fri, 3 Jun 2016 17:55:14 -0400 Subject: [PATCH] Update to latest Reactor snapshot --- .../web/reactive/result/view/ViewResolutionResultHandler.java | 2 +- .../reactive/result/method/InvocableHandlerMethodTests.java | 4 ++-- .../method/annotation/RequestMappingIntegrationTests.java | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/result/view/ViewResolutionResultHandler.java b/spring-web-reactive/src/main/java/org/springframework/web/reactive/result/view/ViewResolutionResultHandler.java index 336037876ed..bc28fbc543f 100644 --- a/spring-web-reactive/src/main/java/org/springframework/web/reactive/result/view/ViewResolutionResultHandler.java +++ b/spring-web-reactive/src/main/java/org/springframework/web/reactive/result/view/ViewResolutionResultHandler.java @@ -306,7 +306,7 @@ public class ViewResolutionResultHandler extends ContentNegotiatingResultHandler .switchIfEmpty(Mono.error( new IllegalStateException( "Could not resolve view with name '" + viewName + "'."))) - .asList() + .collectList() .then(views -> { views.addAll(getDefaultViews()); diff --git a/spring-web-reactive/src/test/java/org/springframework/web/reactive/result/method/InvocableHandlerMethodTests.java b/spring-web-reactive/src/test/java/org/springframework/web/reactive/result/method/InvocableHandlerMethodTests.java index 939c67e217d..44a5302c368 100644 --- a/spring-web-reactive/src/test/java/org/springframework/web/reactive/result/method/InvocableHandlerMethodTests.java +++ b/spring-web-reactive/src/test/java/org/springframework/web/reactive/result/method/InvocableHandlerMethodTests.java @@ -75,7 +75,7 @@ public class InvocableHandlerMethodTests { InvocableHandlerMethod hm = createHandlerMethod("noArgs"); Mono mono = hm.invokeForRequest(this.exchange, this.model); - HandlerResult value = mono.get(); + HandlerResult value = mono.block(); assertNotNull(value); assertEquals("success", value.getReturnValue().get()); @@ -204,7 +204,7 @@ public class InvocableHandlerMethodTests { } 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()); return signal.getThrowable(); } diff --git a/spring-web-reactive/src/test/java/org/springframework/web/reactive/result/method/annotation/RequestMappingIntegrationTests.java b/spring-web-reactive/src/test/java/org/springframework/web/reactive/result/method/annotation/RequestMappingIntegrationTests.java index 7ff5e36a67b..c85b85acb74 100644 --- a/spring-web-reactive/src/test/java/org/springframework/web/reactive/result/method/annotation/RequestMappingIntegrationTests.java +++ b/spring-web-reactive/src/test/java/org/springframework/web/reactive/result/method/annotation/RequestMappingIntegrationTests.java @@ -561,7 +561,7 @@ public class RequestMappingIntegrationTests extends AbstractHttpHandlerIntegrati @RequestMapping("/stream-create") public Publisher streamCreate(@RequestBody Flux personStream) { - return personStream.asList().doOnSuccess(persons::addAll).then(); + return personStream.collectList().doOnSuccess(persons::addAll).then(); } @RequestMapping("/person-capitalize")