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:56 UTC
[20/38] logging-log4j2 git commit: Sort methods.
Sort methods.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/07cb3aab
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/07cb3aab
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/07cb3aab
Branch: refs/heads/LOG4J2-1010&LOG4J2-1447-injectable-contextdata&better-datastructure
Commit: 07cb3aab3ceb822058dd62f035077977a9e5b077
Parents: f4f8eaf
Author: Gary Gregory <gg...@apache.org>
Authored: Thu Aug 4 17:12:52 2016 -0700
Committer: Gary Gregory <gg...@apache.org>
Committed: Thu Aug 4 17:12:52 2016 -0700
----------------------------------------------------------------------
.../log4j/core/layout/AbstractStringLayout.java | 50 ++++++++++----------
1 file changed, 25 insertions(+), 25 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/07cb3aab/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 5ac98e7..0634cc9 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
@@ -65,12 +65,6 @@ public abstract class AbstractStringLayout extends AbstractLayout<String> implem
private static final ThreadLocal<StringBuilder> threadLocal = new ThreadLocal<>();
- private Encoder<StringBuilder> textEncoder;
-
- private static int size(final String property, final int defaultValue) {
- return PropertiesUtil.getProperties().getIntegerProperty(property, defaultValue);
- }
-
/**
* Returns a {@code StringBuilder} that this Layout implementation can use to write the formatted log event to.
*
@@ -87,13 +81,6 @@ public abstract class AbstractStringLayout extends AbstractLayout<String> implem
return result;
}
- protected static void trimToMaxSize(final StringBuilder stringBuilder) {
- if (stringBuilder.length() > MAX_STRING_BUILDER_SIZE) {
- stringBuilder.setLength(MAX_STRING_BUILDER_SIZE);
- stringBuilder.trimToSize();
- }
- }
-
// LOG4J2-1151: If the built-in JDK 8 encoders are available we should use them.
private static boolean isPreJava8() {
final String version = System.getProperty("java.version");
@@ -105,6 +92,19 @@ public abstract class AbstractStringLayout extends AbstractLayout<String> implem
return true;
}
}
+
+ private static int size(final String property, final int defaultValue) {
+ return PropertiesUtil.getProperties().getIntegerProperty(property, defaultValue);
+ }
+
+ protected static void trimToMaxSize(final StringBuilder stringBuilder) {
+ if (stringBuilder.length() > MAX_STRING_BUILDER_SIZE) {
+ stringBuilder.setLength(MAX_STRING_BUILDER_SIZE);
+ stringBuilder.trimToSize();
+ }
+ }
+
+ private Encoder<StringBuilder> textEncoder;
/**
* The charset for the formatted message.
*/
@@ -161,18 +161,6 @@ public abstract class AbstractStringLayout extends AbstractLayout<String> implem
textEncoder = Constants.ENABLE_DIRECT_ENCODERS ? new StringBuilderEncoder(charset) : null;
}
- /**
- * Returns a {@code Encoder<StringBuilder>} that this Layout implementation can use for encoding log events.
- *
- * @return a {@code Encoder<StringBuilder>}
- */
- protected Encoder<StringBuilder> getStringBuilderEncoder() {
- if (textEncoder == null) {
- textEncoder = new StringBuilderEncoder(getCharset());
- }
- return textEncoder;
- }
-
protected byte[] getBytes(final String s) {
if (useCustomEncoding) { // rely on branch prediction to eliminate this check if false
return StringEncoder.encodeSingleByteChars(s);
@@ -225,6 +213,18 @@ public abstract class AbstractStringLayout extends AbstractLayout<String> implem
return headerSerializer;
}
+ /**
+ * Returns a {@code Encoder<StringBuilder>} that this Layout implementation can use for encoding log events.
+ *
+ * @return a {@code Encoder<StringBuilder>}
+ */
+ protected Encoder<StringBuilder> getStringBuilderEncoder() {
+ if (textEncoder == null) {
+ textEncoder = new StringBuilderEncoder(getCharset());
+ }
+ return textEncoder;
+ }
+
protected byte[] serializeToBytes(final Serializer serializer, final byte[] defaultValue, final LogEventFactory logEventFactory) {
final String serializable = serializeToString(serializer, logEventFactory);
if (serializer == null) {