Repository: logging-log4j2 Updated Branches: refs/heads/master 3e9493436 -> 4a610a18d
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/4a610a18/log4j-core/src/main/java/org/apache/logging/log4j/core/config/status/StatusConfiguration.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/status/StatusConfiguration.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/status/StatusConfiguration.java index a6f4d1f..11461a7 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/status/StatusConfiguration.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/status/StatusConfiguration.java @@ -94,7 +94,7 @@ public class StatusConfiguration { * @param destination where status log messages should be output. * @return {@code this} */ - public StatusConfiguration withDestination(final String destination) { + public StatusConfiguration setDestination(final String destination) { try { this.destination = parseStreamName(destination); } catch (final URISyntaxException e) { @@ -131,7 +131,7 @@ public class StatusConfiguration { * @return {@code this} * @see Level */ - public StatusConfiguration withStatus(final String status) { + public StatusConfiguration setStatus(final String status) { this.status = Level.toLevel(status, null); if (this.status == null) { this.error("Invalid status level specified: " + status + ". Defaulting to ERROR."); @@ -146,19 +146,19 @@ public class StatusConfiguration { * @param status logger level to filter below. * @return {@code this} */ - public StatusConfiguration withStatus(final Level status) { + public StatusConfiguration setStatus(final Level status) { this.status = status; return this; } /** * Specifies the verbosity level to log at. This only applies to classes configured by - * {@link #withVerboseClasses(String...) verboseClasses}. + * {@link #setVerboseClasses(String...) verboseClasses}. * * @param verbosity basic filter for status logger messages. * @return {@code this} */ - public StatusConfiguration withVerbosity(final String verbosity) { + public StatusConfiguration setVerbosity(final String verbosity) { this.verbosity = Verbosity.toVerbosity(verbosity); return this; } @@ -169,7 +169,7 @@ public class StatusConfiguration { * @param verboseClasses names of classes to filter if not using VERBOSE. * @return {@code this} */ - public StatusConfiguration withVerboseClasses(final String... verboseClasses) { + public StatusConfiguration setVerboseClasses(final String... verboseClasses) { this.verboseClasses = verboseClasses; return this; } http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/4a610a18/log4j-core/src/main/java/org/apache/logging/log4j/core/config/xml/XmlConfiguration.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/xml/XmlConfiguration.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/xml/XmlConfiguration.java index 07d5740..b4c5e0c 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/xml/XmlConfiguration.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/xml/XmlConfiguration.java @@ -108,21 +108,21 @@ public class XmlConfiguration extends AbstractConfiguration implements Reconfigu } rootElement = document.getDocumentElement(); final Map<String, String> attrs = processAttributes(rootNode, rootElement); - final StatusConfiguration statusConfig = new StatusConfiguration().withVerboseClasses(VERBOSE_CLASSES) - .withStatus(getDefaultStatus()); + final StatusConfiguration statusConfig = new StatusConfiguration().setVerboseClasses(VERBOSE_CLASSES) + .setStatus(getDefaultStatus()); for (final Map.Entry<String, String> entry : attrs.entrySet()) { final String key = entry.getKey(); final String value = getStrSubstitutor().replace(entry.getValue()); if ("status".equalsIgnoreCase(key)) { - statusConfig.withStatus(value); + statusConfig.setStatus(value); } else if ("dest".equalsIgnoreCase(key)) { - statusConfig.withDestination(value); + statusConfig.setDestination(value); } else if ("shutdownHook".equalsIgnoreCase(key)) { isShutdownHookEnabled = !"disable".equalsIgnoreCase(value); } else if ("shutdownTimeout".equalsIgnoreCase(key)) { shutdownTimeoutMillis = Long.parseLong(value); } else if ("verbose".equalsIgnoreCase(key)) { - statusConfig.withVerbosity(value); + statusConfig.setVerbosity(value); } else if ("packages".equalsIgnoreCase(key)) { pluginPackages.addAll(Arrays.asList(value.split(Patterns.COMMA_SEPARATOR))); } else if ("name".equalsIgnoreCase(key)) { http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/4a610a18/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/AbstractFilterable.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/AbstractFilterable.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/AbstractFilterable.java index 9ef6cce..3a8fd63 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/AbstractFilterable.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/AbstractFilterable.java @@ -67,14 +67,6 @@ public abstract class AbstractFilterable extends AbstractLifeCycle implements Fi return asBuilder(); } - /** - * @deprecated Use {@link #setFilter(Filter)}. - */ - @Deprecated - public B withFilter(final Filter filter) { - return setFilter(filter); - } - } /** http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/4a610a18/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/HtmlLayout.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/HtmlLayout.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/HtmlLayout.java index 8a09e4a..24a8170 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/HtmlLayout.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/HtmlLayout.java @@ -388,32 +388,32 @@ public final class HtmlLayout extends AbstractStringLayout { private Builder() { } - public Builder withLocationInfo(final boolean locationInfo) { + public Builder setLocationInfo(final boolean locationInfo) { this.locationInfo = locationInfo; return this; } - public Builder withTitle(final String title) { + public Builder setTitle(final String title) { this.title = title; return this; } - public Builder withContentType(final String contentType) { + public Builder setContentType(final String contentType) { this.contentType = contentType; return this; } - public Builder withCharset(final Charset charset) { + public Builder setCharset(final Charset charset) { this.charset = charset; return this; } - public Builder withFontSize(final FontSize fontSize) { + public Builder setFontSize(final FontSize fontSize) { this.fontSize = fontSize; return this; } - public Builder withFontName(final String fontName) { + public Builder setFontName(final String fontName) { this.fontName = fontName; return this; } http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/4a610a18/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 57cbb9c..dfa4966 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 @@ -294,15 +294,15 @@ public final class PatternLayout extends AbstractStringLayout { @PluginAttribute("header") final String headerPattern, @PluginAttribute("footer") final String footerPattern) { return newBuilder() - .withPattern(pattern) - .withPatternSelector(patternSelector) - .withConfiguration(config) - .withRegexReplacement(replace) - .withCharset(charset) - .withAlwaysWriteExceptions(alwaysWriteExceptions) - .withNoConsoleNoAnsi(noConsoleNoAnsi) - .withHeader(headerPattern) - .withFooter(footerPattern) + .setPattern(pattern) + .setPatternSelector(patternSelector) + .setConfiguration(config) + .setRegexReplacement(replace) + .setCharset(charset) + .setAlwaysWriteExceptions(alwaysWriteExceptions) + .setNoConsoleNoAnsi(noConsoleNoAnsi) + .setHeader(headerPattern) + .setFooter(footerPattern) .build(); } @@ -498,7 +498,7 @@ public final class PatternLayout extends AbstractStringLayout { * @see #DEFAULT_CONVERSION_PATTERN Default conversion pattern */ public static PatternLayout createDefaultLayout(final Configuration configuration) { - return newBuilder().withConfiguration(configuration).build(); + return newBuilder().setConfiguration(configuration).build(); } /** @@ -561,7 +561,7 @@ public final class PatternLayout extends AbstractStringLayout { * @param pattern * The pattern. If not specified, defaults to DEFAULT_CONVERSION_PATTERN. */ - public Builder withPattern(final String pattern) { + public Builder setPattern(final String pattern) { this.pattern = pattern; return this; } @@ -570,7 +570,7 @@ public final class PatternLayout extends AbstractStringLayout { * @param patternSelector * Allows different patterns to be used based on some selection criteria. */ - public Builder withPatternSelector(final PatternSelector patternSelector) { + public Builder setPatternSelector(final PatternSelector patternSelector) { this.patternSelector = patternSelector; return this; } @@ -579,7 +579,7 @@ public final class PatternLayout extends AbstractStringLayout { * @param configuration * The Configuration. Some Converters require access to the Interpolator. */ - public Builder withConfiguration(final Configuration configuration) { + public Builder setConfiguration(final Configuration configuration) { this.configuration = configuration; return this; } @@ -588,7 +588,7 @@ public final class PatternLayout extends AbstractStringLayout { * @param regexReplacement * A Regex replacement */ - public Builder withRegexReplacement(final RegexReplacement regexReplacement) { + public Builder setRegexReplacement(final RegexReplacement regexReplacement) { this.regexReplacement = regexReplacement; return this; } @@ -597,7 +597,7 @@ public final class PatternLayout extends AbstractStringLayout { * @param charset * The character set. The platform default is used if not specified. */ - public Builder withCharset(final Charset charset) { + public Builder setCharset(final Charset charset) { // LOG4J2-783 if null, use platform default by default if (charset != null) { this.charset = charset; @@ -609,7 +609,7 @@ public final class PatternLayout extends AbstractStringLayout { * @param alwaysWriteExceptions * If {@code "true"} (default) exceptions are always written even if the pattern contains no exception tokens. */ - public Builder withAlwaysWriteExceptions(final boolean alwaysWriteExceptions) { + public Builder setAlwaysWriteExceptions(final boolean alwaysWriteExceptions) { this.alwaysWriteExceptions = alwaysWriteExceptions; return this; } @@ -619,7 +619,7 @@ public final class PatternLayout extends AbstractStringLayout { * If {@code "true"} (default is value of system property `log4j.skipJansi`, or `true` if undefined), * do not output ANSI escape codes */ - public Builder withDisableAnsi(final boolean disableAnsi) { + public Builder setDisableAnsi(final boolean disableAnsi) { this.disableAnsi = disableAnsi; return this; } @@ -628,7 +628,7 @@ public final class PatternLayout extends AbstractStringLayout { * @param noConsoleNoAnsi * If {@code "true"} (default is false) and {@link System#console()} is null, do not output ANSI escape codes */ - public Builder withNoConsoleNoAnsi(final boolean noConsoleNoAnsi) { + public Builder setNoConsoleNoAnsi(final boolean noConsoleNoAnsi) { this.noConsoleNoAnsi = noConsoleNoAnsi; return this; } @@ -637,7 +637,7 @@ public final class PatternLayout extends AbstractStringLayout { * @param header * The footer to place at the top of the document, once. */ - public Builder withHeader(final String header) { + public Builder setHeader(final String header) { this.header = header; return this; } @@ -646,7 +646,7 @@ public final class PatternLayout extends AbstractStringLayout { * @param footer * The footer to place at the bottom of the document, once. */ - public Builder withFooter(final String footer) { + public Builder setFooter(final String footer) { this.footer = footer; return this; } http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/4a610a18/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/ConsoleAppenderBuilderTest.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/ConsoleAppenderBuilderTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/ConsoleAppenderBuilderTest.java index a3303bb..d0ff679 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/ConsoleAppenderBuilderTest.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/ConsoleAppenderBuilderTest.java @@ -40,7 +40,7 @@ public class ConsoleAppenderBuilderTest { */ @Test public void testDefaultLayoutDefaultCharset() { - final ConsoleAppender appender = ConsoleAppender.newBuilder().withName("test").build(); + final ConsoleAppender appender = ConsoleAppender.newBuilder().setName("test").build(); final PatternLayout layout = (PatternLayout) appender.getLayout(); final String charsetName = System.getProperty("sun.stdout.encoding"); final String expectedName = charsetName != null ? charsetName : Charset.defaultCharset().name(); @@ -52,7 +52,7 @@ public class ConsoleAppenderBuilderTest { */ @Test public void testSetNullErrorHandlerIsNotAllowed() { - final ConsoleAppender appender = ConsoleAppender.newBuilder().withName("test").build(); + final ConsoleAppender appender = ConsoleAppender.newBuilder().setName("test").build(); ErrorHandler handler = appender.getHandler(); Assert.assertNotNull(handler); // This could likely be allowed to throw, but we're just testing that http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/4a610a18/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/ConsoleAppenderTest.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/ConsoleAppenderTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/ConsoleAppenderTest.java index e203db1..f75f903 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/ConsoleAppenderTest.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/ConsoleAppenderTest.java @@ -91,9 +91,9 @@ public class ConsoleAppenderTest { private void testConsoleStreamManagerDoesNotClose(final PrintStream ps, final Target targetName, final SystemSetter systemSetter) { try { systemSetter.systemSet(psMock); - final Layout<String> layout = PatternLayout.newBuilder().withAlwaysWriteExceptions(true).build(); - final ConsoleAppender app = ConsoleAppender.newBuilder().withLayout(layout).setTarget(targetName) - .withName("Console").withIgnoreExceptions(false).build(); + final Layout<String> layout = PatternLayout.newBuilder().setAlwaysWriteExceptions(true).build(); + final ConsoleAppender app = ConsoleAppender.newBuilder().setLayout(layout).setTarget(targetName) + .setName("Console").setIgnoreExceptions(false).build(); app.start(); assertTrue("Appender did not start", app.isStarted()); @@ -126,7 +126,7 @@ public class ConsoleAppenderTest { private void testFollowSystemPrintStream(final PrintStream ps, final Target target, final SystemSetter systemSetter) { final ConsoleAppender app = ConsoleAppender.newBuilder().setTarget(target).setFollow(true) - .withIgnoreExceptions(false).withName("test").build(); + .setIgnoreExceptions(false).setName("test").build(); Assert.assertEquals(target, app.getTarget()); app.start(); try { http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/4a610a18/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/FileAppenderPermissionsTest.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/FileAppenderPermissionsTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/FileAppenderPermissionsTest.java index 716c9de..396be82 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/FileAppenderPermissionsTest.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/FileAppenderPermissionsTest.java @@ -88,19 +88,19 @@ public class FileAppenderPermissionsTest { public void testFilePermissionsAPI() throws Exception { final File file = new File(DIR, "AppenderTest-" + fileIndex + ".log"); final Path path = file.toPath(); - final Layout<String> layout = PatternLayout.newBuilder().withPattern(PatternLayout.SIMPLE_CONVERSION_PATTERN) + final Layout<String> layout = PatternLayout.newBuilder().setPattern(PatternLayout.SIMPLE_CONVERSION_PATTERN) .build(); // @formatter:off final FileAppender appender = FileAppender.newBuilder() - .withFileName(file.getAbsolutePath()) - .withName("test") - .withImmediateFlush(false) - .withIgnoreExceptions(false) - .withBufferedIo(false) - .withBufferSize(1) - .withLayout(layout) - .withCreateOnDemand(createOnDemand) - .withFilePermissions(filePermissions) + .setFileName(file.getAbsolutePath()) + .setName("test") + .setImmediateFlush(false) + .setIgnoreExceptions(false) + .setBufferedIo(false) + .setBufferSize(1) + .setLayout(layout) + .setCreateOnDemand(createOnDemand) + .setFilePermissions(filePermissions) .build(); // @formatter:on try { @@ -143,20 +143,20 @@ public class FileAppenderPermissionsTest { final String group = findAGroup(user); assertNotNull(group); - final Layout<String> layout = PatternLayout.newBuilder().withPattern(PatternLayout.SIMPLE_CONVERSION_PATTERN) + final Layout<String> layout = PatternLayout.newBuilder().setPattern(PatternLayout.SIMPLE_CONVERSION_PATTERN) .build(); // @formatter:off final FileAppender appender = FileAppender.newBuilder() - .withFileName(file.getAbsolutePath()) - .withName("test") - .withImmediateFlush(true) - .withIgnoreExceptions(false) - .withBufferedIo(false) - .withBufferSize(1) - .withLayout(layout) - .withFilePermissions(filePermissions) - .withFileOwner(user) - .withFileGroup(group) + .setFileName(file.getAbsolutePath()) + .setName("test") + .setImmediateFlush(true) + .setIgnoreExceptions(false) + .setBufferedIo(false) + .setBufferSize(1) + .setLayout(layout) + .setFilePermissions(filePermissions) + .setFileOwner(user) + .setFileGroup(group) .build(); // @formatter:on try { http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/4a610a18/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/FileAppenderTest.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/FileAppenderTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/FileAppenderTest.java index 066b560..465918a 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/FileAppenderTest.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/FileAppenderTest.java @@ -93,14 +93,14 @@ public class FileAppenderTest { final Layout<String> layout = createPatternLayout(); // @formatter:off final FileAppender appender = FileAppender.newBuilder() - .withFileName(FILE_NAME) - .withName("test") - .withImmediateFlush(false) - .withIgnoreExceptions(false) - .withBufferedIo(false) - .withBufferSize(1) - .withLayout(layout) - .withCreateOnDemand(createOnDemand) + .setFileName(FILE_NAME) + .setName("test") + .setImmediateFlush(false) + .setIgnoreExceptions(false) + .setBufferedIo(false) + .setBufferSize(1) + .setLayout(layout) + .setCreateOnDemand(createOnDemand) .build(); // @formatter:on Assert.assertEquals(createOnDemand, appender.getManager().isCreateOnDemand()); @@ -115,7 +115,7 @@ public class FileAppenderTest { } private static PatternLayout createPatternLayout() { - return PatternLayout.newBuilder().withPattern(PatternLayout.SIMPLE_CONVERSION_PATTERN) + return PatternLayout.newBuilder().setPattern(PatternLayout.SIMPLE_CONVERSION_PATTERN) .build(); } @@ -124,14 +124,14 @@ public class FileAppenderTest { final Layout<String> layout = createPatternLayout(); // @formatter:off final FileAppender appender = FileAppender.newBuilder() - .withFileName(FILE_NAME) - .withName("test") - .withImmediateFlush(false) - .withIgnoreExceptions(false) - .withBufferedIo(false) - .withBufferSize(1) - .withLayout(layout) - .withCreateOnDemand(createOnDemand) + .setFileName(FILE_NAME) + .setName("test") + .setImmediateFlush(false) + .setIgnoreExceptions(false) + .setBufferedIo(false) + .setBufferSize(1) + .setLayout(layout) + .setCreateOnDemand(createOnDemand) .build(); // @formatter:on try { @@ -233,14 +233,14 @@ public class FileAppenderTest { final Layout<String> layout = createPatternLayout(); // @formatter:off final FileAppender appender = FileAppender.newBuilder() - .withFileName(FILE_NAME) - .withName("test") - .withImmediateFlush(false) - .withIgnoreExceptions(false) - .withLocking(locking) - .withBufferedIo(false) - .withLayout(layout) - .withCreateOnDemand(createOnDemand) + .setFileName(FILE_NAME) + .setName("test") + .setImmediateFlush(false) + .setIgnoreExceptions(false) + .setLocking(locking) + .setBufferedIo(false) + .setLayout(layout) + .setCreateOnDemand(createOnDemand) .build(); // @formatter:on Assert.assertEquals(createOnDemand, appender.getManager().isCreateOnDemand()); http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/4a610a18/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/InMemoryAppenderTest.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/InMemoryAppenderTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/InMemoryAppenderTest.java index 75d4929..c2c0aa3 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/InMemoryAppenderTest.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/InMemoryAppenderTest.java @@ -44,7 +44,7 @@ public class InMemoryAppenderTest { @Test public void testHeaderRequested() { - final PatternLayout layout = PatternLayout.newBuilder().withHeader("HEADERHEADER").build(); + final PatternLayout layout = PatternLayout.newBuilder().setHeader("HEADERHEADER").build(); final boolean writeHeader = true; final InMemoryAppender app = new InMemoryAppender("test", layout, null, false, writeHeader); final String expectedHeader = "HEADERHEADER"; @@ -53,7 +53,7 @@ public class InMemoryAppenderTest { @Test public void testHeaderSuppressed() { - final PatternLayout layout = PatternLayout.newBuilder().withHeader("HEADERHEADER").build(); + final PatternLayout layout = PatternLayout.newBuilder().setHeader("HEADERHEADER").build(); final boolean writeHeader = false; final InMemoryAppender app = new InMemoryAppender("test", layout, null, false, writeHeader); final String expectedHeader = null; http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/4a610a18/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/OutputStreamAppenderTest.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/OutputStreamAppenderTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/OutputStreamAppenderTest.java index 8dcc97f..9f907bf 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/OutputStreamAppenderTest.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/OutputStreamAppenderTest.java @@ -92,12 +92,12 @@ public class OutputStreamAppenderTest { final Configuration config = ctx.getConfiguration(); // @formatter:off final Appender appender = FileAppender.newBuilder() - .withFileName("target/" + getClass().getName() + ".log") - .withAppend(false) - .withName("File") - .withIgnoreExceptions(false) - .withBufferedIo(false) - .withBufferSize(4000) + .setFileName("target/" + getClass().getName() + ".log") + .setAppend(false) + .setName("File") + .setIgnoreExceptions(false) + .setBufferedIo(false) + .setBufferSize(4000) .setConfiguration(config) .build(); // @formatter:on http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/4a610a18/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/SyslogAppenderCustomLayoutTest.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/SyslogAppenderCustomLayoutTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/SyslogAppenderCustomLayoutTest.java index 716223e..68b2f00 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/SyslogAppenderCustomLayoutTest.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/SyslogAppenderCustomLayoutTest.java @@ -31,7 +31,7 @@ public class SyslogAppenderCustomLayoutTest extends SyslogAppenderTest { @Override protected Builder newSyslogAppenderBuilder(final String protocol, final String format, final boolean newLine) { final Builder builder = super.newSyslogAppenderBuilder(protocol, format, newLine); - builder.withLayout(SyslogLayout.newBuilder().setFacility(Facility.LOCAL3).setIncludeNewLine(true).build()); + builder.setLayout(SyslogLayout.newBuilder().setFacility(Facility.LOCAL3).setIncludeNewLine(true).build()); return builder; } http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/4a610a18/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/SyslogAppenderTest.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/SyslogAppenderTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/SyslogAppenderTest.java index 741a51f..80cdfc9 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/SyslogAppenderTest.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/SyslogAppenderTest.java @@ -116,11 +116,11 @@ public class SyslogAppenderTest extends SyslogAppenderTestBase { protected Builder newSyslogAppenderBuilder(final String protocol, final String format, final boolean newLine) { // @formatter:off return SyslogAppender.newSyslogAppenderBuilder() - .withPort(PORTNUM) - .withProtocol(EnglishEnums.valueOf(Protocol.class, protocol)) - .withReconnectDelayMillis(-1) - .withName("TestApp") - .withIgnoreExceptions(false) + .setPort(PORTNUM) + .setProtocol(EnglishEnums.valueOf(Protocol.class, protocol)) + .setReconnectDelayMillis(-1) + .setName("TestApp") + .setIgnoreExceptions(false) .setId("Audit") .setEnterpriseNumber(18060) .setMdcId("RequestContext") http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/4a610a18/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/CronTriggeringPolicyTest.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/CronTriggeringPolicyTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/CronTriggeringPolicyTest.java index f6bf296..9fed4bc 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/CronTriggeringPolicyTest.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/CronTriggeringPolicyTest.java @@ -52,11 +52,11 @@ public class CronTriggeringPolicyTest { private void testBuilder() { // @formatter:off final RollingFileAppender raf = RollingFileAppender.newBuilder() - .withName("test1") - .withFileName("target/testcmd1.log") - .withFilePattern("target/testcmd1.log.%d{yyyy-MM-dd}") - .withPolicy(createPolicy()) - .withStrategy(createStrategy()) + .setName("test1") + .setFileName("target/testcmd1.log") + .setFilePattern("target/testcmd1.log.%d{yyyy-MM-dd}") + .setPolicy(createPolicy()) + .setStrategy(createStrategy()) .setConfiguration(configuration) .build(); // @formatter:on @@ -88,11 +88,11 @@ public class CronTriggeringPolicyTest { public void testRollingRandomAccessFileAppender() { // @formatter:off RollingRandomAccessFileAppender.newBuilder() - .withName("test2") - .withFileName("target/testcmd2.log") - .withFilePattern("target/testcmd2.log.%d{yyyy-MM-dd}") - .withPolicy(createPolicy()) - .withStrategy(createStrategy()) + .setName("test2") + .setFileName("target/testcmd2.log") + .setFilePattern("target/testcmd2.log.%d{yyyy-MM-dd}") + .setPolicy(createPolicy()) + .setStrategy(createStrategy()) .setConfiguration(configuration) .build(); // @formatter:on http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/4a610a18/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/OnStartupTriggeringPolicyTest.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/OnStartupTriggeringPolicyTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/OnStartupTriggeringPolicyTest.java index 7ef9d92..f40e99b 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/OnStartupTriggeringPolicyTest.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/OnStartupTriggeringPolicyTest.java @@ -72,7 +72,7 @@ public class OnStartupTriggeringPolicyTest { assertEquals(copied, size); Assert.assertTrue(target.toFile().setLastModified(timeStamp)); - final PatternLayout layout = PatternLayout.newBuilder().withPattern("%msg").withConfiguration(configuration) + final PatternLayout layout = PatternLayout.newBuilder().setPattern("%msg").setConfiguration(configuration) .build(); final RolloverStrategy strategy = DefaultRolloverStrategy.createStrategy(null, null, null, "0", null, true, configuration); http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/4a610a18/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingFileAppenderAccessTest.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingFileAppenderAccessTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingFileAppenderAccessTest.java index 8af78b2..a63817e 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingFileAppenderAccessTest.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingFileAppenderAccessTest.java @@ -40,10 +40,10 @@ public class RollingFileAppenderAccessTest { file.deleteOnExit(); // @formatter:off final RollingFileAppender appender = RollingFileAppender.newBuilder() - .withFileName(file.getCanonicalPath()) - .withFilePattern("FilePattern") - .withName("Name") - .withPolicy(OnStartupTriggeringPolicy.createPolicy(1)) + .setFileName(file.getCanonicalPath()) + .setFilePattern("FilePattern") + .setName("Name") + .setPolicy(OnStartupTriggeringPolicy.createPolicy(1)) .setConfiguration(config) .build(); // @formatter:on http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/4a610a18/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingFileAppenderLayoutTest.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingFileAppenderLayoutTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingFileAppenderLayoutTest.java index 5fe9b68..98c64f3 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingFileAppenderLayoutTest.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingFileAppenderLayoutTest.java @@ -27,12 +27,12 @@ public class RollingFileAppenderLayoutTest { public void testDefaultLayout() throws Exception { // @formatter:off Assert.assertNotNull(RollingFileAppender.newBuilder() - .withName(RollingFileAppenderLayoutTest.class.getName()) + .setName(RollingFileAppenderLayoutTest.class.getName()) .setConfiguration(new DefaultConfiguration()) - .withFileName("log.txt") - .withFilePattern("FilePattern") - .withPolicy(OnStartupTriggeringPolicy.createPolicy(1)) - .withCreateOnDemand(true) // no need to clutter up test folder with another file + .setFileName("log.txt") + .setFilePattern("FilePattern") + .setPolicy(OnStartupTriggeringPolicy.createPolicy(1)) + .setCreateOnDemand(true) // no need to clutter up test folder with another file .build().getLayout()); // @formatter:on } http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/4a610a18/log4j-core/src/test/java/org/apache/logging/log4j/core/config/CustomConfigurationTest.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/config/CustomConfigurationTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/config/CustomConfigurationTest.java index d725043..1eb193c 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/config/CustomConfigurationTest.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/config/CustomConfigurationTest.java @@ -76,18 +76,18 @@ public class CustomConfigurationTest { } } final Layout<? extends Serializable> layout = PatternLayout.newBuilder() - .withPattern(PatternLayout.SIMPLE_CONVERSION_PATTERN) - .withConfiguration(config) + .setPattern(PatternLayout.SIMPLE_CONVERSION_PATTERN) + .setConfiguration(config) .build(); // @formatter:off final FileAppender appender = FileAppender.newBuilder() - .withFileName(LOG_FILE) - .withAppend(false) - .withName("File") - .withIgnoreExceptions(false) - .withBufferSize(4000) - .withBufferedIo(false) - .withLayout(layout) + .setFileName(LOG_FILE) + .setAppend(false) + .setName("File") + .setIgnoreExceptions(false) + .setBufferSize(4000) + .setBufferedIo(false) + .setLayout(layout) .build(); // @formatter:on appender.start(); http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/4a610a18/log4j-core/src/test/java/org/apache/logging/log4j/core/config/JiraLog4j2_2134Test.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/config/JiraLog4j2_2134Test.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/config/JiraLog4j2_2134Test.java index 37508bb..65e73fe 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/config/JiraLog4j2_2134Test.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/config/JiraLog4j2_2134Test.java @@ -40,12 +40,12 @@ public class JiraLog4j2_2134Test { final Configuration config = ctx.getConfiguration(); PatternLayout layout = PatternLayout.newBuilder() // @formatter:off - .withPattern(PatternLayout.SIMPLE_CONVERSION_PATTERN) - .withConfiguration(config) + .setPattern(PatternLayout.SIMPLE_CONVERSION_PATTERN) + .setConfiguration(config) .build(); // @formatter:on - Appender appender = FileAppender.newBuilder().withFileName("target/test.log").withLayout(layout) - .setConfiguration(config).withBufferSize(4000).withName("File").build(); + Appender appender = FileAppender.newBuilder().setFileName("target/test.log").setLayout(layout) + .setConfiguration(config).setBufferSize(4000).setName("File").build(); // appender.start(); config.addAppender(appender); AppenderRef ref = AppenderRef.createAppenderRef("File", null, null); http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/4a610a18/log4j-core/src/test/java/org/apache/logging/log4j/core/config/plugins/validation/AbstractPluginWithGenericBuilder.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/config/plugins/validation/AbstractPluginWithGenericBuilder.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/config/plugins/validation/AbstractPluginWithGenericBuilder.java index 7b2a0f8..5689e29 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/config/plugins/validation/AbstractPluginWithGenericBuilder.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/config/plugins/validation/AbstractPluginWithGenericBuilder.java @@ -39,7 +39,7 @@ public class AbstractPluginWithGenericBuilder { return thing; } - public B withThing(final String name) { + public B setThing(final String name) { this.thing = name; return asBuilder(); } http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/4a610a18/log4j-core/src/test/java/org/apache/logging/log4j/core/config/plugins/validation/PluginWithGenericSubclassFoo1Builder.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/config/plugins/validation/PluginWithGenericSubclassFoo1Builder.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/config/plugins/validation/PluginWithGenericSubclassFoo1Builder.java index aed8eee..3f2b15a 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/config/plugins/validation/PluginWithGenericSubclassFoo1Builder.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/config/plugins/validation/PluginWithGenericSubclassFoo1Builder.java @@ -45,7 +45,7 @@ public class PluginWithGenericSubclassFoo1Builder extends AbstractPluginWithGene return foo1; } - public B withFoo1(final String foo1) { + public B setFoo1(final String foo1) { this.foo1 = foo1; return asBuilder(); } http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/4a610a18/log4j-core/src/test/java/org/apache/logging/log4j/core/config/plugins/validation/ValidatingPlugin.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/config/plugins/validation/ValidatingPlugin.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/config/plugins/validation/ValidatingPlugin.java index 6068f46..95a4209 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/config/plugins/validation/ValidatingPlugin.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/config/plugins/validation/ValidatingPlugin.java @@ -57,7 +57,7 @@ public class ValidatingPlugin { @Required(message = "The name given by the builder is null") private String name; - public Builder withName(final String name) { + public Builder setName(final String name) { this.name = name; return this; } http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/4a610a18/log4j-core/src/test/java/org/apache/logging/log4j/core/config/plugins/validation/ValidatingPluginWithGenericBuilder.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/config/plugins/validation/ValidatingPluginWithGenericBuilder.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/config/plugins/validation/ValidatingPluginWithGenericBuilder.java index 5ca9b6e..81b9d6f 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/config/plugins/validation/ValidatingPluginWithGenericBuilder.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/config/plugins/validation/ValidatingPluginWithGenericBuilder.java @@ -57,7 +57,7 @@ public class ValidatingPluginWithGenericBuilder { @Required(message = "The name given by the builder is null") private String name; - public B withName(final String name) { + public B setName(final String name) { this.name = name; return asBuilder(); } http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/4a610a18/log4j-core/src/test/java/org/apache/logging/log4j/core/config/plugins/validation/ValidatingPluginWithTypedBuilder.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/config/plugins/validation/ValidatingPluginWithTypedBuilder.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/config/plugins/validation/ValidatingPluginWithTypedBuilder.java index 9ebb85e..74a6477 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/config/plugins/validation/ValidatingPluginWithTypedBuilder.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/config/plugins/validation/ValidatingPluginWithTypedBuilder.java @@ -57,7 +57,7 @@ public class ValidatingPluginWithTypedBuilder { @Required(message = "The name given by the builder is null") private String name; - public Builder<T> withName(final String name) { + public Builder<T> setName(final String name) { this.name = name; return this; } http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/4a610a18/log4j-core/src/test/java/org/apache/logging/log4j/core/config/plugins/validation/validators/RequiredValidatorTest.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/config/plugins/validation/validators/RequiredValidatorTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/config/plugins/validation/validators/RequiredValidatorTest.java index 15a51ae..684a4c8 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/config/plugins/validation/validators/RequiredValidatorTest.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/config/plugins/validation/validators/RequiredValidatorTest.java @@ -45,8 +45,8 @@ public class RequiredValidatorTest { @Test public void testNullDefaultValue() throws Exception { final ValidatingPlugin validatingPlugin = (ValidatingPlugin) new PluginBuilder(plugin) - .withConfiguration(new NullConfiguration()) - .withConfigurationNode(node) + .setConfiguration(new NullConfiguration()) + .setConfigurationNode(node) .build(); assertNull(validatingPlugin); } @@ -55,8 +55,8 @@ public class RequiredValidatorTest { public void testNonNullValue() throws Exception { node.getAttributes().put("name", "foo"); final ValidatingPlugin validatingPlugin = (ValidatingPlugin) new PluginBuilder(plugin) - .withConfiguration(new NullConfiguration()) - .withConfigurationNode(node) + .setConfiguration(new NullConfiguration()) + .setConfigurationNode(node) .build(); assertNotNull(validatingPlugin); assertEquals("foo", validatingPlugin.getName()); http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/4a610a18/log4j-core/src/test/java/org/apache/logging/log4j/core/config/plugins/validation/validators/ValidHostValidatorTest.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/config/plugins/validation/validators/ValidHostValidatorTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/config/plugins/validation/validators/ValidHostValidatorTest.java index 3a5f534..7885a1f 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/config/plugins/validation/validators/ValidHostValidatorTest.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/config/plugins/validation/validators/ValidHostValidatorTest.java @@ -72,8 +72,8 @@ public class ValidHostValidatorTest { private HostAndPort buildPlugin() { return (HostAndPort) new PluginBuilder(plugin) - .withConfiguration(new NullConfiguration()) - .withConfigurationNode(node) + .setConfiguration(new NullConfiguration()) + .setConfigurationNode(node) .build(); } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/4a610a18/log4j-core/src/test/java/org/apache/logging/log4j/core/config/plugins/validation/validators/ValidPortValidatorTest.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/config/plugins/validation/validators/ValidPortValidatorTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/config/plugins/validation/validators/ValidPortValidatorTest.java index 3aab08d..53d3172 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/config/plugins/validation/validators/ValidPortValidatorTest.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/config/plugins/validation/validators/ValidPortValidatorTest.java @@ -62,8 +62,8 @@ public class ValidPortValidatorTest { private HostAndPort buildPlugin() { return (HostAndPort) new PluginBuilder(plugin) - .withConfiguration(new NullConfiguration()) - .withConfigurationNode(node) + .setConfiguration(new NullConfiguration()) + .setConfigurationNode(node) .build(); } http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/4a610a18/log4j-core/src/test/java/org/apache/logging/log4j/core/config/plugins/validation/validators/ValidatingPluginWithGenericBuilderTest.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/config/plugins/validation/validators/ValidatingPluginWithGenericBuilderTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/config/plugins/validation/validators/ValidatingPluginWithGenericBuilderTest.java index 8e02f20..8ee5abb 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/config/plugins/validation/validators/ValidatingPluginWithGenericBuilderTest.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/config/plugins/validation/validators/ValidatingPluginWithGenericBuilderTest.java @@ -47,8 +47,8 @@ public class ValidatingPluginWithGenericBuilderTest { @Test public void testNullDefaultValue() throws Exception { final ValidatingPluginWithGenericBuilder validatingPlugin = (ValidatingPluginWithGenericBuilder) new PluginBuilder(plugin) - .withConfiguration(new NullConfiguration()) - .withConfigurationNode(node) + .setConfiguration(new NullConfiguration()) + .setConfigurationNode(node) .build(); assertNull(validatingPlugin); } @@ -57,8 +57,8 @@ public class ValidatingPluginWithGenericBuilderTest { public void testNonNullValue() throws Exception { node.getAttributes().put("name", "foo"); final ValidatingPluginWithGenericBuilder validatingPlugin = (ValidatingPluginWithGenericBuilder) new PluginBuilder(plugin) - .withConfiguration(new NullConfiguration()) - .withConfigurationNode(node) + .setConfiguration(new NullConfiguration()) + .setConfigurationNode(node) .build(); assertNotNull(validatingPlugin); assertEquals("foo", validatingPlugin.getName()); http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/4a610a18/log4j-core/src/test/java/org/apache/logging/log4j/core/config/plugins/validation/validators/ValidatingPluginWithGenericSubclassFoo1BuilderTest.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/config/plugins/validation/validators/ValidatingPluginWithGenericSubclassFoo1BuilderTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/config/plugins/validation/validators/ValidatingPluginWithGenericSubclassFoo1BuilderTest.java index d6f3966..f255526 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/config/plugins/validation/validators/ValidatingPluginWithGenericSubclassFoo1BuilderTest.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/config/plugins/validation/validators/ValidatingPluginWithGenericSubclassFoo1BuilderTest.java @@ -47,8 +47,8 @@ public class ValidatingPluginWithGenericSubclassFoo1BuilderTest { @Test public void testNullDefaultValue() throws Exception { final PluginWithGenericSubclassFoo1Builder validatingPlugin = (PluginWithGenericSubclassFoo1Builder) new PluginBuilder(plugin) - .withConfiguration(new NullConfiguration()) - .withConfigurationNode(node) + .setConfiguration(new NullConfiguration()) + .setConfigurationNode(node) .build(); assertNull(validatingPlugin); } @@ -58,8 +58,8 @@ public class ValidatingPluginWithGenericSubclassFoo1BuilderTest { node.getAttributes().put("thing", "thing1"); node.getAttributes().put("foo1", "foo1"); final PluginWithGenericSubclassFoo1Builder validatingPlugin = (PluginWithGenericSubclassFoo1Builder) new PluginBuilder(plugin) - .withConfiguration(new NullConfiguration()) - .withConfigurationNode(node) + .setConfiguration(new NullConfiguration()) + .setConfigurationNode(node) .build(); assertNotNull(validatingPlugin); assertEquals("thing1", validatingPlugin.getThing()); http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/4a610a18/log4j-core/src/test/java/org/apache/logging/log4j/core/config/plugins/validation/validators/ValidatingPluginWithTypedBuilderTest.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/config/plugins/validation/validators/ValidatingPluginWithTypedBuilderTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/config/plugins/validation/validators/ValidatingPluginWithTypedBuilderTest.java index ae236b4..84de5c4 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/config/plugins/validation/validators/ValidatingPluginWithTypedBuilderTest.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/config/plugins/validation/validators/ValidatingPluginWithTypedBuilderTest.java @@ -50,8 +50,8 @@ public class ValidatingPluginWithTypedBuilderTest { // @formatter:off final ValidatingPluginWithTypedBuilder validatingPlugin = (ValidatingPluginWithTypedBuilder) new PluginBuilder(plugin). - withConfiguration(new NullConfiguration()). - withConfigurationNode(node).build(); + setConfiguration(new NullConfiguration()). + setConfigurationNode(node).build(); // @formatter:on assertNull(validatingPlugin); } @@ -62,8 +62,8 @@ public class ValidatingPluginWithTypedBuilderTest { // @formatter:off final ValidatingPluginWithTypedBuilder validatingPlugin = (ValidatingPluginWithTypedBuilder) new PluginBuilder(plugin). - withConfiguration(new NullConfiguration()). - withConfigurationNode(node).build(); + setConfiguration(new NullConfiguration()). + setConfigurationNode(node).build(); // @formatter:on assertNotNull(validatingPlugin); assertEquals("foo", validatingPlugin.getName()); http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/4a610a18/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/HtmlLayoutTest.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/HtmlLayoutTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/HtmlLayoutTest.java index 80acb1f..d0ac614 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/HtmlLayoutTest.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/HtmlLayoutTest.java @@ -73,7 +73,7 @@ public class HtmlLayoutTest { @Test public void testContentType() { final HtmlLayout layout = HtmlLayout.newBuilder() - .withContentType("text/html; charset=UTF-16") + .setContentType("text/html; charset=UTF-16") .build(); assertEquals("text/html; charset=UTF-16", layout.getContentType()); // TODO: make sure this following bit works as well @@ -106,7 +106,7 @@ public class HtmlLayoutTest { } // set up appender final HtmlLayout layout = HtmlLayout.newBuilder() - .withLocationInfo(includeLocation) + .setLocationInfo(includeLocation) .build(); final ListAppender appender = new ListAppender("List", null, layout, true, false); appender.start(); http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/4a610a18/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/PatternLayoutTest.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/PatternLayoutTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/PatternLayoutTest.java index 4749546..09098d9 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/PatternLayoutTest.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/PatternLayoutTest.java @@ -117,8 +117,8 @@ public class PatternLayoutTest { @Test public void testEqualsEmptyMarker() throws Exception { // replace "[]" with the empty string - final PatternLayout layout = PatternLayout.newBuilder().withPattern("[%logger]%equals{[%marker]}{[]}{} %msg") - .withConfiguration(ctx.getConfiguration()).build(); + final PatternLayout layout = PatternLayout.newBuilder().setPattern("[%logger]%equals{[%marker]}{[]}{} %msg") + .setConfiguration(ctx.getConfiguration()).build(); // Not empty marker final LogEvent event1 = Log4jLogEvent.newBuilder() // .setLoggerName(this.getClass().getName()).setLoggerFqcn("org.apache.logging.log4j.core.Logger") // @@ -142,8 +142,8 @@ public class PatternLayoutTest { public void testHeaderFooterJavaLookup() throws Exception { // % does not work here. final String pattern = "%d{UNIX} MyApp%n${java:version}%n${java:runtime}%n${java:vm}%n${java:os}%n${java:hw}"; - final PatternLayout layout = PatternLayout.newBuilder().withConfiguration(ctx.getConfiguration()) - .withHeader("Header: " + pattern).withFooter("Footer: " + pattern).build(); + final PatternLayout layout = PatternLayout.newBuilder().setConfiguration(ctx.getConfiguration()) + .setHeader("Header: " + pattern).setFooter("Footer: " + pattern).build(); final byte[] header = layout.getHeader(); assertNotNull("No header", header); final String headerStr = new String(header); @@ -171,8 +171,8 @@ public class PatternLayoutTest { @Test public void testHeaderFooterMainLookup() { MainMapLookup.setMainArguments("value0", "value1", "value2"); - final PatternLayout layout = PatternLayout.newBuilder().withConfiguration(ctx.getConfiguration()) - .withHeader("${main:0}").withFooter("${main:2}").build(); + final PatternLayout layout = PatternLayout.newBuilder().setConfiguration(ctx.getConfiguration()) + .setHeader("${main:0}").setFooter("${main:2}").build(); final byte[] header = layout.getHeader(); assertNotNull("No header", header); final String headerStr = new String(header); @@ -186,8 +186,8 @@ public class PatternLayoutTest { @Test public void testHeaderFooterThreadContext() throws Exception { - final PatternLayout layout = PatternLayout.newBuilder().withPattern("%d{UNIX} %m") - .withConfiguration(ctx.getConfiguration()).withHeader("${ctx:header}").withFooter("${ctx:footer}") + final PatternLayout layout = PatternLayout.newBuilder().setPattern("%d{UNIX} %m") + .setConfiguration(ctx.getConfiguration()).setHeader("${ctx:header}").setFooter("${ctx:footer}") .build(); ThreadContext.put("header", "Hello world Header"); ThreadContext.put("footer", "Hello world Footer"); @@ -199,8 +199,8 @@ public class PatternLayoutTest { private void testMdcPattern(final String patternStr, final String expectedStr, final boolean useThreadContext) throws Exception { - final PatternLayout layout = PatternLayout.newBuilder().withPattern(patternStr) - .withConfiguration(ctx.getConfiguration()).build(); + final PatternLayout layout = PatternLayout.newBuilder().setPattern(patternStr) + .setConfiguration(ctx.getConfiguration()).build(); if (useThreadContext) { ThreadContext.put("key1", "value1"); ThreadContext.put("key2", "value2"); @@ -248,8 +248,8 @@ public class PatternLayoutTest { final PatternMatch[] patterns = new PatternMatch[1]; patterns[0] = new PatternMatch("FLOW", "%d %-5p [%t]: ====== %C{1}.%M:%L %m ======%n"); final PatternSelector selector = MarkerPatternSelector.createSelector(patterns, "%d %-5p [%t]: %m%n", true, true, ctx.getConfiguration()); - final PatternLayout layout = PatternLayout.newBuilder().withPatternSelector(selector) - .withConfiguration(ctx.getConfiguration()).build(); + final PatternLayout layout = PatternLayout.newBuilder().setPatternSelector(selector) + .setConfiguration(ctx.getConfiguration()).build(); final LogEvent event1 = Log4jLogEvent.newBuilder() // .setLoggerName(this.getClass().getName()).setLoggerFqcn("org.apache.logging.log4j.core.layout.PatternLayoutTest$FauxLogger") .setMarker(MarkerManager.getMarker("FLOW")) @@ -270,8 +270,8 @@ public class PatternLayoutTest { @Test public void testRegex() throws Exception { - final PatternLayout layout = PatternLayout.newBuilder().withPattern(regexPattern) - .withConfiguration(ctx.getConfiguration()).build(); + final PatternLayout layout = PatternLayout.newBuilder().setPattern(regexPattern) + .setConfiguration(ctx.getConfiguration()).build(); final LogEvent event = Log4jLogEvent.newBuilder() // .setLoggerName(this.getClass().getName()).setLoggerFqcn("org.apache.logging.log4j.core.Logger") // .setLevel(Level.INFO) // @@ -283,8 +283,8 @@ public class PatternLayoutTest { @Test public void testRegexEmptyMarker() throws Exception { // replace "[]" with the empty string - final PatternLayout layout = PatternLayout.newBuilder().withPattern("[%logger]%replace{[%marker]}{\\[\\]}{} %msg") - .withConfiguration(ctx.getConfiguration()).build(); + final PatternLayout layout = PatternLayout.newBuilder().setPattern("[%logger]%replace{[%marker]}{\\[\\]}{} %msg") + .setConfiguration(ctx.getConfiguration()).build(); // Not empty marker final LogEvent event1 = Log4jLogEvent.newBuilder() // .setLoggerName(this.getClass().getName()).setLoggerFqcn("org.apache.logging.log4j.core.Logger") // @@ -308,8 +308,8 @@ public class PatternLayoutTest { @Test public void testEqualsMarkerWithMessageSubstitution() throws Exception { // replace "[]" with the empty string - final PatternLayout layout = PatternLayout.newBuilder().withPattern("[%logger]%equals{[%marker]}{[]}{[%msg]}") - .withConfiguration(ctx.getConfiguration()).build(); + final PatternLayout layout = PatternLayout.newBuilder().setPattern("[%logger]%equals{[%marker]}{[]}{[%msg]}") + .setConfiguration(ctx.getConfiguration()).build(); // Not empty marker final LogEvent event1 = Log4jLogEvent.newBuilder() // .setLoggerName(this.getClass().getName()).setLoggerFqcn("org.apache.logging.log4j.core.Logger") // @@ -329,8 +329,8 @@ public class PatternLayoutTest { @Test public void testSpecialChars() throws Exception { - final PatternLayout layout = PatternLayout.newBuilder().withPattern("\\\\%level\\t%msg\\n\\t%logger\\r\\n\\f") - .withConfiguration(ctx.getConfiguration()).build(); + final PatternLayout layout = PatternLayout.newBuilder().setPattern("\\\\%level\\t%msg\\n\\t%logger\\r\\n\\f") + .setConfiguration(ctx.getConfiguration()).build(); final LogEvent event = Log4jLogEvent.newBuilder() // .setLoggerName(this.getClass().getName()).setLoggerFqcn("org.apache.logging.log4j.core.Logger") // .setLevel(Level.INFO) // @@ -345,8 +345,8 @@ public class PatternLayoutTest { @Test public void testUnixTime() throws Exception { - final PatternLayout layout = PatternLayout.newBuilder().withPattern("%d{UNIX} %m") - .withConfiguration(ctx.getConfiguration()).build(); + final PatternLayout layout = PatternLayout.newBuilder().setPattern("%d{UNIX} %m") + .setConfiguration(ctx.getConfiguration()).build(); final LogEvent event1 = Log4jLogEvent.newBuilder() // .setLoggerName(this.getClass().getName()).setLoggerFqcn("org.apache.logging.log4j.core.Logger") // .setLevel(Level.INFO) // @@ -365,8 +365,8 @@ public class PatternLayoutTest { @SuppressWarnings("unused") private void testUnixTime(final String pattern) throws Exception { - final PatternLayout layout = PatternLayout.newBuilder().withPattern(pattern + " %m") - .withConfiguration(ctx.getConfiguration()).build(); + final PatternLayout layout = PatternLayout.newBuilder().setPattern(pattern + " %m") + .setConfiguration(ctx.getConfiguration()).build(); final LogEvent event1 = Log4jLogEvent.newBuilder() // .setLoggerName(this.getClass().getName()).setLoggerFqcn("org.apache.logging.log4j.core.Logger") // .setLevel(Level.INFO) // @@ -385,8 +385,8 @@ public class PatternLayoutTest { @Test public void testUnixTimeMillis() throws Exception { - final PatternLayout layout = PatternLayout.newBuilder().withPattern("%d{UNIX_MILLIS} %m") - .withConfiguration(ctx.getConfiguration()).build(); + final PatternLayout layout = PatternLayout.newBuilder().setPattern("%d{UNIX_MILLIS} %m") + .setConfiguration(ctx.getConfiguration()).build(); final LogEvent event1 = Log4jLogEvent.newBuilder() // .setLoggerName(this.getClass().getName()).setLoggerFqcn("org.apache.logging.log4j.core.Logger") // .setLevel(Level.INFO) // @@ -405,23 +405,23 @@ public class PatternLayoutTest { @Test public void testUsePlatformDefaultIfNoCharset() throws Exception { - final PatternLayout layout = PatternLayout.newBuilder().withPattern("%m") - .withConfiguration(ctx.getConfiguration()).build(); + final PatternLayout layout = PatternLayout.newBuilder().setPattern("%m") + .setConfiguration(ctx.getConfiguration()).build(); assertEquals(Charset.defaultCharset(), layout.getCharset()); } @Test public void testUseSpecifiedCharsetIfExists() throws Exception { - final PatternLayout layout = PatternLayout.newBuilder().withPattern("%m") - .withConfiguration(ctx.getConfiguration()).withCharset(StandardCharsets.UTF_8).build(); + final PatternLayout layout = PatternLayout.newBuilder().setPattern("%m") + .setConfiguration(ctx.getConfiguration()).setCharset(StandardCharsets.UTF_8).build(); assertEquals(StandardCharsets.UTF_8, layout.getCharset()); } @Test public void testLoggerNameTruncationByRetainingPartsFromEnd() throws Exception { { - final PatternLayout layout = PatternLayout.newBuilder().withPattern("%c{1} %m") - .withConfiguration(ctx.getConfiguration()).build(); + final PatternLayout layout = PatternLayout.newBuilder().setPattern("%c{1} %m") + .setConfiguration(ctx.getConfiguration()).build(); final LogEvent event1 = Log4jLogEvent.newBuilder() .setLoggerName(this.getClass().getName()).setLoggerFqcn("org.apache.logging.log4j.core.Logger") .setLevel(Level.INFO) @@ -430,8 +430,8 @@ public class PatternLayoutTest { assertEquals(this.getClass().getName().substring(this.getClass().getName().lastIndexOf(".") + 1) + " Hello, world 1!", new String(result1)); } { - final PatternLayout layout = PatternLayout.newBuilder().withPattern("%c{2} %m") - .withConfiguration(ctx.getConfiguration()).build(); + final PatternLayout layout = PatternLayout.newBuilder().setPattern("%c{2} %m") + .setConfiguration(ctx.getConfiguration()).build(); final LogEvent event1 = Log4jLogEvent.newBuilder() .setLoggerName(this.getClass().getName()).setLoggerFqcn("org.apache.logging.log4j.core.Logger") .setLevel(Level.INFO) @@ -442,8 +442,8 @@ public class PatternLayoutTest { assertEquals(this.getClass().getName().substring(name.length() + 1) + " Hello, world 1!", new String(result1)); } { - final PatternLayout layout = PatternLayout.newBuilder().withPattern("%c{20} %m") - .withConfiguration(ctx.getConfiguration()).build(); + final PatternLayout layout = PatternLayout.newBuilder().setPattern("%c{20} %m") + .setConfiguration(ctx.getConfiguration()).build(); final LogEvent event1 = Log4jLogEvent.newBuilder() .setLoggerName(this.getClass().getName()).setLoggerFqcn("org.apache.logging.log4j.core.Logger") .setLevel(Level.INFO) @@ -456,8 +456,8 @@ public class PatternLayoutTest { @Test public void testCallersFqcnTruncationByRetainingPartsFromEnd() throws Exception { { - final PatternLayout layout = PatternLayout.newBuilder().withPattern("%C{1} %m") - .withConfiguration(ctx.getConfiguration()).build(); + final PatternLayout layout = PatternLayout.newBuilder().setPattern("%C{1} %m") + .setConfiguration(ctx.getConfiguration()).build(); final LogEvent event1 = Log4jLogEvent.newBuilder() .setLoggerName(this.getClass().getName()).setLoggerFqcn("org.apache.logging.log4j.core.Logger") .setLevel(Level.INFO) @@ -468,8 +468,8 @@ public class PatternLayoutTest { assertEquals(this.getClass().getName().substring(this.getClass().getName().lastIndexOf(".") + 1) + " Hello, world 1!", new String(result1)); } { - final PatternLayout layout = PatternLayout.newBuilder().withPattern("%C{2} %m") - .withConfiguration(ctx.getConfiguration()).build(); + final PatternLayout layout = PatternLayout.newBuilder().setPattern("%C{2} %m") + .setConfiguration(ctx.getConfiguration()).build(); final LogEvent event1 = Log4jLogEvent.newBuilder() .setLoggerName(this.getClass().getName()).setLoggerFqcn("org.apache.logging.log4j.core.Logger") .setLevel(Level.INFO) @@ -482,8 +482,8 @@ public class PatternLayoutTest { assertEquals(this.getClass().getName().substring(name.length() + 1) + " Hello, world 1!", new String(result1)); } { - final PatternLayout layout = PatternLayout.newBuilder().withPattern("%C{20} %m") - .withConfiguration(ctx.getConfiguration()).build(); + final PatternLayout layout = PatternLayout.newBuilder().setPattern("%C{20} %m") + .setConfiguration(ctx.getConfiguration()).build(); final LogEvent event1 = Log4jLogEvent.newBuilder() .setLoggerName(this.getClass().getName()).setLoggerFqcn("org.apache.logging.log4j.core.Logger") .setLevel(Level.INFO) @@ -494,8 +494,8 @@ public class PatternLayoutTest { assertEquals(this.getClass().getName() + " Hello, world 1!", new String(result1)); } { - final PatternLayout layout = PatternLayout.newBuilder().withPattern("%class{1} %m") - .withConfiguration(ctx.getConfiguration()).build(); + final PatternLayout layout = PatternLayout.newBuilder().setPattern("%class{1} %m") + .setConfiguration(ctx.getConfiguration()).build(); final LogEvent event1 = Log4jLogEvent.newBuilder() .setLoggerName(this.getClass().getName()).setLoggerFqcn("org.apache.logging.log4j.core.Logger") .setLevel(Level.INFO) @@ -510,8 +510,8 @@ public class PatternLayoutTest { @Test public void testLoggerNameTruncationByDroppingPartsFromFront() throws Exception { { - final PatternLayout layout = PatternLayout.newBuilder().withPattern("%c{-1} %m") - .withConfiguration(ctx.getConfiguration()).build(); + final PatternLayout layout = PatternLayout.newBuilder().setPattern("%c{-1} %m") + .setConfiguration(ctx.getConfiguration()).build(); final LogEvent event1 = Log4jLogEvent.newBuilder() .setLoggerName(this.getClass().getName()).setLoggerFqcn("org.apache.logging.log4j.core.Logger") .setLevel(Level.INFO) @@ -521,8 +521,8 @@ public class PatternLayoutTest { assertEquals(name + " Hello, world 1!", new String(result1)); } { - final PatternLayout layout = PatternLayout.newBuilder().withPattern("%c{-3} %m") - .withConfiguration(ctx.getConfiguration()).build(); + final PatternLayout layout = PatternLayout.newBuilder().setPattern("%c{-3} %m") + .setConfiguration(ctx.getConfiguration()).build(); final LogEvent event1 = Log4jLogEvent.newBuilder() .setLoggerName(this.getClass().getName()).setLoggerFqcn("org.apache.logging.log4j.core.Logger") .setLevel(Level.INFO) @@ -534,8 +534,8 @@ public class PatternLayoutTest { assertEquals(name + " Hello, world 1!", new String(result1)); } { - final PatternLayout layout = PatternLayout.newBuilder().withPattern("%logger{-3} %m") - .withConfiguration(ctx.getConfiguration()).build(); + final PatternLayout layout = PatternLayout.newBuilder().setPattern("%logger{-3} %m") + .setConfiguration(ctx.getConfiguration()).build(); final LogEvent event1 = Log4jLogEvent.newBuilder() .setLoggerName(this.getClass().getName()).setLoggerFqcn("org.apache.logging.log4j.core.Logger") .setLevel(Level.INFO) @@ -547,8 +547,8 @@ public class PatternLayoutTest { assertEquals(name + " Hello, world 1!", new String(result1)); } { - final PatternLayout layout = PatternLayout.newBuilder().withPattern("%c{-20} %m") - .withConfiguration(ctx.getConfiguration()).build(); + final PatternLayout layout = PatternLayout.newBuilder().setPattern("%c{-20} %m") + .setConfiguration(ctx.getConfiguration()).build(); final LogEvent event1 = Log4jLogEvent.newBuilder() .setLoggerName(this.getClass().getName()).setLoggerFqcn("org.apache.logging.log4j.core.Logger") .setLevel(Level.INFO) @@ -562,8 +562,8 @@ public class PatternLayoutTest { @Test public void testCallersFqcnTruncationByDroppingPartsFromFront() throws Exception { { - final PatternLayout layout = PatternLayout.newBuilder().withPattern("%C{-1} %m") - .withConfiguration(ctx.getConfiguration()).build(); + final PatternLayout layout = PatternLayout.newBuilder().setPattern("%C{-1} %m") + .setConfiguration(ctx.getConfiguration()).build(); final LogEvent event1 = Log4jLogEvent.newBuilder() .setLoggerName(this.getClass().getName()).setLoggerFqcn("org.apache.logging.log4j.core.Logger") .setLevel(Level.INFO) @@ -575,8 +575,8 @@ public class PatternLayoutTest { assertEquals(name + " Hello, world 1!", new String(result1)); } { - final PatternLayout layout = PatternLayout.newBuilder().withPattern("%C{-3} %m") - .withConfiguration(ctx.getConfiguration()).build(); + final PatternLayout layout = PatternLayout.newBuilder().setPattern("%C{-3} %m") + .setConfiguration(ctx.getConfiguration()).build(); final LogEvent event1 = Log4jLogEvent.newBuilder() .setLoggerName(this.getClass().getName()).setLoggerFqcn("org.apache.logging.log4j.core.Logger") .setLevel(Level.INFO) @@ -590,8 +590,8 @@ public class PatternLayoutTest { assertEquals(name + " Hello, world 1!", new String(result1)); } { - final PatternLayout layout = PatternLayout.newBuilder().withPattern("%class{-3} %m") - .withConfiguration(ctx.getConfiguration()).build(); + final PatternLayout layout = PatternLayout.newBuilder().setPattern("%class{-3} %m") + .setConfiguration(ctx.getConfiguration()).build(); final LogEvent event1 = Log4jLogEvent.newBuilder() .setLoggerName(this.getClass().getName()).setLoggerFqcn("org.apache.logging.log4j.core.Logger") .setLevel(Level.INFO) @@ -605,8 +605,8 @@ public class PatternLayoutTest { assertEquals(name + " Hello, world 1!", new String(result1)); } { - final PatternLayout layout = PatternLayout.newBuilder().withPattern("%C{-20} %m") - .withConfiguration(ctx.getConfiguration()).build(); + final PatternLayout layout = PatternLayout.newBuilder().setPattern("%C{-20} %m") + .setConfiguration(ctx.getConfiguration()).build(); final LogEvent event1 = Log4jLogEvent.newBuilder() .setLoggerName(this.getClass().getName()).setLoggerFqcn("org.apache.logging.log4j.core.Logger") .setLevel(Level.INFO) http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/4a610a18/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/PatternSelectorTest.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/PatternSelectorTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/PatternSelectorTest.java index 152c605..f9e59a0 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/PatternSelectorTest.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/PatternSelectorTest.java @@ -42,8 +42,8 @@ public class PatternSelectorTest { final PatternMatch[] patterns = new PatternMatch[1]; patterns[0] = new PatternMatch("FLOW", "%d %-5p [%t]: ====== %C{1}.%M:%L %m ======%n"); final PatternSelector selector = MarkerPatternSelector.createSelector(patterns, "%d %-5p [%t]: %m%n", true, true, ctx.getConfiguration()); - final PatternLayout layout = PatternLayout.newBuilder().withPatternSelector(selector) - .withConfiguration(ctx.getConfiguration()).build(); + final PatternLayout layout = PatternLayout.newBuilder().setPatternSelector(selector) + .setConfiguration(ctx.getConfiguration()).build(); final LogEvent event1 = Log4jLogEvent.newBuilder() // .setLoggerName(this.getClass().getName()).setLoggerFqcn("org.apache.logging.log4j.core.layout.PatternSelectorTest$FauxLogger") .setMarker(MarkerManager.getMarker("FLOW")) http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/4a610a18/log4j-jdbc/src/main/java/org/apache/logging/log4j/jdbc/appender/ColumnConfig.java ---------------------------------------------------------------------- diff --git a/log4j-jdbc/src/main/java/org/apache/logging/log4j/jdbc/appender/ColumnConfig.java b/log4j-jdbc/src/main/java/org/apache/logging/log4j/jdbc/appender/ColumnConfig.java index 6d1e2ca..424020a 100644 --- a/log4j-jdbc/src/main/java/org/apache/logging/log4j/jdbc/appender/ColumnConfig.java +++ b/log4j-jdbc/src/main/java/org/apache/logging/log4j/jdbc/appender/ColumnConfig.java @@ -244,9 +244,9 @@ public final class ColumnConfig { if (isPattern) { final PatternLayout layout = PatternLayout.newBuilder() - .withPattern(pattern) - .withConfiguration(configuration) - .withAlwaysWriteExceptions(false) + .setPattern(pattern) + .setConfiguration(configuration) + .setAlwaysWriteExceptions(false) .build(); return new ColumnConfig(name, layout, null, false, isUnicode, isClob); } http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/4a610a18/log4j-jdbc/src/main/java/org/apache/logging/log4j/jdbc/appender/JdbcAppender.java ---------------------------------------------------------------------- diff --git a/log4j-jdbc/src/main/java/org/apache/logging/log4j/jdbc/appender/JdbcAppender.java b/log4j-jdbc/src/main/java/org/apache/logging/log4j/jdbc/appender/JdbcAppender.java index 0cc2f2a..418af37 100644 --- a/log4j-jdbc/src/main/java/org/apache/logging/log4j/jdbc/appender/JdbcAppender.java +++ b/log4j-jdbc/src/main/java/org/apache/logging/log4j/jdbc/appender/JdbcAppender.java @@ -90,8 +90,8 @@ public final class JdbcAppender extends AbstractDatabaseAppender<JdbcDatabaseMan .setColumnConfigs(columnConfigs) .setConnectionSource(connectionSource) .setTableName(tableName) - .withName(name) - .withIgnoreExceptions(ignoreExceptions).setFilter(filter) + .setName(name) + .setIgnoreExceptions(ignoreExceptions).setFilter(filter) .build(); } http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/4a610a18/log4j-perf/src/main/java/org/apache/logging/log4j/perf/nogc/ClassicLogger.java ---------------------------------------------------------------------- diff --git a/log4j-perf/src/main/java/org/apache/logging/log4j/perf/nogc/ClassicLogger.java b/log4j-perf/src/main/java/org/apache/logging/log4j/perf/nogc/ClassicLogger.java index 97fd24e..a05cfdd 100644 --- a/log4j-perf/src/main/java/org/apache/logging/log4j/perf/nogc/ClassicLogger.java +++ b/log4j-perf/src/main/java/org/apache/logging/log4j/perf/nogc/ClassicLogger.java @@ -29,7 +29,7 @@ public class ClassicLogger extends AbstractLogger { @Override protected StringLayout createLayout() { - return PatternLayout.newBuilder().withCharset(StandardCharsets.UTF_8).withPattern("%m").build(); + return PatternLayout.newBuilder().setCharset(StandardCharsets.UTF_8).setPattern("%m").build(); } public void log(final String message, final Object... params) { http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/4a610a18/log4j-samples/log4j-samples-configuration/src/main/java/org/apache/logging/log4j/configuration/CustomConfiguration.java ---------------------------------------------------------------------- diff --git a/log4j-samples/log4j-samples-configuration/src/main/java/org/apache/logging/log4j/configuration/CustomConfiguration.java b/log4j-samples/log4j-samples-configuration/src/main/java/org/apache/logging/log4j/configuration/CustomConfiguration.java index 6e3bddb..1e80d77 100644 --- a/log4j-samples/log4j-samples-configuration/src/main/java/org/apache/logging/log4j/configuration/CustomConfiguration.java +++ b/log4j-samples/log4j-samples-configuration/src/main/java/org/apache/logging/log4j/configuration/CustomConfiguration.java @@ -63,8 +63,8 @@ public class CustomConfiguration extends AbstractConfiguration { setName(CONFIG_NAME); final Layout<? extends Serializable> layout = PatternLayout.newBuilder() - .withPattern(DEFAULT_PATTERN) - .withConfiguration(this) + .setPattern(DEFAULT_PATTERN) + .setConfiguration(this) .build(); final Appender appender = ConsoleAppender.createDefaultAppenderForLayout(layout); appender.start(); http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/4a610a18/log4j-web/src/main/java/org/apache/logging/log4j/web/appender/ServletAppender.java ---------------------------------------------------------------------- diff --git a/log4j-web/src/main/java/org/apache/logging/log4j/web/appender/ServletAppender.java b/log4j-web/src/main/java/org/apache/logging/log4j/web/appender/ServletAppender.java index 6dace71..180a6bf 100644 --- a/log4j-web/src/main/java/org/apache/logging/log4j/web/appender/ServletAppender.java +++ b/log4j-web/src/main/java/org/apache/logging/log4j/web/appender/ServletAppender.java @@ -122,9 +122,9 @@ public class ServletAppender extends AbstractAppender { final String name, final boolean ignoreExceptions) { // @formatter:off return newBuilder().setFilter(filter) - .withIgnoreExceptions(ignoreExceptions) - .withLayout(layout) - .withName(name) + .setIgnoreExceptions(ignoreExceptions) + .setLayout(layout) + .setName(name) .build(); // @formatter:on } http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/4a610a18/src/changes/changes.xml ---------------------------------------------------------------------- diff --git a/src/changes/changes.xml b/src/changes/changes.xml index 278e605..887e34b 100644 --- a/src/changes/changes.xml +++ b/src/changes/changes.xml @@ -302,6 +302,9 @@ <action issue="LOG4J2-2491" dev="ggregory" type="update"> Allow all Appenders to optionally carry a Property array. </action> + <action issue="LOG4J2-2492" dev="ggregory" type="update"> + Update builder methods from the "with" prefix to the "set" prefix. + </action> </release> <release version="2.11.2" date="2018-MM-DD" description="GA Release 2.11.2"> <action issue="LOG4J2-2391" dev="ckozak" type="update">
