Added Supplier<T> defaults for getParsedOptionValue

Author: Claudenw

src/main/java/org/apache/commons/cli/CommandLine.java

@@ -412,6 +412,21 @@ public <T> T getParsedOptionValue(final char opt, final T defaultValue) throws P
         return getParsedOptionValue(String.valueOf(opt), defaultValue);
     }
 
+    /**
+     * Gets a version of this {@code Option} converted to a particular type.
+     *
+     * @param opt the name of the option.
+     * @param defaultValue the default value to return if opt is not set.
+     * @param <T> The return type for the method.
+     * @return the value parsed into a particular object.
+     * @throws ParseException if there are problems turning the option value into the desired type
+     * @see PatternOptionBuilder
+     * @since 1.7.0
+     */
+    public <T> T getParsedOptionValue(final char opt, final Supplier<T> defaultValue) throws ParseException {
+        return getParsedOptionValue(String.valueOf(opt), defaultValue);
+    }
+
     /**
      * Gets a version of this {@code Option} converted to a particular type.
      *
@@ -437,15 +452,30 @@ public <T> T getParsedOptionValue(final Option option) throws ParseException {
      * @see PatternOptionBuilder
      * @since 1.7.0
      */
-    @SuppressWarnings("unchecked")
     public <T> T getParsedOptionValue(final Option option, final T defaultValue) throws ParseException {
+        return getParsedOptionValue(option, () -> defaultValue);
+    }
+
+    /**
+     * Gets a version of this {@code Option} converted to a particular type.
+     *
+     * @param option the name of the option.
+     * @param defaultValue the default value to return if opt is not set.
+     * @param <T> The return type for the method.
+     * @return the value parsed into a particular object.
+     * @throws ParseException if there are problems turning the option value into the desired type
+     * @see PatternOptionBuilder
+     * @since 1.7.0
+     */
+    @SuppressWarnings("unchecked")
+    public <T> T getParsedOptionValue(final Option option, final Supplier<T> defaultValue) throws ParseException {
         if (option == null) {
             return null;
         }
         final String res = getOptionValue(option);
 
         try {
-            return res == null ? defaultValue : (T) option.getConverter().apply(res);
+            return res == null ? defaultValue.get() : (T) option.getConverter().apply(res);
         } catch (final Throwable e) {
             throw ParseException.wrap(e);
         }
@@ -480,6 +510,21 @@ public <T> T getParsedOptionValue(final String opt, final T defaultValue) throws
         return getParsedOptionValue(resolveOption(opt), defaultValue);
     }
 
+    /**
+     * Gets a version of this {@code Option} converted to a particular type.
+     *
+     * @param opt the name of the option.
+     * @param defaultValue the default value to return if opt is not set.
+     * @param <T> The return type for the method.
+     * @return the value parsed into a particular object.
+     * @throws ParseException if there are problems turning the option value into the desired type
+     * @see PatternOptionBuilder
+     * @since 1.7.0
+     */
+    public <T> T getParsedOptionValue(final String opt, final Supplier<T> defaultValue) throws ParseException {
+        return getParsedOptionValue(resolveOption(opt), defaultValue);
+    }
+
     /**
      * jkeyes - commented out until it is implemented properly
      * <p>