JsonLayout additionalFields - rolled back createLayout modification
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/abf1c58b Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/abf1c58b Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/abf1c58b Branch: refs/heads/master Commit: abf1c58b4df2d33f4e84d8f4aa9140fc7bad1931 Parents: a7389e4 Author: Michal Dvorak <[email protected]> Authored: Tue Sep 12 20:12:28 2017 +0200 Committer: Mikael Ståldal <[email protected]> Committed: Tue Sep 26 21:53:52 2017 +0200 ---------------------------------------------------------------------- .../java/org/apache/logging/log4j/core/layout/JsonLayout.java | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/abf1c58b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/JsonLayout.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/JsonLayout.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/JsonLayout.java index f29d185..51f0b5b 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/JsonLayout.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/JsonLayout.java @@ -251,8 +251,6 @@ public final class JsonLayout extends AbstractJacksonLayout { * The character set to use, if {@code null}, uses "UTF-8". * @param includeStacktrace * If "true", includes the stacktrace of any Throwable in the generated JSON, defaults to "true". - * @param additionalFields - * Set of custom fields that are appended to the generated JSON. * @return A JSON Layout. * * @deprecated Use {@link #newBuilder()} instead @@ -269,11 +267,10 @@ public final class JsonLayout extends AbstractJacksonLayout { final String headerPattern, final String footerPattern, final Charset charset, - final boolean includeStacktrace, - final KeyValuePair[] additionalFields) { + final boolean includeStacktrace) { final boolean encodeThreadContextAsList = properties && propertiesAsList; return new JsonLayout(config, locationInfo, properties, encodeThreadContextAsList, complete, compact, eventEol, - headerPattern, footerPattern, charset, includeStacktrace, false, false, additionalFields); + headerPattern, footerPattern, charset, includeStacktrace, false, false, null); } @PluginBuilderFactory
