Fix issue dbmdz/iiif-server-hymir#25

dbmdz · Nov 9, 2018 · 0245eb1 · 0245eb1
1 parent 2785037
commit 0245eb1
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/.../main/java/de/digitalcollections/commons/file/backend/impl/resolver/FileNameResolver.java b/.../main/java/de/digitalcollections/commons/file/backend/impl/resolver/FileNameResolver.java
@@ -25,7 +25,7 @@ public interface FileNameResolver {
    */
   default List<String> getStrings(String identifier, MimeType mimeType) throws ResourceIOException {
     return getStrings(identifier).stream()
-            .filter(s -> MimeType.fromFilename(s).matches(mimeType))
+            .filter(s -> mimeType.matches(MimeType.fromFilename(s)))
             .collect(Collectors.toList());
   }
 
@@ -50,8 +50,9 @@ default List<URI> getUris(String identifier) throws ResourceIOException {
    * @throws ResourceIOException in case getStrings for key fails
    */
   default List<URI> getUris(String identifier, MimeType mimeType) throws ResourceIOException {
-    return getUris(identifier).stream()
-            .filter(u -> MimeType.fromURI(u).matches(mimeType))
+    final List<URI> uris = getUris(identifier);
+    return uris.stream()
+            .filter(u -> (mimeType.matches(MimeType.fromURI(u)) || MimeType.fromURI(u) == null))
             .collect(Collectors.toList());
   }
 
@@ -78,7 +79,7 @@ default List<Path> getPaths(String identifier) throws ResourceIOException {
    */
   default List<Path> getPaths(String identifier, MimeType mimeType) throws ResourceIOException {
     return getPaths(identifier).stream()
-            .filter(p -> MimeType.fromFilename(p.toString()).matches(mimeType))
+            .filter(p -> mimeType.matches(MimeType.fromFilename(p.toString())))
             .collect(Collectors.toList());
   }