From 2cd987351973c5c0e5078284422ee760a5d4ecaf Mon Sep 17 00:00:00 2001 From: DarioGii Date: Fri, 15 Aug 2025 12:32:22 +0100 Subject: [PATCH] resolving conflicts --- .../java/stirling/software/common/configuration/AppConfig.java | 2 +- .../stirling/software/common/model/ApplicationProperties.java | 2 +- .../SPDF/controller/api/converters/ConvertHtmlToPDF.java | 1 - .../SPDF/controller/api/converters/ConvertMarkdownToPdf.java | 1 - 4 files changed, 2 insertions(+), 4 deletions(-) diff --git a/app/common/src/main/java/stirling/software/common/configuration/AppConfig.java b/app/common/src/main/java/stirling/software/common/configuration/AppConfig.java index ee272ba28..b8fa08739 100644 --- a/app/common/src/main/java/stirling/software/common/configuration/AppConfig.java +++ b/app/common/src/main/java/stirling/software/common/configuration/AppConfig.java @@ -49,7 +49,6 @@ public class AppConfig { @Value("${server.port:8080}") private String serverPort; - /* Commented out Thymeleaf template engine bean - to be removed when frontend migration is complete @Value("${v2}") public boolean v2Enabled; @@ -58,6 +57,7 @@ public class AppConfig { return v2Enabled; } + /* Commented out Thymeleaf template engine bean - to be removed when frontend migration is complete @Bean @ConditionalOnProperty(name = "system.customHTMLFiles", havingValue = "true") public SpringTemplateEngine templateEngine(ResourceLoader resourceLoader) { diff --git a/app/common/src/main/java/stirling/software/common/model/ApplicationProperties.java b/app/common/src/main/java/stirling/software/common/model/ApplicationProperties.java index 5845c6d16..60a784618 100644 --- a/app/common/src/main/java/stirling/software/common/model/ApplicationProperties.java +++ b/app/common/src/main/java/stirling/software/common/model/ApplicationProperties.java @@ -372,7 +372,7 @@ public class ApplicationProperties { public String getBaseTmpDir() { return baseTmpDir != null && !baseTmpDir.isEmpty() ? baseTmpDir - : java.lang.System.getProperty("java.io.tmpdir") + "/stirling-pdf"; + : java.lang.System.getProperty("java.io.tmpdir") + "stirling-pdf"; } @JsonIgnore diff --git a/app/core/src/main/java/stirling/software/SPDF/controller/api/converters/ConvertHtmlToPDF.java b/app/core/src/main/java/stirling/software/SPDF/controller/api/converters/ConvertHtmlToPDF.java index 32d1347d6..97cf2e620 100644 --- a/app/core/src/main/java/stirling/software/SPDF/controller/api/converters/ConvertHtmlToPDF.java +++ b/app/core/src/main/java/stirling/software/SPDF/controller/api/converters/ConvertHtmlToPDF.java @@ -37,7 +37,6 @@ public class ConvertHtmlToPDF { private final CustomHtmlSanitizer customHtmlSanitizer; @AutoJobPostMapping(consumes = "multipart/form-data", value = "/html/pdf") - @Operation( summary = "Convert an HTML or ZIP (containing HTML and CSS) to PDF", description = diff --git a/app/core/src/main/java/stirling/software/SPDF/controller/api/converters/ConvertMarkdownToPdf.java b/app/core/src/main/java/stirling/software/SPDF/controller/api/converters/ConvertMarkdownToPdf.java index 2e0f53a0f..3c82c2844 100644 --- a/app/core/src/main/java/stirling/software/SPDF/controller/api/converters/ConvertMarkdownToPdf.java +++ b/app/core/src/main/java/stirling/software/SPDF/controller/api/converters/ConvertMarkdownToPdf.java @@ -46,7 +46,6 @@ public class ConvertMarkdownToPdf { private final CustomHtmlSanitizer customHtmlSanitizer; @AutoJobPostMapping(consumes = "multipart/form-data", value = "/markdown/pdf") - @Operation( summary = "Convert a Markdown file to PDF", description =