Skip to content

Commit 74e0e56

Browse files
ermolenkodevermolenkodev
committed
Fix the imports that were accidentally replaced by wildcards *.
1 parent d3f64aa commit 74e0e56

File tree

5 files changed

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

5 files changed

+75
-23
lines changed

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,13 @@ import com.beust.klaxon.JsonObject
55
import com.beust.klaxon.KlaxonJson
66
import com.beust.klaxon.Parser
77
import com.beust.klaxon.json
8+
import java.io.File
9+
import java.io.InputStream
10+
import java.net.URL
11+
import kotlin.reflect.KType
12+
import kotlin.reflect.KTypeProjection
13+
import kotlin.reflect.full.createType
14+
import kotlin.reflect.typeOf
815
import org.jetbrains.kotlinx.dataframe.AnyCol
916
import org.jetbrains.kotlinx.dataframe.AnyFrame
1017
import org.jetbrains.kotlinx.dataframe.AnyRow
@@ -63,13 +70,6 @@ import org.jetbrains.kotlinx.dataframe.schema.ColumnSchema
6370
import org.jetbrains.kotlinx.dataframe.type
6471
import org.jetbrains.kotlinx.dataframe.typeClass
6572
import org.jetbrains.kotlinx.dataframe.values
66-
import java.io.File
67-
import java.io.InputStream
68-
import java.net.URL
69-
import kotlin.reflect.KType
70-
import kotlin.reflect.KTypeProjection
71-
import kotlin.reflect.full.createType
72-
import kotlin.reflect.typeOf
7373

7474
public class JSON(
7575
private val typeClashTactic: TypeClashTactic = ARRAY_AND_VALUE_COLUMNS,

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,8 @@ import org.jetbrains.kotlinx.dataframe.columns.ColumnKind
2828
import org.jetbrains.kotlinx.dataframe.columns.FrameColumn
2929
import org.jetbrains.kotlinx.dataframe.columns.ValueColumn
3030
import org.jetbrains.kotlinx.dataframe.impl.nothingType
31-
import org.jetbrains.kotlinx.dataframe.io.JSON.TypeClashTactic.*
31+
import org.jetbrains.kotlinx.dataframe.io.JSON.TypeClashTactic.ANY_COLUMNS
32+
import org.jetbrains.kotlinx.dataframe.io.JSON.TypeClashTactic.ARRAY_AND_VALUE_COLUMNS
3233
import org.jetbrains.kotlinx.dataframe.io.SerializationKeys.COLUMNS
3334
import org.jetbrains.kotlinx.dataframe.io.SerializationKeys.DATA
3435
import org.jetbrains.kotlinx.dataframe.io.SerializationKeys.KIND
@@ -40,7 +41,7 @@ import org.jetbrains.kotlinx.dataframe.io.SerializationKeys.VERSION
4041
import org.jetbrains.kotlinx.dataframe.type
4142
import org.jetbrains.kotlinx.dataframe.values
4243
import org.junit.Test
43-
import kotlin.reflect.*
44+
import kotlin.reflect.typeOf
4445

4546
class JsonTests {
4647

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

Lines changed: 36 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,58 @@
11
package org.jetbrains.kotlinx.dataframe.io
22

3-
import com.beust.klaxon.*
3+
import com.beust.klaxon.JsonArray
4+
import com.beust.klaxon.JsonObject
5+
import com.beust.klaxon.KlaxonJson
6+
import com.beust.klaxon.Parser
7+
import com.beust.klaxon.json
8+
import java.io.File
9+
import java.io.InputStream
10+
import java.net.URL
11+
import kotlin.reflect.KType
12+
import kotlin.reflect.KTypeProjection
13+
import kotlin.reflect.full.createType
14+
import kotlin.reflect.typeOf
415
import org.jetbrains.kotlinx.dataframe.AnyCol
516
import org.jetbrains.kotlinx.dataframe.AnyFrame
617
import org.jetbrains.kotlinx.dataframe.AnyRow
718
import org.jetbrains.kotlinx.dataframe.ColumnsContainer
819
import org.jetbrains.kotlinx.dataframe.DataColumn
920
import org.jetbrains.kotlinx.dataframe.DataFrame
1021
import org.jetbrains.kotlinx.dataframe.DataRow
11-
import org.jetbrains.kotlinx.dataframe.api.*
22+
import org.jetbrains.kotlinx.dataframe.api.JsonPath
23+
import org.jetbrains.kotlinx.dataframe.api.KeyValueProperty
24+
import org.jetbrains.kotlinx.dataframe.api.cast
25+
import org.jetbrains.kotlinx.dataframe.api.columnOf
26+
import org.jetbrains.kotlinx.dataframe.api.concat
27+
import org.jetbrains.kotlinx.dataframe.api.dataFrameOf
28+
import org.jetbrains.kotlinx.dataframe.api.firstOrNull
29+
import org.jetbrains.kotlinx.dataframe.api.getColumn
30+
import org.jetbrains.kotlinx.dataframe.api.indices
31+
import org.jetbrains.kotlinx.dataframe.api.isList
32+
import org.jetbrains.kotlinx.dataframe.api.mapIndexed
1233
import org.jetbrains.kotlinx.dataframe.api.name
34+
import org.jetbrains.kotlinx.dataframe.api.named
35+
import org.jetbrains.kotlinx.dataframe.api.rows
36+
import org.jetbrains.kotlinx.dataframe.api.schema
37+
import org.jetbrains.kotlinx.dataframe.api.single
38+
import org.jetbrains.kotlinx.dataframe.api.splitInto
39+
import org.jetbrains.kotlinx.dataframe.api.toDataFrame
1340
import org.jetbrains.kotlinx.dataframe.codeGen.DefaultReadDfMethod
1441
import org.jetbrains.kotlinx.dataframe.codeGen.DefaultReadJsonMethod
1542
import org.jetbrains.kotlinx.dataframe.columns.ColumnGroup
1643
import org.jetbrains.kotlinx.dataframe.columns.ColumnKind
1744
import org.jetbrains.kotlinx.dataframe.columns.FrameColumn
18-
import org.jetbrains.kotlinx.dataframe.impl.*
45+
import org.jetbrains.kotlinx.dataframe.impl.ColumnNameGenerator
46+
import org.jetbrains.kotlinx.dataframe.impl.DataCollectorBase
47+
import org.jetbrains.kotlinx.dataframe.impl.asList
1948
import org.jetbrains.kotlinx.dataframe.impl.columns.createColumn
49+
import org.jetbrains.kotlinx.dataframe.impl.commonType
50+
import org.jetbrains.kotlinx.dataframe.impl.createDataCollector
51+
import org.jetbrains.kotlinx.dataframe.impl.guessValueType
2052
import org.jetbrains.kotlinx.dataframe.impl.schema.DataFrameSchemaImpl
2153
import org.jetbrains.kotlinx.dataframe.impl.schema.extractSchema
2254
import org.jetbrains.kotlinx.dataframe.impl.schema.intersectSchemas
55+
import org.jetbrains.kotlinx.dataframe.impl.splitByIndices
2356
import org.jetbrains.kotlinx.dataframe.io.JSON.TypeClashTactic
2457
import org.jetbrains.kotlinx.dataframe.io.JSON.TypeClashTactic.ANY_COLUMNS
2558
import org.jetbrains.kotlinx.dataframe.io.JSON.TypeClashTactic.ARRAY_AND_VALUE_COLUMNS
@@ -37,13 +70,6 @@ import org.jetbrains.kotlinx.dataframe.schema.ColumnSchema
3770
import org.jetbrains.kotlinx.dataframe.type
3871
import org.jetbrains.kotlinx.dataframe.typeClass
3972
import org.jetbrains.kotlinx.dataframe.values
40-
import java.io.File
41-
import java.io.InputStream
42-
import java.net.URL
43-
import kotlin.reflect.KType
44-
import kotlin.reflect.KTypeProjection
45-
import kotlin.reflect.full.createType
46-
import kotlin.reflect.typeOf
4773

4874
public class JSON(
4975
private val typeClashTactic: TypeClashTactic = ARRAY_AND_VALUE_COLUMNS,

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

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,20 @@
11
package org.jetbrains.kotlinx.dataframe.jupyter
22

3-
import org.jetbrains.kotlinx.dataframe.io.*
3+
import org.jetbrains.kotlinx.dataframe.io.DataFrameHtmlData
4+
import org.jetbrains.kotlinx.dataframe.io.DisplayConfiguration
5+
import org.jetbrains.kotlinx.dataframe.io.toHTML
6+
import org.jetbrains.kotlinx.dataframe.io.toJsonWithMetadata
7+
import org.jetbrains.kotlinx.dataframe.io.toStaticHtml
48
import org.jetbrains.kotlinx.dataframe.jupyter.KotlinNotebookPluginUtils.convertToDataFrame
59
import org.jetbrains.kotlinx.dataframe.nrow
6-
import org.jetbrains.kotlinx.jupyter.api.*
10+
import org.jetbrains.kotlinx.jupyter.api.HtmlData
11+
import org.jetbrains.kotlinx.jupyter.api.JupyterClientType
12+
import org.jetbrains.kotlinx.jupyter.api.KotlinKernelVersion
13+
import org.jetbrains.kotlinx.jupyter.api.MimeTypedResult
14+
import org.jetbrains.kotlinx.jupyter.api.Notebook
715
import org.jetbrains.kotlinx.jupyter.api.libraries.JupyterIntegration
16+
import org.jetbrains.kotlinx.jupyter.api.mimeResult
17+
import org.jetbrains.kotlinx.jupyter.api.renderHtmlAsIFrameIfNeeded
818

919
/** Starting from this version, dataframe integration will respond with additional data for rendering in Kotlin Notebooks plugin. */
1020
private const val MIN_KERNEL_VERSION_FOR_NEW_TABLES_UI = "0.11.0.311"

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

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,21 @@ import io.kotest.matchers.string.shouldContain
88
import io.kotest.matchers.string.shouldNotContain
99
import io.kotest.matchers.types.instanceOf
1010
import org.intellij.lang.annotations.Language
11-
import org.jetbrains.kotlinx.dataframe.*
12-
import org.jetbrains.kotlinx.dataframe.api.*
11+
import org.jetbrains.kotlinx.dataframe.AnyFrame
12+
import org.jetbrains.kotlinx.dataframe.DataFrame
13+
import org.jetbrains.kotlinx.dataframe.DataRow
14+
import org.jetbrains.kotlinx.dataframe.alsoDebug
15+
import org.jetbrains.kotlinx.dataframe.api.JsonPath
16+
import org.jetbrains.kotlinx.dataframe.api.allNulls
17+
import org.jetbrains.kotlinx.dataframe.api.columnsCount
18+
import org.jetbrains.kotlinx.dataframe.api.convert
19+
import org.jetbrains.kotlinx.dataframe.api.dataFrameOf
20+
import org.jetbrains.kotlinx.dataframe.api.forEach
21+
import org.jetbrains.kotlinx.dataframe.api.getColumnGroup
22+
import org.jetbrains.kotlinx.dataframe.api.getFrameColumn
23+
import org.jetbrains.kotlinx.dataframe.api.schema
24+
import org.jetbrains.kotlinx.dataframe.api.toDouble
25+
import org.jetbrains.kotlinx.dataframe.api.toMap
1326
import org.jetbrains.kotlinx.dataframe.columns.ColumnGroup
1427
import org.jetbrains.kotlinx.dataframe.columns.ColumnKind
1528
import org.jetbrains.kotlinx.dataframe.columns.FrameColumn
@@ -25,6 +38,8 @@ import org.jetbrains.kotlinx.dataframe.io.SerializationKeys.METADATA
2538
import org.jetbrains.kotlinx.dataframe.io.SerializationKeys.NCOL
2639
import org.jetbrains.kotlinx.dataframe.io.SerializationKeys.NROW
2740
import org.jetbrains.kotlinx.dataframe.io.SerializationKeys.VERSION
41+
import org.jetbrains.kotlinx.dataframe.type
42+
import org.jetbrains.kotlinx.dataframe.values
2843
import org.junit.Test
2944
import kotlin.reflect.typeOf
3045

0 commit comments

Comments
 (0)