HttpUrl in Kotlin #4745
HttpUrl in Kotlin #4745
Conversation
swankjesse
force-pushed
the
jwilson.0318.httpurl
branch
from
86434e9
to
6b08387
Compare
| 'okhttp3.HttpUrl$Builder#setEncodedQueryParameter(java.lang.String, java.lang.String)', | ||
| 'okhttp3.HttpUrl$Builder#setPathSegment(int, java.lang.String)', | ||
| 'okhttp3.HttpUrl$Builder#setQueryParameter(java.lang.String, java.lang.String)', | ||
| 'okhttp3.HttpUrl$Builder#username(java.lang.String)', |
There was a problem hiding this comment.
Yikes! This list seems very problematic because it means they're not being verified at all anymore. Do newer versions of japicmp handle this? I filed an issue about updating the Gradle plugin (melix/japicmp-gradle-plugin#25) but I suspect I'll have to do it myself since Cedric is a very busy person.
There was a problem hiding this comment.
Yeah, this is gross. Need to fix japicmp.
There was a problem hiding this comment.
There was a problem hiding this comment.
You da best. Guess it's my turn to send the PR to the Gradle plugin then!
| class HttpUrl internal constructor(builder: Builder) { | ||
|
|
||
| /** Either "http" or "https". */ | ||
| internal val scheme: String = builder.scheme ?: throw IllegalStateException("scheme == null") |
There was a problem hiding this comment.
could also be
internal val scheme: String = checkNotNull(builder.scheme) { "scheme == null" }no preference myself
There was a problem hiding this comment.
I’m gonna keep as-is to keep the exception the same.
| val isHttps: Boolean get() = scheme == "https" | ||
|
|
||
| /** Returns this URL as a [java.net.URL][URL]. */ | ||
| fun url(): URL { |
There was a problem hiding this comment.
idiomatic naming would be toUrl on the Kotlin side
There was a problem hiding this comment.
I want to defer Kotlin-facing API changes until it’s all migrated over. When we do that we’ll need to start writing .kt test cases.
| * These differences may have a significant consequence when the URI is interpreted by a | ||
| * web server. For this reason the [URI class][URI] and this method should be avoided. | ||
| */ | ||
| fun uri(): URI { |
There was a problem hiding this comment.
Good call. On the backlog.
| } | ||
|
|
||
| /** Returns either "http" or "https". */ | ||
| fun scheme(): String = scheme |
There was a problem hiding this comment.
seems like nearly everything that was a method should be a read-only property or computed property. this is a data class, can we make it one?
There was a problem hiding this comment.
Heck yes. But for follow-up.
| * null if it has any other protocol. | ||
| */ | ||
| @JvmStatic | ||
| operator fun get(url: URL): HttpUrl? = parse(url.toString()) |
There was a problem hiding this comment.
URL.toHttpUrlOrNull()
| operator fun get(url: URL): HttpUrl? = parse(url.toString()) | ||
|
|
||
| @JvmStatic | ||
| operator fun get(uri: URI): HttpUrl? = parse(uri.toString()) |
There was a problem hiding this comment.
URI.toHttpUrlOrNull()
| var codePoint: Int | ||
| var i = pos | ||
| while (i < limit) { | ||
| codePoint = input.codePointAt(i) |
There was a problem hiding this comment.
Kotlin needs String.forEachCodepoint
There was a problem hiding this comment.
Sure does. We should build an internal inline function for this.
There was a problem hiding this comment.
| private val encodedValues: List<String> = Util.immutableList(encodedValues) | ||
|
|
||
| /** The number of key-value pairs in this form-encoded body. */ | ||
| fun size(): Int = encodedNames.size |
There was a problem hiding this comment.
property + @getJvmName("size") seems more idiomatic
|
|
||
| var i = 0 | ||
| val size = encodedNames.size | ||
| while (i < size) { |
There was a problem hiding this comment.
for (i in 0 until encodedNames.size)
|
|
||
| /** Returns this URL as a {@link URL java.net.URL}. */ | ||
| public URL url() { | ||
| val isHttps: Boolean get() = scheme == "https" |
There was a problem hiding this comment.
scheme is a val, so this can just be a precomputed property without the get()
| * <tr><td>{@code http://username@host/}</td><td>{@code "username"}</td></tr> | ||
| * <tr><td>{@code http://username:password@host/}</td><td>{@code "username"}</td></tr> | ||
| * <tr><td>{@code http://a%20b:c%20d@host/}</td><td>{@code "a%20b"}</td></tr> | ||
| * <table summary=""> |
There was a problem hiding this comment.
Would be nice to convert those into Markdown tables, follow-up
| if (queryNamesAndValues == null) return null // No query. | ||
| val result = StringBuilder() | ||
| namesAndValuesToQueryString(result, queryNamesAndValues) | ||
| return result.toString() |
There was a problem hiding this comment.
nit:
return buildString {
namesAndValuesToQueryString(this, queryNamesAndValues)
}| /** | ||
| * Returns a new {@code HttpUrl} representing {@code url}. | ||
| * | ||
| * @throws IllegalArgumentException If |
There was a problem hiding this comment.
Just read about a neat "non-nullable shadow" pattern, you just do
val encodedQueryNamesAndValues = encodedQueryNamesAndValues ?: throw NullPointerException()and the rest of the code in the method doesn't need the double bangs
| /** | ||
| * Returns a new {@code HttpUrl} representing {@code url}. | ||
| * | ||
| * @throws IllegalArgumentException If |
| if (limit - pos < 2) return -1 | ||
|
|
||
| val c0 = input[pos] | ||
| if ((c0 < 'a' || c0 > 'z') && (c0 < 'A' || c0 > 'Z')) return -1 // Not a scheme start char. |
There was a problem hiding this comment.
if (c0 !in 'a'..'z' && c0 !in 'A'..'Z')
| for (i in pos + 1 until limit) { | ||
| val c = input[i] | ||
|
|
||
| return if (c >= 'a' && c <= 'z' |
There was a problem hiding this comment.
Same, use ranges for a..z, A..Z, 0..9
| try { | ||
| // Canonicalize the port string to skip '\n' etc. | ||
| val portString = canonicalize(input, pos, limit, "", false, false, false, true, null) | ||
| val i = Integer.parseInt(portString) |
swankjesse
force-pushed
the
jwilson.0318.httpurl
branch
from
6b08387
to
817e1d8
Compare
No description provided.