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:16:22 UTC
[commons-configuration] branch master updated (0809670d -> e0d0a482)
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 0809670d CONFIGURATION-817: replaced EasyMock with Mockito completely
new 473cd973 Use forEach()
new 4a78daa4 Use forEach()
new 79290904 Use forEach()
new 1985f6bc Use forEach()
new 0d027e87 Use forEach()
new 086cd84e Use forEach()
new ef74de20 Use forEach()
new 47247063 Use forEach()
new 3e99384b Use forEach()
new e0d0a482 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/beanutils/BeanHelper.java | 4 +--
.../builder/BasicBuilderParameters.java | 14 ++++------
.../builder/BasicConfigurationBuilder.java | 8 +++---
.../combined/CombinedBuilderParametersImpl.java | 4 +--
.../combined/CombinedConfigurationBuilder.java | 32 ++++++----------------
.../configuration2/event/BaseEventSource.java | 9 ++----
.../reloading/CombinedReloadingController.java | 4 +--
.../configuration2/resolver/CatalogResolver.java | 6 +---
.../tree/AbstractImmutableNodeHandler.java | 4 +--
.../xpath/ConfigurationNodeIteratorAttribute.java | 4 +--
10 files changed, 29 insertions(+), 60 deletions(-)
[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 e0d0a48210a331e5e4e83dd37f378264efa09c95
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Sat Jul 16 12:16:05 2022 -0400
Use forEach()
---
.../configuration2/tree/xpath/ConfigurationNodeIteratorAttribute.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/apache/commons/configuration2/tree/xpath/ConfigurationNodeIteratorAttribute.java b/src/main/java/org/apache/commons/configuration2/tree/xpath/ConfigurationNodeIteratorAttribute.java
index 866ff335..fad86655 100644
--- a/src/main/java/org/apache/commons/configuration2/tree/xpath/ConfigurationNodeIteratorAttribute.java
+++ b/src/main/java/org/apache/commons/configuration2/tree/xpath/ConfigurationNodeIteratorAttribute.java
@@ -87,11 +87,11 @@ class ConfigurationNodeIteratorAttribute<T> extends ConfigurationNodeIteratorBas
} else {
final Set<String> names = new LinkedHashSet<>(parent.getNodeHandler().getAttributes(parent.getConfigurationNode()));
final String prefix = name.getPrefix() != null ? prefixName(name.getPrefix(), null) : null;
- for (final String n : names) {
+ names.forEach(n -> {
if (prefix == null || StringUtils.startsWith(n, prefix)) {
addAttributeData(parent, result, n);
}
- }
+ });
}
return result;
[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 0d027e873adcf23c7a5dc570b0367dafef8e1be1
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Sat Jul 16 12:15:26 2022 -0400
Use forEach()
---
.../java/org/apache/commons/configuration2/beanutils/BeanHelper.java | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/src/main/java/org/apache/commons/configuration2/beanutils/BeanHelper.java b/src/main/java/org/apache/commons/configuration2/beanutils/BeanHelper.java
index 84724f55..9341e215 100644
--- a/src/main/java/org/apache/commons/configuration2/beanutils/BeanHelper.java
+++ b/src/main/java/org/apache/commons/configuration2/beanutils/BeanHelper.java
@@ -185,9 +185,7 @@ public final class BeanHelper {
final Class<?> defaultClass = getDefaultClass(bean, propName);
if (prop instanceof Collection) {
final Collection<Object> beanCollection = createPropertyCollection(propName, defaultClass);
- for (final Object elemDef : (Collection<?>) prop) {
- beanCollection.add(createBean((BeanDeclaration) elemDef));
- }
+ ((Collection<BeanDeclaration>) prop).forEach(elemDef -> beanCollection.add(createBean(elemDef)));
initProperty(bean, propName, beanCollection);
} else {
initProperty(bean, propName, createBean((BeanDeclaration) prop, defaultClass));
[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 4724706320c9029e8d087d8031a856227c38ef11
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Sat Jul 16 12:15:53 2022 -0400
Use forEach()
---
.../combined/CombinedConfigurationBuilder.java | 32 ++++++----------------
1 file changed, 8 insertions(+), 24 deletions(-)
diff --git a/src/main/java/org/apache/commons/configuration2/builder/combined/CombinedConfigurationBuilder.java b/src/main/java/org/apache/commons/configuration2/builder/combined/CombinedConfigurationBuilder.java
index fea11930..620fb146 100644
--- a/src/main/java/org/apache/commons/configuration2/builder/combined/CombinedConfigurationBuilder.java
+++ b/src/main/java/org/apache/commons/configuration2/builder/combined/CombinedConfigurationBuilder.java
@@ -26,6 +26,7 @@ import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.Set;
+import java.util.stream.Collectors;
import org.apache.commons.configuration2.CombinedConfiguration;
import org.apache.commons.configuration2.Configuration;
@@ -685,15 +686,8 @@ public class CombinedConfigurationBuilder extends BasicConfigurationBuilder<Comb
* @throws ConfigurationException if an error occurs
*/
protected void registerConfiguredLookups(final HierarchicalConfiguration<?> defConfig, final Configuration resultConfig) throws ConfigurationException {
- final Map<String, Lookup> lookups = new HashMap<>();
-
- final List<? extends HierarchicalConfiguration<?>> nodes = defConfig.configurationsAt(KEY_CONFIGURATION_LOOKUPS);
- for (final HierarchicalConfiguration<?> config : nodes) {
- final XMLBeanDeclaration decl = new XMLBeanDeclaration(config);
- final String key = config.getString(KEY_LOOKUP_KEY);
- final Lookup lookup = (Lookup) fetchBeanHelper().createBean(decl);
- lookups.put(key, lookup);
- }
+ final Map<String, Lookup> lookups = defConfig.configurationsAt(KEY_CONFIGURATION_LOOKUPS).stream().collect(
+ Collectors.toMap(config -> config.getString(KEY_LOOKUP_KEY), config -> (Lookup) fetchBeanHelper().createBean(new XMLBeanDeclaration(config))));
if (!lookups.isEmpty()) {
final ConfigurationInterpolator defCI = defConfig.getInterpolator();
@@ -1003,12 +997,11 @@ public class CombinedConfigurationBuilder extends BasicConfigurationBuilder<Comb
* @param defConfig the definition configuration
*/
private void registerConfiguredProviders(final HierarchicalConfiguration<?> defConfig) {
- final List<? extends HierarchicalConfiguration<?>> nodes = defConfig.configurationsAt(KEY_CONFIGURATION_PROVIDERS);
- for (final HierarchicalConfiguration<?> config : nodes) {
+ defConfig.configurationsAt(KEY_CONFIGURATION_PROVIDERS).forEach(config -> {
final XMLBeanDeclaration decl = new XMLBeanDeclaration(config);
final String key = config.getString(KEY_PROVIDER_KEY);
currentParameters.registerProvider(key, (ConfigurationBuilderProvider) fetchBeanHelper().createBean(decl));
- }
+ });
}
/**
@@ -1045,11 +1038,7 @@ public class CombinedConfigurationBuilder extends BasicConfigurationBuilder<Comb
* @return a collection with corresponding declarations
*/
private Collection<ConfigurationDeclaration> createDeclarations(final Collection<? extends HierarchicalConfiguration<?>> configs) {
- final Collection<ConfigurationDeclaration> declarations = new ArrayList<>(configs.size());
- for (final HierarchicalConfiguration<?> c : configs) {
- declarations.add(new ConfigurationDeclaration(this, c));
- }
- return declarations;
+ return configs.stream().map(c -> new ConfigurationDeclaration(this, c)).collect(Collectors.toList());
}
/**
@@ -1061,10 +1050,7 @@ public class CombinedConfigurationBuilder extends BasicConfigurationBuilder<Comb
* @param key the key for the list nodes
*/
private static void initNodeCombinerListNodes(final CombinedConfiguration cc, final HierarchicalConfiguration<?> defConfig, final String key) {
- final List<Object> listNodes = defConfig.getList(key);
- for (final Object listNode : listNodes) {
- cc.getNodeCombiner().addListNode((String) listNode);
- }
+ defConfig.getList(key).forEach(listNode -> cc.getNodeCombiner().addListNode((String) listNode));
}
/**
@@ -1171,9 +1157,7 @@ public class CombinedConfigurationBuilder extends BasicConfigurationBuilder<Comb
* Frees resources used by this object and performs clean up. This method is called when the owning builder is reset.
*/
public void cleanUp() {
- for (final ConfigurationBuilder<?> b : getChildBuilders()) {
- b.removeEventListener(ConfigurationBuilderEvent.RESET, changeListener);
- }
+ getChildBuilders().forEach(b -> b.removeEventListener(ConfigurationBuilderEvent.RESET, changeListener));
namedBuilders.clear();
}
[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 4a78daa425deb74d2699972b4afbec34b6dd4de8
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Sat Jul 16 12:15:09 2022 -0400
Use forEach()
---
.../org/apache/commons/configuration2/event/BaseEventSource.java | 9 ++-------
1 file changed, 2 insertions(+), 7 deletions(-)
diff --git a/src/main/java/org/apache/commons/configuration2/event/BaseEventSource.java b/src/main/java/org/apache/commons/configuration2/event/BaseEventSource.java
index e6449354..ffae17c3 100644
--- a/src/main/java/org/apache/commons/configuration2/event/BaseEventSource.java
+++ b/src/main/java/org/apache/commons/configuration2/event/BaseEventSource.java
@@ -82,9 +82,7 @@ public class BaseEventSource implements EventSource {
*/
public <T extends Event> Collection<EventListener<? super T>> getEventListeners(final EventType<T> eventType) {
final List<EventListener<? super T>> result = new LinkedList<>();
- for (final EventListener<? super T> l : eventListeners.getEventListeners(eventType)) {
- result.add(l);
- }
+ eventListeners.getEventListeners(eventType).forEach(l -> result.add(l));
return Collections.unmodifiableCollection(result);
}
@@ -147,10 +145,7 @@ public class BaseEventSource implements EventSource {
* @since 1.4
*/
public void clearErrorListeners() {
- for (final EventListenerRegistrationData<? extends ConfigurationErrorEvent> reg : eventListeners
- .getRegistrationsForSuperType(ConfigurationErrorEvent.ANY)) {
- eventListeners.removeEventListener(reg);
- }
+ eventListeners.getRegistrationsForSuperType(ConfigurationErrorEvent.ANY).forEach(reg -> eventListeners.removeEventListener(reg));
}
/**
[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 473cd97390731161967a1921dee2a9d9f54e662a
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Sat Jul 16 12:14:59 2022 -0400
Use forEach()
---
.../commons/configuration2/tree/AbstractImmutableNodeHandler.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/apache/commons/configuration2/tree/AbstractImmutableNodeHandler.java b/src/main/java/org/apache/commons/configuration2/tree/AbstractImmutableNodeHandler.java
index 8169332f..d838b66e 100644
--- a/src/main/java/org/apache/commons/configuration2/tree/AbstractImmutableNodeHandler.java
+++ b/src/main/java/org/apache/commons/configuration2/tree/AbstractImmutableNodeHandler.java
@@ -60,11 +60,11 @@ abstract class AbstractImmutableNodeHandler implements NodeHandler<ImmutableNode
@Override
public <C> List<ImmutableNode> getMatchingChildren(final ImmutableNode node, final NodeMatcher<C> matcher, final C criterion) {
final List<ImmutableNode> result = new ArrayList<>(node.getChildren().size());
- for (final ImmutableNode c : node) {
+ node.forEach(c -> {
if (matcher.matches(c, this, criterion)) {
result.add(c);
}
- }
+ });
return Collections.unmodifiableList(result);
}
[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 086cd84e08fc98e82acf4281674e26b470c86b4e
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Sat Jul 16 12:15:32 2022 -0400
Use forEach()
---
.../org/apache/commons/configuration2/resolver/CatalogResolver.java | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/src/main/java/org/apache/commons/configuration2/resolver/CatalogResolver.java b/src/main/java/org/apache/commons/configuration2/resolver/CatalogResolver.java
index 4ae1fe18..d5a424c0 100644
--- a/src/main/java/org/apache/commons/configuration2/resolver/CatalogResolver.java
+++ b/src/main/java/org/apache/commons/configuration2/resolver/CatalogResolver.java
@@ -129,11 +129,7 @@ public class CatalogResolver implements EntityResolver {
* @param debug True if debugging should be enabled, false otherwise.
*/
public void setDebug(final boolean debug) {
- if (debug) {
- manager.setVerbosity(DEBUG_ALL);
- } else {
- manager.setVerbosity(DEBUG_NONE);
- }
+ manager.setVerbosity(debug ? DEBUG_ALL : DEBUG_NONE);
}
/**
[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 ef74de2072ccb5c27f7d1de91a9c04c5c91563be
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Sat Jul 16 12:15:37 2022 -0400
Use forEach()
---
.../builder/combined/CombinedBuilderParametersImpl.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/apache/commons/configuration2/builder/combined/CombinedBuilderParametersImpl.java b/src/main/java/org/apache/commons/configuration2/builder/combined/CombinedBuilderParametersImpl.java
index 2672bfc4..d4e0851d 100644
--- a/src/main/java/org/apache/commons/configuration2/builder/combined/CombinedBuilderParametersImpl.java
+++ b/src/main/java/org/apache/commons/configuration2/builder/combined/CombinedBuilderParametersImpl.java
@@ -202,11 +202,11 @@ public class CombinedBuilderParametersImpl extends BasicBuilderParameters implem
throw new IllegalArgumentException("Map with providers must not be null!");
}
- for (final Map.Entry<String, ConfigurationBuilderProvider> e : providers.entrySet()) {
+ providers.entrySet().forEach(e -> {
if (!this.providers.containsKey(e.getKey())) {
registerProvider(e.getKey(), e.getValue());
}
- }
+ });
return this;
}
[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 3e99384b1a23b8cb8099d6c9e0d38d5e8438fa61
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Sat Jul 16 12:15:59 2022 -0400
Use forEach()
---
.../commons/configuration2/reloading/CombinedReloadingController.java | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
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 85933729..812c3a79 100644
--- a/src/main/java/org/apache/commons/configuration2/reloading/CombinedReloadingController.java
+++ b/src/main/java/org/apache/commons/configuration2/reloading/CombinedReloadingController.java
@@ -157,9 +157,7 @@ public class CombinedReloadingController extends ReloadingController {
*/
@Override
public void reloadingPerformed() {
- for (final ReloadingController rc : owner.getSubControllers()) {
- rc.resetReloadingState();
- }
+ owner.getSubControllers().forEach(ReloadingController::resetReloadingState);
}
}
}
[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 79290904a0c9491ace93992463b83ed073e55706
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Sat Jul 16 12:15:15 2022 -0400
Use forEach()
---
.../configuration2/builder/BasicBuilderParameters.java | 14 ++++++--------
1 file changed, 6 insertions(+), 8 deletions(-)
diff --git a/src/main/java/org/apache/commons/configuration2/builder/BasicBuilderParameters.java b/src/main/java/org/apache/commons/configuration2/builder/BasicBuilderParameters.java
index c8482255..8b6833fe 100644
--- a/src/main/java/org/apache/commons/configuration2/builder/BasicBuilderParameters.java
+++ b/src/main/java/org/apache/commons/configuration2/builder/BasicBuilderParameters.java
@@ -242,11 +242,11 @@ public class BasicBuilderParameters implements Cloneable, BuilderParameters, Bas
throw new IllegalArgumentException("Parameters to merge must not be null!");
}
- for (final Map.Entry<String, Object> e : p.getParameters().entrySet()) {
+ p.getParameters().entrySet().forEach(e -> {
if (!properties.containsKey(e.getKey()) && !e.getKey().startsWith(RESERVED_PARAMETER_PREFIX)) {
storeProperty(e.getKey(), e.getValue());
}
- }
+ });
}
/**
@@ -423,11 +423,11 @@ public class BasicBuilderParameters implements Cloneable, BuilderParameters, Bas
return null;
}
- for (final Map.Entry<?, ?> e : prefixes.entrySet()) {
+ prefixes.entrySet().forEach(e -> {
if (!(e.getKey() instanceof String) || !(e.getValue() instanceof Lookup)) {
throw new IllegalArgumentException("Map with prefix lookups contains invalid data: " + prefixes);
}
- }
+ });
return fetchPrefixLookups(params);
}
@@ -460,10 +460,8 @@ public class BasicBuilderParameters implements Cloneable, BuilderParameters, Bas
return null;
}
- for (final Object o : col) {
- if (!(o instanceof Lookup)) {
- throw new IllegalArgumentException("Collection with default lookups contains invalid data: " + col);
- }
+ if (col.stream().noneMatch(o -> o instanceof Lookup)) {
+ throw new IllegalArgumentException("Collection with default lookups contains invalid data: " + col);
}
return fetchDefaultLookups(params);
}
[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 1985f6bce3a0819e7287d3a9ae23cff4690a20b7
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Sat Jul 16 12:15:20 2022 -0400
Use forEach()
---
.../commons/configuration2/builder/BasicConfigurationBuilder.java | 8 ++++----
1 file changed, 4 insertions(+), 4 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 b9fb58da..d9734332 100644
--- a/src/main/java/org/apache/commons/configuration2/builder/BasicConfigurationBuilder.java
+++ b/src/main/java/org/apache/commons/configuration2/builder/BasicConfigurationBuilder.java
@@ -534,9 +534,9 @@ public class BasicConfigurationBuilder<T extends ImmutableConfiguration> impleme
*/
private void registerEventListeners(final T obj) {
final EventSource evSrc = ConfigurationUtils.asEventSource(obj, true);
- for (final EventListenerRegistrationData<?> regData : eventListeners.getRegistrations()) {
+ eventListeners.getRegistrations().forEach(regData -> {
registerListener(evSrc, regData);
- }
+ });
}
/**
@@ -547,9 +547,9 @@ public class BasicConfigurationBuilder<T extends ImmutableConfiguration> impleme
*/
private void removeEventListeners(final T obj) {
final EventSource evSrc = ConfigurationUtils.asEventSource(obj, true);
- for (final EventListenerRegistrationData<?> regData : eventListeners.getRegistrations()) {
+ eventListeners.getRegistrations().forEach(regData -> {
removeListener(evSrc, regData);
- }
+ });
}
/**