You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gg...@apache.org on 2022/07/16 17:56:10 UTC
[commons-configuration] branch master updated (db08eade -> fc956641)
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/commons-configuration.git
from db08eade Use forEach()
new 45b575f6 Use forEach()
new ade7178a Use forEach()
new 89ef4155 Use forEach()
new a41b8b9b Use forEach()
new 0430ad92 Use forEach()
new 86f15a89 Use forEach()
new c22d6d13 Use forEach()
new aa0fbc54 Use forEach()
new 00146c49 Use forEach()
new fc956641 Use forEach()
The 10 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../configuration2/AbstractConfiguration.java | 33 +++++-----------------
.../AbstractHierarchicalConfiguration.java | 26 ++++++++---------
.../AbstractYAMLBasedConfiguration.java | 24 +++++-----------
.../commons/configuration2/BaseConfiguration.java | 10 +++----
.../BaseHierarchicalConfiguration.java | 26 ++++-------------
.../beanutils/XMLBeanDeclaration.java | 9 +++---
.../ReloadingMultiFileConfigurationBuilder.java | 9 ++----
.../plist/XMLPropertyListConfiguration.java | 4 +--
.../commons/configuration2/tree/UnionCombiner.java | 8 ++----
.../tree/xpath/XPathExpressionEngine.java | 9 ++----
10 files changed, 48 insertions(+), 110 deletions(-)
[commons-configuration] 07/10: Use forEach()
Posted by gg...@apache.org.
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 c22d6d13580e2acf4773d739d952337422f3cc2e
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Sat Jul 16 13:41:19 2022 -0400
Use forEach()
---
.../AbstractHierarchicalConfiguration.java | 26 +++++++++-------------
1 file changed, 11 insertions(+), 15 deletions(-)
diff --git a/src/main/java/org/apache/commons/configuration2/AbstractHierarchicalConfiguration.java b/src/main/java/org/apache/commons/configuration2/AbstractHierarchicalConfiguration.java
index 603a0869..1265b3eb 100644
--- a/src/main/java/org/apache/commons/configuration2/AbstractHierarchicalConfiguration.java
+++ b/src/main/java/org/apache/commons/configuration2/AbstractHierarchicalConfiguration.java
@@ -245,12 +245,12 @@ public abstract class AbstractHierarchicalConfiguration<T> extends AbstractConfi
}
final NodeHandler<T> handler = getModel().getNodeHandler();
final List<Object> list = new ArrayList<>();
- for (final QueryResult<T> result : results) {
+ results.forEach(result -> {
final Object value = valueFromResult(result, handler);
if (value != null) {
list.add(value);
}
- }
+ });
if (list.size() < 1) {
return null;
@@ -381,11 +381,11 @@ public abstract class AbstractHierarchicalConfiguration<T> extends AbstractConfi
public List<T> resolveNodeKey(final T root, final String key, final NodeHandler<T> handler) {
final List<QueryResult<T>> results = resolveKey(root, key, handler);
final List<T> targetNodes = new LinkedList<>();
- for (final QueryResult<T> result : results) {
+ results.forEach(result -> {
if (!result.isAttributeResult()) {
targetNodes.add(result.getNode());
}
- }
+ });
return targetNodes;
}
@@ -440,16 +440,16 @@ public abstract class AbstractHierarchicalConfiguration<T> extends AbstractConfi
*/
@Override
public String nodeKey(final T node, final Map<T, String> cache, final NodeHandler<T> handler) {
- final List<T> path = new LinkedList<>();
+ final List<T> paths = new LinkedList<>();
T currentNode = node;
String key = cache.get(node);
while (key == null && currentNode != null) {
- path.add(0, currentNode);
+ paths.add(0, currentNode);
currentNode = handler.getParent(currentNode);
key = cache.get(currentNode);
}
- for (final T n : path) {
+ for (final T n : paths) {
final String currentKey = getExpressionEngine().canonicalKey(n, key, handler);
cache.put(n, currentKey);
key = currentKey;
@@ -564,14 +564,12 @@ public abstract class AbstractHierarchicalConfiguration<T> extends AbstractConfi
final List<QueryResult<T>> results = fetchNodeList(prefix);
final NodeHandler<T> handler = getModel().getNodeHandler();
- for (final QueryResult<T> result : results) {
+ results.forEach(result -> {
if (!result.isAttributeResult()) {
- for (final T c : handler.getChildren(result.getNode())) {
- NodeTreeWalker.INSTANCE.walkDFS(c, visitor, handler);
- }
+ handler.getChildren(result.getNode()).forEach(c -> NodeTreeWalker.INSTANCE.walkDFS(c, visitor, handler));
visitor.handleAttributeKeys(prefix, result.getNode(), handler);
}
- }
+ });
return visitor.getKeyList().iterator();
}
@@ -793,9 +791,7 @@ public abstract class AbstractHierarchicalConfiguration<T> extends AbstractConfi
* @param handler the {@code NodeHandler}
*/
public void handleAttributeKeys(final String parentKey, final T node, final NodeHandler<T> handler) {
- for (final String attr : handler.getAttributes(node)) {
- keyList.add(getExpressionEngine().attributeKey(parentKey, attr));
- }
+ handler.getAttributes(node).forEach(attr -> keyList.add(getExpressionEngine().attributeKey(parentKey, attr)));
}
}
[commons-configuration] 06/10: Use forEach()
Posted by gg...@apache.org.
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 86f15a89eb56a5911c6168cbd0114d8fb6d7a383
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Sat Jul 16 13:41:13 2022 -0400
Use forEach()
---
.../configuration2/AbstractConfiguration.java | 33 +++++-----------------
1 file changed, 7 insertions(+), 26 deletions(-)
diff --git a/src/main/java/org/apache/commons/configuration2/AbstractConfiguration.java b/src/main/java/org/apache/commons/configuration2/AbstractConfiguration.java
index c1b0f0dd..0d0be638 100644
--- a/src/main/java/org/apache/commons/configuration2/AbstractConfiguration.java
+++ b/src/main/java/org/apache/commons/configuration2/AbstractConfiguration.java
@@ -30,6 +30,7 @@ import java.util.Map;
import java.util.NoSuchElementException;
import java.util.Properties;
import java.util.concurrent.atomic.AtomicReference;
+import java.util.stream.Collectors;
import org.apache.commons.configuration2.convert.ConversionHandler;
import org.apache.commons.configuration2.convert.DefaultConversionHandler;
@@ -587,9 +588,7 @@ public abstract class AbstractConfiguration extends BaseEventSource implements C
* @since 2.0
*/
protected void addPropertyInternal(final String key, final Object value) {
- for (final Object obj : getListDelimiterHandler().parse(value)) {
- addPropertyDirect(key, obj);
- }
+ getListDelimiterHandler().parse(value).forEach(obj -> addPropertyDirect(key, obj));
}
/**
@@ -1183,9 +1182,7 @@ public abstract class AbstractConfiguration extends BaseEventSource implements C
final List<?> l = (List<?>) value;
// add the interpolated elements in the new list
- for (final Object elem : l) {
- list.add(interpolate(elem));
- }
+ l.forEach(elem -> list.add(interpolate(elem)));
} else if (value == null) {
// This is okay because we just return this list to the caller
@SuppressWarnings("unchecked")
@@ -1299,11 +1296,7 @@ public abstract class AbstractConfiguration extends BaseEventSource implements C
if (c != null) {
c.lock(LockMode.READ);
try {
- for (final Iterator<String> it = c.getKeys(); it.hasNext();) {
- final String key = it.next();
- final Object value = encodeForCopy(c.getProperty(key));
- setProperty(key, value);
- }
+ c.getKeys().forEachRemaining(key -> setProperty(key, encodeForCopy(c.getProperty(key))));
} finally {
c.unlock(LockMode.READ);
}
@@ -1325,11 +1318,7 @@ public abstract class AbstractConfiguration extends BaseEventSource implements C
if (c != null) {
c.lock(LockMode.READ);
try {
- for (final Iterator<String> it = c.getKeys(); it.hasNext();) {
- final String key = it.next();
- final Object value = encodeForCopy(c.getProperty(key));
- addProperty(key, value);
- }
+ c.getKeys().forEachRemaining(key -> addProperty(key, encodeForCopy(c.getProperty(key))));
} finally {
c.unlock(LockMode.READ);
}
@@ -1353,11 +1342,7 @@ public abstract class AbstractConfiguration extends BaseEventSource implements C
// now perform interpolation
c.setListDelimiterHandler(new DisabledListDelimiterHandler());
- for (final Iterator<String> it = getKeys(); it.hasNext();) {
- final String key = it.next();
- c.setProperty(key, getList(key));
- }
-
+ getKeys().forEachRemaining(key -> c.setProperty(key, getList(key)));
c.setListDelimiterHandler(getListDelimiterHandler());
return c;
}
@@ -1396,11 +1381,7 @@ public abstract class AbstractConfiguration extends BaseEventSource implements C
* @return a list with encoded elements
*/
private Object encodeListForCopy(final Collection<?> values) {
- final List<Object> result = new ArrayList<>(values.size());
- for (final Object value : values) {
- result.add(encodeForCopy(value));
- }
- return result;
+ return values.stream().map(this::encodeForCopy).collect(Collectors.toList());
}
/**
[commons-configuration] 02/10: Use forEach()
Posted by gg...@apache.org.
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 ade7178aae68a07e18cdf5aa642aa03891818418
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Sat Jul 16 12:59:59 2022 -0400
Use forEach()
---
.../commons/configuration2/beanutils/XMLBeanDeclaration.java | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/src/main/java/org/apache/commons/configuration2/beanutils/XMLBeanDeclaration.java b/src/main/java/org/apache/commons/configuration2/beanutils/XMLBeanDeclaration.java
index c3d90922..70c23087 100644
--- a/src/main/java/org/apache/commons/configuration2/beanutils/XMLBeanDeclaration.java
+++ b/src/main/java/org/apache/commons/configuration2/beanutils/XMLBeanDeclaration.java
@@ -293,11 +293,11 @@ public class XMLBeanDeclaration implements BeanDeclaration {
@Override
public Map<String, Object> getBeanProperties() {
final Map<String, Object> props = new HashMap<>();
- for (final String key : getAttributeNames()) {
+ getAttributeNames().forEach(key -> {
if (!isReservedAttributeName(key)) {
props.put(key, interpolate(getNode().getAttribute(key)));
}
- }
+ });
return props;
}
@@ -311,7 +311,7 @@ public class XMLBeanDeclaration implements BeanDeclaration {
@Override
public Map<String, Object> getNestedBeanDeclarations() {
final Map<String, Object> nested = new HashMap<>();
- for (final NodeData<?> child : getNode().getChildren()) {
+ getNode().getChildren().forEach(child -> {
if (!isReservedChildName(child.nodeName())) {
if (nested.containsKey(child.nodeName())) {
final Object obj = nested.get(child.nodeName());
@@ -331,8 +331,7 @@ public class XMLBeanDeclaration implements BeanDeclaration {
nested.put(child.nodeName(), createBeanDeclaration(child));
}
}
- }
-
+ });
return nested;
}
[commons-configuration] 09/10: Use forEach()
Posted by gg...@apache.org.
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 00146c490e4f1acc220cb01912503b879da5798f
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Sat Jul 16 13:41:30 2022 -0400
Use forEach()
---
.../org/apache/commons/configuration2/BaseConfiguration.java | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/main/java/org/apache/commons/configuration2/BaseConfiguration.java b/src/main/java/org/apache/commons/configuration2/BaseConfiguration.java
index 47040410..919c7f0e 100644
--- a/src/main/java/org/apache/commons/configuration2/BaseConfiguration.java
+++ b/src/main/java/org/apache/commons/configuration2/BaseConfiguration.java
@@ -168,13 +168,13 @@ public class BaseConfiguration extends AbstractConfiguration implements Cloneabl
copy.store = clonedStore;
// Handle collections in the map; they have to be cloned, too
- for (final Map.Entry<String, Object> e : store.entrySet()) {
- if (e.getValue() instanceof Collection) {
+ store.forEach((k, v) -> {
+ if (v instanceof Collection) {
// This is safe because the collections were created by ourselves
@SuppressWarnings("unchecked")
- final Collection<String> strList = (Collection<String>) e.getValue();
- copy.store.put(e.getKey(), new ArrayList<>(strList));
+ final Collection<String> strList = (Collection<String>) v;
+ copy.store.put(k, new ArrayList<>(strList));
}
- }
+ });
}
}
[commons-configuration] 05/10: Use forEach()
Posted by gg...@apache.org.
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 0430ad92fd87430e19f6f320d624107db010bcf9
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Sat Jul 16 13:40:40 2022 -0400
Use forEach()
---
.../org/apache/commons/configuration2/tree/UnionCombiner.java | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/src/main/java/org/apache/commons/configuration2/tree/UnionCombiner.java b/src/main/java/org/apache/commons/configuration2/tree/UnionCombiner.java
index af7ae0d2..e427aac5 100644
--- a/src/main/java/org/apache/commons/configuration2/tree/UnionCombiner.java
+++ b/src/main/java/org/apache/commons/configuration2/tree/UnionCombiner.java
@@ -122,7 +122,7 @@ public class UnionCombiner 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 = findCombineNode(node1, node2, child1);
if (child2 != null) {
result.addChild(combine(child1, child2));
@@ -130,12 +130,10 @@ public class UnionCombiner 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();
}
[commons-configuration] 08/10: Use forEach()
Posted by gg...@apache.org.
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 <ga...@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;
}
[commons-configuration] 01/10: Use forEach()
Posted by gg...@apache.org.
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 45b575f613d0000674446a2d7a6151592f111315
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Sat Jul 16 12:59:53 2022 -0400
Use forEach()
---
.../builder/combined/ReloadingMultiFileConfigurationBuilder.java | 9 ++-------
1 file changed, 2 insertions(+), 7 deletions(-)
diff --git a/src/main/java/org/apache/commons/configuration2/builder/combined/ReloadingMultiFileConfigurationBuilder.java b/src/main/java/org/apache/commons/configuration2/builder/combined/ReloadingMultiFileConfigurationBuilder.java
index d26b7d56..89d69275 100644
--- a/src/main/java/org/apache/commons/configuration2/builder/combined/ReloadingMultiFileConfigurationBuilder.java
+++ b/src/main/java/org/apache/commons/configuration2/builder/combined/ReloadingMultiFileConfigurationBuilder.java
@@ -16,11 +16,11 @@
*/
package org.apache.commons.configuration2.builder.combined;
-import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.Map;
import java.util.Set;
+import java.util.stream.Collectors;
import org.apache.commons.configuration2.FileBasedConfiguration;
import org.apache.commons.configuration2.builder.FileBasedConfigurationBuilder;
@@ -123,12 +123,7 @@ public class ReloadingMultiFileConfigurationBuilder<T extends FileBasedConfigura
return new CombinedReloadingController(empty) {
@Override
public Collection<ReloadingController> getSubControllers() {
- final Collection<FileBasedConfigurationBuilder<T>> builders = getManagedBuilders().values();
- final Collection<ReloadingController> controllers = new ArrayList<>(builders.size());
- for (final FileBasedConfigurationBuilder<T> b : builders) {
- controllers.add(((ReloadingControllerSupport) b).getReloadingController());
- }
- return controllers;
+ return getManagedBuilders().values().stream().map(b -> ((ReloadingControllerSupport) b).getReloadingController()).collect(Collectors.toList());
}
};
}
[commons-configuration] 10/10: Use forEach()
Posted by gg...@apache.org.
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 fc956641d628e541d95c82664fcf77bde22df8eb
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Sat Jul 16 13:49:49 2022 -0400
Use forEach()
---
.../BaseHierarchicalConfiguration.java | 26 +++++-----------------
1 file changed, 6 insertions(+), 20 deletions(-)
diff --git a/src/main/java/org/apache/commons/configuration2/BaseHierarchicalConfiguration.java b/src/main/java/org/apache/commons/configuration2/BaseHierarchicalConfiguration.java
index 677b356d..009819d3 100644
--- a/src/main/java/org/apache/commons/configuration2/BaseHierarchicalConfiguration.java
+++ b/src/main/java/org/apache/commons/configuration2/BaseHierarchicalConfiguration.java
@@ -25,6 +25,7 @@ import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
+import java.util.stream.Collectors;
import org.apache.commons.configuration2.event.ConfigurationEvent;
import org.apache.commons.configuration2.event.EventListener;
@@ -266,11 +267,9 @@ public class BaseHierarchicalConfiguration extends AbstractHierarchicalConfigura
* @return the list with sub configurations
*/
private List<HierarchicalConfiguration<ImmutableNode>> createConnectedSubConfigurations(final InMemoryNodeModelSupport parentModelSupport,
- final Collection<NodeSelector> selectors) {
+ final Collection<NodeSelector> selectors) {
final List<HierarchicalConfiguration<ImmutableNode>> configs = new ArrayList<>(selectors.size());
- for (final NodeSelector selector : selectors) {
- configs.add(createSubConfigurationForTrackedNode(selector, parentModelSupport));
- }
+ selectors.forEach(selector -> configs.add(createSubConfigurationForTrackedNode(selector, parentModelSupport)));
return configs;
}
@@ -360,14 +359,7 @@ public class BaseHierarchicalConfiguration extends AbstractHierarchicalConfigura
} finally {
endRead();
}
-
- final List<HierarchicalConfiguration<ImmutableNode>> results = new ArrayList<>(nodes.size());
- for (final ImmutableNode node : nodes) {
- final BaseHierarchicalConfiguration sub = createIndependentSubConfigurationForNode(node);
- results.add(sub);
- }
-
- return results;
+ return nodes.stream().map(this::createIndependentSubConfigurationForNode).collect(Collectors.toList());
}
/**
@@ -421,9 +413,7 @@ public class BaseHierarchicalConfiguration extends AbstractHierarchicalConfigura
final ImmutableNode parent = nodes.get(0);
final List<HierarchicalConfiguration<ImmutableNode>> subs = new ArrayList<>(parent.getChildren().size());
- for (final ImmutableNode node : parent) {
- subs.add(createIndependentSubConfigurationForNode(node));
- }
+ parent.forEach(node -> subs.add(createIndependentSubConfigurationForNode(node)));
return subs;
}
@@ -523,11 +513,7 @@ public class BaseHierarchicalConfiguration extends AbstractHierarchicalConfigura
* @return a list with corresponding immutable configurations
*/
private static List<ImmutableHierarchicalConfiguration> toImmutable(final List<? extends HierarchicalConfiguration<?>> subs) {
- final List<ImmutableHierarchicalConfiguration> res = new ArrayList<>(subs.size());
- for (final HierarchicalConfiguration<?> sub : subs) {
- res.add(ConfigurationUtils.unmodifiableConfiguration(sub));
- }
- return res;
+ return subs.stream().map(ConfigurationUtils::unmodifiableConfiguration).collect(Collectors.toList());
}
/**
[commons-configuration] 04/10: Use forEach()
Posted by gg...@apache.org.
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 a41b8b9b5d05b5d628487dfdea0266ce47498a0f
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Sat Jul 16 13:00:07 2022 -0400
Use forEach()
---
.../commons/configuration2/tree/xpath/XPathExpressionEngine.java | 9 ++-------
1 file changed, 2 insertions(+), 7 deletions(-)
diff --git a/src/main/java/org/apache/commons/configuration2/tree/xpath/XPathExpressionEngine.java b/src/main/java/org/apache/commons/configuration2/tree/xpath/XPathExpressionEngine.java
index 8d88bba3..49326d36 100644
--- a/src/main/java/org/apache/commons/configuration2/tree/xpath/XPathExpressionEngine.java
+++ b/src/main/java/org/apache/commons/configuration2/tree/xpath/XPathExpressionEngine.java
@@ -16,11 +16,11 @@
*/
package org.apache.commons.configuration2.tree.xpath;
-import java.util.ArrayList;
import java.util.Collections;
import java.util.LinkedList;
import java.util.List;
import java.util.StringTokenizer;
+import java.util.stream.Collectors;
import org.apache.commons.configuration2.tree.ExpressionEngine;
import org.apache.commons.configuration2.tree.NodeAddData;
@@ -410,12 +410,7 @@ public class XPathExpressionEngine implements ExpressionEngine {
* @return the result list
*/
private static <T> List<QueryResult<T>> convertResults(final List<?> results) {
- final List<QueryResult<T>> queryResults = new ArrayList<>(results.size());
- for (final Object res : results) {
- final QueryResult<T> queryResult = createResult(res);
- queryResults.add(queryResult);
- }
- return queryResults;
+ return results.stream().map(res -> (QueryResult<T>) createResult(res)).collect(Collectors.toList());
}
/**
[commons-configuration] 03/10: Use forEach()
Posted by gg...@apache.org.
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 89ef41555f98938408d0bfd4686b6b2e35efd1bb
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Sat Jul 16 13:00:03 2022 -0400
Use forEach()
---
.../commons/configuration2/plist/XMLPropertyListConfiguration.java | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/src/main/java/org/apache/commons/configuration2/plist/XMLPropertyListConfiguration.java b/src/main/java/org/apache/commons/configuration2/plist/XMLPropertyListConfiguration.java
index d423b9bd..2beb0f26 100644
--- a/src/main/java/org/apache/commons/configuration2/plist/XMLPropertyListConfiguration.java
+++ b/src/main/java/org/apache/commons/configuration2/plist/XMLPropertyListConfiguration.java
@@ -312,9 +312,7 @@ public class XMLPropertyListConfiguration extends BaseHierarchicalConfiguration
}
} else if (value instanceof List) {
out.println(padding + "<array>");
- for (final Object o : (List<?>) value) {
- printValue(out, indentLevel + 1, o);
- }
+ ((List<?>) value).forEach(o -> printValue(out, indentLevel + 1, o));
out.println(padding + "</array>");
} else if (value instanceof HierarchicalConfiguration) {
// This is safe because we have created this configuration