[commons-configuration] 08/10: Use forEach()

[ggregory]

This is an automated email from the ASF dual-hosted git repository.

ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-configuration.git

commit aa0fbc54227dc886cb01ee72124e58ec5ce6c7c9
Author: Gary Gregory <garydgreg...@gmail.com>
AuthorDate: Sat Jul 16 13:41:23 2022 -0400

    Use forEach()
---
 .../AbstractYAMLBasedConfiguration.java            | 24 +++++++---------------
 1 file changed, 7 insertions(+), 17 deletions(-)

diff --git 
a/src/main/java/org/apache/commons/configuration2/AbstractYAMLBasedConfiguration.java
 
b/src/main/java/org/apache/commons/configuration2/AbstractYAMLBasedConfiguration.java
index 942de245..bd67a12d 100644
--- 
a/src/main/java/org/apache/commons/configuration2/AbstractYAMLBasedConfiguration.java
+++ 
b/src/main/java/org/apache/commons/configuration2/AbstractYAMLBasedConfiguration.java
@@ -17,10 +17,6 @@
 
 package org.apache.commons.configuration2;
 
-import org.apache.commons.configuration2.ex.ConfigurationException;
-import org.apache.commons.configuration2.io.ConfigurationLogger;
-import org.apache.commons.configuration2.tree.ImmutableNode;
-
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
@@ -28,6 +24,10 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import org.apache.commons.configuration2.ex.ConfigurationException;
+import org.apache.commons.configuration2.io.ConfigurationLogger;
+import org.apache.commons.configuration2.tree.ImmutableNode;
+
 /**
  * <p>
  * A base class for configuration implementations based on YAML structures.
@@ -77,10 +77,7 @@ public class AbstractYAMLBasedConfiguration extends 
BaseHierarchicalConfiguratio
      */
     protected Map<String, Object> constructMap(final ImmutableNode node) {
         final Map<String, Object> map = new 
HashMap<>(node.getChildren().size());
-        for (final ImmutableNode cNode : node) {
-            final Object value = cNode.getChildren().isEmpty() ? 
cNode.getValue() : constructMap(cNode);
-            addEntry(map, cNode.getNodeName(), value);
-        }
+        node.forEach(cNode -> addEntry(map, cNode.getNodeName(), 
cNode.getChildren().isEmpty() ? cNode.getValue() : constructMap(cNode)));
         return map;
     }
 
@@ -136,12 +133,7 @@ public class AbstractYAMLBasedConfiguration extends 
BaseHierarchicalConfiguratio
      */
     private static List<ImmutableNode> parseMap(final Map<String, Object> map, 
final String key) {
         final ImmutableNode.Builder subtree = new 
ImmutableNode.Builder().name(key);
-        for (final Map.Entry<String, Object> entry : map.entrySet()) {
-            final List<ImmutableNode> children = 
constructHierarchy(entry.getKey(), entry.getValue());
-            for (final ImmutableNode child : children) {
-                subtree.addChild(child);
-            }
-        }
+        map.forEach((k, v) -> constructHierarchy(k, 
v).forEach(subtree::addChild));
         return Collections.singletonList(subtree.create());
     }
 
@@ -154,9 +146,7 @@ public class AbstractYAMLBasedConfiguration extends 
BaseHierarchicalConfiguratio
      */
     private static List<ImmutableNode> parseCollection(final 
Collection<Object> col, final String key) {
         final List<ImmutableNode> nodes = new ArrayList<>(col.size());
-        for (final Object elem : col) {
-            nodes.addAll(constructHierarchy(key, elem));
-        }
+        col.forEach(elem -> nodes.addAll(constructHierarchy(key, elem)));
         return nodes;
     }