Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Dataschema generic inheritance #200

Merged
merged 2 commits into from
Dec 8, 2022
Merged

Dataschema generic inheritance #200

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
853fb97
test and bugfix for convertTo etc. not recognizing super properties c…
Jolanrensen Dec 5, 2022
4855060
fixing same issue for extension generation by ksp with test
Jolanrensen Dec 5, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/codeGen/MarkersExtractor.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ import org.jetbrains.kotlinx.dataframe.impl.schema.getPropertiesOrder
import org.jetbrains.kotlinx.dataframe.schema.ColumnSchema
import kotlin.reflect.KClass
import kotlin.reflect.KType
import kotlin.reflect.full.declaredMemberProperties
import kotlin.reflect.full.findAnnotation
import kotlin.reflect.full.hasAnnotation
import kotlin.reflect.full.memberProperties
import kotlin.reflect.full.superclasses
import kotlin.reflect.full.withNullability
import kotlin.reflect.jvm.jvmErasure
Expand Down Expand Up @@ -54,7 +54,7 @@ internal object MarkersExtractor {

private fun getFields(markerClass: KClass<*>, nullableProperties: Boolean): List<GeneratedField> {
val order = getPropertiesOrder(markerClass)
return markerClass.declaredMemberProperties.sortedBy { order[it.name] ?: Int.MAX_VALUE }.mapIndexed { _, it ->
koperagen marked this conversation as resolved.
Show resolved Hide resolved
return markerClass.memberProperties.sortedBy { order[it.name] ?: Int.MAX_VALUE }.mapIndexed { _, it ->
val fieldName = ValidFieldName.of(it.name)
val columnName = it.findAnnotation<ColumnName>()?.name ?: fieldName.unquoted
val type = it.returnType
Expand Down
21 changes: 17 additions & 4 deletions core/src/test/kotlin/org/jetbrains/kotlinx/dataframe/api/convertTo.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import io.kotest.assertions.throwables.shouldThrow
import io.kotest.matchers.shouldBe
import org.jetbrains.kotlinx.dataframe.AnyFrame
import org.jetbrains.kotlinx.dataframe.DataFrame
import org.jetbrains.kotlinx.dataframe.alsoDebug
import org.jetbrains.kotlinx.dataframe.annotations.DataSchema
import org.jetbrains.kotlinx.dataframe.exceptions.TypeConverterNotFoundException
import org.junit.Test
Expand Down Expand Up @@ -239,9 +240,21 @@ class ConvertToTests {
.alsoDebug("df5 after second convert:")
}

private fun <T : DataFrame<*>> T.alsoDebug(println: String? = null): T = apply {
println?.let { println(it) }
print(borders = true, title = true, columnTypes = true, valueLimit = -1)
schema().print()
interface KeyValue<T> {
val key: String
val value: T
}

@DataSchema
interface MySchema : KeyValue<Int>

@Test
fun `Convert generic interface to itself`() {
val df = dataFrameOf("key", "value")(
"a", 1,
"b", 2,
).alsoDebug()
val converted = df.convertTo<MySchema>().alsoDebug()
converted shouldBe df
}
}