Use forEach()

Author: garydgregory

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

@@ -306,11 +306,11 @@ public Object getOptionObject(final String optionName) {
      */
     public Properties getOptionProperties(final Option option) {
         final Properties props = new Properties();
-        for (final Option processedOption : options) {
+        options.forEach(processedOption -> {
             if (processedOption.equals(option)) {
                 processPropertiesFromValues(props, processedOption.getValuesList());
             }
-        }
+        });
         return props;
     }
 
@@ -326,11 +326,11 @@ public Properties getOptionProperties(final Option option) {
      */
     public Properties getOptionProperties(final String optionName) {
         final Properties props = new Properties();
-        for (final Option option : options) {
+        options.forEach(option -> {
             if (optionName.equals(option.getOpt()) || optionName.equals(option.getLongOpt())) {
                 processPropertiesFromValues(props, option.getValuesList());
             }
-        }
+        });
         return props;
     }
 
@@ -503,14 +503,14 @@ public String[] getOptionValues(final Option option) {
             return null;
         }
         final List<String> values = new ArrayList<>();
-        for (final Option processedOption : options) {
+        options.forEach(processedOption -> {
             if (processedOption.equals(option)) {
                 if (option.isDeprecated()) {
                     handleDeprecated(option);
                 }
                 values.addAll(processedOption.getValuesList());
             }
-        }
+        });
         return values.isEmpty() ? null : values.toArray(Util.EMPTY_STRING_ARRAY);
     }
 

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

@@ -393,7 +393,6 @@ private void appendOptionGroup(final StringBuilder buff, final OptionGroup optio
         for (final Iterator<Option> it = optList.iterator(); it.hasNext();) {
             // whether the option is required or not is handled at group level
             appendOption(buff, it.next(), true);
-
             if (it.hasNext()) {
                 buff.append(" | ");
             }

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

@@ -150,7 +150,7 @@ public Options addOptionGroup(final OptionGroup optionGroup) {
         if (optionGroup.isRequired()) {
             requiredOpts.add(optionGroup);
         }
-        for (final Option option : optionGroup.getOptions()) {
+        optionGroup.getOptions().forEach(option -> {
             // an Option cannot be required if it is in an
             // OptionGroup, either the group is required or
             // nothing is required
@@ -159,7 +159,7 @@ public Options addOptionGroup(final OptionGroup optionGroup) {
             requiredOpts.remove(key);
             addOption(option);
             optionGroups.put(key, optionGroup);
-        }
+        });
         return this;
     }
 
@@ -172,12 +172,12 @@ public Options addOptionGroup(final OptionGroup optionGroup) {
      * @since 1.7.0
      */
     public Options addOptions(final Options options) {
-        for (final Option opt : options.getOptions()) {
+        options.getOptions().forEach(opt -> {
             if (hasOption(opt.getKey())) {
                 throw new IllegalArgumentException("Duplicate key: " + opt.getKey());
             }
             addOption(opt);
-        }
+        });
         options.getOptionGroups().forEach(this::addOptionGroup);
         return this;
     }
@@ -223,11 +223,11 @@ public List<String> getMatchingOptions(final String opt) {
         if (longOpts.containsKey(clean)) {
             return Collections.singletonList(clean);
         }
-        for (final String longOpt : longOpts.keySet()) {
+        longOpts.keySet().forEach(longOpt -> {
             if (longOpt.startsWith(clean)) {
                 matchingOpts.add(longOpt);
             }
-        }
+        });
         return matchingOpts;
     }
 

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

@@ -148,9 +148,7 @@ public CommandLine parse(final Options options, final String[] arguments, final
     public CommandLine parse(final Options options, final String[] arguments, final Properties properties, final boolean stopAtNonOption)
             throws ParseException {
         // clear out the data in options in case it's been used before (CLI-71)
-        for (final Option opt : options.helpOptions()) {
-            opt.clearValues();
-        }
+        options.helpOptions().forEach(Option::clearValues);
         // clear the data from the groups
         for (final OptionGroup optionGroup : options.getOptionGroups()) {
             optionGroup.setSelected(null);

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

@@ -163,7 +163,7 @@ public TableDefinition getTableDefinition(final Iterable<Option> options) {
         // setup the rows for the table.
         final List<List<String>> rows = new ArrayList<>();
         final StringBuilder sb = new StringBuilder();
-        for (final Option option : options) {
+        options.forEach(option -> {
             final List<String> row = new ArrayList<>();
             // create an option formatter to correctly format the parts of the option
             final OptionFormatter formatter = getOptionFormatBuilder().build(option);
@@ -182,7 +182,7 @@ public TableDefinition getTableDefinition(final Iterable<Option> options) {
             // add the option description
             row.add(formatter.getDescription());
             rows.add(row);
-        }
+        });
         // return the TableDefinition with the proper column headers.
         return TableDefinition.from("", styles, showSince ? Arrays.asList("Options", "Since", "Description") : Arrays.asList("Options", "Description"), rows);
     }

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

@@ -191,10 +191,8 @@ protected TableDefinition adjustTableFormat(final TableDefinition table) {
         }
         // regenerate the styles
         final List<TextStyle> styles = new ArrayList<>();
-        for (final TextStyle.Builder builder : styleBuilders) {
-            // adjust by removing the padding as it was not accounted for above.
-            styles.add(builder.get());
-        }
+        // adjust by removing the padding as it was not accounted for above.
+        styleBuilders.forEach(builder -> styles.add(builder.get()));
         return TableDefinition.from(table.caption(), styles, table.headers(), table.rows());
     }
 
@@ -244,9 +242,7 @@ public void appendTable(final TableDefinition rawTable) throws IOException {
         // write the table
         appendParagraph(table.caption());
         final List<TextStyle> headerStyles = new ArrayList<>();
-        for (final TextStyle style : table.columnTextStyles()) {
-            headerStyles.add(TextStyle.builder().setTextStyle(style).setAlignment(TextStyle.Alignment.CENTER).get());
-        }
+        table.columnTextStyles().forEach(style -> headerStyles.add(TextStyle.builder().setTextStyle(style).setAlignment(TextStyle.Alignment.CENTER).get()));
         writeColumnQueues(makeColumnQueues(table.headers(), headerStyles), headerStyles);
         for (final List<String> row : table.rows()) {
             writeColumnQueues(makeColumnQueues(row, table.columnTextStyles()), table.columnTextStyles());