Skip to content

Commit 344b5e5

Browse files
JolanrensenJolanrensen
authored
Merge pull request #1176 from Kotlin/predicate-deprecation-1
Deprecate predicate argument in single, colsInGroups, colsAtAnyDepth
2 parents 3ff686e + 748fe93 commit 344b5e5

File tree

217 files changed

+2834
-4044
lines changed

Some content is hidden

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

217 files changed

+2834
-4044
lines changed

‎core/api/core.api

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -878,11 +878,16 @@ public abstract interface class org/jetbrains/kotlinx/dataframe/api/ColGroupsCol
878878
}
879879

880880
public abstract interface class org/jetbrains/kotlinx/dataframe/api/ColsAtAnyDepthColumnsSelectionDsl {
881+
public fun colsAtAnyDepth (Ljava/lang/String;)Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet;
881882
public fun colsAtAnyDepth (Ljava/lang/String;Lkotlin/jvm/functions/Function1;)Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet;
882883
public fun colsAtAnyDepth (Lkotlin/reflect/KProperty;Lkotlin/jvm/functions/Function1;)Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet;
884+
public fun colsAtAnyDepth (Lorg/jetbrains/kotlinx/dataframe/api/ColumnsSelectionDsl;)Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet;
883885
public fun colsAtAnyDepth (Lorg/jetbrains/kotlinx/dataframe/api/ColumnsSelectionDsl;Lkotlin/jvm/functions/Function1;)Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet;
886+
public fun colsAtAnyDepth (Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;)Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet;
884887
public fun colsAtAnyDepth (Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;Lkotlin/jvm/functions/Function1;)Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet;
888+
public fun colsAtAnyDepth (Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet;)Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet;
885889
public fun colsAtAnyDepth (Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet;Lkotlin/jvm/functions/Function1;)Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet;
890+
public fun colsAtAnyDepth (Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn;)Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet;
886891
public fun colsAtAnyDepth (Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn;Lkotlin/jvm/functions/Function1;)Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet;
887892
public static synthetic fun colsAtAnyDepth$default (Lorg/jetbrains/kotlinx/dataframe/api/ColsAtAnyDepthColumnsSelectionDsl;Ljava/lang/String;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet;
888893
public static synthetic fun colsAtAnyDepth$default (Lorg/jetbrains/kotlinx/dataframe/api/ColsAtAnyDepthColumnsSelectionDsl;Lkotlin/reflect/KProperty;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet;
@@ -1018,11 +1023,16 @@ public abstract interface class org/jetbrains/kotlinx/dataframe/api/ColsColumnsS
10181023
}
10191024

10201025
public abstract interface class org/jetbrains/kotlinx/dataframe/api/ColsInGroupsColumnsSelectionDsl {
1026+
public fun colsInGroups (Ljava/lang/String;)Lorg/jetbrains/kotlinx/dataframe/impl/columns/TransformableColumnSet;
10211027
public fun colsInGroups (Ljava/lang/String;Lkotlin/jvm/functions/Function1;)Lorg/jetbrains/kotlinx/dataframe/impl/columns/TransformableColumnSet;
10221028
public fun colsInGroups (Lkotlin/reflect/KProperty;Lkotlin/jvm/functions/Function1;)Lorg/jetbrains/kotlinx/dataframe/impl/columns/TransformableColumnSet;
1029+
public fun colsInGroups (Lorg/jetbrains/kotlinx/dataframe/api/ColumnsSelectionDsl;)Lorg/jetbrains/kotlinx/dataframe/impl/columns/TransformableColumnSet;
10231030
public fun colsInGroups (Lorg/jetbrains/kotlinx/dataframe/api/ColumnsSelectionDsl;Lkotlin/jvm/functions/Function1;)Lorg/jetbrains/kotlinx/dataframe/impl/columns/TransformableColumnSet;
1031+
public fun colsInGroups (Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;)Lorg/jetbrains/kotlinx/dataframe/impl/columns/TransformableColumnSet;
10241032
public fun colsInGroups (Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;Lkotlin/jvm/functions/Function1;)Lorg/jetbrains/kotlinx/dataframe/impl/columns/TransformableColumnSet;
1033+
public fun colsInGroups (Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet;)Lorg/jetbrains/kotlinx/dataframe/impl/columns/TransformableColumnSet;
10251034
public fun colsInGroups (Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet;Lkotlin/jvm/functions/Function1;)Lorg/jetbrains/kotlinx/dataframe/impl/columns/TransformableColumnSet;
1035+
public fun colsInGroups (Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn;)Lorg/jetbrains/kotlinx/dataframe/impl/columns/TransformableColumnSet;
10261036
public fun colsInGroups (Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn;Lkotlin/jvm/functions/Function1;)Lorg/jetbrains/kotlinx/dataframe/impl/columns/TransformableColumnSet;
10271037
public static synthetic fun colsInGroups$default (Lorg/jetbrains/kotlinx/dataframe/api/ColsInGroupsColumnsSelectionDsl;Ljava/lang/String;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lorg/jetbrains/kotlinx/dataframe/impl/columns/TransformableColumnSet;
10281038
public static synthetic fun colsInGroups$default (Lorg/jetbrains/kotlinx/dataframe/api/ColsInGroupsColumnsSelectionDsl;Lkotlin/reflect/KProperty;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lorg/jetbrains/kotlinx/dataframe/impl/columns/TransformableColumnSet;
@@ -3939,13 +3949,17 @@ public abstract interface class org/jetbrains/kotlinx/dataframe/api/SimplifyColu
39393949
}
39403950

39413951
public abstract interface class org/jetbrains/kotlinx/dataframe/api/SingleColumnsSelectionDsl {
3952+
public fun single (Lorg/jetbrains/kotlinx/dataframe/api/ColumnsSelectionDsl;)Lorg/jetbrains/kotlinx/dataframe/impl/columns/TransformableSingleColumn;
39423953
public fun single (Lorg/jetbrains/kotlinx/dataframe/api/ColumnsSelectionDsl;Lkotlin/jvm/functions/Function1;)Lorg/jetbrains/kotlinx/dataframe/impl/columns/TransformableSingleColumn;
3954+
public fun single (Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet;)Lorg/jetbrains/kotlinx/dataframe/impl/columns/TransformableSingleColumn;
39433955
public fun single (Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet;Lkotlin/jvm/functions/Function1;)Lorg/jetbrains/kotlinx/dataframe/impl/columns/TransformableSingleColumn;
39443956
public static synthetic fun single$default (Lorg/jetbrains/kotlinx/dataframe/api/SingleColumnsSelectionDsl;Lorg/jetbrains/kotlinx/dataframe/api/ColumnsSelectionDsl;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lorg/jetbrains/kotlinx/dataframe/impl/columns/TransformableSingleColumn;
39453957
public static synthetic fun single$default (Lorg/jetbrains/kotlinx/dataframe/api/SingleColumnsSelectionDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lorg/jetbrains/kotlinx/dataframe/impl/columns/TransformableSingleColumn;
3958+
public fun singleCol (Ljava/lang/String;)Lorg/jetbrains/kotlinx/dataframe/impl/columns/TransformableSingleColumn;
39463959
public fun singleCol (Ljava/lang/String;Lkotlin/jvm/functions/Function1;)Lorg/jetbrains/kotlinx/dataframe/impl/columns/TransformableSingleColumn;
39473960
public fun singleCol (Lkotlin/reflect/KProperty;Lkotlin/jvm/functions/Function1;)Lorg/jetbrains/kotlinx/dataframe/impl/columns/TransformableSingleColumn;
39483961
public fun singleCol (Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;Lkotlin/jvm/functions/Function1;)Lorg/jetbrains/kotlinx/dataframe/impl/columns/TransformableSingleColumn;
3962+
public fun singleCol (Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn;)Lorg/jetbrains/kotlinx/dataframe/impl/columns/TransformableSingleColumn;
39493963
public fun singleCol (Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn;Lkotlin/jvm/functions/Function1;)Lorg/jetbrains/kotlinx/dataframe/impl/columns/TransformableSingleColumn;
39503964
public static synthetic fun singleCol$default (Lorg/jetbrains/kotlinx/dataframe/api/SingleColumnsSelectionDsl;Ljava/lang/String;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lorg/jetbrains/kotlinx/dataframe/impl/columns/TransformableSingleColumn;
39513965
public static synthetic fun singleCol$default (Lorg/jetbrains/kotlinx/dataframe/api/SingleColumnsSelectionDsl;Lkotlin/reflect/KProperty;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lorg/jetbrains/kotlinx/dataframe/impl/columns/TransformableSingleColumn;

‎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

0 commit comments

Comments
 (0)