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

Deserialize WRAPPER_ARRAY with no second parameter as null value #2468

Merged
merged 1 commit into from
Sep 20, 2019
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 @@ -113,6 +113,9 @@ protected Object _deserialize(JsonParser p, DeserializationContext ctxt) throws
p = JsonParserSequence.createFlattened(false, tb.asParser(p), p);
p.nextToken();
}
if (hadStartArray && p.currentToken() == JsonToken.END_ARRAY) {
return deser.getNullValue(ctxt);
}
Object value = deser.deserialize(p, ctxt);
// And then need the closing END_ARRAY
if (hadStartArray && p.nextToken() != JsonToken.END_ARRAY) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,9 @@
import com.fasterxml.jackson.annotation.JsonSubTypes.Type;
import com.fasterxml.jackson.annotation.JsonTypeInfo.As;
import com.fasterxml.jackson.annotation.JsonTypeInfo.Id;
import com.fasterxml.jackson.core.JsonParser;
import com.fasterxml.jackson.databind.*;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import com.fasterxml.jackson.databind.type.TypeFactory;

public class TestTypedDeserialization
Expand Down Expand Up @@ -66,6 +68,28 @@ public Fish()
}
}

@JsonDeserialize(using = NullAnimalDeserializer.class)
static class NullAnimal extends Animal
{
public static final NullAnimal NULL_INSTANCE = new NullAnimal();

public NullAnimal() {
super(null);
}
}

static class NullAnimalDeserializer extends JsonDeserializer<NullAnimal> {
@Override
public NullAnimal getNullValue(final DeserializationContext context) {
return NullAnimal.NULL_INSTANCE;
}

@Override
public NullAnimal deserialize(final JsonParser parser, final DeserializationContext context) {
throw new UnsupportedOperationException();
}
}

static class AnimalContainer {
public Animal animal;
}
Expand Down Expand Up @@ -239,6 +263,27 @@ public void testIssue506WithNumber() throws Exception
Issue506NumberBean output = mapper.readValue(json, Issue506NumberBean.class);
assertEquals(input.number, output.number);
}

public void testTypeAsArrayWithNullableType() throws Exception
{
ObjectMapper m = new ObjectMapper();
m.addMixIn(Animal.class, TypeWithArray.class);
Animal a = m.readValue(
"[\""+Fish.class.getName()+"\"]", Animal.class);
assertNull(a);
}

public void testTypeAsArrayWithCustomDeserializer() throws Exception
{
ObjectMapper m = new ObjectMapper();
m.addMixIn(Animal.class, TypeWithArray.class);
Animal a = m.readValue(
"[\""+NullAnimal.class.getName()+"\"]", Animal.class);
assertNotNull(a);
assertEquals(NullAnimal.class, a.getClass());
NullAnimal c = (NullAnimal) a;
assertNull(c.name);
}
}