Repository: logging-log4j2 Updated Branches: refs/heads/master a70500c85 -> e702638bf
[LOG4J2-1697] Add a SerializerBuilder to PatternLayout and deprecate PatternLayout.createSerializer().Use "set" as the setter method prefix. Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/e702638b Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/e702638b Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/e702638b Branch: refs/heads/master Commit: e702638bf2475b5a38bb52ac2f9439cef68adecb Parents: a70500c Author: Gary Gregory <[email protected]> Authored: Mon Nov 14 15:22:38 2016 -0800 Committer: Gary Gregory <[email protected]> Committed: Mon Nov 14 15:22:38 2016 -0800 ---------------------------------------------------------------------- .../log4j/core/layout/AbstractCsvLayout.java | 4 +- .../logging/log4j/core/layout/JsonLayout.java | 4 +- .../log4j/core/layout/PatternLayout.java | 74 ++++++++++---------- .../logging/log4j/core/layout/YamlLayout.java | 4 +- .../logging/log4j/core/net/SmtpManager.java | 2 +- 5 files changed, 44 insertions(+), 44 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/e702638b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/AbstractCsvLayout.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/AbstractCsvLayout.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/AbstractCsvLayout.java index 47b073c..e47b5e6 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/AbstractCsvLayout.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/AbstractCsvLayout.java @@ -68,8 +68,8 @@ public abstract class AbstractCsvLayout extends AbstractStringLayout { protected AbstractCsvLayout(final Configuration config, final Charset charset, final CSVFormat csvFormat, final String header, final String footer) { super(config, charset, - PatternLayout.newSerializerBuilder().withConfiguration(config).withPattern(header).build(), - PatternLayout.newSerializerBuilder().withConfiguration(config).withPattern(footer).build()); + PatternLayout.newSerializerBuilder().setConfiguration(config).setPattern(header).build(), + PatternLayout.newSerializerBuilder().setConfiguration(config).setPattern(footer).build()); this.format = csvFormat; } http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/e702638b/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 71e972e..058cfe6 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 @@ -814,8 +814,8 @@ public final class JsonLayout extends AbstractJacksonLayout { super(config, new JacksonFactory.JSON(encodeThreadContextAsList, includeStacktrace).newWriter( locationInfo, properties, compact), charset, compact, complete, eventEol, - PatternLayout.newSerializerBuilder().withConfiguration(config).withPattern(headerPattern).withDefaultPattern(DEFAULT_HEADER).build(), - PatternLayout.newSerializerBuilder().withConfiguration(config).withPattern(footerPattern).withDefaultPattern(DEFAULT_FOOTER).build()); + PatternLayout.newSerializerBuilder().setConfiguration(config).setPattern(headerPattern).setDefaultPattern(DEFAULT_HEADER).build(), + PatternLayout.newSerializerBuilder().setConfiguration(config).setPattern(footerPattern).setDefaultPattern(DEFAULT_FOOTER).build()); } /** http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/e702638b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/PatternLayout.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/PatternLayout.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/PatternLayout.java index 25027bf..e4440eb 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/PatternLayout.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/PatternLayout.java @@ -106,34 +106,34 @@ public final class PatternLayout extends AbstractStringLayout { final String footerPattern) { super(config, charset, newSerializerBuilder() - .withConfiguration(config) - .withReplace(replace) - .withPatternSelector(patternSelector) - .withAlwaysWriteExceptions(alwaysWriteExceptions) - .withDisableAnsi(disableAnsi) - .withNoConsoleNoAnsi(noConsoleNoAnsi) - .withPattern(headerPattern) + .setConfiguration(config) + .setReplace(replace) + .setPatternSelector(patternSelector) + .setAlwaysWriteExceptions(alwaysWriteExceptions) + .setDisableAnsi(disableAnsi) + .setNoConsoleNoAnsi(noConsoleNoAnsi) + .setPattern(headerPattern) .build(), newSerializerBuilder() - .withConfiguration(config) - .withReplace(replace) - .withPatternSelector(patternSelector) - .withAlwaysWriteExceptions(alwaysWriteExceptions) - .withDisableAnsi(disableAnsi) - .withNoConsoleNoAnsi(noConsoleNoAnsi) - .withPattern(footerPattern) + .setConfiguration(config) + .setReplace(replace) + .setPatternSelector(patternSelector) + .setAlwaysWriteExceptions(alwaysWriteExceptions) + .setDisableAnsi(disableAnsi) + .setNoConsoleNoAnsi(noConsoleNoAnsi) + .setPattern(footerPattern) .build()); this.conversionPattern = eventPattern; this.patternSelector = patternSelector; this.eventSerializer = newSerializerBuilder() - .withConfiguration(config) - .withReplace(replace) - .withPatternSelector(patternSelector) - .withAlwaysWriteExceptions(alwaysWriteExceptions) - .withDisableAnsi(disableAnsi) - .withNoConsoleNoAnsi(noConsoleNoAnsi) - .withPattern(eventPattern) - .withDefaultPattern(DEFAULT_CONVERSION_PATTERN) + .setConfiguration(config) + .setReplace(replace) + .setPatternSelector(patternSelector) + .setAlwaysWriteExceptions(alwaysWriteExceptions) + .setDisableAnsi(disableAnsi) + .setNoConsoleNoAnsi(noConsoleNoAnsi) + .setPattern(eventPattern) + .setDefaultPattern(DEFAULT_CONVERSION_PATTERN) .build(); } @@ -159,13 +159,13 @@ public final class PatternLayout extends AbstractStringLayout { final String pattern, final String defaultPattern, final PatternSelector patternSelector, final boolean alwaysWriteExceptions, final boolean noConsoleNoAnsi) { final SerializerBuilder builder = newSerializerBuilder(); - builder.withAlwaysWriteExceptions(alwaysWriteExceptions); - builder.withConfiguration(configuration); - builder.withDefaultPattern(defaultPattern); - builder.withNoConsoleNoAnsi(noConsoleNoAnsi); - builder.withPattern(pattern); - builder.withPatternSelector(patternSelector); - builder.withReplace(replace); + builder.setAlwaysWriteExceptions(alwaysWriteExceptions); + builder.setConfiguration(configuration); + builder.setDefaultPattern(defaultPattern); + builder.setNoConsoleNoAnsi(noConsoleNoAnsi); + builder.setPattern(pattern); + builder.setPatternSelector(patternSelector); + builder.setReplace(replace); return builder.build(); } @@ -384,42 +384,42 @@ public final class PatternLayout extends AbstractStringLayout { return new PatternSelectorSerializer(patternSelector, replace); } - public SerializerBuilder withConfiguration(final Configuration configuration) { + public SerializerBuilder setConfiguration(final Configuration configuration) { this.configuration = configuration; return this; } - public SerializerBuilder withReplace(final RegexReplacement replace) { + public SerializerBuilder setReplace(final RegexReplacement replace) { this.replace = replace; return this; } - public SerializerBuilder withPattern(final String pattern) { + public SerializerBuilder setPattern(final String pattern) { this.pattern = pattern; return this; } - public SerializerBuilder withDefaultPattern(final String defaultPattern) { + public SerializerBuilder setDefaultPattern(final String defaultPattern) { this.defaultPattern = defaultPattern; return this; } - public SerializerBuilder withPatternSelector(final PatternSelector patternSelector) { + public SerializerBuilder setPatternSelector(final PatternSelector patternSelector) { this.patternSelector = patternSelector; return this; } - public SerializerBuilder withAlwaysWriteExceptions(final boolean alwaysWriteExceptions) { + public SerializerBuilder setAlwaysWriteExceptions(final boolean alwaysWriteExceptions) { this.alwaysWriteExceptions = alwaysWriteExceptions; return this; } - public SerializerBuilder withDisableAnsi(final boolean disableAnsi) { + public SerializerBuilder setDisableAnsi(final boolean disableAnsi) { this.disableAnsi = disableAnsi; return this; } - public SerializerBuilder withNoConsoleNoAnsi(final boolean noConsoleNoAnsi) { + public SerializerBuilder setNoConsoleNoAnsi(final boolean noConsoleNoAnsi) { this.noConsoleNoAnsi = noConsoleNoAnsi; return this; } http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/e702638b/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 91cfd9e..b4657ed 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 @@ -713,8 +713,8 @@ public final class YamlLayout extends AbstractJacksonLayout { final String footerPattern, final Charset charset, final boolean includeStacktrace) { super(config, new JacksonFactory.YAML(includeStacktrace).newWriter(locationInfo, properties, compact), charset, compact, complete, eventEol, - PatternLayout.newSerializerBuilder().withConfiguration(config).withPattern(headerPattern).withDefaultPattern(DEFAULT_HEADER).build(), - PatternLayout.newSerializerBuilder().withConfiguration(config).withPattern(footerPattern).withDefaultPattern(DEFAULT_FOOTER).build()); + PatternLayout.newSerializerBuilder().setConfiguration(config).setPattern(headerPattern).setDefaultPattern(DEFAULT_HEADER).build(), + PatternLayout.newSerializerBuilder().setConfiguration(config).setPattern(footerPattern).setDefaultPattern(DEFAULT_FOOTER).build()); } /** http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/e702638b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/SmtpManager.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/SmtpManager.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/SmtpManager.java index ecefa19..84b07fe 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/SmtpManager.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/SmtpManager.java @@ -141,7 +141,7 @@ public class SmtpManager extends AbstractManager { sb.append(filterName); final String name = "SMTP:" + NameUtil.md5(sb.toString()); - final Serializer subjectSerializer = PatternLayout.newSerializerBuilder().withConfiguration(config).withPattern(subject).build(); + final Serializer subjectSerializer = PatternLayout.newSerializerBuilder().setConfiguration(config).setPattern(subject).build(); return getManager(name, FACTORY, new FactoryData(to, cc, bcc, from, replyTo, subjectSerializer, protocol, host, port, username, password, isDebug, numElements));
