Spring/spring-shell
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Inject the ValidatorFactory instead of Validator.

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

9
spring-shell-standard-commands/src/main/java/org/springframework/shell/standard/commands/Help.java
View File

@@ -40,6 +40,7 @@ import org.springframework.shell.standard.ShellOption;
import javax.validation.MessageInterpolator;
import javax.validation.Validation;
import javax.validation.ValidatorFactory;
import javax.validation.metadata.ConstraintDescriptor;
/**
@@ -72,7 +73,6 @@ public class Help {
private CommandRegistry commandRegistry;
@Autowired(required = false)
private MessageInterpolator messageInterpolator = Validation.buildDefaultValidatorFactory()
.getMessageInterpolator();
@@ -86,6 +86,13 @@ public class Help {
this.commandRegistry = commandRegistry;
}
@Autowired(required = false)
public void setValidatorFactory(ValidatorFactory validatorFactory) {
this.messageInterpolator = validatorFactory.getMessageInterpolator();
}
@ShellMethod(value = "Display help about available commands.", prefix = "-")
public CharSequence help(
@ShellOption(defaultValue = ShellOption.NULL, valueProvider = CommandValueProvider.class, value = { "-C",