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:04 UTC
[commons-configuration] 01/03: Better use of streams
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;