Repository: logging-log4j2 Updated Branches: refs/heads/master abd2428ab -> 627485627
Sort methods. Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/62748562 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/62748562 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/62748562 Branch: refs/heads/master Commit: 6274856278605ba053f74cf609a31d1fbf9094b4 Parents: abd2428 Author: ggregory <[email protected]> Authored: Sun Feb 14 21:37:23 2016 -0800 Committer: ggregory <[email protected]> Committed: Sun Feb 14 21:37:23 2016 -0800 ---------------------------------------------------------------------- .../logging/log4j/message/FormattedMessage.java | 144 +++++++++---------- 1 file changed, 72 insertions(+), 72 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/62748562/log4j-api/src/main/java/org/apache/logging/log4j/message/FormattedMessage.java ---------------------------------------------------------------------- diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/message/FormattedMessage.java b/log4j-api/src/main/java/org/apache/logging/log4j/message/FormattedMessage.java index 67e38b9..85dbc3c 100644 --- a/log4j-api/src/main/java/org/apache/logging/log4j/message/FormattedMessage.java +++ b/log4j-api/src/main/java/org/apache/logging/log4j/message/FormattedMessage.java @@ -43,27 +43,6 @@ public class FormattedMessage implements Message { private Message message; /** - * Constructs with a pattern, a parameter array, and a throwable. - * @param messagePattern The message pattern. - * @param arguments The parameter. - * @param throwable The throwable - */ - public FormattedMessage(final String messagePattern, final Object[] arguments, final Throwable throwable) { - this.messagePattern = messagePattern; - this.argArray = arguments; - this.throwable = throwable; - } - - /** - * Constructs with a pattern and a parameter array. - * @param messagePattern The message pattern. - * @param arguments The parameter. - */ - public FormattedMessage(final String messagePattern, final Object[] arguments) { - this(messagePattern, arguments, null); - } - - /** * Constructs with a pattern and a single parameter. * @param messagePattern The message pattern. * @param arg The parameter. @@ -82,20 +61,47 @@ public class FormattedMessage implements Message { this(messagePattern, new Object[] { arg1, arg2 }); } + /** + * Constructs with a pattern and a parameter array. + * @param messagePattern The message pattern. + * @param arguments The parameter. + */ + public FormattedMessage(final String messagePattern, final Object[] arguments) { + this(messagePattern, arguments, null); + } /** - * Gets the formatted message. - * @return the formatted message. + * Constructs with a pattern, a parameter array, and a throwable. + * @param messagePattern The message pattern. + * @param arguments The parameter. + * @param throwable The throwable */ + public FormattedMessage(final String messagePattern, final Object[] arguments, final Throwable throwable) { + this.messagePattern = messagePattern; + this.argArray = arguments; + this.throwable = throwable; + } + + @Override - public String getFormattedMessage() { - if (formattedMessage == null) { - if (message == null) { - message = getMessage(messagePattern, argArray, throwable); - } - formattedMessage = message.getFormattedMessage(); + public boolean equals(final Object o) { + if (this == o) { + return true; } - return formattedMessage; + if (o == null || getClass() != o.getClass()) { + return false; + } + + final FormattedMessage that = (FormattedMessage) o; + + if (messagePattern != null ? !messagePattern.equals(that.messagePattern) : that.messagePattern != null) { + return false; + } + if (!Arrays.equals(stringArgs, that.stringArgs)) { + return false; + } + + return true; } /** @@ -108,15 +114,18 @@ public class FormattedMessage implements Message { } /** - * Gets the message parameters. - * @return the message parameters. + * Gets the formatted message. + * @return the formatted message. */ @Override - public Object[] getParameters() { - if (argArray != null) { - return argArray; + public String getFormattedMessage() { + if (formattedMessage == null) { + if (message == null) { + message = getMessage(messagePattern, argArray, throwable); + } + formattedMessage = message.getFormattedMessage(); } - return stringArgs; + return formattedMessage; } protected Message getMessage(final String msgPattern, final Object[] args, final Throwable aThrowable) { @@ -139,27 +148,30 @@ public class FormattedMessage implements Message { return new ParameterizedMessage(msgPattern, args, aThrowable); } + /** + * Gets the message parameters. + * @return the message parameters. + */ @Override - public boolean equals(final Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; + public Object[] getParameters() { + if (argArray != null) { + return argArray; } + return stringArgs; + } - final FormattedMessage that = (FormattedMessage) o; - - if (messagePattern != null ? !messagePattern.equals(that.messagePattern) : that.messagePattern != null) { - return false; + @Override + public Throwable getThrowable() { + if (throwable != null) { + return throwable; } - if (!Arrays.equals(stringArgs, that.stringArgs)) { - return false; + if (message == null) { + message = getMessage(messagePattern, argArray, null); } - - return true; + return message.getThrowable(); } + @Override public int hashCode() { int result = messagePattern != null ? messagePattern.hashCode() : 0; @@ -167,6 +179,16 @@ public class FormattedMessage implements Message { return result; } + private void readObject(final ObjectInputStream in) throws IOException, ClassNotFoundException { + in.defaultReadObject(); + formattedMessage = in.readUTF(); + messagePattern = in.readUTF(); + final int length = in.readInt(); + stringArgs = new String[length]; + for (int i = 0; i < length; ++i) { + stringArgs[i] = in.readUTF(); + } + } @Override public String toString() { @@ -186,26 +208,4 @@ public class FormattedMessage implements Message { ++i; } } - - private void readObject(final ObjectInputStream in) throws IOException, ClassNotFoundException { - in.defaultReadObject(); - formattedMessage = in.readUTF(); - messagePattern = in.readUTF(); - final int length = in.readInt(); - stringArgs = new String[length]; - for (int i = 0; i < length; ++i) { - stringArgs[i] = in.readUTF(); - } - } - - @Override - public Throwable getThrowable() { - if (throwable != null) { - return throwable; - } - if (message == null) { - message = getMessage(messagePattern, argArray, null); - } - return message.getThrowable(); - } }
