Skip to content

Commit e0288b7

Browse files
authored
Merge pull request #175 from Kotlin/conversions
[Fix] Conversions
2 parents ce8ce56 + cd3282a commit e0288b7

File tree

2 files changed

+293
-124
lines changed

2 files changed

+293
-124
lines changed

core/src/main/scala/org/jetbrains/kotlinx/spark/extensions/KSparkExtensions.scala

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ import org.apache.spark.SparkContext
2323
import org.apache.spark.sql._
2424

2525
import java.util
26-
import scala.collection.JavaConverters
2726

2827
object KSparkExtensions {
2928

@@ -39,7 +38,13 @@ object KSparkExtensions {
3938

4039
def lit(literal: Any): Column = functions.lit(literal)
4140

42-
def collectAsList[T](ds: Dataset[T]): util.List[T] = JavaConverters.seqAsJavaList(ds.collect())
41+
def collectAsList[T](ds: Dataset[T]): util.List[T] = {
42+
//#if scalaCompat >= 2.13
43+
scala.jdk.javaapi.CollectionConverters.asJava(ds.collect())
44+
//#else
45+
//$scala.collection.JavaConverters.seqAsJavaList(ds.collect())
46+
//#endif
47+
}
4348

4449

4550
def debugCodegen(df: Dataset[_]): Unit = {

0 commit comments

Comments
 (0)