Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

read list value by element java types #3595

Open
wants to merge 10 commits into
base: 2.14
Choose a base branch
from
Open

read list value by element java types #3595

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
61e892b
read list by element types
zrlw Sep 8, 2022
40f1195
add readValue methods
zrlw Sep 8, 2022
d70f5c0
optimize deserialization
zrlw Sep 9, 2022
2c1ac2f
add readValue method only in ObjectReader
zrlw Sep 11, 2022
769f055
initialize list type at object reader construction
zrlw Sep 11, 2022
26a5826
fixed list object reader judging condition
zrlw Sep 11, 2022
732cd00
disable non array handler of fixed element types
zrlw Sep 11, 2022
ab6e142
fix _isListObjectReader
zrlw Sep 11, 2022
2fedde6
optimize readValue
zrlw Sep 11, 2022
599fac3
add databind#735 testcase
zrlw Sep 12, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
187 changes: 160 additions & 27 deletions src/main/java/com/fasterxml/jackson/databind/ObjectReader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@
import com.fasterxml.jackson.core.filter.TokenFilter.Inclusion;
import com.fasterxml.jackson.core.type.ResolvedType;
import com.fasterxml.jackson.core.type.TypeReference;

import com.fasterxml.jackson.databind.cfg.ContextAttributes;
import com.fasterxml.jackson.databind.cfg.DatatypeFeature;
import com.fasterxml.jackson.databind.deser.DataFormatReaders;
import com.fasterxml.jackson.databind.deser.DefaultDeserializationContext;
import com.fasterxml.jackson.databind.deser.DeserializationProblemHandler;
import com.fasterxml.jackson.databind.deser.std.CollectionDeserializer;
import com.fasterxml.jackson.databind.node.JsonNodeFactory;
import com.fasterxml.jackson.databind.node.TreeTraversingParser;
import com.fasterxml.jackson.databind.type.TypeFactory;
Expand Down Expand Up @@ -77,7 +77,7 @@ public class ObjectReader
protected final boolean _unwrapRoot;

/**
* Filter to be consider for JsonParser.
* Filter to be consider for JsonParser.
* Default value to be null as filter not considered.
*/
private final TokenFilter _filter;
Expand Down Expand Up @@ -192,7 +192,7 @@ protected ObjectReader(ObjectMapper mapper, DeserializationConfig config,
_unwrapRoot = config.useRootWrapping();

_rootDeserializer = _prefetchRootDeserializer(valueType);
_dataFormatReaders = null;
_dataFormatReaders = null;
_filter = null;
}

Expand Down Expand Up @@ -401,22 +401,22 @@ public ObjectReader with(DeserializationFeature first,
DeserializationFeature... other)
{
return _with(_config.with(first, other));
}
}

/**
* Method for constructing a new reader instance that is configured
* with specified features enabled.
*/
public ObjectReader withFeatures(DeserializationFeature... features) {
return _with(_config.withFeatures(features));
}
}

/**
* Method for constructing a new reader instance that is configured
* with specified feature disabled.
*/
public ObjectReader without(DeserializationFeature feature) {
return _with(_config.without(feature));
return _with(_config.without(feature));
}

/**
Expand All @@ -426,15 +426,15 @@ public ObjectReader without(DeserializationFeature feature) {
public ObjectReader without(DeserializationFeature first,
DeserializationFeature... other) {
return _with(_config.without(first, other));
}
}

/**
* Method for constructing a new reader instance that is configured
* with specified features disabled.
*/
public ObjectReader withoutFeatures(DeserializationFeature... features) {
return _with(_config.withoutFeatures(features));
}
}

/*
/**********************************************************************
Expand All @@ -460,7 +460,7 @@ public ObjectReader with(DatatypeFeature feature) {
*/
public ObjectReader withFeatures(DatatypeFeature... features) {
return _with(_config.withFeatures(features));
}
}

/**
* Method for constructing a new reader instance that is configured
Expand All @@ -469,7 +469,7 @@ public ObjectReader withFeatures(DatatypeFeature... features) {
* @since 2.14
*/
public ObjectReader without(DatatypeFeature feature) {
return _with(_config.without(feature));
return _with(_config.without(feature));
}

/**
Expand All @@ -480,7 +480,7 @@ public ObjectReader without(DatatypeFeature feature) {
*/
public ObjectReader withoutFeatures(DatatypeFeature... features) {
return _with(_config.withoutFeatures(features));
}
}

/*
/**********************************************************
Expand Down Expand Up @@ -511,7 +511,7 @@ public ObjectReader with(JsonParser.Feature feature) {
*/
public ObjectReader withFeatures(JsonParser.Feature... features) {
return _with(_config.withFeatures(features));
}
}

/**
* Method for constructing a new reader instance that is configured
Expand All @@ -522,7 +522,7 @@ public ObjectReader withFeatures(JsonParser.Feature... features) {
* @return Reader instance with specified feature disabled
*/
public ObjectReader without(JsonParser.Feature feature) {
return _with(_config.without(feature));
return _with(_config.without(feature));
}

/**
Expand Down Expand Up @@ -591,7 +591,7 @@ public ObjectReader with(FormatFeature feature) {
*/
public ObjectReader withFeatures(FormatFeature... features) {
return _with(_config.withFeatures(features));
}
}

/**
* Method for constructing a new reader instance that is configured
Expand All @@ -600,7 +600,7 @@ public ObjectReader withFeatures(FormatFeature... features) {
* @since 2.7
*/
public ObjectReader without(FormatFeature feature) {
return _with(_config.without(feature));
return _with(_config.without(feature));
}

/**
Expand All @@ -620,8 +620,8 @@ public ObjectReader withoutFeatures(FormatFeature... features) {
*/

/**
* Convenience method to bind from {@link JsonPointer}.
* {@link JsonPointerBasedFilter} is registered and will be used for parsing later.
* Convenience method to bind from {@link JsonPointer}.
* {@link JsonPointerBasedFilter} is registered and will be used for parsing later.
* @since 2.6
*/
public ObjectReader at(final String pointerExpr) {
Expand All @@ -648,7 +648,7 @@ public ObjectReader at(final JsonPointer pointer) {
*/
public ObjectReader with(DeserializationConfig config) {
return _with(config);
}
}

/**
* Method for constructing a new instance with configuration that uses
Expand Down Expand Up @@ -776,7 +776,7 @@ public ObjectReader forType(JavaType valueType)
}
return _new(this, _config, valueType, rootDeser,
_valueToUpdate, _schema, _injectableValues, det);
}
}

/**
* Method for constructing a new reader instance that is configured
Expand All @@ -789,7 +789,7 @@ public ObjectReader forType(JavaType valueType)
*/
public ObjectReader forType(Class<?> valueType) {
return forType(_config.constructType(valueType));
}
}

/**
* Method for constructing a new reader instance that is configured
Expand All @@ -802,7 +802,7 @@ public ObjectReader forType(Class<?> valueType) {
*/
public ObjectReader forType(TypeReference<?> valueTypeRef) {
return forType(_config.getTypeFactory().constructType(valueTypeRef.getType()));
}
}

/**
* @deprecated since 2.5 Use {@link #forType(JavaType)} instead
Expand All @@ -818,7 +818,7 @@ public ObjectReader withType(JavaType valueType) {
@Deprecated
public ObjectReader withType(Class<?> valueType) {
return forType(_config.constructType(valueType));
}
}

/**
* @deprecated since 2.5 Use {@link #forType(Class)} instead
Expand All @@ -834,11 +834,11 @@ public ObjectReader withType(java.lang.reflect.Type valueType) {
@Deprecated
public ObjectReader withType(TypeReference<?> valueTypeRef) {
return forType(_config.getTypeFactory().constructType(valueTypeRef.getType()));
}
}

/**
* Method for constructing a new instance with configuration that
* updates passed Object (as root value), instead of constructing
* updates passed Object (as root value), instead of constructing
* a new value.
*<p>
* Note that the method does NOT change state of this reader, but
Expand Down Expand Up @@ -1294,6 +1294,139 @@ public <T> T readValue(JsonParser p, JavaType valueType) throws IOException {
return (T) forType(valueType).readValue(p);
}

@SuppressWarnings("unchecked")
public List<Object> readValue(JsonParser p, List<JavaType> elementTypeList) throws IOException {
if (_valueType == null || !List.class.isAssignableFrom(_valueType.getRawClass())) {
return forType(List.class).readValue(p, elementTypeList);
}
_assertNotNull("p", p);
_assertNotNull("elementTypeList", elementTypeList);
List<Object> result;
final DefaultDeserializationContext ctxt = createDeserializationContext(p);
JsonToken t = _initForReading(ctxt, p);
if (t == JsonToken.VALUE_NULL) {
if (_valueToUpdate == null) {
result = (List<Object>) _findRootDeserializer(ctxt).getNullValue(ctxt);
} else {
result = (List<Object>)_valueToUpdate;
}
} else if (t == JsonToken.END_ARRAY || t == JsonToken.END_OBJECT) {
result = (List<Object>) _valueToUpdate;
} else { // pointing to event other than null
CollectionDeserializer deser =
(CollectionDeserializer) ((JsonDeserializer<?>) _findRootDeserializer(ctxt));
if (_config.useRootWrapping()) {
return _unwrapAndDeserializeWithElementTypeList(
p, ctxt, _valueType, deser, _valueToUpdate, elementTypeList);
}
if (_valueToUpdate == null) {
return deserializeList(deser, p, ctxt, elementTypeList);
}
return deserializeList(deser, p, ctxt, (List<Object>) _valueToUpdate, elementTypeList);
}
// Need to consume the token too
p.clearCurrentToken();
if (_config.isEnabled(DeserializationFeature.FAIL_ON_TRAILING_TOKENS)) {
_verifyNoTrailingTokens(p, ctxt, _valueType);
}
return result;
}

@SuppressWarnings("unchecked")
protected List<Object> _unwrapAndDeserializeWithElementTypeList(JsonParser p,
DefaultDeserializationContext ctxt,
JavaType rootType, CollectionDeserializer deser,
Object valueToUpdate, List<JavaType> elementTypeList)
throws IOException
{
PropertyName expRootName = _config.findRootName(rootType);
String expSimpleName = expRootName.getSimpleName();
if (p.currentToken() != JsonToken.START_OBJECT) {
ctxt.reportWrongTokenException(rootType, JsonToken.START_OBJECT,
"Current token not START_OBJECT (needed to unwrap root name %s), but %s",
ClassUtil.name(expSimpleName), p.currentToken());
}
if (p.nextToken() != JsonToken.FIELD_NAME) {
ctxt.reportWrongTokenException(rootType, JsonToken.FIELD_NAME,
"Current token not FIELD_NAME (to contain expected root name %s), but %s",
ClassUtil.name(expSimpleName), p.currentToken());
}
String actualName = p.currentName();
if (!expSimpleName.equals(actualName)) {
ctxt.reportPropertyInputMismatch(rootType, actualName,
"Root name (%s) does not match expected (%s) for type %s",
ClassUtil.name(actualName), ClassUtil.name(expSimpleName),
ClassUtil.getTypeDescription(rootType));
}
p.nextToken();
final List<Object> result;
if (valueToUpdate == null) {
result = deserializeList(deser, p, ctxt, elementTypeList);
} else {
result = deserializeList(deser, p, ctxt, (List<Object>) valueToUpdate, elementTypeList);
}
if (p.nextToken() != JsonToken.END_OBJECT) {
ctxt.reportWrongTokenException(rootType, JsonToken.END_OBJECT,
"Current token not END_OBJECT (to match wrapper object with root name %s), but %s",
ClassUtil.name(expSimpleName), p.currentToken());
}
return result;
}

@SuppressWarnings("unchecked")
protected List<Object> deserializeList(CollectionDeserializer deser, JsonParser p,
DeserializationContext ctxt, List<JavaType> elemenTypeList)
throws IOException
{
if (p.isExpectedStartArrayToken()) {
List<Object> result = (List<Object>) deser.getValueInstantiator().createUsingDefault(ctxt);
return _deserializeFromArrayWithElementTypeList(p, ctxt, result, elemenTypeList);
}
return (List<Object>) ctxt.handleUnexpectedToken(deser.getValueType(), p);
}

@SuppressWarnings("unchecked")
protected List<Object> deserializeList(CollectionDeserializer deser, JsonParser p,
DeserializationContext ctxt, List<Object> result, List<JavaType> elemenTypeList)
throws IOException
{
if (p.isExpectedStartArrayToken()) {
return _deserializeFromArrayWithElementTypeList(p, ctxt, result, elemenTypeList);
}
return (List<Object>) ctxt.handleUnexpectedToken(deser.getValueType(), p);
}

protected List<Object> _deserializeFromArrayWithElementTypeList(JsonParser p,
DeserializationContext ctxt, List<Object> result, List<JavaType> elemenTypeList)
throws IOException
{
p.setCurrentValue(result);

JsonDeserializer<Object> valueDes = null;
JsonToken t;
int idx = -1;
while ((t = p.nextToken()) != JsonToken.END_ARRAY) {
try {
idx++;
valueDes = ctxt.findContextualValueDeserializer(elemenTypeList.get(idx), null);
Object value;
if (t == JsonToken.VALUE_NULL) {
value = null;
} else {
value = valueDes.deserialize(p, ctxt);
}
result.add(value);
} catch (Exception e) {
boolean wrap = (ctxt == null) || ctxt.isEnabled(DeserializationFeature.WRAP_EXCEPTIONS);
if (!wrap) {
ClassUtil.throwIfRTE(e);
}
throw JsonMappingException.wrapWithPath(e, result, result.size());
}
}
return result;
}

/**
* Convenience method that is equivalent to:
*<pre>
Expand Down Expand Up @@ -2208,7 +2341,7 @@ protected <T> MappingIterator<T> _bindAndReadValues(JsonParser p) throws IOExcep
}

/**
* Consider filter when creating JsonParser.
* Consider filter when creating JsonParser.
*/
protected JsonParser _considerFilter(final JsonParser p, boolean multiValue) {
// 26-Mar-2016, tatu: Need to allow multiple-matches at least if we have
Expand Down Expand Up @@ -2259,7 +2392,7 @@ protected Object _detectBindAndClose(DataFormatReaders.Match match, boolean forc
_reportUnkownFormat(_dataFormatReaders, match);
}
JsonParser p = match.createParserWithMatch();
// One more thing: we Own the input stream now; and while it's
// One more thing: we Own the input stream now; and while it's
// not super clean way to do it, we must ensure closure so:
if (forceClosing) {
p.enable(JsonParser.Feature.AUTO_CLOSE_SOURCE);
Expand All @@ -2275,7 +2408,7 @@ protected <T> MappingIterator<T> _detectBindAndReadValues(DataFormatReaders.Matc
_reportUnkownFormat(_dataFormatReaders, match);
}
JsonParser p = match.createParserWithMatch();
// One more thing: we Own the input stream now; and while it's
// One more thing: we Own the input stream now; and while it's
// not super clean way to do it, we must ensure closure so:
if (forceClosing) {
p.enable(JsonParser.Feature.AUTO_CLOSE_SOURCE);
Expand Down