Repository: logging-log4j2 Updated Branches: refs/heads/master 0db4a578f -> 5f429f79e
Refactor string layouts' String to byte[] conversions. Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/5f429f79 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/5f429f79 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/5f429f79 Branch: refs/heads/master Commit: 5f429f79eb0468a14e4a823457812d3d7a9040cd Parents: 0db4a57 Author: Gary Gregory <[email protected]> Authored: Sun Nov 30 20:19:10 2014 -0500 Committer: Gary Gregory <[email protected]> Committed: Sun Nov 30 20:19:10 2014 -0500 ---------------------------------------------------------------------- .../apache/logging/log4j/core/layout/AbstractStringLayout.java | 4 ++++ .../java/org/apache/logging/log4j/core/layout/GelfLayout.java | 2 +- .../java/org/apache/logging/log4j/core/layout/HtmlLayout.java | 2 +- .../java/org/apache/logging/log4j/core/layout/JsonLayout.java | 4 ++-- .../java/org/apache/logging/log4j/core/layout/PatternLayout.java | 3 +-- .../java/org/apache/logging/log4j/core/layout/XmlLayout.java | 2 +- .../java/org/apache/logging/log4j/test/layout/BasicLayout.java | 2 +- 7 files changed, 11 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5f429f79/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 136d768..89d0604 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 @@ -43,6 +43,10 @@ public abstract class AbstractStringLayout extends AbstractLayout<String> { this.charset = charset == null ? Charsets.UTF_8 : charset; } + protected byte[] getBytes(String s) { + return s.getBytes(charset); + } + protected Charset getCharset() { return charset; } http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5f429f79/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/GelfLayout.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/GelfLayout.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/GelfLayout.java index 704a589..8ead1c7 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/GelfLayout.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/GelfLayout.java @@ -181,7 +181,7 @@ public final class GelfLayout extends AbstractStringLayout { @Override public byte[] toByteArray(final LogEvent event) { - final byte[] bytes = toSerializable(event).getBytes(getCharset()); + final byte[] bytes = getBytes(toSerializable(event)); return bytes.length > compressionThreshold ? compress(bytes) : bytes; } http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5f429f79/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/HtmlLayout.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/HtmlLayout.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/HtmlLayout.java index cd0735c..ad54107 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/HtmlLayout.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/HtmlLayout.java @@ -301,7 +301,7 @@ public final class HtmlLayout extends AbstractStringLayout { sbuf.append("</table>").append(Constants.LINE_SEPARATOR); sbuf.append("<br>").append(Constants.LINE_SEPARATOR); sbuf.append("</body></html>"); - return sbuf.toString().getBytes(getCharset()); + return getBytes(sbuf.toString()); } /** http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5f429f79/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 e8c2a3c..82cd8ec 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 @@ -816,7 +816,7 @@ public final class JsonLayout extends AbstractJacksonLayout { final StringBuilder buf = new StringBuilder(); buf.append('['); buf.append(this.eol); - return buf.toString().getBytes(this.getCharset()); + return getBytes(buf.toString()); } /** @@ -829,7 +829,7 @@ public final class JsonLayout extends AbstractJacksonLayout { if (!this.complete) { return null; } - return (this.eol + ']' + this.eol).getBytes(this.getCharset()); + return getBytes(this.eol + ']' + this.eol); } @Override http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5f429f79/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/PatternLayout.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/PatternLayout.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/PatternLayout.java index acedd9a..45079fa 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/PatternLayout.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/PatternLayout.java @@ -138,8 +138,7 @@ public final class PatternLayout extends AbstractStringLayout { private byte[] strSubstitutorReplace(final byte... b) { if (b != null && config != null) { - final Charset cs = getCharset(); - return config.getStrSubstitutor().replace(new String(b, cs)).getBytes(cs); + return getBytes(config.getStrSubstitutor().replace(new String(b, getCharset()))); } return b; } http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5f429f79/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/XmlLayout.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/XmlLayout.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/XmlLayout.java index 969fea6..df83cca 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/XmlLayout.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/XmlLayout.java @@ -234,7 +234,7 @@ public final class XmlLayout extends AbstractJacksonLayout { if (!complete) { return null; } - return ("</" + ROOT_TAG + '>' + this.eol).getBytes(getCharset()); + return getBytes("</" + ROOT_TAG + '>' + this.eol); } /** http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5f429f79/log4j-core/src/test/java/org/apache/logging/log4j/test/layout/BasicLayout.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/test/layout/BasicLayout.java b/log4j-core/src/test/java/org/apache/logging/log4j/test/layout/BasicLayout.java index 73b8ce3..be5ca6e 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/test/layout/BasicLayout.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/test/layout/BasicLayout.java @@ -35,7 +35,7 @@ public class BasicLayout extends AbstractStringLayout { @Override public byte[] getHeader() { - return HEADER.getBytes(getCharset()); + return getBytes(HEADER); } public BasicLayout(final Charset charset) {
