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 83548bb59..23c216123 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 @@ -452,19 +452,17 @@ public class ApplicationProperties { private List languages; public String getAppName() { - return appName != null && appName.trim().length() > 0 ? appName : null; + return appName != null && !appName.trim().isEmpty() ? appName : null; } public String getHomeDescription() { - return homeDescription != null && homeDescription.trim().length() > 0 + return homeDescription != null && !homeDescription.trim().isEmpty() ? homeDescription : null; } public String getAppNameNavbar() { - return appNameNavbar != null && appNameNavbar.trim().length() > 0 - ? appNameNavbar - : null; + return appNameNavbar != null && !appNameNavbar.trim().isEmpty() ? appNameNavbar : null; } } diff --git a/app/common/src/main/java/stirling/software/common/util/CustomHtmlSanitizer.java b/app/common/src/main/java/stirling/software/common/util/CustomHtmlSanitizer.java index 60bf9ab83..c5fb07645 100644 --- a/app/common/src/main/java/stirling/software/common/util/CustomHtmlSanitizer.java +++ b/app/common/src/main/java/stirling/software/common/util/CustomHtmlSanitizer.java @@ -26,7 +26,7 @@ public class CustomHtmlSanitizer { new AttributePolicy() { @Override public String apply(String elementName, String attributeName, String value) { - if (value == null || value.trim().isEmpty()) { + if (value.trim().isEmpty()) { return null; } diff --git a/app/common/src/main/java/stirling/software/common/util/PDFToFile.java b/app/common/src/main/java/stirling/software/common/util/PDFToFile.java index c5ec8361f..6b3d61b11 100644 --- a/app/common/src/main/java/stirling/software/common/util/PDFToFile.java +++ b/app/common/src/main/java/stirling/software/common/util/PDFToFile.java @@ -74,7 +74,7 @@ public class PDFToFile { Path tempInputFile = null; Path tempOutputDir = null; byte[] fileBytes; - String fileName = "temp.file"; + String fileName; try { tempInputFile = Files.createTempFile("input_", ".pdf"); @@ -167,7 +167,7 @@ public class PDFToFile { Path tempInputFile = null; Path tempOutputDir = null; byte[] fileBytes; - String fileName = "temp.file"; + String fileName; try { // Save the uploaded file to a temporary location @@ -230,7 +230,7 @@ public class PDFToFile { // Get the original PDF file name without the extension String originalPdfFileName = Filenames.toSimpleFileName(inputFile.getOriginalFilename()); - if (originalPdfFileName == null || "".equals(originalPdfFileName.trim())) { + if (originalPdfFileName == null || originalPdfFileName.trim().isEmpty()) { originalPdfFileName = "output.pdf"; } // Assume file is pdf if no extension @@ -248,7 +248,7 @@ public class PDFToFile { Path tempInputFile = null; Path tempOutputDir = null; byte[] fileBytes; - String fileName = "temp.file"; + String fileName; try { // Save the uploaded file to a temporary location diff --git a/app/common/src/main/java/stirling/software/common/util/PdfUtils.java b/app/common/src/main/java/stirling/software/common/util/PdfUtils.java index e4e608bb6..82759007e 100644 --- a/app/common/src/main/java/stirling/software/common/util/PdfUtils.java +++ b/app/common/src/main/java/stirling/software/common/util/PdfUtils.java @@ -131,7 +131,7 @@ public class PdfUtils { } public boolean hasImagesOnPage(PDPage page) throws IOException { - return getAllImages(page.getResources()).size() > 0; + return !getAllImages(page.getResources()).isEmpty(); } public boolean hasTextOnPage(PDPage page, String phrase) throws IOException { diff --git a/app/core/src/main/java/stirling/software/SPDF/config/AppUpdateService.java b/app/core/src/main/java/stirling/software/SPDF/config/AppUpdateService.java index c4c528f77..544867443 100644 --- a/app/core/src/main/java/stirling/software/SPDF/config/AppUpdateService.java +++ b/app/core/src/main/java/stirling/software/SPDF/config/AppUpdateService.java @@ -26,7 +26,7 @@ class AppUpdateService { @Scope("request") public boolean shouldShow() { boolean showUpdate = applicationProperties.getSystem().isShowUpdate(); - boolean showAdminResult = (showAdmin != null) ? showAdmin.getShowUpdateOnlyAdmins() : true; + boolean showAdminResult = showAdmin == null || showAdmin.getShowUpdateOnlyAdmins(); return showUpdate && showAdminResult; } } diff --git a/app/core/src/main/java/stirling/software/SPDF/config/CleanUrlInterceptor.java b/app/core/src/main/java/stirling/software/SPDF/config/CleanUrlInterceptor.java index 9038e3a15..785743731 100644 --- a/app/core/src/main/java/stirling/software/SPDF/config/CleanUrlInterceptor.java +++ b/app/core/src/main/java/stirling/software/SPDF/config/CleanUrlInterceptor.java @@ -66,7 +66,7 @@ public class CleanUrlInterceptor implements HandlerInterceptor { // Construct new query string StringBuilder newQueryString = new StringBuilder(); for (Map.Entry entry : allowedParameters.entrySet()) { - if (newQueryString.length() > 0) { + if (!newQueryString.isEmpty()) { newQueryString.append("&"); } newQueryString.append(entry.getKey()).append("=").append(entry.getValue()); diff --git a/app/core/src/main/java/stirling/software/SPDF/config/ExternalAppDepConfig.java b/app/core/src/main/java/stirling/software/SPDF/config/ExternalAppDepConfig.java index 5346b93ac..49129c548 100644 --- a/app/core/src/main/java/stirling/software/SPDF/config/ExternalAppDepConfig.java +++ b/app/core/src/main/java/stirling/software/SPDF/config/ExternalAppDepConfig.java @@ -101,7 +101,7 @@ public class ExternalAppDepConfig { "Missing dependency: {} - Disabling group: {} (Affected features: {})", command, group, - affectedFeatures != null && !affectedFeatures.isEmpty() + !affectedFeatures.isEmpty() ? String.join(", ", affectedFeatures) : "unknown"); } diff --git a/app/core/src/main/java/stirling/software/SPDF/controller/api/RearrangePagesPDFController.java b/app/core/src/main/java/stirling/software/SPDF/controller/api/RearrangePagesPDFController.java index 035489a36..b1112240e 100644 --- a/app/core/src/main/java/stirling/software/SPDF/controller/api/RearrangePagesPDFController.java +++ b/app/core/src/main/java/stirling/software/SPDF/controller/api/RearrangePagesPDFController.java @@ -257,7 +257,7 @@ public class RearrangePagesPDFController { int totalPages = document.getNumberOfPages(); List newPageOrder; if (sortType != null - && sortType.length() > 0 + && !sortType.isEmpty() && !"custom".equals(sortType.toLowerCase())) { newPageOrder = processSortTypes(sortType, totalPages, pageOrder); } else { diff --git a/app/core/src/main/java/stirling/software/SPDF/controller/api/SplitPdfBySizeController.java b/app/core/src/main/java/stirling/software/SPDF/controller/api/SplitPdfBySizeController.java index 4cc05afab..8be6c3188 100644 --- a/app/core/src/main/java/stirling/software/SPDF/controller/api/SplitPdfBySizeController.java +++ b/app/core/src/main/java/stirling/software/SPDF/controller/api/SplitPdfBySizeController.java @@ -253,7 +253,7 @@ public class SplitPdfBySizeController { log.debug("Starting handleSplitByPageCount with pageCount={}", pageCount); int currentPageCount = 0; log.debug("Creating initial output document"); - PDDocument currentDoc = null; + PDDocument currentDoc; try { currentDoc = pdfDocumentFactory.createNewDocumentBasedOnOldDocument(sourceDocument); log.debug("Successfully created initial output document"); @@ -367,7 +367,7 @@ public class SplitPdfBySizeController { for (int i = 0; i < documentCount; i++) { log.debug("Creating document {} of {}", i + 1, documentCount); - PDDocument currentDoc = null; + PDDocument currentDoc; try { currentDoc = pdfDocumentFactory.createNewDocumentBasedOnOldDocument(sourceDocument); log.debug("Successfully created document {} of {}", i + 1, documentCount); diff --git a/app/core/src/main/java/stirling/software/SPDF/controller/api/converters/ConvertPDFToPDFA.java b/app/core/src/main/java/stirling/software/SPDF/controller/api/converters/ConvertPDFToPDFA.java index f0e83f6c0..16e1a65e7 100644 --- a/app/core/src/main/java/stirling/software/SPDF/controller/api/converters/ConvertPDFToPDFA.java +++ b/app/core/src/main/java/stirling/software/SPDF/controller/api/converters/ConvertPDFToPDFA.java @@ -125,7 +125,7 @@ public class ConvertPDFToPDFA { preProcessedFile = preProcessHighlights(tempInputFile.toFile()); } Set missingFonts = new HashSet<>(); - boolean needImgs = false; + boolean needImgs; try (PDDocument doc = Loader.loadPDF(preProcessedFile)) { missingFonts = findUnembeddedFontNames(doc); needImgs = (pdfaPart == 1) && hasTransparentImages(doc); @@ -287,7 +287,7 @@ public class ConvertPDFToPDFA { if (fontStream == null) continue; try (InputStream in = fontStream.createInputStream()) { - PDFont newFont = null; + PDFont newFont; try { newFont = PDType0Font.load(baseDoc, in, false); } catch (IOException e1) { diff --git a/app/core/src/main/java/stirling/software/SPDF/controller/api/filters/FilterController.java b/app/core/src/main/java/stirling/software/SPDF/controller/api/filters/FilterController.java index 7455ad1de..d3d83a930 100644 --- a/app/core/src/main/java/stirling/software/SPDF/controller/api/filters/FilterController.java +++ b/app/core/src/main/java/stirling/software/SPDF/controller/api/filters/FilterController.java @@ -87,7 +87,7 @@ public class FilterController { PDDocument document = pdfDocumentFactory.load(inputFile); int actualPageCount = document.getNumberOfPages(); - boolean valid = false; + boolean valid; // Perform the comparison switch (comparator) { case "Greater": @@ -130,7 +130,7 @@ public class FilterController { PDRectangle standardSize = PdfUtils.textToPageSize(standardPageSize); float standardArea = standardSize.getWidth() * standardSize.getHeight(); - boolean valid = false; + boolean valid; // Perform the comparison switch (comparator) { case "Greater": @@ -163,7 +163,7 @@ public class FilterController { // Get the file size long actualFileSize = inputFile.getSize(); - boolean valid = false; + boolean valid; // Perform the comparison switch (comparator) { case "Greater": @@ -199,7 +199,7 @@ public class FilterController { // Get the rotation of the first page PDPage firstPage = document.getPage(0); int actualRotation = firstPage.getRotation(); - boolean valid = false; + boolean valid; // Perform the comparison switch (comparator) { case "Greater": diff --git a/app/core/src/main/java/stirling/software/SPDF/controller/api/misc/AutoRenameController.java b/app/core/src/main/java/stirling/software/SPDF/controller/api/misc/AutoRenameController.java index 3b3dc30fa..3ca96f87b 100644 --- a/app/core/src/main/java/stirling/software/SPDF/controller/api/misc/AutoRenameController.java +++ b/app/core/src/main/java/stirling/software/SPDF/controller/api/misc/AutoRenameController.java @@ -77,7 +77,7 @@ public class AutoRenameController { } private void processLine() { - if (lineBuilder.length() > 0 && lineCount < LINE_LIMIT) { + if (!lineBuilder.isEmpty() && lineCount < LINE_LIMIT) { lineInfos.add(new LineInfo(lineBuilder.toString(), maxFontSizeInLine)); } } diff --git a/app/core/src/main/java/stirling/software/SPDF/controller/api/misc/CompressController.java b/app/core/src/main/java/stirling/software/SPDF/controller/api/misc/CompressController.java index d29ba4371..bd3dd5475 100644 --- a/app/core/src/main/java/stirling/software/SPDF/controller/api/misc/CompressController.java +++ b/app/core/src/main/java/stirling/software/SPDF/controller/api/misc/CompressController.java @@ -774,11 +774,8 @@ public class CompressController { // Check if we can't increase the level further if (newOptimizeLevel == optimizeLevel) { - if (autoMode) { - log.info( - "Maximum optimization level reached without meeting target size."); - sizeMet = true; - } + log.info("Maximum optimization level reached without meeting target size."); + sizeMet = true; } else { // Reset flags for next iteration with higher optimization level imageCompressionApplied = false; @@ -879,7 +876,7 @@ public class CompressController { command.add("-sOutputFile=" + gsOutputFile.toString()); command.add(currentFile.toString()); - ProcessExecutorResult returnCode = null; + ProcessExecutorResult returnCode; try { returnCode = ProcessExecutor.getInstance(ProcessExecutor.Processes.GHOSTSCRIPT) diff --git a/app/core/src/main/java/stirling/software/SPDF/controller/api/misc/ExtractImageScansController.java b/app/core/src/main/java/stirling/software/SPDF/controller/api/misc/ExtractImageScansController.java index c80afee6a..d972fc65d 100644 --- a/app/core/src/main/java/stirling/software/SPDF/controller/api/misc/ExtractImageScansController.java +++ b/app/core/src/main/java/stirling/software/SPDF/controller/api/misc/ExtractImageScansController.java @@ -72,7 +72,7 @@ public class ExtractImageScansController { List images = new ArrayList<>(); List tempImageFiles = new ArrayList<>(); - Path tempInputFile = null; + Path tempInputFile; Path tempZipFile = null; List tempDirs = new ArrayList<>(); @@ -201,7 +201,7 @@ public class ExtractImageScansController { return WebResponseUtils.bytesToWebResponse( zipBytes, outputZipFilename, MediaType.APPLICATION_OCTET_STREAM); } - if (processedImageBytes.size() == 0) { + if (processedImageBytes.isEmpty()) { throw new IllegalArgumentException("No images detected"); } else { diff --git a/app/core/src/main/java/stirling/software/SPDF/controller/api/misc/OCRController.java b/app/core/src/main/java/stirling/software/SPDF/controller/api/misc/OCRController.java index ddcea60a0..0338a76c4 100644 --- a/app/core/src/main/java/stirling/software/SPDF/controller/api/misc/OCRController.java +++ b/app/core/src/main/java/stirling/software/SPDF/controller/api/misc/OCRController.java @@ -125,7 +125,7 @@ public class OCRController { try { // Use OCRmyPDF if available (no fallback - error if it fails) if (isOcrMyPdfEnabled()) { - if (sidecar != null && sidecar) { + if (sidecar) { sidecarTextFile = new TempFile(tempFileManager, ".txt"); } @@ -164,7 +164,7 @@ public class OCRController { Filenames.toSimpleFileName(inputFile.getOriginalFilename())) + "_OCR.pdf"; - if (sidecar != null && sidecar && sidecarTextFile != null) { + if (sidecar && sidecarTextFile != null) { // Create a zip file containing both the PDF and the text file String outputZipFilename = GeneralUtils.removeExtension( @@ -257,7 +257,7 @@ public class OCRController { if (cleanFinal != null && cleanFinal) { command.add("--clean-final"); } - if (ocrType != null && !"".equals(ocrType)) { + if (ocrType != null && !ocrType.isEmpty()) { if ("skip-text".equals(ocrType)) { command.add("--skip-text"); } else if ("force-ocr".equals(ocrType)) { @@ -338,7 +338,7 @@ public class OCRController { for (int pageNum = 0; pageNum < pageCount; pageNum++) { PDPage page = document.getPage(pageNum); - boolean hasText = false; + boolean hasText; // Check for existing text try (PDDocument tempDoc = new PDDocument()) { diff --git a/app/core/src/main/java/stirling/software/SPDF/controller/api/misc/StampController.java b/app/core/src/main/java/stirling/software/SPDF/controller/api/misc/StampController.java index c4db90bbb..24b9e84e1 100644 --- a/app/core/src/main/java/stirling/software/SPDF/controller/api/misc/StampController.java +++ b/app/core/src/main/java/stirling/software/SPDF/controller/api/misc/StampController.java @@ -193,7 +193,7 @@ public class StampController { float margin, String colorString) // Y override throws IOException { - String resourceDir = ""; + String resourceDir; PDFont font = new PDType1Font(Standard14Fonts.FontName.HELVETICA); resourceDir = switch (alphabet) { @@ -206,18 +206,16 @@ public class StampController { default -> "static/fonts/NotoSans-Regular.ttf"; }; - if (!"".equals(resourceDir)) { - ClassPathResource classPathResource = new ClassPathResource(resourceDir); - String fileExtension = resourceDir.substring(resourceDir.lastIndexOf(".")); + ClassPathResource classPathResource = new ClassPathResource(resourceDir); + String fileExtension = resourceDir.substring(resourceDir.lastIndexOf(".")); - // Use TempFile with try-with-resources for automatic cleanup - try (TempFile tempFileWrapper = new TempFile(tempFileManager, fileExtension)) { - File tempFile = tempFileWrapper.getFile(); - try (InputStream is = classPathResource.getInputStream(); - FileOutputStream os = new FileOutputStream(tempFile)) { - IOUtils.copy(is, os); - font = PDType0Font.load(document, tempFile); - } + // Use TempFile with try-with-resources for automatic cleanup + try (TempFile tempFileWrapper = new TempFile(tempFileManager, fileExtension)) { + File tempFile = tempFileWrapper.getFile(); + try (InputStream is = classPathResource.getInputStream(); + FileOutputStream os = new FileOutputStream(tempFile)) { + IOUtils.copy(is, os); + font = PDType0Font.load(document, tempFile); } } diff --git a/app/core/src/main/java/stirling/software/SPDF/controller/api/pipeline/PipelineController.java b/app/core/src/main/java/stirling/software/SPDF/controller/api/pipeline/PipelineController.java index df956ffc0..c04840c59 100644 --- a/app/core/src/main/java/stirling/software/SPDF/controller/api/pipeline/PipelineController.java +++ b/app/core/src/main/java/stirling/software/SPDF/controller/api/pipeline/PipelineController.java @@ -69,7 +69,7 @@ public class PipelineController { try { List inputFiles = processor.generateInputFiles(files); - if (inputFiles == null || inputFiles.size() == 0) { + if (inputFiles == null || inputFiles.isEmpty()) { return null; } PipelineResult result = processor.runPipelineAgainstFiles(inputFiles, config); diff --git a/app/core/src/main/java/stirling/software/SPDF/controller/api/pipeline/PipelineDirectoryProcessor.java b/app/core/src/main/java/stirling/software/SPDF/controller/api/pipeline/PipelineDirectoryProcessor.java index a3548ed49..63c08f619 100644 --- a/app/core/src/main/java/stirling/software/SPDF/controller/api/pipeline/PipelineDirectoryProcessor.java +++ b/app/core/src/main/java/stirling/software/SPDF/controller/api/pipeline/PipelineDirectoryProcessor.java @@ -115,7 +115,7 @@ public class PipelineDirectoryProcessor { log.info("Handling directory: {}", dir); Path processingDir = createProcessingDirectory(dir); Optional jsonFileOptional = findJsonFile(dir); - if (!jsonFileOptional.isPresent()) { + if (jsonFileOptional.isEmpty()) { log.warn("No .JSON settings file found. No processing will happen for dir {}.", dir); return; } @@ -150,7 +150,7 @@ public class PipelineDirectoryProcessor { for (PipelineOperation operation : config.getOperations()) { validateOperation(operation); File[] files = collectFilesForProcessing(dir, jsonFile, operation); - if (files == null || files.length == 0) { + if (files.length == 0) { log.debug("No files detected for {} ", dir); return; } diff --git a/app/core/src/main/java/stirling/software/SPDF/controller/api/security/GetInfoOnPDF.java b/app/core/src/main/java/stirling/software/SPDF/controller/api/security/GetInfoOnPDF.java index 0aa5ca819..e92cf1dd6 100644 --- a/app/core/src/main/java/stirling/software/SPDF/controller/api/security/GetInfoOnPDF.java +++ b/app/core/src/main/java/stirling/software/SPDF/controller/api/security/GetInfoOnPDF.java @@ -122,7 +122,7 @@ public class GetInfoOnPDF { if (!ap.canModifyAnnotations()) restrictedPermissions.add("annotation modification"); if (!ap.canPrint()) restrictedPermissions.add("printing"); - if (restrictedPermissions.size() > 0) { + if (!restrictedPermissions.isEmpty()) { summaryData.set("restrictedPermissions", restrictedPermissions); summaryData.put("restrictedPermissionsCount", restrictedPermissions.size()); } @@ -196,7 +196,7 @@ public class GetInfoOnPDF { public ResponseEntity getPdfInfo(@ModelAttribute PDFFile request) throws IOException { MultipartFile inputFile = request.getFileInput(); boolean readonly = true; - try (PDDocument pdfBoxDoc = pdfDocumentFactory.load(inputFile, readonly); ) { + try (PDDocument pdfBoxDoc = pdfDocumentFactory.load(inputFile, readonly)) { ObjectMapper objectMapper = new ObjectMapper(); ObjectNode jsonOutput = objectMapper.createObjectNode(); @@ -256,7 +256,6 @@ public class GetInfoOnPDF { docInfoNode.put("PDF version", pdfBoxDoc.getVersion()); docInfoNode.put("Trapped", info.getTrapped()); docInfoNode.put("Page Mode", getPageModeDescription(pageMode)); - ; PDAcroForm acroForm = pdfBoxDoc.getDocumentCatalog().getAcroForm(); @@ -270,7 +269,7 @@ public class GetInfoOnPDF { // Generate structured summary data about PDF characteristics ObjectNode summaryData = generatePDFSummaryData(pdfBoxDoc); - if (summaryData != null && summaryData.size() > 0) { + if (summaryData != null && !summaryData.isEmpty()) { jsonOutput.set("SummaryData", summaryData); } @@ -795,7 +794,7 @@ public class GetInfoOnPDF { // Recursively explore child elements ArrayNode childElements = exploreStructureTree(structureElement.getKids()); - if (childElements.size() > 0) { + if (!childElements.isEmpty()) { elementNode.set("Children", childElements); } } diff --git a/app/core/src/main/java/stirling/software/SPDF/controller/api/security/SanitizeController.java b/app/core/src/main/java/stirling/software/SPDF/controller/api/security/SanitizeController.java index 57f7db1ae..d7c4b675c 100644 --- a/app/core/src/main/java/stirling/software/SPDF/controller/api/security/SanitizeController.java +++ b/app/core/src/main/java/stirling/software/SPDF/controller/api/security/SanitizeController.java @@ -181,11 +181,9 @@ public class SanitizeController { private void sanitizeLinks(PDDocument document) throws IOException { for (PDPage page : document.getPages()) { for (PDAnnotation annotation : page.getAnnotations()) { - if (annotation != null && annotation instanceof PDAnnotationLink linkAnnotation) { + if (annotation instanceof PDAnnotationLink linkAnnotation) { PDAction action = linkAnnotation.getAction(); - if (action != null - && (action instanceof PDActionLaunch - || action instanceof PDActionURI)) { + if ((action instanceof PDActionLaunch || action instanceof PDActionURI)) { linkAnnotation.setAction(null); } } diff --git a/app/core/src/main/java/stirling/software/SPDF/controller/api/security/WatermarkController.java b/app/core/src/main/java/stirling/software/SPDF/controller/api/security/WatermarkController.java index 29f619175..9a8013ca8 100644 --- a/app/core/src/main/java/stirling/software/SPDF/controller/api/security/WatermarkController.java +++ b/app/core/src/main/java/stirling/software/SPDF/controller/api/security/WatermarkController.java @@ -192,17 +192,15 @@ public class WatermarkController { break; } - if (!"".equals(resourceDir)) { - ClassPathResource classPathResource = new ClassPathResource(resourceDir); - String fileExtension = resourceDir.substring(resourceDir.lastIndexOf(".")); - File tempFile = Files.createTempFile("NotoSansFont", fileExtension).toFile(); - try (InputStream is = classPathResource.getInputStream(); - FileOutputStream os = new FileOutputStream(tempFile)) { - IOUtils.copy(is, os); - font = PDType0Font.load(document, tempFile); - } finally { - if (tempFile != null) Files.deleteIfExists(tempFile.toPath()); - } + ClassPathResource classPathResource = new ClassPathResource(resourceDir); + String fileExtension = resourceDir.substring(resourceDir.lastIndexOf(".")); + File tempFile = Files.createTempFile("NotoSansFont", fileExtension).toFile(); + try (InputStream is = classPathResource.getInputStream(); + FileOutputStream os = new FileOutputStream(tempFile)) { + IOUtils.copy(is, os); + font = PDType0Font.load(document, tempFile); + } finally { + Files.deleteIfExists(tempFile.toPath()); } contentStream.setFont(font, fontSize); diff --git a/app/core/src/main/java/stirling/software/SPDF/controller/web/GeneralWebController.java b/app/core/src/main/java/stirling/software/SPDF/controller/web/GeneralWebController.java index 00f427016..1860754c3 100644 --- a/app/core/src/main/java/stirling/software/SPDF/controller/web/GeneralWebController.java +++ b/app/core/src/main/java/stirling/software/SPDF/controller/web/GeneralWebController.java @@ -77,7 +77,7 @@ public class GeneralWebController { new ObjectMapper() .readValue(config, new TypeReference>() {}); String name = (String) jsonContent.get("name"); - if (name == null || name.length() < 1) { + if (name == null || name.isEmpty()) { String filename = jsonFiles .get(pipelineConfigs.indexOf(config)) @@ -94,7 +94,7 @@ public class GeneralWebController { log.error("exception", e); } } - if (pipelineConfigsWithNames.size() == 0) { + if (pipelineConfigsWithNames.isEmpty()) { Map configWithName = new HashMap<>(); configWithName.put("json", ""); configWithName.put("name", "No preloaded configs found"); diff --git a/app/core/src/main/java/stirling/software/SPDF/service/ApiDocService.java b/app/core/src/main/java/stirling/software/SPDF/service/ApiDocService.java index 8193306ba..a51704fdd 100644 --- a/app/core/src/main/java/stirling/software/SPDF/service/ApiDocService.java +++ b/app/core/src/main/java/stirling/software/SPDF/service/ApiDocService.java @@ -52,7 +52,7 @@ public class ApiDocService { } public List getExtensionTypes(boolean output, String operationName) { - if (outputToFileTypes.size() == 0) { + if (outputToFileTypes.isEmpty()) { outputToFileTypes.put("PDF", List.of("pdf")); outputToFileTypes.put( "IMAGE", @@ -74,7 +74,7 @@ public class ApiDocService { "BOOK", Arrays.asList("epub", "mobi", "azw3", "fb2", "txt", "docx")); // type. } - if (apiDocsJsonRootNode == null || apiDocumentation.size() == 0) { + if (apiDocsJsonRootNode == null || apiDocumentation.isEmpty()) { loadApiDocumentation(); } if (!apiDocumentation.containsKey(operationName)) { @@ -136,7 +136,7 @@ public class ApiDocService { } public boolean isValidOperation(String operationName, Map parameters) { - if (apiDocumentation.size() == 0) { + if (apiDocumentation.isEmpty()) { loadApiDocumentation(); } if (!apiDocumentation.containsKey(operationName)) { @@ -147,7 +147,7 @@ public class ApiDocService { } public boolean isMultiInput(String operationName) { - if (apiDocsJsonRootNode == null || apiDocumentation.size() == 0) { + if (apiDocsJsonRootNode == null || apiDocumentation.isEmpty()) { loadApiDocumentation(); } if (!apiDocumentation.containsKey(operationName)) { diff --git a/app/core/src/main/java/stirling/software/SPDF/service/MetricsAggregatorService.java b/app/core/src/main/java/stirling/software/SPDF/service/MetricsAggregatorService.java index 3b12c9d5e..37ec6dd76 100644 --- a/app/core/src/main/java/stirling/software/SPDF/service/MetricsAggregatorService.java +++ b/app/core/src/main/java/stirling/software/SPDF/service/MetricsAggregatorService.java @@ -29,7 +29,7 @@ public class MetricsAggregatorService { public void aggregateAndSendMetrics() { Map metrics = new HashMap<>(); - final boolean validateGetEndpoints = endpointInspector.getValidGetEndpoints().size() != 0; + final boolean validateGetEndpoints = !endpointInspector.getValidGetEndpoints().isEmpty(); Search.in(meterRegistry) .name("http.requests") .counters()