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 18:16:46 UTC
[commons-configuration] branch master updated (fc956641 -> 5ea388dd)
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 fc956641 Use forEach()
new 45134b32 Use forEach()
new c3fe47bc Use forEach()
new 0341c3af Use forEach()
new 67aec26a Use forEach()
new 3de33310 Use forEach()
new 5df9ca2a Use forEach()
new 57de54b5 Use forEach()
new 70975eac Use forEach()
new 6717a78a Use forEach()
new 5ea388dd 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/CombinedConfiguration.java | 29 +++++----------
.../configuration2/CompositeConfiguration.java | 42 +++++-----------------
.../commons/configuration2/ConfigurationUtils.java | 10 ++----
.../configuration2/DatabaseConfiguration.java | 5 +--
.../DynamicCombinedConfiguration.java | 24 ++++---------
.../HierarchicalConfigurationConverter.java | 5 +--
.../HierarchicalConfigurationXMLReader.java | 4 +--
.../commons/configuration2/INIConfiguration.java | 19 +++-------
.../commons/configuration2/tree/TreeData.java | 8 ++---
.../commons/configuration2/tree/TreeUtils.java | 9 ++---
10 files changed, 39 insertions(+), 116 deletions(-)
[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 45134b320304ffb4cfa8ab92fa543f4994e3869a
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Sat Jul 16 13:56:21 2022 -0400
Use forEach()
---
.../configuration2/CombinedConfiguration.java | 29 +++++++---------------
1 file changed, 9 insertions(+), 20 deletions(-)
diff --git a/src/main/java/org/apache/commons/configuration2/CombinedConfiguration.java b/src/main/java/org/apache/commons/configuration2/CombinedConfiguration.java
index f73e9eee..ce5a72b8 100644
--- a/src/main/java/org/apache/commons/configuration2/CombinedConfiguration.java
+++ b/src/main/java/org/apache/commons/configuration2/CombinedConfiguration.java
@@ -26,6 +26,7 @@ import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Set;
+import java.util.stream.Collectors;
import org.apache.commons.configuration2.event.ConfigurationEvent;
import org.apache.commons.configuration2.event.EventListener;
@@ -392,11 +393,7 @@ public class CombinedConfiguration extends BaseHierarchicalConfiguration impleme
public List<Configuration> getConfigurations() {
beginRead(true);
try {
- final List<Configuration> list = new ArrayList<>(getNumberOfConfigurationsInternal());
- for (final ConfigData cd : configurations) {
- list.add(cd.getConfiguration());
- }
- return list;
+ return configurations.stream().map(ConfigData::getConfiguration).collect(Collectors.toList());
} finally {
endRead();
}
@@ -412,11 +409,7 @@ public class CombinedConfiguration extends BaseHierarchicalConfiguration impleme
public List<String> getConfigurationNameList() {
beginRead(true);
try {
- final List<String> list = new ArrayList<>(getNumberOfConfigurationsInternal());
- for (final ConfigData cd : configurations) {
- list.add(cd.getName());
- }
- return list;
+ return configurations.stream().map(ConfigData::getName).collect(Collectors.toList());
} finally {
endRead();
}
@@ -535,9 +528,7 @@ public class CombinedConfiguration extends BaseHierarchicalConfiguration impleme
try {
final CombinedConfiguration copy = (CombinedConfiguration) super.clone();
copy.initChildCollections();
- for (final ConfigData cd : configurations) {
- copy.addConfiguration(ConfigurationUtils.cloneConfiguration(cd.getConfiguration()), cd.getName(), cd.getAt());
- }
+ configurations.forEach(cd -> copy.addConfiguration(ConfigurationUtils.cloneConfiguration(cd.getConfiguration()), cd.getName(), cd.getAt()));
return copy;
} finally {
@@ -601,7 +592,7 @@ public class CombinedConfiguration extends BaseHierarchicalConfiguration impleme
final List<QueryResult<ImmutableNode>> results = fetchNodeList(key);
final Set<Configuration> sources = new HashSet<>();
- for (final QueryResult<ImmutableNode> result : results) {
+ results.forEach(result -> {
final Set<Configuration> resultSources = findSourceConfigurations(result.getNode());
if (resultSources.isEmpty()) {
// key must be defined in combined configuration
@@ -609,7 +600,7 @@ public class CombinedConfiguration extends BaseHierarchicalConfiguration impleme
} else {
sources.addAll(resultSources);
}
- }
+ });
return sources;
} finally {
@@ -732,13 +723,13 @@ public class CombinedConfiguration extends BaseHierarchicalConfiguration impleme
final Set<Configuration> result = new HashSet<>();
final FindNodeVisitor<ImmutableNode> visitor = new FindNodeVisitor<>(node);
- for (final ConfigData cd : configurations) {
+ configurations.forEach(cd -> {
NodeTreeWalker.INSTANCE.walkBFS(cd.getRootNode(), visitor, getModel().getNodeHandler());
if (visitor.isFound()) {
result.add(cd.getConfiguration());
visitor.reset();
}
- }
+ });
return result;
}
@@ -771,9 +762,7 @@ public class CombinedConfiguration extends BaseHierarchicalConfiguration impleme
*/
private void unregisterListenerAtChildren() {
if (configurations != null) {
- for (final ConfigData child : configurations) {
- unregisterListenerAt(child.getConfiguration());
- }
+ configurations.forEach(child -> unregisterListenerAt(child.getConfiguration()));
}
}
[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 57de54b518f8ad58d324467bca9dc20bd85ebb8c
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Sat Jul 16 14:16:27 2022 -0400
Use forEach()
---
.../DynamicCombinedConfiguration.java | 24 ++++++----------------
1 file changed, 6 insertions(+), 18 deletions(-)
diff --git a/src/main/java/org/apache/commons/configuration2/DynamicCombinedConfiguration.java b/src/main/java/org/apache/commons/configuration2/DynamicCombinedConfiguration.java
index 85a53589..dba0e0f0 100644
--- a/src/main/java/org/apache/commons/configuration2/DynamicCombinedConfiguration.java
+++ b/src/main/java/org/apache/commons/configuration2/DynamicCombinedConfiguration.java
@@ -574,33 +574,25 @@ public class DynamicCombinedConfiguration extends CombinedConfiguration {
@Override
public void clearEventListeners() {
- for (final CombinedConfiguration cc : configs.values()) {
- cc.clearEventListeners();
- }
+ configs.values().forEach(CombinedConfiguration::clearEventListeners);
super.clearEventListeners();
}
@Override
public <T extends Event> void addEventListener(final EventType<T> eventType, final EventListener<? super T> listener) {
- for (final CombinedConfiguration cc : configs.values()) {
- cc.addEventListener(eventType, listener);
- }
+ configs.values().forEach(cc -> cc.addEventListener(eventType, listener));
super.addEventListener(eventType, listener);
}
@Override
public <T extends Event> boolean removeEventListener(final EventType<T> eventType, final EventListener<? super T> listener) {
- for (final CombinedConfiguration cc : configs.values()) {
- cc.removeEventListener(eventType, listener);
- }
+ configs.values().forEach(cc -> cc.removeEventListener(eventType, listener));
return super.removeEventListener(eventType, listener);
}
@Override
public void clearErrorListeners() {
- for (final CombinedConfiguration cc : configs.values()) {
- cc.clearErrorListeners();
- }
+ configs.values().forEach(cc -> cc.clearErrorListeners());
super.clearErrorListeners();
}
@@ -616,9 +608,7 @@ public class DynamicCombinedConfiguration extends CombinedConfiguration {
}
public void invalidateAll() {
- for (final CombinedConfiguration cc : configs.values()) {
- cc.invalidate();
- }
+ configs.values().forEach(CombinedConfiguration::invalidate);
}
/**
@@ -733,9 +723,7 @@ public class DynamicCombinedConfiguration extends CombinedConfiguration {
config.setConversionExpressionEngine(getConversionExpressionEngine());
config.setListDelimiterHandler(getListDelimiterHandler());
copyEventListeners(config);
- for (final ConfigData data : configurations) {
- config.addConfiguration(data.getConfiguration(), data.getName(), data.getAt());
- }
+ configurations.forEach(data -> config.addConfiguration(data.getConfiguration(), data.getName(), data.getAt()));
config.setSynchronizer(getSynchronizer());
}
[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 0341c3af59be12f525138e21e5fe2ee02c5baeb3
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Sat Jul 16 13:56:30 2022 -0400
Use forEach()
---
.../java/org/apache/commons/configuration2/tree/TreeData.java | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/src/main/java/org/apache/commons/configuration2/tree/TreeData.java b/src/main/java/org/apache/commons/configuration2/tree/TreeData.java
index 3a95075a..31ba3e06 100644
--- a/src/main/java/org/apache/commons/configuration2/tree/TreeData.java
+++ b/src/main/java/org/apache/commons/configuration2/tree/TreeData.java
@@ -19,6 +19,8 @@ package org.apache.commons.configuration2.tree;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.Map.Entry;
+import java.util.stream.Collectors;
/**
* An internally used helper class for storing information about the managed node structure. An instance of this class
@@ -198,10 +200,6 @@ class TreeData extends AbstractImmutableNodeHandler implements ReferenceNodeHand
* @return the inverse replacement mapping
*/
private Map<ImmutableNode, ImmutableNode> createInverseMapping(final Map<ImmutableNode, ImmutableNode> replacements) {
- final Map<ImmutableNode, ImmutableNode> inverseMapping = new HashMap<>();
- for (final Map.Entry<ImmutableNode, ImmutableNode> e : replacements.entrySet()) {
- inverseMapping.put(e.getValue(), e.getKey());
- }
- return inverseMapping;
+ return replacements.entrySet().stream().collect(Collectors.toMap(Entry::getValue, Entry::getKey));
}
}
[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 5ea388ddf92ac7e042e167934e583121f5567444
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Sat Jul 16 14:16:40 2022 -0400
Use forEach()
---
.../commons/configuration2/INIConfiguration.java | 19 +++++--------------
1 file changed, 5 insertions(+), 14 deletions(-)
diff --git a/src/main/java/org/apache/commons/configuration2/INIConfiguration.java b/src/main/java/org/apache/commons/configuration2/INIConfiguration.java
index 216b4896..3cc990bc 100644
--- a/src/main/java/org/apache/commons/configuration2/INIConfiguration.java
+++ b/src/main/java/org/apache/commons/configuration2/INIConfiguration.java
@@ -22,7 +22,6 @@ import java.io.PrintWriter;
import java.io.Reader;
import java.io.Writer;
import java.util.ArrayList;
-import java.util.Collection;
import java.util.LinkedHashMap;
import java.util.LinkedHashSet;
import java.util.List;
@@ -370,9 +369,7 @@ public class INIConfiguration extends BaseHierarchicalConfiguration implements F
out.print("]");
out.println();
- for (final ImmutableNode child : node) {
- writeProperty(out, child.getNodeName(), child.getValue(), separator);
- }
+ node.forEach(child -> writeProperty(out, child.getNodeName(), child.getValue(), separator));
} else {
writeProperty(out, node.getNodeName(), node.getValue(), separator);
}
@@ -412,9 +409,7 @@ public class INIConfiguration extends BaseHierarchicalConfiguration implements F
* @return the root node of the newly created hierarchy
*/
private static ImmutableNode createNewRootNode(final ImmutableNode.Builder rootBuilder, final Map<String, ImmutableNode.Builder> sectionBuilders) {
- for (final Map.Entry<String, ImmutableNode.Builder> e : sectionBuilders.entrySet()) {
- rootBuilder.addChild(e.getValue().name(e.getKey()).create());
- }
+ sectionBuilders.entrySet().forEach(e -> rootBuilder.addChild(e.getValue().name(e.getKey()).create()));
return rootBuilder.create();
}
@@ -473,11 +468,7 @@ public class INIConfiguration extends BaseHierarchicalConfiguration implements F
* @param value the value string
*/
private void createValueNodes(final ImmutableNode.Builder sectionBuilder, final String key, final String value) {
- final Collection<String> values = getListDelimiterHandler().split(value, false);
-
- for (final String v : values) {
- sectionBuilder.addChild(new ImmutableNode.Builder().name(key).value(v).create());
- }
+ getListDelimiterHandler().split(value, false).forEach(v -> sectionBuilder.addChild(new ImmutableNode.Builder().name(key).value(v).create()));
}
/**
@@ -902,11 +893,11 @@ public class INIConfiguration extends BaseHierarchicalConfiguration implements F
final List<ImmutableNode> filteredList;
if (node == getRootNode()) {
filteredList = new ArrayList<>(children.size());
- for (final ImmutableNode child : children) {
+ children.forEach(child -> {
if (!isSectionNode(child)) {
filteredList.add(child);
}
- }
+ });
} else {
filteredList = children;
}
[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 6717a78a31c50c67ae2f22958879028dfa238071
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Sat Jul 16 14:16:37 2022 -0400
Use forEach()
---
.../commons/configuration2/HierarchicalConfigurationXMLReader.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/apache/commons/configuration2/HierarchicalConfigurationXMLReader.java b/src/main/java/org/apache/commons/configuration2/HierarchicalConfigurationXMLReader.java
index d4b96cb1..3be472b3 100644
--- a/src/main/java/org/apache/commons/configuration2/HierarchicalConfigurationXMLReader.java
+++ b/src/main/java/org/apache/commons/configuration2/HierarchicalConfigurationXMLReader.java
@@ -151,12 +151,12 @@ public class HierarchicalConfigurationXMLReader<T> extends ConfigurationXMLReade
protected Attributes fetchAttributes(final T node, final NodeHandler<T> handler) {
final AttributesImpl attrs = new AttributesImpl();
- for (final String attr : handler.getAttributes(node)) {
+ handler.getAttributes(node).forEach(attr -> {
final Object value = handler.getAttributeValue(node, attr);
if (value != null) {
attrs.addAttribute(NS_URI, attr, attr, ATTR_TYPE, value.toString());
}
- }
+ });
return attrs;
}
[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 67aec26a5e5aa239afb7a214af5324174e65a884
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Sat Jul 16 13:56:35 2022 -0400
Use forEach()
---
.../java/org/apache/commons/configuration2/tree/TreeUtils.java | 9 ++-------
1 file changed, 2 insertions(+), 7 deletions(-)
diff --git a/src/main/java/org/apache/commons/configuration2/tree/TreeUtils.java b/src/main/java/org/apache/commons/configuration2/tree/TreeUtils.java
index 9b2f27d9..25ad7bd3 100644
--- a/src/main/java/org/apache/commons/configuration2/tree/TreeUtils.java
+++ b/src/main/java/org/apache/commons/configuration2/tree/TreeUtils.java
@@ -17,7 +17,6 @@
package org.apache.commons.configuration2.tree;
import java.io.PrintStream;
-import java.util.Map;
/**
* Utility methods.
@@ -43,9 +42,7 @@ public final class TreeUtils {
private static void printTree(final PrintStream stream, final String indent, final ImmutableNode result) {
final StringBuilder buffer = new StringBuilder(indent).append("<").append(result.getNodeName());
- for (final Map.Entry<String, Object> e : result.getAttributes().entrySet()) {
- buffer.append(' ').append(e.getKey()).append("='").append(e.getValue()).append("'");
- }
+ result.getAttributes().forEach((k, v) -> buffer.append(' ').append(k).append("='").append(v).append("'"));
buffer.append(">");
stream.print(buffer.toString());
if (result.getValue() != null) {
@@ -54,9 +51,7 @@ public final class TreeUtils {
boolean newline = false;
if (!result.getChildren().isEmpty()) {
stream.print("\n");
- for (final ImmutableNode child : result) {
- printTree(stream, indent + " ", child);
- }
+ result.forEach(child -> printTree(stream, indent + " ", child));
newline = true;
}
if (newline) {
[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 70975eacf14048cce83228bb02abb3c187f2a08d
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Sat Jul 16 14:16:31 2022 -0400
Use forEach()
---
.../commons/configuration2/HierarchicalConfigurationConverter.java | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/src/main/java/org/apache/commons/configuration2/HierarchicalConfigurationConverter.java b/src/main/java/org/apache/commons/configuration2/HierarchicalConfigurationConverter.java
index 925c7ce2..2cd80b29 100644
--- a/src/main/java/org/apache/commons/configuration2/HierarchicalConfigurationConverter.java
+++ b/src/main/java/org/apache/commons/configuration2/HierarchicalConfigurationConverter.java
@@ -129,7 +129,6 @@ abstract class HierarchicalConfigurationConverter {
for (final DefaultConfigurationKey.KeyIterator it = key.iterator(); it.hasNext();) {
list.add(it.nextKey());
}
-
Collections.reverse(list);
return list.iterator();
}
@@ -168,9 +167,7 @@ abstract class HierarchicalConfigurationConverter {
protected void fireValue(final String name, final Object value) {
if (value instanceof Collection) {
final Collection<?> valueCol = (Collection<?>) value;
- for (final Object v : valueCol) {
- fireValue(name, v);
- }
+ valueCol.forEach(v -> fireValue(name, v));
} else {
elementStart(name, value);
elementEnd(name);
[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 c3fe47bc724280040f17829344c2710ac7828725
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Sat Jul 16 13:56:25 2022 -0400
Use forEach()
---
.../configuration2/CompositeConfiguration.java | 42 +++++-----------------
1 file changed, 8 insertions(+), 34 deletions(-)
diff --git a/src/main/java/org/apache/commons/configuration2/CompositeConfiguration.java b/src/main/java/org/apache/commons/configuration2/CompositeConfiguration.java
index fe96af4c..1a1606bd 100644
--- a/src/main/java/org/apache/commons/configuration2/CompositeConfiguration.java
+++ b/src/main/java/org/apache/commons/configuration2/CompositeConfiguration.java
@@ -115,11 +115,8 @@ public class CompositeConfiguration extends AbstractConfiguration implements Clo
*/
public CompositeConfiguration(final Configuration inMemoryConfiguration, final Collection<? extends Configuration> configurations) {
this(inMemoryConfiguration);
-
if (configurations != null) {
- for (final Configuration c : configurations) {
- addConfiguration(c);
- }
+ configurations.forEach(this::addConfiguration);
}
}
@@ -299,53 +296,30 @@ public class CompositeConfiguration extends AbstractConfiguration implements Clo
@Override
protected Iterator<String> getKeysInternal() {
final Set<String> keys = new LinkedHashSet<>();
- for (final Configuration config : configList) {
- for (final Iterator<String> it = config.getKeys(); it.hasNext();) {
- keys.add(it.next());
- }
- }
-
+ configList.forEach(config -> config.getKeys().forEachRemaining(keys::add));
return keys.iterator();
}
@Override
protected Iterator<String> getKeysInternal(final String key) {
final Set<String> keys = new LinkedHashSet<>();
- for (final Configuration config : configList) {
- for (final Iterator<String> it = config.getKeys(key); it.hasNext();) {
- keys.add(it.next());
- }
- }
-
+ configList.forEach(config -> config.getKeys(key).forEachRemaining(keys::add));
return keys.iterator();
}
@Override
protected boolean isEmptyInternal() {
- for (final Configuration config : configList) {
- if (!config.isEmpty()) {
- return false;
- }
- }
-
- return true;
+ return configList.stream().allMatch(Configuration::isEmpty);
}
@Override
protected void clearPropertyDirect(final String key) {
- for (final Configuration config : configList) {
- config.clearProperty(key);
- }
+ configList.forEach(config -> config.clearProperty(key));
}
@Override
protected boolean containsKeyInternal(final String key) {
- for (final Configuration config : configList) {
- if (config.containsKey(key)) {
- return true;
- }
- }
- return false;
+ return configList.stream().anyMatch(config -> config.containsKey(key));
}
@Override
@@ -438,11 +412,11 @@ public class CompositeConfiguration extends AbstractConfiguration implements Clo
copy.inMemoryConfiguration = ConfigurationUtils.cloneConfiguration(getInMemoryConfiguration());
copy.configList.add(copy.inMemoryConfiguration);
- for (final Configuration config : configList) {
+ configList.forEach(config -> {
if (config != getInMemoryConfiguration()) {
copy.addConfiguration(ConfigurationUtils.cloneConfiguration(config));
}
- }
+ });
copy.cloneInterpolator(this);
return copy;
[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 3de3331040a5f0b4a942d75bcf6833d055baf34f
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Sat Jul 16 14:16:17 2022 -0400
Use forEach()
---
.../org/apache/commons/configuration2/ConfigurationUtils.java | 10 ++--------
1 file changed, 2 insertions(+), 8 deletions(-)
diff --git a/src/main/java/org/apache/commons/configuration2/ConfigurationUtils.java b/src/main/java/org/apache/commons/configuration2/ConfigurationUtils.java
index 26731715..a234e564 100644
--- a/src/main/java/org/apache/commons/configuration2/ConfigurationUtils.java
+++ b/src/main/java/org/apache/commons/configuration2/ConfigurationUtils.java
@@ -178,10 +178,7 @@ public final class ConfigurationUtils {
* @since 2.2
*/
public static void copy(final ImmutableConfiguration source, final Configuration target) {
- for (final Iterator<String> keys = source.getKeys(); keys.hasNext();) {
- final String key = keys.next();
- target.setProperty(key, source.getProperty(key));
- }
+ source.getKeys().forEachRemaining(key -> target.setProperty(key, source.getProperty(key)));
}
/**
@@ -219,10 +216,7 @@ public final class ConfigurationUtils {
* @since 2.2
*/
public static void append(final ImmutableConfiguration source, final Configuration target) {
- for (final Iterator<String> keys = source.getKeys(); keys.hasNext();) {
- final String key = keys.next();
- target.addProperty(key, source.getProperty(key));
- }
+ source.getKeys().forEachRemaining(key -> target.addProperty(key, source.getProperty(key)));
}
/**
[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 5df9ca2a3f900c42b6908f6105d072c42ad89b17
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Sat Jul 16 14:16:20 2022 -0400
Use forEach()
---
.../org/apache/commons/configuration2/DatabaseConfiguration.java | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/src/main/java/org/apache/commons/configuration2/DatabaseConfiguration.java b/src/main/java/org/apache/commons/configuration2/DatabaseConfiguration.java
index 20c4f5fc..81f5ff13 100644
--- a/src/main/java/org/apache/commons/configuration2/DatabaseConfiguration.java
+++ b/src/main/java/org/apache/commons/configuration2/DatabaseConfiguration.java
@@ -301,11 +301,8 @@ public class DatabaseConfiguration extends AbstractConfiguration {
final List<Object> results = new ArrayList<>();
try (ResultSet rs = openResultSet(String.format(SQL_GET_PROPERTY, table, keyColumn), true, key)) {
while (rs.next()) {
- final Object value = extractPropertyValue(rs);
// Split value if it contains the list delimiter
- for (final Object o : getListDelimiterHandler().parse(value)) {
- results.add(o);
- }
+ getListDelimiterHandler().parse(extractPropertyValue(rs)).forEach(results::add);
}
}
if (!results.isEmpty()) {