Do not use akka content type for files anymore (#5337)

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

Author: imsdu

delta/kernel/src/main/scala/ch/epfl/bluebrain/nexus/delta/kernel/instances/ContentTypeInstances.scala

@@ -15,7 +15,7 @@ import ch.epfl.bluebrain.nexus.delta.plugins.storage.FileSelf.ParsingError
 import ch.epfl.bluebrain.nexus.delta.plugins.storage.files.generators.FileGen
 import ch.epfl.bluebrain.nexus.delta.plugins.storage.files.model.FileAttributes.FileAttributesOrigin.Client
 import ch.epfl.bluebrain.nexus.delta.plugins.storage.files.model.FileRejection.FileNotFound
-import ch.epfl.bluebrain.nexus.delta.plugins.storage.files.model.{Digest, FileAttributes}
+import ch.epfl.bluebrain.nexus.delta.plugins.storage.files.model.{Digest, FileAttributes, MediaType}
 import ch.epfl.bluebrain.nexus.delta.plugins.storage.files.schemas
 import ch.epfl.bluebrain.nexus.delta.plugins.storage.storages.StorageFixtures
 import ch.epfl.bluebrain.nexus.delta.plugins.storage.storages.model.AbsolutePath
@@ -83,7 +83,7 @@ class ArchiveDownloadSpec
       Uri.unsafeFromString("http://localhost/file.txt"),
       Uri.Path.unsafeFromString("file.txt"),
       filename,
-      Some(`text/plain(UTF-8)`),
+      Some(MediaType.`text/plain`),
       Map.empty,
       None,
       None,

delta/kernel/src/main/scala/ch/epfl/bluebrain/nexus/delta/kernel/instances/instances.scala

@@ -18,7 +18,7 @@ import ch.epfl.bluebrain.nexus.delta.plugins.storage.files.generators.FileGen
 import ch.epfl.bluebrain.nexus.delta.plugins.storage.files.model.Digest.ComputedDigest
 import ch.epfl.bluebrain.nexus.delta.plugins.storage.files.model.FileAttributes.FileAttributesOrigin.Client
 import ch.epfl.bluebrain.nexus.delta.plugins.storage.files.model.FileRejection.FileNotFound
-import ch.epfl.bluebrain.nexus.delta.plugins.storage.files.model.{File, FileAttributes}
+import ch.epfl.bluebrain.nexus.delta.plugins.storage.files.model.{File, FileAttributes, MediaType}
 import ch.epfl.bluebrain.nexus.delta.plugins.storage.files.routes.FilesRoutesSpec
 import ch.epfl.bluebrain.nexus.delta.plugins.storage.files.schemas
 import ch.epfl.bluebrain.nexus.delta.plugins.storage.storages.StorageFixtures
@@ -97,7 +97,7 @@ class ArchiveRoutesSpec extends BaseRouteSpec with StorageFixtures with ArchiveH
     Uri.unsafeFromString("http://localhost/file.txt"),
     Uri.Path.unsafeFromString("file.txt"),
     "myfile",
-    Some(`text/plain(UTF-8)`),
+    Some(MediaType.`text/plain`),
     Map.empty,
     None,
     None,

delta/kernel/src/test/scala/ch/epfl/bluebrain/nexus/delta/kernel/instances/ContentTypeInstancesSuite.scala

@@ -1,6 +1,5 @@
 package ch.epfl.bluebrain.nexus.delta.plugins.storage.files
 
-import akka.http.scaladsl.model.ContentTypes.`application/octet-stream`
 import cats.effect.{Clock, IO}
 import cats.syntax.all.*
 import ch.epfl.bluebrain.nexus.delta.kernel.kamon.KamonMetricComponent
@@ -344,10 +343,10 @@ final class Files(
       attributes = file.value.attributes
       storage   <- fetchStorage.onRead(file.value.storage, id.project)
       s          = fetchFile(storage, attributes, file.id)
-      mediaType  = attributes.mediaType.getOrElse(`application/octet-stream`)
+      mediaType  = attributes.mediaType.getOrElse(MediaType.`application/octet-stream`)
     } yield FileResponse[FileRejection](
       attributes.filename,
-      mediaType,
+      MediaType.toAkkaContentType(mediaType),
       Some(ResourceF.etagValue(file)),
       Some(attributes.bytes),
       s
@@ -382,7 +381,7 @@ final class Files(
     for {
       info            <- formDataExtractor(uploadRequest.entity, storage.storageValue.maxFileSize)
       storageMetadata <- fileOperations.save(storage, info, uploadRequest.contentLength)
-    } yield FileAttributes.from(info.filename, info.contentType, uploadRequest.metadata, storageMetadata)
+    } yield FileAttributes.from(info.filename, info.mediaType, uploadRequest.metadata, storageMetadata)
   }.adaptError { case e: SaveFileRejection => SaveRejection(iri, storage.id, e) }
 
   private def generateId(pc: ProjectContext): IO[Iri] =

delta/plugins/archive/src/test/scala/ch/epfl/bluebrain/nexus/delta/plugins/archive/ArchiveDownloadSpec.scala

@@ -1,6 +1,5 @@
 package ch.epfl.bluebrain.nexus.delta.plugins.storage.files
 
-import ch.epfl.bluebrain.nexus.delta.kernel.http.MediaTypeDetectorConfig
 import ch.epfl.bluebrain.nexus.delta.sourcing.config.EventLogConfig
 import pureconfig.ConfigReader
 import pureconfig.generic.semiauto.deriveReader

delta/plugins/archive/src/test/scala/ch/epfl/bluebrain/nexus/delta/plugins/archive/ArchiveRoutesSpec.scala

@@ -2,7 +2,7 @@ package ch.epfl.bluebrain.nexus.delta.plugins.storage.files
 
 import akka.NotUsed
 import akka.actor.ActorSystem
-import akka.http.scaladsl.model.*
+import akka.http.scaladsl.model.{ContentType, ContentTypes, EntityStreamSizeException, ExceptionWithErrorInfo, HttpEntity, Multipart}
 import akka.http.scaladsl.model.MediaTypes.`multipart/form-data`
 import akka.http.scaladsl.model.Multipart.FormData
 import akka.http.scaladsl.server.*
@@ -15,6 +15,7 @@ import cats.effect.IO
 import cats.syntax.all.*
 import ch.epfl.bluebrain.nexus.delta.kernel.error.NotARejection
 import ch.epfl.bluebrain.nexus.delta.plugins.storage.files.model.FileRejection.{FileTooLarge, InvalidMultipartFieldName, WrappedAkkaRejection}
+import ch.epfl.bluebrain.nexus.delta.plugins.storage.files.model.MediaType
 import ch.epfl.bluebrain.nexus.delta.sdk.stream.StreamConverter
 
 import scala.concurrent.{ExecutionContext, Future}
@@ -37,7 +38,7 @@ trait FormDataExtractor {
 
 final case class UploadedFileInformation(
     filename: String,
-    contentType: Option[ContentType],
+    mediaType: Option[MediaType],
     contents: FileData
 )
 
@@ -54,7 +55,7 @@ object FormDataExtractor {
     MultipartUnmarshallers
       .multipartUnmarshaller[Multipart.FormData, Multipart.FormData.BodyPart, Multipart.FormData.BodyPart.Strict](
         mediaRange = `multipart/form-data`,
-        defaultContentType = defaultContentType,
+        defaultContentType = ContentTypes.`application/octet-stream`,
         createBodyPart = (entity, headers) => Multipart.General.BodyPart(entity, headers).toFormDataBodyPart.get,
         createStreamed = (_, parts) => Multipart.FormData(parts),
         createStrictBodyPart =
@@ -118,10 +119,16 @@ object FormDataExtractor {
           val contentTypeFromRequest = part.entity.contentType
           val suppliedContentType    = Option.when(contentTypeFromRequest != defaultContentType)(contentTypeFromRequest)
 
+          val detectedMediaType = mediaTypeDetector(
+            filename,
+            suppliedContentType.flatMap(toHttp4sMediaType),
+            Some(contentTypeFromRequest).flatMap(toHttp4sMediaType)
+          )
+
           Future(
             UploadedFileInformation(
               filename,
-              mediaTypeDetector(filename, suppliedContentType, Some(contentTypeFromRequest)),
+              detectedMediaType,
               convertStream(part.entity.dataBytes)
             ).some
           )
@@ -133,5 +140,8 @@ object FormDataExtractor {
         StreamConverter(source.asInstanceOf[Graph[SourceShape[ByteString], NotUsed]]).map { byteString =>
           byteString.asByteBuffer
         }
+
+      private def toHttp4sMediaType(contentType: ContentType) =
+        MediaType.parse(contentType.value).toOption
     }
 }

delta/plugins/storage/src/main/scala/ch/epfl/bluebrain/nexus/delta/plugins/storage/files/Files.scala

@@ -1,37 +1,31 @@
 package ch.epfl.bluebrain.nexus.delta.plugins.storage.files
 
-import akka.http.scaladsl.model.{ContentType, HttpCharsets, MediaType, MediaTypes}
-import ch.epfl.bluebrain.nexus.delta.kernel.http.MediaTypeDetectorConfig
 import ch.epfl.bluebrain.nexus.delta.kernel.utils.FileUtils
-
-import scala.util.Try
+import ch.epfl.bluebrain.nexus.delta.plugins.storage.files.model.MediaType
 
 /**
-  * Allows to detect a content type from incoming files from their extensions when the client has not provided one
+  * Allows to detect a media type from incoming files from their extensions when the client has not provided one
   *
   * @param config
-  *   the config with a mapping from the extension to the content type
+  *   the config with a mapping from the extension to the media type
   */
 final class MediaTypeDetector(config: MediaTypeDetectorConfig) {
 
-  def apply(filename: String, provided: Option[ContentType], fallback: Option[ContentType]): Option[ContentType] = {
+  def apply(filename: String, provided: Option[MediaType], fallback: Option[MediaType]): Option[MediaType] = {
     val extensionOpt = FileUtils.extension(filename)
 
     def detectFromConfig = for {
       extension       <- extensionOpt
       customMediaType <- config.find(extension)
-    } yield contentType(customMediaType)
+    } yield customMediaType
 
-    def detectAkkaFromExtension = extensionOpt.flatMap { e =>
-      Try(MediaTypes.forExtension(e)).map(contentType).toOption
+    def detectHttp4sFromExtension = extensionOpt.flatMap { e =>
+      org.http4s.MediaType.extensionMap.get(e).map(MediaType(_))
     }
 
     provided
       .orElse(detectFromConfig)
-      .orElse(detectAkkaFromExtension)
+      .orElse(detectHttp4sFromExtension)
       .orElse(fallback)
   }
-
-  private def contentType(mediaType: MediaType) = ContentType(mediaType, () => HttpCharsets.`UTF-8`)
-
 }

delta/plugins/storage/src/main/scala/ch/epfl/bluebrain/nexus/delta/plugins/storage/files/FilesConfig.scala

@@ -1,7 +1,7 @@
-package ch.epfl.bluebrain.nexus.delta.kernel.http
+package ch.epfl.bluebrain.nexus.delta.plugins.storage.files
 
-import akka.http.scaladsl.model.MediaType
 import cats.syntax.all.*
+import ch.epfl.bluebrain.nexus.delta.plugins.storage.files.model.MediaType
 import pureconfig.ConfigReader
 import pureconfig.configurable.genericMapReader
 import pureconfig.error.CannotConvert
@@ -25,7 +25,7 @@ object MediaTypeDetectorConfig {
       ConfigReader.fromString(str =>
         MediaType
           .parse(str)
-          .leftMap(_ => CannotConvert(str, classOf[MediaType].getSimpleName, s"'$str' is not a valid content type."))
+          .leftMap(_ => CannotConvert(str, classOf[MediaType].getSimpleName, s"'$str' is not a valid media type."))
       )
     implicit val mapReader: ConfigReader[Map[String, MediaType]] = genericMapReader(Right(_))