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 | 6 |
1 files changed, 3 insertions, 3 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 944bce7fa..c2640f80c 100644 --- a/src/main/java/com/fasterxml/jackson/databind/introspect/AnnotationIntrospectorPair.java +++ b/src/main/java/com/fasterxml/jackson/databind/introspect/AnnotationIntrospectorPair.java @@ -127,10 +127,10 @@ public class AnnotationIntrospectorPair } @Override - public JsonIncludeProperties.Value findPropertyInclusions(MapperConfig<?> config, Annotated a) + public JsonIncludeProperties.Value findPropertyInclusionByName(MapperConfig<?> config, Annotated a) { - JsonIncludeProperties.Value v2 = _secondary.findPropertyInclusions(config, a); - JsonIncludeProperties.Value v1 = _primary.findPropertyInclusions(config, a); + JsonIncludeProperties.Value v2 = _secondary.findPropertyInclusionByName(config, a); + JsonIncludeProperties.Value v1 = _primary.findPropertyInclusionByName(config, a); return (v2 == null) // shouldn't occur but ? v1 : v2.withOverrides(v1); } |