@@ -20,9 +20,11 @@ class KotlinInstantiatorsTest {
2020 fun `Provides default instantiator for Java class` () {
2121 val javaType = mapper.constructType(String ::class .java)
2222 val defaultInstantiator = StdValueInstantiator (deserConfig, javaType)
23+ val classIntrospector = deserConfig.classIntrospectorInstance()
2324 val instantiator = kotlinInstantiators.modifyValueInstantiator(
2425 deserConfig,
25- deserConfig.classIntrospectorInstance().introspectForDeserialization(javaType).supplier(),
26+ classIntrospector.introspectForDeserialization(javaType,
27+ classIntrospector.introspectClassAnnotations(javaType)).supplier(),
2628 defaultInstantiator
2729 )
2830
@@ -34,9 +36,11 @@ class KotlinInstantiatorsTest {
3436 class TestClass
3537
3638 val javaType = mapper.constructType(TestClass ::class .java)
39+ val classIntrospector = deserConfig.classIntrospectorInstance()
3740 val instantiator = kotlinInstantiators.modifyValueInstantiator(
3841 deserConfig,
39- deserConfig.classIntrospectorInstance().introspectForDeserialization(javaType).supplier(),
42+ classIntrospector.introspectForDeserialization(javaType,
43+ classIntrospector.introspectClassAnnotations(javaType)).supplier(),
4044 StdValueInstantiator (deserConfig, javaType)
4145 )
4246
@@ -55,10 +59,12 @@ class KotlinInstantiatorsTest {
5559 ) {}
5660
5761 assertThrows(IllegalStateException ::class .java) {
62+ val javaType = mapper.constructType(TestClass ::class .java)
63+ val classIntrospector = deserConfig.classIntrospectorInstance()
5864 kotlinInstantiators.modifyValueInstantiator(
5965 deserConfig,
60- deserConfig.classIntrospectorInstance()
61- .introspectForDeserialization(mapper.constructType( TestClass :: class .java )).supplier(),
66+ classIntrospector.introspectForDeserialization(javaType,
67+ classIntrospector.introspectClassAnnotations(javaType )).supplier(),
6268 subClassInstantiator
6369 )
6470 }
0 commit comments