DateUtilities.parse() now allows for timezone offsets to include a "s…

…econds" (third) time component.

Many more conversion tests added.  682 conversions supported, 164 conversion pairs to test.

README.md

@@ -15,15 +15,15 @@ The classes in the`.jar`file are version 52 (`JDK 1.8`).
 To include in your project:
 ##### GradleF
 ```
-implementation 'com.cedarsoftware:java-util:2.4.2'
+implementation 'com.cedarsoftware:java-util:2.4.3'
 ```
 
 ##### Maven
 ```
 <dependency>
   <groupId>com.cedarsoftware</groupId>
   <artifactId>java-util</artifactId>
-  <version>2.4.2</version>
+  <version>2.4.3</version>
 </dependency>
 ```
 ---

changelog.md

@@ -1,4 +1,6 @@
 ### Revision History
+* 2.4.3
+  * `Converter` - many more tests added.  Up to about 680 combinations now.  Waiting to release 2.5.0 when all "cross product" of tests are completed.  
 * 2.4.2
   * Fixed compatibility issues with `StringUtilities.` Method parameters changed from String to CharSequence broke backward compatibility.  Linked jars are bound to method signature at compile time, not at runtime. Added both methods where needed.  Removed methods with "Not" in the name.
   * Fixed compatibility issue with `FastByteArrayOutputStream.` The `.getBuffer()` API was removed in favor of toByteArray(). Now both methods exist, leaving `getBuffer()` for backward compatibility.

pom.xml

@@ -5,7 +5,7 @@
     <groupId>com.cedarsoftware</groupId>
     <artifactId>java-util</artifactId>
     <packaging>jar</packaging>
-    <version>2.4.2</version>
+    <version>2.4.3</version>
     <description>Java Utilities</description>
     <url>https://github.com/jdereg/java-util</url>
 

src/main/java/com/cedarsoftware/util/ArrayUtilities.java

@@ -34,6 +34,7 @@ public final class ArrayUtilities
 
     public static final byte[] EMPTY_BYTE_ARRAY = new byte[0];
     public static final char[] EMPTY_CHAR_ARRAY = new char[0];
+    public static final Character[] EMPTY_CHARACTER_ARRAY = new Character[0];
 
     public static final Class[] EMPTY_CLASS_ARRAY = new Class[0];
 

src/main/java/com/cedarsoftware/util/DateUtilities.java

@@ -4,7 +4,6 @@
 import java.time.ZoneId;
 import java.time.ZoneOffset;
 import java.time.ZonedDateTime;
-import java.time.temporal.TemporalAccessor;
 import java.util.Date;
 import java.util.Map;
 import java.util.TimeZone;
@@ -91,6 +90,7 @@ public final class DateUtilities {
     private static final String wsOrComma = "[ ,]+";
     private static final String tzUnix = "[A-Z]{1,3}";
     private static final String tz_Hh_MM = "[+-]\\d{1,2}:\\d{2}";
+    private static final String tz_Hh_MM_SS = "[+-]\\d{1,2}:\\d{2}:\\d{2}";
     private static final String tz_HHMM = "[+-]\\d{4}";
     private static final String tz_Hh = "[+-]\\d{1,2}";
     private static final String tzNamed = wsOp + "\\[?[A-Za-z][A-Za-z0-9~\\/._+-]+]?";
@@ -112,7 +112,7 @@ public final class DateUtilities {
             Pattern.CASE_INSENSITIVE);
 
     private static final Pattern timePattern = Pattern.compile(
-            "(" + d2 + "):(" + d2 + ")(?::(" + d2 + ")(" + nano + ")?)?(" + tz_Hh_MM + "|" + tz_HHMM + "|" + tz_Hh + "|Z)?(" + tzNamed + ")?",
+            "(" + d2 + "):(" + d2 + ")(?::(" + d2 + ")(" + nano + ")?)?(" + tz_Hh_MM_SS + "|" + tz_Hh_MM + "|" + tz_HHMM + "|" + tz_Hh + "|Z)?(" + tzNamed + ")?",
             Pattern.CASE_INSENSITIVE);
 
     private static final Pattern dayPattern = Pattern.compile("\\b(" + days + ")\\b", Pattern.CASE_INSENSITIVE);
@@ -155,32 +155,33 @@ private DateUtilities() {
      * timezone used when one is not specified.
      * @param dateStr String containing a date.  If there is excess content, it will throw an IllegalArgumentException.
      * @return Date instance that represents the passed in date.  See comments at top of class for supported
-     * formats.  This API is intended to be super flexible in terms of what it can parse.  If a null or empty String is
+     * formats.  This API is intended to be super flexible in terms of what it can parse. If a null or empty String is
      * passed in, null will be returned.
      */
     public static Date parseDate(String dateStr) {
-        if (StringUtilities.isWhitespace(dateStr)) {
+        if (StringUtilities.isEmpty(dateStr)) {
             return null;
         }
         Instant instant;
-        TemporalAccessor dateTime = parseDate(dateStr, ZoneId.systemDefault(), true);
+        ZonedDateTime dateTime = parseDate(dateStr, ZoneId.systemDefault(), true);
         instant = Instant.from(dateTime);
-        Date date = Date.from(instant);
-        return date;
+        return Date.from(instant);
     }
 
     /**
      * Main API. Retrieve date-time from passed in String.  The boolean ensureDateTimeAlone, if set true, ensures that
      * no other non-date content existed in the String.
-     * @param dateStr String containing a date.  See DateUtilities class Javadoc for all the supported formats.  Cannot
-     *                be null or empty String.
+     * @param dateStr String containing a date.  See DateUtilities class Javadoc for all the supported formats.
      * @param defaultZoneId ZoneId to use if no timezone offset or name is given.  Cannot be null.
      * @param ensureDateTimeAlone If true, if there is excess non-Date content, it will throw an IllegalArgument exception.
      * @return ZonedDateTime instance converted from the passed in date String.  See comments at top of class for supported
-     * formats.  This API is intended to be super flexible in terms of what it can parse. 
+     * formats.  This API is intended to be super flexible in terms of what it can parse. If a null or empty String is
+     * passed in, null will be returned.
      */
     public static ZonedDateTime parseDate(String dateStr, ZoneId defaultZoneId, boolean ensureDateTimeAlone) {
-        Convention.throwIfNullOrEmpty(dateStr, "'dateStr' must not be null or empty String.");
+        if (StringUtilities.isEmpty(dateStr)) {
+            return null;
+        }
         Convention.throwIfNull(defaultZoneId, "ZoneId cannot be null.  Use ZoneId.of(\"America/New_York\"), ZoneId.systemDefault(), etc.");
         dateStr = dateStr.trim();
 
@@ -355,7 +356,7 @@ private static void verifyNoGarbageLeft(String remnant) {
         if (StringUtilities.length(remnant) > 0) {
             remnant = remnant.replaceAll("T|,", "").trim();
             if (!remnant.isEmpty()) {
-                    throw new IllegalArgumentException("Issue parsing date-time, other characters present: " + remnant);
+                throw new IllegalArgumentException("Issue parsing date-time, other characters present: " + remnant);
             }
         }
     }

src/main/java/com/cedarsoftware/util/convert/BigDecimalConversions.java

@@ -62,8 +62,7 @@ static LocalTime toLocalTime(Object from, Converter converter) {
         BigDecimal nanos = seconds.multiply(BILLION);
         try {
             return LocalTime.ofNanoOfDay(nanos.longValue());
-        }
-        catch (Exception e) {
+        } catch (Exception e) {
             throw new IllegalArgumentException("Input value [" + seconds.toPlainString() + "] for conversion to LocalTime must be >= 0 && <= 86399.999999999", e);
         }
     }

src/main/java/com/cedarsoftware/util/convert/Converter.java

@@ -695,7 +695,6 @@ private static void buildFactoryConversions() {
         CONVERSION_DB.put(pair(String.class, String.class), Converter::identity);
         CONVERSION_DB.put(pair(Duration.class, String.class), StringConversions::toString);
         CONVERSION_DB.put(pair(Instant.class, String.class), StringConversions::toString);
-        CONVERSION_DB.put(pair(LocalTime.class, String.class), StringConversions::toString);
         CONVERSION_DB.put(pair(MonthDay.class, String.class), StringConversions::toString);
         CONVERSION_DB.put(pair(YearMonth.class, String.class), StringConversions::toString);
         CONVERSION_DB.put(pair(Period.class, String.class), StringConversions::toString);
@@ -836,7 +835,6 @@ private static void buildFactoryConversions() {
 
         // toCharArray
         CONVERSION_DB.put(pair(Void.class, char[].class), VoidConversions::toNull);
-        CONVERSION_DB.put(pair(Void.class, Character[].class), VoidConversions::toNull);
         CONVERSION_DB.put(pair(String.class, char[].class), StringConversions::toCharArray);
         CONVERSION_DB.put(pair(StringBuilder.class, char[].class), StringConversions::toCharArray);
         CONVERSION_DB.put(pair(StringBuffer.class, char[].class), StringConversions::toCharArray);
@@ -845,6 +843,12 @@ private static void buildFactoryConversions() {
         CONVERSION_DB.put(pair(char[].class, char[].class), CharArrayConversions::toCharArray);
         CONVERSION_DB.put(pair(byte[].class, char[].class), ByteArrayConversions::toCharArray);
 
+        // toCharacterArray
+        CONVERSION_DB.put(pair(Void.class, Character[].class), VoidConversions::toNull);
+        CONVERSION_DB.put(pair(String.class, Character[].class), StringConversions::toCharacterArray);
+        CONVERSION_DB.put(pair(StringBuffer.class, Character[].class), StringConversions::toCharacterArray);
+        CONVERSION_DB.put(pair(StringBuilder.class, Character[].class), StringConversions::toCharacterArray);
+
         // toCharBuffer
         CONVERSION_DB.put(pair(Void.class, CharBuffer.class), VoidConversions::toNull);
         CONVERSION_DB.put(pair(String.class, CharBuffer.class), StringConversions::toCharBuffer);
@@ -888,7 +892,7 @@ private static void buildFactoryConversions() {
         CONVERSION_DB.put(pair(AtomicBoolean.class, Map.class), MapConversions::initMap);
         CONVERSION_DB.put(pair(AtomicInteger.class, Map.class), MapConversions::initMap);
         CONVERSION_DB.put(pair(AtomicLong.class, Map.class), MapConversions::initMap);
-        CONVERSION_DB.put(pair(Date.class, Map.class), MapConversions::initMap);
+        CONVERSION_DB.put(pair(Date.class, Map.class), DateConversions::toMap);
         CONVERSION_DB.put(pair(java.sql.Date.class, Map.class), MapConversions::initMap);
         CONVERSION_DB.put(pair(Timestamp.class, Map.class), MapConversions::initMap);
         CONVERSION_DB.put(pair(LocalDate.class, Map.class), MapConversions::initMap);

src/main/java/com/cedarsoftware/util/convert/DateConversions.java

@@ -13,8 +13,13 @@
 import java.time.format.DateTimeFormatterBuilder;
 import java.util.Calendar;
 import java.util.Date;
+import java.util.Map;
 import java.util.concurrent.atomic.AtomicLong;
 
+import com.cedarsoftware.util.CompactLinkedMap;
+
+import static com.cedarsoftware.util.convert.Converter.VALUE;
+
 /**
  * @author Kenny Partlow ([email protected])
  *         <br>
@@ -91,7 +96,13 @@ static LocalDate toLocalDate(Object from, Converter converter) {
     }
 
     static LocalTime toLocalTime(Object from, Converter converter) {
-        return toZonedDateTime(from, converter).toLocalTime();
+        Instant instant = toInstant(from, converter);
+
+        // Convert Instant to LocalDateTime
+        LocalDateTime localDateTime = LocalDateTime.ofInstant(instant, converter.getOptions().getZoneId());
+
+        // Extract the LocalTime from LocalDateTime
+        return localDateTime.toLocalTime();
     }
 
     static BigInteger toBigInteger(Object from, Converter converter) {
@@ -131,4 +142,11 @@ static String toString(Object from, Converter converter) {
 
         return zonedDateTime.format(formatter);
     }
+
+    static Map<String, Object> toMap(Object from, Converter converter) {
+        Date date = (Date) from;
+        Map<String, Object> map = new CompactLinkedMap<>();
+        map.put(VALUE, date.getTime());
+        return map;
+    }
 }

src/main/java/com/cedarsoftware/util/convert/MapConversions.java

@@ -71,6 +71,7 @@ final class MapConversions {
     static final String MINUTES = "minutes";
     static final String SECOND = "second";
     static final String SECONDS = "seconds";
+    static final String EPOCH_MILLIS = "epochMillis";
     static final String MILLI_SECONDS = "millis";
     static final String NANO = "nano";
     static final String NANOS = "nanos";
@@ -176,7 +177,7 @@ static java.sql.Date toSqlDate(Object from, Converter converter) {
     }
 
     static Date toDate(Object from, Converter converter) {
-        return fromSingleKey(from, converter, TIME, Date.class);
+        return fromSingleKey(from, converter, EPOCH_MILLIS, Date.class);
     }
 
     private static final String[] TIMESTAMP_PARAMS = new String[] { TIME, NANOS };