wbrawner/moshi
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use StringBuilder to deduplicate String constants

Browse source
This commit is contained in:
Oliver Bestmann 2019-03-27 18:51:14 +01:00 committed by Jake Wharton
parent 30c973e494
commit 3994723c3c
1 changed files with 20 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
kotlin/codegen/src/main/java/com/squareup/moshi/kotlin/codegen/AdapterGenerator.kt
View file

@ -159,6 +159,16 @@ 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 resultName = nameAllocator.newName("result")
@ -185,10 +195,10 @@ internal class AdapterGenerator(
result.addStatement("%N = %N.fromJson(%N)",
property.localName, nameAllocator[property.delegateKey], readerParam)
} else {
result.addStatement("%N = %N.fromJson(%N) ?: throw·%T(%P)",
property.localName, nameAllocator[property.delegateKey], readerParam,
JsonDataException::class,
"Non-null value '${property.localName}' was null at \${${readerParam.name}.path}")
val exception = jsonDataException(
"Non-null value '", property.localName, "' was null at ", readerParam)
result.addStatement("%N = %N.fromJson(%N) ?: throw·%L",
property.localName, nameAllocator[property.delegateKey], readerParam, exception)
}
result.addStatement("%N = true", property.localIsPresentName)
result.endControlFlow()
@ -197,10 +207,11 @@ internal class AdapterGenerator(
result.addStatement("%L -> %N = %N.fromJson(%N)",
index, property.localName, nameAllocator[property.delegateKey], readerParam)
} else {
result.addStatement("%L -> %N = %N.fromJson(%N) ?: throw·%T(%P)",
val exception = jsonDataException(
"Non-null value '", property.localName, "' was null at ", readerParam)
result.addStatement("%L -> %N = %N.fromJson(%N) ?: throw·%L",
index, property.localName, nameAllocator[property.delegateKey], readerParam,
JsonDataException::class,
"Non-null value '${property.localName}' was null at \${${readerParam.name}.path}")
exception)
}
}
}
@ -230,8 +241,8 @@ internal class AdapterGenerator(
result.addCode(separator)
result.addCode("%N = %N", property.name, property.localName)
if (property.isRequired) {
result.addCode(" ?: throw·%T(%P)", JsonDataException::class,
"Required property '${property.localName}' missing at \${${readerParam.name}.path}")
result.addCode(" ?: throw·%L", jsonDataException(
"Required property '", property.localName, "' missing at ", readerParam))
}
separator = ",\n"
}