Skip to content

Commit 2f5bbb8

Browse files
authored
Minor suggestions and replaced use of obsolete Date-API (#76)
1 parent 71a9c2b commit 2f5bbb8

File tree

6 files changed

+12
-9
lines changed

6 files changed

+12
-9
lines changed

ecs-logging-core/src/main/java/co/elastic/logging/EcsJsonSerializer.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,14 @@
2727
import java.io.PrintWriter;
2828
import java.io.Writer;
2929
import java.util.Map;
30+
import java.util.regex.Pattern;
3031

3132
public class EcsJsonSerializer {
3233

3334
private static final TimestampSerializer TIMESTAMP_SERIALIZER = new TimestampSerializer();
3435
private static final ThreadLocal<StringBuilder> messageStringBuilder = new ThreadLocal<StringBuilder>();
3536
private static final String NEW_LINE = System.getProperty("line.separator");
37+
private static final Pattern NEW_LINE_PATTERN = Pattern.compile("\\n");
3638

3739
public static CharSequence toNullSafeString(final CharSequence s) {
3840
return s == null ? "" : s;
@@ -196,7 +198,7 @@ public static void serializeException(StringBuilder builder, String exceptionCla
196198
builder.append("\",");
197199
if (stackTraceAsArray) {
198200
builder.append("\"error.stack_trace\":[").append(NEW_LINE);
199-
for (String line : stackTrace.split("\\n")) {
201+
for (String line : NEW_LINE_PATTERN.split(stackTrace)) {
200202
appendQuoted(builder, line);
201203
}
202204
builder.append("]");

jul-ecs-formatter/src/test/java/co/elastic/logging/jul/JulLoggingTestTest.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050

5151
public class JulLoggingTestTest extends AbstractEcsLoggingTest {
5252

53-
private final class InMemoryStreamHandler extends StreamHandler {
53+
private static final class InMemoryStreamHandler extends StreamHandler {
5454
private InMemoryStreamHandler(OutputStream out, Formatter formatter) {
5555
super(out, formatter);
5656
}
@@ -74,9 +74,9 @@ public void publish(LogRecord record) {
7474

7575
private final EcsFormatter formatter = new EcsFormatter();
7676

77-
private Logger logger = Logger.getLogger("");
77+
private final Logger logger = Logger.getLogger("");
7878

79-
private ByteArrayOutputStream out = new ByteArrayOutputStream();
79+
private final ByteArrayOutputStream out = new ByteArrayOutputStream();
8080

8181
private LogRecord record;
8282

log4j-ecs-layout/src/test/java/co/elastic/logging/log4j/ListAppender.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
import java.util.List;
3232

3333
class ListAppender extends AppenderSkeleton {
34-
private List<String> logEvents = new ArrayList<>();
34+
private final List<String> logEvents = new ArrayList<String>();
3535

3636
@Override
3737
protected void append(LoggingEvent event) {

log4j2-ecs-layout/src/main/java/co/elastic/logging/log4j2/EcsLayout.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
public class EcsLayout extends AbstractStringLayout {
6060

6161
public static final Charset UTF_8 = Charset.forName("UTF-8");
62-
public static final String[] JSON_FORMAT = {"JSON"};
62+
static final String[] JSON_FORMAT = {"JSON"};
6363

6464
private final TriConsumer<String, Object, StringBuilder> WRITE_MDC = new TriConsumer<String, Object, StringBuilder>() {
6565
@Override
@@ -336,7 +336,7 @@ public static class Builder extends AbstractStringLayout.Builder<EcsLayout.Build
336336
}
337337

338338
public KeyValuePair[] getAdditionalFields() {
339-
return additionalFields;
339+
return additionalFields.clone();
340340
}
341341

342342
public String getServiceName() {
@@ -361,7 +361,7 @@ public boolean isIncludeOrigin() {
361361
* @return this builder
362362
*/
363363
public EcsLayout.Builder setAdditionalFields(final KeyValuePair[] additionalFields) {
364-
this.additionalFields = additionalFields;
364+
this.additionalFields = additionalFields.clone();
365365
return asBuilder();
366366
}
367367

log4j2-ecs-layout/src/test/java/co/elastic/logging/log4j2/ParameterizedStructuredMessage.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ public void accept(String key, Object value, StringBuilder builder) {
3939
}
4040
}
4141
};
42+
private static final long serialVersionUID = -170788861790476303L;
4243

4344
private final String message;
4445

logback-ecs-encoder/src/main/java/co/elastic/logging/logback/EcsEncoder.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ public class EcsEncoder extends EncoderBase<ILoggingEvent> {
4747
private boolean includeMarkers = false;
4848
private ThrowableProxyConverter throwableProxyConverter;
4949
private boolean includeOrigin;
50-
private List<Pair> additionalFields = new ArrayList<Pair>();
50+
private final List<Pair> additionalFields = new ArrayList<Pair>();
5151

5252
@Override
5353
public byte[] headerBytes() {

0 commit comments

Comments
 (0)