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/11/19 00:56:05 UTC
logging-log4j2 git commit: LOG4J2-1447 fix usage of deprecated method
LogEvent.getContextMap
Repository: logging-log4j2
Updated Branches:
refs/heads/master ee6f50d4c -> 1d9c86e24
LOG4J2-1447 fix usage of deprecated method LogEvent.getContextMap
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/1d9c86e2
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/1d9c86e2
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/1d9c86e2
Branch: refs/heads/master
Commit: 1d9c86e24a899135cef4164c0c3fa9eb42449240
Parents: ee6f50d
Author: rpopma <rp...@apache.org>
Authored: Sat Nov 19 09:55:59 2016 +0900
Committer: rpopma <rp...@apache.org>
Committed: Sat Nov 19 09:55:59 2016 +0900
----------------------------------------------------------------------
.../log4j/core/appender/db/jpa/BasicLogEventEntity.java | 1 +
.../log4j/core/appender/rewrite/PropertiesRewritePolicy.java | 2 +-
.../apache/logging/log4j/core/appender/SocketAppenderTest.java | 6 +++---
.../logging/log4j/core/appender/db/jpa/TestBaseEntity.java | 1 +
.../log4j/core/appender/rewrite/MapRewritePolicyTest.java | 2 ++
.../logging/log4j/core/async/RingBufferLogEventTest.java | 2 ++
.../org/apache/logging/log4j/core/impl/Log4jLogEventTest.java | 4 ++++
.../apache/logging/log4j/core/impl/MutableLogEventTest.java | 1 +
.../logging/log4j/core/impl/ReusableLogEventFactoryTest.java | 2 ++
9 files changed, 17 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/1d9c86e2/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jpa/BasicLogEventEntity.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jpa/BasicLogEventEntity.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jpa/BasicLogEventEntity.java
index d318353..5c06316 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jpa/BasicLogEventEntity.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jpa/BasicLogEventEntity.java
@@ -232,6 +232,7 @@ public abstract class BasicLogEventEntity extends AbstractLogEventWrapperEntity
* @see ContextMapAttributeConverter
* @see org.apache.logging.log4j.core.appender.db.jpa.converter.ContextMapJsonAttributeConverter
*/
+ @SuppressWarnings("deprecation")
@Override
@Convert(converter = ContextMapAttributeConverter.class)
public Map<String, String> getContextMap() {
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/1d9c86e2/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rewrite/PropertiesRewritePolicy.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rewrite/PropertiesRewritePolicy.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rewrite/PropertiesRewritePolicy.java
index ad32e28..097d63d 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rewrite/PropertiesRewritePolicy.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rewrite/PropertiesRewritePolicy.java
@@ -64,7 +64,7 @@ public final class PropertiesRewritePolicy implements RewritePolicy {
*/
@Override
public LogEvent rewrite(final LogEvent source) {
- final Map<String, String> props = new HashMap<>(source.getContextMap());
+ final Map<String, String> props = new HashMap<>(source.getContextData().toMap());
for (final Map.Entry<Property, Boolean> entry : properties.entrySet()) {
final Property prop = entry.getKey();
props.put(prop.getName(), entry.getValue().booleanValue() ?
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/1d9c86e2/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/SocketAppenderTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/SocketAppenderTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/SocketAppenderTest.java
index 0f17b9f..64a29ae 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/SocketAppenderTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/SocketAppenderTest.java
@@ -156,7 +156,7 @@ public class SocketAppenderTest {
assertNotNull("No event retrieved", event);
assertTrue("Incorrect event", event.getMessage().getFormattedMessage().equals("This is a test message"));
assertTrue("Message not delivered via TCP", tcpTestServer.getCount() > 0);
- assertEquals(expectedUuidStr, event.getContextMap().get(tcKey));
+ assertEquals(expectedUuidStr, event.getContextData().getValue(tcKey));
event = tcpTestServer.getQueue().poll(3, TimeUnit.SECONDS);
assertNotNull("No event retrieved", event);
assertTrue("Incorrect event", event.getMessage().getFormattedMessage().equals("Throwing an exception"));
@@ -270,7 +270,7 @@ public class SocketAppenderTest {
}
public static class UdpSocketTestServer extends Thread {
-
+
private final DatagramSocket sock;
private boolean shutdown = false;
private Thread thread;
@@ -345,7 +345,7 @@ public class SocketAppenderTest {
public int getLocalPort() {
return serverSocket.getLocalPort();
}
-
+
public void reset() {
queue.clear();
count = 0;
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/1d9c86e2/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/jpa/TestBaseEntity.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/jpa/TestBaseEntity.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/jpa/TestBaseEntity.java
index cc5260f..5d4473e 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/jpa/TestBaseEntity.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/jpa/TestBaseEntity.java
@@ -154,6 +154,7 @@ public class TestBaseEntity extends AbstractLogEventWrapperEntity {
return this.getWrappedEvent().getThrownProxy();
}
+ @SuppressWarnings("deprecation")
@Override
@Transient
public Map<String, String> getContextMap() {
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/1d9c86e2/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rewrite/MapRewritePolicyTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rewrite/MapRewritePolicyTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rewrite/MapRewritePolicyTest.java
index 6ad8617..e18cb00 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rewrite/MapRewritePolicyTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rewrite/MapRewritePolicyTest.java
@@ -156,6 +156,7 @@ public class MapRewritePolicyTest {
assertThat("wrong size", updatedMap, hasSize(2));
}
+ @SuppressWarnings("deprecation")
private void compareLogEvents(final LogEvent orig, final LogEvent changed) {
// Ensure that everything but the Mapped Data is still the same
assertEquals("LoggerName changed", orig.getLoggerName(), changed.getLoggerName());
@@ -167,6 +168,7 @@ public class MapRewritePolicyTest {
changed.getThrown() == null ? null : changed.getThrownProxy().getExtendedStackTrace()
);
assertEquals("ContextMap changed", orig.getContextMap(), changed.getContextMap());
+ assertEquals("ContextData changed", orig.getContextData(), changed.getContextData());
assertEquals("ContextStack changed", orig.getContextStack(), changed.getContextStack());
assertEquals("ThreadName changed", orig.getThreadName(), changed.getThreadName());
assertEquals("Source changed", orig.getSource(), changed.getSource());
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/1d9c86e2/log4j-core/src/test/java/org/apache/logging/log4j/core/async/RingBufferLogEventTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/async/RingBufferLogEventTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/async/RingBufferLogEventTest.java
index fb33926..acfaac2 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/async/RingBufferLogEventTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/async/RingBufferLogEventTest.java
@@ -138,6 +138,7 @@ public class RingBufferLogEventTest {
assertEquals(currentTimeMillis, other.getTimeMillis());
}
+ @SuppressWarnings("deprecation")
@Test
public void testCreateMementoReturnsCopy() {
final RingBufferLogEvent evt = new RingBufferLogEvent();
@@ -164,6 +165,7 @@ public class RingBufferLogEventTest {
assertEquals(evt.getMessage(), actual.getMessage());
assertEquals(evt.getThrown(), actual.getThrown());
assertEquals(evt.getContextMap(), actual.getContextMap());
+ assertEquals(evt.getContextData(), actual.getContextData());
assertEquals(evt.getContextStack(), actual.getContextStack());
assertEquals(evt.getThreadName(), actual.getThreadName());
assertEquals(evt.getTimeMillis(), actual.getTimeMillis());
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/1d9c86e2/log4j-core/src/test/java/org/apache/logging/log4j/core/impl/Log4jLogEventTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/impl/Log4jLogEventTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/impl/Log4jLogEventTest.java
index 57024a4..1acf0b1 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/impl/Log4jLogEventTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/impl/Log4jLogEventTest.java
@@ -94,6 +94,7 @@ public class Log4jLogEventTest {
assertEquals(evt.getLoggerName(), evt2.getLoggerName());
assertEquals(evt.getMarker(), evt2.getMarker());
assertEquals(evt.getContextMap(), evt2.getContextMap());
+ assertEquals(evt.getContextData(), evt2.getContextData());
assertEquals(evt.getContextStack(), evt2.getContextStack());
assertEquals(evt.getMessage(), evt2.getMessage());
assertEquals(evt.getSource(), evt2.getSource());
@@ -123,6 +124,7 @@ public class Log4jLogEventTest {
assertEquals(evt.getLoggerName(), evt2.getLoggerName());
assertEquals(evt.getMarker(), evt2.getMarker());
assertEquals(evt.getContextMap(), evt2.getContextMap());
+ assertEquals(evt.getContextData(), evt2.getContextData());
assertEquals(evt.getContextStack(), evt2.getContextStack());
assertEquals(evt.getMessage(), evt2.getMessage());
assertEquals(evt.getSource(), evt2.getSource());
@@ -234,6 +236,7 @@ public class Log4jLogEventTest {
null, null, null, null, null, 0).getNanoTime());
}
+ @SuppressWarnings("deprecation")
@Test
public void testBuilderCorrectlyCopiesAllEventAttributes() {
final Map<String, String> contextMap = new HashMap<>();
@@ -399,6 +402,7 @@ public class Log4jLogEventTest {
assertNull("source in copy", value);
}
+ @SuppressWarnings("deprecation")
@Test
public void testEquals() {
final Map<String, String> contextMap = new HashMap<>();
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/1d9c86e2/log4j-core/src/test/java/org/apache/logging/log4j/core/impl/MutableLogEventTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/impl/MutableLogEventTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/impl/MutableLogEventTest.java
index 843115d..1d4b58f 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/impl/MutableLogEventTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/impl/MutableLogEventTest.java
@@ -244,6 +244,7 @@ public class MutableLogEventTest {
assertEquals(evt.getLevel(), evt2.getLevel());
assertEquals(evt.getLoggerName(), evt2.getLoggerName());
assertEquals(evt.getMarker(), evt2.getMarker());
+ assertEquals(evt.getContextData(), evt2.getContextData());
assertEquals(evt.getContextMap(), evt2.getContextMap());
assertEquals(evt.getContextStack(), evt2.getContextStack());
assertEquals(evt.getMessage(), evt2.getMessage());
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/1d9c86e2/log4j-core/src/test/java/org/apache/logging/log4j/core/impl/ReusableLogEventFactoryTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/impl/ReusableLogEventFactoryTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/impl/ReusableLogEventFactoryTest.java
index dfc1e90..61eb8d7 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/impl/ReusableLogEventFactoryTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/impl/ReusableLogEventFactoryTest.java
@@ -117,12 +117,14 @@ public class ReusableLogEventFactoryTest {
ReusableLogEventFactory.release(event2[0]);
}
+ @SuppressWarnings("deprecation")
@Test
public void testCreateEventInitFieldsProperly() throws Exception {
final ReusableLogEventFactory factory = new ReusableLogEventFactory();
final LogEvent event = callCreateEvent(factory, "logger", Level.INFO, new SimpleMessage("xyz"), null);
ReusableLogEventFactory.release(event);
assertNotNull(event.getContextMap());
+ assertNotNull(event.getContextData());
assertNotNull(event.getContextStack());
}