root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 12 Packages Projects Releases Wiki Activity

Merge branch '2.3.x' 

Closes gh-21770
This commit is contained in:
Scott Frederick 2020-06-08 15:03:52 -05:00
parent ad6a0d473a 97ff3a8782
commit f3d5416cf4
2 changed files with 64 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/servlet/error/BasicErrorController.java
View File

@ -172,7 +172,7 @@ public class BasicErrorController extends AbstractErrorController {
* @return if the errors attribute should be included * @return if the errors attribute should be included
*/ */
protected boolean isIncludeBindingErrors(HttpServletRequest request, MediaType produces) { protected boolean isIncludeBindingErrors(HttpServletRequest request, MediaType produces) {
switch (getErrorProperties().getIncludeMessage()) { switch (getErrorProperties().getIncludeBindingErrors()) {
case ALWAYS: case ALWAYS:
return true; return true;
case ON_PARAM: case ON_PARAM:

87
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/servlet/error/BasicErrorControllerIntegrationTests.java
View File

@ -205,50 +205,89 @@ class BasicErrorControllerIntegrationTests {
} }
@Test @Test
void testBindingExceptionForMachineClientWithMessageAndErrorsParamTrue() { void testBindingExceptionForMachineClientWithErrorsParamTrue() {
load("--server.error.include-exception=true", "--server.error.include-message=on-param", load("--server.error.include-exception=true", "--server.error.include-binding-errors=on-param");
"--server.error.include-binding-errors=on-param"); bindingExceptionWithErrors("?errors=true");
bindingExceptionWithMessageAndErrors("?message=true&errors=true");
} }
@Test @Test
void testBindingExceptionForMachineClientWithMessageAndErrorsParamFalse() { void testBindingExceptionForMachineClientWithErrorsParamFalse() {
load("--server.error.include-exception=true", "--server.error.include-message=on-param", load("--server.error.include-exception=true", "--server.error.include-binding-errors=on-param");
"--server.error.include-binding-errors=on-param"); bindingExceptionWithoutErrors("?errors=false");
bindingExceptionWithoutMessageAndErrors("?message=false&errors=false");
} }
@Test @Test
void testBindingExceptionForMachineClientWithMessageAndErrorsParamAbsent() { void testBindingExceptionForMachineClientWithErrorsParamAbsent() {
load("--server.error.include-exception=true", "--server.error.include-message=on-param", load("--server.error.include-exception=true", "--server.error.include-binding-errors=on-param");
"--server.error.include-binding-errors=on-param"); bindingExceptionWithoutErrors("");
bindingExceptionWithoutMessageAndErrors("");
} }
@Test @Test
void testBindingExceptionForMachineClientAlwaysMessageAndErrors() { void testBindingExceptionForMachineClientAlwaysErrors() {
load("--server.error.include-exception=true", "--server.error.include-message=always", load("--server.error.include-exception=true", "--server.error.include-binding-errors=always");
"--server.error.include-binding-errors=always"); bindingExceptionWithErrors("?errors=false");
bindingExceptionWithMessageAndErrors("?message=false&errors=false");
} }
@Test @Test
void testBindingExceptionForMachineClientNeverMessageAndErrors() { void testBindingExceptionForMachineClientNeverErrors() {
load("--server.error.include-exception=true", "--server.error.include-message=never", load("--server.error.include-exception=true", "--server.error.include-binding-errors=never");
"--server.error.include-binding-errors=never"); bindingExceptionWithoutErrors("?errors=true");
bindingExceptionWithoutMessageAndErrors("?message=true&errors=true"); }
@Test
void testBindingExceptionForMachineClientWithMessageParamTrue() {
load("--server.error.include-exception=true", "--server.error.include-message=on-param");
bindingExceptionWithMessage("?message=true");
}
@Test
void testBindingExceptionForMachineClientWithMessageParamFalse() {
load("--server.error.include-exception=true", "--server.error.include-message=on-param");
bindingExceptionWithoutMessage("?message=false");
}
@Test
void testBindingExceptionForMachineClientWithMessageParamAbsent() {
load("--server.error.include-exception=true", "--server.error.include-message=on-param");
bindingExceptionWithoutMessage("");
}
@Test
void testBindingExceptionForMachineClientAlwaysMessage() {
load("--server.error.include-exception=true", "--server.error.include-message=always");
bindingExceptionWithMessage("?message=false");
}
@Test
void testBindingExceptionForMachineClientNeverMessage() {
load("--server.error.include-exception=true", "--server.error.include-message=never");
bindingExceptionWithoutMessage("?message=true");
} }
@SuppressWarnings({ "rawtypes" }) @SuppressWarnings({ "rawtypes" })
private void bindingExceptionWithMessageAndErrors(String param) { private void bindingExceptionWithErrors(String param) {
ResponseEntity<Map> entity = new TestRestTemplate().getForEntity(createUrl("/bind" + param), Map.class); ResponseEntity<Map> entity = new TestRestTemplate().getForEntity(createUrl("/bind" + param), Map.class);
assertErrorAttributes(entity.getBody(), "400", "Bad Request", BindException.class, assertErrorAttributes(entity.getBody(), "400", "Bad Request", BindException.class, "", "/bind");
"Validation failed for object='test'. Error count: 1", "/bind");
assertThat(entity.getBody().containsKey("errors")).isTrue(); assertThat(entity.getBody().containsKey("errors")).isTrue();
} }
@SuppressWarnings({ "rawtypes" }) @SuppressWarnings({ "rawtypes" })
private void bindingExceptionWithoutMessageAndErrors(String param) { private void bindingExceptionWithoutErrors(String param) {
ResponseEntity<Map> entity = new TestRestTemplate().getForEntity(createUrl("/bind" + param), Map.class);
assertErrorAttributes(entity.getBody(), "400", "Bad Request", BindException.class, "", "/bind");
assertThat(entity.getBody().containsKey("errors")).isFalse();
}
@SuppressWarnings({ "rawtypes" })
private void bindingExceptionWithMessage(String param) {
ResponseEntity<Map> entity = new TestRestTemplate().getForEntity(createUrl("/bind" + param), Map.class);
assertErrorAttributes(entity.getBody(), "400", "Bad Request", BindException.class,
"Validation failed for object='test'. Error count: 1", "/bind");
assertThat(entity.getBody().containsKey("errors")).isFalse();
}
@SuppressWarnings({ "rawtypes" })
private void bindingExceptionWithoutMessage(String param) {
ResponseEntity<Map> entity = new TestRestTemplate().getForEntity(createUrl("/bind" + param), Map.class); ResponseEntity<Map> entity = new TestRestTemplate().getForEntity(createUrl("/bind" + param), Map.class);
assertErrorAttributes(entity.getBody(), "400", "Bad Request", BindException.class, "", "/bind"); assertErrorAttributes(entity.getBody(), "400", "Bad Request", BindException.class, "", "/bind");
assertThat(entity.getBody().containsKey("errors")).isFalse(); assertThat(entity.getBody().containsKey("errors")).isFalse();