fix

Merge branch 'main' into saml
debugs
2024-11-29 15:05:10 +00:00 · 2024-11-29 14:32:04 +00:00 · 2024-11-29 14:31:15 +00:00 · 2024-11-29 14:29:54 +00:00 · 2024-11-29 10:40:10 +00:00 · 2024-11-29 09:06:51 +00:00
247 changed files with 4704 additions and 36838 deletions
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -1,5 +1,5 @@
 blank_issues_enabled: true
 contact_links:
  - name: 💬 Discord Server
-    url: https://discord.gg/HYmhKj45pU
+    url: https://discord.gg/Cn8pWhQRxZ
    about: You can join our Discord server for real time discussion and support
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -76,7 +76,7 @@ jobs:
      - name: Set up Python
        uses: actions/setup-python@v5
        with:
-          python-version: "3.12"
+          python-version: "3.7"

      - name: Pip requirements
        run: |
--- a/.github/workflows/multiOSReleases.yml
+++ b/.github/workflows/multiOSReleases.yml
@@ -1,96 +0,0 @@
-name: Test Installers Build
-
-on:
-  workflow_dispatch:
-  release:
-    types: [created]
-permissions:
-  contents: write
-  packages: write
-jobs:
-  build-installers:
-    strategy:
-      matrix:
-        include:
-          - os: windows-latest
-            platform: win
-            ext: exe
-         #- os: macos-latest
-         #  platform: mac
-         # ext: dmg
-         #- os: ubuntu-latest
-         #  platform: linux
-         #  ext: deb
-    runs-on: ${{ matrix.os }}
-    
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Set up JDK 21
-        uses: actions/setup-java@v4
-        with:
-          java-version: "21"
-          distribution: "temurin"
-
-      - uses: gradle/actions/setup-gradle@v4
-        with:
-          gradle-version: 8.7
-
-      # Install Windows dependencies
-      - name: Install WiX Toolset
-        if: matrix.os == 'windows-latest'
-        run: |
-          curl -L -o wix.exe https://github.com/wixtoolset/wix3/releases/download/wix3141rtm/wix314.exe
-          .\wix.exe /install /quiet
-          
-      # Install Linux dependencies
-      - name: Install Linux Dependencies
-        if: matrix.os == 'ubuntu-latest'
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y fakeroot rpm
-
-      # Get version number
-      - name: Get version number
-        id: versionNumber
-        run: echo "versionNumber=$(./gradlew printVersion --quiet | tail -1)" >> $GITHUB_OUTPUT
-        shell: bash
-
-      - name: Get version number mac
-        id: versionNumberMac
-        run: echo "versionNumberMac=$(./gradlew printMacVersion --quiet | tail -1)" >> $GITHUB_OUTPUT
-        shell: bash
-
-      # Build installer
-      - name: Build Installer
-        run: ./gradlew build jpackage -x test --info
-        env:
-          DOCKER_ENABLE_SECURITY: false
-          STIRLING_PDF_DESKTOP_UI: true
-
-      # Rename and collect artifacts based on OS
-      - name: Prepare artifacts
-        id: prepare
-        shell: bash
-        run: |
-          if [ "${{ matrix.os }}" = "windows-latest" ]; then
-            mv "build/jpackage/Stirling-PDF-${{ steps.versionNumber.outputs.versionNumber }}.exe" "Stirling-PDF-${{ matrix.platform }}-installer.${{ matrix.ext }}"
-          elif [ "${{ matrix.os }}" = "macos-latest" ]; then
-            mv "build/jpackage/Stirling-PDF-${{ steps.versionNumberMac.outputs.versionNumberMac }}.dmg" "Stirling-PDF-${{ steps.versionNumber.outputs.versionNumber }}-${{ matrix.platform }}.${{ matrix.ext }}"
-          else
-            mv "build/jpackage/stirling-pdf_${{ steps.versionNumber.outputs.versionNumber }}-1_amd64.deb" "Stirling-PDF-${{ steps.versionNumber.outputs.versionNumber }}-${{ matrix.platform }}.${{ matrix.ext }}"
-          fi
-
-      # Upload installer as artifact for testing
-      - name: Upload Installer Artifact
-        uses: actions/upload-artifact@v4
-        with:    
-          name: Stirling-PDF-${{ matrix.platform }}-installer.${{ matrix.ext }}
-          path: Stirling-PDF-${{ matrix.platform }}-installer.${{ matrix.ext }}
-          retention-days: 1
-          if-no-files-found: error
-
-      - name: Upload binaries to release
-        uses: softprops/action-gh-release@v2
-        with:
-          files: ./Stirling-PDF-${{ matrix.platform }}-installer.${{ matrix.ext }}
--- a/.github/workflows/releaseArtifacts.yml
+++ b/.github/workflows/releaseArtifacts.yml
@@ -35,28 +35,27 @@ jobs:
        run: ./gradlew clean createExe
        env:
          DOCKER_ENABLE_SECURITY: ${{ matrix.enable_security }}
-          STIRLING_PDF_DESKTOP_UI: false

      - name: Get version number
        id: versionNumber
        run: echo "versionNumber=$(./gradlew printVersion --quiet | tail -1)" >> $GITHUB_OUTPUT

      - name: Rename binarie
-        run: cp ./build/launch4j/Stirling-PDF.exe ./build/launch4j/Stirling-PDF-Server${{ matrix.file_suffix }}.exe
+        if: matrix.file_suffix != ''
+        run: cp ./build/launch4j/Stirling-PDF.exe ./build/launch4j/Stirling-PDF${{ matrix.file_suffix }}.exe

      - name: Upload Assets binarie
        uses: actions/upload-artifact@v4
        with:
-          path: ./build/launch4j/Stirling-PDF-Server${{ matrix.file_suffix }}.exe
-          name: Stirling-PDF-Server${{ matrix.file_suffix }}.exe
+          path: ./build/launch4j/Stirling-PDF${{ matrix.file_suffix }}.exe
+          name: Stirling-PDF${{ matrix.file_suffix }}.exe
          overwrite: true
          retention-days: 1
          if-no-files-found: error
-          
      - name: Upload binaries to release
        uses: softprops/action-gh-release@v2
        with:
-          files: ./build/launch4j/Stirling-PDF-Server${{ matrix.file_suffix }}.exe
+          files: ./build/launch4j/Stirling-PDF${{ matrix.file_suffix }}.exe

      - name: Rename jar binaries
        run: cp ./build/libs/Stirling-PDF-${{ steps.versionNumber.outputs.versionNumber }}.jar ./build/libs/Stirling-PDF${{ matrix.file_suffix }}.jar
--- a/.gitignore
+++ b/.gitignore
@@ -161,4 +161,3 @@ out/
 .pytest_cache
 .ipynb_checkpoints

-**/jcef-bundle/
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -49,7 +49,5 @@
  "editor.indentSize": "tabSize",
  "editor.stickyScroll.enabled": false,
  "editor.minimap.enabled": false,
-  "editor.formatOnSave": true,
-  "java.format.settings.google.mode": "jar-file",
-  "java.format.settings.google.extra": "--aosp --skip-sorting-imports"
+  "editor.formatOnSave": true
 }
--- a/DATABASE.md
+++ b/DATABASE.md
@@ -1,5 +1,12 @@
 # New Database Backup and Import Functionality

+> [!IMPORTANT]
+> **Full activation will take place on approximately January 5th, 2025!**
+
+Why is the waiting time six months?
+
+There are users who only install updates sporadically; if they skip the preparation, it can/will lead to data loss in the database.
+
 ## Functionality Overview

 The newly introduced feature enhances the application with robust database backup and import capabilities. This feature is designed to ensure data integrity and provide a straightforward way to manage database backups. Here's how it works:
--- a/2
+++ b/2
@@ -1,5 +1,5 @@
 # use alpine
-FROM alpine:3.21.0
+FROM alpine:3.20.3

 ARG VERSION_TAG

--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
 <h1 align="center">Stirling-PDF</h1>

 [![Docker Pulls](https://img.shields.io/docker/pulls/frooodle/s-pdf)](https://hub.docker.com/r/frooodle/s-pdf)
-[![Discord](https://img.shields.io/discord/1068636748814483718?label=Discord)](https://discord.gg/HYmhKj45pU)
+[![Discord](https://img.shields.io/discord/1068636748814483718?label=Discord)](https://discord.gg/Cn8pWhQRxZ)
 [![Docker Image Version (tag latest semver)](https://img.shields.io/docker/v/frooodle/s-pdf/latest)](https://github.com/Stirling-Tools/Stirling-PDF/)
 [![GitHub Repo stars](https://img.shields.io/github/stars/stirling-tools/stirling-pdf?style=social)](https://github.com/Stirling-Tools/stirling-pdf)

@@ -19,7 +19,7 @@ All files and PDFs exist either exclusively on the client side, reside in server

 ## Features

- Enterprise features like SSO Check [here](https://docs.stirlingpdf.com/Enterprise%20Edition)
+- Enterprise features like SSO Check [here](https://docs.stirlingpdf.com/Enterprise%20Edition) 
 - Dark mode support
 - Custom download options
 - Parallel file processing and downloads
@@ -187,48 +187,47 @@ Certain functionality like `Sign` supports pre-saved files stored at `/customFil

 ## Supported Languages

-Stirling-PDF currently supports 38 languages!
+Stirling-PDF currently supports 37 languages!

 | Language                                     | Progress                               |
 | -------------------------------------------- | -------------------------------------- |
-| Arabic (العربية) (ar_AR)                        | ![94%](https://geps.dev/progress/94)   |
-| Azerbaijani (Azərbaycan Dili) (az_AZ)        | ![92%](https://geps.dev/progress/92)   |
-| Basque (Euskara) (eu_ES)                     | ![53%](https://geps.dev/progress/53)   |
-| Bulgarian (Български) (bg_BG)                | ![89%](https://geps.dev/progress/89)   |
-| Catalan (Català) (ca_CA)                     | ![84%](https://geps.dev/progress/84)   |
-| Croatian (Hrvatski) (hr_HR)                  | ![91%](https://geps.dev/progress/91)   |
-| Czech (Česky) (cs_CZ)                        | ![90%](https://geps.dev/progress/90)   |
-| Danish (Dansk) (da_DK)                       | ![89%](https://geps.dev/progress/89)   |
-| Dutch (Nederlands) (nl_NL)                   | ![89%](https://geps.dev/progress/89)   |
+| Arabic (العربية) (ar_AR)                        | ![98%](https://geps.dev/progress/98)   |
+| Azerbaijani (Azərbaycan Dili) (az_AZ)        | ![97%](https://geps.dev/progress/97)   |
+| Basque (Euskara) (eu_ES)                     | ![54%](https://geps.dev/progress/54)   |
+| Bulgarian (Български) (bg_BG)                | ![94%](https://geps.dev/progress/94)   |
+| Catalan (Català) (ca_CA)                     | ![88%](https://geps.dev/progress/88)   |
+| Croatian (Hrvatski) (hr_HR)                  | ![96%](https://geps.dev/progress/96)   |
+| Czech (Česky) (cs_CZ)                        | ![95%](https://geps.dev/progress/95)   |
+| Danish (Dansk) (da_DK)                       | ![94%](https://geps.dev/progress/94)   |
+| Dutch (Nederlands) (nl_NL)                   | ![94%](https://geps.dev/progress/94)   |
 | English (English) (en_GB)                    | ![100%](https://geps.dev/progress/100) |
 | English (US) (en_US)                         | ![100%](https://geps.dev/progress/100) |
-| French (Français) (fr_FR)                    | ![92%](https://geps.dev/progress/92)   |
-| German (Deutsch) (de_DE)                     | ![100%](https://geps.dev/progress/100)   |
-| Greek (Ελληνικά) (el_GR)                     | ![90%](https://geps.dev/progress/90)   |
-| Hindi (हिंदी) (hi_IN)                          | ![88%](https://geps.dev/progress/88)   |
-| Hungarian (Magyar) (hu_HU)                   | ![91%](https://geps.dev/progress/91)   |
-| Indonesian (Bahasa Indonesia) (id_ID)        | ![90%](https://geps.dev/progress/90)   |
-| Irish (Gaeilge) (ga_IE)                      | ![82%](https://geps.dev/progress/82)   |
+| French (Français) (fr_FR)                    | ![97%](https://geps.dev/progress/97)   |
+| German (Deutsch) (de_DE)                     | ![97%](https://geps.dev/progress/97)   |
+| Greek (Ελληνικά) (el_GR)                     | ![95%](https://geps.dev/progress/95)   |
+| Hindi (हिंदी) (hi_IN)                          | ![93%](https://geps.dev/progress/93)   |
+| Hungarian (Magyar) (hu_HU)                   | ![95%](https://geps.dev/progress/95)   |
+| Indonesian (Bahasa Indonesia) (id_ID)        | ![95%](https://geps.dev/progress/95)   |
+| Irish (Gaeilge) (ga_IE)                      | ![86%](https://geps.dev/progress/86)   |
 | Italian (Italiano) (it_IT)                   | ![99%](https://geps.dev/progress/99)   |
-| Japanese (日本語) (ja_JP)                    | ![93%](https://geps.dev/progress/93)   |
-| Korean (한국어) (ko_KR)                      | ![89%](https://geps.dev/progress/89)   |
-| Norwegian (Norsk) (no_NB)                    | ![82%](https://geps.dev/progress/82)   |
-| Persian (فارسی) (fa_IR)                      | ![99%](https://geps.dev/progress/99)   |
-| Polish (Polski) (pl_PL)                      | ![90%](https://geps.dev/progress/90)   |
-| Portuguese (Português) (pt_PT)               | ![90%](https://geps.dev/progress/90)   |
-| Portuguese Brazilian (Português) (pt_BR)     | ![98%](https://geps.dev/progress/98)   |
-| Romanian (Română) (ro_RO)                    | ![84%](https://geps.dev/progress/84)   |
-| Russian (Русский) (ru_RU)                    | ![90%](https://geps.dev/progress/90)   |
-| Serbian Latin alphabet (Srpski) (sr_LATN_RS) | ![67%](https://geps.dev/progress/67)   |
-| Simplified Chinese (简体中文) (zh_CN)         | ![93%](https://geps.dev/progress/93)   |
-| Slovakian (Slovensky) (sk_SK)                | ![78%](https://geps.dev/progress/78)   |
-| Spanish (Español) (es_ES)                    | ![91%](https://geps.dev/progress/91)   |
-| Swedish (Svenska) (sv_SE)                    | ![90%](https://geps.dev/progress/90)   |
-| Thai (ไทย) (th_TH)                           | ![90%](https://geps.dev/progress/90)   |
-| Traditional Chinese (繁體中文) (zh_TW)        | ![91%](https://geps.dev/progress/91)   |
-| Turkish (Türkçe) (tr_TR)                     | ![86%](https://geps.dev/progress/86)   |
-| Ukrainian (Українська) (uk_UA)               | ![76%](https://geps.dev/progress/76)   |
-| Vietnamese (Tiếng Việt) (vi_VN)              | ![83%](https://geps.dev/progress/83)   |
+| Japanese (日本語) (ja_JP)                    | ![83%](https://geps.dev/progress/83)   |
+| Korean (한국어) (ko_KR)                      | ![93%](https://geps.dev/progress/93)   |
+| Norwegian (Norsk) (no_NB)                    | ![85%](https://geps.dev/progress/85)   |
+| Polish (Polski) (pl_PL)                      | ![94%](https://geps.dev/progress/94)   |
+| Portuguese (Português) (pt_PT)               | ![95%](https://geps.dev/progress/95)   |
+| Portuguese Brazilian (Português) (pt_BR)     | ![96%](https://geps.dev/progress/96)   |
+| Romanian (Română) (ro_RO)                    | ![88%](https://geps.dev/progress/88)   |
+| Russian (Русский) (ru_RU)                    | ![95%](https://geps.dev/progress/95)   |
+| Serbian Latin alphabet (Srpski) (sr_LATN_RS) | ![68%](https://geps.dev/progress/68)   |
+| Simplified Chinese (简体中文) (zh_CN)         | ![89%](https://geps.dev/progress/89)   |
+| Slovakian (Slovensky) (sk_SK)                | ![80%](https://geps.dev/progress/80)   |
+| Spanish (Español) (es_ES)                    | ![96%](https://geps.dev/progress/96)   |
+| Swedish (Svenska) (sv_SE)                    | ![94%](https://geps.dev/progress/94)   |
+| Thai (ไทย) (th_TH)                           | ![94%](https://geps.dev/progress/94)   |
+| Traditional Chinese (繁體中文) (zh_TW)        | ![96%](https://geps.dev/progress/96)   |
+| Turkish (Türkçe) (tr_TR)                     | ![90%](https://geps.dev/progress/90)   |
+| Ukrainian (Українська) (uk_UA)               | ![78%](https://geps.dev/progress/78)   |
+| Vietnamese (Tiếng Việt) (vi_VN)              | ![86%](https://geps.dev/progress/86)   |

 ## Contributing (Creating Issues, Translations, Fixing Bugs, etc.)

@@ -241,7 +240,7 @@ Stirling PDF offers a Enterprise edition of its software, This is the same great
 ### Whats included

 - Prioritised Support tickets via support@stirlingpdf.com to reach directly to Stirling-PDF team for support and 1:1 meetings where applicable (Provided they come from same email domain registered with us)
- Prioritised Enhancements to Stirling-PDF where applicable
+- Prioritised Enhancements to Stirling-PDF where applicable 
 - Base SSO support
 - Advanced SSO such as automated login handling (Coming very soon)
 - SAML SSO (Coming very soon)
@@ -405,7 +404,7 @@ To access your account settings, go to Account Settings in the settings cog menu

 To add new users, go to the bottom of Account Settings and hit 'Admin Settings'. Here you can add new users. The different roles mentioned within this are for rate limiting. This is a work in progress and will be expanded on more in the future.

-For API usage, you must provide a header with `X-API-KEY` and the associated API key for that user.
+For API usage, you must provide a header with `X-API-Key` and the associated API key for that user.

 ## FAQ

--- a/build.gradle
+++ b/build.gradle
@@ -8,7 +8,6 @@ plugins {
    id "com.diffplug.spotless" version "6.25.0"
    id "com.github.jk1.dependency-license-report" version "2.9"
 	//id "nebula.lint" version "19.0.3"
-	id("org.panteleyev.jpackageplugin") version "1.6.0"
 }


@@ -22,12 +21,12 @@ ext {
    imageioVersion = "3.12.0"
    lombokVersion = "1.18.36"
    bouncycastleVersion = "1.79"
-    springSecuritySamlVersion = "6.4.2"
-    openSamlVersion = "4.3.2"
+    springSecuritySamlVersion = "6.4.1"
+    openSamlVersion = "4.3.2"  
 }

 group = "stirling.software"
-version = "0.36.5"
+version = "0.35.0"


 java {
@@ -38,9 +37,10 @@ java {
 repositories {
    mavenCentral()
    maven { url "https://jitpack.io" }
-    maven { url "https://build.shibboleth.net/maven/releases" }
-    maven { url "https://maven.pkg.github.com/jcefmaven/jcefmaven" }
-
+    maven { url "https://build.shibboleth.net/nexus/content/repositories/releases/" }
+    maven {
+        url 'https://build.shibboleth.net/maven/releases'
+    }
 }

 licenseReport {
@@ -64,12 +64,6 @@ sourceSets {
                exclude "stirling/software/SPDF/model/User.java"
                exclude "stirling/software/SPDF/repository/**"
            }
-
-            if (System.getenv("STIRLING_PDF_DESKTOP_UI") == "false") {
-            	exclude "stirling/software/SPDF/UI/impl/**"
-            }
-
-
        }
    }
 }
@@ -80,153 +74,16 @@ openApi {
    outputFileName = "SwaggerDoc.json"
 }

-//0.11.5 to 2024.11.5
-def getMacVersion(String version) {
-    def currentYear = java.time.Year.now().getValue()
-    def versionParts = version.split("\\.", 2)
-    return "${currentYear}.${versionParts.length > 1 ? versionParts[1] : versionParts[0]}"
-}
-
-jpackage {
-    input = "build/libs"
-
-    appName = "Stirling-PDF"
-    appVersion = project.version
-    vendor = "Stirling-Software"
-	appDescription = "Stirling PDF - Your Local PDF Editor"
-
-    mainJar = "Stirling-PDF-${project.version}.jar"
-    mainClass = "org.springframework.boot.loader.launch.JarLauncher"
-
-    icon = "src/main/resources/static/favicon.ico"
-
-
-
-    // JVM Options
-    javaOptions = [
-        "-DBROWSER_OPEN=true",
-        "-DSTIRLING_PDF_DESKTOP_UI=true",
-        "-Djava.awt.headless=false",
-        "-Dapple.awt.UIElement=true",
-        "--add-opens", "java.base/java.lang=ALL-UNNAMED",
-        "--add-opens", "java.desktop/java.awt.event=ALL-UNNAMED",
-        "--add-opens", "java.desktop/sun.awt=ALL-UNNAMED"
-
-    ]
-
-
-    verbose = true
-
-    destination = "${projectDir}/build/jpackage"
-
-    // Windows-specific configuration
-    windows {
-    	launcherAsService = false
-    	appVersion = project.version
-        winConsole = false
-        winDirChooser = true
-        winMenu = true
-        winShortcut = true
-        winPerUserInstall = true
-        winMenuGroup = "Stirling Software"
-        winUpgradeUuid = "2a43ed0c-b8c2-40cf-89e1-751129b87641" // Unique identifier for updates
-        winHelpUrl = "https://github.com/Stirling-Tools/Stirling-PDF"
-        winUpdateUrl = "https://github.com/Stirling-Tools/Stirling-PDF/releases"
-        type = "exe"
-        installDir = "C:/Program Files/Stirling-PDF"
-    }
-
-    // macOS-specific configuration
-    mac {
-    	appVersion = getMacVersion(project.version.toString())
-        icon = "src/main/resources/static/favicon.icns"
-        type = "dmg"
-        macPackageIdentifier = "com.stirling.software.pdf"
-        macPackageName = "Stirling-PDF"
-        macAppCategory = "public.app-category.productivity"
-        macSign = false // Enable signing
-        macAppStore = false // Not targeting App Store initially
-
-        //installDir = "Applications"
-
-        // Add license and other documentation to DMG
-        /*macDmgContent = [
-            "README.md",
-            "LICENSE",
-            "CHANGELOG.md"
-        ]*/
-
-        // Enable Mac-specific entitlements
-        //macEntitlements = "entitlements.plist" // You'll need to create this file
-    }
-
-    // Linux-specific configuration
-    linux {
-    	appVersion = project.version
-        icon = "src/main/resources/static/favicon.png"
-        type = "deb" // Can also use "rpm" for Red Hat-based systems
-
-        // Debian package configuration
-        //linuxPackageName = "stirlingpdf"
-        linuxDebMaintainer = "support@stirlingpdf.com"
-        linuxMenuGroup = "Office;PDF;Productivity"
-        linuxAppCategory = "Office"
-        linuxAppRelease = "1"
-        linuxPackageDeps = true
-
-        installDir = "/opt/Stirling-PDF"
-
-        // RPM-specific settings
-        //linuxRpmLicenseType = "MIT"
-    }
-
-    // Common additional options
-    //jLinkOptions = [
-    //    "--strip-debug",
-    //    "--compress=2",
-    //    "--no-header-files",
-    //    "--no-man-pages"
-    //]
-
-    // Add any additional modules required
-    /*addModules = [
-        "java.base",
-        "java.desktop",
-        "java.logging",
-        "java.sql",
-        "java.xml",
-        "jdk.crypto.ec"
-    ]*/
-
-    // Add copyright and license information
-    copyright = "Copyright © 2024 Stirling Software"
-    licenseFile = "LICENSE"
-}
-
-
 launch4j {
    icon = "${projectDir}/src/main/resources/static/favicon.ico"

    outfile="Stirling-PDF.exe"
-
-    if(System.getenv("STIRLING_PDF_DESKTOP_UI") == 'true') {
-    	headerType = "gui"
-    } else {
-    	headerType = "console"
-    }
+    headerType="console"
    jarTask = tasks.bootJar

    errTitle="Encountered error, Do you have Java 21?"
    downloadUrl="https://download.oracle.com/java/21/latest/jdk-21_windows-x64_bin.exe"
-
-    if(System.getenv("STIRLING_PDF_DESKTOP_UI") == 'true') {
-    	variables=["BROWSER_OPEN=true", "STIRLING_PDF_DESKTOP_UI=true"]
-    } else {
-    	variables=["BROWSER_OPEN=true"]
-    }
-
-
-
+    variables=["BROWSER_OPEN=true"]
    jreMinVersion="17"

    mutexName="Stirling-PDF"
@@ -243,7 +100,7 @@ spotless {
    java {
        target project.fileTree('src/main/java')

-        googleJavaFormat("1.25.2").aosp().reorderImports(false)
+        googleJavaFormat("1.22.0").aosp().reorderImports(false)

        importOrder("java", "javax", "org", "com", "net", "io")
        toggleOffOn()
@@ -266,17 +123,10 @@ configurations.all {
    exclude group: "org.springframework.boot", module: "spring-boot-starter-tomcat"
 }
 dependencies {
-
-	if (System.getenv("STIRLING_PDF_DESKTOP_UI") != "false") {
-		implementation "me.friwi:jcefmaven:127.3.1"
-	    implementation "org.openjfx:javafx-controls:21"
-	    implementation "org.openjfx:javafx-swing:21"
-    }
-
    //security updates
-    implementation "org.springframework:spring-webmvc:6.2.1"
+    implementation "org.springframework:spring-webmvc:6.2.0"

-    implementation("io.github.pixee:java-security-toolkit:1.2.1")
+    implementation("io.github.pixee:java-security-toolkit:1.2.0")

    // implementation "org.yaml:snakeyaml:2.2"
    implementation 'com.github.Carleslc.Simple-YAML:Simple-Yaml:1.8.4'
@@ -292,12 +142,12 @@ dependencies {

    if (System.getenv("DOCKER_ENABLE_SECURITY") != "false") {
        implementation "org.springframework.boot:spring-boot-starter-security:$springBootVersion"
-        implementation "org.thymeleaf.extras:thymeleaf-extras-springsecurity5:3.1.3.RELEASE"
+        implementation "org.thymeleaf.extras:thymeleaf-extras-springsecurity5:3.1.2.RELEASE"
        implementation "org.springframework.boot:spring-boot-starter-data-jpa:$springBootVersion"
        implementation "org.springframework.boot:spring-boot-starter-oauth2-client:$springBootVersion"

 		implementation "org.springframework.session:spring-session-core:$springBootVersion"
-
+				
 	    implementation 'com.unboundid.product.scim2:scim2-sdk-client:2.3.5'
        // Don't upgrade h2database
        runtimeOnly "com.h2database:h2:2.3.232"
@@ -368,7 +218,7 @@ dependencies {
    implementation "org.bouncycastle:bcprov-jdk18on:$bouncycastleVersion"
    implementation "org.bouncycastle:bcpkix-jdk18on:$bouncycastleVersion"
    implementation "org.springframework.boot:spring-boot-starter-actuator:$springBootVersion"
-    implementation "io.micrometer:micrometer-core:1.14.2"
+    implementation "io.micrometer:micrometer-core:1.14.1"
    implementation group: "com.google.zxing", name: "core", version: "3.5.3"
    // https://mvnrepository.com/artifact/org.commonmark/commonmark
    implementation "org.commonmark:commonmark:0.24.0"
@@ -421,14 +271,7 @@ jar {
 tasks.named("test") {
    useJUnitPlatform()
 }
-task printVersion {
-    doLast {
-        println project.version
-    }
-}

-task printMacVersion {
-    doLast {
-        println getMacVersion(project.version.toString())
-    }
+task printVersion {
+    println project.version
 }
--- a/cucumber/features/steps/step_definitions.py
+++ b/cucumber/features/steps/step_definitions.py
@@ -15,10 +15,6 @@ import shutil
 import re
 from PIL import Image, ImageDraw

-API_HEADERS = {
-    'X-API-KEY': '123456789'
-}
-
 #########
 # GIVEN #
 #########
@@ -231,7 +227,7 @@ def save_generated_pdf(context, filename):
 def step_send_get_request(context, endpoint):
    base_url = "http://localhost:8080"
    full_url = f"{base_url}{endpoint}"
-    response = requests.get(full_url, headers=API_HEADERS)
+    response = requests.get(full_url)
    context.response = response

@when('I send a GET request to "{endpoint}" with parameters')
@@ -239,7 +235,7 @@ def step_send_get_request_with_params(context, endpoint):
    base_url = "http://localhost:8080"
    params = {row['parameter']: row['value'] for row in context.table}
    full_url = f"{base_url}{endpoint}"
-    response = requests.get(full_url, params=params, headers=API_HEADERS)
+    response = requests.get(full_url, params=params)
    context.response = response

@when('I send the API request to the endpoint "{endpoint}"')
@@ -260,7 +256,7 @@ def step_send_api_request(context, endpoint):
        print(f"form_data {file.name} with {mime_type}")
        form_data.append((key, (file.name, file, mime_type)))

-    response = requests.post(url, files=form_data, headers=API_HEADERS)
+    response = requests.post(url, files=form_data)
    context.response = response

 ########
--- a/exampleYmlFiles/test_cicd.yml
+++ b/exampleYmlFiles/test_cicd.yml
@@ -1,34 +0,0 @@
-services:
-  stirling-pdf:
-    container_name: Stirling-PDF-Security-Fat
-    image: stirlingtools/stirling-pdf:latest-fat
-    deploy:
-      resources:
-        limits:
-          memory: 4G
-    healthcheck:
-      test: ["CMD-SHELL", "curl -f -H 'X-API-KEY: 123456789' http://localhost:8080/api/v1/info/status | grep -q 'UP'"]
-      interval: 5s
-      timeout: 10s
-      retries: 16
-    ports:
-      - 8080:8080
-    volumes:
-      - /stirling/latest/data:/usr/share/tessdata:rw
-      - /stirling/latest/config:/configs:rw
-      - /stirling/latest/logs:/logs:rw
-    environment:
-      DOCKER_ENABLE_SECURITY: "true"
-      SECURITY_ENABLELOGIN: "true"
-      PUID: 1002
-      PGID: 1002
-      UMASK: "022"
-      SYSTEM_DEFAULTLOCALE: en-US
-      UI_APPNAME: Stirling-PDF
-      UI_HOMEDESCRIPTION: Demo site for Stirling-PDF Latest-fat with Security
-      UI_APPNAMENAVBAR: Stirling-PDF Latest-fat
-      SYSTEM_MAXFILESIZE: "100"
-      METRICS_ENABLED: "true"
-      SYSTEM_GOOGLEVISIBILITY: "true"
-      SECURITY_CUSTOMGLOBALAPIKEY: "123456789"
-    restart: on-failure:5
--- a/scripts/ignore_translation.toml
+++ b/scripts/ignore_translation.toml
@@ -42,19 +42,14 @@ ignore = [
    'addPageNumbers.selectText.3',
    'alphabet',
    'certSign.name',
-    'fileChooser.dragAndDrop',
    'home.pipeline.title',
    'language.direction',
-    'legal.impressum',
    'licenses.version',
    'pipeline.title',
    'pipelineOptions.pipelineHeader',
    'pro',
    'sponsor',
    'text',
-    'validateSignature.cert.bits',
-    'validateSignature.cert.version',
-    'validateSignature.status',
    'watermark.type.1',
 ]

@@ -66,6 +61,7 @@ ignore = [
 [es_ES]
 ignore = [
    'adminUserSettings.roles',
+    'color',
    'error',
    'language.direction',
    'no',
@@ -77,11 +73,6 @@ ignore = [
    'language.direction',
 ]

-[fa_IR]
-ignore = [
-    'language.direction',
-]
-
 [fr_FR]
 ignore = [
    'AddStampRequest.alphabet',
--- a/scripts/init.sh
+++ b/scripts/init.sh
@@ -16,10 +16,10 @@ fi
 # Check if TESSERACT_LANGS environment variable is set and is not empty
 if [[ -n "$TESSERACT_LANGS" ]]; then
  # Convert comma-separated values to a space-separated list
-  SPACE_SEPARATED_LANGS=$(echo $TESSERACT_LANGS | tr ',' ' ')
+  LANGS=$(echo $TESSERACT_LANGS | tr ',' ' ')
  pattern='^[a-zA-Z]{2,4}(_[a-zA-Z]{2,4})?$'
  # Install each language pack
-  for LANG in $SPACE_SEPARATED_LANGS; do
+  for LANG in $LANGS; do
     if [[ $LANG =~ $pattern ]]; then
      apk add --no-cache "tesseract-ocr-data-$LANG"
     else
--- a/src/main/java/org/apache/pdfbox/examples/signature/CreateSignatureBase.java
+++ b/src/main/java/org/apache/pdfbox/examples/signature/CreateSignatureBase.java
@@ -97,14 +97,14 @@ public abstract class CreateSignatureBase implements SignatureInterface {
        this.privateKey = privateKey;
    }

-    public Certificate[] getCertificateChain() {
-        return certificateChain;
-    }
-
    public final void setCertificateChain(final Certificate[] certificateChain) {
        this.certificateChain = certificateChain;
    }

+    public Certificate[] getCertificateChain() {
+        return certificateChain;
+    }
+
    public void setTsaUrl(String tsaUrl) {
        this.tsaUrl = tsaUrl;
    }
@@ -152,10 +152,6 @@ public abstract class CreateSignatureBase implements SignatureInterface {
        }
    }

-    public boolean isExternalSigning() {
-        return externalSigning;
-    }
-
    /**
     * Set if external signing scenario should be used. If {@code false}, SignatureInterface would
     * be used for signing.
@@ -167,4 +163,8 @@ public abstract class CreateSignatureBase implements SignatureInterface {
    public void setExternalSigning(boolean externalSigning) {
        this.externalSigning = externalSigning;
    }
+
+    public boolean isExternalSigning() {
+        return externalSigning;
+    }
 }
--- a/src/main/java/org/apache/pdfbox/examples/signature/TSAClient.java
+++ b/src/main/java/org/apache/pdfbox/examples/signature/TSAClient.java
@@ -51,13 +51,15 @@ public class TSAClient {

    private static final DigestAlgorithmIdentifierFinder ALGORITHM_OID_FINDER =
            new DefaultDigestAlgorithmIdentifierFinder();
-    // SecureRandom.getInstanceStrong() would be better, but sometimes blocks on Linux
-    private static final Random RANDOM = new SecureRandom();
+
    private final URL url;
    private final String username;
    private final String password;
    private final MessageDigest digest;

+    // SecureRandom.getInstanceStrong() would be better, but sometimes blocks on Linux
+    private static final Random RANDOM = new SecureRandom();
+
    /**
     * @param url the URL of the TSA service
     * @param username user name of TSA
--- a/src/main/java/stirling/software/SPDF/EE/EEAppConfig.java
+++ b/src/main/java/stirling/software/SPDF/EE/EEAppConfig.java
@@ -1,5 +1,6 @@
 package stirling.software.SPDF.EE;

+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.core.Ordered;
@@ -13,15 +14,8 @@ import stirling.software.SPDF.model.ApplicationProperties;
@Slf4j
 public class EEAppConfig {

-    private final ApplicationProperties applicationProperties;
-
-    private final LicenseKeyChecker licenseKeyChecker;
-
-    public EEAppConfig(
-            ApplicationProperties applicationProperties, LicenseKeyChecker licenseKeyChecker) {
-        this.applicationProperties = applicationProperties;
-        this.licenseKeyChecker = licenseKeyChecker;
-    }
+    @Autowired ApplicationProperties applicationProperties;
+    @Autowired private LicenseKeyChecker licenseKeyChecker;

    @Bean(name = "runningEE")
    public boolean runningEnterpriseEdition() {
--- a/src/main/java/stirling/software/SPDF/EE/LicenseKeyChecker.java
+++ b/src/main/java/stirling/software/SPDF/EE/LicenseKeyChecker.java
@@ -28,7 +28,7 @@ public class LicenseKeyChecker {
        this.checkLicense();
    }

-    @Scheduled(initialDelay = 604800000, fixedRate = 604800000) // 7 days in milliseconds
+    @Scheduled(fixedRate = 604800000) // 7 days in milliseconds
    public void checkLicensePeriodically() {
        checkLicense();
    }
--- a/src/main/java/stirling/software/SPDF/LibreOfficeListener.java
+++ b/src/main/java/stirling/software/SPDF/LibreOfficeListener.java
@@ -6,6 +6,9 @@ import java.net.Socket;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;

+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import io.github.pixee.security.SystemCommand;

 import lombok.extern.slf4j.Slf4j;
@@ -13,20 +16,23 @@ import lombok.extern.slf4j.Slf4j;
@Slf4j
 public class LibreOfficeListener {

+    private static final Logger logger = LoggerFactory.getLogger(LibreOfficeListener.class);
    private static final long ACTIVITY_TIMEOUT = 20L * 60 * 1000; // 20 minutes

    private static final LibreOfficeListener INSTANCE = new LibreOfficeListener();
    private static final int LISTENER_PORT = 2002;
-    private ExecutorService executorService;
-    private long lastActivityTime;
-    private Process process;
-
-    private LibreOfficeListener() {}

    public static LibreOfficeListener getInstance() {
        return INSTANCE;
    }

+    private ExecutorService executorService;
+    private long lastActivityTime;
+
+    private Process process;
+
+    private LibreOfficeListener() {}
+
    private boolean isListenerRunning() {
        log.info("waiting for listener to start");
        try (Socket socket = new Socket()) {
@@ -81,7 +87,7 @@ public class LibreOfficeListener {
                Thread.sleep(1000);
            } catch (InterruptedException e) {
                Thread.currentThread().interrupt();
-                log.error("exception", e);
+                logger.error("exception", e);
            } // Check every 1 second
        }
    }
--- a/src/main/java/stirling/software/SPDF/SPdfApplication.java
+++ b/src/main/java/stirling/software/SPDF/SPdfApplication.java
@@ -8,8 +8,9 @@ import java.nio.file.Paths;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
-import java.util.Properties;

+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.SpringApplication;
@@ -20,33 +21,33 @@ import org.springframework.scheduling.annotation.EnableScheduling;
 import io.github.pixee.security.SystemCommand;

 import jakarta.annotation.PostConstruct;
-import jakarta.annotation.PreDestroy;
-import lombok.extern.slf4j.Slf4j;
-import stirling.software.SPDF.UI.WebBrowser;
 import stirling.software.SPDF.config.ConfigInitializer;
 import stirling.software.SPDF.model.ApplicationProperties;

@SpringBootApplication
@EnableScheduling
-@Slf4j
 public class SPdfApplication {

+    private static final Logger logger = LoggerFactory.getLogger(SPdfApplication.class);
+
+    @Autowired private Environment env;
+    @Autowired ApplicationProperties applicationProperties;
+
    private static String baseUrlStatic;
    private static String serverPortStatic;
-    private final Environment env;
-    private final ApplicationProperties applicationProperties;
-    private final WebBrowser webBrowser;

    @Value("${baseUrl:http://localhost}")
    private String baseUrl;

-    public SPdfApplication(
-            Environment env,
-            ApplicationProperties applicationProperties,
-            @Autowired(required = false) WebBrowser webBrowser) {
-        this.env = env;
-        this.applicationProperties = applicationProperties;
-        this.webBrowser = webBrowser;
+    @Value("${server.port:8080}")
+    public void setServerPortStatic(String port) {
+        if ("auto".equalsIgnoreCase(port)) {
+            // Use Spring Boot's automatic port assignment (server.port=0)
+            SPdfApplication.serverPortStatic =
+                    "0"; // This will let Spring Boot assign an available port
+        } else {
+            SPdfApplication.serverPortStatic = port;
+        }
    }

    // Optionally keep this method if you want to provide a manual port-incrementation fallback.
@@ -66,24 +67,47 @@ public class SPdfApplication {
        }
    }

-    public static void main(String[] args) throws IOException, InterruptedException {
-        SpringApplication app = new SpringApplication(SPdfApplication.class);
-        Properties props = new Properties();
-        if (Boolean.parseBoolean(System.getProperty("STIRLING_PDF_DESKTOP_UI", "false"))) {
-            System.setProperty("java.awt.headless", "false");
-            app.setHeadless(false);
-            props.put("java.awt.headless", "false");
-            props.put("spring.main.web-application-type", "servlet");
+    @PostConstruct
+    public void init() {
+        baseUrlStatic = this.baseUrl;
+        // Check if the BROWSER_OPEN environment variable is set to true
+        String browserOpenEnv = env.getProperty("BROWSER_OPEN");
+        boolean browserOpen = browserOpenEnv != null && "true".equalsIgnoreCase(browserOpenEnv);
+        if (browserOpen) {
+            try {
+                String url = baseUrl + ":" + getStaticPort();
+
+                String os = System.getProperty("os.name").toLowerCase();
+                Runtime rt = Runtime.getRuntime();
+                if (os.contains("win")) {
+                    // For Windows
+                    SystemCommand.runCommand(rt, "rundll32 url.dll,FileProtocolHandler " + url);
+                } else if (os.contains("mac")) {
+                    SystemCommand.runCommand(rt, "open " + url);
+                } else if (os.contains("nix") || os.contains("nux")) {
+                    SystemCommand.runCommand(rt, "xdg-open " + url);
+                }
+            } catch (Exception e) {
+                logger.error("Error opening browser: {}", e.getMessage());
+            }
        }
+        logger.info("Running configs {}", applicationProperties.toString());
+    }
+
+    public static void main(String[] args) throws IOException, InterruptedException {
+
+        SpringApplication app = new SpringApplication(SPdfApplication.class);
        app.setAdditionalProfiles("default");
        app.addInitializers(new ConfigInitializer());
        Map<String, String> propertyFiles = new HashMap<>();
+
        // External config files
        if (Files.exists(Paths.get("configs/settings.yml"))) {
            propertyFiles.put("spring.config.additional-location", "file:configs/settings.yml");
        } else {
-            log.warn("External configuration file 'configs/settings.yml' does not exist.");
+            logger.warn("External configuration file 'configs/settings.yml' does not exist.");
        }
+
        if (Files.exists(Paths.get("configs/custom_settings.yml"))) {
            String existingLocation =
                    propertyFiles.getOrDefault("spring.config.additional-location", "");
@@ -94,96 +118,47 @@ public class SPdfApplication {
                    "spring.config.additional-location",
                    existingLocation + "file:configs/custom_settings.yml");
        } else {
-            log.warn("Custom configuration file 'configs/custom_settings.yml' does not exist.");
+            logger.warn("Custom configuration file 'configs/custom_settings.yml' does not exist.");
        }
-        Properties finalProps = new Properties();
+
        if (!propertyFiles.isEmpty()) {
-            finalProps.putAll(
+            app.setDefaultProperties(
                    Collections.singletonMap(
                            "spring.config.additional-location",
                            propertyFiles.get("spring.config.additional-location")));
        }
-        if (!props.isEmpty()) {
-            finalProps.putAll(props);
-        }
-        app.setDefaultProperties(finalProps);
+
        app.run(args);
+
        // Ensure directories are created
        try {
            Files.createDirectories(Path.of("customFiles/static/"));
            Files.createDirectories(Path.of("customFiles/templates/"));
        } catch (Exception e) {
-            log.error("Error creating directories: {}", e.getMessage());
+            logger.error("Error creating directories: {}", e.getMessage());
        }
+
        printStartupLogs();
    }

    private static void printStartupLogs() {
-        log.info("Stirling-PDF Started.");
+        logger.info("Stirling-PDF Started.");
        String url = baseUrlStatic + ":" + getStaticPort();
-        log.info("Navigate to {}", url);
+        logger.info("Navigate to {}", url);
    }

    public static String getStaticBaseUrl() {
        return baseUrlStatic;
    }

+    public String getNonStaticBaseUrl() {
+        return baseUrlStatic;
+    }
+
    public static String getStaticPort() {
        return serverPortStatic;
    }

-    @Value("${server.port:8080}")
-    public void setServerPortStatic(String port) {
-        if ("auto".equalsIgnoreCase(port)) {
-            // Use Spring Boot's automatic port assignment (server.port=0)
-            SPdfApplication.serverPortStatic = // This will let Spring Boot assign an available port
-                    "0";
-        } else {
-            SPdfApplication.serverPortStatic = port;
-        }
-    }
-
-    @PostConstruct
-    public void init() {
-        baseUrlStatic = this.baseUrl;
-        String url = baseUrl + ":" + getStaticPort();
-        if (webBrowser != null
-                && Boolean.parseBoolean(System.getProperty("STIRLING_PDF_DESKTOP_UI", "false"))) {
-            webBrowser.initWebUI(url);
-        } else {
-            String browserOpenEnv = env.getProperty("BROWSER_OPEN");
-            boolean browserOpen = browserOpenEnv != null && "true".equalsIgnoreCase(browserOpenEnv);
-            if (browserOpen) {
-                try {
-                    String os = System.getProperty("os.name").toLowerCase();
-                    Runtime rt = Runtime.getRuntime();
-                    if (os.contains("win")) {
-                        // For Windows
-                        SystemCommand.runCommand(rt, "rundll32 url.dll,FileProtocolHandler " + url);
-                    } else if (os.contains("mac")) {
-                        SystemCommand.runCommand(rt, "open " + url);
-                    } else if (os.contains("nix") || os.contains("nux")) {
-                        SystemCommand.runCommand(rt, "xdg-open " + url);
-                    }
-                } catch (Exception e) {
-                    log.error("Error opening browser: {}", e.getMessage());
-                }
-            }
-        }
-        log.info("Running configs {}", applicationProperties.toString());
-    }
-
-    @PreDestroy
-    public void cleanup() {
-        if (webBrowser != null) {
-            webBrowser.cleanup();
-        }
-    }
-
-    public String getNonStaticBaseUrl() {
-        return baseUrlStatic;
-    }
-
    public String getNonStaticPort() {
        return serverPortStatic;
    }
--- a/src/main/java/stirling/software/SPDF/UI/WebBrowser.java
+++ b/src/main/java/stirling/software/SPDF/UI/WebBrowser.java
@@ -1,7 +0,0 @@
-package stirling.software.SPDF.UI;
-
-public interface WebBrowser {
-    void initWebUI(String url);
-
-    void cleanup();
-}
--- a/src/main/java/stirling/software/SPDF/UI/impl/DesktopBrowser.java
+++ b/src/main/java/stirling/software/SPDF/UI/impl/DesktopBrowser.java
@@ -1,354 +0,0 @@
-package stirling.software.SPDF.UI.impl;
-
-import java.awt.AWTException;
-import java.awt.BorderLayout;
-import java.awt.Frame;
-import java.awt.Image;
-import java.awt.MenuItem;
-import java.awt.PopupMenu;
-import java.awt.SystemTray;
-import java.awt.TrayIcon;
-import java.awt.event.WindowEvent;
-import java.awt.event.WindowStateListener;
-import java.io.File;
-import java.io.InputStream;
-import java.util.Objects;
-import java.util.concurrent.CompletableFuture;
-
-import javax.imageio.ImageIO;
-import javax.swing.JFrame;
-import javax.swing.JPanel;
-import javax.swing.SwingUtilities;
-import javax.swing.Timer;
-
-import org.cef.CefApp;
-import org.cef.CefClient;
-import org.cef.CefSettings;
-import org.cef.browser.CefBrowser;
-import org.cef.callback.CefBeforeDownloadCallback;
-import org.cef.callback.CefDownloadItem;
-import org.cef.callback.CefDownloadItemCallback;
-import org.cef.handler.CefDownloadHandlerAdapter;
-import org.cef.handler.CefLoadHandlerAdapter;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
-import org.springframework.stereotype.Component;
-
-import jakarta.annotation.PreDestroy;
-import lombok.extern.slf4j.Slf4j;
-import me.friwi.jcefmaven.CefAppBuilder;
-import me.friwi.jcefmaven.EnumProgress;
-import me.friwi.jcefmaven.MavenCefAppHandlerAdapter;
-import me.friwi.jcefmaven.impl.progress.ConsoleProgressHandler;
-import stirling.software.SPDF.UI.WebBrowser;
-
-@Component
-@Slf4j
-@ConditionalOnProperty(
-        name = "STIRLING_PDF_DESKTOP_UI",
-        havingValue = "true",
-        matchIfMissing = false)
-public class DesktopBrowser implements WebBrowser {
-    private static CefApp cefApp;
-    private static CefClient client;
-    private static CefBrowser browser;
-    private static JFrame frame;
-    private static LoadingWindow loadingWindow;
-    private static volatile boolean browserInitialized = false;
-    private static TrayIcon trayIcon;
-    private static SystemTray systemTray;
-
-    public DesktopBrowser() {
-        SwingUtilities.invokeLater(
-                () -> {
-                    loadingWindow = new LoadingWindow(null, "Initializing...");
-                    loadingWindow.setVisible(true);
-                });
-    }
-
-    public void initWebUI(String url) {
-        CompletableFuture.runAsync(
-                () -> {
-                    try {
-                        CefAppBuilder builder = new CefAppBuilder();
-                        configureCefSettings(builder);
-                        builder.setProgressHandler(createProgressHandler());
-
-                        // Build and initialize CEF
-                        cefApp = builder.build();
-                        client = cefApp.createClient();
-
-                        // Set up download handler
-                        setupDownloadHandler();
-
-                        // Create browser and frame on EDT
-                        SwingUtilities.invokeAndWait(
-                                () -> {
-                                    browser = client.createBrowser(url, false, false);
-                                    setupMainFrame();
-                                    setupLoadHandler();
-
-                                    // Show the frame immediately but transparent
-                                    frame.setVisible(true);
-                                });
-                    } catch (Exception e) {
-                        log.error("Error initializing JCEF browser: ", e);
-                        cleanup();
-                    }
-                });
-    }
-
-    private void configureCefSettings(CefAppBuilder builder) {
-        CefSettings settings = builder.getCefSettings();
-        settings.cache_path = new File("jcef-bundle").getAbsolutePath();
-        settings.root_cache_path = new File("jcef-bundle").getAbsolutePath();
-        settings.persist_session_cookies = true;
-        settings.windowless_rendering_enabled = false;
-        settings.log_severity = CefSettings.LogSeverity.LOGSEVERITY_INFO;
-
-        builder.setAppHandler(
-                new MavenCefAppHandlerAdapter() {
-                    @Override
-                    public void stateHasChanged(org.cef.CefApp.CefAppState state) {
-                        log.info("CEF state changed: " + state);
-                        if (state == CefApp.CefAppState.TERMINATED) {
-                            System.exit(0);
-                        }
-                    }
-                });
-    }
-
-    private void setupDownloadHandler() {
-        client.addDownloadHandler(
-                new CefDownloadHandlerAdapter() {
-                    @Override
-                    public boolean onBeforeDownload(
-                            CefBrowser browser,
-                            CefDownloadItem downloadItem,
-                            String suggestedName,
-                            CefBeforeDownloadCallback callback) {
-                        callback.Continue("", true);
-                        return true;
-                    }
-
-                    @Override
-                    public void onDownloadUpdated(
-                            CefBrowser browser,
-                            CefDownloadItem downloadItem,
-                            CefDownloadItemCallback callback) {
-                        if (downloadItem.isComplete()) {
-                            log.info("Download completed: " + downloadItem.getFullPath());
-                        } else if (downloadItem.isCanceled()) {
-                            log.info("Download canceled: " + downloadItem.getFullPath());
-                        }
-                    }
-                });
-    }
-
-    private ConsoleProgressHandler createProgressHandler() {
-        return new ConsoleProgressHandler() {
-            @Override
-            public void handleProgress(EnumProgress state, float percent) {
-                Objects.requireNonNull(state, "state cannot be null");
-                SwingUtilities.invokeLater(
-                        () -> {
-                            if (loadingWindow != null) {
-                                switch (state) {
-                                    case LOCATING:
-                                        loadingWindow.setStatus("Locating Files...");
-                                        loadingWindow.setProgress(0);
-                                        break;
-                                    case DOWNLOADING:
-                                        if (percent >= 0) {
-                                            loadingWindow.setStatus(
-                                                    String.format(
-                                                            "Downloading additional files: %.0f%%",
-                                                            percent));
-                                            loadingWindow.setProgress((int) percent);
-                                        }
-                                        break;
-                                    case EXTRACTING:
-                                        loadingWindow.setStatus("Extracting files...");
-                                        loadingWindow.setProgress(60);
-                                        break;
-                                    case INITIALIZING:
-                                        loadingWindow.setStatus("Initializing UI...");
-                                        loadingWindow.setProgress(80);
-                                        break;
-                                    case INITIALIZED:
-                                        loadingWindow.setStatus("Finalising startup...");
-                                        loadingWindow.setProgress(90);
-                                        break;
-                                }
-                            }
-                        });
-            }
-        };
-    }
-
-    private void setupMainFrame() {
-        frame = new JFrame("Stirling-PDF");
-        frame.setDefaultCloseOperation(JFrame.DO_NOTHING_ON_CLOSE);
-        frame.setUndecorated(true);
-        frame.setOpacity(0.0f);
-
-        JPanel contentPane = new JPanel(new BorderLayout());
-        contentPane.setDoubleBuffered(true);
-        contentPane.add(browser.getUIComponent(), BorderLayout.CENTER);
-        frame.setContentPane(contentPane);
-
-        frame.addWindowListener(
-                new java.awt.event.WindowAdapter() {
-                    @Override
-                    public void windowClosing(java.awt.event.WindowEvent windowEvent) {
-                        cleanup();
-                        System.exit(0);
-                    }
-                });
-
-        frame.setSize(1280, 768);
-        frame.setLocationRelativeTo(null);
-
-        loadIcon();
-    }
-
-    private void setupLoadHandler() {
-        client.addLoadHandler(
-                new CefLoadHandlerAdapter() {
-                    @Override
-                    public void onLoadingStateChange(
-                            CefBrowser browser,
-                            boolean isLoading,
-                            boolean canGoBack,
-                            boolean canGoForward) {
-                        if (!isLoading && !browserInitialized) {
-                            browserInitialized = true;
-                            SwingUtilities.invokeLater(
-                                    () -> {
-                                        if (loadingWindow != null) {
-                                            Timer timer =
-                                                    new Timer(
-                                                            500,
-                                                            e -> {
-                                                                loadingWindow.dispose();
-                                                                loadingWindow = null;
-
-                                                                frame.dispose();
-                                                                frame.setOpacity(1.0f);
-                                                                frame.setUndecorated(false);
-                                                                frame.pack();
-                                                                frame.setSize(1280, 800);
-                                                                frame.setLocationRelativeTo(null);
-                                                                frame.setVisible(true);
-                                                                frame.requestFocus();
-                                                                frame.toFront();
-                                                                browser.getUIComponent()
-                                                                        .requestFocus();
-                                                            });
-                                            timer.setRepeats(false);
-                                            timer.start();
-                                        }
-                                    });
-                        }
-                    }
-                });
-    }
-
-    private void setupTrayIcon(Image icon) {
-        if (!SystemTray.isSupported()) {
-            log.warn("System tray is not supported");
-            return;
-        }
-
-        try {
-            systemTray = SystemTray.getSystemTray();
-
-            // Create popup menu
-            PopupMenu popup = new PopupMenu();
-
-            // Create menu items
-            MenuItem showItem = new MenuItem("Show");
-            showItem.addActionListener(
-                    e -> {
-                        frame.setVisible(true);
-                        frame.setState(Frame.NORMAL);
-                    });
-
-            MenuItem exitItem = new MenuItem("Exit");
-            exitItem.addActionListener(
-                    e -> {
-                        cleanup();
-                        System.exit(0);
-                    });
-
-            // Add menu items to popup menu
-            popup.add(showItem);
-            popup.addSeparator();
-            popup.add(exitItem);
-
-            // Create tray icon
-            trayIcon = new TrayIcon(icon, "Stirling-PDF", popup);
-            trayIcon.setImageAutoSize(true);
-
-            // Add double-click behavior
-            trayIcon.addActionListener(
-                    e -> {
-                        frame.setVisible(true);
-                        frame.setState(Frame.NORMAL);
-                    });
-
-            // Add tray icon to system tray
-            systemTray.add(trayIcon);
-
-            // Modify frame behavior to minimize to tray
-            frame.addWindowStateListener(
-                    new WindowStateListener() {
-                        public void windowStateChanged(WindowEvent e) {
-                            if (e.getNewState() == Frame.ICONIFIED) {
-                                frame.setVisible(false);
-                            }
-                        }
-                    });
-
-        } catch (AWTException e) {
-            log.error("Error setting up system tray icon", e);
-        }
-    }
-
-    private void loadIcon() {
-        try {
-            Image icon = null;
-            String[] iconPaths = {"/static/favicon.ico"};
-
-            for (String path : iconPaths) {
-                if (icon != null) break;
-                try {
-                    try (InputStream is = getClass().getResourceAsStream(path)) {
-                        if (is != null) {
-                            icon = ImageIO.read(is);
-                            break;
-                        }
-                    }
-                } catch (Exception e) {
-                    log.debug("Could not load icon from " + path, e);
-                }
-            }
-
-            if (icon != null) {
-                frame.setIconImage(icon);
-                setupTrayIcon(icon);
-            } else {
-                log.warn("Could not load icon from any source");
-            }
-        } catch (Exception e) {
-            log.error("Error loading icon", e);
-        }
-    }
-
-    @PreDestroy
-    public void cleanup() {
-        if (browser != null) browser.close(true);
-        if (client != null) client.dispose();
-        if (cefApp != null) cefApp.dispose();
-        if (loadingWindow != null) loadingWindow.dispose();
-    }
-}
--- a/src/main/java/stirling/software/SPDF/UI/impl/LoadingWindow.java
+++ b/src/main/java/stirling/software/SPDF/UI/impl/LoadingWindow.java
@@ -1,114 +0,0 @@
-package stirling.software.SPDF.UI.impl;
-
-import java.awt.*;
-import java.io.InputStream;
-
-import javax.imageio.ImageIO;
-import javax.swing.*;
-
-import lombok.extern.slf4j.Slf4j;
-
-@Slf4j
-public class LoadingWindow extends JDialog {
-    private final JProgressBar progressBar;
-    private final JLabel statusLabel;
-    private final JPanel mainPanel;
-    private final JLabel brandLabel;
-
-    public LoadingWindow(Frame parent, String initialUrl) {
-        super(parent, "Initializing Stirling-PDF", true);
-
-        // Initialize components
-        mainPanel = new JPanel();
-        mainPanel.setBackground(Color.WHITE);
-        mainPanel.setBorder(BorderFactory.createEmptyBorder(20, 30, 20, 30));
-        mainPanel.setLayout(new GridBagLayout());
-        GridBagConstraints gbc = new GridBagConstraints();
-
-        // Configure GridBagConstraints
-        gbc.gridwidth = GridBagConstraints.REMAINDER;
-        gbc.fill = GridBagConstraints.HORIZONTAL;
-        gbc.insets = new Insets(5, 5, 5, 5);
-        gbc.weightx = 1.0; // Add horizontal weight
-        gbc.weighty = 0.0; // Add vertical weight
-
-        // Add icon
-        try {
-            try (InputStream is = getClass().getResourceAsStream("/static/favicon.ico")) {
-                if (is != null) {
-                    Image img = ImageIO.read(is);
-                    if (img != null) {
-                        Image scaledImg = img.getScaledInstance(48, 48, Image.SCALE_SMOOTH);
-                        JLabel iconLabel = new JLabel(new ImageIcon(scaledImg));
-                        iconLabel.setHorizontalAlignment(SwingConstants.CENTER);
-                        gbc.gridy = 0;
-                        mainPanel.add(iconLabel, gbc);
-                    }
-                }
-            }
-        } catch (Exception e) {
-            log.error("Failed to load icon", e);
-        }
-        // URL Label with explicit size
-        brandLabel = new JLabel(initialUrl);
-        brandLabel.setHorizontalAlignment(SwingConstants.CENTER);
-        brandLabel.setPreferredSize(new Dimension(300, 25));
-        brandLabel.setText("Stirling-PDF");
-        gbc.gridy = 1;
-        mainPanel.add(brandLabel, gbc);
-
-        // Status label with explicit size
-        statusLabel = new JLabel("Initializing...");
-        statusLabel.setHorizontalAlignment(SwingConstants.CENTER);
-        statusLabel.setPreferredSize(new Dimension(300, 25));
-        gbc.gridy = 2;
-        mainPanel.add(statusLabel, gbc);
-        // Progress bar with explicit size
-        progressBar = new JProgressBar(0, 100);
-        progressBar.setStringPainted(true);
-        progressBar.setPreferredSize(new Dimension(300, 25));
-        gbc.gridy = 3;
-        mainPanel.add(progressBar, gbc);
-
-        // Set dialog properties
-        setContentPane(mainPanel);
-        setDefaultCloseOperation(JDialog.DO_NOTHING_ON_CLOSE);
-        setResizable(false);
-        setUndecorated(false);
-
-        // Set size and position
-        setSize(400, 200);
-        setLocationRelativeTo(parent);
-        setAlwaysOnTop(true);
-        setProgress(0);
-        setStatus("Starting...");
-    }
-
-    public void setProgress(final int progress) {
-        SwingUtilities.invokeLater(
-                () -> {
-                    try {
-                        progressBar.setValue(Math.min(Math.max(progress, 0), 100));
-                        progressBar.setString(progress + "%");
-                        mainPanel.revalidate();
-                        mainPanel.repaint();
-                    } catch (Exception e) {
-                        log.error("Error updating progress", e);
-                    }
-                });
-    }
-
-    public void setStatus(final String status) {
-        log.info(status);
-        SwingUtilities.invokeLater(
-                () -> {
-                    try {
-                        statusLabel.setText(status != null ? status : "");
-                        mainPanel.revalidate();
-                        mainPanel.repaint();
-                    } catch (Exception e) {
-                        log.error("Error updating status", e);
-                    }
-                });
-    }
-}
--- a/src/main/java/stirling/software/SPDF/config/AppConfig.java
+++ b/src/main/java/stirling/software/SPDF/config/AppConfig.java
@@ -7,6 +7,9 @@ import java.nio.file.Paths;
 import java.util.Properties;
 import java.util.function.Predicate;

+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.context.annotation.Bean;
@@ -18,19 +21,15 @@ import org.springframework.core.io.Resource;
 import org.springframework.core.io.ResourceLoader;
 import org.thymeleaf.spring6.SpringTemplateEngine;

-import lombok.extern.slf4j.Slf4j;
 import stirling.software.SPDF.model.ApplicationProperties;

@Configuration
@Lazy
-@Slf4j
 public class AppConfig {

-    private final ApplicationProperties applicationProperties;
+    private static final Logger logger = LoggerFactory.getLogger(AppConfig.class);

-    public AppConfig(ApplicationProperties applicationProperties) {
-        this.applicationProperties = applicationProperties;
-    }
+    @Autowired ApplicationProperties applicationProperties;

    @Bean
    @ConditionalOnProperty(
@@ -62,7 +61,7 @@ public class AppConfig {
            props.load(resource.getInputStream());
            return props.getProperty("version");
        } catch (IOException e) {
-            log.error("exception", e);
+            logger.error("exception", e);
        }
        return "0.0.0";
    }
@@ -102,25 +101,6 @@ public class AppConfig {
        return Files.exists(Paths.get("/.dockerenv"));
    }

-    @Bean(name = "configDirMounted")
-    public boolean isRunningInDockerWithConfig() {
-        Path dockerEnv = Paths.get("/.dockerenv");
-        // default to true if not docker
-        if (!Files.exists(dockerEnv)) {
-            return true;
-        }
-        Path mountInfo = Paths.get("/proc/1/mountinfo");
-        // this should always exist, if not some unknown usecase
-        if (!Files.exists(mountInfo)) {
-            return true;
-        }
-        try {
-            return Files.lines(mountInfo).anyMatch(line -> line.contains(" /configs "));
-        } catch (IOException e) {
-            return false;
-        }
-    }
-
    @Bean(name = "bookAndHtmlFormatsInstalled")
    public boolean bookAndHtmlFormatsInstalled() {
        String installOps = System.getProperty("INSTALL_BOOK_AND_ADVANCED_HTML_OPS");
--- a/src/main/java/stirling/software/SPDF/config/AppUpdateService.java
+++ b/src/main/java/stirling/software/SPDF/config/AppUpdateService.java
@@ -11,16 +11,10 @@ import stirling.software.SPDF.model.ApplicationProperties;
@Service
 class AppUpdateService {

-    private final ApplicationProperties applicationProperties;
+    @Autowired private ApplicationProperties applicationProperties;

-    private final ShowAdminInterface showAdmin;
-
-    public AppUpdateService(
-            ApplicationProperties applicationProperties,
-            @Autowired(required = false) ShowAdminInterface showAdmin) {
-        this.applicationProperties = applicationProperties;
-        this.showAdmin = showAdmin;
-    }
+    @Autowired(required = false)
+    ShowAdminInterface showAdmin;

    @Bean(name = "shouldShow")
    @Scope("request")
--- a/src/main/java/stirling/software/SPDF/config/ConfigInitializer.java
+++ b/src/main/java/stirling/software/SPDF/config/ConfigInitializer.java
@@ -16,15 +16,16 @@ import org.simpleyaml.configuration.comments.CommentType;
 import org.simpleyaml.configuration.file.YamlFile;
 import org.simpleyaml.configuration.implementation.SimpleYamlImplementation;
 import org.simpleyaml.configuration.implementation.snakeyaml.lib.DumperOptions;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.context.ApplicationContextInitializer;
 import org.springframework.context.ConfigurableApplicationContext;

-import lombok.extern.slf4j.Slf4j;
-
-@Slf4j
 public class ConfigInitializer
        implements ApplicationContextInitializer<ConfigurableApplicationContext> {

+    private static final Logger logger = LoggerFactory.getLogger(ConfigInitializer.class);
+
    @Override
    public void initialize(ConfigurableApplicationContext applicationContext) {
        try {
@@ -148,7 +149,7 @@ public class ConfigInitializer
                    .commentSide(settingsTemplateFile.getComment(path, CommentType.SIDE));
        } else {
            // Log if the key is not found in both YAML files
-            log.info("Key not found in both YAML files: " + path);
+            logger.info("Key not found in both YAML files: " + path);
        }
    }
 }
--- a/src/main/java/stirling/software/SPDF/config/EndpointConfiguration.java
+++ b/src/main/java/stirling/software/SPDF/config/EndpointConfiguration.java
@@ -7,23 +7,24 @@ import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.stream.Collectors;

+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.context.annotation.DependsOn;
 import org.springframework.stereotype.Service;

-import lombok.extern.slf4j.Slf4j;
 import stirling.software.SPDF.model.ApplicationProperties;

@Service
-@Slf4j
@DependsOn({"bookAndHtmlFormatsInstalled"})
 public class EndpointConfiguration {
-
-    private static final String REMOVE_BLANKS = "remove-blanks";
-    private final ApplicationProperties applicationProperties;
+    private static final Logger logger = LoggerFactory.getLogger(EndpointConfiguration.class);
    private Map<String, Boolean> endpointStatuses = new ConcurrentHashMap<>();
    private Map<String, Set<String>> endpointGroups = new ConcurrentHashMap<>();
+
+    private final ApplicationProperties applicationProperties;
+
    private boolean bookAndHtmlFormatsInstalled;

    @Autowired
@@ -42,7 +43,7 @@ public class EndpointConfiguration {

    public void disableEndpoint(String endpoint) {
        if (!endpointStatuses.containsKey(endpoint) || endpointStatuses.get(endpoint) != false) {
-            log.debug("Disabling {}", endpoint);
+            logger.debug("Disabling {}", endpoint);
            endpointStatuses.put(endpoint, false);
        }
    }
@@ -86,7 +87,7 @@ public class EndpointConfiguration {
                        .collect(Collectors.toList());

        if (!disabledList.isEmpty()) {
-            log.info(
+            logger.info(
                    "Total disabled endpoints: {}. Disabled endpoints: {}",
                    disabledList.size(),
                    String.join(", ", disabledList));
@@ -259,9 +260,6 @@ public class EndpointConfiguration {

        // Pdftohtml dependent endpoints
        addEndpointToGroup("Pdftohtml", "pdf-to-html");
-
-        // disabled for now while we resolve issues
-        disableEndpoint("pdf-to-pdfa");
    }

    private void processEnvironmentConfigs() {
@@ -286,4 +284,6 @@ public class EndpointConfiguration {
    public Set<String> getEndpointsForGroup(String group) {
        return endpointGroups.getOrDefault(group, new HashSet<>());
    }
+
+    private static final String REMOVE_BLANKS = "remove-blanks";
 }
--- a/src/main/java/stirling/software/SPDF/config/EndpointInterceptor.java
+++ b/src/main/java/stirling/software/SPDF/config/EndpointInterceptor.java
@@ -1,5 +1,6 @@
 package stirling.software.SPDF.config;

+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import org.springframework.web.servlet.HandlerInterceptor;

@@ -9,11 +10,7 @@ import jakarta.servlet.http.HttpServletResponse;
@Component
 public class EndpointInterceptor implements HandlerInterceptor {

-    private final EndpointConfiguration endpointConfiguration;
-
-    public EndpointInterceptor(EndpointConfiguration endpointConfiguration) {
-        this.endpointConfiguration = endpointConfiguration;
-    }
+    @Autowired private EndpointConfiguration endpointConfiguration;

    @Override
    public boolean preHandle(
--- a/src/main/java/stirling/software/SPDF/config/ExternalAppDepConfig.java
+++ b/src/main/java/stirling/software/SPDF/config/ExternalAppDepConfig.java
@@ -6,6 +6,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;

+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Configuration;

 import jakarta.annotation.PostConstruct;
@@ -14,24 +15,7 @@ import lombok.extern.slf4j.Slf4j;
@Configuration
@Slf4j
 public class ExternalAppDepConfig {
-
-    private final EndpointConfiguration endpointConfiguration;
-    private final Map<String, List<String>> commandToGroupMapping =
-            new HashMap<>() {
-
-                {
-                    put("soffice", List.of("LibreOffice"));
-                    put("weasyprint", List.of("Weasyprint"));
-                    put("pdftohtml", List.of("Pdftohtml"));
-                    put("unoconv", List.of("Unoconv"));
-                    put("qpdf", List.of("qpdf"));
-                    put("tesseract", List.of("tesseract"));
-                }
-            };
-
-    public ExternalAppDepConfig(EndpointConfiguration endpointConfiguration) {
-        this.endpointConfiguration = endpointConfiguration;
-    }
+    @Autowired private EndpointConfiguration endpointConfiguration;

    private boolean isCommandAvailable(String command) {
        try {
@@ -50,6 +34,18 @@ public class ExternalAppDepConfig {
        }
    }

+    private final Map<String, List<String>> commandToGroupMapping =
+            new HashMap<>() {
+                {
+                    put("soffice", List.of("LibreOffice"));
+                    put("weasyprint", List.of("Weasyprint"));
+                    put("pdftohtml", List.of("Pdftohtml"));
+                    put("unoconv", List.of("Unoconv"));
+                    put("qpdf", List.of("qpdf"));
+                    put("tesseract", List.of("tesseract"));
+                }
+            };
+
    private List<String> getAffectedFeatures(String group) {
        return endpointConfiguration.getEndpointsForGroup(group).stream()
                .map(endpoint -> formatEndpointAsFeature(endpoint))
@@ -59,6 +55,7 @@ public class ExternalAppDepConfig {
    private String formatEndpointAsFeature(String endpoint) {
        // First replace common terms
        String feature = endpoint.replace("-", " ").replace("pdf", "PDF").replace("img", "image");
+
        // Split into words and capitalize each word
        return Arrays.stream(feature.split("\\s+"))
                .map(word -> capitalizeWord(word))
@@ -79,6 +76,7 @@ public class ExternalAppDepConfig {
        boolean isAvailable = isCommandAvailable(command);
        if (!isAvailable) {
            List<String> affectedGroups = commandToGroupMapping.get(command);
+
            if (affectedGroups != null) {
                for (String group : affectedGroups) {
                    List<String> affectedFeatures = getAffectedFeatures(group);
@@ -97,6 +95,7 @@ public class ExternalAppDepConfig {

    @PostConstruct
    public void checkDependencies() {
+
        // Check core dependencies
        checkDependencyAndDisableGroup("tesseract");
        checkDependencyAndDisableGroup("soffice");
@@ -104,11 +103,13 @@ public class ExternalAppDepConfig {
        checkDependencyAndDisableGroup("weasyprint");
        checkDependencyAndDisableGroup("pdftohtml");
        checkDependencyAndDisableGroup("unoconv");
+
        // Special handling for Python/OpenCV dependencies
        boolean pythonAvailable = isCommandAvailable("python3") || isCommandAvailable("python");
        if (!pythonAvailable) {
            List<String> pythonFeatures = getAffectedFeatures("Python");
            List<String> openCVFeatures = getAffectedFeatures("OpenCV");
+
            endpointConfiguration.disableGroup("Python");
            endpointConfiguration.disableGroup("OpenCV");
            log.warn(
--- a/src/main/java/stirling/software/SPDF/config/InitialSetup.java
+++ b/src/main/java/stirling/software/SPDF/config/InitialSetup.java
@@ -1,13 +1,11 @@
 package stirling.software.SPDF.config;

 import java.io.IOException;
-import java.util.Properties;
 import java.util.UUID;

+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.Ordered;
 import org.springframework.core.annotation.Order;
-import org.springframework.core.io.ClassPathResource;
-import org.springframework.core.io.Resource;
 import org.springframework.stereotype.Component;

 import io.micrometer.common.util.StringUtils;
@@ -22,80 +20,44 @@ import stirling.software.SPDF.utils.GeneralUtils;
@Order(Ordered.HIGHEST_PRECEDENCE + 1)
 public class InitialSetup {

-    private final ApplicationProperties applicationProperties;
-
-    public InitialSetup(ApplicationProperties applicationProperties) {
-        this.applicationProperties = applicationProperties;
-    }
+    @Autowired private ApplicationProperties applicationProperties;

    @PostConstruct
-    public void init() throws IOException {
-        initUUIDKey();
-        initSecretKey();
-        initEnableCSRFSecurity();
-        initLegalUrls();
-        initSetAppVersion();
-    }
-
    public void initUUIDKey() throws IOException {
        String uuid = applicationProperties.getAutomaticallyGenerated().getUUID();
        if (!GeneralUtils.isValidUUID(uuid)) {
-            // Generating a random UUID as the secret key
-            uuid = UUID.randomUUID().toString();
+            uuid = UUID.randomUUID().toString(); // Generating a random UUID as the secret key
            GeneralUtils.saveKeyToConfig("AutomaticallyGenerated.UUID", uuid);
            applicationProperties.getAutomaticallyGenerated().setUUID(uuid);
        }
    }

+    @PostConstruct
    public void initSecretKey() throws IOException {
        String secretKey = applicationProperties.getAutomaticallyGenerated().getKey();
        if (!GeneralUtils.isValidUUID(secretKey)) {
-            // Generating a random UUID as the secret key
-            secretKey = UUID.randomUUID().toString();
+            secretKey = UUID.randomUUID().toString(); // Generating a random UUID as the secret key
            GeneralUtils.saveKeyToConfig("AutomaticallyGenerated.key", secretKey);
            applicationProperties.getAutomaticallyGenerated().setKey(secretKey);
        }
    }

-    public void initEnableCSRFSecurity() throws IOException {
-        if (GeneralUtils.isVersionHigher(
-                "0.36.0", applicationProperties.getAutomaticallyGenerated().getAppVersion())) {
-            Boolean csrf = applicationProperties.getSecurity().getCsrfDisabled();
-            if (!csrf) {
-                GeneralUtils.saveKeyToConfig("security.csrfDisabled", false, false);
-                GeneralUtils.saveKeyToConfig("system.enableAnalytics", "true", false);
-                applicationProperties.getSecurity().setCsrfDisabled(false);
-            }
-        }
-    }
-
+    @PostConstruct
    public void initLegalUrls() throws IOException {
        // Initialize Terms and Conditions
        String termsUrl = applicationProperties.getLegal().getTermsAndConditions();
        if (StringUtils.isEmpty(termsUrl)) {
            String defaultTermsUrl = "https://www.stirlingpdf.com/terms-and-conditions";
-            GeneralUtils.saveKeyToConfig("legal.termsAndConditions", defaultTermsUrl, false);
+            GeneralUtils.saveKeyToConfig("legal.termsAndConditions", defaultTermsUrl);
            applicationProperties.getLegal().setTermsAndConditions(defaultTermsUrl);
        }
+
        // Initialize Privacy Policy
        String privacyUrl = applicationProperties.getLegal().getPrivacyPolicy();
        if (StringUtils.isEmpty(privacyUrl)) {
            String defaultPrivacyUrl = "https://www.stirlingpdf.com/privacy-policy";
-            GeneralUtils.saveKeyToConfig("legal.privacyPolicy", defaultPrivacyUrl, false);
+            GeneralUtils.saveKeyToConfig("legal.privacyPolicy", defaultPrivacyUrl);
            applicationProperties.getLegal().setPrivacyPolicy(defaultPrivacyUrl);
        }
    }
-
-    public void initSetAppVersion() throws IOException {
-        String appVersion = "0.0.0";
-        Resource resource = new ClassPathResource("version.properties");
-        Properties props = new Properties();
-        try {
-            props.load(resource.getInputStream());
-            appVersion = props.getProperty("version");
-        } catch (Exception e) {
-        }
-        applicationProperties.getAutomaticallyGenerated().setAppVersion(appVersion);
-        GeneralUtils.saveKeyToConfig("AutomaticallyGenerated.appVersion", appVersion, false);
-    }
 }
--- a/src/main/java/stirling/software/SPDF/config/LocaleConfiguration.java
+++ b/src/main/java/stirling/software/SPDF/config/LocaleConfiguration.java
@@ -2,6 +2,7 @@ package stirling.software.SPDF.config;

 import java.util.Locale;

+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.web.servlet.LocaleResolver;
@@ -15,11 +16,7 @@ import stirling.software.SPDF.model.ApplicationProperties;
@Configuration
 public class LocaleConfiguration implements WebMvcConfigurer {

-    private final ApplicationProperties applicationProperties;
-
-    public LocaleConfiguration(ApplicationProperties applicationProperties) {
-        this.applicationProperties = applicationProperties;
-    }
+    @Autowired ApplicationProperties applicationProperties;

    @Override
    public void addInterceptors(InterceptorRegistry registry) {
@@ -37,17 +34,21 @@ public class LocaleConfiguration implements WebMvcConfigurer {
    @Bean
    public LocaleResolver localeResolver() {
        SessionLocaleResolver slr = new SessionLocaleResolver();
+
        String appLocaleEnv = applicationProperties.getSystem().getDefaultLocale();
-        Locale defaultLocale = // Fallback to UK locale if environment variable is not set
-                Locale.UK;
+        Locale defaultLocale =
+                Locale.UK; // Fallback to UK locale if environment variable is not set
+
        if (appLocaleEnv != null && !appLocaleEnv.isEmpty()) {
            Locale tempLocale = Locale.forLanguageTag(appLocaleEnv);
            String tempLanguageTag = tempLocale.toLanguageTag();
+
            if (appLocaleEnv.equalsIgnoreCase(tempLanguageTag)) {
                defaultLocale = tempLocale;
            } else {
                tempLocale = Locale.forLanguageTag(appLocaleEnv.replace("_", "-"));
                tempLanguageTag = tempLocale.toLanguageTag();
+
                if (appLocaleEnv.equalsIgnoreCase(tempLanguageTag)) {
                    defaultLocale = tempLocale;
                } else {
@@ -56,6 +57,7 @@ public class LocaleConfiguration implements WebMvcConfigurer {
                }
            }
        }
+
        slr.setDefaultLocale(defaultLocale);
        return slr;
    }
--- a/src/main/java/stirling/software/SPDF/config/OpenApiConfig.java
+++ b/src/main/java/stirling/software/SPDF/config/OpenApiConfig.java
@@ -1,5 +1,6 @@
 package stirling.software.SPDF.config;

+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;

@@ -14,19 +15,15 @@ import stirling.software.SPDF.model.ApplicationProperties;
@Configuration
 public class OpenApiConfig {

-    private final ApplicationProperties applicationProperties;
-
-    public OpenApiConfig(ApplicationProperties applicationProperties) {
-        this.applicationProperties = applicationProperties;
-    }
+    @Autowired ApplicationProperties applicationProperties;

    @Bean
    public OpenAPI customOpenAPI() {
        String version = getClass().getPackage().getImplementationVersion();
        if (version == null) {
-            // default version if all else fails
-            version = "1.0.0";
+            version = "1.0.0"; // default version if all else fails
        }
+
        SecurityScheme apiKeyScheme =
                new SecurityScheme()
                        .type(SecurityScheme.Type.APIKEY)
--- a/src/main/java/stirling/software/SPDF/config/WebMvcConfig.java
+++ b/src/main/java/stirling/software/SPDF/config/WebMvcConfig.java
@@ -1,5 +1,6 @@
 package stirling.software.SPDF.config;

+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
 import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
@@ -8,11 +9,7 @@ import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
@Configuration
 public class WebMvcConfig implements WebMvcConfigurer {

-    private final EndpointInterceptor endpointInterceptor;
-
-    public WebMvcConfig(EndpointInterceptor endpointInterceptor) {
-        this.endpointInterceptor = endpointInterceptor;
-    }
+    @Autowired private EndpointInterceptor endpointInterceptor;

    @Override
    public void addInterceptors(InterceptorRegistry registry) {
--- a/src/main/java/stirling/software/SPDF/config/interfaces/DatabaseBackupInterface.java
+++ b/src/main/java/stirling/software/SPDF/config/interfaces/DatabaseBackupInterface.java
@@ -6,7 +6,6 @@ import java.util.List;
 import stirling.software.SPDF.utils.FileInfo;

 public interface DatabaseBackupInterface {
-
    void exportDatabase() throws IOException;

    boolean importDatabase();
--- a/src/main/java/stirling/software/SPDF/config/security/AppUpdateAuthService.java
+++ b/src/main/java/stirling/software/SPDF/config/security/AppUpdateAuthService.java
@@ -2,6 +2,7 @@ package stirling.software.SPDF.config.security;

 import java.util.Optional;

+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.stereotype.Service;
@@ -14,15 +15,8 @@ import stirling.software.SPDF.repository.UserRepository;
@Service
 class AppUpdateAuthService implements ShowAdminInterface {

-    private final UserRepository userRepository;
-
-    private final ApplicationProperties applicationProperties;
-
-    public AppUpdateAuthService(
-            UserRepository userRepository, ApplicationProperties applicationProperties) {
-        this.userRepository = userRepository;
-        this.applicationProperties = applicationProperties;
-    }
+    @Autowired private UserRepository userRepository;
+    @Autowired private ApplicationProperties applicationProperties;

    @Override
    public boolean getShowUpdateOnlyAdmins() {
@@ -30,18 +24,24 @@ class AppUpdateAuthService implements ShowAdminInterface {
        if (!showUpdate) {
            return showUpdate;
        }
+
        boolean showUpdateOnlyAdmin = applicationProperties.getSystem().getShowUpdateOnlyAdmin();
+
        Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
+
        if (authentication == null || !authentication.isAuthenticated()) {
            return !showUpdateOnlyAdmin;
        }
+
        if (authentication.getName().equalsIgnoreCase("anonymousUser")) {
            return !showUpdateOnlyAdmin;
        }
+
        Optional<User> user = userRepository.findByUsername(authentication.getName());
        if (user.isPresent() && showUpdateOnlyAdmin) {
            return "ROLE_ADMIN".equals(user.get().getRolesAsString());
        }
+
        return showUpdate;
    }
 }
--- a/src/main/java/stirling/software/SPDF/config/security/CustomLogoutSuccessHandler.java
+++ b/src/main/java/stirling/software/SPDF/config/security/CustomLogoutSuccessHandler.java
@@ -219,9 +219,9 @@ public class CustomLogoutSuccessHandler extends SimpleUrlLogoutSuccessHandler {
                // "https://accounts.google.com/Logout?continue=https://appengine.google.com/_ah/logout?continue="
                //                 + response.encodeRedirectURL(redirect_url);
                log.info("Google does not have a specific logout URL");
-            // log.info("Redirecting to Google logout URL: " + googleLogoutUrl);
-            // response.sendRedirect(googleLogoutUrl);
-            // break;
+                // log.info("Redirecting to Google logout URL: " + googleLogoutUrl);
+                // response.sendRedirect(googleLogoutUrl);
+                // break;
            default:
                String defaultRedirectUrl = request.getContextPath() + "/login?" + param;
                log.info("Redirecting to default logout URL: " + defaultRedirectUrl);
--- a/src/main/java/stirling/software/SPDF/config/security/CustomUserDetailsService.java
+++ b/src/main/java/stirling/software/SPDF/config/security/CustomUserDetailsService.java
@@ -4,6 +4,7 @@ import java.util.Collection;
 import java.util.Set;
 import java.util.stream.Collectors;

+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.authentication.LockedException;
 import org.springframework.security.core.GrantedAuthority;
 import org.springframework.security.core.authority.SimpleGrantedAuthority;
@@ -19,15 +20,9 @@ import stirling.software.SPDF.repository.UserRepository;
@Service
 public class CustomUserDetailsService implements UserDetailsService {

-    private final UserRepository userRepository;
+    @Autowired private UserRepository userRepository;

-    private final LoginAttemptService loginAttemptService;
-
-    public CustomUserDetailsService(
-            UserRepository userRepository, LoginAttemptService loginAttemptService) {
-        this.userRepository = userRepository;
-        this.loginAttemptService = loginAttemptService;
-    }
+    @Autowired private LoginAttemptService loginAttemptService;

    @Override
    public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException {
@@ -38,13 +33,16 @@ public class CustomUserDetailsService implements UserDetailsService {
                                () ->
                                        new UsernameNotFoundException(
                                                "No user found with username: " + username));
+
        if (loginAttemptService.isBlocked(username)) {
            throw new LockedException(
                    "Your account has been locked due to too many failed login attempts.");
        }
+
        if (!user.hasPassword()) {
            throw new IllegalArgumentException("Password must not be null");
        }
+
        return new org.springframework.security.core.userdetails.User(
                user.getUsername(),
                user.getPassword(),
--- a/src/main/java/stirling/software/SPDF/config/security/FirstLoginFilter.java
+++ b/src/main/java/stirling/software/SPDF/config/security/FirstLoginFilter.java
@@ -5,6 +5,7 @@ import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.Optional;

+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.context.SecurityContextHolder;
@@ -24,11 +25,7 @@ import stirling.software.SPDF.utils.RequestUriUtils;
@Component
 public class FirstLoginFilter extends OncePerRequestFilter {

-    @Lazy private final UserService userService;
-
-    public FirstLoginFilter(@Lazy UserService userService) {
-        this.userService = userService;
-    }
+    @Autowired @Lazy private UserService userService;

    @Override
    protected void doFilterInternal(
@@ -37,13 +34,16 @@ public class FirstLoginFilter extends OncePerRequestFilter {
        String method = request.getMethod();
        String requestURI = request.getRequestURI();
        String contextPath = request.getContextPath();
+
        // Check if the request is for static resources
        boolean isStaticResource = RequestUriUtils.isStaticResource(contextPath, requestURI);
+
        // If it's a static resource, just continue the filter chain and skip the logic below
        if (isStaticResource) {
            filterChain.doFilter(request, response);
            return;
        }
+
        Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
        if (authentication != null && authentication.isAuthenticated()) {
            Optional<User> user = userService.findByUsernameIgnoreCase(authentication.getName());
@@ -55,10 +55,12 @@ public class FirstLoginFilter extends OncePerRequestFilter {
                return;
            }
        }
+
        if (log.isDebugEnabled()) {
            HttpSession session = request.getSession(true);
            SimpleDateFormat timeFormat = new SimpleDateFormat("HH:mm:ss");
            String creationTime = timeFormat.format(new Date(session.getCreationTime()));
+
            log.debug(
                    "Request Info - New: {}, creationTimeSession {}, ID:  {}, IP: {}, User-Agent: {}, Referer: {}, Request URL: {}",
                    session.isNew(),
--- a/src/main/java/stirling/software/SPDF/config/security/IPRateLimitingFilter.java
+++ b/src/main/java/stirling/software/SPDF/config/security/IPRateLimitingFilter.java
@@ -4,7 +4,11 @@ import java.io.IOException;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.atomic.AtomicInteger;

-import jakarta.servlet.*;
+import jakarta.servlet.Filter;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
 import jakarta.servlet.http.HttpServletRequest;
 import stirling.software.SPDF.utils.RequestUriUtils;

--- a/src/main/java/stirling/software/SPDF/config/security/InitialSecuritySetup.java
+++ b/src/main/java/stirling/software/SPDF/config/security/InitialSecuritySetup.java
@@ -3,6 +3,7 @@ package stirling.software.SPDF.config.security;
 import java.io.IOException;
 import java.util.UUID;

+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;

 import jakarta.annotation.PostConstruct;
@@ -15,20 +16,11 @@ import stirling.software.SPDF.model.Role;
@Slf4j
 public class InitialSecuritySetup {

-    private final UserService userService;
+    @Autowired private UserService userService;

-    private final ApplicationProperties applicationProperties;
+    @Autowired private ApplicationProperties applicationProperties;

-    private final DatabaseBackupInterface databaseBackupHelper;
-
-    public InitialSecuritySetup(
-            UserService userService,
-            ApplicationProperties applicationProperties,
-            DatabaseBackupInterface databaseBackupHelper) {
-        this.userService = userService;
-        this.applicationProperties = applicationProperties;
-        this.databaseBackupHelper = databaseBackupHelper;
-    }
+    @Autowired private DatabaseBackupInterface databaseBackupHelper;

    @PostConstruct
    public void init() throws IllegalArgumentException, IOException {
@@ -83,6 +75,5 @@ public class InitialSecuritySetup {
            userService.addApiKeyToUser(Role.INTERNAL_API_USER.getRoleId());
            log.info("Internal API user created: " + Role.INTERNAL_API_USER.getRoleId());
        }
-        userService.syncCustomApiUser(applicationProperties.getSecurity().getCustomGlobalAPIKey());
    }
 }
--- a/src/main/java/stirling/software/SPDF/config/security/LoginAttemptService.java
+++ b/src/main/java/stirling/software/SPDF/config/security/LoginAttemptService.java
@@ -3,6 +3,7 @@ package stirling.software.SPDF.config.security;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.TimeUnit;

+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

 import jakarta.annotation.PostConstruct;
@@ -14,20 +15,13 @@ import stirling.software.SPDF.model.AttemptCounter;
@Slf4j
 public class LoginAttemptService {

-    private final ApplicationProperties applicationProperties;
+    @Autowired private ApplicationProperties applicationProperties;

    private int MAX_ATTEMPT;
-
    private long ATTEMPT_INCREMENT_TIME;
-
    private ConcurrentHashMap<String, AttemptCounter> attemptsCache;
-
    private boolean isBlockedEnabled = true;

-    public LoginAttemptService(ApplicationProperties applicationProperties) {
-        this.applicationProperties = applicationProperties;
-    }
-
    @PostConstruct
    public void init() {
        MAX_ATTEMPT = applicationProperties.getSecurity().getLoginAttemptCount();
@@ -52,6 +46,7 @@ public class LoginAttemptService {
        if (!isBlockedEnabled || key == null || key.trim().isEmpty()) {
            return;
        }
+
        AttemptCounter attemptCounter = attemptsCache.get(key.toLowerCase());
        if (attemptCounter == null) {
            attemptCounter = new AttemptCounter();
@@ -72,18 +67,20 @@ public class LoginAttemptService {
        if (attemptCounter == null) {
            return false;
        }
+
        return attemptCounter.getAttemptCount() >= MAX_ATTEMPT;
    }

    public int getRemainingAttempts(String key) {
        if (!isBlockedEnabled || key == null || key.trim().isEmpty()) {
-            // Arbitrarily high number if tracking is disabled
-            return Integer.MAX_VALUE;
+            return Integer.MAX_VALUE; // Arbitrarily high number if tracking is disabled
        }
+
        AttemptCounter attemptCounter = attemptsCache.get(key.toLowerCase());
        if (attemptCounter == null) {
            return MAX_ATTEMPT;
        }
+
        return MAX_ATTEMPT - attemptCounter.getAttemptCount();
    }
 }
--- a/src/main/java/stirling/software/SPDF/config/security/SecurityConfiguration.java
+++ b/src/main/java/stirling/software/SPDF/config/security/SecurityConfiguration.java
@@ -1,9 +1,11 @@
 package stirling.software.SPDF.config.security;

+import java.io.IOException;
 import java.security.cert.X509Certificate;
 import java.util.*;

 import org.opensaml.saml.saml2.core.AuthnRequest;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.context.annotation.Bean;
@@ -11,6 +13,7 @@ import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.DependsOn;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.core.io.Resource;
+import org.springframework.security.authentication.AuthenticationProvider;
 import org.springframework.security.authentication.ProviderManager;
 import org.springframework.security.authentication.dao.DaoAuthenticationProvider;
 import org.springframework.security.config.annotation.method.configuration.EnableMethodSecurity;
@@ -29,21 +32,35 @@ import org.springframework.security.oauth2.client.registration.InMemoryClientReg
 import org.springframework.security.oauth2.core.user.OAuth2UserAuthority;
 import org.springframework.security.saml2.core.Saml2X509Credential;
 import org.springframework.security.saml2.core.Saml2X509Credential.Saml2X509CredentialType;
+import org.springframework.security.saml2.provider.service.authentication.AbstractSaml2AuthenticationRequest;
 import org.springframework.security.saml2.provider.service.authentication.OpenSaml4AuthenticationProvider;
 import org.springframework.security.saml2.provider.service.registration.InMemoryRelyingPartyRegistrationRepository;
 import org.springframework.security.saml2.provider.service.registration.RelyingPartyRegistration;
 import org.springframework.security.saml2.provider.service.registration.RelyingPartyRegistrationRepository;
 import org.springframework.security.saml2.provider.service.registration.Saml2MessageBinding;
+import org.springframework.security.saml2.provider.service.web.HttpSessionSaml2AuthenticationRequestRepository;
+import org.springframework.security.saml2.provider.service.web.Saml2AuthenticationRequestRepository;
 import org.springframework.security.saml2.provider.service.web.authentication.OpenSaml4AuthenticationRequestResolver;
 import org.springframework.security.web.SecurityFilterChain;
 import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter;
 import org.springframework.security.web.authentication.rememberme.PersistentTokenRepository;
+import org.springframework.security.web.authentication.session.RegisterSessionAuthenticationStrategy;
+import org.springframework.security.web.context.SecurityContextHolderFilter;
 import org.springframework.security.web.csrf.CookieCsrfTokenRepository;
 import org.springframework.security.web.csrf.CsrfTokenRequestAttributeHandler;
 import org.springframework.security.web.savedrequest.NullRequestCache;
+import org.springframework.security.web.session.ForceEagerSessionCreationFilter;
+import org.springframework.security.web.session.HttpSessionEventPublisher;
+import org.springframework.security.web.session.SessionManagementFilter;
 import org.springframework.security.web.util.matcher.AntPathRequestMatcher;
+import org.springframework.session.web.http.CookieSerializer;
+import org.springframework.session.web.http.DefaultCookieSerializer;
+import org.springframework.web.filter.OncePerRequestFilter;

+import jakarta.servlet.FilterChain;
+import jakarta.servlet.ServletException;
 import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import lombok.extern.slf4j.Slf4j;
 import stirling.software.SPDF.config.security.oauth2.CustomOAuth2AuthenticationFailureHandler;
 import stirling.software.SPDF.config.security.oauth2.CustomOAuth2AuthenticationSuccessHandler;
@@ -62,7 +79,6 @@ import stirling.software.SPDF.model.provider.GithubProvider;
 import stirling.software.SPDF.model.provider.GoogleProvider;
 import stirling.software.SPDF.model.provider.KeycloakProvider;
 import stirling.software.SPDF.repository.JPATokenRepositoryImpl;
-import stirling.software.SPDF.repository.PersistentLoginRepository;

@Configuration
@EnableWebSecurity
@@ -71,64 +87,38 @@ import stirling.software.SPDF.repository.PersistentLoginRepository;
@DependsOn("runningEE")
 public class SecurityConfiguration {

-    private final CustomUserDetailsService userDetailsService;
-    @Lazy private final UserService userService;
-
-    @Qualifier("loginEnabled")
-    private final boolean loginEnabledValue;
-
-    @Qualifier("runningEE")
-    private final boolean runningEE;
-
-    private final ApplicationProperties applicationProperties;
-    private final UserAuthenticationFilter userAuthenticationFilter;
-    private final LoginAttemptService loginAttemptService;
-    private final FirstLoginFilter firstLoginFilter;
-    private final SessionPersistentRegistry sessionRegistry;
-    private final PersistentLoginRepository persistentLoginRepository;
-
-    //    // Only Dev test
-    //    @Bean
-    //    public WebSecurityCustomizer webSecurityCustomizer() {
-    //        return (web) ->
-    //                web.ignoring()
-    //                        .requestMatchers(
-    //                                "/css/**", "/images/**", "/js/**", "/**.svg",
-    // "/pdfjs-legacy/**");
-    //    }
-    public SecurityConfiguration(
-            PersistentLoginRepository persistentLoginRepository,
-            CustomUserDetailsService userDetailsService,
-            @Lazy UserService userService,
-            @Qualifier("loginEnabled") boolean loginEnabledValue,
-            @Qualifier("runningEE") boolean runningEE,
-            ApplicationProperties applicationProperties,
-            UserAuthenticationFilter userAuthenticationFilter,
-            LoginAttemptService loginAttemptService,
-            FirstLoginFilter firstLoginFilter,
-            SessionPersistentRegistry sessionRegistry) {
-        this.userDetailsService = userDetailsService;
-        this.userService = userService;
-        this.loginEnabledValue = loginEnabledValue;
-        this.runningEE = runningEE;
-        this.applicationProperties = applicationProperties;
-        this.userAuthenticationFilter = userAuthenticationFilter;
-        this.loginAttemptService = loginAttemptService;
-        this.firstLoginFilter = firstLoginFilter;
-        this.sessionRegistry = sessionRegistry;
-        this.persistentLoginRepository = persistentLoginRepository;
-    }
+    @Autowired private CustomUserDetailsService userDetailsService;

    @Bean
    public PasswordEncoder passwordEncoder() {
        return new BCryptPasswordEncoder();
    }

+    @Autowired @Lazy private UserService userService;
+
+    @Autowired
+    @Qualifier("loginEnabled")
+    public boolean loginEnabledValue;
+
+    @Autowired
+    @Qualifier("runningEE")
+    public boolean runningEE;
+
+    @Autowired ApplicationProperties applicationProperties;
+
+    @Autowired private UserAuthenticationFilter userAuthenticationFilter;
+
+    @Autowired private LoginAttemptService loginAttemptService;
+
+    @Autowired private FirstLoginFilter firstLoginFilter;
+    @Autowired private SessionPersistentRegistry sessionRegistry;
+
    @Bean
    public SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
-        if (applicationProperties.getSecurity().getCsrfDisabled() || !loginEnabledValue) {
+        if (applicationProperties.getSecurity().getCsrfDisabled()) {
            http.csrf(csrf -> csrf.disable());
        }
+
        if (loginEnabledValue) {
            http.addFilterBefore(
                    userAuthenticationFilter, UsernamePasswordAuthenticationFilter.class);
@@ -142,12 +132,14 @@ public class SecurityConfiguration {
                        csrf ->
                                csrf.ignoringRequestMatchers(
                                                request -> {
-                                                    String apiKey = request.getHeader("X-API-KEY");
+                                                    String apiKey = request.getHeader("X-API-Key");
+
                                                    // If there's no API key, don't ignore CSRF
                                                    // (return false)
                                                    if (apiKey == null || apiKey.trim().isEmpty()) {
                                                        return false;
                                                    }
+
                                                    // Validate API key using existing UserService
                                                    try {
                                                        Optional<User> user =
@@ -171,11 +163,12 @@ public class SecurityConfiguration {
            http.sessionManagement(
                    sessionManagement ->
                            sessionManagement
-                                    .sessionCreationPolicy(SessionCreationPolicy.IF_REQUIRED)
+                            .sessionCreationPolicy(SessionCreationPolicy.IF_REQUIRED)
                                    .maximumSessions(10)
                                    .maxSessionsPreventsLogin(false)
                                    .sessionRegistry(sessionRegistry)
                                    .expiredUrl("/login?logout=true"));
+
            http.authenticationProvider(daoAuthenticationProvider());
            http.requestCache(requestCache -> requestCache.requestCache(new NullRequestCache()));
            http.logout(
@@ -184,23 +177,18 @@ public class SecurityConfiguration {
                                    .logoutSuccessHandler(
                                            new CustomLogoutSuccessHandler(applicationProperties))
                                    .clearAuthentication(true)
-                                    .invalidateHttpSession( // Invalidate session
-                                            true)
+                                    .invalidateHttpSession(true) // Invalidate session
                                    .deleteCookies("JSESSIONID", "remember-me"));
            http.rememberMe(
-                    rememberMeConfigurer -> // Use the configurator directly
-                    rememberMeConfigurer
+                    rememberMeConfigurer ->
+                            rememberMeConfigurer // Use the configurator directly
                                    .tokenRepository(persistentTokenRepository())
-                                    .tokenValiditySeconds( // 14 days
-                                            14 * 24 * 60 * 60)
-                                    .userDetailsService( // Your existing UserDetailsService
-                                            userDetailsService)
-                                    .useSecureCookie( // Enable secure cookie
-                                            true)
-                                    .rememberMeParameter( // Form parameter name
-                                            "remember-me")
-                                    .rememberMeCookieName( // Cookie name
-                                            "remember-me")
+                                    .tokenValiditySeconds(14 * 24 * 60 * 60) // 14 days
+                                    .userDetailsService(
+                                            userDetailsService) // Your existing UserDetailsService
+                                    .useSecureCookie(true) // Enable secure cookie
+                                    .rememberMeParameter("remember-me") // Form parameter name
+                                    .rememberMeCookieName("remember-me") // Cookie name
                                    .alwaysRemember(false));
            http.authorizeHttpRequests(
                    authz ->
@@ -208,12 +196,14 @@ public class SecurityConfiguration {
                                            req -> {
                                                String uri = req.getRequestURI();
                                                String contextPath = req.getContextPath();
+
                                                // Remove the context path from the URI
                                                String trimmedUri =
                                                        uri.startsWith(contextPath)
                                                                ? uri.substring(
                                                                        contextPath.length())
                                                                : uri;
+
                                                return trimmedUri.startsWith("/login")
                                                        || trimmedUri.startsWith("/oauth")
                                                        || trimmedUri.startsWith("/saml2")
@@ -231,6 +221,7 @@ public class SecurityConfiguration {
                                    .permitAll()
                                    .anyRequest()
                                    .authenticated());
+
            // Handle User/Password Logins
            if (applicationProperties.getSecurity().isUserPass()) {
                http.formLogin(
@@ -246,26 +237,27 @@ public class SecurityConfiguration {
                                        .defaultSuccessUrl("/")
                                        .permitAll());
            }
+
            // Handle OAUTH2 Logins
            if (applicationProperties.getSecurity().isOauth2Activ()) {
+
                http.oauth2Login(
                        oauth2 ->
                                oauth2.loginPage("/oauth2")
-                                        .
                                        /*
                                        This Custom handler is used to check if the OAUTH2 user trying to log in, already exists in the database.
                                        If user exists, login proceeds as usual. If user does not exist, then it is autocreated but only if 'OAUTH2AutoCreateUser'
                                        is set as true, else login fails with an error message advising the same.
                                         */
-                                        successHandler(
+                                        .successHandler(
                                                new CustomOAuth2AuthenticationSuccessHandler(
                                                        loginAttemptService,
                                                        applicationProperties,
                                                        userService))
                                        .failureHandler(
                                                new CustomOAuth2AuthenticationFailureHandler())
-                                        . // Add existing Authorities from the database
-                                        userInfoEndpoint(
+                                        // Add existing Authorities from the database
+                                        .userInfoEndpoint(
                                                userInfoEndpoint ->
                                                        userInfoEndpoint
                                                                .oidcUserService(
@@ -277,14 +269,15 @@ public class SecurityConfiguration {
                                                                        userAuthoritiesMapper()))
                                        .permitAll());
            }
+
            // Handle SAML
-            if (applicationProperties.getSecurity().isSaml2Activ()) {
-                // && runningEE
+            if (applicationProperties.getSecurity().isSaml2Activ()) { // && runningEE
                // Configure the authentication provider
                OpenSaml4AuthenticationProvider authenticationProvider =
                        new OpenSaml4AuthenticationProvider();
                authenticationProvider.setResponseAuthenticationConverter(
                        new CustomSaml2ResponseAuthenticationConverter(userService));
+
                http.authenticationProvider(authenticationProvider)
                        .saml2Login(
                                saml2 -> {
@@ -294,6 +287,7 @@ public class SecurityConfiguration {
                                                        relyingPartyRegistrations())
                                                .authenticationManager(
                                                        new ProviderManager(authenticationProvider))
+                                     
                                                .successHandler(
                                                        new CustomSaml2AuthenticationSuccessHandler(
                                                                loginAttemptService,
@@ -310,20 +304,22 @@ public class SecurityConfiguration {
                                    }
                                });
            }
+
        } else {
-            //            if (!applicationProperties.getSecurity().getCsrfDisabled()) {
-            //                CookieCsrfTokenRepository cookieRepo =
-            //                        CookieCsrfTokenRepository.withHttpOnlyFalse();
-            //                CsrfTokenRequestAttributeHandler requestHandler =
-            //                        new CsrfTokenRequestAttributeHandler();
-            //                requestHandler.setCsrfRequestAttributeName(null);
-            //                http.csrf(
-            //                        csrf ->
-            //                                csrf.csrfTokenRepository(cookieRepo)
-            //                                        .csrfTokenRequestHandler(requestHandler));
-            //            }
+            if (!applicationProperties.getSecurity().getCsrfDisabled()) {
+                CookieCsrfTokenRepository cookieRepo =
+                        CookieCsrfTokenRepository.withHttpOnlyFalse();
+                CsrfTokenRequestAttributeHandler requestHandler =
+                        new CsrfTokenRequestAttributeHandler();
+                requestHandler.setCsrfRequestAttributeName(null);
+                http.csrf(
+                        csrf ->
+                                csrf.csrfTokenRepository(cookieRepo)
+                                        .csrfTokenRequestHandler(requestHandler));
+            }
            http.authorizeHttpRequests(authz -> authz.anyRequest().permitAll());
        }
+
        return http.build();
    }

@@ -334,14 +330,17 @@ public class SecurityConfiguration {
            matchIfMissing = false)
    public ClientRegistrationRepository clientRegistrationRepository() {
        List<ClientRegistration> registrations = new ArrayList<>();
+
        githubClientRegistration().ifPresent(registrations::add);
        oidcClientRegistration().ifPresent(registrations::add);
        googleClientRegistration().ifPresent(registrations::add);
        keycloakClientRegistration().ifPresent(registrations::add);
+
        if (registrations.isEmpty()) {
            log.error("At least one OAuth2 provider must be configured");
            System.exit(1);
        }
+
        return new InMemoryClientRegistrationRepository(registrations);
    }

@@ -384,6 +383,7 @@ public class SecurityConfiguration {
            return Optional.empty();
        }
        KeycloakProvider keycloak = client.getKeycloak();
+
        return keycloak != null && keycloak.isSettingsValid()
                ? Optional.of(
                        ClientRegistrations.fromIssuerLocation(keycloak.getIssuer())
@@ -398,6 +398,7 @@ public class SecurityConfiguration {
    }

    private Optional<ClientRegistration> githubClientRegistration() {
+
        OAUTH2 oauth = applicationProperties.getSecurity().getOauth2();
        if (oauth == null || !oauth.getEnabled()) {
            return Optional.empty();
@@ -451,7 +452,7 @@ public class SecurityConfiguration {
                        .clientName("OIDC")
                        .build());
    }
-
+    
    @Bean
    @ConditionalOnProperty(
            name = "security.saml2.enabled",
@@ -459,15 +460,19 @@ public class SecurityConfiguration {
            matchIfMissing = false)
    public RelyingPartyRegistrationRepository relyingPartyRegistrations() throws Exception {
        SAML2 samlConf = applicationProperties.getSecurity().getSaml2();
+
        X509Certificate idpCert = CertificateUtils.readCertificate(samlConf.getidpCert());
        Saml2X509Credential verificationCredential = Saml2X509Credential.verification(idpCert);
+
        Resource privateKeyResource = samlConf.getPrivateKey();
        Resource certificateResource = samlConf.getSpCert();
+
        Saml2X509Credential signingCredential =
                new Saml2X509Credential(
                        CertificateUtils.readPrivateKey(privateKeyResource),
                        CertificateUtils.readCertificate(certificateResource),
                        Saml2X509CredentialType.SIGNING);
+
        RelyingPartyRegistration rp =
                RelyingPartyRegistration.withRegistrationId(samlConf.getRegistrationId())
                        .signingX509Credentials(c -> c.add(signingCredential))
@@ -482,6 +487,7 @@ public class SecurityConfiguration {
                                                        Saml2MessageBinding.POST)
                                                .wantAuthnRequestsSigned(true))
                        .build();
+
        return new InMemoryRelyingPartyRegistrationRepository(rp);
    }

@@ -497,8 +503,10 @@ public class SecurityConfiguration {
        resolver.setAuthnRequestCustomizer(
                customizer -> {
                    log.debug("Customizing SAML Authentication request");
+
                    AuthnRequest authnRequest = customizer.getAuthnRequest();
                    log.debug("AuthnRequest ID: {}", authnRequest.getID());
+                    
                    if (authnRequest.getID() == null) {
                        authnRequest.setID("ARQ" + UUID.randomUUID().toString());
                    }
@@ -509,13 +517,16 @@ public class SecurityConfiguration {
                            authnRequest.getIssuer() != null
                                    ? authnRequest.getIssuer().getValue()
                                    : "null");
+
                    HttpServletRequest request = customizer.getRequest();
+
                    // Log HTTP request details
                    log.debug("HTTP Request Method: {}", request.getMethod());
                    log.debug("Request URI: {}", request.getRequestURI());
                    log.debug("Request URL: {}", request.getRequestURL().toString());
                    log.debug("Query String: {}", request.getQueryString());
                    log.debug("Remote Address: {}", request.getRemoteAddr());
+
                    // Log headers
                    Collections.list(request.getHeaderNames())
                            .forEach(
@@ -525,20 +536,24 @@ public class SecurityConfiguration {
                                                headerName,
                                                request.getHeader(headerName));
                                    });
+
                    // Log SAML specific parameters
                    log.debug("SAML Request Parameters:");
                    log.debug("SAMLRequest: {}", request.getParameter("SAMLRequest"));
                    log.debug("RelayState: {}", request.getParameter("RelayState"));
+
                    // Log session debugrmation if exists
                    if (request.getSession(false) != null) {
                        log.debug("Session ID: {}", request.getSession().getId());
                    }
+
                    // Log any assertions consumer service details if present
                    if (authnRequest.getAssertionConsumerServiceURL() != null) {
                        log.debug(
                                "AssertionConsumerServiceURL: {}",
                                authnRequest.getAssertionConsumerServiceURL());
                    }
+
                    // Log NameID policy if present
                    if (authnRequest.getNameIDPolicy() != null) {
                        log.debug(
@@ -568,10 +583,12 @@ public class SecurityConfiguration {
    GrantedAuthoritiesMapper userAuthoritiesMapper() {
        return (authorities) -> {
            Set<GrantedAuthority> mappedAuthorities = new HashSet<>();
+
            authorities.forEach(
                    authority -> {
                        // Add existing OAUTH2 Authorities
                        mappedAuthorities.add(new SimpleGrantedAuthority(authority.getAuthority()));
+
                        // Add Authorities from database for existing user, if user is present.
                        if (authority instanceof OAuth2UserAuthority oauth2Auth) {
                            String useAsUsername =
@@ -598,18 +615,27 @@ public class SecurityConfiguration {

    @Bean
    public IPRateLimitingFilter rateLimitingFilter() {
-        // Example limit TODO add config level
-        int maxRequestsPerIp = 1000000;
+        int maxRequestsPerIp = 1000000; // Example limit TODO add config level
        return new IPRateLimitingFilter(maxRequestsPerIp, maxRequestsPerIp);
    }

    @Bean
    public PersistentTokenRepository persistentTokenRepository() {
-        return new JPATokenRepositoryImpl(persistentLoginRepository);
+        return new JPATokenRepositoryImpl();
    }

    @Bean
    public boolean activSecurity() {
        return true;
    }
+
+    //    // Only Dev test
+    //    @Bean
+    //    public WebSecurityCustomizer webSecurityCustomizer() {
+    //        return (web) ->
+    //                web.ignoring()
+    //                        .requestMatchers(
+    //                                "/css/**", "/images/**", "/js/**", "/**.svg",
+    // "/pdfjs-legacy/**");
+    //    }
 }
--- a/src/main/java/stirling/software/SPDF/config/security/UserAuthenticationFilter.java
+++ b/src/main/java/stirling/software/SPDF/config/security/UserAuthenticationFilter.java
@@ -71,7 +71,7 @@ public class UserAuthenticationFilter extends OncePerRequestFilter {

        // Check for API key in the request headers if no authentication exists
        if (authentication == null || !authentication.isAuthenticated()) {
-            String apiKey = request.getHeader("X-API-KEY");
+            String apiKey = request.getHeader("X-API-Key");
            if (apiKey != null && !apiKey.trim().isEmpty()) {
                try {
                    // Use API key to authenticate. This requires you to have an authentication
--- a/src/main/java/stirling/software/SPDF/config/security/UserBasedRateLimitingFilter.java
+++ b/src/main/java/stirling/software/SPDF/config/security/UserBasedRateLimitingFilter.java
@@ -5,12 +5,14 @@ import java.time.Duration;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;

+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.http.HttpStatus;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.GrantedAuthority;
 import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.security.core.userdetails.UserDetails;
+import org.springframework.security.core.userdetails.UserDetailsService;
 import org.springframework.stereotype.Component;
 import org.springframework.web.filter.OncePerRequestFilter;

@@ -29,15 +31,13 @@ import stirling.software.SPDF.model.Role;
 public class UserBasedRateLimitingFilter extends OncePerRequestFilter {

    private final Map<String, Bucket> apiBuckets = new ConcurrentHashMap<>();
-
    private final Map<String, Bucket> webBuckets = new ConcurrentHashMap<>();

-    @Qualifier("rateLimit")
-    private final boolean rateLimit;
+    @Autowired private UserDetailsService userDetailsService;

-    public UserBasedRateLimitingFilter(@Qualifier("rateLimit") boolean rateLimit) {
-        this.rateLimit = rateLimit;
-    }
+    @Autowired
+    @Qualifier("rateLimit")
+    public boolean rateLimit;

    @Override
    protected void doFilterInternal(
@@ -48,18 +48,21 @@ public class UserBasedRateLimitingFilter extends OncePerRequestFilter {
            filterChain.doFilter(request, response);
            return;
        }
+
        String method = request.getMethod();
        if (!"POST".equalsIgnoreCase(method)) {
            // If the request is not a POST, just pass it through without rate limiting
            filterChain.doFilter(request, response);
            return;
        }
+
        String identifier = null;
+
        // Check for API key in the request headers
-        String apiKey = request.getHeader("X-API-KEY");
+        String apiKey = request.getHeader("X-API-Key");
        if (apiKey != null && !apiKey.trim().isEmpty()) {
-            identifier = // Prefix to distinguish between API keys and usernames
-                    "API_KEY_" + apiKey;
+            identifier =
+                    "API_KEY_" + apiKey; // Prefix to distinguish between API keys and usernames
        } else {
            Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
            if (authentication != null && authentication.isAuthenticated()) {
@@ -67,13 +70,16 @@ public class UserBasedRateLimitingFilter extends OncePerRequestFilter {
                identifier = userDetails.getUsername();
            }
        }
+
        // If neither API key nor an authenticated user is present, use IP address
        if (identifier == null) {
            identifier = request.getRemoteAddr();
        }
+
        Role userRole =
                getRoleFromAuthentication(SecurityContextHolder.getContext().getAuthentication());
-        if (request.getHeader("X-API-KEY") != null) {
+
+        if (request.getHeader("X-API-Key") != null) {
            // It's an API call
            processRequest(
                    userRole.getApiCallsPerDay(),
@@ -117,6 +123,7 @@ public class UserBasedRateLimitingFilter extends OncePerRequestFilter {
            throws IOException, ServletException {
        Bucket userBucket = buckets.computeIfAbsent(identifier, k -> createUserBucket(limitPerDay));
        ConsumptionProbe probe = userBucket.tryConsumeAndReturnRemaining(1);
+
        if (probe.isConsumed()) {
            response.setHeader(
                    "X-Rate-Limit-Remaining",
--- a/src/main/java/stirling/software/SPDF/config/security/UserService.java
+++ b/src/main/java/stirling/software/SPDF/config/security/UserService.java
@@ -4,6 +4,7 @@ import java.io.IOException;
 import java.util.*;
 import java.util.stream.Collectors;

+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.MessageSource;
 import org.springframework.context.i18n.LocaleContextHolder;
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
@@ -24,7 +25,11 @@ import stirling.software.SPDF.config.interfaces.DatabaseBackupInterface;
 import stirling.software.SPDF.config.security.saml2.CustomSaml2AuthenticatedPrincipal;
 import stirling.software.SPDF.config.security.session.SessionPersistentRegistry;
 import stirling.software.SPDF.controller.api.pipeline.UserServiceInterface;
-import stirling.software.SPDF.model.*;
+import stirling.software.SPDF.model.ApplicationProperties;
+import stirling.software.SPDF.model.AuthenticationType;
+import stirling.software.SPDF.model.Authority;
+import stirling.software.SPDF.model.Role;
+import stirling.software.SPDF.model.User;
 import stirling.software.SPDF.repository.AuthorityRepository;
 import stirling.software.SPDF.repository.UserRepository;

@@ -32,36 +37,19 @@ import stirling.software.SPDF.repository.UserRepository;
@Slf4j
 public class UserService implements UserServiceInterface {

-    private final UserRepository userRepository;
+    @Autowired private UserRepository userRepository;

-    private final AuthorityRepository authorityRepository;
+    @Autowired private AuthorityRepository authorityRepository;

-    private final PasswordEncoder passwordEncoder;
+    @Autowired private PasswordEncoder passwordEncoder;

-    private final MessageSource messageSource;
+    @Autowired private MessageSource messageSource;

-    private final SessionPersistentRegistry sessionRegistry;
+    @Autowired private SessionPersistentRegistry sessionRegistry;

-    private final DatabaseBackupInterface databaseBackupHelper;
+    @Autowired DatabaseBackupInterface databaseBackupHelper;

-    private final ApplicationProperties applicationProperties;
-
-    public UserService(
-            UserRepository userRepository,
-            AuthorityRepository authorityRepository,
-            PasswordEncoder passwordEncoder,
-            MessageSource messageSource,
-            SessionPersistentRegistry sessionRegistry,
-            DatabaseBackupInterface databaseBackupHelper,
-            ApplicationProperties applicationProperties) {
-        this.userRepository = userRepository;
-        this.authorityRepository = authorityRepository;
-        this.passwordEncoder = passwordEncoder;
-        this.messageSource = messageSource;
-        this.sessionRegistry = sessionRegistry;
-        this.databaseBackupHelper = databaseBackupHelper;
-        this.applicationProperties = applicationProperties;
-    }
+    @Autowired ApplicationProperties applicationProperties;

    @Transactional
    public void migrateOauth2ToSSO() {
@@ -96,11 +84,13 @@ public class UserService implements UserServiceInterface {
        if (!user.isPresent()) {
            throw new UsernameNotFoundException("API key is not valid");
        }
+
        // Convert the user into an Authentication object
-        return new UsernamePasswordAuthenticationToken( // principal (typically the user)
-                user, // credentials (we don't expose the password or API key here)
-                null, // user's authorities (roles/permissions)
-                getAuthorities(user.get()));
+        return new UsernamePasswordAuthenticationToken(
+                user, // principal (typically the user)
+                null, // credentials (we don't expose the password or API key here)
+                getAuthorities(user.get()) // user's authorities (roles/permissions)
+                );
    }

    private Collection<? extends GrantedAuthority> getAuthorities(User user) {
@@ -114,8 +104,7 @@ public class UserService implements UserServiceInterface {
        String apiKey;
        do {
            apiKey = UUID.randomUUID().toString();
-        } while ( // Ensure uniqueness
-        userRepository.findByApiKey(apiKey).isPresent());
+        } while (userRepository.findByApiKey(apiKey).isPresent()); // Ensure uniqueness
        return apiKey;
    }

@@ -129,8 +118,7 @@ public class UserService implements UserServiceInterface {
    }

    public User refreshApiKeyForUser(String username) {
-        // reuse the add API key method for refreshing
-        return addApiKeyToUser(username);
+        return addApiKeyToUser(username); // reuse the add API key method for refreshing
    }

    public String getApiKeyForUser(String username) {
@@ -150,11 +138,11 @@ public class UserService implements UserServiceInterface {

    public Optional<User> loadUserByApiKey(String apiKey) {
        Optional<User> user = userRepository.findByApiKey(apiKey);
+
        if (user.isPresent()) {
            return user;
        }
-        // or throw an exception
-        return null;
+        return null; // or throw an exception
    }

    public boolean validateApiKeyForUser(String username, String apiKey) {
@@ -252,12 +240,14 @@ public class UserService implements UserServiceInterface {
        if (userOpt.isPresent()) {
            User user = userOpt.get();
            Map<String, String> settingsMap = user.getSettings();
+
            if (settingsMap == null) {
                settingsMap = new HashMap<>();
            }
            settingsMap.clear();
            settingsMap.putAll(updates);
            user.setSettings(settingsMap);
+
            userRepository.save(user);
            databaseBackupHelper.exportDatabase();
        }
@@ -326,9 +316,12 @@ public class UserService implements UserServiceInterface {
        boolean isValidEmail =
                username.matches(
                        "^(?=.{1,64}@)[A-Za-z0-9]+(\\.[A-Za-z0-9_+.-]+)*@[^-][A-Za-z0-9-]+(\\.[A-Za-z0-9-]+)*(\\.[A-Za-z]{2,})$");
+
        List<String> notAllowedUserList = new ArrayList<>();
        notAllowedUserList.add("ALL_USERS".toLowerCase());
+
        boolean notAllowedUser = notAllowedUserList.contains(username.toLowerCase());
+
        return (isValidSimpleUsername || isValidEmail) && !notAllowedUser;
    }

@@ -381,6 +374,7 @@ public class UserService implements UserServiceInterface {

    public String getCurrentUsername() {
        Object principal = SecurityContextHolder.getContext().getAuthentication().getPrincipal();
+
        if (principal instanceof UserDetails) {
            return ((UserDetails) principal).getUsername();
        } else if (principal instanceof OAuth2User) {
@@ -396,36 +390,6 @@ public class UserService implements UserServiceInterface {
        }
    }

-    @Transactional
-    public void syncCustomApiUser(String customApiKey) throws IOException {
-        if (customApiKey == null || customApiKey.trim().length() == 0) {
-            return;
-        }
-        String username = "CUSTOM_API_USER";
-        Optional<User> existingUser = findByUsernameIgnoreCase(username);
-        if (!existingUser.isPresent()) {
-            // Create new user with API role
-            User user = new User();
-            user.setUsername(username);
-            user.setPassword(UUID.randomUUID().toString());
-            user.setEnabled(true);
-            user.setFirstLogin(false);
-            user.setAuthenticationType(AuthenticationType.WEB);
-            user.setApiKey(customApiKey);
-            user.addAuthority(new Authority(Role.INTERNAL_API_USER.getRoleId(), user));
-            userRepository.save(user);
-            databaseBackupHelper.exportDatabase();
-        } else {
-            // Update API key if it has changed
-            User user = existingUser.get();
-            if (!customApiKey.equals(user.getApiKey())) {
-                user.setApiKey(customApiKey);
-                userRepository.save(user);
-                databaseBackupHelper.exportDatabase();
-            }
-        }
-    }
-
    @Override
    public long getTotalUsersCount() {
        return userRepository.count();
--- a/src/main/java/stirling/software/SPDF/config/security/database/DatabaseBackupHelper.java
+++ b/src/main/java/stirling/software/SPDF/config/security/database/DatabaseBackupHelper.java
@@ -6,7 +6,12 @@ import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.nio.file.attribute.BasicFileAttributes;
-import java.sql.*;
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
 import java.time.LocalDateTime;
 import java.time.ZoneId;
 import java.time.format.DateTimeFormatter;
--- a/src/main/java/stirling/software/SPDF/config/security/database/ScheduledTasks.java
+++ b/src/main/java/stirling/software/SPDF/config/security/database/ScheduledTasks.java
@@ -2,17 +2,14 @@ package stirling.software.SPDF.config.security.database;

 import java.io.IOException;

+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;

@Component
 public class ScheduledTasks {

-    private final DatabaseBackupHelper databaseBackupService;
-
-    public ScheduledTasks(DatabaseBackupHelper databaseBackupService) {
-        this.databaseBackupService = databaseBackupService;
-    }
+    @Autowired private DatabaseBackupHelper databaseBackupService;

    @Scheduled(cron = "0 0 0 * * ?")
    public void performBackup() throws IOException {
--- a/src/main/java/stirling/software/SPDF/config/security/oauth2/CustomOAuth2UserService.java
+++ b/src/main/java/stirling/software/SPDF/config/security/oauth2/CustomOAuth2UserService.java
@@ -2,6 +2,8 @@ package stirling.software.SPDF.config.security.oauth2;

 import java.util.Optional;

+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.security.authentication.LockedException;
 import org.springframework.security.oauth2.client.oidc.userinfo.OidcUserRequest;
 import org.springframework.security.oauth2.client.oidc.userinfo.OidcUserService;
@@ -11,7 +13,6 @@ import org.springframework.security.oauth2.core.OAuth2Error;
 import org.springframework.security.oauth2.core.oidc.user.DefaultOidcUser;
 import org.springframework.security.oauth2.core.oidc.user.OidcUser;

-import lombok.extern.slf4j.Slf4j;
 import stirling.software.SPDF.config.security.LoginAttemptService;
 import stirling.software.SPDF.config.security.UserService;
 import stirling.software.SPDF.model.ApplicationProperties;
@@ -19,7 +20,6 @@ import stirling.software.SPDF.model.ApplicationProperties.Security.OAUTH2;
 import stirling.software.SPDF.model.ApplicationProperties.Security.OAUTH2.Client;
 import stirling.software.SPDF.model.User;

-@Slf4j
 public class CustomOAuth2UserService implements OAuth2UserService<OidcUserRequest, OidcUser> {

    private final OidcUserService delegate = new OidcUserService();
@@ -30,6 +30,8 @@ public class CustomOAuth2UserService implements OAuth2UserService<OidcUserReques

    private ApplicationProperties applicationProperties;

+    private static final Logger logger = LoggerFactory.getLogger(CustomOAuth2UserService.class);
+
    public CustomOAuth2UserService(
            ApplicationProperties applicationProperties,
            UserService userService,
@@ -80,10 +82,10 @@ public class CustomOAuth2UserService implements OAuth2UserService<OidcUserReques
                    user.getUserInfo(),
                    usernameAttribute);
        } catch (IllegalArgumentException e) {
-            log.error("Error loading OIDC user: {}", e.getMessage());
+            logger.error("Error loading OIDC user: {}", e.getMessage());
            throw new OAuth2AuthenticationException(new OAuth2Error(e.getMessage()), e);
        } catch (Exception e) {
-            log.error("Unexpected error loading OIDC user", e);
+            logger.error("Unexpected error loading OIDC user", e);
            throw new OAuth2AuthenticationException("Unexpected error during authentication");
        }
    }
--- a/src/main/java/stirling/software/SPDF/config/security/session/SessionPersistentRegistry.java
+++ b/src/main/java/stirling/software/SPDF/config/security/session/SessionPersistentRegistry.java
@@ -1,7 +1,12 @@
 package stirling.software.SPDF.config.security.session;

 import java.time.Duration;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.Date;
+import java.util.List;
+import java.util.Optional;

 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.security.core.session.SessionInformation;
--- a/src/main/java/stirling/software/SPDF/config/security/session/SessionScheduled.java
+++ b/src/main/java/stirling/software/SPDF/config/security/session/SessionScheduled.java
@@ -5,22 +5,19 @@ import java.time.temporal.ChronoUnit;
 import java.util.Date;
 import java.util.List;

+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.security.core.session.SessionInformation;
 import org.springframework.stereotype.Component;

@Component
 public class SessionScheduled {
-
-    private final SessionPersistentRegistry sessionPersistentRegistry;
-
-    public SessionScheduled(SessionPersistentRegistry sessionPersistentRegistry) {
-        this.sessionPersistentRegistry = sessionPersistentRegistry;
-    }
+    @Autowired private SessionPersistentRegistry sessionPersistentRegistry;

    @Scheduled(cron = "0 0/5 * * * ?")
    public void expireSessions() {
        Instant now = Instant.now();
+
        for (Object principal : sessionPersistentRegistry.getAllPrincipals()) {
            List<SessionInformation> sessionInformations =
                    sessionPersistentRegistry.getAllSessions(principal, false);
--- a/src/main/java/stirling/software/SPDF/controller/api/AdditionalLanguageJsController.java
+++ b/src/main/java/stirling/software/SPDF/controller/api/AdditionalLanguageJsController.java
@@ -4,6 +4,7 @@ import java.io.IOException;
 import java.io.PrintWriter;
 import java.util.List;

+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -17,35 +18,35 @@ import stirling.software.SPDF.service.LanguageService;
@RequestMapping("/js")
 public class AdditionalLanguageJsController {

-    private final LanguageService languageService;
-
-    public AdditionalLanguageJsController(LanguageService languageService) {
-        this.languageService = languageService;
-    }
+    @Autowired private LanguageService languageService;

    @Hidden
    @GetMapping(value = "/additionalLanguageCode.js", produces = "application/javascript")
    public void generateAdditionalLanguageJs(HttpServletResponse response) throws IOException {
        List<String> supportedLanguages = languageService.getSupportedLanguages();
+
        response.setContentType("application/javascript");
        PrintWriter writer = response.getWriter();
+
        // Erstelle das JavaScript dynamisch
        writer.println("const supportedLanguages = " + toJsonArray(supportedLanguages) + ";");
+
        // Generiere die `getDetailedLanguageCode`-Funktion
        writer.println(
                """
-                        function getDetailedLanguageCode() {
-                            const userLanguages = navigator.languages ? navigator.languages : [navigator.language];
-                            for (let lang of userLanguages) {
-                                let matchedLang = supportedLanguages.find(supportedLang => supportedLang.startsWith(lang.replace('-', '_')));
-                                if (matchedLang) {
-                                    return matchedLang;
-                                }
-                            }
-                            // Fallback
-                            return "en_GB";
+                function getDetailedLanguageCode() {
+                    const userLanguages = navigator.languages ? navigator.languages : [navigator.language];
+                    for (let lang of userLanguages) {
+                        let matchedLang = supportedLanguages.find(supportedLang => supportedLang.startsWith(lang.replace('-', '_')));
+                        if (matchedLang) {
+                            return matchedLang;
                        }
-                        """);
+                    }
+                    // Fallback
+                    return "en_GB";
+                }
+                """);
+
        writer.flush();
    }

--- a/src/main/java/stirling/software/SPDF/controller/api/CropController.java
+++ b/src/main/java/stirling/software/SPDF/controller/api/CropController.java
@@ -11,6 +11,8 @@ import org.apache.pdfbox.pdmodel.PDPageContentStream;
 import org.apache.pdfbox.pdmodel.PDPageContentStream.AppendMode;
 import org.apache.pdfbox.pdmodel.common.PDRectangle;
 import org.apache.pdfbox.pdmodel.graphics.form.PDFormXObject;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.ModelAttribute;
@@ -31,6 +33,8 @@ import stirling.software.SPDF.utils.WebResponseUtils;
@Tag(name = "General", description = "General APIs")
 public class CropController {

+    private static final Logger logger = LoggerFactory.getLogger(CropController.class);
+
    private final CustomPDDocumentFactory pdfDocumentFactory;

    private final PostHogService postHogService;
--- a/src/main/java/stirling/software/SPDF/controller/api/DatabaseController.java
+++ b/src/main/java/stirling/software/SPDF/controller/api/DatabaseController.java
@@ -8,19 +8,23 @@ import java.nio.file.Path;
 import java.nio.file.StandardCopyOption;

 import org.eclipse.jetty.http.HttpStatus;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.io.InputStreamResource;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.servlet.mvc.support.RedirectAttributes;

 import io.swagger.v3.oas.annotations.Hidden;
 import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;

 import lombok.extern.slf4j.Slf4j;
@@ -30,25 +34,19 @@ import stirling.software.SPDF.config.security.database.DatabaseBackupHelper;
@Controller
@RequestMapping("/api/v1/database")
@PreAuthorize("hasRole('ROLE_ADMIN')")
-@Tag(name = "Database", description = "Database APIs for backup, import, and management")
+@Tag(name = "Database", description = "Database APIs")
 public class DatabaseController {

-    private final DatabaseBackupHelper databaseBackupHelper;
+    @Autowired DatabaseBackupHelper databaseBackupHelper;

-    public DatabaseController(DatabaseBackupHelper databaseBackupHelper) {
-        this.databaseBackupHelper = databaseBackupHelper;
-    }
-
-    @Operation(
-            summary = "Import a database backup file",
-            description = "Uploads and imports a database backup SQL file.")
+    @Hidden
    @PostMapping(consumes = "multipart/form-data", value = "import-database")
+    @Operation(
+            summary = "Import database backup",
+            description = "This endpoint imports a database backup from a SQL file.")
    public String importDatabase(
-            @Parameter(description = "SQL file to import", required = true)
-                    @RequestParam("fileInput")
-                    MultipartFile file,
-            RedirectAttributes redirectAttributes)
-            throws IOException {
+            @RequestParam("fileInput") MultipartFile file, RedirectAttributes redirectAttributes)
+            throws IllegalArgumentException, IOException {
        if (file == null || file.isEmpty()) {
            redirectAttributes.addAttribute("error", "fileNullOrEmpty");
            return "redirect:/database";
@@ -71,17 +69,13 @@ public class DatabaseController {
    }

    @Hidden
-    @Operation(
-            summary = "Import database backup by filename",
-            description = "Imports a database backup file from the server using its file name.")
    @GetMapping("/import-database-file/{fileName}")
-    public String importDatabaseFromBackupUI(
-            @Parameter(description = "Name of the file to import", required = true) @PathVariable
-                    String fileName)
-            throws IOException {
+    public String importDatabaseFromBackupUI(@PathVariable String fileName)
+            throws IllegalArgumentException, IOException {
        if (fileName == null || fileName.isEmpty()) {
            return "redirect:/database?error=fileNullOrEmpty";
        }
+
        // Check if the file exists in the backup list
        boolean fileExists =
                databaseBackupHelper.getBackupList().stream()
@@ -99,13 +93,12 @@ public class DatabaseController {
    }

    @Hidden
+    @GetMapping("/delete/{fileName}")
    @Operation(
            summary = "Delete a database backup file",
-            description = "Deletes a specified database backup file from the server.")
-    @GetMapping("/delete/{fileName}")
-    public String deleteFile(
-            @Parameter(description = "Name of the file to delete", required = true) @PathVariable
-                    String fileName) {
+            description =
+                    "This endpoint deletes a database backup file with the specified file name.")
+    public String deleteFile(@PathVariable String fileName) {
        if (fileName == null || fileName.isEmpty()) {
            throw new IllegalArgumentException("File must not be null or empty");
        }
@@ -124,13 +117,12 @@ public class DatabaseController {
    }

    @Hidden
+    @GetMapping("/download/{fileName}")
    @Operation(
            summary = "Download a database backup file",
-            description = "Downloads the specified database backup file from the server.")
-    @GetMapping("/download/{fileName}")
-    public ResponseEntity<?> downloadFile(
-            @Parameter(description = "Name of the file to download", required = true) @PathVariable
-                    String fileName) {
+            description =
+                    "This endpoint downloads a database backup file with the specified file name.")
+    public ResponseEntity<?> downloadFile(@PathVariable String fileName) {
        if (fileName == null || fileName.isEmpty()) {
            throw new IllegalArgumentException("File must not be null or empty");
        }
@@ -149,22 +141,4 @@ public class DatabaseController {
                    .build();
        }
    }
-
-    @Operation(
-            summary = "Create a database backup",
-            description =
-                    "This endpoint triggers the creation of a database backup and redirects to the"
-                            + " database management page.")
-    @GetMapping("/createDatabaseBackup")
-    public String createDatabaseBackup() {
-        try {
-            log.info("Starting database backup creation...");
-            databaseBackupHelper.exportDatabase();
-            log.info("Database backup successfully created.");
-        } catch (IOException e) {
-            log.error("Error creating database backup: {}", e.getMessage(), e);
-            return "redirect:/database?error=" + e.getMessage();
-        }
-        return "redirect:/database?infoMessage=backupCreated";
-    }
 }
--- a/src/main/java/stirling/software/SPDF/controller/api/MergeController.java
+++ b/src/main/java/stirling/software/SPDF/controller/api/MergeController.java
@@ -20,6 +20,8 @@ import org.apache.pdfbox.pdmodel.PDPage;
 import org.apache.pdfbox.pdmodel.interactive.form.PDAcroForm;
 import org.apache.pdfbox.pdmodel.interactive.form.PDField;
 import org.apache.pdfbox.pdmodel.interactive.form.PDSignatureField;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.ModelAttribute;
@@ -31,18 +33,18 @@ import org.springframework.web.multipart.MultipartFile;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;

-import lombok.extern.slf4j.Slf4j;
 import stirling.software.SPDF.model.api.general.MergePdfsRequest;
 import stirling.software.SPDF.service.CustomPDDocumentFactory;
 import stirling.software.SPDF.utils.GeneralUtils;
 import stirling.software.SPDF.utils.WebResponseUtils;

@RestController
-@Slf4j
@RequestMapping("/api/v1/general")
@Tag(name = "General", description = "General APIs")
 public class MergeController {

+    private static final Logger logger = LoggerFactory.getLogger(MergeController.class);
+
    private final CustomPDDocumentFactory pdfDocumentFactory;

    @Autowired
@@ -182,7 +184,7 @@ public class MergeController {
                    baos.toByteArray(), mergedFileName); // Return the modified PDF

        } catch (Exception ex) {
-            log.error("Error in merge pdf process", ex);
+            logger.error("Error in merge pdf process", ex);
            throw ex;
        } finally {
            for (File file : filesToDelete) {
--- a/src/main/java/stirling/software/SPDF/controller/api/MultiPageLayoutController.java
+++ b/src/main/java/stirling/software/SPDF/controller/api/MultiPageLayoutController.java
@@ -1,6 +1,6 @@
 package stirling.software.SPDF.controller.api;

-import java.awt.*;
+import java.awt.Color;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;

@@ -12,6 +12,8 @@ import org.apache.pdfbox.pdmodel.PDPageContentStream;
 import org.apache.pdfbox.pdmodel.common.PDRectangle;
 import org.apache.pdfbox.pdmodel.graphics.form.PDFormXObject;
 import org.apache.pdfbox.util.Matrix;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.ModelAttribute;
@@ -33,6 +35,8 @@ import stirling.software.SPDF.utils.WebResponseUtils;
@Tag(name = "General", description = "General APIs")
 public class MultiPageLayoutController {

+    private static final Logger logger = LoggerFactory.getLogger(MultiPageLayoutController.class);
+
    private final CustomPDDocumentFactory pdfDocumentFactory;

    @Autowired
--- a/src/main/java/stirling/software/SPDF/controller/api/PdfImageRemovalController.java
+++ b/src/main/java/stirling/software/SPDF/controller/api/PdfImageRemovalController.java
@@ -6,10 +6,7 @@ import java.io.IOException;
 import org.apache.pdfbox.pdmodel.PDDocument;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.ModelAttribute;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;

 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
--- a/src/main/java/stirling/software/SPDF/controller/api/RearrangePagesPDFController.java
+++ b/src/main/java/stirling/software/SPDF/controller/api/RearrangePagesPDFController.java
@@ -8,6 +8,8 @@ import java.util.List;
 import org.apache.pdfbox.Loader;
 import org.apache.pdfbox.pdmodel.PDDocument;
 import org.apache.pdfbox.pdmodel.PDPage;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.ModelAttribute;
@@ -20,7 +22,6 @@ import io.github.pixee.security.Filenames;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;

-import lombok.extern.slf4j.Slf4j;
 import stirling.software.SPDF.model.SortTypes;
 import stirling.software.SPDF.model.api.PDFWithPageNums;
 import stirling.software.SPDF.model.api.general.RearrangePagesRequest;
@@ -30,10 +31,11 @@ import stirling.software.SPDF.utils.WebResponseUtils;

@RestController
@RequestMapping("/api/v1/general")
-@Slf4j
@Tag(name = "General", description = "General APIs")
 public class RearrangePagesPDFController {

+    private static final Logger logger = LoggerFactory.getLogger(RearrangePagesPDFController.class);
+
    private final CustomPDDocumentFactory pdfDocumentFactory;

    @Autowired
@@ -200,7 +202,7 @@ public class RearrangePagesPDFController {
                    throw new IllegalArgumentException("Unsupported custom mode");
            }
        } catch (IllegalArgumentException e) {
-            log.error("Unsupported custom mode", e);
+            logger.error("Unsupported custom mode", e);
            return null;
        }
    }
@@ -228,8 +230,8 @@ public class RearrangePagesPDFController {
            } else {
                newPageOrder = GeneralUtils.parsePageList(pageOrderArr, totalPages, false);
            }
-            log.info("newPageOrder = " + newPageOrder);
-            log.info("totalPages = " + totalPages);
+            logger.info("newPageOrder = " + newPageOrder);
+            logger.info("totalPages = " + totalPages);
            // Create a new list to hold the pages in the new order
            List<PDPage> newPages = new ArrayList<>();
            for (int i = 0; i < newPageOrder.size(); i++) {
@@ -252,7 +254,7 @@ public class RearrangePagesPDFController {
                                    .replaceFirst("[.][^.]+$", "")
                            + "_rearranged.pdf");
        } catch (IOException e) {
-            log.error("Failed rearranging documents", e);
+            logger.error("Failed rearranging documents", e);
            return null;
        }
    }
--- a/src/main/java/stirling/software/SPDF/controller/api/RotationController.java
+++ b/src/main/java/stirling/software/SPDF/controller/api/RotationController.java
@@ -5,6 +5,8 @@ import java.io.IOException;
 import org.apache.pdfbox.pdmodel.PDDocument;
 import org.apache.pdfbox.pdmodel.PDPage;
 import org.apache.pdfbox.pdmodel.PDPageTree;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.ModelAttribute;
@@ -26,6 +28,8 @@ import stirling.software.SPDF.utils.WebResponseUtils;
@Tag(name = "General", description = "General APIs")
 public class RotationController {

+    private static final Logger logger = LoggerFactory.getLogger(RotationController.class);
+
    private final CustomPDDocumentFactory pdfDocumentFactory;

    @Autowired
--- a/src/main/java/stirling/software/SPDF/controller/api/ScalePagesController.java
+++ b/src/main/java/stirling/software/SPDF/controller/api/ScalePagesController.java
@@ -13,6 +13,8 @@ import org.apache.pdfbox.pdmodel.PDPageContentStream;
 import org.apache.pdfbox.pdmodel.common.PDRectangle;
 import org.apache.pdfbox.pdmodel.graphics.form.PDFormXObject;
 import org.apache.pdfbox.util.Matrix;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.ModelAttribute;
@@ -34,6 +36,8 @@ import stirling.software.SPDF.utils.WebResponseUtils;
@Tag(name = "General", description = "General APIs")
 public class ScalePagesController {

+    private static final Logger logger = LoggerFactory.getLogger(ScalePagesController.class);
+
    private final CustomPDDocumentFactory pdfDocumentFactory;

    @Autowired
--- a/src/main/java/stirling/software/SPDF/controller/api/SettingsController.java
+++ b/src/main/java/stirling/software/SPDF/controller/api/SettingsController.java
@@ -2,12 +2,11 @@ package stirling.software.SPDF.controller.api;

 import java.io.IOException;

+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.*;

 import io.swagger.v3.oas.annotations.Hidden;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -21,11 +20,7 @@ import stirling.software.SPDF.utils.GeneralUtils;
@Hidden
 public class SettingsController {

-    private final ApplicationProperties applicationProperties;
-
-    public SettingsController(ApplicationProperties applicationProperties) {
-        this.applicationProperties = applicationProperties;
-    }
+    @Autowired ApplicationProperties applicationProperties;

    @PostMapping("/update-enable-analytics")
    @Hidden
@@ -37,6 +32,7 @@ public class SettingsController {
        }
        GeneralUtils.saveKeyToConfig("system.enableAnalytics", String.valueOf(enabled), false);
        applicationProperties.getSystem().setEnableAnalytics(String.valueOf(enabled));
+
        return ResponseEntity.ok("Updated");
    }
 }
--- a/src/main/java/stirling/software/SPDF/controller/api/SplitPDFController.java
+++ b/src/main/java/stirling/software/SPDF/controller/api/SplitPDFController.java
@@ -13,6 +13,8 @@ import java.util.zip.ZipOutputStream;
 import org.apache.pdfbox.Loader;
 import org.apache.pdfbox.pdmodel.PDDocument;
 import org.apache.pdfbox.pdmodel.PDPage;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
@@ -26,17 +28,16 @@ import io.github.pixee.security.Filenames;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;

-import lombok.extern.slf4j.Slf4j;
 import stirling.software.SPDF.model.api.PDFWithPageNums;
 import stirling.software.SPDF.service.CustomPDDocumentFactory;
 import stirling.software.SPDF.utils.WebResponseUtils;

@RestController
@RequestMapping("/api/v1/general")
-@Slf4j
@Tag(name = "General", description = "General APIs")
 public class SplitPDFController {

+    private static final Logger logger = LoggerFactory.getLogger(SplitPDFController.class);
    private final CustomPDDocumentFactory pdfDocumentFactory;

    @Autowired
@@ -51,114 +52,84 @@ public class SplitPDFController {
                    "This endpoint splits a given PDF file into separate documents based on the specified page numbers or ranges. Users can specify pages using individual numbers, ranges, or 'all' for every page. Input:PDF Output:PDF Type:SIMO")
    public ResponseEntity<byte[]> splitPdf(@ModelAttribute PDFWithPageNums request)
            throws IOException {
+        MultipartFile file = request.getFileInput();
+        String pages = request.getPageNumbers();
+        // open the pdf document

-        PDDocument document = null;
-        Path zipFile = null;
+        PDDocument document = Loader.loadPDF(file.getBytes());
+        // PdfMetadata metadata = PdfMetadataService.extractMetadataFromPdf(document);
+        int totalPages = document.getNumberOfPages();
+        List<Integer> pageNumbers = request.getPageNumbersList(document, false);
+        if (!pageNumbers.contains(totalPages - 1)) {
+            // Create a mutable ArrayList so we can add to it
+            pageNumbers = new ArrayList<>(pageNumbers);
+            pageNumbers.add(totalPages - 1);
+        }
+
+        logger.info(
+                "Splitting PDF into pages: {}",
+                pageNumbers.stream().map(String::valueOf).collect(Collectors.joining(",")));
+
+        // split the document
        List<ByteArrayOutputStream> splitDocumentsBoas = new ArrayList<>();
-
-        try {
-
-            MultipartFile file = request.getFileInput();
-            String pages = request.getPageNumbers();
-            // open the pdf document
-
-            document = Loader.loadPDF(file.getBytes());
-            // PdfMetadata metadata = PdfMetadataService.extractMetadataFromPdf(document);
-            int totalPages = document.getNumberOfPages();
-            List<Integer> pageNumbers = request.getPageNumbersList(document, false);
-            if (!pageNumbers.contains(totalPages - 1)) {
-                // Create a mutable ArrayList so we can add to it
-                pageNumbers = new ArrayList<>(pageNumbers);
-                pageNumbers.add(totalPages - 1);
-            }
-
-            log.info(
-                    "Splitting PDF into pages: {}",
-                    pageNumbers.stream().map(String::valueOf).collect(Collectors.joining(",")));
-
-            // split the document
-            splitDocumentsBoas = new ArrayList<>();
-            int previousPageNumber = 0;
-            for (int splitPoint : pageNumbers) {
-                try (PDDocument splitDocument =
-                        pdfDocumentFactory.createNewDocumentBasedOnOldDocument(document)) {
-                    for (int i = previousPageNumber; i <= splitPoint; i++) {
-                        PDPage page = document.getPage(i);
-                        splitDocument.addPage(page);
-                        log.info("Adding page {} to split document", i);
-                    }
-                    previousPageNumber = splitPoint + 1;
-
-                    // Transfer metadata to split pdf
-                    // PdfMetadataService.setMetadataToPdf(splitDocument, metadata);
-
-                    ByteArrayOutputStream baos = new ByteArrayOutputStream();
-                    splitDocument.save(baos);
-
-                    splitDocumentsBoas.add(baos);
-                } catch (Exception e) {
-                    log.error("Failed splitting documents and saving them", e);
-                    throw e;
+        int previousPageNumber = 0;
+        for (int splitPoint : pageNumbers) {
+            try (PDDocument splitDocument =
+                    pdfDocumentFactory.createNewDocumentBasedOnOldDocument(document)) {
+                for (int i = previousPageNumber; i <= splitPoint; i++) {
+                    PDPage page = document.getPage(i);
+                    splitDocument.addPage(page);
+                    logger.info("Adding page {} to split document", i);
                }
-            }
+                previousPageNumber = splitPoint + 1;

-            // closing the original document
-            document.close();
+                // Transfer metadata to split pdf
+                // PdfMetadataService.setMetadataToPdf(splitDocument, metadata);

-            zipFile = Files.createTempFile("split_documents", ".zip");
+                ByteArrayOutputStream baos = new ByteArrayOutputStream();
+                splitDocument.save(baos);

-            String filename =
-                    Filenames.toSimpleFileName(file.getOriginalFilename())
-                            .replaceFirst("[.][^.]+$", "");
-            try (ZipOutputStream zipOut = new ZipOutputStream(Files.newOutputStream(zipFile))) {
-                // loop through the split documents and write them to the zip file
-                for (int i = 0; i < splitDocumentsBoas.size(); i++) {
-                    String fileName = filename + "_" + (i + 1) + ".pdf";
-                    ByteArrayOutputStream baos = splitDocumentsBoas.get(i);
-                    byte[] pdf = baos.toByteArray();
-
-                    // Add PDF file to the zip
-                    ZipEntry pdfEntry = new ZipEntry(fileName);
-                    zipOut.putNextEntry(pdfEntry);
-                    zipOut.write(pdf);
-                    zipOut.closeEntry();
-
-                    log.info("Wrote split document {} to zip file", fileName);
-                }
+                splitDocumentsBoas.add(baos);
            } catch (Exception e) {
-                log.error("Failed writing to zip", e);
+                logger.error("Failed splitting documents and saving them", e);
                throw e;
            }
-
-            log.info("Successfully created zip file with split documents: {}", zipFile.toString());
-            byte[] data = Files.readAllBytes(zipFile);
-            Files.deleteIfExists(zipFile);
-
-            // return the Resource in the response
-            return WebResponseUtils.bytesToWebResponse(
-                    data, filename + ".zip", MediaType.APPLICATION_OCTET_STREAM);
-
-        } finally {
-            try {
-                // Close the main document
-                if (document != null) {
-                    document.close();
-                }
-
-                // Close all ByteArrayOutputStreams
-                for (ByteArrayOutputStream baos : splitDocumentsBoas) {
-                    if (baos != null) {
-                        baos.close();
-                    }
-                }
-
-                // Delete temporary zip file
-                if (zipFile != null) {
-                    Files.deleteIfExists(zipFile);
-                }
-            } catch (Exception e) {
-                log.error("Error while cleaning up resources", e);
-            }
        }
+
+        // closing the original document
+        document.close();
+
+        Path zipFile = Files.createTempFile("split_documents", ".zip");
+
+        String filename =
+                Filenames.toSimpleFileName(file.getOriginalFilename())
+                        .replaceFirst("[.][^.]+$", "");
+        try (ZipOutputStream zipOut = new ZipOutputStream(Files.newOutputStream(zipFile))) {
+            // loop through the split documents and write them to the zip file
+            for (int i = 0; i < splitDocumentsBoas.size(); i++) {
+                String fileName = filename + "_" + (i + 1) + ".pdf";
+                ByteArrayOutputStream baos = splitDocumentsBoas.get(i);
+                byte[] pdf = baos.toByteArray();
+
+                // Add PDF file to the zip
+                ZipEntry pdfEntry = new ZipEntry(fileName);
+                zipOut.putNextEntry(pdfEntry);
+                zipOut.write(pdf);
+                zipOut.closeEntry();
+
+                logger.info("Wrote split document {} to zip file", fileName);
+            }
+        } catch (Exception e) {
+            logger.error("Failed writing to zip", e);
+            throw e;
+        }
+
+        logger.info("Successfully created zip file with split documents: {}", zipFile.toString());
+        byte[] data = Files.readAllBytes(zipFile);
+        Files.deleteIfExists(zipFile);
+
+        // return the Resource in the response
+        return WebResponseUtils.bytesToWebResponse(
+                data, filename + ".zip", MediaType.APPLICATION_OCTET_STREAM);
    }
 }
--- a/src/main/java/stirling/software/SPDF/controller/api/SplitPdfByChaptersController.java
+++ b/src/main/java/stirling/software/SPDF/controller/api/SplitPdfByChaptersController.java
@@ -13,6 +13,8 @@ import org.apache.pdfbox.pdmodel.PDDocument;
 import org.apache.pdfbox.pdmodel.PDPage;
 import org.apache.pdfbox.pdmodel.interactive.documentnavigation.outline.PDDocumentOutline;
 import org.apache.pdfbox.pdmodel.interactive.documentnavigation.outline.PDOutlineItem;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
@@ -30,7 +32,6 @@ import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
 import stirling.software.SPDF.model.PdfMetadata;
 import stirling.software.SPDF.model.api.SplitPdfByChaptersRequest;
 import stirling.software.SPDF.service.PdfMetadataService;
@@ -38,10 +39,12 @@ import stirling.software.SPDF.utils.WebResponseUtils;

@RestController
@RequestMapping("/api/v1/general")
-@Slf4j
@Tag(name = "General", description = "General APIs")
 public class SplitPdfByChaptersController {

+    private static final Logger logger =
+            LoggerFactory.getLogger(SplitPdfByChaptersController.class);
+
    private final PdfMetadataService pdfMetadataService;

    @Autowired
@@ -49,6 +52,104 @@ public class SplitPdfByChaptersController {
        this.pdfMetadataService = pdfMetadataService;
    }

+    @PostMapping(value = "/split-pdf-by-chapters", consumes = "multipart/form-data")
+    @Operation(
+            summary = "Split PDFs by Chapters",
+            description = "Splits a PDF into chapters and returns a ZIP file.")
+    public ResponseEntity<byte[]> splitPdf(@ModelAttribute SplitPdfByChaptersRequest request)
+            throws Exception {
+        MultipartFile file = request.getFileInput();
+        boolean includeMetadata = request.getIncludeMetadata();
+        Integer bookmarkLevel =
+                request.getBookmarkLevel(); // levels start from 0 (top most bookmarks)
+        if (bookmarkLevel < 0) {
+            return ResponseEntity.badRequest().body("Invalid bookmark level".getBytes());
+        }
+        PDDocument sourceDocument = Loader.loadPDF(file.getBytes());
+
+        PDDocumentOutline outline = sourceDocument.getDocumentCatalog().getDocumentOutline();
+
+        if (outline == null) {
+            logger.warn("No outline found for {}", file.getOriginalFilename());
+            return ResponseEntity.badRequest().body("No outline found".getBytes());
+        }
+        List<Bookmark> bookmarks = new ArrayList<>();
+        try {
+            bookmarks =
+                    extractOutlineItems(
+                            sourceDocument,
+                            outline.getFirstChild(),
+                            bookmarks,
+                            outline.getFirstChild().getNextSibling(),
+                            0,
+                            bookmarkLevel);
+            // to handle last page edge case
+            bookmarks.get(bookmarks.size() - 1).setEndPage(sourceDocument.getNumberOfPages());
+            Bookmark lastBookmark = bookmarks.get(bookmarks.size() - 1);
+
+        } catch (Exception e) {
+            logger.error("Unable to extract outline items", e);
+            return ResponseEntity.internalServerError()
+                    .body("Unable to extract outline items".getBytes());
+        }
+
+        boolean allowDuplicates = request.getAllowDuplicates();
+        if (!allowDuplicates) {
+            /*
+            duplicates are generated when multiple bookmarks correspond to the same page,
+            if the user doesn't want duplicates mergeBookmarksThatCorrespondToSamePage() method will merge the titles of all
+            the bookmarks that correspond to the same page, and treat them as a single bookmark
+            */
+            bookmarks = mergeBookmarksThatCorrespondToSamePage(bookmarks);
+        }
+        for (Bookmark bookmark : bookmarks) {
+            logger.info(
+                    "{}::::{} to {}",
+                    bookmark.getTitle(),
+                    bookmark.getStartPage(),
+                    bookmark.getEndPage());
+        }
+        List<ByteArrayOutputStream> splitDocumentsBoas =
+                getSplitDocumentsBoas(sourceDocument, bookmarks, includeMetadata);
+
+        Path zipFile = createZipFile(bookmarks, splitDocumentsBoas);
+
+        byte[] data = Files.readAllBytes(zipFile);
+        Files.deleteIfExists(zipFile);
+
+        String filename =
+                Filenames.toSimpleFileName(file.getOriginalFilename())
+                        .replaceFirst("[.][^.]+$", "");
+        sourceDocument.close();
+        return WebResponseUtils.bytesToWebResponse(
+                data, filename + ".zip", MediaType.APPLICATION_OCTET_STREAM);
+    }
+
+    private List<Bookmark> mergeBookmarksThatCorrespondToSamePage(List<Bookmark> bookmarks) {
+        String mergedTitle = "";
+        List<Bookmark> chaptersToBeRemoved = new ArrayList<>();
+        for (Bookmark bookmark : bookmarks) {
+            if (bookmark.getStartPage() == bookmark.getEndPage()) {
+                mergedTitle = mergedTitle.concat(bookmark.getTitle().concat(" "));
+                chaptersToBeRemoved.add(bookmark);
+            } else {
+                if (!mergedTitle.isEmpty()) {
+                    if (mergedTitle.length() > 255) {
+                        mergedTitle = mergedTitle.substring(0, 253) + "...";
+                    }
+
+                    bookmarks.set(
+                            bookmarks.indexOf(bookmark),
+                            new Bookmark(
+                                    mergedTitle, bookmark.getStartPage(), bookmark.getEndPage()));
+                }
+                mergedTitle = "";
+            }
+        }
+        bookmarks.removeAll(chaptersToBeRemoved);
+        return bookmarks;
+    }
+
    private static List<Bookmark> extractOutlineItems(
            PDDocument sourceDocument,
            PDOutlineItem current,
@@ -117,120 +218,6 @@ public class SplitPdfByChaptersController {
        return bookmarks;
    }

-    @PostMapping(value = "/split-pdf-by-chapters", consumes = "multipart/form-data")
-    @Operation(
-            summary = "Split PDFs by Chapters",
-            description = "Splits a PDF into chapters and returns a ZIP file.")
-    public ResponseEntity<byte[]> splitPdf(@ModelAttribute SplitPdfByChaptersRequest request)
-            throws Exception {
-        MultipartFile file = request.getFileInput();
-        PDDocument sourceDocument = null;
-        Path zipFile = null;
-
-        try {
-            boolean includeMetadata = request.getIncludeMetadata();
-            Integer bookmarkLevel =
-                    request.getBookmarkLevel(); // levels start from 0 (top most bookmarks)
-            if (bookmarkLevel < 0) {
-                return ResponseEntity.badRequest().body("Invalid bookmark level".getBytes());
-            }
-            sourceDocument = Loader.loadPDF(file.getBytes());
-
-            PDDocumentOutline outline = sourceDocument.getDocumentCatalog().getDocumentOutline();
-
-            if (outline == null) {
-                log.warn("No outline found for {}", file.getOriginalFilename());
-                return ResponseEntity.badRequest().body("No outline found".getBytes());
-            }
-            List<Bookmark> bookmarks = new ArrayList<>();
-            try {
-                bookmarks =
-                        extractOutlineItems(
-                                sourceDocument,
-                                outline.getFirstChild(),
-                                bookmarks,
-                                outline.getFirstChild().getNextSibling(),
-                                0,
-                                bookmarkLevel);
-                // to handle last page edge case
-                bookmarks.get(bookmarks.size() - 1).setEndPage(sourceDocument.getNumberOfPages());
-                Bookmark lastBookmark = bookmarks.get(bookmarks.size() - 1);
-
-            } catch (Exception e) {
-                log.error("Unable to extract outline items", e);
-                return ResponseEntity.internalServerError()
-                        .body("Unable to extract outline items".getBytes());
-            }
-
-            boolean allowDuplicates = request.getAllowDuplicates();
-            if (!allowDuplicates) {
-                /*
-                duplicates are generated when multiple bookmarks correspond to the same page,
-                if the user doesn't want duplicates mergeBookmarksThatCorrespondToSamePage() method will merge the titles of all
-                the bookmarks that correspond to the same page, and treat them as a single bookmark
-                */
-                bookmarks = mergeBookmarksThatCorrespondToSamePage(bookmarks);
-            }
-            for (Bookmark bookmark : bookmarks) {
-                log.info(
-                        "{}::::{} to {}",
-                        bookmark.getTitle(),
-                        bookmark.getStartPage(),
-                        bookmark.getEndPage());
-            }
-            List<ByteArrayOutputStream> splitDocumentsBoas =
-                    getSplitDocumentsBoas(sourceDocument, bookmarks, includeMetadata);
-
-            zipFile = createZipFile(bookmarks, splitDocumentsBoas);
-
-            byte[] data = Files.readAllBytes(zipFile);
-            Files.deleteIfExists(zipFile);
-
-            String filename =
-                    Filenames.toSimpleFileName(file.getOriginalFilename())
-                            .replaceFirst("[.][^.]+$", "");
-            sourceDocument.close();
-            return WebResponseUtils.bytesToWebResponse(
-                    data, filename + ".zip", MediaType.APPLICATION_OCTET_STREAM);
-        } finally {
-            try {
-                if (sourceDocument != null) {
-                    sourceDocument.close();
-                }
-                if (zipFile != null) {
-                    Files.deleteIfExists(zipFile);
-                }
-            } catch (Exception e) {
-                log.error("Error while cleaning up resources", e);
-            }
-        }
-    }
-
-    private List<Bookmark> mergeBookmarksThatCorrespondToSamePage(List<Bookmark> bookmarks) {
-        String mergedTitle = "";
-        List<Bookmark> chaptersToBeRemoved = new ArrayList<>();
-        for (Bookmark bookmark : bookmarks) {
-            if (bookmark.getStartPage() == bookmark.getEndPage()) {
-                mergedTitle = mergedTitle.concat(bookmark.getTitle().concat(" "));
-                chaptersToBeRemoved.add(bookmark);
-            } else {
-                if (!mergedTitle.isEmpty()) {
-                    if (mergedTitle.length() > 255) {
-                        mergedTitle = mergedTitle.substring(0, 253) + "...";
-                    }
-
-                    bookmarks.set(
-                            bookmarks.indexOf(bookmark),
-                            new Bookmark(
-                                    mergedTitle, bookmark.getStartPage(), bookmark.getEndPage()));
-                }
-                mergedTitle = "";
-            }
-        }
-        bookmarks.removeAll(chaptersToBeRemoved);
-        return bookmarks;
-    }
-
    private Path createZipFile(
            List<Bookmark> bookmarks, List<ByteArrayOutputStream> splitDocumentsBoas)
            throws Exception {
@@ -253,14 +240,14 @@ public class SplitPdfByChaptersController {
                zipOut.write(pdf);
                zipOut.closeEntry();

-                log.info("Wrote split document {} to zip file", fileName);
+                logger.info("Wrote split document {} to zip file", fileName);
            }
        } catch (Exception e) {
-            log.error("Failed writing to zip", e);
+            logger.error("Failed writing to zip", e);
            throw e;
        }

-        log.info("Successfully created zip file with split documents: {}", zipFile);
+        logger.info("Successfully created zip file with split documents: {}", zipFile);
        return zipFile;
    }

@@ -281,7 +268,7 @@ public class SplitPdfByChaptersController {
                        i++) {
                    PDPage page = sourceDocument.getPage(i);
                    splitDocument.addPage(page);
-                    log.info("Adding page {} to split document", i);
+                    logger.info("Adding page {} to split document", i);
                }
                ByteArrayOutputStream baos = new ByteArrayOutputStream();
                if (includeMetadata) {
@@ -292,7 +279,7 @@ public class SplitPdfByChaptersController {

                splitDocumentsBoas.add(baos);
            } catch (Exception e) {
-                log.error("Failed splitting documents and saving them", e);
+                logger.error("Failed splitting documents and saving them", e);
                throw e;
            }
        }
--- a/src/main/java/stirling/software/SPDF/controller/api/SplitPdfBySectionsController.java
+++ b/src/main/java/stirling/software/SPDF/controller/api/SplitPdfBySectionsController.java
@@ -18,6 +18,8 @@ import org.apache.pdfbox.pdmodel.PDPageContentStream.AppendMode;
 import org.apache.pdfbox.pdmodel.common.PDRectangle;
 import org.apache.pdfbox.pdmodel.graphics.form.PDFormXObject;
 import org.apache.pdfbox.util.Matrix;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
@@ -40,6 +42,9 @@ import stirling.software.SPDF.utils.WebResponseUtils;
@Tag(name = "General", description = "General APIs")
 public class SplitPdfBySectionsController {

+    private static final Logger logger =
+            LoggerFactory.getLogger(SplitPdfBySectionsController.class);
+
    private final CustomPDDocumentFactory pdfDocumentFactory;

    @Autowired
@@ -100,13 +105,15 @@ public class SplitPdfBySectionsController {

                if (sectionNum == horiz * verti) pageNum++;
            }
-            data = Files.readAllBytes(zipFile);
-            return WebResponseUtils.bytesToWebResponse(
-                    data, filename + "_split.zip", MediaType.APPLICATION_OCTET_STREAM);
-
+        } catch (Exception e) {
+            logger.error("exception", e);
        } finally {
+            data = Files.readAllBytes(zipFile);
            Files.deleteIfExists(zipFile);
        }
+
+        return WebResponseUtils.bytesToWebResponse(
+                data, filename + "_split.zip", MediaType.APPLICATION_OCTET_STREAM);
    }

    public List<PDDocument> splitPdfPages(
--- a/src/main/java/stirling/software/SPDF/controller/api/SplitPdfBySizeController.java
+++ b/src/main/java/stirling/software/SPDF/controller/api/SplitPdfBySizeController.java
@@ -10,6 +10,8 @@ import java.util.zip.ZipOutputStream;
 import org.apache.pdfbox.Loader;
 import org.apache.pdfbox.pdmodel.PDDocument;
 import org.apache.pdfbox.pdmodel.PDPage;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
@@ -23,7 +25,6 @@ import io.github.pixee.security.Filenames;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;

-import lombok.extern.slf4j.Slf4j;
 import stirling.software.SPDF.model.api.general.SplitPdfBySizeOrCountRequest;
 import stirling.software.SPDF.service.CustomPDDocumentFactory;
 import stirling.software.SPDF.utils.GeneralUtils;
@@ -31,10 +32,10 @@ import stirling.software.SPDF.utils.WebResponseUtils;

@RestController
@RequestMapping("/api/v1/general")
-@Slf4j
@Tag(name = "General", description = "General APIs")
 public class SplitPdfBySizeController {

+    private static final Logger logger = LoggerFactory.getLogger(SplitPdfBySizeController.class);
    private final CustomPDDocumentFactory pdfDocumentFactory;

    @Autowired
@@ -77,7 +78,7 @@ public class SplitPdfBySizeController {
            }

        } catch (Exception e) {
-            log.error("exception", e);
+            logger.error("exception", e);
        } finally {
            data = Files.readAllBytes(zipFile);
            Files.deleteIfExists(zipFile);
--- a/src/main/java/stirling/software/SPDF/controller/api/ToSinglePageController.java
+++ b/src/main/java/stirling/software/SPDF/controller/api/ToSinglePageController.java
@@ -11,6 +11,8 @@ import org.apache.pdfbox.pdmodel.PDPage;
 import org.apache.pdfbox.pdmodel.PDPageContentStream;
 import org.apache.pdfbox.pdmodel.common.PDRectangle;
 import org.apache.pdfbox.pdmodel.graphics.form.PDFormXObject;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.ModelAttribute;
@@ -30,6 +32,8 @@ import stirling.software.SPDF.utils.WebResponseUtils;
@Tag(name = "General", description = "General APIs")
 public class ToSinglePageController {

+    private static final Logger logger = LoggerFactory.getLogger(ToSinglePageController.class);
+
    private final CustomPDDocumentFactory pdfDocumentFactory;

    @Autowired
--- a/src/main/java/stirling/software/SPDF/controller/api/UserController.java
+++ b/src/main/java/stirling/software/SPDF/controller/api/UserController.java
@@ -7,6 +7,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Optional;

+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -17,7 +18,11 @@ import org.springframework.security.oauth2.core.user.OAuth2User;
 import org.springframework.security.web.authentication.logout.SecurityContextLogoutHandler;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.servlet.mvc.support.RedirectAttributes;
 import org.springframework.web.servlet.view.RedirectView;

@@ -40,14 +45,9 @@ import stirling.software.SPDF.model.api.user.UsernameAndPass;
@Slf4j
 public class UserController {

-    private static final String LOGIN_MESSAGETYPE_CREDSUPDATED = "/login?messageType=credsUpdated";
-    private final UserService userService;
-    private final SessionPersistentRegistry sessionRegistry;
+    @Autowired private UserService userService;

-    public UserController(UserService userService, SessionPersistentRegistry sessionRegistry) {
-        this.userService = userService;
-        this.sessionRegistry = sessionRegistry;
-    }
+    @Autowired SessionPersistentRegistry sessionRegistry;

    @PreAuthorize("!hasAuthority('ROLE_DEMO_USER')")
    @PostMapping("/register")
@@ -75,27 +75,36 @@ public class UserController {
            HttpServletResponse response,
            RedirectAttributes redirectAttributes)
            throws IOException {
+
        if (!userService.isUsernameValid(newUsername)) {
            return new RedirectView("/account?messageType=invalidUsername", true);
        }
+
        if (principal == null) {
            return new RedirectView("/account?messageType=notAuthenticated", true);
        }
+
        // The username MUST be unique when renaming
        Optional<User> userOpt = userService.findByUsername(principal.getName());
+
        if (userOpt == null || userOpt.isEmpty()) {
            return new RedirectView("/account?messageType=userNotFound", true);
        }
+
        User user = userOpt.get();
+
        if (user.getUsername().equals(newUsername)) {
            return new RedirectView("/account?messageType=usernameExists", true);
        }
+
        if (!userService.isPasswordCorrect(user, currentPassword)) {
            return new RedirectView("/account?messageType=incorrectPassword", true);
        }
+
        if (!user.getUsername().equals(newUsername) && userService.usernameExists(newUsername)) {
            return new RedirectView("/account?messageType=usernameExists", true);
        }
+
        if (newUsername != null && newUsername.length() > 0) {
            try {
                userService.changeUsername(user, newUsername);
@@ -103,8 +112,10 @@ public class UserController {
                return new RedirectView("/account?messageType=invalidUsername", true);
            }
        }
+
        // Logout using Spring's utility
        new SecurityContextLogoutHandler().logout(request, response, null);
+
        return new RedirectView(LOGIN_MESSAGETYPE_CREDSUPDATED, true);
    }

@@ -121,18 +132,24 @@ public class UserController {
        if (principal == null) {
            return new RedirectView("/change-creds?messageType=notAuthenticated", true);
        }
+
        Optional<User> userOpt = userService.findByUsernameIgnoreCase(principal.getName());
+
        if (userOpt == null || userOpt.isEmpty()) {
            return new RedirectView("/change-creds?messageType=userNotFound", true);
        }
+
        User user = userOpt.get();
+
        if (!userService.isPasswordCorrect(user, currentPassword)) {
            return new RedirectView("/change-creds?messageType=incorrectPassword", true);
        }
+
        userService.changePassword(user, newPassword);
        userService.changeFirstUse(user, false);
        // Logout using Spring's utility
        new SecurityContextLogoutHandler().logout(request, response, null);
+
        return new RedirectView(LOGIN_MESSAGETYPE_CREDSUPDATED, true);
    }

@@ -149,17 +166,24 @@ public class UserController {
        if (principal == null) {
            return new RedirectView("/account?messageType=notAuthenticated", true);
        }
+
        Optional<User> userOpt = userService.findByUsernameIgnoreCase(principal.getName());
+
        if (userOpt == null || userOpt.isEmpty()) {
            return new RedirectView("/account?messageType=userNotFound", true);
        }
+
        User user = userOpt.get();
+
        if (!userService.isPasswordCorrect(user, currentPassword)) {
            return new RedirectView("/account?messageType=incorrectPassword", true);
        }
+
        userService.changePassword(user, newPassword);
+
        // Logout using Spring's utility
        new SecurityContextLogoutHandler().logout(request, response, null);
+
        return new RedirectView(LOGIN_MESSAGETYPE_CREDSUPDATED, true);
    }

@@ -169,14 +193,17 @@ public class UserController {
            throws IOException {
        Map<String, String[]> paramMap = request.getParameterMap();
        Map<String, String> updates = new HashMap<>();
+
        for (Map.Entry<String, String[]> entry : paramMap.entrySet()) {
            updates.put(entry.getKey(), entry.getValue()[0]);
        }
+
        log.debug("Processed updates: " + updates);
+
        // Assuming you have a method in userService to update the settings for a user
        userService.updateUserSettings(principal.getName(), updates);
-        // Redirect to a page of your choice after updating
-        return "redirect:/account";
+
+        return "redirect:/account"; // Redirect to a page of your choice after updating
    }

    @PreAuthorize("hasRole('ROLE_ADMIN')")
@@ -189,10 +216,13 @@ public class UserController {
            @RequestParam(name = "forceChange", required = false, defaultValue = "false")
                    boolean forceChange)
            throws IllegalArgumentException, IOException {
+
        if (!userService.isUsernameValid(username)) {
            return new RedirectView("/addUsers?messageType=invalidUsername", true);
        }
+
        Optional<User> userOpt = userService.findByUsernameIgnoreCase(username);
+
        if (userOpt.isPresent()) {
            User user = userOpt.get();
            if (user != null && user.getUsername().equalsIgnoreCase(username)) {
@@ -213,6 +243,7 @@ public class UserController {
            // If the role ID is not valid, redirect with an error message
            return new RedirectView("/addUsers?messageType=invalidRole", true);
        }
+
        if (authType.equalsIgnoreCase(AuthenticationType.SSO.toString())) {
            userService.saveUser(username, AuthenticationType.SSO, role);
        } else {
@@ -221,9 +252,9 @@ public class UserController {
            }
            userService.saveUser(username, password, role, forceChange);
        }
+
        return new RedirectView(
-                "/addUsers", // Redirect to account page after adding the user
-                true);
+                "/addUsers", true); // Redirect to account page after adding the user
    }

    @PreAuthorize("hasRole('ROLE_ADMIN')")
@@ -233,7 +264,9 @@ public class UserController {
            @RequestParam(name = "role") String role,
            Authentication authentication)
            throws IOException {
+
        Optional<User> userOpt = userService.findByUsernameIgnoreCase(username);
+
        if (!userOpt.isPresent()) {
            return new RedirectView("/addUsers?messageType=userNotFound", true);
        }
@@ -242,6 +275,7 @@ public class UserController {
        }
        // Get the currently authenticated username
        String currentUsername = authentication.getName();
+
        // Check if the provided username matches the current session's username
        if (currentUsername.equalsIgnoreCase(username)) {
            return new RedirectView("/addUsers?messageType=downgradeCurrentUser", true);
@@ -258,10 +292,11 @@ public class UserController {
            return new RedirectView("/addUsers?messageType=invalidRole", true);
        }
        User user = userOpt.get();
+
        userService.changeRole(user, role);
+
        return new RedirectView(
-                "/addUsers", // Redirect to account page after adding the user
-                true);
+                "/addUsers", true); // Redirect to account page after adding the user
    }

    @PreAuthorize("hasRole('ROLE_ADMIN')")
@@ -271,7 +306,9 @@ public class UserController {
            @RequestParam("enabled") boolean enabled,
            Authentication authentication)
            throws IOException {
+
        Optional<User> userOpt = userService.findByUsernameIgnoreCase(username);
+
        if (!userOpt.isPresent()) {
            return new RedirectView("/addUsers?messageType=userNotFound", true);
        }
@@ -280,12 +317,15 @@ public class UserController {
        }
        // Get the currently authenticated username
        String currentUsername = authentication.getName();
+
        // Check if the provided username matches the current session's username
        if (currentUsername.equalsIgnoreCase(username)) {
            return new RedirectView("/addUsers?messageType=disabledCurrentUser", true);
        }
        User user = userOpt.get();
+
        userService.changeUserEnabled(user, enabled);
+
        if (!enabled) {
            // Invalidate all sessions if the user is being disabled
            List<Object> principals = sessionRegistry.getAllPrincipals();
@@ -309,24 +349,28 @@ public class UserController {
                }
            }
        }
+
        return new RedirectView(
-                "/addUsers", // Redirect to account page after adding the user
-                true);
+                "/addUsers", true); // Redirect to account page after adding the user
    }

    @PreAuthorize("hasRole('ROLE_ADMIN')")
    @PostMapping("/admin/deleteUser/{username}")
    public RedirectView deleteUser(
            @PathVariable("username") String username, Authentication authentication) {
+
        if (!userService.usernameExistsIgnoreCase(username)) {
            return new RedirectView("/addUsers?messageType=deleteUsernameExists", true);
        }
+
        // Get the currently authenticated username
        String currentUsername = authentication.getName();
+
        // Check if the provided username matches the current session's username
        if (currentUsername.equalsIgnoreCase(username)) {
            return new RedirectView("/addUsers?messageType=deleteCurrentUser", true);
        }
+
        // Invalidate all sessions before deleting the user
        List<SessionInformation> sessionsInformations =
                sessionRegistry.getAllSessions(authentication.getPrincipal(), false);
@@ -366,4 +410,6 @@ public class UserController {
        }
        return ResponseEntity.ok(apiKey);
    }
+
+    private static final String LOGIN_MESSAGETYPE_CREDSUPDATED = "/login?messageType=credsUpdated";
 }
--- a/src/main/java/stirling/software/SPDF/controller/api/converters/ConvertImgPDFController.java
+++ b/src/main/java/stirling/software/SPDF/controller/api/converters/ConvertImgPDFController.java
@@ -14,6 +14,8 @@ import java.util.zip.ZipOutputStream;

 import org.apache.commons.io.FileUtils;
 import org.apache.pdfbox.rendering.ImageType;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
@@ -27,7 +29,6 @@ import io.github.pixee.security.Filenames;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;

-import lombok.extern.slf4j.Slf4j;
 import stirling.software.SPDF.model.api.converters.ConvertToImageRequest;
 import stirling.software.SPDF.model.api.converters.ConvertToPdfRequest;
 import stirling.software.SPDF.service.CustomPDDocumentFactory;
@@ -39,10 +40,11 @@ import stirling.software.SPDF.utils.WebResponseUtils;

@RestController
@RequestMapping("/api/v1/convert")
-@Slf4j
@Tag(name = "Convert", description = "Convert APIs")
 public class ConvertImgPDFController {

+    private static final Logger logger = LoggerFactory.getLogger(ConvertImgPDFController.class);
+
    private final CustomPDDocumentFactory pdfDocumentFactory;

    @Autowired
@@ -63,137 +65,112 @@ public class ConvertImgPDFController {
        String colorType = request.getColorType();
        String dpi = request.getDpi();

-        Path tempFile = null;
-        Path tempOutputDir = null;
-        Path tempPdfPath = null;
+        byte[] pdfBytes = file.getBytes();
+        ImageType colorTypeResult = ImageType.RGB;
+        if ("greyscale".equals(colorType)) {
+            colorTypeResult = ImageType.GRAY;
+        } else if ("blackwhite".equals(colorType)) {
+            colorTypeResult = ImageType.BINARY;
+        }
+        // returns bytes for image
+        boolean singleImage = "single".equals(singleOrMultiple);
        byte[] result = null;
+        String filename =
+                Filenames.toSimpleFileName(file.getOriginalFilename())
+                        .replaceFirst("[.][^.]+$", "");

-        try {
-            byte[] pdfBytes = file.getBytes();
-            ImageType colorTypeResult = ImageType.RGB;
-            if ("greyscale".equals(colorType)) {
-                colorTypeResult = ImageType.GRAY;
-            } else if ("blackwhite".equals(colorType)) {
-                colorTypeResult = ImageType.BINARY;
-            }
-            // returns bytes for image
-            boolean singleImage = "single".equals(singleOrMultiple);
-            String filename =
-                    Filenames.toSimpleFileName(file.getOriginalFilename())
-                            .replaceFirst("[.][^.]+$", "");
-
-            result =
-                    PdfUtils.convertFromPdf(
-                            pdfBytes,
-                            "webp".equalsIgnoreCase(imageFormat)
-                                    ? "png"
-                                    : imageFormat.toUpperCase(),
-                            colorTypeResult,
-                            singleImage,
-                            Integer.valueOf(dpi),
-                            filename);
-            if (result == null || result.length == 0) {
-                log.error("resultant bytes for {} is null, error converting ", filename);
-            }
-            if ("webp".equalsIgnoreCase(imageFormat) && !CheckProgramInstall.isPythonAvailable()) {
-                throw new IOException("Python is not installed. Required for WebP conversion.");
-            } else if ("webp".equalsIgnoreCase(imageFormat)
-                    && CheckProgramInstall.isPythonAvailable()) {
-                // Write the output stream to a temp file
-                tempFile = Files.createTempFile("temp_png", ".png");
-                try (FileOutputStream fos = new FileOutputStream(tempFile.toFile())) {
-                    fos.write(result);
-                    fos.flush();
-                }
-
-                String pythonVersion = CheckProgramInstall.getAvailablePythonCommand();
-
-                List<String> command = new ArrayList<>();
-                command.add(pythonVersion);
-                command.add("./scripts/png_to_webp.py"); // Python script to handle the conversion
-
-                // Create a temporary directory for the output WebP files
-                tempOutputDir = Files.createTempDirectory("webp_output");
-                if (singleImage) {
-                    // Run the Python script to convert PNG to WebP
-                    command.add(tempFile.toString());
-                    command.add(tempOutputDir.toString());
-                    command.add("--single");
-                } else {
-                    // Save the uploaded PDF to a temporary file
-                    tempPdfPath = Files.createTempFile("temp_pdf", ".pdf");
-                    file.transferTo(tempPdfPath.toFile());
-                    // Run the Python script to convert PDF to WebP
-                    command.add(tempPdfPath.toString());
-                    command.add(tempOutputDir.toString());
-                }
-                command.add("--dpi");
-                command.add(dpi);
-                ProcessExecutorResult resultProcess =
-                        ProcessExecutor.getInstance(ProcessExecutor.Processes.PYTHON_OPENCV)
-                                .runCommandWithOutputHandling(command);
-
-                // Find all WebP files in the output directory
-                List<Path> webpFiles =
-                        Files.walk(tempOutputDir)
-                                .filter(path -> path.toString().endsWith(".webp"))
-                                .collect(Collectors.toList());
-
-                if (webpFiles.isEmpty()) {
-                    log.error("No WebP files were created in: {}", tempOutputDir.toString());
-                    throw new IOException(
-                            "No WebP files were created. " + resultProcess.getMessages());
-                }
-
-                byte[] bodyBytes = new byte[0];
-
-                if (webpFiles.size() == 1) {
-                    // Return the single WebP file directly
-                    Path webpFilePath = webpFiles.get(0);
-                    bodyBytes = Files.readAllBytes(webpFilePath);
-                } else {
-                    // Create a ZIP file containing all WebP images
-                    ByteArrayOutputStream zipOutputStream = new ByteArrayOutputStream();
-                    try (ZipOutputStream zos = new ZipOutputStream(zipOutputStream)) {
-                        for (Path webpFile : webpFiles) {
-                            zos.putNextEntry(new ZipEntry(webpFile.getFileName().toString()));
-                            Files.copy(webpFile, zos);
-                            zos.closeEntry();
-                        }
-                    }
-                    bodyBytes = zipOutputStream.toByteArray();
-                }
-                // Clean up the temporary files
-                Files.deleteIfExists(tempFile);
-                if (tempOutputDir != null) FileUtils.deleteDirectory(tempOutputDir.toFile());
-                result = bodyBytes;
+        result =
+                PdfUtils.convertFromPdf(
+                        pdfBytes,
+                        "webp".equalsIgnoreCase(imageFormat) ? "png" : imageFormat.toUpperCase(),
+                        colorTypeResult,
+                        singleImage,
+                        Integer.valueOf(dpi),
+                        filename);
+        if (result == null || result.length == 0) {
+            logger.error("resultant bytes for {} is null, error converting ", filename);
+        }
+        if ("webp".equalsIgnoreCase(imageFormat) && !CheckProgramInstall.isPythonAvailable()) {
+            throw new IOException("Python is not installed. Required for WebP conversion.");
+        } else if ("webp".equalsIgnoreCase(imageFormat)
+                && CheckProgramInstall.isPythonAvailable()) {
+            // Write the output stream to a temp file
+            Path tempFile = Files.createTempFile("temp_png", ".png");
+            try (FileOutputStream fos = new FileOutputStream(tempFile.toFile())) {
+                fos.write(result);
+                fos.flush();
            }

+            String pythonVersion = CheckProgramInstall.getAvailablePythonCommand();
+
+            List<String> command = new ArrayList<>();
+            command.add(pythonVersion);
+            command.add("./scripts/png_to_webp.py"); // Python script to handle the conversion
+
+            // Create a temporary directory for the output WebP files
+            Path tempOutputDir = Files.createTempDirectory("webp_output");
            if (singleImage) {
-                String docName = filename + "." + imageFormat;
-                MediaType mediaType = MediaType.parseMediaType(getMediaType(imageFormat));
-                return WebResponseUtils.bytesToWebResponse(result, docName, mediaType);
+                // Run the Python script to convert PNG to WebP
+                command.add(tempFile.toString());
+                command.add(tempOutputDir.toString());
+                command.add("--single");
            } else {
-                String zipFilename = filename + "_convertedToImages.zip";
-                return WebResponseUtils.bytesToWebResponse(
-                        result, zipFilename, MediaType.APPLICATION_OCTET_STREAM);
+                // Save the uploaded PDF to a temporary file
+                Path tempPdfPath = Files.createTempFile("temp_pdf", ".pdf");
+                file.transferTo(tempPdfPath.toFile());
+                // Run the Python script to convert PDF to WebP
+                command.add(tempPdfPath.toString());
+                command.add(tempOutputDir.toString());
+            }
+            command.add("--dpi");
+            command.add(dpi);
+            ProcessExecutorResult resultProcess =
+                    ProcessExecutor.getInstance(ProcessExecutor.Processes.PYTHON_OPENCV)
+                            .runCommandWithOutputHandling(command);
+
+            // Find all WebP files in the output directory
+            List<Path> webpFiles =
+                    Files.walk(tempOutputDir)
+                            .filter(path -> path.toString().endsWith(".webp"))
+                            .collect(Collectors.toList());
+
+            if (webpFiles.isEmpty()) {
+                logger.error("No WebP files were created in: {}", tempOutputDir.toString());
+                throw new IOException("No WebP files were created. " + resultProcess.getMessages());
            }

-        } finally {
-            try {
-                // Clean up temporary files
-                if (tempFile != null) {
-                    Files.deleteIfExists(tempFile);
+            byte[] bodyBytes = new byte[0];
+
+            if (webpFiles.size() == 1) {
+                // Return the single WebP file directly
+                Path webpFilePath = webpFiles.get(0);
+                bodyBytes = Files.readAllBytes(webpFilePath);
+            } else {
+                // Create a ZIP file containing all WebP images
+                ByteArrayOutputStream zipOutputStream = new ByteArrayOutputStream();
+                try (ZipOutputStream zos = new ZipOutputStream(zipOutputStream)) {
+                    for (Path webpFile : webpFiles) {
+                        zos.putNextEntry(new ZipEntry(webpFile.getFileName().toString()));
+                        Files.copy(webpFile, zos);
+                        zos.closeEntry();
+                    }
                }
-                if (tempPdfPath != null) {
-                    Files.deleteIfExists(tempPdfPath);
-                }
-                if (tempOutputDir != null) {
-                    FileUtils.deleteDirectory(tempOutputDir.toFile());
-                }
-            } catch (Exception e) {
-                log.error("Error cleaning up temporary files", e);
+                bodyBytes = zipOutputStream.toByteArray();
            }
+            // Clean up the temporary files
+            Files.deleteIfExists(tempFile);
+            if (tempOutputDir != null) FileUtils.deleteDirectory(tempOutputDir.toFile());
+            result = bodyBytes;
+        }
+
+        if (singleImage) {
+            String docName = filename + "." + imageFormat;
+            MediaType mediaType = MediaType.parseMediaType(getMediaType(imageFormat));
+            return WebResponseUtils.bytesToWebResponse(result, docName, mediaType);
+        } else {
+            String zipFilename = filename + "_convertedToImages.zip";
+            return WebResponseUtils.bytesToWebResponse(
+                    result, zipFilename, MediaType.APPLICATION_OCTET_STREAM);
        }
    }

@@ -208,13 +185,7 @@ public class ConvertImgPDFController {
        String fitOption = request.getFitOption();
        String colorType = request.getColorType();
        boolean autoRotate = request.isAutoRotate();
-        // Handle Null entries for formdata
-        if (colorType == null || colorType.isBlank()) {
-            colorType = "color";
-        }
-        if (fitOption == null || fitOption.isEmpty()) {
-            fitOption = "fillPage";
-        }
+
        // Convert the file to PDF and get the resulting bytes
        byte[] bytes =
                PdfUtils.imageToPdf(file, fitOption, autoRotate, colorType, pdfDocumentFactory);
--- a/src/main/java/stirling/software/SPDF/controller/api/converters/ConvertOfficeController.java
+++ b/src/main/java/stirling/software/SPDF/controller/api/converters/ConvertOfficeController.java
@@ -33,13 +33,6 @@ 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());
@@ -85,6 +78,13 @@ 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",
--- a/src/main/java/stirling/software/SPDF/controller/api/converters/ConvertPDFToBookController.java
+++ b/src/main/java/stirling/software/SPDF/controller/api/converters/ConvertPDFToBookController.java
@@ -6,6 +6,7 @@ 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;
@@ -25,13 +26,9 @@ import stirling.software.SPDF.utils.WebResponseUtils;
 // @RequestMapping("/api/v1/convert")
 public class ConvertPDFToBookController {

+    @Autowired
    @Qualifier("bookAndHtmlFormatsInstalled")
-    private final boolean bookAndHtmlFormatsInstalled;
-
-    public ConvertPDFToBookController(
-            @Qualifier("bookAndHtmlFormatsInstalled") boolean bookAndHtmlFormatsInstalled) {
-        this.bookAndHtmlFormatsInstalled = bookAndHtmlFormatsInstalled;
-    }
+    private boolean bookAndHtmlFormatsInstalled;

    @PostMapping(consumes = "multipart/form-data", value = "/pdf/book")
    @Operation(
@@ -42,13 +39,16 @@ 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,24 +58,28 @@ 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_", // Use the output format for the file extension
-                        "." + outputFormat);
+                        "output_",
+                        "." + outputFormat); // Use the output format for the file extension
        Path tempInputFile = null;
+
        try {
            // Create temp input file from the provided PDF
-            // Assuming input is always PDF
-            tempInputFile = Files.createTempFile("input_", ".pdf");
+            tempInputFile = Files.createTempFile("input_", ".pdf"); // Assuming input is always 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
@@ -84,12 +88,13 @@ public class ConvertPDFToBookController {
            }
            Files.deleteIfExists(tempOutputFile);
        }
+
        String outputFilename =
                Filenames.toSimpleFileName(fileInput.getOriginalFilename())
                                .replaceFirst("[.][^.]+$", "")
                        + "."
-                        + // Remove file extension and append .pdf
-                        outputFormat;
+                        + outputFormat; // Remove file extension and append .pdf
+
        return WebResponseUtils.bytesToWebResponse(outputFileBytes, outputFilename);
    }
 }
--- a/src/main/java/stirling/software/SPDF/controller/api/converters/ConvertPDFToPDFA.java
+++ b/src/main/java/stirling/software/SPDF/controller/api/converters/ConvertPDFToPDFA.java
@@ -8,6 +8,8 @@ import java.util.Arrays;
 import java.util.List;

 import org.apache.commons.io.FileUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.ModelAttribute;
@@ -20,7 +22,6 @@ import io.github.pixee.security.Filenames;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;

-import lombok.extern.slf4j.Slf4j;
 import stirling.software.SPDF.model.api.converters.PdfToPdfARequest;
 import stirling.software.SPDF.utils.ProcessExecutor;
 import stirling.software.SPDF.utils.ProcessExecutor.ProcessExecutorResult;
@@ -28,10 +29,11 @@ import stirling.software.SPDF.utils.WebResponseUtils;

@RestController
@RequestMapping("/api/v1/convert")
-@Slf4j
@Tag(name = "Convert", description = "Convert APIs")
 public class ConvertPDFToPDFA {

+    private static final Logger logger = LoggerFactory.getLogger(ConvertPDFToPDFA.class);
+
    @PostMapping(consumes = "multipart/form-data", value = "/pdf/pdfa")
    @Operation(
            summary = "Convert a PDF to a PDF/A",
@@ -44,7 +46,7 @@ public class ConvertPDFToPDFA {

        // Validate input file type
        if (!"application/pdf".equals(inputFile.getContentType())) {
-            log.error("Invalid input file type: {}", inputFile.getContentType());
+            logger.error("Invalid input file type: {}", inputFile.getContentType());
            throw new IllegalArgumentException("Input file must be a PDF");
        }

@@ -94,7 +96,7 @@ public class ConvertPDFToPDFA {
                            .runCommandWithOutputHandling(command);

            if (returnCode.getRc() != 0) {
-                log.error("PDF/A conversion failed with return code: {}", returnCode.getRc());
+                logger.error("PDF/A conversion failed with return code: {}", returnCode.getRc());
                throw new RuntimeException("PDF/A conversion failed");
            }

--- a/src/main/java/stirling/software/SPDF/controller/api/converters/ConvertWebsiteToPDF.java
+++ b/src/main/java/stirling/software/SPDF/controller/api/converters/ConvertWebsiteToPDF.java
@@ -7,6 +7,8 @@ import java.util.ArrayList;
 import java.util.List;

 import org.apache.pdfbox.pdmodel.PDDocument;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.ModelAttribute;
@@ -17,7 +19,6 @@ import org.springframework.web.bind.annotation.RestController;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;

-import lombok.extern.slf4j.Slf4j;
 import stirling.software.SPDF.model.api.converters.UrlToPdfRequest;
 import stirling.software.SPDF.service.CustomPDDocumentFactory;
 import stirling.software.SPDF.utils.GeneralUtils;
@@ -27,10 +28,11 @@ import stirling.software.SPDF.utils.WebResponseUtils;

@RestController
@Tag(name = "Convert", description = "Convert APIs")
-@Slf4j
@RequestMapping("/api/v1/convert")
 public class ConvertWebsiteToPDF {

+    private static final Logger logger = LoggerFactory.getLogger(ConvertWebsiteToPDF.class);
+
    private final CustomPDDocumentFactory pdfDocumentFactory;

    @Autowired
@@ -86,7 +88,7 @@ public class ConvertWebsiteToPDF {
                try {
                    Files.deleteIfExists(tempOutputFile);
                } catch (IOException e) {
-                    log.error("Error deleting temporary output file", e);
+                    logger.error("Error deleting temporary output file", e);
                }
            }
        }
--- a/src/main/java/stirling/software/SPDF/controller/api/converters/ExtractCSVController.java
+++ b/src/main/java/stirling/software/SPDF/controller/api/converters/ExtractCSVController.java
@@ -7,6 +7,8 @@ import org.apache.commons.csv.CSVFormat;
 import org.apache.commons.csv.QuoteMode;
 import org.apache.pdfbox.Loader;
 import org.apache.pdfbox.pdmodel.PDDocument;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.http.ContentDisposition;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.MediaType;
@@ -32,6 +34,8 @@ import technology.tabula.writers.Writer;
@Tag(name = "Convert", description = "Convert APIs")
 public class ExtractCSVController {

+    private static final Logger logger = LoggerFactory.getLogger(ExtractCSVController.class);
+
    @PostMapping(value = "/pdf/csv", consumes = "multipart/form-data")
    @Operation(
            summary = "Extracts a CSV document from a PDF",
--- a/src/main/java/stirling/software/SPDF/controller/api/misc/AutoRenameController.java
+++ b/src/main/java/stirling/software/SPDF/controller/api/misc/AutoRenameController.java
@@ -9,6 +9,8 @@ import org.apache.pdfbox.Loader;
 import org.apache.pdfbox.pdmodel.PDDocument;
 import org.apache.pdfbox.text.PDFTextStripper;
 import org.apache.pdfbox.text.TextPosition;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -20,16 +22,16 @@ import io.github.pixee.security.Filenames;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;

-import lombok.extern.slf4j.Slf4j;
 import stirling.software.SPDF.model.api.misc.ExtractHeaderRequest;
 import stirling.software.SPDF.utils.WebResponseUtils;

@RestController
@RequestMapping("/api/v1/misc")
-@Slf4j
@Tag(name = "Misc", description = "Miscellaneous APIs")
 public class AutoRenameController {

+    private static final Logger logger = LoggerFactory.getLogger(AutoRenameController.class);
+
    private static final float TITLE_FONT_SIZE_THRESHOLD = 20.0f;
    private static final int LINE_LIMIT = 200;

@@ -46,6 +48,16 @@ public class AutoRenameController {
        PDDocument document = Loader.loadPDF(file.getBytes());
        PDFTextStripper reader =
                new PDFTextStripper() {
+                    class LineInfo {
+                        String text;
+                        float fontSize;
+
+                        LineInfo(String text, float fontSize) {
+                            this.text = text;
+                            this.fontSize = fontSize;
+                        }
+                    }
+
                    List<LineInfo> lineInfos = new ArrayList<>();
                    StringBuilder lineBuilder = new StringBuilder();
                    float lastY = -1;
@@ -112,16 +124,6 @@ public class AutoRenameController {
                                                        .text)
                                        : null);
                    }
-
-                    class LineInfo {
-                        String text;
-                        float fontSize;
-
-                        LineInfo(String text, float fontSize) {
-                            this.text = text;
-                            this.fontSize = fontSize;
-                        }
-                    }
                };

        String header = reader.getText(document);
@@ -131,7 +133,7 @@ public class AutoRenameController {
            header = header.replaceAll("[/\\\\?%*:|\"<>]", "").trim();
            return WebResponseUtils.pdfDocToWebResponse(document, header + ".pdf");
        } else {
-            log.info("File has no good title to be found");
+            logger.info("File has no good title to be found");
            return WebResponseUtils.pdfDocToWebResponse(
                    document, Filenames.toSimpleFileName(file.getOriginalFilename()));
        }
--- a/src/main/java/stirling/software/SPDF/controller/api/misc/AutoSplitPdfController.java
+++ b/src/main/java/stirling/software/SPDF/controller/api/misc/AutoSplitPdfController.java
@@ -14,6 +14,8 @@ import java.util.zip.ZipOutputStream;

 import org.apache.pdfbox.pdmodel.PDDocument;
 import org.apache.pdfbox.rendering.PDFRenderer;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
@@ -23,24 +25,28 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;

-import com.google.zxing.*;
+import com.google.zxing.BinaryBitmap;
+import com.google.zxing.LuminanceSource;
+import com.google.zxing.MultiFormatReader;
+import com.google.zxing.NotFoundException;
+import com.google.zxing.PlanarYUVLuminanceSource;
+import com.google.zxing.Result;
 import com.google.zxing.common.HybridBinarizer;

 import io.github.pixee.security.Filenames;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;

-import lombok.extern.slf4j.Slf4j;
 import stirling.software.SPDF.model.api.misc.AutoSplitPdfRequest;
 import stirling.software.SPDF.service.CustomPDDocumentFactory;
 import stirling.software.SPDF.utils.WebResponseUtils;

@RestController
@RequestMapping("/api/v1/misc")
-@Slf4j
@Tag(name = "Misc", description = "Miscellaneous APIs")
 public class AutoSplitPdfController {

+    private static final Logger logger = LoggerFactory.getLogger(AutoSplitPdfController.class);
    private static final String QR_CONTENT = "https://github.com/Stirling-Tools/Stirling-PDF";
    private static final String QR_CONTENT_OLD = "https://github.com/Frooodle/Stirling-PDF";

@@ -51,52 +57,6 @@ public class AutoSplitPdfController {
        this.pdfDocumentFactory = pdfDocumentFactory;
    }

-    private static String decodeQRCode(BufferedImage bufferedImage) {
-        LuminanceSource source;
-
-        if (bufferedImage.getRaster().getDataBuffer() instanceof DataBufferByte) {
-            byte[] pixels = ((DataBufferByte) bufferedImage.getRaster().getDataBuffer()).getData();
-            source =
-                    new PlanarYUVLuminanceSource(
-                            pixels,
-                            bufferedImage.getWidth(),
-                            bufferedImage.getHeight(),
-                            0,
-                            0,
-                            bufferedImage.getWidth(),
-                            bufferedImage.getHeight(),
-                            false);
-        } else if (bufferedImage.getRaster().getDataBuffer() instanceof DataBufferInt) {
-            int[] pixels = ((DataBufferInt) bufferedImage.getRaster().getDataBuffer()).getData();
-            byte[] newPixels = new byte[pixels.length];
-            for (int i = 0; i < pixels.length; i++) {
-                newPixels[i] = (byte) (pixels[i] & 0xff);
-            }
-            source =
-                    new PlanarYUVLuminanceSource(
-                            newPixels,
-                            bufferedImage.getWidth(),
-                            bufferedImage.getHeight(),
-                            0,
-                            0,
-                            bufferedImage.getWidth(),
-                            bufferedImage.getHeight(),
-                            false);
-        } else {
-            throw new IllegalArgumentException(
-                    "BufferedImage must have 8-bit gray scale, 24-bit RGB, 32-bit ARGB (packed int), byte gray, or 3-byte/4-byte RGB image data");
-        }
-
-        BinaryBitmap bitmap = new BinaryBitmap(new HybridBinarizer(source));
-
-        try {
-            Result result = new MultiFormatReader().decode(bitmap);
-            return result.getText();
-        } catch (NotFoundException e) {
-            return null; // there is no QR code in the image
-        }
-    }
-
    @PostMapping(value = "/auto-split-pdf", consumes = "multipart/form-data")
    @Operation(
            summary = "Auto split PDF pages into separate documents",
@@ -174,7 +134,7 @@ public class AutoSplitPdfController {
                try {
                    document.close();
                } catch (IOException e) {
-                    log.error("Error closing main PDDocument", e);
+                    logger.error("Error closing main PDDocument", e);
                }
            }

@@ -182,7 +142,7 @@ public class AutoSplitPdfController {
                try {
                    splitDoc.close();
                } catch (IOException e) {
-                    log.error("Error closing split PDDocument", e);
+                    logger.error("Error closing split PDDocument", e);
                }
            }

@@ -190,9 +150,55 @@ public class AutoSplitPdfController {
                try {
                    Files.deleteIfExists(zipFile);
                } catch (IOException e) {
-                    log.error("Error deleting temporary zip file", e);
+                    logger.error("Error deleting temporary zip file", e);
                }
            }
        }
    }
+
+    private static String decodeQRCode(BufferedImage bufferedImage) {
+        LuminanceSource source;
+
+        if (bufferedImage.getRaster().getDataBuffer() instanceof DataBufferByte) {
+            byte[] pixels = ((DataBufferByte) bufferedImage.getRaster().getDataBuffer()).getData();
+            source =
+                    new PlanarYUVLuminanceSource(
+                            pixels,
+                            bufferedImage.getWidth(),
+                            bufferedImage.getHeight(),
+                            0,
+                            0,
+                            bufferedImage.getWidth(),
+                            bufferedImage.getHeight(),
+                            false);
+        } else if (bufferedImage.getRaster().getDataBuffer() instanceof DataBufferInt) {
+            int[] pixels = ((DataBufferInt) bufferedImage.getRaster().getDataBuffer()).getData();
+            byte[] newPixels = new byte[pixels.length];
+            for (int i = 0; i < pixels.length; i++) {
+                newPixels[i] = (byte) (pixels[i] & 0xff);
+            }
+            source =
+                    new PlanarYUVLuminanceSource(
+                            newPixels,
+                            bufferedImage.getWidth(),
+                            bufferedImage.getHeight(),
+                            0,
+                            0,
+                            bufferedImage.getWidth(),
+                            bufferedImage.getHeight(),
+                            false);
+        } else {
+            throw new IllegalArgumentException(
+                    "BufferedImage must have 8-bit gray scale, 24-bit RGB, 32-bit ARGB (packed int), byte gray, or 3-byte/4-byte RGB image data");
+        }
+
+        BinaryBitmap bitmap = new BinaryBitmap(new HybridBinarizer(source));
+
+        try {
+            Result result = new MultiFormatReader().decode(bitmap);
+            return result.getText();
+        } catch (NotFoundException e) {
+            return null; // there is no QR code in the image
+        }
+    }
 }
--- a/src/main/java/stirling/software/SPDF/controller/api/misc/BlankPageController.java
+++ b/src/main/java/stirling/software/SPDF/controller/api/misc/BlankPageController.java
@@ -14,6 +14,8 @@ import org.apache.pdfbox.pdmodel.PDPage;
 import org.apache.pdfbox.pdmodel.PDPageTree;
 import org.apache.pdfbox.rendering.PDFRenderer;
 import org.apache.pdfbox.text.PDFTextStripper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
@@ -28,7 +30,6 @@ import io.github.pixee.security.Filenames;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;

-import lombok.extern.slf4j.Slf4j;
 import stirling.software.SPDF.model.api.misc.RemoveBlankPagesRequest;
 import stirling.software.SPDF.service.CustomPDDocumentFactory;
 import stirling.software.SPDF.utils.PdfUtils;
@@ -36,10 +37,11 @@ import stirling.software.SPDF.utils.WebResponseUtils;

@RestController
@RequestMapping("/api/v1/misc")
-@Slf4j
@Tag(name = "Misc", description = "Miscellaneous APIs")
 public class BlankPageController {

+    private static final Logger logger = LoggerFactory.getLogger(BlankPageController.class);
+
    private final CustomPDDocumentFactory pdfDocumentFactory;

    @Autowired
@@ -47,32 +49,6 @@ public class BlankPageController {
        this.pdfDocumentFactory = pdfDocumentFactory;
    }

-    public static boolean isBlankImage(
-            BufferedImage image, int threshold, double whitePercent, int blurSize) {
-        if (image == null) {
-            log.info("Error: Image is null");
-            return false;
-        }
-
-        // Convert to binary image based on the threshold
-        int whitePixels = 0;
-        int totalPixels = image.getWidth() * image.getHeight();
-
-        for (int i = 0; i < image.getHeight(); i++) {
-            for (int j = 0; j < image.getWidth(); j++) {
-                int color = image.getRGB(j, i) & 0xFF;
-                if (color >= 255 - threshold) {
-                    whitePixels++;
-                }
-            }
-        }
-
-        double whitePixelPercentage = (whitePixels / (double) totalPixels) * 100;
-        log.info(String.format("Page has white pixel percent of %.2f%%", whitePixelPercentage));
-
-        return whitePixelPercentage >= whitePercent;
-    }
-
    @PostMapping(consumes = "multipart/form-data", value = "/remove-blanks")
    @Operation(
            summary = "Remove blank pages from a PDF file",
@@ -95,7 +71,7 @@ public class BlankPageController {
            PDFRenderer pdfRenderer = new PDFRenderer(document);
            pdfRenderer.setSubsamplingAllowed(true);
            for (PDPage page : pages) {
-                log.info("checking page {}", pageIndex);
+                logger.info("checking page {}", pageIndex);
                textStripper.setStartPage(pageIndex + 1);
                textStripper.setEndPage(pageIndex + 1);
                String pageText = textStripper.getText(document);
@@ -103,12 +79,12 @@ public class BlankPageController {

                boolean blank = true;
                if (hasText) {
-                    log.info("page {} has text, not blank", pageIndex);
+                    logger.info("page {} has text, not blank", pageIndex);
                    blank = false;
                } else {
                    boolean hasImages = PdfUtils.hasImagesOnPage(page);
                    if (hasImages) {
-                        log.info("page {} has image, running blank detection", pageIndex);
+                        logger.info("page {} has image, running blank detection", pageIndex);
                        // Render image and save as temp file
                        BufferedImage image = pdfRenderer.renderImageWithDPI(pageIndex, 30);
                        blank = isBlankImage(image, threshold, whitePercent, threshold);
@@ -116,10 +92,10 @@ public class BlankPageController {
                }

                if (blank) {
-                    log.info("Skipping, Image was  blank for page #{}", pageIndex);
+                    logger.info("Skipping, Image was  blank for page #{}", pageIndex);
                    blankPages.add(page);
                } else {
-                    log.info("page {} has image which is not blank", pageIndex);
+                    logger.info("page {} has image which is not blank", pageIndex);
                    nonBlankPages.add(page);
                }

@@ -145,12 +121,12 @@ public class BlankPageController {

            zos.close();

-            log.info("Returning ZIP file: {}", filename + "_processed.zip");
+            logger.info("Returning ZIP file: {}", filename + "_processed.zip");
            return WebResponseUtils.boasToWebResponse(
                    baos, filename + "_processed.zip", MediaType.APPLICATION_OCTET_STREAM);

        } catch (IOException e) {
-            log.error("exception", e);
+            logger.error("exception", e);
            return new ResponseEntity<>(HttpStatus.INTERNAL_SERVER_ERROR);
        }
    }
@@ -169,4 +145,30 @@ public class BlankPageController {
            zos.closeEntry();
        }
    }
+
+    public static boolean isBlankImage(
+            BufferedImage image, int threshold, double whitePercent, int blurSize) {
+        if (image == null) {
+            logger.info("Error: Image is null");
+            return false;
+        }
+
+        // Convert to binary image based on the threshold
+        int whitePixels = 0;
+        int totalPixels = image.getWidth() * image.getHeight();
+
+        for (int i = 0; i < image.getHeight(); i++) {
+            for (int j = 0; j < image.getWidth(); j++) {
+                int color = image.getRGB(j, i) & 0xFF;
+                if (color >= 255 - threshold) {
+                    whitePixels++;
+                }
+            }
+        }
+
+        double whitePixelPercentage = (whitePixels / (double) totalPixels) * 100;
+        logger.info(String.format("Page has white pixel percent of %.2f%%", whitePixelPercentage));
+
+        return whitePixelPercentage >= whitePercent;
+    }
 }
--- a/src/main/java/stirling/software/SPDF/controller/api/misc/CompressController.java
+++ b/src/main/java/stirling/software/SPDF/controller/api/misc/CompressController.java
@@ -1,6 +1,6 @@
 package stirling.software.SPDF.controller.api.misc;

-import java.awt.*;
+import java.awt.Image;
 import java.awt.image.BufferedImage;
 import java.io.ByteArrayOutputStream;
 import java.nio.file.Files;
@@ -17,6 +17,8 @@ import org.apache.pdfbox.pdmodel.PDPage;
 import org.apache.pdfbox.pdmodel.PDResources;
 import org.apache.pdfbox.pdmodel.graphics.PDXObject;
 import org.apache.pdfbox.pdmodel.graphics.image.PDImageXObject;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.ModelAttribute;
@@ -29,7 +31,6 @@ import io.github.pixee.security.Filenames;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;

-import lombok.extern.slf4j.Slf4j;
 import stirling.software.SPDF.model.api.misc.OptimizePdfRequest;
 import stirling.software.SPDF.service.CustomPDDocumentFactory;
 import stirling.software.SPDF.utils.GeneralUtils;
@@ -39,10 +40,11 @@ import stirling.software.SPDF.utils.WebResponseUtils;

@RestController
@RequestMapping("/api/v1/misc")
-@Slf4j
@Tag(name = "Misc", description = "Miscellaneous APIs")
 public class CompressController {

+    private static final Logger logger = LoggerFactory.getLogger(CompressController.class);
+
    private final CustomPDDocumentFactory pdfDocumentFactory;

    @Autowired
@@ -189,7 +191,7 @@ public class CompressController {
                            incrementOptimizeLevel(
                                    optimizeLevel, outputFileSize, expectedOutputSize);
                    if (autoMode && optimizeLevel > 9) {
-                        log.info("Maximum compression level reached in auto mode");
+                        logger.info("Maximum compression level reached in auto mode");
                        sizeMet = true;
                    }
                }
@@ -201,7 +203,7 @@ public class CompressController {

            // Check if optimized file is larger than the original
            if (pdfBytes.length > inputFileSize) {
-                log.warn(
+                logger.warn(
                        "Optimized file is larger than the original. Returning the original file instead.");
                finalFile = tempInputFile;
            }
@@ -232,7 +234,7 @@ public class CompressController {

    private int incrementOptimizeLevel(int currentLevel, long currentSize, long targetSize) {
        double currentRatio = currentSize / (double) targetSize;
-        log.info("Current compression ratio: {}", String.format("%.2f", currentRatio));
+        logger.info("Current compression ratio: {}", String.format("%.2f", currentRatio));

        if (currentRatio > 2.0) {
            return Math.min(9, currentLevel + 3);
--- a/src/main/java/stirling/software/SPDF/controller/api/misc/ExtractImageScansController.java
+++ b/src/main/java/stirling/software/SPDF/controller/api/misc/ExtractImageScansController.java
@@ -17,6 +17,8 @@ import org.apache.commons.io.FileUtils;
 import org.apache.pdfbox.Loader;
 import org.apache.pdfbox.pdmodel.PDDocument;
 import org.apache.pdfbox.rendering.PDFRenderer;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -29,7 +31,6 @@ import io.swagger.v3.oas.annotations.media.Schema;
 import io.swagger.v3.oas.annotations.parameters.RequestBody;
 import io.swagger.v3.oas.annotations.tags.Tag;

-import lombok.extern.slf4j.Slf4j;
 import stirling.software.SPDF.model.api.misc.ExtractImageScansRequest;
 import stirling.software.SPDF.utils.CheckProgramInstall;
 import stirling.software.SPDF.utils.ProcessExecutor;
@@ -38,11 +39,10 @@ import stirling.software.SPDF.utils.WebResponseUtils;

@RestController
@RequestMapping("/api/v1/misc")
-@Slf4j
@Tag(name = "Misc", description = "Miscellaneous APIs")
 public class ExtractImageScansController {

-    private static final String REPLACEFIRST = "[.][^.]+$";
+    private static final Logger logger = LoggerFactory.getLogger(ExtractImageScansController.class);

    @PostMapping(consumes = "multipart/form-data", value = "/extract-image-scans")
    @Operation(
@@ -201,7 +201,7 @@ public class ExtractImageScansController {
                        try {
                            Files.deleteIfExists(path);
                        } catch (IOException e) {
-                            log.error("Failed to delete temporary image file: " + path, e);
+                            logger.error("Failed to delete temporary image file: " + path, e);
                        }
                    });

@@ -209,7 +209,7 @@ public class ExtractImageScansController {
                try {
                    Files.deleteIfExists(tempZipFile);
                } catch (IOException e) {
-                    log.error("Failed to delete temporary zip file: " + tempZipFile, e);
+                    logger.error("Failed to delete temporary zip file: " + tempZipFile, e);
                }
            }

@@ -218,9 +218,11 @@ public class ExtractImageScansController {
                        try {
                            FileUtils.deleteDirectory(dir.toFile());
                        } catch (IOException e) {
-                            log.error("Failed to delete temporary directory: " + dir, e);
+                            logger.error("Failed to delete temporary directory: " + dir, e);
                        }
                    });
        }
    }
+
+    private static final String REPLACEFIRST = "[.][^.]+$";
 }
--- a/src/main/java/stirling/software/SPDF/controller/api/misc/ExtractImagesController.java
+++ b/src/main/java/stirling/software/SPDF/controller/api/misc/ExtractImagesController.java
@@ -25,6 +25,8 @@ import org.apache.pdfbox.cos.COSName;
 import org.apache.pdfbox.pdmodel.PDDocument;
 import org.apache.pdfbox.pdmodel.PDPage;
 import org.apache.pdfbox.pdmodel.graphics.image.PDImageXObject;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.ModelAttribute;
@@ -37,17 +39,17 @@ import io.github.pixee.security.Filenames;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;

-import lombok.extern.slf4j.Slf4j;
 import stirling.software.SPDF.model.api.PDFExtractImagesRequest;
 import stirling.software.SPDF.utils.ImageProcessingUtils;
 import stirling.software.SPDF.utils.WebResponseUtils;

@RestController
@RequestMapping("/api/v1/misc")
-@Slf4j
@Tag(name = "Misc", description = "Miscellaneous APIs")
 public class ExtractImagesController {

+    private static final Logger logger = LoggerFactory.getLogger(ExtractImagesController.class);
+
    @PostMapping(consumes = "multipart/form-data", value = "/extract-images")
    @Operation(
            summary = "Extract images from a PDF file",
@@ -105,7 +107,7 @@ public class ExtractImagesController {
                                                allowDuplicates);
                                    } catch (IOException e) {
                                        // Log the error and continue processing other pages
-                                        log.error(
+                                        logger.error(
                                                "Error extracting images from page {}: {}",
                                                pageNum,
                                                e.getMessage());
@@ -165,7 +167,7 @@ public class ExtractImagesController {
        try {
            md = MessageDigest.getInstance("MD5");
        } catch (NoSuchAlgorithmException e) {
-            log.error("MD5 algorithm not available for extractImages hash.", e);
+            logger.error("MD5 algorithm not available for extractImages hash.", e);
            return;
        }
        if (page.getResources() == null || page.getResources().getXObjectNames() == null) {
--- a/src/main/java/stirling/software/SPDF/controller/api/misc/FakeScanControllerWIP.java
+++ b/src/main/java/stirling/software/SPDF/controller/api/misc/FakeScanControllerWIP.java
@@ -1,10 +1,19 @@
 package stirling.software.SPDF.controller.api.misc;

-import java.awt.*;
+import java.awt.AlphaComposite;
+import java.awt.BasicStroke;
+import java.awt.Color;
+import java.awt.GradientPaint;
+import java.awt.Graphics2D;
+import java.awt.RenderingHints;
 import java.awt.geom.AffineTransform;
 import java.awt.geom.Ellipse2D;
 import java.awt.geom.Path2D;
-import java.awt.image.*;
+import java.awt.image.AffineTransformOp;
+import java.awt.image.BufferedImage;
+import java.awt.image.BufferedImageOp;
+import java.awt.image.ConvolveOp;
+import java.awt.image.Kernel;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.security.SecureRandom;
@@ -18,6 +27,8 @@ import org.apache.pdfbox.pdmodel.graphics.image.JPEGFactory;
 import org.apache.pdfbox.pdmodel.graphics.image.PDImageXObject;
 import org.apache.pdfbox.rendering.ImageType;
 import org.apache.pdfbox.rendering.PDFRenderer;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -39,6 +50,8 @@ import stirling.software.SPDF.utils.WebResponseUtils;
@Tag(name = "Misc", description = "Miscellaneous APIs")
 public class FakeScanControllerWIP {

+    private static final Logger logger = LoggerFactory.getLogger(FakeScanControllerWIP.class);
+
    // TODO finish
    @PostMapping(consumes = "multipart/form-data", value = "/fake-scan")
    @Hidden
--- a/src/main/java/stirling/software/SPDF/controller/api/misc/FlattenController.java
+++ b/src/main/java/stirling/software/SPDF/controller/api/misc/FlattenController.java
@@ -12,6 +12,8 @@ import org.apache.pdfbox.pdmodel.graphics.image.PDImageXObject;
 import org.apache.pdfbox.pdmodel.interactive.form.PDAcroForm;
 import org.apache.pdfbox.rendering.ImageType;
 import org.apache.pdfbox.rendering.PDFRenderer;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.ModelAttribute;
@@ -24,17 +26,17 @@ import io.github.pixee.security.Filenames;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;

-import lombok.extern.slf4j.Slf4j;
 import stirling.software.SPDF.model.api.misc.FlattenRequest;
 import stirling.software.SPDF.service.CustomPDDocumentFactory;
 import stirling.software.SPDF.utils.WebResponseUtils;

@RestController
@RequestMapping("/api/v1/misc")
-@Slf4j
@Tag(name = "Misc", description = "Miscellaneous APIs")
 public class FlattenController {

+    private static final Logger logger = LoggerFactory.getLogger(FlattenController.class);
+
    private final CustomPDDocumentFactory pdfDocumentFactory;

    @Autowired
@@ -82,7 +84,7 @@ public class FlattenController {
                        contentStream.drawImage(pdImage, 0, 0, pageWidth, pageHeight);
                    }
                } catch (IOException e) {
-                    log.error("exception", e);
+                    logger.error("exception", e);
                }
            }
            return WebResponseUtils.pdfDocToWebResponse(
--- a/src/main/java/stirling/software/SPDF/controller/api/misc/MetadataController.java
+++ b/src/main/java/stirling/software/SPDF/controller/api/misc/MetadataController.java
@@ -11,26 +11,29 @@ import org.apache.pdfbox.Loader;
 import org.apache.pdfbox.cos.COSName;
 import org.apache.pdfbox.pdmodel.PDDocument;
 import org.apache.pdfbox.pdmodel.PDDocumentInformation;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.WebDataBinder;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;

 import io.github.pixee.security.Filenames;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;

-import lombok.extern.slf4j.Slf4j;
 import stirling.software.SPDF.model.api.misc.MetadataRequest;
 import stirling.software.SPDF.utils.WebResponseUtils;
-import stirling.software.SPDF.utils.propertyeditor.StringToMapPropertyEditor;

@RestController
@RequestMapping("/api/v1/misc")
-@Slf4j
@Tag(name = "Misc", description = "Miscellaneous APIs")
 public class MetadataController {

+    private static final Logger logger = LoggerFactory.getLogger(MetadataController.class);
+
    private String checkUndefined(String entry) {
        // Check if the string is "undefined"
        if ("undefined".equals(entry)) {
@@ -41,11 +44,6 @@ public class MetadataController {
        return entry;
    }

-    @InitBinder
-    public void initBinder(WebDataBinder binder) {
-        binder.registerCustomEditor(Map.class, "allRequestParams", new StringToMapPropertyEditor());
-    }
-
    @PostMapping(consumes = "multipart/form-data", value = "/update-metadata")
    @Operation(
            summary = "Update metadata of a PDF file",
@@ -142,7 +140,7 @@ public class MetadataController {
                creationDateCal.setTime(
                        new SimpleDateFormat("yyyy/MM/dd HH:mm:ss").parse(creationDate));
            } catch (ParseException e) {
-                log.error("exception", e);
+                logger.error("exception", e);
            }
            info.setCreationDate(creationDateCal);
        } else {
@@ -154,7 +152,7 @@ public class MetadataController {
                modificationDateCal.setTime(
                        new SimpleDateFormat("yyyy/MM/dd HH:mm:ss").parse(modificationDate));
            } catch (ParseException e) {
-                log.error("exception", e);
+                logger.error("exception", e);
            }
            info.setModificationDate(modificationDateCal);
        } else {
--- a/src/main/java/stirling/software/SPDF/controller/api/misc/OCRController.java
+++ b/src/main/java/stirling/software/SPDF/controller/api/misc/OCRController.java
@@ -1,10 +1,18 @@
 package stirling.software.SPDF.controller.api.misc;

 import java.awt.image.BufferedImage;
-import java.io.*;
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStreamReader;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
 import java.util.stream.Collectors;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipOutputStream;
@@ -16,6 +24,7 @@ import org.apache.pdfbox.pdmodel.PDDocument;
 import org.apache.pdfbox.pdmodel.PDPage;
 import org.apache.pdfbox.rendering.PDFRenderer;
 import org.apache.pdfbox.text.PDFTextStripper;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.ModelAttribute;
@@ -39,14 +48,12 @@ import stirling.software.SPDF.service.CustomPDDocumentFactory;
@Slf4j
 public class OCRController {

-    private final ApplicationProperties applicationProperties;
+    @Autowired private ApplicationProperties applicationProperties;

    private final CustomPDDocumentFactory pdfDocumentFactory;

-    public OCRController(
-            ApplicationProperties applicationProperties,
-            CustomPDDocumentFactory pdfDocumentFactory) {
-        this.applicationProperties = applicationProperties;
+    @Autowired
+    public OCRController(CustomPDDocumentFactory pdfDocumentFactory) {
        this.pdfDocumentFactory = pdfDocumentFactory;
    }

@@ -71,45 +78,54 @@ public class OCRController {
        MultipartFile inputFile = request.getFileInput();
        List<String> languages = request.getLanguages();
        String ocrType = request.getOcrType();
+
        Path tempDir = Files.createTempDirectory("ocr_process");
        Path tempInputFile = tempDir.resolve("input.pdf");
        Path tempOutputDir = tempDir.resolve("output");
        Path tempImagesDir = tempDir.resolve("images");
        Path finalOutputFile = tempDir.resolve("final_output.pdf");
+
        Files.createDirectories(tempOutputDir);
        Files.createDirectories(tempImagesDir);
-        Process process = null;
+
        try {
            // Save input file
            inputFile.transferTo(tempInputFile.toFile());
            PDFMergerUtility merger = new PDFMergerUtility();
            merger.setDestinationFileName(finalOutputFile.toString());
+
            try (PDDocument document = pdfDocumentFactory.load(tempInputFile.toFile())) {
                PDFRenderer pdfRenderer = new PDFRenderer(document);
                int pageCount = document.getNumberOfPages();
+
                for (int pageNum = 0; pageNum < pageCount; pageNum++) {
                    PDPage page = document.getPage(pageNum);
                    boolean hasText = false;
+
                    // Check for existing text
                    try (PDDocument tempDoc = new PDDocument()) {
                        tempDoc.addPage(page);
                        PDFTextStripper stripper = new PDFTextStripper();
                        hasText = !stripper.getText(tempDoc).trim().isEmpty();
                    }
+
                    boolean shouldOcr =
                            switch (ocrType) {
                                case "skip-text" -> !hasText;
                                case "force-ocr" -> true;
                                default -> true;
                            };
+
                    Path pageOutputPath =
                            tempOutputDir.resolve(String.format("page_%d.pdf", pageNum));
+
                    if (shouldOcr) {
                        // Convert page to image
                        BufferedImage image = pdfRenderer.renderImageWithDPI(pageNum, 300);
                        Path imagePath =
                                tempImagesDir.resolve(String.format("page_%d.png", pageNum));
                        ImageIO.write(image, "png", imagePath.toFile());
+
                        // Build OCR command
                        List<String> command = new ArrayList<>();
                        command.add("tesseract");
@@ -120,10 +136,11 @@ public class OCRController {
                                        .toString());
                        command.add("-l");
                        command.add(String.join("+", languages));
-                        // Always output PDF
-                        command.add("pdf");
+                        command.add("pdf"); // Always output PDF
+
                        ProcessBuilder pb = new ProcessBuilder(command);
-                        process = pb.start();
+                        Process process = pb.start();
+
                        // Capture any error output
                        try (BufferedReader reader =
                                new BufferedReader(
@@ -133,11 +150,13 @@ public class OCRController {
                                log.debug("Tesseract: {}", line);
                            }
                        }
+
                        int exitCode = process.waitFor();
                        if (exitCode != 0) {
                            throw new RuntimeException(
                                    "Tesseract failed with exit code: " + exitCode);
                        }
+
                        // Add OCR'd PDF to merger
                        merger.addSource(pageOutputPath.toFile());
                    } else {
@@ -150,24 +169,25 @@ public class OCRController {
                    }
                }
            }
+
            // Merge all pages into final PDF
            merger.mergeDocuments(null);
+
            // Read the final PDF file
            byte[] pdfContent = Files.readAllBytes(finalOutputFile);
            String outputFilename =
                    Filenames.toSimpleFileName(inputFile.getOriginalFilename())
                                    .replaceFirst("[.][^.]+$", "")
                            + "_OCR.pdf";
+
            return ResponseEntity.ok()
                    .header(
                            "Content-Disposition",
                            "attachment; filename=\"" + outputFilename + "\"")
                    .contentType(MediaType.APPLICATION_PDF)
                    .body(pdfContent);
+
        } finally {
-            if (process != null) {
-                process.destroy();
-            }
            // Clean up temporary files
            deleteDirectory(tempDir);
        }
@@ -179,14 +199,17 @@ public class OCRController {
            log.warn("File {} does not exist, skipping", file);
            return;
        }
+
        try (FileInputStream fis = new FileInputStream(file)) {
            ZipEntry zipEntry = new ZipEntry(filename);
            zipOut.putNextEntry(zipEntry);
+
            byte[] buffer = new byte[1024];
            int length;
            while ((length = fis.read(buffer)) >= 0) {
                zipOut.write(buffer, 0, length);
            }
+
            zipOut.closeEntry();
        }
    }
--- a/src/main/java/stirling/software/SPDF/controller/api/misc/OverlayImageController.java
+++ b/src/main/java/stirling/software/SPDF/controller/api/misc/OverlayImageController.java
@@ -2,6 +2,8 @@ package stirling.software.SPDF.controller.api.misc;

 import java.io.IOException;

+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
@@ -15,7 +17,6 @@ import io.github.pixee.security.Filenames;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;

-import lombok.extern.slf4j.Slf4j;
 import stirling.software.SPDF.model.api.misc.OverlayImageRequest;
 import stirling.software.SPDF.service.CustomPDDocumentFactory;
 import stirling.software.SPDF.utils.PdfUtils;
@@ -23,10 +24,11 @@ import stirling.software.SPDF.utils.WebResponseUtils;

@RestController
@RequestMapping("/api/v1/misc")
-@Slf4j
@Tag(name = "Misc", description = "Miscellaneous APIs")
 public class OverlayImageController {

+    private static final Logger logger = LoggerFactory.getLogger(OverlayImageController.class);
+
    private final CustomPDDocumentFactory pdfDocumentFactory;

    @Autowired
@@ -58,7 +60,7 @@ public class OverlayImageController {
                                    .replaceFirst("[.][^.]+$", "")
                            + "_overlayed.pdf");
        } catch (IOException e) {
-            log.error("Failed to add image to PDF", e);
+            logger.error("Failed to add image to PDF", e);
            return new ResponseEntity<>(HttpStatus.BAD_REQUEST);
        }
    }
--- a/src/main/java/stirling/software/SPDF/controller/api/misc/PageNumbersController.java
+++ b/src/main/java/stirling/software/SPDF/controller/api/misc/PageNumbersController.java
@@ -10,6 +10,8 @@ import org.apache.pdfbox.pdmodel.PDPageContentStream;
 import org.apache.pdfbox.pdmodel.common.PDRectangle;
 import org.apache.pdfbox.pdmodel.font.PDType1Font;
 import org.apache.pdfbox.pdmodel.font.Standard14Fonts;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
@@ -33,6 +35,8 @@ import stirling.software.SPDF.utils.WebResponseUtils;
@Tag(name = "Misc", description = "Miscellaneous APIs")
 public class PageNumbersController {

+    private static final Logger logger = LoggerFactory.getLogger(PageNumbersController.class);
+
    private final CustomPDDocumentFactory pdfDocumentFactory;

    @Autowired
--- a/src/main/java/stirling/software/SPDF/controller/api/misc/PrintFileController.java
+++ b/src/main/java/stirling/software/SPDF/controller/api/misc/PrintFileController.java
@@ -1,6 +1,7 @@
 package stirling.software.SPDF.controller.api.misc;

-import java.awt.*;
+import java.awt.Graphics;
+import java.awt.Graphics2D;
 import java.awt.image.BufferedImage;
 import java.awt.print.PageFormat;
 import java.awt.print.Printable;
--- a/src/main/java/stirling/software/SPDF/controller/api/misc/RepairController.java
+++ b/src/main/java/stirling/software/SPDF/controller/api/misc/RepairController.java
@@ -6,6 +6,8 @@ import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.List;

+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.ModelAttribute;
@@ -29,6 +31,8 @@ import stirling.software.SPDF.utils.WebResponseUtils;
@Tag(name = "Misc", description = "Miscellaneous APIs")
 public class RepairController {

+    private static final Logger logger = LoggerFactory.getLogger(RepairController.class);
+
    private final CustomPDDocumentFactory pdfDocumentFactory;

    @Autowired
--- a/src/main/java/stirling/software/SPDF/controller/api/misc/ShowJavascript.java
+++ b/src/main/java/stirling/software/SPDF/controller/api/misc/ShowJavascript.java
@@ -7,6 +7,8 @@ import org.apache.pdfbox.Loader;
 import org.apache.pdfbox.pdmodel.PDDocument;
 import org.apache.pdfbox.pdmodel.common.PDNameTreeNode;
 import org.apache.pdfbox.pdmodel.interactive.action.PDActionJavaScript;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.ModelAttribute;
@@ -27,6 +29,8 @@ import stirling.software.SPDF.utils.WebResponseUtils;
@Tag(name = "Misc", description = "Miscellaneous APIs")
 public class ShowJavascript {

+    private static final Logger logger = LoggerFactory.getLogger(ShowJavascript.class);
+
    @PostMapping(consumes = "multipart/form-data", value = "/show-javascript")
    @Operation(
            summary = "Grabs all JS from a PDF and returns a single JS file with all code",
--- a/src/main/java/stirling/software/SPDF/controller/api/misc/StampController.java
+++ b/src/main/java/stirling/software/SPDF/controller/api/misc/StampController.java
@@ -1,6 +1,6 @@
 package stirling.software.SPDF.controller.api.misc;

-import java.awt.*;
+import java.awt.Color;
 import java.awt.image.BufferedImage;
 import java.io.File;
 import java.io.FileOutputStream;
@@ -229,22 +229,10 @@ public class StampController {
                    calculatePositionY(
                            pageSize, position, calculateTextCapHeight(font, fontSize), margin);
        }
-        // Split the stampText into multiple lines
-        String[] lines = stampText.split("\\\\n");
-
-        // Calculate dynamic line height based on font ascent and descent
-        float ascent = font.getFontDescriptor().getAscent();
-        float descent = font.getFontDescriptor().getDescent();
-        float lineHeight = ((ascent - descent) / 1000) * fontSize;

        contentStream.beginText();
-        for (int i = 0; i < lines.length; i++) {
-            String line = lines[i];
-            // Set the text matrix for each line with rotation
-            contentStream.setTextMatrix(
-                    Matrix.getRotateInstance(Math.toRadians(rotation), x, y - (i * lineHeight)));
-            contentStream.showText(line);
-        }
+        contentStream.setTextMatrix(Matrix.getRotateInstance(Math.toRadians(rotation), x, y));
+        contentStream.showText(stampText);
        contentStream.endText();
    }

--- a/src/main/java/stirling/software/SPDF/controller/api/pipeline/ApiDocService.java
+++ b/src/main/java/stirling/software/SPDF/controller/api/pipeline/ApiDocService.java
@@ -7,6 +7,8 @@ import java.util.Map;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;

+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpEntity;
 import org.springframework.http.HttpHeaders;
@@ -19,35 +21,28 @@ import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;

 import jakarta.servlet.ServletContext;
-import lombok.extern.slf4j.Slf4j;
 import stirling.software.SPDF.SPdfApplication;
 import stirling.software.SPDF.model.ApiEndpoint;
 import stirling.software.SPDF.model.Role;

@Service
-@Slf4j
 public class ApiDocService {

    private final Map<String, ApiEndpoint> apiDocumentation = new HashMap<>();

-    private final ServletContext servletContext;
-    private final UserServiceInterface userService;
-    Map<String, List<String>> outputToFileTypes = new HashMap<>();
-    JsonNode apiDocsJsonRootNode;
+    private static final Logger logger = LoggerFactory.getLogger(ApiDocService.class);

-    public ApiDocService(
-            ServletContext servletContext,
-            @Autowired(required = false) UserServiceInterface userService) {
-        this.servletContext = servletContext;
-        this.userService = userService;
-    }
+    @Autowired private ServletContext servletContext;

    private String getApiDocsUrl() {
        String contextPath = servletContext.getContextPath();
        String port = SPdfApplication.getStaticPort();
+
        return "http://localhost:" + port + contextPath + "/v1/api-docs";
    }

+    Map<String, List<String>> outputToFileTypes = new HashMap<>();
+
    public List<String> getExtensionTypes(boolean output, String operationName) {
        if (outputToFileTypes.size() == 0) {
            outputToFileTypes.put("PDF", Arrays.asList("pdf"));
@@ -71,12 +66,14 @@ public class ApiDocService {
                    "BOOK", Arrays.asList("epub", "mobi", "azw3", "fb2", "txt", "docx"));
            // type.
        }
+
        if (apiDocsJsonRootNode == null || apiDocumentation.size() == 0) {
            loadApiDocumentation();
        }
        if (!apiDocumentation.containsKey(operationName)) {
            return null;
        }
+
        ApiEndpoint endpoint = apiDocumentation.get(operationName);
        String description = endpoint.getDescription();
        Pattern pattern = null;
@@ -95,11 +92,16 @@ public class ApiDocService {
        return null;
    }

+    @Autowired(required = false)
+    private UserServiceInterface userService;
+
    private String getApiKeyForUser() {
        if (userService == null) return "";
        return userService.getApiKeyForUser(Role.INTERNAL_API_USER.getRoleId());
    }

+    JsonNode apiDocsJsonRootNode;
+
    // @EventListener(ApplicationReadyEvent.class)
    private synchronized void loadApiDocumentation() {
        String apiDocsJson = "";
@@ -110,12 +112,15 @@ public class ApiDocService {
                headers.set("X-API-KEY", apiKey);
            }
            HttpEntity<String> entity = new HttpEntity<>(headers);
+
            RestTemplate restTemplate = new RestTemplate();
            ResponseEntity<String> response =
                    restTemplate.exchange(getApiDocsUrl(), HttpMethod.GET, entity, String.class);
            apiDocsJson = response.getBody();
+
            ObjectMapper mapper = new ObjectMapper();
            apiDocsJsonRootNode = mapper.readTree(apiDocsJson);
+
            JsonNode paths = apiDocsJsonRootNode.path("paths");
            paths.fields()
                    .forEachRemaining(
@@ -130,7 +135,7 @@ public class ApiDocService {
                            });
        } catch (Exception e) {
            // Handle exceptions
-            log.error("Error grabbing swagger doc, body result {}", apiDocsJson);
+            logger.error("Error grabbing swagger doc, body result {}", apiDocsJson);
        }
    }

@@ -152,15 +157,19 @@ public class ApiDocService {
        if (!apiDocumentation.containsKey(operationName)) {
            return false;
        }
+
        ApiEndpoint endpoint = apiDocumentation.get(operationName);
        String description = endpoint.getDescription();
+
        Pattern pattern = Pattern.compile("Type:(\\w+)");
        Matcher matcher = pattern.matcher(description);
        if (matcher.find()) {
            String type = matcher.group(1);
            return type.startsWith("MI");
        }
+
        return false;
    }
 }
+
 // Model class for API Endpoint
--- a/src/main/java/stirling/software/SPDF/controller/api/pipeline/PipelineController.java
+++ b/src/main/java/stirling/software/SPDF/controller/api/pipeline/PipelineController.java
@@ -8,6 +8,9 @@ import java.util.Map;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipOutputStream;

+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.io.Resource;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
@@ -23,7 +26,6 @@ import com.fasterxml.jackson.databind.ObjectMapper;

 import io.swagger.v3.oas.annotations.tags.Tag;

-import lombok.extern.slf4j.Slf4j;
 import stirling.software.SPDF.model.ApplicationProperties;
 import stirling.software.SPDF.model.PipelineConfig;
 import stirling.software.SPDF.model.api.HandleDataRequest;
@@ -31,39 +33,30 @@ import stirling.software.SPDF.utils.WebResponseUtils;

@RestController
@RequestMapping("/api/v1/pipeline")
-@Slf4j
@Tag(name = "Pipeline", description = "Pipeline APIs")
 public class PipelineController {

+    private static final Logger logger = LoggerFactory.getLogger(PipelineController.class);
+
    final String watchedFoldersDir = "./pipeline/watchedFolders/";
-
    final String finishedFoldersDir = "./pipeline/finishedFolders/";
+    @Autowired PipelineProcessor processor;

-    private final PipelineProcessor processor;
+    @Autowired ApplicationProperties applicationProperties;

-    private final ApplicationProperties applicationProperties;
-
-    private final ObjectMapper objectMapper;
-
-    public PipelineController(
-            PipelineProcessor processor,
-            ApplicationProperties applicationProperties,
-            ObjectMapper objectMapper) {
-        this.processor = processor;
-        this.applicationProperties = applicationProperties;
-        this.objectMapper = objectMapper;
-    }
+    @Autowired private ObjectMapper objectMapper;

    @PostMapping("/handleData")
    public ResponseEntity<byte[]> handleData(@ModelAttribute HandleDataRequest request)
            throws JsonMappingException, JsonProcessingException {
+
        MultipartFile[] files = request.getFileInput();
        String jsonString = request.getJson();
        if (files == null) {
            return null;
        }
        PipelineConfig config = objectMapper.readValue(jsonString, PipelineConfig.class);
-        log.info("Received POST request to /handleData with {} files", files.length);
+        logger.info("Received POST request to /handleData with {} files", files.length);
        try {
            List<Resource> inputFiles = processor.generateInputFiles(files);
            if (inputFiles == null || inputFiles.size() == 0) {
@@ -77,21 +70,26 @@ public class PipelineController {
                byte[] bytes = new byte[(int) singleFile.contentLength()];
                is.read(bytes);
                is.close();
-                log.info("Returning single file response...");
+
+                logger.info("Returning single file response...");
                return WebResponseUtils.bytesToWebResponse(
                        bytes, singleFile.getFilename(), MediaType.APPLICATION_OCTET_STREAM);
            } else if (outputFiles == null) {
                return null;
            }
+
            // Create a ByteArrayOutputStream to hold the zip
            ByteArrayOutputStream baos = new ByteArrayOutputStream();
            ZipOutputStream zipOut = new ZipOutputStream(baos);
+
            // A map to keep track of filenames and their counts
            Map<String, Integer> filenameCount = new HashMap<>();
+
            // Loop through each file and add it to the zip
            for (Resource file : outputFiles) {
                String originalFilename = file.getFilename();
                String filename = originalFilename;
+
                // Check if the filename already exists, and modify it if necessary
                if (filenameCount.containsKey(originalFilename)) {
                    int count = filenameCount.get(originalFilename);
@@ -102,23 +100,29 @@ public class PipelineController {
                } else {
                    filenameCount.put(originalFilename, 1);
                }
+
                ZipEntry zipEntry = new ZipEntry(filename);
                zipOut.putNextEntry(zipEntry);
+
                // Read the file into a byte array
                InputStream is = file.getInputStream();
                byte[] bytes = new byte[(int) file.contentLength()];
                is.read(bytes);
+
                // Write the bytes of the file to the zip
                zipOut.write(bytes, 0, bytes.length);
                zipOut.closeEntry();
+
                is.close();
            }
+
            zipOut.close();
-            log.info("Returning zipped file response...");
+
+            logger.info("Returning zipped file response...");
            return WebResponseUtils.boasToWebResponse(
                    baos, "output.zip", MediaType.APPLICATION_OCTET_STREAM);
        } catch (Exception e) {
-            log.error("Error handling data: ", e);
+            logger.error("Error handling data: ", e);
            return null;
        }
    }
--- a/src/main/java/stirling/software/SPDF/controller/api/pipeline/PipelineDirectoryProcessor.java
+++ b/src/main/java/stirling/software/SPDF/controller/api/pipeline/PipelineDirectoryProcessor.java
@@ -16,6 +16,9 @@ import java.util.List;
 import java.util.Optional;
 import java.util.stream.Stream;

+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.core.io.ByteArrayResource;
 import org.springframework.core.io.Resource;
@@ -24,40 +27,27 @@ import org.springframework.stereotype.Service;

 import com.fasterxml.jackson.databind.ObjectMapper;

-import lombok.extern.slf4j.Slf4j;
 import stirling.software.SPDF.model.PipelineConfig;
 import stirling.software.SPDF.model.PipelineOperation;
 import stirling.software.SPDF.utils.FileMonitor;

@Service
-@Slf4j
 public class PipelineDirectoryProcessor {

-    private final ObjectMapper objectMapper;
+    private static final Logger logger = LoggerFactory.getLogger(PipelineDirectoryProcessor.class);
+    @Autowired private ObjectMapper objectMapper;
+    @Autowired private ApiDocService apiDocService;
+    @Autowired PipelineProcessor processor;
+    @Autowired FileMonitor fileMonitor;

-    private final ApiDocService apiDocService;
-
-    private final PipelineProcessor processor;
-
-    private final FileMonitor fileMonitor;
-
-    private final String watchedFoldersDir;
-
-    private final String finishedFoldersDir;
+    final String watchedFoldersDir;
+    final String finishedFoldersDir;

    public PipelineDirectoryProcessor(
-            ObjectMapper objectMapper,
-            ApiDocService apiDocService,
            @Qualifier("watchedFoldersDir") String watchedFoldersDir,
-            @Qualifier("finishedFoldersDir") String finishedFoldersDir,
-            PipelineProcessor processor,
-            FileMonitor fileMonitor) {
-        this.objectMapper = objectMapper;
-        this.apiDocService = apiDocService;
+            @Qualifier("finishedFoldersDir") String finishedFoldersDir) {
        this.watchedFoldersDir = watchedFoldersDir;
        this.finishedFoldersDir = finishedFoldersDir;
-        this.processor = processor;
-        this.fileMonitor = fileMonitor;
    }

    @Scheduled(fixedRate = 60000)
@@ -66,9 +56,9 @@ public class PipelineDirectoryProcessor {
        if (!Files.exists(watchedFolderPath)) {
            try {
                Files.createDirectories(watchedFolderPath);
-                log.info("Created directory: {}", watchedFolderPath);
+                logger.info("Created directory: {}", watchedFolderPath);
            } catch (IOException e) {
-                log.error("Error creating directory: {}", watchedFolderPath, e);
+                logger.error("Error creating directory: {}", watchedFolderPath, e);
                return;
            }
        }
@@ -81,22 +71,24 @@ public class PipelineDirectoryProcessor {
                                        handleDirectory(t);
                                    }
                                } catch (Exception e) {
-                                    log.error("Error handling directory: {}", t, e);
+                                    logger.error("Error handling directory: {}", t, e);
                                }
                            });
        } catch (Exception e) {
-            log.error("Error walking through directory: {}", watchedFolderPath, e);
+            logger.error("Error walking through directory: {}", watchedFolderPath, e);
        }
    }

    public void handleDirectory(Path dir) throws IOException {
-        log.info("Handling directory: {}", dir);
+        logger.info("Handling directory: {}", dir);
        Path processingDir = createProcessingDirectory(dir);
+
        Optional<Path> jsonFileOptional = findJsonFile(dir);
        if (!jsonFileOptional.isPresent()) {
-            log.warn("No .JSON settings file found. No processing will happen for dir {}.", dir);
+            logger.warn("No .JSON settings file found. No processing will happen for dir {}.", dir);
            return;
        }
+
        Path jsonFile = jsonFileOptional.get();
        PipelineConfig config = readAndParseJson(jsonFile);
        processPipelineOperations(dir, processingDir, jsonFile, config);
@@ -106,7 +98,7 @@ public class PipelineDirectoryProcessor {
        Path processingDir = dir.resolve("processing");
        if (!Files.exists(processingDir)) {
            Files.createDirectory(processingDir);
-            log.info("Created processing directory: {}", processingDir);
+            logger.info("Created processing directory: {}", processingDir);
        }
        return processingDir;
    }
@@ -119,7 +111,7 @@ public class PipelineDirectoryProcessor {

    private PipelineConfig readAndParseJson(Path jsonFile) throws IOException {
        String jsonString = new String(Files.readAllBytes(jsonFile), StandardCharsets.UTF_8);
-        log.debug("Reading JSON file: {}", jsonFile);
+        logger.debug("Reading JSON file: {}", jsonFile);
        return objectMapper.readValue(jsonString, PipelineConfig.class);
    }

@@ -129,7 +121,7 @@ public class PipelineDirectoryProcessor {
            validateOperation(operation);
            File[] files = collectFilesForProcessing(dir, jsonFile, operation);
            if (files == null || files.length == 0) {
-                log.debug("No files detected for {} ", dir);
+                logger.debug("No files detected for {} ", dir);
                return;
            }
            List<File> filesToProcess = prepareFilesForProcessing(files, processingDir);
@@ -175,11 +167,13 @@ public class PipelineDirectoryProcessor {
    private Path resolveUniqueFilePath(Path directory, String originalFileName) {
        Path filePath = directory.resolve(originalFileName);
        int counter = 1;
+
        while (Files.exists(filePath)) {
            String newName = appendSuffixToFileName(originalFileName, "(" + counter + ")");
            filePath = directory.resolve(newName);
            counter++;
        }
+
        return filePath;
    }

@@ -208,7 +202,7 @@ public class PipelineDirectoryProcessor {
            moveAndRenameFiles(outputFiles, config, dir);
            deleteOriginalFiles(filesToProcess, processingDir);
        } catch (Exception e) {
-            log.error("error during processing", e);
+            logger.error("error during processing", e);
            moveFilesBack(filesToProcess, processingDir);
        }
    }
@@ -218,15 +212,18 @@ public class PipelineDirectoryProcessor {
        for (Resource resource : resources) {
            String outputFileName = createOutputFileName(resource, config);
            Path outputPath = determineOutputPath(config, dir);
+
            if (!Files.exists(outputPath)) {
                Files.createDirectories(outputPath);
-                log.info("Created directory: {}", outputPath);
+                logger.info("Created directory: {}", outputPath);
            }
+
            Path outputFile = outputPath.resolve(outputFileName);
            try (OutputStream os = new FileOutputStream(outputFile.toFile())) {
                os.write(((ByteArrayResource) resource).getByteArray());
            }
-            log.info("File moved and renamed to {}", outputFile);
+
+            logger.info("File moved and renamed to {}", outputFile);
        }
    }

@@ -234,6 +231,7 @@ public class PipelineDirectoryProcessor {
        String resourceName = resource.getFilename();
        String baseName = resourceName.substring(0, resourceName.lastIndexOf('.'));
        String extension = resourceName.substring(resourceName.lastIndexOf('.') + 1);
+
        String outputFileName =
                config.getOutputPattern()
                                .replace("{filename}", baseName)
@@ -248,6 +246,7 @@ public class PipelineDirectoryProcessor {
                                                .format(DateTimeFormatter.ofPattern("HHmmss")))
                        + "."
                        + extension;
+
        return outputFileName;
    }

@@ -257,6 +256,7 @@ public class PipelineDirectoryProcessor {
                        .replace("{outputFolder}", finishedFoldersDir)
                        .replace("{folderName}", dir.toString())
                        .replaceAll("\\\\?watchedFolders", "");
+
        return Paths.get(outputDir).isAbsolute() ? Paths.get(outputDir) : Paths.get(".", outputDir);
    }

@@ -264,7 +264,7 @@ public class PipelineDirectoryProcessor {
            throws IOException {
        for (File file : filesToProcess) {
            Files.deleteIfExists(processingDir.resolve(file.getName()));
-            log.info("Deleted original file: {}", file.getName());
+            logger.info("Deleted original file: {}", file.getName());
        }
    }

@@ -272,12 +272,12 @@ public class PipelineDirectoryProcessor {
        for (File file : filesToProcess) {
            try {
                Files.move(processingDir.resolve(file.getName()), file.toPath());
-                log.info(
+                logger.info(
                        "Moved file back to original location: {} , {}",
                        file.toPath(),
                        file.getName());
            } catch (IOException e) {
-                log.error("Error moving file back to original location: {}", file.getName(), e);
+                logger.error("Error moving file back to original location: {}", file.getName(), e);
            }
        }
    }
--- a/src/main/java/stirling/software/SPDF/controller/api/pipeline/PipelineProcessor.java
+++ b/src/main/java/stirling/software/SPDF/controller/api/pipeline/PipelineProcessor.java
@@ -1,6 +1,10 @@
 package stirling.software.SPDF.controller.api.pipeline;

-import java.io.*;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.IOException;
+import java.io.PrintStream;
 import java.net.URLDecoder;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
@@ -15,10 +19,17 @@ import java.util.stream.Collectors;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipInputStream;

+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.io.ByteArrayResource;
 import org.springframework.core.io.Resource;
-import org.springframework.http.*;
+import org.springframework.http.HttpEntity;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpMethod;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
 import org.springframework.util.LinkedMultiValueMap;
 import org.springframework.util.MultiValueMap;
@@ -29,49 +40,22 @@ import io.github.pixee.security.Filenames;
 import io.github.pixee.security.ZipSecurity;

 import jakarta.servlet.ServletContext;
-import lombok.extern.slf4j.Slf4j;
 import stirling.software.SPDF.SPdfApplication;
 import stirling.software.SPDF.model.PipelineConfig;
 import stirling.software.SPDF.model.PipelineOperation;
 import stirling.software.SPDF.model.Role;

@Service
-@Slf4j
 public class PipelineProcessor {

-    private final ApiDocService apiDocService;
+    private static final Logger logger = LoggerFactory.getLogger(PipelineProcessor.class);

-    private final UserServiceInterface userService;
+    @Autowired private ApiDocService apiDocService;

-    private final ServletContext servletContext;
+    @Autowired(required = false)
+    private UserServiceInterface userService;

-    public PipelineProcessor(
-            ApiDocService apiDocService,
-            @Autowired(required = false) UserServiceInterface userService,
-            ServletContext servletContext) {
-        this.apiDocService = apiDocService;
-        this.userService = userService;
-        this.servletContext = servletContext;
-    }
-
-    public static String removeTrailingNaming(String filename) {
-        // Splitting filename into name and extension
-        int dotIndex = filename.lastIndexOf(".");
-        if (dotIndex == -1) {
-            // No extension found
-            return filename;
-        }
-        String name = filename.substring(0, dotIndex);
-        String extension = filename.substring(dotIndex);
-        // Finding the last underscore
-        int underscoreIndex = name.lastIndexOf("_");
-        if (underscoreIndex == -1) {
-            // No underscore found
-            return filename;
-        }
-        // Removing the last part and reattaching the extension
-        return name.substring(0, underscoreIndex) + extension;
-    }
+    @Autowired private ServletContext servletContext;

    private String getApiKeyForUser() {
        if (userService == null) return "";
@@ -81,18 +65,23 @@ public class PipelineProcessor {
    private String getBaseUrl() {
        String contextPath = servletContext.getContextPath();
        String port = SPdfApplication.getStaticPort();
+
        return "http://localhost:" + port + contextPath + "/";
    }

    List<Resource> runPipelineAgainstFiles(List<Resource> outputFiles, PipelineConfig config)
            throws Exception {
+
        ByteArrayOutputStream logStream = new ByteArrayOutputStream();
        PrintStream logPrintStream = new PrintStream(logStream);
+
        boolean hasErrors = false;
+
        for (PipelineOperation pipelineOperation : config.getOperations()) {
            String operation = pipelineOperation.getOperation();
            boolean isMultiInputOperation = apiDocService.isMultiInput(operation);
-            log.info(
+
+            logger.info(
                    "Running operation: {} isMultiInputOperation {}",
                    operation,
                    isMultiInputOperation);
@@ -102,7 +91,9 @@ public class PipelineProcessor {
                inputFileTypes = new ArrayList<String>(Arrays.asList("ALL"));
            }
            // List outputFileTypes = apiDocService.getExtensionTypes(true, operation);
+
            String url = getBaseUrl() + operation;
+
            List<Resource> newOutputFiles = new ArrayList<>();
            if (!isMultiInputOperation) {
                for (Resource file : outputFiles) {
@@ -112,6 +103,7 @@ public class PipelineProcessor {
                            hasInputFileType = true;
                            MultiValueMap<String, Object> body = new LinkedMultiValueMap<>();
                            body.add("fileInput", file);
+
                            for (Entry<String, Object> entry : parameters.entrySet()) {
                                if (entry.getValue() instanceof List) {
                                    List<?> list = (List<?>) entry.getValue();
@@ -122,7 +114,9 @@ public class PipelineProcessor {
                                    body.add(entry.getKey(), entry.getValue());
                                }
                            }
+
                            ResponseEntity<byte[]> response = sendWebRequest(url, body);
+
                            // If the operation is filter and the response body is null or empty,
                            // skip
                            // this
@@ -130,9 +124,10 @@ public class PipelineProcessor {
                            if (operation.startsWith("filter-")
                                    && (response.getBody() == null
                                            || response.getBody().length == 0)) {
-                                log.info("Skipping file due to failing {}", operation);
+                                logger.info("Skipping file due to failing {}", operation);
                                continue;
                            }
+
                            if (!response.getStatusCode().equals(HttpStatus.OK)) {
                                logPrintStream.println("Error: " + response.getBody());
                                hasErrors = true;
@@ -141,6 +136,7 @@ public class PipelineProcessor {
                            processOutputFiles(operation, response, newOutputFiles);
                        }
                    }
+
                    if (!hasInputFileType) {
                        logPrintStream.println(
                                "No files with extension "
@@ -150,6 +146,7 @@ public class PipelineProcessor {
                        hasErrors = true;
                    }
                }
+
            } else {
                // Filter and collect all files that match the inputFileExtension
                List<Resource> matchingFiles;
@@ -165,14 +162,17 @@ public class PipelineProcessor {
                                                            .anyMatch(file.getFilename()::endsWith))
                                    .collect(Collectors.toList());
                }
+
                // Check if there are matching files
                if (!matchingFiles.isEmpty()) {
                    // Create a new MultiValueMap for the request body
                    MultiValueMap<String, Object> body = new LinkedMultiValueMap<>();
+
                    // Add all matching files to the body
                    for (Resource file : matchingFiles) {
                        body.add("fileInput", file);
                    }
+
                    for (Entry<String, Object> entry : parameters.entrySet()) {
                        if (entry.getValue() instanceof List) {
                            List<?> list = (List<?>) entry.getValue();
@@ -183,7 +183,9 @@ public class PipelineProcessor {
                            body.add(entry.getKey(), entry.getValue());
                        }
                    }
+
                    ResponseEntity<byte[]> response = sendWebRequest(url, body);
+
                    // Handle the response
                    if (response.getStatusCode().equals(HttpStatus.OK)) {
                        processOutputFiles(operation, response, newOutputFiles);
@@ -206,24 +208,50 @@ public class PipelineProcessor {
            outputFiles = newOutputFiles;
        }
        if (hasErrors) {
-            log.error("Errors occurred during processing. Log: {}", logStream.toString());
+            logger.error("Errors occurred during processing. Log: {}", logStream.toString());
        }
+
        return outputFiles;
    }

    private ResponseEntity<byte[]> sendWebRequest(String url, MultiValueMap<String, Object> body) {
        RestTemplate restTemplate = new RestTemplate();
+
        // Set up headers, including API key
+
        HttpHeaders headers = new HttpHeaders();
        String apiKey = getApiKeyForUser();
-        headers.add("X-API-KEY", apiKey);
+        headers.add("X-API-Key", apiKey);
        headers.setContentType(MediaType.MULTIPART_FORM_DATA);
+
        // Create HttpEntity with the body and headers
        HttpEntity<MultiValueMap<String, Object>> entity = new HttpEntity<>(body, headers);
+
        // Make the request to the REST endpoint
        return restTemplate.exchange(url, HttpMethod.POST, entity, byte[].class);
    }

+    public static String removeTrailingNaming(String filename) {
+        // Splitting filename into name and extension
+        int dotIndex = filename.lastIndexOf(".");
+        if (dotIndex == -1) {
+            // No extension found
+            return filename;
+        }
+        String name = filename.substring(0, dotIndex);
+        String extension = filename.substring(dotIndex);
+
+        // Finding the last underscore
+        int underscoreIndex = name.lastIndexOf("_");
+        if (underscoreIndex == -1) {
+            // No underscore found
+            return filename;
+        }
+
+        // Removing the last part and reattaching the extension
+        return name.substring(0, underscoreIndex) + extension;
+    }
+
    private List<Resource> processOutputFiles(
            String operation, ResponseEntity<byte[]> response, List<Resource> newOutputFiles)
            throws IOException {
@@ -233,11 +261,13 @@ public class PipelineProcessor {
            // If the operation is "auto-rename", generate a new filename.
            // This is a simple example of generating a filename using current timestamp.
            // Modify as per your needs.
+
            newFilename = extractFilename(response);
        } else {
            // Otherwise, keep the original filename.
            newFilename = removeTrailingNaming(extractFilename(response));
        }
+
        // Check if the response body is a zip file
        if (isZip(response.getBody())) {
            // Unzip the file and add all the files to the new output files
@@ -245,7 +275,6 @@ public class PipelineProcessor {
        } else {
            Resource outputResource =
                    new ByteArrayResource(response.getBody()) {
-
                        @Override
                        public String getFilename() {
                            return newFilename;
@@ -253,14 +282,16 @@ public class PipelineProcessor {
                    };
            newOutputFiles.add(outputResource);
        }
+
        return newOutputFiles;
    }

    public String extractFilename(ResponseEntity<byte[]> response) {
-        // Default filename if not found
-        String filename = "default-filename.ext";
+        String filename = "default-filename.ext"; // Default filename if not found
+
        HttpHeaders headers = response.getHeaders();
        String contentDisposition = headers.getFirst(HttpHeaders.CONTENT_DISPOSITION);
+
        if (contentDisposition != null && !contentDisposition.isEmpty()) {
            String[] parts = contentDisposition.split(";");
            for (String part : parts) {
@@ -268,27 +299,30 @@ public class PipelineProcessor {
                    // Extracts filename and removes quotes if present
                    filename = part.split("=")[1].trim().replace("\"", "");
                    filename = URLDecoder.decode(filename, StandardCharsets.UTF_8);
+
                    break;
                }
            }
        }
+
        return filename;
    }

    List<Resource> generateInputFiles(File[] files) throws Exception {
        if (files == null || files.length == 0) {
-            log.info("No files");
+            logger.info("No files");
            return null;
        }
+
        List<Resource> outputFiles = new ArrayList<>();
+
        for (File file : files) {
            Path path = Paths.get(file.getAbsolutePath());
-            // debug statement
-            log.info("Reading file: " + path);
+            logger.info("Reading file: " + path); // debug statement
+
            if (Files.exists(path)) {
                Resource fileResource =
                        new ByteArrayResource(Files.readAllBytes(path)) {
-
                            @Override
                            public String getFilename() {
                                return file.getName();
@@ -296,23 +330,24 @@ public class PipelineProcessor {
                        };
                outputFiles.add(fileResource);
            } else {
-                log.info("File not found: " + path);
+                logger.info("File not found: " + path);
            }
        }
-        log.info("Files successfully loaded. Starting processing...");
+        logger.info("Files successfully loaded. Starting processing...");
        return outputFiles;
    }

    List<Resource> generateInputFiles(MultipartFile[] files) throws Exception {
        if (files == null || files.length == 0) {
-            log.info("No files");
+            logger.info("No files");
            return null;
        }
+
        List<Resource> outputFiles = new ArrayList<>();
+
        for (MultipartFile file : files) {
            Resource fileResource =
                    new ByteArrayResource(file.getBytes()) {
-
                        @Override
                        public String getFilename() {
                            return Filenames.toSimpleFileName(file.getOriginalFilename());
@@ -320,7 +355,7 @@ public class PipelineProcessor {
                    };
            outputFiles.add(fileResource);
        }
-        log.info("Files successfully loaded. Starting processing...");
+        logger.info("Files successfully loaded. Starting processing...");
        return outputFiles;
    }

@@ -328,42 +363,48 @@ public class PipelineProcessor {
        if (data == null || data.length < 4) {
            return false;
        }
+
        // Check the first four bytes of the data against the standard zip magic number
        return data[0] == 0x50 && data[1] == 0x4B && data[2] == 0x03 && data[3] == 0x04;
    }

    private List<Resource> unzip(byte[] data) throws IOException {
-        log.info("Unzipping data of length: {}", data.length);
+        logger.info("Unzipping data of length: {}", data.length);
        List<Resource> unzippedFiles = new ArrayList<>();
+
        try (ByteArrayInputStream bais = new ByteArrayInputStream(data);
                ZipInputStream zis = ZipSecurity.createHardenedInputStream(bais)) {
+
            ZipEntry entry;
            while ((entry = zis.getNextEntry()) != null) {
                ByteArrayOutputStream baos = new ByteArrayOutputStream();
                byte[] buffer = new byte[1024];
                int count;
+
                while ((count = zis.read(buffer)) != -1) {
                    baos.write(buffer, 0, count);
                }
+
                final String filename = entry.getName();
                Resource fileResource =
                        new ByteArrayResource(baos.toByteArray()) {
-
                            @Override
                            public String getFilename() {
                                return filename;
                            }
                        };
+
                // If the unzipped file is a zip file, unzip it
                if (isZip(baos.toByteArray())) {
-                    log.info("File {} is a zip file. Unzipping...", filename);
+                    logger.info("File {} is a zip file. Unzipping...", filename);
                    unzippedFiles.addAll(unzip(baos.toByteArray()));
                } else {
                    unzippedFiles.add(fileResource);
                }
            }
        }
-        log.info("Unzipping completed. {} files were unzipped.", unzippedFiles.size());
+
+        logger.info("Unzipping completed. {} files were unzipped.", unzippedFiles.size());
        return unzippedFiles;
    }
 }
--- a/src/main/java/stirling/software/SPDF/controller/api/security/CertSignController.java
+++ b/src/main/java/stirling/software/SPDF/controller/api/security/CertSignController.java
@@ -1,9 +1,20 @@
 package stirling.software.SPDF.controller.api.security;

-import java.awt.*;
-import java.io.*;
+import java.awt.Color;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.OutputStream;
 import java.nio.file.Files;
-import java.security.*;
+import java.security.KeyStore;
+import java.security.KeyStoreException;
+import java.security.NoSuchAlgorithmException;
+import java.security.PrivateKey;
+import java.security.Security;
+import java.security.UnrecoverableKeyException;
 import java.security.cert.Certificate;
 import java.security.cert.CertificateException;
 import java.security.cert.CertificateFactory;
@@ -52,6 +63,8 @@ import org.bouncycastle.operator.InputDecryptorProvider;
 import org.bouncycastle.operator.OperatorCreationException;
 import org.bouncycastle.pkcs.PKCS8EncryptedPrivateKeyInfo;
 import org.bouncycastle.pkcs.PKCSException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.http.ResponseEntity;
@@ -65,166 +78,21 @@ import io.github.pixee.security.Filenames;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;

-import lombok.extern.slf4j.Slf4j;
 import stirling.software.SPDF.model.api.security.SignPDFWithCertRequest;
 import stirling.software.SPDF.service.CustomPDDocumentFactory;
 import stirling.software.SPDF.utils.WebResponseUtils;

@RestController
@RequestMapping("/api/v1/security")
-@Slf4j
@Tag(name = "Security", description = "Security APIs")
 public class CertSignController {

+    private static final Logger logger = LoggerFactory.getLogger(CertSignController.class);
+
    static {
        Security.addProvider(new BouncyCastleProvider());
    }

-    private final CustomPDDocumentFactory pdfDocumentFactory;
-
-    @Autowired
-    public CertSignController(CustomPDDocumentFactory pdfDocumentFactory) {
-        this.pdfDocumentFactory = pdfDocumentFactory;
-    }
-
-    private static void sign(
-            CustomPDDocumentFactory pdfDocumentFactory,
-            byte[] input,
-            OutputStream output,
-            CreateSignature instance,
-            Boolean showSignature,
-            Integer pageNumber,
-            String name,
-            String location,
-            String reason,
-            Boolean showLogo) {
-        try (PDDocument doc = pdfDocumentFactory.load(input)) {
-            PDSignature signature = new PDSignature();
-            signature.setFilter(PDSignature.FILTER_ADOBE_PPKLITE);
-            signature.setSubFilter(PDSignature.SUBFILTER_ADBE_PKCS7_DETACHED);
-            signature.setName(name);
-            signature.setLocation(location);
-            signature.setReason(reason);
-            signature.setSignDate(Calendar.getInstance());
-
-            if (showSignature) {
-                SignatureOptions signatureOptions = new SignatureOptions();
-                signatureOptions.setVisualSignature(
-                        instance.createVisibleSignature(doc, signature, pageNumber, showLogo));
-                signatureOptions.setPage(pageNumber);
-
-                doc.addSignature(signature, instance, signatureOptions);
-
-            } else {
-                doc.addSignature(signature, instance);
-            }
-            doc.saveIncremental(output);
-        } catch (Exception e) {
-            log.error("exception", e);
-        }
-    }
-
-    @PostMapping(consumes = "multipart/form-data", value = "/cert-sign")
-    @Operation(
-            summary = "Sign PDF with a Digital Certificate",
-            description =
-                    "This endpoint accepts a PDF file, a digital certificate and related information to sign"
-                            + " the PDF. It then returns the digitally signed PDF file. Input:PDF Output:PDF"
-                            + " Type:SISO")
-    public ResponseEntity<byte[]> signPDFWithCert(@ModelAttribute SignPDFWithCertRequest request)
-            throws Exception {
-        MultipartFile pdf = request.getFileInput();
-        String certType = request.getCertType();
-        MultipartFile privateKeyFile = request.getPrivateKeyFile();
-        MultipartFile certFile = request.getCertFile();
-        MultipartFile p12File = request.getP12File();
-        MultipartFile jksfile = request.getJksFile();
-        String password = request.getPassword();
-        Boolean showSignature = request.isShowSignature();
-        String reason = request.getReason();
-        String location = request.getLocation();
-        String name = request.getName();
-        Integer pageNumber = request.getPageNumber() - 1;
-        Boolean showLogo = request.isShowLogo();
-
-        if (certType == null) {
-            throw new IllegalArgumentException("Cert type must be provided");
-        }
-
-        KeyStore ks = null;
-
-        switch (certType) {
-            case "PEM":
-                ks = KeyStore.getInstance("JKS");
-                ks.load(null);
-                PrivateKey privateKey = getPrivateKeyFromPEM(privateKeyFile.getBytes(), password);
-                Certificate cert = (Certificate) getCertificateFromPEM(certFile.getBytes());
-                ks.setKeyEntry(
-                        "alias", privateKey, password.toCharArray(), new Certificate[] {cert});
-                break;
-            case "PKCS12":
-                ks = KeyStore.getInstance("PKCS12");
-                ks.load(p12File.getInputStream(), password.toCharArray());
-                break;
-            case "JKS":
-                ks = KeyStore.getInstance("JKS");
-                ks.load(jksfile.getInputStream(), password.toCharArray());
-                break;
-            default:
-                throw new IllegalArgumentException("Invalid cert type: " + certType);
-        }
-
-        CreateSignature createSignature = new CreateSignature(ks, password.toCharArray());
-        ByteArrayOutputStream baos = new ByteArrayOutputStream();
-        sign(
-                pdfDocumentFactory,
-                pdf.getBytes(),
-                baos,
-                createSignature,
-                showSignature,
-                pageNumber,
-                name,
-                location,
-                reason,
-                showLogo);
-        return WebResponseUtils.boasToWebResponse(
-                baos,
-                Filenames.toSimpleFileName(pdf.getOriginalFilename()).replaceFirst("[.][^.]+$", "")
-                        + "_signed.pdf");
-    }
-
-    private PrivateKey getPrivateKeyFromPEM(byte[] pemBytes, String password)
-            throws IOException, OperatorCreationException, PKCSException {
-        try (PEMParser pemParser =
-                new PEMParser(new InputStreamReader(new ByteArrayInputStream(pemBytes)))) {
-            Object pemObject = pemParser.readObject();
-            JcaPEMKeyConverter converter = new JcaPEMKeyConverter().setProvider("BC");
-            PrivateKeyInfo pkInfo;
-            if (pemObject instanceof PKCS8EncryptedPrivateKeyInfo) {
-                InputDecryptorProvider decProv =
-                        new JceOpenSSLPKCS8DecryptorProviderBuilder().build(password.toCharArray());
-                pkInfo = ((PKCS8EncryptedPrivateKeyInfo) pemObject).decryptPrivateKeyInfo(decProv);
-            } else if (pemObject instanceof PEMEncryptedKeyPair) {
-                PEMDecryptorProvider decProv =
-                        new JcePEMDecryptorProviderBuilder().build(password.toCharArray());
-                pkInfo =
-                        ((PEMEncryptedKeyPair) pemObject)
-                                .decryptKeyPair(decProv)
-                                .getPrivateKeyInfo();
-            } else {
-                pkInfo = ((PEMKeyPair) pemObject).getPrivateKeyInfo();
-            }
-            return converter.getPrivateKey(pkInfo);
-        }
-    }
-
-    private Certificate getCertificateFromPEM(byte[] pemBytes)
-            throws IOException, CertificateException {
-        try (ByteArrayInputStream bis = new ByteArrayInputStream(pemBytes)) {
-            return CertificateFactory.getInstance("X.509").generateCertificate(bis);
-        }
-    }
-
    class CreateSignature extends CreateSignatureBase {
        File logoFile;

@@ -240,7 +108,7 @@ public class CertSignController {
                logoFile = Files.createTempFile("signature", ".png").toFile();
                FileUtils.copyInputStreamToFile(is, logoFile);
            } catch (IOException e) {
-                log.error("Failed to load image signature file");
+                logger.error("Failed to load image signature file");
                throw e;
            }
        }
@@ -332,4 +200,147 @@ public class CertSignController {
            }
        }
    }
+
+    private final CustomPDDocumentFactory pdfDocumentFactory;
+
+    @Autowired
+    public CertSignController(CustomPDDocumentFactory pdfDocumentFactory) {
+        this.pdfDocumentFactory = pdfDocumentFactory;
+    }
+
+    @PostMapping(consumes = "multipart/form-data", value = "/cert-sign")
+    @Operation(
+            summary = "Sign PDF with a Digital Certificate",
+            description =
+                    "This endpoint accepts a PDF file, a digital certificate and related information to sign the PDF. It then returns the digitally signed PDF file. Input:PDF Output:PDF Type:SISO")
+    public ResponseEntity<byte[]> signPDFWithCert(@ModelAttribute SignPDFWithCertRequest request)
+            throws Exception {
+        MultipartFile pdf = request.getFileInput();
+        String certType = request.getCertType();
+        MultipartFile privateKeyFile = request.getPrivateKeyFile();
+        MultipartFile certFile = request.getCertFile();
+        MultipartFile p12File = request.getP12File();
+        MultipartFile jksfile = request.getJksFile();
+        String password = request.getPassword();
+        Boolean showSignature = request.isShowSignature();
+        String reason = request.getReason();
+        String location = request.getLocation();
+        String name = request.getName();
+        Integer pageNumber = request.getPageNumber() - 1;
+        Boolean showLogo = request.isShowLogo();
+
+        if (certType == null) {
+            throw new IllegalArgumentException("Cert type must be provided");
+        }
+
+        KeyStore ks = null;
+
+        switch (certType) {
+            case "PEM":
+                ks = KeyStore.getInstance("JKS");
+                ks.load(null);
+                PrivateKey privateKey = getPrivateKeyFromPEM(privateKeyFile.getBytes(), password);
+                Certificate cert = (Certificate) getCertificateFromPEM(certFile.getBytes());
+                ks.setKeyEntry(
+                        "alias", privateKey, password.toCharArray(), new Certificate[] {cert});
+                break;
+            case "PKCS12":
+                ks = KeyStore.getInstance("PKCS12");
+                ks.load(p12File.getInputStream(), password.toCharArray());
+                break;
+            case "JKS":
+                ks = KeyStore.getInstance("JKS");
+                ks.load(jksfile.getInputStream(), password.toCharArray());
+                break;
+            default:
+                throw new IllegalArgumentException("Invalid cert type: " + certType);
+        }
+
+        CreateSignature createSignature = new CreateSignature(ks, password.toCharArray());
+        ByteArrayOutputStream baos = new ByteArrayOutputStream();
+        sign(
+                pdfDocumentFactory,
+                pdf.getBytes(),
+                baos,
+                createSignature,
+                showSignature,
+                pageNumber,
+                name,
+                location,
+                reason,
+                showLogo);
+        return WebResponseUtils.boasToWebResponse(
+                baos,
+                Filenames.toSimpleFileName(pdf.getOriginalFilename()).replaceFirst("[.][^.]+$", "")
+                        + "_signed.pdf");
+    }
+
+    private static void sign(
+            CustomPDDocumentFactory pdfDocumentFactory,
+            byte[] input,
+            OutputStream output,
+            CreateSignature instance,
+            Boolean showSignature,
+            Integer pageNumber,
+            String name,
+            String location,
+            String reason,
+            Boolean showLogo) {
+        try (PDDocument doc = pdfDocumentFactory.load(input)) {
+            PDSignature signature = new PDSignature();
+            signature.setFilter(PDSignature.FILTER_ADOBE_PPKLITE);
+            signature.setSubFilter(PDSignature.SUBFILTER_ADBE_PKCS7_DETACHED);
+            signature.setName(name);
+            signature.setLocation(location);
+            signature.setReason(reason);
+            signature.setSignDate(Calendar.getInstance());
+
+            if (showSignature) {
+                SignatureOptions signatureOptions = new SignatureOptions();
+                signatureOptions.setVisualSignature(
+                        instance.createVisibleSignature(doc, signature, pageNumber, showLogo));
+                signatureOptions.setPage(pageNumber);
+
+                doc.addSignature(signature, instance, signatureOptions);
+
+            } else {
+                doc.addSignature(signature, instance);
+            }
+            doc.saveIncremental(output);
+        } catch (Exception e) {
+            logger.error("exception", e);
+        }
+    }
+
+    private PrivateKey getPrivateKeyFromPEM(byte[] pemBytes, String password)
+            throws IOException, OperatorCreationException, PKCSException {
+        try (PEMParser pemParser =
+                new PEMParser(new InputStreamReader(new ByteArrayInputStream(pemBytes)))) {
+            Object pemObject = pemParser.readObject();
+            JcaPEMKeyConverter converter = new JcaPEMKeyConverter().setProvider("BC");
+            PrivateKeyInfo pkInfo;
+            if (pemObject instanceof PKCS8EncryptedPrivateKeyInfo) {
+                InputDecryptorProvider decProv =
+                        new JceOpenSSLPKCS8DecryptorProviderBuilder().build(password.toCharArray());
+                pkInfo = ((PKCS8EncryptedPrivateKeyInfo) pemObject).decryptPrivateKeyInfo(decProv);
+            } else if (pemObject instanceof PEMEncryptedKeyPair) {
+                PEMDecryptorProvider decProv =
+                        new JcePEMDecryptorProviderBuilder().build(password.toCharArray());
+                pkInfo =
+                        ((PEMEncryptedKeyPair) pemObject)
+                                .decryptKeyPair(decProv)
+                                .getPrivateKeyInfo();
+            } else {
+                pkInfo = ((PEMKeyPair) pemObject).getPrivateKeyInfo();
+            }
+            return converter.getPrivateKey(pkInfo);
+        }
+    }
+
+    private Certificate getCertificateFromPEM(byte[] pemBytes)
+            throws IOException, CertificateException {
+        try (ByteArrayInputStream bis = new ByteArrayInputStream(pemBytes)) {
+            return CertificateFactory.getInstance("X.509").generateCertificate(bis);
+        }
+    }
 }
--- a/src/main/java/stirling/software/SPDF/controller/api/security/GetInfoOnPDF.java
+++ b/src/main/java/stirling/software/SPDF/controller/api/security/GetInfoOnPDF.java
@@ -4,13 +4,25 @@ import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
 import java.text.SimpleDateFormat;
-import java.util.*;
+import java.util.Calendar;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;

 import org.apache.pdfbox.Loader;
 import org.apache.pdfbox.cos.COSInputStream;
 import org.apache.pdfbox.cos.COSName;
 import org.apache.pdfbox.cos.COSString;
-import org.apache.pdfbox.pdmodel.*;
+import org.apache.pdfbox.pdmodel.PDDocument;
+import org.apache.pdfbox.pdmodel.PDDocumentCatalog;
+import org.apache.pdfbox.pdmodel.PDDocumentInformation;
+import org.apache.pdfbox.pdmodel.PDDocumentNameDictionary;
+import org.apache.pdfbox.pdmodel.PDEmbeddedFilesNameTreeNode;
+import org.apache.pdfbox.pdmodel.PDJavascriptNameTreeNode;
+import org.apache.pdfbox.pdmodel.PDPage;
+import org.apache.pdfbox.pdmodel.PDResources;
 import org.apache.pdfbox.pdmodel.common.PDMetadata;
 import org.apache.pdfbox.pdmodel.common.PDRectangle;
 import org.apache.pdfbox.pdmodel.common.PDStream;
@@ -44,6 +56,8 @@ import org.apache.xmpbox.XMPMetadata;
 import org.apache.xmpbox.xml.DomXmpParser;
 import org.apache.xmpbox.xml.XmpParsingException;
 import org.apache.xmpbox.xml.XmpSerializer;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.ModelAttribute;
@@ -59,60 +73,18 @@ import com.fasterxml.jackson.databind.node.ObjectNode;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;

-import lombok.extern.slf4j.Slf4j;
 import stirling.software.SPDF.model.api.PDFFile;
 import stirling.software.SPDF.utils.WebResponseUtils;

@RestController
@RequestMapping("/api/v1/security")
-@Slf4j
@Tag(name = "Security", description = "Security APIs")
 public class GetInfoOnPDF {

+    private static final Logger logger = LoggerFactory.getLogger(GetInfoOnPDF.class);
+
    static ObjectMapper objectMapper = new ObjectMapper();

-    private static void addOutlinesToArray(PDOutlineItem outline, ArrayNode arrayNode) {
-        if (outline == null) return;
-
-        ObjectNode outlineNode = objectMapper.createObjectNode();
-        outlineNode.put("Title", outline.getTitle());
-        // You can add other properties if needed
-        arrayNode.add(outlineNode);
-
-        PDOutlineItem child = outline.getFirstChild();
-        while (child != null) {
-            addOutlinesToArray(child, arrayNode);
-            child = child.getNextSibling();
-        }
-    }
-
-    public static boolean checkForStandard(PDDocument document, String standardKeyword) {
-        // Check XMP Metadata
-        try {
-            PDMetadata pdMetadata = document.getDocumentCatalog().getMetadata();
-            if (pdMetadata != null) {
-                COSInputStream metaStream = pdMetadata.createInputStream();
-                DomXmpParser domXmpParser = new DomXmpParser();
-                XMPMetadata xmpMeta = domXmpParser.parse(metaStream);
-
-                ByteArrayOutputStream baos = new ByteArrayOutputStream();
-                new XmpSerializer().serialize(xmpMeta, baos, true);
-                String xmpString = new String(baos.toByteArray(), StandardCharsets.UTF_8);
-
-                if (xmpString.contains(standardKeyword)) {
-                    return true;
-                }
-            }
-        } catch (
-                Exception
-                        e) { // Catching general exception for brevity, ideally you'd catch specific
-            // exceptions.
-            log.error("exception", e);
-        }
-
-        return false;
-    }
-
    @PostMapping(consumes = "multipart/form-data", value = "/get-info-on-pdf")
    @Operation(summary = "Summary here", description = "desc. Input:PDF Output:JSON Type:SISO")
    public ResponseEntity<byte[]> getPdfInfo(@ModelAttribute PDFFile request) throws IOException {
@@ -252,7 +224,7 @@ public class GetInfoOnPDF {
                            javascriptArray.add(jsNode);
                        }
                    } catch (IOException e) {
-                        log.error("exception", e);
+                        logger.error("exception", e);
                    }
                }
            }
@@ -285,7 +257,7 @@ public class GetInfoOnPDF {
                }
            } catch (Exception e) {
                // TODO Auto-generated catch block
-                log.error("exception", e);
+                logger.error("exception", e);
            }

            boolean isPdfACompliant = checkForStandard(pdfBoxDoc, "PDF/A");
@@ -337,7 +309,7 @@ public class GetInfoOnPDF {
                    new XmpSerializer().serialize(xmpMeta, os, true);
                    xmpString = new String(os.toByteArray(), StandardCharsets.UTF_8);
                } catch (XmpParsingException | IOException e) {
-                    log.error("exception", e);
+                    logger.error("exception", e);
                }
            }

@@ -350,14 +322,27 @@ public class GetInfoOnPDF {
                PDEncryption pdfEncryption = pdfBoxDoc.getEncryption();
                encryption.put("EncryptionAlgorithm", pdfEncryption.getFilter());
                encryption.put("KeyLength", pdfEncryption.getLength());
+                AccessPermission ap = pdfBoxDoc.getCurrentAccessPermission();
+                if (ap != null) {
+                    ObjectNode permissionsNode = objectMapper.createObjectNode();
+
+                    permissionsNode.put("CanAssembleDocument", ap.canAssembleDocument());
+                    permissionsNode.put("CanExtractContent", ap.canExtractContent());
+                    permissionsNode.put(
+                            "CanExtractForAccessibility", ap.canExtractForAccessibility());
+                    permissionsNode.put("CanFillInForm", ap.canFillInForm());
+                    permissionsNode.put("CanModify", ap.canModify());
+                    permissionsNode.put("CanModifyAnnotations", ap.canModifyAnnotations());
+                    permissionsNode.put("CanPrint", ap.canPrint());
+
+                    encryption.set(
+                            "Permissions", permissionsNode); // set the node under "Permissions"
+                }
                // Add other encryption-related properties as needed
            } else {
                encryption.put("IsEncrypted", false);
            }

-            ObjectNode permissionsNode = objectMapper.createObjectNode();
-            setNodePermissions(pdfBoxDoc, permissionsNode);
-
            ObjectNode pageInfoParent = objectMapper.createObjectNode();
            for (int pageNum = 0; pageNum < pdfBoxDoc.getNumberOfPages(); pageNum++) {
                ObjectNode pageInfo = objectMapper.createObjectNode();
@@ -599,7 +584,6 @@ public class GetInfoOnPDF {
            jsonOutput.set("DocumentInfo", docInfoNode);
            jsonOutput.set("Compliancy", compliancy);
            jsonOutput.set("Encryption", encryption);
-            jsonOutput.set("Permissions", permissionsNode); // set the node under "Permissions"
            jsonOutput.set("Other", other);
            jsonOutput.set("PerPageInfo", pageInfoParent);

@@ -613,27 +597,24 @@ public class GetInfoOnPDF {
                    MediaType.APPLICATION_JSON);

        } catch (Exception e) {
-            log.error("exception", e);
+            logger.error("exception", e);
        }
        return null;
    }

-    private void setNodePermissions(PDDocument pdfBoxDoc, ObjectNode permissionsNode) {
-        AccessPermission ap = pdfBoxDoc.getCurrentAccessPermission();
+    private static void addOutlinesToArray(PDOutlineItem outline, ArrayNode arrayNode) {
+        if (outline == null) return;

-        permissionsNode.put("Document Assembly", getPermissionState(ap.canAssembleDocument()));
-        permissionsNode.put("Extracting Content", getPermissionState(ap.canExtractContent()));
-        permissionsNode.put(
-                "Extracting for accessibility",
-                getPermissionState(ap.canExtractForAccessibility()));
-        permissionsNode.put("Form Filling", getPermissionState(ap.canFillInForm()));
-        permissionsNode.put("Modifying", getPermissionState(ap.canModify()));
-        permissionsNode.put("Modifying annotations", getPermissionState(ap.canModifyAnnotations()));
-        permissionsNode.put("Printing", getPermissionState(ap.canPrint()));
-    }
+        ObjectNode outlineNode = objectMapper.createObjectNode();
+        outlineNode.put("Title", outline.getTitle());
+        // You can add other properties if needed
+        arrayNode.add(outlineNode);

-    private String getPermissionState(boolean state) {
-        return state ? "Allowed" : "Not Allowed";
+        PDOutlineItem child = outline.getFirstChild();
+        while (child != null) {
+            addOutlinesToArray(child, arrayNode);
+            child = child.getNextSibling();
+        }
    }

    public String getPageOrientation(double width, double height) {
@@ -693,6 +674,33 @@ public class GetInfoOnPDF {
        return dimensionInfo;
    }

+    public static boolean checkForStandard(PDDocument document, String standardKeyword) {
+        // Check XMP Metadata
+        try {
+            PDMetadata pdMetadata = document.getDocumentCatalog().getMetadata();
+            if (pdMetadata != null) {
+                COSInputStream metaStream = pdMetadata.createInputStream();
+                DomXmpParser domXmpParser = new DomXmpParser();
+                XMPMetadata xmpMeta = domXmpParser.parse(metaStream);
+
+                ByteArrayOutputStream baos = new ByteArrayOutputStream();
+                new XmpSerializer().serialize(xmpMeta, baos, true);
+                String xmpString = new String(baos.toByteArray(), StandardCharsets.UTF_8);
+
+                if (xmpString.contains(standardKeyword)) {
+                    return true;
+                }
+            }
+        } catch (
+                Exception
+                        e) { // Catching general exception for brevity, ideally you'd catch specific
+            // exceptions.
+            logger.error("exception", e);
+        }
+
+        return false;
+    }
+
    public ArrayNode exploreStructureTree(List<Object> nodes) {
        ArrayNode elementsArray = objectMapper.createArrayNode();
        if (nodes != null) {
--- a/src/main/java/stirling/software/SPDF/controller/api/security/PasswordController.java
+++ b/src/main/java/stirling/software/SPDF/controller/api/security/PasswordController.java
@@ -5,6 +5,8 @@ import java.io.IOException;
 import org.apache.pdfbox.pdmodel.PDDocument;
 import org.apache.pdfbox.pdmodel.encryption.AccessPermission;
 import org.apache.pdfbox.pdmodel.encryption.StandardProtectionPolicy;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.ModelAttribute;
@@ -27,6 +29,8 @@ import stirling.software.SPDF.utils.WebResponseUtils;
@Tag(name = "Security", description = "Security APIs")
 public class PasswordController {

+    private static final Logger logger = LoggerFactory.getLogger(PasswordController.class);
+
    private final CustomPDDocumentFactory pdfDocumentFactory;

    @Autowired
@@ -38,8 +42,7 @@ public class PasswordController {
    @Operation(
            summary = "Remove password from a PDF file",
            description =
-                    "This endpoint removes the password from a protected PDF file. Users need to provide the"
-                            + " existing password. Input:PDF Output:PDF Type:SISO")
+                    "This endpoint removes the password from a protected PDF file. Users need to provide the existing password. Input:PDF Output:PDF Type:SISO")
    public ResponseEntity<byte[]> removePassword(@ModelAttribute PDFPasswordRequest request)
            throws IOException {
        MultipartFile fileInput = request.getFileInput();
@@ -57,8 +60,7 @@ public class PasswordController {
    @Operation(
            summary = "Add password to a PDF file",
            description =
-                    "This endpoint adds password protection to a PDF file. Users can specify a set of"
-                            + " permissions that should be applied to the file. Input:PDF Output:PDF")
+                    "This endpoint adds password protection to a PDF file. Users can specify a set of permissions that should be applied to the file. Input:PDF Output:PDF")
    public ResponseEntity<byte[]> addPassword(@ModelAttribute AddPasswordRequest request)
            throws IOException {
        MultipartFile fileInput = request.getFileInput();
--- a/src/main/java/stirling/software/SPDF/controller/api/security/RedactController.java
+++ b/src/main/java/stirling/software/SPDF/controller/api/security/RedactController.java
@@ -1,6 +1,6 @@
 package stirling.software.SPDF.controller.api.security;

-import java.awt.*;
+import java.awt.Color;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.util.List;
@@ -8,6 +8,8 @@ import java.util.List;
 import org.apache.pdfbox.pdmodel.PDDocument;
 import org.apache.pdfbox.pdmodel.PDPageContentStream;
 import org.apache.pdfbox.pdmodel.common.PDRectangle;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.ModelAttribute;
@@ -20,7 +22,6 @@ import io.github.pixee.security.Filenames;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;

-import lombok.extern.slf4j.Slf4j;
 import stirling.software.SPDF.model.PDFText;
 import stirling.software.SPDF.model.api.security.RedactPdfRequest;
 import stirling.software.SPDF.pdf.TextFinder;
@@ -30,10 +31,11 @@ import stirling.software.SPDF.utils.WebResponseUtils;

@RestController
@RequestMapping("/api/v1/security")
-@Slf4j
@Tag(name = "Security", description = "Security APIs")
 public class RedactController {

+    private static final Logger logger = LoggerFactory.getLogger(RedactController.class);
+
    private final CustomPDDocumentFactory pdfDocumentFactory;

    @Autowired
@@ -45,8 +47,7 @@ public class RedactController {
    @Operation(
            summary = "Redacts listOfText in a PDF document",
            description =
-                    "This operation takes an input PDF file and redacts the provided listOfText. Input:PDF,"
-                            + " Output:PDF, Type:SISO")
+                    "This operation takes an input PDF file and redacts the provided listOfText. Input:PDF, Output:PDF, Type:SISO")
    public ResponseEntity<byte[]> redactPdf(@ModelAttribute RedactPdfRequest request)
            throws Exception {
        MultipartFile file = request.getFileInput();
@@ -67,7 +68,7 @@ public class RedactController {
            }
            redactColor = Color.decode(colorString);
        } catch (NumberFormatException e) {
-            log.warn("Invalid color string provided. Using default color BLACK for redaction.");
+            logger.warn("Invalid color string provided. Using default color BLACK for redaction.");
            redactColor = Color.BLACK;
        }

--- a/src/main/java/stirling/software/SPDF/controller/api/security/RemoveCertSignController.java
+++ b/src/main/java/stirling/software/SPDF/controller/api/security/RemoveCertSignController.java
@@ -8,6 +8,8 @@ import org.apache.pdfbox.pdmodel.PDDocumentCatalog;
 import org.apache.pdfbox.pdmodel.interactive.form.PDAcroForm;
 import org.apache.pdfbox.pdmodel.interactive.form.PDField;
 import org.apache.pdfbox.pdmodel.interactive.form.PDSignatureField;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.ModelAttribute;
@@ -29,6 +31,8 @@ import stirling.software.SPDF.utils.WebResponseUtils;
@Tag(name = "Security", description = "Security APIs")
 public class RemoveCertSignController {

+    private static final Logger logger = LoggerFactory.getLogger(RemoveCertSignController.class);
+
    private final CustomPDDocumentFactory pdfDocumentFactory;

    @Autowired
@@ -40,8 +44,7 @@ public class RemoveCertSignController {
    @Operation(
            summary = "Remove digital signature from PDF",
            description =
-                    "This endpoint accepts a PDF file and returns the PDF file without the digital signature."
-                            + " Input: PDF, Output: PDF")
+                    "This endpoint accepts a PDF file and returns the PDF file without the digital signature. Input: PDF, Output: PDF")
    public ResponseEntity<byte[]> removeCertSignPDF(@ModelAttribute PDFFile request)
            throws Exception {
        MultipartFile pdf = request.getFileInput();
--- a/src/main/java/stirling/software/SPDF/controller/api/security/SanitizeController.java
+++ b/src/main/java/stirling/software/SPDF/controller/api/security/SanitizeController.java
@@ -4,9 +4,17 @@ import java.io.IOException;

 import org.apache.pdfbox.cos.COSDictionary;
 import org.apache.pdfbox.cos.COSName;
-import org.apache.pdfbox.pdmodel.*;
+import org.apache.pdfbox.pdmodel.PDDocument;
+import org.apache.pdfbox.pdmodel.PDDocumentCatalog;
+import org.apache.pdfbox.pdmodel.PDPage;
+import org.apache.pdfbox.pdmodel.PDPageTree;
+import org.apache.pdfbox.pdmodel.PDResources;
 import org.apache.pdfbox.pdmodel.common.PDMetadata;
-import org.apache.pdfbox.pdmodel.interactive.action.*;
+import org.apache.pdfbox.pdmodel.interactive.action.PDAction;
+import org.apache.pdfbox.pdmodel.interactive.action.PDActionJavaScript;
+import org.apache.pdfbox.pdmodel.interactive.action.PDActionLaunch;
+import org.apache.pdfbox.pdmodel.interactive.action.PDActionURI;
+import org.apache.pdfbox.pdmodel.interactive.action.PDFormFieldAdditionalActions;
 import org.apache.pdfbox.pdmodel.interactive.annotation.PDAnnotation;
 import org.apache.pdfbox.pdmodel.interactive.annotation.PDAnnotationLink;
 import org.apache.pdfbox.pdmodel.interactive.annotation.PDAnnotationWidget;
--- a/src/main/java/stirling/software/SPDF/controller/api/security/ValidateSignatureController.java
+++ b/src/main/java/stirling/software/SPDF/controller/api/security/ValidateSignatureController.java
@@ -1,176 +0,0 @@
-package stirling.software.SPDF.controller.api.security;
-
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.security.cert.CertificateException;
-import java.security.cert.CertificateFactory;
-import java.security.cert.X509Certificate;
-import java.security.interfaces.RSAPublicKey;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-
-import org.apache.pdfbox.pdmodel.PDDocument;
-import org.apache.pdfbox.pdmodel.interactive.digitalsignature.PDSignature;
-import org.bouncycastle.cert.X509CertificateHolder;
-import org.bouncycastle.cert.jcajce.JcaX509CertificateConverter;
-import org.bouncycastle.cms.*;
-import org.bouncycastle.cms.jcajce.JcaSimpleSignerInfoVerifierBuilder;
-import org.bouncycastle.util.Store;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.ModelAttribute;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.multipart.MultipartFile;
-
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.tags.Tag;
-
-import stirling.software.SPDF.model.api.security.SignatureValidationRequest;
-import stirling.software.SPDF.model.api.security.SignatureValidationResult;
-import stirling.software.SPDF.service.CertificateValidationService;
-import stirling.software.SPDF.service.CustomPDDocumentFactory;
-
-@RestController
-@RequestMapping("/api/v1/security")
-@Tag(name = "Security", description = "Security APIs")
-public class ValidateSignatureController {
-
-    private final CustomPDDocumentFactory pdfDocumentFactory;
-    private final CertificateValidationService certValidationService;
-
-    @Autowired
-    public ValidateSignatureController(
-            CustomPDDocumentFactory pdfDocumentFactory,
-            CertificateValidationService certValidationService) {
-        this.pdfDocumentFactory = pdfDocumentFactory;
-        this.certValidationService = certValidationService;
-    }
-
-    @Operation(
-            summary = "Validate PDF Digital Signature",
-            description =
-                    "Validates the digital signatures in a PDF file against default or custom certificates. Input:PDF Output:JSON Type:SISO")
-    @PostMapping(value = "/validate-signature")
-    public ResponseEntity<List<SignatureValidationResult>> validateSignature(
-            @ModelAttribute SignatureValidationRequest request) throws IOException {
-        List<SignatureValidationResult> results = new ArrayList<>();
-        MultipartFile file = request.getFileInput();
-
-        // Load custom certificate if provided
-        X509Certificate customCert = null;
-        if (request.getCertFile() != null && !request.getCertFile().isEmpty()) {
-            try (ByteArrayInputStream certStream =
-                    new ByteArrayInputStream(request.getCertFile().getBytes())) {
-                CertificateFactory cf = CertificateFactory.getInstance("X.509");
-                customCert = (X509Certificate) cf.generateCertificate(certStream);
-            } catch (CertificateException e) {
-                throw new RuntimeException("Invalid certificate file: " + e.getMessage());
-            }
-        }
-
-        try (PDDocument document = pdfDocumentFactory.load(file.getInputStream())) {
-            List<PDSignature> signatures = document.getSignatureDictionaries();
-
-            for (PDSignature sig : signatures) {
-                SignatureValidationResult result = new SignatureValidationResult();
-
-                try {
-                    byte[] signedContent = sig.getSignedContent(file.getInputStream());
-                    byte[] signatureBytes = sig.getContents(file.getInputStream());
-
-                    CMSProcessable content = new CMSProcessableByteArray(signedContent);
-                    CMSSignedData signedData = new CMSSignedData(content, signatureBytes);
-
-                    Store<X509CertificateHolder> certStore = signedData.getCertificates();
-                    SignerInformationStore signerStore = signedData.getSignerInfos();
-
-                    for (SignerInformation signer : signerStore.getSigners()) {
-                        X509CertificateHolder certHolder =
-                                (X509CertificateHolder)
-                                        certStore.getMatches(signer.getSID()).iterator().next();
-                        X509Certificate cert =
-                                new JcaX509CertificateConverter().getCertificate(certHolder);
-
-                        boolean isValid =
-                                signer.verify(new JcaSimpleSignerInfoVerifierBuilder().build(cert));
-                        result.setValid(isValid);
-
-                        // Additional validations
-                        result.setChainValid(
-                                customCert != null
-                                        ? certValidationService
-                                                .validateCertificateChainWithCustomCert(
-                                                        cert, customCert)
-                                        : certValidationService.validateCertificateChain(cert));
-
-                        result.setTrustValid(
-                                customCert != null
-                                        ? certValidationService.validateTrustWithCustomCert(
-                                                cert, customCert)
-                                        : certValidationService.validateTrustStore(cert));
-
-                        result.setNotRevoked(!certValidationService.isRevoked(cert));
-                        result.setNotExpired(!cert.getNotAfter().before(new Date()));
-
-                        // Set basic signature info
-                        result.setSignerName(sig.getName());
-                        result.setSignatureDate(sig.getSignDate().getTime().toString());
-                        result.setReason(sig.getReason());
-                        result.setLocation(sig.getLocation());
-
-                        // Set new certificate details
-                        result.setIssuerDN(cert.getIssuerX500Principal().getName());
-                        result.setSubjectDN(cert.getSubjectX500Principal().getName());
-                        result.setSerialNumber(cert.getSerialNumber().toString(16)); // Hex format
-                        result.setValidFrom(cert.getNotBefore().toString());
-                        result.setValidUntil(cert.getNotAfter().toString());
-                        result.setSignatureAlgorithm(cert.getSigAlgName());
-
-                        // Get key size (if possible)
-                        try {
-                            result.setKeySize(
-                                    ((RSAPublicKey) cert.getPublicKey()).getModulus().bitLength());
-                        } catch (Exception e) {
-                            // If not RSA or error, set to 0
-                            result.setKeySize(0);
-                        }
-
-                        result.setVersion(String.valueOf(cert.getVersion()));
-
-                        // Set key usage
-                        List<String> keyUsages = new ArrayList<>();
-                        boolean[] keyUsageFlags = cert.getKeyUsage();
-                        if (keyUsageFlags != null) {
-                            String[] keyUsageLabels = {
-                                "Digital Signature", "Non-Repudiation", "Key Encipherment",
-                                "Data Encipherment", "Key Agreement", "Certificate Signing",
-                                "CRL Signing", "Encipher Only", "Decipher Only"
-                            };
-                            for (int i = 0; i < keyUsageFlags.length; i++) {
-                                if (keyUsageFlags[i]) {
-                                    keyUsages.add(keyUsageLabels[i]);
-                                }
-                            }
-                        }
-                        result.setKeyUsages(keyUsages);
-
-                        // Check if self-signed
-                        result.setSelfSigned(
-                                cert.getSubjectX500Principal()
-                                        .equals(cert.getIssuerX500Principal()));
-                    }
-                } catch (Exception e) {
-                    result.setValid(false);
-                    result.setErrorMessage("Signature validation failed: " + e.getMessage());
-                }
-
-                results.add(result);
-            }
-        }
-
-        return ResponseEntity.ok(results);
-    }
-}
--- a/src/main/java/stirling/software/SPDF/controller/api/security/WatermarkController.java
+++ b/src/main/java/stirling/software/SPDF/controller/api/security/WatermarkController.java
@@ -1,6 +1,6 @@
 package stirling.software.SPDF.controller.api.security;

-import java.awt.*;
+import java.awt.Color;
 import java.awt.image.BufferedImage;
 import java.io.File;
 import java.io.FileOutputStream;
@@ -69,7 +69,6 @@ public class WatermarkController {
        float opacity = request.getOpacity();
        int widthSpacer = request.getWidthSpacer();
        int heightSpacer = request.getHeightSpacer();
-        String customColor = request.getCustomColor();
        boolean convertPdfToImage = request.isConvertPDFToImage();

        // Load the input PDF
@@ -98,8 +97,7 @@ public class WatermarkController {
                        widthSpacer,
                        heightSpacer,
                        fontSize,
-                        alphabet,
-                        customColor);
+                        alphabet);
            } else if ("image".equalsIgnoreCase(watermarkType)) {
                addImageWatermark(
                        contentStream,
@@ -138,8 +136,7 @@ public class WatermarkController {
            int widthSpacer,
            int heightSpacer,
            float fontSize,
-            String alphabet,
-            String colorString)
+            String alphabet)
            throws IOException {
        String resourceDir = "";
        PDFont font = new PDType1Font(Standard14Fonts.FontName.HELVETICA);
@@ -176,18 +173,7 @@ public class WatermarkController {
        }

        contentStream.setFont(font, fontSize);
-
-        Color redactColor;
-        try {
-            if (!colorString.startsWith("#")) {
-                colorString = "#" + colorString;
-            }
-            redactColor = Color.decode(colorString);
-        } catch (NumberFormatException e) {
-
-            redactColor = Color.LIGHT_GRAY;
-        }
-        contentStream.setNonStrokingColor(redactColor);
+        contentStream.setNonStrokingColor(Color.LIGHT_GRAY);

        String[] textLines = watermarkText.split("\\\\n");
        float maxLineWidth = 0;
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Anthony Stirling	fbc6b3a70e	fix	2024-11-29 15:05:10 +00:00
Anthony Stirling	329f755823	Merge branch 'main' into saml	2024-11-29 14:32:04 +00:00
Anthony Stirling	acc50e48c5	debugs	2024-11-29 14:31:15 +00:00
Anthony Stirling	92a571d31c	saml stuff	2024-11-29 14:29:54 +00:00
Anthony Stirling	5976e69f54	debugs	2024-11-29 10:40:10 +00:00
Anthony Stirling	e588d8f99e	spring dev fix for saml	2024-11-29 09:06:51 +00:00
Anthony Stirling	1c0f423510	remove unused repo	2024-11-29 08:59:29 +00:00
Anthony Stirling	2d6fe55985	info to debug	2024-11-29 08:53:54 +00:00
Anthony Stirling	5171088fca	more fixes	2024-11-29 08:43:57 +00:00
Anthony Stirling	b4837df76c	ee flag for saml	2024-11-28 19:41:39 +00:00
Anthony Stirling	d20e8f7d54	oauth to saml and compare fixes etc	2024-11-28 19:27:37 +00:00
Anthony Stirling	2885fac30d	remove debugs	2024-11-28 15:43:24 +00:00
Anthony Stirling	2a4a19a80f	backup	2024-11-28 15:00:37 +00:00