Repository: logging-log4j2 Updated Branches: refs/heads/master a94340825 -> c4506b965
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/c4506b96 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/c4506b96 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/c4506b96 Branch: refs/heads/master Commit: c4506b965cce2fb380f630c85d30eb179adf0907 Parents: a943408 Author: rpopma <[email protected]> Authored: Sat Nov 19 10:05:34 2016 +0900 Committer: rpopma <[email protected]> Committed: Sat Nov 19 10:05:34 2016 +0900 ---------------------------------------------------------------------- .../logging/log4j/core/layout/CsvLogEventLayout.java | 10 +++++----- .../org/apache/logging/log4j/core/layout/HtmlLayout.java | 10 +++++----- .../apache/logging/log4j/core/layout/Rfc5424Layout.java | 4 ++-- .../logging/log4j/core/layout/LogEventFixtures.java | 1 + 4 files changed, 13 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/c4506b96/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/CsvLogEventLayout.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/CsvLogEventLayout.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/CsvLogEventLayout.java index 618ee5e..499a3d9 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/CsvLogEventLayout.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/CsvLogEventLayout.java @@ -33,9 +33,9 @@ import org.apache.logging.log4j.status.StatusLogger; /** * A Comma-Separated Value (CSV) layout to log events. - * + * * Depends on Apache Commons CSV 1.2. - * + * * @since 2.4 */ @Plugin(name = "CsvLogEventLayout", category = Node.CATEGORY, elementType = Layout.ELEMENT_TYPE, printObject = true) @@ -61,7 +61,7 @@ public class CsvLogEventLayout extends AbstractCsvLayout { @PluginAttribute("nullString") final String nullString, @PluginAttribute("recordSeparator") final String recordSeparator, @PluginAttribute(value = "charset", defaultString = DEFAULT_CHARSET) final Charset charset, - @PluginAttribute("header") final String header, + @PluginAttribute("header") final String header, @PluginAttribute("footer") final String footer) // @formatter:on { @@ -69,7 +69,7 @@ public class CsvLogEventLayout extends AbstractCsvLayout { final CSVFormat csvFormat = createFormat(format, delimiter, escape, quote, quoteMode, nullString, recordSeparator); return new CsvLogEventLayout(config, charset, csvFormat, header, footer); } - + protected CsvLogEventLayout(final Configuration config, final Charset charset, final CSVFormat csvFormat, final String header, final String footer) { super(config, charset, csvFormat, header, footer); } @@ -91,7 +91,7 @@ public class CsvLogEventLayout extends AbstractCsvLayout { format.print(event.getMarker(), buffer, false); format.print(event.getThrownProxy(), buffer, false); format.print(event.getSource(), buffer, false); - format.print(event.getContextMap(), buffer, false); + format.print(event.getContextData(), buffer, false); format.print(event.getContextStack(), buffer, false); format.println(buffer); return buffer.toString(); http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/c4506b96/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/HtmlLayout.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/HtmlLayout.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/HtmlLayout.java index 4e9772a..87846ac 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/HtmlLayout.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/HtmlLayout.java @@ -61,7 +61,7 @@ public final class HtmlLayout extends AbstractStringLayout { private static final String DEFAULT_CONTENT_TYPE = "text/html"; private final long jvmStartTime = ManagementFactory.getRuntimeMXBean().getStartTime(); - + // Print no location info by default private final boolean locationInfo; private final String title; @@ -196,11 +196,11 @@ public final class HtmlLayout extends AbstractStringLayout { sbuf.append("</td></tr>").append(Strings.LINE_SEPARATOR); } - if (event.getContextMap() != null && !event.getContextMap().isEmpty()) { + if (event.getContextData() != null && !event.getContextData().isEmpty()) { sbuf.append("<tr><td bgcolor=\"#EEEEEE\" style=\"font-size : ").append(fontSize); sbuf.append(";\" colspan=\"6\" "); sbuf.append("title=\"Mapped Diagnostic Context\">"); - sbuf.append("MDC: ").append(Transform.escapeHtmlTags(event.getContextMap().toString())); + sbuf.append("MDC: ").append(Transform.escapeHtmlTags(event.getContextData().toMap().toString())); sbuf.append("</td></tr>").append(Strings.LINE_SEPARATOR); } @@ -262,12 +262,12 @@ public final class HtmlLayout extends AbstractStringLayout { sbuilder.append(s).append(Strings.LINE_SEPARATOR); return sbuilder; } - + private StringBuilder append(final StringBuilder sbuilder, final String s) { sbuilder.append(s); return sbuilder; } - + /** * Returns appropriate HTML headers. * @return The header as a byte array. http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/c4506b96/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/Rfc5424Layout.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/Rfc5424Layout.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/Rfc5424Layout.java index 7b7f2aa..b5c57a1 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/Rfc5424Layout.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/Rfc5424Layout.java @@ -246,7 +246,7 @@ public final class Rfc5424Layout extends AbstractStringLayout { * <li>Key: "structured" Value: "true"</li> * <li>Key: "format" Value: "RFC5424"</li> * </ul> - * + * * @return Map of content format keys supporting Rfc5424Layout */ @Override @@ -361,7 +361,7 @@ public final class Rfc5424Layout extends AbstractStringLayout { } final Map<String, StructuredDataElement> sdElements = new HashMap<>(); - final Map<String, String> contextMap = event.getContextMap(); + final Map<String, String> contextMap = event.getContextData().toMap(); if (mdcRequired != null) { checkRequired(contextMap); http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/c4506b96/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/LogEventFixtures.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/LogEventFixtures.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/LogEventFixtures.java index 468f25c..abbcc49 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/LogEventFixtures.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/LogEventFixtures.java @@ -81,6 +81,7 @@ class LogEventFixtures { return expected; } + @SuppressWarnings("deprecation") static void assertEqualLogEvents(final LogEvent expected, final LogEvent actual, final boolean includeSource, final boolean includeContext, final boolean includeStacktrace) { assertEquals(expected.getClass(), actual.getClass());
