Move some methods from DateTimeUtils to DateTimeFunctions

h2/src/main/org/h2/expression/Function.java

@@ -1458,7 +1458,7 @@ public class Function extends Expression implements FunctionCall {
                     tz = DateTimeUtils.timeZoneNameFromOffsetMins(
                             ((ValueTimestampTimeZone) v0).getTimeZoneOffsetMins());
                 }
-                result = ValueString.get(DateTimeUtils.formatDateTime(
+                result = ValueString.get(DateTimeFunctions.formatDateTime(
                         v0.getTimestamp(), v1.getString(), locale, tz),
                         database.getMode().treatEmptyStringsAsNull);
             }
@@ -1472,7 +1472,7 @@ public class Function extends Expression implements FunctionCall {
                         null : v2 == ValueNull.INSTANCE ? null : v2.getString();
                 String tz = v3 == null ?
                         null : v3 == ValueNull.INSTANCE ? null : v3.getString();
-                java.util.Date d = DateTimeUtils.parseDateTime(
+                java.util.Date d = DateTimeFunctions.parseDateTime(
                         v0.getString(), v1.getString(), locale, tz);
                 result = ValueTimestamp.fromMillis(d.getTime());
             }

h2/src/main/org/h2/util/DateTimeFunctions.java

@@ -27,10 +27,13 @@ import static org.h2.expression.Function.YEAR;
 
 import java.math.BigDecimal;
 import java.text.DateFormatSymbols;
+import java.text.SimpleDateFormat;
 import java.util.GregorianCalendar;
 import java.util.HashMap;
 import java.util.Locale;
+import java.util.TimeZone;
 
+import org.h2.api.ErrorCode;
 import org.h2.expression.Function;
 import org.h2.message.DbException;
 import org.h2.value.Value;
@@ -371,6 +374,46 @@ public final class DateTimeFunctions {
         return result;
     }
 
+    /**
+     * Formats a date using a format string.
+     *
+     * @param date
+     *            the date to format
+     * @param format
+     *            the format string
+     * @param locale
+     *            the locale
+     * @param timeZone
+     *            the timezone
+     * @return the formatted date
+     */
+    public static String formatDateTime(java.util.Date date, String format, String locale, String timeZone) {
+        SimpleDateFormat dateFormat = getDateFormat(format, locale, timeZone);
+        synchronized (dateFormat) {
+            return dateFormat.format(date);
+        }
+    }
+
+    private static SimpleDateFormat getDateFormat(String format, String locale, String timeZone) {
+        try {
+            // currently, a new instance is create for each call
+            // however, could cache the last few instances
+            SimpleDateFormat df;
+            if (locale == null) {
+                df = new SimpleDateFormat(format);
+            } else {
+                Locale l = new Locale(locale);
+                df = new SimpleDateFormat(format, l);
+            }
+            if (timeZone != null) {
+                df.setTimeZone(TimeZone.getTimeZone(timeZone));
+            }
+            return df;
+        } catch (Exception e) {
+            throw DbException.get(ErrorCode.PARSE_ERROR_1, e, format + "/" + locale + "/" + timeZone);
+        }
+    }
+
     private static int getDatePart(String part) {
         Integer p = DATE_PART.get(StringUtils.toUpperEnglish(part));
         if (p == null) {
@@ -474,6 +517,31 @@ public final class DateTimeFunctions {
         return DATE_PART.containsKey(StringUtils.toUpperEnglish(part));
     }
 
+    /**
+     * Parses a date using a format string.
+     *
+     * @param date
+     *            the date to parse
+     * @param format
+     *            the parsing format
+     * @param locale
+     *            the locale
+     * @param timeZone
+     *            the timeZone
+     * @return the parsed date
+     */
+    public static java.util.Date parseDateTime(String date, String format, String locale, String timeZone) {
+        SimpleDateFormat dateFormat = getDateFormat(format, locale, timeZone);
+        try {
+            synchronized (dateFormat) {
+                return dateFormat.parse(date);
+            }
+        } catch (Exception e) {
+            // ParseException
+            throw DbException.get(ErrorCode.PARSE_ERROR_1, e, date);
+        }
+    }
+
     private static long weekdiff(long absolute1, long absolute2, int firstDayOfWeek) {
         absolute1 += 4 - firstDayOfWeek;
         long r1 = absolute1 / 7;

h2/src/main/org/h2/util/DateTimeUtils.java

@@ -9,12 +9,9 @@ package org.h2.util;
 import java.sql.Date;
 import java.sql.Time;
 import java.sql.Timestamp;
-import java.text.SimpleDateFormat;
 import java.util.Calendar;
 import java.util.GregorianCalendar;
-import java.util.Locale;
 import java.util.TimeZone;
-import org.h2.api.ErrorCode;
 import org.h2.engine.Mode;
 import org.h2.message.DbException;
 import org.h2.value.Value;
@@ -859,67 +856,6 @@ public class DateTimeUtils {
         return year;
     }
 
-    /**
-     * Formats a date using a format string.
-     *
-     * @param date the date to format
-     * @param format the format string
-     * @param locale the locale
-     * @param timeZone the timezone
-     * @return the formatted date
-     */
-    public static String formatDateTime(java.util.Date date, String format,
-            String locale, String timeZone) {
-        SimpleDateFormat dateFormat = getDateFormat(format, locale, timeZone);
-        synchronized (dateFormat) {
-            return dateFormat.format(date);
-        }
-    }
-
-    /**
-     * Parses a date using a format string.
-     *
-     * @param date the date to parse
-     * @param format the parsing format
-     * @param locale the locale
-     * @param timeZone the timeZone
-     * @return the parsed date
-     */
-    public static java.util.Date parseDateTime(String date, String format,
-            String locale, String timeZone) {
-        SimpleDateFormat dateFormat = getDateFormat(format, locale, timeZone);
-        try {
-            synchronized (dateFormat) {
-                return dateFormat.parse(date);
-            }
-        } catch (Exception e) {
-            // ParseException
-            throw DbException.get(ErrorCode.PARSE_ERROR_1, e, date);
-        }
-    }
-
-    private static SimpleDateFormat getDateFormat(String format, String locale,
-            String timeZone) {
-        try {
-            // currently, a new instance is create for each call
-            // however, could cache the last few instances
-            SimpleDateFormat df;
-            if (locale == null) {
-                df = new SimpleDateFormat(format);
-            } else {
-                Locale l = new Locale(locale);
-                df = new SimpleDateFormat(format, l);
-            }
-            if (timeZone != null) {
-                df.setTimeZone(TimeZone.getTimeZone(timeZone));
-            }
-            return df;
-        } catch (Exception e) {
-            throw DbException.get(ErrorCode.PARSE_ERROR_1, e,
-                    format + "/" + locale + "/" + timeZone);
-        }
-    }
-
     /**
      * Returns number of days in month.
      *

h2/src/test/org/h2/test/unit/TestStringUtils.java

@@ -13,7 +13,7 @@ import java.util.Random;
 import org.h2.message.DbException;
 import org.h2.test.TestBase;
 import org.h2.test.utils.AssertThrows;
-import org.h2.util.DateTimeUtils;
+import org.h2.util.DateTimeFunctions;
 import org.h2.util.StringUtils;
 
 /**
@@ -85,7 +85,7 @@ public class TestStringUtils extends TestBase {
                 StringUtils.xmlText("Rand&Blue"));
         assertEquals("<<[[[]]]>>",
                 StringUtils.xmlCData("<<[[[]]]>>"));
-        Date dt = DateTimeUtils.parseDateTime(
+        Date dt = DateTimeFunctions.parseDateTime(
                 "2001-02-03 04:05:06 GMT",
                 "yyyy-MM-dd HH:mm:ss z", "en", "GMT");
         String s = StringUtils.xmlStartDoc()
@@ -99,10 +99,10 @@ public class TestStringUtils extends TestBase {
                         + StringUtils.xmlNode("description", null, "H2 Database Engine")
                         + StringUtils.xmlNode("language", null, "en-us")
                         + StringUtils.xmlNode("pubDate", null,
-                                DateTimeUtils.formatDateTime(dt,
+                                DateTimeFunctions.formatDateTime(dt,
                                 "EEE, d MMM yyyy HH:mm:ss z", "en", "GMT"))
                         + StringUtils.xmlNode("lastBuildDate", null,
-                                DateTimeUtils.formatDateTime(dt,
+                                DateTimeFunctions.formatDateTime(dt,
                                 "EEE, d MMM yyyy HH:mm:ss z", "en", "GMT"))
                         + StringUtils.xmlNode("item", null,
                                 StringUtils.xmlNode("title", null,