Skip to content

Sync with databind/5094 changes #576

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

Merged
merged 1 commit into from
Apr 16, 2025
Merged

Sync with databind/5094 changes #576

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions ion/src/main/java/tools/jackson/dataformat/ion/ionvalue/DeserializersEx.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,23 +30,24 @@ class DeserializersEx extends SimpleDeserializers

@Override
public ValueDeserializer<?> findBeanDeserializer(JavaType type, DeserializationConfig config,
BeanDescription beanDesc)
BeanDescription.Supplier beanDescRef)
{
if (IonValue.class.isAssignableFrom(type.getRawClass())) {
return ION_VALUE_DESERIALIZER;
}
return super.findBeanDeserializer(type, config, beanDesc);
return super.findBeanDeserializer(type, config, beanDescRef);
}

@Override
public ValueDeserializer<?>
findCollectionDeserializer(CollectionType type, DeserializationConfig config, BeanDescription beanDesc,
findCollectionDeserializer(CollectionType type, DeserializationConfig config,
BeanDescription.Supplier beanDescRef,
TypeDeserializer elementTypeDeserializer, ValueDeserializer<?> elementDeserializer)
{
if (IonContainer.class.isAssignableFrom(type.getRawClass())) {
return ION_VALUE_DESERIALIZER;
}
return super.findCollectionDeserializer(type, config, beanDesc,
return super.findCollectionDeserializer(type, config, beanDescRef,
elementTypeDeserializer, elementDeserializer);
}
}