Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add null value handling for kotlin TypesAdapters #110

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+3 −3
Open

Add null value handling for kotlin TypesAdapters #110

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions gradle-plugin/plugin/src/main/resources/kotlin/tools/TypesAdapters.kt.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ 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)) }
value?.let { writer.value(it.format(formatter)) } ?: writer.nullValue()
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would rather suggest to have concrete implementations dealing only with the "not-nullable" case and having XNullableJsonAdapter taking care of the null handling.

Something like

internal abstract class XNullableJsonAdapter<T> : JsonAdapter<T>() { 
    abstract fun fromNonNullString(nextString: String): T
    abstract fun toJsonNonNull(writer: JsonWriter, value: T)
    ...
}

This allows to focus the attention of nullable in the class related to nullable and to the T type encoding in the related adapter class

}
}

Expand All @@ -77,14 +77,14 @@ internal class ZonedDateTimeAdapter : XNullableJsonAdapter<ZonedDateTime>() {
}

override fun toJson(writer: JsonWriter, value: ZonedDateTime?) {
value?.let { writer.value(it.format(formatter)) }
value?.let { writer.value(it.format(formatter)) } ?: writer.nullValue()
}
}

internal class BigDecimalJsonAdapter : XNullableJsonAdapter<BigDecimal>() {
override fun fromNonNullString(nextString: String) = BigDecimal(nextString)

override fun toJson(writer: JsonWriter, value: BigDecimal?) {
value?.let { writer.value(it) }
value?.let { writer.value(it) } ?: writer.nullValue()
}
}