Merge pull request #523 from hzsweers/z/nonNullTypeVariabels

Fix nullable properties of TypeVariable types

kotlin-codegen/compiler/src/main/java/com/squareup/moshi/DelegateKey.kt

@@ -40,7 +40,7 @@ internal data class DelegateKey(
   private val type: TypeName,
   private val jsonQualifiers: Set<AnnotationMirror>
 ) {
-  val nullable get() = type.nullable || type is TypeVariableName
+  val nullable get() = type.nullable
 
   /** Returns an adapter to use when encoding and decoding this property. */
   fun generateProperty(

kotlin-codegen/compiler/src/main/java/com/squareup/moshi/metadata.kt

@@ -80,6 +80,7 @@ internal fun Type.asTypeName(
   val realType = when {
     hasTypeParameter() -> return getTypeParameter(typeParameter)
         .asTypeName(nameResolver, getTypeParameter, resolveAliases)
+        .let { if (nullable) it.asNullable() else it }
     hasTypeParameterName() -> typeParameterName
     hasAbbreviatedType() && !resolveAliases -> abbreviatedType.typeAliasName
     else -> className

kotlin-codegen/integration-test/src/test/kotlin/com/squareup/moshi/GeneratedAdaptersTest.kt

@@ -222,14 +222,16 @@ class GeneratedAdaptersTest {
         listOf("foo", null, "bar"),
         setOf("foo", null, "bar"),
         mapOf("foo" to "bar", "baz" to null),
-        null
+        null,
+        1
     )
 
     val noNullsTypeParams = NullableTypeParams<Int>(
         nullableTypeParams.nullableList,
         nullableTypeParams.nullableSet,
         nullableTypeParams.nullableMap.filterValues { it != null },
-        null
+        null,
+        1
     )
 
     val json = adapter.toJson(nullableTypeParams)
@@ -781,7 +783,8 @@ data class NullableTypeParams<T>(
     val nullableList: List<String?>,
     val nullableSet: Set<String?>,
     val nullableMap: Map<String, String?>,
-    val nullableT: T?
+    val nullableT: T?,
+    val nonNullT: T
 )
 
 typealias TypeAliasName = String