Remove CharSequenceFormattable from ParameterizedMessages
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/299f488d Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/299f488d Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/299f488d Branch: refs/heads/master Commit: 299f488dceb9035892e5f4a3d68cf5c1a801dcee Parents: 0ec82b7 Author: Mikael Ståldal <[email protected]> Authored: Fri Apr 15 14:48:07 2016 +0200 Committer: Mikael Ståldal <[email protected]> Committed: Fri Apr 15 14:48:07 2016 +0200 ---------------------------------------------------------------------- .../logging/log4j/message/ParameterizedMessage.java | 14 +------------- .../log4j/message/ReusableParameterizedMessage.java | 10 +--------- 2 files changed, 2 insertions(+), 22 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/299f488d/log4j-api/src/main/java/org/apache/logging/log4j/message/ParameterizedMessage.java ---------------------------------------------------------------------- diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/message/ParameterizedMessage.java b/log4j-api/src/main/java/org/apache/logging/log4j/message/ParameterizedMessage.java index 4e8648e..1747102 100644 --- a/log4j-api/src/main/java/org/apache/logging/log4j/message/ParameterizedMessage.java +++ b/log4j-api/src/main/java/org/apache/logging/log4j/message/ParameterizedMessage.java @@ -16,7 +16,6 @@ */ package org.apache.logging.log4j.message; -import org.apache.logging.log4j.util.CharSequenceFormattable; import org.apache.logging.log4j.util.StringBuilderFormattable; import java.util.Arrays; @@ -29,7 +28,7 @@ import java.util.Arrays; * licensed under the LGPL. It has been relicensed here with his permission providing that this attribution remain. * </p> */ -public class ParameterizedMessage implements Message, StringBuilderFormattable, CharSequenceFormattable { +public class ParameterizedMessage implements Message, StringBuilderFormattable { /** * Prefix for recursion. */ @@ -220,17 +219,6 @@ public class ParameterizedMessage implements Message, StringBuilderFormattable, } } - @Override - public CharSequence getFormattedCharSequence() { - if (formattedMessage != null) { - return formattedMessage; - } else { - final StringBuilder buffer = getThreadLocalStringBuilder(); - formatTo(buffer); - return buffer; - } - } - /** * Replace placeholders in the given messagePattern with arguments. * http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/299f488d/log4j-api/src/main/java/org/apache/logging/log4j/message/ReusableParameterizedMessage.java ---------------------------------------------------------------------- diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/message/ReusableParameterizedMessage.java b/log4j-api/src/main/java/org/apache/logging/log4j/message/ReusableParameterizedMessage.java index c4c15d5..22b0b15 100644 --- a/log4j-api/src/main/java/org/apache/logging/log4j/message/ReusableParameterizedMessage.java +++ b/log4j-api/src/main/java/org/apache/logging/log4j/message/ReusableParameterizedMessage.java @@ -16,7 +16,6 @@ */ package org.apache.logging.log4j.message; -import org.apache.logging.log4j.util.CharSequenceFormattable; import org.apache.logging.log4j.util.PerformanceSensitive; import java.util.Arrays; @@ -29,7 +28,7 @@ import java.util.Arrays; * @since 2.6 */ @PerformanceSensitive("allocation") -public class ReusableParameterizedMessage implements ReusableMessage, CharSequenceFormattable { +public class ReusableParameterizedMessage implements ReusableMessage { private static final long serialVersionUID = 7800075879295123856L; private static ThreadLocal<StringBuilder> buffer = new ThreadLocal<>(); @@ -259,13 +258,6 @@ public class ReusableParameterizedMessage implements ReusableMessage, CharSequen } @Override - public CharSequence getFormattedCharSequence() { - final StringBuilder sb = getBuffer(); - formatTo(sb); - return sb; - } - - @Override public String toString() { return "ReusableParameterizedMessage[messagePattern=" + getFormat() + ", stringArgs=" + Arrays.toString(getParameters()) + ", throwable=" + getThrowable() + ']';
