Repository: logging-log4j2 Updated Branches: refs/heads/master 61b3ab301 -> f6a856d08
Remove unused 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/16bfee4b Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/16bfee4b Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/16bfee4b Branch: refs/heads/master Commit: 16bfee4b3eb2330a65a144d2cba55bd4bbf4a5f8 Parents: 61b3ab3 Author: Matt Sicker <[email protected]> Authored: Fri Jan 6 22:56:57 2017 -0600 Committer: Matt Sicker <[email protected]> Committed: Fri Jan 6 22:56:57 2017 -0600 ---------------------------------------------------------------------- .../logging/log4j/core/layout/SyslogLayout.java | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/16bfee4b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/SyslogLayout.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/SyslogLayout.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/SyslogLayout.java index 96c0ae5..97fcc3b 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/SyslogLayout.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/SyslogLayout.java @@ -30,7 +30,7 @@ import org.apache.logging.log4j.core.Layout; import org.apache.logging.log4j.core.LogEvent; import org.apache.logging.log4j.core.config.Node; import org.apache.logging.log4j.core.config.plugins.Plugin; -import org.apache.logging.log4j.core.config.plugins.PluginAttribute; +import org.apache.logging.log4j.core.config.plugins.PluginBuilderAttribute; import org.apache.logging.log4j.core.config.plugins.PluginBuilderFactory; import org.apache.logging.log4j.core.net.Facility; import org.apache.logging.log4j.core.net.Priority; @@ -62,13 +62,13 @@ public final class SyslogLayout extends AbstractStringLayout { setCharset(StandardCharsets.UTF_8); } - @PluginAttribute(value = "facility") + @PluginBuilderAttribute private Facility facility = Facility.LOCAL0; - @PluginAttribute(value = "newLine") + @PluginBuilderAttribute("newLine") private boolean includeNewLine; - @PluginAttribute("newLineEscape") + @PluginBuilderAttribute("newLineEscape") private String escapeNL; @Override @@ -208,11 +208,8 @@ public final class SyslogLayout extends AbstractStringLayout { * @deprecated Use {@link #newBuilder()}. */ @Deprecated - public static SyslogLayout createLayout( - @PluginAttribute(value = "facility", defaultString = "LOCAL0") final Facility facility, - @PluginAttribute(value = "newLine") final boolean includeNewLine, - @PluginAttribute("newLineEscape") final String escapeNL, - @PluginAttribute(value = "charset", defaultString = "UTF-8") final Charset charset) { + public static SyslogLayout createLayout(final Facility facility, final boolean includeNewLine, + final String escapeNL, final Charset charset) { return new SyslogLayout(facility, includeNewLine, escapeNL, charset); }
