Use vararg for args

Author: cstamas

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

@@ -732,7 +732,7 @@ public CommandLine parse(final Options options, final String[] arguments) throws
     }
 
     /**
-     * @see #parse(Options, String[], Properties, NonOptionAction)
+     * @see #parse(Options, Properties, NonOptionAction, String[])
      */
     @Override
     public CommandLine parse(final Options options, final String[] arguments, final boolean stopAtNonOption) throws ParseException {
@@ -764,26 +764,26 @@ public CommandLine parse(final Options options, final String[] arguments, final
      *
      * @return the list of atomic option and value tokens
      * @throws ParseException if there are any problems encountered while parsing the command line tokens.
-     * @see #parse(Options, String[], Properties, NonOptionAction)
+     * @see #parse(Options, Properties, NonOptionAction, String[])
      */
     public CommandLine parse(final Options options, final String[] arguments, final Properties properties, final boolean stopAtNonOption)
         throws ParseException {
-        return parse(options, arguments, properties, stopAtNonOption ? NonOptionAction.STOP : NonOptionAction.THROW);
+        return parse(options, properties, stopAtNonOption ? NonOptionAction.STOP : NonOptionAction.THROW, arguments);
     }
 
     /**
      * Parses the arguments according to the specified options and properties.
      *
      * @param options the specified Options
-     * @param arguments the command line arguments
      * @param properties command line option name-value pairs
      * @param nonOptionAction see {@link NonOptionAction}.
+     * @param arguments the command line arguments
      *
      * @return the list of atomic option and value tokens
      * @throws ParseException if there are any problems encountered while parsing the command line tokens.
      * @since 1.10.0
      */
-    public CommandLine parse(final Options options, final String[] arguments, final Properties properties, final NonOptionAction nonOptionAction)
+    public CommandLine parse(final Options options, final Properties properties, final NonOptionAction nonOptionAction, final String... arguments)
             throws ParseException {
         this.options = options;
         this.nonOptionAction = nonOptionAction;

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

@@ -178,7 +178,7 @@ void chainingParsersSkipHappyPath() throws ParseException {
 
         DefaultParser parser = new DefaultParser();
 
-        CommandLine baseCommandLine = parser.parse(baseOptions, args, null, DefaultParser.NonOptionAction.SKIP);
+        CommandLine baseCommandLine = parser.parse(baseOptions, null, DefaultParser.NonOptionAction.SKIP, args);
         assertEquals(2, baseCommandLine.getOptions().length);
         assertEquals(4, baseCommandLine.getArgs().length);
         assertTrue(baseCommandLine.hasOption("a"));
@@ -192,7 +192,7 @@ void chainingParsersSkipHappyPath() throws ParseException {
         assertTrue(baseCommandLine.getArgList().contains("arg1"));
         assertTrue(baseCommandLine.getArgList().contains("arg2"));
 
-        CommandLine specificCommandLine = parser.parse(specificOptions, args, null, DefaultParser.NonOptionAction.THROW);
+        CommandLine specificCommandLine = parser.parse(specificOptions, null, DefaultParser.NonOptionAction.THROW, args);
         assertEquals(4, specificCommandLine.getOptions().length);
         assertEquals(2, specificCommandLine.getArgs().length);
         assertTrue(specificCommandLine.hasOption("a"));
@@ -225,12 +225,12 @@ void chainingParsersSkipNonHappyPath() throws ParseException {
 
         DefaultParser parser = new DefaultParser();
 
-        CommandLine baseCommandLine = parser.parse(baseOptions, args, null, DefaultParser.NonOptionAction.SKIP);
+        CommandLine baseCommandLine = parser.parse(baseOptions, null, DefaultParser.NonOptionAction.SKIP, args);
         assertEquals(2, baseCommandLine.getOptions().length);
         assertEquals(4, baseCommandLine.getArgs().length);
 
         UnrecognizedOptionException e = assertThrows(UnrecognizedOptionException.class,
-                () -> parser.parse(specificOptions, args, null, DefaultParser.NonOptionAction.THROW));
+                () -> parser.parse(specificOptions, null, DefaultParser.NonOptionAction.THROW, args));
         assertTrue(e.getMessage().contains("-d"));
     }
 
@@ -254,7 +254,7 @@ void chainingParsersIgnoreHappyPath() throws ParseException {
 
         DefaultParser parser = new DefaultParser();
 
-        CommandLine baseCommandLine = parser.parse(baseOptions, args, null, DefaultParser.NonOptionAction.IGNORE);
+        CommandLine baseCommandLine = parser.parse(baseOptions, null, DefaultParser.NonOptionAction.IGNORE, args);
         assertEquals(2, baseCommandLine.getOptions().length);
         assertEquals(2, baseCommandLine.getArgs().length);
         assertTrue(baseCommandLine.hasOption("a"));
@@ -268,7 +268,7 @@ void chainingParsersIgnoreHappyPath() throws ParseException {
         assertTrue(baseCommandLine.getArgList().contains("arg1"));
         assertTrue(baseCommandLine.getArgList().contains("arg2"));
 
-        CommandLine specificCommandLine = parser.parse(specificOptions, args, null, DefaultParser.NonOptionAction.THROW);
+        CommandLine specificCommandLine = parser.parse(specificOptions, null, DefaultParser.NonOptionAction.THROW, args);
         assertEquals(4, specificCommandLine.getOptions().length);
         assertEquals(2, specificCommandLine.getArgs().length);
         assertTrue(specificCommandLine.hasOption("a"));
@@ -301,12 +301,12 @@ void chainingParsersIgnoreNonHappyPath() throws ParseException {
 
         DefaultParser parser = new DefaultParser();
 
-        CommandLine baseCommandLine = parser.parse(baseOptions, args, null, DefaultParser.NonOptionAction.IGNORE);
+        CommandLine baseCommandLine = parser.parse(baseOptions, null, DefaultParser.NonOptionAction.IGNORE, args);
         assertEquals(2, baseCommandLine.getOptions().length);
         assertEquals(2, baseCommandLine.getArgs().length);
 
         UnrecognizedOptionException e = assertThrows(UnrecognizedOptionException.class,
-                () -> parser.parse(specificOptions, args, null, DefaultParser.NonOptionAction.THROW));
+                () -> parser.parse(specificOptions, null, DefaultParser.NonOptionAction.THROW, args));
         assertTrue(e.getMessage().contains("-d"));
     }