Skip to content

Sync with changes from databind/5094 #61

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 changes from databind/5094 #61

Show file tree
Hide file tree
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
6 changes: 3 additions & 3 deletions jakarta-jsonp/src/main/java/tools/jackson/datatype/jsonp/JSONPModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ public JSONPModule(JsonProvider jsonProvider)
public ValueDeserializer<?> findBeanDeserializer(
JavaType type,
DeserializationConfig config,
BeanDescription beanDesc
BeanDescription.Supplier beanDescRef
) {
if (type.isTypeOrSubTypeOf(JsonValue.class)) {
if (type.hasRawClass(JsonValue.class)) {
Expand All @@ -65,7 +65,7 @@ public ValueDeserializer<?> findBeanDeserializer(
public ValueDeserializer<?> findCollectionDeserializer(
CollectionType type,
DeserializationConfig config,
BeanDescription beanDesc,
BeanDescription.Supplier beanDescRef,
TypeDeserializer elementTypeDeserializer,
ValueDeserializer<?> elementDeserializer
) {
Expand All @@ -79,7 +79,7 @@ public ValueDeserializer<?> findCollectionDeserializer(
public ValueDeserializer<?> findMapDeserializer(
MapType type,
DeserializationConfig config,
BeanDescription beanDesc,
BeanDescription.Supplier beanDescRef,
KeyDeserializer keyDeserializer,
TypeDeserializer elementTypeDeserializer,
ValueDeserializer<?> elementDeserializer
Expand Down
6 changes: 3 additions & 3 deletions jsr-353/src/main/java/tools/jackson/datatype/jsr353/JSR353Module.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ public JSR353Module(JsonProvider jsonProvider)
public ValueDeserializer<?> findBeanDeserializer(
JavaType type,
DeserializationConfig config,
BeanDescription beanDesc
BeanDescription.Supplier beanDescRef
) {
if (type.isTypeOrSubTypeOf(JsonValue.class)) {
if (type.hasRawClass(JsonValue.class)) {
Expand All @@ -66,7 +66,7 @@ public ValueDeserializer<?> findBeanDeserializer(
public ValueDeserializer<?> findCollectionDeserializer(
CollectionType type,
DeserializationConfig config,
BeanDescription beanDesc,
BeanDescription.Supplier beanDescRef,
TypeDeserializer elementTypeDeserializer,
ValueDeserializer<?> elementDeserializer
) {
Expand All @@ -80,7 +80,7 @@ public ValueDeserializer<?> findCollectionDeserializer(
public ValueDeserializer<?> findMapDeserializer(
MapType type,
DeserializationConfig config,
BeanDescription beanDesc,
BeanDescription.Supplier beanDescRef,
KeyDeserializer keyDeserializer,
TypeDeserializer elementTypeDeserializer,
ValueDeserializer<?> elementDeserializer
Expand Down