You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by gg...@apache.org on 2022/01/22 18:27:10 UTC
[logging-log4j2] branch release-2.x updated: Reuse constants.
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch release-2.x
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
The following commit(s) were added to refs/heads/release-2.x by this push:
new 834f212 Reuse constants.
834f212 is described below
commit 834f21292deaf4fd03dd0434c8d2c98d6dcc6da4
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Sat Jan 22 13:27:04 2022 -0500
Reuse constants.
---
.../log4j/message/BasicThreadInformation.java | 12 ++++++-----
.../logging/log4j/message/ThreadDumpMessage.java | 6 ++++--
.../logging/log4j/core/impl/ThrowableProxy.java | 3 ++-
.../logging/log4j/core/layout/GelfLayout.java | 25 ++++++++++++----------
.../core/message/ExtendedThreadInformation.java | 18 +++++++++-------
.../core/pattern/EncodingPatternConverter.java | 15 +++++++------
.../apache/logging/dumbster/smtp/SmtpMessage.java | 8 ++++---
7 files changed, 50 insertions(+), 37 deletions(-)
diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/message/BasicThreadInformation.java b/log4j-api/src/main/java/org/apache/logging/log4j/message/BasicThreadInformation.java
index 623ab89..301f508 100644
--- a/log4j-api/src/main/java/org/apache/logging/log4j/message/BasicThreadInformation.java
+++ b/log4j-api/src/main/java/org/apache/logging/log4j/message/BasicThreadInformation.java
@@ -16,7 +16,9 @@
*/
package org.apache.logging.log4j.message;
-import org.apache.logging.log4j.util.Chars;
+import static org.apache.logging.log4j.util.Chars.LF;
+import static org.apache.logging.log4j.util.Chars.SPACE;
+
import org.apache.logging.log4j.util.StringBuilders;
/**
@@ -84,7 +86,7 @@ class BasicThreadInformation implements ThreadInformation {
*/
@Override
public void printThreadInfo(final StringBuilder sb) {
- StringBuilders.appendDqValue(sb, name).append(Chars.SPACE);
+ StringBuilders.appendDqValue(sb, name).append(SPACE);
if (isDaemon) {
sb.append("daemon ");
}
@@ -92,8 +94,8 @@ class BasicThreadInformation implements ThreadInformation {
if (threadGroupName != null) {
StringBuilders.appendKeyDqValue(sb, "group", threadGroupName);
}
- sb.append('\n');
- sb.append("\tThread state: ").append(state.name()).append('\n');
+ sb.append(LF);
+ sb.append("\tThread state: ").append(state.name()).append(LF);
}
/**
@@ -104,7 +106,7 @@ class BasicThreadInformation implements ThreadInformation {
@Override
public void printStack(final StringBuilder sb, final StackTraceElement[] trace) {
for (final StackTraceElement element : trace) {
- sb.append("\tat ").append(element).append('\n');
+ sb.append("\tat ").append(element).append(LF);
}
}
}
diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/message/ThreadDumpMessage.java b/log4j-api/src/main/java/org/apache/logging/log4j/message/ThreadDumpMessage.java
index 2229948..feb54b7 100644
--- a/log4j-api/src/main/java/org/apache/logging/log4j/message/ThreadDumpMessage.java
+++ b/log4j-api/src/main/java/org/apache/logging/log4j/message/ThreadDumpMessage.java
@@ -16,6 +16,8 @@
*/
package org.apache.logging.log4j.message;
+import static org.apache.logging.log4j.util.Chars.LF;
+
import java.io.InvalidObjectException;
import java.io.ObjectInputStream;
import java.io.Serializable;
@@ -101,13 +103,13 @@ public class ThreadDumpMessage implements Message, StringBuilderFormattable {
public void formatTo(final StringBuilder sb) {
sb.append(title);
if (title.length() > 0) {
- sb.append('\n');
+ sb.append(LF);
}
for (final Map.Entry<ThreadInformation, StackTraceElement[]> entry : threads.entrySet()) {
final ThreadInformation info = entry.getKey();
info.printThreadInfo(sb);
info.printStack(sb, entry.getValue());
- sb.append('\n');
+ sb.append(LF);
}
}
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/ThrowableProxy.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/ThrowableProxy.java
index c8940f6..5eafff4 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/ThrowableProxy.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/ThrowableProxy.java
@@ -28,6 +28,7 @@ import java.util.Set;
import org.apache.logging.log4j.core.pattern.PlainTextRenderer;
import org.apache.logging.log4j.core.pattern.TextRenderer;
+import org.apache.logging.log4j.util.Chars;
import org.apache.logging.log4j.util.StackLocatorUtil;
import org.apache.logging.log4j.util.Strings;
@@ -49,7 +50,7 @@ import org.apache.logging.log4j.util.Strings;
*/
public class ThrowableProxy implements Serializable {
- private static final char EOL = '\n';
+ private static final char EOL = Chars.LF;
private static final String EOL_STR = String.valueOf(EOL);
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 e3fcd81..78048ff 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
@@ -16,6 +16,9 @@
*/
package org.apache.logging.log4j.core.layout;
+import static org.apache.logging.log4j.util.Chars.LF;
+import static org.apache.logging.log4j.util.Chars.NUL;
+
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.OutputStream;
@@ -135,31 +138,31 @@ public final class GelfLayout extends AbstractStringLayout {
private boolean includeThreadContext = true;
@PluginBuilderAttribute
- private boolean includeNullDelimiter = false;
+ private boolean includeNullDelimiter;
@PluginBuilderAttribute
- private boolean includeNewLineDelimiter = false;
+ private boolean includeNewLineDelimiter;
@PluginBuilderAttribute
- private String threadContextIncludes = null;
+ private String threadContextIncludes;
@PluginBuilderAttribute
- private String threadContextExcludes = null;
+ private String threadContextExcludes;
@PluginBuilderAttribute
- private String mapMessageIncludes = null;
+ private String mapMessageIncludes;
@PluginBuilderAttribute
- private String mapMessageExcludes = null;
+ private String mapMessageExcludes;
@PluginBuilderAttribute
private boolean includeMapMessage = true;
@PluginBuilderAttribute
- private boolean omitEmptyFields = false;
+ private boolean omitEmptyFields;
@PluginBuilderAttribute
- private String messagePattern = null;
+ private String messagePattern;
@PluginBuilderAttribute
private String threadContextPrefix = "";
@@ -168,7 +171,7 @@ public final class GelfLayout extends AbstractStringLayout {
private String mapPrefix = "";
@PluginElement("PatternSelector")
- private PatternSelector patternSelector = null;
+ private PatternSelector patternSelector;
public Builder() {
setCharset(StandardCharsets.UTF_8);
@@ -655,10 +658,10 @@ public final class GelfLayout extends AbstractStringLayout {
builder.append(Q);
builder.append('}');
if (includeNullDelimiter) {
- builder.append('\0');
+ builder.append(NUL);
}
if (includeNewLineDelimiter) {
- builder.append('\n');
+ builder.append(LF);
}
return builder;
}
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/message/ExtendedThreadInformation.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/message/ExtendedThreadInformation.java
index af7bf8b..f7f941f 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/message/ExtendedThreadInformation.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/message/ExtendedThreadInformation.java
@@ -16,6 +16,8 @@
*/
package org.apache.logging.log4j.core.message;
+import static org.apache.logging.log4j.util.Chars.LF;
+
import java.lang.management.LockInfo;
import java.lang.management.MonitorInfo;
import java.lang.management.ThreadInfo;
@@ -46,7 +48,7 @@ class ExtendedThreadInformation implements ThreadInformation {
if (threadInfo.isInNative()) {
sb.append(" (in native)");
}
- sb.append('\n');
+ sb.append(LF);
}
@Override
@@ -54,24 +56,24 @@ class ExtendedThreadInformation implements ThreadInformation {
int i = 0;
for (final StackTraceElement element : stack) {
sb.append("\tat ").append(element.toString());
- sb.append('\n');
+ sb.append(LF);
if (i == 0 && threadInfo.getLockInfo() != null) {
final Thread.State ts = threadInfo.getThreadState();
switch (ts) {
case BLOCKED:
sb.append("\t- blocked on ");
formatLock(sb, threadInfo.getLockInfo());
- sb.append('\n');
+ sb.append(LF);
break;
case WAITING:
sb.append("\t- waiting on ");
formatLock(sb, threadInfo.getLockInfo());
- sb.append('\n');
+ sb.append(LF);
break;
case TIMED_WAITING:
sb.append("\t- waiting on ");
formatLock(sb, threadInfo.getLockInfo());
- sb.append('\n');
+ sb.append(LF);
break;
default:
}
@@ -81,7 +83,7 @@ class ExtendedThreadInformation implements ThreadInformation {
if (mi.getLockedStackDepth() == i) {
sb.append("\t- locked ");
formatLock(sb, mi);
- sb.append('\n');
+ sb.append(LF);
}
}
++i;
@@ -89,11 +91,11 @@ class ExtendedThreadInformation implements ThreadInformation {
final LockInfo[] locks = threadInfo.getLockedSynchronizers();
if (locks.length > 0) {
- sb.append("\n\tNumber of locked synchronizers = ").append(locks.length).append('\n');
+ sb.append("\n\tNumber of locked synchronizers = ").append(locks.length).append(LF);
for (final LockInfo li : locks) {
sb.append("\t- ");
formatLock(sb, li);
- sb.append('\n');
+ sb.append(LF);
}
}
}
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/EncodingPatternConverter.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/EncodingPatternConverter.java
index b9b917c..90660ed 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/EncodingPatternConverter.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/EncodingPatternConverter.java
@@ -16,9 +16,10 @@
*/
package org.apache.logging.log4j.core.pattern;
+import static org.apache.logging.log4j.util.Chars.CR;
+import static org.apache.logging.log4j.util.Chars.LF;
+
import java.util.List;
-import java.util.function.Function;
-import java.util.stream.Stream;
import org.apache.logging.log4j.core.LogEvent;
import org.apache.logging.log4j.core.config.Configuration;
@@ -131,9 +132,9 @@ public final class EncodingPatternConverter extends LogEventPatternConverter {
private String escapeChar(char c) {
switch (c) {
- case '\r':
+ case CR:
return "\\r";
- case '\n':
+ case LF:
return "\\n";
case '&':
return "&";
@@ -176,7 +177,7 @@ public final class EncodingPatternConverter extends LogEventPatternConverter {
for (int i = origLength - 1; i >= start; i--) {
final char c = toAppendTo.charAt(i);
- if (c == '\r' || c == '\n') {
+ if (c == CR || c == LF) {
firstSpecialChar = i;
toAppendTo.append(' '); // make room for the escape sequence
}
@@ -185,11 +186,11 @@ public final class EncodingPatternConverter extends LogEventPatternConverter {
for (int i = origLength - 1, j = toAppendTo.length(); i >= firstSpecialChar; i--) {
final char c = toAppendTo.charAt(i);
switch (c) {
- case '\r':
+ case CR:
toAppendTo.setCharAt(--j, 'r');
toAppendTo.setCharAt(--j, '\\');
break;
- case '\n':
+ case LF:
toAppendTo.setCharAt(--j, 'n');
toAppendTo.setCharAt(--j, '\\');
break;
diff --git a/log4j-core/src/test/java/org/apache/logging/dumbster/smtp/SmtpMessage.java b/log4j-core/src/test/java/org/apache/logging/dumbster/smtp/SmtpMessage.java
index ebc3cf5..e861b18 100644
--- a/log4j-core/src/test/java/org/apache/logging/dumbster/smtp/SmtpMessage.java
+++ b/log4j-core/src/test/java/org/apache/logging/dumbster/smtp/SmtpMessage.java
@@ -16,6 +16,8 @@
*/
package org.apache.logging.dumbster.smtp;
+import static org.apache.logging.log4j.util.Chars.LF;
+
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Iterator;
@@ -145,12 +147,12 @@ public class SmtpMessage {
msg.append(name);
msg.append(": ");
msg.append(value);
- msg.append('\n');
+ msg.append(LF);
}
}
- msg.append('\n');
+ msg.append(LF);
msg.append(body);
- msg.append('\n');
+ msg.append(LF);
return msg.toString();
}
}