Merge branch '2.2.x' into 2.3.x

wilkinsona · wilkinsona · commit a2f7ce0564bb · 2020-06-25T10:32:32.000+01:00
Closes gh-22102
diff --git a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/web/test/WebEndpointTestInvocationContextProvider.java b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/web/test/WebEndpointTestInvocationContextProvider.java
@@ -194,7 +194,7 @@ private WebTestClient createWebTestClient() {
 					"http://localhost:" + determinePort());
 			uriBuilderFactory.setEncodingMode(EncodingMode.NONE);
 			return WebTestClient.bindToServer().uriBuilderFactory(uriBuilderFactory).responseTimeout(TIMEOUT)
-					.filter((request, next) -> {
+					.codecs((codecs) -> codecs.defaultCodecs().maxInMemorySize(-1)).filter((request, next) -> {
 						if (HttpMethod.GET == request.method()) {
 							return next.exchange(request).retry(10);
 						}

Original file line number	Diff line number	Diff line change
`@@ -194,7 +194,7 @@ private WebTestClient createWebTestClient() {`
`194`	`194`	`"http://localhost:" + determinePort());`
`195`	`195`	`uriBuilderFactory.setEncodingMode(EncodingMode.NONE);`
`196`	`196`	`return WebTestClient.bindToServer().uriBuilderFactory(uriBuilderFactory).responseTimeout(TIMEOUT)`
`197`		`- .filter((request, next) -> {`
	`197`	`+ .codecs((codecs) -> codecs.defaultCodecs().maxInMemorySize(-1)).filter((request, next) -> {`
`198`	`198`	`if (HttpMethod.GET == request.method()) {`
`199`	`199`	`return next.exchange(request).retry(10);`
`200`	`200`	`}`