From 6e6154a80a5aef9b4963806ff4880e373c87d54d Mon Sep 17 00:00:00 2001
From: Eric Bottard <eric.bottard+github@gmail.com>
Date: Mon, 27 Nov 2017 16:42:17 +0100
Subject: [PATCH] Rename conversionService to something else to avoid
 initialization cycle issue (Converters were not being wired, etc).

Fixes #180
---
 .../shell/SpringShellAutoConfiguration.java                | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/spring-shell-core/src/main/java/org/springframework/shell/SpringShellAutoConfiguration.java b/spring-shell-core/src/main/java/org/springframework/shell/SpringShellAutoConfiguration.java
index 53416378..d80b5804 100644
--- a/spring-shell-core/src/main/java/org/springframework/shell/SpringShellAutoConfiguration.java
+++ b/spring-shell-core/src/main/java/org/springframework/shell/SpringShellAutoConfiguration.java
@@ -45,7 +45,7 @@ public class SpringShellAutoConfiguration {
 
 	@Bean
 	@Qualifier("spring-shell")
-	public ConversionService conversionService(ApplicationContext applicationContext) {
+	public ConversionService shellConversionService(ApplicationContext applicationContext) {
 		Collection<Converter> converters = applicationContext.getBeansOfType(Converter.class).values();
 		Collection<GenericConverter> genericConverters = applicationContext.getBeansOfType(GenericConverter.class).values();
 		Collection<ConverterFactory> converterFactories = applicationContext.getBeansOfType(ConverterFactory.class).values();
@@ -63,11 +63,6 @@ public class SpringShellAutoConfiguration {
 		return defaultConversionService;
 	}
 
-	@Bean
-	public ConversionService other() {
-		return new DefaultConversionService();
-	}
-
 	@Bean
 	@ConditionalOnMissingBean(Validator.class)
 	public Validator validator() {