Fix Nullability warning in JsonAdapters

Updating generated methods `toJson` to accept a non null `JsonWriter`.
Previously the IDE was raising an issue due to different method signature.

Fixes #74

plugin/src/main/java/com/yelp/codegen/SharedCodegen.kt

@@ -39,7 +39,7 @@ internal const val X_OPERATION_ID = "x-operation-id"
 internal const val X_UNSAFE_OPERATION = "x-unsafe-operation"
 
 // Headers Names
-internal const val HEADER_X_OPERATION_ID = "X-Operation-Id"
+internal const val HEADER_X_OPERATION_ID = "X-Operation-ID"
 internal const val HEADER_CONTENT_TYPE = "Content-Type"
 
 abstract class SharedCodegen : DefaultCodegen(), CodegenConfig {

plugin/src/main/resources/kotlin/tools/TypesAdapters.kt.mustache

@@ -59,8 +59,8 @@ internal class LocalDateAdapter : XNullableJsonAdapter<LocalDate>() {
 
     override fun fromNonNullString(nextString: String) : LocalDate = LocalDate.parse(nextString, formatter)
 
-    override fun toJson(writer: JsonWriter?, value: LocalDate?) {
-        value?.let { writer?.value(it.format(formatter)) }
+    override fun toJson(writer: JsonWriter, value: LocalDate?) {
+        value?.let { writer.value(it.format(formatter)) }
     }
 }
 
@@ -76,15 +76,15 @@ internal class ZonedDateTimeAdapter : XNullableJsonAdapter<ZonedDateTime>() {
         }
     }
 
-    override fun toJson(writer: JsonWriter?, value: ZonedDateTime?) {
-        value?.let { writer?.value(it.format(formatter)) }
+    override fun toJson(writer: JsonWriter, value: ZonedDateTime?) {
+        value?.let { writer.value(it.format(formatter)) }
     }
 }
 
 internal class BigDecimalJsonAdapter : XNullableJsonAdapter<BigDecimal>() {
     override fun fromNonNullString(nextString: String) = BigDecimal(nextString)
 
-    override fun toJson(writer: JsonWriter?, value: BigDecimal?) {
-        value?.let { writer?.value(it) }
+    override fun toJson(writer: JsonWriter, value: BigDecimal?) {
+        value?.let { writer.value(it) }
     }
 }

samples/generated-code/src/main/java/com/yelp/codegen/generatecodesamples/models/Pet.kt

@@ -10,16 +10,16 @@ import com.squareup.moshi.Json
 
 /**
  * Represents a specific Pet in the store
- * @property id Unique ID of this Pet
  * @property category Optional category of the pet
+ * @property id Unique ID of this Pet
  * @property name Name of this specific pet
  * @property photoUrls Photo URls for this Pet on the bucket
  * @property tags Pet status in the store
  */
 data class Pet(
     @Json(name = "name") @field:Json(name = "name") var name: String,
     @Json(name = "photoUrls") @field:Json(name = "photoUrls") var photoUrls: List<String>,
-    @Json(name = "id") @field:Json(name = "id") var id: Long? = null,
     @Json(name = "category") @field:Json(name = "category") var category: Category? = null,
+    @Json(name = "id") @field:Json(name = "id") var id: Long? = null,
     @Json(name = "tags") @field:Json(name = "tags") var tags: List<Tag>? = null
 )

samples/generated-code/src/main/java/com/yelp/codegen/generatecodesamples/tools/TypesAdapters.kt

@@ -18,7 +18,7 @@ import java.math.BigDecimal
  * Moshi Factory to handle all the custom types we want to support,
  * such as [LocalDate], [ZonedDateTime], [BigDecimal].
  */
-internal class TypesAdapterFactory : JsonAdapter.Factory {
+class TypesAdapterFactory : JsonAdapter.Factory {
     private val types = mapOf<Type, JsonAdapter<*>>(
             LocalDate::class.java to LocalDateAdapter(),
             ZonedDateTime::class.java to ZonedDateTimeAdapter(),
@@ -59,8 +59,8 @@ internal class LocalDateAdapter : XNullableJsonAdapter<LocalDate>() {
 
     override fun fromNonNullString(nextString: String): LocalDate = LocalDate.parse(nextString, formatter)
 
-    override fun toJson(writer: JsonWriter?, value: LocalDate?) {
-        value?.let { writer?.value(it.format(formatter)) }
+    override fun toJson(writer: JsonWriter, value: LocalDate?) {
+        value?.let { writer.value(it.format(formatter)) }
     }
 }
 
@@ -76,15 +76,15 @@ internal class ZonedDateTimeAdapter : XNullableJsonAdapter<ZonedDateTime>() {
         }
     }
 
-    override fun toJson(writer: JsonWriter?, value: ZonedDateTime?) {
-        value?.let { writer?.value(it.format(formatter)) }
+    override fun toJson(writer: JsonWriter, value: ZonedDateTime?) {
+        value?.let { writer.value(it.format(formatter)) }
     }
 }
 
 internal class BigDecimalJsonAdapter : XNullableJsonAdapter<BigDecimal>() {
     override fun fromNonNullString(nextString: String) = BigDecimal(nextString)
 
-    override fun toJson(writer: JsonWriter?, value: BigDecimal?) {
-        value?.let { writer?.value(it) }
+    override fun toJson(writer: JsonWriter, value: BigDecimal?) {
+        value?.let { writer.value(it) }
     }
 }

samples/generated-code/src/main/java/com/yelp/codegen/generatecodesamples/tools/XNullableAdapterFactory.kt

@@ -6,7 +6,7 @@ import com.squareup.moshi.JsonWriter
 import com.squareup.moshi.Moshi
 import java.lang.reflect.Type
 
-internal class XNullableAdapterFactory : JsonAdapter.Factory {
+class XNullableAdapterFactory : JsonAdapter.Factory {
     override fun create(type: Type, annotations: MutableSet<out Annotation>, moshi: Moshi): JsonAdapter<*>? {
         if (annotations.any { it is XNullable }) {
             return object : JsonAdapter<Any>() {

samples/junit-tests/src/main/java/com/yelp/codegen/generatecodesamples/apis/ResourceApi.kt

@@ -38,7 +38,6 @@ interface ResourceApi {
     @Headers(
             "X-Operation-ID: getBracketsInParameterName"
     )
-
     @GET("/brackets/in/parameter/name")
     fun getBracketsInParameterName(
         @retrofit2.http.Query("page") page: String?,
@@ -55,7 +54,6 @@ interface ResourceApi {
     @Headers(
             "X-Operation-ID: get_empty_endpoint"
     )
-
     @GET("/empty_endpoint")
     fun getEmptyEndpoint(): Single<EmptyModel>
 
@@ -66,7 +64,6 @@ interface ResourceApi {
     @Headers(
             "X-Operation-ID: get_format_endpoint"
     )
-
     @GET("/format_endpoint/{property_format}")
     fun getFormatEndpoint(
         @retrofit2.http.Path("property_format") propertyFormat: String
@@ -78,7 +75,6 @@ interface ResourceApi {
     @Headers(
             "X-Operation-ID: get_nested_additional_properties"
     )
-
     @GET("/nested_additional_properties")
     fun getNestedAdditionalProperties(): Single<NestedAdditionalProperties>
 
@@ -88,7 +84,6 @@ interface ResourceApi {
     @Headers(
             "X-Operation-ID: get_nested_additional_properties_custom_description"
     )
-
     @GET("/nested_additional_properties/custom_description")
     fun getNestedAdditionalPropertiesCustomDescription(): Single<NestedAdditionalPropertiesCustomDescription>
 
@@ -100,7 +95,6 @@ interface ResourceApi {
     @Headers(
             "X-Operation-ID: get_property_array"
     )
-
     @GET("/property_array/{value_type}/{size}")
     fun getPropertyArray(
         @retrofit2.http.Path("value_type") valueType: String,
@@ -115,7 +109,6 @@ interface ResourceApi {
     @Headers(
             "X-Operation-ID: get_property_map"
     )
-
     @GET("/property_map/{value_type}/{size}")
     fun getPropertyMap(
         @retrofit2.http.Path("value_type") valueType: String,
@@ -128,7 +121,6 @@ interface ResourceApi {
     @Headers(
             "X-Operation-ID: get_required_type_endpoint"
     )
-
     @GET("/required/type_endpoint")
     fun getRequiredTypeEndpoint(): Single<RequiredTypeResponses>
 
@@ -138,7 +130,6 @@ interface ResourceApi {
     @Headers(
             "X-Operation-ID: get_reserved_keywords"
     )
-
     @GET("/reserved_keywords")
     fun getReservedKeywords(): Single<ReservedKeywords>
 
@@ -148,7 +139,6 @@ interface ResourceApi {
     @Headers(
             "X-Operation-ID: get_top_level_enum"
     )
-
     @GET("/top_level_enum")
     fun getTopLevelEnum(): Single<TopLevelEnum>
 
@@ -159,7 +149,6 @@ interface ResourceApi {
     @Headers(
             "X-Operation-ID: get_top_level_map"
     )
-
     @GET("/top_level_map/{size}")
     fun getTopLevelMap(
         @retrofit2.http.Path("size") size: String
@@ -172,7 +161,6 @@ interface ResourceApi {
     @Headers(
             "X-Operation-ID: get_type_endpoint"
     )
-
     @GET("/type_endpoint/{property_type}")
     fun getTypeEndpoint(
         @retrofit2.http.Path("property_type") propertyType: String

samples/junit-tests/src/main/java/com/yelp/codegen/generatecodesamples/apis/XnullableApi.kt

@@ -27,7 +27,6 @@ interface XnullableApi {
     @Headers(
             "X-Operation-ID: get_xnullable_format_endpoint"
     )
-
     @GET("/xnullable/format_endpoint/{property_format}")
     fun getXnullableFormatEndpoint(
         @retrofit2.http.Path("property_format") propertyFormat: String
@@ -39,7 +38,6 @@ interface XnullableApi {
     @Headers(
             "X-Operation-ID: get_xnullable_nested_additional_properties"
     )
-
     @GET("/xnullable/nested_additional_properties")
     fun getXnullableNestedAdditionalProperties(): Single<XnullableNestedAdditionalProperties>
 
@@ -51,7 +49,6 @@ interface XnullableApi {
     @Headers(
             "X-Operation-ID: get_xnullable_property_array"
     )
-
     @GET("/xnullable/property_array/{value_type}/{size}")
     fun getXnullablePropertyArray(
         @retrofit2.http.Path("value_type") valueType: String,
@@ -66,7 +63,6 @@ interface XnullableApi {
     @Headers(
             "X-Operation-ID: get_xnullable_property_map"
     )
-
     @GET("/xnullable/property_map/{value_type}/{size}")
     fun getXnullablePropertyMap(
         @retrofit2.http.Path("value_type") valueType: String,
@@ -80,7 +76,6 @@ interface XnullableApi {
     @Headers(
             "X-Operation-ID: get_xnullable_required_property_array"
     )
-
     @GET("/xnullable/required/property_array/{size}")
     fun getXnullableRequiredPropertyArray(
         @retrofit2.http.Path("size") size: String
@@ -93,7 +88,6 @@ interface XnullableApi {
     @Headers(
             "X-Operation-ID: get_xnullable_required_property_map"
     )
-
     @GET("/xnullable/required/property_map/{size}")
     fun getXnullableRequiredPropertyMap(
         @retrofit2.http.Path("size") size: String
@@ -106,7 +100,6 @@ interface XnullableApi {
     @Headers(
             "X-Operation-ID: get_xnullable_required_type_endpoint"
     )
-
     @GET("/xnullable/required/type_endpoint/{property_type}")
     fun getXnullableRequiredTypeEndpoint(
         @retrofit2.http.Path("property_type") propertyType: String
@@ -119,7 +112,6 @@ interface XnullableApi {
     @Headers(
             "X-Operation-ID: get_xnullable_type_endpoint"
     )
-
     @GET("/xnullable/type_endpoint/{property_type}")
     fun getXnullableTypeEndpoint(
         @retrofit2.http.Path("property_type") propertyType: String

samples/junit-tests/src/main/java/com/yelp/codegen/generatecodesamples/tools/TypesAdapters.kt

@@ -59,8 +59,8 @@ internal class LocalDateAdapter : XNullableJsonAdapter<LocalDate>() {
 
     override fun fromNonNullString(nextString: String): LocalDate = LocalDate.parse(nextString, formatter)
 
-    override fun toJson(writer: JsonWriter?, value: LocalDate?) {
-        value?.let { writer?.value(it.format(formatter)) }
+    override fun toJson(writer: JsonWriter, value: LocalDate?) {
+        value?.let { writer.value(it.format(formatter)) }
     }
 }
 
@@ -76,15 +76,15 @@ internal class ZonedDateTimeAdapter : XNullableJsonAdapter<ZonedDateTime>() {
         }
     }
 
-    override fun toJson(writer: JsonWriter?, value: ZonedDateTime?) {
-        value?.let { writer?.value(it.format(formatter)) }
+    override fun toJson(writer: JsonWriter, value: ZonedDateTime?) {
+        value?.let { writer.value(it.format(formatter)) }
     }
 }
 
 internal class BigDecimalJsonAdapter : XNullableJsonAdapter<BigDecimal>() {
     override fun fromNonNullString(nextString: String) = BigDecimal(nextString)
 
-    override fun toJson(writer: JsonWriter?, value: BigDecimal?) {
-        value?.let { writer?.value(it) }
+    override fun toJson(writer: JsonWriter, value: BigDecimal?) {
+        value?.let { writer.value(it) }
     }
 }