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

Fix dollar sign escaping for json key names.

Browse Source
This commit is contained in:
Eric Cochran
2018-07-24 18:03:23 -07:00
parent 78821bbc80
commit 248be5805b
3 changed files with 23 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
kotlin/codegen/src/main/java/com/squareup/moshi/kotlin/codegen/AdapterGenerator.kt
View File

@@ -303,7 +303,7 @@ internal class AdapterGenerator(
result.addStatement("%N.beginObject()", writerParam)
propertyList.forEach { property ->
result.addStatement("%N.name(%S)", writerParam, property.jsonName)
result.addStatement("%N.name(\"${property.jsonName}\")", writerParam)
result.addStatement("%N.toJson(%N, %N.%L)",
nameAllocator.get(property.delegateKey), writerParam, valueParam, property.name)
}

2
kotlin/codegen/src/main/java/com/squareup/moshi/kotlin/codegen/TargetProperty.kt
View File

@@ -128,7 +128,7 @@ internal data class TargetProperty(
private val Element?.jsonName: String?
get() {
if (this == null) return null
return getAnnotation(Json::class.java)?.name
return getAnnotation(Json::class.java)?.name?.replace("$", "\\$")
}
override fun toString() = name