Merge branch '2.18'

FasterXML · May 8, 2024 · d6e9abf · d6e9abf
2 parents f3ecae0 + 66abd8b
commit d6e9abf
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 4 deletions.
diff --git a/...urner/src/test/java/tools/jackson/module/afterburner/format/ColletionFormatShapeTest.java b/...urner/src/test/java/tools/jackson/module/afterburner/format/ColletionFormatShapeTest.java
@@ -14,7 +14,10 @@ public class ColletionFormatShapeTest extends AfterburnerTestBase
     // [databind#40]: Allow serialization 'as POJO' (resulting in JSON Object) 
     @JsonPropertyOrder({ "size", "value" })
     @JsonFormat(shape=Shape.POJO)
-    @JsonIgnoreProperties({ "empty" }) // from 'isEmpty()'
+    @JsonIgnoreProperties({
+        "empty", // from 'isEmpty()'
+        "first", "last" // JDK 21 additions
+    })
     static class CollectionAsPOJO
         extends ArrayList<String>
     {
@@ -50,7 +53,14 @@ public void testListAsObjectRoundtrip() throws Exception
         list.add("a");
         list.add("b");
         String json = MAPPER.writeValueAsString(list);
-        assertEquals("{\"size\":2,\"values\":[\"a\",\"b\"]}", json);
+
+        // 2023-10-17, tatu: JDK 21 introduced new properties, so check
+        //  just that we have certain things, ignore extra
+        JsonNode doc = MAPPER.readTree(json);
+        //assertEquals("{\"size\":2,\"values\":[\"a\",\"b\"]}", json);
+
+        assertEquals(2, doc.path("size").intValue());
+        assertEquals("[\"a\",\"b\"]", doc.path("values").toString());
 
         // and then bring it back!
         CollectionAsPOJO result = MAPPER.readValue(json, CollectionAsPOJO.class);

diff --git a/blackbird/src/test/java/tools/jackson/module/blackbird/format/ColletionFormatShapeTest.java b/blackbird/src/test/java/tools/jackson/module/blackbird/format/ColletionFormatShapeTest.java
@@ -14,7 +14,10 @@ public class ColletionFormatShapeTest extends BlackbirdTestBase
     // [databind#40]: Allow serialization 'as POJO' (resulting in JSON Object) 
     @JsonPropertyOrder({ "size", "value" })
     @JsonFormat(shape=Shape.POJO)
-    @JsonIgnoreProperties({ "empty" }) // from 'isEmpty()'
+    @JsonIgnoreProperties({
+        "empty", // from 'isEmpty()'
+        "first", "last" // JDK 21 additions
+    })
     static class CollectionAsPOJO
         extends ArrayList<String>
     {
@@ -50,7 +53,14 @@ public void testListAsObjectRoundtrip() throws Exception
         list.add("a");
         list.add("b");
         String json = MAPPER.writeValueAsString(list);
-        assertEquals("{\"size\":2,\"values\":[\"a\",\"b\"]}", json);
+
+        // 2023-10-17, tatu: JDK 21 introduced new properties, so check
+        //  just that we have certain things, ignore extra
+        JsonNode doc = MAPPER.readTree(json);
+        //assertEquals("{\"size\":2,\"values\":[\"a\",\"b\"]}", json);
+
+        assertEquals(2, doc.path("size").intValue());
+        assertEquals("[\"a\",\"b\"]", doc.path("values").toString());
 
         // and then bring it back!
         CollectionAsPOJO result = MAPPER.readValue(json, CollectionAsPOJO.class);