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

Merge branch '2.2.x' 

Closes gh-19622
This commit is contained in:
Madhura Bhave 2020-01-10 13:01:54 -08:00
parent 88f7f8cca0 139995469a
commit d510a7bd80
2 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/bind/validation/ValidationBindHandler.java
View File

@ -16,10 +16,8 @@
package org.springframework.boot.context.properties.bind.validation; package org.springframework.boot.context.properties.bind.validation;
import java.util.Deque;
import java.util.LinkedHashMap; import java.util.LinkedHashMap;
import java.util.LinkedHashSet; import java.util.LinkedHashSet;
import java.util.LinkedList;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
import java.util.stream.Collectors; import java.util.stream.Collectors;
@ -52,7 +50,7 @@ public class ValidationBindHandler extends AbstractBindHandler {
private final Set<ConfigurationProperty> boundProperties = new LinkedHashSet<>(); private final Set<ConfigurationProperty> boundProperties = new LinkedHashSet<>();
private final Deque<BindValidationException> exceptions = new LinkedList<>(); private BindValidationException exception;
public ValidationBindHandler(Validator... validators) { public ValidationBindHandler(Validator... validators) {
this.validators = validators; this.validators = validators;
@ -94,7 +92,7 @@ public class ValidationBindHandler extends AbstractBindHandler {
this.boundTypes.clear(); this.boundTypes.clear();
this.boundResults.clear(); this.boundResults.clear();
this.boundProperties.clear(); this.boundProperties.clear();
this.exceptions.clear(); this.exception = null;
} }
@Override @Override
@ -105,13 +103,15 @@ public class ValidationBindHandler extends AbstractBindHandler {
} }
private void validate(ConfigurationPropertyName name, Bindable<?> target, BindContext context, Object result) { private void validate(ConfigurationPropertyName name, Bindable<?> target, BindContext context, Object result) {
Object validationTarget = getValidationTarget(target, context, result); if (this.exception == null) {
Class<?> validationType = target.getBoxedType().resolve(); Object validationTarget = getValidationTarget(target, context, result);
if (validationTarget != null) { Class<?> validationType = target.getBoxedType().resolve();
validateAndPush(name, validationTarget, validationType); if (validationTarget != null) {
validateAndPush(name, validationTarget, validationType);
}
} }
if (context.getDepth() == 0 && !this.exceptions.isEmpty()) { if (context.getDepth() == 0 && this.exception != null) {
throw this.exceptions.pop(); throw this.exception;
} }
} }
@ -134,7 +134,7 @@ public class ValidationBindHandler extends AbstractBindHandler {
} }
} }
if (result != null && result.hasErrors()) { if (result != null && result.hasErrors()) {
this.exceptions.push(new BindValidationException(result.getValidationErrors())); this.exception = new BindValidationException(result.getValidationErrors());
} }
} }

9
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/bind/validation/ValidationBindHandlerTests.java
View File

@ -201,6 +201,15 @@ class ValidationBindHandlerTests {
assertThat(cause.getMessage()).contains("rejected value [2]"); assertThat(cause.getMessage()).contains("rejected value [2]");
} }
@Test
void validationShouldBeSkippedIfPreviousValidationErrorPresent() {
this.sources.add(new MockConfigurationPropertySource("foo.inner.person-age", 2));
BindValidationException cause = bindAndExpectValidationError(() -> this.binder
.bind(ConfigurationPropertyName.of("foo"), Bindable.of(ExampleCamelCase.class), this.handler));
FieldError fieldError = (FieldError) cause.getValidationErrors().getAllErrors().get(0);
assertThat(fieldError.getField()).isEqualTo("personAge");
}
private BindValidationException bindAndExpectValidationError(Runnable action) { private BindValidationException bindAndExpectValidationError(Runnable action) {
try { try {
action.run(); action.run();