Skip to content

Commit 4c59723

Browse files
committed
Add failing test for #1214
1 parent 9cf3e43 commit 4c59723

File tree

5 files changed

+159
-114
lines changed

5 files changed

+159
-114
lines changed

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1204,7 +1204,6 @@ public Object deserializeFromString(JsonParser p, DeserializationContext ctxt) t
12041204
* Method called to deserialize POJO value from a JSON floating-point
12051205
* number.
12061206
*/
1207-
@SuppressWarnings("incomplete-switch")
12081207
public Object deserializeFromDouble(JsonParser p, DeserializationContext ctxt) throws IOException
12091208
{
12101209
NumberType t = p.getNumberType();

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
import java.util.*;
44

5-
65
import com.fasterxml.jackson.databind.*;
76
import com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder;
87
import com.fasterxml.jackson.databind.deser.impl.BeanPropertyMap;
@@ -359,7 +358,7 @@ public JsonDeserializer<?> build()
359358
public AbstractDeserializer buildAbstract() {
360359
return new AbstractDeserializer(this, _beanDesc, _backRefProperties);
361360
}
362-
361+
363362
/**
364363
* Method for constructing a specialized deserializer that uses
365364
* additional external Builder object during data binding.
@@ -411,7 +410,7 @@ public JsonDeserializer<?> buildBuilderBased(JavaType valueType,
411410
PropertyMetadata.STD_REQUIRED);
412411
propertyMap = propertyMap.withProperty(prop);
413412
}
414-
413+
415414
return new BuilderBasedDeserializer(this,
416415
_beanDesc, propertyMap, _backRefProperties, _ignorableProps, _ignoreAllUnknown,
417416
anyViews);

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

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -448,14 +448,12 @@ protected void addBeanProps(DeserializationContext ctxt,
448448
builder.getValueInstantiator().getFromObjectArguments(ctxt.getConfig());
449449
final boolean isConcrete = !beanDesc.getType().isAbstract();
450450

451-
// Things specified as "ok to ignore"? [JACKSON-77]
451+
// Things specified as "ok to ignore"?
452452
AnnotationIntrospector intr = ctxt.getAnnotationIntrospector();
453-
boolean ignoreAny = false;
454-
{
453+
if (intr != null) {
455454
Boolean B = intr.findIgnoreUnknownProperties(beanDesc.getClassInfo());
456455
if (B != null) {
457-
ignoreAny = B.booleanValue();
458-
builder.setIgnoreUnknownProperties(ignoreAny);
456+
builder.setIgnoreUnknownProperties(B.booleanValue());
459457
}
460458
}
461459
// Or explicit/implicit definitions?

0 commit comments

Comments
 (0)