Unifies UriParser

quartz/src/androidMain/kotlin/com/vitorpamplona/quartz/utils/UriParser.android.kt

@@ -1,61 +0,0 @@
-/*
- * Copyright (c) 2025 Vitor Pamplona
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to use,
- * copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the
- * Software, and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
- * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
- * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
- * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-package com.vitorpamplona.quartz.utils
-
-import androidx.core.net.toUri
-import java.net.URLDecoder
-
-actual class UriParser actual constructor(
-    uri: String,
-) {
-    val myUri = uri.toUri()
-
-    val fragments: Map<String, String> by lazy {
-        myUri.fragment?.ifBlank { null }?.let { keyValuePair ->
-            keyValuePair.split('&').associate { paramValue ->
-                val parts = paramValue.split("=", limit = 2)
-                if (parts.size == 2) {
-                    parts[0] to URLDecoder.decode(parts[1], "UTF-8")
-                } else {
-                    parts[0] to "" // Handle parameters without a value, e.g., "param&other=value"
-                }
-            }
-        } ?: emptyMap()
-    }
-
-    actual fun scheme(): String? = myUri.scheme
-
-    actual fun host(): String? = myUri.host
-
-    actual fun port(): Int? {
-        // android.net.Uri.getPort() returns -1 if the port is not set, so we handle that case.
-        val port = myUri.port
-        return if (port == -1) null else port
-    }
-
-    actual fun path(): String? = myUri.path
-
-    actual fun queryParameterNames() = myUri.queryParameterNames
-
-    actual fun getQueryParameter(param: String) = myUri.getQueryParameter(param)
-
-    actual fun fragments(): Map<String, String> = fragments
-}

quartz/src/jvmAndroid/kotlin/com/vitorpamplona/quartz/utils/UriParser.jvmAndroid.kt

@@ -26,28 +26,29 @@ import java.net.URLDecoder
 actual class UriParser actual constructor(
     uri: String,
 ) {
-    val myUri = URI.create(uri)
-    val queryParameters: Map<String, String> by lazy {
+    private val myUri = URI.create(uri)
+
+    private val queryParameters: Map<String, String> by lazy {
         myUri.query?.ifBlank { null }?.let { query ->
             query.split('&').associate { paramValue ->
                 val parts = paramValue.split("=", limit = 2)
                 if (parts.size == 2) {
-                    parts[0] to parts[1]
+                    parts[0] to URLDecoder.decode(parts[1], "UTF-8")
                 } else {
-                    parts[0] to "" // Handle parameters without a value, e.g., "param&other=value"
+                    parts[0] to "" // Handle parameters without a value
                 }
             }
         } ?: emptyMap()
     }
 
-    val fragments: Map<String, String> by lazy {
+    private val fragments: Map<String, String> by lazy {
         myUri.rawFragment?.ifBlank { null }?.let { keyValuePair ->
             keyValuePair.split('&').associate { paramValue ->
                 val parts = paramValue.split("=", limit = 2)
                 if (parts.size == 2) {
                     parts[0] to URLDecoder.decode(parts[1], "UTF-8")
                 } else {
-                    parts[0] to "" // Handle parameters without a value, e.g., "param&other=value"
+                    parts[0] to "" // Handle parameters without a value
                 }
             }
         } ?: emptyMap()
@@ -58,7 +59,6 @@ actual class UriParser actual constructor(
     actual fun host(): String? = myUri.host
 
     actual fun port(): Int? {
-        // java.net.URI.getPort() returns -1 if the port is not set, so we handle that case.
         val port = myUri.port
         return if (port == -1) null else port
     }
@@ -69,5 +69,5 @@ actual class UriParser actual constructor(
 
     actual fun getQueryParameter(param: String): String? = queryParameters[param]
 
-    actual fun fragments() = fragments
+    actual fun fragments(): Map<String, String> = fragments
 }