Skip to content

Commit 1353405

Browse files
JolanrensenJolanrensen
committed
collected deprecated access api messages into the deprecations file
1 parent 93abde1 commit 1353405

Some content is hidden

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

74 files changed

+633
-1680
lines changed

‎core/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] */
@@ -71,29 +72,23 @@ public interface ColumnSelectionDsl<out T> : ColumnsContainer<T> {
7172
* @include [CommonKPropertyInvokeDocs]
7273
* @return The [DataColumn] this [KProperty Accessor][KProperty] points to.
7374
*/
74-
@Deprecated(
75-
"Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html",
76-
)
75+
@Deprecated(DEPRECATED_ACCESS_API)
7776
@AccessApiOverload
7877
public operator fun <T> KProperty<T>.invoke(): DataColumn<T> = this@ColumnSelectionDsl[this]
7978

8079
/**
8180
* @include [CommonKPropertyInvokeDocs]
8281
* @return The [ColumnGroup] this [KProperty Accessor][KProperty] points to.
8382
*/
84-
@Deprecated(
85-
"Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html",
86-
)
83+
@Deprecated(DEPRECATED_ACCESS_API)
8784
@AccessApiOverload
8885
public operator fun <T> KProperty<DataRow<T>>.invoke(): ColumnGroup<T> = this@ColumnSelectionDsl[this]
8986

9087
/**
9188
* @include [CommonKPropertyInvokeDocs]
9289
* @return The [FrameColumn] this [KProperty Accessor][KProperty] points to.
9390
*/
94-
@Deprecated(
95-
"Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html",
96-
)
91+
@Deprecated(DEPRECATED_ACCESS_API)
9792
@AccessApiOverload
9893
public operator fun <T> KProperty<DataFrame<T>>.invoke(): FrameColumn<T> = this@ColumnSelectionDsl[this]
9994

@@ -118,9 +113,7 @@ public interface ColumnSelectionDsl<out T> : ColumnsContainer<T> {
118113
*/
119114
@Suppress("INAPPLICABLE_JVM_NAME")
120115
@JvmName("KPropertyDataRowGet")
121-
@Deprecated(
122-
"Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html",
123-
)
116+
@Deprecated(DEPRECATED_ACCESS_API)
124117
@AccessApiOverload
125118
public operator fun <T, R> KProperty<DataRow<T>>.get(column: KProperty<R>): DataColumn<R> = invoke()[column]
126119

@@ -130,9 +123,7 @@ public interface ColumnSelectionDsl<out T> : ColumnsContainer<T> {
130123
*/
131124
@Suppress("INAPPLICABLE_JVM_NAME")
132125
@JvmName("KPropertyDataRowGet")
133-
@Deprecated(
134-
"Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html",
135-
)
126+
@Deprecated(DEPRECATED_ACCESS_API)
136127
@AccessApiOverload
137128
public operator fun <T, R> KProperty<DataRow<T>>.get(column: KProperty<DataRow<R>>): ColumnGroup<R> =
138129
invoke()[column]
@@ -143,9 +134,7 @@ public interface ColumnSelectionDsl<out T> : ColumnsContainer<T> {
143134
*/
144135
@Suppress("INAPPLICABLE_JVM_NAME")
145136
@JvmName("KPropertyDataRowGet")
146-
@Deprecated(
147-
"Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html",
148-
)
137+
@Deprecated(DEPRECATED_ACCESS_API)
149138
@AccessApiOverload
150139
public operator fun <T, R> KProperty<DataRow<T>>.get(column: KProperty<DataFrame<R>>): FrameColumn<R> =
151140
invoke()[column]
@@ -154,19 +143,15 @@ public interface ColumnSelectionDsl<out T> : ColumnsContainer<T> {
154143
* @include [CommonKPropertyGetDocs]
155144
* @return The [DataColumn] these [KProperty Accessors][KProperty] point to.
156145
*/
157-
@Deprecated(
158-
"Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html",
159-
)
146+
@Deprecated(DEPRECATED_ACCESS_API)
160147
@AccessApiOverload
161148
public operator fun <T, R> KProperty<T>.get(column: KProperty<R>): DataColumn<R> = invoke().asColumnGroup()[column]
162149

163150
/**
164151
* @include [CommonKPropertyGetDocs]
165152
* @return The [ColumnGroup] these [KProperty Accessors][KProperty] point to.
166153
*/
167-
@Deprecated(
168-
"Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html",
169-
)
154+
@Deprecated(DEPRECATED_ACCESS_API)
170155
@AccessApiOverload
171156
public operator fun <T, R> KProperty<T>.get(column: KProperty<DataRow<R>>): ColumnGroup<R> =
172157
invoke().asColumnGroup()[column]
@@ -175,9 +160,7 @@ public interface ColumnSelectionDsl<out T> : ColumnsContainer<T> {
175160
* @include [CommonKPropertyGetDocs]
176161
* @return The [FrameColumn] these [KProperty Accessors][KProperty] point to.
177162
*/
178-
@Deprecated(
179-
"Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html",
180-
)
163+
@Deprecated(DEPRECATED_ACCESS_API)
181164
@AccessApiOverload
182165
public operator fun <T, R> KProperty<T>.get(column: KProperty<DataFrame<R>>): FrameColumn<R> =
183166
invoke().asColumnGroup()[column]

‎core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/ColumnsSelectionDsl.kt

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ import org.jetbrains.kotlinx.dataframe.documentation.Indent
1616
import org.jetbrains.kotlinx.dataframe.documentation.LineBreak
1717
import org.jetbrains.kotlinx.dataframe.documentation.SelectingColumns
1818
import org.jetbrains.kotlinx.dataframe.impl.DataFrameReceiver
19+
import org.jetbrains.kotlinx.dataframe.util.DEPRECATED_ACCESS_API
1920
import kotlin.reflect.KProperty
2021

2122
/** [Columns Selection DSL][ColumnsSelectionDsl] */
@@ -399,9 +400,7 @@ public interface ColumnsSelectionDsl<out T> : // SingleColumn<DataRow<T>>
399400
*
400401
* `df.`[select][DataFrame.select]` { DataSchemaType::myColGroup `[`{`][KProperty.select]` colA `[`and`][ColumnsSelectionDsl.and]` colB `[`}`][KProperty.select]` }`
401402
*/
402-
@Deprecated(
403-
"Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html",
404-
)
403+
@Deprecated(DEPRECATED_ACCESS_API)
405404
@AccessApiOverload
406405
public operator fun <C, R> KProperty<C>.invoke(selector: ColumnsSelector<C, R>): ColumnSet<R> =
407406
columnGroup(this).select(selector)

‎core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/DataFrameGet.kt

Lines changed: 11 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ import org.jetbrains.kotlinx.dataframe.impl.getColumnPaths
2323
import org.jetbrains.kotlinx.dataframe.impl.getColumnsWithPaths
2424
import org.jetbrains.kotlinx.dataframe.ncol
2525
import org.jetbrains.kotlinx.dataframe.nrow
26+
import org.jetbrains.kotlinx.dataframe.util.DEPRECATED_ACCESS_API
2627
import kotlin.reflect.KProperty
2728

2829
public fun <T, C> DataFrame<T>.getColumnsWithPaths(selector: ColumnsSelector<T, C>): List<ColumnWithPath<C>> =
@@ -87,23 +88,17 @@ public fun <T> DataFrame<T>.properties(): ColumnsScope<T> = this
8788
public fun <T> ColumnsContainer<T>.getColumn(name: String): AnyCol =
8889
getColumnOrNull(name) ?: throw IllegalArgumentException("Column not found: '$name'")
8990

90-
@Deprecated(
91-
"Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html",
92-
)
91+
@Deprecated(DEPRECATED_ACCESS_API)
9392
@AccessApiOverload
9493
public fun <T, R> ColumnsContainer<T>.getColumn(column: ColumnReference<DataFrame<R>>): FrameColumn<R> =
9594
getColumnOrNull(column)?.asFrameColumn() ?: throw IllegalArgumentException("FrameColumn not found: '$column'")
9695

97-
@Deprecated(
98-
"Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html",
99-
)
96+
@Deprecated(DEPRECATED_ACCESS_API)
10097
@AccessApiOverload
10198
public fun <T, R> ColumnsContainer<T>.getColumn(column: ColumnReference<DataRow<R>>): ColumnGroup<R> =
10299
getColumnOrNull(column)?.asColumnGroup() ?: throw IllegalArgumentException("ColumnGroup not found: '$column'")
103100

104-
@Deprecated(
105-
"Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html",
106-
)
101+
@Deprecated(DEPRECATED_ACCESS_API)
107102
@AccessApiOverload
108103
public fun <T, R> ColumnsContainer<T>.getColumn(column: ColumnReference<R>): DataColumn<R> =
109104
getColumnOrNull(column) ?: throw IllegalArgumentException("Column not found: '$column'")
@@ -125,16 +120,12 @@ public fun <T> ColumnsContainer<T>.getColumnGroup(index: Int): ColumnGroup<*> =
125120

126121
public fun <T> ColumnsContainer<T>.getColumnGroup(name: String): ColumnGroup<*> = getColumn(name).asColumnGroup()
127122

128-
@Deprecated(
129-
"Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html",
130-
)
123+
@Deprecated(DEPRECATED_ACCESS_API)
131124
@AccessApiOverload
132125
public fun <T> ColumnsContainer<T>.getColumnGroup(column: KProperty<*>): ColumnGroup<*> =
133126
getColumnGroup(column.columnName)
134127

135-
@Deprecated(
136-
"Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html",
137-
)
128+
@Deprecated(DEPRECATED_ACCESS_API)
138129
@AccessApiOverload
139130
public fun <T, C> ColumnsContainer<T>.getColumnGroup(column: ColumnReference<DataRow<C>>): ColumnGroup<C> =
140131
getColumn(column)
@@ -149,9 +140,7 @@ public fun <T, C> ColumnsContainer<T>.getColumnGroup(column: ColumnSelector<T, D
149140
public fun <T> ColumnsContainer<T>.getColumnGroupOrNull(name: String): ColumnGroup<*>? =
150141
getColumnOrNull(name)?.asColumnGroup()
151142

152-
@Deprecated(
153-
"Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html",
154-
)
143+
@Deprecated(DEPRECATED_ACCESS_API)
155144
@AccessApiOverload
156145
public fun <T> ColumnsContainer<T>.getColumnGroupOrNull(column: KProperty<*>): ColumnGroup<*>? =
157146
getColumnGroupOrNull(column.columnName)
@@ -160,27 +149,19 @@ public fun <T> ColumnsContainer<T>.getColumnGroupOrNull(column: KProperty<*>): C
160149

161150
// region containsColumn
162151

163-
@Deprecated(
164-
"Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html",
165-
)
152+
@Deprecated(DEPRECATED_ACCESS_API)
166153
@AccessApiOverload
167154
public fun <C> ColumnsContainer<*>.containsColumn(column: ColumnReference<C>): Boolean = getColumnOrNull(column) != null
168155

169-
@Deprecated(
170-
"Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html",
171-
)
156+
@Deprecated(DEPRECATED_ACCESS_API)
172157
@AccessApiOverload
173158
public fun ColumnsContainer<*>.containsColumn(column: KProperty<*>): Boolean = containsColumn(column.columnName)
174159

175-
@Deprecated(
176-
"Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html",
177-
)
160+
@Deprecated(DEPRECATED_ACCESS_API)
178161
@AccessApiOverload
179162
public operator fun ColumnsContainer<*>.contains(column: AnyColumnReference): Boolean = containsColumn(column)
180163

181-
@Deprecated(
182-
"Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html",
183-
)
164+
@Deprecated(DEPRECATED_ACCESS_API)
184165
@AccessApiOverload
185166
public operator fun ColumnsContainer<*>.contains(column: KProperty<*>): Boolean = containsColumn(column)
186167

‎core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/DataRowApi.kt

Lines changed: 7 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ import org.jetbrains.kotlinx.dataframe.index
1717
import org.jetbrains.kotlinx.dataframe.indices
1818
import org.jetbrains.kotlinx.dataframe.ncol
1919
import org.jetbrains.kotlinx.dataframe.nrow
20+
import org.jetbrains.kotlinx.dataframe.util.DEPRECATED_ACCESS_API
2021
import kotlin.experimental.ExperimentalTypeInference
2122
import kotlin.reflect.KProperty
2223
import kotlin.reflect.KType
@@ -62,23 +63,17 @@ public fun AnyRow.namedValues(): List<NameValuePair<Any?>> =
6263

6364
public fun <T> AnyRow.getValue(columnName: String): T = get(columnName) as T
6465

65-
@Deprecated(
66-
"Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html",
67-
)
66+
@Deprecated(DEPRECATED_ACCESS_API)
6867
@AccessApiOverload
6968
public fun <T> AnyRow.getValue(column: ColumnReference<T>): T = get(column)
7069

71-
@Deprecated(
72-
"Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html",
73-
)
70+
@Deprecated(DEPRECATED_ACCESS_API)
7471
@AccessApiOverload
7572
public fun <T> AnyRow.getValue(column: KProperty<T>): T = get(column)
7673

7774
public fun <T> AnyRow.getValueOrNull(columnName: String): T? = getOrNull(columnName) as T?
7875

79-
@Deprecated(
80-
"Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html",
81-
)
76+
@Deprecated(DEPRECATED_ACCESS_API)
8277
@AccessApiOverload
8378
public fun <T> AnyRow.getValueOrNull(column: KProperty<T>): T? = getValueOrNull<T>(column.columnName)
8479

@@ -88,23 +83,17 @@ public fun <T> AnyRow.getValueOrNull(column: KProperty<T>): T? = getValueOrNull<
8883

8984
public fun AnyRow.containsKey(columnName: String): Boolean = owner.containsColumn(columnName)
9085

91-
@Deprecated(
92-
"Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html",
93-
)
86+
@Deprecated(DEPRECATED_ACCESS_API)
9487
@AccessApiOverload
9588
public fun AnyRow.containsKey(column: AnyColumnReference): Boolean = owner.containsColumn(column)
9689

97-
@Deprecated(
98-
"Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html",
99-
)
90+
@Deprecated(DEPRECATED_ACCESS_API)
10091
@AccessApiOverload
10192
public fun AnyRow.containsKey(column: KProperty<*>): Boolean = owner.containsColumn(column)
10293

10394
public operator fun AnyRow.contains(column: AnyColumnReference): Boolean = containsKey(column)
10495

105-
@Deprecated(
106-
"Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html",
107-
)
96+
@Deprecated(DEPRECATED_ACCESS_API)
10897
@AccessApiOverload
10998
public operator fun AnyRow.contains(column: KProperty<*>): Boolean = containsKey(column)
11099

0 commit comments

Comments
 (0)