You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by rp...@apache.org on 2016/03/08 11:09:44 UTC
[1/2] logging-log4j2 git commit: LOG4J2-1296 bugfix in
ReusableObjectMessage: should not cache formatted message but return latest
set value as is
Repository: logging-log4j2
Updated Branches:
refs/heads/master defe7149b -> db769237d
LOG4J2-1296 bugfix in ReusableObjectMessage: should not cache formatted message but return latest set value as is
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/6d09a482
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/6d09a482
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/6d09a482
Branch: refs/heads/master
Commit: 6d09a482cef57b567d594e138c850fd4bcd085c9
Parents: defe714
Author: rpopma <rp...@apache.org>
Authored: Tue Mar 8 21:09:12 2016 +1100
Committer: rpopma <rp...@apache.org>
Committed: Tue Mar 8 21:09:12 2016 +1100
----------------------------------------------------------------------
.../apache/logging/log4j/message/ReusableObjectMessage.java | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/6d09a482/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 0bae294..5944924 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
@@ -41,11 +41,7 @@ public class ReusableObjectMessage implements ReusableMessage {
*/
@Override
public String getFormattedMessage() {
- // LOG4J2-763: cache formatted string in case obj changes later
- if (objectString == null) {
- objectString = String.valueOf(obj);
- }
- return objectString;
+ return String.valueOf(obj);
}
@Override
[2/2] logging-log4j2 git commit: LOG4J2-1296 added unit tests for
ReusableObjectMessage
Posted by rp...@apache.org.
LOG4J2-1296 added unit tests for ReusableObjectMessage
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/db769237
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/db769237
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/db769237
Branch: refs/heads/master
Commit: db769237d62397b2fc3e0028751230a1cab793fd
Parents: 6d09a48
Author: rpopma <rp...@apache.org>
Authored: Tue Mar 8 21:09:33 2016 +1100
Committer: rpopma <rp...@apache.org>
Committed: Tue Mar 8 21:09:33 2016 +1100
----------------------------------------------------------------------
.../message/ReusableObjectMessageTest.java | 122 +++++++++++++++++++
1 file changed, 122 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/db769237/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
new file mode 100644
index 0000000..961eaa9
--- /dev/null
+++ b/log4j-api/src/test/java/org/apache/logging/log4j/message/ReusableObjectMessageTest.java
@@ -0,0 +1,122 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache license, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the license for the specific language governing permissions and
+ * limitations under the license.
+ */
+package org.apache.logging.log4j.message;
+
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+/**
+ * Tests ReusableObjectMessage.
+ */
+public class ReusableObjectMessageTest {
+
+ @Test
+ public void testSet_InitializesFormattedMessage() throws Exception {
+ ReusableObjectMessage msg = new ReusableObjectMessage();
+ msg.set("abc");
+ assertEquals("abc", msg.getFormattedMessage());
+ }
+
+ @Test
+ public void testGetFormattedMessage_InitiallyNullString() throws Exception {
+ assertEquals("null", new ReusableObjectMessage().getFormattedMessage());
+ }
+
+ @Test
+ public void testGetFormattedMessage_ReturnsLatestSetString() throws Exception {
+ ReusableObjectMessage msg = new ReusableObjectMessage();
+ msg.set("abc");
+ assertEquals("abc", msg.getFormattedMessage());
+ msg.set("def");
+ assertEquals("def", msg.getFormattedMessage());
+ msg.set("xyz");
+ assertEquals("xyz", msg.getFormattedMessage());
+ }
+
+ @Test
+ public void testGetFormat_InitiallyNullString() throws Exception {
+ assertEquals("null", new ReusableObjectMessage().getFormat());
+ }
+
+ @Test
+ public void testGetFormat_ReturnsLatestSetString() throws Exception {
+ ReusableObjectMessage msg = new ReusableObjectMessage();
+ msg.set("abc");
+ assertEquals("abc", msg.getFormat());
+ msg.set("def");
+ assertEquals("def", msg.getFormat());
+ msg.set("xyz");
+ assertEquals("xyz", msg.getFormat());
+ }
+
+ @Test
+ public void testGetParameters_InitiallyReturnsNullObjectInLength1Array() throws Exception {
+ assertArrayEquals(new Object[]{null}, new ReusableObjectMessage().getParameters());
+ }
+
+ @Test
+ public void testGetParameters_ReturnsSetObjectInParameterArrayAfterMessageSet() throws Exception {
+ ReusableObjectMessage msg = new ReusableObjectMessage();
+ msg.set("abc");
+ assertArrayEquals(new Object[]{"abc"}, msg.getParameters());
+ msg.set("def");
+ assertArrayEquals(new Object[]{"def"}, msg.getParameters());
+ }
+
+ @Test
+ public void testGetThrowable_InitiallyReturnsNull() throws Exception {
+ assertNull(new ReusableObjectMessage().getThrowable());
+ }
+
+ @Test
+ public void testGetThrowable_ReturnsNullAfterMessageSet() throws Exception {
+ ReusableObjectMessage msg = new ReusableObjectMessage();
+ msg.set("abc");
+ assertNull(msg.getThrowable());
+ msg.set("def");
+ assertNull(msg.getThrowable());
+ }
+
+ @Test
+ public void testFormatTo_InitiallyWritesNull() throws Exception {
+ ReusableObjectMessage msg = new ReusableObjectMessage();
+ 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();
+ msg.formatTo(sb);
+ assertEquals("null", sb.toString());
+ sb.setLength(0);
+ msg.set("abc");
+ msg.formatTo(sb);
+ assertEquals("abc", sb.toString());
+ sb.setLength(0);
+ msg.set("def");
+ msg.formatTo(sb);
+ assertEquals("def", sb.toString());
+ sb.setLength(0);
+ msg.set("xyz");
+ msg.formatTo(sb);
+ assertEquals("xyz", sb.toString());
+ }
+}
\ No newline at end of file