Implement custom media type detection #4312
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
imsdu
commented
Sep 28, 2023
Comment on lines
46
to
59
| private val defaultContentType: ContentType.Binary = ContentTypes.`application/octet-stream` | ||
|
|
||
| // Creating an unmarshaller defaulting to `application/octet-stream` as a content type | ||
| implicit private val um: FromEntityUnmarshaller[Multipart.FormData] = | ||
| MultipartUnmarshallers | ||
| .multipartUnmarshaller[Multipart.FormData, Multipart.FormData.BodyPart, Multipart.FormData.BodyPart.Strict]( | ||
| mediaRange = `multipart/form-data`, | ||
| defaultContentType = defaultContentType, | ||
| createBodyPart = (entity, headers) => Multipart.General.BodyPart(entity, headers).toFormDataBodyPart.get, | ||
| createStreamed = (_, parts) => Multipart.FormData(parts), | ||
| createStrictBodyPart = | ||
| (entity, headers) => Multipart.General.BodyPart.Strict(entity, headers).toFormDataBodyPart.get, | ||
| createStrict = (_, parts) => Multipart.FormData.Strict(parts) | ||
| ) |
There was a problem hiding this comment.
Default from akka is text/plain, aligning it to application/octet-stream as in the storage part
A bit verbose but it depends on akka there
imsdu
commented
Sep 28, 2023
| @@ -0,0 +1,34 @@ | |||
| app { | |||
There was a problem hiding this comment.
Changed the way to run the storage in the tests so that it aligns with Delta
More readable than using system properties too
imsdu
commented
Sep 28, 2023
| * @param isDir | ||
| * flag to decide whether or not the path is a directory | ||
| */ | ||
| def apply(path: Path, isDir: Boolean = false): ContentType = |
There was a problem hiding this comment.
I guess it could be wrapped in a F[_]/ an IO but it feels like enough yak shaving and enough complexity for a single PR
imsdu
commented
Sep 28, 2023
| customMediaType <- mediaTypeDetector.find(extension) | ||
| } yield ContentType(customMediaType, () => HttpCharsets.`UTF-8`) | ||
|
|
||
| bodyDefinedContentType.orElse(detectFromConfig).getOrElse(contentTypeFromAkka) |
There was a problem hiding this comment.
Anything set by the user prevails over automatic detection
imsdu
commented
Sep 28, 2023
| /** | ||
| * Extracts the extension from the given filename | ||
| */ | ||
| def extension(filename: String): Option[String] = { |
There was a problem hiding this comment.
Allows to get rid of this apache commons io dependency
imsdu
commented
Sep 28, 2023
imsdu
commented
Sep 28, 2023
imsdu
commented
Sep 28, 2023
build.sbt
Outdated
| scalaTest % Test | ||
| ), | ||
| cleanFiles ++= Seq( | ||
| baseDirectory.value / "permissions-fixer" / "target" / "**", | ||
| baseDirectory.value / "nexus-storage.jar" | ||
| ), | ||
| Test / testOptions += Tests.Argument(TestFrameworks.ScalaTest, "-o", "-u", "target/test-reports"), | ||
| Test / parallelExecution := false, | ||
| Universal / mappings := { |
dantb
reviewed
Sep 28, 2023
Comment on lines
92
to
99
| case part if part.name == fieldName => | ||
| val filename = part.filename.getOrElse("file") | ||
| val contentType = detectContentType(filename, part.entity.contentType) | ||
| FileDescription(filename, contentType).runToFuture.map { desc => | ||
| Some(desc -> part.entity) | ||
| } | ||
| case part => | ||
| part.entity.discardBytes().future.as(None) |
There was a problem hiding this comment.
Nit - this chunk could be its own function
Comment on lines
75
to
86
| case RejectionError(r) => | ||
| WrappedAkkaRejection(r) | ||
| case Unmarshaller.NoContentException => | ||
| WrappedAkkaRejection(RequestEntityExpectedRejection) | ||
| case x: UnsupportedContentTypeException => | ||
| WrappedAkkaRejection(UnsupportedRequestContentTypeRejection(x.supported, x.actualContentType)) | ||
| case x: IllegalArgumentException => | ||
| WrappedAkkaRejection(ValidationRejection(Option(x.getMessage).getOrElse(""), Some(x))) | ||
| case x: ExceptionWithErrorInfo => | ||
| WrappedAkkaRejection(MalformedRequestContentRejection(x.info.format(withDetail = false), x)) | ||
| case x => | ||
| WrappedAkkaRejection(MalformedRequestContentRejection(Option(x.getMessage).getOrElse(""), x)) |
There was a problem hiding this comment.
Same comment - could have an error handling function
...e/src/main/scala/ch/epfl/bluebrain/nexus/delta/plugins/storage/files/FormDataExtractor.scala
Show resolved
Hide resolved
| response.status shouldEqual StatusCodes.Created | ||
| } | ||
| storageId2 = s"${storageId}2" | ||
| _ <- deltaClient.get[Json](s"/storages/$fullId/nxv:$storageId2", Coyote) { (json, response) => | ||
| val expected = storageResponse(fullId, storageId2, s"$storageName/read", s"$storageName/write") | ||
| _ <- deltaClient.get[Json](s"/storages/$projectRef/nxv:$storageId2", Coyote) { (json, response) => |
imsdu
changed the title
olivergrabinski
previously approved these changes
Oct 3, 2023
Comment on lines
21
to
33
| test("Detect overridden content type") { | ||
| val customMediaType = MediaTypes.`application/vnd.api+json` | ||
| val detector = new ContentTypeDetector(MediaTypeDetectorConfig("json" -> MediaTypes.`application/vnd.api+json`)) | ||
| val expected = ContentType(customMediaType, () => `UTF-8`) | ||
| assertEquals(detector(jsonPath, isDir = false), expected) | ||
| } | ||
|
|
||
| test("Detect overridden content type") { | ||
| val customMediaType = MediaTypes.`application/vnd.api+json` | ||
| val detector = new ContentTypeDetector(MediaTypeDetectorConfig("json" -> MediaTypes.`application/vnd.api+json`)) | ||
| val expected = ContentType(customMediaType, () => `UTF-8`) | ||
| assertEquals(detector(jsonPath, isDir = false), expected) | ||
| } |
olivergrabinski
approved these changes
Oct 3, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #4266