From 8a22f6b1333eafb38dd2ff54ac29ffba8ef8758e Mon Sep 17 00:00:00 2001 From: Artem Daugel-Dauge Date: Sun, 4 Nov 2018 20:44:10 +0300 Subject: [PATCH] Do not check required property for null second time (#732) * Do not check required property second time * Fix codestyle --- .../java/com/squareup/moshi/kotlin/codegen/AdapterGenerator.kt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/kotlin/codegen/src/main/java/com/squareup/moshi/kotlin/codegen/AdapterGenerator.kt b/kotlin/codegen/src/main/java/com/squareup/moshi/kotlin/codegen/AdapterGenerator.kt index 6937832..587720d 100644 --- a/kotlin/codegen/src/main/java/com/squareup/moshi/kotlin/codegen/AdapterGenerator.kt +++ b/kotlin/codegen/src/main/java/com/squareup/moshi/kotlin/codegen/AdapterGenerator.kt @@ -258,6 +258,8 @@ internal class AdapterGenerator( if (property.differentiateAbsentFromNull) { result.addCode("%2N = if (%3N) %4N else %1N.%2N", resultName, property.name, property.localIsPresentName, property.localName) + } else if (property.isRequired) { + result.addCode("%1N = %2N", property.name, property.localName) } else { result.addCode("%2N = %3N ?: %1N.%2N", resultName, property.name, property.localName) }