From 489b178a9bc3c62a5148b3773d92cd44fb2cad0c Mon Sep 17 00:00:00 2001
From: Zac Sweers <zac.sweers@gmail.com>
Date: Thu, 12 Sep 2019 16:07:41 -0400
Subject: [PATCH] Only add constructor property if it will be used (#918)

Before - we would always add the constructor property even if the class had no default constructor parameters. Apparently -Werror doesn't flag this as a warning either, so we didn't catch it before
---
 .../squareup/moshi/kotlin/codegen/api/AdapterGenerator.kt   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/kotlin/codegen/src/main/java/com/squareup/moshi/kotlin/codegen/api/AdapterGenerator.kt b/kotlin/codegen/src/main/java/com/squareup/moshi/kotlin/codegen/api/AdapterGenerator.kt
index a38db59..9167ce7 100644
--- a/kotlin/codegen/src/main/java/com/squareup/moshi/kotlin/codegen/api/AdapterGenerator.kt
+++ b/kotlin/codegen/src/main/java/com/squareup/moshi/kotlin/codegen/api/AdapterGenerator.kt
@@ -139,14 +139,13 @@ internal class AdapterGenerator(
     }
 
     result.addProperty(optionsProperty)
-    result.addProperty(constructorProperty)
     for (uniqueAdapter in nonTransientProperties.distinctBy { it.delegateKey }) {
       result.addProperty(uniqueAdapter.delegateKey.generateProperty(
           nameAllocator, typeRenderer, moshiParam, uniqueAdapter.name))
     }
 
     result.addFunction(generateToStringFun())
-    result.addFunction(generateFromJsonFun())
+    result.addFunction(generateFromJsonFun(result))
     result.addFunction(generateToJsonFun())
 
     return result.build()
@@ -172,7 +171,7 @@ internal class AdapterGenerator(
         .build()
   }
 
-  private fun generateFromJsonFun(): FunSpec {
+  private fun generateFromJsonFun(classBuilder: TypeSpec.Builder): FunSpec {
     val result = FunSpec.builder("fromJson")
         .addModifiers(KModifier.OVERRIDE)
         .addParameter(readerParam)
@@ -240,6 +239,7 @@ internal class AdapterGenerator(
     val maskName = nameAllocator.newName("mask")
     val localConstructorName = nameAllocator.newName("localConstructor")
     if (useDefaultsConstructor) {
+      classBuilder.addProperty(constructorProperty)
       // Dynamic default constructor call
       val booleanArrayBlock = parameterProperties.map { param ->
         when {