Skip to content

Commit

Permalink
Merge branch '2.12'
Browse files Browse the repository at this point in the history
  • Loading branch information
cowtowncoder committed Jun 12, 2020
2 parents 2687f84 + b6dbe87 commit 3f21f3d
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 4 deletions.
3 changes: 3 additions & 0 deletions release-notes/VERSION-2.x
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,9 @@ Project: jackson-databind

#2486: Builder Deserialization with JsonCreator Value vs Array
(reported by Ville K)
#2755: `StdSubtypeResolver` is not thread safe (possibly due to copy
not being made with `ObjectMapper.copy()`)
(reported by tjwilson90@github)

2.11.0 (26-Apr-2020)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
import com.fasterxml.jackson.databind.*;
import com.fasterxml.jackson.databind.annotation.JacksonStdImpl;
import com.fasterxml.jackson.databind.cfg.CoercionAction;
import com.fasterxml.jackson.databind.cfg.CoercionInputShape;
import com.fasterxml.jackson.databind.deser.ContextualDeserializer;
import com.fasterxml.jackson.databind.type.LogicalType;
import com.fasterxml.jackson.databind.util.ClassUtil;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ static class EnclosingForRefWithNoCreator {
/*****************************************************
*/

private final ObjectMapper MAPPER = objectMapper();
private final ObjectMapper MAPPER = newJsonMapper();

// for [databind#687]
public void testSerializeDeserializeWithCreator() throws IOException {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -136,10 +136,15 @@ static class V extends AbstractData {
private static final long serialVersionUID = 1L;
}

/*
/*****************************************************
/* Test methods
/*****************************************************
*/

public void testFull825() throws Exception
{
final ObjectMapper mapper = jsonMapperBuilder()
.enable(DeserializationFeature.ACCEPT_EMPTY_STRING_AS_NULL_OBJECT)
.activateDefaultTyping(NoCheckSubTypeValidator.instance,
DefaultTyping.OBJECT_AND_NON_CONCRETE)
.build();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
public class TestArraySerialization
extends BaseMapTest
{
private final ObjectMapper MAPPER = newJsonMapper();
private final ObjectMapper MAPPER = sharedMapper();

public void testLongStringArray() throws Exception
{
Expand Down

0 comments on commit 3f21f3d

Please sign in to comment.