Internal refactoring

Author: garydgregory

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

@@ -150,6 +150,10 @@ public static Builder builder() {
         return new Builder();
     }
 
+    static int indexOfEqual(final String token) {
+        return token.indexOf(Char.EQUAL);
+    }
+
     /** The command-line instance. */
     protected CommandLine cmd;
 
@@ -358,7 +362,7 @@ protected void handleConcatenatedOptions(final String token) throws ParseExcepti
      * @param token the command line token to handle
      */
     private void handleLongOption(final String token) throws ParseException {
-        if (token.indexOf(Char.EQUAL) == -1) {
+        if (indexOfEqual(token) == -1) {
             handleLongOptionWithoutEqual(token);
         } else {
             handleLongOptionWithEqual(token);
@@ -373,7 +377,7 @@ private void handleLongOption(final String token) throws ParseException {
      * @param token the command line token to handle
      */
     private void handleLongOptionWithEqual(final String token) throws ParseException {
-        final int pos = token.indexOf(Char.EQUAL);
+        final int pos = indexOfEqual(token);
         final String value = token.substring(pos + 1);
         final String opt = token.substring(0, pos);
         final List<String> matchingOpts = getMatchingLongOptions(opt);
@@ -469,7 +473,7 @@ private void handleProperties(final Properties properties) throws ParseException
      */
     private void handleShortAndLongOption(final String token) throws ParseException {
         final String t = Util.stripLeadingHyphens(token);
-        final int pos = t.indexOf(Char.EQUAL);
+        final int pos = indexOfEqual(t);
         if (t.length() == 1) {
             // -S
             if (options.hasShortOption(t)) {
@@ -600,7 +604,7 @@ private boolean isLongOption(final String token) {
         if (token == null || !token.startsWith("-") || token.length() == 1) {
             return false;
         }
-        final int pos = token.indexOf(Char.EQUAL);
+        final int pos = indexOfEqual(token);
         final String t = pos == -1 ? token : token.substring(0, pos);
         if (!getMatchingLongOptions(t).isEmpty()) {
             // long or partial long options (--L, -L, --L=V, -L=V, --l, --l=V)
@@ -647,7 +651,7 @@ private boolean isShortOption(final String token) {
             return false;
         }
         // remove leading "-" and "=value"
-        final int pos = token.indexOf(Char.EQUAL);
+        final int pos = indexOfEqual(token);
         final String optName = pos == -1 ? token.substring(1) : token.substring(1, pos);
         if (options.hasShortOption(optName)) {
             return true;

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

@@ -45,33 +45,32 @@ public class GnuParser extends Parser {
     @Override
     protected String[] flatten(final Options options, final String[] arguments, final boolean stopAtNonOption) {
         final List<String> tokens = new ArrayList<>();
-
         boolean eatTheRest = false;
-
         for (int i = 0; i < arguments.length; i++) {
             final String arg = arguments[i];
-
             if ("--".equals(arg)) {
                 eatTheRest = true;
                 tokens.add("--");
             } else if ("-".equals(arg)) {
                 tokens.add("-");
             } else if (arg.startsWith("-")) {
                 final String opt = Util.stripLeadingHyphens(arg);
-
                 if (options.hasOption(opt)) {
                     tokens.add(arg);
-                } else if (opt.indexOf(Char.EQUAL) != -1 && options.hasOption(opt.substring(0, opt.indexOf(Char.EQUAL)))) {
-                    // the format is --foo=value or -foo=value
-                    tokens.add(arg.substring(0, arg.indexOf(Char.EQUAL))); // --foo
-                    tokens.add(arg.substring(arg.indexOf(Char.EQUAL) + 1)); // value
-                } else if (options.hasOption(arg.substring(0, 2))) {
-                    // the format is a special properties option (-Dproperty=value)
-                    tokens.add(arg.substring(0, 2)); // -D
-                    tokens.add(arg.substring(2)); // property=value
                 } else {
-                    eatTheRest = stopAtNonOption;
-                    tokens.add(arg);
+                    final int equalPos = DefaultParser.indexOfEqual(opt);
+                    if (equalPos != -1 && options.hasOption(opt.substring(0, equalPos))) {
+                        // the format is --foo=value or -foo=value
+                        tokens.add(arg.substring(0, arg.indexOf(Char.EQUAL))); // --foo
+                        tokens.add(arg.substring(arg.indexOf(Char.EQUAL) + 1)); // value
+                    } else if (options.hasOption(arg.substring(0, 2))) {
+                        // the format is a special properties option (-Dproperty=value)
+                        tokens.add(arg.substring(0, 2)); // -D
+                        tokens.add(arg.substring(2)); // property=value
+                    } else {
+                        eatTheRest = stopAtNonOption;
+                        tokens.add(arg);
+                    }
                 }
             } else {
                 tokens.add(arg);

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

@@ -135,7 +135,7 @@ protected String[] flatten(final Options options, final String[] arguments, fina
 
             // handle long option --foo or --foo=bar
             else if (token.startsWith("--")) {
-                final int pos = token.indexOf(Char.EQUAL);
+                final int pos = DefaultParser.indexOfEqual(token);
                 final String opt = pos == -1 ? token : token.substring(0, pos); // --foo
 
                 final List<String> matchingOpts = options.getMatchingOptions(opt);

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

@@ -697,10 +697,9 @@ public void testPropertyOptionMultipleValues() throws Exception {
         final Properties properties = new Properties();
         properties.setProperty("k", "one,two");
 
-        final String[] values = { "one", "two" };
-
         final CommandLine cmd = parse(parser, options, null, properties);
         assertTrue(cmd.hasOption("k"));
+        final String[] values = { "one", "two" };
         assertArrayEquals(values, cmd.getOptionValues('k'));
     }