Skip to content

Commit 0c1a348

Browse files
JolanrensenJolanrensen
committed
fixup! deprecated generateCode in favor of generateInterfaces. Reworked generateCode.kt from feedback
1 parent fcd76d0 commit 0c1a348

16 files changed

+60
-60
lines changed

‎core/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

‎docs/StardustDocs/resources/api/generate_docs/notebook_test_generate_docs_1.html‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@
177177
</style>
178178
</head>
179179
<body>
180-
<table class="dataframe" id="df_234881024"></table>
180+
<table class="dataframe" id="df_838860800"></table>
181181

182182
<p class="dataframe_description"></p>
183183
</body>
@@ -458,23 +458,23 @@
458458

459459
/*<!--*/
460460
call_DataFrame(function() { DataFrame.addTable({ cols: [{ name: "<span title=\"user: String\">user</span>", children: [], rightAlign: false, values: ["Alice","Bob"] },
461-
{ name: "<span title=\"orders: DataFrame<*>\">orders</span>", children: [], rightAlign: false, values: [{ frameId: 234881025, value: "<b>DataFrame 2 x 2</b>" },{ frameId: 234881026, value: "<b>DataFrame 3 x 2</b>" }] },
462-
], id: 234881024, rootId: 234881024, totalRows: 2 } ) });
461+
{ name: "<span title=\"orders: DataFrame<*>\">orders</span>", children: [], rightAlign: false, values: [{ frameId: 838860801, value: "<b>DataFrame 2 x 2</b>" },{ frameId: 838860802, value: "<b>DataFrame 3 x 2</b>" }] },
462+
], id: 838860800, rootId: 838860800, totalRows: 2 } ) });
463463
/*-->*/
464464

465465
/*<!--*/
466466
call_DataFrame(function() { DataFrame.addTable({ cols: [{ name: "<span title=\"orderId: Int\">orderId</span>", children: [], rightAlign: true, values: ["<span class=\"formatted\" title=\"\"><span class=\"numbers\">101</span></span>","<span class=\"formatted\" title=\"\"><span class=\"numbers\">102</span></span>"] },
467467
{ name: "<span title=\"amount: Double\">amount</span>", children: [], rightAlign: true, values: ["<span class=\"formatted\" title=\"\"><span class=\"numbers\">50.0</span></span>","<span class=\"formatted\" title=\"\"><span class=\"numbers\">75.5</span></span>"] },
468-
], id: 234881025, rootId: 234881024, totalRows: 2 } ) });
468+
], id: 838860801, rootId: 838860800, totalRows: 2 } ) });
469469
/*-->*/
470470

471471
/*<!--*/
472472
call_DataFrame(function() { DataFrame.addTable({ cols: [{ name: "<span title=\"orderId: Int\">orderId</span>", children: [], rightAlign: true, values: ["<span class=\"formatted\" title=\"\"><span class=\"numbers\">103</span></span>","<span class=\"formatted\" title=\"\"><span class=\"numbers\">104</span></span>","<span class=\"formatted\" title=\"\"><span class=\"numbers\">105</span></span>"] },
473473
{ name: "<span title=\"amount: Double\">amount</span>", children: [], rightAlign: true, values: ["<span class=\"formatted\" title=\"\"><span class=\"numbers\">20.0</span></span>","<span class=\"formatted\" title=\"\"><span class=\"numbers\">30.0</span></span>","<span class=\"formatted\" title=\"\"><span class=\"numbers\">25.0</span></span>"] },
474-
], id: 234881026, rootId: 234881024, totalRows: 3 } ) });
474+
], id: 838860802, rootId: 838860800, totalRows: 3 } ) });
475475
/*-->*/
476476

477-
call_DataFrame(function() { DataFrame.renderTable(234881024) });
477+
call_DataFrame(function() { DataFrame.renderTable(838860800) });
478478

479479
function sendHeight() {
480480
const table = document.querySelector('table.dataframe');

‎docs/StardustDocs/resources/api/rename/notebook_test_rename_3.html‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@
177177
</style>
178178
</head>
179179
<body>
180-
<table class="dataframe" id="df_234881027"></table>
180+
<table class="dataframe" id="df_838860803"></table>
181181

182182
<p class="dataframe_description"></p>
183183
</body>
@@ -460,10 +460,10 @@
460460
call_DataFrame(function() { DataFrame.addTable({ cols: [{ name: "<span title=\"ColumnA: Int\">ColumnA</span>", children: [], rightAlign: true, values: ["<span class=\"formatted\" title=\"\"><span class=\"numbers\">1</span></span>","<span class=\"formatted\" title=\"\"><span class=\"numbers\">2</span></span>"] },
461461
{ name: "<span title=\"column_b: String\">column_b</span>", children: [], rightAlign: false, values: ["a","b"] },
462462
{ name: "<span title=\"COLUMN-C: Boolean\">COLUMN-C</span>", children: [], rightAlign: false, values: ["true","false"] },
463-
], id: 234881027, rootId: 234881027, totalRows: 2 } ) });
463+
], id: 838860803, rootId: 838860803, totalRows: 2 } ) });
464464
/*-->*/
465465

466-
call_DataFrame(function() { DataFrame.renderTable(234881027) });
466+
call_DataFrame(function() { DataFrame.renderTable(838860803) });
467467

468468
function sendHeight() {
469469
const table = document.querySelector('table.dataframe');

‎docs/StardustDocs/resources/api/rename/notebook_test_rename_4.html‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@
177177
</style>
178178
</head>
179179
<body>
180-
<table class="dataframe" id="df_234881028"></table>
180+
<table class="dataframe" id="df_838860804"></table>
181181

182182
<p class="dataframe_description"></p>
183183
</body>
@@ -460,10 +460,10 @@
460460
call_DataFrame(function() { DataFrame.addTable({ cols: [{ name: "<span title=\"columnA: Int\">columnA</span>", children: [], rightAlign: true, values: ["<span class=\"formatted\" title=\"\"><span class=\"numbers\">1</span></span>","<span class=\"formatted\" title=\"\"><span class=\"numbers\">2</span></span>"] },
461461
{ name: "<span title=\"column_b: String\">column_b</span>", children: [], rightAlign: false, values: ["a","b"] },
462462
{ name: "<span title=\"columnC: Boolean\">columnC</span>", children: [], rightAlign: false, values: ["true","false"] },
463-
], id: 234881028, rootId: 234881028, totalRows: 2 } ) });
463+
], id: 838860804, rootId: 838860804, totalRows: 2 } ) });
464464
/*-->*/
465465

466-
call_DataFrame(function() { DataFrame.renderTable(234881028) });
466+
call_DataFrame(function() { DataFrame.renderTable(838860804) });
467467

468468
function sendHeight() {
469469
const table = document.querySelector('table.dataframe');

‎docs/StardustDocs/resources/api/rename/notebook_test_rename_5.html‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@
177177
</style>
178178
</head>
179179
<body>
180-
<table class="dataframe" id="df_234881029"></table>
180+
<table class="dataframe" id="df_838860805"></table>
181181

182182
<p class="dataframe_description"></p>
183183
</body>
@@ -460,10 +460,10 @@
460460
call_DataFrame(function() { DataFrame.addTable({ cols: [{ name: "<span title=\"columnA: Int\">columnA</span>", children: [], rightAlign: true, values: ["<span class=\"formatted\" title=\"\"><span class=\"numbers\">1</span></span>","<span class=\"formatted\" title=\"\"><span class=\"numbers\">2</span></span>"] },
461461
{ name: "<span title=\"columnB: String\">columnB</span>", children: [], rightAlign: false, values: ["a","b"] },
462462
{ name: "<span title=\"columnC: Boolean\">columnC</span>", children: [], rightAlign: false, values: ["true","false"] },
463-
], id: 234881029, rootId: 234881029, totalRows: 2 } ) });
463+
], id: 838860805, rootId: 838860805, totalRows: 2 } ) });
464464
/*-->*/
465465

466-
call_DataFrame(function() { DataFrame.renderTable(234881029) });
466+
call_DataFrame(function() { DataFrame.renderTable(838860805) });
467467

468468
function sendHeight() {
469469
const table = document.querySelector('table.dataframe');

‎docs/StardustDocs/resources/guides/quickstart/notebook_test_quickstart_10.html‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@
177177
</style>
178178
</head>
179179
<body>
180-
<table class="dataframe" id="df_234881036"></table>
180+
<table class="dataframe" id="df_838860812"></table>
181181

182182
<p class="dataframe_description">... showing only top 20 of 24 rows</p><p class="dataframe_description"></p>
183183
</body>
@@ -461,10 +461,10 @@
461461
{ name: "<span title=\"starsCount: Int\">starsCount</span>", children: [], rightAlign: true, values: ["<span class=\"formatted\" title=\"\"><span class=\"numbers\">6120</span></span>","<span class=\"formatted\" title=\"\"><span class=\"numbers\">1241</span></span>","<span class=\"formatted\" title=\"\"><span class=\"numbers\">12926</span></span>","<span class=\"formatted\" title=\"\"><span class=\"numbers\">1066</span></span>","<span class=\"formatted\" title=\"\"><span class=\"numbers\">39402</span></span>","<span class=\"formatted\" title=\"\"><span class=\"numbers\">1737</span></span>","<span class=\"formatted\" title=\"\"><span class=\"numbers\">5688</span></span>","<span class=\"formatted\" title=\"\"><span class=\"numbers\">1074</span></span>","<span class=\"formatted\" title=\"\"><span class=\"numbers\">1181</span></span>","<span class=\"formatted\" title=\"\"><span class=\"numbers\">1072</span></span>","<span class=\"formatted\" title=\"\"><span class=\"numbers\">1110</span></span>","<span class=\"formatted\" title=\"\"><span class=\"numbers\">1058</span></span>","<span class=\"formatted\" title=\"\"><span class=\"numbers\">1815</span></span>","<span class=\"formatted\" title=\"\"><span class=\"numbers\">1017</span></span>","<span class=\"formatted\" title=\"\"><span class=\"numbers\">7101</span></span>","<span class=\"formatted\" title=\"\"><span class=\"numbers\">2424</span></span>","<span class=\"formatted\" title=\"\"><span class=\"numbers\">2836</span></span>","<span class=\"formatted\" title=\"\"><span class=\"numbers\">2628</span></span>","<span class=\"formatted\" title=\"\"><span class=\"numbers\">6059</span></span>","<span class=\"formatted\" title=\"\"><span class=\"numbers\">1133</span></span>"] },
462462
{ name: "<span title=\"topics: List<String>\">topics</span>", children: [], rightAlign: false, values: ["<span class=\"formatted\" title=\"ideavim\nintellij\nintellij-platform\njb-official\nkotlin\nvim\nvim-emulator\"><span class=\"structural\">[</span>ideavim<span class=\"structural\">, </span>intellij<span class=\"structural\">, </span>intellij-pl<span class=\"structural\">...</span><span class=\"structural\">, </span><span class=\"structural\">...</span><span class=\"structural\">]</span></span>","<span class=\"formatted\" title=\"domain-specific-language\ndsl\"><span class=\"structural\">[</span>domain-specific-language<span class=\"structural\">, </span>dsl<span class=\"structural\">]</span></span>","<span class=\"formatted\" title=\"code-editor\nide\nintellij\nintellij-community\nintellij-platform\"><span class=\"structural\">[</span>code-editor<span class=\"structural\">, </span>ide<span class=\"structural\">, </span>intellij<span class=\"structural\">, </span>i<span class=\"structural\">...</span><span class=\"structural\">, </span>i<span class=\"structural\">...</span><span class=\"structural\">]</span></span>","<span class=\"formatted\" title=\"intellij-idea\nintellij-plugin\nscala\"><span class=\"structural\">[</span>intellij-idea<span class=\"structural\">, </span>intellij-plugin<span class=\"structural\">, </span>scala<span class=\"structural\">]</span></span>","<span class=\"formatted\" title=\"compiler\ngradle-plugin\nintellij-plugin\nkotlin\nkotlin-library\nmaven-plugin\nprogramming-language\"><span class=\"structural\">[</span>compiler<span class=\"structural\">, </span>gradle-plugin<span class=\"structural\">, </span>intel<span class=\"structural\">...</span><span class=\"structural\">, </span><span class=\"structural\">...</span><span class=\"structural\">]</span></span>","<span class=\"formatted\" title=\"\"><span class=\"structural\">[</span><span class=\"structural\">]</span></span>","<span class=\"formatted\" title=\"dao\nkotlin\norm\nsql\"><span class=\"structural\">[</span>dao<span class=\"structural\">, </span>kotlin<span class=\"structural\">, </span>orm<span class=\"structural\">, </span>sql<span class=\"structural\">]</span></span>","<span class=\"formatted\" title=\"kotlin\"><span class=\"structural\">[</span>kotlin<span class=\"structural\">]</span></span>","<span class=\"formatted\" title=\"gitignore\nignore-files\nintellij\nintellij-plugin\njava\"><span class=\"structural\">[</span>gitignore<span class=\"structural\">, </span>ignore-files<span class=\"structural\">, </span>intellij<span class=\"structural\">, </span><span class=\"structural\">...</span><span class=\"structural\">]</span></span>","<span class=\"formatted\" title=\"\"><span class=\"structural\">[</span><span class=\"structural\">]</span></span>","<span class=\"formatted\" title=\"\"><span class=\"structural\">[</span><span class=\"structural\">]</span></span>","<span class=\"formatted\" title=\"gradle\ngradle-intellij-plugin\ngradle-kotlin-dsl\ngroovy\nintellij\nintellij-ides\nintellij-platform\nintellij-plugin\nintellij-sdk\njetbrains-plugin\nkotlin\nplugin-verifier\npublishing-dsl\nsetup-dsl\nteamcity\ntravis-configuration\"><span class=\"structural\">[</span>gradle<span class=\"structural\">, </span>gradle-intellij-plugin<span class=\"structural\">, </span><span class=\"structural\">...</span><span class=\"structural\">]</span></span>","<span class=\"formatted\" title=\"sprite\nsvg\nsvg-sprite\nsvg-stack\nwebpack\nwebpack-loader\nwebpack-plugin\nwebpack2\nwebpack3\"><span class=\"structural\">[</span>sprite<span class=\"structural\">, </span>svg<span class=\"structural\">, </span>svg-sprite<span class=\"structural\">, </span>svg-s<span class=\"structural\">...</span><span class=\"structural\">, </span><span class=\"structural\">...</span><span class=\"structural\">]</span></span>","<span class=\"formatted\" title=\"hacktoberfest\njetbrains\nplugin\nresharper\nresharper-plugin\nrider\nunity\nunity-editor\"><span class=\"structural\">[</span>hacktoberfest<span class=\"structural\">, </span>jetbrains<span class=\"structural\">, </span>plugin<span class=\"structural\">, </span><span class=\"structural\">...</span><span class=\"structural\">]</span></span>","<span class=\"formatted\" title=\"c\ncompiler\nkotlin\nllvm\nobjective-c\"><span class=\"structural\">[</span>c<span class=\"structural\">, </span>compiler<span class=\"structural\">, </span>kotlin<span class=\"structural\">, </span>llvm<span class=\"structural\">, </span>objective-c<span class=\"structural\">]</span></span>","<span class=\"formatted\" title=\"create-react-app\njetbrains-ui\nkotlin\nreact\nwebpack\"><span class=\"structural\">[</span>create-react-app<span class=\"structural\">, </span>jetbrains-ui<span class=\"structural\">, </span><span class=\"structural\">...</span><span class=\"structural\">]</span></span>","<span class=\"formatted\" title=\"components\njetbrains-ui\nreact\"><span class=\"structural\">[</span>components<span class=\"structural\">, </span>jetbrains-ui<span class=\"structural\">, </span>react<span class=\"structural\">]</span></span>","<span class=\"formatted\" title=\"\"><span class=\"structural\">[</span><span class=\"structural\">]</span></span>","<span class=\"formatted\" title=\"coding-font\nfont\nligatures\nmonospaced-font\nprogramming-font\nprogramming-ligatures\"><span class=\"structural\">[</span>coding-font<span class=\"structural\">, </span>font<span class=\"structural\">, </span>ligatures<span class=\"structural\">, </span><span class=\"structural\">...</span><span class=\"structural\">]</span></span>","<span class=\"formatted\" title=\"intellij\nintellij-idea\nintellij-idea-plugin\nintellij-platform\nintellij-plugin\nintellij-plugins\njetbrains-plugin\"><span class=\"structural\">[</span>intellij<span class=\"structural\">, </span>intellij-idea<span class=\"structural\">, </span>intel<span class=\"structural\">...</span><span class=\"structural\">, </span><span class=\"structural\">...</span><span class=\"structural\">]</span></span>"] },
463463
{ name: "<span title=\"isIntellij: Boolean\">isIntellij</span>", children: [], rightAlign: false, values: ["true","false","true","true","false","true","false","false","true","false","false","true","false","false","false","false","false","false","false","true"] },
464-
], id: 234881036, rootId: 234881036, totalRows: 24 } ) });
464+
], id: 838860812, rootId: 838860812, totalRows: 24 } ) });
465465
/*-->*/
466466

467-
call_DataFrame(function() { DataFrame.renderTable(234881036) });
467+
call_DataFrame(function() { DataFrame.renderTable(838860812) });
468468

469469
function sendHeight() {
470470
const table = document.querySelector('table.dataframe');

0 commit comments

Comments
 (0)