Allow introspection and polymorphic type handling to use `JsonTypeInfo.Value` #3942

JooHyukKim · 2023-05-19T14:59:43Z

part of #3943

src/main/java/com/fasterxml/jackson/databind/introspect/JacksonAnnotationIntrospector.java

JooHyukKim · 2023-05-20T15:34:09Z

Should we deprecate below methods in 2.16? --they will be gone in 3.0.

Deprecate TypeResolverBuilder.init(JsonTypeInfo.Id, TypeIdResolver)?
Deprecate configuration methods of TypeResolverBuilder? List goes inclusion(As), typeProperty(String), defaultImpl(Class<?>), typeIdVisibility(boolean)?

JooHyukKim · 2023-05-20T15:38:34Z

@cowtowncoder may I ask for a brief review? Just to make sure we are heading to the right direction.😄 If I were to take this version further, I will probably just add some test cases.

Thank you so much in advance 🙏🏼🙏🏼

…XML#3921)

cowtowncoder · 2023-05-22T01:18:16Z

src/main/java/com/fasterxml/jackson/databind/introspect/JacksonAnnotationIntrospector.java

@@ -1498,27 +1509,30 @@ protected PropertyName _findConstructorName(Annotated a)
    protected TypeResolverBuilder<?> _findTypeResolver(MapperConfig<?> config,
            Annotated ann, JavaType baseType)
    {
+        // since 2.16 : backporting {@link JsonTypeInfo.Value} from 3.0
+        final AnnotationIntrospector ai = config.getAnnotationIntrospector();


We are in AnnotationIntrospector, should not look for config here (in fact that'd be wrong with AI pair, I think)

Right. Changed to plan findPolymorphicTypeInfo(config, ann); 👍🏻

cowtowncoder · 2023-05-22T01:20:22Z

src/main/java/com/fasterxml/jackson/databind/jsontype/TypeResolverBuilder.java

+     *   
+     * @since 2.16
+     */
+    public T init(JsonTypeInfo.Value settings, TypeIdResolver res);


Would require default implementation, I think, to avoid breakage wrt backwards-compatibility (existing implementations can't really implement it). Not sure if that impl should do nothing or throw an exception...

cowtowncoder · 2023-05-22T01:21:55Z

src/test/java/com/fasterxml/jackson/databind/ser/jdk/MapKeySerializationTest.java

@@ -256,6 +256,28 @@ public void testUnWrappedMapWithDefaultType() throws Exception{
        assertEquals("{\"@type\":\"HashMap\",\"xxxB\":\"bar\"}", json);
    }

+    // [databind#838]


This is probably not the right issue? But also, does this belong here?

Right, should not have copied the issue label 😅.

I was struggling to figure out (I am still 🥲) what should be tested and wrote a sample replacing the old behavior.

Ah. No problem, was just confused :)

cowtowncoder · 2023-05-22T01:24:07Z

Ok, how about we split this further? At first only add new method in AnnotationIntrospector (and AnnotationIntrospectorPair). I could merge that quickly since that is safe & would make trickier changes easier to review.

And then the meaningful changes can follow. I think XML module (jackson-dataformat-xml) is one place where matching changes are needed.

JooHyukKim · 2023-05-22T01:27:54Z

Ok, how about we split this further? At first only add new method in AnnotationIntrospector (and AnnotationIntrospectorPair). I could merge that quickly since that is safe & would make trickier changes easier to review.

Sounds like a plan👍🏻. I will turn this PR into draft, create a new one with only AnnotationIntrospector (and AnnotationIntrospectorPair part, and document the new PR in #3943.

Thank you for your suggestion @cowtowncoder 🙏🏼🙏🏼

src/main/java/com/fasterxml/jackson/databind/jsontype/TypeResolverBuilder.java

JooHyukKim · 2023-05-22T23:11:36Z

src/main/java/com/fasterxml/jackson/databind/jsontype/impl/StdTypeResolverBuilder.java

+    /**
+     * @since 2.16 (backported from Jackson 3.0)
+     */
+    protected Boolean _requireTypeIdForSubtypes;


I don't think this field should be included in this PR, but #3891

…erXML#3951)

… 3.0 (FasterXML#3949)

… 3.0)

…ype (deprecated in 2.7)

…HyukKim/jackson-databind into Introduce-JsonTypeInfo.Value

….com/JooHyukKim/jackson-databind into Introduce-JsonTypeInfo.Value" This reverts commit 93983d3, reversing changes made to c30d8a6.

…HyukKim/jackson-databind into Introduce-JsonTypeInfo.Value

JooHyukKim · 2023-05-23T14:43:29Z

CLOSED

Will close this PR and open #3953 due to severe Git conflicts.

JooHyukKim commented May 19, 2023

View reviewed changes

src/main/java/com/fasterxml/jackson/databind/introspect/JacksonAnnotationIntrospector.java Outdated Show resolved Hide resolved

JooHyukKim mentioned this pull request May 20, 2023

Allow introspection and config-override system to use JsonTypeInfo.Value #3943

Open

JooHyukKim marked this pull request as ready for review May 20, 2023 15:34

JooHyukKim marked this pull request as draft May 20, 2023 15:35

JooHyukKim changed the title ~~Allow introspection and config-override system to use JsonTypeInfo.Value.~~ Allow introspection and polymorphic type handling to use JsonTypeInfo.Value May 20, 2023

JooHyukKim marked this pull request as ready for review May 21, 2023 08:31

Add tests for Record deserialization regression and related (Faster…

228bc0e

…XML#3921)

cowtowncoder reviewed May 22, 2023

View reviewed changes

JooHyukKim marked this pull request as draft May 22, 2023 03:22

JooHyukKim commented May 22, 2023

View reviewed changes

src/main/java/com/fasterxml/jackson/databind/jsontype/TypeResolverBuilder.java Show resolved Hide resolved

JooHyukKim commented May 22, 2023

View reviewed changes

src/main/java/com/fasterxml/jackson/databind/jsontype/TypeResolverBuilder.java Outdated Show resolved Hide resolved

JooHyukKim added 7 commits May 23, 2023 07:47

Backport findPolymorphicTypeInfo

79c232f

Clean up unnccessary change.

8cabbd9

Use Value class around TypeResolverBuilder

0b30af1

Clean up changes

a509ac2

Add version changes in StdTypeResolverBuilder

97c14f1

Replace usage of TypeResolverBuilder.init

3b77339

Apply review

57b740e

JooHyukKim force-pushed the Introduce-JsonTypeInfo.Value branch from 7f116b5 to 57b740e Compare May 22, 2023 22:47

JooHyukKim commented May 22, 2023

View reviewed changes

JooHyukKim and others added 4 commits May 22, 2023 18:14

Add behavioral test regarding transient field with annotation (Fast…

04b8ed2

…erXML#3951)

Update Maven wrapper version

3505990

Merge branch '2.15' into 2.16

8753e8a

Backport TypeResolverBuilder initialization mechanisms from Jackson…

58b9fc9

… 3.0 (FasterXML#3949)

cowtowncoder and others added 25 commits May 22, 2023 20:02

remove obsolete "optimize" property

cc02b19

Start work on FasterXML#3950: add skeletal IterationType (to merge to…

a42a015

… 3.0)

Minor removal of deprecated "narrow" method implementation from JavaT…

dcffc41

…ype (deprecated in 2.7)

...

f878a66

Backport findPolymorphicTypeInfo

9991ffc

Clean up unnccessary change.

3cb02a4

Use Value class around TypeResolverBuilder

bcb1c27

Clean up changes

0d472b3

Add version changes in StdTypeResolverBuilder

8d63f67

Replace usage of TypeResolverBuilder.init

94a66c6

Apply review

3d5d2a8

Remove unnccessary changes

c30d8a6

Merge branch 'Introduce-JsonTypeInfo.Value' of https://github.com/Joo…

93983d3

…HyukKim/jackson-databind into Introduce-JsonTypeInfo.Value

Remove conflicting change in TypeResolverBuilder

3761d1b

Revert "Merge branch 'Introduce-JsonTypeInfo.Value' of https://github…

90edb76

….com/JooHyukKim/jackson-databind into Introduce-JsonTypeInfo.Value" This reverts commit 93983d3, reversing changes made to c30d8a6.

Backport findPolymorphicTypeInfo

7fdc0e7

Clean up unnccessary change.

d8d3990

Use Value class around TypeResolverBuilder

dd6054a

Clean up changes

4386503

Add version changes in StdTypeResolverBuilder

e628ddc

Replace usage of TypeResolverBuilder.init

5e5d3b4

Apply review

669ca81

Remove conflicting change in TypeResolverBuilder

deee3a9

Revert "Merge branch 'Introduce-JsonTypeInfo.Value' of https://github…

176d904

….com/JooHyukKim/jackson-databind into Introduce-JsonTypeInfo.Value" This reverts commit 93983d3, reversing changes made to c30d8a6.

Merge branch 'Introduce-JsonTypeInfo.Value' of https://github.com/Joo…

c200afd

…HyukKim/jackson-databind into Introduce-JsonTypeInfo.Value

JooHyukKim mentioned this pull request May 23, 2023

Use JsonTypeInfo.Value for annotation handling #3953

Merged

JooHyukKim closed this May 23, 2023

JooHyukKim deleted the Introduce-JsonTypeInfo.Value branch July 14, 2023 14:46

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Allow introspection and polymorphic type handling to use `JsonTypeInfo.Value` #3942

Allow introspection and polymorphic type handling to use `JsonTypeInfo.Value` #3942

JooHyukKim commented May 19, 2023 •

edited

Loading

JooHyukKim commented May 20, 2023

JooHyukKim commented May 20, 2023 •

edited

Loading

cowtowncoder May 22, 2023

JooHyukKim May 22, 2023

cowtowncoder May 22, 2023

cowtowncoder May 22, 2023

JooHyukKim May 22, 2023

cowtowncoder May 22, 2023

cowtowncoder commented May 22, 2023 •

edited

Loading

JooHyukKim commented May 22, 2023

JooHyukKim May 22, 2023

JooHyukKim commented May 23, 2023

Allow introspection and polymorphic type handling to use JsonTypeInfo.Value #3942

Allow introspection and polymorphic type handling to use JsonTypeInfo.Value #3942

Conversation

JooHyukKim commented May 19, 2023 • edited Loading

JooHyukKim commented May 20, 2023

JooHyukKim commented May 20, 2023 • edited Loading

cowtowncoder May 22, 2023

Choose a reason for hiding this comment

JooHyukKim May 22, 2023

Choose a reason for hiding this comment

cowtowncoder May 22, 2023

Choose a reason for hiding this comment

cowtowncoder May 22, 2023

Choose a reason for hiding this comment

JooHyukKim May 22, 2023

Choose a reason for hiding this comment

cowtowncoder May 22, 2023

Choose a reason for hiding this comment

cowtowncoder commented May 22, 2023 • edited Loading

JooHyukKim commented May 22, 2023

JooHyukKim May 22, 2023

Choose a reason for hiding this comment

JooHyukKim commented May 23, 2023

CLOSED

Allow introspection and polymorphic type handling to use `JsonTypeInfo.Value` #3942

Allow introspection and polymorphic type handling to use `JsonTypeInfo.Value` #3942

JooHyukKim commented May 19, 2023 •

edited

Loading

JooHyukKim commented May 20, 2023 •

edited

Loading

cowtowncoder commented May 22, 2023 •

edited

Loading