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/08/06 15:04:03 UTC
[commons-configuration] branch master updated (c6151ff3 -> 4a18c3ff)
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 c6151ff3 Use streams
new d8ce59fa Better use of streams
new 3726e06d Better use of streams
new 4a18c3ff Better use of streams
The 3 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:
.../apache/commons/configuration2/INIConfiguration.java | 9 ++-------
.../apache/commons/configuration2/XMLConfiguration.java | 3 +--
.../configuration2/builder/BasicConfigurationBuilder.java | 9 ++-------
.../configuration2/builder/DefaultParametersManager.java | 10 +---------
.../builder/combined/MultiWrapDynaClass.java | 11 +++++------
.../configuration2/plist/PropertyListConfiguration.java | 6 +++---
.../reloading/CombinedReloadingController.java | 14 ++++----------
.../apache/commons/configuration2/tree/ImmutableNode.java | 11 +++--------
8 files changed, 21 insertions(+), 52 deletions(-)
[commons-configuration] 02/03: Better use of streams
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 3726e06d823937f4b07792b9d5b9326896315fc3
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Sat Aug 6 10:56:25 2022 -0400
Better use of streams
---
.../apache/commons/configuration2/XMLConfiguration.java | 3 +--
.../reloading/CombinedReloadingController.java | 14 ++++----------
.../apache/commons/configuration2/tree/ImmutableNode.java | 11 +++--------
3 files changed, 8 insertions(+), 20 deletions(-)
diff --git a/src/main/java/org/apache/commons/configuration2/XMLConfiguration.java b/src/main/java/org/apache/commons/configuration2/XMLConfiguration.java
index ee4417a8..e02a5f55 100644
--- a/src/main/java/org/apache/commons/configuration2/XMLConfiguration.java
+++ b/src/main/java/org/apache/commons/configuration2/XMLConfiguration.java
@@ -945,8 +945,7 @@ public class XMLConfiguration extends BaseHierarchicalConfiguration implements F
public void handleRemovedNodes(final ReferenceNodeHandler refHandler) {
refHandler.removedReferences().forEach(ref -> {
if (ref instanceof Node) {
- final Node removedElem = (Node) ref;
- removeReference((Element) elementMapping.get(removedElem));
+ removeReference((Element) elementMapping.get((Node) ref));
}
});
}
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 b8d0033e..1646bbc3 100644
--- a/src/main/java/org/apache/commons/configuration2/reloading/CombinedReloadingController.java
+++ b/src/main/java/org/apache/commons/configuration2/reloading/CombinedReloadingController.java
@@ -129,10 +129,10 @@ public class CombinedReloadingController extends ReloadingController {
/**
* Creates a new instance of {@code MultiReloadingControllerDetector}.
*
- * @param o the owner
+ * @param owner the owner
*/
- public MultiReloadingControllerDetector(final CombinedReloadingController o) {
- owner = o;
+ public MultiReloadingControllerDetector(final CombinedReloadingController owner) {
+ this.owner = owner;
}
/**
@@ -142,13 +142,7 @@ public class CombinedReloadingController extends ReloadingController {
*/
@Override
public boolean isReloadingRequired() {
- boolean result = false;
- for (final ReloadingController rc : owner.getSubControllers()) {
- if (rc.checkForReloading(null)) {
- result = true;
- }
- }
- return result;
+ return owner.getSubControllers().stream().reduce(false, (b, rc) -> b | rc.checkForReloading(null), (t, u) -> t | u);
}
/**
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 7a688bfe..836a87a0 100644
--- a/src/main/java/org/apache/commons/configuration2/tree/ImmutableNode.java
+++ b/src/main/java/org/apache/commons/configuration2/tree/ImmutableNode.java
@@ -24,6 +24,7 @@ import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
+import java.util.stream.Collectors;
/**
* <p>
@@ -100,16 +101,10 @@ public final class ImmutableNode implements Iterable<ImmutableNode> {
* @return a list with the child nodes
*/
public List<ImmutableNode> getChildren(final String name) {
- final List<ImmutableNode> list = new ArrayList<>();
if (name == null) {
- return list;
+ return new ArrayList<>();
}
- children.forEach(node -> {
- if (name.equals(node.getNodeName())) {
- list.add(node);
- }
- });
- return list;
+ return children.stream().filter(in -> name.equals(in.getNodeName())).collect(Collectors.toList());
}
/**
[commons-configuration] 01/03: Better use of streams
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 d8ce59fadcbee2b3475e8e452f88a2b32b1248a9
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Sat Aug 6 10:56:13 2022 -0400
Better use of streams
---
.../configuration2/builder/BasicConfigurationBuilder.java | 9 ++-------
.../configuration2/builder/DefaultParametersManager.java | 10 +---------
.../configuration2/builder/combined/MultiWrapDynaClass.java | 11 +++++------
.../configuration2/plist/PropertyListConfiguration.java | 6 +++---
4 files changed, 11 insertions(+), 25 deletions(-)
diff --git a/src/main/java/org/apache/commons/configuration2/builder/BasicConfigurationBuilder.java b/src/main/java/org/apache/commons/configuration2/builder/BasicConfigurationBuilder.java
index d9734332..15e99fe9 100644
--- a/src/main/java/org/apache/commons/configuration2/builder/BasicConfigurationBuilder.java
+++ b/src/main/java/org/apache/commons/configuration2/builder/BasicConfigurationBuilder.java
@@ -212,7 +212,6 @@ public class BasicConfigurationBuilder<T extends ImmutableConfiguration> impleme
newParams.putAll(p.getParameters());
handleEventListenerProviders(p);
}
-
return setParameters(newParams);
}
@@ -534,9 +533,7 @@ public class BasicConfigurationBuilder<T extends ImmutableConfiguration> impleme
*/
private void registerEventListeners(final T obj) {
final EventSource evSrc = ConfigurationUtils.asEventSource(obj, true);
- eventListeners.getRegistrations().forEach(regData -> {
- registerListener(evSrc, regData);
- });
+ eventListeners.getRegistrations().forEach(regData -> registerListener(evSrc, regData));
}
/**
@@ -547,9 +544,7 @@ public class BasicConfigurationBuilder<T extends ImmutableConfiguration> impleme
*/
private void removeEventListeners(final T obj) {
final EventSource evSrc = ConfigurationUtils.asEventSource(obj, true);
- eventListeners.getRegistrations().forEach(regData -> {
- removeListener(evSrc, regData);
- });
+ eventListeners.getRegistrations().forEach(regData -> removeListener(evSrc, regData));
}
/**
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 d16e7879..f9ffe004 100644
--- a/src/main/java/org/apache/commons/configuration2/builder/DefaultParametersManager.java
+++ b/src/main/java/org/apache/commons/configuration2/builder/DefaultParametersManager.java
@@ -17,7 +17,6 @@
package org.apache.commons.configuration2.builder;
import java.util.Collection;
-import java.util.LinkedList;
import java.util.concurrent.CopyOnWriteArrayList;
/**
@@ -127,14 +126,7 @@ public class DefaultParametersManager {
* @param startClass the start class for which this handler is to be removed
*/
public void unregisterDefaultsHandler(final DefaultParametersHandler<?> handler, final Class<?> startClass) {
- final Collection<DefaultHandlerData> toRemove = new LinkedList<>();
- defaultHandlers.forEach(dhd -> {
- if (dhd.isOccurrence(handler, startClass)) {
- toRemove.add(dhd);
- }
- });
-
- defaultHandlers.removeAll(toRemove);
+ defaultHandlers.removeIf(dhd -> dhd.isOccurrence(handler, startClass));
}
/**
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 d0b5de96..f985ed1f 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
@@ -20,6 +20,7 @@ import java.util.Collection;
import java.util.HashMap;
import java.util.LinkedList;
import java.util.Map;
+import java.util.stream.Stream;
import org.apache.commons.beanutils.DynaBean;
import org.apache.commons.beanutils.DynaClass;
@@ -86,11 +87,9 @@ class MultiWrapDynaClass implements DynaClass {
* @param wrappedCls the collection with the wrapped classes
*/
private void initProperties(final Collection<? extends DynaClass> wrappedCls) {
- wrappedCls.forEach(cls -> {
- for (final DynaProperty p : cls.getDynaProperties()) {
- properties.add(p);
- namedProperties.put(p.getName(), p);
- }
- });
+ wrappedCls.forEach(cls -> Stream.of(cls.getDynaProperties()).forEach(p -> {
+ properties.add(p);
+ namedProperties.put(p.getName(), p);
+ }));
}
}
diff --git a/src/main/java/org/apache/commons/configuration2/plist/PropertyListConfiguration.java b/src/main/java/org/apache/commons/configuration2/plist/PropertyListConfiguration.java
index 4f3f9e9c..c7b523ff 100644
--- a/src/main/java/org/apache/commons/configuration2/plist/PropertyListConfiguration.java
+++ b/src/main/java/org/apache/commons/configuration2/plist/PropertyListConfiguration.java
@@ -384,9 +384,9 @@ public class PropertyListConfiguration extends BaseHierarchicalConfiguration imp
*/
private static Map<String, Object> transformMap(final Map<?, ?> src) {
final Map<String, Object> dest = new HashMap<>();
- src.entrySet().forEach(e -> {
- if (e.getKey() instanceof String) {
- dest.put((String) e.getKey(), e.getValue());
+ src.forEach((k, v) -> {
+ if (k instanceof String) {
+ dest.put((String) k, v);
}
});
return dest;
[commons-configuration] 03/03: Better use of streams
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 4a18c3ff2c195f51e25a15707bfb1106615b0cd3
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Sat Aug 6 11:03:57 2022 -0400
Better use of streams
---
.../java/org/apache/commons/configuration2/INIConfiguration.java | 9 ++-------
.../java/org/apache/commons/configuration2/XMLConfiguration.java | 2 +-
2 files changed, 3 insertions(+), 8 deletions(-)
diff --git a/src/main/java/org/apache/commons/configuration2/INIConfiguration.java b/src/main/java/org/apache/commons/configuration2/INIConfiguration.java
index 3cc990bc..1a5c5c99 100644
--- a/src/main/java/org/apache/commons/configuration2/INIConfiguration.java
+++ b/src/main/java/org/apache/commons/configuration2/INIConfiguration.java
@@ -21,12 +21,12 @@ import java.io.IOException;
import java.io.PrintWriter;
import java.io.Reader;
import java.io.Writer;
-import java.util.ArrayList;
import java.util.LinkedHashMap;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
+import java.util.stream.Collectors;
import org.apache.commons.configuration2.convert.ListDelimiterHandler;
import org.apache.commons.configuration2.ex.ConfigurationException;
@@ -892,12 +892,7 @@ public class INIConfiguration extends BaseHierarchicalConfiguration implements F
private List<ImmutableNode> filterChildrenOfGlobalSection(final ImmutableNode node, final List<ImmutableNode> children) {
final List<ImmutableNode> filteredList;
if (node == getRootNode()) {
- filteredList = new ArrayList<>(children.size());
- children.forEach(child -> {
- if (!isSectionNode(child)) {
- filteredList.add(child);
- }
- });
+ filteredList = children.stream().filter(child -> !isSectionNode(child)).collect(Collectors.toList());
} else {
filteredList = children;
}
diff --git a/src/main/java/org/apache/commons/configuration2/XMLConfiguration.java b/src/main/java/org/apache/commons/configuration2/XMLConfiguration.java
index e02a5f55..7e0a5dd3 100644
--- a/src/main/java/org/apache/commons/configuration2/XMLConfiguration.java
+++ b/src/main/java/org/apache/commons/configuration2/XMLConfiguration.java
@@ -945,7 +945,7 @@ public class XMLConfiguration extends BaseHierarchicalConfiguration implements F
public void handleRemovedNodes(final ReferenceNodeHandler refHandler) {
refHandler.removedReferences().forEach(ref -> {
if (ref instanceof Node) {
- removeReference((Element) elementMapping.get((Node) ref));
+ removeReference((Element) elementMapping.get(ref));
}
});
}