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 '3.2.x' 

Closes gh-40365
This commit is contained in:
Moritz Halbritter 2024-04-16 13:40:11 +02:00
parent aefe6e8bc0 5058719242
commit 1cc453fd38
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/diagnostics/analyzer/BindValidationFailureAnalyzer.java
View File

@ -47,9 +47,9 @@ class BindValidationFailureAnalyzer extends AbstractFailureAnalyzer<Throwable> {
private ExceptionDetails getBindValidationExceptionDetails(Throwable rootFailure) { private ExceptionDetails getBindValidationExceptionDetails(Throwable rootFailure) {
BindValidationException validationException = findCause(rootFailure, BindValidationException.class); BindValidationException validationException = findCause(rootFailure, BindValidationException.class);
if (validationException != null) { if (validationException != null) {
BindException target = findCause(rootFailure, BindException.class); BindException bindException = findCause(rootFailure, BindException.class);
List<ObjectError> errors = validationException.getValidationErrors().getAllErrors(); List<ObjectError> errors = validationException.getValidationErrors().getAllErrors();
return new ExceptionDetails(errors, target, validationException); return new ExceptionDetails(errors, bindException.getTarget().getType(), validationException);
} }
org.springframework.validation.BindException bindException = findCause(rootFailure, org.springframework.validation.BindException bindException = findCause(rootFailure,
org.springframework.validation.BindException.class); org.springframework.validation.BindException.class);

8
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/diagnostics/analyzer/BindValidationFailureAnalyzerTests.java
View File

@ -63,9 +63,11 @@ class BindValidationFailureAnalyzerTests {
@Test @Test
void bindExceptionWithFieldErrorsDueToValidationFailure() { void bindExceptionWithFieldErrorsDueToValidationFailure() {
FailureAnalysis analysis = performAnalysis(FieldValidationFailureConfiguration.class); FailureAnalysis analysis = performAnalysis(FieldValidationFailureConfiguration.class);
assertThat(analysis.getDescription()).contains(failure("test.foo.foo", "null", "must not be null")); assertThat(analysis.getDescription()).contains(failure("test.foo.foo", "null", "must not be null"))
assertThat(analysis.getDescription()).contains(failure("test.foo.value", "0", "at least five")); .contains(failure("test.foo.value", "0", "at least five"))
assertThat(analysis.getDescription()).contains(failure("test.foo.nested.bar", "null", "must not be null")); .contains(failure("test.foo.nested.bar", "null", "must not be null"))
.contains(
"Binding to target org.springframework.boot.diagnostics.analyzer.BindValidationFailureAnalyzerTests$FieldValidationFailureProperties failed:");
} }
@Test @Test