Skip to content

Commit 22bb293

Browse files
committed
Update serialization library version and improve comments
1 parent 6d954f8 commit 22bb293

File tree

3 files changed

+3
-4
lines changed

3 files changed

+3
-4
lines changed

core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/impl/io/readJson.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ internal fun fromJsonListAnyColumns(
167167

168168
@Suppress("KotlinConstantConditions")
169169
val columns: List<AnyCol> = when {
170-
// Create one column of type Any? (or guessed a primitive type) from all the records
170+
// Create one column of type Any? (or guessed primitive type) from all the records
171171
colType == AnyColType.ANY -> {
172172
val collector: DataCollectorBase<Any?> =
173173
if (justPrimitives) createDataCollector(records.size) // guess the type
@@ -419,7 +419,7 @@ internal fun fromJsonListArrayAndValueColumns(
419419

420420
// list element type can be JsonObject, JsonArray or primitive
421421
// So first, we gather all properties of objects to merge including "array" and "value" if needed
422-
// so the resulting type of property with instances 123, ["abc"], and { "a": 1, "b": 2 } will be
422+
// so the resulting type of a property with instances 123, ["abc"], and { "a": 1, "b": 2 } will be
423423
// { array: List<String>, value: Int?, a: Int?, b: Int? }
424424
// and instances will look like
425425
// { "array": [], "value": 123, "a": null, "b": null }

core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/impl/io/writeJson.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,6 @@ internal fun encodeRowWithMetadata(
156156
}.let { col.name to it }
157157
}
158158
if (values.isEmpty()) return null
159-
JsonObject(mapOf("exampleKey" to JsonPrimitive("exampleValue")))
160159
return JsonObject(values.toMap())
161160
}
162161

gradle/libs.versions.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ kover = "0.6.1"
2626

2727
commonsCsv = "1.10.0"
2828
commonsCompress = "1.26.0"
29-
serialization = "1.6.2"
29+
serialization = "1.7.0"
3030
fuel = "2.3.1"
3131
poi = "5.2.5"
3232
mariadb = "3.3.2"

0 commit comments

Comments
 (0)