Cleanup

Author: jameskleeh

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

@@ -15,7 +15,7 @@
  */
 package org.grails.plugins.databinding
 
-import grails.JavaVersion
+import grails.internal.JavaVersion
 import grails.plugins.Plugin
 import grails.util.GrailsUtil
 import grails.web.databinding.DataBindingUtils

grails-plugin-gsp/src/main/groovy/org/grails/plugins/web/taglib/FormTagLib.groovy

@@ -15,13 +15,10 @@
  */
 package org.grails.plugins.web.taglib
 
-import grails.JavaVersion
+import grails.internal.JavaVersion
 import grails.artefact.TagLibrary
 import grails.gsp.TagLib
 import groovy.transform.CompileStatic
-import org.springframework.beans.factory.annotation.Autowired
-import org.springframework.core.convert.support.DefaultConversionService
-import org.springframework.core.convert.support.GenericConversionService
 
 import java.text.DateFormat
 import java.text.DateFormatSymbols
@@ -42,12 +39,7 @@ import org.springframework.http.HttpMethod
 import org.springframework.web.servlet.support.RequestContextUtils as RCU
 import org.springframework.web.servlet.support.RequestDataValueProcessor
 
-import java.time.LocalDate
-import java.time.LocalDateTime
-import java.time.LocalTime
-import java.time.ZoneId
-import java.time.ZonedDateTime
-import java.time.temporal.Temporal
+import java.time.*
 import java.time.temporal.TemporalAccessor
 
 /**

grails-plugin-gsp/src/main/groovy/org/grails/plugins/web/taglib/FormatTagLib.groovy

@@ -15,7 +15,7 @@
  */
 package org.grails.plugins.web.taglib
 
-import grails.JavaVersion
+import grails.internal.JavaVersion
 import grails.artefact.TagLibrary
 import grails.gsp.TagLib
 import groovy.transform.CompileStatic
@@ -35,7 +35,6 @@ import org.springframework.util.StringUtils
 
 import java.time.LocalDate
 import java.time.LocalDateTime
-import java.time.LocalTime
 import java.time.format.DateTimeFormatter
 import java.time.temporal.TemporalAccessor
 

grails-test-suite-web/src/test/groovy/org/grails/web/taglib/FormatTagLibTests.groovy

@@ -7,13 +7,7 @@ import java.text.DecimalFormatSymbols
 
 import org.grails.taglib.GrailsTagException
 
-import java.time.LocalDate
-import java.time.LocalDateTime
-import java.time.LocalTime
-import java.time.OffsetDateTime
-import java.time.OffsetTime
-import java.time.ZoneOffset
-import java.time.ZonedDateTime
+import java.time.*
 
 /**
  * Tests for the FormatTagLib.

grails-web/src/main/groovy/grails/JavaVersion.groovy

@@ -0,0 +1,34 @@
+/*
+ * Copyright 2014 original authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package grails.internal
+
+/**
+ * A class to determine the runtime Java version
+ *
+ * @author James Kleeh
+ * @since 3.2.1
+ */
+class JavaVersion {
+
+    static Boolean isAtLeast(int major, int minor) {
+        String version = System.getProperty("java.version");
+        int firstPos = version.indexOf('.');
+        int currMajor = Integer.parseInt(version.substring(0, firstPos));
+        int secondPos = version.indexOf('.', firstPos+1);
+        int currMinor = Integer.parseInt(version.substring(firstPos+1, secondPos));
+        currMajor >= major && currMinor >= minor
+    }
+}