File tree Expand file tree Collapse file tree 2 files changed +3
-5
lines changed
ktorm-jackson/src/main/kotlin/me/liuwj/ktorm/jackson Expand file tree Collapse file tree 2 files changed +3
-5
lines changed Original file line number Diff line number Diff line change @@ -6,7 +6,6 @@ import com.fasterxml.jackson.databind.*
66import com.fasterxml.jackson.databind.jsontype.TypeSerializer
77import com.fasterxml.jackson.databind.module.SimpleSerializers
88import me.liuwj.ktorm.entity.Entity
9- import kotlin.reflect.full.isSubclassOf
109import kotlin.reflect.full.memberProperties
1110import kotlin.reflect.jvm.javaGetter
1211
@@ -24,7 +23,7 @@ internal class EntitySerializers : SimpleSerializers() {
2423 beanDesc : BeanDescription
2524 ): JsonSerializer <* >? {
2625
27- if (type.rawClass.kotlin.isSubclassOf (Entity ::class )) {
26+ if (type.isTypeOrSubTypeOf (Entity ::class .java )) {
2827 return SerializerImpl
2928 } else {
3029 return super .findSerializer(config, type, beanDesc)
Original file line number Diff line number Diff line change @@ -10,7 +10,6 @@ import com.fasterxml.jackson.databind.jsontype.TypeIdResolver
1010import com.fasterxml.jackson.databind.jsontype.TypeSerializer
1111import com.fasterxml.jackson.databind.jsontype.impl.StdTypeResolverBuilder
1212import me.liuwj.ktorm.entity.Entity
13- import kotlin.reflect.full.isSubclassOf
1413
1514/* *
1615 * Created by vince on Aug 13, 2018.
@@ -39,7 +38,7 @@ internal class EntityTypeResolverBuilder(val src: StdTypeResolverBuilder) : StdT
3938 subtypes : MutableCollection <NamedType >?
4039 ): TypeSerializer ? {
4140
42- if (baseType.rawClass.kotlin.isSubclassOf (Entity ::class )) {
41+ if (baseType.isTypeOrSubTypeOf (Entity ::class .java )) {
4342 // Always use type serialization for entity types...
4443 return super .buildTypeSerializer(config, baseType, subtypes)
4544 } else {
@@ -53,7 +52,7 @@ internal class EntityTypeResolverBuilder(val src: StdTypeResolverBuilder) : StdT
5352 subtypes : MutableCollection <NamedType >?
5453 ): TypeDeserializer ? {
5554
56- if (baseType.rawClass.kotlin.isSubclassOf (Entity ::class )) {
55+ if (baseType.isTypeOrSubTypeOf (Entity ::class .java )) {
5756 // Always use type serialization for entity types...
5857 return super .buildTypeDeserializer(config, baseType, subtypes)
5958 } else {
You can’t perform that action at this time.
0 commit comments