Skip to content

Commit 748fe93

Browse files
JolanrensenJolanrensen
committed
running Korro, KoDEx etc.
1 parent 53dcc42 commit 748fe93

122 files changed

Lines changed: 1782 additions & 2151 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/ColumnsContainer.kt‎

Lines changed: 12 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import org.jetbrains.kotlinx.dataframe.columns.ColumnReference
1212
import org.jetbrains.kotlinx.dataframe.columns.FrameColumn
1313
import org.jetbrains.kotlinx.dataframe.impl.columnName
1414
import org.jetbrains.kotlinx.dataframe.impl.columns.asAnyFrameColumn
15+
import org.jetbrains.kotlinx.dataframe.util.DEPRECATED_ACCESS_API
1516
import kotlin.reflect.KProperty
1617

1718
/**
@@ -43,15 +44,11 @@ public interface ColumnsContainer<out T> : ColumnsScope<T> {
4344

4445
public fun getColumnOrNull(index: Int): AnyCol?
4546

46-
@Deprecated(
47-
"Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html",
48-
)
47+
@Deprecated(DEPRECATED_ACCESS_API)
4948
@AccessApiOverload
5049
public fun <R> getColumnOrNull(column: ColumnReference<R>): DataColumn<R>?
5150

52-
@Deprecated(
53-
"Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html",
54-
)
51+
@Deprecated(DEPRECATED_ACCESS_API)
5552
@AccessApiOverload
5653
public fun <R> getColumnOrNull(column: KProperty<R>): DataColumn<R>?
5754

@@ -67,58 +64,40 @@ public interface ColumnsContainer<out T> : ColumnsScope<T> {
6764

6865
public operator fun get(columnPath: ColumnPath): AnyCol = getColumn(columnPath)
6966

70-
@Deprecated(
71-
"Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html",
72-
)
67+
@Deprecated(DEPRECATED_ACCESS_API)
7368
@AccessApiOverload
7469
public operator fun <R> get(column: DataColumn<R>): DataColumn<R> = getColumn(column.name()).cast()
7570

76-
@Deprecated(
77-
"Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html",
78-
)
71+
@Deprecated(DEPRECATED_ACCESS_API)
7972
@AccessApiOverload
8073
public operator fun <R> get(column: DataColumn<DataRow<R>>): ColumnGroup<R> = getColumn(column)
8174

82-
@Deprecated(
83-
"Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html",
84-
)
75+
@Deprecated(DEPRECATED_ACCESS_API)
8576
@AccessApiOverload
8677
public operator fun <R> get(column: DataColumn<DataFrame<R>>): FrameColumn<R> = getColumn(column)
8778

88-
@Deprecated(
89-
"Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html",
90-
)
79+
@Deprecated(DEPRECATED_ACCESS_API)
9180
@AccessApiOverload
9281
public operator fun <R> get(column: ColumnReference<R>): DataColumn<R> = getColumn(column)
9382

94-
@Deprecated(
95-
"Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html",
96-
)
83+
@Deprecated(DEPRECATED_ACCESS_API)
9784
@AccessApiOverload
9885
public operator fun <R> get(column: ColumnReference<DataRow<R>>): ColumnGroup<R> = getColumn(column)
9986

100-
@Deprecated(
101-
"Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html",
102-
)
87+
@Deprecated(DEPRECATED_ACCESS_API)
10388
@AccessApiOverload
10489
public operator fun <R> get(column: ColumnReference<DataFrame<R>>): FrameColumn<R> = getColumn(column)
10590

106-
@Deprecated(
107-
"Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html",
108-
)
91+
@Deprecated(DEPRECATED_ACCESS_API)
10992
@AccessApiOverload
11093
public operator fun <R> get(column: KProperty<R>): DataColumn<R> = get(column.columnName).cast()
11194

112-
@Deprecated(
113-
"Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html",
114-
)
95+
@Deprecated(DEPRECATED_ACCESS_API)
11596
@AccessApiOverload
11697
public operator fun <R> get(column: KProperty<DataRow<R>>): ColumnGroup<R> =
11798
get(column.columnName).asColumnGroup().cast()
11899

119-
@Deprecated(
120-
"Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html",
121-
)
100+
@Deprecated(DEPRECATED_ACCESS_API)
122101
@AccessApiOverload
123102
public operator fun <R> get(column: KProperty<DataFrame<R>>): FrameColumn<R> =
124103
get(column.columnName).asAnyFrameColumn().castFrameColumn()

‎core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/DataFrame.kt‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ import org.jetbrains.kotlinx.dataframe.impl.headPlusIterable
2424
import org.jetbrains.kotlinx.dataframe.impl.schema.createEmptyDataFrame
2525
import org.jetbrains.kotlinx.dataframe.impl.schema.createEmptyDataFrameOf
2626
import org.jetbrains.kotlinx.dataframe.schema.DataFrameSchema
27+
import org.jetbrains.kotlinx.dataframe.util.DEPRECATED_ACCESS_API
2728
import kotlin.reflect.KType
2829

2930
/**
@@ -121,9 +122,7 @@ public interface DataFrame<out T> :
121122
*/
122123
public operator fun <T, C> DataFrame<T>.get(columns: ColumnsSelector<T, C>): List<DataColumn<C>> = this.get(columns)
123124

124-
@Deprecated(
125-
"Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html",
126-
)
125+
@Deprecated(DEPRECATED_ACCESS_API)
127126
@AccessApiOverload
128127
public operator fun <T> DataFrame<T>.get(first: AnyColumnReference, vararg other: AnyColumnReference): DataFrame<T> =
129128
select { (listOf(first) + other).toColumnSet() }

‎core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/DataRow.kt‎

Lines changed: 7 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import org.jetbrains.kotlinx.dataframe.columns.ColumnReference
99
import org.jetbrains.kotlinx.dataframe.impl.columnName
1010
import org.jetbrains.kotlinx.dataframe.impl.owner
1111
import org.jetbrains.kotlinx.dataframe.impl.toIterable
12+
import org.jetbrains.kotlinx.dataframe.util.DEPRECATED_ACCESS_API
1213
import kotlin.reflect.KProperty
1314

1415
/**
@@ -28,27 +29,19 @@ public interface DataRow<out T> {
2829

2930
public operator fun <R> get(expression: RowExpression<T, R>): R = expression(this, this)
3031

31-
@Deprecated(
32-
"Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html",
33-
)
32+
@Deprecated(DEPRECATED_ACCESS_API)
3433
@AccessApiOverload
3534
public operator fun <R> get(column: ColumnReference<R>): R
3635

37-
@Deprecated(
38-
"Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html",
39-
)
36+
@Deprecated(DEPRECATED_ACCESS_API)
4037
@AccessApiOverload
4138
public operator fun <R> get(columns: List<ColumnReference<R>>): List<R> = columns.map { get(it) }
4239

43-
@Deprecated(
44-
"Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html",
45-
)
40+
@Deprecated(DEPRECATED_ACCESS_API)
4641
@AccessApiOverload
4742
public operator fun <R> get(property: KProperty<R>): R = get(property.columnName) as R
4843

49-
@Deprecated(
50-
"Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html",
51-
)
44+
@Deprecated(DEPRECATED_ACCESS_API)
5245
@AccessApiOverload
5346
public operator fun get(first: AnyColumnReference, vararg other: AnyColumnReference): DataRow<T> =
5447
owner.get(first, *other)[index]
@@ -83,9 +76,7 @@ public interface DataRow<out T> {
8376

8477
public fun getOrNull(name: String): Any?
8578

86-
@Deprecated(
87-
"Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html",
88-
)
79+
@Deprecated(DEPRECATED_ACCESS_API)
8980
@AccessApiOverload
9081
public fun <R> getValueOrNull(column: ColumnReference<R>): R?
9182

@@ -95,9 +86,7 @@ public interface DataRow<out T> {
9586

9687
public operator fun String.get(vararg path: String): ColumnPath = ColumnPath(listOf(this) + path)
9788

98-
@Deprecated(
99-
"Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html",
100-
)
89+
@Deprecated(DEPRECATED_ACCESS_API)
10190
@AccessApiOverload
10291
public operator fun <R> ColumnReference<R>.invoke(): R = get(this)
10392

‎core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/ColumnSelectionDsl.kt‎

Lines changed: 10 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import org.jetbrains.kotlinx.dataframe.columns.ColumnPath
1111
import org.jetbrains.kotlinx.dataframe.columns.ColumnReference
1212
import org.jetbrains.kotlinx.dataframe.columns.FrameColumn
1313
import org.jetbrains.kotlinx.dataframe.impl.columns.getColumn
14+
import org.jetbrains.kotlinx.dataframe.util.DEPRECATED_ACCESS_API
1415
import kotlin.reflect.KProperty
1516

1617
/** [Column Selection DSL][ColumnSelectionDsl] */
@@ -86,9 +87,7 @@ public interface ColumnSelectionDsl<out T> : ColumnsContainer<T> {
8687
* @throws [IllegalArgumentException] if the column is not found.
8788
* @return The [DataColumn] this [KProperty Accessor][KProperty] points to.
8889
*/
89-
@Deprecated(
90-
"Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html",
91-
)
90+
@Deprecated(DEPRECATED_ACCESS_API)
9291
@AccessApiOverload
9392
public operator fun <T> KProperty<T>.invoke(): DataColumn<T> = this@ColumnSelectionDsl[this]
9493

@@ -99,9 +98,7 @@ public interface ColumnSelectionDsl<out T> : ColumnsContainer<T> {
9998
* @throws [IllegalArgumentException] if the column is not found.
10099
* @return The [ColumnGroup] this [KProperty Accessor][KProperty] points to.
101100
*/
102-
@Deprecated(
103-
"Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html",
104-
)
101+
@Deprecated(DEPRECATED_ACCESS_API)
105102
@AccessApiOverload
106103
public operator fun <T> KProperty<DataRow<T>>.invoke(): ColumnGroup<T> = this@ColumnSelectionDsl[this]
107104

@@ -112,9 +109,7 @@ public interface ColumnSelectionDsl<out T> : ColumnsContainer<T> {
112109
* @throws [IllegalArgumentException] if the column is not found.
113110
* @return The [FrameColumn] this [KProperty Accessor][KProperty] points to.
114111
*/
115-
@Deprecated(
116-
"Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html",
117-
)
112+
@Deprecated(DEPRECATED_ACCESS_API)
118113
@AccessApiOverload
119114
public operator fun <T> KProperty<DataFrame<T>>.invoke(): FrameColumn<T> = this@ColumnSelectionDsl[this]
120115

@@ -149,9 +144,7 @@ public interface ColumnSelectionDsl<out T> : ColumnsContainer<T> {
149144
*/
150145
@Suppress("INAPPLICABLE_JVM_NAME")
151146
@JvmName("KPropertyDataRowGet")
152-
@Deprecated(
153-
"Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html",
154-
)
147+
@Deprecated(DEPRECATED_ACCESS_API)
155148
@AccessApiOverload
156149
public operator fun <T, R> KProperty<DataRow<T>>.get(column: KProperty<R>): DataColumn<R> = invoke()[column]
157150

@@ -171,9 +164,7 @@ public interface ColumnSelectionDsl<out T> : ColumnsContainer<T> {
171164
*/
172165
@Suppress("INAPPLICABLE_JVM_NAME")
173166
@JvmName("KPropertyDataRowGet")
174-
@Deprecated(
175-
"Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html",
176-
)
167+
@Deprecated(DEPRECATED_ACCESS_API)
177168
@AccessApiOverload
178169
public operator fun <T, R> KProperty<DataRow<T>>.get(column: KProperty<DataRow<R>>): ColumnGroup<R> =
179170
invoke()[column]
@@ -194,9 +185,7 @@ public interface ColumnSelectionDsl<out T> : ColumnsContainer<T> {
194185
*/
195186
@Suppress("INAPPLICABLE_JVM_NAME")
196187
@JvmName("KPropertyDataRowGet")
197-
@Deprecated(
198-
"Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html",
199-
)
188+
@Deprecated(DEPRECATED_ACCESS_API)
200189
@AccessApiOverload
201190
public operator fun <T, R> KProperty<DataRow<T>>.get(column: KProperty<DataFrame<R>>): FrameColumn<R> =
202191
invoke()[column]
@@ -215,9 +204,7 @@ public interface ColumnSelectionDsl<out T> : ColumnsContainer<T> {
215204
* @throws [IllegalArgumentException] if the column is not found.
216205
* @return The [DataColumn] these [KProperty Accessors][KProperty] point to.
217206
*/
218-
@Deprecated(
219-
"Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html",
220-
)
207+
@Deprecated(DEPRECATED_ACCESS_API)
221208
@AccessApiOverload
222209
public operator fun <T, R> KProperty<T>.get(column: KProperty<R>): DataColumn<R> = invoke().asColumnGroup()[column]
223210

@@ -235,9 +222,7 @@ public interface ColumnSelectionDsl<out T> : ColumnsContainer<T> {
235222
* @throws [IllegalArgumentException] if the column is not found.
236223
* @return The [ColumnGroup] these [KProperty Accessors][KProperty] point to.
237224
*/
238-
@Deprecated(
239-
"Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html",
240-
)
225+
@Deprecated(DEPRECATED_ACCESS_API)
241226
@AccessApiOverload
242227
public operator fun <T, R> KProperty<T>.get(column: KProperty<DataRow<R>>): ColumnGroup<R> =
243228
invoke().asColumnGroup()[column]
@@ -256,9 +241,7 @@ public interface ColumnSelectionDsl<out T> : ColumnsContainer<T> {
256241
* @throws [IllegalArgumentException] if the column is not found.
257242
* @return The [FrameColumn] these [KProperty Accessors][KProperty] point to.
258243
*/
259-
@Deprecated(
260-
"Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html",
261-
)
244+
@Deprecated(DEPRECATED_ACCESS_API)
262245
@AccessApiOverload
263246
public operator fun <T, R> KProperty<T>.get(column: KProperty<DataFrame<R>>): FrameColumn<R> =
264247
invoke().asColumnGroup()[column]

0 commit comments

Comments
 (0)