Simplify internal delegation

Author: garydgregory

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

@@ -346,7 +346,7 @@ protected void handleConcatenatedOptions(final String token) throws ParseExcepti
 
             if (currentOption != null && token.length() != i + 1) {
                 // add the trail as an argument of the option
-                currentOption.addValueForProcessing(stripLeadingAndTrailingQuotesDefaultOff(token.substring(i + 1)));
+                currentOption.processValue(stripLeadingAndTrailingQuotesDefaultOff(token.substring(i + 1)));
                 break;
             }
         }
@@ -388,7 +388,7 @@ private void handleLongOptionWithEqual(final String token) throws ParseException
             final Option option = options.getOption(key);
             if (option.acceptsArg()) {
                 handleOption(option);
-                currentOption.addValueForProcessing(stripLeadingAndTrailingQuotesDefaultOff(value));
+                currentOption.processValue(stripLeadingAndTrailingQuotesDefaultOff(value));
                 currentOption = null;
             } else {
                 handleUnknownToken(currentToken);
@@ -448,7 +448,7 @@ private void handleProperties(final Properties properties) throws ParseException
 
                 if (opt.hasArg()) {
                     if (opt.getValues() == null || opt.getValues().length == 0) {
-                        opt.addValueForProcessing(stripLeadingAndTrailingQuotesDefaultOff(value));
+                        opt.processValue(stripLeadingAndTrailingQuotesDefaultOff(value));
                     }
                 } else if (!("yes".equalsIgnoreCase(value) || "true".equalsIgnoreCase(value) || "1".equalsIgnoreCase(value))) {
                     // if the value is not yes, true or 1 then don't add the option to the CommandLine
@@ -492,12 +492,12 @@ private void handleShortAndLongOption(final String token) throws ParseException
 
                 if (opt != null && options.getOption(opt).acceptsArg()) {
                     handleOption(options.getOption(opt));
-                    currentOption.addValueForProcessing(stripLeadingAndTrailingQuotesDefaultOff(t.substring(opt.length())));
+                    currentOption.processValue(stripLeadingAndTrailingQuotesDefaultOff(t.substring(opt.length())));
                     currentOption = null;
                 } else if (isJavaProperty(t)) {
                     // -SV1 (-Dflag)
                     handleOption(options.getOption(t.substring(0, 1)));
-                    currentOption.addValueForProcessing(stripLeadingAndTrailingQuotesDefaultOff(t.substring(1)));
+                    currentOption.processValue(stripLeadingAndTrailingQuotesDefaultOff(t.substring(1)));
                     currentOption = null;
                 } else {
                     // -S1S2S3 or -S1S2V
@@ -514,16 +514,16 @@ private void handleShortAndLongOption(final String token) throws ParseException
                 final Option option = options.getOption(opt);
                 if (option != null && option.acceptsArg()) {
                     handleOption(option);
-                    currentOption.addValueForProcessing(value);
+                    currentOption.processValue(value);
                     currentOption = null;
                 } else {
                     handleUnknownToken(token);
                 }
             } else if (isJavaProperty(opt)) {
                 // -SV1=V2 (-Dkey=value)
                 handleOption(options.getOption(opt.substring(0, 1)));
-                currentOption.addValueForProcessing(opt.substring(1));
-                currentOption.addValueForProcessing(value);
+                currentOption.processValue(opt.substring(1));
+                currentOption.processValue(value);
                 currentOption = null;
             } else {
                 // -L=V or -l=V
@@ -545,7 +545,7 @@ private void handleToken(final String token) throws ParseException {
         } else if ("--".equals(token)) {
             skipParsing = true;
         } else if (currentOption != null && currentOption.acceptsArg() && isArgument(token)) {
-            currentOption.addValueForProcessing(stripLeadingAndTrailingQuotesDefaultOn(token));
+            currentOption.processValue(stripLeadingAndTrailingQuotesDefaultOn(token));
         } else if (token.startsWith("--")) {
             handleLongOption(token);
         } else if (token.startsWith("-") && !"-".equals(token)) {

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

@@ -507,19 +507,7 @@ private void add(final String value) {
     @Deprecated
     public boolean addValue(final String value) {
         throw new UnsupportedOperationException(
-                "The addValue method is not intended for client use. Subclasses should use the addValueForProcessing method instead.");
-    }
-
-    /**
-     * Adds the specified value to this Option.
-     *
-     * @param value is a/the value of this Option.
-     */
-    void addValueForProcessing(final String value) {
-        if (argCount == UNINITIALIZED) {
-            throw new IllegalArgumentException("NO_ARGS_ALLOWED");
-        }
-        processValue(value);
+                "The addValue method is not intended for client use. Subclasses should use the processValue method instead.");
     }
 
     /**
@@ -823,7 +811,10 @@ public boolean isRequired() {
      *
      * @param value The String to be processed.
      */
-    private void processValue(final String value) {
+    void processValue(final String value) {
+        if (argCount == UNINITIALIZED) {
+            throw new IllegalArgumentException("NO_ARGS_ALLOWED");
+        }
         String add = value;
         // this Option has a separator character
         if (hasValueSeparator()) {

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

@@ -224,7 +224,7 @@ public void processArgs(final Option opt, final ListIterator<String> iter) throw
             }
             // found a value
             try {
-                opt.addValueForProcessing(Util.stripLeadingAndTrailingQuotes(str));
+                opt.processValue(Util.stripLeadingAndTrailingQuotes(str));
             } catch (final RuntimeException exp) {
                 iter.previous();
                 break;
@@ -287,7 +287,7 @@ protected void processProperties(final Properties properties) throws ParseExcept
                 if (opt.hasArg()) {
                     if (opt.getValues() == null || opt.getValues().length == 0) {
                         try {
-                            opt.addValueForProcessing(value);
+                            opt.processValue(value);
                         } catch (final RuntimeException exp) { // NOPMD
                             // if we cannot add the value don't worry about it
                         }

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

@@ -104,7 +104,7 @@ private Option roundTrip(final Option o) throws IOException, ClassNotFoundExcept
     public void testAddValue() {
         final Option option = new Option("f", null);
         assertThrows(UnsupportedOperationException.class, () -> option.addValue(""));
-        assertThrows(IllegalArgumentException.class, () -> option.addValueForProcessing(""));
+        assertThrows(IllegalArgumentException.class, () -> option.processValue(""));
     }
 
     @Test