Skip to content

Commit 2b6aca4

Browse files
committed
some cleaning per request
1 parent 84bf0d5 commit 2b6aca4

File tree

6 files changed

+14
-89
lines changed

6 files changed

+14
-89
lines changed

kotlin-spark-api-streaming.json

Lines changed: 0 additions & 14 deletions
This file was deleted.

kotlin-spark-api.json

Lines changed: 0 additions & 30 deletions
This file was deleted.

kotlin-spark-api/3.2/src/main/kotlin/org/jetbrains/kotlinx/spark/api/jupyter/HtmlRendering.kt

Lines changed: 13 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -84,14 +84,12 @@ internal fun <T> JavaRDDLike<T, *>.toHtml(limit: Int = 20, truncate: Int = 30):
8484
else -> row.toString()
8585
}
8686

87-
+string.let {
88-
if (truncate > 0 && it.length > truncate) {
89-
// do not show ellipses for strings shorter than 4 characters.
90-
if (truncate < 4) it.substring(0, truncate)
91-
else it.substring(0, truncate - 3) + "..."
92-
} else {
93-
it
94-
}
87+
+if (truncate > 0 && string.length > truncate) {
88+
// do not show ellipses for strings shorter than 4 characters.
89+
if (truncate < 4) string.substring(0, truncate)
90+
else string.substring(0, truncate - 3) + "..."
91+
} else {
92+
string
9593
}
9694
}
9795
}
@@ -115,15 +113,14 @@ internal fun <T> Dataset<T>.toHtml(limit: Int = 20, truncate: Int = 30): String
115113

116114
tr {
117115
for (header in rows.first()) th {
118-
+header.let {
119-
if (truncate > 0 && it.length > truncate) {
120-
// do not show ellipses for strings shorter than 4 characters.
121-
if (truncate < 4) it.substring(0, truncate)
122-
else it.substring(0, truncate - 3) + "..."
123-
} else {
124-
it
125-
}
116+
+if (truncate > 0 && header.length > truncate) {
117+
// do not show ellipses for strings shorter than 4 characters.
118+
if (truncate < 4) header.substring(0, truncate)
119+
else header.substring(0, truncate - 3) + "..."
120+
} else {
121+
header
126122
}
123+
127124
}
128125
}
129126

kotlin-spark-api/3.2/src/main/kotlin/org/jetbrains/kotlinx/spark/api/jupyter/Integration.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ package org.jetbrains.kotlinx.spark.api.jupyter
2222
import org.apache.spark.api.java.JavaRDDLike
2323
import org.apache.spark.rdd.RDD
2424
import org.apache.spark.sql.Dataset
25-
import org.intellij.lang.annotations.Language
2625
import org.jetbrains.kotlinx.jupyter.api.HTML
2726
import org.jetbrains.kotlinx.jupyter.api.KotlinKernelHost
2827
import org.jetbrains.kotlinx.jupyter.api.libraries.JupyterIntegration

kotlin-spark-api/3.2/src/main/kotlin/org/jetbrains/kotlinx/spark/api/jupyter/SparkIntegration.kt

Lines changed: 1 addition & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -19,28 +19,9 @@
1919
*/
2020
package org.jetbrains.kotlinx.spark.api.jupyter
2121

22-
import kotlinx.html.*
23-
import kotlinx.html.stream.appendHTML
24-
import org.apache.spark.api.java.JavaRDDLike
25-
import org.apache.spark.rdd.RDD
26-
import org.apache.spark.sql.Dataset
27-
import org.apache.spark.unsafe.array.ByteArrayMethods
28-
import org.intellij.lang.annotations.Language
29-
import org.jetbrains.kotlinx.jupyter.api.HTML
30-
import org.jetbrains.kotlinx.jupyter.api.libraries.JupyterIntegration
31-
import org.jetbrains.kotlinx.spark.api.*
32-
import java.io.InputStreamReader
33-
3422

35-
import org.apache.spark.*
23+
import org.intellij.lang.annotations.Language
3624
import org.jetbrains.kotlinx.jupyter.api.KotlinKernelHost
37-
import scala.collection.*
38-
import org.jetbrains.kotlinx.spark.api.SparkSession
39-
import scala.Product
40-
import java.io.Serializable
41-
import java.util.Random
42-
import scala.collection.Iterable as ScalaIterable
43-
import scala.collection.Iterator as ScalaIterator
4425

4526
/**
4627
* %use kotlin-spark-api

pom.xml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
<kotlin-jupyter-api.version>0.11.0-83</kotlin-jupyter-api.version>
2121
<kotlinx.html.version>0.7.3</kotlinx.html.version>
2222
<hadoop.version>3.3.1</hadoop.version>
23-
<!-- <junit.version>5.8.2</junit.version>-->
2423

2524
<!-- Plugin versions -->
2625
<allure-maven.version>2.10.0</allure-maven.version>
@@ -67,13 +66,6 @@
6766
<artifactId>kotlin-jupyter-test-kit</artifactId>
6867
<version>${kotlin-jupyter-api.version}</version>
6968
</dependency>
70-
<!-- <dependency>-->
71-
<!-- <groupId>org.junit</groupId>-->
72-
<!-- <artifactId>junit-bom</artifactId>-->
73-
<!-- <version>${junit.version}</version>-->
74-
<!-- <type>pom</type>-->
75-
<!-- <scope>import</scope>-->
76-
<!-- </dependency>-->
7769
</dependencies>
7870
</dependencyManagement>
7971

0 commit comments

Comments
 (0)