Sort members

Author: garydgregory

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

@@ -153,21 +153,6 @@ public Builder setStripLeadingAndTrailingQuotes(final Boolean stripLeadingAndTra
         }
     }
 
-    /**
-     * Creates a new {@link Builder} to create an {@link DefaultParser} using descriptive
-     * methods.
-     *
-     * @return a new {@link Builder} instance
-     * @since 1.5.0
-     */
-    public static Builder builder() {
-        return new Builder();
-    }
-
-    static int indexOfEqual(final String token) {
-        return token.indexOf(Char.EQUAL);
-    }
-
     /**
      * Enum representing possible actions that may be done when "non option" is discovered during parsing.
      *
@@ -194,6 +179,21 @@ public enum NonOptionAction {
         THROW;
     }
 
+    /**
+     * Creates a new {@link Builder} to create an {@link DefaultParser} using descriptive
+     * methods.
+     *
+     * @return a new {@link Builder} instance
+     * @since 1.5.0
+     */
+    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;
 
@@ -308,6 +308,16 @@ private DefaultParser(final boolean allowPartialMatching, final Boolean stripLea
         this.deprecatedHandler = deprecatedHandler;
     }
 
+    /**
+     * Adds token to command line {@link CommandLine#addArg(String)}.
+     *
+     * @param token the unrecognized option/argument.
+     * @since 1.10.0
+     */
+    protected void addArg(final String token) {
+        cmd.addArg(token);
+    }
+
     /**
      * Throws a {@link MissingArgumentException} if the current option didn't receive the number of arguments expected.
      */
@@ -633,16 +643,6 @@ protected void handleUnknownToken(final String token) throws ParseException {
         }
     }
 
-    /**
-     * Adds token to command line {@link CommandLine#addArg(String)}.
-     *
-     * @param token the unrecognized option/argument.
-     * @since 1.10.0
-     */
-    protected void addArg(final String token) {
-        cmd.addArg(token);
-    }
-
     /**
      * Tests if the token is a valid argument.
      *
@@ -726,6 +726,43 @@ private boolean isShortOption(final String token) {
         return !optName.isEmpty() && options.hasShortOption(String.valueOf(optName.charAt(0)));
     }
 
+    /**
+     * Parses the arguments according to the specified options and properties.
+     *
+     * @param options the specified Options
+     * @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 Properties properties, final NonOptionAction nonOptionAction, final String... arguments)
+            throws ParseException {
+        this.options = options;
+        this.nonOptionAction = nonOptionAction;
+        skipParsing = false;
+        currentOption = null;
+        expectedOpts = new ArrayList<>(options.getRequiredOptions());
+        // clear the data from the groups
+        for (final OptionGroup group : options.getOptionGroups()) {
+            group.setSelected(null);
+        }
+        cmd = CommandLine.builder().setDeprecatedHandler(deprecatedHandler).get();
+        if (arguments != null) {
+            for (final String argument : arguments) {
+                handleToken(argument);
+            }
+        }
+        // check the arguments of the last option
+        checkRequiredArgs();
+        // add the default options
+        handleProperties(properties);
+        checkRequiredOptions();
+        return cmd;
+    }
+
     @Override
     public CommandLine parse(final Options options, final String[] arguments) throws ParseException {
         return parse(options, arguments, null);
@@ -771,43 +808,6 @@ public CommandLine parse(final Options options, final String[] arguments, final
         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 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 Properties properties, final NonOptionAction nonOptionAction, final String... arguments)
-            throws ParseException {
-        this.options = options;
-        this.nonOptionAction = nonOptionAction;
-        skipParsing = false;
-        currentOption = null;
-        expectedOpts = new ArrayList<>(options.getRequiredOptions());
-        // clear the data from the groups
-        for (final OptionGroup group : options.getOptionGroups()) {
-            group.setSelected(null);
-        }
-        cmd = CommandLine.builder().setDeprecatedHandler(deprecatedHandler).get();
-        if (arguments != null) {
-            for (final String argument : arguments) {
-                handleToken(argument);
-            }
-        }
-        // check the arguments of the last option
-        checkRequiredArgs();
-        // add the default options
-        handleProperties(properties);
-        checkRequiredOptions();
-        return cmd;
-    }
-
     /**
      * Strips balanced leading and trailing quotes if the stripLeadingAndTrailingQuotes is set
      * If stripLeadingAndTrailingQuotes is null, then do not strip

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

@@ -78,13 +78,6 @@ public static class Builder implements Supplier<HelpFormatter> {
         // TODO All other instance HelpFormatter instance variables.
         // Make HelpFormatter immutable for 2.0
 
-        /**
-         * Constructs a new instance.
-         */
-        public Builder() {
-            // empty
-        }
-
         /**
          * A function to convert a description (not null) and a deprecated Option (not null) to help description
          */
@@ -103,6 +96,13 @@ public Builder() {
         /** The flag to determine if the since values should be dispalyed */
         private boolean showSince;
 
+        /**
+         * Constructs a new instance.
+         */
+        public Builder() {
+            // empty
+        }
+
         @Override
         public HelpFormatter get() {
             return new HelpFormatter(deprecatedFormatFunction, printStream, showSince);

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

@@ -28,13 +28,6 @@ Licensed to the Apache Software Foundation (ASF) under one or more
  */
 public class OptionGroup implements Serializable {
 
-    /**
-     * Constructs a new instance.
-     */
-    public OptionGroup() {
-        // empty
-    }
-
     /** The serial version UID. */
     private static final long serialVersionUID = 1L;
 
@@ -47,6 +40,13 @@ public OptionGroup() {
     /** Specified whether this group is required */
     private boolean required;
 
+    /**
+     * Constructs a new instance.
+     */
+    public OptionGroup() {
+        // empty
+    }
+
     /**
      * Adds the given {@code Option} to this group.
      *

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

@@ -40,13 +40,6 @@ Licensed to the Apache Software Foundation (ASF) under one or more
  */
 public class Options implements Serializable {
 
-    /**
-     * Constructs new instance.
-     */
-    public Options() {
-        // empty
-    }
-
     /** The serial version UID. */
     private static final long serialVersionUID = 1L;
 
@@ -64,6 +57,13 @@ public Options() {
     /** A map of the option groups */
     private final Map<String, OptionGroup> optionGroups = new LinkedHashMap<>();
 
+    /**
+     * Constructs new instance.
+     */
+    public Options() {
+        // empty
+    }
+
     /**
      * Adds an option instance
      *

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

@@ -74,16 +74,6 @@ Licensed to the Apache Software Foundation (ASF) under one or more
  */
 public class PatternOptionBuilder {
 
-    /**
-     * Deprecated, only provides static methods.
-     *
-     * @deprecated Will be private or class will be final.
-     */
-    @Deprecated
-    public PatternOptionBuilder() {
-        // empty
-    }
-
     /** String class */
     public static final Class<String> STRING_VALUE = String.class;
 
@@ -99,13 +89,13 @@ public PatternOptionBuilder() {
     /** Class class */
     public static final Class<?> CLASS_VALUE = Class.class;
 
+    /** FileInputStream class */
+    public static final Class<FileInputStream> EXISTING_FILE_VALUE = FileInputStream.class;
+
     /// can we do this one??
     // is meant to check that the file exists, else it errors.
     // ie) it's for reading not writing.
 
-    /** FileInputStream class */
-    public static final Class<FileInputStream> EXISTING_FILE_VALUE = FileInputStream.class;
-
     /** File class */
     public static final Class<File> FILE_VALUE = File.class;
 
@@ -236,4 +226,14 @@ public static Options parsePattern(final String pattern) {
     static <T> T unsupported() {
         return (T) UNSUPPORTED;
     }
+
+    /**
+     * Deprecated, only provides static methods.
+     *
+     * @deprecated Will be private or class will be final.
+     */
+    @Deprecated
+    public PatternOptionBuilder() {
+        // empty
+    }
 }