Repository: camel Updated Branches: refs/heads/master aaa85fc74 -> 9a0278461
[Spring Boot] Improved tests. Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/9a027846 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/9a027846 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/9a027846 Branch: refs/heads/master Commit: 9a0278461638eba16815b07f2a422d041c37bd01 Parents: aaa85fc Author: Henryk Konsek <[email protected]> Authored: Mon Jan 5 16:00:55 2015 +0100 Committer: Henryk Konsek <[email protected]> Committed: Mon Jan 5 16:01:13 2015 +0100 ---------------------------------------------------------------------- .../camel/spring/boot/SpringConversionServiceConfiguration.java | 2 +- .../apache/camel/spring/boot/ExistingConversionServiceTest.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/9a027846/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/SpringConversionServiceConfiguration.java ---------------------------------------------------------------------- diff --git a/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/SpringConversionServiceConfiguration.java b/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/SpringConversionServiceConfiguration.java index 5ca2373..eb0dab0 100644 --- a/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/SpringConversionServiceConfiguration.java +++ b/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/SpringConversionServiceConfiguration.java @@ -27,7 +27,7 @@ import org.springframework.core.convert.support.DefaultConversionService; @Configuration public class SpringConversionServiceConfiguration { - @ConditionalOnMissingBean(ConversionService.class) + @ConditionalOnMissingBean @Bean ConversionService conversionService(ApplicationContext applicationContext) { DefaultConversionService service = new DefaultConversionService(); http://git-wip-us.apache.org/repos/asf/camel/blob/9a027846/components/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/ExistingConversionServiceTest.java ---------------------------------------------------------------------- diff --git a/components/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/ExistingConversionServiceTest.java b/components/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/ExistingConversionServiceTest.java index e0910fe..699f598 100644 --- a/components/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/ExistingConversionServiceTest.java +++ b/components/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/ExistingConversionServiceTest.java @@ -53,7 +53,7 @@ class ConversionServiceConfig { static ConversionService providedConversionService = new DefaultConversionService(); @Bean - ConversionService conversionService() { + ConversionService providedConversionService() { return providedConversionService; }
