Merge branch '2.15' into 2.16

Author: cowtowncoder

release-notes/CREDITS-2.x

@@ -1659,6 +1659,13 @@ Antti Lampinen (arlampin@github)
  * Reported #3897: 2.15.0 breaks deserialization when POJO/Record only has a single field
    and is marked `Access.WRITE_ONLY`
   (2.15.1)
+  * Reported #3897: 2.15.0 breaks deserialization when POJO/Record only has a single field
+    and is marked `Access.WRITE_ONLY`
+   (2.15.1)
+
+Dmitry Bolotin (dbolotin@github)
+  * Reported #1172: `@JsonView` doesn't work with `@JsonCreator`
+   (2.15.4)
 
 Kevin Baes (BaesKevin@github)
  * Reported #3251: Generic class with generic field of runtime type `Double` is deserialized

release-notes/VERSION-2.x

@@ -96,6 +96,11 @@ Project: jackson-databind
 #4159: Add new `DefaultTyping.NON_FINAL_AND_ENUMS` to allow Default Typing for `Enum`s
  (contributed by Joo-Hyuk K)
 
+2.15.4 (not yet released)
+
+#1172: `@JsonView` doesn't work with `@JsonCreator`
+ (reported by Dmitry B)
+
 2.15.3 (12-Oct-2023)
 
 #3968: Records with additional constructors failed to deserialize

src/test/java/com/fasterxml/jackson/databind/views/ViewsWithCreatorTest.java

@@ -0,0 +1,97 @@
+package com.fasterxml.jackson.databind.views;
+
+import com.fasterxml.jackson.annotation.*;
+
+import com.fasterxml.jackson.databind.BaseMapTest;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.ObjectReader;
+
+public class ViewsWithCreatorTest
+    extends BaseMapTest
+{
+    static class View { }
+    static class View1 extends View { }
+    static class View2 extends View { }
+
+    @JsonAutoDetect(
+            fieldVisibility = JsonAutoDetect.Visibility.PUBLIC_ONLY,
+            isGetterVisibility = JsonAutoDetect.Visibility.NONE,
+            getterVisibility = JsonAutoDetect.Visibility.NONE)
+    @JsonIgnoreProperties(ignoreUnknown = true)
+    static class ObjWithCreator {
+
+        public String a;
+
+        @JsonView(View1.class)
+        public String b;
+
+        @JsonView(View2.class)
+        public String c;
+
+        public ObjWithCreator() { }
+
+        @JsonCreator
+        public ObjWithCreator(@JsonProperty("a") String a, @JsonProperty("b") String b, @JsonProperty("c") String c) {
+            this.a = a;
+            this.b = b;
+            this.c = c;
+        }
+
+        @Override
+        public String toString() {
+            return String.format("%s-%s-%s", a, b, c);
+        }
+    }
+
+    @JsonAutoDetect(fieldVisibility = JsonAutoDetect.Visibility.PUBLIC_ONLY,
+            isGetterVisibility = JsonAutoDetect.Visibility.NONE,
+            getterVisibility = JsonAutoDetect.Visibility.NONE)
+    @JsonIgnoreProperties(ignoreUnknown = true)
+    static class ObjWithoutCreator {
+
+        public String a;
+
+        @JsonView(View1.class)
+        public String b;
+
+        @JsonView(View2.class)
+        public String c;
+
+        public ObjWithoutCreator() { }
+
+        public ObjWithoutCreator(String a, String b, String c) {
+            this.a = a;
+            this.b = b;
+            this.c = c;
+        }
+
+        @Override
+        public String toString() {
+            return String.format("%s-%s-%s", a, b, c);
+        }
+    }
+
+    private final ObjectMapper MAPPER = newJsonMapper();
+    
+    // [databind#1172]
+    public void testWithJsonCreator() throws Exception
+    {
+        ObjectReader reader = MAPPER.readerFor(ObjWithCreator.class).withView(View1.class);
+
+        // serialize first,
+        String json = MAPPER.writeValueAsString(new ObjWithCreator("a", "b", "c"));
+        // then back
+        assertEquals("a-b-null", reader.readValue(json).toString());
+    }
+
+    // [databind#1172]
+    public void testWithoutJsonCreator() throws Exception
+    {
+        ObjectReader reader = MAPPER.readerFor(ObjWithoutCreator.class).withView(View1.class);
+
+        // serialize first,
+        String json = MAPPER.writeValueAsString(new ObjWithoutCreator("a", "b", "c"));
+        // then back
+        assertEquals("a-b-null", reader.readValue(json).toString());
+    }
+}