Skip to content

rename to valid camel case and remove deprecated URL() #1175

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 6, 2025
Merged

rename to valid camel case and remove deprecated URL() #1175

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dbfa1f8
rename to valid camel case and remove deprecated URL()
AndreiKingsley May 6, 2025
3ad9726
fix convert to url
AndreiKingsley May 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 15 additions & 4 deletions core/api/core.api
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1535,6 +1535,8 @@ public final class org/jetbrains/kotlinx/dataframe/api/ConvertKt {
public static final fun convertToStringFromT (Lorg/jetbrains/kotlinx/dataframe/DataColumn;)Lorg/jetbrains/kotlinx/dataframe/DataColumn;
public static final fun convertToURL (Lorg/jetbrains/kotlinx/dataframe/DataColumn;)Lorg/jetbrains/kotlinx/dataframe/DataColumn;
public static final fun convertToURLFromStringNullable (Lorg/jetbrains/kotlinx/dataframe/DataColumn;)Lorg/jetbrains/kotlinx/dataframe/DataColumn;
public static final fun convertToUrl (Lorg/jetbrains/kotlinx/dataframe/DataColumn;)Lorg/jetbrains/kotlinx/dataframe/DataColumn;
public static final fun convertToUrlFromStringNullable (Lorg/jetbrains/kotlinx/dataframe/DataColumn;)Lorg/jetbrains/kotlinx/dataframe/DataColumn;
public static final fun to (Lorg/jetbrains/kotlinx/dataframe/api/Convert;Lkotlin/jvm/functions/Function2;)Lorg/jetbrains/kotlinx/dataframe/DataFrame;
public static final fun to (Lorg/jetbrains/kotlinx/dataframe/api/Convert;Lkotlin/reflect/KType;)Lorg/jetbrains/kotlinx/dataframe/DataFrame;
public static final fun toBigDecimal (Lorg/jetbrains/kotlinx/dataframe/api/Convert;)Lorg/jetbrains/kotlinx/dataframe/DataFrame;
Expand Down Expand Up @@ -1610,6 +1612,8 @@ public final class org/jetbrains/kotlinx/dataframe/api/ConvertKt {
public static final fun toLongTAny (Lorg/jetbrains/kotlinx/dataframe/api/Convert;)Lorg/jetbrains/kotlinx/dataframe/DataFrame;
public static final fun toStr (Lorg/jetbrains/kotlinx/dataframe/api/Convert;)Lorg/jetbrains/kotlinx/dataframe/DataFrame;
public static final fun toStrTAny (Lorg/jetbrains/kotlinx/dataframe/api/Convert;)Lorg/jetbrains/kotlinx/dataframe/DataFrame;
public static final fun toURLFromString (Lorg/jetbrains/kotlinx/dataframe/api/Convert;)Lorg/jetbrains/kotlinx/dataframe/DataFrame;
public static final fun toURLFromStringNullable (Lorg/jetbrains/kotlinx/dataframe/api/Convert;)Lorg/jetbrains/kotlinx/dataframe/DataFrame;
public static final fun toUrlFromString (Lorg/jetbrains/kotlinx/dataframe/api/Convert;)Lorg/jetbrains/kotlinx/dataframe/DataFrame;
public static final fun toUrlFromStringNullable (Lorg/jetbrains/kotlinx/dataframe/api/Convert;)Lorg/jetbrains/kotlinx/dataframe/DataFrame;
}
Expand Down Expand Up @@ -2221,10 +2225,10 @@ public final class org/jetbrains/kotlinx/dataframe/api/FormattedFrame {
public fun <init> (Lorg/jetbrains/kotlinx/dataframe/DataFrame;Lkotlin/jvm/functions/Function3;)V
public synthetic fun <init> (Lorg/jetbrains/kotlinx/dataframe/DataFrame;Lkotlin/jvm/functions/Function3;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
public final fun getDisplayConfiguration (Lorg/jetbrains/kotlinx/dataframe/io/DisplayConfiguration;)Lorg/jetbrains/kotlinx/dataframe/io/DisplayConfiguration;
public final fun toHTML (Lorg/jetbrains/kotlinx/dataframe/io/DisplayConfiguration;)Lorg/jetbrains/kotlinx/dataframe/io/DataFrameHtmlData;
public static synthetic fun toHTML$default (Lorg/jetbrains/kotlinx/dataframe/api/FormattedFrame;Lorg/jetbrains/kotlinx/dataframe/io/DisplayConfiguration;ILjava/lang/Object;)Lorg/jetbrains/kotlinx/dataframe/io/DataFrameHtmlData;
public final fun toStandaloneHTML (Lorg/jetbrains/kotlinx/dataframe/io/DisplayConfiguration;)Lorg/jetbrains/kotlinx/dataframe/io/DataFrameHtmlData;
public static synthetic fun toStandaloneHTML$default (Lorg/jetbrains/kotlinx/dataframe/api/FormattedFrame;Lorg/jetbrains/kotlinx/dataframe/io/DisplayConfiguration;ILjava/lang/Object;)Lorg/jetbrains/kotlinx/dataframe/io/DataFrameHtmlData;
public final fun toHtml (Lorg/jetbrains/kotlinx/dataframe/io/DisplayConfiguration;)Lorg/jetbrains/kotlinx/dataframe/io/DataFrameHtmlData;
public static synthetic fun toHtml$default (Lorg/jetbrains/kotlinx/dataframe/api/FormattedFrame;Lorg/jetbrains/kotlinx/dataframe/io/DisplayConfiguration;ILjava/lang/Object;)Lorg/jetbrains/kotlinx/dataframe/io/DataFrameHtmlData;
public final fun toStandaloneHtml (Lorg/jetbrains/kotlinx/dataframe/io/DisplayConfiguration;)Lorg/jetbrains/kotlinx/dataframe/io/DataFrameHtmlData;
public static synthetic fun toStandaloneHtml$default (Lorg/jetbrains/kotlinx/dataframe/api/FormattedFrame;Lorg/jetbrains/kotlinx/dataframe/io/DisplayConfiguration;ILjava/lang/Object;)Lorg/jetbrains/kotlinx/dataframe/io/DataFrameHtmlData;
}

public final class org/jetbrains/kotlinx/dataframe/api/FormattingDSL {
Expand Down Expand Up @@ -6087,6 +6091,9 @@ public final class org/jetbrains/kotlinx/dataframe/io/DataFrameHtmlData {
public final fun writeHTML (Ljava/io/File;)V
public final fun writeHTML (Ljava/lang/String;)V
public final fun writeHTML (Ljava/nio/file/Path;)V
public final fun writeHtml (Ljava/io/File;)V
public final fun writeHtml (Ljava/lang/String;)V
public final fun writeHtml (Ljava/nio/file/Path;)V
}

public final class org/jetbrains/kotlinx/dataframe/io/DataFrameHtmlData$Companion {
Expand Down Expand Up @@ -6163,8 +6170,12 @@ public final class org/jetbrains/kotlinx/dataframe/io/GuessKt {
public final class org/jetbrains/kotlinx/dataframe/io/HtmlKt {
public static final fun toHTML (Lorg/jetbrains/kotlinx/dataframe/DataFrame;Lorg/jetbrains/kotlinx/dataframe/io/DisplayConfiguration;Lorg/jetbrains/kotlinx/dataframe/jupyter/CellRenderer;Lkotlin/jvm/functions/Function1;)Lorg/jetbrains/kotlinx/dataframe/io/DataFrameHtmlData;
public static synthetic fun toHTML$default (Lorg/jetbrains/kotlinx/dataframe/DataFrame;Lorg/jetbrains/kotlinx/dataframe/io/DisplayConfiguration;Lorg/jetbrains/kotlinx/dataframe/jupyter/CellRenderer;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lorg/jetbrains/kotlinx/dataframe/io/DataFrameHtmlData;
public static final fun toHtml (Lorg/jetbrains/kotlinx/dataframe/DataFrame;Lorg/jetbrains/kotlinx/dataframe/io/DisplayConfiguration;Lorg/jetbrains/kotlinx/dataframe/jupyter/CellRenderer;Lkotlin/jvm/functions/Function1;)Lorg/jetbrains/kotlinx/dataframe/io/DataFrameHtmlData;
public static synthetic fun toHtml$default (Lorg/jetbrains/kotlinx/dataframe/DataFrame;Lorg/jetbrains/kotlinx/dataframe/io/DisplayConfiguration;Lorg/jetbrains/kotlinx/dataframe/jupyter/CellRenderer;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lorg/jetbrains/kotlinx/dataframe/io/DataFrameHtmlData;
public static final fun toStandaloneHTML (Lorg/jetbrains/kotlinx/dataframe/DataFrame;Lorg/jetbrains/kotlinx/dataframe/io/DisplayConfiguration;Lorg/jetbrains/kotlinx/dataframe/jupyter/CellRenderer;Lkotlin/jvm/functions/Function1;)Lorg/jetbrains/kotlinx/dataframe/io/DataFrameHtmlData;
public static synthetic fun toStandaloneHTML$default (Lorg/jetbrains/kotlinx/dataframe/DataFrame;Lorg/jetbrains/kotlinx/dataframe/io/DisplayConfiguration;Lorg/jetbrains/kotlinx/dataframe/jupyter/CellRenderer;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lorg/jetbrains/kotlinx/dataframe/io/DataFrameHtmlData;
public static final fun toStandaloneHtml (Lorg/jetbrains/kotlinx/dataframe/DataFrame;Lorg/jetbrains/kotlinx/dataframe/io/DisplayConfiguration;Lorg/jetbrains/kotlinx/dataframe/jupyter/CellRenderer;Lkotlin/jvm/functions/Function1;)Lorg/jetbrains/kotlinx/dataframe/io/DataFrameHtmlData;
public static synthetic fun toStandaloneHtml$default (Lorg/jetbrains/kotlinx/dataframe/DataFrame;Lorg/jetbrains/kotlinx/dataframe/io/DisplayConfiguration;Lorg/jetbrains/kotlinx/dataframe/jupyter/CellRenderer;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lorg/jetbrains/kotlinx/dataframe/io/DataFrameHtmlData;
public static final fun toStaticHtml (Lorg/jetbrains/kotlinx/dataframe/DataFrame;Lorg/jetbrains/kotlinx/dataframe/io/DisplayConfiguration;Lorg/jetbrains/kotlinx/dataframe/jupyter/CellRenderer;ZZ)Lorg/jetbrains/kotlinx/dataframe/io/DataFrameHtmlData;
public static synthetic fun toStaticHtml$default (Lorg/jetbrains/kotlinx/dataframe/DataFrame;Lorg/jetbrains/kotlinx/dataframe/io/DisplayConfiguration;Lorg/jetbrains/kotlinx/dataframe/jupyter/CellRenderer;ZZILjava/lang/Object;)Lorg/jetbrains/kotlinx/dataframe/io/DataFrameHtmlData;
}
Expand Down
44 changes: 35 additions & 9 deletions core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/convert.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,13 @@ import org.jetbrains.kotlinx.dataframe.impl.io.FastDoubleParser
import org.jetbrains.kotlinx.dataframe.io.toDataFrame
import org.jetbrains.kotlinx.dataframe.util.CONVERT_TO
import org.jetbrains.kotlinx.dataframe.util.CONVERT_TO_REPLACE
import org.jetbrains.kotlinx.dataframe.util.CONVERT_TO_URL
import org.jetbrains.kotlinx.dataframe.util.CONVERT_TO_URL_REPLACE
import org.jetbrains.kotlinx.dataframe.util.TO_URL
import org.jetbrains.kotlinx.dataframe.util.TO_URL_REPLACE
import java.math.BigDecimal
import java.math.BigInteger
import java.net.URI
import java.net.URL
import java.util.Locale
import kotlin.reflect.KProperty
Expand Down Expand Up @@ -180,7 +185,7 @@ internal interface ConvertDocs {
* `| `__`.`__[**`toInstant`**][Convert.toInstant]`()`
*
* {@include [Indent]}
* `| `__`.`__[**`toURL`**][Convert.toURL]`()`
* `| `__`.`__[**`toUrl`**][Convert.toUrl]`()`
*
* {@include [Indent]}
* `| `__`.`__[**`toIFrame`**][Convert.toIFrame]`()`
Expand Down Expand Up @@ -325,7 +330,7 @@ public inline fun <T, C, reified R> Convert<T, C?>.notNull(
* - [toStr], [toInt], [toLong], [toDouble], [toFloat], [toBigDecimal],
* [toBigInteger], [toBoolean] – convert to standard types.
* - [toLocalDateTime], [toLocalDate], [toLocalTime], [toInstant] – convert to kotlinx.datetime types.
* - [toURL], [toIFrame], [toImg] – convert to special types.
* - [toUrl], [toIFrame], [toImg] – convert to special types.
* - [toDataFrames] – converts a column of lists into separate DataFrames.
*
* See [Grammar][ConvertDocs.Grammar] for more details.
Expand Down Expand Up @@ -956,20 +961,34 @@ public fun <T, R : URL?> Convert<T, URL>.toImg(width: Int? = null, height: Int?

// region toURL

@Deprecated(CONVERT_TO_URL, ReplaceWith(CONVERT_TO_URL_REPLACE), DeprecationLevel.ERROR)
public fun DataColumn<String>.convertToURL(): DataColumn<URL> = convertToUrl()

/**
* Converts values in this [String] column to an [URL].
*
* @return A new [DataColumn] with an [URL] values.
*/
public fun DataColumn<String>.convertToURL(): DataColumn<URL> = map { URL(it) }
public fun DataColumn<String>.convertToUrl(): DataColumn<URL> = map { URI(it).toURL() }

@Deprecated(CONVERT_TO_URL, ReplaceWith(CONVERT_TO_URL_REPLACE), DeprecationLevel.ERROR)
@JvmName("convertToURLFromStringNullable")
public fun DataColumn<String?>.convertToURL(): DataColumn<URL?> = convertToUrl()

/**
* Converts values in this [String] column to an [URL]. Preserves null values.
*
* @return A new [DataColumn] with an [URL] nullable values.
*/
@JvmName("convertToURLFromStringNullable")
public fun DataColumn<String?>.convertToURL(): DataColumn<URL?> = map { it?.let { URL(it) } }
@JvmName("convertToUrlFromStringNullable")
public fun DataColumn<String?>.convertToUrl(): DataColumn<URL?> = map { it?.let { URI(it).toURL() } }

@Deprecated(TO_URL, ReplaceWith(TO_URL_REPLACE), DeprecationLevel.ERROR)
@JvmName("toURLFromStringNullable")
@Refine
@Converter(URL::class, nullable = true)
@Interpretable("ToSpecificType")
public fun <T> Convert<T, String?>.toURL(): DataFrame<T> = asColumn { it.convertToUrl() }

/**
* Converts values in the [String] columns previously selected with [convert] to an [URL],
Expand All @@ -980,7 +999,7 @@ public fun DataColumn<String?>.convertToURL(): DataColumn<URL?> = map { it?.let
*
* ### Examples:
* ```kotlin
* df.convert { webAddress }.toURL()
* df.convert { webAddress }.toUrl()
* ```
*
* @return A new [DataFrame] with the values converted to an [URL].
Expand All @@ -989,7 +1008,14 @@ public fun DataColumn<String?>.convertToURL(): DataColumn<URL?> = map { it?.let
@Refine
@Converter(URL::class, nullable = true)
@Interpretable("ToSpecificType")
public fun <T> Convert<T, String?>.toURL(): DataFrame<T> = asColumn { it.convertToURL() }
public fun <T> Convert<T, String?>.toUrl(): DataFrame<T> = asColumn { it.convertToUrl() }

@Deprecated(TO_URL, ReplaceWith(TO_URL_REPLACE), DeprecationLevel.ERROR)
@JvmName("toURLFromString")
@Refine
@Converter(URL::class, nullable = false)
@Interpretable("ToSpecificType")
public fun <T> Convert<T, String>.toURL(): DataFrame<T> = toUrl()

/**
* Converts values in the [String] columns previously selected with [convert] to an [URL],
Expand All @@ -999,7 +1025,7 @@ public fun <T> Convert<T, String?>.toURL(): DataFrame<T> = asColumn { it.convert
*
* ### Examples:
* ```kotlin
* df.convert { webAddress }.toURL()
* df.convert { webAddress }.toUrl()
* ```
*
* @return A new [DataFrame] with the values converted to an [URL].
Expand All @@ -1008,7 +1034,7 @@ public fun <T> Convert<T, String?>.toURL(): DataFrame<T> = asColumn { it.convert
@Refine
@Converter(URL::class, nullable = false)
@Interpretable("ToSpecificType")
public fun <T> Convert<T, String>.toURL(): DataFrame<T> = asColumn { it.convertToURL() }
public fun <T> Convert<T, String>.toUrl(): DataFrame<T> = asColumn { it.convertToUrl() }

// endregion

Expand Down
12 changes: 6 additions & 6 deletions core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/format.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ import org.jetbrains.kotlinx.dataframe.impl.api.formatImpl
import org.jetbrains.kotlinx.dataframe.impl.api.linearGradient
import org.jetbrains.kotlinx.dataframe.io.DataFrameHtmlData
import org.jetbrains.kotlinx.dataframe.io.DisplayConfiguration
import org.jetbrains.kotlinx.dataframe.io.toHTML
import org.jetbrains.kotlinx.dataframe.io.toStandaloneHTML
import org.jetbrains.kotlinx.dataframe.io.toHtml
import org.jetbrains.kotlinx.dataframe.io.toStandaloneHtml
import kotlin.reflect.KProperty

// region DataFrame
Expand Down Expand Up @@ -126,14 +126,14 @@ public class FormattedFrame<T>(internal val df: DataFrame<T>, internal val forma
/**
* @return DataFrameHtmlData without additional definitions. Can be rendered in Jupyter kernel environments
*/
public fun toHTML(configuration: DisplayConfiguration = DisplayConfiguration.DEFAULT): DataFrameHtmlData =
df.toHTML(getDisplayConfiguration(configuration))
public fun toHtml(configuration: DisplayConfiguration = DisplayConfiguration.DEFAULT): DataFrameHtmlData =
df.toHtml(getDisplayConfiguration(configuration))

/**
* @return DataFrameHtmlData with table script and css definitions. Can be saved as an *.html file and displayed in the browser
*/
public fun toStandaloneHTML(configuration: DisplayConfiguration = DisplayConfiguration.DEFAULT): DataFrameHtmlData =
df.toStandaloneHTML(getDisplayConfiguration(configuration))
public fun toStandaloneHtml(configuration: DisplayConfiguration = DisplayConfiguration.DEFAULT): DataFrameHtmlData =
df.toStandaloneHtml(getDisplayConfiguration(configuration))

public fun getDisplayConfiguration(configuration: DisplayConfiguration): DisplayConfiguration =
configuration.copy(cellFormatter = formatter as RowColFormatter<*, *>?)
Expand Down
3 changes: 2 additions & 1 deletion core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/impl/api/parse.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ import org.jetbrains.kotlinx.dataframe.io.isUrl
import org.jetbrains.kotlinx.dataframe.values
import java.math.BigDecimal
import java.math.BigInteger
import java.net.URI
import java.net.URL
import java.text.ParsePosition
import java.time.format.DateTimeFormatter
Expand Down Expand Up @@ -240,7 +241,7 @@ internal object Parsers : GlobalParserOptions {
toJavaLocalDateTimeOrNull(formatter) // since we accept a Java DateTimeFormatter
?.toKotlinLocalDateTime()

private fun String.toUrlOrNull(): URL? = if (isUrl(this)) catchSilent { URL(this) } else null
private fun String.toUrlOrNull(): URL? = if (isUrl(this)) catchSilent { URI(this).toURL() } else null
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

toUrl?

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's Java API


private fun String.toBooleanOrNull() =
when (uppercase(Locale.getDefault())) {
Expand Down
3 changes: 2 additions & 1 deletion core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/io/common.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import org.jetbrains.kotlinx.dataframe.util.IS_URL_REPLACE
import java.io.File
import java.io.InputStream
import java.net.HttpURLConnection
import java.net.URI
import java.net.URL

/**
Expand Down Expand Up @@ -110,7 +111,7 @@ public fun isProtocolSupported(url: URL): Boolean = url.protocol in setOf("http"
*/
public fun asUrl(fileOrUrl: String): URL =
if (isUrl(fileOrUrl)) {
URL(fileOrUrl).toURI()
URI(fileOrUrl)
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Uri?

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's Java API

} else {
File(fileOrUrl).also {
require(it.exists()) { "File not found: \"$fileOrUrl\"" }
Expand Down
Loading