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

Refactor missing/null properties to helper utils instead (#900)

Browse Source 
* Create missing property and unexpected null templates

* Fix rebase conflicts
This commit is contained in:
Zac Sweers
2019-09-08 17:36:58 -04:00
committed by GitHub
parent 329d0e14b0
commit 619be26e95
2 changed files with 27 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -31,7 +31,6 @@ import com.squareup.kotlinpoet.asClassName
import com.squareup.kotlinpoet.asTypeName
import com.squareup.kotlinpoet.joinToCode
import com.squareup.moshi.JsonAdapter
import com.squareup.moshi.JsonDataException
import com.squareup.moshi.JsonReader
import com.squareup.moshi.JsonWriter
import com.squareup.moshi.Moshi
@@ -176,16 +175,6 @@ internal class AdapterGenerator(
.build()
}
private fun jsonDataException(
description: String,
identifier: String,
condition: String,
reader: ParameterSpec
): CodeBlock {
return CodeBlock.of("%T(%T(%S).append(%S).append(%S).append(%N.path).toString())",
JsonDataException::class, StringBuilder::class, description, identifier, condition, reader)
}
private fun generateFromJsonFun(): FunSpec {
val result = FunSpec.builder("fromJson")
.addModifiers(KModifier.OVERRIDE)
@@ -210,8 +199,7 @@ internal class AdapterGenerator(
result.addStatement("%N = %N.fromJson(%N)",
property.localName, nameAllocator[property.delegateKey], readerParam)
} else {
val exception = jsonDataException(
"Non-null value '", property.localName, "' was null at ", readerParam)
val exception = unexpectedNull(property.localName, readerParam)
result.addStatement("%N = %N.fromJson(%N) ?: throw·%L",
property.localName, nameAllocator[property.delegateKey], readerParam, exception)
}
@@ -222,8 +210,7 @@ internal class AdapterGenerator(
result.addStatement("%L -> %N = %N.fromJson(%N)",
index, property.localName, nameAllocator[property.delegateKey], readerParam)
} else {
val exception = jsonDataException(
"Non-null value '", property.localName, "' was null at ", readerParam)
val exception = unexpectedNull(property.localName, readerParam)
result.addStatement("%L -> %N = %N.fromJson(%N) ?: throw·%L",
index, property.localName, nameAllocator[property.delegateKey], readerParam,
exception)
@@ -306,8 +293,9 @@ internal class AdapterGenerator(
result.addCode("%N = %N", property.name, property.localName)
}
if (!property.isTransient && property.isRequired) {
result.addCode(" ?: throw·%L", jsonDataException(
"Required property '", property.localName, "' missing at ", readerParam))
val missingPropertyBlock =
CodeBlock.of("%T.missingProperty(%S, %N)", Util::class, property.localName, readerParam)
result.addCode(" ?: throw·%L", missingPropertyBlock)
}
separator = ",\n"
}
@@ -334,6 +322,10 @@ internal class AdapterGenerator(
return result.build()
}
private fun unexpectedNull(identifier: String, reader: ParameterSpec): CodeBlock {
return CodeBlock.of("%T.unexpectedNull(%S, %N)", Util::class, identifier, reader)
}
private fun generateToJsonFun(): FunSpec {
val result = FunSpec.builder("toJson")
.addModifiers(KModifier.OVERRIDE)