fix incorrect URL encoding algorithm after replacing Apache's URIBuilder

Author: sunny-chung

src/jvmMain/kotlin/com/sunnychung/application/multiplatform/hellohttp/model/HttpRequest.kt

@@ -3,6 +3,7 @@ package com.sunnychung.application.multiplatform.hellohttp.model
 //import org.apache.hc.core5.net.URIBuilder
 import org.springframework.web.util.UriComponentsBuilder
 import java.net.URI
+import java.net.URLEncoder
 
 class HttpRequest(
     val method: String = "",
@@ -32,16 +33,22 @@ class HttpRequest(
     val headers get() = initialHeaders + newHeaders
     val queryParameters get() = initialQueryParameters + newQueryParameters
 
-    fun getResolvedUri(): URI {
+    fun getResolvedUri(): URI { // see com.sunnychung.application.multiplatform.hellohttp.test.HttpRequestTest
         return UriComponentsBuilder.fromUriString(url.replace(" ", "+"))
+            .encode()
+            .build()
+            .toString()
             .run {
-                var b = this
+//                var b = this
+//                println(this)
+                var b = UriComponentsBuilder.fromUriString(this)
                 queryParameters.forEach {
-                    b = b.queryParam(it.first, it.second)
+                    b = b.queryParam(it.first, URLEncoder.encode(it.second, Charsets.UTF_8))
+//                    b = b.queryParam(it.first, it.second)
                 }
                 b
             }
-            .encode()
+//            .encode()
             .build()
             .let { URI.create(it.toString()) }
     }

src/jvmTest/kotlin/com/sunnychung/application/multiplatform/hellohttp/test/HttpRequestTest.kt

@@ -0,0 +1,46 @@
+package com.sunnychung.application.multiplatform.hellohttp.test
+
+import com.sunnychung.application.multiplatform.hellohttp.model.ContentType
+import com.sunnychung.application.multiplatform.hellohttp.model.HttpRequest
+import com.sunnychung.application.multiplatform.hellohttp.model.ProtocolApplication
+import kotlin.test.Test
+import kotlin.test.assertEquals
+
+class HttpRequestTest {
+
+    @Test
+    fun `plus char is encoded`() {
+        HttpRequest(
+            method = "GET",
+            url = "http://sunnychung.application.multiplatform.hellohttp/path",
+            queryParameters = listOf("a" to "b+c", "d" to "e+f"),
+            contentType = ContentType.None,
+            application = ProtocolApplication.Http,
+        ).run {
+            assertEquals("http://sunnychung.application.multiplatform.hellohttp/path?a=b%2bc&d=e%2bf", getResolvedUri().toString().lowercase())
+        }
+
+//        HttpRequest(
+//            method = "GET",
+//            url = "http://sunnychung.application.multiplatform.hellohttp/path+xyz",
+//            queryParameters = listOf("a" to "b+c", "d" to "e+f"),
+//            contentType = ContentType.None,
+//            application = ProtocolApplication.Http,
+//        ).run {
+//            assertEquals("http://sunnychung.application.multiplatform.hellohttp/path%2bxyz?a=b%2bc&d=e%2bf", getResolvedUri().toString().lowercase())
+//        }
+    }
+
+    @Test
+    fun `unicode is encoded`() {
+        HttpRequest(
+            method = "GET",
+            url = "http://sunnychung.application.multiplatform.hellohttp/anything/中文字",
+            queryParameters = listOf("a" to "b+c", "d" to "e+f"),
+            contentType = ContentType.None,
+            application = ProtocolApplication.Http,
+        ).run {
+            assertEquals("http://sunnychung.application.multiplatform.hellohttp/anything/%E4%B8%AD%E6%96%87%E5%AD%97?a=b%2bc&d=e%2bf".lowercase(), getResolvedUri().toString().lowercase())
+        }
+    }
+}