Add defaultValue to Dates.stringToDuration(), re #62

Author: safris

src/main/java/org/libj/util/Dates.java

@@ -689,35 +689,7 @@ public static int currentTimeDays() {
     return (int)(System.currentTimeMillis() / Dates.MILLISECONDS_IN_DAY);
   }
 
-  /**
-   * Returns the milliseconds duration representation of the specified string duration.
-   * <p>
-   * The duration format is expressed with the regular expression:
-   * <pre>
-   * -?(\d+w)?(\d+d)?(\d+h)?(\d+m)?(\d*(.\d{1,3})s)?
-   * </pre>
-   * With the following key for units:
-   * <p>
-   * @formatter:off
-   * <table>
-   * <caption>Unit Key</caption>
-   * <tr><td><b>Unit</b></td><td><b>Description</b></td></tr>
-   * <tr><td><code><b>w</b></code></td><td>Week</td></tr>
-   * <tr><td><code><b>d</b></code></td><td>Day</td></tr>
-   * <tr><td><code><b>h</b></code></td><td>Hour</td></tr>
-   * <tr><td><code><b>m</b></code></td><td>Minute</td></tr>
-   * <tr><td><code><b>s</b></code></td><td>Second</td></tr>
-   * </table>
-   * @formatter:on
-   *
-   * @implSpec The second unit duration supports 3 fractional decimal digits.
-   * @param str The duration string.
-   * @return The milliseconds duration representation of the specified string duration.
-   * @throws NullPointerException If {@code str} is null.
-   * @throws IllegalArgumentException If {@code str} does not match the regular expression format.
-   * @see #durationToString(long)
-   */
-  public static long stringToDuration(final String str) {
+  private static long stringToDuration(final String str, final long defaultValue, final boolean hasDefaultValue) {
     long dur = 0;
 
     long v = 0;
@@ -741,6 +713,8 @@ else if (d == 2)
           a = 10;
         else if (d == 3)
           a = 1;
+        else if (hasDefaultValue)
+          return defaultValue;
         else
           throw new IllegalArgumentException("Fractional values are only supported for 3 digits of second precision: " + str);
 
@@ -752,29 +726,45 @@ else if (ch == 'm') {
         dur += v * MILLISECONDS_IN_MINUTE;
         v = 0;
         d = 0;
-        if (dot)
+        if (dot) {
+          if (hasDefaultValue)
+            return defaultValue;
+
           throw new IllegalArgumentException("Fractional values are only supported for second precision: " + str);
+        }
       }
       else if (ch == 'h') {
         dur += v * MILLISECONDS_IN_HOUR;
         v = 0;
         d = 0;
-        if (dot)
+        if (dot) {
+          if (hasDefaultValue)
+            return defaultValue;
+
           throw new IllegalArgumentException("Fractional values are only supported for second precision: " + str);
+        }
       }
       else if (ch == 'd') {
         dur += v * MILLISECONDS_IN_DAY;
         v = 0;
         d = 0;
-        if (dot)
+        if (dot) {
+          if (hasDefaultValue)
+            return defaultValue;
+
           throw new IllegalArgumentException("Fractional values are only supported for second precision: " + str);
+        }
       }
       else if (ch == 'w') {
         dur += v * MILLISECONDS_IN_WEEK;
         v = 0;
         d = 0;
-        if (dot)
+        if (dot) {
+          if (hasDefaultValue)
+            return defaultValue;
+
           throw new IllegalArgumentException("Fractional values are only supported for second precision: " + str);
+        }
       }
       else if ('0' <= ch && ch <= '9') {
         v *= 10;
@@ -785,6 +775,9 @@ else if (ch == '.') {
         dot = true;
         d = 0;
       }
+      else if (hasDefaultValue) {
+        return defaultValue;
+      }
       else {
         throw new IllegalArgumentException("Unsupported character " + ch + " at position " + i + ": " + str);
       }
@@ -796,6 +789,70 @@ else if (ch == '.') {
     return isNegative ? -dur : dur;
   }
 
+  /**
+   * Returns the milliseconds duration representation of the specified string duration.
+   * <p>
+   * The duration format is expressed with the regular expression:
+   * <pre>
+   * -?(\d+w)?(\d+d)?(\d+h)?(\d+m)?(\d*(.\d{1,3})s)?
+   * </pre>
+   * With the following key for units:
+   * <p>
+   * @formatter:off
+   * <table>
+   * <caption>Unit Key</caption>
+   * <tr><td><b>Unit</b></td><td><b>Description</b></td></tr>
+   * <tr><td><code><b>w</b></code></td><td>Week</td></tr>
+   * <tr><td><code><b>d</b></code></td><td>Day</td></tr>
+   * <tr><td><code><b>h</b></code></td><td>Hour</td></tr>
+   * <tr><td><code><b>m</b></code></td><td>Minute</td></tr>
+   * <tr><td><code><b>s</b></code></td><td>Second</td></tr>
+   * </table>
+   * @formatter:on
+   *
+   * @implSpec The second unit duration supports 3 fractional decimal digits.
+   * @param str The duration string.
+   * @param defaultValue The value to return if {@code str} cannot be parsed as a duration.
+   * @return The milliseconds duration representation of the specified string duration.
+   * @throws NullPointerException If {@code str} is null.
+   * @see #durationToString(long)
+   */
+  public static long stringToDuration(final String str, final long defaultValue) {
+    return stringToDuration(str, defaultValue, true);
+  }
+
+  /**
+   * Returns the milliseconds duration representation of the specified string duration.
+   * <p>
+   * The duration format is expressed with the regular expression:
+   * <pre>
+   * -?(\d+w)?(\d+d)?(\d+h)?(\d+m)?(\d*(.\d{1,3})s)?
+   * </pre>
+   * With the following key for units:
+   * <p>
+   * @formatter:off
+   * <table>
+   * <caption>Unit Key</caption>
+   * <tr><td><b>Unit</b></td><td><b>Description</b></td></tr>
+   * <tr><td><code><b>w</b></code></td><td>Week</td></tr>
+   * <tr><td><code><b>d</b></code></td><td>Day</td></tr>
+   * <tr><td><code><b>h</b></code></td><td>Hour</td></tr>
+   * <tr><td><code><b>m</b></code></td><td>Minute</td></tr>
+   * <tr><td><code><b>s</b></code></td><td>Second</td></tr>
+   * </table>
+   * @formatter:on
+   *
+   * @implSpec The second unit duration supports 3 fractional decimal digits.
+   * @param str The duration string.
+   * @return The milliseconds duration representation of the specified string duration.
+   * @throws NullPointerException If {@code str} is null.
+   * @throws IllegalArgumentException If {@code str} does not match the regular expression format.
+   * @see #durationToString(long)
+   */
+  public static long stringToDuration(final String str) {
+    return stringToDuration(str, 0, false);
+  }
+
   /**
    * Returns the string duration representation of the specified duration in milliseconds.
    * <p>