You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by gg...@apache.org on 2018/10/29 23:05:01 UTC
logging-log4j2 git commit: [LOG4J2-2493] Remove deprecated code.
Still a bit more to do.
Repository: logging-log4j2
Updated Branches:
refs/heads/master 0c1ad7ccd -> d7db912b0
[LOG4J2-2493] Remove deprecated code. Still a bit more to do.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/d7db912b
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/d7db912b
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/d7db912b
Branch: refs/heads/master
Commit: d7db912b045d07b537e388797c41217112cfbe26
Parents: 0c1ad7c
Author: Gary Gregory <ga...@gmail.com>
Authored: Mon Oct 29 17:04:55 2018 -0600
Committer: Gary Gregory <ga...@gmail.com>
Committed: Mon Oct 29 17:04:55 2018 -0600
----------------------------------------------------------------------
.../logging/log4j/core/AbstractLogEvent.java | 11 -----------
.../org/apache/logging/log4j/core/LogEvent.java | 17 +----------------
.../log4j/core/async/RingBufferLogEvent.java | 6 ------
.../logging/log4j/core/impl/Log4jLogEvent.java | 8 --------
.../logging/log4j/core/impl/MutableLogEvent.java | 5 -----
.../appender/rewrite/MapRewritePolicyTest.java | 1 -
.../log4j/core/async/RingBufferLogEventTest.java | 1 -
.../logging/log4j/core/impl/Log4jLogEventTest.java | 2 --
.../log4j/core/impl/MutableLogEventTest.java | 3 ---
.../core/impl/ReusableLogEventFactoryTest.java | 1 -
.../log4j/core/layout/LogEventFixtures.java | 1 -
.../logging/log4j/flume/appender/FlumeEvent.java | 9 ---------
.../log4j/jpa/appender/BasicLogEventEntity.java | 14 --------------
.../log4j/jpa/appender/LogEventEntityTest.java | 8 --------
.../logging/log4j/jpa/appender/TestBaseEntity.java | 7 -------
.../log4j/jpa/appender/TestBasicEntity.java | 11 -----------
.../log4j/jackson/AbstractLogEventMixIn.java | 7 -------
.../logging/log4j/jackson/LogEventJsonMixIn.java | 6 ------
.../jackson/LogEventWithContextListMixIn.java | 6 ------
.../log4j/perf/jmh/jpa/TestBasicEntity.java | 6 ------
20 files changed, 1 insertion(+), 129 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/d7db912b/log4j-core/src/main/java/org/apache/logging/log4j/core/AbstractLogEvent.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/AbstractLogEvent.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/AbstractLogEvent.java
index f1e6aed..35cbc94 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/AbstractLogEvent.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/AbstractLogEvent.java
@@ -16,9 +16,6 @@
*/
package org.apache.logging.log4j.core;
-import java.util.Collections;
-import java.util.Map;
-
import org.apache.logging.log4j.Level;
import org.apache.logging.log4j.Marker;
import org.apache.logging.log4j.ThreadContext;
@@ -52,14 +49,6 @@ public abstract class AbstractLogEvent implements LogEvent {
return null;
}
- /**
- * Returns {@link Collections#emptyMap()}.
- */
- @Override
- public Map<String, String> getContextMap() {
- return Collections.emptyMap();
- }
-
@Override
public ContextStack getContextStack() {
return ThreadContext.EMPTY_STACK;
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/d7db912b/log4j-core/src/main/java/org/apache/logging/log4j/core/LogEvent.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/LogEvent.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/LogEvent.java
index 017eb2e..e12ab63 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/LogEvent.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/LogEvent.java
@@ -36,16 +36,10 @@ import org.apache.logging.log4j.util.ReadOnlyStringMap;
* {@link org.apache.logging.log4j.Level} that the message was logged at. If a
* {@link org.apache.logging.log4j.Marker} was used, then it is included here. The contents of the
* {@link org.apache.logging.log4j.ThreadContext} at the time of the log call are provided via
- * {@link #getContextMap()} and {@link #getContextStack()}. If a {@link java.lang.Throwable} was included in the log
+ * {@link #getContextData()} and {@link #getContextStack()}. If a {@link java.lang.Throwable} was included in the log
* call, then it is provided via {@link #getThrown()}. When this class is serialized, the attached Throwable will
* be wrapped into a {@link org.apache.logging.log4j.core.impl.ThrowableProxy} so that it may be safely serialized
* and deserialized properly without causing problems if the exception class is not available on the other end.
- * <p>
- * Since version 2.7, {@link #getContextMap()} is deprecated in favor of {@link #getContextData()}, which
- * can carry both {@code ThreadContext} data as well as other context data supplied by the
- * {@linkplain org.apache.logging.log4j.core.impl.ContextDataInjectorFactory configured}
- * {@link ContextDataInjector}.
- * </p>
*/
public interface LogEvent extends Serializable {
@@ -57,15 +51,6 @@ public interface LogEvent extends Serializable {
LogEvent toImmutable();
/**
- * Gets the context map (also know as Mapped Diagnostic Context or MDC).
- *
- * @return The context map, never {@code null}.
- * @deprecated use {@link #getContextData()} instead
- */
- @Deprecated
- Map<String, String> getContextMap();
-
- /**
* Returns the {@code ReadOnlyStringMap} object holding context data key-value pairs.
* <p>
* Context data (also known as Mapped Diagnostic Context or MDC) is data that is set by the application to be
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/d7db912b/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 96059a9..030ce56 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
@@ -348,12 +348,6 @@ public class RingBufferLogEvent implements LogEvent, ReusableMessage, CharSequen
this.contextData = contextData;
}
- @SuppressWarnings("unchecked")
- @Override
- public Map<String, String> getContextMap() {
- return contextData.toMap();
- }
-
@Override
public ContextStack getContextStack() {
return contextStack;
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/d7db912b/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/Log4jLogEvent.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/Log4jLogEvent.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/Log4jLogEvent.java
index b842715..5a8402b 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/Log4jLogEvent.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/Log4jLogEvent.java
@@ -545,14 +545,6 @@ public class Log4jLogEvent implements LogEvent {
public ReadOnlyStringMap getContextData() {
return contextData;
}
- /**
- * Returns the immutable copy of the ThreadContext Map.
- * @return The context Map.
- */
- @Override
- public Map<String, String> getContextMap() {
- return contextData.toMap();
- }
/**
* Returns an immutable copy of the ThreadContext stack.
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/d7db912b/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/MutableLogEvent.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/MutableLogEvent.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/MutableLogEvent.java
index 80c086a..53cb503 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/MutableLogEvent.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/MutableLogEvent.java
@@ -378,11 +378,6 @@ public class MutableLogEvent implements LogEvent, ReusableMessage, ParameterVisi
return contextData;
}
- @Override
- public Map<String, String> getContextMap() {
- return contextData.toMap();
- }
-
public void setContextData(final StringMap mutableContextData) {
this.contextData = mutableContextData;
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/d7db912b/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 3247f82..f311007 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
@@ -172,7 +172,6 @@ public class MapRewritePolicyTest {
orig.getThrown() == null ? null : orig.getThrownProxy().getExtendedStackTrace(),
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());
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/d7db912b/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 bb891cd..07a02c7 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
@@ -173,7 +173,6 @@ public class RingBufferLogEventTest {
assertEquals(evt.getLevel(), actual.getLevel());
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());
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/d7db912b/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 ebc8209..59a223e 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
@@ -114,7 +114,6 @@ public class Log4jLogEventTest {
assertEquals(evt.getLevel(), evt2.getLevel());
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());
@@ -144,7 +143,6 @@ public class Log4jLogEventTest {
assertEquals(evt.getLevel(), evt2.getLevel());
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());
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/d7db912b/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 273502a..e8544bc 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
@@ -224,7 +224,6 @@ public class MutableLogEventTest {
mutable.setThrown(new Exception());
mutable.setTimeMillis(56789);
- assertNotNull("context map", mutable.getContextMap());
assertNotNull("context stack", mutable.getContextStack());
assertTrue("end of batch", mutable.isEndOfBatch());
assertTrue("incl loc", mutable.isIncludeLocation());
@@ -296,7 +295,6 @@ public class MutableLogEventTest {
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());
assertNotNull(evt2.getSource());
@@ -341,7 +339,6 @@ public class MutableLogEventTest {
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());
assertNotNull(evt2.getSource());
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/d7db912b/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 cb9eea3..c11f92e 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
@@ -123,7 +123,6 @@ public class ReusableLogEventFactoryTest {
final ReusableLogEventFactory factory = new ReusableLogEventFactory();
final LogEvent event = callCreateEvent(factory, "logger", Level.INFO, new SimpleMessage("xyz"), null);
try {
- assertNotNull(event.getContextMap());
assertNotNull(event.getContextData());
assertNotNull(event.getContextStack());
} finally {
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/d7db912b/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/LogEventFixtures.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/LogEventFixtures.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/LogEventFixtures.java
index 4e85eb7..2fffad4 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/LogEventFixtures.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/LogEventFixtures.java
@@ -88,7 +88,6 @@ public class LogEventFixtures {
final boolean includeContext, final boolean includeStacktrace) {
assertEquals(expected.getClass(), actual.getClass());
assertEquals(includeContext ? expected.getContextData() : ContextDataFactory.createContextData(), actual.getContextData());
- assertEquals(includeContext ? expected.getContextMap() : Collections.EMPTY_MAP, actual.getContextMap());
assertEquals(expected.getContextStack(), actual.getContextStack());
assertEquals(expected.getLevel(), actual.getLevel());
assertEquals(expected.getLoggerName(), actual.getLoggerName());
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/d7db912b/log4j-flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeEvent.java
----------------------------------------------------------------------
diff --git a/log4j-flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeEvent.java b/log4j-flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeEvent.java
index a471004..1e736f3 100644
--- a/log4j-flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeEvent.java
+++ b/log4j-flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeEvent.java
@@ -332,15 +332,6 @@ public class FlumeEvent extends SimpleEvent implements LogEvent {
}
/**
- * Returns a copy of the context Map.
- * @return a copy of the context Map.
- */
- @Override
- public Map<String, String> getContextMap() {
- return contextMap;
- }
-
- /**
* Returns the context data of the {@code LogEvent} that this {@code FlumeEvent} was constructed with.
* @return the context data of the {@code LogEvent} that this {@code FlumeEvent} was constructed with.
*/
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/d7db912b/log4j-jpa/src/main/java/org/apache/logging/log4j/jpa/appender/BasicLogEventEntity.java
----------------------------------------------------------------------
diff --git a/log4j-jpa/src/main/java/org/apache/logging/log4j/jpa/appender/BasicLogEventEntity.java b/log4j-jpa/src/main/java/org/apache/logging/log4j/jpa/appender/BasicLogEventEntity.java
index f48fd46..4c5bd01 100644
--- a/log4j-jpa/src/main/java/org/apache/logging/log4j/jpa/appender/BasicLogEventEntity.java
+++ b/log4j-jpa/src/main/java/org/apache/logging/log4j/jpa/appender/BasicLogEventEntity.java
@@ -227,20 +227,6 @@ public abstract class BasicLogEventEntity extends AbstractLogEventWrapperEntity
}
/**
- * Gets the context map. Annotated with {@code @Convert(converter = ContextMapAttributeConverter.class)}.
- *
- * @return the context map.
- * @see ContextMapAttributeConverter
- * @see org.apache.logging.log4j.jpa.converter.ContextMapJsonAttributeConverter
- */
- @SuppressWarnings("deprecation")
- @Override
- @Convert(converter = ContextMapAttributeConverter.class)
- public Map<String, String> getContextMap() {
- return this.getWrappedEvent().getContextMap();
- }
-
- /**
* Gets the context stack. Annotated with {@code @Convert(converter = ContextStackAttributeConverter.class)}.
*
* @return the context stack.
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/d7db912b/log4j-jpa/src/test/java/org/apache/logging/log4j/jpa/appender/LogEventEntityTest.java
----------------------------------------------------------------------
diff --git a/log4j-jpa/src/test/java/org/apache/logging/log4j/jpa/appender/LogEventEntityTest.java b/log4j-jpa/src/test/java/org/apache/logging/log4j/jpa/appender/LogEventEntityTest.java
index 502b4fa..dc83f8f 100644
--- a/log4j-jpa/src/test/java/org/apache/logging/log4j/jpa/appender/LogEventEntityTest.java
+++ b/log4j-jpa/src/test/java/org/apache/logging/log4j/jpa/appender/LogEventEntityTest.java
@@ -17,8 +17,6 @@
package org.apache.logging.log4j.jpa.appender;
-import java.util.Map;
-
import org.apache.logging.log4j.Level;
import org.apache.logging.log4j.Marker;
import org.apache.logging.log4j.ThreadContext.ContextStack;
@@ -26,7 +24,6 @@ import org.apache.logging.log4j.core.LogEvent;
import org.apache.logging.log4j.core.impl.ThrowableProxy;
import org.apache.logging.log4j.core.time.Instant;
import org.apache.logging.log4j.core.time.MutableInstant;
-import org.apache.logging.log4j.jpa.appender.AbstractLogEventWrapperEntity;
import org.apache.logging.log4j.message.Message;
import org.junit.Assert;
import org.junit.Test;
@@ -40,11 +37,6 @@ public class LogEventEntityTest {
private static final long serialVersionUID = 2L;
@Override
- public Map<String, String> getContextMap() {
- return null;
- }
-
- @Override
public ContextStack getContextStack() {
return null;
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/d7db912b/log4j-jpa/src/test/java/org/apache/logging/log4j/jpa/appender/TestBaseEntity.java
----------------------------------------------------------------------
diff --git a/log4j-jpa/src/test/java/org/apache/logging/log4j/jpa/appender/TestBaseEntity.java b/log4j-jpa/src/test/java/org/apache/logging/log4j/jpa/appender/TestBaseEntity.java
index 522372a..ae85df1 100644
--- a/log4j-jpa/src/test/java/org/apache/logging/log4j/jpa/appender/TestBaseEntity.java
+++ b/log4j-jpa/src/test/java/org/apache/logging/log4j/jpa/appender/TestBaseEntity.java
@@ -164,13 +164,6 @@ public class TestBaseEntity extends AbstractLogEventWrapperEntity {
return this.getWrappedEvent().getThrownProxy();
}
- @SuppressWarnings("deprecation")
- @Override
- @Transient
- public Map<String, String> getContextMap() {
- return this.getWrappedEvent().getContextMap();
- }
-
@Override
@Transient
public ReadOnlyStringMap getContextData() {
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/d7db912b/log4j-jpa/src/test/java/org/apache/logging/log4j/jpa/appender/TestBasicEntity.java
----------------------------------------------------------------------
diff --git a/log4j-jpa/src/test/java/org/apache/logging/log4j/jpa/appender/TestBasicEntity.java b/log4j-jpa/src/test/java/org/apache/logging/log4j/jpa/appender/TestBasicEntity.java
index b98d525..12a38c4 100644
--- a/log4j-jpa/src/test/java/org/apache/logging/log4j/jpa/appender/TestBasicEntity.java
+++ b/log4j-jpa/src/test/java/org/apache/logging/log4j/jpa/appender/TestBasicEntity.java
@@ -16,10 +16,7 @@
*/
package org.apache.logging.log4j.jpa.appender;
-import java.util.Map;
-
import javax.persistence.Column;
-import javax.persistence.Convert;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
@@ -27,8 +24,6 @@ import javax.persistence.Id;
import javax.persistence.Table;
import org.apache.logging.log4j.core.LogEvent;
-import org.apache.logging.log4j.jpa.appender.BasicLogEventEntity;
-import org.apache.logging.log4j.jpa.converter.ContextMapJsonAttributeConverter;
@Entity
@Table(name = "jpaBasicLogEntry")
@@ -57,10 +52,4 @@ public class TestBasicEntity extends BasicLogEventEntity {
this.id = id;
}
- @Override
- @Convert(converter = ContextMapJsonAttributeConverter.class)
- @Column(name = "contextMapJson")
- public Map<String, String> getContextMap() {
- return super.getContextMap();
- }
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/d7db912b/log4j-layout-jackson/src/main/java/org/apache/logging/log4j/jackson/AbstractLogEventMixIn.java
----------------------------------------------------------------------
diff --git a/log4j-layout-jackson/src/main/java/org/apache/logging/log4j/jackson/AbstractLogEventMixIn.java b/log4j-layout-jackson/src/main/java/org/apache/logging/log4j/jackson/AbstractLogEventMixIn.java
index 43784d6..059c09d 100644
--- a/log4j-layout-jackson/src/main/java/org/apache/logging/log4j/jackson/AbstractLogEventMixIn.java
+++ b/log4j-layout-jackson/src/main/java/org/apache/logging/log4j/jackson/AbstractLogEventMixIn.java
@@ -16,8 +16,6 @@
*/
package org.apache.logging.log4j.jackson;
-import java.util.Map;
-
import org.apache.logging.log4j.core.LogEvent;
import org.apache.logging.log4j.message.Message;
@@ -53,11 +51,6 @@ public abstract class AbstractLogEventMixIn implements LogEvent {
private static final long serialVersionUID = 1L;
- @Deprecated
- @Override
- @JsonIgnore
- public abstract Map<String, String> getContextMap();
-
@JsonSerialize(using = MessageSerializer.class)
@JsonDeserialize(using = SimpleMessageDeserializer.class)
@Override
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/d7db912b/log4j-layout-jackson/src/main/java/org/apache/logging/log4j/jackson/LogEventJsonMixIn.java
----------------------------------------------------------------------
diff --git a/log4j-layout-jackson/src/main/java/org/apache/logging/log4j/jackson/LogEventJsonMixIn.java b/log4j-layout-jackson/src/main/java/org/apache/logging/log4j/jackson/LogEventJsonMixIn.java
index e9607bd..8061e24 100644
--- a/log4j-layout-jackson/src/main/java/org/apache/logging/log4j/jackson/LogEventJsonMixIn.java
+++ b/log4j-layout-jackson/src/main/java/org/apache/logging/log4j/jackson/LogEventJsonMixIn.java
@@ -16,8 +16,6 @@
*/
package org.apache.logging.log4j.jackson;
-import java.util.Map;
-
import org.apache.logging.log4j.Level;
import org.apache.logging.log4j.Marker;
import org.apache.logging.log4j.ThreadContext.ContextStack;
@@ -67,10 +65,6 @@ public abstract class LogEventJsonMixIn /* extends AbstractLogEventMixIn */ impl
@Override
public abstract ReadOnlyStringMap getContextData();
- @Override
- @JsonIgnore
- public abstract Map<String, String> getContextMap();
-
@JsonProperty(JsonConstants.ELT_CONTEXT_STACK)
@Override
public abstract ContextStack getContextStack();
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/d7db912b/log4j-layout-jackson/src/main/java/org/apache/logging/log4j/jackson/LogEventWithContextListMixIn.java
----------------------------------------------------------------------
diff --git a/log4j-layout-jackson/src/main/java/org/apache/logging/log4j/jackson/LogEventWithContextListMixIn.java b/log4j-layout-jackson/src/main/java/org/apache/logging/log4j/jackson/LogEventWithContextListMixIn.java
index cd0639b..8c0fe5a 100644
--- a/log4j-layout-jackson/src/main/java/org/apache/logging/log4j/jackson/LogEventWithContextListMixIn.java
+++ b/log4j-layout-jackson/src/main/java/org/apache/logging/log4j/jackson/LogEventWithContextListMixIn.java
@@ -16,8 +16,6 @@
*/
package org.apache.logging.log4j.jackson;
-import java.util.Map;
-
import org.apache.logging.log4j.Level;
import org.apache.logging.log4j.Marker;
import org.apache.logging.log4j.ThreadContext.ContextStack;
@@ -50,10 +48,6 @@ abstract class LogEventWithContextListMixIn implements LogEvent {
@Override
public abstract ReadOnlyStringMap getContextData();
- @Override
- @JsonIgnore
- public abstract Map<String, String> getContextMap();
-
@JsonProperty(JsonConstants.ELT_CONTEXT_STACK)
@Override
public abstract ContextStack getContextStack();
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/d7db912b/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/jpa/TestBasicEntity.java
----------------------------------------------------------------------
diff --git a/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/jpa/TestBasicEntity.java b/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/jpa/TestBasicEntity.java
index eb55925..ee41f60 100644
--- a/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/jpa/TestBasicEntity.java
+++ b/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/jpa/TestBasicEntity.java
@@ -57,10 +57,4 @@ public class TestBasicEntity extends BasicLogEventEntity {
this.id = id;
}
- @Override
- @Convert(converter = ContextMapJsonAttributeConverter.class)
- @Column(name = "contextMapJson")
- public Map<String, String> getContextMap() {
- return super.getContextMap();
- }
}