Changeset 17114 in josm for trunk/src/org/openstreetmap/josm/tools

Timestamp:

2020-10-08T19:48:57+02:00 (4 years ago)

Author:

simon04

Message:

see #19704 - Enhance DateUtils.tsFromString to fix unit tests

File:

• trunk/src/org/openstreetmap/josm/tools/date/DateUtils.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/tools/date/DateUtils.java

@@ -68 +68 @@
     public static long tsFromString(String str) {
         // "2007-07-25T09:26:24{Z|{+|-}01[:00]}"
-        if (checkLayout(str, "xxxx-xx-xx")) {
+        if (checkLayout(str, "xxxx-xx-xx") ||
+                checkLayout(str, "xxxx-xx") ||
+                checkLayout(str, "xxxx")) {
             final ZonedDateTime local = ZonedDateTime.of(
                     parsePart4(str, 0),
-                    parsePart2(str, 5),
-                    parsePart2(str, 8),
+                    str.length() > 5 ? parsePart2(str, 5) : 1,
+                    str.length() > 8 ? parsePart2(str, 8) : 1,
                     0, 0, 0, 0, ZoneOffset.UTC);
             return local.toInstant().toEpochMilli();
@@ -129 +131 @@
         try {
             // slow path for fractional seconds different from millisecond precision
-            return Instant.parse(str).toEpochMilli();
+            return ZonedDateTime.parse(str).toInstant().toEpochMilli();
         } catch (IllegalArgumentException | DateTimeParseException ex) {
             throw new UncheckedParseException("The date string (" + str + ") could not be parsed.", ex);