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

Update to KotlinPoet 1.0.0-RC2.

Browse Source 
Also, use KotlinPoet's escaping for $ characters in formatted strings.
This is partly a revert of 01f600c (https://github.com/square/moshi/pull/604/).
This commit is contained in:
Eric Cochran
2018-11-02 16:59:27 -07:00
parent 9eb142d05b
commit 0795e9cbd5
5 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -79,8 +79,9 @@ internal class AdapterGenerator(
private val optionsProperty = PropertySpec.builder(
nameAllocator.newName("options"), JsonReader.Options::class.asTypeName(),
KModifier.PRIVATE)
.initializer("%T.of(${propertyList.joinToString(", ") { "\"${it.jsonName}\"" }})",
JsonReader.Options::class.asTypeName())
.initializer("%T.of(${propertyList.joinToString(", ") {
CodeBlock.of("%S", it.jsonName).toString()
}})", JsonReader.Options::class.asTypeName())
.build()
fun generateFile(generatedOption: TypeElement?): FileSpec {
@@ -296,7 +297,7 @@ internal class AdapterGenerator(
result.addStatement("%N.beginObject()", writerParam)
propertyList.forEach { property ->
result.addStatement("%N.name(\"${property.jsonName}\")", writerParam)
result.addStatement("%N.name(%S)", writerParam, property.jsonName)
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/DelegateKey.kt
View File

@@ -47,7 +47,7 @@ internal data class DelegateKey(
propertyName: String
): PropertySpec {
val qualifierNames = jsonQualifiers.joinToString("") {
"At${(it.type as ClassName).simpleName}"
"At${it.className.simpleName}"
}
val adapterName = nameAllocator.newName(
"${type.toVariableName().decapitalize()}${qualifierNames}Adapter", this)

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

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

4
kotlin/codegen/src/main/java/com/squareup/moshi/kotlin/codegen/TypeRenderer.kt
View File

@@ -51,9 +51,9 @@ abstract class TypeRenderer {
|| typeName == INT.asNullable()
|| typeName == LONG.asNullable()
|| typeName == SHORT.asNullable()) {
return CodeBlock.of("%T::class.javaObjectType", typeName.asNonNullable())
return CodeBlock.of("%T::class.javaObjectType", typeName.asNonNull())
}
return render(typeName.asNonNullable())
return render(typeName.asNonNull())
}
return when (typeName) {