Skip to content

Commit d04d4e1

Browse files
committed
fixup! updated grammar dsls for colsAtAnyDepth and colsInGroups, removing predicate
1 parent 1353405 commit d04d4e1

File tree

2 files changed

+30
-5
lines changed

2 files changed

+30
-5
lines changed

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

Lines changed: 27 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@ import org.jetbrains.kotlinx.dataframe.documentation.Indent
1515
import org.jetbrains.kotlinx.dataframe.documentation.LineBreak
1616
import org.jetbrains.kotlinx.dataframe.impl.columns.TransformableColumnSet
1717
import org.jetbrains.kotlinx.dataframe.impl.columns.transform
18+
import org.jetbrains.kotlinx.dataframe.util.COLS_IN_GROUPS
19+
import org.jetbrains.kotlinx.dataframe.util.COLS_IN_GROUPS_REPLACE
1820
import org.jetbrains.kotlinx.dataframe.util.DEPRECATED_ACCESS_API
1921
import kotlin.reflect.KProperty
2022

@@ -115,7 +117,11 @@ public interface ColsInGroupsColumnsSelectionDsl {
115117
*
116118
* `df.`[select][DataFrame.select]` { `[colsOf][ColumnsSelectionDsl.colsOf]`<`[DataRow][DataRow]`<MyGroupType>>().`[colsInGroups][ColumnSet.colsInGroups]`() }`
117119
*/
118-
@Deprecated("", ReplaceWith("this.colsInGroups().filter(predicate)"))
120+
@Deprecated(
121+
message = COLS_IN_GROUPS,
122+
replaceWith = ReplaceWith(COLS_IN_GROUPS_REPLACE),
123+
level = DeprecationLevel.WARNING,
124+
)
119125
public fun ColumnSet<*>.colsInGroups(predicate: ColumnFilter<*> = { true }): TransformableColumnSet<*> =
120126
transform { it.flatMap { it.cols().filter { predicate(it) } } }
121127

@@ -135,7 +141,11 @@ public interface ColsInGroupsColumnsSelectionDsl {
135141
*
136142
* `df.`[select][DataFrame.select]` { `[colsInGroups][ColumnSet.colsInGroups]`() }`
137143
*/
138-
@Deprecated("", ReplaceWith("colsInGroups().filter(predicate)"))
144+
@Deprecated(
145+
message = COLS_IN_GROUPS,
146+
replaceWith = ReplaceWith(COLS_IN_GROUPS_REPLACE),
147+
level = DeprecationLevel.WARNING,
148+
)
139149
public fun ColumnsSelectionDsl<*>.colsInGroups(predicate: ColumnFilter<*> = { true }): TransformableColumnSet<*> =
140150
asSingleColumn().colsInGroups(predicate)
141151

@@ -155,7 +165,11 @@ public interface ColsInGroupsColumnsSelectionDsl {
155165
*
156166
* `df.`[select][DataFrame.select]` { myColumnGroup.`[colsInGroups][SingleColumn.colsInGroups]` { it.`[any][ColumnWithPath.any]` { it == "Alice" } } }`
157167
*/
158-
@Deprecated("", ReplaceWith("this.colsInGroups().filter(predicate)"))
168+
@Deprecated(
169+
message = COLS_IN_GROUPS,
170+
replaceWith = ReplaceWith(COLS_IN_GROUPS_REPLACE),
171+
level = DeprecationLevel.WARNING,
172+
)
159173
public fun SingleColumn<DataRow<*>>.colsInGroups(predicate: ColumnFilter<*> = { true }): TransformableColumnSet<*> =
160174
ensureIsColumnGroup().allColumnsInternal().colsInGroups(predicate)
161175

@@ -174,7 +188,11 @@ public interface ColsInGroupsColumnsSelectionDsl {
174188
*
175189
* `df.`[select][DataFrame.select]` { "myColumnGroup".`[colsInGroups][String.colsInGroups]`() }`
176190
*/
177-
@Deprecated("", ReplaceWith("colsInGroups().filter(predicate)"))
191+
@Deprecated(
192+
message = COLS_IN_GROUPS,
193+
replaceWith = ReplaceWith(COLS_IN_GROUPS_REPLACE),
194+
level = DeprecationLevel.WARNING,
195+
)
178196
public fun String.colsInGroups(predicate: ColumnFilter<*> = { true }): TransformableColumnSet<*> =
179197
columnGroup(this).colsInGroups(predicate)
180198

@@ -205,7 +223,11 @@ public interface ColsInGroupsColumnsSelectionDsl {
205223
*
206224
* `df.`[select][DataFrame.select]` { "pathTo"["myColumnGroup"].`[colsInGroups][ColumnPath.colsInGroups]`() }`
207225
*/
208-
@Deprecated("", ReplaceWith("colsInGroups().filter(predicate)"))
226+
@Deprecated(
227+
message = COLS_IN_GROUPS,
228+
replaceWith = ReplaceWith(COLS_IN_GROUPS_REPLACE),
229+
level = DeprecationLevel.WARNING,
230+
)
209231
public fun ColumnPath.colsInGroups(predicate: ColumnFilter<*> = { true }): TransformableColumnSet<*> =
210232
columnGroup(this).colsInGroups(predicate)
211233

core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/util/deprecationMessages.kt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -169,6 +169,9 @@ internal const val DATAFRAME_OF_WITH_VALUES =
169169
internal const val COLS_AT_ANY_DEPTH = "Deprecated shortcut for better compiler plugin support. $MESSAGE_1_1"
170170
internal const val COLS_AT_ANY_DEPTH_REPLACE = "this.colsAtAnyDepth().filter(predicate)"
171171

172+
internal const val COLS_IN_GROUPS = "Deprecated shortcut for better compiler plugin support. $MESSAGE_1_1"
173+
internal const val COLS_IN_GROUPS_REPLACE = "this.colsInGroups().filter(predicate)"
174+
172175
// endregion
173176

174177
// region keep across releases

0 commit comments

Comments
 (0)