Merge branch '2.18' into 2.19

Author: cowtowncoder

release-notes/CREDITS-2.x

@@ -1889,10 +1889,13 @@ Zhen Lin Low (@zhenlin-pay2)
    when collecting bean properties, breaking AsExternalTypeDeserializer
   (2.18.3)
 
-Fawzi Essam (@iifawz)
+Fawzi Essam (@iifawzi)
+ * Contributed fix or #4628: `@JsonIgnore` and `@JsonProperty.access=READ_ONLY`
+   on Record property
+  (2.18.4)
  * Contributed fix for #5049: Duplicate creator property "b" (index 0 vs 1)
    on simple java record
-  (2.18.3)
+  (2.18.4)
 
 Liam Feid (@fxshlein)
  * Contributed #1467: Support `@JsonUnwrapped` with `@JsonCreator`

release-notes/VERSION-2.x

@@ -92,6 +92,10 @@ Project: jackson-databind
 
 2.18.4 (not yet released)
 
+#4628: `@JsonIgnore` and `@JsonProperty.access=READ_ONLY` on Record property
+  ignored for deserialization
+ (reported by Sim Y-T)
+ (fix contributed by Fawzi E)
 #5049: Duplicate creator property "b" (index 0 vs 1) on simple java record
  (reported by @richard-melvin)
  (fix contributed by Fawzi E)

src/main/java/com/fasterxml/jackson/databind/introspect/POJOPropertiesCollector.java

@@ -1390,6 +1390,12 @@ protected void _renameProperties(Map<String, POJOPropertyBuilder> props)
             Map.Entry<String, POJOPropertyBuilder> entry = it.next();
             POJOPropertyBuilder prop = entry.getValue();
 
+            // 10-Apr-2025: [databind#4628] skip properties that are marked to be ignored
+            // TODO: we are using implicit name, is that ok?
+            if (_ignoredPropertyNames != null && _ignoredPropertyNames.contains(prop.getName())) {
+                continue;
+            }
+
             Collection<PropertyName> l = prop.findExplicitNames();
 
             // no explicit names? Implicit one is fine as is

src/test-jdk17/java/com/fasterxml/jackson/databind/records/RecordJsonSerDeser188Test.java

@@ -51,6 +51,8 @@ public void serialize(String value, JsonGenerator jgen, SerializerProvider provi
     @SuppressWarnings("serial")
     static class PrefixStringDeserializer extends StdScalarDeserializer<String>
     {
+        private static final long serialVersionUID = 1L;
+
         protected PrefixStringDeserializer() {
             super(String.class);
         }

src/test-jdk17/java/com/fasterxml/jackson/databind/records/RecordWithJsonIgnoreTest.java

@@ -18,8 +18,10 @@ record RecordWithIgnore(int id, @JsonIgnore String name) {
     record RecordWithIgnoreJsonProperty(int id, @JsonIgnore @JsonProperty("name") String name) {
     }
 
+    record RecordWithIgnoreJsonPropertyDifferentName(int id, @JsonIgnore @JsonProperty("name2") String name) {
+    }
+    
     record RecordWithIgnoreAccessor(int id, String name) {
-
         @JsonIgnore
         @Override
         public String name() {
@@ -63,6 +65,20 @@ public void testSerializeJsonIgnoreAndJsonPropertyRecord() throws Exception {
         assertEquals("{\"id\":123}", json);
     }
 
+    @Test
+    public void testDeserializeJsonIgnoreAndJsonPropertyRecord() throws Exception {
+        RecordWithIgnoreJsonProperty value = MAPPER.readValue("{\"id\":123,\"name\":\"Bob\"}",
+                RecordWithIgnoreJsonProperty.class);
+        assertEquals(new RecordWithIgnoreJsonProperty(123, null), value);
+    }
+
+    @Test
+    public void testDeserializeJsonIgnoreRecordWithDifferentName() throws Exception {
+        RecordWithIgnoreJsonPropertyDifferentName value = MAPPER.readValue("{\"id\":123,\"name\":\"Bob\"}",
+                RecordWithIgnoreJsonPropertyDifferentName.class);
+        assertEquals(new RecordWithIgnoreJsonPropertyDifferentName(123, null), value);
+    }
+
     /*
     /**********************************************************************
     /* Test methods, JsonIgnore accessor
@@ -71,10 +87,11 @@ public void testSerializeJsonIgnoreAndJsonPropertyRecord() throws Exception {
 
     @Test
     public void testSerializeJsonIgnoreAccessorRecord() throws Exception {
-        String json = MAPPER.writeValueAsString(new RecordWithIgnoreAccessor(123, "Bob"));
-        assertEquals("{\"id\":123}", json);
+        assertEquals("{\"id\":123}",
+                MAPPER.writeValueAsString(new RecordWithIgnoreAccessor(123, "Bob")));
     }
 
+    // [databind#4628]
     @Test
     public void testDeserializeJsonIgnoreAccessorRecord() throws Exception {
         RecordWithIgnoreAccessor expected = new RecordWithIgnoreAccessor(123, null);