Repository: logging-log4j2 Updated Branches: refs/heads/master 4d0108fa0 -> 3e56a7586
LOG4J2-1923 Remove obsolete plugin annotations Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/3e56a758 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/3e56a758 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/3e56a758 Branch: refs/heads/master Commit: 3e56a758695cf2a03d95c837bf6a1a6ae790728f Parents: 4d0108f Author: Mikael Ståldal <mik...@staldal.nu> Authored: Sat Jul 8 17:29:42 2017 +0200 Committer: Mikael Ståldal <mik...@staldal.nu> Committed: Sat Jul 8 17:29:42 2017 +0200 ---------------------------------------------------------------------- .../logging/log4j/core/layout/JsonLayout.java | 25 +++++++++----------- .../logging/log4j/core/layout/XmlLayout.java | 16 +++++-------- .../logging/log4j/core/layout/YamlLayout.java | 17 ++++++------- 3 files changed, 24 insertions(+), 34 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/3e56a758/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 aa12a0f..bbe2c9c 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 @@ -212,20 +212,17 @@ public final class JsonLayout extends AbstractJacksonLayout { */ @Deprecated public static JsonLayout createLayout( - // @formatter:off - @PluginConfiguration final Configuration config, - @PluginAttribute(value = "locationInfo") final boolean locationInfo, - @PluginAttribute(value = "properties") final boolean properties, - @PluginAttribute(value = "propertiesAsList") final boolean propertiesAsList, - @PluginAttribute(value = "complete") final boolean complete, - @PluginAttribute(value = "compact") final boolean compact, - @PluginAttribute(value = "eventEol") final boolean eventEol, - @PluginAttribute(value = "header", defaultString = DEFAULT_HEADER) final String headerPattern, - @PluginAttribute(value = "footer", defaultString = DEFAULT_FOOTER) final String footerPattern, - @PluginAttribute(value = "charset", defaultString = "UTF-8") final Charset charset, - @PluginAttribute(value = "includeStacktrace", defaultBoolean = true) final boolean includeStacktrace - // @formatter:on - ) { + final Configuration config, + final boolean locationInfo, + final boolean properties, + final boolean propertiesAsList, + final boolean complete, + final boolean compact, + final boolean eventEol, + final String headerPattern, + final String footerPattern, + final Charset charset, + final boolean includeStacktrace) { final boolean encodeThreadContextAsList = properties && propertiesAsList; return new JsonLayout(config, locationInfo, properties, encodeThreadContextAsList, complete, compact, eventEol, headerPattern, footerPattern, charset, includeStacktrace, false); http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/3e56a758/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/XmlLayout.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/XmlLayout.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/XmlLayout.java index 3757d45..c744acf 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/XmlLayout.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/XmlLayout.java @@ -171,16 +171,12 @@ public final class XmlLayout extends AbstractJacksonLayout { */ @Deprecated public static XmlLayout createLayout( - // @formatter:off - @PluginAttribute(value = "locationInfo") final boolean locationInfo, - @PluginAttribute(value = "properties") final boolean properties, - @PluginAttribute(value = "complete") final boolean complete, - @PluginAttribute(value = "compact") final boolean compact, - @PluginAttribute(value = "charset", defaultString = "UTF-8") final Charset charset, - @PluginAttribute(value = "includeStacktrace", defaultBoolean = true) final boolean includeStacktrace - ) - // @formatter:on - { + final boolean locationInfo, + final boolean properties, + final boolean complete, + final boolean compact, + final Charset charset, + final boolean includeStacktrace) { return new XmlLayout(null, locationInfo, properties, complete, compact, charset, includeStacktrace, false); } http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/3e56a758/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/YamlLayout.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/YamlLayout.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/YamlLayout.java index 7cfca20..8a5994e 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/YamlLayout.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/YamlLayout.java @@ -165,16 +165,13 @@ public final class YamlLayout extends AbstractJacksonLayout { */ @Deprecated public static AbstractJacksonLayout createLayout( - // @formatter:off - @PluginConfiguration final Configuration config, - @PluginAttribute(value = "locationInfo") final boolean locationInfo, - @PluginAttribute(value = "properties") final boolean properties, - @PluginAttribute(value = "header", defaultString = DEFAULT_HEADER) final String headerPattern, - @PluginAttribute(value = "footer", defaultString = DEFAULT_FOOTER) final String footerPattern, - @PluginAttribute(value = "charset", defaultString = "UTF-8") final Charset charset, - @PluginAttribute(value = "includeStacktrace", defaultBoolean = true) final boolean includeStacktrace - // @formatter:on - ) { + final Configuration config, + final boolean locationInfo, + final boolean properties, + final String headerPattern, + final String footerPattern, + final Charset charset, + final boolean includeStacktrace) { return new YamlLayout(config, locationInfo, properties, false, false, true, headerPattern, footerPattern, charset, includeStacktrace, false); }
