mirror of
https://github.com/fankes/moshi.git
synced 2025-10-18 23:49:21 +08:00
Convert JsonReader to Kotlin (#1505)
* Rename .java to .kt * Convert JsonReader to Kotlin Made it sealed along the way like JsonWriter Some of the properties had different docs for setting and getting, which dokka doesn't seem to have a nice way to differentiate. Went with a little marked up form but open to suggestions. * Restore isLenient name to lenient This plays nice for both java and kotlin consumers, as it's still isLenient to java consumers but not a source breaking change for kotlin * Fix peek nullability and a kotlin source change * Fix another nullability * Use collection builders * Ok this didn't work quite as I expected * Update moshi/src/main/java/com/squareup/moshi/JsonReader.kt Co-authored-by: Parth Padgaonkar <1294660+JvmName@users.noreply.github.com> Co-authored-by: Parth Padgaonkar <1294660+JvmName@users.noreply.github.com>
This commit is contained in:
@@ -191,7 +191,7 @@ public class PolymorphicJsonAdapterFactory<T> internal constructor(
|
||||
|
||||
override fun fromJson(reader: JsonReader): Any? {
|
||||
val peeked = reader.peekJson()
|
||||
peeked.setFailOnUnknown(false)
|
||||
peeked.failOnUnknown = false
|
||||
val labelIndex = peeked.use(::labelIndex)
|
||||
return if (labelIndex == -1) {
|
||||
fallbackJsonAdapter?.fromJson(reader)
|
||||
|
Reference in New Issue
Block a user