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 16:44:18 UTC
[commons-configuration] branch master updated (e0d0a482 -> 468a7304)
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 e0d0a482 Use forEach()
new da5ef9b2 Use forEach()
new ed97373a Use forEach()
new 5510c8c2 Use forEach()
new 5f075940 Use forEach()
new 52522ca6 Use forEach()
new ffbecceb Use forEach()
new 0d169b3d Use forEach()
new de1838bb Use forEach()
new 026f29b0 Use forEach()
new 468a7304 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:
.../builder/DefaultParametersManager.java | 8 +++---
.../builder/FileBasedConfigurationBuilder.java | 7 ++----
.../configuration2/event/EventListenerList.java | 12 +++------
.../configuration2/interpol/ExprLookup.java | 4 +--
.../interpol/InterpolatorSpecification.java | 8 ++----
.../commons/configuration2/io/FileHandler.java | 20 ++++-----------
.../tree/DefaultExpressionEngine.java | 4 +--
.../commons/configuration2/tree/ImmutableNode.java | 8 +++---
.../configuration2/tree/InMemoryNodeModel.java | 29 +++++++++-------------
.../xpath/ConfigurationNodeIteratorChildren.java | 8 +++---
10 files changed, 38 insertions(+), 70 deletions(-)
[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 52522ca671f46be10cc7a8ffdf3c200b883117dd
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Sat Jul 16 12:43:44 2022 -0400
Use forEach()
---
.../java/org/apache/commons/configuration2/interpol/ExprLookup.java | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/src/main/java/org/apache/commons/configuration2/interpol/ExprLookup.java b/src/main/java/org/apache/commons/configuration2/interpol/ExprLookup.java
index 422b5928..26cf4ed9 100644
--- a/src/main/java/org/apache/commons/configuration2/interpol/ExprLookup.java
+++ b/src/main/java/org/apache/commons/configuration2/interpol/ExprLookup.java
@@ -260,9 +260,7 @@ public class ExprLookup implements Lookup {
* @param ctx the context to be initialized
*/
private void initializeContext(final JexlContext ctx) {
- for (final Variable var : variables) {
- ctx.set(var.getName(), var.getValue());
- }
+ variables.forEach(var -> ctx.set(var.getName(), var.getValue()));
}
/**
[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 026f29b0a2a9c1cd0e5489603ec70775f27c9456
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Sat Jul 16 12:44:05 2022 -0400
Use forEach()
---
.../configuration2/tree/InMemoryNodeModel.java | 29 +++++++++-------------
1 file changed, 12 insertions(+), 17 deletions(-)
diff --git a/src/main/java/org/apache/commons/configuration2/tree/InMemoryNodeModel.java b/src/main/java/org/apache/commons/configuration2/tree/InMemoryNodeModel.java
index 33ee670d..bc8c4f5a 100644
--- a/src/main/java/org/apache/commons/configuration2/tree/InMemoryNodeModel.java
+++ b/src/main/java/org/apache/commons/configuration2/tree/InMemoryNodeModel.java
@@ -568,9 +568,7 @@ public class InMemoryNodeModel implements NodeModel<ImmutableNode> {
NodeTreeWalker.INSTANCE.walkBFS(root, new ConfigurationNodeVisitorAdapter<ImmutableNode>() {
@Override
public void visitBeforeChildren(final ImmutableNode node, final NodeHandler<ImmutableNode> handler) {
- for (final ImmutableNode c : node) {
- parents.put(c, node);
- }
+ node.forEach(c -> parents.put(c, node));
}
}, DUMMY_HANDLER);
}
@@ -686,9 +684,7 @@ public class InMemoryNodeModel implements NodeModel<ImmutableNode> {
*/
private static Collection<ImmutableNode> createNodesToAdd(final String newNodeName, final Iterable<?> values) {
final Collection<ImmutableNode> nodes = new LinkedList<>();
- for (final Object value : values) {
- nodes.add(new ImmutableNode.Builder().name(newNodeName).value(value).create());
- }
+ values.forEach(value -> nodes.add(new ImmutableNode.Builder().name(newNodeName).value(value).create()));
return nodes;
}
@@ -733,13 +729,13 @@ public class InMemoryNodeModel implements NodeModel<ImmutableNode> {
* @return a flag whether there are elements to be cleared
*/
private static boolean initializeClearTransaction(final ModelTransaction tx, final Collection<QueryResult<ImmutableNode>> results) {
- for (final QueryResult<ImmutableNode> result : results) {
+ results.forEach(result -> {
if (result.isAttributeResult()) {
tx.addRemoveAttributeOperation(result.getNode(), result.getAttributeName());
} else {
tx.addClearNodeValueOperation(result.getNode());
}
- }
+ });
return !results.isEmpty();
}
@@ -752,13 +748,14 @@ public class InMemoryNodeModel implements NodeModel<ImmutableNode> {
* @return a flag whether there are elements to be updated
*/
private static boolean initializeUpdateTransaction(final ModelTransaction tx, final Map<QueryResult<ImmutableNode>, Object> changedValues) {
- for (final Map.Entry<QueryResult<ImmutableNode>, Object> e : changedValues.entrySet()) {
- if (e.getKey().isAttributeResult()) {
- tx.addAttributeOperation(e.getKey().getNode(), e.getKey().getAttributeName(), e.getValue());
+ changedValues.forEach((k, v) -> {
+ final ImmutableNode node = k.getNode();
+ if (k.isAttributeResult()) {
+ tx.addAttributeOperation(node, k.getAttributeName(), v);
} else {
- tx.addChangeNodeValueOperation(e.getKey().getNode(), e.getValue());
+ tx.addChangeNodeValueOperation(node, v);
}
- }
+ });
return !changedValues.isEmpty();
}
@@ -915,12 +912,10 @@ public class InMemoryNodeModel implements NodeModel<ImmutableNode> {
* @return the updated {@code TreeData} object
*/
private static TreeData createSelectorsForTrackedNodes(final Mutable<Collection<NodeSelector>> refSelectors, final List<ImmutableNode> nodes,
- final TreeData current, final NodeKeyResolver<ImmutableNode> resolver) {
+ final TreeData current, final NodeKeyResolver<ImmutableNode> resolver) {
final List<NodeSelector> selectors = new ArrayList<>(nodes.size());
final Map<ImmutableNode, String> cache = new HashMap<>();
- for (final ImmutableNode node : nodes) {
- selectors.add(new NodeSelector(resolver.nodeKey(node, cache, current)));
- }
+ nodes.forEach(node -> selectors.add(new NodeSelector(resolver.nodeKey(node, cache, current))));
refSelectors.setValue(selectors);
final NodeTracker newTracker = current.getNodeTracker().trackNodes(selectors, nodes);
return current.updateNodeTracker(newTracker);
[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 5510c8c23180cd07c79c930fd870d57e1ea91845
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Sat Jul 16 12:43:35 2022 -0400
Use forEach()
---
.../commons/configuration2/builder/DefaultParametersManager.java | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/src/main/java/org/apache/commons/configuration2/builder/DefaultParametersManager.java b/src/main/java/org/apache/commons/configuration2/builder/DefaultParametersManager.java
index cf90637e..d16e7879 100644
--- a/src/main/java/org/apache/commons/configuration2/builder/DefaultParametersManager.java
+++ b/src/main/java/org/apache/commons/configuration2/builder/DefaultParametersManager.java
@@ -128,11 +128,11 @@ public class DefaultParametersManager {
*/
public void unregisterDefaultsHandler(final DefaultParametersHandler<?> handler, final Class<?> startClass) {
final Collection<DefaultHandlerData> toRemove = new LinkedList<>();
- for (final DefaultHandlerData dhd : defaultHandlers) {
+ defaultHandlers.forEach(dhd -> {
if (dhd.isOccurrence(handler, startClass)) {
toRemove.add(dhd);
}
- }
+ });
defaultHandlers.removeAll(toRemove);
}
@@ -146,9 +146,7 @@ public class DefaultParametersManager {
*/
public void initializeParameters(final BuilderParameters params) {
if (params != null) {
- for (final DefaultHandlerData dhd : defaultHandlers) {
- dhd.applyHandlerIfMatching(params);
- }
+ defaultHandlers.forEach(dhd -> dhd.applyHandlerIfMatching(params));
}
}
[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 468a73040d884d25c912a2baa9bc67aaaf5d3486
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Sat Jul 16 12:44:12 2022 -0400
Use forEach()
---
.../configuration2/interpol/InterpolatorSpecification.java | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/src/main/java/org/apache/commons/configuration2/interpol/InterpolatorSpecification.java b/src/main/java/org/apache/commons/configuration2/interpol/InterpolatorSpecification.java
index 58a2c140..a432cc52 100644
--- a/src/main/java/org/apache/commons/configuration2/interpol/InterpolatorSpecification.java
+++ b/src/main/java/org/apache/commons/configuration2/interpol/InterpolatorSpecification.java
@@ -185,9 +185,7 @@ public final class InterpolatorSpecification {
*/
public Builder withPrefixLookups(final Map<String, ? extends Lookup> lookups) {
if (lookups != null) {
- for (final Map.Entry<String, ? extends Lookup> e : lookups.entrySet()) {
- withPrefixLookup(e.getKey(), e.getValue());
- }
+ lookups.forEach(this::withPrefixLookup);
}
return this;
}
@@ -215,9 +213,7 @@ public final class InterpolatorSpecification {
*/
public Builder withDefaultLookups(final Collection<? extends Lookup> lookups) {
if (lookups != null) {
- for (final Lookup l : lookups) {
- withDefaultLookup(l);
- }
+ lookups.forEach(this::withDefaultLookup);
}
return this;
}
[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 de1838bb99c0c0314b3904354c1f6a8b616f2b80
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Sat Jul 16 12:44:00 2022 -0400
Use forEach()
---
.../org/apache/commons/configuration2/tree/ImmutableNode.java | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/main/java/org/apache/commons/configuration2/tree/ImmutableNode.java b/src/main/java/org/apache/commons/configuration2/tree/ImmutableNode.java
index a23c70f2..7a688bfe 100644
--- a/src/main/java/org/apache/commons/configuration2/tree/ImmutableNode.java
+++ b/src/main/java/org/apache/commons/configuration2/tree/ImmutableNode.java
@@ -104,11 +104,11 @@ public final class ImmutableNode implements Iterable<ImmutableNode> {
if (name == null) {
return list;
}
- for (final ImmutableNode node : children) {
+ children.forEach(node -> {
if (name.equals(node.getNodeName())) {
list.add(node);
}
- }
+ });
return list;
}
@@ -555,11 +555,11 @@ public final class ImmutableNode implements Iterable<ImmutableNode> {
*/
private static Collection<? extends ImmutableNode> filterNull(final Collection<? extends ImmutableNode> children) {
final List<ImmutableNode> result = new ArrayList<>(children.size());
- for (final ImmutableNode c : children) {
+ children.forEach(c -> {
if (c != null) {
result.add(c);
}
- }
+ });
return result;
}
}
[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 0d169b3d7066849762aff6f39558109caa3e82b6
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Sat Jul 16 12:43:53 2022 -0400
Use forEach()
---
.../commons/configuration2/io/FileHandler.java | 20 +++++---------------
1 file changed, 5 insertions(+), 15 deletions(-)
diff --git a/src/main/java/org/apache/commons/configuration2/io/FileHandler.java b/src/main/java/org/apache/commons/configuration2/io/FileHandler.java
index 387b3c50..b3bbe172 100644
--- a/src/main/java/org/apache/commons/configuration2/io/FileHandler.java
+++ b/src/main/java/org/apache/commons/configuration2/io/FileHandler.java
@@ -370,45 +370,35 @@ public class FileHandler {
* Notifies the registered listeners about a completed load operation.
*/
private void fireLoadedEvent() {
- for (final FileHandlerListener l : listeners) {
- l.loaded(this);
- }
+ listeners.forEach(l -> l.loaded(this));
}
/**
* Notifies the registered listeners about the start of a load operation.
*/
private void fireLoadingEvent() {
- for (final FileHandlerListener l : listeners) {
- l.loading(this);
- }
+ listeners.forEach(l -> l.loading(this));
}
/**
* Notifies the registered listeners about a property update.
*/
private void fireLocationChangedEvent() {
- for (final FileHandlerListener l : listeners) {
- l.locationChanged(this);
- }
+ listeners.forEach(l -> l.locationChanged(this));
}
/**
* Notifies the registered listeners about a completed save operation.
*/
private void fireSavedEvent() {
- for (final FileHandlerListener l : listeners) {
- l.saved(this);
- }
+ listeners.forEach(l -> l.saved(this));
}
/**
* Notifies the registered listeners about the start of a save operation.
*/
private void fireSavingEvent() {
- for (final FileHandlerListener l : listeners) {
- l.saving(this);
- }
+ listeners.forEach(l -> l.saving(this));
}
/**
[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 ffbeccebe1c0a18f9ff3b6975eccea8e2b6542a7
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Sat Jul 16 12:43:49 2022 -0400
Use forEach()
---
.../configuration2/builder/FileBasedConfigurationBuilder.java | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/src/main/java/org/apache/commons/configuration2/builder/FileBasedConfigurationBuilder.java b/src/main/java/org/apache/commons/configuration2/builder/FileBasedConfigurationBuilder.java
index f85583e2..91794628 100644
--- a/src/main/java/org/apache/commons/configuration2/builder/FileBasedConfigurationBuilder.java
+++ b/src/main/java/org/apache/commons/configuration2/builder/FileBasedConfigurationBuilder.java
@@ -16,7 +16,6 @@
*/
package org.apache.commons.configuration2.builder;
-import java.util.List;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
@@ -112,16 +111,14 @@ public class FileBasedConfigurationBuilder<T extends FileBasedConfiguration> ext
return enc;
}
- final List<Class<?>> superclasses = ClassUtils.getAllSuperclasses(configClass);
- for (final Class<?> cls : superclasses) {
+ for (final Class<?> cls : ClassUtils.getAllSuperclasses(configClass)) {
enc = DEFAULT_ENCODINGS.get(cls);
if (enc != null) {
return enc;
}
}
- final List<Class<?>> interfaces = ClassUtils.getAllInterfaces(configClass);
- for (final Class<?> cls : interfaces) {
+ for (final Class<?> cls : ClassUtils.getAllInterfaces(configClass)) {
enc = DEFAULT_ENCODINGS.get(cls);
if (enc != null) {
return enc;
[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 ed97373a5198055321ffb2203f1fa1c5ffd192c2
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Sat Jul 16 12:43:29 2022 -0400
Use forEach()
---
.../apache/commons/configuration2/tree/DefaultExpressionEngine.java | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/src/main/java/org/apache/commons/configuration2/tree/DefaultExpressionEngine.java b/src/main/java/org/apache/commons/configuration2/tree/DefaultExpressionEngine.java
index cacababf..6b89b42b 100644
--- a/src/main/java/org/apache/commons/configuration2/tree/DefaultExpressionEngine.java
+++ b/src/main/java/org/apache/commons/configuration2/tree/DefaultExpressionEngine.java
@@ -362,9 +362,7 @@ public class DefaultExpressionEngine implements ExpressionEngine {
findNodesForKey((DefaultConfigurationKey.KeyIterator) keyPart.clone(), subNodes.get(keyPart.getIndex()), nodes, handler);
}
} else {
- for (final T node : subNodes) {
- findNodesForKey((DefaultConfigurationKey.KeyIterator) keyPart.clone(), node, nodes, handler);
- }
+ subNodes.forEach(node -> findNodesForKey((DefaultConfigurationKey.KeyIterator) keyPart.clone(), node, nodes, handler));
}
}
[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 5f075940fa5618657bd562d75cba21240ac2b173
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Sat Jul 16 12:43:40 2022 -0400
Use forEach()
---
.../commons/configuration2/event/EventListenerList.java | 12 ++++--------
1 file changed, 4 insertions(+), 8 deletions(-)
diff --git a/src/main/java/org/apache/commons/configuration2/event/EventListenerList.java b/src/main/java/org/apache/commons/configuration2/event/EventListenerList.java
index 4670cb37..c67051a0 100644
--- a/src/main/java/org/apache/commons/configuration2/event/EventListenerList.java
+++ b/src/main/java/org/apache/commons/configuration2/event/EventListenerList.java
@@ -179,7 +179,7 @@ public class EventListenerList {
final Map<EventType<?>, Set<EventType<?>>> superTypes = new HashMap<>();
final List<EventListenerRegistrationData<? extends T>> results = new LinkedList<>();
- for (final EventListenerRegistrationData<?> reg : listeners) {
+ listeners.forEach(reg -> {
Set<EventType<?>> base = superTypes.get(reg.getEventType());
if (base == null) {
base = EventType.fetchSuperEventTypes(reg.getEventType());
@@ -192,7 +192,7 @@ public class EventListenerList {
EventListenerRegistrationData<? extends T> result = (EventListenerRegistrationData<? extends T>) reg;
results.add(result);
}
- }
+ });
return results;
}
@@ -214,10 +214,7 @@ public class EventListenerList {
if (c == null) {
throw new IllegalArgumentException("List to be copied must not be null!");
}
-
- for (final EventListenerRegistrationData<?> regData : c.getRegistrations()) {
- addEventListener(regData);
- }
+ c.getRegistrations().forEach(this::addEventListener);
}
/**
@@ -330,8 +327,7 @@ public class EventListenerList {
* @param event the event object
*/
private void invokeNextListenerUnchecked(final Event event) {
- final EventListener<? super T> listener = next();
- callListener(listener, event);
+ callListener(next(), event);
}
/**
[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 da5ef9b22655c4450f353d25c4c64e7cb8e2499d
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Sat Jul 16 12:43:19 2022 -0400
Use forEach()
---
.../tree/xpath/ConfigurationNodeIteratorChildren.java | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/main/java/org/apache/commons/configuration2/tree/xpath/ConfigurationNodeIteratorChildren.java b/src/main/java/org/apache/commons/configuration2/tree/xpath/ConfigurationNodeIteratorChildren.java
index 0540a058..e7855cf2 100644
--- a/src/main/java/org/apache/commons/configuration2/tree/xpath/ConfigurationNodeIteratorChildren.java
+++ b/src/main/java/org/apache/commons/configuration2/tree/xpath/ConfigurationNodeIteratorChildren.java
@@ -118,11 +118,11 @@ class ConfigurationNodeIteratorChildren<T> extends ConfigurationNodeIteratorBase
private List<T> createSubNodeListForName(final T node, final QName name) {
final String compareName = qualifiedName(name);
final List<T> result = new ArrayList<>();
- for (final T child : getNodeHandler().getChildren(node)) {
+ getNodeHandler().getChildren(node).forEach(child -> {
if (StringUtils.equals(compareName, getNodeHandler().nodeName(child))) {
result.add(child);
}
- }
+ });
return result;
}
@@ -140,11 +140,11 @@ class ConfigurationNodeIteratorChildren<T> extends ConfigurationNodeIteratorBase
}
final List<T> prefixChildren = new ArrayList<>(children.size());
final String prefix = prefixName(name.getPrefix(), null);
- for (final T child : children) {
+ children.forEach(child -> {
if (StringUtils.startsWith(getNodeHandler().nodeName(child), prefix)) {
prefixChildren.add(child);
}
- }
+ });
return prefixChildren;
}