Repository: logging-log4j2 Updated Branches: refs/heads/master 1d9c86e24 -> a94340825
LOG4J2-1447 fix usage of deprecated method LogEvent.getContextMap Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/a9434082 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/a9434082 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/a9434082 Branch: refs/heads/master Commit: a9434082599f98a503261e5af6187e108aa6c8ff Parents: 1d9c86e Author: rpopma <[email protected]> Authored: Sat Nov 19 10:00:56 2016 +0900 Committer: rpopma <[email protected]> Committed: Sat Nov 19 10:00:56 2016 +0900 ---------------------------------------------------------------------- .../apache/log4j/layout/Log4j1XmlLayout.java | 35 ++++++++++---------- .../log4j/flume/appender/FlumeEvent.java | 2 +- .../nosql/appender/NoSqlDatabaseManager.java | 15 +++++---- 3 files changed, 27 insertions(+), 25 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/a9434082/log4j-1.2-api/src/main/java/org/apache/log4j/layout/Log4j1XmlLayout.java ---------------------------------------------------------------------- diff --git a/log4j-1.2-api/src/main/java/org/apache/log4j/layout/Log4j1XmlLayout.java b/log4j-1.2-api/src/main/java/org/apache/log4j/layout/Log4j1XmlLayout.java index 2343c4e..10a872c 100644 --- a/log4j-1.2-api/src/main/java/org/apache/log4j/layout/Log4j1XmlLayout.java +++ b/log4j-1.2-api/src/main/java/org/apache/log4j/layout/Log4j1XmlLayout.java @@ -16,6 +16,9 @@ */ package org.apache.log4j.layout; +import java.nio.charset.StandardCharsets; +import java.util.List; + import org.apache.logging.log4j.core.Layout; import org.apache.logging.log4j.core.LogEvent; import org.apache.logging.log4j.core.config.Node; @@ -25,13 +28,10 @@ import org.apache.logging.log4j.core.config.plugins.PluginFactory; import org.apache.logging.log4j.core.layout.AbstractStringLayout; import org.apache.logging.log4j.core.layout.ByteBufferDestination; import org.apache.logging.log4j.core.util.Transform; +import org.apache.logging.log4j.util.BiConsumer; +import org.apache.logging.log4j.util.ReadOnlyStringMap; import org.apache.logging.log4j.util.Strings; -import java.nio.charset.StandardCharsets; -import java.util.Arrays; -import java.util.List; -import java.util.Map; - /** * Port of XMLLayout in Log4j 1.x. Provided for compatibility with existing Log4j 1 configurations. * @@ -136,22 +136,21 @@ public final class Log4j1XmlLayout extends AbstractStringLayout { } if (properties) { - final Map<String, String> contextMap = event.getContextMap(); + final ReadOnlyStringMap contextMap = event.getContextData(); if (!contextMap.isEmpty()) { buf.append("<log4j:properties>\r\n"); - final Object[] keys = contextMap.keySet().toArray(); - Arrays.sort(keys); - for (final Object key1 : keys) { - final String key = key1.toString(); - final String val = contextMap.get(key); - if (val != null) { - buf.append("<log4j:data name=\""); - buf.append(Transform.escapeHtmlTags(key)); - buf.append("\" value=\""); - buf.append(Transform.escapeHtmlTags(val)); - buf.append("\"/>\r\n"); + contextMap.forEach(new BiConsumer<String, String>() { + @Override + public void accept(final String key, final String val) { + if (val != null) { + buf.append("<log4j:data name=\""); + buf.append(Transform.escapeHtmlTags(key)); + buf.append("\" value=\""); + buf.append(Transform.escapeHtmlTags(val)); + buf.append("\"/>\r\n"); + } } - } + }); buf.append("</log4j:properties>\r\n"); } } http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/a9434082/log4j-flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeEvent.java ---------------------------------------------------------------------- diff --git a/log4j-flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeEvent.java b/log4j-flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeEvent.java index 355f654..39ba774 100644 --- a/log4j-flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeEvent.java +++ b/log4j-flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeEvent.java @@ -89,7 +89,7 @@ public class FlumeEvent extends SimpleEvent implements LogEvent { if (eventPrefix == null) { eventPrefix = DEFAULT_EVENT_PREFIX; } - final Map<String, String> mdc = event.getContextMap(); + final Map<String, String> mdc = event.getContextData().toMap(); if (includes != null) { final String[] array = includes.split(Patterns.COMMA_SEPARATOR); if (array.length > 0) { http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/a9434082/log4j-nosql/src/main/java/org/apache/logging/log4j/nosql/appender/NoSqlDatabaseManager.java ---------------------------------------------------------------------- diff --git a/log4j-nosql/src/main/java/org/apache/logging/log4j/nosql/appender/NoSqlDatabaseManager.java b/log4j-nosql/src/main/java/org/apache/logging/log4j/nosql/appender/NoSqlDatabaseManager.java index 0198079..e1526fc 100644 --- a/log4j-nosql/src/main/java/org/apache/logging/log4j/nosql/appender/NoSqlDatabaseManager.java +++ b/log4j-nosql/src/main/java/org/apache/logging/log4j/nosql/appender/NoSqlDatabaseManager.java @@ -16,8 +16,6 @@ */ package org.apache.logging.log4j.nosql.appender; -import java.util.Map; - import org.apache.logging.log4j.Marker; import org.apache.logging.log4j.ThreadContext; import org.apache.logging.log4j.core.LogEvent; @@ -25,6 +23,8 @@ import org.apache.logging.log4j.core.appender.AppenderLoggingException; import org.apache.logging.log4j.core.appender.ManagerFactory; import org.apache.logging.log4j.core.appender.db.AbstractDatabaseManager; import org.apache.logging.log4j.core.util.Closer; +import org.apache.logging.log4j.util.BiConsumer; +import org.apache.logging.log4j.util.ReadOnlyStringMap; /** * An {@link AbstractDatabaseManager} implementation for all NoSQL databases. @@ -119,14 +119,17 @@ public final class NoSqlDatabaseManager<W> extends AbstractDatabaseManager { entity.set("thrown", originalExceptionEntity); } - final Map<String, String> contextMap = event.getContextMap(); + final ReadOnlyStringMap contextMap = event.getContextData(); if (contextMap == null) { entity.set("contextMap", (Object) null); } else { final NoSqlObject<W> contextMapEntity = this.connection.createObject(); - for (final Map.Entry<String, String> entry : contextMap.entrySet()) { - contextMapEntity.set(entry.getKey(), entry.getValue()); - } + contextMap.forEach(new BiConsumer<String, String>() { + @Override + public void accept(final String key, final String val) { + contextMapEntity.set(key, val); + } + }); entity.set("contextMap", contextMapEntity); }
