[commons-configuration] 01/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 445df99183fa950cdf24e970fea3bfedb71b648c
Author: Gary Gregory <garydgreg...@gmail.com>
AuthorDate: Sat Jul 16 12:58:31 2022 -0400

    Use forEach()
---
 .../commons/configuration2/tree/MergeCombiner.java | 24 +++++++++-------------
 .../configuration2/tree/ModelTransaction.java      | 17 +++++----------
 2 files changed, 15 insertions(+), 26 deletions(-)

diff --git 
a/src/main/java/org/apache/commons/configuration2/tree/MergeCombiner.java 
b/src/main/java/org/apache/commons/configuration2/tree/MergeCombiner.java
index 842c44cd..345a2c2e 100644
--- a/src/main/java/org/apache/commons/configuration2/tree/MergeCombiner.java
+++ b/src/main/java/org/apache/commons/configuration2/tree/MergeCombiner.java
@@ -58,7 +58,7 @@ public class MergeCombiner extends NodeCombiner {
 
         // Check if nodes can be combined
         final List<ImmutableNode> children2 = new 
LinkedList<>(node2.getChildren());
-        for (final ImmutableNode child1 : node1) {
+        node1.forEach(child1 -> {
             final ImmutableNode child2 = canCombine(node2, child1, children2);
             if (child2 != null) {
                 result.addChild(combine(child1, child2));
@@ -66,12 +66,10 @@ public class MergeCombiner extends NodeCombiner {
             } else {
                 result.addChild(child1);
             }
-        }
+        });
 
         // Add remaining children of node 2
-        for (final ImmutableNode c : children2) {
-            result.addChild(c);
-        }
+        children2.forEach(result::addChild);
         return result.create();
     }
 
@@ -85,11 +83,11 @@ public class MergeCombiner extends NodeCombiner {
      */
     protected void addAttributes(final ImmutableNode.Builder result, final 
ImmutableNode node1, final ImmutableNode node2) {
         final Map<String, Object> attributes = new 
HashMap<>(node1.getAttributes());
-        for (final Map.Entry<String, Object> e : 
node2.getAttributes().entrySet()) {
-            if (!attributes.containsKey(e.getKey())) {
-                attributes.put(e.getKey(), e.getValue());
+        node2.getAttributes().forEach((k, v) -> {
+            if (!attributes.containsKey(k)) {
+                attributes.put(k, v);
             }
-        }
+        });
         result.addAttributes(attributes);
     }
 
@@ -107,19 +105,17 @@ public class MergeCombiner extends NodeCombiner {
         final List<ImmutableNode> nodes = new ArrayList<>();
 
         final List<ImmutableNode> children = HANDLER.getChildren(node2, 
child.getNodeName());
-        for (final ImmutableNode node : children) {
+        children.forEach(node -> {
             if (matchAttributes(attrs1, node)) {
                 nodes.add(node);
             }
-        }
+        });
 
         if (nodes.size() == 1) {
             return nodes.get(0);
         }
         if (nodes.size() > 1 && !isListNode(child)) {
-            for (final ImmutableNode node : nodes) {
-                children2.remove(node);
-            }
+            nodes.forEach(children2::remove);
         }
 
         return null;
diff --git 
a/src/main/java/org/apache/commons/configuration2/tree/ModelTransaction.java 
b/src/main/java/org/apache/commons/configuration2/tree/ModelTransaction.java
index d62bd9c0..b3ded88e 100644
--- a/src/main/java/org/apache/commons/configuration2/tree/ModelTransaction.java
+++ b/src/main/java/org/apache/commons/configuration2/tree/ModelTransaction.java
@@ -356,10 +356,7 @@ class ModelTransaction {
     private void executeOperations() {
         while (!operations.isEmpty()) {
             final Integer level = operations.lastKey(); // start down in 
hierarchy
-            final Map<ImmutableNode, Operations> levelOps = 
operations.remove(level);
-            for (final Map.Entry<ImmutableNode, Operations> e : 
levelOps.entrySet()) {
-                e.getValue().apply(e.getKey(), level);
-            }
+            operations.remove(level).forEach((k, v) -> v.apply(k, level));
         }
     }
 
@@ -391,18 +388,14 @@ class ModelTransaction {
      * Adds newly added nodes and their children to the parent mapping.
      */
     private void updateParentMappingForAddedNodes() {
-        for (final ImmutableNode node : addedNodes) {
-            InMemoryNodeModel.updateParentMapping(parentMapping, node);
-        }
+        addedNodes.forEach(node -> 
InMemoryNodeModel.updateParentMapping(parentMapping, node));
     }
 
     /**
      * Removes nodes that have been removed during this transaction from the 
parent and replacement mappings.
      */
     private void updateParentMappingForRemovedNodes() {
-        for (final ImmutableNode node : removedNodes) {
-            removeNodesFromParentAndReplacementMapping(node);
-        }
+        removedNodes.forEach(node -> 
removeNodesFromParentAndReplacementMapping(node));
     }
 
     /**
@@ -905,10 +898,10 @@ class ModelTransaction {
          */
         private void handleAddedNodes(final ImmutableNode node) {
             if (addedNodesInOperation != null) {
-                for (final ImmutableNode child : addedNodesInOperation) {
+                addedNodesInOperation.forEach(child -> {
                     parentMapping.put(child, node);
                     addedNodes.add(child);
-                }
+                });
             }
         }
     }