Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Rename WebFlux response body methods

Browse Source 
This commit adapts to recent changes in Spring Framework.
See spring-projects/spring-framework#23212
This commit is contained in:
Brian Clozel
2019-08-20 13:03:24 +02:00
parent 752bb0f5ab
commit e7c3ab3e27
6 changed files with 21 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/reactive/error/AbstractErrorWebExceptionHandler.java
View File

@@ -171,7 +171,7 @@ public abstract class AbstractErrorWebExceptionHandler implements ErrorWebExcept
}
Resource resource = resolveResource(viewName);
if (resource != null) {
return responseBody.body(BodyInserters.fromResource(resource));
return responseBody.bodyValue(BodyInserters.fromResource(resource));
}
return Mono.empty();
}
@@ -223,7 +223,7 @@ public abstract class AbstractErrorWebExceptionHandler implements ErrorWebExcept
builder.append("<div style='white-space:pre-wrap;'>").append(htmlEscape(trace)).append("</div>");
}
builder.append("</body></html>");
return responseBody.body(builder.toString());
return responseBody.bodyValue(builder.toString());
}
private String htmlEscape(Object input) {

2
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/reactive/error/DefaultErrorWebExceptionHandlerIntegrationTests.java
View File

@@ -111,7 +111,7 @@ class DefaultErrorWebExceptionHandlerIntegrationTests {
void bindingResultError() {
this.contextRunner.run((context) -> {
WebTestClient client = getWebClient(context);
client.post().uri("/bind").contentType(MediaType.APPLICATION_JSON).body("{}").exchange().expectStatus()
client.post().uri("/bind").contentType(MediaType.APPLICATION_JSON).bodyValue("{}").exchange().expectStatus()
.isBadRequest().expectBody().jsonPath("status").isEqualTo("400").jsonPath("error")
.isEqualTo(HttpStatus.BAD_REQUEST.getReasonPhrase()).jsonPath("path").isEqualTo(("/bind"))
.jsonPath("exception").doesNotExist().jsonPath("errors").isArray().jsonPath("message").isNotEmpty()