Skip to content

Fix #5405: @JsonFormat(shape = Shape.POJO) does not work for java.util.Map serialization via property annotation #5452

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
JacksonJang wants to merge 3 commits into
base: 3.x
Choose a base branch
from
+20 −5
Open

Fix #5405: @JsonFormat(shape = Shape.POJO) does not work for java.util.Map serialization via property annotation #5452

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2a15b6c
Fix #5405, @JsonFormat(shape = Shape.POJO) does not work for java.uti…
JacksonJang Dec 1, 2025
58e8c48
Merge branch '3.x' into 5405-map-format-shape-bug
cowtowncoder Dec 3, 2025
18520e9
Merge branch '3.x' into 5405-map-format-shape-bug
cowtowncoder Dec 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions src/main/java/tools/jackson/databind/SerializationContext.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -695,6 +695,13 @@ public ValueSerializer<Object> findPrimaryPropertySerializer(JavaType valueType,
ValueSerializer<Object> ser = _knownSerializers.untypedValueSerializer(valueType);
if (ser == null) {
ser = _createAndCachePropertySerializer(valueType, property);
} else if (property != null) {
// [databind#5405]: property-level @JsonFormat overrides must be applied even with cached serializers
JsonFormat.Value overrides = property.findFormatOverrides(_config);
if (overrides != null && !overrides.equals(JsonFormat.Value.empty())) {
BeanDescription.Supplier beanDescRef = lazyIntrospectBeanDescription(valueType);
ser = _checkShapeShifting(valueType, beanDescRef, property, ser);
}
}
return handlePrimaryContextualization(ser, property);
}
Expand Down
18 changes: 13 additions & 5 deletions ...atabind/tofix/MapFormatShape5405Test.java → ...kson/databind/MapFormatShape5405Test.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package tools.jackson.databind.tofix;
package tools.jackson.databind;

import java.util.*;

Expand All @@ -8,9 +8,7 @@
import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonPropertyOrder;

import tools.jackson.databind.*;
import tools.jackson.databind.testutil.DatabindTestUtil;
import tools.jackson.databind.testutil.failure.JacksonTestFailureExpected;

import static org.junit.jupiter.api.Assertions.assertEquals;

Expand Down Expand Up @@ -72,13 +70,23 @@ public Bean5405Override(int value) {
// [databind#5045]: property overrides for @JsonFormat.shape won't work for Maps
// 30-Nov-2025, tatu: Something about caching is the issue: if "b" commented out,
// override appears to work; with "b" not
@JacksonTestFailureExpected
@Test
public void serializeAsPOJOViaProperty() throws Exception
{
String result = MAPPER.writeValueAsString(new Bean5405Container(1,0,3));
assertEquals(a2q(
"{'a':{'extra':13,'empty':false},'c':{'extra':13,'empty':false}}"),
result);
}

// [databind#5405]:
// 01-Dec-2025, JacksonJang: In this case, the @JsonFormat(shape = POJO) override behaves correctly even with b included.
@Test
public void serializeAsPOJOViaFullProperty() throws Exception
{
String result = MAPPER.writeValueAsString(new Bean5405Container(1,2,3));
assertEquals(a2q(
"{'a':{'extra':13,'empty':false},'b':{'value':2},'c':{'extra':13,'empty':false}}"),
"{'a':{'extra':13,'empty':false},'b':{'value':2},'c':{'extra':13,'empty':false}}"),
result);
}

Expand Down