Skip to content

Commit 310f35c

Browse files
committed
minor refactoring to try simplify/unify property type checks
1 parent 23a30a7 commit 310f35c

File tree

1 file changed

+7
-12
lines changed

1 file changed

+7
-12
lines changed

src/main/java/com/fasterxml/jackson/databind/deser/BeanDeserializerFactory.java

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -594,18 +594,13 @@ protected List<BeanPropertyDefinition> filterBeanProps(DeserializationContext ct
594594
continue;
595595
}
596596
if (!property.hasConstructorParameter()) { // never skip constructor params
597-
AnnotatedMember primary = property.getPrimaryMember();
598-
// 22-Oct-2016, tatu: Looks like there are properties defined for single-arg
599-
// delegating creator (... or something)
600-
if (primary != null) {
601-
Class<?> rawPropertyType = primary.getRawType();
602-
// Some types are declared as ignorable as well
603-
if ((rawPropertyType != null)
604-
&& isIgnorableType(ctxt.getConfig(), property, rawPropertyType, ignoredTypes)) {
605-
// important: make ignorable, to avoid errors if value is actually seen
606-
builder.addIgnorable(name);
607-
continue;
608-
}
597+
Class<?> rawPropertyType = property.getRawPrimaryType();
598+
// Some types are declared as ignorable as well
599+
if ((rawPropertyType != null)
600+
&& isIgnorableType(ctxt.getConfig(), property, rawPropertyType, ignoredTypes)) {
601+
// important: make ignorable, to avoid errors if value is actually seen
602+
builder.addIgnorable(name);
603+
continue;
609604
}
610605
}
611606
result.add(property);

0 commit comments

Comments
 (0)