diff options
author | Tatu Saloranta <tatu.saloranta@iki.fi> | 2020-07-31 21:29:34 -0700 |
---|---|---|
committer | Tatu Saloranta <tatu.saloranta@iki.fi> | 2020-07-31 21:29:34 -0700 |
commit | c6da267dcff9eafcbb919df1e1deba1b3e842956 (patch) | |
tree | c11e1eb9d7e805970749f2d712e45c10d144713c | |
parent | 61069b5752929ff3262433113ede37f1d75821a6 (diff) | |
parent | 8f5d3659ba40e1983d16cf5f551ecce34c71e71a (diff) | |
download | jackson-databind-c6da267dcff9eafcbb919df1e1deba1b3e842956.tar.gz |
Merge branch '2.11' into 2.12
-rw-r--r-- | src/main/java/com/fasterxml/jackson/databind/deser/impl/BeanPropertyMap.java | 4 | ||||
-rw-r--r-- | src/test/java/com/fasterxml/jackson/failing/JsonIgnoreProperties2803Test.java | 36 |
2 files changed, 38 insertions, 2 deletions
diff --git a/src/main/java/com/fasterxml/jackson/databind/deser/impl/BeanPropertyMap.java b/src/main/java/com/fasterxml/jackson/databind/deser/impl/BeanPropertyMap.java index 50248c600..406fa9bd6 100644 --- a/src/main/java/com/fasterxml/jackson/databind/deser/impl/BeanPropertyMap.java +++ b/src/main/java/com/fasterxml/jackson/databind/deser/impl/BeanPropertyMap.java @@ -112,7 +112,7 @@ public class BeanPropertyMap Map<String,List<PropertyName>> aliasDefs) { this(caseInsensitive, props, aliasDefs, Locale.getDefault()); } - + /* Copy constructors used when a property can replace existing one * * @since 2.9.6 @@ -373,7 +373,7 @@ public class BeanPropertyMap /* Public API, mutators /********************************************************** */ - + /** * Mutant factory method that will use this instance as the base, and * construct an instance that is otherwise same except for excluding diff --git a/src/test/java/com/fasterxml/jackson/failing/JsonIgnoreProperties2803Test.java b/src/test/java/com/fasterxml/jackson/failing/JsonIgnoreProperties2803Test.java new file mode 100644 index 000000000..34b50878b --- /dev/null +++ b/src/test/java/com/fasterxml/jackson/failing/JsonIgnoreProperties2803Test.java @@ -0,0 +1,36 @@ +package com.fasterxml.jackson.failing; + +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.databind.BaseMapTest; +import com.fasterxml.jackson.databind.ObjectMapper; + +public class JsonIgnoreProperties2803Test extends BaseMapTest +{ + // [databind#2803] + static class Building2803 { + @JsonIgnoreProperties({"something"}) + @JsonProperty + private Room2803 lobby; + } + + static class Museum2803 extends Building2803 { + } + + static class Room2803 { + public String id; + public Building2803 something; + } + + private final ObjectMapper MAPPER = newJsonMapper(); + + // [databind#2803] + public void testIgnoreProps2803() throws Exception + { + final String DOC = "{\"lobby\":{\"id\":\"L1\"}}"; + + // Important! Must do both calls, in this order + Museum2803 museum = MAPPER.readValue(DOC, Museum2803.class); + Building2803 building = MAPPER.readValue(DOC, Building2803.class); + } +} |