Skip to content
Merged
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,11 @@ class KotlinInstantiatorsTest {
fun `Provides default instantiator for Java class`() {
val javaType = mapper.constructType(String::class.java)
val defaultInstantiator = StdValueInstantiator(deserConfig, javaType)
val classIntrospector = deserConfig.classIntrospectorInstance()
val instantiator = kotlinInstantiators.modifyValueInstantiator(
deserConfig,
deserConfig.classIntrospectorInstance().introspectForDeserialization(javaType).supplier(),
classIntrospector.introspectForDeserialization(javaType,
classIntrospector.introspectClassAnnotations(javaType)).supplier(),
defaultInstantiator
)

Expand All @@ -34,9 +36,11 @@ class KotlinInstantiatorsTest {
class TestClass

val javaType = mapper.constructType(TestClass::class.java)
val classIntrospector = deserConfig.classIntrospectorInstance()
val instantiator = kotlinInstantiators.modifyValueInstantiator(
deserConfig,
deserConfig.classIntrospectorInstance().introspectForDeserialization(javaType).supplier(),
classIntrospector.introspectForDeserialization(javaType,
classIntrospector.introspectClassAnnotations(javaType)).supplier(),
StdValueInstantiator(deserConfig, javaType)
)

Expand All @@ -55,10 +59,12 @@ class KotlinInstantiatorsTest {
) {}

assertThrows(IllegalStateException::class.java) {
val javaType = mapper.constructType(TestClass::class.java)
val classIntrospector = deserConfig.classIntrospectorInstance()
kotlinInstantiators.modifyValueInstantiator(
deserConfig,
deserConfig.classIntrospectorInstance()
.introspectForDeserialization(mapper.constructType(TestClass::class.java)).supplier(),
classIntrospector.introspectForDeserialization(javaType,
classIntrospector.introspectClassAnnotations(javaType)).supplier(),
subClassInstantiator
)
}
Expand Down