Merge branch 'develop' of [email protected]:goobi-workflow/goobi-workflow-core.git into develop

Author: rsehr

src/main/java/org/goobi/api/rest/process/thumbnail/GoobiThumbnailResource.java

@@ -24,6 +24,7 @@
  */
 package org.goobi.api.rest.process.thumbnail;
 
+import java.io.UnsupportedEncodingException;
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.net.URLEncoder;
@@ -42,6 +43,7 @@
 import jakarta.ws.rs.PathParam;
 import jakarta.ws.rs.container.ContainerRequestContext;
 import jakarta.ws.rs.core.Context;
+import jakarta.ws.rs.core.UriBuilder;
 import lombok.extern.log4j.Log4j2;
 
 @jakarta.ws.rs.Path("process/thumbs/{processId}/{foldername}/{filename}")
@@ -91,4 +93,20 @@ public void createResourceURI(HttpServletRequest request, String processId, Stri
     public String getGoobiURIPrefix() {
         return GoobiThumbnailResource.class.getAnnotation(jakarta.ws.rs.Path.class).value();
     }
+
+    /**
+     * This needs to override the createResourceURI method of the ImageResource class which otherwise throws an error due to different number of path
+     * variables The actual value of the URI is created in {@link #createResourceURI(HttpServletRequest, String, String, String)
+     */
+    @Override
+    protected URI createResourceURI(URI baseURI, String directory, String filename) throws IllegalRequestException {
+        try {
+            return UriBuilder.fromUri(baseURI)
+                    .path(getURIPrefix())
+                    .build("", URLEncoder.encode(directory, "utf-8"), URLEncoder.encode(filename, "utf-8"));
+        } catch (UnsupportedEncodingException e) {
+            log.error("Failed to create image request uri");
+            throw new IllegalRequestException("Unable to evaluate request to '" + directory + "', '" + filename + "'");
+        }
+    }
 }