Skip to content

Commit 9406129

Browse files
committed
Fix JTL static analysis issues
1 parent 752b3b5 commit 9406129

File tree

10 files changed

+12
-10
lines changed

10 files changed

+12
-10
lines changed

log4j-layout-template-json-test/src/test/java/org/apache/logging/log4j/layout/template/json/ThreadLocalRecyclerNestedLoggingTest.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,8 @@ public class ThreadLocalRecyclerNestedLoggingTest {
3838

3939
private static final class ThrowableLoggingInGetMessage extends RuntimeException {
4040

41+
private static final long serialVersionUID = 10127;
42+
4143
private final Logger logger;
4244

4345
private ThrowableLoggingInGetMessage(final Logger logger) {

log4j-layout-template-json-test/src/test/java/org/apache/logging/log4j/layout/template/json/resolver/LevelResolverTest.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,6 @@
2323
import static org.assertj.core.api.Assertions.assertThat;
2424

2525
import org.apache.logging.log4j.Level;
26-
import org.apache.logging.log4j.Marker;
27-
import org.apache.logging.log4j.MarkerManager;
2826
import org.apache.logging.log4j.core.LogEvent;
2927
import org.apache.logging.log4j.core.impl.Log4jLogEvent;
3028
import org.apache.logging.log4j.layout.template.json.JsonTemplateLayout;
@@ -49,7 +47,6 @@ void should_work_with_custom_levels() {
4947
.build();
5048

5149
// Create the log event.
52-
final Marker marker = MarkerManager.getMarker("MARKER");
5350
Level level = Level.forName("CUSTOM_LEVEL", 250);
5451
final LogEvent logEvent = Log4jLogEvent.newBuilder().setLevel(level).build();
5552

log4j-layout-template-json-test/src/test/java/org/apache/logging/log4j/layout/template/json/resolver/MessageResolverTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
class MessageResolverTest {
4747

4848
/**
49-
* @see <a href="https://issues.apache.org/jira/browse/LOG4J2-3080">LOG4J2-3080</a>
49+
* A <a href="https://issues.apache.org/jira/browse/LOG4J2-3080">LOG4J2-3080</a> reproduction.
5050
*/
5151
@Test
5252
@LoggerContextSource("messageFallbackKeyUsingJsonTemplateLayout.xml")

log4j-layout-template-json-test/src/test/java/org/apache/logging/log4j/layout/template/json/resolver/StackTraceStringResolverTest.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -629,6 +629,7 @@ private static final class NonAsciiUtf8MethodNameContainingException extends Run
629629

630630
private static final String NON_ASCII_UTF8_TEXT = "அஆஇฬ๘";
631631

632+
@SuppressWarnings("StaticAssignmentOfThrowable")
632633
private static final NonAsciiUtf8MethodNameContainingException INSTANCE = createInstance();
633634

634635
@SuppressWarnings("UnicodeInCode")

log4j-layout-template-json-test/src/test/java/org/apache/logging/log4j/layout/template/json/resolver/TimestampResolverTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
class TimestampResolverTest {
3232

3333
/**
34-
* @see <a href="https://issues.apache.org/jira/browse/LOG4J2-3183">LOG4J2-3183</a>
34+
* Reproduces <a href="https://issues.apache.org/jira/browse/LOG4J2-3183">LOG4J2-3183</a>.
3535
*/
3636
@Test
3737
void epoch_nanos_should_not_overlap() {

log4j-layout-template-json-test/src/test/java/org/apache/logging/log4j/layout/template/json/util/InstantFormatterTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ void nanoseconds_should_be_formatted() {
5858
}
5959

6060
/**
61-
* @see <a href="https://issues.apache.org/jira/browse/LOG4J2-3614">LOG4J2-3614</a>
61+
* Reproduces <a href="https://issues.apache.org/jira/browse/LOG4J2-3614">LOG4J2-3614</a>.
6262
*/
6363
@Test
6464
void FastDateFormat_failures_should_be_handled() {

log4j-layout-template-json-test/src/test/java/org/apache/logging/log4j/layout/template/json/util/JsonWriterTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
import org.assertj.core.api.SoftAssertions;
4242
import org.junit.jupiter.api.Test;
4343

44-
@SuppressWarnings("DoubleBraceInitialization")
44+
@SuppressWarnings({"DoubleBraceInitialization", "UnnecessaryStringBuilder"})
4545
class JsonWriterTest {
4646

4747
private static final JsonWriter WRITER = JsonWriter.newBuilder()

log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/MessageResolverFactory.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
import org.apache.logging.log4j.core.config.plugins.PluginFactory;
2121

2222
/**
23-
* @see MessageResolver
23+
* A {@link MessageResolver} factory.
2424
*/
2525
@Plugin(name = "MessageResolverFactory", category = TemplateResolverFactory.CATEGORY)
2626
public final class MessageResolverFactory implements EventResolverFactory {

log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/TemplateResolverFactories.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,7 @@ Map<String, F> populateFactoryByName(
102102
}
103103
}
104104

105+
@SuppressWarnings("TypeParameterUnusedInFormals")
105106
private static <V, C extends TemplateResolverContext<V, C>, F extends TemplateResolverFactory<V, C>> F castFactory(
106107
final Class<V> valueClass, final Class<C> contextClass, final TemplateResolverFactory<?, ?> factory) {
107108
final Class<?> factoryValueClass = factory.getValueClass();

log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/TemplateResolverInterceptors.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
*/
1717
package org.apache.logging.log4j.layout.template.json.resolver;
1818

19-
import java.util.LinkedList;
19+
import java.util.ArrayList;
2020
import java.util.List;
2121
import java.util.Map;
2222
import java.util.Set;
@@ -71,7 +71,7 @@ List<I> populateInterceptors(
7171
final Map<String, PluginType<?>> pluginTypeByName,
7272
final Class<V> valueClass,
7373
final Class<C> contextClass) {
74-
final List<I> interceptors = new LinkedList<>();
74+
final List<I> interceptors = new ArrayList<>();
7575
final Set<String> pluginNames = pluginTypeByName.keySet();
7676
for (final String pluginName : pluginNames) {
7777
final PluginType<?> pluginType = pluginTypeByName.get(pluginName);
@@ -100,6 +100,7 @@ List<I> populateInterceptors(
100100
}
101101
}
102102

103+
@SuppressWarnings("TypeParameterUnusedInFormals")
103104
private static <V, C extends TemplateResolverContext<V, C>, I extends TemplateResolverInterceptor<V, C>>
104105
I castInterceptor(
105106
final Class<V> valueClass,

0 commit comments

Comments
 (0)