Repository: logging-log4j-tools Updated Branches: refs/heads/master 7bbfce708 -> cb615be7b
[LOG4J2-2493] Remove deprecated code. Still a bit more to do. Project: http://git-wip-us.apache.org/repos/asf/logging-log4j-tools/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j-tools/commit/cb615be7 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j-tools/tree/cb615be7 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j-tools/diff/cb615be7 Branch: refs/heads/master Commit: cb615be7bcb9088411c47e9a739a6cbd45bc78dd Parents: 7bbfce7 Author: Gary Gregory <[email protected]> Authored: Mon Oct 29 17:36:03 2018 -0600 Committer: Gary Gregory <[email protected]> Committed: Mon Oct 29 17:36:03 2018 -0600 ---------------------------------------------------------------------- .../log4j/server/AbstractSocketServerTest.java | 21 ++++++++++---------- .../log4j/server/SslXmlSocketServerTest.java | 21 ++++++++++---------- 2 files changed, 20 insertions(+), 22 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j-tools/blob/cb615be7/log4j-server/src/test/java/org/apache/logging/log4j/server/AbstractSocketServerTest.java ---------------------------------------------------------------------- diff --git a/log4j-server/src/test/java/org/apache/logging/log4j/server/AbstractSocketServerTest.java b/log4j-server/src/test/java/org/apache/logging/log4j/server/AbstractSocketServerTest.java index 0b5fd2d..2e2c0d0 100644 --- a/log4j-server/src/test/java/org/apache/logging/log4j/server/AbstractSocketServerTest.java +++ b/log4j-server/src/test/java/org/apache/logging/log4j/server/AbstractSocketServerTest.java @@ -190,7 +190,7 @@ public abstract class AbstractSocketServerTest { socketAppender.start(); final ListAppender listAppender = new ListAppender("Events", serverFilter, null, false, false); listAppender.start(); - final PatternLayout layout = PatternLayout.newBuilder().withPattern("%m %ex%n").build(); + final PatternLayout layout = PatternLayout.newBuilder().setPattern("%m %ex%n").build(); final ConsoleAppender console = ConsoleAppender.createDefaultAppenderForLayout(layout); final Logger serverLogger = ctx.getLogger(this.getClass().getName()); serverLogger.addAppender(console); @@ -229,16 +229,15 @@ public abstract class AbstractSocketServerTest { final Layout<? extends Serializable> socketLayout) { // @formatter:off return SocketAppender.newBuilder() - .withProtocol(this.protocol) - .withHost("localhost") - .withPort(this.port) - .withReconnectDelayMillis(-1) - .withName("test") - .withImmediateFlush(true) - .withImmediateFail(false) - .withIgnoreExceptions(false) - .withLayout(socketLayout) - .withFilter(socketFilter) + .setProtocol(this.protocol) + .setHost("localhost") + .setPort(this.port) + .setReconnectDelayMillis(-1) + .setName("test") + .setImmediateFlush(true) + .setImmediateFail(false) + .setIgnoreExceptions(false) + .setLayout(socketLayout).setFilter(socketFilter) .build(); // @formatter:on } http://git-wip-us.apache.org/repos/asf/logging-log4j-tools/blob/cb615be7/log4j-server/src/test/java/org/apache/logging/log4j/server/SslXmlSocketServerTest.java ---------------------------------------------------------------------- diff --git a/log4j-server/src/test/java/org/apache/logging/log4j/server/SslXmlSocketServerTest.java b/log4j-server/src/test/java/org/apache/logging/log4j/server/SslXmlSocketServerTest.java index 42a9e9e..6d08723 100644 --- a/log4j-server/src/test/java/org/apache/logging/log4j/server/SslXmlSocketServerTest.java +++ b/log4j-server/src/test/java/org/apache/logging/log4j/server/SslXmlSocketServerTest.java @@ -53,17 +53,16 @@ public class SslXmlSocketServerTest extends AbstractSocketServerTest { final Layout<? extends Serializable> socketLayout) { // @formatter:off return SocketAppender.newBuilder() - .withProtocol(this.protocol) - .withHost("localhost") - .withPort(this.port) - .withReconnectDelayMillis(-1) - .withName("test") - .withImmediateFlush(true) - .withImmediateFail(false) - .withIgnoreExceptions(false) - .withLayout(socketLayout) - .withFilter(socketFilter) - .withSslConfiguration(sslConfiguration) + .setProtocol(this.protocol) + .setHost("localhost") + .setPort(this.port) + .setReconnectDelayMillis(-1) + .setName("test") + .setImmediateFlush(true) + .setImmediateFail(false) + .setIgnoreExceptions(false) + .setLayout(socketLayout).setFilter(socketFilter) + .setSslConfiguration(sslConfiguration) .build(); // @formatter:on }
