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

Fast followups from #899 (#901)

Browse Source 
Followup fixes from the previous PR
This commit is contained in:
Zac Sweers
2019-09-08 19:15:02 -04:00
committed by GitHub
parent 619be26e95
commit 5a4530b7d9
1 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
kotlin/reflect/src/main/java/com/squareup/moshi/kotlin/reflect/KotlinJsonAdapter.kt
View File

@@ -213,18 +213,14 @@ class KotlinJsonAdapterFactory : JsonAdapter.Factory {
val parameter = parametersByName[property.name] val parameter = parametersByName[property.name]
if (Modifier.isTransient(property.javaField?.modifiers ?: 0)) { if (Modifier.isTransient(property.javaField?.modifiers ?: 0)) {
@Suppress("ReplaceGuardClauseWithFunctionCall") // More readable this way require(parameter == null || parameter.isOptional) {
if (parameter != null && !parameter.isOptional) { "No default value for transient constructor $parameter"
throw IllegalArgumentException(
"No default value for transient constructor $parameter")
} }
continue continue
} }
@Suppress("ReplaceGuardClauseWithFunctionCall") // More readable this way require(parameter == null || parameter.type == property.returnType) {
if (parameter != null && parameter.type != property.returnType) { "'${property.name}' has a constructor parameter of type ${parameter!!.type} but a property of type ${property.returnType}."
throw IllegalArgumentException("'${property.name}' has a constructor parameter of type " +
"${parameter.type} but a property of type ${property.returnType}.")
} }
if (property !is KMutableProperty1 && parameter == null) continue if (property !is KMutableProperty1 && parameter == null) continue
@@ -254,7 +250,9 @@ class KotlinJsonAdapterFactory : JsonAdapter.Factory {
for (parameter in constructor.parameters) { for (parameter in constructor.parameters) {
val binding = bindingsByName.remove(parameter.name) val binding = bindingsByName.remove(parameter.name)
require(!(binding == null && !parameter.isOptional)) { "No property for required constructor $parameter" } require(binding != null || parameter.isOptional) {
"No property for required constructor $parameter"
}
bindings += binding bindings += binding
} }