Merge pull request #511 from square/eric.non-null

Fix error message for assigning to non-null properties.

kotlin/src/test/java/com/squareup/moshi/kotlin/KotlinJsonAdapterTest.kt

@@ -152,6 +152,20 @@ class KotlinJsonAdapterTest {
     }
   }
 
+  @Test fun nonNullConstructorParameterCalledWithNullFromAdapterFailsWithJsonDataException() {
+    val moshi = Moshi.Builder().add(object {
+      @FromJson fun fromJson(string: String): String? = null
+    }).add(KotlinJsonAdapterFactory()).build()
+    val jsonAdapter = moshi.adapter(HasNonNullConstructorParameter::class.java)
+
+    try {
+      jsonAdapter.fromJson("{\"a\":\"hello\"}")
+      fail()
+    } catch (expected: JsonDataException) {
+      assertThat(expected).hasMessage("Non-null value 'a' was null at \$")
+    }
+  }
+
   class HasNonNullConstructorParameter(val a: String)
 
   @Test fun nonNullPropertySetToNullFailsWithJsonDataException() {
@@ -166,6 +180,20 @@ class KotlinJsonAdapterTest {
     }
   }
 
+  @Test fun nonNullPropertySetToNullFromAdapterFailsWithJsonDataException() {
+    val moshi = Moshi.Builder().add(object {
+      @FromJson fun fromJson(string: String): String? = null
+    }).add(KotlinJsonAdapterFactory()).build()
+    val jsonAdapter = moshi.adapter(HasNonNullProperty::class.java)
+
+    try {
+      jsonAdapter.fromJson("{\"a\":\"hello\"}")
+      fail()
+    } catch (expected: JsonDataException) {
+      assertThat(expected).hasMessage("Non-null value 'a' was null at \$")
+    }
+  }
+
   class HasNonNullProperty {
     var a: String = ""
   }