fankes/moshi
2
0
Fork 0
mirror of https://github.com/fankes/moshi.git synced 2025-10-19 16:09:21 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Hide Types.resolve.

Browse Source
This commit is contained in:
Eric Cochran
2018-04-03 23:30:33 -07:00
parent c1b93247e3
commit a931184edf
7 changed files with 433 additions and 411 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
kotlin/src/main/java/com/squareup/moshi/kotlin/KotlinJsonAdapter.kt
View File

@@ -23,6 +23,7 @@ import com.squareup.moshi.JsonWriter
import com.squareup.moshi.Moshi
import com.squareup.moshi.Types
import com.squareup.moshi.internal.Util
import com.squareup.moshi.internal.Util.resolve
import java.lang.reflect.Modifier
import java.lang.reflect.Type
import java.util.AbstractMap.SimpleEntry
@@ -225,7 +226,7 @@ class KotlinJsonAdapterFactory : JsonAdapter.Factory {
}
val name = jsonAnnotation?.name ?: property.name
val resolvedPropertyType = Types.resolve(type, rawType, property.returnType.javaType)
val resolvedPropertyType = resolve(type, rawType, property.returnType.javaType)
val adapter = moshi.adapter<Any>(
resolvedPropertyType, Util.jsonAnnotations(allAnnotations.toTypedArray()))