From 0fcae5d2c5cad7c63cec9497d12d4f44d9a66cae Mon Sep 17 00:00:00 2001
From: Sebastien Deleuze <sdeleuze@pivotal.io>
Date: Fri, 25 Nov 2016 12:54:48 +0100
Subject: [PATCH] Polishing

Issue: SPR-14952
---
 .../server/reactive/MockServerHttpResponse.java  | 16 ++++++++--------
 .../reactive/test/MockServerHttpResponse.java    | 16 ++++++++--------
 .../reactive/test/MockClientHttpRequest.java     | 16 ++++++++--------
 3 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/spring-test/src/main/java/org/springframework/mock/http/server/reactive/MockServerHttpResponse.java b/spring-test/src/main/java/org/springframework/mock/http/server/reactive/MockServerHttpResponse.java
index 3aa79c4a94a..b2f2d863e64 100644
--- a/spring-test/src/main/java/org/springframework/mock/http/server/reactive/MockServerHttpResponse.java
+++ b/spring-test/src/main/java/org/springframework/mock/http/server/reactive/MockServerHttpResponse.java
@@ -50,9 +50,9 @@ public class MockServerHttpResponse implements ServerHttpResponse {
 
 	private final MultiValueMap<String, ResponseCookie> cookies = new LinkedMultiValueMap<>();
 
-	private Publisher<? extends DataBuffer> body;
+	private Flux<DataBuffer> body;
 
-	private Publisher<? extends Publisher<? extends DataBuffer>> bodyWithFlushes;
+	private Flux<Publisher<DataBuffer>> bodyWithFlushes;
 
 	private DataBufferFactory bufferFactory = new DefaultDataBufferFactory();
 
@@ -77,24 +77,24 @@ public class MockServerHttpResponse implements ServerHttpResponse {
 		return this.cookies;
 	}
 
-	public Publisher<? extends DataBuffer> getBody() {
+	public Publisher<DataBuffer> getBody() {
 		return this.body;
 	}
 
-	public Publisher<? extends Publisher<? extends DataBuffer>> getBodyWithFlush() {
+	public Publisher<Publisher<DataBuffer>> getBodyWithFlush() {
 		return this.bodyWithFlushes;
 	}
 
 	@Override
 	public Mono<Void> writeWith(Publisher<? extends DataBuffer> body) {
-		this.body = body;
-		return Flux.from(this.body).then();
+		this.body = Flux.from(body);
+		return this.body.then();
 	}
 
 	@Override
 	public Mono<Void> writeAndFlushWith(Publisher<? extends Publisher<? extends DataBuffer>> body) {
-		this.bodyWithFlushes = body;
-		return Flux.from(this.bodyWithFlushes).then();
+		this.bodyWithFlushes = Flux.from(body).map(p -> Flux.from(p));
+		return this.bodyWithFlushes.then();
 	}
 
 	@Override
diff --git a/spring-web/src/test/java/org/springframework/mock/http/server/reactive/test/MockServerHttpResponse.java b/spring-web/src/test/java/org/springframework/mock/http/server/reactive/test/MockServerHttpResponse.java
index 9105cd81ae4..fd7ae11364a 100644
--- a/spring-web/src/test/java/org/springframework/mock/http/server/reactive/test/MockServerHttpResponse.java
+++ b/spring-web/src/test/java/org/springframework/mock/http/server/reactive/test/MockServerHttpResponse.java
@@ -49,9 +49,9 @@ public class MockServerHttpResponse implements ServerHttpResponse {
 
 	private final MultiValueMap<String, ResponseCookie> cookies = new LinkedMultiValueMap<>();
 
-	private Publisher<? extends DataBuffer> body;
+	private Flux<DataBuffer> body;
 
-	private Publisher<? extends Publisher<? extends DataBuffer>> bodyWithFlushes;
+	private Flux<Publisher<DataBuffer>> bodyWithFlushes;
 
 	private DataBufferFactory bufferFactory = new DefaultDataBufferFactory();
 
@@ -77,24 +77,24 @@ public class MockServerHttpResponse implements ServerHttpResponse {
 		return this.cookies;
 	}
 
-	public Publisher<? extends DataBuffer> getBody() {
+	public Publisher<DataBuffer> getBody() {
 		return this.body;
 	}
 
-	public Publisher<? extends Publisher<? extends DataBuffer>> getBodyWithFlush() {
+	public Publisher<Publisher<DataBuffer>> getBodyWithFlush() {
 		return this.bodyWithFlushes;
 	}
 
 	@Override
 	public Mono<Void> writeWith(Publisher<? extends DataBuffer> body) {
-		this.body = body;
-		return Flux.from(this.body).then();
+		this.body = Flux.from(body);
+		return this.body.then();
 	}
 
 	@Override
 	public Mono<Void> writeAndFlushWith(Publisher<? extends Publisher<? extends DataBuffer>> body) {
-		this.bodyWithFlushes = body;
-		return Flux.from(this.bodyWithFlushes).then();
+		this.bodyWithFlushes = Flux.from(body).map(p -> Flux.from(p));
+		return this.bodyWithFlushes.then();
 	}
 
 	@Override
diff --git a/spring-web/src/test/java/org/springframework/web/client/reactive/test/MockClientHttpRequest.java b/spring-web/src/test/java/org/springframework/web/client/reactive/test/MockClientHttpRequest.java
index bffbf351b2a..2125f92defa 100644
--- a/spring-web/src/test/java/org/springframework/web/client/reactive/test/MockClientHttpRequest.java
+++ b/spring-web/src/test/java/org/springframework/web/client/reactive/test/MockClientHttpRequest.java
@@ -41,9 +41,9 @@ public class MockClientHttpRequest extends AbstractClientHttpRequest {
 
 	private final DataBufferFactory bufferFactory = new DefaultDataBufferFactory();
 
-	private Publisher<? extends DataBuffer> body;
+	private Flux<DataBuffer> body;
 
-	private Publisher<? extends Publisher<? extends DataBuffer>> bodyWithFlushes;
+	private Flux<Publisher<DataBuffer>> bodyWithFlushes;
 
 
 	public MockClientHttpRequest() {
@@ -91,21 +91,21 @@ public class MockClientHttpRequest extends AbstractClientHttpRequest {
 
 	@Override
 	public Mono<Void> writeWith(Publisher<? extends DataBuffer> body) {
-		this.body = body;
-		return applyBeforeCommit().then(Flux.from(this.body).then());
+		this.body = Flux.from(body);
+		return applyBeforeCommit().then(this.body.then());
 	}
 
 	@Override
 	public Mono<Void> writeAndFlushWith(Publisher<? extends Publisher<? extends DataBuffer>> body) {
-		this.bodyWithFlushes = body;
-		return applyBeforeCommit().then(Flux.from(this.bodyWithFlushes).then());
+		this.bodyWithFlushes = Flux.from(body).map(p -> Flux.from(p));
+		return applyBeforeCommit().then(this.bodyWithFlushes.then());
 	}
 
-	public Publisher<? extends DataBuffer> getBody() {
+	public Publisher<DataBuffer> getBody() {
 		return body;
 	}
 
-	public Publisher<? extends Publisher<? extends DataBuffer>> getBodyWithFlush() {
+	public Publisher<Publisher<DataBuffer>> getBodyWithFlush() {
 		return bodyWithFlushes;
 	}