Switched to ConvertUtilsBean2 for conversions.

Added getParsedOptionValues methods with default values.
Fixed som javadoc,

Author: Claudenw

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

@@ -351,8 +351,9 @@ public String[] getOptionValues(final String opt) {
      * @throws ParseException if there are problems turning the option value into the desired type
      * @see PatternOptionBuilder
      * @since 1.5.0
+     * @param <T> The return type for the method.
      */
-    public Object getParsedOptionValue(final char opt) throws ParseException {
+    public <T> T getParsedOptionValue(final char opt) throws ParseException {
         return getParsedOptionValue(String.valueOf(opt));
     }
 
@@ -364,29 +365,77 @@ public Object getParsedOptionValue(final char opt) throws ParseException {
      * @throws ParseException if there are problems turning the option value into the desired type
      * @see PatternOptionBuilder
      * @since 1.5.0
+     * @param <T> The return type for the method.
      */
-    public Object getParsedOptionValue(final Option option) throws ParseException {
+    public <T> T getParsedOptionValue(final Option option) throws ParseException {
+        return  getParsedOptionValue(option, null);
+    }
+
+    /**
+     * Gets a version of this {@code Option} converted to a particular type.
+     *
+     * @param opt the name of the option.
+     * @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.2
+     * @param <T> The return type for the method.
+     */
+    public <T> T getParsedOptionValue(final String opt) throws ParseException {
+        return getParsedOptionValue(resolveOption(opt));
+    }
+    
+    /**
+     * 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.
+     * @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
+     * @param <T> The return type for the method.
+     */
+    public <T> T getParsedOptionValue(final char opt, T defaultValue) throws ParseException {
+        return getParsedOptionValue(String.valueOf(opt), 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.
+     * @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
+     * @param <T> The return type for the method.
+     */
+    @SuppressWarnings("unchecked")
+    public <T> T getParsedOptionValue(final Option option, T defaultValue) throws ParseException {
         if (option == null) {
             return null;
         }
         final String res = getOptionValue(option);
         if (res == null) {
-            return null;
+            return defaultValue;
         }
-        return TypeHandler.createValue(res, option.getType());
+        return (T) TypeHandler.createValue(res, (Class<?>) option.getType());
     }
 
     /**
      * 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.
      * @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.2
+     * @since 1.7
+     * @param <T> The return type for the method.
      */
-    public Object getParsedOptionValue(final String opt) throws ParseException {
-        return getParsedOptionValue(resolveOption(opt));
+    public <T> T getParsedOptionValue(final String opt, T defaultValue) throws ParseException {
+        return getParsedOptionValue(resolveOption(opt), defaultValue);
     }
 
     /**

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

@@ -20,11 +20,10 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 import java.io.File;
 import java.io.FileInputStream;
 import java.net.URL;
-import java.text.SimpleDateFormat;
 import java.util.Date;
 
 import org.apache.commons.beanutils.ConversionException;
-import org.apache.commons.beanutils.ConvertUtilsBean;
+import org.apache.commons.beanutils.ConvertUtilsBean2;
 import org.apache.commons.beanutils.Converter;
 import org.apache.commons.beanutils.converters.ConverterFacade;
 import org.apache.commons.beanutils.converters.DateConverter;
@@ -37,10 +36,16 @@ Licensed to the Apache Software Foundation (ASF) under one or more
  */
 public class TypeHandler {
 
-    private static ConvertUtilsBean convertUtils;
+    /**
+     * The conversion utilities from BeanUtils.
+     */
+    private static ConvertUtilsBean2 convertUtils;
 
+    /**
+     * Setup the convertUtils object
+     */
     static {
-        convertUtils = new ConvertUtilsBean();
+        convertUtils = new ConvertUtilsBean2();
         convertUtils.register(true, true, 0);
         /*
          * this can not be a ternary because the unboxing operations will result in it
@@ -59,7 +64,7 @@ public Number apply(String str) throws ConversionException {
         };
         convertUtils.register(new SimpleConverter<>(fn, Number.class), Number.class);
 
-        Func<Object> fo = (str) -> {
+        Func<Object> fo = str -> {
                 final Class<?> cl;
 
                 try {
@@ -238,7 +243,7 @@ public static <T> T createValue(final String str, Class<T> clazz) throws ParseEx
      *                            value of {@code str}.
      * @throws     ParseException if the value creation for the given object type
      *                            failed
-     * @deprecated                use createValue(str, Class<?>);
+     * @deprecated                use {@link #createValue(String, Class)};
      */
     @Deprecated // (since="1.7")
     public static Object createValue(final String str, final Object obj) throws ParseException {

src/main/java/org/apache/commons/cli/converters/Func.java

@@ -18,11 +18,17 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 
 /**
  * The definition of the functional interface to call when doing a conversion.
- * Like Function<String,T> but can throw an Exception.
+ * Like {@code Function<String,T>} but can throw an Exception.
  *
  * @param <T> The return type for the function.
  */
 @FunctionalInterface
 public interface Func<T> {
+    /**
+     * Applies the conversion function to the String argument.
+     * @param str the String to convert
+     * @return the Object from the conversion.
+     * @throws Exception on error.
+     */
     T apply(String str) throws Exception;
-}
+}

src/main/java/org/apache/commons/cli/converters/SimpleConverter.java

@@ -25,10 +25,19 @@ Licensed to the Apache Software Foundation (ASF) under one or more
  * @param <T> The type of object the converter will return.
  */
 public class SimpleConverter<T> extends AbstractConverter {
-
+    /**
+     * The Func to convert string values.
+     */
     private final Func<? extends T> func;
+    /**
+     * The class type of the object that is returned.
+     */
     private final Class<T> type;
 
+    /**
+     * @param func the Func instance to use to convert values.
+     * @param type the Type that this Converter returns.
+     */
     public SimpleConverter(Func<? extends T> func, Class<T> type) {
         this.func = func;
         this.type = type;

src/main/java/org/apache/commons/cli/converters/package-info.java

@@ -0,0 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * Apache Commons CLI converters to convert from String to Object of various types.
+ */
+package org.apache.commons.cli.converters;

src/test/java/org/apache/commons/cli/PatternOptionBuilderTest.java

@@ -153,7 +153,6 @@ public void testSimplePattern() throws Exception {
             // expected
         }
 
-        // DATES NOT SUPPORTED YET
         assertEquals("date flag z", new Date(1023400137000L), line.getOptionObject('z'));
 
     }

src/test/java/org/apache/commons/cli/TypeHandlerTest.java

@@ -25,7 +25,6 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 import java.io.File;
 import java.io.FileInputStream;
 import java.net.URL;
-import java.text.DateFormat;
 import java.util.Date;
 
 import org.junit.Test;
@@ -62,7 +61,7 @@ public void testBadValueDate() {
     public void testCreateValueDate() throws Exception {
         Date d = new Date(1023400137000L);
         Date d2 = TypeHandler.createValue("Thu Jun 06 17:48:57 EDT 2002", PatternOptionBuilder.DATE_VALUE);
-        assertEquals( d, d2 );
+        assertEquals(d, d2);
     }