Skip to content

Commit 1d2cd16

Browse files
committed
#13690 - ensure the data binder is initialized lazily
1 parent c356409 commit 1d2cd16

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
import org.springframework.context.ApplicationContext;
1818
import org.springframework.context.MessageSource;
1919
import org.springframework.context.annotation.Bean;
20+
import org.springframework.context.annotation.Lazy;
2021
import org.springframework.core.annotation.AnnotationAwareOrderComparator;
2122

2223
@AutoConfiguration
@@ -31,6 +32,7 @@ public DataBindingConfiguration(DataBindingConfigurationProperties configuration
3132
this.configurationProperties = configurationProperties;
3233
}
3334

35+
@Lazy
3436
@Bean("grailsWebDataBinder")
3537
protected GrailsWebDataBinder grailsWebDataBinder(
3638
GrailsApplication grailsApplication,

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ class DataBindingConfigurationSpec extends Specification implements GrailsUnitTe
3030
grailsApplication.mainContext.containsBean("grailsWebDataBinder")
3131
}
3232

33-
@PendingFeature(reason = 'test != test2')
3433
void "test custom ValueConverter are ordered if defined with @Order"() {
3534

3635
when:
@@ -43,7 +42,6 @@ class DataBindingConfigurationSpec extends Specification implements GrailsUnitTe
4342

4443
}
4544

46-
@PendingFeature(reason = 'test != test2')
4745
void "test customize data binding for the types which have standard ValueConverters using @Order"() {
4846
when:
4947
Map source = ["name": "John Doe", "prop": "test", "dob": "12031990"]

0 commit comments

Comments
 (0)