[CLI-336] Deprecation not always reported (#284)

* added methods with OptionGroup args + tests

* Updated OptionGroup documentation to indicate where deprecation is no reported

* Added tests

* added tests + cleaned up checkstyle

* added more tests

Author: Claudenw

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

@@ -314,7 +314,7 @@ public String getOptionValue(final char opt, final Supplier<String> defaultValue
     /**
      * Gets the first argument, if any, of this option.
      *
-     * @param option the name of the option.
+     * @param option the option.
      * @return Value of the argument if option is set, and has an argument, otherwise null.
      * @since 1.5.0
      */
@@ -326,7 +326,7 @@ public String getOptionValue(final Option option) {
     /**
      * Gets the first argument, if any, of an option.
      *
-     * @param option name of the option.
+     * @param option the option.
      * @param defaultValue is the default value to be returned if the option is not specified.
      * @return Value of the argument if option is set, and has an argument, otherwise {@code defaultValue}.
      * @since 1.5.0
@@ -338,7 +338,7 @@ public String getOptionValue(final Option option, final String defaultValue) {
     /**
      * Gets the first argument, if any, of an option.
      *
-     * @param option name of the option.
+     * @param option the option.
      * @param defaultValue is a supplier for the default value to be returned if the option is not specified.
      * @return Value of the argument if option is set, and has an argument, otherwise {@code defaultValue}.
      * @since 1.7.0
@@ -348,6 +348,44 @@ public String getOptionValue(final Option option, final Supplier<String> default
         return answer != null ? answer : get(defaultValue);
     }
 
+    /**
+     * Gets the first argument, if any, of this option group.
+     *
+     * @param optionGroup the option group.
+     * @return Value of the argument if option group is selected, and has an argument, otherwise null.
+     * @since 1.9.0
+     */
+    public String getOptionValue(final OptionGroup optionGroup) {
+        final String[] values = getOptionValues(optionGroup);
+        return values == null ? null : values[0];
+    }
+
+    /**
+     * Gets the first argument, if any, of an option group.
+     *
+     * @param optionGroup the option group.
+     * @param defaultValue is the default value to be returned if the option group is not selected.
+     * @return Value of the argument if option group is selected, and has an argument, otherwise {@code defaultValue}.
+     * @since 1.9.0
+     */
+    public String getOptionValue(final OptionGroup optionGroup, final String defaultValue) {
+        return getOptionValue(optionGroup, () -> defaultValue);
+    }
+
+    /**
+     * Gets the first argument, if any, of an option group.
+     *
+     * @param optionGroup the option group..
+     * @param defaultValue is a supplier for the default value to be returned if the option group is not selected.
+     * @return Value of the argument if option group is selected, and has an argument, otherwise {@code defaultValue}.
+     * @since 1.9.0
+     */
+    public String getOptionValue(final OptionGroup optionGroup, final Supplier<String> defaultValue) {
+        final String answer = getOptionValue(optionGroup);
+        return answer != null ? answer : get(defaultValue);
+    }
+
+
     /**
      * Gets the first argument, if any, of this option.
      *
@@ -395,26 +433,40 @@ public String[] getOptionValues(final char opt) {
     /**
      * Gets the array of values, if any, of an option.
      *
-     * @param option string name of the option.
+     * @param option the option.
      * @return Values of the argument if option is set, and has an argument, otherwise null.
      * @since 1.5.0
      */
     public String[] getOptionValues(final Option option) {
         if (option == null) {
             return null;
         }
-        if (option.isDeprecated()) {
-            handleDeprecated(option);
-        }
         final List<String> values = new ArrayList<>();
         for (final Option processedOption : options) {
             if (processedOption.equals(option)) {
+                if (option.isDeprecated()) {
+                    handleDeprecated(option);
+                }
                 values.addAll(processedOption.getValuesList());
             }
         }
         return values.isEmpty() ? null : values.toArray(Util.EMPTY_STRING_ARRAY);
     }
 
+    /**
+     * Gets the array of values, if any, of an option group.
+     *
+     * @param optionGroup the option group.
+     * @return Values of the argument if option group is selected, and has an argument, otherwise null.
+     * @since 1.9.0
+     */
+    public String[] getOptionValues(final OptionGroup optionGroup) {
+        if (optionGroup == null || !optionGroup.isSelected()) {
+            return null;
+        }
+        return getOptionValues(optionGroup.getSelected());
+    }
+
     /**
      * Gets the array of values, if any, of an option.
      *
@@ -472,7 +524,7 @@ public <T> T getParsedOptionValue(final char opt, final T defaultValue) throws P
     /**
      * Gets a version of this {@code Option} converted to a particular type.
      *
-     * @param option the name of the option.
+     * @param option the option.
      * @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
@@ -486,7 +538,7 @@ public <T> T getParsedOptionValue(final Option option) throws ParseException {
     /**
      * Gets a version of this {@code Option} converted to a particular type.
      *
-     * @param option the name of the option.
+     * @param option 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.
@@ -513,7 +565,7 @@ public <T> T getParsedOptionValue(final Option option, final Supplier<T> default
     /**
      * Gets a version of this {@code Option} converted to a particular type.
      *
-     * @param option the name of the option.
+     * @param option 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.
@@ -525,6 +577,53 @@ public <T> T getParsedOptionValue(final Option option, final T defaultValue) thr
         return getParsedOptionValue(option, () -> defaultValue);
     }
 
+    /**
+     * Gets a version of this {@code OptionGroup} converted to a particular type.
+     *
+     * @param optionGroup the option group.
+     * @param <T> The return type for the method.
+     * @return the value parsed into a particular object.
+     * @throws ParseException if there are problems turning the selected option value into the desired type
+     * @see PatternOptionBuilder
+     * @since 1.9.0
+     */
+    public <T> T getParsedOptionValue(final OptionGroup optionGroup) throws ParseException {
+        return getParsedOptionValue(optionGroup, () -> null);
+    }
+
+    /**
+     * Gets a version of this {@code OptionGroup} converted to a particular type.
+     *
+     * @param optionGroup the option group.
+     * @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 selected option value into the desired type
+     * @see PatternOptionBuilder
+     * @since 1.9.0
+     */
+    public <T> T getParsedOptionValue(final OptionGroup optionGroup, final Supplier<T> defaultValue) throws ParseException {
+        if (optionGroup == null || !optionGroup.isSelected()) {
+            return get(defaultValue);
+        }
+        return getParsedOptionValue(optionGroup.getSelected(), defaultValue);
+    }
+
+    /**
+     * Gets a version of this {@code OptionGroup} converted to a particular type.
+     *
+     * @param optionGroup the option group.
+     * @param defaultValue the default value to return if an option is not selected.
+     * @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.9.0
+     */
+    public <T> T getParsedOptionValue(final OptionGroup optionGroup, final T defaultValue) throws ParseException {
+        return getParsedOptionValue(optionGroup, () -> defaultValue);
+    }
+
     /**
      * Gets a version of this {@code Option} converted to a particular type.
      *
@@ -623,6 +722,20 @@ public boolean hasOption(final Option opt) {
         return result;
     }
 
+    /**
+     * Tests to see if an option has been set.
+     *
+     * @param optionGroup the option group to check.
+     * @return true if set, false if not.
+     * @since 1.9.0
+     */
+    public boolean hasOption(final OptionGroup optionGroup) {
+        if (optionGroup == null || !optionGroup.isSelected()) {
+            return false;
+        }
+        return hasOption(optionGroup.getSelected());
+    }
+
     /**
      * Tests to see if an option has been set.
      *

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

@@ -76,6 +76,7 @@ public Collection<Option> getOptions() {
     /**
      * Gets the selected option name.
      *
+     * If the selected option is deprecated <em>no warning is logged</em>.
      * @return the selected option name.
      */
     public String getSelected() {
@@ -94,6 +95,7 @@ public boolean isRequired() {
     /**
      * Tests whether an option is selected.
      *
+     *  If an option is selected and is deprecated <em>no warning is logged</em>.
      * @return whether whether an option is selected.
      * @since 1.9.0
      */
@@ -113,6 +115,7 @@ public void setRequired(final boolean required) {
     /**
      * Sets the selected option of this group to {@code name}.
      *
+     * If the selected option is deprecated <em>no warning is logged</em>.
      * @param option the option that is selected
      * @throws AlreadySelectedException if an option from this group has already been selected.
      */