This is an automated email from the ASF dual-hosted git repository. pkarwasz pushed a commit to branch bnd in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit ea7e6a97898ce67be4463440d7ea04936ce6cae0 Author: Piotr P. Karwasz <[email protected]> AuthorDate: Tue Sep 26 14:59:22 2023 +0200 Fix Error Prone errors --- .../logging/log4j/message/MapMessageTest.java | 23 +++++++++++----------- .../logging/log4j/message/ObjectMessageTest.java | 1 + 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/log4j-api-test/src/test/java/org/apache/logging/log4j/message/MapMessageTest.java b/log4j-api-test/src/test/java/org/apache/logging/log4j/message/MapMessageTest.java index d7344c30d4..70e1c258da 100644 --- a/log4j-api-test/src/test/java/org/apache/logging/log4j/message/MapMessageTest.java +++ b/log4j-api-test/src/test/java/org/apache/logging/log4j/message/MapMessageTest.java @@ -24,6 +24,7 @@ import java.util.Collections; import java.util.LinkedHashMap; import java.util.LinkedList; import java.util.List; +import java.util.Map; import com.google.common.base.Strings; import org.apache.logging.log4j.util.StringBuilderFormattable; @@ -116,6 +117,16 @@ public class MapMessageTest { @Test public void testJsonFormatterNestedObjectSupport() { + final Map<String, Object> map = new LinkedHashMap<>(); + map.put("chars", new char[]{'a', 'b', 'c'}); + map.put("booleans", new boolean[]{true, false}); + map.put("bytes", new byte[]{1, 2}); + map.put("shorts", new short[]{3, 4}); + map.put("ints", new int[]{256, 257}); + map.put("longs", new long[]{2147483648L, 2147483649L}); + map.put("floats", new float[]{1.0F, 1.1F}); + map.put("doubles", new double[]{2.0D, 2.1D}); + map.put("objects", new Object[]{"foo", "bar"}); final String actualJson = new ObjectMapMessage() .with("key1", "val1") .with("key2", Collections.singletonMap("key2.1", "val2.1")) @@ -127,17 +138,7 @@ public class MapMessageTest { Arrays.asList(true, false), new BigDecimal(30), Collections.singletonMap("key3.3", "val3.3"))) - .with("key4", new LinkedHashMap<String, Object>() {{ - put("chars", new char[]{'a', 'b', 'c'}); - put("booleans", new boolean[]{true, false}); - put("bytes", new byte[]{1, 2}); - put("shorts", new short[]{3, 4}); - put("ints", new int[]{256, 257}); - put("longs", new long[]{2147483648L, 2147483649L}); - put("floats", new float[]{1.0F, 1.1F}); - put("doubles", new double[]{2.0D, 2.1D}); - put("objects", new Object[]{"foo", "bar"}); - }}) + .with("key4", map) .getFormattedMessage(new String[]{"JSON"}); final String expectedJson = ("{" + "'key1':'val1'," + diff --git a/log4j-api-test/src/test/java/org/apache/logging/log4j/message/ObjectMessageTest.java b/log4j-api-test/src/test/java/org/apache/logging/log4j/message/ObjectMessageTest.java index ba93e4563c..15f0660f75 100644 --- a/log4j-api-test/src/test/java/org/apache/logging/log4j/message/ObjectMessageTest.java +++ b/log4j-api-test/src/test/java/org/apache/logging/log4j/message/ObjectMessageTest.java @@ -78,6 +78,7 @@ public class ObjectMessageTest { @Test public void testDeserializeNonSerializableParamEqualIfToStringSame() { + @SuppressWarnings("EqualsHashCode") class NonSerializable { @Override public boolean equals(final Object other) {
