Merge branch '3.1.x' into 3.2.x

Author: graemerocher

grails-core/src/main/groovy/grails/boot/config/GrailsApplicationPostProcessor.groovy

@@ -34,6 +34,7 @@ import org.springframework.context.event.ApplicationContextEvent
 import org.springframework.context.event.ContextClosedEvent
 import org.springframework.context.event.ContextRefreshedEvent
 import org.springframework.core.convert.converter.Converter
+import org.springframework.core.convert.support.ConfigurableConversionService
 import org.springframework.core.env.AbstractEnvironment
 import org.springframework.core.env.ConfigurableEnvironment
 import org.springframework.core.env.EnumerablePropertySource
@@ -109,16 +110,17 @@ class GrailsApplicationPostProcessor implements BeanDefinitionRegistryPostProces
 
     protected void loadApplicationConfig() {
         org.springframework.core.env.Environment environment = applicationContext.getEnvironment()
+        ConfigurableConversionService conversionService = null
         if(environment instanceof ConfigurableEnvironment) {
             if(environment instanceof AbstractEnvironment) {
-                def cs = environment.getConversionService()
-                cs.addConverter(new Converter<NavigableMap.NullSafeNavigator, String>() {
+                conversionService = environment.getConversionService()
+                conversionService.addConverter(new Converter<NavigableMap.NullSafeNavigator, String>() {
                     @Override
                     public String convert(NavigableMap.NullSafeNavigator source) {
                         return null;
                     }
                 });
-                cs.addConverter(new Converter<NavigableMap.NullSafeNavigator, Object>() {
+                conversionService.addConverter(new Converter<NavigableMap.NullSafeNavigator, Object>() {
                     @Override
                     public Object convert(NavigableMap.NullSafeNavigator source) {
                         return null;
@@ -138,7 +140,11 @@ class GrailsApplicationPostProcessor implements BeanDefinitionRegistryPostProces
                     }
                 }
             }
-            ((DefaultGrailsApplication)grailsApplication).config = new PropertySourcesConfig(propertySources)
+            def config = new PropertySourcesConfig(propertySources)
+            if(conversionService != null) {
+                config.setConversionService( conversionService )
+            }
+            ((DefaultGrailsApplication)grailsApplication).config = config
         }
     }
 

grails-core/src/main/groovy/org/grails/spring/context/support/MapBasedSmartPropertyOverrideConfigurer.groovy

@@ -60,11 +60,8 @@ class MapBasedSmartPropertyOverrideConfigurer implements BeanFactoryPostProcesso
                     final beanPropertyValue = beanPropertiesMap.get(beanPropertyName)
                     applyPropertyValue(factory, beanName.toString(), beanPropertyName.toString(), beanPropertyValue)
                 }
-
             }
-
         }
-
     }
 
     protected void applyPropertyValue(ConfigurableListableBeanFactory factory, String beanName, String property, Object value) {
@@ -116,15 +113,14 @@ class MapBasedSmartPropertyOverrideConfigurer implements BeanFactoryPostProcesso
     }
 
     protected BeanDefinition getTargetBeanDefinitionForFactoryBean(ConfigurableListableBeanFactory factory,
-            String beanName, BeanDefinition beanDefinition, Class beanClass) {
+            String beanName, BeanDefinition beanDefinition, Class<? extends FactoryBean> beanClass) {
 
         if (TransactionProxyFactoryBean.isAssignableFrom(beanClass)) {
             getTargetBeanDefinition(factory, beanName,
                     (BeanDefinition)beanDefinition.propertyValues.getPropertyValue("target").value)
         }
         else {
-            throw new BeanCreationException(beanName,
-                 "Unable to determine target bean definition for FactoryBeans of type " + beanClass.name)
+            beanDefinition
         }
     }
 }