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
The following commit(s) were added to refs/heads/master by this push:
new d713ca1a Use forEach()
d713ca1a is described below
commit d713ca1a26d444620ebed48f7c08ec33da005baf
Author: Gary Gregory <[email protected]>
AuthorDate: Wed Jul 20 10:40:25 2022 -0400
Use forEach()
---
.../commons/configuration2/CompositeConfiguration.java | 13 +------------
.../commons/configuration2/XMLPropertiesConfiguration.java | 8 ++------
.../configuration2/builder/combined/MultiWrapDynaClass.java | 3 +--
.../reloading/CombinedReloadingController.java | 7 +++----
.../org/apache/commons/configuration2/tree/NodeTracker.java | 11 +++--------
5 files changed, 10 insertions(+), 32 deletions(-)
diff --git
a/src/main/java/org/apache/commons/configuration2/CompositeConfiguration.java
b/src/main/java/org/apache/commons/configuration2/CompositeConfiguration.java
index 1a1606bd..edc9c910 100644
---
a/src/main/java/org/apache/commons/configuration2/CompositeConfiguration.java
+++
b/src/main/java/org/apache/commons/configuration2/CompositeConfiguration.java
@@ -279,18 +279,7 @@ public class CompositeConfiguration extends
AbstractConfiguration implements Clo
*/
@Override
protected Object getPropertyInternal(final String key) {
- Configuration firstMatchingConfiguration = null;
- for (final Configuration config : configList) {
- if (config.containsKey(key)) {
- firstMatchingConfiguration = config;
- break;
- }
- }
-
- if (firstMatchingConfiguration != null) {
- return firstMatchingConfiguration.getProperty(key);
- }
- return null;
+ return configList.stream().filter(config ->
config.containsKey(key)).findFirst().map(config ->
config.getProperty(key)).orElse(null);
}
@Override
diff --git
a/src/main/java/org/apache/commons/configuration2/XMLPropertiesConfiguration.java
b/src/main/java/org/apache/commons/configuration2/XMLPropertiesConfiguration.java
index 43df057b..57a4fd32 100644
---
a/src/main/java/org/apache/commons/configuration2/XMLPropertiesConfiguration.java
+++
b/src/main/java/org/apache/commons/configuration2/XMLPropertiesConfiguration.java
@@ -224,9 +224,7 @@ public class XMLPropertiesConfiguration extends
BaseConfiguration implements Fil
* @param values a list with all property values
*/
private void writeProperty(final PrintWriter out, final String key, final
List<?> values) {
- for (final Object value : values) {
- writeProperty(out, key, value);
- }
+ values.forEach(value -> writeProperty(out, key, value));
}
/**
@@ -283,9 +281,7 @@ public class XMLPropertiesConfiguration extends
BaseConfiguration implements Fil
}
private void writeProperty(final Document document, final Node properties,
final String key, final List<?> values) {
- for (final Object value : values) {
- writeProperty(document, properties, key, value);
- }
+ values.forEach(value -> writeProperty(document, properties, key,
value));
}
/**
diff --git
a/src/main/java/org/apache/commons/configuration2/builder/combined/MultiWrapDynaClass.java
b/src/main/java/org/apache/commons/configuration2/builder/combined/MultiWrapDynaClass.java
index 810de4a2..d0b5de96 100644
---
a/src/main/java/org/apache/commons/configuration2/builder/combined/MultiWrapDynaClass.java
+++
b/src/main/java/org/apache/commons/configuration2/builder/combined/MultiWrapDynaClass.java
@@ -87,8 +87,7 @@ class MultiWrapDynaClass implements DynaClass {
*/
private void initProperties(final Collection<? extends DynaClass>
wrappedCls) {
wrappedCls.forEach(cls -> {
- final DynaProperty[] props = cls.getDynaProperties();
- for (final DynaProperty p : props) {
+ for (final DynaProperty p : cls.getDynaProperties()) {
properties.add(p);
namedProperties.put(p.getName(), p);
}
diff --git
a/src/main/java/org/apache/commons/configuration2/reloading/CombinedReloadingController.java
b/src/main/java/org/apache/commons/configuration2/reloading/CombinedReloadingController.java
index 812c3a79..b8d0033e 100644
---
a/src/main/java/org/apache/commons/configuration2/reloading/CombinedReloadingController.java
+++
b/src/main/java/org/apache/commons/configuration2/reloading/CombinedReloadingController.java
@@ -19,6 +19,7 @@ package org.apache.commons.configuration2.reloading;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
+import java.util.Objects;
/**
* <p>
@@ -109,10 +110,8 @@ public class CombinedReloadingController extends
ReloadingController {
throw new IllegalArgumentException("Collection with sub
controllers must not be null!");
}
final Collection<ReloadingController> ctrls = new
ArrayList<>(subCtrls);
- for (final ReloadingController rc : ctrls) {
- if (rc == null) {
- throw new IllegalArgumentException("Collection with sub
controllers contains a null entry!");
- }
+ if (ctrls.stream().anyMatch(Objects::isNull)) {
+ throw new IllegalArgumentException("Collection with sub
controllers contains a null entry!");
}
return Collections.unmodifiableCollection(ctrls);
diff --git
a/src/main/java/org/apache/commons/configuration2/tree/NodeTracker.java
b/src/main/java/org/apache/commons/configuration2/tree/NodeTracker.java
index c202fad7..a088918a 100644
--- a/src/main/java/org/apache/commons/configuration2/tree/NodeTracker.java
+++ b/src/main/java/org/apache/commons/configuration2/tree/NodeTracker.java
@@ -21,6 +21,7 @@ import java.util.Collections;
import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
+import java.util.stream.Collectors;
import org.apache.commons.configuration2.ex.ConfigurationRuntimeException;
@@ -211,14 +212,8 @@ class NodeTracker {
// there is not state to be updated
return this;
}
-
- final Map<NodeSelector, TrackedNodeData> newState = new HashMap<>();
- for (final Map.Entry<NodeSelector, TrackedNodeData> e :
trackedNodes.entrySet()) {
- final TrackedNodeData newData = e.getValue().isDetached() ?
e.getValue() : e.getValue().detach(null);
- newState.put(e.getKey(), newData);
- }
-
- return new NodeTracker(newState);
+ return new NodeTracker(trackedNodes.entrySet().stream()
+ .collect(Collectors.toMap(e -> e.getKey(), e ->
e.getValue().isDetached() ? e.getValue() : e.getValue().detach(null))));
}
/**
