From 8cb4030cb5eb663751009f27ffcf251aaf715b1c Mon Sep 17 00:00:00 2001 From: Nikita Klimenko Date: Fri, 17 Nov 2023 15:54:15 +0200 Subject: [PATCH] remove klaxon usage outside json.kt --- .../org/jetbrains/kotlinx/dataframe/impl/api/concat.kt | 9 ++++++++- .../org/jetbrains/kotlinx/dataframe/impl/api/concat.kt | 9 ++++++++- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/impl/api/concat.kt b/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/impl/api/concat.kt index ec03eb8878..591cbe6033 100644 --- a/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/impl/api/concat.kt +++ b/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/impl/api/concat.kt @@ -1,6 +1,5 @@ package org.jetbrains.kotlinx.dataframe.impl.api -import com.beust.klaxon.internal.firstNotNullResult import org.jetbrains.kotlinx.dataframe.DataColumn import org.jetbrains.kotlinx.dataframe.DataFrame import org.jetbrains.kotlinx.dataframe.api.asColumnGroup @@ -89,3 +88,11 @@ internal fun concatImpl(dataFrames: List>): DataFrame { dataFrameOf(columns) }.cast() } + +private inline fun Iterable.firstNotNullResult(transform: (T) -> R?): R? { + for (element in this) { + val result = transform(element) + if (result != null) return result + } + return null +} diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/impl/api/concat.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/impl/api/concat.kt index ec03eb8878..591cbe6033 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/impl/api/concat.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/impl/api/concat.kt @@ -1,6 +1,5 @@ package org.jetbrains.kotlinx.dataframe.impl.api -import com.beust.klaxon.internal.firstNotNullResult import org.jetbrains.kotlinx.dataframe.DataColumn import org.jetbrains.kotlinx.dataframe.DataFrame import org.jetbrains.kotlinx.dataframe.api.asColumnGroup @@ -89,3 +88,11 @@ internal fun concatImpl(dataFrames: List>): DataFrame { dataFrameOf(columns) }.cast() } + +private inline fun Iterable.firstNotNullResult(transform: (T) -> R?): R? { + for (element in this) { + val result = transform(element) + if (result != null) return result + } + return null +}