Add getBodyAsString() to MockClientHttpRequest

Issue: SPR-16988

spring-test/src/main/java/org/springframework/mock/http/client/reactive/MockClientHttpRequest.java

@@ -17,7 +17,10 @@
 package org.springframework.mock.http.client.reactive;
 
 import java.net.URI;
+import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
 import java.util.Collection;
+import java.util.Optional;
 import java.util.function.Function;
 
 import org.reactivestreams.Publisher;
@@ -26,12 +29,14 @@ import reactor.core.publisher.Mono;
 
 import org.springframework.core.io.buffer.DataBuffer;
 import org.springframework.core.io.buffer.DataBufferFactory;
+import org.springframework.core.io.buffer.DataBufferUtils;
 import org.springframework.core.io.buffer.DefaultDataBufferFactory;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpMethod;
 import org.springframework.http.client.reactive.AbstractClientHttpRequest;
 import org.springframework.http.client.reactive.ClientHttpRequest;
 import org.springframework.util.Assert;
+import org.springframework.util.MimeType;
 import org.springframework.web.util.UriComponentsBuilder;
 
 /**
@@ -96,11 +101,38 @@ public class MockClientHttpRequest extends AbstractClientHttpRequest {
 		return this.body;
 	}
 
+	/**
+	 * Aggregate response data and convert to a String using the "Content-Type"
+	 * charset or "UTF-8" by default.
+	 */
+	public Mono<String> getBodyAsString() {
+
+		Charset charset = Optional.ofNullable(getHeaders().getContentType()).map(MimeType::getCharset)
+				.orElse(StandardCharsets.UTF_8);
+
+		return getBody()
+				.reduce(bufferFactory().allocateBuffer(), (previous, current) -> {
+					previous.write(current);
+					DataBufferUtils.release(current);
+					return previous;
+				})
+				.map(buffer -> bufferToString(buffer, charset));
+	}
+
+	private static String bufferToString(DataBuffer buffer, Charset charset) {
+		Assert.notNull(charset, "'charset' must not be null");
+		byte[] bytes = new byte[buffer.readableByteCount()];
+		buffer.read(bytes);
+		return new String(bytes, charset);
+	}
+
 	/**
 	 * Configure a custom handler for writing the request body.
+	 *
 	 * <p>The default write handler consumes and caches the request body so it
 	 * may be accessed subsequently, e.g. in test assertions. Use this property
 	 * when the request body is an infinite stream.
+	 *
 	 * @param writeHandler the write handler to use returning {@code Mono<Void>}
 	 * when the body has been "written" (i.e. consumed).
 	 */

spring-web/src/test/java/org/springframework/mock/http/client/reactive/test/MockClientHttpRequest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2016 the original author or authors.
+ * Copyright 2002-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,7 +17,10 @@
 package org.springframework.mock.http.client.reactive.test;
 
 import java.net.URI;
+import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
 import java.util.Collection;
+import java.util.Optional;
 import java.util.function.Function;
 
 import org.reactivestreams.Publisher;
@@ -26,16 +29,19 @@ import reactor.core.publisher.Mono;
 
 import org.springframework.core.io.buffer.DataBuffer;
 import org.springframework.core.io.buffer.DataBufferFactory;
+import org.springframework.core.io.buffer.DataBufferUtils;
 import org.springframework.core.io.buffer.DefaultDataBufferFactory;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpMethod;
 import org.springframework.http.client.reactive.AbstractClientHttpRequest;
 import org.springframework.http.client.reactive.ClientHttpRequest;
 import org.springframework.util.Assert;
+import org.springframework.util.MimeType;
 import org.springframework.web.util.UriComponentsBuilder;
 
 /**
  * Mock implementation of {@link ClientHttpRequest}.
+ *
  * @author Brian Clozel
  * @author Rossen Stoyanchev
  * @since 5.0
@@ -95,6 +101,31 @@ public class MockClientHttpRequest extends AbstractClientHttpRequest {
 		return this.body;
 	}
 
+	/**
+	 * Aggregate response data and convert to a String using the "Content-Type"
+	 * charset or "UTF-8" by default.
+	 */
+	public Mono<String> getBodyAsString() {
+
+		Charset charset = Optional.ofNullable(getHeaders().getContentType()).map(MimeType::getCharset)
+				.orElse(StandardCharsets.UTF_8);
+
+		return getBody()
+				.reduce(bufferFactory().allocateBuffer(), (previous, current) -> {
+					previous.write(current);
+					DataBufferUtils.release(current);
+					return previous;
+				})
+				.map(buffer -> bufferToString(buffer, charset));
+	}
+
+	private static String bufferToString(DataBuffer buffer, Charset charset) {
+		Assert.notNull(charset, "'charset' must not be null");
+		byte[] bytes = new byte[buffer.readableByteCount()];
+		buffer.read(bytes);
+		return new String(bytes, charset);
+	}
+
 	/**
 	 * Configure a custom handler for writing the request body.
 	 *