Do not use CharSequenceFormattable for (Reusable)ObjectMessage
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/149da7f8 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/149da7f8 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/149da7f8 Branch: refs/heads/master Commit: 149da7f8d05b3d400a30447aa15c0858c7aea12c Parents: 8b59f23 Author: Mikael Ståldal <[email protected]> Authored: Thu Apr 14 10:49:17 2016 +0200 Committer: Mikael Ståldal <[email protected]> Committed: Thu Apr 14 10:49:17 2016 +0200 ---------------------------------------------------------------------- .../apache/logging/log4j/message/ObjectMessage.java | 12 +----------- .../apache/logging/log4j/message/ReusableMessage.java | 3 +-- .../logging/log4j/message/ReusableObjectMessage.java | 9 --------- .../log4j/message/ReusableParameterizedMessage.java | 3 ++- .../logging/log4j/message/ReusableSimpleMessage.java | 3 ++- .../logging/log4j/message/ThreadDumpMessage.java | 13 +------------ .../logging/log4j/core/async/RingBufferLogEvent.java | 3 ++- 7 files changed, 9 insertions(+), 37 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/149da7f8/log4j-api/src/main/java/org/apache/logging/log4j/message/ObjectMessage.java ---------------------------------------------------------------------- diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/message/ObjectMessage.java b/log4j-api/src/main/java/org/apache/logging/log4j/message/ObjectMessage.java index 11e2731..eaeb445 100644 --- a/log4j-api/src/main/java/org/apache/logging/log4j/message/ObjectMessage.java +++ b/log4j-api/src/main/java/org/apache/logging/log4j/message/ObjectMessage.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.io.IOException; @@ -27,7 +26,7 @@ import java.io.Serializable; /** * Handles messages that contain an Object. */ -public class ObjectMessage implements Message, StringBuilderFormattable, CharSequenceFormattable { +public class ObjectMessage implements Message, StringBuilderFormattable { private static final long serialVersionUID = -5903272448334166185L; @@ -70,15 +69,6 @@ public class ObjectMessage implements Message, StringBuilderFormattable, CharSeq } } - @Override - public CharSequence getFormattedCharSequence() { - if (obj instanceof CharSequence) { - return (CharSequence) obj; - } else { - return getFormattedMessage(); - } - } - /** * Returns the object formatted using its toString method. * http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/149da7f8/log4j-api/src/main/java/org/apache/logging/log4j/message/ReusableMessage.java ---------------------------------------------------------------------- diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/message/ReusableMessage.java b/log4j-api/src/main/java/org/apache/logging/log4j/message/ReusableMessage.java index ad1fc6d..a6da9c4 100644 --- a/log4j-api/src/main/java/org/apache/logging/log4j/message/ReusableMessage.java +++ b/log4j-api/src/main/java/org/apache/logging/log4j/message/ReusableMessage.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 org.apache.logging.log4j.util.StringBuilderFormattable; @@ -30,5 +29,5 @@ import org.apache.logging.log4j.util.StringBuilderFormattable; * @since 2.6 */ @PerformanceSensitive("allocation") -public interface ReusableMessage extends Message, StringBuilderFormattable, CharSequenceFormattable { +public interface ReusableMessage extends Message, StringBuilderFormattable { } http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/149da7f8/log4j-api/src/main/java/org/apache/logging/log4j/message/ReusableObjectMessage.java ---------------------------------------------------------------------- diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/message/ReusableObjectMessage.java b/log4j-api/src/main/java/org/apache/logging/log4j/message/ReusableObjectMessage.java index d40bb00..12f62f4 100644 --- a/log4j-api/src/main/java/org/apache/logging/log4j/message/ReusableObjectMessage.java +++ b/log4j-api/src/main/java/org/apache/logging/log4j/message/ReusableObjectMessage.java @@ -57,15 +57,6 @@ public class ReusableObjectMessage implements ReusableMessage { } } - @Override - public CharSequence getFormattedCharSequence() { - if (obj instanceof CharSequence) { - return (CharSequence) obj; - } else { - return getFormattedMessage(); - } - } - /** * Returns the object formatted using its toString method. * http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/149da7f8/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 bd084e0..c4c15d5 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,6 +16,7 @@ */ package org.apache.logging.log4j.message; +import org.apache.logging.log4j.util.CharSequenceFormattable; import org.apache.logging.log4j.util.PerformanceSensitive; import java.util.Arrays; @@ -28,7 +29,7 @@ import java.util.Arrays; * @since 2.6 */ @PerformanceSensitive("allocation") -public class ReusableParameterizedMessage implements ReusableMessage { +public class ReusableParameterizedMessage implements ReusableMessage, CharSequenceFormattable { private static final long serialVersionUID = 7800075879295123856L; private static ThreadLocal<StringBuilder> buffer = new ThreadLocal<>(); http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/149da7f8/log4j-api/src/main/java/org/apache/logging/log4j/message/ReusableSimpleMessage.java ---------------------------------------------------------------------- diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/message/ReusableSimpleMessage.java b/log4j-api/src/main/java/org/apache/logging/log4j/message/ReusableSimpleMessage.java index 68bf7ba..2dd46d2 100644 --- a/log4j-api/src/main/java/org/apache/logging/log4j/message/ReusableSimpleMessage.java +++ b/log4j-api/src/main/java/org/apache/logging/log4j/message/ReusableSimpleMessage.java @@ -16,6 +16,7 @@ */ package org.apache.logging.log4j.message; +import org.apache.logging.log4j.util.CharSequenceFormattable; import org.apache.logging.log4j.util.PerformanceSensitive; /** @@ -23,7 +24,7 @@ import org.apache.logging.log4j.util.PerformanceSensitive; * @since 2.6 */ @PerformanceSensitive("allocation") -public class ReusableSimpleMessage implements ReusableMessage { +public class ReusableSimpleMessage implements ReusableMessage, CharSequenceFormattable { private static final long serialVersionUID = -9199974506498249809L; private static Object[] EMPTY_PARAMS = new Object[0]; private CharSequence charSequence; http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/149da7f8/log4j-api/src/main/java/org/apache/logging/log4j/message/ThreadDumpMessage.java ---------------------------------------------------------------------- diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/message/ThreadDumpMessage.java b/log4j-api/src/main/java/org/apache/logging/log4j/message/ThreadDumpMessage.java index 2a9b193..3907443 100644 --- a/log4j-api/src/main/java/org/apache/logging/log4j/message/ThreadDumpMessage.java +++ b/log4j-api/src/main/java/org/apache/logging/log4j/message/ThreadDumpMessage.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 org.apache.logging.log4j.util.Strings; @@ -33,7 +32,7 @@ import java.util.Map; /** * Captures information about all running Threads. */ -public class ThreadDumpMessage implements Message, StringBuilderFormattable, CharSequenceFormattable { +public class ThreadDumpMessage implements Message, StringBuilderFormattable { private static final long serialVersionUID = -1103400781608841088L; @@ -104,16 +103,6 @@ public class ThreadDumpMessage implements Message, StringBuilderFormattable, Cha } } - @Override - public CharSequence getFormattedCharSequence() { - if (formattedMessage != null) { - return formattedMessage; - } - final StringBuilder sb = new StringBuilder(255); - formatTo(sb); - return sb; - } - /** * Returns the title. * @return the title. http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/149da7f8/log4j-core/src/main/java/org/apache/logging/log4j/core/async/RingBufferLogEvent.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/async/RingBufferLogEvent.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/async/RingBufferLogEvent.java index 2b79e1b..873efc6 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/async/RingBufferLogEvent.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/async/RingBufferLogEvent.java @@ -30,6 +30,7 @@ import org.apache.logging.log4j.message.Message; import org.apache.logging.log4j.message.ReusableMessage; import org.apache.logging.log4j.message.SimpleMessage; import org.apache.logging.log4j.message.TimestampMessage; +import org.apache.logging.log4j.util.CharSequenceFormattable; import org.apache.logging.log4j.util.PropertiesUtil; import org.apache.logging.log4j.util.Strings; @@ -41,7 +42,7 @@ import java.util.Map; * When the Disruptor is started, the RingBuffer is populated with event objects. These objects are then re-used during * the life of the RingBuffer. */ -public class RingBufferLogEvent implements LogEvent, ReusableMessage { +public class RingBufferLogEvent implements LogEvent, ReusableMessage, CharSequenceFormattable { /** The {@code EventFactory} for {@code RingBufferLogEvent}s. */ public static final Factory FACTORY = new Factory();
