@@ -7,6 +7,14 @@ import org.jetbrains.kotlinx.dataframe.columns.ColumnPath
7
7
import org.jetbrains.kotlinx.dataframe.columns.ColumnSet
8
8
import org.jetbrains.kotlinx.dataframe.columns.SingleColumn
9
9
import org.jetbrains.kotlinx.dataframe.impl.columns.TransformableColumnSet
10
+ import org.jetbrains.kotlinx.dataframe.util.COL_ENDS_WITH
11
+ import org.jetbrains.kotlinx.dataframe.util.COL_ENDS_WITH_REPLACE
12
+ import org.jetbrains.kotlinx.dataframe.util.COL_STARTS_WITH
13
+ import org.jetbrains.kotlinx.dataframe.util.COL_STARTS_WITH_REPLACE
14
+ import org.jetbrains.kotlinx.dataframe.util.ENDS_WITH
15
+ import org.jetbrains.kotlinx.dataframe.util.ENDS_WITH_REPLACE
16
+ import org.jetbrains.kotlinx.dataframe.util.STARTS_WITH
17
+ import org.jetbrains.kotlinx.dataframe.util.STARTS_WITH_REPLACE
10
18
import kotlin.reflect.KProperty
11
19
12
20
// region ColumnsSelectionDsl
@@ -606,17 +614,6 @@ public interface ColumnNameFiltersColumnsSelectionDsl {
606
614
607
615
// region nameStartsWith
608
616
609
- @Deprecated(" Use nameStartsWith instead" , ReplaceWith (" this.nameStartsWith(prefix)" ))
610
- public fun <C > ColumnSet<C>.startsWith (prefix : CharSequence ): TransformableColumnSet <C > = nameStartsWith(prefix)
611
-
612
- @Deprecated(" Use nameStartsWith instead" , ReplaceWith (" this.nameStartsWith(prefix)" ))
613
- public fun ColumnsSelectionDsl <* >.startsWith (prefix : CharSequence ): TransformableColumnSet <* > =
614
- nameStartsWith(prefix)
615
-
616
- @Deprecated(" Use colsNameStartsWith instead" , ReplaceWith (" this.colsNameStartsWith(prefix)" ))
617
- public fun SingleColumn <DataRow <* >>.startsWith (prefix : CharSequence ): TransformableColumnSet <* > =
618
- colsNameStartsWith(prefix)
619
-
620
617
/* *
621
618
* ## (Cols) Name Starts With
622
619
* Returns a [ColumnSet][org.jetbrains.kotlinx.dataframe.columns.ColumnSet] containing all columns from [this]
@@ -850,18 +847,6 @@ public interface ColumnNameFiltersColumnsSelectionDsl {
850
847
851
848
// region nameEndsWith
852
849
853
- @Deprecated(" Use nameEndsWith instead" , ReplaceWith (" this.nameEndsWith(suffix)" ))
854
- @Suppress(" UNCHECKED_CAST" )
855
- public fun <C > ColumnSet<C>.endsWith (suffix : CharSequence ): TransformableColumnSet <C > =
856
- colsInternal { it.name.endsWith(suffix) } as TransformableColumnSet <C >
857
-
858
- @Deprecated(" Use nameEndsWith instead" , ReplaceWith (" this.nameEndsWith(suffix)" ))
859
- public fun ColumnsSelectionDsl <* >.endsWith (suffix : CharSequence ): TransformableColumnSet <* > = nameEndsWith(suffix)
860
-
861
- @Deprecated(" Use colsNameEndsWith instead" , ReplaceWith (" this.colsNameEndsWith(suffix)" ))
862
- public fun SingleColumn <DataRow <* >>.endsWith (suffix : CharSequence ): TransformableColumnSet <* > =
863
- this .ensureIsColumnGroup().colsInternal { it.name.endsWith(suffix) }
864
-
865
850
/* *
866
851
* ## (Cols) Name Ends With
867
852
* Returns a [ColumnSet][org.jetbrains.kotlinx.dataframe.columns.ColumnSet] containing all columns from [this]
@@ -1090,6 +1075,57 @@ public interface ColumnNameFiltersColumnsSelectionDsl {
1090
1075
): TransformableColumnSet <* > = columnGroup(this ).colsNameEndsWith(suffix, ignoreCase)
1091
1076
1092
1077
// endregion
1078
+
1079
+ // region deprecations
1080
+
1081
+ @Deprecated(
1082
+ message = STARTS_WITH ,
1083
+ replaceWith = ReplaceWith (STARTS_WITH_REPLACE ),
1084
+ level = DeprecationLevel .ERROR ,
1085
+ )
1086
+ public fun <C > ColumnSet<C>.startsWith (prefix : CharSequence ): TransformableColumnSet <C > = nameStartsWith(prefix)
1087
+
1088
+ @Deprecated(
1089
+ message = STARTS_WITH ,
1090
+ replaceWith = ReplaceWith (STARTS_WITH_REPLACE ),
1091
+ level = DeprecationLevel .ERROR ,
1092
+ )
1093
+ public fun ColumnsSelectionDsl <* >.startsWith (prefix : CharSequence ): TransformableColumnSet <* > =
1094
+ nameStartsWith(prefix)
1095
+
1096
+ @Deprecated(
1097
+ message = COL_STARTS_WITH ,
1098
+ replaceWith = ReplaceWith (COL_STARTS_WITH_REPLACE ),
1099
+ level = DeprecationLevel .ERROR ,
1100
+ )
1101
+ public fun SingleColumn <DataRow <* >>.startsWith (prefix : CharSequence ): TransformableColumnSet <* > =
1102
+ colsNameStartsWith(prefix)
1103
+
1104
+ @Deprecated(
1105
+ message = ENDS_WITH ,
1106
+ replaceWith = ReplaceWith (ENDS_WITH_REPLACE ),
1107
+ level = DeprecationLevel .ERROR ,
1108
+ )
1109
+ @Suppress(" UNCHECKED_CAST" )
1110
+ public fun <C > ColumnSet<C>.endsWith (suffix : CharSequence ): TransformableColumnSet <C > =
1111
+ colsInternal { it.name.endsWith(suffix) } as TransformableColumnSet <C >
1112
+
1113
+ @Deprecated(
1114
+ message = ENDS_WITH ,
1115
+ replaceWith = ReplaceWith (ENDS_WITH_REPLACE ),
1116
+ level = DeprecationLevel .ERROR ,
1117
+ )
1118
+ public fun ColumnsSelectionDsl <* >.endsWith (suffix : CharSequence ): TransformableColumnSet <* > = nameEndsWith(suffix)
1119
+
1120
+ @Deprecated(
1121
+ message = COL_ENDS_WITH ,
1122
+ replaceWith = ReplaceWith (COL_ENDS_WITH_REPLACE ),
1123
+ level = DeprecationLevel .ERROR ,
1124
+ )
1125
+ public fun SingleColumn <DataRow <* >>.endsWith (suffix : CharSequence ): TransformableColumnSet <* > =
1126
+ this .ensureIsColumnGroup().colsInternal { it.name.endsWith(suffix) }
1127
+
1128
+ // endregion
1093
1129
}
1094
1130
1095
1131
// endregion
0 commit comments