Inject the ValidatorFactory instead of Validator.

This prevents the Spring Validator Factory from being injected (it
does not support the 1.1 methods)
This commit is contained in:
Eric Bottard
2017-09-11 17:16:43 +02:00
parent 8f3c11a3bd
commit 4a6c699aca
5 changed files with 34 additions and 9 deletions

View File

@@ -30,6 +30,7 @@ import javax.annotation.PostConstruct;
import javax.validation.ConstraintViolation;
import javax.validation.Validation;
import javax.validation.Validator;
import javax.validation.ValidatorFactory;
import javax.validation.executable.ExecutableValidator;
import org.springframework.beans.factory.annotation.Autowired;
@@ -64,7 +65,6 @@ public class Shell implements CommandRegistry {
@Autowired
protected ApplicationContext applicationContext;
@Autowired(required = false)
private Validator validator = Validation.buildDefaultValidatorFactory().getValidator();
protected Map<String, MethodTarget> methodTargets = new HashMap<>();
@@ -81,6 +81,11 @@ public class Shell implements CommandRegistry {
this.resultHandler = resultHandler;
}
@Autowired(required = false)
public void setValidatorFactory(ValidatorFactory validatorFactory) {
this.validator = validatorFactory.getValidator();
}
@Override
public Map<String, MethodTarget> listCommands() {
return methodTargets;