diff options
Diffstat (limited to 'src/main/java/com/fasterxml/jackson/databind/introspect/AnnotationIntrospectorPair.java')
-rw-r--r-- | src/main/java/com/fasterxml/jackson/databind/introspect/AnnotationIntrospectorPair.java | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/src/main/java/com/fasterxml/jackson/databind/introspect/AnnotationIntrospectorPair.java b/src/main/java/com/fasterxml/jackson/databind/introspect/AnnotationIntrospectorPair.java index d69bbd3cd..3ba0ab9a5 100644 --- a/src/main/java/com/fasterxml/jackson/databind/introspect/AnnotationIntrospectorPair.java +++ b/src/main/java/com/fasterxml/jackson/databind/introspect/AnnotationIntrospectorPair.java @@ -10,6 +10,7 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonIncludeProperties; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonSetter; import com.fasterxml.jackson.core.Version; @@ -126,6 +127,15 @@ public class AnnotationIntrospectorPair } @Override + public JsonIncludeProperties.Value findPropertyInclusions(Annotated a) + { + JsonIncludeProperties.Value v2 = _secondary.findPropertyInclusions(a); + JsonIncludeProperties.Value v1 = _primary.findPropertyInclusions(a); + return (v2 == null) // shouldn't occur but + ? v1 : v2.withOverrides(v1); + } + + @Override public Boolean isIgnorableType(AnnotatedClass ac) { Boolean result = _primary.isIgnorableType(ac); |