diff --git a/app/core/src/main/java/stirling/software/SPDF/controller/api/pipeline/PipelineProcessor.java b/app/core/src/main/java/stirling/software/SPDF/controller/api/pipeline/PipelineProcessor.java index 070d681e4..7c1744617 100644 --- a/app/core/src/main/java/stirling/software/SPDF/controller/api/pipeline/PipelineProcessor.java +++ b/app/core/src/main/java/stirling/software/SPDF/controller/api/pipeline/PipelineProcessor.java @@ -7,7 +7,6 @@ import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; import java.util.ArrayList; -import java.util.Arrays; import java.util.List; import java.util.Map; import java.util.Map.Entry; @@ -106,7 +105,7 @@ public class PipelineProcessor { Map parameters = pipelineOperation.getParameters(); List inputFileTypes = apiDocService.getExtensionTypes(false, operation); if (inputFileTypes == null) { - inputFileTypes = new ArrayList(Arrays.asList("ALL")); + inputFileTypes = new ArrayList<>(List.of("ALL")); } if (!apiDocService.isValidOperation(operation, parameters)) { 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 0e46af08d..cfe3f9819 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 @@ -53,7 +53,7 @@ public class ApiDocService { public List getExtensionTypes(boolean output, String operationName) { if (outputToFileTypes.size() == 0) { - outputToFileTypes.put("PDF", Arrays.asList("pdf")); + outputToFileTypes.put("PDF", List.of("pdf")); outputToFileTypes.put( "IMAGE", Arrays.asList( @@ -63,10 +63,10 @@ public class ApiDocService { "ZIP", Arrays.asList("zip", "rar", "7z", "tar", "gz", "bz2", "xz", "lz", "lzma", "z")); outputToFileTypes.put("WORD", Arrays.asList("doc", "docx", "odt", "rtf")); - outputToFileTypes.put("CSV", Arrays.asList("csv")); + outputToFileTypes.put("CSV", List.of("csv")); outputToFileTypes.put("JS", Arrays.asList("js", "jsx")); outputToFileTypes.put("HTML", Arrays.asList("html", "htm", "xhtml")); - outputToFileTypes.put("JSON", Arrays.asList("json")); + outputToFileTypes.put("JSON", List.of("json")); outputToFileTypes.put("TXT", Arrays.asList("txt", "text", "md", "markdown")); outputToFileTypes.put("PPT", Arrays.asList("ppt", "pptx", "odp")); outputToFileTypes.put("XML", Arrays.asList("xml", "xsd", "xsl")); diff --git a/app/core/src/main/java/stirling/software/SPDF/service/CertificateValidationService.java b/app/core/src/main/java/stirling/software/SPDF/service/CertificateValidationService.java index f8b94f8df..672ee76f9 100644 --- a/app/core/src/main/java/stirling/software/SPDF/service/CertificateValidationService.java +++ b/app/core/src/main/java/stirling/software/SPDF/service/CertificateValidationService.java @@ -77,7 +77,7 @@ public class CertificateValidationService { try { CertPathValidator validator = CertPathValidator.getInstance("PKIX"); CertificateFactory cf = CertificateFactory.getInstance("X.509"); - List certList = Arrays.asList(cert); + List certList = Collections.singletonList(cert); CertPath certPath = cf.generateCertPath(certList); Set anchors = new HashSet<>(); diff --git a/app/core/src/test/java/stirling/software/SPDF/controller/api/MergeControllerTest.java b/app/core/src/test/java/stirling/software/SPDF/controller/api/MergeControllerTest.java index 1c07d26f2..b9de24f2c 100644 --- a/app/core/src/test/java/stirling/software/SPDF/controller/api/MergeControllerTest.java +++ b/app/core/src/test/java/stirling/software/SPDF/controller/api/MergeControllerTest.java @@ -1,12 +1,14 @@ package stirling.software.SPDF.controller.api; import static org.junit.jupiter.api.Assertions.*; -import static org.mockito.ArgumentMatchers.*; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.*; import java.io.IOException; import java.lang.reflect.Method; import java.util.Arrays; +import java.util.Collections; import java.util.List; import org.apache.pdfbox.pdmodel.PDDocument; @@ -266,8 +268,8 @@ class MergeControllerTest { when(pdfDocumentFactory.createNewDocument()).thenReturn(mockMergedDocument); when(doc1.getPages()).thenReturn(pages1); when(doc2.getPages()).thenReturn(pages2); - when(pages1.iterator()).thenReturn(Arrays.asList(page1).iterator()); - when(pages2.iterator()).thenReturn(Arrays.asList(page2).iterator()); + when(pages1.iterator()).thenReturn(Collections.singletonList(page1).iterator()); + when(pages2.iterator()).thenReturn(Collections.singletonList(page2).iterator()); // When PDDocument result = mergeController.mergeDocuments(documents); @@ -282,7 +284,7 @@ class MergeControllerTest { @Test void testMergeDocuments_EmptyList_ReturnsEmptyDocument() throws IOException { // Given - List documents = Arrays.asList(); + List documents = List.of(); when(pdfDocumentFactory.createNewDocument()).thenReturn(mockMergedDocument); diff --git a/app/core/src/test/java/stirling/software/SPDF/service/PdfImageRemovalServiceTest.java b/app/core/src/test/java/stirling/software/SPDF/service/PdfImageRemovalServiceTest.java index 6e06a74a7..bd934b642 100644 --- a/app/core/src/test/java/stirling/software/SPDF/service/PdfImageRemovalServiceTest.java +++ b/app/core/src/test/java/stirling/software/SPDF/service/PdfImageRemovalServiceTest.java @@ -1,17 +1,10 @@ package stirling.software.SPDF.service; import static org.mockito.ArgumentMatchers.any; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.never; -import static org.mockito.Mockito.times; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; +import static org.mockito.Mockito.*; import java.io.IOException; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Iterator; -import java.util.List; +import java.util.*; import org.apache.pdfbox.cos.COSName; import org.apache.pdfbox.pdmodel.PDDocument; @@ -42,7 +35,7 @@ class PdfImageRemovalServiceTest { // Configure page tree to iterate over our single page when(document.getPages()).thenReturn(pageTree); - Iterator pageIterator = Arrays.asList(page).iterator(); + Iterator pageIterator = Collections.singletonList(page).iterator(); when(pageTree.iterator()).thenReturn(pageIterator); // Set up page resources @@ -80,7 +73,7 @@ class PdfImageRemovalServiceTest { // Configure page tree to iterate over our single page when(document.getPages()).thenReturn(pageTree); - Iterator pageIterator = Arrays.asList(page).iterator(); + Iterator pageIterator = Collections.singletonList(page).iterator(); when(pageTree.iterator()).thenReturn(pageIterator); // Set up page resources @@ -118,12 +111,12 @@ class PdfImageRemovalServiceTest { // Set up image XObjects for page 1 COSName img1 = COSName.getPDFName("Im1"); - when(resources1.getXObjectNames()).thenReturn(Arrays.asList(img1)); + when(resources1.getXObjectNames()).thenReturn(Collections.singletonList(img1)); when(resources1.isImageXObject(img1)).thenReturn(true); // Set up image XObjects for page 2 COSName img2 = COSName.getPDFName("Im2"); - when(resources2.getXObjectNames()).thenReturn(Arrays.asList(img2)); + when(resources2.getXObjectNames()).thenReturn(Collections.singletonList(img2)); when(resources2.isImageXObject(img2)).thenReturn(true); // Execute the method