Merge branch '2.21' into 2.x

Author: cowtowncoder

afterburner/src/main/java/com/fasterxml/jackson/module/afterburner/deser/SuperSonicBeanDeserializer.java

@@ -173,6 +173,11 @@ public Object deserialize(JsonParser p, DeserializationContext ctxt) throws IOEx
     public final Object deserialize(JsonParser p, DeserializationContext ctxt, Object bean)
         throws IOException
     {
+        // [modules-base#339]: Need to delegate to base implementation for
+        //   proper @JsonView handling during deserialization
+        if (_needViewProcesing) {
+            return super.deserialize(p, ctxt, bean);
+        }
         // [databind#631]: Assign current value, to be accessible by custom serializers
         p.assignCurrentValue(bean);
         if (_injectables != null) {
@@ -229,6 +234,11 @@ public final Object deserialize(JsonParser p, DeserializationContext ctxt, Objec
     @Override
     public final Object deserializeFromObject(JsonParser p, DeserializationContext ctxt) throws IOException
     {
+        // [modules-base#339]: Need to delegate to base implementation for
+        //   proper @JsonView handling during deserialization
+        if (_needViewProcesing) {
+            return super.deserializeFromObject(p, ctxt);
+        }
         // See BeanDeserializer.deserializeFromObject [databind#622]
         // Allow Object Id references to come in as JSON Objects as well...
         if ((_objectIdReader != null) && _objectIdReader.maySerializeAsObject()) {

afterburner/src/test/java/com/fasterxml/jackson/module/afterburner/deser/DeserializeWithViewTest.java

@@ -0,0 +1,51 @@
+package com.fasterxml.jackson.module.afterburner.deser;
+
+import org.junit.jupiter.api.Test;
+
+import com.fasterxml.jackson.annotation.*;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.module.afterburner.AfterburnerTestBase;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+// [modules-base#339]: @JsonView deserialization filtering broken with AfterburnerModule
+public class DeserializeWithViewTest extends AfterburnerTestBase
+{
+    static class ViewA { }
+    static class ViewB { }
+
+    static class ViewBean {
+        @JsonView(ViewA.class)
+        public String activeField;
+
+        @JsonView(ViewB.class)
+        public String ignoredField;
+    }
+
+    @Test
+    public void testReaderWithView() throws Exception
+    {
+        ObjectMapper mapper = newObjectMapper();
+        String json = "{\"activeField\":\"hello\",\"ignoredField\":\"hopla\"}";
+
+        ViewBean bean = mapper.readerWithView(ViewA.class)
+                .readValue(json, ViewBean.class);
+
+        assertEquals("hello", bean.activeField);
+        assertNull(bean.ignoredField,
+                "@JsonView(ViewB.class) property should not be deserialized with ViewA active");
+    }
+
+    @Test
+    public void testReaderWithoutView() throws Exception
+    {
+        ObjectMapper mapper = newObjectMapper();
+        String json = "{\"activeField\":\"hello\",\"ignoredField\":\"hopla\"}";
+
+        // Without a view, both fields should be deserialized
+        ViewBean bean = mapper.readValue(json, ViewBean.class);
+
+        assertEquals("hello", bean.activeField);
+        assertEquals("hopla", bean.ignoredField);
+    }
+}

blackbird/src/main/java/com/fasterxml/jackson/module/blackbird/deser/SuperSonicBeanDeserializer.java

@@ -173,6 +173,11 @@ public Object deserialize(JsonParser p, DeserializationContext ctxt) throws IOEx
     public final Object deserialize(JsonParser p, DeserializationContext ctxt, Object bean)
         throws IOException
     {
+        // [modules-base#339]: Need to delegate to base implementation for
+        //   proper @JsonView handling during deserialization
+        if (_needViewProcesing) {
+            return super.deserialize(p, ctxt, bean);
+        }
         // [databind#631]: Assign current value, to be accessible by custom deserializers
         p.assignCurrentValue(bean);
         if (_injectables != null) {
@@ -229,6 +234,11 @@ public final Object deserialize(JsonParser p, DeserializationContext ctxt, Objec
     @Override
     public final Object deserializeFromObject(JsonParser p, DeserializationContext ctxt) throws IOException
     {
+        // [modules-base#339]: Need to delegate to base implementation for
+        //   proper @JsonView handling during deserialization
+        if (_needViewProcesing) {
+            return super.deserializeFromObject(p, ctxt);
+        }
         // See BeanDeserializer.deserializeFromObject [databind#622]
         // Allow Object Id references to come in as JSON Objects as well...
         if ((_objectIdReader != null) && _objectIdReader.maySerializeAsObject()) {

blackbird/src/test/java/com/fasterxml/jackson/module/blackbird/deser/DeserializeWithViewTest.java

@@ -0,0 +1,51 @@
+package com.fasterxml.jackson.module.blackbird.deser;
+
+import org.junit.jupiter.api.Test;
+
+import com.fasterxml.jackson.annotation.*;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.module.blackbird.BlackbirdTestBase;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+// [modules-base#339]: @JsonView deserialization filtering broken with BlackbirdModule
+public class DeserializeWithViewTest extends BlackbirdTestBase
+{
+    static class ViewA { }
+    static class ViewB { }
+
+    static class ViewBean {
+        @JsonView(ViewA.class)
+        public String activeField;
+
+        @JsonView(ViewB.class)
+        public String ignoredField;
+    }
+
+    @Test
+    public void testReaderWithView() throws Exception
+    {
+        ObjectMapper mapper = newObjectMapper();
+        String json = "{\"activeField\":\"hello\",\"ignoredField\":\"hopla\"}";
+
+        ViewBean bean = mapper.readerWithView(ViewA.class)
+                .readValue(json, ViewBean.class);
+
+        assertEquals("hello", bean.activeField);
+        assertNull(bean.ignoredField,
+                "@JsonView(ViewB.class) property should not be deserialized with ViewA active");
+    }
+
+    @Test
+    public void testReaderWithoutView() throws Exception
+    {
+        ObjectMapper mapper = newObjectMapper();
+        String json = "{\"activeField\":\"hello\",\"ignoredField\":\"hopla\"}";
+
+        // Without a view, both fields should be deserialized
+        ViewBean bean = mapper.readValue(json, ViewBean.class);
+
+        assertEquals("hello", bean.activeField);
+        assertEquals("hopla", bean.ignoredField);
+    }
+}

release-notes/VERSION-2.x

@@ -23,6 +23,12 @@ Active maintainers:
 === Releases ===
 ------------------------------------------------------------------------
 
+2.21.3 (not yet released)
+
+#339: `@JsonView` deserialization filtering is broken when `BlackbirdModule`
+  is registered
+ (reported by @jolangloys)
+
 2.21.2 (20-Mar-2026)
 2.21.1 (22-Feb-2026)