Migrate different Uri to use http4s and adopt only RFC-3986 (#5336)

* Migrate different Uri to use http4s and adopt only RFC-3986

* Add docs + fix warning

---------

Co-authored-by: Simon Dumas <simon.dumas@senscience.ai>

Author: imsdu

delta/app/src/main/scala/ch/epfl/bluebrain/nexus/delta/routes/OrganizationsRoutes.scala

@@ -78,7 +78,7 @@ final class OrganizationsRoutes(
         extractCaller { implicit caller =>
           concat(
             // List organizations
-            (get & extractUri & fromPaginated & orgsSearchParams & sort[Organization] & pathEndOrSingleSlash) {
+            (get & extractHttp4sUri & fromPaginated & orgsSearchParams & sort[Organization] & pathEndOrSingleSlash) {
               (uri, pagination, params, order) =>
                 implicit val searchJsonLdEncoder: JsonLdEncoder[SearchResults[OrganizationResource]] =
                   searchResultsJsonLdEncoder(Organization.context, pagination, uri)

delta/app/src/main/scala/ch/epfl/bluebrain/nexus/delta/routes/ProjectsRoutes.scala

@@ -75,7 +75,7 @@ final class ProjectsRoutes(
         extractCaller { implicit caller =>
           concat(
             // List projects
-            (get & pathEndOrSingleSlash & extractUri & fromPaginated & projectsSearchParams &
+            (get & pathEndOrSingleSlash & extractHttp4sUri & fromPaginated & projectsSearchParams &
               sort[Project]) { (uri, pagination, params, order) =>
               implicit val searchJsonLdEncoder: JsonLdEncoder[SearchResults[ProjectResource]] =
                 searchResultsJsonLdEncoder(Project.context, pagination, uri)
@@ -157,7 +157,7 @@ final class ProjectsRoutes(
               )
             },
             // list projects for an organization
-            (get & label & pathEndOrSingleSlash & extractUri & fromPaginated & projectsSearchParams &
+            (get & label & pathEndOrSingleSlash & extractHttp4sUri & fromPaginated & projectsSearchParams &
               sort[Project]) { (organization, uri, pagination, params, order) =>
               implicit val searchJsonLdEncoder: JsonLdEncoder[SearchResults[ProjectResource]] =
                 searchResultsJsonLdEncoder(Project.context, pagination, uri)

delta/app/src/main/scala/ch/epfl/bluebrain/nexus/delta/routes/RealmsRoutes.scala

@@ -49,7 +49,7 @@ class RealmsRoutes(identities: Identities, realms: Realms, aclCheck: AclCheck)(i
         extractCaller { implicit caller =>
           concat(
             // List realms
-            (get & extractUri & fromPaginated & realmsSearchParams & sort[Realm] & pathEndOrSingleSlash) {
+            (get & extractHttp4sUri & fromPaginated & realmsSearchParams & sort[Realm] & pathEndOrSingleSlash) {
               (uri, pagination, params, order) =>
                 authorizeFor(AclAddress.Root, realmsPermissions.read).apply {
                   implicit val encoder: JsonLdEncoder[SearchResults[RealmResource]] =

delta/app/src/main/scala/ch/epfl/bluebrain/nexus/delta/wiring/RealmsModule.scala

@@ -12,13 +12,10 @@ import ch.epfl.bluebrain.nexus.delta.sdk.*
 import ch.epfl.bluebrain.nexus.delta.sdk.acls.AclCheck
 import ch.epfl.bluebrain.nexus.delta.sdk.identities.Identities
 import ch.epfl.bluebrain.nexus.delta.sdk.identities.model.ServiceAccount
-import ch.epfl.bluebrain.nexus.delta.sdk.instances.*
 import ch.epfl.bluebrain.nexus.delta.sdk.model.{BaseUri, MetadataContextValue}
-import ch.epfl.bluebrain.nexus.delta.sdk.realms.{RealmProvisioning, Realms, RealmsConfig, RealmsImpl}
+import ch.epfl.bluebrain.nexus.delta.sdk.realms.*
 import ch.epfl.bluebrain.nexus.delta.sourcing.Transactors
-import io.circe.Json
 import izumi.distage.model.definition.{Id, ModuleDef}
-import org.http4s.Uri
 import org.http4s.client.Client
 import org.http4s.ember.client.EmberClientBuilder
 
@@ -39,7 +36,7 @@ object RealmsModule extends ModuleDef {
         client: Client[IO] @Id("realm"),
         xas: Transactors
     ) =>
-      val wellKnownResolver = realms.WellKnownResolver((uri: Uri) => client.expect[Json](uri)) _
+      val wellKnownResolver = WellKnownResolver(client) _
       RealmsImpl(cfg, wellKnownResolver, xas, clock)
   }
 

delta/app/src/test/scala/ch/epfl/bluebrain/nexus/delta/plugin/PluginLoaderSpec.scala

@@ -5,13 +5,14 @@ import cats.effect.IO
 import ch.epfl.bluebrain.nexus.delta.plugin.PluginsLoader.PluginLoaderConfig
 import ch.epfl.bluebrain.nexus.delta.sdk.PriorityRoute
 import ch.epfl.bluebrain.nexus.delta.sdk.model.BaseUri
+import ch.epfl.bluebrain.nexus.delta.sdk.syntax.*
 import ch.epfl.bluebrain.nexus.testkit.scalatest.ce.CatsEffectSpec
 import com.typesafe.config.impl.ConfigImpl
 import izumi.distage.model.definition.ModuleDef
 
 class PluginLoaderSpec extends CatsEffectSpec with ScalatestRouteTest {
 
-  private val baseUri       = BaseUri.withoutPrefix("http://localhost")
+  private val baseUri       = BaseUri.withoutPrefix(uri"http://localhost")
   private val serviceModule = new ModuleDef {
     make[BaseUri].fromValue(baseUri)
   }

delta/app/src/test/scala/ch/epfl/bluebrain/nexus/delta/routes/OrganizationsRoutesSpec.scala

@@ -173,7 +173,8 @@ class OrganizationsRoutesSpec extends BaseRouteSpec {
     }
 
     "list organizations created by a user" in {
-      Get(s"/v1/orgs?createdBy=${UrlUtils.encode(creatorOrg2.asIri.toString)}") ~> as(reader) ~> routes ~> check {
+      val createdBy = UrlUtils.encodeUriQuery(creatorOrg2.asIri.toString)
+      Get(s"/v1/orgs?createdBy=$createdBy") ~> as(reader) ~> routes ~> check {
         status shouldEqual StatusCodes.OK
         response.asJson should equalIgnoreArrayOrder(expectedResults(org2Created.removeKeys("@context")))
       }

delta/app/src/test/scala/ch/epfl/bluebrain/nexus/delta/routes/RealmsRoutesSpec.scala

@@ -2,7 +2,7 @@ package ch.epfl.bluebrain.nexus.delta.routes
 
 import akka.http.scaladsl.model.StatusCodes
 import akka.http.scaladsl.server.Route
-import ch.epfl.bluebrain.nexus.delta.kernel.utils.UrlUtils
+import ch.epfl.bluebrain.nexus.delta.kernel.utils.UrlUtils.encodeUriQuery
 import ch.epfl.bluebrain.nexus.delta.rdf.Vocabulary.contexts
 import ch.epfl.bluebrain.nexus.delta.sdk.acls.AclSimpleCheck
 import ch.epfl.bluebrain.nexus.delta.sdk.acls.model.AclAddress
@@ -207,7 +207,7 @@ class RealmsRoutesSpec extends BaseRouteSpec with IOFromMap {
     }
 
     "list realms created by alice" in {
-      Get(s"/v1/realms?createdBy=${UrlUtils.encode(alice.asIri.toString)}") ~> routes ~> check {
+      Get(s"/v1/realms?createdBy=${encodeUriQuery(alice.asIri.toString)}") ~> routes ~> check {
         status shouldEqual StatusCodes.OK
         response.asJson should equalIgnoreArrayOrder(
           expectedResults(

delta/app/src/test/scala/ch/epfl/bluebrain/nexus/delta/routes/ResolversRoutesSpec.scala

@@ -5,7 +5,8 @@ import akka.http.scaladsl.model.headers.{Accept, Location}
 import akka.http.scaladsl.model.{StatusCodes, Uri}
 import akka.http.scaladsl.server.Route
 import cats.effect.IO
-import ch.epfl.bluebrain.nexus.delta.kernel.utils.{UUIDF, UrlUtils}
+import ch.epfl.bluebrain.nexus.delta.kernel.utils.UUIDF
+import ch.epfl.bluebrain.nexus.delta.kernel.utils.UrlUtils.encodeUriPath
 import ch.epfl.bluebrain.nexus.delta.rdf.IriOrBNode.Iri
 import ch.epfl.bluebrain.nexus.delta.rdf.Vocabulary.{contexts, nxv, schema, schemas}
 import ch.epfl.bluebrain.nexus.delta.sdk.acls.AclSimpleCheck
@@ -577,9 +578,9 @@ class ResolversRoutesSpec extends BaseRouteSpec {
       }
     }
 
-    val idResourceEncoded      = UrlUtils.encode(resourceId.toString)
-    val idSchemaEncoded        = UrlUtils.encode(schemaId.toString)
-    val unknownResourceEncoded = UrlUtils.encode((nxv + "xxx").toString)
+    val idResourceEncoded      = encodeUriPath(resourceId.toString)
+    val idSchemaEncoded        = encodeUriPath(schemaId.toString)
+    val unknownResourceEncoded = encodeUriPath((nxv + "xxx").toString)
 
     val resourceResolved = jsonContentOf(
       "resolvers/resource-resolved.json",

delta/app/src/test/scala/ch/epfl/bluebrain/nexus/delta/routes/ResourcesRoutesSpec.scala

@@ -5,7 +5,8 @@ import akka.http.scaladsl.model.headers.{Accept, Location, RawHeader}
 import akka.http.scaladsl.model.{RequestEntity, StatusCodes, Uri}
 import akka.http.scaladsl.server.Route
 import cats.syntax.all.*
-import ch.epfl.bluebrain.nexus.delta.kernel.utils.{UUIDF, UrlUtils}
+import ch.epfl.bluebrain.nexus.delta.kernel.utils.UUIDF
+import ch.epfl.bluebrain.nexus.delta.kernel.utils.UrlUtils.encodeUriPath
 import ch.epfl.bluebrain.nexus.delta.rdf.IriOrBNode.Iri
 import ch.epfl.bluebrain.nexus.delta.rdf.Vocabulary.{contexts, nxv, schema as schemaOrg, schemas}
 import ch.epfl.bluebrain.nexus.delta.rdf.jsonld.context.JsonLdContext.keywords
@@ -59,7 +60,7 @@ class ResourcesRoutesSpec extends BaseRouteSpec with ValidateResourceFixture wit
   private val tag        = UserTag.unsafe("mytag")
 
   private val myId                            = nxv + "myid" // Resource created against no schema with id present on the payload
-  private def encodeWithBase(id: String)      = UrlUtils.encode((nxv + id).toString)
+  private def encodeWithBase(id: String)      = encodeUriPath((nxv + id).toString)
   private val payload                         = jsonContentOf("resources/resource.json", "id" -> myId)
   private def simplePayload(id: String)       = jsonContentOf("resources/resource.json", "id" -> (nxv + id))
   private val payloadWithoutId                = payload.removeKeys(keywords.id)
@@ -563,7 +564,7 @@ class ResourcesRoutesSpec extends BaseRouteSpec with ValidateResourceFixture wit
     }
 
     "fetch a resource original payload with metadata using tags and revisions" in {
-      val mySchema = UrlUtils.encode(schemas.resources.toString)
+      val mySchema = encodeUriPath(schemas.resources.toString)
       val myTag    = "myTag"
       givenAResourceWithTag(myTag) { id =>
         val endpoints = List(
@@ -704,7 +705,7 @@ class ResourcesRoutesSpec extends BaseRouteSpec with ValidateResourceFixture wit
       val methods = List(Get, Put, Post, Delete)
       givenAResource { id =>
         forAll(methods) { method =>
-          method(s"/v1/resources/myorg/myproject/myschema/${UrlUtils.encode(id)}/xxx") ~> as(
+          method(s"/v1/resources/myorg/myproject/myschema/${encodeUriPath(id)}/xxx") ~> as(
             reader
           ) ~> routes ~> check {
             status shouldEqual StatusCodes.NotFound

delta/app/src/test/scala/ch/epfl/bluebrain/nexus/delta/routes/ResourcesTrialRoutesSpec.scala

@@ -3,7 +3,7 @@ package ch.epfl.bluebrain.nexus.delta.routes
 import akka.http.scaladsl.model.StatusCodes
 import akka.http.scaladsl.server.Route
 import cats.effect.IO
-import ch.epfl.bluebrain.nexus.delta.kernel.utils.UrlUtils
+import ch.epfl.bluebrain.nexus.delta.kernel.utils.UrlUtils.encodeUriPath
 import ch.epfl.bluebrain.nexus.delta.rdf.Vocabulary.{contexts, nxv, schemas}
 import ch.epfl.bluebrain.nexus.delta.rdf.jsonld.context.JsonLdContext.keywords
 import ch.epfl.bluebrain.nexus.delta.routes.ResourcesTrialRoutes.GenerateSchema
@@ -191,7 +191,7 @@ class ResourcesTrialRoutesSpec extends BaseRouteSpec with ResourceInstanceFixtur
     }
 
     s"successfully validate $myId for a user with access against the unconstrained schema" in {
-      val unconstrained = UrlUtils.encode(schemas.resources.toString)
+      val unconstrained = encodeUriPath(schemas.resources.toString)
       Get(s"/v1/resources/$projectRef/$unconstrained/myId/validate") ~> as(alice) ~> routes ~> check {
         response.status shouldEqual StatusCodes.OK
         response.asJson shouldEqual
@@ -225,7 +225,7 @@ class ResourcesTrialRoutesSpec extends BaseRouteSpec with ResourceInstanceFixtur
 
     "fail to validate an unknown resource" in {
       val unknownResource = nxv + "unknown"
-      val unknownEncoded  = UrlUtils.encode(unknownResource.toString)
+      val unknownEncoded  = encodeUriPath(unknownResource.toString)
       Get(s"/v1/resources/$projectRef/_/$unknownEncoded/validate") ~> as(alice) ~> routes ~> check {
         response.status shouldEqual StatusCodes.NotFound
         response.asJson shouldEqual jsonContentOf(