[CLI-331] Handle reporting of deprecated options when parameters are not String type. (#270)

* fixes

* added additional testing

* Indent

---------

Co-authored-by: Gary Gregory <garydgregory@users.noreply.github.com>

Author: Claudenw

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

@@ -405,6 +405,9 @@ 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)) {
@@ -498,6 +501,9 @@ public <T> T getParsedOptionValue(final Option option, final Supplier<T> default
         if (option == null) {
             return get(defaultValue);
         }
+        if (option.isDeprecated()) {
+            handleDeprecated(option);
+        }
         final String res = getOptionValue(option);
         try {
             if (res == null) {
@@ -615,7 +621,11 @@ public boolean hasOption(final char opt) {
      * @since 1.5.0
      */
     public boolean hasOption(final Option opt) {
-        return options.contains(opt);
+        boolean result = options.contains(opt);
+        if (result && opt.isDeprecated()) {
+            handleDeprecated(opt);
+        }
+        return result;
     }
 
     /**
@@ -665,9 +675,6 @@ private Option resolveOption(final String opt) {
         if (actual != null) {
             for (final Option option : options) {
                 if (actual.equals(option.getOpt()) || actual.equals(option.getLongOpt())) {
-                    if (option.isDeprecated()) {
-                        handleDeprecated(option);
-                    }
                     return option;
                 }
             }

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

@@ -95,6 +95,27 @@ public void testDeprecatedOption() {
         handler.set(null);
         cmd.getOptionValue("Nope");
         assertNull(handler.get());
+        handler.set(null);
+        cmd.getOptionValue(opt);
+        assertSame(opt, handler.get());
+    }
+
+    @Test
+    public void testDeprecatedParsedOptionValue() throws ParseException {
+        final CommandLine.Builder builder = new CommandLine.Builder();
+        builder.addArg("foo").addArg("bar");
+        final Option opt = Option.builder().option("T").deprecated().build();
+        builder.addOption(opt);
+        final AtomicReference<Option> handler = new AtomicReference<>();
+        final CommandLine cmd = builder.setDeprecatedHandler(handler::set).build();
+        cmd.getParsedOptionValue(opt.getOpt());
+        assertSame(opt, handler.get());
+        handler.set(null);
+        cmd.getParsedOptionValue("Nope");
+        assertNull(handler.get());
+        handler.set(null);
+        cmd.getParsedOptionValue(opt);
+        assertSame(opt, handler.get());
     }
 
     @Test