Repository: logging-log4j2 Updated Branches: refs/heads/LOG4J-1181 2674e2838 -> 1e9585001
Use final. Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/132e9489 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/132e9489 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/132e9489 Branch: refs/heads/LOG4J-1181 Commit: 132e9489189855f4d8f3f27ead8a043a7c72c41b Parents: e3c418d Author: ggregory <[email protected]> Authored: Fri Jun 3 10:01:38 2016 -0700 Committer: ggregory <[email protected]> Committed: Fri Jun 3 10:01:38 2016 -0700 ---------------------------------------------------------------------- .../log4j/message/AbstractMessageFactory.java | 30 +++++++++--------- .../log4j/message/FormattedMessageFactory.java | 28 ++++++++--------- .../log4j/message/MessageFormatMessage.java | 2 +- .../message/MessageFormatMessageFactory.java | 28 ++++++++--------- .../log4j/message/ParameterFormatter.java | 10 +++--- .../log4j/message/ParameterizedMessage.java | 6 ++-- .../message/ParameterizedMessageFactory.java | 28 ++++++++--------- .../log4j/message/ReusableMessageFactory.java | 6 ++-- .../log4j/message/ReusableObjectMessage.java | 2 +- .../message/ReusableParameterizedMessage.java | 32 ++++++++++---------- .../log4j/message/ReusableSimpleMessage.java | 4 +-- .../logging/log4j/message/SimpleMessage.java | 4 +-- .../log4j/message/SimpleMessageFactory.java | 28 ++++++++--------- .../message/StringFormatterMessageFactory.java | 28 ++++++++--------- .../logging/log4j/message/JsonMessage.java | 2 +- .../log4j/message/ParameterFormatterTest.java | 12 ++++---- .../message/ReusableObjectMessageTest.java | 18 +++++------ .../ReusableParameterizedMessageTest.java | 4 +-- .../message/ReusableSimpleMessageTest.java | 18 +++++------ 19 files changed, 145 insertions(+), 145 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/132e9489/log4j-api/src/main/java/org/apache/logging/log4j/message/AbstractMessageFactory.java ---------------------------------------------------------------------- diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/message/AbstractMessageFactory.java b/log4j-api/src/main/java/org/apache/logging/log4j/message/AbstractMessageFactory.java index c1913a6..6429ed7 100644 --- a/log4j-api/src/main/java/org/apache/logging/log4j/message/AbstractMessageFactory.java +++ b/log4j-api/src/main/java/org/apache/logging/log4j/message/AbstractMessageFactory.java @@ -35,7 +35,7 @@ public abstract class AbstractMessageFactory implements MessageFactory2, Seriali private static final long serialVersionUID = -1307891137684031187L; @Override - public Message newMessage(CharSequence message) { + public Message newMessage(final CharSequence message) { return new SimpleMessage(message); } @@ -63,7 +63,7 @@ public abstract class AbstractMessageFactory implements MessageFactory2, Seriali * @since 2.6.1 */ @Override - public Message newMessage(String message, Object p0) { + public Message newMessage(final String message, final Object p0) { return newMessage(message, new Object[] { p0 }); } @@ -71,7 +71,7 @@ public abstract class AbstractMessageFactory implements MessageFactory2, Seriali * @since 2.6.1 */ @Override - public Message newMessage(String message, Object p0, Object p1) { + public Message newMessage(final String message, final Object p0, final Object p1) { return newMessage(message, new Object[] { p0, p1 }); } @@ -79,7 +79,7 @@ public abstract class AbstractMessageFactory implements MessageFactory2, Seriali * @since 2.6.1 */ @Override - public Message newMessage(String message, Object p0, Object p1, Object p2) { + public Message newMessage(final String message, final Object p0, final Object p1, final Object p2) { return newMessage(message, new Object[] { p0, p1, p2 }); } @@ -87,7 +87,7 @@ public abstract class AbstractMessageFactory implements MessageFactory2, Seriali * @since 2.6.1 */ @Override - public Message newMessage(String message, Object p0, Object p1, Object p2, Object p3) { + public Message newMessage(final String message, final Object p0, final Object p1, final Object p2, final Object p3) { return newMessage(message, new Object[] { p0, p1, p2, p3 }); } @@ -95,7 +95,7 @@ public abstract class AbstractMessageFactory implements MessageFactory2, Seriali * @since 2.6.1 */ @Override - public Message newMessage(String message, Object p0, Object p1, Object p2, Object p3, Object p4) { + public Message newMessage(final String message, final Object p0, final Object p1, final Object p2, final Object p3, final Object p4) { return newMessage(message, new Object[] { p0, p1, p2, p3, p4 }); } @@ -103,7 +103,7 @@ public abstract class AbstractMessageFactory implements MessageFactory2, Seriali * @since 2.6.1 */ @Override - public Message newMessage(String message, Object p0, Object p1, Object p2, Object p3, Object p4, Object p5) { + public Message newMessage(final String message, final Object p0, final Object p1, final Object p2, final Object p3, final Object p4, final Object p5) { return newMessage(message, new Object[] { p0, p1, p2, p3, p4, p5 }); } @@ -111,8 +111,8 @@ public abstract class AbstractMessageFactory implements MessageFactory2, Seriali * @since 2.6.1 */ @Override - public Message newMessage(String message, Object p0, Object p1, Object p2, Object p3, Object p4, Object p5, - Object p6) { + public Message newMessage(final String message, final Object p0, final Object p1, final Object p2, final Object p3, final Object p4, final Object p5, + final Object p6) { return newMessage(message, new Object[] { p0, p1, p2, p3, p4, p5, p6 }); } @@ -120,8 +120,8 @@ public abstract class AbstractMessageFactory implements MessageFactory2, Seriali * @since 2.6.1 */ @Override - public Message newMessage(String message, Object p0, Object p1, Object p2, Object p3, Object p4, Object p5, - Object p6, Object p7) { + public Message newMessage(final String message, final Object p0, final Object p1, final Object p2, final Object p3, final Object p4, final Object p5, + final Object p6, final Object p7) { return newMessage(message, new Object[] { p0, p1, p2, p3, p4, p5, p6, p7 }); } @@ -129,8 +129,8 @@ public abstract class AbstractMessageFactory implements MessageFactory2, Seriali * @since 2.6.1 */ @Override - public Message newMessage(String message, Object p0, Object p1, Object p2, Object p3, Object p4, Object p5, - Object p6, Object p7, Object p8) { + public Message newMessage(final String message, final Object p0, final Object p1, final Object p2, final Object p3, final Object p4, final Object p5, + final Object p6, final Object p7, final Object p8) { return newMessage(message, new Object[] { p0, p1, p2, p3, p4, p5, p6, p7, p8 }); } @@ -138,8 +138,8 @@ public abstract class AbstractMessageFactory implements MessageFactory2, Seriali * @since 2.6.1 */ @Override - public Message newMessage(String message, Object p0, Object p1, Object p2, Object p3, Object p4, Object p5, - Object p6, Object p7, Object p8, Object p9) { + public Message newMessage(final String message, final Object p0, final Object p1, final Object p2, final Object p3, final Object p4, final Object p5, + final Object p6, final Object p7, final Object p8, final Object p9) { return newMessage(message, new Object[] { p0, p1, p2, p3, p4, p5, p6, p7, p8, p9 }); } http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/132e9489/log4j-api/src/main/java/org/apache/logging/log4j/message/FormattedMessageFactory.java ---------------------------------------------------------------------- diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/message/FormattedMessageFactory.java b/log4j-api/src/main/java/org/apache/logging/log4j/message/FormattedMessageFactory.java index e72c3e6..805e24b 100644 --- a/log4j-api/src/main/java/org/apache/logging/log4j/message/FormattedMessageFactory.java +++ b/log4j-api/src/main/java/org/apache/logging/log4j/message/FormattedMessageFactory.java @@ -54,7 +54,7 @@ public class FormattedMessageFactory extends AbstractMessageFactory { * @since 2.6.1 */ @Override - public Message newMessage(String message, Object p0) { + public Message newMessage(final String message, final Object p0) { return new FormattedMessage(message, p0); } @@ -62,7 +62,7 @@ public class FormattedMessageFactory extends AbstractMessageFactory { * @since 2.6.1 */ @Override - public Message newMessage(String message, Object p0, Object p1) { + public Message newMessage(final String message, final Object p0, final Object p1) { return new FormattedMessage(message, p0, p1); } @@ -70,7 +70,7 @@ public class FormattedMessageFactory extends AbstractMessageFactory { * @since 2.6.1 */ @Override - public Message newMessage(String message, Object p0, Object p1, Object p2) { + public Message newMessage(final String message, final Object p0, final Object p1, final Object p2) { return new FormattedMessage(message, p0, p1, p2); } @@ -78,7 +78,7 @@ public class FormattedMessageFactory extends AbstractMessageFactory { * @since 2.6.1 */ @Override - public Message newMessage(String message, Object p0, Object p1, Object p2, Object p3) { + public Message newMessage(final String message, final Object p0, final Object p1, final Object p2, final Object p3) { return new FormattedMessage(message, p0, p1, p2, p3); } @@ -86,7 +86,7 @@ public class FormattedMessageFactory extends AbstractMessageFactory { * @since 2.6.1 */ @Override - public Message newMessage(String message, Object p0, Object p1, Object p2, Object p3, Object p4) { + public Message newMessage(final String message, final Object p0, final Object p1, final Object p2, final Object p3, final Object p4) { return new FormattedMessage(message, p0, p1, p2, p3, p4); } @@ -94,7 +94,7 @@ public class FormattedMessageFactory extends AbstractMessageFactory { * @since 2.6.1 */ @Override - public Message newMessage(String message, Object p0, Object p1, Object p2, Object p3, Object p4, Object p5) { + public Message newMessage(final String message, final Object p0, final Object p1, final Object p2, final Object p3, final Object p4, final Object p5) { return new FormattedMessage(message, p0, p1, p2, p3, p4, p5); } @@ -102,8 +102,8 @@ public class FormattedMessageFactory extends AbstractMessageFactory { * @since 2.6.1 */ @Override - public Message newMessage(String message, Object p0, Object p1, Object p2, Object p3, Object p4, Object p5, - Object p6) { + public Message newMessage(final String message, final Object p0, final Object p1, final Object p2, final Object p3, final Object p4, final Object p5, + final Object p6) { return new FormattedMessage(message, p0, p1, p2, p3, p4, p5, p6); } @@ -111,8 +111,8 @@ public class FormattedMessageFactory extends AbstractMessageFactory { * @since 2.6.1 */ @Override - public Message newMessage(String message, Object p0, Object p1, Object p2, Object p3, Object p4, Object p5, - Object p6, Object p7) { + public Message newMessage(final String message, final Object p0, final Object p1, final Object p2, final Object p3, final Object p4, final Object p5, + final Object p6, final Object p7) { return new FormattedMessage(message, p0, p1, p2, p3, p4, p5, p6, p7); } @@ -120,8 +120,8 @@ public class FormattedMessageFactory extends AbstractMessageFactory { * @since 2.6.1 */ @Override - public Message newMessage(String message, Object p0, Object p1, Object p2, Object p3, Object p4, Object p5, - Object p6, Object p7, Object p8) { + public Message newMessage(final String message, final Object p0, final Object p1, final Object p2, final Object p3, final Object p4, final Object p5, + final Object p6, final Object p7, final Object p8) { return new FormattedMessage(message, p0, p1, p2, p3, p4, p5, p6, p7, p8); } @@ -129,8 +129,8 @@ public class FormattedMessageFactory extends AbstractMessageFactory { * @since 2.6.1 */ @Override - public Message newMessage(String message, Object p0, Object p1, Object p2, Object p3, Object p4, Object p5, - Object p6, Object p7, Object p8, Object p9) { + public Message newMessage(final String message, final Object p0, final Object p1, final Object p2, final Object p3, final Object p4, final Object p5, + final Object p6, final Object p7, final Object p8, final Object p9) { return new FormattedMessage(message, p0, p1, p2, p3, p4, p5, p6, p7, p8, p9); } } http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/132e9489/log4j-api/src/main/java/org/apache/logging/log4j/message/MessageFormatMessage.java ---------------------------------------------------------------------- diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/message/MessageFormatMessage.java b/log4j-api/src/main/java/org/apache/logging/log4j/message/MessageFormatMessage.java index 3991c30..b34a72d 100644 --- a/log4j-api/src/main/java/org/apache/logging/log4j/message/MessageFormatMessage.java +++ b/log4j-api/src/main/java/org/apache/logging/log4j/message/MessageFormatMessage.java @@ -112,7 +112,7 @@ public class MessageFormatMessage implements Message { protected String formatMessage(final String msgPattern, final Object... args) { try { - MessageFormat temp = new MessageFormat(msgPattern, locale); + final MessageFormat temp = new MessageFormat(msgPattern, locale); return temp.format(args); } catch (final IllegalFormatException ife) { LOGGER.error("Unable to format msg: " + msgPattern, ife); http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/132e9489/log4j-api/src/main/java/org/apache/logging/log4j/message/MessageFormatMessageFactory.java ---------------------------------------------------------------------- diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/message/MessageFormatMessageFactory.java b/log4j-api/src/main/java/org/apache/logging/log4j/message/MessageFormatMessageFactory.java index 40e43dc..f75e68b 100644 --- a/log4j-api/src/main/java/org/apache/logging/log4j/message/MessageFormatMessageFactory.java +++ b/log4j-api/src/main/java/org/apache/logging/log4j/message/MessageFormatMessageFactory.java @@ -52,7 +52,7 @@ public class MessageFormatMessageFactory extends AbstractMessageFactory { * @since 2.6.1 */ @Override - public Message newMessage(String message, Object p0) { + public Message newMessage(final String message, final Object p0) { return new MessageFormatMessage(message, p0); } @@ -60,7 +60,7 @@ public class MessageFormatMessageFactory extends AbstractMessageFactory { * @since 2.6.1 */ @Override - public Message newMessage(String message, Object p0, Object p1) { + public Message newMessage(final String message, final Object p0, final Object p1) { return new MessageFormatMessage(message, p0, p1); } @@ -68,7 +68,7 @@ public class MessageFormatMessageFactory extends AbstractMessageFactory { * @since 2.6.1 */ @Override - public Message newMessage(String message, Object p0, Object p1, Object p2) { + public Message newMessage(final String message, final Object p0, final Object p1, final Object p2) { return new MessageFormatMessage(message, p0, p1, p2); } @@ -76,7 +76,7 @@ public class MessageFormatMessageFactory extends AbstractMessageFactory { * @since 2.6.1 */ @Override - public Message newMessage(String message, Object p0, Object p1, Object p2, Object p3) { + public Message newMessage(final String message, final Object p0, final Object p1, final Object p2, final Object p3) { return new MessageFormatMessage(message, p0, p1, p2, p3); } @@ -84,7 +84,7 @@ public class MessageFormatMessageFactory extends AbstractMessageFactory { * @since 2.6.1 */ @Override - public Message newMessage(String message, Object p0, Object p1, Object p2, Object p3, Object p4) { + public Message newMessage(final String message, final Object p0, final Object p1, final Object p2, final Object p3, final Object p4) { return new MessageFormatMessage(message, p0, p1, p2, p3, p4); } @@ -92,7 +92,7 @@ public class MessageFormatMessageFactory extends AbstractMessageFactory { * @since 2.6.1 */ @Override - public Message newMessage(String message, Object p0, Object p1, Object p2, Object p3, Object p4, Object p5) { + public Message newMessage(final String message, final Object p0, final Object p1, final Object p2, final Object p3, final Object p4, final Object p5) { return new MessageFormatMessage(message, p0, p1, p2, p3, p4, p5); } @@ -100,8 +100,8 @@ public class MessageFormatMessageFactory extends AbstractMessageFactory { * @since 2.6.1 */ @Override - public Message newMessage(String message, Object p0, Object p1, Object p2, Object p3, Object p4, Object p5, - Object p6) { + public Message newMessage(final String message, final Object p0, final Object p1, final Object p2, final Object p3, final Object p4, final Object p5, + final Object p6) { return new MessageFormatMessage(message, p0, p1, p2, p3, p4, p5, p6); } @@ -109,8 +109,8 @@ public class MessageFormatMessageFactory extends AbstractMessageFactory { * @since 2.6.1 */ @Override - public Message newMessage(String message, Object p0, Object p1, Object p2, Object p3, Object p4, Object p5, - Object p6, Object p7) { + public Message newMessage(final String message, final Object p0, final Object p1, final Object p2, final Object p3, final Object p4, final Object p5, + final Object p6, final Object p7) { return new MessageFormatMessage(message, p0, p1, p2, p3, p4, p5, p6, p7); } @@ -118,8 +118,8 @@ public class MessageFormatMessageFactory extends AbstractMessageFactory { * @since 2.6.1 */ @Override - public Message newMessage(String message, Object p0, Object p1, Object p2, Object p3, Object p4, Object p5, - Object p6, Object p7, Object p8) { + public Message newMessage(final String message, final Object p0, final Object p1, final Object p2, final Object p3, final Object p4, final Object p5, + final Object p6, final Object p7, final Object p8) { return new MessageFormatMessage(message, p0, p1, p2, p3, p4, p5, p6, p7, p8); } @@ -127,8 +127,8 @@ public class MessageFormatMessageFactory extends AbstractMessageFactory { * @since 2.6.1 */ @Override - public Message newMessage(String message, Object p0, Object p1, Object p2, Object p3, Object p4, Object p5, - Object p6, Object p7, Object p8, Object p9) { + public Message newMessage(final String message, final Object p0, final Object p1, final Object p2, final Object p3, final Object p4, final Object p5, + final Object p6, final Object p7, final Object p8, final Object p9) { return new MessageFormatMessage(message, p0, p1, p2, p3, p4, p5, p6, p7, p8, p9); } } http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/132e9489/log4j-api/src/main/java/org/apache/logging/log4j/message/ParameterFormatter.java ---------------------------------------------------------------------- diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/message/ParameterFormatter.java b/log4j-api/src/main/java/org/apache/logging/log4j/message/ParameterFormatter.java index fa1a43a..0718cc1 100644 --- a/log4j-api/src/main/java/org/apache/logging/log4j/message/ParameterFormatter.java +++ b/log4j-api/src/main/java/org/apache/logging/log4j/message/ParameterFormatter.java @@ -75,7 +75,7 @@ final class ParameterFormatter { if (messagePattern == null) { return 0; } - int length = messagePattern.length(); + final int length = messagePattern.length(); int result = 0; boolean isEscaped = false; for (int i = 0; i < length - 1; i++) { @@ -105,7 +105,7 @@ final class ParameterFormatter { if (messagePattern == null) { return 0; } - int length = messagePattern.length(); + final int length = messagePattern.length(); int result = 0; boolean isEscaped = false; for (int i = 0; i < length - 1; i++) { @@ -134,7 +134,7 @@ final class ParameterFormatter { * @param messagePattern the message pattern to be analyzed. * @return the number of unescaped placeholders. */ - static int countArgumentPlaceholders3(final char[] messagePattern, int length, final int[] indices) { + static int countArgumentPlaceholders3(final char[] messagePattern, final int length, final int[] indices) { int result = 0; boolean isEscaped = false; for (int i = 0; i < length - 1; i++) { @@ -229,7 +229,7 @@ final class ParameterFormatter { int escapeCounter = 0; int currentArgument = 0; int i = 0; - int len = messagePattern.length(); + final int len = messagePattern.length(); for (; i < len - 1; i++) { // last char is excluded from the loop final char curChar = messagePattern.charAt(i); if (curChar == ESCAPE_CHAR) { @@ -275,7 +275,7 @@ final class ParameterFormatter { // Profiling showed this method is important to log4j performance. Modify with care! // 28 bytes (allows immediate JVM inlining: < 35 bytes) LOG4J2-1096 private static void handleRemainingCharIfAny(final String messagePattern, final int len, - final StringBuilder buffer, int escapeCounter, int i) { + final StringBuilder buffer, final int escapeCounter, final int i) { if (i == len - 1) { final char curChar = messagePattern.charAt(i); handleLastChar(buffer, escapeCounter, curChar); http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/132e9489/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 6c5b8e7..c48ab14 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 @@ -133,17 +133,17 @@ public class ParameterizedMessage implements Message, StringBuilderFormattable { this(messagePattern, new Object[]{arg0, arg1}); } - private void init(String messagePattern) { + private void init(final String messagePattern) { this.messagePattern = messagePattern; this.indices = new int[messagePattern == null ? 0 : messagePattern.length() >> 1]; // divide by 2 - int usedCount = ParameterFormatter.countArgumentPlaceholders2(messagePattern, indices); + final int usedCount = ParameterFormatter.countArgumentPlaceholders2(messagePattern, indices); initThrowable(argArray, usedCount); this.usedCount = Math.min(usedCount, (argArray == null) ? 0 : argArray.length); } private void initThrowable(final Object[] params, final int usedParams) { if (params != null) { - int argCount = params.length; + final int argCount = params.length; if (usedParams < argCount && this.throwable == null && params[argCount - 1] instanceof Throwable) { this.throwable = (Throwable) params[argCount - 1]; } http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/132e9489/log4j-api/src/main/java/org/apache/logging/log4j/message/ParameterizedMessageFactory.java ---------------------------------------------------------------------- diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/message/ParameterizedMessageFactory.java b/log4j-api/src/main/java/org/apache/logging/log4j/message/ParameterizedMessageFactory.java index b526bc4..5878cac 100644 --- a/log4j-api/src/main/java/org/apache/logging/log4j/message/ParameterizedMessageFactory.java +++ b/log4j-api/src/main/java/org/apache/logging/log4j/message/ParameterizedMessageFactory.java @@ -67,7 +67,7 @@ public final class ParameterizedMessageFactory extends AbstractMessageFactory { * @since 2.6.1 */ @Override - public Message newMessage(String message, Object p0) { + public Message newMessage(final String message, final Object p0) { return new ParameterizedMessage(message, p0); } @@ -75,7 +75,7 @@ public final class ParameterizedMessageFactory extends AbstractMessageFactory { * @since 2.6.1 */ @Override - public Message newMessage(String message, Object p0, Object p1) { + public Message newMessage(final String message, final Object p0, final Object p1) { return new ParameterizedMessage(message, p0, p1); } @@ -83,7 +83,7 @@ public final class ParameterizedMessageFactory extends AbstractMessageFactory { * @since 2.6.1 */ @Override - public Message newMessage(String message, Object p0, Object p1, Object p2) { + public Message newMessage(final String message, final Object p0, final Object p1, final Object p2) { return new ParameterizedMessage(message, p0, p1, p2); } @@ -91,7 +91,7 @@ public final class ParameterizedMessageFactory extends AbstractMessageFactory { * @since 2.6.1 */ @Override - public Message newMessage(String message, Object p0, Object p1, Object p2, Object p3) { + public Message newMessage(final String message, final Object p0, final Object p1, final Object p2, final Object p3) { return new ParameterizedMessage(message, p0, p1, p2, p3); } @@ -99,7 +99,7 @@ public final class ParameterizedMessageFactory extends AbstractMessageFactory { * @since 2.6.1 */ @Override - public Message newMessage(String message, Object p0, Object p1, Object p2, Object p3, Object p4) { + public Message newMessage(final String message, final Object p0, final Object p1, final Object p2, final Object p3, final Object p4) { return new ParameterizedMessage(message, p0, p1, p2, p3, p4); } @@ -107,7 +107,7 @@ public final class ParameterizedMessageFactory extends AbstractMessageFactory { * @since 2.6.1 */ @Override - public Message newMessage(String message, Object p0, Object p1, Object p2, Object p3, Object p4, Object p5) { + public Message newMessage(final String message, final Object p0, final Object p1, final Object p2, final Object p3, final Object p4, final Object p5) { return new ParameterizedMessage(message, p0, p1, p2, p3, p4, p5); } @@ -115,8 +115,8 @@ public final class ParameterizedMessageFactory extends AbstractMessageFactory { * @since 2.6.1 */ @Override - public Message newMessage(String message, Object p0, Object p1, Object p2, Object p3, Object p4, Object p5, - Object p6) { + public Message newMessage(final String message, final Object p0, final Object p1, final Object p2, final Object p3, final Object p4, final Object p5, + final Object p6) { return new ParameterizedMessage(message, p0, p1, p2, p3, p4, p5, p6); } @@ -124,8 +124,8 @@ public final class ParameterizedMessageFactory extends AbstractMessageFactory { * @since 2.6.1 */ @Override - public Message newMessage(String message, Object p0, Object p1, Object p2, Object p3, Object p4, Object p5, - Object p6, Object p7) { + public Message newMessage(final String message, final Object p0, final Object p1, final Object p2, final Object p3, final Object p4, final Object p5, + final Object p6, final Object p7) { return new ParameterizedMessage(message, p0, p1, p2, p3, p4, p5, p6, p7); } @@ -133,8 +133,8 @@ public final class ParameterizedMessageFactory extends AbstractMessageFactory { * @since 2.6.1 */ @Override - public Message newMessage(String message, Object p0, Object p1, Object p2, Object p3, Object p4, Object p5, - Object p6, Object p7, Object p8) { + public Message newMessage(final String message, final Object p0, final Object p1, final Object p2, final Object p3, final Object p4, final Object p5, + final Object p6, final Object p7, final Object p8) { return new ParameterizedMessage(message, p0, p1, p2, p3, p4, p5, p6, p7, p8); } @@ -142,8 +142,8 @@ public final class ParameterizedMessageFactory extends AbstractMessageFactory { * @since 2.6.1 */ @Override - public Message newMessage(String message, Object p0, Object p1, Object p2, Object p3, Object p4, Object p5, - Object p6, Object p7, Object p8, Object p9) { + public Message newMessage(final String message, final Object p0, final Object p1, final Object p2, final Object p3, final Object p4, final Object p5, + final Object p6, final Object p7, final Object p8, final Object p9) { return new ParameterizedMessage(message, p0, p1, p2, p3, p4, p5, p6, p7, p8, p9); } } http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/132e9489/log4j-api/src/main/java/org/apache/logging/log4j/message/ReusableMessageFactory.java ---------------------------------------------------------------------- diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/message/ReusableMessageFactory.java b/log4j-api/src/main/java/org/apache/logging/log4j/message/ReusableMessageFactory.java index b29d842..9a6329b 100644 --- a/log4j-api/src/main/java/org/apache/logging/log4j/message/ReusableMessageFactory.java +++ b/log4j-api/src/main/java/org/apache/logging/log4j/message/ReusableMessageFactory.java @@ -78,7 +78,7 @@ public final class ReusableMessageFactory implements MessageFactory2, Serializab @Override public Message newMessage(final CharSequence charSequence) { - ReusableSimpleMessage result = getSimple(); + final ReusableSimpleMessage result = getSimple(); result.set(charSequence); return result; } @@ -164,7 +164,7 @@ public final class ReusableMessageFactory implements MessageFactory2, Serializab */ @Override public Message newMessage(final String message) { - ReusableSimpleMessage result = getSimple(); + final ReusableSimpleMessage result = getSimple(); result.set(message); return result; } @@ -180,7 +180,7 @@ public final class ReusableMessageFactory implements MessageFactory2, Serializab */ @Override public Message newMessage(final Object message) { - ReusableObjectMessage result = getObject(); + final ReusableObjectMessage result = getObject(); result.set(message); return result; } http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/132e9489/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 fddc0eb..21e9f98 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 @@ -30,7 +30,7 @@ public class ReusableObjectMessage implements ReusableMessage { private transient Object obj; private transient String objectString; - public void set(Object object) { + public void set(final Object object) { this.obj = object; } http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/132e9489/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 2498eb6..96f5394 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 @@ -108,7 +108,7 @@ public class ReusableParameterizedMessage implements ReusableMessage { this.varargs = null; this.messagePattern = messagePattern; this.argCount = argCount; - int placeholderCount = count(messagePattern, indices); + final int placeholderCount = count(messagePattern, indices); initThrowable(paramArray, argCount, placeholderCount); this.usedCount = Math.min(placeholderCount, argCount); } @@ -130,26 +130,26 @@ public class ReusableParameterizedMessage implements ReusableMessage { } } - ReusableParameterizedMessage set(String messagePattern, Object... arguments) { + ReusableParameterizedMessage set(final String messagePattern, final Object... arguments) { init(messagePattern, arguments == null ? 0 : arguments.length, arguments); varargs = arguments; return this; } - ReusableParameterizedMessage set(String messagePattern, Object p0) { + ReusableParameterizedMessage set(final String messagePattern, final Object p0) { params[0] = p0; init(messagePattern, 1, params); return this; } - ReusableParameterizedMessage set(String messagePattern, Object p0, Object p1) { + ReusableParameterizedMessage set(final String messagePattern, final Object p0, final Object p1) { params[0] = p0; params[1] = p1; init(messagePattern, 2, params); return this; } - ReusableParameterizedMessage set(String messagePattern, Object p0, Object p1, Object p2) { + ReusableParameterizedMessage set(final String messagePattern, final Object p0, final Object p1, final Object p2) { params[0] = p0; params[1] = p1; params[2] = p2; @@ -157,7 +157,7 @@ public class ReusableParameterizedMessage implements ReusableMessage { return this; } - ReusableParameterizedMessage set(String messagePattern, Object p0, Object p1, Object p2, Object p3) { + ReusableParameterizedMessage set(final String messagePattern, final Object p0, final Object p1, final Object p2, final Object p3) { params[0] = p0; params[1] = p1; params[2] = p2; @@ -166,7 +166,7 @@ public class ReusableParameterizedMessage implements ReusableMessage { return this; } - ReusableParameterizedMessage set(String messagePattern, Object p0, Object p1, Object p2, Object p3, Object p4) { + ReusableParameterizedMessage set(final String messagePattern, final Object p0, final Object p1, final Object p2, final Object p3, final Object p4) { params[0] = p0; params[1] = p1; params[2] = p2; @@ -176,7 +176,7 @@ public class ReusableParameterizedMessage implements ReusableMessage { return this; } - ReusableParameterizedMessage set(String messagePattern, Object p0, Object p1, Object p2, Object p3, Object p4, Object p5) { + ReusableParameterizedMessage set(final String messagePattern, final Object p0, final Object p1, final Object p2, final Object p3, final Object p4, final Object p5) { params[0] = p0; params[1] = p1; params[2] = p2; @@ -187,8 +187,8 @@ public class ReusableParameterizedMessage implements ReusableMessage { return this; } - ReusableParameterizedMessage set(String messagePattern, Object p0, Object p1, Object p2, Object p3, Object p4, Object p5, - Object p6) { + ReusableParameterizedMessage set(final String messagePattern, final Object p0, final Object p1, final Object p2, final Object p3, final Object p4, final Object p5, + final Object p6) { params[0] = p0; params[1] = p1; params[2] = p2; @@ -200,8 +200,8 @@ public class ReusableParameterizedMessage implements ReusableMessage { return this; } - ReusableParameterizedMessage set(String messagePattern, Object p0, Object p1, Object p2, Object p3, Object p4, Object p5, - Object p6, Object p7) { + ReusableParameterizedMessage set(final String messagePattern, final Object p0, final Object p1, final Object p2, final Object p3, final Object p4, final Object p5, + final Object p6, final Object p7) { params[0] = p0; params[1] = p1; params[2] = p2; @@ -214,8 +214,8 @@ public class ReusableParameterizedMessage implements ReusableMessage { return this; } - ReusableParameterizedMessage set(String messagePattern, Object p0, Object p1, Object p2, Object p3, Object p4, Object p5, - Object p6, Object p7, Object p8) { + ReusableParameterizedMessage set(final String messagePattern, final Object p0, final Object p1, final Object p2, final Object p3, final Object p4, final Object p5, + final Object p6, final Object p7, final Object p8) { params[0] = p0; params[1] = p1; params[2] = p2; @@ -229,8 +229,8 @@ public class ReusableParameterizedMessage implements ReusableMessage { return this; } - ReusableParameterizedMessage set(String messagePattern, Object p0, Object p1, Object p2, Object p3, Object p4, Object p5, - Object p6, Object p7, Object p8, Object p9) { + ReusableParameterizedMessage set(final String messagePattern, final Object p0, final Object p1, final Object p2, final Object p3, final Object p4, final Object p5, + final Object p6, final Object p7, final Object p8, final Object p9) { params[0] = p0; params[1] = p1; params[2] = p2; http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/132e9489/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 d894ef7..905b694 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 @@ -93,12 +93,12 @@ public class ReusableSimpleMessage implements ReusableMessage, CharSequence { } @Override - public char charAt(int index) { + public char charAt(final int index) { return charSequence.charAt(index); } @Override - public CharSequence subSequence(int start, int end) { + public CharSequence subSequence(final int start, final int end) { return charSequence.subSequence(start, end); } } http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/132e9489/log4j-api/src/main/java/org/apache/logging/log4j/message/SimpleMessage.java ---------------------------------------------------------------------- diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/message/SimpleMessage.java b/log4j-api/src/main/java/org/apache/logging/log4j/message/SimpleMessage.java index 3701b09..0c209e5 100644 --- a/log4j-api/src/main/java/org/apache/logging/log4j/message/SimpleMessage.java +++ b/log4j-api/src/main/java/org/apache/logging/log4j/message/SimpleMessage.java @@ -133,12 +133,12 @@ public class SimpleMessage implements Message, StringBuilderFormattable, CharSeq } @Override - public char charAt(int index) { + public char charAt(final int index) { return charSequence.charAt(index); } @Override - public CharSequence subSequence(int start, int end) { + public CharSequence subSequence(final int start, final int end) { return charSequence.subSequence(start, end); } http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/132e9489/log4j-api/src/main/java/org/apache/logging/log4j/message/SimpleMessageFactory.java ---------------------------------------------------------------------- diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/message/SimpleMessageFactory.java b/log4j-api/src/main/java/org/apache/logging/log4j/message/SimpleMessageFactory.java index 2a60358..e85b8c0 100644 --- a/log4j-api/src/main/java/org/apache/logging/log4j/message/SimpleMessageFactory.java +++ b/log4j-api/src/main/java/org/apache/logging/log4j/message/SimpleMessageFactory.java @@ -65,7 +65,7 @@ public final class SimpleMessageFactory extends AbstractMessageFactory { * @since 2.6.1 */ @Override - public Message newMessage(String message, Object p0) { + public Message newMessage(final String message, final Object p0) { return new SimpleMessage(message); } @@ -73,7 +73,7 @@ public final class SimpleMessageFactory extends AbstractMessageFactory { * @since 2.6.1 */ @Override - public Message newMessage(String message, Object p0, Object p1) { + public Message newMessage(final String message, final Object p0, final Object p1) { return new SimpleMessage(message); } @@ -81,7 +81,7 @@ public final class SimpleMessageFactory extends AbstractMessageFactory { * @since 2.6.1 */ @Override - public Message newMessage(String message, Object p0, Object p1, Object p2) { + public Message newMessage(final String message, final Object p0, final Object p1, final Object p2) { return new SimpleMessage(message); } @@ -89,7 +89,7 @@ public final class SimpleMessageFactory extends AbstractMessageFactory { * @since 2.6.1 */ @Override - public Message newMessage(String message, Object p0, Object p1, Object p2, Object p3) { + public Message newMessage(final String message, final Object p0, final Object p1, final Object p2, final Object p3) { return new SimpleMessage(message); } @@ -97,7 +97,7 @@ public final class SimpleMessageFactory extends AbstractMessageFactory { * @since 2.6.1 */ @Override - public Message newMessage(String message, Object p0, Object p1, Object p2, Object p3, Object p4) { + public Message newMessage(final String message, final Object p0, final Object p1, final Object p2, final Object p3, final Object p4) { return new SimpleMessage(message); } @@ -105,7 +105,7 @@ public final class SimpleMessageFactory extends AbstractMessageFactory { * @since 2.6.1 */ @Override - public Message newMessage(String message, Object p0, Object p1, Object p2, Object p3, Object p4, Object p5) { + public Message newMessage(final String message, final Object p0, final Object p1, final Object p2, final Object p3, final Object p4, final Object p5) { return new SimpleMessage(message); } @@ -113,8 +113,8 @@ public final class SimpleMessageFactory extends AbstractMessageFactory { * @since 2.6.1 */ @Override - public Message newMessage(String message, Object p0, Object p1, Object p2, Object p3, Object p4, Object p5, - Object p6) { + public Message newMessage(final String message, final Object p0, final Object p1, final Object p2, final Object p3, final Object p4, final Object p5, + final Object p6) { return new SimpleMessage(message); } @@ -122,8 +122,8 @@ public final class SimpleMessageFactory extends AbstractMessageFactory { * @since 2.6.1 */ @Override - public Message newMessage(String message, Object p0, Object p1, Object p2, Object p3, Object p4, Object p5, - Object p6, Object p7) { + public Message newMessage(final String message, final Object p0, final Object p1, final Object p2, final Object p3, final Object p4, final Object p5, + final Object p6, final Object p7) { return new SimpleMessage(message); } @@ -131,8 +131,8 @@ public final class SimpleMessageFactory extends AbstractMessageFactory { * @since 2.6.1 */ @Override - public Message newMessage(String message, Object p0, Object p1, Object p2, Object p3, Object p4, Object p5, - Object p6, Object p7, Object p8) { + public Message newMessage(final String message, final Object p0, final Object p1, final Object p2, final Object p3, final Object p4, final Object p5, + final Object p6, final Object p7, final Object p8) { return new SimpleMessage(message); } @@ -140,8 +140,8 @@ public final class SimpleMessageFactory extends AbstractMessageFactory { * @since 2.6.1 */ @Override - public Message newMessage(String message, Object p0, Object p1, Object p2, Object p3, Object p4, Object p5, - Object p6, Object p7, Object p8, Object p9) { + public Message newMessage(final String message, final Object p0, final Object p1, final Object p2, final Object p3, final Object p4, final Object p5, + final Object p6, final Object p7, final Object p8, final Object p9) { return new SimpleMessage(message); } } http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/132e9489/log4j-api/src/main/java/org/apache/logging/log4j/message/StringFormatterMessageFactory.java ---------------------------------------------------------------------- diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/message/StringFormatterMessageFactory.java b/log4j-api/src/main/java/org/apache/logging/log4j/message/StringFormatterMessageFactory.java index 19a63fb..b6554d5 100644 --- a/log4j-api/src/main/java/org/apache/logging/log4j/message/StringFormatterMessageFactory.java +++ b/log4j-api/src/main/java/org/apache/logging/log4j/message/StringFormatterMessageFactory.java @@ -66,7 +66,7 @@ public final class StringFormatterMessageFactory extends AbstractMessageFactory * @since 2.6.1 */ @Override - public Message newMessage(String message, Object p0) { + public Message newMessage(final String message, final Object p0) { return new StringFormattedMessage(message, p0); } @@ -74,7 +74,7 @@ public final class StringFormatterMessageFactory extends AbstractMessageFactory * @since 2.6.1 */ @Override - public Message newMessage(String message, Object p0, Object p1) { + public Message newMessage(final String message, final Object p0, final Object p1) { return new StringFormattedMessage(message, p0, p1); } @@ -82,7 +82,7 @@ public final class StringFormatterMessageFactory extends AbstractMessageFactory * @since 2.6.1 */ @Override - public Message newMessage(String message, Object p0, Object p1, Object p2) { + public Message newMessage(final String message, final Object p0, final Object p1, final Object p2) { return new StringFormattedMessage(message, p0, p1, p2); } @@ -90,7 +90,7 @@ public final class StringFormatterMessageFactory extends AbstractMessageFactory * @since 2.6.1 */ @Override - public Message newMessage(String message, Object p0, Object p1, Object p2, Object p3) { + public Message newMessage(final String message, final Object p0, final Object p1, final Object p2, final Object p3) { return new StringFormattedMessage(message, p0, p1, p2, p3); } @@ -98,7 +98,7 @@ public final class StringFormatterMessageFactory extends AbstractMessageFactory * @since 2.6.1 */ @Override - public Message newMessage(String message, Object p0, Object p1, Object p2, Object p3, Object p4) { + public Message newMessage(final String message, final Object p0, final Object p1, final Object p2, final Object p3, final Object p4) { return new StringFormattedMessage(message, p0, p1, p2, p3, p4); } @@ -106,7 +106,7 @@ public final class StringFormatterMessageFactory extends AbstractMessageFactory * @since 2.6.1 */ @Override - public Message newMessage(String message, Object p0, Object p1, Object p2, Object p3, Object p4, Object p5) { + public Message newMessage(final String message, final Object p0, final Object p1, final Object p2, final Object p3, final Object p4, final Object p5) { return new StringFormattedMessage(message, p0, p1, p2, p3, p4, p5); } @@ -114,8 +114,8 @@ public final class StringFormatterMessageFactory extends AbstractMessageFactory * @since 2.6.1 */ @Override - public Message newMessage(String message, Object p0, Object p1, Object p2, Object p3, Object p4, Object p5, - Object p6) { + public Message newMessage(final String message, final Object p0, final Object p1, final Object p2, final Object p3, final Object p4, final Object p5, + final Object p6) { return new StringFormattedMessage(message, p0, p1, p2, p3, p4, p5, p6); } @@ -123,8 +123,8 @@ public final class StringFormatterMessageFactory extends AbstractMessageFactory * @since 2.6.1 */ @Override - public Message newMessage(String message, Object p0, Object p1, Object p2, Object p3, Object p4, Object p5, - Object p6, Object p7) { + public Message newMessage(final String message, final Object p0, final Object p1, final Object p2, final Object p3, final Object p4, final Object p5, + final Object p6, final Object p7) { return new StringFormattedMessage(message, p0, p1, p2, p3, p4, p5, p6, p7); } @@ -132,8 +132,8 @@ public final class StringFormatterMessageFactory extends AbstractMessageFactory * @since 2.6.1 */ @Override - public Message newMessage(String message, Object p0, Object p1, Object p2, Object p3, Object p4, Object p5, - Object p6, Object p7, Object p8) { + public Message newMessage(final String message, final Object p0, final Object p1, final Object p2, final Object p3, final Object p4, final Object p5, + final Object p6, final Object p7, final Object p8) { return new StringFormattedMessage(message, p0, p1, p2, p3, p4, p5, p6, p7, p8); } @@ -141,8 +141,8 @@ public final class StringFormatterMessageFactory extends AbstractMessageFactory * @since 2.6.1 */ @Override - public Message newMessage(String message, Object p0, Object p1, Object p2, Object p3, Object p4, Object p5, - Object p6, Object p7, Object p8, Object p9) { + public Message newMessage(final String message, final Object p0, final Object p1, final Object p2, final Object p3, final Object p4, final Object p5, + final Object p6, final Object p7, final Object p8, final Object p9) { return new StringFormattedMessage(message, p0, p1, p2, p3, p4, p5, p6, p7, p8, p9); } } http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/132e9489/log4j-api/src/test/java/org/apache/logging/log4j/message/JsonMessage.java ---------------------------------------------------------------------- diff --git a/log4j-api/src/test/java/org/apache/logging/log4j/message/JsonMessage.java b/log4j-api/src/test/java/org/apache/logging/log4j/message/JsonMessage.java index 7d228b8..5107841 100644 --- a/log4j-api/src/test/java/org/apache/logging/log4j/message/JsonMessage.java +++ b/log4j-api/src/test/java/org/apache/logging/log4j/message/JsonMessage.java @@ -43,7 +43,7 @@ public class JsonMessage implements Message { public String getFormattedMessage() { try { return mapper.writeValueAsString(object); - } catch (JsonProcessingException e) { + } catch (final JsonProcessingException e) { StatusLogger.getLogger().catching(e); return object.toString(); } http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/132e9489/log4j-api/src/test/java/org/apache/logging/log4j/message/ParameterFormatterTest.java ---------------------------------------------------------------------- diff --git a/log4j-api/src/test/java/org/apache/logging/log4j/message/ParameterFormatterTest.java b/log4j-api/src/test/java/org/apache/logging/log4j/message/ParameterFormatterTest.java index 625b1b8..6e728f6 100644 --- a/log4j-api/src/test/java/org/apache/logging/log4j/message/ParameterFormatterTest.java +++ b/log4j-api/src/test/java/org/apache/logging/log4j/message/ParameterFormatterTest.java @@ -169,23 +169,23 @@ public class ParameterFormatterTest { @Test public void testDeepToString() throws Exception { - List<Object> list = new ArrayList<>(); + final List<Object> list = new ArrayList<>(); list.add(1); list.add(list); list.add(2); - String actual = ParameterFormatter.deepToString(list); - String expected = "[1, [..." + ParameterFormatter.identityToString(list) + "...], 2]"; + final String actual = ParameterFormatter.deepToString(list); + final String expected = "[1, [..." + ParameterFormatter.identityToString(list) + "...], 2]"; assertEquals(expected, actual); } @Test public void testIdentityToString() throws Exception { - List<Object> list = new ArrayList<>(); + final List<Object> list = new ArrayList<>(); list.add(1); list.add(list); list.add(2); - String actual = ParameterFormatter.identityToString(list); - String expected = list.getClass().getName() + "@" + Integer.toHexString(System.identityHashCode(list)); + final String actual = ParameterFormatter.identityToString(list); + final String expected = list.getClass().getName() + "@" + Integer.toHexString(System.identityHashCode(list)); assertEquals(expected, actual); } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/132e9489/log4j-api/src/test/java/org/apache/logging/log4j/message/ReusableObjectMessageTest.java ---------------------------------------------------------------------- diff --git a/log4j-api/src/test/java/org/apache/logging/log4j/message/ReusableObjectMessageTest.java b/log4j-api/src/test/java/org/apache/logging/log4j/message/ReusableObjectMessageTest.java index 961eaa9..d4f87a7 100644 --- a/log4j-api/src/test/java/org/apache/logging/log4j/message/ReusableObjectMessageTest.java +++ b/log4j-api/src/test/java/org/apache/logging/log4j/message/ReusableObjectMessageTest.java @@ -27,7 +27,7 @@ public class ReusableObjectMessageTest { @Test public void testSet_InitializesFormattedMessage() throws Exception { - ReusableObjectMessage msg = new ReusableObjectMessage(); + final ReusableObjectMessage msg = new ReusableObjectMessage(); msg.set("abc"); assertEquals("abc", msg.getFormattedMessage()); } @@ -39,7 +39,7 @@ public class ReusableObjectMessageTest { @Test public void testGetFormattedMessage_ReturnsLatestSetString() throws Exception { - ReusableObjectMessage msg = new ReusableObjectMessage(); + final ReusableObjectMessage msg = new ReusableObjectMessage(); msg.set("abc"); assertEquals("abc", msg.getFormattedMessage()); msg.set("def"); @@ -55,7 +55,7 @@ public class ReusableObjectMessageTest { @Test public void testGetFormat_ReturnsLatestSetString() throws Exception { - ReusableObjectMessage msg = new ReusableObjectMessage(); + final ReusableObjectMessage msg = new ReusableObjectMessage(); msg.set("abc"); assertEquals("abc", msg.getFormat()); msg.set("def"); @@ -71,7 +71,7 @@ public class ReusableObjectMessageTest { @Test public void testGetParameters_ReturnsSetObjectInParameterArrayAfterMessageSet() throws Exception { - ReusableObjectMessage msg = new ReusableObjectMessage(); + final ReusableObjectMessage msg = new ReusableObjectMessage(); msg.set("abc"); assertArrayEquals(new Object[]{"abc"}, msg.getParameters()); msg.set("def"); @@ -85,7 +85,7 @@ public class ReusableObjectMessageTest { @Test public void testGetThrowable_ReturnsNullAfterMessageSet() throws Exception { - ReusableObjectMessage msg = new ReusableObjectMessage(); + final ReusableObjectMessage msg = new ReusableObjectMessage(); msg.set("abc"); assertNull(msg.getThrowable()); msg.set("def"); @@ -94,16 +94,16 @@ public class ReusableObjectMessageTest { @Test public void testFormatTo_InitiallyWritesNull() throws Exception { - ReusableObjectMessage msg = new ReusableObjectMessage(); - StringBuilder sb = new StringBuilder(); + final ReusableObjectMessage msg = new ReusableObjectMessage(); + final StringBuilder sb = new StringBuilder(); msg.formatTo(sb); assertEquals("null", sb.toString()); } @Test public void testFormatTo_WritesLatestSetString() throws Exception { - ReusableObjectMessage msg = new ReusableObjectMessage(); - StringBuilder sb = new StringBuilder(); + final ReusableObjectMessage msg = new ReusableObjectMessage(); + final StringBuilder sb = new StringBuilder(); msg.formatTo(sb); assertEquals("null", sb.toString()); sb.setLength(0); http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/132e9489/log4j-api/src/test/java/org/apache/logging/log4j/message/ReusableParameterizedMessageTest.java ---------------------------------------------------------------------- diff --git a/log4j-api/src/test/java/org/apache/logging/log4j/message/ReusableParameterizedMessageTest.java b/log4j-api/src/test/java/org/apache/logging/log4j/message/ReusableParameterizedMessageTest.java index 00fe130..4b6182b 100644 --- a/log4j-api/src/test/java/org/apache/logging/log4j/message/ReusableParameterizedMessageTest.java +++ b/log4j-api/src/test/java/org/apache/logging/log4j/message/ReusableParameterizedMessageTest.java @@ -29,7 +29,7 @@ public class ReusableParameterizedMessageTest { @Test public void testNoArgs() { final String testMsg = "Test message {}"; - ReusableParameterizedMessage msg = new ReusableParameterizedMessage(); + final ReusableParameterizedMessage msg = new ReusableParameterizedMessage(); msg.set(testMsg, (Object[]) null); String result = msg.getFormattedMessage(); assertEquals(testMsg, result); @@ -129,7 +129,7 @@ public class ReusableParameterizedMessageTest { @Test public void testThrowable() { final String testMsg = "Test message {}"; - ReusableParameterizedMessage msg = new ReusableParameterizedMessage(); + final ReusableParameterizedMessage msg = new ReusableParameterizedMessage(); final Throwable EXCEPTION1 = new IllegalAccessError("#1"); msg.set(testMsg, "msg", EXCEPTION1); assertSame(EXCEPTION1, msg.getThrowable()); http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/132e9489/log4j-api/src/test/java/org/apache/logging/log4j/message/ReusableSimpleMessageTest.java ---------------------------------------------------------------------- diff --git a/log4j-api/src/test/java/org/apache/logging/log4j/message/ReusableSimpleMessageTest.java b/log4j-api/src/test/java/org/apache/logging/log4j/message/ReusableSimpleMessageTest.java index bd560b0..3a56b64 100644 --- a/log4j-api/src/test/java/org/apache/logging/log4j/message/ReusableSimpleMessageTest.java +++ b/log4j-api/src/test/java/org/apache/logging/log4j/message/ReusableSimpleMessageTest.java @@ -27,7 +27,7 @@ public class ReusableSimpleMessageTest { @Test public void testSet_InitializesFormattedMessage() throws Exception { - ReusableSimpleMessage msg = new ReusableSimpleMessage(); + final ReusableSimpleMessage msg = new ReusableSimpleMessage(); msg.set("abc"); assertEquals("abc", msg.getFormattedMessage()); } @@ -39,7 +39,7 @@ public class ReusableSimpleMessageTest { @Test public void testGetFormattedMessage_ReturnsLatestSetString() throws Exception { - ReusableSimpleMessage msg = new ReusableSimpleMessage(); + final ReusableSimpleMessage msg = new ReusableSimpleMessage(); msg.set("abc"); assertEquals("abc", msg.getFormattedMessage()); msg.set("def"); @@ -55,7 +55,7 @@ public class ReusableSimpleMessageTest { @Test public void testGetFormat_ReturnsLatestSetString() throws Exception { - ReusableSimpleMessage msg = new ReusableSimpleMessage(); + final ReusableSimpleMessage msg = new ReusableSimpleMessage(); msg.set("abc"); assertEquals("abc", msg.getFormat()); msg.set("def"); @@ -71,7 +71,7 @@ public class ReusableSimpleMessageTest { @Test public void testGetParameters_ReturnsEmptyArrayAfterMessageSet() throws Exception { - ReusableSimpleMessage msg = new ReusableSimpleMessage(); + final ReusableSimpleMessage msg = new ReusableSimpleMessage(); msg.set("abc"); assertArrayEquals(new Object[0], msg.getParameters()); msg.set("def"); @@ -85,7 +85,7 @@ public class ReusableSimpleMessageTest { @Test public void testGetThrowable_ReturnsNullAfterMessageSet() throws Exception { - ReusableSimpleMessage msg = new ReusableSimpleMessage(); + final ReusableSimpleMessage msg = new ReusableSimpleMessage(); msg.set("abc"); assertNull(msg.getThrowable()); msg.set("def"); @@ -94,16 +94,16 @@ public class ReusableSimpleMessageTest { @Test public void testFormatTo_InitiallyWritesNull() throws Exception { - ReusableSimpleMessage msg = new ReusableSimpleMessage(); - StringBuilder sb = new StringBuilder(); + final ReusableSimpleMessage msg = new ReusableSimpleMessage(); + final StringBuilder sb = new StringBuilder(); msg.formatTo(sb); assertEquals("null", sb.toString()); } @Test public void testFormatTo_WritesLatestSetString() throws Exception { - ReusableSimpleMessage msg = new ReusableSimpleMessage(); - StringBuilder sb = new StringBuilder(); + final ReusableSimpleMessage msg = new ReusableSimpleMessage(); + final StringBuilder sb = new StringBuilder(); msg.formatTo(sb); assertEquals("null", sb.toString()); sb.setLength(0);
