You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by rg...@apache.org on 2015/10/13 06:09:01 UTC
[05/50] logging-log4j2 git commit: Checkstyle: field definition order,
method order, format, line length.
Checkstyle: field definition order, method order, format, line length.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/dc3f626f
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/dc3f626f
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/dc3f626f
Branch: refs/heads/master
Commit: dc3f626fff796176e975e6099af4fc2cbd2c7990
Parents: 2b3b8a3
Author: rpopma <rp...@apache.org>
Authored: Sun Oct 4 00:10:09 2015 +0200
Committer: Ralph Goers <rg...@nextiva.com>
Committed: Sat Oct 3 23:08:06 2015 -0700
----------------------------------------------------------------------
.../log4j/core/layout/AbstractLayout.java | 4 +-
.../log4j/core/layout/AbstractStringLayout.java | 46 ++++++++++----------
2 files changed, 25 insertions(+), 25 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/dc3f626f/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/AbstractLayout.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/AbstractLayout.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/AbstractLayout.java
index 20b25bf..4fa1d8e 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/AbstractLayout.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/AbstractLayout.java
@@ -32,13 +32,13 @@ import org.apache.logging.log4j.status.StatusLogger;
*/
public abstract class AbstractLayout<T extends Serializable> implements Layout<T>, Serializable {
- private static final long serialVersionUID = 1L;
-
/**
* Allow subclasses access to the status logger without creating another instance.
*/
protected static final Logger LOGGER = StatusLogger.getLogger();
+ private static final long serialVersionUID = 1L;
+
/**
* The header to include when the stream is opened. May be null.
*/
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/dc3f626f/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 5fcc6f6..a21d11c 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
@@ -26,16 +26,32 @@ import org.apache.logging.log4j.core.LogEvent;
*/
public abstract class AbstractStringLayout extends AbstractLayout<String> {
- private static final long serialVersionUID = 1L;
+ /**
+ * Default length for new StringBuilder instances: {@value} .
+ */
protected static final int DEFAULT_STRING_BUILDER_SIZE = 1024;
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * The charset for the formatted message.
+ */
+ // TODO: Charset is not serializable. Implement read/writeObject() ?
+ private final Charset charset;
+
+ protected AbstractStringLayout(final Charset charset) {
+ this(charset, null, null);
+ }
+
+ protected AbstractStringLayout(final Charset charset, final byte[] header, final byte[] footer) {
+ super(header, footer);
+ this.charset = charset == null ? StandardCharsets.UTF_8 : charset;
+ }
/**
* Converts a String to a byte[].
*
- * @param str
- * if null, return null.
- * @param charset
- * if null, use the default charset.
+ * @param str if null, return null.
+ * @param charset if null, use the default charset.
* @return a byte[]
*/
static byte[] toBytes(final String str, final Charset charset) {
@@ -50,7 +66,7 @@ public abstract class AbstractStringLayout extends AbstractLayout<String> {
@Override
protected StringBuilder initialValue() {
return new StringBuilder(DEFAULT_STRING_BUILDER_SIZE);
- }
+ }
};
}
@@ -60,21 +76,6 @@ public abstract class AbstractStringLayout extends AbstractLayout<String> {
return buf;
}
- /**
- * The charset for the formatted message.
- */
- // TODO: Charset is not serializable. Implement read/writeObject() ?
- private final Charset charset;
-
- protected AbstractStringLayout(final Charset charset) {
- this(charset, null, null);
- }
-
- protected AbstractStringLayout(final Charset charset, final byte[] header, final byte[] footer) {
- super(header, footer);
- this.charset = charset == null ? StandardCharsets.UTF_8 : charset;
- }
-
protected byte[] getBytes(final String s) {
return s.getBytes(charset);
}
@@ -94,8 +95,7 @@ public abstract class AbstractStringLayout extends AbstractLayout<String> {
/**
* Formats the Log Event as a byte array.
*
- * @param event
- * The Log Event.
+ * @param event The Log Event.
* @return The formatted event as a byte array.
*/
@Override