From db4469b86c4b7eb0b5a31a3319ab7644fe1a02e1 Mon Sep 17 00:00:00 2001 From: Pedro Fonseca Date: Sat, 12 Apr 2025 01:09:18 +0100 Subject: [PATCH] Update UploadLimit bean to reflect changes in ApplicationProperties --- .../stirling/software/SPDF/config/AppConfig.java | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/src/main/java/stirling/software/SPDF/config/AppConfig.java b/src/main/java/stirling/software/SPDF/config/AppConfig.java index 3594c2586..146f97626 100644 --- a/src/main/java/stirling/software/SPDF/config/AppConfig.java +++ b/src/main/java/stirling/software/SPDF/config/AppConfig.java @@ -111,18 +111,12 @@ public class AppConfig { @Bean(name = "uploadLimit") public long uploadLimit() { - boolean uploadLimit = - applicationProperties.getSystem().getUploadLimit().getEnableUploadSizeLimit() - != null - ? applicationProperties - .getSystem() - .getUploadLimit() - .getEnableUploadSizeLimit() - : false; + String maxUploadSize = + applicationProperties.getSystem().getFileUploadLimit() != null + ? applicationProperties.getSystem().getFileUploadLimit() + : ""; - String maxUploadSize = applicationProperties.getSystem().getUploadLimit().getLimit(); - - if (!uploadLimit || maxUploadSize == null || maxUploadSize.isEmpty()) { + if (maxUploadSize.isEmpty()) { return 0; } else if (!new Regex("^[1-9][0-9]{0,2}[KMGkmg][Bb]$").matches(maxUploadSize)) { log.error(