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

Qualify the Spring Shell provided ConversionService

Browse Source 
Fixes #173
This commit is contained in:
Eric Bottard
2017-11-06 14:52:50 +01:00
parent 2ff18f9062
commit 7d50c0813f
3 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
spring-shell-core/src/main/java/org/springframework/shell/SpringShellAutoConfiguration.java
View File

@@ -44,7 +44,7 @@ import javax.validation.Validator;
public class SpringShellAutoConfiguration {
@Bean
@ConditionalOnMissingBean(ConversionService.class)
@Qualifier("spring-shell")
public ConversionService conversionService(ApplicationContext applicationContext) {
Collection<Converter> converters = applicationContext.getBeansOfType(Converter.class).values();
Collection<GenericConverter> genericConverters = applicationContext.getBeansOfType(GenericConverter.class).values();
@@ -63,6 +63,11 @@ public class SpringShellAutoConfiguration {
return defaultConversionService;
}
@Bean
public ConversionService other() {
return new DefaultConversionService();
}
@Bean
@ConditionalOnMissingBean(Validator.class)
public Validator validator() {