-
-
Notifications
You must be signed in to change notification settings - Fork 1.4k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Update release notes wrt #43, minor cleanup
- Loading branch information
1 parent
9a271ef
commit 0a1ba4b
Showing
5 changed files
with
141 additions
and
138 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
230 changes: 112 additions & 118 deletions
230
src/main/java/com/fasterxml/jackson/databind/jsontype/impl/AsDeductionTypeDeserializer.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,152 +1,146 @@ | ||
| package com.fasterxml.jackson.databind.jsontype.impl; | ||
|
|
||
| import java.io.IOException; | ||
| import java.util.BitSet; | ||
| import java.util.Collection; | ||
| import java.util.HashMap; | ||
| import java.util.Iterator; | ||
| import java.util.LinkedList; | ||
| import java.util.List; | ||
| import java.util.Map; | ||
| import java.util.*; | ||
|
|
||
| import com.fasterxml.jackson.annotation.JsonTypeInfo; | ||
|
|
||
| import com.fasterxml.jackson.core.JsonParser; | ||
| import com.fasterxml.jackson.core.JsonToken; | ||
| import com.fasterxml.jackson.databind.BeanProperty; | ||
| import com.fasterxml.jackson.databind.DeserializationConfig; | ||
| import com.fasterxml.jackson.databind.DeserializationContext; | ||
| import com.fasterxml.jackson.databind.JavaType; | ||
| import com.fasterxml.jackson.databind.MapperFeature; | ||
|
|
||
| import com.fasterxml.jackson.databind.*; | ||
| import com.fasterxml.jackson.databind.exc.InvalidTypeIdException; | ||
| import com.fasterxml.jackson.databind.introspect.BeanPropertyDefinition; | ||
| import com.fasterxml.jackson.databind.jsontype.NamedType; | ||
| import com.fasterxml.jackson.databind.jsontype.TypeDeserializer; | ||
| import com.fasterxml.jackson.databind.jsontype.TypeIdResolver; | ||
| import com.fasterxml.jackson.databind.util.ClassUtil; | ||
| import com.fasterxml.jackson.databind.util.TokenBuffer; | ||
|
|
||
| /** | ||
| * A {@link TypeDeserializer} capable of deducing polymorphic types based on the fields available. Deduction | ||
| * is limited to the <i>names</i> of child fields (not their values or, consequently, any nested descendants). | ||
| * Exceptions will be thrown if not enough unique information is present to select a single subtype. | ||
| */ | ||
| public class AsDeductionTypeDeserializer extends AsPropertyTypeDeserializer { | ||
|
|
||
| // Fieldname -> bitmap-index of every field discovered, across all subtypes | ||
| private final Map<String, Integer> fieldBitIndex; | ||
| // Bitmap of available fields in each subtype (including its parents) | ||
| private final Map<BitSet, String> subtypeFingerprints; | ||
|
|
||
| public AsDeductionTypeDeserializer(JavaType bt, TypeIdResolver idRes, JavaType defaultImpl, DeserializationConfig config, Collection<NamedType> subtypes) { | ||
| super(bt, idRes, null, false, defaultImpl); | ||
| fieldBitIndex = new HashMap<>(); | ||
| subtypeFingerprints = buildFingerprints(config, subtypes); | ||
| } | ||
|
|
||
| public AsDeductionTypeDeserializer(AsDeductionTypeDeserializer src, BeanProperty property) { | ||
| super(src, property); | ||
| fieldBitIndex = src.fieldBitIndex; | ||
| subtypeFingerprints = src.subtypeFingerprints; | ||
| } | ||
|
|
||
| @Override | ||
| public JsonTypeInfo.As getTypeInclusion() { | ||
| return null; | ||
| } | ||
|
|
||
| @Override | ||
| public TypeDeserializer forProperty(BeanProperty prop) { | ||
| return (prop == _property) ? this : new AsDeductionTypeDeserializer(this, prop); | ||
| } | ||
|
|
||
| protected Map<BitSet, String> buildFingerprints(DeserializationConfig config, Collection<NamedType> subtypes) { | ||
| boolean ignoreCase = config.isEnabled(MapperFeature.ACCEPT_CASE_INSENSITIVE_PROPERTIES); | ||
|
|
||
| int nextField = 0; | ||
| Map<BitSet, String> fingerprints = new HashMap<>(); | ||
|
|
||
| for (NamedType subtype : subtypes) { | ||
| JavaType subtyped = config.getTypeFactory().constructType(subtype.getType()); | ||
| List<BeanPropertyDefinition> properties = config.introspect(subtyped).findProperties(); | ||
|
|
||
| BitSet fingerprint = new BitSet(nextField + properties.size()); | ||
| for (BeanPropertyDefinition property : properties) { | ||
| String name = property.getName(); | ||
| if (ignoreCase) name = name.toLowerCase(); | ||
| Integer bitIndex = fieldBitIndex.get(name); | ||
| if (bitIndex == null) { | ||
| bitIndex = nextField; | ||
| fieldBitIndex.put(name, nextField++); | ||
| } | ||
| fingerprint.set(bitIndex); | ||
| } | ||
| public class AsDeductionTypeDeserializer extends AsPropertyTypeDeserializer | ||
| { | ||
| private static final long serialVersionUID = 1L; | ||
|
|
||
| // Fieldname -> bitmap-index of every field discovered, across all subtypes | ||
| private final Map<String, Integer> fieldBitIndex; | ||
| // Bitmap of available fields in each subtype (including its parents) | ||
| private final Map<BitSet, String> subtypeFingerprints; | ||
|
|
||
| public AsDeductionTypeDeserializer(JavaType bt, TypeIdResolver idRes, JavaType defaultImpl, DeserializationConfig config, Collection<NamedType> subtypes) { | ||
| super(bt, idRes, null, false, defaultImpl); | ||
| fieldBitIndex = new HashMap<>(); | ||
| subtypeFingerprints = buildFingerprints(config, subtypes); | ||
| } | ||
|
|
||
| String existingFingerprint = fingerprints.put(fingerprint, subtype.getType().getName()); | ||
| public AsDeductionTypeDeserializer(AsDeductionTypeDeserializer src, BeanProperty property) { | ||
| super(src, property); | ||
| fieldBitIndex = src.fieldBitIndex; | ||
| subtypeFingerprints = src.subtypeFingerprints; | ||
| } | ||
|
|
||
| // Validate uniqueness | ||
| if (existingFingerprint != null) { | ||
| throw new IllegalStateException( | ||
| String.format("Subtypes %s and %s have the same signature and cannot be uniquely deduced.", existingFingerprint, subtype.getType().getName()) | ||
| ); | ||
| } | ||
| @Override | ||
| public JsonTypeInfo.As getTypeInclusion() { | ||
| return null; | ||
| } | ||
|
|
||
| @Override | ||
| public TypeDeserializer forProperty(BeanProperty prop) { | ||
| return (prop == _property) ? this : new AsDeductionTypeDeserializer(this, prop); | ||
| } | ||
| return fingerprints; | ||
| } | ||
|
|
||
| @Override | ||
| public Object deserializeTypedFromObject(JsonParser p, DeserializationContext ctxt) throws IOException { | ||
|
|
||
| JsonToken t = p.currentToken(); | ||
| if (t == JsonToken.START_OBJECT) { | ||
| t = p.nextToken(); | ||
| } else { | ||
| /* This is most likely due to the fact that not all Java types are | ||
| * serialized as JSON Objects; so if "as-property" inclusion is requested, | ||
| * serialization of things like Lists must be instead handled as if | ||
| * "as-wrapper-array" was requested. | ||
| * But this can also be due to some custom handling: so, if "defaultImpl" | ||
| * is defined, it will be asked to handle this case. | ||
| */ | ||
| return _deserializeTypedUsingDefaultImpl(p, ctxt, null); | ||
|
|
||
| protected Map<BitSet, String> buildFingerprints(DeserializationConfig config, Collection<NamedType> subtypes) { | ||
| boolean ignoreCase = config.isEnabled(MapperFeature.ACCEPT_CASE_INSENSITIVE_PROPERTIES); | ||
|
|
||
| int nextField = 0; | ||
| Map<BitSet, String> fingerprints = new HashMap<>(); | ||
|
|
||
| for (NamedType subtype : subtypes) { | ||
| JavaType subtyped = config.getTypeFactory().constructType(subtype.getType()); | ||
| List<BeanPropertyDefinition> properties = config.introspect(subtyped).findProperties(); | ||
|
|
||
| BitSet fingerprint = new BitSet(nextField + properties.size()); | ||
| for (BeanPropertyDefinition property : properties) { | ||
| String name = property.getName(); | ||
| if (ignoreCase) name = name.toLowerCase(); | ||
| Integer bitIndex = fieldBitIndex.get(name); | ||
| if (bitIndex == null) { | ||
| bitIndex = nextField; | ||
| fieldBitIndex.put(name, nextField++); | ||
| } | ||
| fingerprint.set(bitIndex); | ||
| } | ||
|
|
||
| String existingFingerprint = fingerprints.put(fingerprint, subtype.getType().getName()); | ||
|
|
||
| // Validate uniqueness | ||
| if (existingFingerprint != null) { | ||
| throw new IllegalStateException( | ||
| String.format("Subtypes %s and %s have the same signature and cannot be uniquely deduced.", existingFingerprint, subtype.getType().getName()) | ||
| ); | ||
| } | ||
| } | ||
| return fingerprints; | ||
| } | ||
|
|
||
| List<BitSet> candidates = new LinkedList<>(subtypeFingerprints.keySet()); | ||
| @Override | ||
| public Object deserializeTypedFromObject(JsonParser p, DeserializationContext ctxt) throws IOException { | ||
|
|
||
| JsonToken t = p.currentToken(); | ||
| if (t == JsonToken.START_OBJECT) { | ||
| t = p.nextToken(); | ||
| } else { | ||
| /* This is most likely due to the fact that not all Java types are | ||
| * serialized as JSON Objects; so if "as-property" inclusion is requested, | ||
| * serialization of things like Lists must be instead handled as if | ||
| * "as-wrapper-array" was requested. | ||
| * But this can also be due to some custom handling: so, if "defaultImpl" | ||
| * is defined, it will be asked to handle this case. | ||
| */ | ||
| return _deserializeTypedUsingDefaultImpl(p, ctxt, null); | ||
| } | ||
|
|
||
| List<BitSet> candidates = new LinkedList<>(subtypeFingerprints.keySet()); | ||
|
|
||
| // Record processed tokens as we must rewind once after deducing the deserializer to use | ||
| TokenBuffer tb = new TokenBuffer(p, ctxt); | ||
| boolean ignoreCase = ctxt.isEnabled(MapperFeature.ACCEPT_CASE_INSENSITIVE_PROPERTIES); | ||
| // Record processed tokens as we must rewind once after deducing the deserializer to use | ||
| TokenBuffer tb = new TokenBuffer(p, ctxt); | ||
| boolean ignoreCase = ctxt.isEnabled(MapperFeature.ACCEPT_CASE_INSENSITIVE_PROPERTIES); | ||
|
|
||
| for (; t == JsonToken.FIELD_NAME; t = p.nextToken()) { | ||
| String name = p.getCurrentName(); | ||
| if (ignoreCase) name = name.toLowerCase(); | ||
| for (; t == JsonToken.FIELD_NAME; t = p.nextToken()) { | ||
| String name = p.currentName(); | ||
| if (ignoreCase) name = name.toLowerCase(); | ||
|
|
||
| tb.copyCurrentStructure(p); | ||
| tb.copyCurrentStructure(p); | ||
|
|
||
| Integer bit = fieldBitIndex.get(name); | ||
| if (bit != null) { | ||
| // field is known by at least one subtype | ||
| prune(candidates, bit); | ||
| if (candidates.size() == 1) { | ||
| return _deserializeTypedForId(p, ctxt, tb, subtypeFingerprints.get(candidates.get(0))); | ||
| Integer bit = fieldBitIndex.get(name); | ||
| if (bit != null) { | ||
| // field is known by at least one subtype | ||
| prune(candidates, bit); | ||
| if (candidates.size() == 1) { | ||
| return _deserializeTypedForId(p, ctxt, tb, subtypeFingerprints.get(candidates.get(0))); | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| throw new InvalidTypeIdException( | ||
| p, | ||
| String.format("Cannot deduce unique subtype of %s (%d candidates match)", _baseType.toString(), candidates.size()), | ||
| _baseType | ||
| , "DEDUCED" | ||
| ); | ||
| } | ||
|
|
||
| // Keep only fingerprints containing this field | ||
| private static void prune(List<BitSet> candidates, int bit) { | ||
| for (Iterator<BitSet> iter = candidates.iterator(); iter.hasNext(); ) { | ||
| if (!iter.next().get(bit)) { | ||
| iter.remove(); | ||
| } | ||
| throw new InvalidTypeIdException(p, | ||
| String.format("Cannot deduce unique subtype of %s (%d candidates match)", | ||
| ClassUtil.getTypeDescription(_baseType), | ||
| candidates.size()), | ||
| _baseType | ||
| , "DEDUCED" | ||
| ); | ||
| } | ||
| } | ||
|
|
||
| // Keep only fingerprints containing this field | ||
| private static void prune(List<BitSet> candidates, int bit) { | ||
| for (Iterator<BitSet> iter = candidates.iterator(); iter.hasNext(); ) { | ||
| if (!iter.next().get(bit)) { | ||
| iter.remove(); | ||
| } | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.