From 5bdca3a76509591a55a97e1db6a0f1f8062cb055 Mon Sep 17 00:00:00 2001 From: Brian Anderson Date: Thu, 12 Jun 2025 09:20:30 -0600 Subject: [PATCH 1/2] Update logback.xml to have a valid schema as newer versions of spring-boot are more strict in their parsing and the /transform process doesn't seem to address this during the upgrade --- src/main/resources/logback.xml | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/main/resources/logback.xml b/src/main/resources/logback.xml index 18b78e5..5e4b220 100644 --- a/src/main/resources/logback.xml +++ b/src/main/resources/logback.xml @@ -1,15 +1,17 @@ + + + %d{HH:mm:ss.SSS} | %thread | %-5level | %logger{1} | %msg%n + + + - - - %d{HH:mm:ss.SSS} | %thread | %-5level | %logger{1} | %msg%n - - + \ No newline at end of file From 31eacbefe74af729847b8f4a0d55453478c93a01 Mon Sep 17 00:00:00 2001 From: Brian Anderson Date: Thu, 12 Jun 2025 10:15:07 -0600 Subject: [PATCH 2/2] Updated the DownloadController to include a named PathVariable due to stricter requirements around reflection in more recent versions of Java --- src/main/java/com/nurkiewicz/download/DownloadController.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/nurkiewicz/download/DownloadController.java b/src/main/java/com/nurkiewicz/download/DownloadController.java index e717026..7279b90 100644 --- a/src/main/java/com/nurkiewicz/download/DownloadController.java +++ b/src/main/java/com/nurkiewicz/download/DownloadController.java @@ -33,7 +33,7 @@ public DownloadController(FileStorage storage) { @RequestMapping(method = {GET, HEAD}, value = "/{uuid}") public ResponseEntity redirect( HttpMethod method, - @PathVariable UUID uuid, + @PathVariable("uuid") UUID uuid, @RequestHeader(IF_NONE_MATCH) Optional requestEtagOpt, @RequestHeader(IF_MODIFIED_SINCE) Optional ifModifiedSinceOpt ) { @@ -45,7 +45,7 @@ public ResponseEntity redirect( @RequestMapping(method = {GET, HEAD}, value = "/{uuid}/{filename}") public ResponseEntity download( HttpMethod method, - @PathVariable UUID uuid, + @PathVariable("uuid") UUID uuid, @RequestHeader(IF_NONE_MATCH) Optional requestEtagOpt, @RequestHeader(IF_MODIFIED_SINCE) Optional ifModifiedSinceOpt ) {