You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by gg...@apache.org on 2020/11/21 22:24:59 UTC
[logging-log4j2] 12/12: Use lambdas.
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch release-2.x
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit 8a120d1692da08395c6cd13c79a4726bcd8db08d
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Sat Nov 21 16:50:06 2020 -0500
Use lambdas.
---
.../apache/logging/log4j/util/PropertiesUtil.java | 30 +++++++++-------------
.../logging/log4j/util/SortedArrayStringMap.java | 7 +----
.../apache/logging/log4j/AbstractLoggerTest.java | 7 +----
.../java/org/apache/logging/log4j/LoggerTest.java | 24 ++---------------
.../message/ReusableParameterizedMessageTest.java | 7 +----
.../logging/log4j/core/filter/MapFilter.java | 8 +-----
6 files changed, 18 insertions(+), 65 deletions(-)
diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/util/PropertiesUtil.java b/log4j-api/src/main/java/org/apache/logging/log4j/util/PropertiesUtil.java
index 8421629..ca09ed8 100644
--- a/log4j-api/src/main/java/org/apache/logging/log4j/util/PropertiesUtil.java
+++ b/log4j-api/src/main/java/org/apache/logging/log4j/util/PropertiesUtil.java
@@ -429,12 +429,9 @@ public final class PropertiesUtil {
private Environment(final PropertySource propertySource) {
PropertyFilePropertySource sysProps = new PropertyFilePropertySource(LOG4J_SYSTEM_PROPERTIES_FILE_NAME);
try {
- sysProps.forEach(new BiConsumer<String, String>() {
- @Override
- public void accept(String key, String value) {
- if (System.getProperty(key) == null) {
- System.setProperty(key, value);
- }
+ sysProps.forEach((key, value) -> {
+ if (System.getProperty(key) == null) {
+ System.setProperty(key, value);
}
});
} catch (SecurityException ex) {
@@ -461,18 +458,15 @@ public final class PropertiesUtil {
normalized.clear();
tokenized.clear();
for (final PropertySource source : sources) {
- source.forEach(new BiConsumer<String, String>() {
- @Override
- public void accept(final String key, final String value) {
- if (key != null && value != null) {
- literal.put(key, value);
- final List<CharSequence> tokens = PropertySource.Util.tokenize(key);
- if (tokens.isEmpty()) {
- normalized.put(source.getNormalForm(Collections.singleton(key)), value);
- } else {
- normalized.put(source.getNormalForm(tokens), value);
- tokenized.put(tokens, value);
- }
+ source.forEach((key, value) -> {
+ if (key != null && value != null) {
+ literal.put(key, value);
+ final List<CharSequence> tokens = PropertySource.Util.tokenize(key);
+ if (tokens.isEmpty()) {
+ normalized.put(source.getNormalForm(Collections.singleton(key)), value);
+ } else {
+ normalized.put(source.getNormalForm(tokens), value);
+ tokenized.put(tokens, value);
}
}
});
diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/util/SortedArrayStringMap.java b/log4j-api/src/main/java/org/apache/logging/log4j/util/SortedArrayStringMap.java
index ffd9745..0011afd 100644
--- a/log4j-api/src/main/java/org/apache/logging/log4j/util/SortedArrayStringMap.java
+++ b/log4j-api/src/main/java/org/apache/logging/log4j/util/SortedArrayStringMap.java
@@ -67,12 +67,7 @@ public class SortedArrayStringMap implements IndexedStringMap {
private static final long serialVersionUID = -5748905872274478116L;
private static final int HASHVAL = 31;
- private static final TriConsumer<String, Object, StringMap> PUT_ALL = new TriConsumer<String, Object, StringMap>() {
- @Override
- public void accept(final String key, final Object value, final StringMap contextData) {
- contextData.putValue(key, value);
- }
- };
+ private static final TriConsumer<String, Object, StringMap> PUT_ALL = (key, value, contextData) -> contextData.putValue(key, value);
/**
* An empty array instance to share when the table is not inflated.
diff --git a/log4j-api/src/test/java/org/apache/logging/log4j/AbstractLoggerTest.java b/log4j-api/src/test/java/org/apache/logging/log4j/AbstractLoggerTest.java
index bdce79d..26e9790 100644
--- a/log4j-api/src/test/java/org/apache/logging/log4j/AbstractLoggerTest.java
+++ b/log4j-api/src/test/java/org/apache/logging/log4j/AbstractLoggerTest.java
@@ -866,12 +866,7 @@ public class AbstractLoggerTest {
public void testSupplierWithoutThrowable() {
final ThrowableExpectingLogger logger = new ThrowableExpectingLogger(false);
final ThrowableMessage message = new ThrowableMessage(null);
- final Supplier<Message> supplier = new Supplier<Message>() {
- @Override
- public Message get() {
- return message;
- }
- };
+ final Supplier<Message> supplier = () -> message;
logger.debug(supplier);
logger.error(supplier);
diff --git a/log4j-api/src/test/java/org/apache/logging/log4j/LoggerTest.java b/log4j-api/src/test/java/org/apache/logging/log4j/LoggerTest.java
index ec07d85..397fbe1 100644
--- a/log4j-api/src/test/java/org/apache/logging/log4j/LoggerTest.java
+++ b/log4j-api/src/test/java/org/apache/logging/log4j/LoggerTest.java
@@ -160,17 +160,7 @@ public class LoggerTest {
@Test
public void flowTracingString_SupplierOfObjectMessages() {
- final EntryMessage msg = logger.traceEntry("doFoo(a={}, b={})", new Supplier<Message>() {
- @Override
- public Message get() {
- return new ObjectMessage(1);
- }
- }, new Supplier<Message>() {
- @Override
- public Message get() {
- return new ObjectMessage(2);
- }
- });
+ final EntryMessage msg = logger.traceEntry("doFoo(a={}, b={})", (Supplier<Message>) () -> new ObjectMessage(1), (Supplier<Message>) () -> new ObjectMessage(2));
logger.traceExit(msg, 3);
assertEquals(2, results.size());
assertThat("Incorrect Entry", results.get(0), startsWith("ENTER[ FLOW ] TRACE Enter"));
@@ -181,17 +171,7 @@ public class LoggerTest {
@Test
public void flowTracingString_SupplierOfStrings() {
- final EntryMessage msg = logger.traceEntry("doFoo(a={}, b={})", new Supplier<String>() {
- @Override
- public String get() {
- return "1";
- }
- }, new Supplier<String>() {
- @Override
- public String get() {
- return "2";
- }
- });
+ final EntryMessage msg = logger.traceEntry("doFoo(a={}, b={})", (Supplier<String>) () -> "1", (Supplier<String>) () -> "2");
logger.traceExit(msg, 3);
assertEquals(2, results.size());
assertThat("Incorrect Entry", results.get(0), startsWith("ENTER[ FLOW ] TRACE Enter"));
diff --git a/log4j-api/src/test/java/org/apache/logging/log4j/message/ReusableParameterizedMessageTest.java b/log4j-api/src/test/java/org/apache/logging/log4j/message/ReusableParameterizedMessageTest.java
index 087c623..6cbb207 100644
--- a/log4j-api/src/test/java/org/apache/logging/log4j/message/ReusableParameterizedMessageTest.java
+++ b/log4j-api/src/test/java/org/apache/logging/log4j/message/ReusableParameterizedMessageTest.java
@@ -158,12 +158,7 @@ public class ReusableParameterizedMessageTest {
expected.add("msg");
expected.add(EXCEPTION1);
final List<Object> actual = new LinkedList<>();
- msg.forEachParameter(new ParameterConsumer<Void>() {
- @Override
- public void accept(final Object parameter, final int parameterIndex, final Void state) {
- actual.add(parameter);
- }
- }, null);
+ msg.forEachParameter((parameter, parameterIndex, state) -> actual.add(parameter), null);
assertEquals(expected, actual);
}
}
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/MapFilter.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/MapFilter.java
index 39f3f14..fc74c73 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/MapFilter.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/MapFilter.java
@@ -35,7 +35,6 @@ import org.apache.logging.log4j.core.config.plugins.PluginFactory;
import org.apache.logging.log4j.core.util.KeyValuePair;
import org.apache.logging.log4j.message.MapMessage;
import org.apache.logging.log4j.message.Message;
-import org.apache.logging.log4j.util.BiConsumer;
import org.apache.logging.log4j.util.IndexedReadOnlyStringMap;
import org.apache.logging.log4j.util.IndexedStringMap;
import org.apache.logging.log4j.util.PerformanceSensitive;
@@ -216,12 +215,7 @@ public class MapFilter extends AbstractFilter {
@Deprecated
protected Map<String, List<String>> getMap() {
final Map<String, List<String>> result = new HashMap<>(map.size());
- map.forEach(new BiConsumer<String, List<String>>() {
- @Override
- public void accept(final String key, final List<String> value) {
- result.put(key, value);
- }
- });
+ map.forEach((key, value) -> result.put(key, (List<String>) value));
return result;
}