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/08/07 13:18:57 UTC
[21/38] logging-log4j2 git commit: [LOG4J2-1482] Improper header in
CsvParameterLayout. Update code after feedback from Remko on the dev ML.
[LOG4J2-1482] Improper header in CsvParameterLayout. Update code after
feedback from Remko on the dev ML.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/6478f94c
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/6478f94c
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/6478f94c
Branch: refs/heads/LOG4J2-1010&LOG4J2-1447-injectable-contextdata&better-datastructure
Commit: 6478f94c0851540372748f0af8b2bf83b07d7cb1
Parents: 07cb3aa
Author: Gary Gregory <gg...@apache.org>
Authored: Thu Aug 4 17:15:02 2016 -0700
Committer: Gary Gregory <gg...@apache.org>
Committed: Thu Aug 4 17:15:02 2016 -0700
----------------------------------------------------------------------
.../log4j/core/layout/AbstractStringLayout.java | 17 ++++++++++-------
.../logging/log4j/core/layout/JsonLayout.java | 5 ++---
.../logging/log4j/core/layout/YamlLayout.java | 5 ++---
3 files changed, 14 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/6478f94c/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/AbstractStringLayout.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/AbstractStringLayout.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/AbstractStringLayout.java
index 0634cc9..9e7deb5 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/AbstractStringLayout.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/AbstractStringLayout.java
@@ -21,7 +21,6 @@ import org.apache.logging.log4j.core.StringLayout;
import org.apache.logging.log4j.core.config.Configuration;
import org.apache.logging.log4j.core.config.LoggerConfig;
import org.apache.logging.log4j.core.impl.DefaultLogEventFactory;
-import org.apache.logging.log4j.core.impl.LogEventFactory;
import org.apache.logging.log4j.core.util.Constants;
import org.apache.logging.log4j.core.util.StringEncoder;
import org.apache.logging.log4j.util.PropertiesUtil;
@@ -192,7 +191,7 @@ public abstract class AbstractStringLayout extends AbstractLayout<String> implem
*/
@Override
public byte[] getFooter() {
- return serializeToBytes(footerSerializer, super.getFooter(), DefaultLogEventFactory.getInstance());
+ return serializeToBytes(footerSerializer, super.getFooter());
}
public Serializer getFooterSerializer() {
@@ -206,13 +205,17 @@ public abstract class AbstractStringLayout extends AbstractLayout<String> implem
*/
@Override
public byte[] getHeader() {
- return serializeToBytes(headerSerializer, super.getHeader(), DefaultLogEventFactory.getInstance());
+ return serializeToBytes(headerSerializer, super.getHeader());
}
public Serializer getHeaderSerializer() {
return headerSerializer;
}
+ protected DefaultLogEventFactory getLogEventFactory() {
+ return DefaultLogEventFactory.getInstance();
+ }
+
/**
* Returns a {@code Encoder<StringBuilder>} that this Layout implementation can use for encoding log events.
*
@@ -225,21 +228,21 @@ public abstract class AbstractStringLayout extends AbstractLayout<String> implem
return textEncoder;
}
- protected byte[] serializeToBytes(final Serializer serializer, final byte[] defaultValue, final LogEventFactory logEventFactory) {
- final String serializable = serializeToString(serializer, logEventFactory);
+ protected byte[] serializeToBytes(final Serializer serializer, final byte[] defaultValue) {
+ final String serializable = serializeToString(serializer);
if (serializer == null) {
return defaultValue;
}
return StringEncoder.toBytes(serializable, getCharset());
}
- protected String serializeToString(final Serializer serializer, final LogEventFactory logEventFactory) {
+ protected String serializeToString(final Serializer serializer) {
if (serializer == null) {
return null;
}
final LoggerConfig rootLogger = getConfiguration().getRootLogger();
// Using "" for the FQCN, does it matter?
- final LogEvent logEvent = logEventFactory.createEvent(rootLogger.getName(), null, Strings.EMPTY,
+ final LogEvent logEvent = getLogEventFactory().createEvent(rootLogger.getName(), null, Strings.EMPTY,
rootLogger.getLevel(), null, null, null);
return serializer.toSerializable(logEvent);
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/6478f94c/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/JsonLayout.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/JsonLayout.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/JsonLayout.java
index 239a59f..e9d87ae 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/JsonLayout.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/JsonLayout.java
@@ -32,7 +32,6 @@ import org.apache.logging.log4j.core.config.plugins.Plugin;
import org.apache.logging.log4j.core.config.plugins.PluginAttribute;
import org.apache.logging.log4j.core.config.plugins.PluginConfiguration;
import org.apache.logging.log4j.core.config.plugins.PluginFactory;
-import org.apache.logging.log4j.core.impl.DefaultLogEventFactory;
/**
* Appends a series of JSON events as strings serialized as bytes.
@@ -829,7 +828,7 @@ public final class JsonLayout extends AbstractJacksonLayout {
return null;
}
final StringBuilder buf = new StringBuilder();
- final String str = serializeToString(getHeaderSerializer(), DefaultLogEventFactory.getInstance());
+ final String str = serializeToString(getHeaderSerializer());
if (str != null) {
buf.append(str);
}
@@ -849,7 +848,7 @@ public final class JsonLayout extends AbstractJacksonLayout {
}
final StringBuilder buf = new StringBuilder();
buf.append(this.eol);
- final String str = serializeToString(getFooterSerializer(), DefaultLogEventFactory.getInstance());
+ final String str = serializeToString(getFooterSerializer());
if (str != null) {
buf.append(str);
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/6478f94c/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/YamlLayout.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/YamlLayout.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/YamlLayout.java
index 4b7a0c6..6f3e103 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/YamlLayout.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/YamlLayout.java
@@ -32,7 +32,6 @@ import org.apache.logging.log4j.core.config.plugins.Plugin;
import org.apache.logging.log4j.core.config.plugins.PluginAttribute;
import org.apache.logging.log4j.core.config.plugins.PluginConfiguration;
import org.apache.logging.log4j.core.config.plugins.PluginFactory;
-import org.apache.logging.log4j.core.impl.DefaultLogEventFactory;
import org.apache.logging.log4j.util.Strings;
/**
@@ -729,7 +728,7 @@ public final class YamlLayout extends AbstractJacksonLayout {
return null;
}
final StringBuilder buf = new StringBuilder();
- final String str = serializeToString(getHeaderSerializer(), DefaultLogEventFactory.getInstance());
+ final String str = serializeToString(getHeaderSerializer());
if (str != null) {
buf.append(str);
}
@@ -749,7 +748,7 @@ public final class YamlLayout extends AbstractJacksonLayout {
}
final StringBuilder buf = new StringBuilder();
buf.append(this.eol);
- final String str = serializeToString(getFooterSerializer(), DefaultLogEventFactory.getInstance());
+ final String str = serializeToString(getFooterSerializer());
if (str != null) {
buf.append(str);
}