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

Lenient rejectedValue lookup in SpringValidatorAdapter 

Closes gh-29043
This commit is contained in:
rstoyanchev 2024-01-08 16:38:54 +00:00
parent 1f2d29ee08
commit 37fa82c578
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
spring-context/src/main/java/org/springframework/validation/beanvalidation/SpringValidatorAdapter.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2023 the original author or authors. * Copyright 2002-2024 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.
@ -32,6 +32,7 @@ import jakarta.validation.executable.ExecutableValidator;
import jakarta.validation.metadata.BeanDescriptor; import jakarta.validation.metadata.BeanDescriptor;
import jakarta.validation.metadata.ConstraintDescriptor; import jakarta.validation.metadata.ConstraintDescriptor;
import org.springframework.beans.InvalidPropertyException;
import org.springframework.beans.NotReadablePropertyException; import org.springframework.beans.NotReadablePropertyException;
import org.springframework.context.MessageSourceResolvable; import org.springframework.context.MessageSourceResolvable;
import org.springframework.context.support.DefaultMessageSourceResolvable; import org.springframework.context.support.DefaultMessageSourceResolvable;
@ -312,7 +313,13 @@ public class SpringValidatorAdapter implements SmartValidator, jakarta.validatio
(invalidValue == violation.getLeafBean() || field.contains("[") || field.contains("."))) { (invalidValue == violation.getLeafBean() || field.contains("[") || field.contains("."))) {
// Possibly a bean constraint with property path: retrieve the actual property value. // Possibly a bean constraint with property path: retrieve the actual property value.
// However, explicitly avoid this for "address[]" style paths that we can't handle. // However, explicitly avoid this for "address[]" style paths that we can't handle.
invalidValue = bindingResult.getRawFieldValue(field); try {
invalidValue = bindingResult.getRawFieldValue(field);
}
catch (InvalidPropertyException ex) {
// Bean validation uses ValueExtractor's to unwrap container values
// in which cases we can't access the raw value.
}
} }
return invalidValue; return invalidValue;
} }