Keep trailing slashes

Author: mickael-menu

readium/shared/src/main/java/org/readium/r2/shared/util/Url.kt

@@ -182,7 +182,11 @@ public sealed class Url : Parcelable {
         uri.buildUpon()
             .apply {
                 path?.let {
-                    path(File(it).normalize().path)
+                    var normalizedPath = File(it).normalize().path
+                    if (it.endsWith("/")) {
+                        normalizedPath += "/"
+                    }
+                    path(normalizedPath)
                 }
 
                 if (this@Url is AbsoluteUrl) {

readium/shared/src/test/java/org/readium/r2/shared/util/UrlTest.kt

@@ -432,6 +432,16 @@ class UrlTest {
             Url("foo/./bar/../../../baz")!!.normalize().toString()
         )
 
+        // Trailing slash is kept.
+        assertEquals(
+            "http://example.com/foo/",
+            Url("http://example.com/foo/")!!.normalize().toString()
+        )
+        assertEquals(
+            "foo/",
+            Url("foo/")!!.normalize().toString()
+        )
+
         // The other components are left as-is.
         assertEquals(
             "http://user:password@example.com:443/foo?b=b&a=a#fragment",