Skip to content

Commit d1e2ee7

Browse files
committed
Replace '.name' with '.toString()' in ColumnKind serialization implementation and tests.
1 parent c565e80 commit d1e2ee7

File tree

4 files changed

+10
-10
lines changed
  • core
    • generated-sources/src
      • main/kotlin/org/jetbrains/kotlinx/dataframe/io
      • test/kotlin/org/jetbrains/kotlinx/dataframe/io
    • src
      • main/kotlin/org/jetbrains/kotlinx/dataframe/io
      • test/kotlin/org/jetbrains/kotlinx/dataframe/io

4 files changed

+10
-10
lines changed

core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/io/json.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -899,7 +899,7 @@ internal fun KlaxonJson.encodeRowWithMetadata(
899899
when (col) {
900900
is ColumnGroup<*> -> obj(
901901
DATA to encodeRowWithMetadata(col, index, rowLimit),
902-
METADATA to obj(KIND to ColumnKind.Group.name)
902+
METADATA to obj(KIND to ColumnKind.Group.toString())
903903
)
904904

905905
is FrameColumn<*> -> {
@@ -908,7 +908,7 @@ internal fun KlaxonJson.encodeRowWithMetadata(
908908
obj(
909909
DATA to data,
910910
METADATA to obj(
911-
KIND to ColumnKind.Frame.name,
911+
KIND to ColumnKind.Frame.toString(),
912912
NCOL to col[index].ncol,
913913
NROW to col[index].nrow
914914
)

core/generated-sources/src/test/kotlin/org/jetbrains/kotlinx/dataframe/io/json.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1000,7 +1000,7 @@ class JsonTests {
10001000

10011001
val permissions = row["permissions"] as JsonObject
10021002
val metadata = permissions[METADATA] as JsonObject
1003-
metadata[KIND] shouldBe ColumnKind.Group.name
1003+
metadata[KIND] shouldBe ColumnKind.Group.toString()
10041004

10051005
val decodedData = permissions[DATA] as JsonObject
10061006

@@ -1020,7 +1020,7 @@ class JsonTests {
10201020
val contributors = row["contributors"] as JsonObject
10211021

10221022
val metadata = contributors[METADATA] as JsonObject
1023-
metadata[KIND] shouldBe ColumnKind.Frame.name
1023+
metadata[KIND] shouldBe ColumnKind.Frame.toString()
10241024
metadata[NCOL] shouldBe 8
10251025
metadata[NROW] shouldBe 29
10261026

@@ -1041,7 +1041,7 @@ class JsonTests {
10411041
val contributors = row["contributors"] as JsonObject
10421042

10431043
val metadata = contributors[METADATA] as JsonObject
1044-
metadata[KIND] shouldBe ColumnKind.Frame.name
1044+
metadata[KIND] shouldBe ColumnKind.Frame.toString()
10451045
metadata[NCOL] shouldBe 8
10461046
metadata[NROW] shouldBe 29
10471047

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -899,7 +899,7 @@ internal fun KlaxonJson.encodeRowWithMetadata(
899899
when (col) {
900900
is ColumnGroup<*> -> obj(
901901
DATA to encodeRowWithMetadata(col, index, rowLimit),
902-
METADATA to obj(KIND to ColumnKind.Group.name)
902+
METADATA to obj(KIND to ColumnKind.Group.toString())
903903
)
904904

905905
is FrameColumn<*> -> {
@@ -908,7 +908,7 @@ internal fun KlaxonJson.encodeRowWithMetadata(
908908
obj(
909909
DATA to data,
910910
METADATA to obj(
911-
KIND to ColumnKind.Frame.name,
911+
KIND to ColumnKind.Frame.toString(),
912912
NCOL to col[index].ncol,
913913
NROW to col[index].nrow
914914
)

core/src/test/kotlin/org/jetbrains/kotlinx/dataframe/io/json.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1000,7 +1000,7 @@ class JsonTests {
10001000

10011001
val permissions = row["permissions"] as JsonObject
10021002
val metadata = permissions[METADATA] as JsonObject
1003-
metadata[KIND] shouldBe ColumnKind.Group.name
1003+
metadata[KIND] shouldBe ColumnKind.Group.toString()
10041004

10051005
val decodedData = permissions[DATA] as JsonObject
10061006

@@ -1020,7 +1020,7 @@ class JsonTests {
10201020
val contributors = row["contributors"] as JsonObject
10211021

10221022
val metadata = contributors[METADATA] as JsonObject
1023-
metadata[KIND] shouldBe ColumnKind.Frame.name
1023+
metadata[KIND] shouldBe ColumnKind.Frame.toString()
10241024
metadata[NCOL] shouldBe 8
10251025
metadata[NROW] shouldBe 29
10261026

@@ -1041,7 +1041,7 @@ class JsonTests {
10411041
val contributors = row["contributors"] as JsonObject
10421042

10431043
val metadata = contributors[METADATA] as JsonObject
1044-
metadata[KIND] shouldBe ColumnKind.Frame.name
1044+
metadata[KIND] shouldBe ColumnKind.Frame.toString()
10451045
metadata[NCOL] shouldBe 8
10461046
metadata[NROW] shouldBe 29
10471047

0 commit comments

Comments
 (0)