Adjust content negotiation for binaries (#998)

Resolves #997
trellis-ldp · Aug 3, 2020 · f5028dc · f5028dc
1 parent e6057f3
commit f5028dc
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 4 deletions.
diff --git a/core/http/src/main/java/org/trellisldp/http/impl/HttpUtils.java b/core/http/src/main/java/org/trellisldp/http/impl/HttpUtils.java
@@ -192,11 +192,15 @@ public static RDFSyntax getSyntax(final IOService ioService, final List<MediaTyp
         if (acceptableTypes.isEmpty()) {
             return mimeType != null ? null : TURTLE;
         }
-        final MediaType mt = mimeType != null ? MediaType.valueOf(mimeType) : null;
-        for (final MediaType type : acceptableTypes) {
-            if (type.isCompatible(mt)) {
-                return null;
+        if (mimeType != null) {
+            final MediaType mt = MediaType.valueOf(mimeType);
+            for (final MediaType type : acceptableTypes) {
+                if (type.isCompatible(mt)) {
+                    return null;
+                }
             }
+        }
+        for (final MediaType type : acceptableTypes) {
             final RDFSyntax syntax = ioService.supportedReadSyntaxes().stream()
                 .filter(s -> MediaType.valueOf(s.mediaType()).isCompatible(type))
                 .findFirst().orElse(null);

diff --git a/core/http/src/test/java/org/trellisldp/http/impl/HttpUtilsTest.java b/core/http/src/test/java/org/trellisldp/http/impl/HttpUtilsTest.java
@@ -98,6 +98,12 @@ void testGetSyntaxEmpty() {
         assertEquals(TURTLE, HttpUtils.getSyntax(ioService, emptyList(), null), "Turtle not default syntax!");
     }
 
+    @Test
+    void testGetBinarySynax() {
+        assertNull(HttpUtils.getSyntax(ioService, asList(MediaType.TEXT_HTML_TYPE, MediaType.WILDCARD_TYPE),
+                    "image/png"), "Incorrect binary syntax");
+    }
+
     @Test
     void testGetSyntaxFallback() {
         final List<MediaType> types = asList(APPLICATION_JSON_TYPE, TEXT_XML_TYPE,