Fix static analysis issues

Author: vy

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

@@ -16,6 +16,7 @@
  */
 package org.apache.logging.log4j.layout.template.json;
 
+import java.io.Serial;
 import java.nio.charset.StandardCharsets;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -37,6 +38,9 @@ public class NestedLoggingTest {
 
     private static final class ThrowableLoggingInGetMessage extends RuntimeException {
 
+        @Serial
+        private static final long serialVersionUID = 42L;
+
         private final Logger logger;
 
         private ThrowableLoggingInGetMessage(final Logger logger) {

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

@@ -16,12 +16,13 @@
  */
 package org.apache.logging.log4j.layout.template.json.resolver;
 
-import static org.apache.logging.log4j.layout.template.json.TestHelpers.*;
+import static org.apache.logging.log4j.layout.template.json.TestHelpers.CONFIGURATION;
+import static org.apache.logging.log4j.layout.template.json.TestHelpers.asMap;
+import static org.apache.logging.log4j.layout.template.json.TestHelpers.usingSerializedLogEventAccessor;
+import static org.apache.logging.log4j.layout.template.json.TestHelpers.writeJson;
 import static org.assertj.core.api.Assertions.assertThat;
 
 import org.apache.logging.log4j.Level;
-import org.apache.logging.log4j.Marker;
-import org.apache.logging.log4j.MarkerManager;
 import org.apache.logging.log4j.core.LogEvent;
 import org.apache.logging.log4j.core.impl.Log4jLogEvent;
 import org.apache.logging.log4j.layout.template.json.JsonTemplateLayout;
@@ -46,7 +47,6 @@ void should_work_with_custom_levels() {
                 .build();
 
         // Create the log event.
-        final Marker marker = MarkerManager.getMarker("MARKER");
         Level level = Level.forName("CUSTOM_LEVEL", 250);
         final LogEvent logEvent = Log4jLogEvent.newBuilder().setLevel(level).build();
 

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

@@ -43,7 +43,7 @@
 class MessageResolverTest {
 
     /**
-     * @see <a href="https://issues.apache.org/jira/browse/LOG4J2-3080">LOG4J2-3080</a>
+     * Tests the inconsistent <code>fallbackKey</code> behaviour described in <a href="https://issues.apache.org/jira/browse/LOG4J2-3080">LOG4J2-3080</a>.
      */
     @Test
     @LoggerContextSource("messageFallbackKeyUsingJsonTemplateLayout.xml")

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

@@ -39,6 +39,7 @@
 import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
 
+@SuppressWarnings("StaticAssignmentOfThrowable")
 class StackTraceStringResolverTest {
 
     ////////////////////////////////////////////////////////////////////////////

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

@@ -28,7 +28,7 @@
 class TimestampResolverTest {
 
     /**
-     * @see <a href="https://issues.apache.org/jira/browse/LOG4J2-3183">LOG4J2-3183</a>
+     * Tests epoch nanoseconds do not overlap as reported in <a href="https://issues.apache.org/jira/browse/LOG4J2-3183">LOG4J2-3183</a>.
      */
     @Test
     void epoch_nanos_should_not_overlap() {

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

@@ -433,12 +433,7 @@ void test_writeString_emitter_excessive_string() {
     void test_writeString_emitter_excessive_string_ending_with_high_surrogate() {
         withLockedWriter(writer -> {
             final int maxStringLength = writer.getMaxStringLength();
-            @SuppressWarnings("StringBufferReplaceableByString")
-            final String excessiveString = new StringBuilder()
-                    .append("x".repeat(maxStringLength - 1))
-                    .append(HI_SURROGATE)
-                    .append(LO_SURROGATE)
-                    .toString();
+            final String excessiveString = "x".repeat(maxStringLength - 1) + HI_SURROGATE + LO_SURROGATE;
             final String expectedJson =
                     "\"" + "x".repeat(maxStringLength - 1) + writer.getTruncatedStringSuffix() + '"';
             final BiConsumer<StringBuilder, String> emitter = StringBuilder::append;
@@ -479,12 +474,7 @@ void test_writeString_formattable_excessive_string() {
     void test_writeString_formattable_excessive_string_ending_with_high_surrogate() {
         withLockedWriter(writer -> {
             final int maxStringLength = writer.getMaxStringLength();
-            @SuppressWarnings("StringBufferReplaceableByString")
-            final String excessiveString = new StringBuilder()
-                    .append("x".repeat(maxStringLength - 1))
-                    .append(HI_SURROGATE)
-                    .append(LO_SURROGATE)
-                    .toString();
+            final String excessiveString = "x".repeat(maxStringLength - 1) + HI_SURROGATE + LO_SURROGATE;
             final String expectedJson =
                     "\"" + "x".repeat(maxStringLength - 1) + writer.getTruncatedStringSuffix() + '"';
             final String actualJson =
@@ -549,12 +539,7 @@ void test_writeString_excessive_seq() {
     void test_writeString_excessive_seq_ending_with_high_surrogate() {
         withLockedWriter(writer -> {
             final int maxStringLength = writer.getMaxStringLength();
-            @SuppressWarnings("StringBufferReplaceableByString")
-            final CharSequence seq = new StringBuilder()
-                    .append("x".repeat(maxStringLength - 1))
-                    .append(HI_SURROGATE)
-                    .append(LO_SURROGATE)
-                    .toString();
+            final CharSequence seq = "x".repeat(maxStringLength - 1) + HI_SURROGATE + LO_SURROGATE;
             final String expectedJson =
                     "\"" + "x".repeat(maxStringLength - 1) + writer.getTruncatedStringSuffix() + '"';
             final String actualJson = writer.use(() -> writer.writeString(seq));
@@ -614,13 +599,7 @@ void test_writeString_excessive_buffer() {
     void test_writerString_excessive_buffer_ending_with_high_surrogate() {
         withLockedWriter(writer -> {
             final int maxStringLength = writer.getMaxStringLength();
-            @SuppressWarnings("StringBufferReplaceableByString")
-            final char[] buffer = new StringBuilder()
-                    .append("x".repeat(maxStringLength - 1))
-                    .append(HI_SURROGATE)
-                    .append(LO_SURROGATE)
-                    .toString()
-                    .toCharArray();
+            final char[] buffer = ("x".repeat(maxStringLength - 1) + HI_SURROGATE + LO_SURROGATE).toCharArray();
             final String expectedJson =
                     "\"" + "x".repeat(maxStringLength - 1) + writer.getTruncatedStringSuffix() + '"';
             final String actualJson = writer.use(() -> writer.writeString(buffer));

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

@@ -21,7 +21,7 @@
 import org.apache.logging.log4j.plugins.PluginFactory;
 
 /**
- * @see MessageResolver
+ * A {@link MessageResolver} factory.
  */
 @Namespace(TemplateResolverFactory.CATEGORY)
 @Plugin("MessageResolverFactory")

log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/util/JsonWriter.java

@@ -700,7 +700,7 @@ private void writeNumber(final Number number) {
         } else {
             final long longNumber = number.longValue();
             final double doubleValue = number.doubleValue();
-            if (Double.compare(longNumber, doubleValue) == 0) {
+            if (Double.compare((double) longNumber, doubleValue) == 0) {
                 writeNumber(longNumber);
             } else {
                 writeNumber(doubleValue);