Use forEachRemaining

- Reduce vertical whitespace
- Better private method name

Author: garydgregory

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

@@ -162,12 +162,10 @@ public String toString() {
                 buff.append(OptionFormatter.DEFAULT_LONG_OPT_PREFIX);
                 buff.append(option.getLongOpt());
             }
-
             if (option.getDescription() != null) {
                 buff.append(Char.SP);
                 buff.append(option.getDescription());
             }
-
             if (iter.hasNext()) {
                 buff.append(", ");
             }

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

@@ -52,6 +52,17 @@ public PosixParser() {
         // empty
     }
 
+    /**
+     * Adds the remaining tokens to the processed tokens list.
+     *
+     * @param iter An iterator over the remaining tokens
+     */
+    private void addRemaining(final Iterator<String> iter) {
+        if (eatTheRest) {
+            iter.forEachRemaining(tokens::add);
+        }
+    }
+
     /**
      * Breaks {@code token} into its constituent parts using the following algorithm.
      *
@@ -171,24 +182,11 @@ protected String[] flatten(final Options options, final String[] arguments, fina
                     processNonOptionToken(token, stopAtNonOption);
                 }
             }
-            gobble(iter);
+            addRemaining(iter);
         }
         return tokens.toArray(Util.EMPTY_STRING_ARRAY);
     }
 
-    /**
-     * Adds the remaining tokens to the processed tokens list.
-     *
-     * @param iter An iterator over the remaining tokens
-     */
-    private void gobble(final Iterator<String> iter) {
-        if (eatTheRest) {
-            while (iter.hasNext()) {
-                tokens.add(iter.next());
-            }
-        }
-    }
-
     /**
      * Resets the members to their original state i.e. remove all of {@code tokens} entries and set
      * {@code eatTheRest} to false.

src/main/java/org/apache/commons/cli/help/AbstractHelpFormatter.java

@@ -472,7 +472,6 @@ public String toSyntaxOptions(final OptionGroup group) {
             formatter = optionFormatBuilder.build(iter.next());
             // whether the option is required or not is handled at group level
             buff.append(formatter.toSyntaxOption(true));
-
             if (iter.hasNext()) {
                 buff.append(optionGroupSeparator);
             }