From 628ae2fda8b3106f2f4df8436e0c5f56af4cd24d Mon Sep 17 00:00:00 2001 From: Sebastien Deleuze Date: Tue, 9 Feb 2016 17:58:12 +0100 Subject: [PATCH] Use Flux instead of Stream in Publisher based integration tests --- .../method/annotation/RequestMappingIntegrationTests.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/spring-web-reactive/src/test/java/org/springframework/web/reactive/method/annotation/RequestMappingIntegrationTests.java b/spring-web-reactive/src/test/java/org/springframework/web/reactive/method/annotation/RequestMappingIntegrationTests.java index 07547e21a22..aeeaa94f23d 100644 --- a/spring-web-reactive/src/test/java/org/springframework/web/reactive/method/annotation/RequestMappingIntegrationTests.java +++ b/spring-web-reactive/src/test/java/org/springframework/web/reactive/method/annotation/RequestMappingIntegrationTests.java @@ -469,7 +469,7 @@ public class RequestMappingIntegrationTests extends AbstractHttpHandlerIntegrati @RequestMapping("/param") public Publisher handleWithParam(@RequestParam String name) { - return Stream.just("Hello ", name, "!"); + return Flux.just("Hello ", name, "!"); } @RequestMapping("/person") @@ -485,7 +485,7 @@ public class RequestMappingIntegrationTests extends AbstractHttpHandlerIntegrati @RequestMapping("/raw") public Publisher rawResponseBody() { JacksonJsonEncoder encoder = new JacksonJsonEncoder(new DefaultDataBufferAllocator()); - return encoder.encode(Stream.just(new Person("Robert")), + return encoder.encode(Mono.just(new Person("Robert")), ResolvableType.forClass(Person.class), MediaType.APPLICATION_JSON).map(DataBuffer::asByteBuffer); } @@ -526,7 +526,7 @@ public class RequestMappingIntegrationTests extends AbstractHttpHandlerIntegrati @RequestMapping("/publisher") public Publisher publisherResponseBody() { - return Stream.just(new Person("Robert"), new Person("Marie")); + return Flux.just(new Person("Robert"), new Person("Marie")); } @RequestMapping("/flux") @@ -546,7 +546,7 @@ public class RequestMappingIntegrationTests extends AbstractHttpHandlerIntegrati @RequestMapping("/publisher-capitalize") public Publisher publisherCapitalize(@RequestBody Publisher persons) { - return Stream + return Flux .from(persons) .map(person -> new Person(person.getName().toUpperCase())); }