Sort members

Author: garydgregory

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

@@ -221,6 +221,45 @@ public String[] getArgs() {
         return args.toArray(Util.EMPTY_STRING_ARRAY);
     }
 
+    /**
+     * Gets the number of times this option appears in the command line
+     *
+     * @param optionChar the character name of the option.
+     * @return Number of times the option is present
+     * @since 1.11.0
+     */
+    public int getOptionCount(final char optionChar) {
+        return getOptionCount(String.valueOf(optionChar));
+    }
+
+    /**
+     * Gets the number of times this option appears in the command line.
+     *
+     * @param option the option.
+     * @return Number of times the option is present
+     * @since 1.11.0
+     */
+    public int getOptionCount(final Option option) {
+        int result = 0;
+        for (Option opt : options) {
+            if (Objects.equals(opt, option)) {
+                ++result;
+            }
+        }
+        return result;
+    }
+
+    /**
+     * Gets the number of times this option appears in the command line
+     *
+     * @param optionName the name of the option.
+     * @return Number of times the option is present
+     * @since 1.11.0
+     */
+    public int getOptionCount(final String optionName) {
+        return getOptionCount(resolveOption(optionName));
+    }
+
     /**
      * Gets the {@code Object} type of this {@code Option}.
      *
@@ -300,45 +339,6 @@ public Option[] getOptions() {
         return options.toArray(Option.EMPTY_ARRAY);
     }
 
-    /**
-     * Gets the number of times this option appears in the command line.
-     *
-     * @param option the option.
-     * @return Number of times the option is present
-     * @since 1.11.0
-     */
-    public int getOptionCount(final Option option) {
-        int result = 0;
-        for (Option opt : options) {
-            if (Objects.equals(opt, option)) {
-                ++result;
-            }
-        }
-        return result;
-    }
-
-    /**
-     * Gets the number of times this option appears in the command line
-     *
-     * @param optionChar the character name of the option.
-     * @return Number of times the option is present
-     * @since 1.11.0
-     */
-    public int getOptionCount(final char optionChar) {
-        return getOptionCount(String.valueOf(optionChar));
-    }
-
-    /**
-     * Gets the number of times this option appears in the command line
-     *
-     * @param optionName the name of the option.
-     * @return Number of times the option is present
-     * @since 1.11.0
-     */
-    public int getOptionCount(final String optionName) {
-        return getOptionCount(resolveOption(optionName));
-    }
-
     /**
      * Gets the first argument, if any, of this option.
      *

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

@@ -25,6 +25,12 @@ class OptionCountTest {
     private static final Option  VERBOSITY = new Option("v", "verbosity: use multiple times for more");
     private static final Options OPTIONS   = new Options().addOption(VERBOSITY);
 
+    @Test
+    void testFiveSwitchesMixed() throws ParseException {
+        final CommandLine cmdLine = new DefaultParser().parse(OPTIONS, new String[]{"-v", "-vvv", "-v"});
+        assertEquals(5, cmdLine.getOptionCount(VERBOSITY));
+    }
+
     @Test
     void testNoSwitch() throws ParseException {
         final CommandLine cmdLine = new DefaultParser().parse(OPTIONS, new String[]{});
@@ -50,10 +56,4 @@ void testThreeSwitchesCompact() throws ParseException {
         final CommandLine cmdLine = new DefaultParser().parse(OPTIONS, new String[]{"-vvv"});
         assertEquals(3, cmdLine.getOptionCount(VERBOSITY));
     }
-
-    @Test
-    void testFiveSwitchesMixed() throws ParseException {
-        final CommandLine cmdLine = new DefaultParser().parse(OPTIONS, new String[]{"-v", "-vvv", "-v"});
-        assertEquals(5, cmdLine.getOptionCount(VERBOSITY));
-    }
 }