Skip to content

Commit 4d4a73f

Browse files
Automated commit of generated code
1 parent 2330a13 commit 4d4a73f

File tree

3 files changed

+108
-323
lines changed

3 files changed

+108
-323
lines changed

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ import org.jetbrains.kotlinx.dataframe.util.GENERATE_INTERFACES
4444
* @param extensionProperties Whether to generate [extension properties (column accessors)][org.jetbrains.kotlinx.dataframe.documentation.AccessApi.ExtensionPropertiesApi]
4545
* in addition to data schema declarations (markers).
4646
* Useful if you don't use the compiler plugin, otherwise they are not needed;
47-
* the compiler plugin and older Gradle/KSP plugin generate them automatically.
47+
* the compiler plugin, notebooks, and older Gradle/KSP plugin generate them automatically.
4848
* Default is `false`.
4949
* @param visibility Visibility modifier for the generated declarations (markers). Default is [MarkerVisibility.IMPLICIT_PUBLIC][org.jetbrains.kotlinx.dataframe.codeGen.MarkerVisibility.IMPLICIT_PUBLIC].
5050
* @param useFqNames If `true`, fully qualified type names will be used in generated code. Default is `false`.
@@ -91,7 +91,7 @@ public fun <T> DataFrame<T>.generateInterfaces(
9191
* @param extensionProperties Whether to generate [extension properties (column accessors)][org.jetbrains.kotlinx.dataframe.documentation.AccessApi.ExtensionPropertiesApi]
9292
* in addition to data schema declarations (markers).
9393
* Useful if you don't use the compiler plugin, otherwise they are not needed;
94-
* the compiler plugin and older Gradle/KSP plugin generate them automatically.
94+
* the compiler plugin, notebooks, and older Gradle/KSP plugin generate them automatically.
9595
* Default is `false`.
9696
* @param visibility Visibility modifier for the generated declarations (markers). Default is [MarkerVisibility.IMPLICIT_PUBLIC][org.jetbrains.kotlinx.dataframe.codeGen.MarkerVisibility.IMPLICIT_PUBLIC].
9797
* @param useFqNames If `true`, fully qualified type names will be used in generated code. Default is `false`.
@@ -140,7 +140,7 @@ public inline fun <reified T> DataFrame<T>.generateInterfaces(
140140
* @param extensionProperties Whether to generate [extension properties (column accessors)][org.jetbrains.kotlinx.dataframe.documentation.AccessApi.ExtensionPropertiesApi]
141141
* in addition to data schema declarations (markers).
142142
* Useful if you don't use the compiler plugin, otherwise they are not needed;
143-
* the compiler plugin and older Gradle/KSP plugin generate them automatically.
143+
* the compiler plugin, notebooks, and older Gradle/KSP plugin generate them automatically.
144144
* Default is `false`.
145145
* @param visibility Visibility modifier for the generated declarations (markers). Default is [MarkerVisibility.IMPLICIT_PUBLIC][org.jetbrains.kotlinx.dataframe.codeGen.MarkerVisibility.IMPLICIT_PUBLIC].
146146
* @param useFqNames If `true`, fully qualified type names will be used in generated code. Default is `false`.
@@ -190,7 +190,7 @@ public fun <T> DataFrame<T>.generateDataClasses(
190190
* @param extensionProperties Whether to generate [extension properties (column accessors)][org.jetbrains.kotlinx.dataframe.documentation.AccessApi.ExtensionPropertiesApi]
191191
* in addition to data schema declarations (markers).
192192
* Useful if you don't use the compiler plugin, otherwise they are not needed;
193-
* the compiler plugin and older Gradle/KSP plugin generate them automatically.
193+
* the compiler plugin, notebooks, and older Gradle/KSP plugin generate them automatically.
194194
* Default is `false`.
195195
* @param visibility Visibility modifier for the generated declarations (markers). Default is [MarkerVisibility.IMPLICIT_PUBLIC][org.jetbrains.kotlinx.dataframe.codeGen.MarkerVisibility.IMPLICIT_PUBLIC].
196196
* @param useFqNames If `true`, fully qualified type names will be used in generated code. Default is `false`.
@@ -240,7 +240,7 @@ public inline fun <reified T> DataFrame<T>.generateDataClasses(
240240
* @param extensionProperties Whether to generate [extension properties (column accessors)][org.jetbrains.kotlinx.dataframe.documentation.AccessApi.ExtensionPropertiesApi]
241241
* in addition to data schema declarations (markers).
242242
* Useful if you don't use the compiler plugin, otherwise they are not needed;
243-
* the compiler plugin and older Gradle/KSP plugin generate them automatically.
243+
* the compiler plugin, notebooks, and older Gradle/KSP plugin generate them automatically.
244244
* Default is `false`.
245245
* @param visibility Visibility modifier for the generated declarations (markers). Default is [MarkerVisibility.IMPLICIT_PUBLIC][org.jetbrains.kotlinx.dataframe.codeGen.MarkerVisibility.IMPLICIT_PUBLIC].
246246
* @param useFqNames If `true`, fully qualified type names will be used in generated code. Default is `false`.
@@ -294,7 +294,7 @@ public fun DataFrameSchema.generateInterfaces(
294294
* @param extensionProperties Whether to generate [extension properties (column accessors)][org.jetbrains.kotlinx.dataframe.documentation.AccessApi.ExtensionPropertiesApi]
295295
* in addition to data schema declarations (markers).
296296
* Useful if you don't use the compiler plugin, otherwise they are not needed;
297-
* the compiler plugin and older Gradle/KSP plugin generate them automatically.
297+
* the compiler plugin, notebooks, and older Gradle/KSP plugin generate them automatically.
298298
* Default is `false`.
299299
* @param visibility Visibility modifier for the generated declarations (markers). Default is [MarkerVisibility.IMPLICIT_PUBLIC][org.jetbrains.kotlinx.dataframe.codeGen.MarkerVisibility.IMPLICIT_PUBLIC].
300300
* @param useFqNames If `true`, fully qualified type names will be used in generated code. Default is `false`.
@@ -368,7 +368,7 @@ internal fun DataFrameSchema.generateCodeImpl(
368368
name = markerName,
369369
fields = true,
370370
extensionProperties = extensionProperties,
371-
isOpen = false,
371+
isOpen = !asDataClass,
372372
visibility = visibility,
373373
asDataClass = asDataClass,
374374
fieldNameNormalizer = nameNormalizer,

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -113,15 +113,6 @@ internal const val TO_URL_REPLACE = "toUrl()"
113113
internal const val FILTER_BY = "This function is deprecated in favor of `filter { }`. $MESSAGE_1_0"
114114
internal const val FILTER_BY_REPLACE = "filter { column }"
115115

116-
internal const val GENERATE_CODE =
117-
"This function has been deprecated in favor of the more explicit `generateInterfaces()`. The `fields` parameter has also been removed. Use `CodeGenerator` explicitly, if you need it. $MESSAGE_1_0"
118-
119-
internal const val GENERATE_CODE_REPLACE1 = "this.generateInterfaces(extensionProperties = extensionProperties)"
120-
internal const val GENERATE_CODE_REPLACE2 =
121-
"this.generateInterfaces(markerName = markerName, extensionProperties = extensionProperties, visibility = visibility)"
122-
123-
internal const val GENERATE_INTERFACES = "This function is just here for binary compatibility. $MESSAGE_1_0"
124-
125116
// endregion
126117

127118
// region WARNING in 1.0, ERROR in 1.1
@@ -189,6 +180,15 @@ internal const val SINGLE_COL_REPLACE = "this.allCols().filter(condition).single
189180
internal const val SINGLE_PLAIN_REPLACE = "this.cols().filter(condition).single()"
190181
internal const val SINGLE_SET_REPLACE = "this.filter(condition).single()"
191182

183+
internal const val GENERATE_CODE =
184+
"This function has been deprecated in favor of the more explicit `generateInterfaces()`. The `fields` parameter has also been removed. Use `CodeGenerator` explicitly, if you need it. $MESSAGE_1_1"
185+
186+
internal const val GENERATE_CODE_REPLACE1 = "this.generateInterfaces(extensionProperties = extensionProperties)"
187+
internal const val GENERATE_CODE_REPLACE2 =
188+
"this.generateInterfaces(markerName = markerName, extensionProperties = extensionProperties, visibility = visibility)"
189+
190+
internal const val GENERATE_INTERFACES = "This function is just here for binary compatibility. $MESSAGE_1_1"
191+
192192
// endregion
193193

194194
// region keep across releases

0 commit comments

Comments
 (0)