Skip to content
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.

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

Add now-passing test for #3133 #4231

Merged
merged 3 commits into from
Nov 28, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -244,7 +244,7 @@ public static ObjectMapper newJsonMapper() {
}

// @since 2.10
protected static JsonMapper.Builder jsonMapperBuilder() {
public static JsonMapper.Builder jsonMapperBuilder() {
return JsonMapper.builder();
}

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
package com.fasterxml.jackson.databind.deser.jdk;

import java.util.HashMap;
import java.util.Map;

import com.fasterxml.jackson.annotation.JsonSubTypes;
import com.fasterxml.jackson.annotation.JsonTypeInfo;
import com.fasterxml.jackson.databind.DeserializationFeature;
import com.fasterxml.jackson.databind.ObjectMapper;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;

import static com.fasterxml.jackson.databind.BaseMapTest.jsonMapperBuilder;
import static com.fasterxml.jackson.databind.BaseTest.a2q;

/**
* Unit test proving that below issue is fixed.
* <p>
* [databind#3133] Map deserialization results in different numeric classes based on json
* ordering (BigDecimal / Double) when used in combination with @JsonSubTypes
*/
public class BigDecimalForFloatDisabled3133Test
{
@JsonTypeInfo(
use = JsonTypeInfo.Id.NAME,
include = JsonTypeInfo.As.PROPERTY,
property = "type")

@JsonSubTypes({
@JsonSubTypes.Type(value = TestMapContainer.class, name = "MAP"),
})
interface TestJsonTypeInfoInterface { }

static class TestMapContainer implements TestJsonTypeInfoInterface {

private Map<String, ? extends Object> map = new HashMap<>();

public Map<String, ? extends Object> getMap() {
return map;
}

public void setMap(Map<String, ? extends Object> map) {
this.map = map;
}
}

private final ObjectMapper mapper = jsonMapperBuilder()
.disable(DeserializationFeature.USE_BIG_DECIMAL_FOR_FLOATS)
.build();

@Test
public void testDeserializeWithDifferentOrdering() throws Exception {
// case 1 : type first
String ordering1 = a2q("{'type': 'MAP','map': { 'doubleValue': 0.1 }}");
TestMapContainer model1 = mapper.readValue(ordering1, TestMapContainer.class);
Assertions.assertTrue(model1.getMap().get("doubleValue") instanceof Double);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this would be better as assertEquals(0.1d, model1.getMap().get("doubleValue"))

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

At that time, I was unsure whether to closely align with the test case from #3133.
In hindsight, I should've gone with your suggestion. Thankss 🙏🏼


// case 2 : value first
String ordering2 = a2q("{'map': { 'doubleValue': 0.1 }, 'type': 'MAP'}");
TestMapContainer model2 = mapper.readValue(ordering2, TestMapContainer.class);
Assertions.assertTrue(model2.getMap().get("doubleValue") instanceof Double);
}
}