Fix empty files aborting download (#47)

* Make sure to catch RuntimeExceptions as well

* Do not fail for empty files

* Optimize imports

---------

Co-authored-by: KochTobi <[email protected]>

Author: KochTobi

rest-api/src/main/java/life/qbic/data_download/rest/exceptions/GlobalExceptionHandler.java

@@ -2,24 +2,15 @@
 
 import static org.slf4j.LoggerFactory.getLogger;
 
-import jakarta.servlet.ServletException;
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpServletResponse;
-import java.io.IOException;
 import life.qbic.data_download.rest.exceptions.ErrorMessageTranslationService.UserFriendlyErrorMessage;
 import org.slf4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.HttpStatusCode;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
-import org.springframework.security.access.AccessDeniedException;
-import org.springframework.security.core.Authentication;
-import org.springframework.security.core.context.SecurityContextHolder;
-import org.springframework.security.web.access.AccessDeniedHandler;
 import org.springframework.web.bind.annotation.ControllerAdvice;
 import org.springframework.web.bind.annotation.ExceptionHandler;
-import org.springframework.web.bind.annotation.ResponseStatus;
 
 /**
  * The global exception handler. This exception handler takes effect after authentication and
@@ -59,6 +50,16 @@ public ResponseEntity<String> unknownException(Exception e) {
     log.error(e.getMessage(), e);
     return ResponseEntity
         .status(HttpStatus.INTERNAL_SERVER_ERROR)
+        .contentType(MediaType.TEXT_PLAIN)
+        .body("Something went wrong. Please try again later.");
+  }
+
+  @ExceptionHandler(value = RuntimeException.class)
+  public ResponseEntity<String> unknownException(RuntimeException e) {
+    log.error(e.getMessage(), e);
+    return ResponseEntity
+        .status(HttpStatus.INTERNAL_SERVER_ERROR)
+        .contentType(MediaType.TEXT_PLAIN)
         .body("Something went wrong. Please try again later.");
   }
 

zip/src/main/java/life/qbic/data_download/util/zip/api/FileInfo.java

@@ -13,7 +13,7 @@ public record FileInfo(String filePath, long fileSize, long expectedCrc, FileTim
     if (isNull(fileTimes)) {
       fileTimes = FileTimes.unknown();
     }
-    if (fileSize <= 0) {
+    if (fileSize < 0) {
       throw new IllegalArgumentException("File size must be greater than 0");
     }
   }