Skip to content

Commit 83ba578

Browse files
committed
Remove star imports and fix testing by reading json file
1 parent 63d6f8b commit 83ba578

File tree

5 files changed

+66
-9
lines changed

5 files changed

+66
-9
lines changed

build.gradle.kts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,6 @@ private fun String.findVersion(): Version {
7070

7171
// these names of outdated dependencies will not show up in the table output
7272
val dependencyUpdateExclusions = listOf(
73-
// 5.6 requires Java 11
74-
// libs.serialization.get().name,
7573
// TODO Requires more work to be updated to 1.7.0+, https://github.com/Kotlin/dataframe/issues/594
7674
libs.plugins.kover.get().pluginId,
7775
// TODO Updating requires major changes all across the project, https://github.com/Kotlin/dataframe/issues/364

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

Lines changed: 55 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,24 +3,75 @@
33
package org.jetbrains.kotlinx.dataframe.io
44

55
import kotlinx.serialization.ExperimentalSerializationApi
6-
import kotlinx.serialization.json.*
7-
import org.jetbrains.kotlinx.dataframe.*
8-
import org.jetbrains.kotlinx.dataframe.api.*
6+
import kotlinx.serialization.json.Json
7+
import kotlinx.serialization.json.JsonArray
8+
import kotlinx.serialization.json.JsonElement
9+
import kotlinx.serialization.json.JsonNull
10+
import kotlinx.serialization.json.JsonObject
11+
import kotlinx.serialization.json.JsonPrimitive
12+
import kotlinx.serialization.json.boolean
13+
import kotlinx.serialization.json.booleanOrNull
14+
import kotlinx.serialization.json.buildJsonArray
15+
import kotlinx.serialization.json.buildJsonObject
16+
import kotlinx.serialization.json.decodeFromStream
17+
import kotlinx.serialization.json.double
18+
import kotlinx.serialization.json.doubleOrNull
19+
import kotlinx.serialization.json.int
20+
import kotlinx.serialization.json.intOrNull
21+
import kotlinx.serialization.json.jsonArray
22+
import kotlinx.serialization.json.jsonPrimitive
23+
import kotlinx.serialization.json.long
24+
import kotlinx.serialization.json.longOrNull
25+
import org.jetbrains.kotlinx.dataframe.AnyCol
26+
import org.jetbrains.kotlinx.dataframe.AnyFrame
27+
import org.jetbrains.kotlinx.dataframe.AnyRow
28+
import org.jetbrains.kotlinx.dataframe.ColumnsContainer
29+
import org.jetbrains.kotlinx.dataframe.DataColumn
30+
import org.jetbrains.kotlinx.dataframe.DataFrame
31+
import org.jetbrains.kotlinx.dataframe.DataRow
32+
import org.jetbrains.kotlinx.dataframe.api.JsonPath
33+
import org.jetbrains.kotlinx.dataframe.api.KeyValueProperty
34+
import org.jetbrains.kotlinx.dataframe.api.cast
35+
import org.jetbrains.kotlinx.dataframe.api.columnOf
36+
import org.jetbrains.kotlinx.dataframe.api.concat
37+
import org.jetbrains.kotlinx.dataframe.api.dataFrameOf
38+
import org.jetbrains.kotlinx.dataframe.api.firstOrNull
39+
import org.jetbrains.kotlinx.dataframe.api.getColumn
40+
import org.jetbrains.kotlinx.dataframe.api.indices
41+
import org.jetbrains.kotlinx.dataframe.api.isList
42+
import org.jetbrains.kotlinx.dataframe.api.mapIndexed
943
import org.jetbrains.kotlinx.dataframe.api.name
44+
import org.jetbrains.kotlinx.dataframe.api.named
45+
import org.jetbrains.kotlinx.dataframe.api.rows
46+
import org.jetbrains.kotlinx.dataframe.api.schema
47+
import org.jetbrains.kotlinx.dataframe.api.single
48+
import org.jetbrains.kotlinx.dataframe.api.splitInto
49+
import org.jetbrains.kotlinx.dataframe.api.toDataFrame
1050
import org.jetbrains.kotlinx.dataframe.codeGen.DefaultReadDfMethod
1151
import org.jetbrains.kotlinx.dataframe.codeGen.DefaultReadJsonMethod
1252
import org.jetbrains.kotlinx.dataframe.columns.ColumnGroup
1353
import org.jetbrains.kotlinx.dataframe.columns.ColumnKind
1454
import org.jetbrains.kotlinx.dataframe.columns.FrameColumn
15-
import org.jetbrains.kotlinx.dataframe.impl.*
55+
import org.jetbrains.kotlinx.dataframe.impl.ColumnNameGenerator
56+
import org.jetbrains.kotlinx.dataframe.impl.DataCollectorBase
57+
import org.jetbrains.kotlinx.dataframe.impl.asList
1658
import org.jetbrains.kotlinx.dataframe.impl.columns.createColumn
59+
import org.jetbrains.kotlinx.dataframe.impl.commonType
60+
import org.jetbrains.kotlinx.dataframe.impl.createDataCollector
61+
import org.jetbrains.kotlinx.dataframe.impl.guessValueType
1762
import org.jetbrains.kotlinx.dataframe.impl.schema.DataFrameSchemaImpl
1863
import org.jetbrains.kotlinx.dataframe.impl.schema.extractSchema
1964
import org.jetbrains.kotlinx.dataframe.impl.schema.intersectSchemas
65+
import org.jetbrains.kotlinx.dataframe.impl.splitByIndices
2066
import org.jetbrains.kotlinx.dataframe.io.JSON.TypeClashTactic
2167
import org.jetbrains.kotlinx.dataframe.io.JSON.TypeClashTactic.ANY_COLUMNS
2268
import org.jetbrains.kotlinx.dataframe.io.JSON.TypeClashTactic.ARRAY_AND_VALUE_COLUMNS
69+
import org.jetbrains.kotlinx.dataframe.ncol
70+
import org.jetbrains.kotlinx.dataframe.nrow
2371
import org.jetbrains.kotlinx.dataframe.schema.ColumnSchema
72+
import org.jetbrains.kotlinx.dataframe.type
73+
import org.jetbrains.kotlinx.dataframe.typeClass
74+
import org.jetbrains.kotlinx.dataframe.values
2475
import java.io.File
2576
import java.io.InputStream
2677
import java.net.URL

core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/jupyter/JupyterHtmlRenderer.kt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
package org.jetbrains.kotlinx.dataframe.jupyter
22

33
import kotlinx.serialization.ExperimentalSerializationApi
4-
import kotlinx.serialization.json.*
4+
import kotlinx.serialization.json.addAll
5+
import kotlinx.serialization.json.buildJsonObject
6+
import kotlinx.serialization.json.put
7+
import kotlinx.serialization.json.putJsonArray
58
import org.jetbrains.kotlinx.dataframe.api.rows
69
import org.jetbrains.kotlinx.dataframe.api.toDataFrame
710
import org.jetbrains.kotlinx.dataframe.io.DataFrameHtmlData

core/src/test/kotlin/org/jetbrains/kotlinx/dataframe/jupyter/RenderingTests.kt

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,12 @@ import io.kotest.matchers.comparables.shouldBeLessThan
66
import io.kotest.matchers.shouldBe
77
import io.kotest.matchers.string.shouldContain
88
import io.kotest.matchers.string.shouldNotContain
9-
import kotlinx.serialization.json.*
9+
import kotlinx.serialization.json.Json
10+
import kotlinx.serialization.json.JsonArray
11+
import kotlinx.serialization.json.JsonObject
12+
import kotlinx.serialization.json.int
13+
import kotlinx.serialization.json.jsonArray
14+
import kotlinx.serialization.json.jsonPrimitive
1015
import org.intellij.lang.annotations.Language
1116
import org.jetbrains.kotlinx.jupyter.api.MimeTypedResult
1217
import org.jetbrains.kotlinx.jupyter.testkit.JupyterReplTestCase

plugins/dataframe-gradle-plugin/src/test/kotlin/org/jetbrains/dataframe/gradle/DataFrameReadTest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ class DataFrameReadTest {
3333
fun `file with invalid json`() {
3434
val temp = Files.createTempDirectory("").toFile()
3535
val invalidJson = File(temp, "test.json").also { it.writeText(".") }
36-
shouldThrow<IllegalArgumentException> {
36+
shouldNotThrowAny {
3737
DataFrame.read(invalidJson)
3838
}
3939
}

0 commit comments

Comments
 (0)