Merge pull request #13917 from jdaugherty/7.0.x

#13690 - ensure the data binder is initialized lazily

Author: codeconsole

grails-plugin-databinding/src/main/groovy/org/grails/plugins/databinding/DataBindingConfiguration.java

@@ -17,6 +17,7 @@
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.MessageSource;
 import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.core.annotation.AnnotationAwareOrderComparator;
 
 @AutoConfiguration
@@ -31,6 +32,12 @@ public DataBindingConfiguration(DataBindingConfigurationProperties configuration
         this.configurationProperties = configurationProperties;
     }
 
+    /*
+    Must be lazy initialized because plugins ValueConverters & StructuredBindingEditors may be initialized by the Grails
+    Bean DSL instead of an AutoConfiguration. For example, DataBindingConfigurationSpec defines beans as part of the test
+    startup and without this being Lazy it, those beans will never be wired to the GrailsWebDataBinder bean.
+     */
+    @Lazy
     @Bean("grailsWebDataBinder")
     protected GrailsWebDataBinder grailsWebDataBinder(
             GrailsApplication grailsApplication,

grails-plugin-databinding/src/test/groovy/org/grails/plugins/databinding/DataBindingConfigurationSpec.groovy

@@ -30,7 +30,6 @@ class DataBindingConfigurationSpec extends Specification implements GrailsUnitTe
         grailsApplication.mainContext.containsBean("grailsWebDataBinder")
     }
 
-    @PendingFeature(reason = 'test != test2')
     void "test custom ValueConverter are ordered if defined with @Order"() {
 
         when:
@@ -43,7 +42,6 @@ class DataBindingConfigurationSpec extends Specification implements GrailsUnitTe
 
     }
 
-    @PendingFeature(reason = 'test != test2')
     void "test customize data binding for the types which have standard ValueConverters using @Order"() {
         when:
         Map source = ["name": "John Doe", "prop": "test", "dob": "12031990"]