Browse Source

Use Errors.hasErrors() in DefaultErrorAttributes

Closes gh-14912
pull/16246/head
dreis2211 7 years ago committed by Madhura Bhave
parent
commit
3fea487c7b
  1. 2
      spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/reactive/error/DefaultErrorAttributes.java
  2. 4
      spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/servlet/error/DefaultErrorAttributes.java

2
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/reactive/error/DefaultErrorAttributes.java

@ -141,7 +141,7 @@ public class DefaultErrorAttributes implements ErrorAttributes {
} }
if (error instanceof BindingResult) { if (error instanceof BindingResult) {
BindingResult result = (BindingResult) error; BindingResult result = (BindingResult) error;
if (result.getErrorCount() > 0) { if (result.hasErrors()) {
errorAttributes.put("errors", result.getAllErrors()); errorAttributes.put("errors", result.getAllErrors());
} }
} }

4
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/servlet/error/DefaultErrorAttributes.java

@ -1,5 +1,5 @@
/* /*
* Copyright 2012-2017 the original author or authors. * Copyright 2012-2018 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -159,7 +159,7 @@ public class DefaultErrorAttributes
errorAttributes.put("message", error.getMessage()); errorAttributes.put("message", error.getMessage());
return; return;
} }
if (result.getErrorCount() > 0) { if (result.hasErrors()) {
errorAttributes.put("errors", result.getAllErrors()); errorAttributes.put("errors", result.getAllErrors());
errorAttributes.put("message", errorAttributes.put("message",
"Validation failed for object='" + result.getObjectName() "Validation failed for object='" + result.getObjectName()

Loading…
Cancel
Save