Merge branch '2.2.x'

Closes gh-19568
This commit is contained in:
Andy Wilkinson 2020-01-08 11:15:59 +00:00
commit cbacb6116b

View File

@ -54,6 +54,7 @@ import org.springframework.http.HttpStatus;
import org.springframework.test.web.reactive.server.EntityExchangeResult;
import org.springframework.test.web.reactive.server.WebTestClient;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.reactive.function.client.ExchangeStrategies;
import static org.assertj.core.api.Assertions.assertThat;
@ -164,7 +165,10 @@ class WebMvcEndpointExposureIntegrationTests {
private WebTestClient createClient(AssertableWebApplicationContext context) {
int port = context.getSourceApplicationContext(ServletWebServerApplicationContext.class).getWebServer()
.getPort();
return WebTestClient.bindToServer().baseUrl("http://localhost:" + port).build();
ExchangeStrategies exchangeStrategies = ExchangeStrategies.builder()
.codecs((configurer) -> configurer.defaultCodecs().maxInMemorySize(512 * 1024)).build();
return WebTestClient.bindToServer().baseUrl("http://localhost:" + port).exchangeStrategies(exchangeStrategies)
.build();
}
private boolean isExposed(WebTestClient client, HttpMethod method, String path) throws Exception {