This is an automated email from the ASF dual-hosted git repository.
pkarwasz pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
The following commit(s) were added to refs/heads/main by this push:
new 256128015d Restores LinkedHashMap
256128015d is described below
commit 256128015d4041a18668ef8ac3503982e3a934a6
Author: Piotr P. Karwasz <[email protected]>
AuthorDate: Tue Sep 26 14:57:49 2023 +0200
Restores LinkedHashMap
---
.../logging/log4j/message/MapMessageTest.java | 23 +++++++++++-----------
1 file changed, 12 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 df64945ed1..a4545e15f0 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
@@ -21,6 +21,7 @@ import java.sql.Date;
import java.sql.Time;
import java.util.Arrays;
import java.util.Collections;
+import java.util.LinkedHashMap;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
@@ -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", Map.of(
- "chars", new char[]{'a', 'b', 'c'},
- "booleans", new boolean[]{true, false},
- "bytes", new byte[]{1, 2},
- "shorts", new short[]{3, 4},
- "ints", new int[]{256, 257},
- "longs", new long[]{2147483648L, 2147483649L},
- "floats", new float[]{1.0F, 1.1F},
- "doubles", new double[]{2.0D, 2.1D},
- "objects", new Object[]{"foo", "bar"}
- ))
+ .with("key4", map)
.getFormattedMessage(new String[]{"JSON"});
final String expectedJson = ("{" +
"'key1':'val1'," +
