Author: mattsicker
Date: Tue May 27 00:07:40 2014
New Revision: 1597672
URL: http://svn.apache.org/r1597672
Log:
Specify default conversion pattern and re-use builder in factory method.
Modified:
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/PatternLayout.java
Modified:
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/PatternLayout.java
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/PatternLayout.java?rev=1597672&r1=1597671&r2=1597672&view=diff
==============================================================================
---
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/PatternLayout.java
(original)
+++
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/PatternLayout.java
Tue May 27 00:07:40 2014
@@ -265,7 +265,7 @@ public final class PatternLayout extends
*/
@PluginFactory
public static PatternLayout createLayout(
- @PluginAttribute("pattern") final String pattern,
+ @PluginAttribute(value = "pattern", defaultStringValue =
DEFAULT_CONVERSION_PATTERN) final String pattern,
@PluginConfiguration final Configuration config,
@PluginElement("Replace") final RegexReplacement replace,
@PluginAttribute(value = "charset", defaultStringValue = "UTF-8")
final Charset charset,
@@ -273,8 +273,16 @@ public final class PatternLayout extends
@PluginAttribute(value = "noConsoleNoAnsi", defaultBooleanValue =
false) final boolean noConsoleNoAnsi,
@PluginAttribute("header") final String header,
@PluginAttribute("footer") final String footer) {
- return new PatternLayout(config, replace, pattern == null ?
DEFAULT_CONVERSION_PATTERN : pattern, charset,
- alwaysWriteExceptions, noConsoleNoAnsi, header, footer);
+ return newBuilder()
+ .withPattern(pattern)
+ .withConfiguration(config)
+ .withRegexReplacement(replace)
+ .withCharset(charset)
+ .withAlwaysWriteExceptions(alwaysWriteExceptions)
+ .withNoConsoleNoAnsi(noConsoleNoAnsi)
+ .withHeader(header)
+ .withFooter(footer)
+ .build();
}
/**
