Flatten some common HttpUrl internals (#8185)

* Flatten some common HttpUrl internals Trying to reduce the number of indirections that were only necessary when we were attempting to support multiplatform. * Add a synthetic API
square · Jan 9, 2024 · 3cc0f49 · 3cc0f49
1 parent d1b4734
commit 3cc0f49
Show file tree

Hide file tree

Showing 9 changed files with 1,075 additions and 1,316 deletions.
diff --git a/okhttp/api/okhttp.api b/okhttp/api/okhttp.api
@@ -677,6 +677,7 @@ public final class okhttp3/HttpUrl {
 	public final fun -deprecated_uri ()Ljava/net/URI;
 	public final fun -deprecated_url ()Ljava/net/URL;
 	public final fun -deprecated_username ()Ljava/lang/String;
+	public synthetic fun <init> (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ILjava/util/List;Ljava/util/List;Ljava/lang/String;Ljava/lang/String;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public static final fun defaultPort (Ljava/lang/String;)I
 	public final fun encodedFragment ()Ljava/lang/String;
 	public final fun encodedPassword ()Ljava/lang/String;

diff --git a/okhttp/src/main/kotlin/okhttp3/-JvmPlatform.kt b/okhttp/src/main/kotlin/okhttp3/-JvmPlatform.kt
diff --git a/okhttp/src/main/kotlin/okhttp3/FormBody.kt b/okhttp/src/main/kotlin/okhttp3/FormBody.kt
@@ -18,10 +18,10 @@ package okhttp3
 import java.io.IOException
 import java.nio.charset.Charset
 import okhttp3.MediaType.Companion.toMediaType
-import okhttp3.internal.CommonHttpUrl.FORM_ENCODE_SET
-import okhttp3.internal.CommonHttpUrl.percentDecode
-import okhttp3.internal.JvmHttpUrl.canonicalizeWithCharset
 import okhttp3.internal.toImmutableList
+import okhttp3.internal.url.FORM_ENCODE_SET
+import okhttp3.internal.url.canonicalizeWithCharset
+import okhttp3.internal.url.percentDecode
 import okio.Buffer
 import okio.BufferedSink