Repository: logging-log4j2 Updated Branches: refs/heads/LOG4J2-1010&LOG4J2-1447-injectable-contextdata&better-datastructure 6146960e0 -> a23b40310
LOG4J2-1010, LOG4J2-1447 change ContextDataFactory and ContextDataInjectorFactory method names from "get" to "create" Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/a23b4031 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/a23b4031 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/a23b4031 Branch: refs/heads/LOG4J2-1010&LOG4J2-1447-injectable-contextdata&better-datastructure Commit: a23b4031029e5d3016650e871307d9d30fddac88 Parents: 6146960 Author: rpopma <[email protected]> Authored: Sat Aug 20 15:16:36 2016 +0900 Committer: rpopma <[email protected]> Committed: Sat Aug 20 15:16:36 2016 +0900 ---------------------------------------------------------------------- .../jpa/converter/ContextDataJsonAttributeConverter.java | 2 +- .../logging/log4j/core/async/RingBufferLogEvent.java | 2 +- .../log4j/core/async/RingBufferLogEventTranslator.java | 2 +- .../logging/log4j/core/impl/ContextDataFactory.java | 2 +- .../log4j/core/impl/ContextDataInjectorFactory.java | 2 +- .../org/apache/logging/log4j/core/impl/Log4jLogEvent.java | 10 +++++----- .../apache/logging/log4j/core/impl/MutableLogEvent.java | 2 +- .../logging/log4j/core/impl/ReusableLogEventFactory.java | 2 +- .../core/jackson/ContextDataAsEntryListDeserializer.java | 2 +- .../log4j/core/jackson/ContextDataDeserializer.java | 2 +- .../logging/log4j/core/layout/LogEventFixtures.java | 2 +- 11 files changed, 15 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/a23b4031/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jpa/converter/ContextDataJsonAttributeConverter.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jpa/converter/ContextDataJsonAttributeConverter.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jpa/converter/ContextDataJsonAttributeConverter.java index 8285a66..93fe95a 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jpa/converter/ContextDataJsonAttributeConverter.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jpa/converter/ContextDataJsonAttributeConverter.java @@ -74,7 +74,7 @@ public class ContextDataJsonAttributeConverter implements AttributeConverter<Con return null; } try { - final MutableContextData result = ContextDataFactory.getContextData(); + final MutableContextData result = ContextDataFactory.createContextData(); final ObjectNode root = (ObjectNode) OBJECT_MAPPER.readTree(s); final Iterator<Map.Entry<String, JsonNode>> entries = root.fields(); while (entries.hasNext()) { http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/a23b4031/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 35bdab2..1ebb114 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 @@ -82,7 +82,7 @@ public class RingBufferLogEvent implements LogEvent, ReusableMessage, CharSequen private Object[] parameters; private transient Throwable thrown; private ThrowableProxy thrownProxy; - private final MutableContextData contextData = ContextDataFactory.getContextData(); + private final MutableContextData contextData = ContextDataFactory.createContextData(); private Marker marker; private String fqcn; private StackTraceElement location; http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/a23b4031/log4j-core/src/main/java/org/apache/logging/log4j/core/async/RingBufferLogEventTranslator.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/async/RingBufferLogEventTranslator.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/async/RingBufferLogEventTranslator.java index 50fd344..9ae27c7 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/async/RingBufferLogEventTranslator.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/async/RingBufferLogEventTranslator.java @@ -35,7 +35,7 @@ import com.lmax.disruptor.EventTranslator; public class RingBufferLogEventTranslator implements EventTranslator<RingBufferLogEvent> { - private final ContextDataInjector injector = ContextDataInjectorFactory.getInjector(); + private final ContextDataInjector injector = ContextDataInjectorFactory.createInjector(); private AsyncLogger asyncLogger; private String loggerName; protected Marker marker; http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/a23b4031/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/ContextDataFactory.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/ContextDataFactory.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/ContextDataFactory.java index 2882ea4..6cf5ad1 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/ContextDataFactory.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/ContextDataFactory.java @@ -33,7 +33,7 @@ import org.apache.logging.log4j.util.PropertiesUtil; public class ContextDataFactory { @SuppressWarnings("unchecked") - public static MutableContextData getContextData() { + public static MutableContextData createContextData() { final String CLASS = PropertiesUtil.getProperties().getStringProperty("log4j2.ContextData", ArrayContextData.class.getName()); try { http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/a23b4031/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/ContextDataInjectorFactory.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/ContextDataInjectorFactory.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/ContextDataInjectorFactory.java index a5253cf..0a255cb 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/ContextDataInjectorFactory.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/ContextDataInjectorFactory.java @@ -41,7 +41,7 @@ public class ContextDataInjectorFactory { * * @return a ContextDataInjector that populates the {@code ContextData} of all {@code LogEvent} objects */ - public static ContextDataInjector getInjector() { + public static ContextDataInjector createInjector() { final String className = PropertiesUtil.getProperties().getStringProperty("log4j2.ContextDataInjector"); if (className == null) { return new ThreadContextDataInjector(); http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/a23b4031/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 e283bea..d97890b 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 @@ -183,7 +183,7 @@ public class Log4jLogEvent implements LogEvent { @SuppressWarnings("unchecked") @Deprecated public Builder setContextMap(final Map<String, String> contextMap) { - contextData = ContextDataFactory.getContextData(); // replace with new instance + contextData = ContextDataFactory.createContextData(); // replace with new instance if (contextMap != null) { for (Map.Entry<String, String> entry : contextMap.entrySet()) { contextData.putValue(entry.getKey(), entry.getValue()); @@ -401,7 +401,7 @@ public class Log4jLogEvent implements LogEvent { this.message = message; this.thrown = thrown; this.thrownProxy = thrownProxy; - this.contextData = contextData == null ? ContextDataFactory.getContextData() : contextData; + this.contextData = contextData == null ? ContextDataFactory.createContextData() : contextData; this.contextStack = contextStack == null ? ThreadContext.EMPTY_STACK : contextStack; this.timeMillis = message instanceof TimestampMessage ? ((TimestampMessage) message).getTimestamp() @@ -417,7 +417,7 @@ public class Log4jLogEvent implements LogEvent { } private static MutableContextData createContextData(final Map<String, String> contextMap) { - final MutableContextData result = ContextDataFactory.getContextData(); + final MutableContextData result = ContextDataFactory.createContextData(); if (contextMap != null) { for (Map.Entry<String, String> entry : contextMap.entrySet()) { result.putValue(entry.getKey(), entry.getValue()); @@ -427,8 +427,8 @@ public class Log4jLogEvent implements LogEvent { } private static MutableContextData createContextData(final List<Property> properties) { - final MutableContextData result = ContextDataFactory.getContextData(); - final ContextDataInjector injector = ContextDataInjectorFactory.getInjector(); + final MutableContextData result = ContextDataFactory.createContextData(); + final ContextDataInjector injector = ContextDataInjectorFactory.createInjector(); injector.injectContextData(properties, result); return result; } http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/a23b4031/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 a5a69d4..08423c6 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 @@ -55,7 +55,7 @@ public class MutableLogEvent implements LogEvent, ReusableMessage { private Object[] parameters; private Throwable thrown; private ThrowableProxy thrownProxy; - private MutableContextData contextData = ContextDataFactory.getContextData(); + private MutableContextData contextData = ContextDataFactory.createContextData(); private Marker marker; private String loggerFqcn; private StackTraceElement source; http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/a23b4031/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/ReusableLogEventFactory.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/ReusableLogEventFactory.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/ReusableLogEventFactory.java index ebfdd1c..cd0db99 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/ReusableLogEventFactory.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/ReusableLogEventFactory.java @@ -38,7 +38,7 @@ public class ReusableLogEventFactory implements LogEventFactory { private static final Clock CLOCK = ClockFactory.getClock(); private static ThreadLocal<MutableLogEvent> mutableLogEventThreadLocal = new ThreadLocal<>(); - private final ContextDataInjector injector = ContextDataInjectorFactory.getInjector(); + private final ContextDataInjector injector = ContextDataInjectorFactory.createInjector(); /** * Creates a log event. http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/a23b4031/log4j-core/src/main/java/org/apache/logging/log4j/core/jackson/ContextDataAsEntryListDeserializer.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/jackson/ContextDataAsEntryListDeserializer.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/jackson/ContextDataAsEntryListDeserializer.java index 90fe08d..4b83fc7 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/jackson/ContextDataAsEntryListDeserializer.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/jackson/ContextDataAsEntryListDeserializer.java @@ -48,7 +48,7 @@ public class ContextDataAsEntryListDeserializer extends StdDeserializer<MutableC final List<MapEntry> list = jp.readValueAs(new TypeReference<List<MapEntry>>() { // empty }); - final MutableContextData contextData = new ContextDataFactory().getContextData(); + final MutableContextData contextData = new ContextDataFactory().createContextData(); for (final MapEntry mapEntry : list) { contextData.putValue(mapEntry.getKey(), mapEntry.getValue()); } http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/a23b4031/log4j-core/src/main/java/org/apache/logging/log4j/core/jackson/ContextDataDeserializer.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/jackson/ContextDataDeserializer.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/jackson/ContextDataDeserializer.java index e17b9a4..0988a98 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/jackson/ContextDataDeserializer.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/jackson/ContextDataDeserializer.java @@ -51,7 +51,7 @@ public class ContextDataDeserializer extends StdDeserializer<MutableContextData> // if (tok != JsonToken.START_OBJECT) { // throw new IOException("Expected data to start with an Object"); // } - final MutableContextData contextData = ContextDataFactory.getContextData(); + final MutableContextData contextData = ContextDataFactory.createContextData(); // Iterate over object fields: while (jp.nextToken() != JsonToken.END_OBJECT) { String fieldName = jp.getCurrentName(); http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/a23b4031/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 7ce4e6c..19e32df 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 @@ -84,7 +84,7 @@ class LogEventFixtures { static void assertEqualLogEvents(final LogEvent expected, final LogEvent actual, final boolean includeSource, final boolean includeContext) { assertEquals(expected.getClass(), actual.getClass()); - assertEquals(includeContext ? expected.getContextData() : ContextDataFactory.getContextData(), actual.getContextData()); + 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());
