BeanDeserializerModifier::updateBuilder shall work for immutable beans too (#4356)

src/main/java/com/fasterxml/jackson/databind/deser/BeanDeserializerBase.java

@@ -551,6 +551,14 @@ public void resolve(DeserializationContext ctxt) throws JsonMappingException
                 }
                 SettableBeanProperty newProp = prop.withValueDeserializer(deser);
                 _replaceProperty(_beanProperties, creatorProps, prop, newProp);
+            } else if (creatorProps != null) {
+                for (int i = 0, len = creatorProps.length; i < len; ++i) {
+                    SettableBeanProperty creatorProp = creatorProps[i];
+                    if (!creatorProp.hasValueDeserializer() && creatorProp.getFullName().equals(prop.getFullName())) {
+                        creatorProps[i] = creatorProp.withValueDeserializer(prop.getValueDeserializer());
+                        break;
+                    }
+                }
             }
         }
 

src/test/java/com/fasterxml/jackson/databind/module/DeserializerUpdateBuilderTest.java

@@ -0,0 +1,91 @@
+package com.fasterxml.jackson.databind.module;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.core.JacksonException;
+import com.fasterxml.jackson.core.JsonParser;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.BaseMapTest;
+import com.fasterxml.jackson.databind.BeanDescription;
+import com.fasterxml.jackson.databind.DeserializationConfig;
+import com.fasterxml.jackson.databind.DeserializationContext;
+import com.fasterxml.jackson.databind.JsonDeserializer;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.deser.BeanDeserializerBuilder;
+import com.fasterxml.jackson.databind.deser.BeanDeserializerModifier;
+import com.fasterxml.jackson.databind.deser.SettableBeanProperty;
+import com.fasterxml.jackson.databind.module.SimpleModule;
+import java.io.IOException;
+import java.util.Iterator;
+
+public class DeserializerUpdateBuilderTest extends BaseMapTest {
+
+    static class MutableBean {
+
+        private String a;
+
+        public String getA() {
+            return a;
+        }
+
+        public void setA(String a) {
+            this.a = a;
+        }
+    }
+
+    static class ImmutableBean {
+
+        private final String a;
+
+        @JsonCreator
+        public ImmutableBean(@JsonProperty("a") String a) {
+            this.a = a;
+        }
+
+        public String getA() {
+            return a;
+        }
+    }
+
+    static SimpleModule getSimpleModuleWithDeserializerModifier() {
+        return new SimpleModule().setDeserializerModifier(new BeanDeserializerModifier() {
+            @Override
+            public BeanDeserializerBuilder updateBuilder(DeserializationConfig config, BeanDescription beanDesc, BeanDeserializerBuilder builder) {
+                for (Iterator<SettableBeanProperty> properties = builder.getProperties(); properties.hasNext();) {
+                    SettableBeanProperty property = properties.next();
+                    if (property.getName().equals("a")) {
+                        builder.addOrReplaceProperty(property.withValueDeserializer(new ConvertingStringDeserializer()), true);
+                    }
+                }
+                return builder;
+            }
+        });
+    }
+
+    static final String CUSTOM_DESERIALIZER_VALUE = "Custom deserializer value";
+
+    static class ConvertingStringDeserializer extends JsonDeserializer<String> {
+
+        @Override
+        public String deserialize(JsonParser p, DeserializationContext ctxt) throws IOException, JacksonException {
+            String ignore = p.getValueAsString();
+            return CUSTOM_DESERIALIZER_VALUE;
+        }
+    }
+
+    final ObjectMapper objectMapper = jsonMapperBuilder().addModules(getSimpleModuleWithDeserializerModifier()).build();
+
+    // Succeeds
+    public void testMutableBeanUpdateBuilder() throws JsonProcessingException {
+        MutableBean recreatedBean = objectMapper.readValue("{\"a\": \"Some value\"}", MutableBean.class);
+
+        assertEquals(CUSTOM_DESERIALIZER_VALUE, recreatedBean.getA());
+    }
+
+    // Fails without fix
+    public void testImmutableBeanUpdateBuilder() throws JsonProcessingException {
+        ImmutableBean recreatedBean = objectMapper.readValue("{\"a\": \"Some value\"}", ImmutableBean.class);
+
+        assertEquals(CUSTOM_DESERIALIZER_VALUE, recreatedBean.getA());
+    }
+}