This is an automated email from the ASF dual-hosted git repository. vy pushed a commit to branch release-2.x in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit d92dad362cc60375e9fcd1dddc08b1f94e3b905e Author: Volkan Yazıcı <[email protected]> AuthorDate: Thu Feb 4 10:21:22 2021 +0100 Fix compiler warnings in JsonTemplateLayout. --- .../logging/log4j/layout/template/json/util/MapAccessor.java | 2 +- .../layout/template/json/util/StringParameterParser.java | 2 +- .../json/JsonTemplateLayoutNullEventDelimiterTest.java | 11 +++++++++-- .../log4j/layout/template/json/JsonTemplateLayoutTest.java | 11 +++++++++-- .../layout/template/json/util/StringParameterParserTest.java | 2 +- 5 files changed, 21 insertions(+), 7 deletions(-) diff --git a/log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/util/MapAccessor.java b/log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/util/MapAccessor.java index 3deb2da..6396e77 100644 --- a/log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/util/MapAccessor.java +++ b/log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/util/MapAccessor.java @@ -172,7 +172,7 @@ public class MapAccessor { if (this == instance) { return true; } - if (instance == null || getClass() != instance.getClass()) { + if (!(instance instanceof MapAccessor)) { return false; } final MapAccessor that = (MapAccessor) instance; diff --git a/log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/util/StringParameterParser.java b/log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/util/StringParameterParser.java index 2db794e..2600c14 100644 --- a/log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/util/StringParameterParser.java +++ b/log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/util/StringParameterParser.java @@ -58,7 +58,7 @@ public final class StringParameterParser { @Override public String toString() { - return null; + return "null"; } } diff --git a/log4j-layout-template-json/src/test/java/org/apache/logging/log4j/layout/template/json/JsonTemplateLayoutNullEventDelimiterTest.java b/log4j-layout-template-json/src/test/java/org/apache/logging/log4j/layout/template/json/JsonTemplateLayoutNullEventDelimiterTest.java index 9c16871..80cce67 100644 --- a/log4j-layout-template-json/src/test/java/org/apache/logging/log4j/layout/template/json/JsonTemplateLayoutNullEventDelimiterTest.java +++ b/log4j-layout-template-json/src/test/java/org/apache/logging/log4j/layout/template/json/JsonTemplateLayoutNullEventDelimiterTest.java @@ -129,13 +129,20 @@ public class JsonTemplateLayoutNullEventDelimiterTest { } @Override - public synchronized void close() throws InterruptedException { + public synchronized void close() { if (closed) { throw new IllegalStateException("shutdown has already been invoked"); } closed = true; interrupt(); - join(3_000L); + try { + join(3_000L); + } catch (InterruptedException ignored) { + // Due to JDK-7027157, we shouldn't throw an InterruptedException + // from an AutoCloseable#close() method. Hence we catch it and + // then restore the interrupted flag. + Thread.currentThread().interrupt(); + } } } diff --git a/log4j-layout-template-json/src/test/java/org/apache/logging/log4j/layout/template/json/JsonTemplateLayoutTest.java b/log4j-layout-template-json/src/test/java/org/apache/logging/log4j/layout/template/json/JsonTemplateLayoutTest.java index 24c2040..6c81991 100644 --- a/log4j-layout-template-json/src/test/java/org/apache/logging/log4j/layout/template/json/JsonTemplateLayoutTest.java +++ b/log4j-layout-template-json/src/test/java/org/apache/logging/log4j/layout/template/json/JsonTemplateLayoutTest.java @@ -1979,13 +1979,20 @@ class JsonTemplateLayoutTest { } @Override - public synchronized void close() throws InterruptedException { + public synchronized void close() { if (closed) { throw new IllegalStateException("shutdown has already been invoked"); } closed = true; interrupt(); - join(3_000L); + try { + join(3_000L); + } catch (InterruptedException ignored) { + // Due to JDK-7027157, we shouldn't throw an InterruptedException + // from an AutoCloseable#close() method. Hence we catch it and + // then restore the interrupted flag. + Thread.currentThread().interrupt(); + } } } diff --git a/log4j-layout-template-json/src/test/java/org/apache/logging/log4j/layout/template/json/util/StringParameterParserTest.java b/log4j-layout-template-json/src/test/java/org/apache/logging/log4j/layout/template/json/util/StringParameterParserTest.java index 92bbe55..f279070 100644 --- a/log4j-layout-template-json/src/test/java/org/apache/logging/log4j/layout/template/json/util/StringParameterParserTest.java +++ b/log4j-layout-template-json/src/test/java/org/apache/logging/log4j/layout/template/json/util/StringParameterParserTest.java @@ -378,7 +378,7 @@ class StringParameterParserTest { void test_NullValue_toString() { final Map<String, Value> map = StringParameterParser.parse("a"); final NullValue value = (NullValue) map.get("a"); - Assertions.assertThat(value.toString()).isEqualTo(null); + Assertions.assertThat(value.toString()).isEqualTo("null"); } @Test
