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

Don't mangle property names that contain a dollar sign (#1446)

Browse Source 
Without this fix the new test fails like this:

    value of: toJson(...)
    expected: {"$a":"apple","$b":"banana"}
    but was : {"${'$'}a":"apple","$b":"banana"}
This commit is contained in:
Jesse Wilson
2021-12-05 21:07:27 -05:00
committed by GitHub
parent fb5dd08168
commit bc441ad7f3
3 changed files with 18 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
kotlin/codegen/src/main/java/com/squareup/moshi/kotlin/codegen/apt/metadata.kt
View File

@@ -390,8 +390,7 @@ private fun declaredProperties(
propertySpec = property,
parameter = parameter,
visibility = property.modifiers.visibility(),
jsonName = parameter?.jsonName ?: property.annotations.jsonName()
?: name.escapeDollarSigns(),
jsonName = parameter?.jsonName ?: property.annotations.jsonName() ?: name,
jsonIgnore = isIgnored
)
}
@@ -517,10 +516,6 @@ private fun <T> AnnotationSpec.elementValue(name: String): T? {
}?.value?.value as? T
}
private fun String.escapeDollarSigns(): String {
return replace("\$", "\${\'\$\'}")
}
internal val TypeElement.metadata: Metadata
get() {
return getAnnotation(Metadata::class.java)

7
kotlin/codegen/src/main/java/com/squareup/moshi/kotlin/codegen/ksp/TargetTypes.kt
View File

@@ -243,8 +243,7 @@ private fun declaredProperties(
propertySpec = propertySpec,
parameter = parameter,
visibility = property.getVisibility().toKModifier() ?: KModifier.PUBLIC,
jsonName = parameter?.jsonName ?: property.jsonName()
?: name.escapeDollarSigns(),
jsonName = parameter?.jsonName ?: property.jsonName() ?: name,
jsonIgnore = isTransient || parameter?.jsonIgnore == true || property.jsonIgnore()
)
}
@@ -279,7 +278,3 @@ private fun KSPropertyDeclaration.toPropertySpec(
}
.build()
}
private fun String.escapeDollarSigns(): String {
return replace("\$", "\${\'\$\'}")
}