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

Convert default value

Browse Source 
- Change parser to user conversion service to attempt
  conversion from a default value to an expected type.
- Make more use of shellConversionService bean so that
  we use the one which can be customized.
This commit is contained in:
Janne Valkealahti
2022-05-18 08:00:49 +01:00
parent 6a1158dc12
commit 57f6cff7c6
7 changed files with 91 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
spring-shell-autoconfigure/src/main/java/org/springframework/shell/boot/SpringShellAutoConfiguration.java
View File

@@ -20,6 +20,7 @@ import java.util.Set;
import org.jline.terminal.Terminal;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
import org.springframework.boot.convert.ApplicationConversionService;
import org.springframework.context.ApplicationContext;
@@ -44,7 +45,7 @@ import org.springframework.shell.result.ResultHandlerConfig;
public class SpringShellAutoConfiguration {
@Bean
@ConditionalOnMissingBean(ConversionService.class)
@ConditionalOnMissingBean(value = ConversionService.class, name = { "shellConversionService" })
public ConversionService shellConversionService(ApplicationContext applicationContext) {
FormattingConversionService service = new FormattingConversionService();
DefaultConversionService.addDefaultConverters(service);
@@ -63,7 +64,10 @@ public class SpringShellAutoConfiguration {
}
@Bean
public Shell shell(ResultHandlerService resultHandlerService, CommandCatalog commandRegistry, Terminal terminal) {
return new Shell(resultHandlerService, commandRegistry, terminal);
public Shell shell(ResultHandlerService resultHandlerService, CommandCatalog commandRegistry, Terminal terminal,
@Qualifier("shellConversionService") ConversionService shellConversionService) {
Shell shell = new Shell(resultHandlerService, commandRegistry, terminal);
shell.setConversionService(shellConversionService);
return shell;
}
}