Skip to content

Commit 31be52d

Browse files
committed
Move JSR310 out of core - Creating a separate plugin. Update formatDate and datePicker tags to move date logic to a bean
1 parent e14dc4b commit 31be52d

File tree

9 files changed

+102
-460
lines changed

9 files changed

+102
-460
lines changed

build.gradle

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -336,7 +336,6 @@ subprojects { project ->
336336
if (isTravisBuild) {
337337
maxParallelForks = 2
338338
maxHeapSize = '768m'
339-
minHeapSize = '256m'
340339
if(!isJava8Compatible) {
341340
jvmArgs '-XX:MaxPermSize=256m'
342341
}

grails-plugin-databinding/src/main/groovy/org/grails/databinding/converters/web/Jsr310ConvertersConfiguration.groovy

Lines changed: 0 additions & 341 deletions
This file was deleted.

grails-plugin-databinding/src/main/groovy/org/grails/plugins/databinding/DataBindingGrailsPlugin.groovy

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,8 @@ class DataBindingGrailsPlugin extends Plugin {
4848
public static final String AUTO_GROW_COLLECTION_LIMIT = 'grails.databinding.autoGrowCollectionLimit'
4949
public static final String DATE_FORMATS = 'grails.databinding.dateFormats'
5050

51+
public static final List<String> DEFAULT_DATE_FORMATS = ['yyyy-MM-dd HH:mm:ss.S',"yyyy-MM-dd'T'HH:mm:ss'Z'","yyyy-MM-dd HH:mm:ss.S z","yyyy-MM-dd'T'HH:mm:ss.SSSX"]
52+
5153
def version = GrailsUtil.getGrailsVersion()
5254

5355
@Override
@@ -57,7 +59,7 @@ class DataBindingGrailsPlugin extends Plugin {
5759
boolean trimStringsSetting = config.getProperty(TRIM_STRINGS, Boolean, true)
5860
boolean convertEmptyStringsToNullSetting = config.getProperty(CONVERT_EMPTY_STRINGS_TO_NULL, Boolean, true)
5961
Integer autoGrowCollectionLimitSetting = config.getProperty(AUTO_GROW_COLLECTION_LIMIT, Integer, 256)
60-
List dateFormats = config.getProperty(DATE_FORMATS, List, ['yyyy-MM-dd HH:mm:ss.S',"yyyy-MM-dd'T'HH:mm:ss'Z'","yyyy-MM-dd HH:mm:ss.S z","yyyy-MM-dd'T'HH:mm:ss.SSSX"])
62+
List dateFormats = config.getProperty(DATE_FORMATS, List, DEFAULT_DATE_FORMATS)
6163

6264

6365
"${DataBindingUtils.DATA_BINDER_BEAN_NAME}"(GrailsWebDataBinder, grailsApplication) {
@@ -90,12 +92,6 @@ class DataBindingGrailsPlugin extends Plugin {
9092
targetType = BigInteger
9193
}
9294

93-
if (JavaVersion.isAtLeast(1,8)) {
94-
jsr310ConvertersConfiguration(Jsr310ConvertersConfiguration) {
95-
formatStrings = dateFormats
96-
}
97-
}
98-
9995
"${DataBindingSourceRegistry.BEAN_NAME}"(DefaultDataBindingSourceRegistry)
10096

10197
xmlDataBindingSourceCreator(XmlDataBindingSourceCreator)

0 commit comments

Comments
 (0)