formattingand autowired constructors (#2557)

# Description
This pull request includes several changes aimed at improving the code
structure and removing redundant code. The most significant changes
involve reordering methods, removing unnecessary annotations, and
refactoring constructors to use dependency injection.
Autowired now comes via constructor (which also doesn't need autowired
annotation as its done by default for configuration)



## Checklist

- [ ] I have read the [Contribution
Guidelines](https://github.com/Stirling-Tools/Stirling-PDF/blob/main/CONTRIBUTING.md)
- [ ] I have performed a self-review of my own code
- [ ] I have attached images of the change if it is UI based
- [ ] I have commented my code, particularly in hard-to-understand areas
- [ ] If my code has heavily changed functionality I have updated
relevant docs on [Stirling-PDFs doc
repo](https://github.com/Stirling-Tools/Stirling-Tools.github.io/blob/main/docs/)
- [ ] My changes generate no new warnings
- [ ] I have read the section [Add New Translation
Tags](https://github.com/Stirling-Tools/Stirling-PDF/blob/main/HowToAddNewLanguage.md#add-new-translation-tags)
(for new translation tags only)

src/main/java/stirling/software/SPDF/controller/api/converters/ConvertOfficeController.java

@@ -33,6 +33,13 @@ import stirling.software.SPDF.utils.WebResponseUtils;
 @RequestMapping("/api/v1/convert")
 public class ConvertOfficeController {
 
+    private final CustomPDDocumentFactory pdfDocumentFactory;
+
+    @Autowired
+    public ConvertOfficeController(CustomPDDocumentFactory pdfDocumentFactory) {
+        this.pdfDocumentFactory = pdfDocumentFactory;
+    }
+
     public File convertToPdf(MultipartFile inputFile) throws IOException, InterruptedException {
         // Check for valid file extension
         String originalFilename = Filenames.toSimpleFileName(inputFile.getOriginalFilename());
@@ -78,13 +85,6 @@ public class ConvertOfficeController {
         return fileExtension.matches(extensionPattern);
     }
 
-    private final CustomPDDocumentFactory pdfDocumentFactory;
-
-    @Autowired
-    public ConvertOfficeController(CustomPDDocumentFactory pdfDocumentFactory) {
-        this.pdfDocumentFactory = pdfDocumentFactory;
-    }
-
     @PostMapping(consumes = "multipart/form-data", value = "/file/pdf")
     @Operation(
             summary = "Convert a file to a PDF using LibreOffice",

src/main/java/stirling/software/SPDF/controller/api/converters/ConvertPDFToBookController.java

@@ -6,7 +6,6 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.ModelAttribute;
@@ -26,9 +25,13 @@ import stirling.software.SPDF.utils.WebResponseUtils;
 // @RequestMapping("/api/v1/convert")
 public class ConvertPDFToBookController {
 
-    @Autowired
     @Qualifier("bookAndHtmlFormatsInstalled")
-    private boolean bookAndHtmlFormatsInstalled;
+    private final boolean bookAndHtmlFormatsInstalled;
+
+    public ConvertPDFToBookController(
+            @Qualifier("bookAndHtmlFormatsInstalled") boolean bookAndHtmlFormatsInstalled) {
+        this.bookAndHtmlFormatsInstalled = bookAndHtmlFormatsInstalled;
+    }
 
     @PostMapping(consumes = "multipart/form-data", value = "/pdf/book")
     @Operation(
@@ -39,16 +42,13 @@ public class ConvertPDFToBookController {
     public ResponseEntity<byte[]> HtmlToPdf(@ModelAttribute PdfToBookRequest request)
             throws Exception {
         MultipartFile fileInput = request.getFileInput();
-
         if (!bookAndHtmlFormatsInstalled) {
             throw new IllegalArgumentException(
                     "bookAndHtmlFormatsInstalled flag is False, this functionality is not available");
         }
-
         if (fileInput == null) {
             throw new IllegalArgumentException("Please provide a file for conversion.");
         }
-
         // Validate the output format
         String outputFormat = request.getOutputFormat().toLowerCase();
         List<String> allowedFormats =
@@ -58,28 +58,24 @@ public class ConvertPDFToBookController {
         if (!allowedFormats.contains(outputFormat)) {
             throw new IllegalArgumentException("Invalid output format: " + outputFormat);
         }
-
         byte[] outputFileBytes;
         List<String> command = new ArrayList<>();
         Path tempOutputFile =
                 Files.createTempFile(
-                        "output_",
-                        "." + outputFormat); // Use the output format for the file extension
+                        "output_", // Use the output format for the file extension
+                        "." + outputFormat);
         Path tempInputFile = null;
-
         try {
             // Create temp input file from the provided PDF
-            tempInputFile = Files.createTempFile("input_", ".pdf"); // Assuming input is always PDF
+            // Assuming input is always PDF
+            tempInputFile = Files.createTempFile("input_", ".pdf");
             Files.write(tempInputFile, fileInput.getBytes());
-
             command.add("ebook-convert");
             command.add(tempInputFile.toString());
             command.add(tempOutputFile.toString());
-
             ProcessExecutorResult returnCode =
                     ProcessExecutor.getInstance(ProcessExecutor.Processes.CALIBRE)
                             .runCommandWithOutputHandling(command);
-
             outputFileBytes = Files.readAllBytes(tempOutputFile);
         } finally {
             // Clean up temporary files
@@ -88,13 +84,12 @@ public class ConvertPDFToBookController {
             }
             Files.deleteIfExists(tempOutputFile);
         }
-
         String outputFilename =
                 Filenames.toSimpleFileName(fileInput.getOriginalFilename())
                                 .replaceFirst("[.][^.]+$", "")
                         + "."
-                        + outputFormat; // Remove file extension and append .pdf
-
+                        + // Remove file extension and append .pdf
+                        outputFormat;
         return WebResponseUtils.bytesToWebResponse(outputFileBytes, outputFilename);
     }
 }