mirror of
https://github.com/spring-projects/spring-boot.git
synced 2024-09-03 04:26:12 +08:00
Fix validation when key matching the prefix is set
Fixes gh-15597
This commit is contained in:
parent
ce62a962eb
commit
b345fc8574
@ -76,6 +76,17 @@ public class ValidationBindHandler extends AbstractBindHandler {
|
||||
super.onFinish(name, target, context, result);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Object onFailure(ConfigurationPropertyName name, Bindable<?> target,
|
||||
BindContext context, Exception error) throws Exception {
|
||||
Object result = super.onFailure(name, target, context, error);
|
||||
validate(name, target, context, null);
|
||||
if (!this.exceptions.isEmpty()) {
|
||||
throw this.exceptions.pop();
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
private void validate(ConfigurationPropertyName name, Bindable<?> target,
|
||||
BindContext context, Object result) {
|
||||
Object validationTarget = getValidationTarget(target, context, result);
|
||||
|
@ -27,6 +27,8 @@ import javax.validation.constraints.NotNull;
|
||||
import org.junit.Before;
|
||||
import org.junit.Test;
|
||||
|
||||
import org.springframework.boot.context.properties.bind.AbstractBindHandler;
|
||||
import org.springframework.boot.context.properties.bind.BindContext;
|
||||
import org.springframework.boot.context.properties.bind.BindException;
|
||||
import org.springframework.boot.context.properties.bind.Bindable;
|
||||
import org.springframework.boot.context.properties.bind.Binder;
|
||||
@ -35,6 +37,7 @@ import org.springframework.boot.context.properties.source.ConfigurationPropertyN
|
||||
import org.springframework.boot.context.properties.source.ConfigurationPropertySource;
|
||||
import org.springframework.boot.context.properties.source.MockConfigurationPropertySource;
|
||||
import org.springframework.boot.origin.Origin;
|
||||
import org.springframework.core.convert.ConverterNotFoundException;
|
||||
import org.springframework.validation.FieldError;
|
||||
import org.springframework.validation.ObjectError;
|
||||
import org.springframework.validation.annotation.Validated;
|
||||
@ -57,12 +60,14 @@ public class ValidationBindHandlerTests {
|
||||
|
||||
private Binder binder;
|
||||
|
||||
private LocalValidatorFactoryBean validator;
|
||||
|
||||
@Before
|
||||
public void setup() {
|
||||
this.binder = new Binder(this.sources);
|
||||
LocalValidatorFactoryBean validator = new LocalValidatorFactoryBean();
|
||||
validator.afterPropertiesSet();
|
||||
this.handler = new ValidationBindHandler(validator);
|
||||
this.validator = new LocalValidatorFactoryBean();
|
||||
this.validator.afterPropertiesSet();
|
||||
this.handler = new ValidationBindHandler(this.validator);
|
||||
}
|
||||
|
||||
@Test
|
||||
@ -162,6 +167,34 @@ public class ValidationBindHandlerTests {
|
||||
this.handler);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void bindShouldNotValidateIfOtherHandlersInChainThrowError() {
|
||||
this.sources.add(new MockConfigurationPropertySource("foo", "hello"));
|
||||
ExampleValidatedBean bean = new ExampleValidatedBean();
|
||||
assertThatExceptionOfType(BindException.class)
|
||||
.isThrownBy(
|
||||
() -> this.binder.bind("foo",
|
||||
Bindable.of(ExampleValidatedBean.class)
|
||||
.withExistingValue(bean),
|
||||
this.handler))
|
||||
.withCauseInstanceOf(ConverterNotFoundException.class);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void bindShouldValidateIfOtherHandlersInChainIgnoreError() {
|
||||
TestHandler testHandler = new TestHandler();
|
||||
this.handler = new ValidationBindHandler(testHandler, this.validator);
|
||||
this.sources.add(new MockConfigurationPropertySource("foo", "hello"));
|
||||
ExampleValidatedBean bean = new ExampleValidatedBean();
|
||||
assertThatExceptionOfType(BindException.class)
|
||||
.isThrownBy(
|
||||
() -> this.binder.bind("foo",
|
||||
Bindable.of(ExampleValidatedBean.class)
|
||||
.withExistingValue(bean),
|
||||
this.handler))
|
||||
.withCauseInstanceOf(BindValidationException.class);
|
||||
}
|
||||
|
||||
private BindValidationException bindAndExpectValidationError(Runnable action) {
|
||||
try {
|
||||
action.run();
|
||||
@ -265,4 +298,14 @@ public class ValidationBindHandlerTests {
|
||||
|
||||
}
|
||||
|
||||
static class TestHandler extends AbstractBindHandler {
|
||||
|
||||
@Override
|
||||
public Object onFailure(ConfigurationPropertyName name, Bindable<?> target,
|
||||
BindContext context, Exception error) throws Exception {
|
||||
return null;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user