Skip to content

Commit 9d65788

Browse files
authored
Merge pull request #506 from Kotlin/klaxon-fix
remove klaxon usage outside json.kt
2 parents c7b8169 + 8cb4030 commit 9d65788

File tree

2 files changed

+16
-2
lines changed
  • core
    • generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/impl/api
    • src/main/kotlin/org/jetbrains/kotlinx/dataframe/impl/api

2 files changed

+16
-2
lines changed

core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/impl/api/concat.kt

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package org.jetbrains.kotlinx.dataframe.impl.api
22

3-
import com.beust.klaxon.internal.firstNotNullResult
43
import org.jetbrains.kotlinx.dataframe.DataColumn
54
import org.jetbrains.kotlinx.dataframe.DataFrame
65
import org.jetbrains.kotlinx.dataframe.api.asColumnGroup
@@ -89,3 +88,11 @@ internal fun <T> concatImpl(dataFrames: List<DataFrame<T>>): DataFrame<T> {
8988
dataFrameOf(columns)
9089
}.cast()
9190
}
91+
92+
private inline fun <T, R : Any> Iterable<T>.firstNotNullResult(transform: (T) -> R?): R? {
93+
for (element in this) {
94+
val result = transform(element)
95+
if (result != null) return result
96+
}
97+
return null
98+
}

core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/impl/api/concat.kt

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package org.jetbrains.kotlinx.dataframe.impl.api
22

3-
import com.beust.klaxon.internal.firstNotNullResult
43
import org.jetbrains.kotlinx.dataframe.DataColumn
54
import org.jetbrains.kotlinx.dataframe.DataFrame
65
import org.jetbrains.kotlinx.dataframe.api.asColumnGroup
@@ -89,3 +88,11 @@ internal fun <T> concatImpl(dataFrames: List<DataFrame<T>>): DataFrame<T> {
8988
dataFrameOf(columns)
9089
}.cast()
9190
}
91+
92+
private inline fun <T, R : Any> Iterable<T>.firstNotNullResult(transform: (T) -> R?): R? {
93+
for (element in this) {
94+
val result = transform(element)
95+
if (result != null) return result
96+
}
97+
return null
98+
}

0 commit comments

Comments
 (0)