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 2021/06/26 15:32:49 UTC
[commons-configuration] branch master updated: CONFIGURATION-803
java8 lambda improvements (#112)
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
The following commit(s) were added to refs/heads/master by this push:
new 33da480 CONFIGURATION-803 java8 lambda improvements (#112)
33da480 is described below
commit 33da480e63bb9d75674d219e8986ea013a2a6937
Author: Arturo Bernal <ar...@gmail.com>
AuthorDate: Sat Jun 26 17:32:43 2021 +0200
CONFIGURATION-803 java8 lambda improvements (#112)
---
.../builder/BasicConfigurationBuilder.java | 10 +-----
.../combined/MultiFileConfigurationBuilder.java | 2 +-
.../configuration2/tree/ModelTransaction.java | 8 +----
.../configuration2/TestSystemConfiguration.java | 27 +++++++---------
.../commons/configuration2/io/TestFileHandler.java | 36 +++-------------------
.../configuration2/tree/TestInMemoryNodeModel.java | 25 ++++++---------
6 files changed, 28 insertions(+), 80 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 19e2b48..09f3e9d 100644
--- a/src/main/java/org/apache/commons/configuration2/builder/BasicConfigurationBuilder.java
+++ b/src/main/java/org/apache/commons/configuration2/builder/BasicConfigurationBuilder.java
@@ -739,15 +739,7 @@ public class BasicConfigurationBuilder<T extends ImmutableConfiguration> impleme
{
final Map<String, Object> filteredMap =
new HashMap<>(getParameters());
- for (final Iterator<String> it = filteredMap.keySet().iterator(); it
- .hasNext();)
- {
- final String key = it.next();
- if (key.startsWith(BuilderParameters.RESERVED_PARAMETER_PREFIX))
- {
- it.remove();
- }
- }
+ filteredMap.keySet().removeIf(key -> key.startsWith(BuilderParameters.RESERVED_PARAMETER_PREFIX));
return filteredMap;
}
diff --git a/src/main/java/org/apache/commons/configuration2/builder/combined/MultiFileConfigurationBuilder.java b/src/main/java/org/apache/commons/configuration2/builder/combined/MultiFileConfigurationBuilder.java
index 19505ec..f823a59 100644
--- a/src/main/java/org/apache/commons/configuration2/builder/combined/MultiFileConfigurationBuilder.java
+++ b/src/main/java/org/apache/commons/configuration2/builder/combined/MultiFileConfigurationBuilder.java
@@ -110,7 +110,7 @@ public class MultiFileConfigurationBuilder<T extends FileBasedConfiguration>
* {@code MultiFileConfigurationBuilder}.
*/
private final EventListener<ConfigurationBuilderEvent> managedBuilderDelegationListener =
- event -> handleManagedBuilderEvent(event);
+ this::handleManagedBuilderEvent;
/**
* Creates a new instance of {@code MultiFileConfigurationBuilder} and sets
diff --git a/src/main/java/org/apache/commons/configuration2/tree/ModelTransaction.java b/src/main/java/org/apache/commons/configuration2/tree/ModelTransaction.java
index c3dd810..8675a24 100644
--- a/src/main/java/org/apache/commons/configuration2/tree/ModelTransaction.java
+++ b/src/main/java/org/apache/commons/configuration2/tree/ModelTransaction.java
@@ -360,13 +360,7 @@ class ModelTransaction
final Integer nodeLevel =
Integer.valueOf(level == LEVEL_UNKNOWN ? level(target)
: level);
- Map<ImmutableNode, Operations> levelOperations =
- operations.get(nodeLevel);
- if (levelOperations == null)
- {
- levelOperations = new HashMap<>();
- operations.put(nodeLevel, levelOperations);
- }
+ Map<ImmutableNode, Operations> levelOperations = operations.computeIfAbsent(nodeLevel, k -> new HashMap<>());
Operations ops = levelOperations.get(target);
if (ops == null)
{
diff --git a/src/test/java/org/apache/commons/configuration2/TestSystemConfiguration.java b/src/test/java/org/apache/commons/configuration2/TestSystemConfiguration.java
index 8dda127..a5e7bda 100644
--- a/src/test/java/org/apache/commons/configuration2/TestSystemConfiguration.java
+++ b/src/test/java/org/apache/commons/configuration2/TestSystemConfiguration.java
@@ -104,26 +104,21 @@ public class TestSystemConfiguration
final AtomicBoolean stop = new AtomicBoolean();
final String property =
SystemConfiguration.class.getName() + ".testProperty";
- final Thread t = new Thread()
- {
- @Override
- public void run()
+ final Thread t = new Thread(() -> {
+ boolean setValue = true;
+ while (!stop.get())
{
- boolean setValue = true;
- while (!stop.get())
+ if (setValue)
+ {
+ System.setProperty(property, "true");
+ }
+ else
{
- if (setValue)
- {
- System.setProperty(property, "true");
- }
- else
- {
- System.clearProperty(property);
- }
- setValue = !setValue;
+ System.clearProperty(property);
}
+ setValue = !setValue;
}
- };
+ });
try
{
t.start();
diff --git a/src/test/java/org/apache/commons/configuration2/io/TestFileHandler.java b/src/test/java/org/apache/commons/configuration2/io/TestFileHandler.java
index 3366f11..b67ba1b 100644
--- a/src/test/java/org/apache/commons/configuration2/io/TestFileHandler.java
+++ b/src/test/java/org/apache/commons/configuration2/io/TestFileHandler.java
@@ -1351,38 +1351,10 @@ public class TestFileHandler
for (int i = 0; i < loops; i++)
{
final FileHandler handler = new FileHandler();
- final Thread t1 = new Thread()
- {
- @Override
- public void run()
- {
- handler.setFileSystem(fileSystem);
- }
- };
- final Thread t2 = new Thread()
- {
- @Override
- public void run()
- {
- handler.setFileName(TEST_FILENAME);
- }
- };
- final Thread t3 = new Thread()
- {
- @Override
- public void run()
- {
- handler.setEncoding(encoding);
- }
- };
- final Thread t4 = new Thread()
- {
- @Override
- public void run()
- {
- handler.setLocationStrategy(locationStrategy);
- }
- };
+ final Thread t1 = new Thread(() -> handler.setFileSystem(fileSystem));
+ final Thread t2 = new Thread(() -> handler.setFileName(TEST_FILENAME));
+ final Thread t3 = new Thread(() -> handler.setEncoding(encoding));
+ final Thread t4 = new Thread(() -> handler.setLocationStrategy(locationStrategy));
final List<Thread> threads = Arrays.asList(t1, t2, t3, t4);
for (final Thread t : threads)
{
diff --git a/src/test/java/org/apache/commons/configuration2/tree/TestInMemoryNodeModel.java b/src/test/java/org/apache/commons/configuration2/tree/TestInMemoryNodeModel.java
index 2452ccb..32a56d6 100644
--- a/src/test/java/org/apache/commons/configuration2/tree/TestInMemoryNodeModel.java
+++ b/src/test/java/org/apache/commons/configuration2/tree/TestInMemoryNodeModel.java
@@ -657,23 +657,18 @@ public class TestInMemoryNodeModel
for (int i = 0; i < threadCount; i++)
{
final String authorName = authorPrefix + i;
- threads[i] = new Thread()
- {
- @Override
- public void run()
+ threads[i] = new Thread(() -> {
+ try
{
- try
- {
- latch.await();
- model.addProperty(KEY,
- Collections.singleton(authorName), resolver);
- }
- catch (final InterruptedException iex)
- {
- // ignore
- }
+ latch.await();
+ model.addProperty(KEY,
+ Collections.singleton(authorName), resolver);
}
- };
+ catch (final InterruptedException iex)
+ {
+ // ignore
+ }
+ });
threads[i].start();
}
latch.countDown();