Merge branch 'main' into on_hover-pagenumber-display#527

.git-blame-ignore-revs

@@ -0,0 +1,2 @@
+# Formatting
+5f771b785130154ed47952635b7acef371ffe0ec

.github/dependabot.yml

@@ -9,3 +9,7 @@ updates:
     directory: "/" # Location of package manifests
     schedule:
       interval: "weekly"
+  - package-ecosystem: "docker"
+    directory: "/" # Location of Dockerfile
+    schedule:
+      interval: "weekly"

.github/workflows/build.yml

@@ -0,0 +1,34 @@
+name: "Build repo"
+
+on:
+  push:
+    branches: [ "main" ]
+  pull_request:
+    branches: [ "main" ]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    permissions:
+      actions: read
+      contents: read
+      security-events: write
+
+    strategy:
+      fail-fast: false
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v3
+
+    - name: Set up JDK 17
+      uses: actions/setup-java@v3
+      with:
+        java-version: '17'
+        distribution: 'temurin'
+
+    - uses: gradle/gradle-build-action@v2.4.2
+      with:
+        gradle-version: 7.6
+        arguments: build --no-build-cache

.github/workflows/codeql.yml

@@ -1,55 +0,0 @@
-# For most projects, this workflow file will not need changing; you simply need
-# to commit it to your repository.
-#
-# You may wish to alter this file to override the set of languages analyzed,
-# or to provide custom queries or build logic.
-#
-# ******** NOTE ********
-# We have attempted to detect the languages in your repository. Please check
-# the `language` matrix defined below to confirm you have the correct set of
-
-name: "Build repo"
-
-on:
-  push:
-    branches: [ "main" ]
-  pull_request:
-    # The branches below must be a subset of the branches above
-    branches: [ "main" ]
-  schedule:
-    - cron: '15 12 * * 1'
-
-jobs:
-  analyze:
-    name: Analyze
-    runs-on: ubuntu-latest
-    permissions:
-      actions: read
-      contents: read
-      security-events: write
-
-    strategy:
-      fail-fast: false
-
-    steps:
-    - name: Checkout repository
-      uses: actions/checkout@v3
-      
-    - name: Set up JDK 17
-      uses: actions/setup-java@v3
-      with:
-        java-version: '17'
-        distribution: 'temurin'
-
-   # - name: Initialize CodeQL
-   #   uses: github/codeql-action/init@v2
-   #   with:
-   #     languages: java
-
-    - uses: gradle/gradle-build-action@v2.4.2
-      with:
-        gradle-version: 7.6
-        arguments: assemble --no-build-cache
-
-    #- name: Perform CodeQL analysis
-    #  uses: github/codeql-action/analyze@v2

.github/workflows/test.yml

@@ -0,0 +1,56 @@
+name: Docker Compose Tests
+
+on:
+  pull_request:
+    paths:
+      - 'src/**'
+      - '**.gradle'
+      - 'exampleYmlFiles/**'
+      - 'Dockerfile'
+      - 'Dockerfile**'
+    paths-ignore:
+      - 'src/main/java/resources/messages*'
+jobs:
+  test:
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Checkout Repository
+      uses: actions/checkout@v2
+
+    - name: Set up Java 17
+      uses: actions/setup-java@v2
+      with:
+        java-version: '17'
+        distribution: 'adopt'
+
+    - name: Set up Docker Buildx
+      uses: docker/setup-buildx-action@v1
+
+    - name: Run Docker Compose Tests
+      run: |
+        chmod +x ./gradlew
+        
+    - name: Get version number
+      id: versionNumber
+      run: echo "::set-output name=versionNumber::$(./gradlew printVersion --quiet | tail -1)"
+
+
+    - name: Cache Docker layers
+      uses: actions/cache@v2
+      with:
+        path: /tmp/.buildx-cache
+        key: ${{ runner.os }}-buildx-${{ steps.versionNumber.outputs.versionNumber }}
+        restore-keys: |
+          ${{ runner.os }}-buildx-
+
+    - name: Install Docker Compose
+      run: |
+        sudo curl -L "https://github.com/docker/compose/releases/download/v2.6.0/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose
+        sudo chmod +x /usr/local/bin/docker-compose
+
+
+    - name: Run Docker Compose Tests
+      run: |
+        chmod +x ./test.sh
+        ./test.sh

HowToAddNewLanguage.md

@@ -1,4 +1,4 @@
-<p align="center"><img src="https://raw.githubusercontent.com/Frooodle/Stirling-PDF/main/docs/stirling.png" width="80" ><br><h1 align="center">Stirling-PDF</h1>
+<p align="center"><img src="https://raw.githubusercontent.com/Stirling-Tools/Stirling-PDF/main/docs/stirling.png" width="80" ><br><h1 align="center">Stirling-PDF</h1>
 </p>
 
 
@@ -8,9 +8,9 @@ Fork Stirling-PDF and make a new branch out of Main
 
 Then add reference to the language in the navbar by adding a new language entry to the dropdown
 
-https://github.com/Frooodle/Stirling-PDF/blob/main/src/main/resources/templates/fragments/languages.html
+https://github.com/Stirling-Tools/Stirling-PDF/blob/main/src/main/resources/templates/fragments/languages.html
 and add a flag svg file to 
-https://github.com/Frooodle/Stirling-PDF/tree/main/src/main/resources/static/images/flags
+https://github.com/Stirling-Tools/Stirling-PDF/tree/main/src/main/resources/static/images/flags
 Any SVG flags are fine, i got most of mine from [here](https://flagicons.lipis.dev/)
 If your language isnt represented by a flag just find whichever closely matches it, such as for Arabic i chose Saudi Arabia
 
@@ -25,7 +25,7 @@ The data-language-code is the code used to reference the file in the next step.
 
 Start by copying the existing english property file 
 
-[https://github.com/Frooodle/Stirling-PDF/blob/main/src/main/resources/messages_en_GB.properties](https://github.com/Frooodle/Stirling-PDF/blob/main/src/main/resources/messages_en_GB.properties)
+[https://github.com/Stirling-Tools/Stirling-PDF/blob/main/src/main/resources/messages_en_GB.properties](https://github.com/Stirling-Tools/Stirling-PDF/blob/main/src/main/resources/messages_en_GB.properties)
 
 Copy and rename it to messages_{your data-language-code here}.properties, in the polish example you would set the name to messages_pl_PL.properties
 

LocalRunGuide.md

@@ -109,7 +109,7 @@ pip3 install uno opencv-python-headless unoconv pngquant WeasyPrint
 
 ```bash
 cd ~/.git &&\
-git clone https://github.com/Frooodle/Stirling-PDF.git &&\
+git clone https://github.com/Stirling-Tools/Stirling-PDF.git &&\
 cd Stirling-PDF &&\
 chmod +x ./gradlew &&\
 ./gradlew build

README.md

@@ -1,14 +1,14 @@
-<p align="center"><img src="https://raw.githubusercontent.com/Frooodle/Stirling-PDF/main/docs/stirling.png" width="80" ><br><h1 align="center">Stirling-PDF</h1>
+<p align="center"><img src="https://raw.githubusercontent.com/Stirling-Tools/Stirling-PDF/main/docs/stirling.png" width="80" ><br><h1 align="center">Stirling-PDF</h1>
 </p>
 
 [![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/Cn8pWhQRxZ)
-[![Docker Image Version (tag latest semver)](https://img.shields.io/docker/v/frooodle/s-pdf/latest)](https://github.com/Frooodle/Stirling-PDF/)
+[![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/frooodle/stirling-pdf?style=social)](https://github.com/Frooodle/stirling-pdf)
+[![GitHub Repo stars](https://img.shields.io/github/stars/stirling-tools/stirling-pdf?style=social)](https://github.com/Stirling-Tools/stirling-pdf)
 [![Paypal Donate](https://img.shields.io/badge/Paypal%20Donate-yellow?style=flat&logo=paypal)](https://www.paypal.com/paypalme/froodleplex)
 [![Github Sponser](https://img.shields.io/badge/Github%20Sponsor-yellow?style=flat&logo=github)](https://github.com/sponsors/Frooodle)
 
-[![Deploy to DO](https://www.deploytodo.com/do-btn-blue.svg)](https://cloud.digitalocean.com/apps/new?repo=https://github.com/Frooodle/Stirling-PDF/tree/digitalOcean&refcode=c3210994b1af)
+[![Deploy to DO](https://www.deploytodo.com/do-btn-blue.svg)](https://cloud.digitalocean.com/apps/new?repo=https://github.com/Stirling-Tools/Stirling-PDF/tree/digitalOcean&refcode=c3210994b1af)
 
 This is a powerful locally hosted web based PDF manipulation tool using docker that allows you to perform various operations on PDF files, such as splitting merging, converting, reorganizing, adding images, rotating, compressing, and more. This locally hosted web application started as a 100% ChatGPT-made application and has evolved to include a wide range of features to handle all your PDF needs.
 
@@ -22,10 +22,10 @@ Please feel free to submit feature requests or report bugs either through GitHub
 
 ## Features
 - Dark mode support.
-- Custom download options (see [here](https://github.com/Frooodle/Stirling-PDF/blob/main/images/settings.png) for example)
+- Custom download options (see [here](https://github.com/Stirling-Tools/Stirling-PDF/blob/main/images/settings.png) for example)
 - Parallel file processing and downloads
 - API for integration with external scripts 
-- Optional Login and Authentication support (see [here](https://github.com/Frooodle/Stirling-PDF/tree/main#login-authentication) for documentation)
+- Optional Login and Authentication support (see [here](https://github.com/Stirling-Tools/Stirling-PDF/tree/main#login-authentication) for documentation)
 
 
 ## **PDF Features**
@@ -80,7 +80,7 @@ Please feel free to submit feature requests or report bugs either through GitHub
 - Get all information on a PDF to view or export as JSON. 
 
 
-For a overview of the tasks and the technology each uses please view [Endpoint-groups.md](https://github.com/Frooodle/Stirling-PDF/blob/main/Endpoint-groups.md)
+For a overview of the tasks and the technology each uses please view [Endpoint-groups.md](https://github.com/Stirling-Tools/Stirling-PDF/blob/main/Endpoint-groups.md)
 Hosted instance/demo of the app can be seen [here](https://pdf.adminforge.de/) hosted by the team at adminforge.de
 
 ## Technologies used
@@ -96,13 +96,13 @@ Hosted instance/demo of the app can be seen [here](https://pdf.adminforge.de/) h
 ## How to use
 
 ### Locally
-Please view https://github.com/Frooodle/Stirling-PDF/blob/main/LocalRunGuide.md
+Please view https://github.com/Stirling-Tools/Stirling-PDF/blob/main/LocalRunGuide.md
 
 ### Docker / Podman
 https://hub.docker.com/r/frooodle/s-pdf
 
 Stirling PDF has 3 different versions, a Full version, Lite, and ultra-Lite. Depending on the types of features you use you may want a smaller image to save on space.
-To see what the different versions offer please look at our [version mapping](https://github.com/Frooodle/Stirling-PDF/blob/main/Version-groups.md)
+To see what the different versions offer please look at our [version mapping](https://github.com/Stirling-Tools/Stirling-PDF/blob/main/Version-groups.md)
 For people that don't mind about space optimization just use the latest tag.
 ![Docker Image Size (tag)](https://img.shields.io/docker/image-size/frooodle/s-pdf/latest?label=Stirling-PDF%20Full)
 ![Docker Image Size (tag)](https://img.shields.io/docker/image-size/frooodle/s-pdf/latest-lite?label=Stirling-PDF%20Lite)
@@ -144,7 +144,7 @@ services:
 Note: Podman is CLI-compatible with Docker, so simply replace "docker" with "podman".
 
 ## Enable OCR/Compression feature
-Please view https://github.com/Frooodle/Stirling-PDF/blob/main/HowToUseOCR.md
+Please view https://github.com/Stirling-Tools/Stirling-PDF/blob/main/HowToUseOCR.md
 
 ## Want to add your own language?
 Stirling PDF currently supports 21!
@@ -172,7 +172,7 @@ Stirling PDF currently supports 21!
 - Hindi (हिंदी) (hi_IN)
 
 If you want to add your own language to Stirling-PDF please refer
-https://github.com/Frooodle/Stirling-PDF/blob/main/HowToAddNewLanguage.md
+https://github.com/Stirling-Tools/Stirling-PDF/blob/main/HowToAddNewLanguage.md
 
 And please create a PR to merge it back in so others can use it! 
 
@@ -224,7 +224,7 @@ metrics:
   enabled: true # 'true' to enable Info APIs endpoints (view http://localhost:8080/swagger-ui/index.html#/API to learn more), 'false' to disable
 ```
 ### Extra notes
-- Endpoints. Currently, the endpoints ENDPOINTS_TO_REMOVE and GROUPS_TO_REMOVE can include comma separate lists of endpoints and groups to disable as example ENDPOINTS_TO_REMOVE=img-to-pdf,remove-pages would disable both image-to-pdf and remove pages, GROUPS_TO_REMOVE=LibreOffice Would disable all things that use LibreOffice. You can see a list of all endpoints and groups [here](https://github.com/Frooodle/Stirling-PDF/blob/main/Endpoint-groups.md) 
+- Endpoints. Currently, the endpoints ENDPOINTS_TO_REMOVE and GROUPS_TO_REMOVE can include comma separate lists of endpoints and groups to disable as example ENDPOINTS_TO_REMOVE=img-to-pdf,remove-pages would disable both image-to-pdf and remove pages, GROUPS_TO_REMOVE=LibreOffice Would disable all things that use LibreOffice. You can see a list of all endpoints and groups [here](https://github.com/Stirling-Tools/Stirling-PDF/blob/main/Endpoint-groups.md)
 - customStaticFilePath. Customise static files such as the app logo by placing files in the /customFiles/static/ directory. An example of customising app logo is placing a /customFiles/static/favicon.svg to override current SVG. This can be used to change any images/icons/css/fonts/js etc in Stirling-PDF
 
 ### Environment only parameters
@@ -234,7 +234,7 @@ metrics:
 
 ## API
 For those wanting to use Stirling-PDFs backend API to link with their own custom scripting to edit PDFs you can view all existing API documentation
-[here](https://app.swaggerhub.com/apis-docs/Frooodle/Stirling-PDF/) or navigate to /swagger-ui/index.html of your stirling-pdf instance for your versions documentation (Or by following the API button in your settings of Stirling-PDF)
+[here](https://app.swaggerhub.com/apis-docs/Stirling-Tools/Stirling-PDF/) or navigate to /swagger-ui/index.html of your stirling-pdf instance for your versions documentation (Or by following the API button in your settings of Stirling-PDF)
 
 
 ## Login authentication

build.gradle

@@ -1,10 +1,11 @@
 plugins {
-	id 'java'
+    id 'java'
-	id 'org.springframework.boot' version '3.1.2'
+    id 'org.springframework.boot' version '3.2.1'
-	id 'io.spring.dependency-management' version '1.1.3'
+    id 'io.spring.dependency-management' version '1.1.3'
-	id 'org.springdoc.openapi-gradle-plugin' version '1.8.0'
+    id 'org.springdoc.openapi-gradle-plugin' version '1.8.0'
-	id "io.swagger.swaggerhub" version "1.3.2"
+    id "io.swagger.swaggerhub" version "1.3.2"
-	id 'edu.sc.seis.launch4j' version '3.0.5'
+    id 'edu.sc.seis.launch4j' version '3.0.5'
+    id 'com.diffplug.spotless' version '6.23.3'
 }
 
 group = 'stirling.software'
@@ -12,7 +13,7 @@ version = '0.18.1'
 sourceCompatibility = '17'
 
 repositories {
-	mavenCentral()
+    mavenCentral()
 }
 
 sourceSets {
@@ -61,21 +62,37 @@ launch4j {
   messagesInstanceAlreadyExists="Stirling-PDF is already running."
 }
 
-dependencies {
+spotless {
-	//security updates
+    java {
-	implementation 'ch.qos.logback:logback-classic:1.4.14'
+        target project.fileTree('src/main/java')
-	implementation 'ch.qos.logback:logback-core:1.4.14'
-	implementation 'org.springframework:spring-webmvc:6.0.15'
 
-    implementation 'org.yaml:snakeyaml:2.1'
+        googleJavaFormat('1.19.1').aosp().reorderImports(false)
+
+        importOrder('java', 'javax', 'org', 'com', 'net', 'io')
+        toggleOffOn()
+        trimTrailingWhitespace()
+        indentWithSpaces()
+        endWithNewline()
+    }
+}
+
+dependencies {
+    //security updates
+    implementation 'ch.qos.logback:logback-classic:1.4.14'
+    implementation 'ch.qos.logback:logback-core:1.4.14'
+    implementation 'org.springframework:spring-webmvc:6.1.2'
+
+    implementation 'org.yaml:snakeyaml:2.2'
     implementation 'org.springframework.boot:spring-boot-starter-web:3.2.1'
     implementation 'org.springframework.boot:spring-boot-starter-thymeleaf:3.2.1'
 
     if (System.getenv('DOCKER_ENABLE_SECURITY') != 'false') {
         implementation 'org.springframework.boot:spring-boot-starter-security:3.2.1'
         implementation 'org.thymeleaf.extras:thymeleaf-extras-springsecurity5:3.1.2.RELEASE'
-        implementation "org.springframework.boot:spring-boot-starter-data-jpa"
+        implementation "org.springframework.boot:spring-boot-starter-data-jpa:3.2.1"
-        implementation "com.h2database:h2"
+        
+        //2.2.x requires rebuild of DB file.. need migration path
+        implementation "com.h2database:h2:2.1.214"
     }
 
     testImplementation 'org.springframework.boot:spring-boot-starter-test:3.2.1'
@@ -107,7 +124,7 @@ dependencies {
     //general PDF
 
     // https://mvnrepository.com/artifact/com.opencsv/opencsv
-    implementation ('com.opencsv:opencsv:5.7.1') {
+    implementation ('com.opencsv:opencsv:5.9') {
         exclude group: 'commons-logging', module: 'commons-logging'
     }
     
@@ -134,6 +151,9 @@ dependencies {
     annotationProcessor 'org.projectlombok:lombok:1.18.28'
 }
 
+tasks.withType(JavaCompile) {
+    dependsOn 'spotlessApply'
+}
 
 task writeVersion {
     def propsFile = file('src/main/resources/version.properties')
@@ -164,7 +184,7 @@ jar {
 }
 
 tasks.named('test') {
-	useJUnitPlatform()
+    useJUnitPlatform()
 }
 
 task printVersion {

chart/stirling-pdf/Chart.yaml

@@ -1,15 +1,15 @@
 apiVersion: v2
 appVersion: 0.14.2
 description: locally hosted web application that allows you to perform various operations on PDF files
-home: https://github.com/Frooodle/Stirling-PDF
+home: https://github.com/Stirling-Tools/Stirling-PDF
 keywords:
 - stirling-pdf
 - helm
 - charts repo
 maintainers:
-- name: Frooodle
+- name: Stirling-Tools
-  url: https://github.com/Frooodle/Stirling-PDF
+  url: https://github.com/Stirling-Tools/Stirling-PDF
 name: stirling-pdf-chart
 sources:
-- https://github.com/Frooodle/Stirling-PDF
+- https://github.com/Stirling-Tools/Stirling-PDF
 version: 1.0.0

exampleYmlFiles/docker-compose-latest-lite-security.yml

@@ -0,0 +1,31 @@
+version: '3.3'
+services:
+  stirling-pdf:
+    container_name: Stirling-PDF-Lite-Security
+    image: frooodle/s-pdf:latest-lite
+    deploy:
+      resources:
+        limits:
+          memory: 2G
+    healthcheck:
+      test: ["CMD-SHELL", "curl -f http://localhost:8080/api/v1/info/status | grep -q 'UP' && curl -fL http://localhost:8080/ | grep -q 'Please sign in'"]
+      interval: 5s
+      timeout: 10s
+      retries: 16
+    ports:
+      - 8080:8080
+    volumes:
+      - /stirling/latest/data:/usr/share/tesseract-ocr/5/tessdata:rw
+      - /stirling/latest/config:/configs:rw
+      - /stirling/latest/logs:/logs:rw
+    environment:
+      DOCKER_ENABLE_SECURITY: "true"
+      SECURITY_ENABLELOGIN: "true"
+      SYSTEM_DEFAULTLOCALE: en_US
+      UI_APPNAME: Stirling-PDF-Lite
+      UI_HOMEDESCRIPTION: Demo site for Stirling-PDF-Lite Latest with Security
+      UI_APPNAMENAVBAR: Stirling-PDF-Lite Latest
+      SYSTEM_MAXFILESIZE: "100"
+      METRICS_ENABLED: "true"
+      SYSTEM_GOOGLEVISIBILITY: "true"
+    restart: on-failure:5

exampleYmlFiles/docker-compose-latest-lite.yml

@@ -0,0 +1,30 @@
+version: '3.3'
+services:
+  stirling-pdf:
+    container_name: Stirling-PDF-Lite
+    image: frooodle/s-pdf:latest-lite
+    deploy:
+      resources:
+        limits:
+          memory: 2G
+    healthcheck:
+      test: ["CMD-SHELL", "curl -f http://localhost:8080/api/v1/info/status | grep -q 'UP' && curl -fL http://localhost:8080/ | grep -qv 'Please sign in'"]
+      interval: 5s
+      timeout: 10s
+      retries: 16
+    ports:
+      - 8080:8080
+    volumes:
+      - /stirling/latest/config:/configs:rw
+      - /stirling/latest/logs:/logs:rw
+    environment:
+      DOCKER_ENABLE_SECURITY: "false"
+      SECURITY_ENABLELOGIN: "false"
+      SYSTEM_DEFAULTLOCALE: en_US
+      UI_APPNAME: Stirling-PDF-Lite
+      UI_HOMEDESCRIPTION: Demo site for Stirling-PDF-Lite Latest
+      UI_APPNAMENAVBAR: Stirling-PDF-Lite Latest
+      SYSTEM_MAXFILESIZE: "100"
+      METRICS_ENABLED: "true"
+      SYSTEM_GOOGLEVISIBILITY: "true"
+    restart: on-failure:5

exampleYmlFiles/docker-compose-latest-security.yml

@@ -0,0 +1,31 @@
+version: '3.3'
+services:
+  stirling-pdf:
+    container_name: Stirling-PDF-Security
+    image: frooodle/s-pdf:latest
+    deploy:
+      resources:
+        limits:
+          memory: 4G
+    healthcheck:
+      test: ["CMD-SHELL", "curl -f http://localhost:8080/api/v1/info/status | grep -q 'UP' && curl -fL http://localhost:8080/ | grep -q 'Please sign in'"]
+      interval: 5s
+      timeout: 10s
+      retries: 16
+    ports:
+      - 8080:8080
+    volumes:
+      - /stirling/latest/data:/usr/share/tesseract-ocr/5/tessdata:rw
+      - /stirling/latest/config:/configs:rw
+      - /stirling/latest/logs:/logs:rw
+    environment:
+      DOCKER_ENABLE_SECURITY: "true"
+      SECURITY_ENABLELOGIN: "true"
+      SYSTEM_DEFAULTLOCALE: en_US
+      UI_APPNAME: Stirling-PDF
+      UI_HOMEDESCRIPTION: Demo site for Stirling-PDF Latest with Security
+      UI_APPNAMENAVBAR: Stirling-PDF Latest
+      SYSTEM_MAXFILESIZE: "100"
+      METRICS_ENABLED: "true"
+      SYSTEM_GOOGLEVISIBILITY: "true"
+    restart: on-failure:5

exampleYmlFiles/docker-compose-latest-ultra-lite-security.yml

@@ -0,0 +1,31 @@
+version: '3.3'
+services:
+  stirling-pdf:
+    container_name: Stirling-PDF-Ultra-Lite-Security
+    image: frooodle/s-pdf:latest-ultra-lite
+    deploy:
+      resources:
+        limits:
+          memory: 1G
+    healthcheck:
+      test: ["CMD-SHELL", "curl -f http://localhost:8080/api/v1/info/status | grep -q 'UP' && curl -fL http://localhost:8080/ | grep -q 'Please sign in'"]
+      interval: 5s
+      timeout: 10s
+      retries: 16
+    ports:
+      - 8080:8080
+    volumes:
+      - /stirling/latest/data:/usr/share/tesseract-ocr/5/tessdata:rw
+      - /stirling/latest/config:/configs:rw
+      - /stirling/latest/logs:/logs:rw
+    environment:
+      DOCKER_ENABLE_SECURITY: "true"
+      SECURITY_ENABLELOGIN: "true"
+      SYSTEM_DEFAULTLOCALE: en_US
+      UI_APPNAME: Stirling-PDF-Lite
+      UI_HOMEDESCRIPTION: Demo site for Stirling-PDF-Lite Latest with Security
+      UI_APPNAMENAVBAR: Stirling-PDF-Lite Latest
+      SYSTEM_MAXFILESIZE: "100"
+      METRICS_ENABLED: "true"
+      SYSTEM_GOOGLEVISIBILITY: "true"
+    restart: on-failure:5

exampleYmlFiles/docker-compose-latest-ultra-lite.yml

@@ -0,0 +1,30 @@
+version: '3.3'
+services:
+  stirling-pdf:
+    container_name: Stirling-PDF-Ultra-Lite
+    image: frooodle/s-pdf:latest-ultra-lite
+    deploy:
+      resources:
+        limits:
+          memory: 1G
+    healthcheck:
+      test: ["CMD-SHELL", "curl -f http://localhost:8080/api/v1/info/status | grep -q 'UP' && curl -fL http://localhost:8080/ | grep -qv 'Please sign in'"]
+      interval: 5s
+      timeout: 10s
+      retries: 16
+    ports:
+      - 8080:8080
+    volumes:
+      - /stirling/latest/config:/configs:rw
+      - /stirling/latest/logs:/logs:rw
+    environment:
+      DOCKER_ENABLE_SECURITY: "false"
+      SECURITY_ENABLELOGIN: "false"
+      SYSTEM_DEFAULTLOCALE: en_US
+      UI_APPNAME: Stirling-PDF-Ultra-lite
+      UI_HOMEDESCRIPTION: Demo site for Stirling-PDF-Ultra-lite Latest
+      UI_APPNAMENAVBAR: Stirling-PDF-Ultra-lite Latest
+      SYSTEM_MAXFILESIZE: "100"
+      METRICS_ENABLED: "true"
+      SYSTEM_GOOGLEVISIBILITY: "true"
+    restart: on-failure:5

exampleYmlFiles/docker-compose-latest.yml

@@ -0,0 +1,31 @@
+version: '3.3'
+services:
+  stirling-pdf:
+    container_name: Stirling-PDF
+    image: frooodle/s-pdf:latest
+    deploy:
+      resources:
+        limits:
+          memory: 4G
+    healthcheck:
+      test: ["CMD-SHELL", "curl -f http://localhost:8080/api/v1/info/status | grep -q 'UP' && curl -fL http://localhost:8080/ | grep -qv 'Please sign in'"]
+      interval: 5s
+      timeout: 10s
+      retries: 16
+    ports:
+      - 8080:8080
+    volumes:
+      - /stirling/latest/data:/usr/share/tesseract-ocr/5/tessdata:rw
+      - /stirling/latest/config:/configs:rw
+      - /stirling/latest/logs:/logs:rw
+    environment:
+      DOCKER_ENABLE_SECURITY: "false"
+      SECURITY_ENABLELOGIN: "false"
+      SYSTEM_DEFAULTLOCALE: en_US
+      UI_APPNAME: Stirling-PDF
+      UI_HOMEDESCRIPTION: Demo site for Stirling-PDF Latest
+      UI_APPNAMENAVBAR: Stirling-PDF Latest
+      SYSTEM_MAXFILESIZE: "100"
+      METRICS_ENABLED: "true"
+      SYSTEM_GOOGLEVISIBILITY: "true"
+    restart: on-failure:5

scripts/download-security-jar.sh

@@ -2,13 +2,13 @@ echo "Running Stirling PDF with DOCKER_ENABLE_SECURITY=${DOCKER_ENABLE_SECURITY}
 # Check for DOCKER_ENABLE_SECURITY and download the appropriate JAR if required
 if [ "$DOCKER_ENABLE_SECURITY" = "true" ] && [ "$VERSION_TAG" != "alpha" ]; then
     if [ ! -f app-security.jar ]; then
-    	echo "Trying to download from: https://github.com/Frooodle/Stirling-PDF/releases/download/v$VERSION_TAG/Stirling-PDF-with-login.jar"
+    	echo "Trying to download from: https://github.com/Stirling-Tools/Stirling-PDF/releases/download/v$VERSION_TAG/Stirling-PDF-with-login.jar"
-        curl -L -o app-security.jar https://github.com/Frooodle/Stirling-PDF/releases/download/v$VERSION_TAG/Stirling-PDF-with-login.jar
+        curl -L -o app-security.jar https://github.com/Stirling-Tools/Stirling-PDF/releases/download/v$VERSION_TAG/Stirling-PDF-with-login.jar
        
         # If the first download attempt failed, try with the 'v' prefix
         if [ $? -ne 0 ]; then
-            echo "Trying to download from: https://github.com/Frooodle/Stirling-PDF/releases/download/$VERSION_TAG/Stirling-PDF-with-login.jar"
+            echo "Trying to download from: https://github.com/Stirling-Tools/Stirling-PDF/releases/download/$VERSION_TAG/Stirling-PDF-with-login.jar"
-        	curl -L -o app-security.jar https://github.com/Frooodle/Stirling-PDF/releases/download/$VERSION_TAG/Stirling-PDF-with-login.jar
+        	curl -L -o app-security.jar https://github.com/Stirling-Tools/Stirling-PDF/releases/download/$VERSION_TAG/Stirling-PDF-with-login.jar
         fi
 
         if [ $? -eq 0 ]; then  # checks if curl was successful

src/main/java/stirling/software/SPDF/LibreOfficeListener.java

@@ -22,14 +22,14 @@ public class LibreOfficeListener {
 
     private Process process;
 
-    private LibreOfficeListener() {
+    private LibreOfficeListener() {}
-    }
 
     private boolean isListenerRunning() {
         try {
             System.out.println("waiting for listener to start");
             Socket socket = new Socket();
-            socket.connect(new InetSocketAddress("localhost", 2002), 1000); // Timeout after 1 second
+            socket.connect(
+                    new InetSocketAddress("localhost", 2002), 1000); // Timeout after 1 second
             socket.close();
             return true;
         } catch (IOException e) {
@@ -49,21 +49,22 @@ public class LibreOfficeListener {
 
         // Start a background thread to monitor the activity timeout
         executorService = Executors.newSingleThreadExecutor();
-        executorService.submit(() -> {
+        executorService.submit(
-            while (true) {
+                () -> {
-                long idleTime = System.currentTimeMillis() - lastActivityTime;
+                    while (true) {
-                if (idleTime >= ACTIVITY_TIMEOUT) {
+                        long idleTime = System.currentTimeMillis() - lastActivityTime;
-                    // If there has been no activity for too long, tear down the listener
+                        if (idleTime >= ACTIVITY_TIMEOUT) {
-                    process.destroy();
+                            // If there has been no activity for too long, tear down the listener
-                    break;
+                            process.destroy();
-                }
+                            break;
-                try {
+                        }
-                    Thread.sleep(5000); // Check for inactivity every 5 seconds
+                        try {
-                } catch (InterruptedException e) {
+                            Thread.sleep(5000); // Check for inactivity every 5 seconds
-                    break;
+                        } catch (InterruptedException e) {
-                }
+                            break;
-            }
+                        }
-        });
+                    }
+                });
 
         // Wait for the listener to start up
         long startTime = System.currentTimeMillis();
@@ -92,5 +93,4 @@ public class LibreOfficeListener {
             process.destroy();
         }
     }
-
 }

src/main/java/stirling/software/SPDF/SPdfApplication.java

@@ -13,13 +13,12 @@ import org.springframework.scheduling.annotation.EnableScheduling;
 import jakarta.annotation.PostConstruct;
 import stirling.software.SPDF.config.ConfigInitializer;
 import stirling.software.SPDF.utils.GeneralUtils;
-@SpringBootApplication
 
+@SpringBootApplication
 @EnableScheduling
 public class SPdfApplication {
 
-	@Autowired
+    @Autowired private Environment env;
-    private Environment env;
 
     @PostConstruct
     public void init() {
@@ -44,21 +43,24 @@ public class SPdfApplication {
     }
 
     public static void main(String[] args) {
-    	SpringApplication app = new SpringApplication(SPdfApplication.class);
+        SpringApplication app = new SpringApplication(SPdfApplication.class);
-    	app.addInitializers(new ConfigInitializer());
+        app.addInitializers(new ConfigInitializer());
-    	if (Files.exists(Paths.get("configs/settings.yml"))) {
+        if (Files.exists(Paths.get("configs/settings.yml"))) {
-            app.setDefaultProperties(Collections.singletonMap("spring.config.additional-location", "file:configs/settings.yml"));
+            app.setDefaultProperties(
+                    Collections.singletonMap(
+                            "spring.config.additional-location", "file:configs/settings.yml"));
         } else {
-            System.out.println("External configuration file 'configs/settings.yml' does not exist. Using default configuration and environment configuration instead.");
+            System.out.println(
+                    "External configuration file 'configs/settings.yml' does not exist. Using default configuration and environment configuration instead.");
         }
         app.run(args);
 
         try {
-			Thread.sleep(1000);
+            Thread.sleep(1000);
-		} catch (InterruptedException e) {
+        } catch (InterruptedException e) {
-			// TODO Auto-generated catch block
+            // TODO Auto-generated catch block
-			e.printStackTrace();
+            e.printStackTrace();
-		}
+        }
 
         GeneralUtils.createDir("customFiles/static/");
         GeneralUtils.createDir("customFiles/templates/");

src/main/java/stirling/software/SPDF/config/AppConfig.java

@@ -5,12 +5,11 @@ import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
 import stirling.software.SPDF.model.ApplicationProperties;
+
 @Configuration
 public class AppConfig {
 
-    
+    @Autowired ApplicationProperties applicationProperties;
-    @Autowired
-    ApplicationProperties applicationProperties;
 
     @Bean(name = "loginEnabled")
     public boolean loginEnabled() {
@@ -19,7 +18,7 @@ public class AppConfig {
 
     @Bean(name = "appName")
     public String appName() {
-        String homeTitle =  applicationProperties.getUi().getAppName();
+        String homeTitle = applicationProperties.getUi().getAppName();
         return (homeTitle != null) ? homeTitle : "Stirling PDF";
     }
 
@@ -31,28 +30,31 @@ public class AppConfig {
 
     @Bean(name = "homeText")
     public String homeText() {
-    	return (applicationProperties.getUi().getHomeDescription() != null) ? applicationProperties.getUi().getHomeDescription() : "null";
+        return (applicationProperties.getUi().getHomeDescription() != null)
+                ? applicationProperties.getUi().getHomeDescription()
+                : "null";
     }
 
-
     @Bean(name = "navBarText")
     public String navBarText() {
-        String defaultNavBar = applicationProperties.getUi().getAppNameNavbar() != null ? applicationProperties.getUi().getAppNameNavbar() : applicationProperties.getUi().getAppName();
+        String defaultNavBar =
+                applicationProperties.getUi().getAppNameNavbar() != null
+                        ? applicationProperties.getUi().getAppNameNavbar()
+                        : applicationProperties.getUi().getAppName();
         return (defaultNavBar != null) ? defaultNavBar : "Stirling PDF";
     }
 
     @Bean(name = "enableAlphaFunctionality")
     public boolean enableAlphaFunctionality() {
-        return applicationProperties.getSystem().getEnableAlphaFunctionality() != null ? applicationProperties.getSystem().getEnableAlphaFunctionality() : false;
+        return applicationProperties.getSystem().getEnableAlphaFunctionality() != null
+                ? applicationProperties.getSystem().getEnableAlphaFunctionality()
+                : false;
     }
 
-	@Bean(name = "rateLimit")
+    @Bean(name = "rateLimit")
     public boolean rateLimit() {
         String appName = System.getProperty("rateLimit");
-        if (appName == null) 
+        if (appName == null) appName = System.getenv("rateLimit");
-            appName = System.getenv("rateLimit");
         return (appName != null) ? Boolean.valueOf(appName) : false;
     }
-	
-	
 }

src/main/java/stirling/software/SPDF/config/Beans.java

@@ -16,8 +16,7 @@ import stirling.software.SPDF.model.ApplicationProperties;
 @Configuration
 public class Beans implements WebMvcConfigurer {
 
-	@Autowired
+    @Autowired ApplicationProperties applicationProperties;
-    ApplicationProperties applicationProperties;
 
     @Override
     public void addInterceptors(InterceptorRegistry registry) {
@@ -36,24 +35,25 @@ public class Beans implements WebMvcConfigurer {
     public LocaleResolver localeResolver() {
         SessionLocaleResolver slr = new SessionLocaleResolver();
 
-        
         String appLocaleEnv = applicationProperties.getSystem().getDefaultLocale();
-        Locale defaultLocale = Locale.UK; // Fallback to UK locale if environment variable is not set
+        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)) {
+            if (appLocaleEnv.equalsIgnoreCase(tempLanguageTag)) {
                 defaultLocale = tempLocale;
             } else {
-                tempLocale = Locale.forLanguageTag(appLocaleEnv.replace("_","-"));
+                tempLocale = Locale.forLanguageTag(appLocaleEnv.replace("_", "-"));
                 tempLanguageTag = tempLocale.toLanguageTag();
 
                 if (appLocaleEnv.equalsIgnoreCase(tempLanguageTag)) {
                     defaultLocale = tempLocale;
                 } else {
-                    System.err.println("Invalid APP_LOCALE environment variable value. Falling back to default Locale.UK.");
+                    System.err.println(
+                            "Invalid APP_LOCALE environment variable value. Falling back to default Locale.UK.");
                 }
             }
         }
@@ -61,5 +61,4 @@ public class Beans implements WebMvcConfigurer {
         slr.setDefaultLocale(defaultLocale);
         return slr;
     }
-    
 }

src/main/java/stirling/software/SPDF/config/CleanUrlInterceptor.java

@@ -13,56 +13,62 @@ import jakarta.servlet.http.HttpServletResponse;
 
 public class CleanUrlInterceptor implements HandlerInterceptor {
 
-	private static final List<String> ALLOWED_PARAMS = Arrays.asList("lang", "endpoint", "endpoints", "logout", "error", "file", "messageType");
+    private static final List<String> ALLOWED_PARAMS =
+            Arrays.asList(
+                    "lang", "endpoint", "endpoints", "logout", "error", "file", "messageType");
 
+    @Override
+    public boolean preHandle(
+            HttpServletRequest request, HttpServletResponse response, Object handler)
+            throws Exception {
+        String queryString = request.getQueryString();
+        if (queryString != null && !queryString.isEmpty()) {
+            String requestURI = request.getRequestURI();
+            Map<String, String> parameters = new HashMap<>();
 
-	@Override
+            // Keep only the allowed parameters
-	public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler)
+            String[] queryParameters = queryString.split("&");
-			throws Exception {
+            for (String param : queryParameters) {
-		String queryString = request.getQueryString();
+                String[] keyValue = param.split("=");
-		if (queryString != null && !queryString.isEmpty()) {
+                if (keyValue.length != 2) {
-			String requestURI = request.getRequestURI();
+                    continue;
-			Map<String, String> parameters = new HashMap<>();
+                }
+                if (ALLOWED_PARAMS.contains(keyValue[0])) {
+                    parameters.put(keyValue[0], keyValue[1]);
+                }
+            }
 
-			// Keep only the allowed parameters
+            // If there are any parameters that are not allowed
-			String[] queryParameters = queryString.split("&");
+            if (parameters.size() != queryParameters.length) {
-			for (String param : queryParameters) {
+                // Construct new query string
-				String[] keyValue = param.split("=");
+                StringBuilder newQueryString = new StringBuilder();
-				if (keyValue.length != 2) {
+                for (Map.Entry<String, String> entry : parameters.entrySet()) {
-					continue;
+                    if (newQueryString.length() > 0) {
-				}
+                        newQueryString.append("&");
-				if (ALLOWED_PARAMS.contains(keyValue[0])) {
+                    }
-					parameters.put(keyValue[0], keyValue[1]);
+                    newQueryString.append(entry.getKey()).append("=").append(entry.getValue());
-				}
+                }
-			}
 
-			// If there are any parameters that are not allowed
+                // Redirect to the URL with only allowed query parameters
-			if (parameters.size() != queryParameters.length) {
+                String redirectUrl = requestURI + "?" + newQueryString;
-				// Construct new query string
+                response.sendRedirect(redirectUrl);
-				StringBuilder newQueryString = new StringBuilder();
+                return false;
-				for (Map.Entry<String, String> entry : parameters.entrySet()) {
+            }
-					if (newQueryString.length() > 0) {
+        }
-						newQueryString.append("&");
+        return true;
-					}
+    }
-					newQueryString.append(entry.getKey()).append("=").append(entry.getValue());
-				}
 
-				// Redirect to the URL with only allowed query parameters
+    @Override
-				String redirectUrl = requestURI + "?" + newQueryString;
+    public void postHandle(
-				response.sendRedirect(redirectUrl);
+            HttpServletRequest request,
-				return false;
+            HttpServletResponse response,
-			}
+            Object handler,
-		}
+            ModelAndView modelAndView) {}
-		return true;
-	}
 
-	@Override
+    @Override
-	public void postHandle(HttpServletRequest request, HttpServletResponse response, Object handler,
+    public void afterCompletion(
-			ModelAndView modelAndView) {
+            HttpServletRequest request,
-	}
+            HttpServletResponse response,
-
+            Object handler,
-	@Override
+            Exception ex) {}
-	public void afterCompletion(HttpServletRequest request, HttpServletResponse response, Object handler,
-			Exception ex) {
-	}
 }

src/main/java/stirling/software/SPDF/config/ConfigInitializer.java

@@ -19,111 +19,125 @@ import java.util.stream.Collectors;
 import org.springframework.context.ApplicationContextInitializer;
 import org.springframework.context.ConfigurableApplicationContext;
 
-public class ConfigInitializer implements ApplicationContextInitializer<ConfigurableApplicationContext> {
+public class ConfigInitializer
+        implements ApplicationContextInitializer<ConfigurableApplicationContext> {
 
-	@Override
+    @Override
-	public void initialize(ConfigurableApplicationContext applicationContext) {
+    public void initialize(ConfigurableApplicationContext applicationContext) {
-		try {
+        try {
-			ensureConfigExists();
+            ensureConfigExists();
-		} catch (IOException e) {
+        } catch (IOException e) {
-			throw new RuntimeException("Failed to initialize application configuration", e);
+            throw new RuntimeException("Failed to initialize application configuration", e);
-		}
+        }
-	}
+    }
 
-	public void ensureConfigExists() throws IOException {
+    public void ensureConfigExists() throws IOException {
-		// Define the path to the external config directory
+        // Define the path to the external config directory
-		Path destPath = Paths.get("configs", "settings.yml");
+        Path destPath = Paths.get("configs", "settings.yml");
 
-		// Check if the file already exists
+        // Check if the file already exists
-		if (Files.notExists(destPath)) {
+        if (Files.notExists(destPath)) {
-			// Ensure the destination directory exists
+            // Ensure the destination directory exists
-			Files.createDirectories(destPath.getParent());
+            Files.createDirectories(destPath.getParent());
 
-			// Copy the resource from classpath to the external directory
+            // Copy the resource from classpath to the external directory
-			try (InputStream in = getClass().getClassLoader().getResourceAsStream("settings.yml.template")) {
+            try (InputStream in =
-				if (in != null) {
+                    getClass().getClassLoader().getResourceAsStream("settings.yml.template")) {
-					Files.copy(in, destPath);
+                if (in != null) {
-				} else {
+                    Files.copy(in, destPath);
-					throw new FileNotFoundException("Resource file not found: settings.yml.template");
+                } else {
-				}
+                    throw new FileNotFoundException(
-			}
+                            "Resource file not found: settings.yml.template");
-		} else {
+                }
-			// If user file exists, we need to merge it with the template from the classpath
+            }
-			List<String> templateLines;
+        } else {
-			try (InputStream in = getClass().getClassLoader().getResourceAsStream("settings.yml.template")) {
+            // If user file exists, we need to merge it with the template from the classpath
-				templateLines = new BufferedReader(new InputStreamReader(in, StandardCharsets.UTF_8)).lines()
+            List<String> templateLines;
-						.collect(Collectors.toList());
+            try (InputStream in =
-			}
+                    getClass().getClassLoader().getResourceAsStream("settings.yml.template")) {
+                templateLines =
+                        new BufferedReader(new InputStreamReader(in, StandardCharsets.UTF_8))
+                                .lines()
+                                .collect(Collectors.toList());
+            }
 
-			mergeYamlFiles(templateLines, destPath, destPath);
+            mergeYamlFiles(templateLines, destPath, destPath);
-		}
+        }
-	}
+    }
 
-	public void mergeYamlFiles(List<String> templateLines, Path userFilePath, Path outputPath) throws IOException {
+    public void mergeYamlFiles(List<String> templateLines, Path userFilePath, Path outputPath)
-		List<String> userLines = Files.readAllLines(userFilePath);
+            throws IOException {
-		List<String> mergedLines = new ArrayList<>();
+        List<String> userLines = Files.readAllLines(userFilePath);
-		boolean insideAutoGenerated = false;
+        List<String> mergedLines = new ArrayList<>();
-		boolean beforeFirstKey = true;
+        boolean insideAutoGenerated = false;
+        boolean beforeFirstKey = true;
 
-		Function<String, Boolean> isCommented = line -> line.trim().startsWith("#");
+        Function<String, Boolean> isCommented = line -> line.trim().startsWith("#");
-		Function<String, String> extractKey = line -> {
+        Function<String, String> extractKey =
-			String[] parts = line.split(":");
+                line -> {
-			return parts.length > 0 ? parts[0].trim().replace("#", "").trim() : "";
+                    String[] parts = line.split(":");
-		};
+                    return parts.length > 0 ? parts[0].trim().replace("#", "").trim() : "";
+                };
 
-		Set<String> userKeys = userLines.stream().map(extractKey).collect(Collectors.toSet());
+        Set<String> userKeys = userLines.stream().map(extractKey).collect(Collectors.toSet());
 
-		for (String line : templateLines) {
+        for (String line : templateLines) {
-			String key = extractKey.apply(line);
+            String key = extractKey.apply(line);
 
-			if (line.trim().equalsIgnoreCase("AutomaticallyGenerated:")) {
+            if (line.trim().equalsIgnoreCase("AutomaticallyGenerated:")) {
-				insideAutoGenerated = true;
+                insideAutoGenerated = true;
-				mergedLines.add(line);
+                mergedLines.add(line);
-				continue;
+                continue;
-			} else if (insideAutoGenerated && line.trim().isEmpty()) {
+            } else if (insideAutoGenerated && line.trim().isEmpty()) {
-				insideAutoGenerated = false;
+                insideAutoGenerated = false;
-				mergedLines.add(line);
+                mergedLines.add(line);
-				continue;
+                continue;
-			}
+            }
 
-			if (beforeFirstKey && (isCommented.apply(line) || line.trim().isEmpty())) {
+            if (beforeFirstKey && (isCommented.apply(line) || line.trim().isEmpty())) {
-				// Handle top comments and empty lines before the first key.
+                // Handle top comments and empty lines before the first key.
-				mergedLines.add(line);
+                mergedLines.add(line);
-				continue;
+                continue;
-			}
+            }
 
-			if (!key.isEmpty())
+            if (!key.isEmpty()) beforeFirstKey = false;
-				beforeFirstKey = false;
 
-			if (userKeys.contains(key)) {
+            if (userKeys.contains(key)) {
-				// If user has any version (commented or uncommented) of this key, skip the
+                // If user has any version (commented or uncommented) of this key, skip the
-				// template line
+                // template line
-				Optional<String> userValue = userLines.stream()
+                Optional<String> userValue =
-						.filter(l -> extractKey.apply(l).equalsIgnoreCase(key) && !isCommented.apply(l)).findFirst();
+                        userLines.stream()
-				if (userValue.isPresent())
+                                .filter(
-					mergedLines.add(userValue.get());
+                                        l ->
-				continue;
+                                                extractKey.apply(l).equalsIgnoreCase(key)
-			}
+                                                        && !isCommented.apply(l))
+                                .findFirst();
+                if (userValue.isPresent()) mergedLines.add(userValue.get());
+                continue;
+            }
 
-			if (isCommented.apply(line) || line.trim().isEmpty() || !userKeys.contains(key)) {
+            if (isCommented.apply(line) || line.trim().isEmpty() || !userKeys.contains(key)) {
-				mergedLines.add(line); // If line is commented, empty or key not present in user's file, retain the
+                mergedLines.add(
-										// template line
+                        line); // If line is commented, empty or key not present in user's file,
-				continue;
+                // retain the
-			}
+                // template line
-		}
+                continue;
+            }
+        }
 
-		// Add any additional uncommented user lines that are not present in the
+        // Add any additional uncommented user lines that are not present in the
-		// template
+        // template
-		for (String userLine : userLines) {
+        for (String userLine : userLines) {
-			String userKey = extractKey.apply(userLine);
+            String userKey = extractKey.apply(userLine);
-			boolean isPresentInTemplate = templateLines.stream().map(extractKey)
+            boolean isPresentInTemplate =
-					.anyMatch(templateKey -> templateKey.equalsIgnoreCase(userKey));
+                    templateLines.stream()
-			if (!isPresentInTemplate && !isCommented.apply(userLine)) {
+                            .map(extractKey)
-				mergedLines.add(userLine);
+                            .anyMatch(templateKey -> templateKey.equalsIgnoreCase(userKey));
-			}
+            if (!isPresentInTemplate && !isCommented.apply(userLine)) {
-		}
+                mergedLines.add(userLine);
-
+            }
-		Files.write(outputPath, mergedLines, StandardCharsets.UTF_8);
+        }
-	}
 
+        Files.write(outputPath, mergedLines, StandardCharsets.UTF_8);
+    }
 }

src/main/java/stirling/software/SPDF/config/EndpointConfiguration.java

@@ -12,6 +12,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import stirling.software.SPDF.model.ApplicationProperties;
+
 @Service
 public class EndpointConfiguration {
     private static final Logger logger = LoggerFactory.getLogger(EndpointConfiguration.class);
@@ -28,14 +29,14 @@ public class EndpointConfiguration {
     }
 
     public void enableEndpoint(String endpoint) {
-    	endpointStatuses.put(endpoint, true);
+        endpointStatuses.put(endpoint, true);
     }
 
     public void disableEndpoint(String endpoint) {
-    	if(!endpointStatuses.containsKey(endpoint) || endpointStatuses.get(endpoint) !=  false) {
+        if (!endpointStatuses.containsKey(endpoint) || endpointStatuses.get(endpoint) != false) {
-	        logger.info("Disabling {}", endpoint);
+            logger.info("Disabling {}", endpoint);
-	        endpointStatuses.put(endpoint, false);
+            endpointStatuses.put(endpoint, false);
-    	}
+        }
     }
 
     public boolean isEndpointEnabled(String endpoint) {
@@ -85,7 +86,6 @@ public class EndpointConfiguration {
         addEndpointToGroup("PageOps", "overlay-pdf");
         addEndpointToGroup("PageOps", "split-pdf-by-sections");
 
-        
         // Adding endpoints to "Convert" group
         addEndpointToGroup("Convert", "pdf-to-img");
         addEndpointToGroup("Convert", "img-to-pdf");
@@ -102,7 +102,6 @@ public class EndpointConfiguration {
         addEndpointToGroup("Convert", "markdown-to-pdf");
         addEndpointToGroup("Convert", "pdf-to-csv");
 
-        
         // Adding endpoints to "Security" group
         addEndpointToGroup("Security", "add-password");
         addEndpointToGroup("Security", "remove-password");
@@ -112,7 +111,6 @@ public class EndpointConfiguration {
         addEndpointToGroup("Security", "sanitize-pdf");
         addEndpointToGroup("Security", "auto-redact");
 
-        
         // Adding endpoints to "Other" group
         addEndpointToGroup("Other", "ocr-pdf");
         addEndpointToGroup("Other", "add-image");
@@ -131,9 +129,7 @@ public class EndpointConfiguration {
         addEndpointToGroup("Other", "get-info-on-pdf");
         addEndpointToGroup("Other", "show-javascript");
 
-        
+        // CLI
-        
-        //CLI
         addEndpointToGroup("CLI", "compress-pdf");
         addEndpointToGroup("CLI", "extract-image-scans");
         addEndpointToGroup("CLI", "remove-blanks");
@@ -150,18 +146,17 @@ public class EndpointConfiguration {
         addEndpointToGroup("CLI", "html-to-pdf");
         addEndpointToGroup("CLI", "url-to-pdf");
 
-        
+        // python
-        //python
         addEndpointToGroup("Python", "extract-image-scans");
         addEndpointToGroup("Python", "remove-blanks");
         addEndpointToGroup("Python", "html-to-pdf");
         addEndpointToGroup("Python", "url-to-pdf");
 
-        //openCV
+        // openCV
         addEndpointToGroup("OpenCV", "extract-image-scans");
         addEndpointToGroup("OpenCV", "remove-blanks");
 
-        //LibreOffice
+        // LibreOffice
         addEndpointToGroup("LibreOffice", "repair");
         addEndpointToGroup("LibreOffice", "file-to-pdf");
         addEndpointToGroup("LibreOffice", "xlsx-to-pdf");
@@ -171,13 +166,12 @@ public class EndpointConfiguration {
         addEndpointToGroup("LibreOffice", "pdf-to-html");
         addEndpointToGroup("LibreOffice", "pdf-to-xml");
 
-        
+        // OCRmyPDF
-        //OCRmyPDF
         addEndpointToGroup("OCRmyPDF", "compress-pdf");
         addEndpointToGroup("OCRmyPDF", "pdf-to-pdfa");
         addEndpointToGroup("OCRmyPDF", "ocr-pdf");
 
-        //Java
+        // Java
         addEndpointToGroup("Java", "merge-pdfs");
         addEndpointToGroup("Java", "remove-pages");
         addEndpointToGroup("Java", "split-pdfs");
@@ -211,13 +205,11 @@ public class EndpointConfiguration {
         addEndpointToGroup("Java", "overlay-pdf");
         addEndpointToGroup("Java", "split-pdf-by-sections");
 
-        //Javascript
+        // Javascript
         addEndpointToGroup("Javascript", "pdf-organizer");
         addEndpointToGroup("Javascript", "sign");
         addEndpointToGroup("Javascript", "compare");
         addEndpointToGroup("Javascript", "adjust-contrast");
-        
-        
     }
 
     private void processEnvironmentConfigs() {
@@ -236,6 +228,4 @@ public class EndpointConfiguration {
             }
         }
     }
-
 }
-

src/main/java/stirling/software/SPDF/config/EndpointInterceptor.java

@@ -10,11 +10,11 @@ import jakarta.servlet.http.HttpServletResponse;
 @Component
 public class EndpointInterceptor implements HandlerInterceptor {
 
-    @Autowired
+    @Autowired private EndpointConfiguration endpointConfiguration;
-    private EndpointConfiguration endpointConfiguration;
 
     @Override
-    public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler)
+    public boolean preHandle(
+            HttpServletRequest request, HttpServletResponse response, Object handler)
             throws Exception {
         String requestURI = request.getRequestURI();
         if (!endpointConfiguration.isEndpointEnabled(requestURI)) {

src/main/java/stirling/software/SPDF/config/MetricsConfig.java

@@ -1,4 +1,5 @@
 package stirling.software.SPDF.config;
+
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 

src/main/java/stirling/software/SPDF/config/MetricsFilter.java

@@ -8,6 +8,7 @@ import org.springframework.web.filter.OncePerRequestFilter;
 
 import io.micrometer.core.instrument.Counter;
 import io.micrometer.core.instrument.MeterRegistry;
+
 import jakarta.servlet.FilterChain;
 import jakarta.servlet.ServletException;
 import jakarta.servlet.http.HttpServletRequest;
@@ -16,35 +17,48 @@ import jakarta.servlet.http.HttpServletResponse;
 @Component
 public class MetricsFilter extends OncePerRequestFilter {
 
-	private final MeterRegistry meterRegistry;
+    private final MeterRegistry meterRegistry;
 
-	@Autowired
+    @Autowired
-	public MetricsFilter(MeterRegistry meterRegistry) {
+    public MetricsFilter(MeterRegistry meterRegistry) {
-		this.meterRegistry = meterRegistry;
+        this.meterRegistry = meterRegistry;
-	}
+    }
 
-	@Override
+    @Override
-	protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain filterChain)
+    protected void doFilterInternal(
-			throws ServletException, IOException {
+            HttpServletRequest request, HttpServletResponse response, FilterChain filterChain)
-		String uri = request.getRequestURI();
+            throws ServletException, IOException {
+        String uri = request.getRequestURI();
 
-		// System.out.println("uri="+uri + ", method=" + request.getMethod() );
+        // System.out.println("uri="+uri + ", method=" + request.getMethod() );
-		// Ignore static resources
+        // Ignore static resources
-		if (!(uri.startsWith("/js") || uri.startsWith("/v1/api-docs") || uri.endsWith("robots.txt")
+        if (!(uri.startsWith("/js")
-				|| uri.startsWith("/images")  || uri.startsWith("/images")|| uri.endsWith(".png") || uri.endsWith(".ico") || uri.endsWith(".css") || uri.endsWith(".map")
+                || uri.startsWith("/v1/api-docs")
-				|| uri.endsWith(".svg") || uri.endsWith(".js") || uri.contains("swagger")
+                || uri.endsWith("robots.txt")
-				|| uri.startsWith("/api/v1/info") || uri.startsWith("/site.webmanifest")  || uri.startsWith("/fonts") || uri.startsWith("/pdfjs") )) {
+                || uri.startsWith("/images")
+                || uri.startsWith("/images")
+                || uri.endsWith(".png")
+                || uri.endsWith(".ico")
+                || uri.endsWith(".css")
+                || uri.endsWith(".map")
+                || uri.endsWith(".svg")
+                || uri.endsWith(".js")
+                || uri.contains("swagger")
+                || uri.startsWith("/api/v1/info")
+                || uri.startsWith("/site.webmanifest")
+                || uri.startsWith("/fonts")
+                || uri.startsWith("/pdfjs"))) {
 
+            Counter counter =
+                    Counter.builder("http.requests")
+                            .tag("uri", uri)
+                            .tag("method", request.getMethod())
+                            .register(meterRegistry);
 
+            counter.increment();
+            // System.out.println("Counted");
+        }
 
-			Counter counter = Counter.builder("http.requests").tag("uri", uri).tag("method", request.getMethod())
+        filterChain.doFilter(request, response);
-					.register(meterRegistry);
+    }
-
-			counter.increment();
-			// System.out.println("Counted");
-		}
-
-		filterChain.doFilter(request, response);
-	}
-
 }

src/main/java/stirling/software/SPDF/config/OpenApiConfig.java

@@ -9,34 +9,45 @@ import io.swagger.v3.oas.models.OpenAPI;
 import io.swagger.v3.oas.models.info.Info;
 import io.swagger.v3.oas.models.security.SecurityRequirement;
 import io.swagger.v3.oas.models.security.SecurityScheme;
+
 import stirling.software.SPDF.model.ApplicationProperties;
 
 @Configuration
 public class OpenApiConfig {
 
-	@Autowired
+    @Autowired ApplicationProperties applicationProperties;
-	ApplicationProperties applicationProperties;
 
-	@Bean
+    @Bean
-	public OpenAPI customOpenAPI() {
+    public OpenAPI customOpenAPI() {
-		String version = getClass().getPackage().getImplementationVersion();
+        String version = getClass().getPackage().getImplementationVersion();
-		if (version == null) {
+        if (version == null) {
-			version = "1.0.0"; // default version if all else fails
+            version = "1.0.0"; // default version if all else fails
-		}
+        }
-
-		SecurityScheme apiKeyScheme = new SecurityScheme().type(SecurityScheme.Type.APIKEY).in(SecurityScheme.In.HEADER)
-				.name("X-API-KEY");
-		if (!applicationProperties.getSecurity().getEnableLogin()) {
-			return new OpenAPI().components(new Components())
-					.info(new Info().title("Stirling PDF API").version(version).description(
-							"API documentation for all Server-Side processing.\nPlease note some functionality might be UI only and missing from here."));
-		} else {
-			return new OpenAPI().components(new Components().addSecuritySchemes("apiKey", apiKeyScheme))
-					.info(new Info().title("Stirling PDF API").version(version).description(
-							"API documentation for all Server-Side processing.\nPlease note some functionality might be UI only and missing from here."))
-					.addSecurityItem(new SecurityRequirement().addList("apiKey"));
-		}
-
-	}
 
+        SecurityScheme apiKeyScheme =
+                new SecurityScheme()
+                        .type(SecurityScheme.Type.APIKEY)
+                        .in(SecurityScheme.In.HEADER)
+                        .name("X-API-KEY");
+        if (!applicationProperties.getSecurity().getEnableLogin()) {
+            return new OpenAPI()
+                    .components(new Components())
+                    .info(
+                            new Info()
+                                    .title("Stirling PDF API")
+                                    .version(version)
+                                    .description(
+                                            "API documentation for all Server-Side processing.\nPlease note some functionality might be UI only and missing from here."));
+        } else {
+            return new OpenAPI()
+                    .components(new Components().addSecuritySchemes("apiKey", apiKeyScheme))
+                    .info(
+                            new Info()
+                                    .title("Stirling PDF API")
+                                    .version(version)
+                                    .description(
+                                            "API documentation for all Server-Side processing.\nPlease note some functionality might be UI only and missing from here."))
+                    .addSecurityItem(new SecurityRequirement().addList("apiKey"));
+        }
+    }
 }

src/main/java/stirling/software/SPDF/config/StartupApplicationListener.java

@@ -1,6 +1,5 @@
 package stirling.software.SPDF.config;
 
-
 import java.time.LocalDateTime;
 
 import org.springframework.context.ApplicationListener;
@@ -17,4 +16,3 @@ public class StartupApplicationListener implements ApplicationListener<ContextRe
         startTime = LocalDateTime.now();
     }
 }
- 

src/main/java/stirling/software/SPDF/config/WebMvcConfig.java

@@ -9,8 +9,7 @@ import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 @Configuration
 public class WebMvcConfig implements WebMvcConfigurer {
 
-    @Autowired
+    @Autowired private EndpointInterceptor endpointInterceptor;
-    private EndpointInterceptor endpointInterceptor;
 
     @Override
     public void addInterceptors(InterceptorRegistry registry) {
@@ -22,6 +21,6 @@ public class WebMvcConfig implements WebMvcConfigurer {
         // Handler for external static resources
         registry.addResourceHandler("/**")
                 .addResourceLocations("file:customFiles/static/", "classpath:/static/");
-                //.setCachePeriod(0); // Optional: disable caching
+        // .setCachePeriod(0); // Optional: disable caching
     }
 }

src/main/java/stirling/software/SPDF/config/YamlPropertySourceFactory.java

@@ -8,16 +8,18 @@ import org.springframework.core.env.PropertiesPropertySource;
 import org.springframework.core.env.PropertySource;
 import org.springframework.core.io.support.EncodedResource;
 import org.springframework.core.io.support.PropertySourceFactory;
+
 public class YamlPropertySourceFactory implements PropertySourceFactory {
 
     @Override
     public PropertySource<?> createPropertySource(String name, EncodedResource encodedResource)
-      throws IOException {
+            throws IOException {
         YamlPropertiesFactoryBean factory = new YamlPropertiesFactoryBean();
         factory.setResources(encodedResource.getResource());
 
         Properties properties = factory.getObject();
 
-        return new PropertiesPropertySource(encodedResource.getResource().getFilename(), properties);
+        return new PropertiesPropertySource(
+                encodedResource.getResource().getFilename(), properties);
     }
 }

src/main/java/stirling/software/SPDF/config/security/CustomAuthenticationFailureHandler.java

@@ -12,11 +12,11 @@ import org.springframework.stereotype.Component;
 import jakarta.servlet.ServletException;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
+
 @Component
 public class CustomAuthenticationFailureHandler extends SimpleUrlAuthenticationFailureHandler {
 
-	@Autowired
+    @Autowired private final LoginAttemptService loginAttemptService;
-	private final LoginAttemptService loginAttemptService;
 
     @Autowired
     public CustomAuthenticationFailureHandler(LoginAttemptService loginAttemptService) {
@@ -24,24 +24,26 @@ public class CustomAuthenticationFailureHandler extends SimpleUrlAuthenticationF
     }
 
     @Override
-    public void onAuthenticationFailure(HttpServletRequest request, HttpServletResponse response, AuthenticationException exception) 
+    public void onAuthenticationFailure(
-      throws IOException, ServletException {
+            HttpServletRequest request,
-    	String ip = request.getRemoteAddr();
+            HttpServletResponse response,
+            AuthenticationException exception)
+            throws IOException, ServletException {
+        String ip = request.getRemoteAddr();
         logger.error("Failed login attempt from IP: " + ip);
 
         String username = request.getParameter("username");
-        if(loginAttemptService.loginAttemptCheck(username)) {
+        if (loginAttemptService.loginAttemptCheck(username)) {
-        	setDefaultFailureUrl("/login?error=locked");
+            setDefaultFailureUrl("/login?error=locked");
 
         } else {
-	        if (exception.getClass().isAssignableFrom(BadCredentialsException.class)) {
+            if (exception.getClass().isAssignableFrom(BadCredentialsException.class)) {
-	        	setDefaultFailureUrl("/login?error=badcredentials");
+                setDefaultFailureUrl("/login?error=badcredentials");
-	        } else if (exception.getClass().isAssignableFrom(LockedException.class)) {
+            } else if (exception.getClass().isAssignableFrom(LockedException.class)) {
-	        	setDefaultFailureUrl("/login?error=locked");
+                setDefaultFailureUrl("/login?error=locked");
-	        }
+            }
         }
 
-        
         super.onAuthenticationFailure(request, response, exception);
     }
 }

src/main/java/stirling/software/SPDF/config/security/CustomAuthenticationSuccessHandler.java

@@ -15,21 +15,26 @@ import jakarta.servlet.http.HttpSession;
 import stirling.software.SPDF.utils.RequestUriUtils;
 
 @Component
-public class CustomAuthenticationSuccessHandler extends SavedRequestAwareAuthenticationSuccessHandler {
+public class CustomAuthenticationSuccessHandler
+        extends SavedRequestAwareAuthenticationSuccessHandler {
 
-    @Autowired
+    @Autowired private LoginAttemptService loginAttemptService;
-    private LoginAttemptService loginAttemptService;
 
     @Override
-    public void onAuthenticationSuccess(HttpServletRequest request, HttpServletResponse response, Authentication authentication) throws ServletException, IOException {
+    public void onAuthenticationSuccess(
-    	String username = request.getParameter("username");
+            HttpServletRequest request, HttpServletResponse response, Authentication authentication)
+            throws ServletException, IOException {
+        String username = request.getParameter("username");
         loginAttemptService.loginSucceeded(username);
 
-        
         // Get the saved request
         HttpSession session = request.getSession(false);
-        SavedRequest savedRequest = session != null ? (SavedRequest) session.getAttribute("SPRING_SECURITY_SAVED_REQUEST") : null;
+        SavedRequest savedRequest =
-        if (savedRequest != null && !RequestUriUtils.isStaticResource(savedRequest.getRedirectUrl())) {
+                session != null
+                        ? (SavedRequest) session.getAttribute("SPRING_SECURITY_SAVED_REQUEST")
+                        : null;
+        if (savedRequest != null
+                && !RequestUriUtils.isStaticResource(savedRequest.getRedirectUrl())) {
             // Redirect to the original destination
             super.onAuthenticationSuccess(request, response, authentication);
         } else {
@@ -37,8 +42,6 @@ public class CustomAuthenticationSuccessHandler extends SavedRequestAwareAuthent
             getRedirectStrategy().sendRedirect(request, response, "/");
         }
 
-        //super.onAuthenticationSuccess(request, response, authentication);
+        // super.onAuthenticationSuccess(request, response, authentication);
     }
-
-    
 }

src/main/java/stirling/software/SPDF/config/security/CustomUserDetailsService.java

@@ -20,33 +20,38 @@ import stirling.software.SPDF.repository.UserRepository;
 @Service
 public class CustomUserDetailsService implements UserDetailsService {
 
-    @Autowired
+    @Autowired private UserRepository userRepository;
-    private UserRepository userRepository;
 
-    @Autowired
+    @Autowired private LoginAttemptService loginAttemptService;
-    private LoginAttemptService loginAttemptService;
 
     @Override
     public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException {
-        User user = userRepository.findByUsername(username)
+        User user =
-            .orElseThrow(() -> new UsernameNotFoundException("No user found with username: " + username));
+                userRepository
+                        .findByUsername(username)
+                        .orElseThrow(
+                                () ->
+                                        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.");
+            throw new LockedException(
+                    "Your account has been locked due to too many failed login attempts.");
         }
 
         return new org.springframework.security.core.userdetails.User(
-            user.getUsername(),
+                user.getUsername(),
-            user.getPassword(),
+                user.getPassword(),
-            user.isEnabled(),
+                user.isEnabled(),
-            true, true, true,
+                true,
-            getAuthorities(user.getAuthorities())
+                true,
-        );
+                true,
+                getAuthorities(user.getAuthorities()));
     }
 
     private Collection<? extends GrantedAuthority> getAuthorities(Set<Authority> authorities) {
         return authorities.stream()
-            .map(authority -> new SimpleGrantedAuthority(authority.getAuthority()))
+                .map(authority -> new SimpleGrantedAuthority(authority.getAuthority()))
-            .collect(Collectors.toList());
+                .collect(Collectors.toList());
     }
 }

src/main/java/stirling/software/SPDF/config/security/FirstLoginFilter.java

@@ -20,15 +20,15 @@ import stirling.software.SPDF.utils.RequestUriUtils;
 @Component
 public class FirstLoginFilter extends OncePerRequestFilter {
 
-    @Autowired
+    @Autowired @Lazy private UserService userService;
-    @Lazy
-    private UserService userService;
 
     @Override
-    protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain filterChain) throws ServletException, IOException {
+    protected void doFilterInternal(
-    	String method = request.getMethod();
+            HttpServletRequest request, HttpServletResponse response, FilterChain filterChain)
-    	String requestURI = request.getRequestURI(); 
+            throws ServletException, IOException {
-    	 // Check if the request is for static resources
+        String method = request.getMethod();
+        String requestURI = request.getRequestURI();
+        // Check if the request is for static resources
         boolean isStaticResource = RequestUriUtils.isStaticResource(requestURI);
 
         // If it's a static resource, just continue the filter chain and skip the logic below
@@ -40,7 +40,10 @@ public class FirstLoginFilter extends OncePerRequestFilter {
         Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
         if (authentication != null && authentication.isAuthenticated()) {
             Optional<User> user = userService.findByUsername(authentication.getName());
-            if ("GET".equalsIgnoreCase(method) && user.isPresent() && user.get().isFirstLogin() && !"/change-creds".equals(requestURI)) {
+            if ("GET".equalsIgnoreCase(method)
+                    && user.isPresent()
+                    && user.get().isFirstLogin()
+                    && !"/change-creds".equals(requestURI)) {
                 response.sendRedirect("/change-creds");
                 return;
             }

src/main/java/stirling/software/SPDF/config/security/IPRateLimitingFilter.java

@@ -1,4 +1,5 @@
 package stirling.software.SPDF.config.security;
+
 import java.io.IOException;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.atomic.AtomicInteger;
@@ -13,7 +14,8 @@ import stirling.software.SPDF.utils.RequestUriUtils;
 
 public class IPRateLimitingFilter implements Filter {
 
-    private final ConcurrentHashMap<String, AtomicInteger> requestCounts = new ConcurrentHashMap<>();
+    private final ConcurrentHashMap<String, AtomicInteger> requestCounts =
+            new ConcurrentHashMap<>();
     private final ConcurrentHashMap<String, AtomicInteger> getCounts = new ConcurrentHashMap<>();
     private final int maxRequests;
     private final int maxGetRequests;
@@ -24,38 +26,39 @@ public class IPRateLimitingFilter implements Filter {
     }
 
     @Override
-    public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException {
+    public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain)
-    	if (request instanceof HttpServletRequest) {
+            throws IOException, ServletException {
-	    	HttpServletRequest httpRequest = (HttpServletRequest) request;
+        if (request instanceof HttpServletRequest) {
-	        String method = httpRequest.getMethod();
+            HttpServletRequest httpRequest = (HttpServletRequest) request;
-	        String requestURI = httpRequest.getRequestURI(); 
+            String method = httpRequest.getMethod();
-	    	 // Check if the request is for static resources
+            String requestURI = httpRequest.getRequestURI();
-	        boolean isStaticResource = RequestUriUtils.isStaticResource(requestURI);
+            // Check if the request is for static resources
+            boolean isStaticResource = RequestUriUtils.isStaticResource(requestURI);
 
-	        // If it's a static resource, just continue the filter chain and skip the logic below
+            // If it's a static resource, just continue the filter chain and skip the logic below
-	        if (isStaticResource) {
+            if (isStaticResource) {
-	        	chain.doFilter(request, response);
+                chain.doFilter(request, response);
-	            return;
+                return;
-	        }
+            }
 
-	        String clientIp = request.getRemoteAddr();
+            String clientIp = request.getRemoteAddr();
-	        requestCounts.computeIfAbsent(clientIp, k -> new AtomicInteger(0));
+            requestCounts.computeIfAbsent(clientIp, k -> new AtomicInteger(0));
-	        if (!"GET".equalsIgnoreCase(method)) {
+            if (!"GET".equalsIgnoreCase(method)) {
 
-		        if (requestCounts.get(clientIp).incrementAndGet() > maxRequests) {
+                if (requestCounts.get(clientIp).incrementAndGet() > maxRequests) {
-		            // Handle limit exceeded (e.g., send error response)
+                    // Handle limit exceeded (e.g., send error response)
-		            response.getWriter().write("Rate limit exceeded");
+                    response.getWriter().write("Rate limit exceeded");
-		            return;
+                    return;
-		        }
+                }
-	        } else {
+            } else {
-	        	if (requestCounts.get(clientIp).incrementAndGet() > maxGetRequests) {
+                if (requestCounts.get(clientIp).incrementAndGet() > maxGetRequests) {
-		            // Handle limit exceeded (e.g., send error response)
+                    // Handle limit exceeded (e.g., send error response)
-		            response.getWriter().write("GET Rate limit exceeded");
+                    response.getWriter().write("GET Rate limit exceeded");
-		            return;
+                    return;
-		        }
+                }
-	        }
+            }
-    	}
+        }
-    	 chain.doFilter(request, response);
+        chain.doFilter(request, response);
     }
 
     public void resetRequestCounts() {

src/main/java/stirling/software/SPDF/config/security/InitialSecuritySetup.java

@@ -13,75 +13,76 @@ import org.springframework.stereotype.Component;
 import jakarta.annotation.PostConstruct;
 import stirling.software.SPDF.model.ApplicationProperties;
 import stirling.software.SPDF.model.Role;
+
 @Component
 public class InitialSecuritySetup {
 
-	@Autowired
+    @Autowired private UserService userService;
-	private UserService userService;
 
+    @Autowired ApplicationProperties applicationProperties;
 
-	@Autowired
+    @PostConstruct
-	ApplicationProperties applicationProperties;
+    public void init() {
+        if (!userService.hasUsers()) {
 
-	@PostConstruct
+            String initialUsername =
-	public void init() {
+                    applicationProperties.getSecurity().getInitialLogin().getUsername();
-		if (!userService.hasUsers()) {
+            String initialPassword =
+                    applicationProperties.getSecurity().getInitialLogin().getPassword();
+            if (initialUsername != null && initialPassword != null) {
+                userService.saveUser(initialUsername, initialPassword, Role.ADMIN.getRoleId());
+            } else {
+                initialUsername = "admin";
+                initialPassword = "stirling";
+                userService.saveUser(
+                        initialUsername, initialPassword, Role.ADMIN.getRoleId(), true);
+            }
+        }
+        if (!userService.usernameExists(Role.INTERNAL_API_USER.getRoleId())) {
+            userService.saveUser(
+                    Role.INTERNAL_API_USER.getRoleId(),
+                    UUID.randomUUID().toString(),
+                    Role.INTERNAL_API_USER.getRoleId());
+            userService.addApiKeyToUser(Role.INTERNAL_API_USER.getRoleId());
+        }
+    }
 
+    @PostConstruct
+    public void initSecretKey() throws IOException {
+        String secretKey = applicationProperties.getAutomaticallyGenerated().getKey();
+        if (secretKey == null || secretKey.isEmpty()) {
+            secretKey = UUID.randomUUID().toString(); // Generating a random UUID as the secret key
+            saveKeyToConfig(secretKey);
+        }
+    }
 
-			String initialUsername = applicationProperties.getSecurity().getInitialLogin().getUsername();
+    private void saveKeyToConfig(String key) throws IOException {
-			String initialPassword = applicationProperties.getSecurity().getInitialLogin().getPassword();
+        Path path = Paths.get("configs", "settings.yml"); // Target the configs/settings.yml
-			if (initialUsername != null && initialPassword != null) {
+        List<String> lines = Files.readAllLines(path);
-				userService.saveUser(initialUsername, initialPassword, Role.ADMIN.getRoleId());
+        boolean keyFound = false;
-			} else {
-				initialUsername = "admin";
-			    initialPassword = "stirling";
-				userService.saveUser(initialUsername, initialPassword, Role.ADMIN.getRoleId(), true);
-			}
-		}
-		if(!userService.usernameExists(Role.INTERNAL_API_USER.getRoleId())) {
-			userService.saveUser(Role.INTERNAL_API_USER.getRoleId(), UUID.randomUUID().toString(), Role.INTERNAL_API_USER.getRoleId());
-			userService.addApiKeyToUser(Role.INTERNAL_API_USER.getRoleId());
-		}
-	}
 
+        // Search for the existing key to replace it or place to add it
+        for (int i = 0; i < lines.size(); i++) {
+            if (lines.get(i).startsWith("AutomaticallyGenerated:")) {
+                keyFound = true;
+                if (i + 1 < lines.size() && lines.get(i + 1).trim().startsWith("key:")) {
+                    lines.set(i + 1, "  key: " + key);
+                    break;
+                } else {
+                    lines.add(i + 1, "  key: " + key);
+                    break;
+                }
+            }
+        }
 
+        // If the section doesn't exist, append it
+        if (!keyFound) {
+            lines.add("# Automatically Generated Settings (Do Not Edit Directly)");
+            lines.add("AutomaticallyGenerated:");
+            lines.add("  key: " + key);
+        }
 
-	@PostConstruct
+        // Write back to the file
-	public void initSecretKey() throws IOException {
+        Files.write(path, lines);
-		String secretKey = applicationProperties.getAutomaticallyGenerated().getKey();
+    }
-		if (secretKey == null || secretKey.isEmpty()) {
-			secretKey = UUID.randomUUID().toString(); // Generating a random UUID as the secret key
-			saveKeyToConfig(secretKey);
-		}
-	}
-
-	private void saveKeyToConfig(String key) throws IOException {
-		Path path = Paths.get("configs", "settings.yml"); // Target the configs/settings.yml
-		List<String> lines = Files.readAllLines(path);
-		boolean keyFound = false;
-
-		// Search for the existing key to replace it or place to add it
-		for (int i = 0; i < lines.size(); i++) {
-			if (lines.get(i).startsWith("AutomaticallyGenerated:")) {
-				keyFound = true;
-				if (i + 1 < lines.size() && lines.get(i + 1).trim().startsWith("key:")) {
-					lines.set(i + 1, "  key: " + key);
-					break;
-				} else {
-					lines.add(i + 1, "  key: " + key);
-					break;
-				}
-			}
-		}
-
-		// If the section doesn't exist, append it
-		if (!keyFound) {
-			lines.add("# Automatically Generated Settings (Do Not Edit Directly)");
-			lines.add("AutomaticallyGenerated:");
-			lines.add("  key: " + key);
-		}
-
-		// Write back to the file
-		Files.write(path, lines);
-	}
 }

src/main/java/stirling/software/SPDF/config/security/LoginAttemptService.java

@@ -1,4 +1,5 @@
 package stirling.software.SPDF.config.security;
+
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.TimeUnit;
 
@@ -12,39 +13,41 @@ import stirling.software.SPDF.model.AttemptCounter;
 @Service
 public class LoginAttemptService {
 
-	
+    @Autowired ApplicationProperties applicationProperties;
-	@Autowired
-	ApplicationProperties applicationProperties;
 
     private int MAX_ATTEMPTS;
     private long ATTEMPT_INCREMENT_TIME;
 
-    
     @PostConstruct
     public void init() {
-    	MAX_ATTEMPTS = applicationProperties.getSecurity().getLoginAttemptCount();
+        MAX_ATTEMPTS = applicationProperties.getSecurity().getLoginAttemptCount();
-    	ATTEMPT_INCREMENT_TIME = TimeUnit.MINUTES.toMillis(applicationProperties.getSecurity().getLoginResetTimeMinutes());
+        ATTEMPT_INCREMENT_TIME =
+                TimeUnit.MINUTES.toMillis(
+                        applicationProperties.getSecurity().getLoginResetTimeMinutes());
     }
 
-    private final ConcurrentHashMap<String, AttemptCounter> attemptsCache = new ConcurrentHashMap<>();
+    private final ConcurrentHashMap<String, AttemptCounter> attemptsCache =
+            new ConcurrentHashMap<>();
 
     public void loginSucceeded(String key) {
         attemptsCache.remove(key);
     }
 
     public boolean loginAttemptCheck(String key) {
-        attemptsCache.compute(key, (k, attemptCounter) -> {
+        attemptsCache.compute(
-            if (attemptCounter == null || attemptCounter.shouldReset(ATTEMPT_INCREMENT_TIME)) {
+                key,
-                return new AttemptCounter();
+                (k, attemptCounter) -> {
-            } else {
+                    if (attemptCounter == null
-                attemptCounter.increment();
+                            || attemptCounter.shouldReset(ATTEMPT_INCREMENT_TIME)) {
-                return attemptCounter;
+                        return new AttemptCounter();
-            }
+                    } else {
-        });
+                        attemptCounter.increment();
+                        return attemptCounter;
+                    }
+                });
         return attemptsCache.get(key).getAttemptCount() >= MAX_ATTEMPTS;
     }
 
-
     public boolean isBlocked(String key) {
         AttemptCounter attemptCounter = attemptsCache.get(key);
         if (attemptCounter != null) {
@@ -52,5 +55,4 @@ public class LoginAttemptService {
         }
         return false;
     }
-
 }

src/main/java/stirling/software/SPDF/config/security/RateLimitResetScheduler.java

@@ -1,4 +1,5 @@
 package stirling.software.SPDF.config.security;
+
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 

src/main/java/stirling/software/SPDF/config/security/SecurityConfiguration.java

@@ -19,104 +19,112 @@ import org.springframework.security.web.savedrequest.NullRequestCache;
 import org.springframework.security.web.util.matcher.AntPathRequestMatcher;
 
 import stirling.software.SPDF.repository.JPATokenRepositoryImpl;
+
 @Configuration
 @EnableWebSecurity()
 @EnableMethodSecurity
 public class SecurityConfiguration {
 
-    @Autowired
+    @Autowired private UserDetailsService userDetailsService;
-    private UserDetailsService userDetailsService;
 
     @Bean
     public PasswordEncoder passwordEncoder() {
         return new BCryptPasswordEncoder();
     }
-    @Autowired
+
-    @Lazy
+    @Autowired @Lazy private UserService userService;
-    private UserService userService;
 
     @Autowired
     @Qualifier("loginEnabled")
     public boolean loginEnabledValue;
 
-    @Autowired
+    @Autowired private UserAuthenticationFilter userAuthenticationFilter;
-    private UserAuthenticationFilter userAuthenticationFilter;
 
+    @Autowired private LoginAttemptService loginAttemptService;
 
-
+    @Autowired private FirstLoginFilter firstLoginFilter;
-    @Autowired
-    private  LoginAttemptService loginAttemptService;
-    
-    @Autowired
-    private FirstLoginFilter firstLoginFilter;
 
     @Bean
-    public SecurityFilterChain filterChain(HttpSecurity http) throws Exception  {
+    public SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
-    	http.addFilterBefore(userAuthenticationFilter, UsernamePasswordAuthenticationFilter.class);
+        http.addFilterBefore(userAuthenticationFilter, UsernamePasswordAuthenticationFilter.class);
 
-    	if(loginEnabledValue) {
+        if (loginEnabledValue) {
 
-    		http.csrf(csrf -> csrf.disable());
+            http.csrf(csrf -> csrf.disable());
-    		http.addFilterBefore(rateLimitingFilter(), UsernamePasswordAuthenticationFilter.class);
+            http.addFilterBefore(rateLimitingFilter(), UsernamePasswordAuthenticationFilter.class);
-    		http.addFilterAfter(firstLoginFilter, UsernamePasswordAuthenticationFilter.class);
+            http.addFilterAfter(firstLoginFilter, UsernamePasswordAuthenticationFilter.class);
-	        http
+            http.formLogin(
-	            .formLogin(formLogin -> formLogin
+                            formLogin ->
-	                .loginPage("/login")
+                                    formLogin
-	                .successHandler(new CustomAuthenticationSuccessHandler())
+                                            .loginPage("/login")
-	                .defaultSuccessUrl("/")
+                                            .successHandler(
-	                .failureHandler(new CustomAuthenticationFailureHandler(loginAttemptService))
+                                                    new CustomAuthenticationSuccessHandler())
-	                .permitAll()
+                                            .defaultSuccessUrl("/")
-	            ).requestCache(requestCache -> requestCache
+                                            .failureHandler(
-	                    .requestCache(new NullRequestCache())
+                                                    new CustomAuthenticationFailureHandler(
-	            	    )
+                                                            loginAttemptService))
-	            .logout(logout -> logout
+                                            .permitAll())
-	            		.logoutRequestMatcher(new AntPathRequestMatcher("/logout"))
+                    .requestCache(requestCache -> requestCache.requestCache(new NullRequestCache()))
-	                    .logoutSuccessUrl("/login?logout=true")
+                    .logout(
-	                    .invalidateHttpSession(true)        // Invalidate session
+                            logout ->
-	                    .deleteCookies("JSESSIONID", "remember-me") 
+                                    logout.logoutRequestMatcher(
-	            ).rememberMe(rememberMeConfigurer -> rememberMeConfigurer // Use the configurator directly
+                                                    new AntPathRequestMatcher("/logout"))
-                    .key("uniqueAndSecret")
+                                            .logoutSuccessUrl("/login?logout=true")
-                    .tokenRepository(persistentTokenRepository())
+                                            .invalidateHttpSession(true) // Invalidate session
-                    .tokenValiditySeconds(1209600) // 2 weeks
+                                            .deleteCookies("JSESSIONID", "remember-me"))
-                )
+                    .rememberMe(
-	            .authorizeHttpRequests(authz -> authz
+                            rememberMeConfigurer ->
-	                    .requestMatchers(req ->  {
+                                    rememberMeConfigurer // Use the configurator directly
-	                        String uri = req.getRequestURI();
+                                            .key("uniqueAndSecret")
-	                        String contextPath = req.getContextPath();
+                                            .tokenRepository(persistentTokenRepository())
+                                            .tokenValiditySeconds(1209600) // 2 weeks
+                            )
+                    .authorizeHttpRequests(
+                            authz ->
+                                    authz.requestMatchers(
+                                                    req -> {
+                                                        String uri = req.getRequestURI();
+                                                        String contextPath = req.getContextPath();
 
-	                        // Remove the context path from the URI
+                                                        // Remove the context path from the URI
-	                        String trimmedUri = uri.startsWith(contextPath) ? uri.substring(contextPath.length()) : uri;
+                                                        String trimmedUri =
+                                                                uri.startsWith(contextPath)
+                                                                        ? uri.substring(
+                                                                                contextPath
+                                                                                        .length())
+                                                                        : uri;
+
+                                                        return trimmedUri.startsWith("/login")
+                                                                || trimmedUri.endsWith(".svg")
+                                                                || trimmedUri.startsWith(
+                                                                        "/register")
+                                                                || trimmedUri.startsWith("/error")
+                                                                || trimmedUri.startsWith("/images/")
+                                                                || trimmedUri.startsWith("/public/")
+                                                                || trimmedUri.startsWith("/css/")
+                                                                || trimmedUri.startsWith("/js/")
+                                                                || trimmedUri.startsWith(
+                                                                        "/api/v1/info/status");
+                                                    })
+                                            .permitAll()
+                                            .anyRequest()
+                                            .authenticated())
+                    .userDetailsService(userDetailsService)
+                    .authenticationProvider(authenticationProvider());
+        } else {
+            http.csrf(csrf -> csrf.disable())
+                    .authorizeHttpRequests(authz -> authz.anyRequest().permitAll());
+        }
 
-	                        return trimmedUri.startsWith("/login") || trimmedUri.endsWith(".svg") || 
-	                               trimmedUri.startsWith("/register") || trimmedUri.startsWith("/error") || 
-	                               trimmedUri.startsWith("/images/") || trimmedUri.startsWith("/public/") || 
-	                               trimmedUri.startsWith("/css/") || trimmedUri.startsWith("/js/");
-	                    }
-	                    ).permitAll()
-	                    .anyRequest().authenticated()
-	                )
-	            .userDetailsService(userDetailsService)
-	            .authenticationProvider(authenticationProvider());
-    	} else {
-    		 http.csrf(csrf -> csrf.disable())
-             .authorizeHttpRequests(authz -> authz
-                 .anyRequest().permitAll()
-             );
-    	}
         return http.build();
     }
 
-    
-
-    
     @Bean
     public IPRateLimitingFilter rateLimitingFilter() {
         int maxRequestsPerIp = 1000000; // Example limit TODO add config level
         return new IPRateLimitingFilter(maxRequestsPerIp, maxRequestsPerIp);
     }
 
- 
-    
     @Bean
     public DaoAuthenticationProvider authenticationProvider() {
         DaoAuthenticationProvider authProvider = new DaoAuthenticationProvider();
@@ -129,8 +137,4 @@ public class SecurityConfiguration {
     public PersistentTokenRepository persistentTokenRepository() {
         return new JPATokenRepositoryImpl();
     }
-    
-
-    
 }
-

src/main/java/stirling/software/SPDF/config/security/UserAuthenticationFilter.java

@@ -19,25 +19,22 @@ import jakarta.servlet.ServletException;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
 import stirling.software.SPDF.model.ApiKeyAuthenticationToken;
+
 @Component
 public class UserAuthenticationFilter extends OncePerRequestFilter {
 
-    @Autowired
+    @Autowired private UserDetailsService userDetailsService;
-    private UserDetailsService userDetailsService;
-
-    @Autowired
-    @Lazy
-    private UserService userService;
 
+    @Autowired @Lazy private UserService userService;
 
     @Autowired
     @Qualifier("loginEnabled")
     public boolean loginEnabledValue;
 
     @Override
-    protected void doFilterInternal(HttpServletRequest request,
+    protected void doFilterInternal(
-                                    HttpServletResponse response,
+            HttpServletRequest request, HttpServletResponse response, FilterChain filterChain)
-                                    FilterChain filterChain) throws ServletException, IOException {
+            throws ServletException, IOException {
 
         if (!loginEnabledValue) {
             // If login is not enabled, just pass all requests without authentication
@@ -52,15 +49,17 @@ public class UserAuthenticationFilter extends OncePerRequestFilter {
             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 provider for API keys.
+                    // Use API key to authenticate. This requires you to have an authentication
-                	UserDetails userDetails = userService.loadUserByApiKey(apiKey);
+                    // provider for API keys.
-                	if(userDetails == null)
+                    UserDetails userDetails = userService.loadUserByApiKey(apiKey);
-                	{
+                    if (userDetails == null) {
-                		response.setStatus(HttpStatus.UNAUTHORIZED.value());
+                        response.setStatus(HttpStatus.UNAUTHORIZED.value());
                         response.getWriter().write("Invalid API Key.");
                         return;
-                	}
+                    }
-                    authentication = new ApiKeyAuthenticationToken(userDetails, apiKey, userDetails.getAuthorities());
+                    authentication =
+                            new ApiKeyAuthenticationToken(
+                                    userDetails, apiKey, userDetails.getAuthorities());
                     SecurityContextHolder.getContext().setAuthentication(authentication);
                 } catch (AuthenticationException e) {
                     // If API key authentication fails, deny the request
@@ -73,16 +72,18 @@ public class UserAuthenticationFilter extends OncePerRequestFilter {
 
         // If we still don't have any authentication, deny the request
         if (authentication == null || !authentication.isAuthenticated()) {
-        	String method = request.getMethod();
+            String method = request.getMethod();
-        	String contextPath = request.getContextPath();
+            String contextPath = request.getContextPath();
 
-        	if ("GET".equalsIgnoreCase(method) && !  (contextPath + "/login").equals(requestURI)) {
+            if ("GET".equalsIgnoreCase(method) && !(contextPath + "/login").equals(requestURI)) {
-        		 response.sendRedirect(contextPath + "/login");  // redirect to the login page
+                response.sendRedirect(contextPath + "/login"); // redirect to the login page
-        	     return;
+                return;
             } else {
-	            response.setStatus(HttpStatus.UNAUTHORIZED.value());
+                response.setStatus(HttpStatus.UNAUTHORIZED.value());
-	            response.getWriter().write("Authentication required. Please provide a X-API-KEY in request header.\nThis is found in Settings -> Account Settings -> API Key\nAlternativly you can disable authentication if this is unexpected");
+                response.getWriter()
-	            return;
+                        .write(
+                                "Authentication required. Please provide a X-API-KEY in request header.\nThis is found in Settings -> Account Settings -> API Key\nAlternativly you can disable authentication if this is unexpected");
+                return;
             }
         }
 
@@ -94,15 +95,16 @@ public class UserAuthenticationFilter extends OncePerRequestFilter {
         String uri = request.getRequestURI();
         String contextPath = request.getContextPath();
         String[] permitAllPatterns = {
-        		contextPath + "/login",
+            contextPath + "/login",
-        		contextPath + "/register",
+            contextPath + "/register",
-        		contextPath + "/error",
+            contextPath + "/error",
-        		contextPath + "/images/",
+            contextPath + "/images/",
-        		contextPath + "/public/",
+            contextPath + "/public/",
-        		contextPath + "/css/",
+            contextPath + "/css/",
-        		contextPath + "/js/",
+            contextPath + "/js/",
-        		contextPath +  "/pdfjs/",
+            contextPath + "/pdfjs/",
-        		contextPath +  "/site.webmanifest"
+            contextPath + "/api/v1/info/status",
+            contextPath + "/site.webmanifest"
         };
 
         for (String pattern : permitAllPatterns) {
@@ -113,5 +115,4 @@ public class UserAuthenticationFilter extends OncePerRequestFilter {
 
         return false;
     }
-
 }

src/main/java/stirling/software/SPDF/config/security/UserBasedRateLimitingFilter.java

@@ -20,28 +20,29 @@ import io.github.bucket4j.Bandwidth;
 import io.github.bucket4j.Bucket;
 import io.github.bucket4j.ConsumptionProbe;
 import io.github.bucket4j.Refill;
+
 import jakarta.servlet.FilterChain;
 import jakarta.servlet.ServletException;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
 import stirling.software.SPDF.model.Role;
+
 @Component
 public class UserBasedRateLimitingFilter extends OncePerRequestFilter {
 
-	private final Map<String, Bucket> apiBuckets = new ConcurrentHashMap<>();
+    private final Map<String, Bucket> apiBuckets = new ConcurrentHashMap<>();
     private final Map<String, Bucket> webBuckets = new ConcurrentHashMap<>();
 
-    @Autowired
+    @Autowired private UserDetailsService userDetailsService;
-    private UserDetailsService userDetailsService;
 
     @Autowired
     @Qualifier("rateLimit")
     public boolean rateLimit;
 
     @Override
-    protected void doFilterInternal(HttpServletRequest request,
+    protected void doFilterInternal(
-                                    HttpServletResponse response,
+            HttpServletRequest request, HttpServletResponse response, FilterChain filterChain)
-                                    FilterChain filterChain) throws ServletException, IOException {
+            throws ServletException, IOException {
         if (!rateLimit) {
             // If rateLimit is not enabled, just pass all requests without rate limiting
             filterChain.doFilter(request, response);
@@ -60,7 +61,8 @@ public class UserBasedRateLimitingFilter extends OncePerRequestFilter {
         // Check for API key in the request headers
         String apiKey = request.getHeader("X-API-Key");
         if (apiKey != null && !apiKey.trim().isEmpty()) {
-            identifier = "API_KEY_" + apiKey; // Prefix to distinguish between API keys and usernames
+            identifier =
+                    "API_KEY_" + apiKey; // Prefix to distinguish between API keys and usernames
         } else {
             Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
             if (authentication != null && authentication.isAuthenticated()) {
@@ -74,14 +76,27 @@ public class UserBasedRateLimitingFilter extends OncePerRequestFilter {
             identifier = request.getRemoteAddr();
         }
 
-        Role userRole = getRoleFromAuthentication(SecurityContextHolder.getContext().getAuthentication());
+        Role userRole =
+                getRoleFromAuthentication(SecurityContextHolder.getContext().getAuthentication());
 
         if (request.getHeader("X-API-Key") != null) {
             // It's an API call
-            processRequest(userRole.getApiCallsPerDay(), identifier, apiBuckets, request, response, filterChain);
+            processRequest(
+                    userRole.getApiCallsPerDay(),
+                    identifier,
+                    apiBuckets,
+                    request,
+                    response,
+                    filterChain);
         } else {
             // It's a Web UI call
-            processRequest(userRole.getWebCallsPerDay(), identifier, webBuckets, request, response, filterChain);
+            processRequest(
+                    userRole.getWebCallsPerDay(),
+                    identifier,
+                    webBuckets,
+                    request,
+                    response,
+                    filterChain);
         }
     }
 
@@ -98,8 +113,13 @@ public class UserBasedRateLimitingFilter extends OncePerRequestFilter {
         throw new IllegalStateException("User does not have a valid role.");
     }
 
-    private void processRequest(int limitPerDay, String identifier, Map<String, Bucket> buckets,
+    private void processRequest(
-                                HttpServletRequest request, HttpServletResponse response, FilterChain filterChain)
+            int limitPerDay,
+            String identifier,
+            Map<String, Bucket> buckets,
+            HttpServletRequest request,
+            HttpServletResponse response,
+            FilterChain filterChain)
             throws IOException, ServletException {
         Bucket userBucket = buckets.computeIfAbsent(identifier, k -> createUserBucket(limitPerDay));
         ConsumptionProbe probe = userBucket.tryConsumeAndReturnRemaining(1);
@@ -116,10 +136,8 @@ public class UserBasedRateLimitingFilter extends OncePerRequestFilter {
     }
 
     private Bucket createUserBucket(int limitPerDay) {
-        Bandwidth limit = Bandwidth.classic(limitPerDay, Refill.intervally(limitPerDay, Duration.ofDays(1)));
+        Bandwidth limit =
+                Bandwidth.classic(limitPerDay, Refill.intervally(limitPerDay, Duration.ofDays(1)));
         return Bucket.builder().addLimit(limit).build();
     }
 }
-
-
-

src/main/java/stirling/software/SPDF/config/security/UserService.java

@@ -1,4 +1,5 @@
 package stirling.software.SPDF.config.security;
+
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;
@@ -21,14 +22,13 @@ import stirling.software.SPDF.model.Authority;
 import stirling.software.SPDF.model.Role;
 import stirling.software.SPDF.model.User;
 import stirling.software.SPDF.repository.UserRepository;
+
 @Service
-public class UserService  implements UserServiceInterface{
+public class UserService implements UserServiceInterface {
 
-    @Autowired
+    @Autowired private UserRepository userRepository;
-    private UserRepository userRepository;
 
-    @Autowired
+    @Autowired private PasswordEncoder passwordEncoder;
-    private PasswordEncoder passwordEncoder;
 
     public Authentication getAuthentication(String apiKey) {
         User user = getUserByApiKey(apiKey);
@@ -38,19 +38,17 @@ public class UserService  implements UserServiceInterface{
 
         // Convert the user into an Authentication object
         return new UsernamePasswordAuthenticationToken(
-            user,                       // principal (typically the user)
+                user, // principal (typically the user)
-            null,                       // credentials (we don't expose the password or API key here)
+                null, // credentials (we don't expose the password or API key here)
-            getAuthorities(user)        // user's authorities (roles/permissions)
+                getAuthorities(user) // user's authorities (roles/permissions)
-        );
+                );
     }
 
     private Collection<? extends GrantedAuthority> getAuthorities(User user) {
         // Convert each Authority object into a SimpleGrantedAuthority object.
-    	return user.getAuthorities().stream()
+        return user.getAuthorities().stream()
-    		    .map((Authority authority) -> new SimpleGrantedAuthority(authority.getAuthority()))
+                .map((Authority authority) -> new SimpleGrantedAuthority(authority.getAuthority()))
-    		    .collect(Collectors.toList());
+                .collect(Collectors.toList());
-
-
     }
 
     private String generateApiKey() {
@@ -62,8 +60,10 @@ public class UserService  implements UserServiceInterface{
     }
 
     public User addApiKeyToUser(String username) {
-        User user = userRepository.findByUsername(username)
+        User user =
-            .orElseThrow(() -> new UsernameNotFoundException("User not found"));
+                userRepository
+                        .findByUsername(username)
+                        .orElseThrow(() -> new UsernameNotFoundException("User not found"));
 
         user.setApiKey(generateApiKey());
         return userRepository.save(user);
@@ -74,8 +74,10 @@ public class UserService  implements UserServiceInterface{
     }
 
     public String getApiKeyForUser(String username) {
-        User user = userRepository.findByUsername(username)
+        User user =
-            .orElseThrow(() -> new UsernameNotFoundException("User not found"));
+                userRepository
+                        .findByUsername(username)
+                        .orElseThrow(() -> new UsernameNotFoundException("User not found"));
         return user.getApiKey();
     }
 
@@ -93,15 +95,13 @@ public class UserService  implements UserServiceInterface{
             User user = userOptional;
             // Convert your User entity to a UserDetails object with authorities
             return new org.springframework.security.core.userdetails.User(
-                user.getUsername(),
+                    user.getUsername(),
-                user.getPassword(), // you might not need this for API key auth
+                    user.getPassword(), // you might not need this for API key auth
-                getAuthorities(user)
+                    getAuthorities(user));
-            );
         }
-        return null;  // or throw an exception
+        return null; // or throw an exception
     }
 
-
     public boolean validateApiKeyForUser(String username, String apiKey) {
         Optional<User> userOpt = userRepository.findByUsername(username);
         return userOpt.isPresent() && userOpt.get().getApiKey().equals(apiKey);
@@ -136,15 +136,15 @@ public class UserService  implements UserServiceInterface{
     }
 
     public void deleteUser(String username) {
-    	 Optional<User> userOpt = userRepository.findByUsername(username);
+        Optional<User> userOpt = userRepository.findByUsername(username);
-         if (userOpt.isPresent()) {
+        if (userOpt.isPresent()) {
-        	 for (Authority authority : userOpt.get().getAuthorities()) {
+            for (Authority authority : userOpt.get().getAuthorities()) {
-	             if (authority.getAuthority().equals(Role.INTERNAL_API_USER.getRoleId())) {
+                if (authority.getAuthority().equals(Role.INTERNAL_API_USER.getRoleId())) {
-	                 return;
+                    return;
-	             }
+                }
-	         }
+            }
-        	 userRepository.delete(userOpt.get());
+            userRepository.delete(userOpt.get());
-         }
+        }
     }
 
     public boolean usernameExists(String username) {
@@ -161,8 +161,8 @@ public class UserService  implements UserServiceInterface{
             User user = userOpt.get();
             Map<String, String> settingsMap = user.getSettings();
 
-            if(settingsMap == null) {
+            if (settingsMap == null) {
-                settingsMap = new HashMap<String,String>();
+                settingsMap = new HashMap<String, String>();
             }
             settingsMap.clear();
             settingsMap.putAll(updates);
@@ -191,7 +191,6 @@ public class UserService  implements UserServiceInterface{
         userRepository.save(user);
     }
 
-    
     public boolean isPasswordCorrect(User user, String currentPassword) {
         return passwordEncoder.matches(currentPassword, user.getPassword());
     }

src/main/java/stirling/software/SPDF/controller/api/CropController.java

@@ -20,6 +20,7 @@ import org.springframework.web.bind.annotation.RestController;
 
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
+
 import stirling.software.SPDF.model.api.general.CropPdfForm;
 import stirling.software.SPDF.utils.WebResponseUtils;
 
@@ -28,59 +29,62 @@ 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 static final Logger logger = LoggerFactory.getLogger(CropController.class);
 
-	@PostMapping(value = "/crop", consumes = "multipart/form-data")
+    @PostMapping(value = "/crop", consumes = "multipart/form-data")
-	@Operation(summary = "Crops a PDF document", description = "This operation takes an input PDF file and crops it according to the given coordinates. Input:PDF Output:PDF Type:SISO")
+    @Operation(
-	public ResponseEntity<byte[]> cropPdf(@ModelAttribute CropPdfForm form)
+            summary = "Crops a PDF document",
-			throws IOException {
+            description =
+                    "This operation takes an input PDF file and crops it according to the given coordinates. Input:PDF Output:PDF Type:SISO")
+    public ResponseEntity<byte[]> cropPdf(@ModelAttribute CropPdfForm form) throws IOException {
 
+        PDDocument sourceDocument =
+                PDDocument.load(new ByteArrayInputStream(form.getFileInput().getBytes()));
 
+        PDDocument newDocument = new PDDocument();
 
+        int totalPages = sourceDocument.getNumberOfPages();
 
-PDDocument sourceDocument = PDDocument.load(new ByteArrayInputStream(form.getFileInput().getBytes()));
+        LayerUtility layerUtility = new LayerUtility(newDocument);
 
-PDDocument newDocument = new PDDocument();
+        for (int i = 0; i < totalPages; i++) {
+            PDPage sourcePage = sourceDocument.getPage(i);
 
-int totalPages = sourceDocument.getNumberOfPages();
+            // Create a new page with the size of the source page
+            PDPage newPage = new PDPage(sourcePage.getMediaBox());
+            newDocument.addPage(newPage);
+            PDPageContentStream contentStream = new PDPageContentStream(newDocument, newPage);
 
-LayerUtility layerUtility = new LayerUtility(newDocument);
+            // Import the source page as a form XObject
+            PDFormXObject formXObject = layerUtility.importPageAsForm(sourceDocument, i);
 
-for (int i = 0; i < totalPages; i++) {
+            contentStream.saveGraphicsState();
-    PDPage sourcePage = sourceDocument.getPage(i);
 
-    // Create a new page with the size of the source page
+            // Define the crop area
-    PDPage newPage = new PDPage(sourcePage.getMediaBox());
+            contentStream.addRect(form.getX(), form.getY(), form.getWidth(), form.getHeight());
-    newDocument.addPage(newPage);
+            contentStream.clip();
-    PDPageContentStream contentStream = new PDPageContentStream(newDocument, newPage);
 
-    // Import the source page as a form XObject
+            // Draw the entire formXObject
-    PDFormXObject formXObject = layerUtility.importPageAsForm(sourceDocument, i);
+            contentStream.drawForm(formXObject);
 
-    contentStream.saveGraphicsState();
+            contentStream.restoreGraphicsState();
 
-    // Define the crop area
+            contentStream.close();
-    contentStream.addRect(form.getX(), form.getY(), form.getWidth(), form.getHeight());
-    contentStream.clip();
 
-    // Draw the entire formXObject
+            // Now, set the new page's media box to the cropped size
-    contentStream.drawForm(formXObject);
+            newPage.setMediaBox(
+                    new PDRectangle(form.getX(), form.getY(), form.getWidth(), form.getHeight()));
+        }
 
-    contentStream.restoreGraphicsState();
+        ByteArrayOutputStream baos = new ByteArrayOutputStream();
-
+        newDocument.save(baos);
-    contentStream.close();
+        newDocument.close();
-    
+        sourceDocument.close();
-    // Now, set the new page's media box to the cropped size
-    newPage.setMediaBox(new PDRectangle(form.getX(), form.getY(), form.getWidth(), form.getHeight()));
-}
-
-ByteArrayOutputStream baos = new ByteArrayOutputStream();
-newDocument.save(baos);
-newDocument.close();
-sourceDocument.close();
-
-byte[] pdfContent = baos.toByteArray();
-return WebResponseUtils.bytesToWebResponse(pdfContent, form.getFileInput().getOriginalFilename().replaceFirst("[.][^.]+$", "") + "_cropped.pdf");
-	}
 
+        byte[] pdfContent = baos.toByteArray();
+        return WebResponseUtils.bytesToWebResponse(
+                pdfContent,
+                form.getFileInput().getOriginalFilename().replaceFirst("[.][^.]+$", "")
+                        + "_cropped.pdf");
+    }
 }

src/main/java/stirling/software/SPDF/controller/api/MergeController.java

@@ -1,7 +1,15 @@
 package stirling.software.SPDF.controller.api;
 
-import io.swagger.v3.oas.annotations.Operation;
+import java.io.ByteArrayInputStream;
-import io.swagger.v3.oas.annotations.tags.Tag;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.nio.file.attribute.BasicFileAttributes;
+import java.util.Arrays;
+import java.util.Comparator;
+import java.util.List;
+
 import org.apache.pdfbox.io.MemoryUsageSetting;
 import org.apache.pdfbox.multipdf.PDFMergerUtility;
 import org.apache.pdfbox.pdmodel.PDDocument;
@@ -14,19 +22,13 @@ 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.general.MergePdfsRequest;
 import stirling.software.SPDF.utils.WebResponseUtils;
 
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Paths;
-import java.nio.file.attribute.BasicFileAttributes;
-import java.util.Arrays;
-import java.util.Comparator;
-import java.util.List;
-
 @RestController
 @RequestMapping("/api/v1/general")
 @Tag(name = "General", description = "General APIs")
@@ -34,7 +36,6 @@ public class MergeController {
 
     private static final Logger logger = LoggerFactory.getLogger(MergeController.class);
 
-
     private PDDocument mergeDocuments(List<PDDocument> documents) throws IOException {
         PDDocument mergedDoc = new PDDocument();
         for (PDDocument doc : documents) {
@@ -52,27 +53,39 @@ public class MergeController {
             case "byDateModified":
                 return (file1, file2) -> {
                     try {
-                        BasicFileAttributes attr1 = Files.readAttributes(Paths.get(file1.getOriginalFilename()), BasicFileAttributes.class);
+                        BasicFileAttributes attr1 =
-                        BasicFileAttributes attr2 = Files.readAttributes(Paths.get(file2.getOriginalFilename()), BasicFileAttributes.class);
+                                Files.readAttributes(
+                                        Paths.get(file1.getOriginalFilename()),
+                                        BasicFileAttributes.class);
+                        BasicFileAttributes attr2 =
+                                Files.readAttributes(
+                                        Paths.get(file2.getOriginalFilename()),
+                                        BasicFileAttributes.class);
                         return attr1.lastModifiedTime().compareTo(attr2.lastModifiedTime());
                     } catch (IOException e) {
-                        return 0;  // If there's an error, treat them as equal
+                        return 0; // If there's an error, treat them as equal
                     }
                 };
             case "byDateCreated":
                 return (file1, file2) -> {
                     try {
-                        BasicFileAttributes attr1 = Files.readAttributes(Paths.get(file1.getOriginalFilename()), BasicFileAttributes.class);
+                        BasicFileAttributes attr1 =
-                        BasicFileAttributes attr2 = Files.readAttributes(Paths.get(file2.getOriginalFilename()), BasicFileAttributes.class);
+                                Files.readAttributes(
+                                        Paths.get(file1.getOriginalFilename()),
+                                        BasicFileAttributes.class);
+                        BasicFileAttributes attr2 =
+                                Files.readAttributes(
+                                        Paths.get(file2.getOriginalFilename()),
+                                        BasicFileAttributes.class);
                         return attr1.creationTime().compareTo(attr2.creationTime());
                     } catch (IOException e) {
-                        return 0;  // If there's an error, treat them as equal
+                        return 0; // If there's an error, treat them as equal
                     }
                 };
             case "byPDFTitle":
                 return (file1, file2) -> {
                     try (PDDocument doc1 = PDDocument.load(file1.getInputStream());
-                         PDDocument doc2 = PDDocument.load(file2.getInputStream())) {
+                            PDDocument doc2 = PDDocument.load(file2.getInputStream())) {
                         String title1 = doc1.getDocumentInformation().getTitle();
                         String title2 = doc2.getDocumentInformation().getTitle();
                         return title1.compareTo(title2);
@@ -82,14 +95,17 @@ public class MergeController {
                 };
             case "orderProvided":
             default:
-                return (file1, file2) -> 0;  // Default is the order provided
+                return (file1, file2) -> 0; // Default is the order provided
         }
     }
 
     @PostMapping(consumes = "multipart/form-data", value = "/merge-pdfs")
-    @Operation(summary = "Merge multiple PDF files into one",
+    @Operation(
-            description = "This endpoint merges multiple PDF files into a single PDF file. The merged file will contain all pages from the input files in the order they were provided. Input:PDF Output:PDF Type:MISO")
+            summary = "Merge multiple PDF files into one",
-    public ResponseEntity<byte[]> mergePdfs(@ModelAttribute MergePdfsRequest form) throws IOException {
+            description =
+                    "This endpoint merges multiple PDF files into a single PDF file. The merged file will contain all pages from the input files in the order they were provided. Input:PDF Output:PDF Type:MISO")
+    public ResponseEntity<byte[]> mergePdfs(@ModelAttribute MergePdfsRequest form)
+            throws IOException {
         try {
             MultipartFile[] files = form.getFileInput();
             Arrays.sort(files, getSortComparator(form.getSortType()));
@@ -101,14 +117,16 @@ public class MergeController {
                 mergedDoc.addSource(new ByteArrayInputStream(file.getBytes()));
             }
 
-            mergedDoc.setDestinationFileName(files[0].getOriginalFilename().replaceFirst("[.][^.]+$", "") + "_merged.pdf");
+            mergedDoc.setDestinationFileName(
+                    files[0].getOriginalFilename().replaceFirst("[.][^.]+$", "") + "_merged.pdf");
             mergedDoc.setDestinationStream(docOutputstream);
             mergedDoc.mergeDocuments(MemoryUsageSetting.setupMainMemoryOnly());
 
-            return WebResponseUtils.bytesToWebResponse(docOutputstream.toByteArray(), mergedDoc.getDestinationFileName());
+            return WebResponseUtils.bytesToWebResponse(
+                    docOutputstream.toByteArray(), mergedDoc.getDestinationFileName());
         } catch (Exception ex) {
             logger.error("Error in merge pdf process", ex);
-           throw ex;
+            throw ex;
         }
     }
 }

src/main/java/stirling/software/SPDF/controller/api/MultiPageLayoutController.java

@@ -1,6 +1,5 @@
 package stirling.software.SPDF.controller.api;
 
-
 import java.awt.Color;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -23,6 +22,7 @@ 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.general.MergeMultiplePagesRequest;
 import stirling.software.SPDF.utils.WebResponseUtils;
 
@@ -31,94 +31,110 @@ 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 static final Logger logger = LoggerFactory.getLogger(MultiPageLayoutController.class);
 
-	@PostMapping(value = "/multi-page-layout", consumes = "multipart/form-data")
+    @PostMapping(value = "/multi-page-layout", consumes = "multipart/form-data")
-	@Operation(
+    @Operation(
-	    summary = "Merge multiple pages of a PDF document into a single page",
+            summary = "Merge multiple pages of a PDF document into a single page",
-	    description = "This operation takes an input PDF file and the number of pages to merge into a single sheet in the output PDF file. Input:PDF Output:PDF Type:SISO"
+            description =
-	)
+                    "This operation takes an input PDF file and the number of pages to merge into a single sheet in the output PDF file. Input:PDF Output:PDF Type:SISO")
-	public ResponseEntity<byte[]> mergeMultiplePagesIntoOne(@ModelAttribute MergeMultiplePagesRequest request)
+    public ResponseEntity<byte[]> mergeMultiplePagesIntoOne(
-	        throws IOException {
+            @ModelAttribute MergeMultiplePagesRequest request) throws IOException {
 
-	    int pagesPerSheet = request.getPagesPerSheet();
+        int pagesPerSheet = request.getPagesPerSheet();
-	    MultipartFile file = request.getFileInput();
+        MultipartFile file = request.getFileInput();
-	    boolean addBorder = request.isAddBorder();
+        boolean addBorder = request.isAddBorder();
 
-	    if (pagesPerSheet != 2 && pagesPerSheet != 3 && pagesPerSheet != (int) Math.sqrt(pagesPerSheet) * Math.sqrt(pagesPerSheet)) {
+        if (pagesPerSheet != 2
-	        throw new IllegalArgumentException("pagesPerSheet must be 2, 3 or a perfect square");
+                && pagesPerSheet != 3
-	    }
+                && pagesPerSheet != (int) Math.sqrt(pagesPerSheet) * Math.sqrt(pagesPerSheet)) {
+            throw new IllegalArgumentException("pagesPerSheet must be 2, 3 or a perfect square");
+        }
 
-	    int cols = pagesPerSheet == 2 || pagesPerSheet == 3 ? pagesPerSheet : (int) Math.sqrt(pagesPerSheet);
+        int cols =
-	    int rows = pagesPerSheet == 2 || pagesPerSheet == 3 ? 1 : (int) Math.sqrt(pagesPerSheet);
+                pagesPerSheet == 2 || pagesPerSheet == 3
+                        ? pagesPerSheet
+                        : (int) Math.sqrt(pagesPerSheet);
+        int rows = pagesPerSheet == 2 || pagesPerSheet == 3 ? 1 : (int) Math.sqrt(pagesPerSheet);
 
-	    PDDocument sourceDocument = PDDocument.load(file.getInputStream());
+        PDDocument sourceDocument = PDDocument.load(file.getInputStream());
-	    PDDocument newDocument = new PDDocument();
+        PDDocument newDocument = new PDDocument();
-	    PDPage newPage = new PDPage(PDRectangle.A4);
+        PDPage newPage = new PDPage(PDRectangle.A4);
-	    newDocument.addPage(newPage);
+        newDocument.addPage(newPage);
 
-	    int totalPages = sourceDocument.getNumberOfPages();
+        int totalPages = sourceDocument.getNumberOfPages();
-	    float cellWidth = newPage.getMediaBox().getWidth() / cols;
+        float cellWidth = newPage.getMediaBox().getWidth() / cols;
-	    float cellHeight = newPage.getMediaBox().getHeight() / rows;
+        float cellHeight = newPage.getMediaBox().getHeight() / rows;
 
-	    PDPageContentStream contentStream = new PDPageContentStream(newDocument, newPage, PDPageContentStream.AppendMode.APPEND, true, true);
+        PDPageContentStream contentStream =
-	    LayerUtility layerUtility = new LayerUtility(newDocument);
+                new PDPageContentStream(
+                        newDocument, newPage, PDPageContentStream.AppendMode.APPEND, true, true);
+        LayerUtility layerUtility = new LayerUtility(newDocument);
 
-	    float borderThickness = 1.5f; // Specify border thickness as required
+        float borderThickness = 1.5f; // Specify border thickness as required
-	    contentStream.setLineWidth(borderThickness);
+        contentStream.setLineWidth(borderThickness);
-	    contentStream.setStrokingColor(Color.BLACK);
+        contentStream.setStrokingColor(Color.BLACK);
 
-	    for (int i = 0; i < totalPages; i++) {
+        for (int i = 0; i < totalPages; i++) {
-	        if (i != 0 && i % pagesPerSheet == 0) {
+            if (i != 0 && i % pagesPerSheet == 0) {
-	            // Close the current content stream and create a new page and content stream
+                // Close the current content stream and create a new page and content stream
-	            contentStream.close();
+                contentStream.close();
-	            newPage = new PDPage(PDRectangle.A4);
+                newPage = new PDPage(PDRectangle.A4);
-	            newDocument.addPage(newPage);
+                newDocument.addPage(newPage);
-	            contentStream = new PDPageContentStream(newDocument, newPage, PDPageContentStream.AppendMode.APPEND, true, true);
+                contentStream =
-	        }
+                        new PDPageContentStream(
+                                newDocument,
+                                newPage,
+                                PDPageContentStream.AppendMode.APPEND,
+                                true,
+                                true);
+            }
 
-	        PDPage sourcePage = sourceDocument.getPage(i);
+            PDPage sourcePage = sourceDocument.getPage(i);
-	        PDRectangle rect = sourcePage.getMediaBox();
+            PDRectangle rect = sourcePage.getMediaBox();
-	        float scaleWidth = cellWidth / rect.getWidth();
+            float scaleWidth = cellWidth / rect.getWidth();
-	        float scaleHeight = cellHeight / rect.getHeight();
+            float scaleHeight = cellHeight / rect.getHeight();
-	        float scale = Math.min(scaleWidth, scaleHeight);
+            float scale = Math.min(scaleWidth, scaleHeight);
 
-	        int adjustedPageIndex = i % pagesPerSheet;  // This will reset the index for every new page
+            int adjustedPageIndex =
-	        int rowIndex = adjustedPageIndex / cols;
+                    i % pagesPerSheet; // This will reset the index for every new page
-	        int colIndex = adjustedPageIndex % cols;
+            int rowIndex = adjustedPageIndex / cols;
+            int colIndex = adjustedPageIndex % cols;
 
-	        float x = colIndex * cellWidth + (cellWidth - rect.getWidth() * scale) / 2;
+            float x = colIndex * cellWidth + (cellWidth - rect.getWidth() * scale) / 2;
-	        float y = newPage.getMediaBox().getHeight() - ((rowIndex + 1) * cellHeight - (cellHeight - rect.getHeight() * scale) / 2);
+            float y =
+                    newPage.getMediaBox().getHeight()
+                            - ((rowIndex + 1) * cellHeight
+                                    - (cellHeight - rect.getHeight() * scale) / 2);
 
-	        contentStream.saveGraphicsState();
+            contentStream.saveGraphicsState();
-	        contentStream.transform(Matrix.getTranslateInstance(x, y));
+            contentStream.transform(Matrix.getTranslateInstance(x, y));
-	        contentStream.transform(Matrix.getScaleInstance(scale, scale));
+            contentStream.transform(Matrix.getScaleInstance(scale, scale));
 
-	        PDFormXObject formXObject = layerUtility.importPageAsForm(sourceDocument, i);
+            PDFormXObject formXObject = layerUtility.importPageAsForm(sourceDocument, i);
-	        contentStream.drawForm(formXObject);
+            contentStream.drawForm(formXObject);
 
-	        contentStream.restoreGraphicsState();
+            contentStream.restoreGraphicsState();
 
-	        if(addBorder) {
+            if (addBorder) {
-		        // Draw border around each page
+                // Draw border around each page
-		        float borderX = colIndex * cellWidth;
+                float borderX = colIndex * cellWidth;
-		        float borderY = newPage.getMediaBox().getHeight() - (rowIndex + 1) * cellHeight;
+                float borderY = newPage.getMediaBox().getHeight() - (rowIndex + 1) * cellHeight;
-		        contentStream.addRect(borderX, borderY, cellWidth, cellHeight);
+                contentStream.addRect(borderX, borderY, cellWidth, cellHeight);
-		        contentStream.stroke();
+                contentStream.stroke();
-	        }
+            }
-	    }
+        }
 
+        contentStream.close(); // Close the final content stream
+        sourceDocument.close();
 
-	    contentStream.close(); // Close the final content stream
+        ByteArrayOutputStream baos = new ByteArrayOutputStream();
-	    sourceDocument.close();
+        newDocument.save(baos);
-
+        newDocument.close();
-	    ByteArrayOutputStream baos = new ByteArrayOutputStream();
-	    newDocument.save(baos);
-	    newDocument.close();
-
-	    byte[] result = baos.toByteArray();
-	    return WebResponseUtils.bytesToWebResponse(result, file.getOriginalFilename().replaceFirst("[.][^.]+$", "") + "_layoutChanged.pdf");
-	}
-
 
+        byte[] result = baos.toByteArray();
+        return WebResponseUtils.bytesToWebResponse(
+                result,
+                file.getOriginalFilename().replaceFirst("[.][^.]+$", "") + "_layoutChanged.pdf");
+    }
 }

src/main/java/stirling/software/SPDF/controller/api/PdfOverlayController.java

@@ -1,11 +1,13 @@
 package stirling.software.SPDF.controller.api;
+
 import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.IOException;
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.ArrayList;
+
 import org.apache.pdfbox.multipdf.Overlay;
 import org.apache.pdfbox.pdmodel.PDDocument;
 import org.springframework.http.MediaType;
@@ -18,17 +20,23 @@ 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.general.OverlayPdfsRequest;
 import stirling.software.SPDF.utils.GeneralUtils;
 import stirling.software.SPDF.utils.WebResponseUtils;
+
 @RestController
 @RequestMapping("/api/v1/general")
 @Tag(name = "General", description = "General APIs")
 public class PdfOverlayController {
 
-	@PostMapping(value = "/overlay-pdfs", consumes = "multipart/form-data")
+    @PostMapping(value = "/overlay-pdfs", consumes = "multipart/form-data")
-    @Operation(summary = "Overlay PDF files in various modes", description = "Overlay PDF files onto a base PDF with different modes: Sequential, Interleaved, or Fixed Repeat. Input:PDF Output:PDF Type:MIMO")
+    @Operation(
-    public ResponseEntity<byte[]> overlayPdfs(@ModelAttribute OverlayPdfsRequest request) throws IOException {
+            summary = "Overlay PDF files in various modes",
+            description =
+                    "Overlay PDF files onto a base PDF with different modes: Sequential, Interleaved, or Fixed Repeat. Input:PDF Output:PDF Type:MIMO")
+    public ResponseEntity<byte[]> overlayPdfs(@ModelAttribute OverlayPdfsRequest request)
+            throws IOException {
         MultipartFile baseFile = request.getFileInput();
         int overlayPos = request.getOverlayPosition();
 
@@ -41,12 +49,19 @@ public class PdfOverlayController {
                 overlayPdfFiles[i] = GeneralUtils.multipartToFile(overlayFiles[i]);
             }
 
-            String mode = request.getOverlayMode(); // "SequentialOverlay", "InterleavedOverlay", "FixedRepeatOverlay"
+            String mode = request.getOverlayMode(); // "SequentialOverlay", "InterleavedOverlay",
+            // "FixedRepeatOverlay"
             int[] counts = request.getCounts(); // Used for FixedRepeatOverlay mode
 
             try (PDDocument basePdf = PDDocument.load(baseFile.getInputStream());
                     Overlay overlay = new Overlay()) {
-                Map<Integer, String> overlayGuide = prepareOverlayGuide(basePdf.getNumberOfPages(), overlayPdfFiles, mode, counts, tempFiles);
+                Map<Integer, String> overlayGuide =
+                        prepareOverlayGuide(
+                                basePdf.getNumberOfPages(),
+                                overlayPdfFiles,
+                                mode,
+                                counts,
+                                tempFiles);
 
                 overlay.setInputPDF(basePdf);
                 if (overlayPos == 0) {
@@ -58,9 +73,12 @@ public class PdfOverlayController {
                 ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
                 overlay.overlay(overlayGuide).save(outputStream);
                 byte[] data = outputStream.toByteArray();
-                String outputFilename = baseFile.getOriginalFilename().replaceFirst("[.][^.]+$", "") + "_overlayed.pdf";  // Remove file extension and append .pdf
+                String outputFilename =
+                        baseFile.getOriginalFilename().replaceFirst("[.][^.]+$", "")
+                                + "_overlayed.pdf"; // Remove file extension and append .pdf
 
-                return WebResponseUtils.bytesToWebResponse(data, outputFilename, MediaType.APPLICATION_PDF);
+                return WebResponseUtils.bytesToWebResponse(
+                        data, outputFilename, MediaType.APPLICATION_PDF);
             }
         } finally {
             for (File overlayPdfFile : overlayPdfFiles) {
@@ -76,7 +94,9 @@ public class PdfOverlayController {
         }
     }
 
-    private Map<Integer, String> prepareOverlayGuide(int basePageCount, File[] overlayFiles, String mode, int[] counts, List<File> tempFiles) throws IOException {
+    private Map<Integer, String> prepareOverlayGuide(
+            int basePageCount, File[] overlayFiles, String mode, int[] counts, List<File> tempFiles)
+            throws IOException {
         Map<Integer, String> overlayGuide = new HashMap<>();
         switch (mode) {
             case "SequentialOverlay":
@@ -94,12 +114,19 @@ public class PdfOverlayController {
         return overlayGuide;
     }
 
-    private void sequentialOverlay(Map<Integer, String> overlayGuide, File[] overlayFiles, int basePageCount, List<File> tempFiles) throws IOException {
+    private void sequentialOverlay(
+            Map<Integer, String> overlayGuide,
+            File[] overlayFiles,
+            int basePageCount,
+            List<File> tempFiles)
+            throws IOException {
         int overlayFileIndex = 0;
         int pageCountInCurrentOverlay = 0;
 
         for (int basePageIndex = 1; basePageIndex <= basePageCount; basePageIndex++) {
-            if (pageCountInCurrentOverlay == 0 || pageCountInCurrentOverlay >= getNumberOfPages(overlayFiles[overlayFileIndex])) {
+            if (pageCountInCurrentOverlay == 0
+                    || pageCountInCurrentOverlay
+                            >= getNumberOfPages(overlayFiles[overlayFileIndex])) {
                 pageCountInCurrentOverlay = 0;
                 overlayFileIndex = (overlayFileIndex + 1) % overlayFiles.length;
             }
@@ -125,13 +152,9 @@ public class PdfOverlayController {
         }
     }
 
-
+    private void interleavedOverlay(
-
+            Map<Integer, String> overlayGuide, File[] overlayFiles, int basePageCount)
-
+            throws IOException {
-
-
-
-    private void interleavedOverlay(Map<Integer, String> overlayGuide, File[] overlayFiles, int basePageCount) throws IOException {
         for (int basePageIndex = 1; basePageIndex <= basePageCount; basePageIndex++) {
             File overlayFile = overlayFiles[(basePageIndex - 1) % overlayFiles.length];
 
@@ -145,10 +168,12 @@ public class PdfOverlayController {
         }
     }
 
-
+    private void fixedRepeatOverlay(
-    private void fixedRepeatOverlay(Map<Integer, String> overlayGuide, File[] overlayFiles, int[] counts, int basePageCount) throws IOException {
+            Map<Integer, String> overlayGuide, File[] overlayFiles, int[] counts, int basePageCount)
+            throws IOException {
         if (overlayFiles.length != counts.length) {
-            throw new IllegalArgumentException("Counts array length must match the number of overlay files");
+            throw new IllegalArgumentException(
+                    "Counts array length must match the number of overlay files");
         }
         int currentPage = 1;
         for (int i = 0; i < overlayFiles.length; i++) {
@@ -167,7 +192,7 @@ public class PdfOverlayController {
             }
         }
     }
-
 }
 
-// Additional classes like OverlayPdfsRequest, WebResponseUtils, etc. are assumed to be defined elsewhere.
+// Additional classes like OverlayPdfsRequest, WebResponseUtils, etc. are assumed to be defined
+// elsewhere.

src/main/java/stirling/software/SPDF/controller/api/RearrangePagesPDFController.java

@@ -17,200 +17,204 @@ 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.SortTypes;
 import stirling.software.SPDF.model.api.PDFWithPageNums;
 import stirling.software.SPDF.model.api.general.RearrangePagesRequest;
 import stirling.software.SPDF.utils.GeneralUtils;
 import stirling.software.SPDF.utils.WebResponseUtils;
+
 @RestController
 @RequestMapping("/api/v1/general")
 @Tag(name = "General", description = "General APIs")
 public class RearrangePagesPDFController {
 
-	private static final Logger logger = LoggerFactory.getLogger(RearrangePagesPDFController.class);
+    private static final Logger logger = LoggerFactory.getLogger(RearrangePagesPDFController.class);
 
-	@PostMapping(consumes = "multipart/form-data", value = "/remove-pages")
+    @PostMapping(consumes = "multipart/form-data", value = "/remove-pages")
-	@Operation(summary = "Remove pages from a PDF file", description = "This endpoint removes specified pages from a given PDF file. Users can provide a comma-separated list of page numbers or ranges to delete. Input:PDF Output:PDF Type:SISO")
+    @Operation(
-	public ResponseEntity<byte[]> deletePages(@ModelAttribute PDFWithPageNums request )
+            summary = "Remove pages from a PDF file",
-			throws IOException {
+            description =
+                    "This endpoint removes specified pages from a given PDF file. Users can provide a comma-separated list of page numbers or ranges to delete. Input:PDF Output:PDF Type:SISO")
+    public ResponseEntity<byte[]> deletePages(@ModelAttribute PDFWithPageNums request)
+            throws IOException {
 
-		MultipartFile pdfFile = request.getFileInput();
+        MultipartFile pdfFile = request.getFileInput();
-		String pagesToDelete = request.getPageNumbers();
+        String pagesToDelete = request.getPageNumbers();
 
-		PDDocument document = PDDocument.load(pdfFile.getBytes());
+        PDDocument document = PDDocument.load(pdfFile.getBytes());
 
-		// Split the page order string into an array of page numbers or range of numbers
+        // Split the page order string into an array of page numbers or range of numbers
-		String[] pageOrderArr = pagesToDelete.split(",");
+        String[] pageOrderArr = pagesToDelete.split(",");
 
-		List<Integer> pagesToRemove = GeneralUtils.parsePageList(pageOrderArr, document.getNumberOfPages());
+        List<Integer> pagesToRemove =
+                GeneralUtils.parsePageList(pageOrderArr, document.getNumberOfPages());
 
-		for (int i = pagesToRemove.size() - 1; i >= 0; i--) {
+        for (int i = pagesToRemove.size() - 1; i >= 0; i--) {
-			int pageIndex = pagesToRemove.get(i);
+            int pageIndex = pagesToRemove.get(i);
-			document.removePage(pageIndex);
+            document.removePage(pageIndex);
-		}
+        }
-		return WebResponseUtils.pdfDocToWebResponse(document,
+        return WebResponseUtils.pdfDocToWebResponse(
-				pdfFile.getOriginalFilename().replaceFirst("[.][^.]+$", "") + "_removed_pages.pdf");
+                document,
-
+                pdfFile.getOriginalFilename().replaceFirst("[.][^.]+$", "") + "_removed_pages.pdf");
-	}
-
-	
-
-	private List<Integer> removeFirst(int totalPages) {
-		if (totalPages <= 1)
-			return new ArrayList<>();
-		List<Integer> newPageOrder = new ArrayList<>();
-		for (int i = 2; i <= totalPages; i++) {
-			newPageOrder.add(i - 1);
-		}
-		return newPageOrder;
-	}
-
-	private List<Integer> removeLast(int totalPages) {
-		if (totalPages <= 1)
-			return new ArrayList<>();
-		List<Integer> newPageOrder = new ArrayList<>();
-		for (int i = 1; i < totalPages; i++) {
-			newPageOrder.add(i - 1);
-		}
-		return newPageOrder;
-	}
-
-	private List<Integer> removeFirstAndLast(int totalPages) {
-		if (totalPages <= 2)
-			return new ArrayList<>();
-		List<Integer> newPageOrder = new ArrayList<>();
-		for (int i = 2; i < totalPages; i++) {
-			newPageOrder.add(i - 1);
-		}
-		return newPageOrder;
-	}
-
-	private List<Integer> reverseOrder(int totalPages) {
-		List<Integer> newPageOrder = new ArrayList<>();
-		for (int i = totalPages; i >= 1; i--) {
-			newPageOrder.add(i - 1);
-		}
-		return newPageOrder;
-	}
-
-	private List<Integer> duplexSort(int totalPages) {
-		List<Integer> newPageOrder = new ArrayList<>();
-		int half = (totalPages + 1) / 2; // This ensures proper behavior with odd numbers of pages
-		for (int i = 1; i <= half; i++) {
-			newPageOrder.add(i - 1);
-			if (i <= totalPages - half) { // Avoid going out of bounds
-				newPageOrder.add(totalPages - i);
-			}
-		}
-		return newPageOrder;
-	}
-
-	private List<Integer> bookletSort(int totalPages) {
-		List<Integer> newPageOrder = new ArrayList<>();
-		for (int i = 0; i < totalPages / 2; i++) {
-			newPageOrder.add(i);
-			newPageOrder.add(totalPages - i - 1);
-		}
-		return newPageOrder;
-	}
-
-	private List<Integer> sideStitchBooklet(int totalPages) {
-		List<Integer> newPageOrder = new ArrayList<>();
-		for (int i = 0; i < (totalPages + 3) / 4; i++) {
-			int begin = i * 4;
-			newPageOrder.add(Math.min(begin + 3, totalPages - 1));
-			newPageOrder.add(Math.min(begin, totalPages - 1));
-			newPageOrder.add(Math.min(begin + 1, totalPages - 1));
-			newPageOrder.add(Math.min(begin + 2, totalPages - 1));
-		}
-		return newPageOrder;
     }
 
-	private List<Integer> oddEvenSplit(int totalPages) {
+    private List<Integer> removeFirst(int totalPages) {
-		List<Integer> newPageOrder = new ArrayList<>();
+        if (totalPages <= 1) return new ArrayList<>();
-		for (int i = 1; i <= totalPages; i += 2) {
+        List<Integer> newPageOrder = new ArrayList<>();
-			newPageOrder.add(i - 1);
+        for (int i = 2; i <= totalPages; i++) {
-		}
+            newPageOrder.add(i - 1);
-		for (int i = 2; i <= totalPages; i += 2) {
+        }
-			newPageOrder.add(i - 1);
+        return newPageOrder;
-		}
+    }
-		return newPageOrder;
-	}
 
-	private List<Integer> processSortTypes(String sortTypes, int totalPages) {
+    private List<Integer> removeLast(int totalPages) {
-		try {
+        if (totalPages <= 1) return new ArrayList<>();
-			SortTypes mode = SortTypes.valueOf(sortTypes.toUpperCase());
+        List<Integer> newPageOrder = new ArrayList<>();
-			switch (mode) {
+        for (int i = 1; i < totalPages; i++) {
-			case REVERSE_ORDER:
+            newPageOrder.add(i - 1);
-				return reverseOrder(totalPages);
+        }
-			case DUPLEX_SORT:
+        return newPageOrder;
-				return duplexSort(totalPages);
+    }
-			case BOOKLET_SORT:
-				return bookletSort(totalPages);
-			case SIDE_STITCH_BOOKLET_SORT:
-				return sideStitchBooklet(totalPages);
-			case ODD_EVEN_SPLIT:
-				return oddEvenSplit(totalPages);
-			case REMOVE_FIRST:
-				return removeFirst(totalPages);
-			case REMOVE_LAST:
-				return removeLast(totalPages);
-			case REMOVE_FIRST_AND_LAST:
-				return removeFirstAndLast(totalPages);
-			default:
-				throw new IllegalArgumentException("Unsupported custom mode");
-			}
-		} catch (IllegalArgumentException e) {
-			logger.error("Unsupported custom mode", e);
-			return null;
-		}
-	}
 
-	@PostMapping(consumes = "multipart/form-data", value = "/rearrange-pages")
+    private List<Integer> removeFirstAndLast(int totalPages) {
-	@Operation(summary = "Rearrange pages in a PDF file", description = "This endpoint rearranges pages in a given PDF file based on the specified page order or custom mode. Users can provide a page order as a comma-separated list of page numbers or page ranges, or a custom mode. Input:PDF Output:PDF")
+        if (totalPages <= 2) return new ArrayList<>();
-	public ResponseEntity<byte[]> rearrangePages(@ModelAttribute RearrangePagesRequest request) throws IOException {
+        List<Integer> newPageOrder = new ArrayList<>();
-	    MultipartFile pdfFile = request.getFileInput();
+        for (int i = 2; i < totalPages; i++) {
-	    String pageOrder = request.getPageNumbers();
+            newPageOrder.add(i - 1);
-	    String sortType = request.getCustomMode();
+        }
-		try {
+        return newPageOrder;
-			// Load the input PDF
+    }
-			PDDocument document = PDDocument.load(pdfFile.getInputStream());
 
-			// Split the page order string into an array of page numbers or range of numbers
+    private List<Integer> reverseOrder(int totalPages) {
-			String[] pageOrderArr = pageOrder != null ? pageOrder.split(",") : new String[0];
+        List<Integer> newPageOrder = new ArrayList<>();
-			int totalPages = document.getNumberOfPages();
+        for (int i = totalPages; i >= 1; i--) {
-			List<Integer> newPageOrder;
+            newPageOrder.add(i - 1);
-			if (sortType != null && sortType.length() > 0) {
+        }
-				newPageOrder = processSortTypes(sortType, totalPages);
+        return newPageOrder;
-			} else {
+    }
-				newPageOrder = GeneralUtils.parsePageList(pageOrderArr, 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++) {
-				newPages.add(document.getPage(newPageOrder.get(i)));
-			}
 
-			// Remove all the pages from the original document
+    private List<Integer> duplexSort(int totalPages) {
-			for (int i = document.getNumberOfPages() - 1; i >= 0; i--) {
+        List<Integer> newPageOrder = new ArrayList<>();
-				document.removePage(i);
+        int half = (totalPages + 1) / 2; // This ensures proper behavior with odd numbers of pages
-			}
+        for (int i = 1; i <= half; i++) {
+            newPageOrder.add(i - 1);
+            if (i <= totalPages - half) { // Avoid going out of bounds
+                newPageOrder.add(totalPages - i);
+            }
+        }
+        return newPageOrder;
+    }
 
-			// Add the pages in the new order
+    private List<Integer> bookletSort(int totalPages) {
-			for (PDPage page : newPages) {
+        List<Integer> newPageOrder = new ArrayList<>();
-				document.addPage(page);
+        for (int i = 0; i < totalPages / 2; i++) {
-			}
+            newPageOrder.add(i);
+            newPageOrder.add(totalPages - i - 1);
+        }
+        return newPageOrder;
+    }
 
-			return WebResponseUtils.pdfDocToWebResponse(document,
+    private List<Integer> sideStitchBooklet(int totalPages) {
-					pdfFile.getOriginalFilename().replaceFirst("[.][^.]+$", "") + "_rearranged.pdf");
+        List<Integer> newPageOrder = new ArrayList<>();
-		} catch (IOException e) {
+        for (int i = 0; i < (totalPages + 3) / 4; i++) {
-			logger.error("Failed rearranging documents", e);
+            int begin = i * 4;
-			return null;
+            newPageOrder.add(Math.min(begin + 3, totalPages - 1));
-		}
+            newPageOrder.add(Math.min(begin, totalPages - 1));
-	}
+            newPageOrder.add(Math.min(begin + 1, totalPages - 1));
+            newPageOrder.add(Math.min(begin + 2, totalPages - 1));
+        }
+        return newPageOrder;
+    }
 
+    private List<Integer> oddEvenSplit(int totalPages) {
+        List<Integer> newPageOrder = new ArrayList<>();
+        for (int i = 1; i <= totalPages; i += 2) {
+            newPageOrder.add(i - 1);
+        }
+        for (int i = 2; i <= totalPages; i += 2) {
+            newPageOrder.add(i - 1);
+        }
+        return newPageOrder;
+    }
 
+    private List<Integer> processSortTypes(String sortTypes, int totalPages) {
+        try {
+            SortTypes mode = SortTypes.valueOf(sortTypes.toUpperCase());
+            switch (mode) {
+                case REVERSE_ORDER:
+                    return reverseOrder(totalPages);
+                case DUPLEX_SORT:
+                    return duplexSort(totalPages);
+                case BOOKLET_SORT:
+                    return bookletSort(totalPages);
+                case SIDE_STITCH_BOOKLET_SORT:
+                    return sideStitchBooklet(totalPages);
+                case ODD_EVEN_SPLIT:
+                    return oddEvenSplit(totalPages);
+                case REMOVE_FIRST:
+                    return removeFirst(totalPages);
+                case REMOVE_LAST:
+                    return removeLast(totalPages);
+                case REMOVE_FIRST_AND_LAST:
+                    return removeFirstAndLast(totalPages);
+                default:
+                    throw new IllegalArgumentException("Unsupported custom mode");
+            }
+        } catch (IllegalArgumentException e) {
+            logger.error("Unsupported custom mode", e);
+            return null;
+        }
+    }
 
+    @PostMapping(consumes = "multipart/form-data", value = "/rearrange-pages")
+    @Operation(
+            summary = "Rearrange pages in a PDF file",
+            description =
+                    "This endpoint rearranges pages in a given PDF file based on the specified page order or custom mode. Users can provide a page order as a comma-separated list of page numbers or page ranges, or a custom mode. Input:PDF Output:PDF")
+    public ResponseEntity<byte[]> rearrangePages(@ModelAttribute RearrangePagesRequest request)
+            throws IOException {
+        MultipartFile pdfFile = request.getFileInput();
+        String pageOrder = request.getPageNumbers();
+        String sortType = request.getCustomMode();
+        try {
+            // Load the input PDF
+            PDDocument document = PDDocument.load(pdfFile.getInputStream());
+
+            // Split the page order string into an array of page numbers or range of numbers
+            String[] pageOrderArr = pageOrder != null ? pageOrder.split(",") : new String[0];
+            int totalPages = document.getNumberOfPages();
+            List<Integer> newPageOrder;
+            if (sortType != null && sortType.length() > 0) {
+                newPageOrder = processSortTypes(sortType, totalPages);
+            } else {
+                newPageOrder = GeneralUtils.parsePageList(pageOrderArr, 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++) {
+                newPages.add(document.getPage(newPageOrder.get(i)));
+            }
+
+            // Remove all the pages from the original document
+            for (int i = document.getNumberOfPages() - 1; i >= 0; i--) {
+                document.removePage(i);
+            }
+
+            // Add the pages in the new order
+            for (PDPage page : newPages) {
+                document.addPage(page);
+            }
+
+            return WebResponseUtils.pdfDocToWebResponse(
+                    document,
+                    pdfFile.getOriginalFilename().replaceFirst("[.][^.]+$", "")
+                            + "_rearranged.pdf");
+        } catch (IOException e) {
+            logger.error("Failed rearranging documents", e);
+            return null;
+        }
+    }
 }

src/main/java/stirling/software/SPDF/controller/api/RotationController.java

@@ -16,6 +16,7 @@ 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.general.RotatePDFRequest;
 import stirling.software.SPDF.utils.WebResponseUtils;
 
@@ -28,11 +29,11 @@ public class RotationController {
 
     @PostMapping(consumes = "multipart/form-data", value = "/rotate-pdf")
     @Operation(
-        summary = "Rotate a PDF file",
+            summary = "Rotate a PDF file",
-        description = "This endpoint rotates a given PDF file by a specified angle. The angle must be a multiple of 90. Input:PDF Output:PDF Type:SISO"
+            description =
-    )
+                    "This endpoint rotates a given PDF file by a specified angle. The angle must be a multiple of 90. Input:PDF Output:PDF Type:SISO")
-    public ResponseEntity<byte[]> rotatePDF(
+    public ResponseEntity<byte[]> rotatePDF(@ModelAttribute RotatePDFRequest request)
-    		@ModelAttribute RotatePDFRequest request) throws IOException {
+            throws IOException {
         MultipartFile pdfFile = request.getFileInput();
         Integer angle = request.getAngle();
         // Load the PDF document
@@ -45,8 +46,8 @@ public class RotationController {
             page.setRotation(page.getRotation() + angle);
         }
 
-        return WebResponseUtils.pdfDocToWebResponse(document, pdfFile.getOriginalFilename().replaceFirst("[.][^.]+$", "") + "_rotated.pdf");
+        return WebResponseUtils.pdfDocToWebResponse(
-
+                document,
+                pdfFile.getOriginalFilename().replaceFirst("[.][^.]+$", "") + "_rotated.pdf");
     }
-
 }

src/main/java/stirling/software/SPDF/controller/api/ScalePagesController.java

@@ -23,88 +23,90 @@ 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.general.ScalePagesRequest;
 import stirling.software.SPDF.utils.WebResponseUtils;
+
 @RestController
 @RequestMapping("/api/v1/general")
 @Tag(name = "General", description = "General APIs")
 public class ScalePagesController {
 
-	private static final Logger logger = LoggerFactory.getLogger(ScalePagesController.class);
+    private static final Logger logger = LoggerFactory.getLogger(ScalePagesController.class);
 
-	@PostMapping(value = "/scale-pages", consumes = "multipart/form-data")
+    @PostMapping(value = "/scale-pages", consumes = "multipart/form-data")
-	@Operation(summary = "Change the size of a PDF page/document", description = "This operation takes an input PDF file and the size to scale the pages to in the output PDF file. Input:PDF Output:PDF Type:SISO")
+    @Operation(
-	public ResponseEntity<byte[]> scalePages(@ModelAttribute ScalePagesRequest request) throws IOException {
+            summary = "Change the size of a PDF page/document",
-	    MultipartFile file = request.getFileInput();
+            description =
-	    String targetPDRectangle = request.getPageSize();
+                    "This operation takes an input PDF file and the size to scale the pages to in the output PDF file. Input:PDF Output:PDF Type:SISO")
-	    float scaleFactor = request.getScaleFactor();
+    public ResponseEntity<byte[]> scalePages(@ModelAttribute ScalePagesRequest request)
+            throws IOException {
+        MultipartFile file = request.getFileInput();
+        String targetPDRectangle = request.getPageSize();
+        float scaleFactor = request.getScaleFactor();
 
-		Map<String, PDRectangle> sizeMap = new HashMap<>();
+        Map<String, PDRectangle> sizeMap = new HashMap<>();
-		// Add A0 - A10
+        // Add A0 - A10
-		sizeMap.put("A0", PDRectangle.A0);
+        sizeMap.put("A0", PDRectangle.A0);
-		sizeMap.put("A1", PDRectangle.A1);
+        sizeMap.put("A1", PDRectangle.A1);
-		sizeMap.put("A2", PDRectangle.A2);
+        sizeMap.put("A2", PDRectangle.A2);
-		sizeMap.put("A3", PDRectangle.A3);
+        sizeMap.put("A3", PDRectangle.A3);
-		sizeMap.put("A4", PDRectangle.A4);
+        sizeMap.put("A4", PDRectangle.A4);
-		sizeMap.put("A5", PDRectangle.A5);
+        sizeMap.put("A5", PDRectangle.A5);
-		sizeMap.put("A6", PDRectangle.A6);
+        sizeMap.put("A6", PDRectangle.A6);
 
-		// Add other sizes
+        // Add other sizes
-		sizeMap.put("LETTER", PDRectangle.LETTER);
+        sizeMap.put("LETTER", PDRectangle.LETTER);
-		sizeMap.put("LEGAL", PDRectangle.LEGAL);
+        sizeMap.put("LEGAL", PDRectangle.LEGAL);
 
-		if (!sizeMap.containsKey(targetPDRectangle)) {
+        if (!sizeMap.containsKey(targetPDRectangle)) {
-			throw new IllegalArgumentException(
+            throw new IllegalArgumentException(
-					"Invalid PDRectangle. It must be one of the following: A0, A1, A2, A3, A4, A5, A6, A7, A8, A9, A10");
+                    "Invalid PDRectangle. It must be one of the following: A0, A1, A2, A3, A4, A5, A6, A7, A8, A9, A10");
-		}
+        }
 
-		PDRectangle targetSize = sizeMap.get(targetPDRectangle);
+        PDRectangle targetSize = sizeMap.get(targetPDRectangle);
 
-	    PDDocument sourceDocument = PDDocument.load(file.getBytes());
+        PDDocument sourceDocument = PDDocument.load(file.getBytes());
-	    PDDocument outputDocument = new PDDocument();
+        PDDocument outputDocument = new PDDocument();
 
-	    int totalPages = sourceDocument.getNumberOfPages();
+        int totalPages = sourceDocument.getNumberOfPages();
-	    for (int i = 0; i < totalPages; i++) {
+        for (int i = 0; i < totalPages; i++) {
-	        PDPage sourcePage = sourceDocument.getPage(i);
+            PDPage sourcePage = sourceDocument.getPage(i);
-	        PDRectangle sourceSize = sourcePage.getMediaBox();
+            PDRectangle sourceSize = sourcePage.getMediaBox();
 
-	        float scaleWidth = targetSize.getWidth() / sourceSize.getWidth();
+            float scaleWidth = targetSize.getWidth() / sourceSize.getWidth();
-	        float scaleHeight = targetSize.getHeight() / sourceSize.getHeight();
+            float scaleHeight = targetSize.getHeight() / sourceSize.getHeight();
-	        float scale = Math.min(scaleWidth, scaleHeight) * scaleFactor;
+            float scale = Math.min(scaleWidth, scaleHeight) * scaleFactor;
 
-	        PDPage newPage = new PDPage(targetSize);
+            PDPage newPage = new PDPage(targetSize);
-	        outputDocument.addPage(newPage);
+            outputDocument.addPage(newPage);
 
-	        PDPageContentStream contentStream = new PDPageContentStream(outputDocument, newPage, PDPageContentStream.AppendMode.APPEND, true);
+            PDPageContentStream contentStream =
+                    new PDPageContentStream(
+                            outputDocument, newPage, PDPageContentStream.AppendMode.APPEND, true);
 
-	        float x = (targetSize.getWidth() - sourceSize.getWidth() * scale) / 2;
+            float x = (targetSize.getWidth() - sourceSize.getWidth() * scale) / 2;
-	        float y = (targetSize.getHeight() - sourceSize.getHeight() * scale) / 2;
+            float y = (targetSize.getHeight() - sourceSize.getHeight() * scale) / 2;
 
-	        contentStream.saveGraphicsState();
+            contentStream.saveGraphicsState();
-	        contentStream.transform(Matrix.getTranslateInstance(x, y));
+            contentStream.transform(Matrix.getTranslateInstance(x, y));
-	        contentStream.transform(Matrix.getScaleInstance(scale, scale));
+            contentStream.transform(Matrix.getScaleInstance(scale, scale));
 
-	        LayerUtility layerUtility = new LayerUtility(outputDocument);
+            LayerUtility layerUtility = new LayerUtility(outputDocument);
-	        PDFormXObject form = layerUtility.importPageAsForm(sourceDocument, i);
+            PDFormXObject form = layerUtility.importPageAsForm(sourceDocument, i);
-	        contentStream.drawForm(form);
+            contentStream.drawForm(form);
 
-	        contentStream.restoreGraphicsState();
+            contentStream.restoreGraphicsState();
-	        contentStream.close();
+            contentStream.close();
-	    }
+        }
-
-
-
-
-
-	    ByteArrayOutputStream baos = new ByteArrayOutputStream();
-	    outputDocument.save(baos);
-	    outputDocument.close();
-	    sourceDocument.close();
-	    
-	    
-		return WebResponseUtils.bytesToWebResponse(baos.toByteArray(),
-				file.getOriginalFilename().replaceFirst("[.][^.]+$", "") + "_scaled.pdf");
-	}
 
+        ByteArrayOutputStream baos = new ByteArrayOutputStream();
+        outputDocument.save(baos);
+        outputDocument.close();
+        sourceDocument.close();
 
+        return WebResponseUtils.bytesToWebResponse(
+                baos.toByteArray(),
+                file.getOriginalFilename().replaceFirst("[.][^.]+$", "") + "_scaled.pdf");
+    }
 }

src/main/java/stirling/software/SPDF/controller/api/SplitPDFController.java

@@ -25,6 +25,7 @@ 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.PDFWithPageNums;
 import stirling.software.SPDF.utils.WebResponseUtils;
 
@@ -36,19 +37,24 @@ public class SplitPDFController {
     private static final Logger logger = LoggerFactory.getLogger(SplitPDFController.class);
 
     @PostMapping(consumes = "multipart/form-data", value = "/split-pages")
-    @Operation(summary = "Split a PDF file into separate documents",
+    @Operation(
-            description = "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")
+            summary = "Split a PDF file into separate documents",
-    public ResponseEntity<byte[]> splitPdf(@ModelAttribute PDFWithPageNums request) throws IOException {
+            description =
-    	MultipartFile file = request.getFileInput();
+                    "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
         InputStream inputStream = file.getInputStream();
         PDDocument document = PDDocument.load(inputStream);
 
         List<Integer> pageNumbers = request.getPageNumbersList(document);
-        if(!pageNumbers.contains(document.getNumberOfPages() - 1))
+        if (!pageNumbers.contains(document.getNumberOfPages() - 1))
-        	pageNumbers.add(document.getNumberOfPages()- 1);
+            pageNumbers.add(document.getNumberOfPages() - 1);
-        logger.info("Splitting PDF into pages: {}", pageNumbers.stream().map(String::valueOf).collect(Collectors.joining(",")));
+        logger.info(
+                "Splitting PDF into pages: {}",
+                pageNumbers.stream().map(String::valueOf).collect(Collectors.joining(",")));
 
         // split the document
         List<ByteArrayOutputStream> splitDocumentsBoas = new ArrayList<>();
@@ -72,7 +78,6 @@ public class SplitPDFController {
             }
         }
 
-
         // closing the original document
         document.close();
 
@@ -104,8 +109,7 @@ public class SplitPDFController {
         Files.delete(zipFile);
 
         // return the Resource in the response
-        return WebResponseUtils.bytesToWebResponse(data, filename + ".zip", MediaType.APPLICATION_OCTET_STREAM);
+        return WebResponseUtils.bytesToWebResponse(
-        
+                data, filename + ".zip", MediaType.APPLICATION_OCTET_STREAM);
     }
-
 }

src/main/java/stirling/software/SPDF/controller/api/SplitPdfBySectionsController.java

@@ -1,4 +1,5 @@
 package stirling.software.SPDF.controller.api;
+
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.nio.file.Files;
@@ -25,17 +26,22 @@ 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.SplitPdfBySectionsRequest;
 import stirling.software.SPDF.utils.WebResponseUtils;
+
 @RestController
 @RequestMapping("/api/v1/general")
 @Tag(name = "General", description = "General APIs")
 public class SplitPdfBySectionsController {
 
-
+    @PostMapping(value = "/split-pdf-by-sections", consumes = "multipart/form-data")
-	@PostMapping(value = "/split-pdf-by-sections", consumes = "multipart/form-data")
+    @Operation(
-    @Operation(summary = "Split PDF pages into smaller sections", description = "Split each page of a PDF into smaller sections based on the user's choice (halves, thirds, quarters, etc.), both vertically and horizontally. Input:PDF Output:ZIP-PDF Type:SISO")
+            summary = "Split PDF pages into smaller sections",
-    public ResponseEntity<byte[]> splitPdf(@ModelAttribute SplitPdfBySectionsRequest request) throws Exception {
+            description =
+                    "Split each page of a PDF into smaller sections based on the user's choice (halves, thirds, quarters, etc.), both vertically and horizontally. Input:PDF Output:ZIP-PDF Type:SISO")
+    public ResponseEntity<byte[]> splitPdf(@ModelAttribute SplitPdfBySectionsRequest request)
+            throws Exception {
         List<ByteArrayOutputStream> splitDocumentsBoas = new ArrayList<>();
 
         MultipartFile file = request.getFileInput();
@@ -59,8 +65,6 @@ public class SplitPdfBySectionsController {
         String filename = file.getOriginalFilename().replaceFirst("[.][^.]+$", "");
         byte[] data;
 
-
-        
         try (ZipOutputStream zipOut = new ZipOutputStream(Files.newOutputStream(zipFile))) {
             int pageNum = 1;
             for (int i = 0; i < splitDocumentsBoas.size(); i++) {
@@ -82,10 +86,13 @@ public class SplitPdfBySectionsController {
             Files.delete(zipFile);
         }
 
-        return WebResponseUtils.bytesToWebResponse(data, filename + "_split.zip", MediaType.APPLICATION_OCTET_STREAM);
+        return WebResponseUtils.bytesToWebResponse(
+                data, filename + "_split.zip", MediaType.APPLICATION_OCTET_STREAM);
     }
 
-    public List<PDDocument> splitPdfPages(PDDocument document, int horizontalDivisions, int verticalDivisions) throws IOException {
+    public List<PDDocument> splitPdfPages(
+            PDDocument document, int horizontalDivisions, int verticalDivisions)
+            throws IOException {
         List<PDDocument> splitDocuments = new ArrayList<>();
 
         for (PDPage originalPage : document.getPages()) {
@@ -103,13 +110,20 @@ public class SplitPdfBySectionsController {
                     PDPage subPage = new PDPage(new PDRectangle(subPageWidth, subPageHeight));
                     subDoc.addPage(subPage);
 
-                    PDFormXObject form = layerUtility.importPageAsForm(document, document.getPages().indexOf(originalPage));
+                    PDFormXObject form =
+                            layerUtility.importPageAsForm(
+                                    document, document.getPages().indexOf(originalPage));
 
-                    try (PDPageContentStream contentStream = new PDPageContentStream(subDoc, subPage)) {
+                    try (PDPageContentStream contentStream =
+                            new PDPageContentStream(subDoc, subPage)) {
                         // Set clipping area and position
                         float translateX = -subPageWidth * i;
                         float translateY = height - subPageHeight * (verticalDivisions - j);
                         
+                        
+                        //Code for google Docs pdfs..
+                        //float translateY = -subPageHeight * (verticalDivisions - 1 - j);
+                        
                         contentStream.saveGraphicsState();
                         contentStream.addRect(0, 0, subPageWidth, subPageHeight);
                         contentStream.clip();
@@ -127,9 +141,4 @@ public class SplitPdfBySectionsController {
 
         return splitDocuments;
     }
-
-
-
-    
-
 }

src/main/java/stirling/software/SPDF/controller/api/SplitPdfBySizeController.java

@@ -1,4 +1,5 @@
 package stirling.software.SPDF.controller.api;
+
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.nio.file.Files;
@@ -20,6 +21,7 @@ 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.general.SplitPdfBySizeOrCountRequest;
 import stirling.software.SPDF.utils.GeneralUtils;
 import stirling.software.SPDF.utils.WebResponseUtils;
@@ -29,19 +31,20 @@ import stirling.software.SPDF.utils.WebResponseUtils;
 @Tag(name = "General", description = "General APIs")
 public class SplitPdfBySizeController {
 
-
     @PostMapping(value = "/split-by-size-or-count", consumes = "multipart/form-data")
-    @Operation(summary = "Auto split PDF pages into separate documents based on size or count", description = "split PDF into multiple paged documents based on size/count, ie if 20 pages and split into 5, it does 5 documents each 4 pages\r\n"
+    @Operation(
-    		+ " if 10MB and each page is 1MB and you enter 2MB then 5 docs each 2MB (rounded so that it accepts 1.9MB but not 2.1MB) Input:PDF Output:ZIP-PDF Type:SISO")
+            summary = "Auto split PDF pages into separate documents based on size or count",
-    public ResponseEntity<byte[]> autoSplitPdf(@ModelAttribute SplitPdfBySizeOrCountRequest request) throws Exception {
+            description =
-    	List<ByteArrayOutputStream> splitDocumentsBoas = new ArrayList<ByteArrayOutputStream>();
+                    "split PDF into multiple paged documents based on size/count, ie if 20 pages and split into 5, it does 5 documents each 4 pages\r\n"
-        
+                            + " if 10MB and each page is 1MB and you enter 2MB then 5 docs each 2MB (rounded so that it accepts 1.9MB but not 2.1MB) Input:PDF Output:ZIP-PDF Type:SISO")
-        
+    public ResponseEntity<byte[]> autoSplitPdf(@ModelAttribute SplitPdfBySizeOrCountRequest request)
+            throws Exception {
+        List<ByteArrayOutputStream> splitDocumentsBoas = new ArrayList<ByteArrayOutputStream>();
 
         MultipartFile file = request.getFileInput();
         PDDocument sourceDocument = PDDocument.load(file.getInputStream());
 
-        //0 = size, 1 = page count, 2 = doc count
+        // 0 = size, 1 = page count, 2 = doc count
         int type = request.getSplitType();
         String value = request.getSplitValue();
 
@@ -93,7 +96,7 @@ public class SplitPdfBySizeController {
                 splitDocumentsBoas.add(currentDocToByteArray(currentDoc));
             }
         } else if (type == 2) { // Split by doc count
-        	int documentCount = Integer.parseInt(value);
+            int documentCount = Integer.parseInt(value);
             int totalPageCount = sourceDocument.getNumberOfPages();
             int pagesPerDocument = totalPageCount / documentCount;
             int extraPages = totalPageCount % documentCount;
@@ -115,8 +118,6 @@ public class SplitPdfBySizeController {
 
         sourceDocument.close();
 
-        
-        
         Path zipFile = Files.createTempFile("split_documents", ".zip");
         String filename = file.getOriginalFilename().replaceFirst("[.][^.]+$", "");
         byte[] data;
@@ -135,11 +136,12 @@ public class SplitPdfBySizeController {
         } catch (Exception e) {
             e.printStackTrace();
         } finally {
-        	data = Files.readAllBytes(zipFile);
+            data = Files.readAllBytes(zipFile);
             Files.delete(zipFile);
         }
 
-        return WebResponseUtils.bytesToWebResponse(data, filename + ".zip", MediaType.APPLICATION_OCTET_STREAM);
+        return WebResponseUtils.bytesToWebResponse(
+                data, filename + ".zip", MediaType.APPLICATION_OCTET_STREAM);
     }
 
     private ByteArrayOutputStream currentDocToByteArray(PDDocument document) throws IOException {
@@ -148,6 +150,4 @@ public class SplitPdfBySizeController {
         document.close();
         return baos;
     }
-    
-
 }

src/main/java/stirling/software/SPDF/controller/api/ToSinglePageController.java

@@ -20,8 +20,10 @@ import org.springframework.web.bind.annotation.RestController;
 
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
+
 import stirling.software.SPDF.model.api.PDFFile;
 import stirling.software.SPDF.utils.WebResponseUtils;
+
 @RestController
 @RequestMapping("/api/v1/general")
 @Tag(name = "General", description = "General APIs")
@@ -29,58 +31,61 @@ public class ToSinglePageController {
 
     private static final Logger logger = LoggerFactory.getLogger(ToSinglePageController.class);
 
-   
     @PostMapping(consumes = "multipart/form-data", value = "/pdf-to-single-page")
     @Operation(
-        summary = "Convert a multi-page PDF into a single long page PDF",
+            summary = "Convert a multi-page PDF into a single long page PDF",
-        description = "This endpoint converts a multi-page PDF document into a single paged PDF document. The width of the single page will be same as the input's width, but the height will be the sum of all the pages' heights. Input:PDF Output:PDF Type:SISO"
+            description =
-    )
+                    "This endpoint converts a multi-page PDF document into a single paged PDF document. The width of the single page will be same as the input's width, but the height will be the sum of all the pages' heights. Input:PDF Output:PDF Type:SISO")
-    public ResponseEntity<byte[]> pdfToSinglePage(@ModelAttribute PDFFile request) throws IOException {
+    public ResponseEntity<byte[]> pdfToSinglePage(@ModelAttribute PDFFile request)
+            throws IOException {
 
-    	// Load the source document
+        // Load the source document
-    	PDDocument sourceDocument = PDDocument.load(request.getFileInput().getInputStream());
+        PDDocument sourceDocument = PDDocument.load(request.getFileInput().getInputStream());
 
-    	// Calculate total height and max width
+        // Calculate total height and max width
-    	float totalHeight = 0;
+        float totalHeight = 0;
-    	float maxWidth = 0;
+        float maxWidth = 0;
-    	for (PDPage page : sourceDocument.getPages()) {
+        for (PDPage page : sourceDocument.getPages()) {
-    	    PDRectangle pageSize = page.getMediaBox();
+            PDRectangle pageSize = page.getMediaBox();
-    	    totalHeight += pageSize.getHeight();
+            totalHeight += pageSize.getHeight();
-    	    maxWidth = Math.max(maxWidth, pageSize.getWidth());
+            maxWidth = Math.max(maxWidth, pageSize.getWidth());
-    	}
+        }
 
-    	// Create new document and page with calculated dimensions
+        // Create new document and page with calculated dimensions
-    	PDDocument newDocument = new PDDocument();
+        PDDocument newDocument = new PDDocument();
-    	PDPage newPage = new PDPage(new PDRectangle(maxWidth, totalHeight));
+        PDPage newPage = new PDPage(new PDRectangle(maxWidth, totalHeight));
-    	newDocument.addPage(newPage);
+        newDocument.addPage(newPage);
 
-    	// Initialize the content stream of the new page
+        // Initialize the content stream of the new page
-    	PDPageContentStream contentStream = new PDPageContentStream(newDocument, newPage);
+        PDPageContentStream contentStream = new PDPageContentStream(newDocument, newPage);
-    	contentStream.close();
+        contentStream.close();
-    	
-    	LayerUtility layerUtility = new LayerUtility(newDocument);
-    	float yOffset = totalHeight;
-
-    	// For each page, copy its content to the new page at the correct offset
-    	for (PDPage page : sourceDocument.getPages()) {
-    	    PDFormXObject form = layerUtility.importPageAsForm(sourceDocument, sourceDocument.getPages().indexOf(page));
-    	    AffineTransform af = AffineTransform.getTranslateInstance(0, yOffset - page.getMediaBox().getHeight());
-    	    layerUtility.wrapInSaveRestore(newPage);
-    	    String defaultLayerName = "Layer" + sourceDocument.getPages().indexOf(page);
-    	    layerUtility.appendFormAsLayer(newPage, form, af, defaultLayerName);
-    	    yOffset -= page.getMediaBox().getHeight();
-    	}
-
-    	ByteArrayOutputStream baos = new ByteArrayOutputStream();
-    	newDocument.save(baos);
-    	newDocument.close();
-    	sourceDocument.close();
-
-    	byte[] result = baos.toByteArray();
-    	return WebResponseUtils.bytesToWebResponse(result, request.getFileInput().getOriginalFilename().replaceFirst("[.][^.]+$", "") + "_singlePage.pdf");
 
+        LayerUtility layerUtility = new LayerUtility(newDocument);
+        float yOffset = totalHeight;
 
+        // For each page, copy its content to the new page at the correct offset
+        for (PDPage page : sourceDocument.getPages()) {
+            PDFormXObject form =
+                    layerUtility.importPageAsForm(
+                            sourceDocument, sourceDocument.getPages().indexOf(page));
+            AffineTransform af =
+                    AffineTransform.getTranslateInstance(
+                            0, yOffset - page.getMediaBox().getHeight());
+            layerUtility.wrapInSaveRestore(newPage);
+            String defaultLayerName = "Layer" + sourceDocument.getPages().indexOf(page);
+            layerUtility.appendFormAsLayer(newPage, form, af, defaultLayerName);
+            yOffset -= page.getMediaBox().getHeight();
+        }
 
+        ByteArrayOutputStream baos = new ByteArrayOutputStream();
+        newDocument.save(baos);
+        newDocument.close();
+        sourceDocument.close();
 
+        byte[] result = baos.toByteArray();
+        return WebResponseUtils.bytesToWebResponse(
+                result,
+                request.getFileInput().getOriginalFilename().replaceFirst("[.][^.]+$", "")
+                        + "_singlePage.pdf");
     }
 }

src/main/java/stirling/software/SPDF/controller/api/UserController.java

@@ -30,13 +30,13 @@ import stirling.software.SPDF.model.User;
 @RequestMapping("/api/v1/user")
 public class UserController {
 
-    @Autowired
+    @Autowired private UserService userService;
-    private UserService userService;
 
     @PreAuthorize("!hasAuthority('ROLE_DEMO_USER')")
     @PostMapping("/register")
-    public String register(@RequestParam String username, @RequestParam String password, Model model) {
+    public String register(
-        if(userService.usernameExists(username)) {
+            @RequestParam String username, @RequestParam String password, Model model) {
+        if (userService.usernameExists(username)) {
             model.addAttribute("error", "Username already exists");
             return "register";
         }
@@ -47,36 +47,38 @@ public class UserController {
 
     @PreAuthorize("!hasAuthority('ROLE_DEMO_USER')")
     @PostMapping("/change-username-and-password")
-    public RedirectView changeUsernameAndPassword(Principal principal,
+    public RedirectView changeUsernameAndPassword(
-                                                 @RequestParam String currentPassword, 
+            Principal principal,
-                                                 @RequestParam String newUsername, 
+            @RequestParam String currentPassword,
-                                                 @RequestParam String newPassword, 
+            @RequestParam String newUsername,
-                                                 HttpServletRequest request, 
+            @RequestParam String newPassword,
-                                                 HttpServletResponse response,
+            HttpServletRequest request,
-                                                 RedirectAttributes redirectAttributes) {
+            HttpServletResponse response,
-    	if (principal == null) {
+            RedirectAttributes redirectAttributes) {
-    	    return new RedirectView("/change-creds?messageType=notAuthenticated");
+        if (principal == null) {
-    	}
+            return new RedirectView("/change-creds?messageType=notAuthenticated");
+        }
 
-    	Optional<User> userOpt = userService.findByUsername(principal.getName());
+        Optional<User> userOpt = userService.findByUsername(principal.getName());
 
-    	if (userOpt == null || userOpt.isEmpty()) {
+        if (userOpt == null || userOpt.isEmpty()) {
-    	    return new RedirectView("/change-creds?messageType=userNotFound");
+            return new RedirectView("/change-creds?messageType=userNotFound");
-    	}
+        }
 
-    	User user = userOpt.get();
+        User user = userOpt.get();
 
-    	if (!userService.isPasswordCorrect(user, currentPassword)) {
+        if (!userService.isPasswordCorrect(user, currentPassword)) {
-    	    return new RedirectView("/change-creds?messageType=incorrectPassword");
+            return new RedirectView("/change-creds?messageType=incorrectPassword");
-    	}
+        }
-
-    	if (!user.getUsername().equals(newUsername) && userService.usernameExists(newUsername)) {
-    	    return new RedirectView("/change-creds?messageType=usernameExists");
-    	}
 
+        if (!user.getUsername().equals(newUsername) && userService.usernameExists(newUsername)) {
+            return new RedirectView("/change-creds?messageType=usernameExists");
+        }
 
         userService.changePassword(user, newPassword);
-        if(newUsername != null && newUsername.length() > 0 && !user.getUsername().equals(newUsername)) {
+        if (newUsername != null
+                && newUsername.length() > 0
+                && !user.getUsername().equals(newUsername)) {
             userService.changeUsername(user, newUsername);
         }
         userService.changeFirstUse(user, false);
@@ -87,36 +89,36 @@ public class UserController {
         return new RedirectView("/login?messageType=credsUpdated");
     }
 
-
     @PreAuthorize("!hasAuthority('ROLE_DEMO_USER')")
     @PostMapping("/change-username")
-    public RedirectView changeUsername(Principal principal,
+    public RedirectView changeUsername(
-                                       @RequestParam String currentPassword, 
+            Principal principal,
-                                       @RequestParam String newUsername, 
+            @RequestParam String currentPassword,
-                                       HttpServletRequest request, 
+            @RequestParam String newUsername,
-                                       HttpServletResponse response,
+            HttpServletRequest request,
-                                       RedirectAttributes redirectAttributes) {
+            HttpServletResponse response,
-    	if (principal == null) {
+            RedirectAttributes redirectAttributes) {
-    	    return new RedirectView("/account?messageType=notAuthenticated");
+        if (principal == null) {
-    	}
+            return new RedirectView("/account?messageType=notAuthenticated");
+        }
 
-    	Optional<User> userOpt = userService.findByUsername(principal.getName());
+        Optional<User> userOpt = userService.findByUsername(principal.getName());
 
-    	if (userOpt == null || userOpt.isEmpty()) {
+        if (userOpt == null || userOpt.isEmpty()) {
-    	    return new RedirectView("/account?messageType=userNotFound");
+            return new RedirectView("/account?messageType=userNotFound");
-    	}
+        }
 
-    	User user = userOpt.get();
+        User user = userOpt.get();
 
-    	if (!userService.isPasswordCorrect(user, currentPassword)) {
+        if (!userService.isPasswordCorrect(user, currentPassword)) {
-    	    return new RedirectView("/account?messageType=incorrectPassword");
+            return new RedirectView("/account?messageType=incorrectPassword");
-    	}
+        }
 
-    	if (!user.getUsername().equals(newUsername) && userService.usernameExists(newUsername)) {
+        if (!user.getUsername().equals(newUsername) && userService.usernameExists(newUsername)) {
-    	    return new RedirectView("/account?messageType=usernameExists");
+            return new RedirectView("/account?messageType=usernameExists");
-    	}
+        }
 
-    	if(newUsername != null && newUsername.length() > 0) {
+        if (newUsername != null && newUsername.length() > 0) {
             userService.changeUsername(user, newUsername);
         }
 
@@ -128,27 +130,28 @@ public class UserController {
 
     @PreAuthorize("!hasAuthority('ROLE_DEMO_USER')")
     @PostMapping("/change-password")
-    public RedirectView changePassword(Principal principal, 
+    public RedirectView changePassword(
-                                       @RequestParam String currentPassword, 
+            Principal principal,
-                                       @RequestParam String newPassword, 
+            @RequestParam String currentPassword,
-                                       HttpServletRequest request, 
+            @RequestParam String newPassword,
-                                       HttpServletResponse response,
+            HttpServletRequest request,
-                                       RedirectAttributes redirectAttributes) {
+            HttpServletResponse response,
-    	if (principal == null) {
+            RedirectAttributes redirectAttributes) {
-    	    return new RedirectView("/account?messageType=notAuthenticated");
+        if (principal == null) {
-    	}
+            return new RedirectView("/account?messageType=notAuthenticated");
+        }
 
-    	Optional<User> userOpt = userService.findByUsername(principal.getName());
+        Optional<User> userOpt = userService.findByUsername(principal.getName());
 
-    	if (userOpt == null || userOpt.isEmpty()) {
+        if (userOpt == null || userOpt.isEmpty()) {
-    	    return new RedirectView("/account?messageType=userNotFound");
+            return new RedirectView("/account?messageType=userNotFound");
-    	}
+        }
 
-    	User user = userOpt.get();
+        User user = userOpt.get();
 
-    	if (!userService.isPasswordCorrect(user, currentPassword)) {
+        if (!userService.isPasswordCorrect(user, currentPassword)) {
-    	    return new RedirectView("/account?messageType=incorrectPassword");
+            return new RedirectView("/account?messageType=incorrectPassword");
-    	}
+        }
 
         userService.changePassword(user, newPassword);
 
@@ -160,33 +163,37 @@ public class UserController {
 
     @PreAuthorize("!hasAuthority('ROLE_DEMO_USER')")
     @PostMapping("/updateUserSettings")
-	public String updateUserSettings(HttpServletRequest request, Principal principal) {
+    public String updateUserSettings(HttpServletRequest request, Principal principal) {
-	    Map<String, String[]> paramMap = request.getParameterMap();
+        Map<String, String[]> paramMap = request.getParameterMap();
-	    Map<String, String> updates = new HashMap<>();
+        Map<String, String> updates = new HashMap<>();
 
-	    System.out.println("Received parameter map: " + paramMap);
+        System.out.println("Received parameter map: " + paramMap);
 
-	    for (Map.Entry<String, String[]> entry : paramMap.entrySet()) {
+        for (Map.Entry<String, String[]> entry : paramMap.entrySet()) {
-	        updates.put(entry.getKey(), entry.getValue()[0]);
+            updates.put(entry.getKey(), entry.getValue()[0]);
-	    }
+        }
 
-	    System.out.println("Processed updates: " + updates);
+        System.out.println("Processed updates: " + updates);
 
-	    // Assuming you have a method in userService to update the settings for a user
+        // Assuming you have a method in userService to update the settings for a user
-	    userService.updateUserSettings(principal.getName(), updates);
+        userService.updateUserSettings(principal.getName(), updates);
 
-	    return "redirect:/account";  // Redirect to a page of your choice after updating
+        return "redirect:/account"; // Redirect to a page of your choice after updating
-	}
+    }
 
     @PreAuthorize("hasRole('ROLE_ADMIN')")
     @PostMapping("/admin/saveUser")
-    public RedirectView saveUser(@RequestParam String username, @RequestParam String password, @RequestParam String role, 
+    public RedirectView saveUser(
-    		@RequestParam(name = "forceChange", required = false, defaultValue = "false") boolean forceChange) {
+            @RequestParam String username,
+            @RequestParam String password,
+            @RequestParam String role,
+            @RequestParam(name = "forceChange", required = false, defaultValue = "false")
+                    boolean forceChange) {
 
-    	if(userService.usernameExists(username)) {
+        if (userService.usernameExists(username)) {
-    		return new RedirectView("/addUsers?messageType=usernameExists");
+            return new RedirectView("/addUsers?messageType=usernameExists");
-    	}
+        }
-    	try {
+        try {
             // Validate the role
             Role roleEnum = Role.fromString(role);
             if (roleEnum == Role.INTERNAL_API_USER) {
@@ -199,15 +206,14 @@ public class UserController {
         }
 
         userService.saveUser(username, password, role, forceChange);
-        return new RedirectView("/addUsers");  // Redirect to account page after adding the user
+        return new RedirectView("/addUsers"); // Redirect to account page after adding the user
     }
 
-    
     @PreAuthorize("hasRole('ROLE_ADMIN')")
     @PostMapping("/admin/deleteUser/{username}")
-    public String deleteUser(@PathVariable String username,  Authentication authentication) {
+    public String deleteUser(@PathVariable String username, Authentication authentication) {
 
-    	// Get the currently authenticated username
+        // Get the currently authenticated username
         String currentUsername = authentication.getName();
 
         // Check if the provided username matches the current session's username
@@ -215,7 +221,7 @@ public class UserController {
             throw new IllegalArgumentException("Cannot delete currently logined in user.");
         }
 
-    	userService.deleteUser(username); 
+        userService.deleteUser(username);
         return "redirect:/addUsers";
     }
 
@@ -247,6 +253,4 @@ public class UserController {
         }
         return ResponseEntity.ok(apiKey);
     }
-    
-    
 }

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

@@ -9,6 +9,7 @@ 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.GeneralFile;
 import stirling.software.SPDF.utils.FileToPdf;
 import stirling.software.SPDF.utils.WebResponseUtils;
@@ -18,35 +19,30 @@ import stirling.software.SPDF.utils.WebResponseUtils;
 @RequestMapping("/api/v1/convert")
 public class ConvertHtmlToPDF {
 
+    @PostMapping(consumes = "multipart/form-data", value = "/html/pdf")
+    @Operation(
+            summary = "Convert an HTML or ZIP (containing HTML and CSS) to PDF",
+            description =
+                    "This endpoint takes an HTML or ZIP file input and converts it to a PDF format.")
+    public ResponseEntity<byte[]> HtmlToPdf(@ModelAttribute GeneralFile request) throws Exception {
+        MultipartFile fileInput = request.getFileInput();
 
-	 @PostMapping(consumes = "multipart/form-data", value = "/html/pdf")
+        if (fileInput == null) {
-	    @Operation(
+            throw new IllegalArgumentException(
-	        summary = "Convert an HTML or ZIP (containing HTML and CSS) to PDF",
+                    "Please provide an HTML or ZIP file for conversion.");
-	        description = "This endpoint takes an HTML or ZIP file input and converts it to a PDF format."
+        }
-	    )
-	    public ResponseEntity<byte[]> HtmlToPdf(
-	    		@ModelAttribute GeneralFile request) 
-	    		        throws Exception {
-	    			MultipartFile fileInput = request.getFileInput();
-
-	        if (fileInput == null) {
-	            throw new IllegalArgumentException("Please provide an HTML or ZIP file for conversion.");
-	        }
-
-	        String originalFilename = fileInput.getOriginalFilename();
-	        if (originalFilename == null || (!originalFilename.endsWith(".html") && !originalFilename.endsWith(".zip"))) {
-	            throw new IllegalArgumentException("File must be either .html or .zip format.");
-	        }byte[] pdfBytes = FileToPdf.convertHtmlToPdf( fileInput.getBytes(), originalFilename);
-	        
-	        String outputFilename = originalFilename.replaceFirst("[.][^.]+$", "") + ".pdf";  // Remove file extension and append .pdf
-	        
-	        return WebResponseUtils.bytesToWebResponse(pdfBytes, outputFilename);
-	    }
-
-	   
-
-    
 
+        String originalFilename = fileInput.getOriginalFilename();
+        if (originalFilename == null
+                || (!originalFilename.endsWith(".html") && !originalFilename.endsWith(".zip"))) {
+            throw new IllegalArgumentException("File must be either .html or .zip format.");
+        }
+        byte[] pdfBytes = FileToPdf.convertHtmlToPdf(fileInput.getBytes(), originalFilename);
 
+        String outputFilename =
+                originalFilename.replaceFirst("[.][^.]+$", "")
+                        + ".pdf"; // Remove file extension and append .pdf
 
+        return WebResponseUtils.bytesToWebResponse(pdfBytes, outputFilename);
+    }
 }

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

@@ -20,6 +20,7 @@ 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.converters.ConvertToImageRequest;
 import stirling.software.SPDF.model.api.converters.ConvertToPdfRequest;
 import stirling.software.SPDF.utils.PdfUtils;
@@ -33,9 +34,12 @@ public class ConvertImgPDFController {
     private static final Logger logger = LoggerFactory.getLogger(ConvertImgPDFController.class);
 
     @PostMapping(consumes = "multipart/form-data", value = "/pdf/img")
-    @Operation(summary = "Convert PDF to image(s)",
+    @Operation(
-            description = "This endpoint converts a PDF file to image(s) with the specified image format, color type, and DPI. Users can choose to get a single image or multiple images.  Input:PDF Output:Image Type:SI-Conditional")
+            summary = "Convert PDF to image(s)",
-    public ResponseEntity<Resource> convertToImage(@ModelAttribute ConvertToImageRequest request) throws IOException {
+            description =
+                    "This endpoint converts a PDF file to image(s) with the specified image format, color type, and DPI. Users can choose to get a single image or multiple images.  Input:PDF Output:Image Type:SI-Conditional")
+    public ResponseEntity<Resource> convertToImage(@ModelAttribute ConvertToImageRequest request)
+            throws IOException {
         MultipartFile file = request.getFileInput();
         String imageFormat = request.getImageFormat();
         String singleOrMultiple = request.getSingleOrMultiple();
@@ -54,7 +58,14 @@ public class ConvertImgPDFController {
         byte[] result = null;
         String filename = file.getOriginalFilename().replaceFirst("[.][^.]+$", "");
         try {
-            result = PdfUtils.convertFromPdf(pdfBytes, imageFormat.toUpperCase(), colorTypeResult, singleImage, Integer.valueOf(dpi), filename);
+            result =
+                    PdfUtils.convertFromPdf(
+                            pdfBytes,
+                            imageFormat.toUpperCase(),
+                            colorTypeResult,
+                            singleImage,
+                            Integer.valueOf(dpi),
+                            filename);
         } catch (IOException e) {
             // TODO Auto-generated catch block
             e.printStackTrace();
@@ -65,21 +76,29 @@ public class ConvertImgPDFController {
         if (singleImage) {
             HttpHeaders headers = new HttpHeaders();
             headers.setContentType(MediaType.parseMediaType(getMediaType(imageFormat)));
-            ResponseEntity<Resource> response = new ResponseEntity<>(new ByteArrayResource(result), headers, HttpStatus.OK);
+            ResponseEntity<Resource> response =
+                    new ResponseEntity<>(new ByteArrayResource(result), headers, HttpStatus.OK);
             return response;
         } else {
             ByteArrayResource resource = new ByteArrayResource(result);
             // return the Resource in the response
             return ResponseEntity.ok()
-                    .header(HttpHeaders.CONTENT_DISPOSITION, "attachment; filename=" + filename + "_convertedToImages.zip")
+                    .header(
-                    .contentType(MediaType.APPLICATION_OCTET_STREAM).contentLength(resource.contentLength()).body(resource);
+                            HttpHeaders.CONTENT_DISPOSITION,
+                            "attachment; filename=" + filename + "_convertedToImages.zip")
+                    .contentType(MediaType.APPLICATION_OCTET_STREAM)
+                    .contentLength(resource.contentLength())
+                    .body(resource);
         }
     }
 
     @PostMapping(consumes = "multipart/form-data", value = "/img/pdf")
-    @Operation(summary = "Convert images to a PDF file",
+    @Operation(
-            description = "This endpoint converts one or more images to a PDF file. Users can specify whether to stretch the images to fit the PDF page, and whether to automatically rotate the images. Input:Image Output:PDF Type:SISO?")
+            summary = "Convert images to a PDF file",
-    public ResponseEntity<byte[]> convertToPdf(@ModelAttribute ConvertToPdfRequest request) throws IOException {
+            description =
+                    "This endpoint converts one or more images to a PDF file. Users can specify whether to stretch the images to fit the PDF page, and whether to automatically rotate the images. Input:Image Output:PDF Type:SISO?")
+    public ResponseEntity<byte[]> convertToPdf(@ModelAttribute ConvertToPdfRequest request)
+            throws IOException {
         MultipartFile[] file = request.getFileInput();
         String fitOption = request.getFitOption();
         String colorType = request.getColorType();
@@ -87,7 +106,9 @@ public class ConvertImgPDFController {
 
         // Convert the file to PDF and get the resulting bytes
         byte[] bytes = PdfUtils.imageToPdf(file, fitOption, autoRotate, colorType);
-        return WebResponseUtils.bytesToWebResponse(bytes, file[0].getOriginalFilename().replaceFirst("[.][^.]+$", "") + "_converted.pdf");
+        return WebResponseUtils.bytesToWebResponse(
+                bytes,
+                file[0].getOriginalFilename().replaceFirst("[.][^.]+$", "") + "_converted.pdf");
     }
 
     private String getMediaType(String imageFormat) {

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

@@ -12,6 +12,7 @@ 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.GeneralFile;
 import stirling.software.SPDF.utils.FileToPdf;
 import stirling.software.SPDF.utils.WebResponseUtils;
@@ -21,15 +22,14 @@ import stirling.software.SPDF.utils.WebResponseUtils;
 @RequestMapping("/api/v1/convert")
 public class ConvertMarkdownToPdf {
 
-	@PostMapping(consumes = "multipart/form-data", value = "/markdown/pdf")
+    @PostMapping(consumes = "multipart/form-data", value = "/markdown/pdf")
     @Operation(
-        summary = "Convert a Markdown file to PDF",
+            summary = "Convert a Markdown file to PDF",
-        description = "This endpoint takes a Markdown file input, converts it to HTML, and then to PDF format."
+            description =
-    )
+                    "This endpoint takes a Markdown file input, converts it to HTML, and then to PDF format.")
-    public ResponseEntity<byte[]> markdownToPdf(
+    public ResponseEntity<byte[]> markdownToPdf(@ModelAttribute GeneralFile request)
-    		@ModelAttribute GeneralFile request) 
+            throws Exception {
-    		        throws Exception {
+        MultipartFile fileInput = request.getFileInput();
-    			MultipartFile fileInput = request.getFileInput();
 
         if (fileInput == null) {
             throw new IllegalArgumentException("Please provide a Markdown file for conversion.");
@@ -48,7 +48,9 @@ public class ConvertMarkdownToPdf {
 
         byte[] pdfBytes = FileToPdf.convertHtmlToPdf(htmlContent.getBytes(), "converted.html");
 
-        String outputFilename = originalFilename.replaceFirst("[.][^.]+$", "") + ".pdf";  // Remove file extension and append .pdf
+        String outputFilename =
+                originalFilename.replaceFirst("[.][^.]+$", "")
+                        + ".pdf"; // Remove file extension and append .pdf
         return WebResponseUtils.bytesToWebResponse(pdfBytes, outputFilename);
     }
 }

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

@@ -18,6 +18,7 @@ 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.GeneralFile;
 import stirling.software.SPDF.utils.ProcessExecutor;
 import stirling.software.SPDF.utils.ProcessExecutor.ProcessExecutorResult;
@@ -31,20 +32,33 @@ public class ConvertOfficeController {
     public byte[] convertToPdf(MultipartFile inputFile) throws IOException, InterruptedException {
         // Check for valid file extension
         String originalFilename = inputFile.getOriginalFilename();
-        if (originalFilename == null || !isValidFileExtension(FilenameUtils.getExtension(originalFilename))) {
+        if (originalFilename == null
+                || !isValidFileExtension(FilenameUtils.getExtension(originalFilename))) {
             throw new IllegalArgumentException("Invalid file extension");
         }
 
         // Save the uploaded file to a temporary location
-        Path tempInputFile = Files.createTempFile("input_", "." + FilenameUtils.getExtension(originalFilename));
+        Path tempInputFile =
+                Files.createTempFile("input_", "." + FilenameUtils.getExtension(originalFilename));
         Files.copy(inputFile.getInputStream(), tempInputFile, StandardCopyOption.REPLACE_EXISTING);
 
         // Prepare the output file path
         Path tempOutputFile = Files.createTempFile("output_", ".pdf");
 
         // Run the LibreOffice command
-        List<String> command = new ArrayList<>(Arrays.asList("unoconv", "-vvv", "-f", "pdf", "-o", tempOutputFile.toString(), tempInputFile.toString()));
+        List<String> command =
-        ProcessExecutorResult returnCode = ProcessExecutor.getInstance(ProcessExecutor.Processes.LIBRE_OFFICE).runCommandWithOutputHandling(command);
+                new ArrayList<>(
+                        Arrays.asList(
+                                "unoconv",
+                                "-vvv",
+                                "-f",
+                                "pdf",
+                                "-o",
+                                tempOutputFile.toString(),
+                                tempInputFile.toString()));
+        ProcessExecutorResult returnCode =
+                ProcessExecutor.getInstance(ProcessExecutor.Processes.LIBRE_OFFICE)
+                        .runCommandWithOutputHandling(command);
 
         // Read the converted PDF file
         byte[] pdfBytes = Files.readAllBytes(tempOutputFile);
@@ -55,6 +69,7 @@ public class ConvertOfficeController {
 
         return pdfBytes;
     }
+
     private boolean isValidFileExtension(String fileExtension) {
         String extensionPattern = "^(?i)[a-z0-9]{2,4}$";
         return fileExtension.matches(extensionPattern);
@@ -62,17 +77,19 @@ public class ConvertOfficeController {
 
     @PostMapping(consumes = "multipart/form-data", value = "/file/pdf")
     @Operation(
-        summary = "Convert a file to a PDF using LibreOffice",
+            summary = "Convert a file to a PDF using LibreOffice",
-        description = "This endpoint converts a given file to a PDF using LibreOffice API  Input:Any Output:PDF Type:SISO"
+            description =
-    )
+                    "This endpoint converts a given file to a PDF using LibreOffice API  Input:ANY Output:PDF Type:SISO")
     public ResponseEntity<byte[]> processFileToPDF(@ModelAttribute GeneralFile request)
-	        throws Exception {
+            throws Exception {
-		MultipartFile inputFile = request.getFileInput();
+        MultipartFile inputFile = request.getFileInput();
         // unused but can start server instance if startup time is to long
         // LibreOfficeListener.getInstance().start();
 
         byte[] pdfByteArray = convertToPdf(inputFile);
-        return WebResponseUtils.bytesToWebResponse(pdfByteArray, inputFile.getOriginalFilename().replaceFirst("[.][^.]+$", "") + "_convertedToPDF.pdf");
+        return WebResponseUtils.bytesToWebResponse(
+                pdfByteArray,
+                inputFile.getOriginalFilename().replaceFirst("[.][^.]+$", "")
+                        + "_convertedToPDF.pdf");
     }
-
 }

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

@@ -11,6 +11,7 @@ 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.PDFFile;
 import stirling.software.SPDF.model.api.converters.PdfToPresentationRequest;
 import stirling.software.SPDF.model.api.converters.PdfToTextOrRTFRequest;
@@ -22,51 +23,70 @@ import stirling.software.SPDF.utils.PDFToFile;
 @Tag(name = "Convert", description = "Convert APIs")
 public class ConvertPDFToOffice {
 
-	@PostMapping(consumes = "multipart/form-data", value = "/pdf/html")
+    @PostMapping(consumes = "multipart/form-data", value = "/pdf/html")
-	@Operation(summary = "Convert PDF to HTML", description = "This endpoint converts a PDF file to HTML format. Input:PDF Output:HTML Type:SISO")
+    @Operation(
-	public ResponseEntity<byte[]> processPdfToHTML(@ModelAttribute PDFFile request) 
+            summary = "Convert PDF to HTML",
-	        throws Exception {
+            description =
-		MultipartFile inputFile = request.getFileInput();
+                    "This endpoint converts a PDF file to HTML format. Input:PDF Output:HTML Type:SISO")
-		PDFToFile pdfToFile = new PDFToFile();
+    public ResponseEntity<byte[]> processPdfToHTML(@ModelAttribute PDFFile request)
-		return pdfToFile.processPdfToOfficeFormat(inputFile, "html", "writer_pdf_import");
+            throws Exception {
-	}
+        MultipartFile inputFile = request.getFileInput();
+        PDFToFile pdfToFile = new PDFToFile();
+        return pdfToFile.processPdfToOfficeFormat(inputFile, "html", "writer_pdf_import");
+    }
 
-	@PostMapping(consumes = "multipart/form-data", value = "/pdf/presentation")
+    @PostMapping(consumes = "multipart/form-data", value = "/pdf/presentation")
-	@Operation(summary = "Convert PDF to Presentation format", description = "This endpoint converts a given PDF file to a Presentation format. Input:PDF Output:PPT Type:SISO")
+    @Operation(
-	public ResponseEntity<byte[]> processPdfToPresentation(@ModelAttribute PdfToPresentationRequest request) throws IOException, InterruptedException {
+            summary = "Convert PDF to Presentation format",
-	    MultipartFile inputFile = request.getFileInput();
+            description =
-	    String outputFormat = request.getOutputFormat();
+                    "This endpoint converts a given PDF file to a Presentation format. Input:PDF Output:PPT Type:SISO")
-		PDFToFile pdfToFile = new PDFToFile();
+    public ResponseEntity<byte[]> processPdfToPresentation(
-		return pdfToFile.processPdfToOfficeFormat(inputFile, outputFormat, "impress_pdf_import");
+            @ModelAttribute PdfToPresentationRequest request)
-	}
+            throws IOException, InterruptedException {
+        MultipartFile inputFile = request.getFileInput();
+        String outputFormat = request.getOutputFormat();
+        PDFToFile pdfToFile = new PDFToFile();
+        return pdfToFile.processPdfToOfficeFormat(inputFile, outputFormat, "impress_pdf_import");
+    }
 
-	@PostMapping(consumes = "multipart/form-data", value = "/pdf/text")
+    @PostMapping(consumes = "multipart/form-data", value = "/pdf/text")
-	@Operation(summary = "Convert PDF to Text or RTF format", description = "This endpoint converts a given PDF file to Text or RTF format. Input:PDF Output:TXT Type:SISO")
+    @Operation(
-	public ResponseEntity<byte[]> processPdfToRTForTXT(@ModelAttribute PdfToTextOrRTFRequest request) throws IOException, InterruptedException {
+            summary = "Convert PDF to Text or RTF format",
-	    MultipartFile inputFile = request.getFileInput();
+            description =
-	    String outputFormat = request.getOutputFormat();
+                    "This endpoint converts a given PDF file to Text or RTF format. Input:PDF Output:TXT Type:SISO")
+    public ResponseEntity<byte[]> processPdfToRTForTXT(
+            @ModelAttribute PdfToTextOrRTFRequest request)
+            throws IOException, InterruptedException {
+        MultipartFile inputFile = request.getFileInput();
+        String outputFormat = request.getOutputFormat();
 
-		PDFToFile pdfToFile = new PDFToFile();
+        PDFToFile pdfToFile = new PDFToFile();
-		return pdfToFile.processPdfToOfficeFormat(inputFile, outputFormat, "writer_pdf_import");
+        return pdfToFile.processPdfToOfficeFormat(inputFile, outputFormat, "writer_pdf_import");
-	}
+    }
 
-	@PostMapping(consumes = "multipart/form-data", value = "/pdf/word")
+    @PostMapping(consumes = "multipart/form-data", value = "/pdf/word")
-	@Operation(summary = "Convert PDF to Word document", description = "This endpoint converts a given PDF file to a Word document format. Input:PDF Output:WORD Type:SISO")
+    @Operation(
-	public ResponseEntity<byte[]> processPdfToWord(@ModelAttribute PdfToWordRequest request) throws IOException, InterruptedException {
+            summary = "Convert PDF to Word document",
-	    MultipartFile inputFile = request.getFileInput();
+            description =
-	    String outputFormat = request.getOutputFormat();
+                    "This endpoint converts a given PDF file to a Word document format. Input:PDF Output:WORD Type:SISO")
-		PDFToFile pdfToFile = new PDFToFile();
+    public ResponseEntity<byte[]> processPdfToWord(@ModelAttribute PdfToWordRequest request)
-		return pdfToFile.processPdfToOfficeFormat(inputFile, outputFormat, "writer_pdf_import");
+            throws IOException, InterruptedException {
-	}
+        MultipartFile inputFile = request.getFileInput();
+        String outputFormat = request.getOutputFormat();
+        PDFToFile pdfToFile = new PDFToFile();
+        return pdfToFile.processPdfToOfficeFormat(inputFile, outputFormat, "writer_pdf_import");
+    }
 
-	@PostMapping(consumes = "multipart/form-data", value = "/pdf/xml")
+    @PostMapping(consumes = "multipart/form-data", value = "/pdf/xml")
-	@Operation(summary = "Convert PDF to XML", description = "This endpoint converts a PDF file to an XML file. Input:PDF Output:XML Type:SISO")
+    @Operation(
-	public ResponseEntity<byte[]> processPdfToXML(@ModelAttribute PDFFile request) 
+            summary = "Convert PDF to XML",
-	        throws Exception {
+            description =
-		MultipartFile inputFile = request.getFileInput();
+                    "This endpoint converts a PDF file to an XML file. Input:PDF Output:XML Type:SISO")
-
+    public ResponseEntity<byte[]> processPdfToXML(@ModelAttribute PDFFile request)
-		PDFToFile pdfToFile = new PDFToFile();
+            throws Exception {
-		return pdfToFile.processPdfToOfficeFormat(inputFile, "xml", "writer_pdf_import");
+        MultipartFile inputFile = request.getFileInput();
-	}
 
+        PDFToFile pdfToFile = new PDFToFile();
+        return pdfToFile.processPdfToOfficeFormat(inputFile, "xml", "writer_pdf_import");
+    }
 }

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

@@ -14,6 +14,7 @@ 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.PDFFile;
 import stirling.software.SPDF.utils.ProcessExecutor;
 import stirling.software.SPDF.utils.ProcessExecutor.ProcessExecutorResult;
@@ -24,14 +25,13 @@ import stirling.software.SPDF.utils.WebResponseUtils;
 @Tag(name = "Convert", description = "Convert APIs")
 public class ConvertPDFToPDFA {
 
-	@PostMapping(consumes = "multipart/form-data", value = "/pdf/pdfa")
+    @PostMapping(consumes = "multipart/form-data", value = "/pdf/pdfa")
-	@Operation(
+    @Operation(
-	    summary = "Convert a PDF to a PDF/A",
+            summary = "Convert a PDF to a PDF/A",
-	    description = "This endpoint converts a PDF file to a PDF/A file. PDF/A is a format designed for long-term archiving of digital documents. Input:PDF Output:PDF Type:SISO"
+            description =
-	)
+                    "This endpoint converts a PDF file to a PDF/A file. PDF/A is a format designed for long-term archiving of digital documents. Input:PDF Output:PDF Type:SISO")
-	public ResponseEntity<byte[]> pdfToPdfA(@ModelAttribute PDFFile request) 
+    public ResponseEntity<byte[]> pdfToPdfA(@ModelAttribute PDFFile request) throws Exception {
-	        throws Exception {
+        MultipartFile inputFile = request.getFileInput();
-		MultipartFile inputFile = request.getFileInput();
 
         // Save the uploaded file to a temporary location
         Path tempInputFile = Files.createTempFile("input_", ".pdf");
@@ -50,7 +50,9 @@ public class ConvertPDFToPDFA {
         command.add(tempInputFile.toString());
         command.add(tempOutputFile.toString());
 
-        ProcessExecutorResult returnCode = ProcessExecutor.getInstance(ProcessExecutor.Processes.OCR_MY_PDF).runCommandWithOutputHandling(command);
+        ProcessExecutorResult returnCode =
+                ProcessExecutor.getInstance(ProcessExecutor.Processes.OCR_MY_PDF)
+                        .runCommandWithOutputHandling(command);
 
         // Read the optimized PDF file
         byte[] pdfBytes = Files.readAllBytes(tempOutputFile);
@@ -60,8 +62,8 @@ public class ConvertPDFToPDFA {
         Files.delete(tempOutputFile);
 
         // Return the optimized PDF as a response
-        String outputFilename = inputFile.getOriginalFilename().replaceFirst("[.][^.]+$", "") + "_PDFA.pdf";
+        String outputFilename =
+                inputFile.getOriginalFilename().replaceFirst("[.][^.]+$", "") + "_PDFA.pdf";
         return WebResponseUtils.bytesToWebResponse(pdfBytes, outputFilename);
     }
-
 }

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

@@ -14,6 +14,7 @@ import org.springframework.web.bind.annotation.RestController;
 
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
+
 import stirling.software.SPDF.model.api.converters.UrlToPdfRequest;
 import stirling.software.SPDF.utils.GeneralUtils;
 import stirling.software.SPDF.utils.ProcessExecutor;
@@ -25,52 +26,52 @@ import stirling.software.SPDF.utils.WebResponseUtils;
 @RequestMapping("/api/v1/convert")
 public class ConvertWebsiteToPDF {
 
-	@PostMapping(consumes = "multipart/form-data", value = "/url/pdf")
+    @PostMapping(consumes = "multipart/form-data", value = "/url/pdf")
-	@Operation(
+    @Operation(
-	    summary = "Convert a URL to a PDF",
+            summary = "Convert a URL to a PDF",
-	    description = "This endpoint fetches content from a URL and converts it to a PDF format. Input:N/A Output:PDF Type:SISO"
+            description =
-	)
+                    "This endpoint fetches content from a URL and converts it to a PDF format. Input:N/A Output:PDF Type:SISO")
-	public ResponseEntity<byte[]> urlToPdf(@ModelAttribute UrlToPdfRequest request) throws IOException, InterruptedException {
+    public ResponseEntity<byte[]> urlToPdf(@ModelAttribute UrlToPdfRequest request)
-	    String URL = request.getUrlInput();
+            throws IOException, InterruptedException {
+        String URL = request.getUrlInput();
 
-	    // Validate the URL format
+        // Validate the URL format
-	    if(!URL.matches("^https?://.*") || !GeneralUtils.isValidURL(URL)) {
+        if (!URL.matches("^https?://.*") || !GeneralUtils.isValidURL(URL)) {
-	        throw new IllegalArgumentException("Invalid URL format provided.");
+            throw new IllegalArgumentException("Invalid URL format provided.");
-	    }
+        }
-	    Path tempOutputFile = null;
+        Path tempOutputFile = null;
-	    byte[] pdfBytes;
+        byte[] pdfBytes;
-	    try {
+        try {
-		    // Prepare the output file path
+            // Prepare the output file path
-		    tempOutputFile = Files.createTempFile("output_", ".pdf");
+            tempOutputFile = Files.createTempFile("output_", ".pdf");
 
-		    // Prepare the OCRmyPDF command
+            // Prepare the OCRmyPDF command
-		    List<String> command = new ArrayList<>();
+            List<String> command = new ArrayList<>();
-		    command.add("weasyprint");
+            command.add("weasyprint");
-		    command.add(URL);
+            command.add(URL);
-		    command.add(tempOutputFile.toString());
+            command.add(tempOutputFile.toString());
 
-		    ProcessExecutorResult returnCode = ProcessExecutor.getInstance(ProcessExecutor.Processes.WEASYPRINT).runCommandWithOutputHandling(command);
+            ProcessExecutorResult returnCode =
+                    ProcessExecutor.getInstance(ProcessExecutor.Processes.WEASYPRINT)
+                            .runCommandWithOutputHandling(command);
 
-		    // Read the optimized PDF file
+            // Read the optimized PDF file
-		    pdfBytes = Files.readAllBytes(tempOutputFile);
+            pdfBytes = Files.readAllBytes(tempOutputFile);
-	    }
+        } finally {
-	    finally {
+            // Clean up the temporary files
-		    // Clean up the temporary files
+            Files.delete(tempOutputFile);
-		    Files.delete(tempOutputFile);
+        }
-	    }
+        // Convert URL to a safe filename
-	    // Convert URL to a safe filename
+        String outputFilename = convertURLToFileName(URL);
-	    String outputFilename = convertURLToFileName(URL);
-	    
-	    return WebResponseUtils.bytesToWebResponse(pdfBytes, outputFilename);
-	}
-
-	private String convertURLToFileName(String url) {
-	    String safeName = url.replaceAll("[^a-zA-Z0-9]", "_");
-	    if(safeName.length() > 50) {
-	        safeName = safeName.substring(0, 50); // restrict to 50 characters
-	    }
-	    return safeName + ".pdf";
-	}
 
+        return WebResponseUtils.bytesToWebResponse(pdfBytes, outputFilename);
+    }
 
+    private String convertURLToFileName(String url) {
+        String safeName = url.replaceAll("[^a-zA-Z0-9]", "_");
+        if (safeName.length() > 50) {
+            safeName = safeName.substring(0, 50); // restrict to 50 characters
+        }
+        return safeName + ".pdf";
+    }
 }

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

@@ -22,6 +22,7 @@ import com.opencsv.CSVWriter;
 
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
+
 import stirling.software.SPDF.controller.api.CropController;
 import stirling.software.SPDF.controller.api.strippers.PDFTableStripper;
 import stirling.software.SPDF.model.api.extract.PDFFilePage;
@@ -34,21 +35,24 @@ public class ExtractController {
     private static final Logger logger = LoggerFactory.getLogger(CropController.class);
 
     @PostMapping(value = "/pdf/csv", consumes = "multipart/form-data")
-    @Operation(summary = "Extracts a PDF document to csv", description = "This operation takes an input PDF file and returns CSV file of whole page. Input:PDF Output:CSV Type:SISO")
+    @Operation(
-    public ResponseEntity<String> PdfToCsv(@ModelAttribute PDFFilePage form)
+            summary = "Extracts a PDF document to csv",
-            throws Exception {
+            description =
+                    "This operation takes an input PDF file and returns CSV file of whole page. Input:PDF Output:CSV Type:SISO")
+    public ResponseEntity<String> PdfToCsv(@ModelAttribute PDFFilePage form) throws Exception {
 
         ArrayList<String> tableData = new ArrayList<>();
         int columnsCount = 0;
 
-        try (PDDocument document = PDDocument.load(new ByteArrayInputStream(form.getFileInput().getBytes()))) {
+        try (PDDocument document =
+                PDDocument.load(new ByteArrayInputStream(form.getFileInput().getBytes()))) {
             final double res = 72; // PDF units are at 72 DPI
             PDFTableStripper stripper = new PDFTableStripper();
             PDPage pdPage = document.getPage(form.getPageId() - 1);
             stripper.extractTable(pdPage);
             columnsCount = stripper.getColumns();
             for (int c = 0; c < columnsCount; ++c) {
-                for(int r=0; r<stripper.getRows(); ++r) {
+                for (int r = 0; r < stripper.getRows(); ++r) {
                     tableData.add(stripper.getText(r, c));
                 }
             }
@@ -56,24 +60,31 @@ public class ExtractController {
 
         ArrayList<String> notEmptyColumns = new ArrayList<>();
 
-        for (String item: tableData) {
+        for (String item : tableData) {
-            if(!item.trim().isEmpty()){
+            if (!item.trim().isEmpty()) {
                 notEmptyColumns.add(item);
-            }else{
+            } else {
                 columnsCount--;
             }
         }
 
-        List<String> fullTable  =  notEmptyColumns.stream().map((entity)->
+        List<String> fullTable =
-            entity.replace('\n',' ').replace('\r',' ').trim().replaceAll("\\s{2,}", "|")).toList();
+                notEmptyColumns.stream()
+                        .map(
+                                (entity) ->
+                                        entity.replace('\n', ' ')
+                                                .replace('\r', ' ')
+                                                .trim()
+                                                .replaceAll("\\s{2,}", "|"))
+                        .toList();
 
         int rowsCount = fullTable.get(0).split("\\|").length;
 
-        ArrayList<String> headersList = getTableHeaders(columnsCount,fullTable);
+        ArrayList<String> headersList = getTableHeaders(columnsCount, fullTable);
-        ArrayList<String> recordList = getRecordsList(rowsCount,fullTable);
+        ArrayList<String> recordList = getRecordsList(rowsCount, fullTable);
 
-        if(headersList.size() == 0 && recordList.size() == 0) {
+        if (headersList.size() == 0 && recordList.size() == 0) {
-        	throw new Exception("No table detected, no headers or records found");
+            throw new Exception("No table detected, no headers or records found");
         }
 
         StringWriter writer = new StringWriter();
@@ -85,35 +96,41 @@ public class ExtractController {
         }
 
         HttpHeaders headers = new HttpHeaders();
-        headers.setContentDisposition(ContentDisposition.builder("attachment").filename(form.getFileInput().getOriginalFilename().replaceFirst("[.][^.]+$", "") + "_extracted.csv").build());
+        headers.setContentDisposition(
+                ContentDisposition.builder("attachment")
+                        .filename(
+                                form.getFileInput()
+                                                .getOriginalFilename()
+                                                .replaceFirst("[.][^.]+$", "")
+                                        + "_extracted.csv")
+                        .build());
         headers.setContentType(MediaType.parseMediaType("text/csv"));
 
-        return ResponseEntity.ok()
+        return ResponseEntity.ok().headers(headers).body(writer.toString());
-                .headers(headers)
-                .body(writer.toString());
     }
 
-    private ArrayList<String> getRecordsList( int rowsCounts ,List<String> items){
+    private ArrayList<String> getRecordsList(int rowsCounts, List<String> items) {
         ArrayList<String> recordsList = new ArrayList<>();
 
-            for (int b=1; b<rowsCounts;b++) {
+        for (int b = 1; b < rowsCounts; b++) {
-                StringBuilder strbldr = new StringBuilder();
+            StringBuilder strbldr = new StringBuilder();
 
-                for (int i=0;i<items.size();i++){
+            for (int i = 0; i < items.size(); i++) {
-                    String[] parts = items.get(i).split("\\|");
+                String[] parts = items.get(i).split("\\|");
-                    strbldr.append(parts[b]);
+                strbldr.append(parts[b]);
-                    if (i!= items.size()-1){
+                if (i != items.size() - 1) {
-                        strbldr.append("|");
+                    strbldr.append("|");
-                    }
                 }
-                recordsList.add(strbldr.toString());
             }
+            recordsList.add(strbldr.toString());
+        }
 
         return recordsList;
     }
-    private ArrayList<String> getTableHeaders(int columnsCount, List<String> items){
+
+    private ArrayList<String> getTableHeaders(int columnsCount, List<String> items) {
         ArrayList<String> resultList = new ArrayList<>();
-        for (int i=0;i<columnsCount;i++){
+        for (int i = 0; i < columnsCount; i++) {
             String[] parts = items.get(i).split("\\|");
             resultList.add(parts[0]);
         }

src/main/java/stirling/software/SPDF/controller/api/filters/FilterController.java

@@ -14,6 +14,7 @@ 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.PDFComparisonAndCount;
 import stirling.software.SPDF.model.api.PDFWithPageNums;
 import stirling.software.SPDF.model.api.filter.ContainsTextRequest;
@@ -28,169 +29,182 @@ import stirling.software.SPDF.utils.WebResponseUtils;
 @Tag(name = "Filter", description = "Filter APIs")
 public class FilterController {
 
-	@PostMapping(consumes = "multipart/form-data", value = "/filter-contains-text")
+    @PostMapping(consumes = "multipart/form-data", value = "/filter-contains-text")
-	@Operation(summary = "Checks if a PDF contains set text, returns true if does", description = "Input:PDF Output:Boolean Type:SISO")
+    @Operation(
-	public ResponseEntity<byte[]> containsText(@ModelAttribute ContainsTextRequest request) throws IOException, InterruptedException {
+            summary = "Checks if a PDF contains set text, returns true if does",
-	    MultipartFile inputFile = request.getFileInput();
+            description = "Input:PDF Output:Boolean Type:SISO")
-	    String text = request.getText();
+    public ResponseEntity<byte[]> containsText(@ModelAttribute ContainsTextRequest request)
-	    String pageNumber = request.getPageNumbers();
+            throws IOException, InterruptedException {
+        MultipartFile inputFile = request.getFileInput();
+        String text = request.getText();
+        String pageNumber = request.getPageNumbers();
 
-		PDDocument pdfDocument = PDDocument.load(inputFile.getInputStream());
+        PDDocument pdfDocument = PDDocument.load(inputFile.getInputStream());
-		if (PdfUtils.hasText(pdfDocument, pageNumber, text))
+        if (PdfUtils.hasText(pdfDocument, pageNumber, text))
-			return WebResponseUtils.pdfDocToWebResponse(pdfDocument, inputFile.getOriginalFilename());
+            return WebResponseUtils.pdfDocToWebResponse(
-		return null;
+                    pdfDocument, inputFile.getOriginalFilename());
-	}
+        return null;
+    }
 
-	// TODO
+    // TODO
-	@PostMapping(consumes = "multipart/form-data", value = "/filter-contains-image")
+    @PostMapping(consumes = "multipart/form-data", value = "/filter-contains-image")
-	@Operation(summary = "Checks if a PDF contains an image", description = "Input:PDF Output:Boolean Type:SISO")
+    @Operation(
-	public ResponseEntity<byte[]> containsImage(@ModelAttribute PDFWithPageNums request)
+            summary = "Checks if a PDF contains an image",
-			throws IOException, InterruptedException {
+            description = "Input:PDF Output:Boolean Type:SISO")
-		MultipartFile inputFile = request.getFileInput();
+    public ResponseEntity<byte[]> containsImage(@ModelAttribute PDFWithPageNums request)
-	    String pageNumber = request.getPageNumbers();
+            throws IOException, InterruptedException {
+        MultipartFile inputFile = request.getFileInput();
+        String pageNumber = request.getPageNumbers();
 
-		PDDocument pdfDocument = PDDocument.load(inputFile.getInputStream());
+        PDDocument pdfDocument = PDDocument.load(inputFile.getInputStream());
-		if (PdfUtils.hasImages(pdfDocument, pageNumber))
+        if (PdfUtils.hasImages(pdfDocument, pageNumber))
-			return WebResponseUtils.pdfDocToWebResponse(pdfDocument, inputFile.getOriginalFilename());
+            return WebResponseUtils.pdfDocToWebResponse(
-		return null;
+                    pdfDocument, inputFile.getOriginalFilename());
-	}
+        return null;
+    }
 
-	@PostMapping(consumes = "multipart/form-data", value = "/filter-page-count")
+    @PostMapping(consumes = "multipart/form-data", value = "/filter-page-count")
-	@Operation(summary = "Checks if a PDF is greater, less or equal to a setPageCount", description = "Input:PDF Output:Boolean Type:SISO")
+    @Operation(
-	public ResponseEntity<byte[]> pageCount(@ModelAttribute PDFComparisonAndCount request) throws IOException, InterruptedException {
+            summary = "Checks if a PDF is greater, less or equal to a setPageCount",
-	    MultipartFile inputFile = request.getFileInput();
+            description = "Input:PDF Output:Boolean Type:SISO")
-	    String pageCount = request.getPageCount();
+    public ResponseEntity<byte[]> pageCount(@ModelAttribute PDFComparisonAndCount request)
-	    String comparator = request.getComparator();
+            throws IOException, InterruptedException {
-		// Load the PDF
+        MultipartFile inputFile = request.getFileInput();
-		PDDocument document = PDDocument.load(inputFile.getInputStream());
+        String pageCount = request.getPageCount();
-		int actualPageCount = document.getNumberOfPages();
+        String comparator = request.getComparator();
+        // Load the PDF
+        PDDocument document = PDDocument.load(inputFile.getInputStream());
+        int actualPageCount = document.getNumberOfPages();
 
-		boolean valid = false;
+        boolean valid = false;
-		// Perform the comparison
+        // Perform the comparison
-		switch (comparator) {
+        switch (comparator) {
-		case "Greater":
+            case "Greater":
-			valid = actualPageCount > Integer.parseInt(pageCount);
+                valid = actualPageCount > Integer.parseInt(pageCount);
-			break;
+                break;
-		case "Equal":
+            case "Equal":
-			valid = actualPageCount == Integer.parseInt(pageCount);
+                valid = actualPageCount == Integer.parseInt(pageCount);
-			break;
+                break;
-		case "Less":
+            case "Less":
-			valid = actualPageCount < Integer.parseInt(pageCount);
+                valid = actualPageCount < Integer.parseInt(pageCount);
-			break;
+                break;
-		default:
+            default:
-			throw new IllegalArgumentException("Invalid comparator: " + comparator);
+                throw new IllegalArgumentException("Invalid comparator: " + comparator);
-		}
+        }
 
-		if (valid)
+        if (valid) return WebResponseUtils.multiPartFileToWebResponse(inputFile);
-			return WebResponseUtils.multiPartFileToWebResponse(inputFile);
+        return null;
-		return null;
+    }
-	}
 
-	@PostMapping(consumes = "multipart/form-data", value = "/filter-page-size")
+    @PostMapping(consumes = "multipart/form-data", value = "/filter-page-size")
-	@Operation(summary = "Checks if a PDF is of a certain size", description = "Input:PDF Output:Boolean Type:SISO")
+    @Operation(
-	public ResponseEntity<byte[]> pageSize(@ModelAttribute PageSizeRequest request) throws IOException, InterruptedException {
+            summary = "Checks if a PDF is of a certain size",
-	    MultipartFile inputFile = request.getFileInput();
+            description = "Input:PDF Output:Boolean Type:SISO")
-	    String standardPageSize = request.getStandardPageSize();
+    public ResponseEntity<byte[]> pageSize(@ModelAttribute PageSizeRequest request)
-	    String comparator = request.getComparator();
+            throws IOException, InterruptedException {
+        MultipartFile inputFile = request.getFileInput();
+        String standardPageSize = request.getStandardPageSize();
+        String comparator = request.getComparator();
 
-		// Load the PDF
+        // Load the PDF
-		PDDocument document = PDDocument.load(inputFile.getInputStream());
+        PDDocument document = PDDocument.load(inputFile.getInputStream());
 
-		PDPage firstPage = document.getPage(0);
+        PDPage firstPage = document.getPage(0);
-		PDRectangle actualPageSize = firstPage.getMediaBox();
+        PDRectangle actualPageSize = firstPage.getMediaBox();
 
-		// Calculate the area of the actual page size
+        // Calculate the area of the actual page size
-		float actualArea = actualPageSize.getWidth() * actualPageSize.getHeight();
+        float actualArea = actualPageSize.getWidth() * actualPageSize.getHeight();
 
-		// Get the standard size and calculate its area
+        // Get the standard size and calculate its area
-		PDRectangle standardSize = PdfUtils.textToPageSize(standardPageSize);
+        PDRectangle standardSize = PdfUtils.textToPageSize(standardPageSize);
-		float standardArea = standardSize.getWidth() * standardSize.getHeight();
+        float standardArea = standardSize.getWidth() * standardSize.getHeight();
 
-		boolean valid = false;
+        boolean valid = false;
-		// Perform the comparison
+        // Perform the comparison
-		switch (comparator) {
+        switch (comparator) {
-		case "Greater":
+            case "Greater":
-			valid = actualArea > standardArea;
+                valid = actualArea > standardArea;
-			break;
+                break;
-		case "Equal":
+            case "Equal":
-			valid = actualArea == standardArea;
+                valid = actualArea == standardArea;
-			break;
+                break;
-		case "Less":
+            case "Less":
-			valid = actualArea < standardArea;
+                valid = actualArea < standardArea;
-			break;
+                break;
-		default:
+            default:
-			throw new IllegalArgumentException("Invalid comparator: " + comparator);
+                throw new IllegalArgumentException("Invalid comparator: " + comparator);
-		}
+        }
 
-		if (valid)
+        if (valid) return WebResponseUtils.multiPartFileToWebResponse(inputFile);
-			return WebResponseUtils.multiPartFileToWebResponse(inputFile);
+        return null;
-		return null;
+    }
-	}
 
-	@PostMapping(consumes = "multipart/form-data", value = "/filter-file-size")
+    @PostMapping(consumes = "multipart/form-data", value = "/filter-file-size")
-	@Operation(summary = "Checks if a PDF is a set file size", description = "Input:PDF Output:Boolean Type:SISO")
+    @Operation(
-	public ResponseEntity<byte[]> fileSize(@ModelAttribute FileSizeRequest request) throws IOException, InterruptedException {
+            summary = "Checks if a PDF is a set file size",
-	    MultipartFile inputFile = request.getFileInput();
+            description = "Input:PDF Output:Boolean Type:SISO")
-	    String fileSize = request.getFileSize();
+    public ResponseEntity<byte[]> fileSize(@ModelAttribute FileSizeRequest request)
-	    String comparator = request.getComparator();
+            throws IOException, InterruptedException {
+        MultipartFile inputFile = request.getFileInput();
+        String fileSize = request.getFileSize();
+        String comparator = request.getComparator();
 
-		// Get the file size
+        // Get the file size
-		long actualFileSize = inputFile.getSize();
+        long actualFileSize = inputFile.getSize();
 
-		boolean valid = false;
+        boolean valid = false;
-		// Perform the comparison
+        // Perform the comparison
-		switch (comparator) {
+        switch (comparator) {
-		case "Greater":
+            case "Greater":
-			valid = actualFileSize > Long.parseLong(fileSize);
+                valid = actualFileSize > Long.parseLong(fileSize);
-			break;
+                break;
-		case "Equal":
+            case "Equal":
-			valid = actualFileSize == Long.parseLong(fileSize);
+                valid = actualFileSize == Long.parseLong(fileSize);
-			break;
+                break;
-		case "Less":
+            case "Less":
-			valid = actualFileSize < Long.parseLong(fileSize);
+                valid = actualFileSize < Long.parseLong(fileSize);
-			break;
+                break;
-		default:
+            default:
-			throw new IllegalArgumentException("Invalid comparator: " + comparator);
+                throw new IllegalArgumentException("Invalid comparator: " + comparator);
-		}
+        }
 
-		if (valid)
+        if (valid) return WebResponseUtils.multiPartFileToWebResponse(inputFile);
-			return WebResponseUtils.multiPartFileToWebResponse(inputFile);
+        return null;
-		return null;
+    }
-	}
 
-	@PostMapping(consumes = "multipart/form-data", value = "/filter-page-rotation")
+    @PostMapping(consumes = "multipart/form-data", value = "/filter-page-rotation")
-	@Operation(summary = "Checks if a PDF is of a certain rotation", description = "Input:PDF Output:Boolean Type:SISO")
+    @Operation(
-	public ResponseEntity<byte[]> pageRotation(@ModelAttribute PageRotationRequest request) throws IOException, InterruptedException {
+            summary = "Checks if a PDF is of a certain rotation",
-	    MultipartFile inputFile = request.getFileInput();
+            description = "Input:PDF Output:Boolean Type:SISO")
-	    int rotation = request.getRotation();
+    public ResponseEntity<byte[]> pageRotation(@ModelAttribute PageRotationRequest request)
-	    String comparator = request.getComparator();
+            throws IOException, InterruptedException {
+        MultipartFile inputFile = request.getFileInput();
+        int rotation = request.getRotation();
+        String comparator = request.getComparator();
 
-		// Load the PDF
+        // Load the PDF
-		PDDocument document = PDDocument.load(inputFile.getInputStream());
+        PDDocument document = PDDocument.load(inputFile.getInputStream());
 
-		// Get the rotation of the first page
+        // Get the rotation of the first page
-		PDPage firstPage = document.getPage(0);
+        PDPage firstPage = document.getPage(0);
-		int actualRotation = firstPage.getRotation();
+        int actualRotation = firstPage.getRotation();
-		boolean valid = false;
+        boolean valid = false;
-		// Perform the comparison
+        // Perform the comparison
-		switch (comparator) {
+        switch (comparator) {
-		case "Greater":
+            case "Greater":
-			valid = actualRotation > rotation;
+                valid = actualRotation > rotation;
-			break;
+                break;
-		case "Equal":
+            case "Equal":
-			valid = actualRotation == rotation;
+                valid = actualRotation == rotation;
-			break;
+                break;
-		case "Less":
+            case "Less":
-			valid = actualRotation < rotation;
+                valid = actualRotation < rotation;
-			break;
+                break;
-		default:
+            default:
-			throw new IllegalArgumentException("Invalid comparator: " + comparator);
+                throw new IllegalArgumentException("Invalid comparator: " + comparator);
-		}
+        }
-
-		if (valid)
-			return WebResponseUtils.multiPartFileToWebResponse(inputFile);
-		return null;
-
-	}
 
+        if (valid) return WebResponseUtils.multiPartFileToWebResponse(inputFile);
+        return null;
+    }
 }

src/main/java/stirling/software/SPDF/controller/api/misc/AutoRenameController.java

@@ -19,8 +19,10 @@ 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.misc.ExtractHeaderRequest;
 import stirling.software.SPDF.utils.WebResponseUtils;
+
 @RestController
 @RequestMapping("/api/v1/misc")
 @Tag(name = "Misc", description = "Miscellaneous APIs")
@@ -32,97 +34,105 @@ public class AutoRenameController {
     private static final int LINE_LIMIT = 11;
 
     @PostMapping(consumes = "multipart/form-data", value = "/auto-rename")
-    @Operation(summary = "Extract header from PDF file", description = "This endpoint accepts a PDF file and attempts to extract its title or header based on heuristics. Input:PDF Output:PDF Type:SISO")
+    @Operation(
-    public ResponseEntity<byte[]> extractHeader(@ModelAttribute ExtractHeaderRequest request) throws Exception {
+            summary = "Extract header from PDF file",
+            description =
+                    "This endpoint accepts a PDF file and attempts to extract its title or header based on heuristics. Input:PDF Output:PDF Type:SISO")
+    public ResponseEntity<byte[]> extractHeader(@ModelAttribute ExtractHeaderRequest request)
+            throws Exception {
         MultipartFile file = request.getFileInput();
         Boolean useFirstTextAsFallback = request.isUseFirstTextAsFallback();
 
-    	        PDDocument document = PDDocument.load(file.getInputStream());
+        PDDocument document = PDDocument.load(file.getInputStream());
-    	        PDFTextStripper reader = new PDFTextStripper() {
+        PDFTextStripper reader =
-    	            class LineInfo {
+                new PDFTextStripper() {
-    	                String text;
+                    class LineInfo {
-    	                float fontSize;
+                        String text;
+                        float fontSize;
 
-    	                LineInfo(String text, float fontSize) {
+                        LineInfo(String text, float fontSize) {
-    	                    this.text = text;
+                            this.text = text;
-    	                    this.fontSize = fontSize;
+                            this.fontSize = fontSize;
-    	                }
+                        }
-    	            }
+                    }
 
-    	            List<LineInfo> lineInfos = new ArrayList<>();
+                    List<LineInfo> lineInfos = new ArrayList<>();
-    	            StringBuilder lineBuilder = new StringBuilder();
+                    StringBuilder lineBuilder = new StringBuilder();
-    	            float lastY = -1;
+                    float lastY = -1;
-    	            float maxFontSizeInLine = 0.0f;
+                    float maxFontSizeInLine = 0.0f;
-    	            int lineCount = 0;
+                    int lineCount = 0;
 
-    	            @Override
+                    @Override
-    	            protected void processTextPosition(TextPosition text) {
+                    protected void processTextPosition(TextPosition text) {
-    	                if (lastY != text.getY() && lineCount < LINE_LIMIT) {
+                        if (lastY != text.getY() && lineCount < LINE_LIMIT) {
-    	                    processLine();
+                            processLine();
-    	                    lineBuilder = new StringBuilder(text.getUnicode());
+                            lineBuilder = new StringBuilder(text.getUnicode());
-    	                    maxFontSizeInLine = text.getFontSizeInPt();
+                            maxFontSizeInLine = text.getFontSizeInPt();
-    	                    lastY = text.getY();
+                            lastY = text.getY();
-    	                    lineCount++;
+                            lineCount++;
-    	                } else if (lineCount < LINE_LIMIT) {
+                        } else if (lineCount < LINE_LIMIT) {
-    	                    lineBuilder.append(text.getUnicode());
+                            lineBuilder.append(text.getUnicode());
-    	                    if (text.getFontSizeInPt() > maxFontSizeInLine) {
+                            if (text.getFontSizeInPt() > maxFontSizeInLine) {
-    	                        maxFontSizeInLine = text.getFontSizeInPt();
+                                maxFontSizeInLine = text.getFontSizeInPt();
-    	                    }
+                            }
-    	                }
+                        }
-    	            }
+                    }
 
-    	            private void processLine() {
+                    private void processLine() {
-    	                if (lineBuilder.length() > 0 && lineCount < LINE_LIMIT) {
+                        if (lineBuilder.length() > 0 && lineCount < LINE_LIMIT) {
-    	                    lineInfos.add(new LineInfo(lineBuilder.toString(), maxFontSizeInLine));
+                            lineInfos.add(new LineInfo(lineBuilder.toString(), maxFontSizeInLine));
-    	                }
+                        }
-    	            }
+                    }
 
-    	            @Override
+                    @Override
-    	            public String getText(PDDocument doc) throws IOException {
+                    public String getText(PDDocument doc) throws IOException {
-    	                this.lineInfos.clear();
+                        this.lineInfos.clear();
-    	                this.lineBuilder = new StringBuilder();
+                        this.lineBuilder = new StringBuilder();
-    	                this.lastY = -1;
+                        this.lastY = -1;
-    	                this.maxFontSizeInLine = 0.0f;
+                        this.maxFontSizeInLine = 0.0f;
-    	                this.lineCount = 0;
+                        this.lineCount = 0;
-    	                super.getText(doc);
+                        super.getText(doc);
-    	                processLine(); // Process the last line
+                        processLine(); // Process the last line
 
-    	                // Merge lines with same font size
+                        // Merge lines with same font size
-    	                List<LineInfo> mergedLineInfos = new ArrayList<>();
+                        List<LineInfo> mergedLineInfos = new ArrayList<>();
-    	                for (int i = 0; i < lineInfos.size(); i++) {
+                        for (int i = 0; i < lineInfos.size(); i++) {
-    	                    String mergedText = lineInfos.get(i).text;
+                            String mergedText = lineInfos.get(i).text;
-    	                    float fontSize = lineInfos.get(i).fontSize;
+                            float fontSize = lineInfos.get(i).fontSize;
-    	                    while (i + 1 < lineInfos.size() && lineInfos.get(i + 1).fontSize == fontSize) {
+                            while (i + 1 < lineInfos.size()
-    	                        mergedText += " " + lineInfos.get(i + 1).text;
+                                    && lineInfos.get(i + 1).fontSize == fontSize) {
-    	                        i++;
+                                mergedText += " " + lineInfos.get(i + 1).text;
-    	                    }
+                                i++;
-    	                    mergedLineInfos.add(new LineInfo(mergedText, fontSize));
+                            }
-    	                }
+                            mergedLineInfos.add(new LineInfo(mergedText, fontSize));
+                        }
 
-    	                // Sort lines by font size in descending order and get the first one
+                        // Sort lines by font size in descending order and get the first one
-    	                mergedLineInfos.sort(Comparator.comparing((LineInfo li) -> li.fontSize).reversed());
+                        mergedLineInfos.sort(
-    	                String title = mergedLineInfos.isEmpty() ? null : mergedLineInfos.get(0).text;
+                                Comparator.comparing((LineInfo li) -> li.fontSize).reversed());
-
+                        String title =
-    	                return title != null ? title : (useFirstTextAsFallback ? (mergedLineInfos.isEmpty() ? null : mergedLineInfos.get(mergedLineInfos.size() - 1).text) : null);
+                                mergedLineInfos.isEmpty() ? null : mergedLineInfos.get(0).text;
-    	            }
-
-    	        };
-
-    	        String header = reader.getText(document);
 
+                        return title != null
+                                ? title
+                                : (useFirstTextAsFallback
+                                        ? (mergedLineInfos.isEmpty()
+                                                ? null
+                                                : mergedLineInfos.get(mergedLineInfos.size() - 1)
+                                                        .text)
+                                        : null);
+                    }
+                };
 
+        String header = reader.getText(document);
 
         // Sanitize the header string by removing characters not allowed in a filename.
         if (header != null && header.length() < 255) {
             header = header.replaceAll("[/\\\\?%*:|\"<>]", "");
             return WebResponseUtils.pdfDocToWebResponse(document, header + ".pdf");
         } else {
-        	logger.info("File has no good title to be found");
+            logger.info("File has no good title to be found");
-        	return WebResponseUtils.pdfDocToWebResponse(document, file.getOriginalFilename());
+            return WebResponseUtils.pdfDocToWebResponse(document, file.getOriginalFilename());
         }
     }
-    
-
-
-
 }

src/main/java/stirling/software/SPDF/controller/api/misc/AutoSplitPdfController.java

@@ -1,4 +1,5 @@
 package stirling.software.SPDF.controller.api.misc;
+
 import java.awt.image.BufferedImage;
 import java.awt.image.DataBufferByte;
 import java.awt.image.DataBufferInt;
@@ -32,6 +33,7 @@ import com.google.zxing.common.HybridBinarizer;
 
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
+
 import stirling.software.SPDF.model.api.misc.AutoSplitPdfRequest;
 import stirling.software.SPDF.utils.WebResponseUtils;
 
@@ -40,11 +42,15 @@ import stirling.software.SPDF.utils.WebResponseUtils;
 @Tag(name = "Misc", description = "Miscellaneous APIs")
 public class AutoSplitPdfController {
 
-    private static final String QR_CONTENT = "https://github.com/Frooodle/Stirling-PDF";
+    private static final String QR_CONTENT = "https://github.com/Stirling-Tools/Stirling-PDF";
 
     @PostMapping(value = "/auto-split-pdf", consumes = "multipart/form-data")
-    @Operation(summary = "Auto split PDF pages into separate documents", description = "This endpoint accepts a PDF file, scans each page for a specific QR code, and splits the document at the QR code boundaries. The output is a zip file containing each separate PDF document. Input:PDF Output:ZIP-PDF Type:SISO")
+    @Operation(
-    public ResponseEntity<byte[]> autoSplitPdf(@ModelAttribute AutoSplitPdfRequest request) throws IOException {
+            summary = "Auto split PDF pages into separate documents",
+            description =
+                    "This endpoint accepts a PDF file, scans each page for a specific QR code, and splits the document at the QR code boundaries. The output is a zip file containing each separate PDF document. Input:PDF Output:ZIP-PDF Type:SISO")
+    public ResponseEntity<byte[]> autoSplitPdf(@ModelAttribute AutoSplitPdfRequest request)
+            throws IOException {
         MultipartFile file = request.getFileInput();
         boolean duplexMode = request.isDuplexMode();
 
@@ -107,29 +113,48 @@ public class AutoSplitPdfController {
         } catch (Exception e) {
             e.printStackTrace();
         } finally {
-        	data = Files.readAllBytes(zipFile);
+            data = Files.readAllBytes(zipFile);
             Files.delete(zipFile);
         }
 
-        return WebResponseUtils.bytesToWebResponse(data, filename + ".zip", MediaType.APPLICATION_OCTET_STREAM);
+        return WebResponseUtils.bytesToWebResponse(
+                data, filename + ".zip", MediaType.APPLICATION_OCTET_STREAM);
     }
 
-
     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);
+            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);
+            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");
+            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));

src/main/java/stirling/software/SPDF/controller/api/misc/BlankPageController.java

@@ -28,6 +28,7 @@ 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.misc.RemoveBlankPagesRequest;
 import stirling.software.SPDF.utils.PdfUtils;
 import stirling.software.SPDF.utils.ProcessExecutor;
@@ -39,17 +40,18 @@ import stirling.software.SPDF.utils.WebResponseUtils;
 @Tag(name = "Misc", description = "Miscellaneous APIs")
 public class BlankPageController {
 
-	@PostMapping(consumes = "multipart/form-data", value = "/remove-blanks")
+    @PostMapping(consumes = "multipart/form-data", value = "/remove-blanks")
-	@Operation(
+    @Operation(
-	    summary = "Remove blank pages from a PDF file",
+            summary = "Remove blank pages from a PDF file",
-	    description = "This endpoint removes blank pages from a given PDF file. Users can specify the threshold and white percentage to tune the detection of blank pages. Input:PDF Output:PDF Type:SISO"
+            description =
-	)
+                    "This endpoint removes blank pages from a given PDF file. Users can specify the threshold and white percentage to tune the detection of blank pages. Input:PDF Output:PDF Type:SISO")
-	public ResponseEntity<byte[]> removeBlankPages(@ModelAttribute RemoveBlankPagesRequest request) throws IOException, InterruptedException {
+    public ResponseEntity<byte[]> removeBlankPages(@ModelAttribute RemoveBlankPagesRequest request)
-	    MultipartFile inputFile = request.getFileInput();
+            throws IOException, InterruptedException {
-	    int threshold = request.getThreshold();
+        MultipartFile inputFile = request.getFileInput();
-	    float whitePercent = request.getWhitePercent();
+        int threshold = request.getThreshold();
+        float whitePercent = request.getWhitePercent();
 
-    	PDDocument document = null;
+        PDDocument document = null;
         try {
             document = PDDocument.load(inputFile.getInputStream());
             PDPageTree pages = document.getDocumentCatalog().getPages();
@@ -79,14 +81,27 @@ public class BlankPageController {
                         BufferedImage image = pdfRenderer.renderImageWithDPI(pageIndex, 300);
                         ImageIO.write(image, "png", tempFile.toFile());
 
-                        List<String> command = new ArrayList<>(Arrays.asList("python3", System.getProperty("user.dir") + "/scripts/detect-blank-pages.py", tempFile.toString() ,"--threshold", String.valueOf(threshold), "--white_percent", String.valueOf(whitePercent)));
+                        List<String> command =
+                                new ArrayList<>(
+                                        Arrays.asList(
+                                                "python3",
+                                                System.getProperty("user.dir")
+                                                        + "/scripts/detect-blank-pages.py",
+                                                tempFile.toString(),
+                                                "--threshold",
+                                                String.valueOf(threshold),
+                                                "--white_percent",
+                                                String.valueOf(whitePercent)));
 
                         // Run CLI command
-                        ProcessExecutorResult returnCode = ProcessExecutor.getInstance(ProcessExecutor.Processes.PYTHON_OPENCV).runCommandWithOutputHandling(command);
+                        ProcessExecutorResult returnCode =
+                                ProcessExecutor.getInstance(ProcessExecutor.Processes.PYTHON_OPENCV)
+                                        .runCommandWithOutputHandling(command);
 
                         // does contain data
                         if (returnCode.getRc() == 0) {
-                            System.out.println("page " + pageIndex + " has image which is not blank");
+                            System.out.println(
+                                    "page " + pageIndex + " has image which is not blank");
                             pagesToKeepIndex.add(pageIndex);
                         } else {
                             System.out.println("Skipping, Image was blank for page #" + pageIndex);
@@ -94,12 +109,12 @@ public class BlankPageController {
                     }
                 }
                 pageIndex++;
-                
             }
             System.out.print("pagesToKeep=" + pagesToKeepIndex.size());
 
             // Remove pages not present in pagesToKeepIndex
-            List<Integer> pageIndices = IntStream.range(0, pages.getCount()).boxed().collect(Collectors.toList());
+            List<Integer> pageIndices =
+                    IntStream.range(0, pages.getCount()).boxed().collect(Collectors.toList());
             Collections.reverse(pageIndices); // Reverse to prevent index shifting during removal
             for (Integer i : pageIndices) {
                 if (!pagesToKeepIndex.contains(i)) {
@@ -107,16 +122,15 @@ public class BlankPageController {
                 }
             }
 
-            return WebResponseUtils.pdfDocToWebResponse(document, inputFile.getOriginalFilename().replaceFirst("[.][^.]+$", "") + "_blanksRemoved.pdf");
+            return WebResponseUtils.pdfDocToWebResponse(
+                    document,
+                    inputFile.getOriginalFilename().replaceFirst("[.][^.]+$", "")
+                            + "_blanksRemoved.pdf");
         } catch (IOException e) {
             e.printStackTrace();
             return new ResponseEntity<>(HttpStatus.INTERNAL_SERVER_ERROR);
         } finally {
-            if (document != null)
+            if (document != null) document.close();
-                document.close();
         }
     }
-
-
-    
 }

src/main/java/stirling/software/SPDF/controller/api/misc/CompressController.java

@@ -30,6 +30,7 @@ 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.misc.OptimizePdfRequest;
 import stirling.software.SPDF.utils.GeneralUtils;
 import stirling.software.SPDF.utils.ProcessExecutor;
@@ -44,20 +45,23 @@ public class CompressController {
     private static final Logger logger = LoggerFactory.getLogger(CompressController.class);
 
     @PostMapping(consumes = "multipart/form-data", value = "/compress-pdf")
-    @Operation(summary = "Optimize PDF file", description = "This endpoint accepts a PDF file and optimizes it based on the provided parameters. Input:PDF Output:PDF Type:SISO")
+    @Operation(
-    public ResponseEntity<byte[]> optimizePdf(@ModelAttribute OptimizePdfRequest request) throws Exception {
+            summary = "Optimize PDF file",
+            description =
+                    "This endpoint accepts a PDF file and optimizes it based on the provided parameters. Input:PDF Output:PDF Type:SISO")
+    public ResponseEntity<byte[]> optimizePdf(@ModelAttribute OptimizePdfRequest request)
+            throws Exception {
         MultipartFile inputFile = request.getFileInput();
         Integer optimizeLevel = request.getOptimizeLevel();
         String expectedOutputSizeString = request.getExpectedOutputSize();
 
-
+        if (expectedOutputSizeString == null && optimizeLevel == null) {
-        if(expectedOutputSizeString == null && optimizeLevel == null) {
             throw new Exception("Both expected output size and optimize level are not specified");
         }
 
         Long expectedOutputSize = 0L;
         boolean autoMode = false;
-        if (expectedOutputSizeString != null && expectedOutputSizeString.length() > 1 ) {
+        if (expectedOutputSizeString != null && expectedOutputSizeString.length() > 1) {
             expectedOutputSize = GeneralUtils.convertSizeToBytes(expectedOutputSizeString);
             autoMode = true;
         }
@@ -71,8 +75,9 @@ public class CompressController {
         // Prepare the output file path
         Path tempOutputFile = Files.createTempFile("output_", ".pdf");
 
-        // Determine initial optimization level based on expected size reduction, only if in autoMode
+        // Determine initial optimization level based on expected size reduction, only if in
-        if(autoMode) {
+        // autoMode
+        if (autoMode) {
             double sizeReductionRatio = expectedOutputSize / (double) inputFileSize;
             if (sizeReductionRatio > 0.7) {
                 optimizeLevel = 1;
@@ -94,20 +99,20 @@ public class CompressController {
             command.add("-dCompatibilityLevel=1.4");
 
             switch (optimizeLevel) {
-            case 1:
+                case 1:
-                command.add("-dPDFSETTINGS=/prepress");
+                    command.add("-dPDFSETTINGS=/prepress");
-                break;
+                    break;
-            case 2:
+                case 2:
-                command.add("-dPDFSETTINGS=/printer");
+                    command.add("-dPDFSETTINGS=/printer");
-                break;    
+                    break;
-            case 3:
+                case 3:
-                command.add("-dPDFSETTINGS=/ebook");
+                    command.add("-dPDFSETTINGS=/ebook");
-                break;
+                    break;
-            case 4:
+                case 4:
-                command.add("-dPDFSETTINGS=/screen");
+                    command.add("-dPDFSETTINGS=/screen");
-                break;
+                    break;
-            default:
+                default:
-                command.add("-dPDFSETTINGS=/default");
+                    command.add("-dPDFSETTINGS=/default");
             }
 
             command.add("-dNOPAUSE");
@@ -116,7 +121,9 @@ public class CompressController {
             command.add("-sOutputFile=" + tempOutputFile.toString());
             command.add(tempInputFile.toString());
 
-            ProcessExecutorResult returnCode = ProcessExecutor.getInstance(ProcessExecutor.Processes.GHOSTSCRIPT).runCommandWithOutputHandling(command);
+            ProcessExecutorResult returnCode =
+                    ProcessExecutor.getInstance(ProcessExecutor.Processes.GHOSTSCRIPT)
+                            .runCommandWithOutputHandling(command);
 
             // Check if file size is within expected size or not auto mode so instantly finish
             long outputFileSize = Files.size(tempOutputFile);
@@ -125,19 +132,18 @@ public class CompressController {
             } else {
                 // Increase optimization level for next iteration
                 optimizeLevel++;
-                if(autoMode && optimizeLevel > 3) {
+                if (autoMode && optimizeLevel > 3) {
                     System.out.println("Skipping level 4 due to bad results in auto mode");
                     sizeMet = true;
-                } else if(optimizeLevel == 5) {
+                } else if (optimizeLevel == 5) {
 
                 } else {
-                    System.out.println("Increasing ghostscript optimisation level to " + optimizeLevel);
+                    System.out.println(
+                            "Increasing ghostscript optimisation level to " + optimizeLevel);
                 }
             }
         }
 
-        
-
         if (expectedOutputSize != null && autoMode) {
             long outputFileSize = Files.size(tempOutputFile);
             if (outputFileSize > expectedOutputSize) {
@@ -157,8 +163,8 @@ public class CompressController {
                                     BufferedImage bufferedImage = image.getImage();
 
                                     // Calculate the new dimensions
-                                    int newWidth = (int)(bufferedImage.getWidth() * scaleFactor);
+                                    int newWidth = (int) (bufferedImage.getWidth() * scaleFactor);
-                                    int newHeight = (int)(bufferedImage.getHeight() * scaleFactor);
+                                    int newHeight = (int) (bufferedImage.getHeight() * scaleFactor);
 
                                     // If the new dimensions are zero, skip this iteration
                                     if (newWidth == 0 || newHeight == 0) {
@@ -166,23 +172,39 @@ public class CompressController {
                                     }
 
                                     // Otherwise, proceed with the scaling
-                                    Image scaledImage = bufferedImage.getScaledInstance(newWidth, newHeight, Image.SCALE_SMOOTH);
+                                    Image scaledImage =
+                                            bufferedImage.getScaledInstance(
+                                                    newWidth, newHeight, Image.SCALE_SMOOTH);
 
                                     // Convert the scaled image back to a BufferedImage
-                                    BufferedImage scaledBufferedImage = new BufferedImage(newWidth, newHeight, BufferedImage.TYPE_INT_RGB);
+                                    BufferedImage scaledBufferedImage =
-                                    scaledBufferedImage.getGraphics().drawImage(scaledImage, 0, 0, null);
+                                            new BufferedImage(
+                                                    newWidth,
+                                                    newHeight,
+                                                    BufferedImage.TYPE_INT_RGB);
+                                    scaledBufferedImage
+                                            .getGraphics()
+                                            .drawImage(scaledImage, 0, 0, null);
 
                                     // Compress the scaled image
-                                    ByteArrayOutputStream compressedImageStream = new ByteArrayOutputStream();
+                                    ByteArrayOutputStream compressedImageStream =
-                                    ImageIO.write(scaledBufferedImage, "jpeg", compressedImageStream);
+                                            new ByteArrayOutputStream();
+                                    ImageIO.write(
+                                            scaledBufferedImage, "jpeg", compressedImageStream);
                                     byte[] imageBytes = compressedImageStream.toByteArray();
                                     compressedImageStream.close();
 
                                     // Convert compressed image back to PDImageXObject
-                                    ByteArrayInputStream bais = new ByteArrayInputStream(imageBytes);
+                                    ByteArrayInputStream bais =
-                                    PDImageXObject compressedImage = PDImageXObject.createFromByteArray(doc, imageBytes, image.getCOSObject().toString());
+                                            new ByteArrayInputStream(imageBytes);
+                                    PDImageXObject compressedImage =
+                                            PDImageXObject.createFromByteArray(
+                                                    doc,
+                                                    imageBytes,
+                                                    image.getCOSObject().toString());
 
-                                    // Replace the image in the resources with the compressed version
+                                    // Replace the image in the resources with the compressed
+                                    // version
                                     res.put(name, compressedImage);
                                 }
                             }
@@ -194,16 +216,23 @@ public class CompressController {
                         long currentSize = Files.size(tempOutputFile);
                         // Check if the overall PDF size is still larger than expectedOutputSize
                         if (currentSize > expectedOutputSize) {
-                         // Log the current file size and scaleFactor
+                            // Log the current file size and scaleFactor
 
-                            System.out.println("Current file size: " + FileUtils.byteCountToDisplaySize(currentSize));
+                            System.out.println(
+                                    "Current file size: "
+                                            + FileUtils.byteCountToDisplaySize(currentSize));
                             System.out.println("Current scale factor: " + scaleFactor);
 
                             // The file is still too large, reduce scaleFactor and try again
                             scaleFactor *= 0.9; // reduce scaleFactor by 10%
                             // Avoid scaleFactor being too small, causing the image to shrink to 0
-                            if(scaleFactor < 0.2 || previousFileSize == currentSize){
+                            if (scaleFactor < 0.2 || previousFileSize == currentSize) {
-                                throw new RuntimeException("Could not reach the desired size without excessively degrading image quality, lowest size recommended is " + FileUtils.byteCountToDisplaySize(currentSize) + ", " + currentSize + " bytes");
+                                throw new RuntimeException(
+                                        "Could not reach the desired size without excessively degrading image quality, lowest size recommended is "
+                                                + FileUtils.byteCountToDisplaySize(currentSize)
+                                                + ", "
+                                                + currentSize
+                                                + " bytes");
                             }
                             previousFileSize = currentSize;
                         } else {
@@ -211,10 +240,7 @@ public class CompressController {
                             break;
                         }
                     }
-
                 }
-
-                    
             }
         }
 
@@ -222,9 +248,10 @@ public class CompressController {
         byte[] pdfBytes = Files.readAllBytes(tempOutputFile);
 
         // Check if optimized file is larger than the original
-        if(pdfBytes.length > inputFileSize) {
+        if (pdfBytes.length > inputFileSize) {
             // Log the occurrence
-            logger.warn("Optimized file is larger than the original. Returning the original file instead.");
+            logger.warn(
+                    "Optimized file is larger than the original. Returning the original file instead.");
 
             // Read the original file again
             pdfBytes = Files.readAllBytes(tempInputFile);
@@ -235,8 +262,8 @@ public class CompressController {
         Files.delete(tempOutputFile);
 
         // Return the optimized PDF as a response
-        String outputFilename = inputFile.getOriginalFilename().replaceFirst("[.][^.]+$", "") + "_Optimized.pdf";
+        String outputFilename =
+                inputFile.getOriginalFilename().replaceFirst("[.][^.]+$", "") + "_Optimized.pdf";
         return WebResponseUtils.bytesToWebResponse(pdfBytes, outputFilename);
     }
-
 }

src/main/java/stirling/software/SPDF/controller/api/misc/ExtractImageScansController.java

@@ -32,10 +32,12 @@ import io.swagger.v3.oas.annotations.media.Content;
 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 stirling.software.SPDF.model.api.misc.ExtractImageScansRequest;
 import stirling.software.SPDF.utils.ProcessExecutor;
 import stirling.software.SPDF.utils.ProcessExecutor.ProcessExecutorResult;
 import stirling.software.SPDF.utils.WebResponseUtils;
+
 @RestController
 @RequestMapping("/api/v1/misc")
 @Tag(name = "Misc", description = "Miscellaneous APIs")
@@ -44,18 +46,28 @@ public class ExtractImageScansController {
     private static final Logger logger = LoggerFactory.getLogger(ExtractImageScansController.class);
 
     @PostMapping(consumes = "multipart/form-data", value = "/extract-image-scans")
-    @Operation(summary = "Extract image scans from an input file",
+    @Operation(
-            description = "This endpoint extracts image scans from a given file based on certain parameters. Users can specify angle threshold, tolerance, minimum area, minimum contour area, and border size. Input:PDF Output:IMAGE/ZIP Type:SIMO")
+            summary = "Extract image scans from an input file",
+            description =
+                    "This endpoint extracts image scans from a given file based on certain parameters. Users can specify angle threshold, tolerance, minimum area, minimum contour area, and border size. Input:PDF Output:IMAGE/ZIP Type:SIMO")
     public ResponseEntity<byte[]> extractImageScans(
-    		@RequestBody(
+            @RequestBody(
-    	            description = "Form data containing file and extraction parameters",
+                            description = "Form data containing file and extraction parameters",
-    	            required = true,
+                            required = true,
-    	            content = @Content(
+                            content =
-    	                mediaType = "multipart/form-data",
+                                    @Content(
-    	                schema = @Schema(implementation = ExtractImageScansRequest.class) // This should represent your form's structure
+                                            mediaType = "multipart/form-data",
-    	            )
+                                            schema =
-    	        )
+                                                    @Schema(
-    	        ExtractImageScansRequest form) throws IOException, InterruptedException {
+                                                            implementation =
+                                                                    ExtractImageScansRequest
+                                                                            .class) // This should
+                                            // represent
+                                            // your form's
+                                            // structure
+                                            ))
+                    ExtractImageScansRequest form)
+            throws IOException, InterruptedException {
         String fileName = form.getFileInput().getOriginalFilename();
         String extension = fileName.substring(fileName.lastIndexOf(".") + 1);
 
@@ -64,7 +76,8 @@ public class ExtractImageScansController {
         // Check if input file is a PDF
         if (extension.equalsIgnoreCase("pdf")) {
             // Load PDF document
-            try (PDDocument document = PDDocument.load(new ByteArrayInputStream(form.getFileInput().getBytes()))) {
+            try (PDDocument document =
+                    PDDocument.load(new ByteArrayInputStream(form.getFileInput().getBytes()))) {
                 PDFRenderer pdfRenderer = new PDFRenderer(document);
                 int pageCount = document.getNumberOfPages();
                 images = new ArrayList<>();
@@ -84,7 +97,10 @@ public class ExtractImageScansController {
             }
         } else {
             Path tempInputFile = Files.createTempFile("input_", "." + extension);
-            Files.copy(form.getFileInput().getInputStream(), tempInputFile, StandardCopyOption.REPLACE_EXISTING);
+            Files.copy(
+                    form.getFileInput().getInputStream(),
+                    tempInputFile,
+                    StandardCopyOption.REPLACE_EXISTING);
             // Add input file path to images list
             images.add(tempInputFile.toString());
         }
@@ -95,21 +111,28 @@ public class ExtractImageScansController {
         for (int i = 0; i < images.size(); i++) {
 
             Path tempDir = Files.createTempDirectory("openCV_output");
-            List<String> command = new ArrayList<>(Arrays.asList(
+            List<String> command =
-                    "python3", 
+                    new ArrayList<>(
-                    "./scripts/split_photos.py", 
+                            Arrays.asList(
-                    images.get(i), 
+                                    "python3",
-                    tempDir.toString(), 
+                                    "./scripts/split_photos.py",
-                    "--angle_threshold", String.valueOf(form.getAngleThreshold()),
+                                    images.get(i),
-                    "--tolerance", String.valueOf(form.getTolerance()),
+                                    tempDir.toString(),
-                    "--min_area", String.valueOf(form.getMinArea()),
+                                    "--angle_threshold",
-                    "--min_contour_area", String.valueOf(form.getMinContourArea()),
+                                    String.valueOf(form.getAngleThreshold()),
-                    "--border_size", String.valueOf(form.getBorderSize())
+                                    "--tolerance",
-                ));
+                                    String.valueOf(form.getTolerance()),
-
+                                    "--min_area",
+                                    String.valueOf(form.getMinArea()),
+                                    "--min_contour_area",
+                                    String.valueOf(form.getMinContourArea()),
+                                    "--border_size",
+                                    String.valueOf(form.getBorderSize())));
 
             // Run CLI command
-            ProcessExecutorResult returnCode = ProcessExecutor.getInstance(ProcessExecutor.Processes.PYTHON_OPENCV).runCommandWithOutputHandling(command);
+            ProcessExecutorResult returnCode =
+                    ProcessExecutor.getInstance(ProcessExecutor.Processes.PYTHON_OPENCV)
+                            .runCommandWithOutputHandling(command);
 
             // Read the output photos in temp directory
             List<Path> tempOutputFiles = Files.list(tempDir).sorted().collect(Collectors.toList());
@@ -126,10 +149,16 @@ public class ExtractImageScansController {
             String outputZipFilename = fileName.replaceFirst("[.][^.]+$", "") + "_processed.zip";
             Path tempZipFile = Files.createTempFile("output_", ".zip");
 
-            try (ZipOutputStream zipOut = new ZipOutputStream(new FileOutputStream(tempZipFile.toFile()))) {
+            try (ZipOutputStream zipOut =
+                    new ZipOutputStream(new FileOutputStream(tempZipFile.toFile()))) {
                 // Add processed images to the zip
                 for (int i = 0; i < processedImageBytes.size(); i++) {
-                    ZipEntry entry = new ZipEntry(fileName.replaceFirst("[.][^.]+$", "") + "_" + (i + 1) + ".png");
+                    ZipEntry entry =
+                            new ZipEntry(
+                                    fileName.replaceFirst("[.][^.]+$", "")
+                                            + "_"
+                                            + (i + 1)
+                                            + ".png");
                     zipOut.putNextEntry(entry);
                     zipOut.write(processedImageBytes.get(i));
                     zipOut.closeEntry();
@@ -141,13 +170,15 @@ public class ExtractImageScansController {
             // Clean up the temporary zip file
             Files.delete(tempZipFile);
 
-            return WebResponseUtils.bytesToWebResponse(zipBytes, outputZipFilename, MediaType.APPLICATION_OCTET_STREAM);
+            return WebResponseUtils.bytesToWebResponse(
+                    zipBytes, outputZipFilename, MediaType.APPLICATION_OCTET_STREAM);
         } else {
             // Return the processed image as a response
             byte[] imageBytes = processedImageBytes.get(0);
-            return WebResponseUtils.bytesToWebResponse(imageBytes, fileName.replaceFirst("[.][^.]+$", "") + ".png", MediaType.IMAGE_PNG);
+            return WebResponseUtils.bytesToWebResponse(
+                    imageBytes,
+                    fileName.replaceFirst("[.][^.]+$", "") + ".png",
+                    MediaType.IMAGE_PNG);
         }
-
     }
-
 }

src/main/java/stirling/software/SPDF/controller/api/misc/ExtractImagesController.java

@@ -1,4 +1,5 @@
 package stirling.software.SPDF.controller.api.misc;
+
 import java.awt.Graphics2D;
 import java.awt.Image;
 import java.awt.image.BufferedImage;
@@ -29,8 +30,10 @@ 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.PDFWithImageFormatRequest;
 import stirling.software.SPDF.utils.WebResponseUtils;
+
 @RestController
 @RequestMapping("/api/v1/misc")
 @Tag(name = "Misc", description = "Miscellaneous APIs")
@@ -39,13 +42,17 @@ 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",
+    @Operation(
-            description = "This endpoint extracts images from a given PDF file and returns them in a zip file. Users can specify the output image format. Input:PDF Output:IMAGE/ZIP Type:SIMO")
+            summary = "Extract images from a PDF file",
-    public ResponseEntity<byte[]> extractImages(@ModelAttribute PDFWithImageFormatRequest request) throws IOException {
+            description =
+                    "This endpoint extracts images from a given PDF file and returns them in a zip file. Users can specify the output image format. Input:PDF Output:IMAGE/ZIP Type:SIMO")
+    public ResponseEntity<byte[]> extractImages(@ModelAttribute PDFWithImageFormatRequest request)
+            throws IOException {
         MultipartFile file = request.getFileInput();
         String format = request.getFormat();
 
-        System.out.println(System.currentTimeMillis() + "file=" + file.getName() + ", format=" + format);
+        System.out.println(
+                System.currentTimeMillis() + "file=" + file.getName() + ", format=" + format);
         PDDocument document = PDDocument.load(file.getBytes());
 
         // Create ByteArrayOutputStream to write zip file to byte array
@@ -69,7 +76,7 @@ public class ExtractImagesController {
                 if (page.getResources().isImageXObject(name)) {
                     PDImageXObject image = (PDImageXObject) page.getResources().getXObject(name);
                     int imageHash = image.hashCode();
-                    if(processedImages.contains(imageHash)) {
+                    if (processedImages.contains(imageHash)) {
                         continue; // Skip already processed images
                     }
                     processedImages.add(imageHash);
@@ -78,15 +85,28 @@ public class ExtractImagesController {
                     RenderedImage renderedImage = image.getImage();
                     BufferedImage bufferedImage = null;
                     if (format.equalsIgnoreCase("png")) {
-                        bufferedImage = new BufferedImage(renderedImage.getWidth(), renderedImage.getHeight(), BufferedImage.TYPE_INT_ARGB);
+                        bufferedImage =
+                                new BufferedImage(
+                                        renderedImage.getWidth(),
+                                        renderedImage.getHeight(),
+                                        BufferedImage.TYPE_INT_ARGB);
                     } else if (format.equalsIgnoreCase("jpeg") || format.equalsIgnoreCase("jpg")) {
-                        bufferedImage = new BufferedImage(renderedImage.getWidth(), renderedImage.getHeight(), BufferedImage.TYPE_INT_RGB);
+                        bufferedImage =
+                                new BufferedImage(
+                                        renderedImage.getWidth(),
+                                        renderedImage.getHeight(),
+                                        BufferedImage.TYPE_INT_RGB);
                     } else if (format.equalsIgnoreCase("gif")) {
-                        bufferedImage = new BufferedImage(renderedImage.getWidth(), renderedImage.getHeight(), BufferedImage.TYPE_BYTE_INDEXED);
+                        bufferedImage =
+                                new BufferedImage(
+                                        renderedImage.getWidth(),
+                                        renderedImage.getHeight(),
+                                        BufferedImage.TYPE_BYTE_INDEXED);
                     }
 
                     // Write image to zip file
-                    String imageName = filename + "_" + imageIndex + " (Page " + pageNum + ")." + format;
+                    String imageName =
+                            filename + "_" + imageIndex + " (Page " + pageNum + ")." + format;
                     ZipEntry zipEntry = new ZipEntry(imageName);
                     zos.putNextEntry(zipEntry);
 
@@ -111,7 +131,7 @@ public class ExtractImagesController {
         // Create ByteArrayResource from byte array
         byte[] zipContents = baos.toByteArray();
 
-        return WebResponseUtils.boasToWebResponse(baos, filename + "_extracted-images.zip", MediaType.APPLICATION_OCTET_STREAM);
+        return WebResponseUtils.boasToWebResponse(
+                baos, filename + "_extracted-images.zip", MediaType.APPLICATION_OCTET_STREAM);
     }
-
 }

src/main/java/stirling/software/SPDF/controller/api/misc/FakeScanControllerWIP.java

@@ -3,21 +3,17 @@ package stirling.software.SPDF.controller.api.misc;
 import java.awt.Color;
 import java.awt.geom.AffineTransform;
 import java.awt.image.AffineTransformOp;
-//Required for image manipulation
 import java.awt.image.BufferedImage;
 import java.awt.image.BufferedImageOp;
 import java.awt.image.ConvolveOp;
 import java.awt.image.Kernel;
 import java.awt.image.RescaleOp;
 import java.io.ByteArrayOutputStream;
-//Required for file input/output
 import java.io.File;
 import java.io.IOException;
 import java.security.SecureRandom;
-//Other required classes
 import java.util.Random;
 
-//Required for image input/output
 import javax.imageio.ImageIO;
 
 import org.apache.pdfbox.pdmodel.PDDocument;
@@ -40,6 +36,7 @@ import org.springframework.web.multipart.MultipartFile;
 import io.swagger.v3.oas.annotations.Hidden;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
+
 import stirling.software.SPDF.model.api.PDFFile;
 import stirling.software.SPDF.utils.WebResponseUtils;
 
@@ -50,102 +47,101 @@ public class FakeScanControllerWIP {
 
     private static final Logger logger = LoggerFactory.getLogger(FakeScanControllerWIP.class);
 
-    //TODO
+    // TODO
     @Hidden
     @PostMapping(consumes = "multipart/form-data", value = "/fakeScan")
     @Operation(
-        summary = "Repair a PDF file",
+            summary = "Repair a PDF file",
-        description = "This endpoint repairs a given PDF file by running Ghostscript command. The PDF is first saved to a temporary location, repaired, read back, and then returned as a response."
+            description =
-    )
+                    "This endpoint repairs a given PDF file by running Ghostscript command. The PDF is first saved to a temporary location, repaired, read back, and then returned as a response.")
     public ResponseEntity<byte[]> repairPdf(@ModelAttribute PDFFile request) throws IOException {
         MultipartFile inputFile = request.getFileInput();
 
-    	PDDocument document = PDDocument.load(inputFile.getBytes());
+        PDDocument document = PDDocument.load(inputFile.getBytes());
-    	PDFRenderer pdfRenderer = new PDFRenderer(document);
+        PDFRenderer pdfRenderer = new PDFRenderer(document);
-    	for (int page = 0; page < document.getNumberOfPages(); ++page)
+        for (int page = 0; page < document.getNumberOfPages(); ++page) {
-    	{
+            BufferedImage image = pdfRenderer.renderImageWithDPI(page, 300, ImageType.RGB);
-    	    BufferedImage image = pdfRenderer.renderImageWithDPI(page, 300, ImageType.RGB);
+            ImageIO.write(image, "png", new File("scanned-" + (page + 1) + ".png"));
-    	    ImageIO.write(image, "png", new File("scanned-" + (page+1) + ".png"));
+        }
-    	}
+        document.close();
-    	document.close();
 
-    	// Constants
+        // Constants
-    	int scannedness = 90;  // Value between 0 and 100
+        int scannedness = 90; // Value between 0 and 100
-    	int dirtiness = 0;  // Value between 0 and 100
+        int dirtiness = 0; // Value between 0 and 100
 
-    	// Load the source image
+        // Load the source image
-    	BufferedImage sourceImage = ImageIO.read(new File("scanned-1.png"));
+        BufferedImage sourceImage = ImageIO.read(new File("scanned-1.png"));
 
-    	// Create the destination image
+        // Create the destination image
-    	BufferedImage destinationImage = new BufferedImage(sourceImage.getWidth(), sourceImage.getHeight(), sourceImage.getType());
+        BufferedImage destinationImage =
+                new BufferedImage(
+                        sourceImage.getWidth(), sourceImage.getHeight(), sourceImage.getType());
 
-    	// Apply a brightness and contrast effect based on the "scanned-ness"
+        // Apply a brightness and contrast effect based on the "scanned-ness"
-    	float scaleFactor = 1.0f + (scannedness / 100.0f) * 0.5f;  // Between 1.0 and 1.5
+        float scaleFactor = 1.0f + (scannedness / 100.0f) * 0.5f; // Between 1.0 and 1.5
-    	float offset = scannedness * 1.5f;  // Between 0 and 150
+        float offset = scannedness * 1.5f; // Between 0 and 150
-    	BufferedImageOp op = new RescaleOp(scaleFactor, offset, null);
+        BufferedImageOp op = new RescaleOp(scaleFactor, offset, null);
-    	op.filter(sourceImage, destinationImage);
+        op.filter(sourceImage, destinationImage);
 
-    	// Apply a rotation effect
+        // Apply a rotation effect
-    	double rotationRequired = Math.toRadians((new SecureRandom().nextInt(3 - 1) + 1));  // Random angle between 1 and 3 degrees
+        double rotationRequired =
-    	double locationX = destinationImage.getWidth() / 2;
+                Math.toRadians(
-    	double locationY = destinationImage.getHeight() / 2;
+                        (new SecureRandom().nextInt(3 - 1)
-    	AffineTransform tx = AffineTransform.getRotateInstance(rotationRequired, locationX, locationY);
+                                + 1)); // Random angle between 1 and 3 degrees
-    	AffineTransformOp rotateOp = new AffineTransformOp(tx, AffineTransformOp.TYPE_BILINEAR);
+        double locationX = destinationImage.getWidth() / 2;
-    	destinationImage = rotateOp.filter(destinationImage, null);
+        double locationY = destinationImage.getHeight() / 2;
+        AffineTransform tx =
+                AffineTransform.getRotateInstance(rotationRequired, locationX, locationY);
+        AffineTransformOp rotateOp = new AffineTransformOp(tx, AffineTransformOp.TYPE_BILINEAR);
+        destinationImage = rotateOp.filter(destinationImage, null);
 
-    	// Apply a blur effect based on the "scanned-ness"
+        // Apply a blur effect based on the "scanned-ness"
-    	float blurIntensity = scannedness / 100.0f * 0.2f;  // Between 0.0 and 0.2
+        float blurIntensity = scannedness / 100.0f * 0.2f; // Between 0.0 and 0.2
-    	float[] matrix = {
+        float[] matrix = {
-    	    blurIntensity, blurIntensity, blurIntensity,
+            blurIntensity, blurIntensity, blurIntensity,
-    	    blurIntensity, blurIntensity, blurIntensity,
+            blurIntensity, blurIntensity, blurIntensity,
-    	    blurIntensity, blurIntensity, blurIntensity
+            blurIntensity, blurIntensity, blurIntensity
-    	};
+        };
-    	BufferedImageOp blurOp = new ConvolveOp(new Kernel(3, 3, matrix), ConvolveOp.EDGE_NO_OP, null);
+        BufferedImageOp blurOp =
-    	destinationImage = blurOp.filter(destinationImage, null);
+                new ConvolveOp(new Kernel(3, 3, matrix), ConvolveOp.EDGE_NO_OP, null);
+        destinationImage = blurOp.filter(destinationImage, null);
 
-    	// Add noise to the image based on the "dirtiness"
+        // Add noise to the image based on the "dirtiness"
-    	Random random = new SecureRandom();
+        Random random = new SecureRandom();
-    	for (int y = 0; y < destinationImage.getHeight(); y++) {
+        for (int y = 0; y < destinationImage.getHeight(); y++) {
-    	    for (int x = 0; x < destinationImage.getWidth(); x++) {
+            for (int x = 0; x < destinationImage.getWidth(); x++) {
-    	        if (random.nextInt(100) < dirtiness) {
+                if (random.nextInt(100) < dirtiness) {
-    	            // Change the pixel color to black randomly based on the "dirtiness"
+                    // Change the pixel color to black randomly based on the "dirtiness"
-    	            destinationImage.setRGB(x, y, Color.BLACK.getRGB());
+                    destinationImage.setRGB(x, y, Color.BLACK.getRGB());
-    	        }
+                }
-    	    }
+            }
-    	}
+        }
 
-    	// Save the image
+        // Save the image
-    	ImageIO.write(destinationImage, "PNG", new File("scanned-1.png"));
+        ImageIO.write(destinationImage, "PNG", new File("scanned-1.png"));
 
+        PDDocument documentOut = new PDDocument();
+        for (int page = 1; page <= document.getNumberOfPages(); ++page) {
+            BufferedImage bim = ImageIO.read(new File("scanned-" + page + ".png"));
 
+            // Adjust the dimensions of the page
+            PDPage pdPage = new PDPage(new PDRectangle(bim.getWidth() - 1, bim.getHeight() - 1));
+            documentOut.addPage(pdPage);
 
+            PDImageXObject pdImage = LosslessFactory.createFromImage(documentOut, bim);
+            PDPageContentStream contentStream = new PDPageContentStream(documentOut, pdPage);
 
-    	
+            // Draw the image with a slight offset and enlarged dimensions
-    	
+            contentStream.drawImage(pdImage, -1, -1, bim.getWidth() + 2, bim.getHeight() + 2);
-
+            contentStream.close();
-    	PDDocument documentOut = new PDDocument();
+        }
-    	for (int page = 1; page <= document.getNumberOfPages(); ++page)
+        ByteArrayOutputStream baos = new ByteArrayOutputStream();
-    	{
+        documentOut.save(baos);
-    	    BufferedImage bim = ImageIO.read(new File("scanned-" + page + ".png"));
+        documentOut.close();
-    	    
-    	    // Adjust the dimensions of the page
-    	    PDPage pdPage = new PDPage(new PDRectangle(bim.getWidth() - 1, bim.getHeight() - 1));
-    	    documentOut.addPage(pdPage);
-    	    
-    	    PDImageXObject pdImage = LosslessFactory.createFromImage(documentOut, bim);
-    	    PDPageContentStream contentStream = new PDPageContentStream(documentOut, pdPage);
-    	    
-    	    // Draw the image with a slight offset and enlarged dimensions
-    	    contentStream.drawImage(pdImage, -1, -1, bim.getWidth() + 2, bim.getHeight() + 2);
-    	    contentStream.close();
-    	}
-    	ByteArrayOutputStream baos = new ByteArrayOutputStream();
-    	documentOut.save(baos);
-    	documentOut.close();
 
         // Return the optimized PDF as a response
-        String outputFilename = inputFile.getOriginalFilename().replaceFirst("[.][^.]+$", "") + "_scanned.pdf";
+        String outputFilename =
+                inputFile.getOriginalFilename().replaceFirst("[.][^.]+$", "") + "_scanned.pdf";
         return WebResponseUtils.boasToWebResponse(baos, outputFilename);
     }
-
 }

src/main/java/stirling/software/SPDF/controller/api/misc/MetadataController.java

@@ -19,6 +19,7 @@ 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.misc.MetadataRequest;
 import stirling.software.SPDF.utils.WebResponseUtils;
 
@@ -27,7 +28,6 @@ import stirling.software.SPDF.utils.WebResponseUtils;
 @Tag(name = "Misc", description = "Miscellaneous APIs")
 public class MetadataController {
 
-
     private String checkUndefined(String entry) {
         // Check if the string is "undefined"
         if ("undefined".equals(entry)) {
@@ -36,13 +36,15 @@ public class MetadataController {
         }
         // Return the original string if it's not "undefined"
         return entry;
-
     }
 
     @PostMapping(consumes = "multipart/form-data", value = "/update-metadata")
-    @Operation(summary = "Update metadata of a PDF file",
+    @Operation(
-            description = "This endpoint allows you to update the metadata of a given PDF file. You can add, modify, or delete standard and custom metadata fields. Input:PDF Output:PDF Type:SISO")
+            summary = "Update metadata of a PDF file",
-    public ResponseEntity<byte[]> metadata(@ModelAttribute MetadataRequest request) throws IOException {
+            description =
+                    "This endpoint allows you to update the metadata of a given PDF file. You can add, modify, or delete standard and custom metadata fields. Input:PDF Output:PDF Type:SISO")
+    public ResponseEntity<byte[]> metadata(@ModelAttribute MetadataRequest request)
+            throws IOException {
 
         // Extract PDF file from the request object
         MultipartFile pdfFile = request.getFileInput();
@@ -61,8 +63,8 @@ public class MetadataController {
 
         // Extract additional custom parameters
         Map<String, String> allRequestParams = request.getAllRequestParams();
-        if(allRequestParams == null) {
+        if (allRequestParams == null) {
-        	allRequestParams = new java.util.HashMap<String, String>();
+            allRequestParams = new java.util.HashMap<String, String>();
         }
         // Load the PDF file into a PDDocument
         PDDocument document = PDDocument.load(pdfFile.getBytes());
@@ -89,7 +91,9 @@ public class MetadataController {
             }
             // Remove metadata from the PDF history
             document.getDocumentCatalog().getCOSObject().removeItem(COSName.getPDFName("Metadata"));
-            document.getDocumentCatalog().getCOSObject().removeItem(COSName.getPDFName("PieceInfo"));
+            document.getDocumentCatalog()
+                    .getCOSObject()
+                    .removeItem(COSName.getPDFName("PieceInfo"));
             author = null;
             creationDate = null;
             creator = null;
@@ -104,9 +108,17 @@ public class MetadataController {
             for (Entry<String, String> entry : allRequestParams.entrySet()) {
                 String key = entry.getKey();
                 // Check if the key is a standard metadata key
-                if (!key.equalsIgnoreCase("Author") && !key.equalsIgnoreCase("CreationDate") && !key.equalsIgnoreCase("Creator") && !key.equalsIgnoreCase("Keywords")
+                if (!key.equalsIgnoreCase("Author")
-                        && !key.equalsIgnoreCase("modificationDate") && !key.equalsIgnoreCase("Producer") && !key.equalsIgnoreCase("Subject") && !key.equalsIgnoreCase("Title")
+                        && !key.equalsIgnoreCase("CreationDate")
-                        && !key.equalsIgnoreCase("Trapped") && !key.contains("customKey") && !key.contains("customValue")) {
+                        && !key.equalsIgnoreCase("Creator")
+                        && !key.equalsIgnoreCase("Keywords")
+                        && !key.equalsIgnoreCase("modificationDate")
+                        && !key.equalsIgnoreCase("Producer")
+                        && !key.equalsIgnoreCase("Subject")
+                        && !key.equalsIgnoreCase("Title")
+                        && !key.equalsIgnoreCase("Trapped")
+                        && !key.contains("customKey")
+                        && !key.contains("customValue")) {
                     info.setCustomMetadataValue(key, entry.getValue());
                 } else if (key.contains("customKey")) {
                     int number = Integer.parseInt(key.replaceAll("\\D", ""));
@@ -119,7 +131,8 @@ public class MetadataController {
         if (creationDate != null && creationDate.length() > 0) {
             Calendar creationDateCal = Calendar.getInstance();
             try {
-                creationDateCal.setTime(new SimpleDateFormat("yyyy/MM/dd HH:mm:ss").parse(creationDate));
+                creationDateCal.setTime(
+                        new SimpleDateFormat("yyyy/MM/dd HH:mm:ss").parse(creationDate));
             } catch (ParseException e) {
                 e.printStackTrace();
             }
@@ -130,7 +143,8 @@ public class MetadataController {
         if (modificationDate != null && modificationDate.length() > 0) {
             Calendar modificationDateCal = Calendar.getInstance();
             try {
-                modificationDateCal.setTime(new SimpleDateFormat("yyyy/MM/dd HH:mm:ss").parse(modificationDate));
+                modificationDateCal.setTime(
+                        new SimpleDateFormat("yyyy/MM/dd HH:mm:ss").parse(modificationDate));
             } catch (ParseException e) {
                 e.printStackTrace();
             }
@@ -147,7 +161,8 @@ public class MetadataController {
         info.setTrapped(trapped);
 
         document.setDocumentInformation(info);
-        return WebResponseUtils.pdfDocToWebResponse(document, pdfFile.getOriginalFilename().replaceFirst("[.][^.]+$", "") + "_metadata.pdf");
+        return WebResponseUtils.pdfDocToWebResponse(
+                document,
+                pdfFile.getOriginalFilename().replaceFirst("[.][^.]+$", "") + "_metadata.pdf");
     }
-
 }

src/main/java/stirling/software/SPDF/controller/api/misc/OCRController.java

@@ -26,6 +26,7 @@ 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.misc.ProcessPdfWithOcrRequest;
 import stirling.software.SPDF.utils.ProcessExecutor;
 import stirling.software.SPDF.utils.ProcessExecutor.ProcessExecutorResult;
@@ -44,14 +45,21 @@ public class OCRController {
         if (files == null) {
             return Collections.emptyList();
         }
-        return Arrays.stream(files).filter(file -> file.getName().endsWith(".traineddata")).map(file -> file.getName().replace(".traineddata", ""))
+        return Arrays.stream(files)
-                .filter(lang -> !lang.equalsIgnoreCase("osd")).collect(Collectors.toList());
+                .filter(file -> file.getName().endsWith(".traineddata"))
+                .map(file -> file.getName().replace(".traineddata", ""))
+                .filter(lang -> !lang.equalsIgnoreCase("osd"))
+                .collect(Collectors.toList());
     }
 
     @PostMapping(consumes = "multipart/form-data", value = "/ocr-pdf")
-    @Operation(summary = "Process a PDF file with OCR",
+    @Operation(
-            description = "This endpoint processes a PDF file using OCR (Optical Character Recognition). Users can specify languages, sidecar, deskew, clean, cleanFinal, ocrType, ocrRenderType, and removeImagesAfter options. Input:PDF Output:PDF Type:SI-Conditional")
+            summary = "Process a PDF file with OCR",
-    public ResponseEntity<byte[]> processPdfWithOCR(@ModelAttribute ProcessPdfWithOcrRequest request) throws IOException, InterruptedException {
+            description =
+                    "This endpoint processes a PDF file using OCR (Optical Character Recognition). Users can specify languages, sidecar, deskew, clean, cleanFinal, ocrType, ocrRenderType, and removeImagesAfter options. Input:PDF Output:PDF Type:SI-Conditional")
+    public ResponseEntity<byte[]> processPdfWithOCR(
+            @ModelAttribute ProcessPdfWithOcrRequest request)
+            throws IOException, InterruptedException {
         MultipartFile inputFile = request.getFileInput();
         List<String> selectedLanguages = request.getLanguages();
         Boolean sidecar = request.isSidecar();
@@ -66,7 +74,7 @@ public class OCRController {
             throw new IOException("Please select at least one language.");
         }
 
-        if(!ocrRenderType.equals("hocr") && !ocrRenderType.equals("sandwich")) {
+        if (!ocrRenderType.equals("hocr") && !ocrRenderType.equals("sandwich")) {
             throw new IOException("ocrRenderType wrong");
         }
 
@@ -74,7 +82,8 @@ public class OCRController {
         List<String> availableLanguages = getAvailableTesseractLanguages();
 
         // Validate selected languages
-        selectedLanguages = selectedLanguages.stream().filter(availableLanguages::contains).toList();
+        selectedLanguages =
+                selectedLanguages.stream().filter(availableLanguages::contains).toList();
 
         if (selectedLanguages.isEmpty()) {
             throw new IOException("None of the selected languages are valid.");
@@ -92,8 +101,16 @@ public class OCRController {
         // Run OCR Command
         String languageOption = String.join("+", selectedLanguages);
 
-        
+        List<String> command =
-        List<String> command = new ArrayList<>(Arrays.asList("ocrmypdf", "--verbose", "2", "--output-type", "pdf", "--pdf-renderer" , ocrRenderType));
+                new ArrayList<>(
+                        Arrays.asList(
+                                "ocrmypdf",
+                                "--verbose",
+                                "2",
+                                "--output-type",
+                                "pdf",
+                                "--pdf-renderer",
+                                ocrRenderType));
 
         if (sidecar != null && sidecar) {
             sidecarTextPath = Files.createTempFile("sidecar", ".txt");
@@ -120,26 +137,42 @@ public class OCRController {
             }
         }
 
-        command.addAll(Arrays.asList("--language", languageOption, tempInputFile.toString(), tempOutputFile.toString()));
+        command.addAll(
+                Arrays.asList(
+                        "--language",
+                        languageOption,
+                        tempInputFile.toString(),
+                        tempOutputFile.toString()));
 
         // Run CLI command
-        ProcessExecutorResult result = ProcessExecutor.getInstance(ProcessExecutor.Processes.OCR_MY_PDF).runCommandWithOutputHandling(command);
+        ProcessExecutorResult result =
-        if(result.getRc() != 0 && result.getMessages().contains("multiprocessing/synchronize.py") && result.getMessages().contains("OSError: [Errno 38] Function not implemented")) {
+                ProcessExecutor.getInstance(ProcessExecutor.Processes.OCR_MY_PDF)
-        	command.add("--jobs");
+                        .runCommandWithOutputHandling(command);
-        	command.add("1");
+        if (result.getRc() != 0
-        	result = ProcessExecutor.getInstance(ProcessExecutor.Processes.OCR_MY_PDF).runCommandWithOutputHandling(command);
+                && result.getMessages().contains("multiprocessing/synchronize.py")
+                && result.getMessages().contains("OSError: [Errno 38] Function not implemented")) {
+            command.add("--jobs");
+            command.add("1");
+            result =
+                    ProcessExecutor.getInstance(ProcessExecutor.Processes.OCR_MY_PDF)
+                            .runCommandWithOutputHandling(command);
         }
 
-
-        
-        
         // Remove images from the OCR processed PDF if the flag is set to true
         if (removeImagesAfter != null && removeImagesAfter) {
             Path tempPdfWithoutImages = Files.createTempFile("output_", "_no_images.pdf");
 
-            List<String> gsCommand = Arrays.asList("gs", "-sDEVICE=pdfwrite", "-dFILTERIMAGE", "-o", tempPdfWithoutImages.toString(), tempOutputFile.toString());
+            List<String> gsCommand =
+                    Arrays.asList(
+                            "gs",
+                            "-sDEVICE=pdfwrite",
+                            "-dFILTERIMAGE",
+                            "-o",
+                            tempPdfWithoutImages.toString(),
+                            tempOutputFile.toString());
 
-            ProcessExecutor.getInstance(ProcessExecutor.Processes.GHOSTSCRIPT).runCommandWithOutputHandling(gsCommand);
+            ProcessExecutor.getInstance(ProcessExecutor.Processes.GHOSTSCRIPT)
+                    .runCommandWithOutputHandling(gsCommand);
             tempOutputFile = tempPdfWithoutImages;
         }
         // Read the OCR processed PDF file
@@ -148,14 +181,17 @@ public class OCRController {
         Files.delete(tempInputFile);
 
         // Return the OCR processed PDF as a response
-        String outputFilename = inputFile.getOriginalFilename().replaceFirst("[.][^.]+$", "") + "_OCR.pdf";
+        String outputFilename =
+                inputFile.getOriginalFilename().replaceFirst("[.][^.]+$", "") + "_OCR.pdf";
 
         if (sidecar != null && sidecar) {
             // Create a zip file containing both the PDF and the text file
-            String outputZipFilename = inputFile.getOriginalFilename().replaceFirst("[.][^.]+$", "") + "_OCR.zip";
+            String outputZipFilename =
+                    inputFile.getOriginalFilename().replaceFirst("[.][^.]+$", "") + "_OCR.zip";
             Path tempZipFile = Files.createTempFile("output_", ".zip");
 
-            try (ZipOutputStream zipOut = new ZipOutputStream(new FileOutputStream(tempZipFile.toFile()))) {
+            try (ZipOutputStream zipOut =
+                    new ZipOutputStream(new FileOutputStream(tempZipFile.toFile()))) {
                 // Add PDF file to the zip
                 ZipEntry pdfEntry = new ZipEntry(outputFilename);
                 zipOut.putNextEntry(pdfEntry);
@@ -177,13 +213,12 @@ public class OCRController {
             Files.delete(sidecarTextPath);
 
             // Return the zip file containing both the PDF and the text file
-            return WebResponseUtils.bytesToWebResponse(zipBytes, outputZipFilename, MediaType.APPLICATION_OCTET_STREAM);
+            return WebResponseUtils.bytesToWebResponse(
+                    zipBytes, outputZipFilename, MediaType.APPLICATION_OCTET_STREAM);
         } else {
             // Return the OCR processed PDF as a response
             Files.delete(tempOutputFile);
             return WebResponseUtils.bytesToWebResponse(pdfBytes, outputFilename);
         }
-
     }
-
 }

src/main/java/stirling/software/SPDF/controller/api/misc/OverlayImageController.java

@@ -14,6 +14,7 @@ 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.misc.OverlayImageRequest;
 import stirling.software.SPDF.utils.PdfUtils;
 import stirling.software.SPDF.utils.WebResponseUtils;
@@ -27,9 +28,9 @@ public class OverlayImageController {
 
     @PostMapping(consumes = "multipart/form-data", value = "/add-image")
     @Operation(
-        summary = "Overlay image onto a PDF file",
+            summary = "Overlay image onto a PDF file",
-        description = "This endpoint overlays an image onto a PDF file at the specified coordinates. The image can be overlaid on every page of the PDF if specified.  Input:PDF/IMAGE Output:PDF Type:MF-SISO"
+            description =
-    )
+                    "This endpoint overlays an image onto a PDF file at the specified coordinates. The image can be overlaid on every page of the PDF if specified.  Input:PDF/IMAGE Output:PDF Type:MF-SISO")
     public ResponseEntity<byte[]> overlayImage(@ModelAttribute OverlayImageRequest request) {
         MultipartFile pdfFile = request.getFileInput();
         MultipartFile imageFile = request.getImageFile();
@@ -41,7 +42,9 @@ public class OverlayImageController {
             byte[] imageBytes = imageFile.getBytes();
             byte[] result = PdfUtils.overlayImage(pdfBytes, imageBytes, x, y, everyPage);
 
-            return WebResponseUtils.bytesToWebResponse(result, pdfFile.getOriginalFilename().replaceFirst("[.][^.]+$", "") + "_overlayed.pdf");
+            return WebResponseUtils.bytesToWebResponse(
+                    result,
+                    pdfFile.getOriginalFilename().replaceFirst("[.][^.]+$", "") + "_overlayed.pdf");
         } catch (IOException e) {
             logger.error("Failed to add image to PDF", e);
             return new ResponseEntity<>(HttpStatus.BAD_REQUEST);

src/main/java/stirling/software/SPDF/controller/api/misc/PageNumbersController.java

@@ -21,6 +21,7 @@ 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.misc.AddPageNumbersRequest;
 import stirling.software.SPDF.utils.GeneralUtils;
 import stirling.software.SPDF.utils.WebResponseUtils;
@@ -33,16 +34,20 @@ public class PageNumbersController {
     private static final Logger logger = LoggerFactory.getLogger(PageNumbersController.class);
 
     @PostMapping(value = "/add-page-numbers", consumes = "multipart/form-data")
-    @Operation(summary = "Add page numbers to a PDF document", description = "This operation takes an input PDF file and adds page numbers to it. Input:PDF Output:PDF Type:SISO")
+    @Operation(
-    public ResponseEntity<byte[]> addPageNumbers(@ModelAttribute AddPageNumbersRequest request) throws IOException {
+            summary = "Add page numbers to a PDF document",
+            description =
+                    "This operation takes an input PDF file and adds page numbers to it. Input:PDF Output:PDF Type:SISO")
+    public ResponseEntity<byte[]> addPageNumbers(@ModelAttribute AddPageNumbersRequest request)
+            throws IOException {
         MultipartFile file = request.getFileInput();
         String customMargin = request.getCustomMargin();
         int position = request.getPosition();
         int startingNumber = request.getStartingNumber();
         String pagesToNumber = request.getPagesToNumber();
         String customText = request.getCustomText();
-    	int pageNumber = startingNumber;
+        int pageNumber = startingNumber;
-    	byte[] fileBytes = file.getBytes();
+        byte[] fileBytes = file.getBytes();
         PDDocument document = PDDocument.load(fileBytes);
 
         float marginFactor;
@@ -60,7 +65,6 @@ public class PageNumbersController {
                 marginFactor = 0.075f;
                 break;
 
-                
             default:
                 marginFactor = 0.035f;
                 break;
@@ -68,19 +72,29 @@ public class PageNumbersController {
 
         float fontSize = 12.0f;
         PDType1Font font = PDType1Font.HELVETICA;
-        if(pagesToNumber == null || pagesToNumber.length() == 0) {
+        if (pagesToNumber == null || pagesToNumber.length() == 0) {
-        	pagesToNumber = "all";
+            pagesToNumber = "all";
         }
-        if(customText == null || customText.length() == 0) {
+        if (customText == null || customText.length() == 0) {
-        	customText = "{n}";
+            customText = "{n}";
         }
-        List<Integer> pagesToNumberList = GeneralUtils.parsePageList(pagesToNumber.split(","), document.getNumberOfPages());
+        List<Integer> pagesToNumberList =
+                GeneralUtils.parsePageList(pagesToNumber.split(","), document.getNumberOfPages());
 
         for (int i : pagesToNumberList) {
             PDPage page = document.getPage(i);
             PDRectangle pageSize = page.getMediaBox();
 
-            String text = customText != null ? customText.replace("{n}", String.valueOf(pageNumber)).replace("{total}", String.valueOf(document.getNumberOfPages())).replace("{filename}", file.getOriginalFilename().replaceFirst("[.][^.]+$", "")) : String.valueOf(pageNumber);
+            String text =
+                    customText != null
+                            ? customText
+                                    .replace("{n}", String.valueOf(pageNumber))
+                                    .replace("{total}", String.valueOf(document.getNumberOfPages()))
+                                    .replace(
+                                            "{filename}",
+                                            file.getOriginalFilename()
+                                                    .replaceFirst("[.][^.]+$", ""))
+                            : String.valueOf(pageNumber);
 
             float x, y;
 
@@ -88,10 +102,10 @@ public class PageNumbersController {
             int yGroup = 2 - (position - 1) / 3;
 
             switch (xGroup) {
-                case 0:  // left
+                case 0: // left
                     x = pageSize.getLowerLeftX() + marginFactor * pageSize.getWidth();
                     break;
-                case 1:  // center
+                case 1: // center
                     x = pageSize.getLowerLeftX() + (pageSize.getWidth() / 2);
                     break;
                 default: // right
@@ -100,10 +114,10 @@ public class PageNumbersController {
             }
 
             switch (yGroup) {
-                case 0:  // bottom
+                case 0: // bottom
                     y = pageSize.getLowerLeftY() + marginFactor * pageSize.getHeight();
                     break;
-                case 1:  // middle
+                case 1: // middle
                     y = pageSize.getLowerLeftY() + (pageSize.getHeight() / 2);
                     break;
                 default: // top
@@ -111,7 +125,9 @@ public class PageNumbersController {
                     break;
             }
 
-            PDPageContentStream contentStream = new PDPageContentStream(document, page, PDPageContentStream.AppendMode.APPEND, true);
+            PDPageContentStream contentStream =
+                    new PDPageContentStream(
+                            document, page, PDPageContentStream.AppendMode.APPEND, true);
             contentStream.beginText();
             contentStream.setFont(font, fontSize);
             contentStream.newLineAtOffset(x, y);
@@ -126,10 +142,9 @@ public class PageNumbersController {
         document.save(baos);
         document.close();
 
-        return WebResponseUtils.bytesToWebResponse(baos.toByteArray(), file.getOriginalFilename().replaceFirst("[.][^.]+$", "") + "_numbersAdded.pdf", MediaType.APPLICATION_PDF);
+        return WebResponseUtils.bytesToWebResponse(
-
+                baos.toByteArray(),
+                file.getOriginalFilename().replaceFirst("[.][^.]+$", "") + "_numbersAdded.pdf",
+                MediaType.APPLICATION_PDF);
     }
-
-
-
 }

src/main/java/stirling/software/SPDF/controller/api/misc/RepairController.java

@@ -17,6 +17,7 @@ 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.PDFFile;
 import stirling.software.SPDF.utils.ProcessExecutor;
 import stirling.software.SPDF.utils.ProcessExecutor.ProcessExecutorResult;
@@ -31,11 +32,12 @@ public class RepairController {
 
     @PostMapping(consumes = "multipart/form-data", value = "/repair")
     @Operation(
-        summary = "Repair a PDF file",
+            summary = "Repair a PDF file",
-        description = "This endpoint repairs a given PDF file by running Ghostscript command. The PDF is first saved to a temporary location, repaired, read back, and then returned as a response. Input:PDF Output:PDF Type:SISO"
+            description =
-    )
+                    "This endpoint repairs a given PDF file by running Ghostscript command. The PDF is first saved to a temporary location, repaired, read back, and then returned as a response. Input:PDF Output:PDF Type:SISO")
-    public ResponseEntity<byte[]> repairPdf(@ModelAttribute PDFFile request) throws IOException, InterruptedException {
+    public ResponseEntity<byte[]> repairPdf(@ModelAttribute PDFFile request)
-    	MultipartFile inputFile = request.getFileInput();
+            throws IOException, InterruptedException {
+        MultipartFile inputFile = request.getFileInput();
         // Save the uploaded file to a temporary location
         Path tempInputFile = Files.createTempFile("input_", ".pdf");
         inputFile.transferTo(tempInputFile.toFile());
@@ -50,8 +52,9 @@ public class RepairController {
         command.add("-sDEVICE=pdfwrite");
         command.add(tempInputFile.toString());
 
-
+        ProcessExecutorResult returnCode =
-        ProcessExecutorResult returnCode = ProcessExecutor.getInstance(ProcessExecutor.Processes.GHOSTSCRIPT).runCommandWithOutputHandling(command);
+                ProcessExecutor.getInstance(ProcessExecutor.Processes.GHOSTSCRIPT)
+                        .runCommandWithOutputHandling(command);
 
         // Read the optimized PDF file
         byte[] pdfBytes = Files.readAllBytes(tempOutputFile);
@@ -61,8 +64,8 @@ public class RepairController {
         Files.delete(tempOutputFile);
 
         // Return the optimized PDF as a response
-        String outputFilename = inputFile.getOriginalFilename().replaceFirst("[.][^.]+$", "") + "_repaired.pdf";
+        String outputFilename =
+                inputFile.getOriginalFilename().replaceFirst("[.][^.]+$", "") + "_repaired.pdf";
         return WebResponseUtils.bytesToWebResponse(pdfBytes, outputFilename);
     }
-
 }

src/main/java/stirling/software/SPDF/controller/api/misc/ShowJavascript.java

@@ -17,47 +17,60 @@ 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.PDFFile;
 import stirling.software.SPDF.utils.WebResponseUtils;
+
 @RestController
 @RequestMapping("/api/v1/misc")
 @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", description = "desc. Input:PDF Output:JS Type:SISO")
+    @Operation(
+            summary = "Grabs all JS from a PDF and returns a single JS file with all code",
+            description = "desc. Input:PDF Output:JS Type:SISO")
     public ResponseEntity<byte[]> extractHeader(@ModelAttribute PDFFile request) throws Exception {
-    	MultipartFile inputFile = request.getFileInput();
+        MultipartFile inputFile = request.getFileInput();
         String script = "";
 
         try (PDDocument document = PDDocument.load(inputFile.getInputStream())) {
 
-        	if(document.getDocumentCatalog() != null && document.getDocumentCatalog().getNames() != null) {
+            if (document.getDocumentCatalog() != null
-	            PDNameTreeNode<PDActionJavaScript> jsTree = document.getDocumentCatalog().getNames().getJavaScript();
+                    && document.getDocumentCatalog().getNames() != null) {
+                PDNameTreeNode<PDActionJavaScript> jsTree =
+                        document.getDocumentCatalog().getNames().getJavaScript();
 
-	            if (jsTree != null) {
+                if (jsTree != null) {
-	                Map<String, PDActionJavaScript> jsEntries = jsTree.getNames();
+                    Map<String, PDActionJavaScript> jsEntries = jsTree.getNames();
 
-	                for (Map.Entry<String, PDActionJavaScript> entry : jsEntries.entrySet()) {
+                    for (Map.Entry<String, PDActionJavaScript> entry : jsEntries.entrySet()) {
-	                    String name = entry.getKey();
+                        String name = entry.getKey();
-	                    PDActionJavaScript jsAction = entry.getValue();
+                        PDActionJavaScript jsAction = entry.getValue();
-	                    String jsCodeStr = jsAction.getAction();
+                        String jsCodeStr = jsAction.getAction();
 
-	                    script += "// File: " + inputFile.getOriginalFilename() + ", Script: " + name + "\n" + jsCodeStr + "\n";
+                        script +=
-	                }
+                                "// File: "
-	            }
+                                        + inputFile.getOriginalFilename()
-        	}
+                                        + ", Script: "
-
+                                        + name
-            if (script.isEmpty()) {
+                                        + "\n"
-                script = "PDF '" + inputFile.getOriginalFilename() + "' does not contain Javascript";
+                                        + jsCodeStr
+                                        + "\n";
+                    }
+                }
             }
 
-            return WebResponseUtils.bytesToWebResponse(script.getBytes(StandardCharsets.UTF_8), inputFile.getOriginalFilename() + ".js");
+            if (script.isEmpty()) {
+                script =
+                        "PDF '" + inputFile.getOriginalFilename() + "' does not contain Javascript";
+            }
+
+            return WebResponseUtils.bytesToWebResponse(
+                    script.getBytes(StandardCharsets.UTF_8),
+                    inputFile.getOriginalFilename() + ".js");
         }
     }
-    
-
-
-
 }

src/main/java/stirling/software/SPDF/controller/api/pipeline/ApiDocService.java

@@ -1,9 +1,11 @@
 package stirling.software.SPDF.controller.api.pipeline;
+
 import java.util.HashMap;
 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;
@@ -17,11 +19,10 @@ import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 
 import jakarta.servlet.ServletContext;
-
 import stirling.software.SPDF.SPdfApplication;
 import stirling.software.SPDF.model.ApiEndpoint;
 import stirling.software.SPDF.model.Role;
-import org.slf4j.Logger;
+
 @Service
 public class ApiDocService {
 
@@ -29,32 +30,28 @@ public class ApiDocService {
 
     private static final Logger logger = LoggerFactory.getLogger(ApiDocService.class);
 
-    @Autowired
+    @Autowired private ServletContext servletContext;
-    private ServletContext servletContext;
 
     private String getApiDocsUrl() {
         String contextPath = servletContext.getContextPath();
         String port = SPdfApplication.getPort();
 
-        return "http://localhost:"+ port + contextPath + "/v1/api-docs";
+        return "http://localhost:" + port + contextPath + "/v1/api-docs";
     }
 
+    @Autowired(required = false)
+    private UserServiceInterface userService;
 
-    @Autowired(required=false)
+    private String getApiKeyForUser() {
-	private UserServiceInterface userService;
+        if (userService == null) return "";
+        return userService.getApiKeyForUser(Role.INTERNAL_API_USER.getRoleId());
+    }
 
-	private String getApiKeyForUser() {
+    JsonNode apiDocsJsonRootNode;
-		if(userService == null)
-			return "";
-		return userService.getApiKeyForUser(Role.INTERNAL_API_USER.getRoleId());
-	}
 
-	JsonNode apiDocsJsonRootNode;
+    // @EventListener(ApplicationReadyEvent.class)
-	
+    private synchronized void loadApiDocumentation() {
-	
+        String apiDocsJson = "";
-	//@EventListener(ApplicationReadyEvent.class)
-	private synchronized void loadApiDocumentation() {
-		String apiDocsJson = "";
         try {
             HttpHeaders headers = new HttpHeaders();
             String apiKey = getApiKeyForUser();
@@ -64,32 +61,35 @@ public class ApiDocService {
             HttpEntity<String> entity = new HttpEntity<>(headers);
 
             RestTemplate restTemplate = new RestTemplate();
-            ResponseEntity<String> response = restTemplate.exchange(getApiDocsUrl(), HttpMethod.GET, entity, String.class);
+            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(entry -> {
+            paths.fields()
-                String path = entry.getKey();
+                    .forEachRemaining(
-                JsonNode pathNode = entry.getValue();
+                            entry -> {
-                if (pathNode.has("post")) {
+                                String path = entry.getKey();
-                    JsonNode postNode = pathNode.get("post");
+                                JsonNode pathNode = entry.getValue();
-                    ApiEndpoint endpoint = new ApiEndpoint(path, postNode);
+                                if (pathNode.has("post")) {
-                    apiDocumentation.put(path, endpoint);
+                                    JsonNode postNode = pathNode.get("post");
-                }
+                                    ApiEndpoint endpoint = new ApiEndpoint(path, postNode);
-            });
+                                    apiDocumentation.put(path, endpoint);
+                                }
+                            });
         } catch (Exception e) {
             // Handle exceptions
-        	logger.error("Error grabbing swagger doc, body result {}", apiDocsJson);
+            logger.error("Error grabbing swagger doc, body result {}", apiDocsJson);
         }
     }
 
     public boolean isValidOperation(String operationName, Map<String, Object> parameters) {
-    	if(apiDocumentation.size() == 0) {
+        if (apiDocumentation.size() == 0) {
-    		loadApiDocumentation();
+            loadApiDocumentation();
-    	}
+        }
         if (!apiDocumentation.containsKey(operationName)) {
             return false;
         }
@@ -98,10 +98,10 @@ public class ApiDocService {
     }
 
     public boolean isMultiInput(String operationName) {
-    	if(apiDocsJsonRootNode == null || apiDocumentation.size() == 0) {
+        if (apiDocsJsonRootNode == null || apiDocumentation.size() == 0) {
-    		loadApiDocumentation();
+            loadApiDocumentation();
-    	}
+        }
-    	if (!apiDocumentation.containsKey(operationName)) {
+        if (!apiDocumentation.containsKey(operationName)) {
             return false;
         }
 
@@ -120,4 +120,3 @@ public class ApiDocService {
 }
 
 // Model class for API Endpoint
-

src/main/java/stirling/software/SPDF/controller/api/pipeline/PipelineController.java

@@ -2,7 +2,9 @@ package stirling.software.SPDF.controller.api.pipeline;
 
 import java.io.ByteArrayOutputStream;
 import java.io.InputStream;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipOutputStream;
 
@@ -24,6 +26,7 @@ import com.fasterxml.jackson.databind.JsonMappingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 
 import io.swagger.v3.oas.annotations.tags.Tag;
+
 import stirling.software.SPDF.model.ApplicationProperties;
 import stirling.software.SPDF.model.PipelineConfig;
 import stirling.software.SPDF.model.api.HandleDataRequest;
@@ -34,84 +37,97 @@ import stirling.software.SPDF.utils.WebResponseUtils;
 @Tag(name = "Pipeline", description = "Pipeline APIs")
 public class PipelineController {
 
-	private static final Logger logger = LoggerFactory.getLogger(PipelineController.class);
+    private static final Logger logger = LoggerFactory.getLogger(PipelineController.class);
 
-	final String watchedFoldersDir = "./pipeline/watchedFolders/";
+    final String watchedFoldersDir = "./pipeline/watchedFolders/";
-	final String finishedFoldersDir = "./pipeline/finishedFolders/";
+    final String finishedFoldersDir = "./pipeline/finishedFolders/";
-	@Autowired
+    @Autowired PipelineProcessor processor;
-	PipelineProcessor processor;
 
+    @Autowired ApplicationProperties applicationProperties;
 
-	@Autowired
+    @Autowired private ObjectMapper objectMapper;
-	ApplicationProperties applicationProperties;
 
-	@Autowired
+    @PostMapping("/handleData")
-	private ObjectMapper objectMapper;
+    public ResponseEntity<byte[]> handleData(@ModelAttribute HandleDataRequest request)
+            throws JsonMappingException, JsonProcessingException {
+        if (!Boolean.TRUE.equals(applicationProperties.getSystem().getEnableAlphaFunctionality())) {
+            return new ResponseEntity<>(HttpStatus.BAD_REQUEST);
+        }
 
-
+        MultipartFile[] files = request.getFileInput();
-	@PostMapping("/handleData")
+        String jsonString = request.getJson();
-	public ResponseEntity<byte[]> handleData(@ModelAttribute HandleDataRequest request) throws JsonMappingException, JsonProcessingException {
+        if (files == null) {
-		if (!Boolean.TRUE.equals(applicationProperties.getSystem().getEnableAlphaFunctionality())) {
+            return null;
-			return new ResponseEntity<>(HttpStatus.BAD_REQUEST);
+        }
-		}
+        PipelineConfig config = objectMapper.readValue(jsonString, PipelineConfig.class);
-
+        logger.info("Received POST request to /handleData with {} files", files.length);
-		MultipartFile[] files = request.getFileInput();
+        try {
-		String jsonString = request.getJson();
+            List<Resource> inputFiles = processor.generateInputFiles(files);
-		if (files == null) {
+            if (inputFiles == null || inputFiles.size() == 0) {
-			return null;
+                return null;
-		}
-		PipelineConfig config = objectMapper.readValue(jsonString, PipelineConfig.class);
-		logger.info("Received POST request to /handleData with {} files", files.length);
-		try {
-			List<Resource> inputFiles = processor.generateInputFiles(files);
-			if(inputFiles == null  || inputFiles.size() == 0) {
-            	return null;
             }
-			List<Resource> outputFiles = processor.runPipelineAgainstFiles(inputFiles, config);
+            List<Resource> outputFiles = processor.runPipelineAgainstFiles(inputFiles, config);
-			if (outputFiles != null && outputFiles.size() == 1) {
+            if (outputFiles != null && outputFiles.size() == 1) {
-				// If there is only one file, return it directly
+                // If there is only one file, return it directly
-				Resource singleFile = outputFiles.get(0);
+                Resource singleFile = outputFiles.get(0);
-				InputStream is = singleFile.getInputStream();
+                InputStream is = singleFile.getInputStream();
-				byte[] bytes = new byte[(int) singleFile.contentLength()];
+                byte[] bytes = new byte[(int) singleFile.contentLength()];
-				is.read(bytes);
+                is.read(bytes);
-				is.close();
+                is.close();
 
-				logger.info("Returning single file response...");
+                logger.info("Returning single file response...");
-				return WebResponseUtils.bytesToWebResponse(bytes, singleFile.getFilename(),
+                return WebResponseUtils.bytesToWebResponse(
-						MediaType.APPLICATION_OCTET_STREAM);
+                        bytes, singleFile.getFilename(), MediaType.APPLICATION_OCTET_STREAM);
-			} else if (outputFiles == null) {
+            } else if (outputFiles == null) {
-				return null;
+                return null;
-			}
+            }
 
-			// Create a ByteArrayOutputStream to hold the zip
+            // Create a ByteArrayOutputStream to hold the zip
-			ByteArrayOutputStream baos = new ByteArrayOutputStream();
+            ByteArrayOutputStream baos = new ByteArrayOutputStream();
-			ZipOutputStream zipOut = new ZipOutputStream(baos);
+            ZipOutputStream zipOut = new ZipOutputStream(baos);
 
-			// Loop through each file and add it to the zip
+            // A map to keep track of filenames and their counts
-			for (Resource file : outputFiles) {
+            Map<String, Integer> filenameCount = new HashMap<>();
-				ZipEntry zipEntry = new ZipEntry(file.getFilename());
-				zipOut.putNextEntry(zipEntry);
 
-				// Read the file into a byte array
+            // Loop through each file and add it to the zip
-				InputStream is = file.getInputStream();
+            for (Resource file : outputFiles) {
-				byte[] bytes = new byte[(int) file.contentLength()];
+                String originalFilename = file.getFilename();
-				is.read(bytes);
+                String filename = originalFilename;
 
-				// Write the bytes of the file to the zip
+                // Check if the filename already exists, and modify it if necessary
-				zipOut.write(bytes, 0, bytes.length);
+                if (filenameCount.containsKey(originalFilename)) {
-				zipOut.closeEntry();
+                    int count = filenameCount.get(originalFilename);
+                    String baseName = originalFilename.replaceAll("\\.[^.]*$", "");
+                    String extension = originalFilename.replaceAll("^.*\\.", "");
+                    filename = baseName + "(" + count + ")." + extension;
+                    filenameCount.put(originalFilename, count + 1);
+                } else {
+                    filenameCount.put(originalFilename, 1);
+                }
 
-				is.close();
+                ZipEntry zipEntry = new ZipEntry(filename);
-			}
+                zipOut.putNextEntry(zipEntry);
 
-			zipOut.close();
+                // Read the file into a byte array
+                InputStream is = file.getInputStream();
+                byte[] bytes = new byte[(int) file.contentLength()];
+                is.read(bytes);
 
-			logger.info("Returning zipped file response...");
+                // Write the bytes of the file to the zip
-			return WebResponseUtils.boasToWebResponse(baos, "output.zip", MediaType.APPLICATION_OCTET_STREAM);
+                zipOut.write(bytes, 0, bytes.length);
-		} catch (Exception e) {
+                zipOut.closeEntry();
-			logger.error("Error handling data: ", e);
-			return null;
-		}
-	}
 
+                is.close();
+            }
+
+            zipOut.close();
+
+            logger.info("Returning zipped file response...");
+            return WebResponseUtils.boasToWebResponse(
+                    baos, "output.zip", MediaType.APPLICATION_OCTET_STREAM);
+        } catch (Exception e) {
+            logger.error("Error handling data: ", e);
+            return null;
+        }
+    }
 }

src/main/java/stirling/software/SPDF/controller/api/pipeline/PipelineDirectoryProcessor.java

@@ -33,49 +33,47 @@ import stirling.software.SPDF.model.PipelineOperation;
 @Service
 public class PipelineDirectoryProcessor {
 
-	private static final Logger logger = LoggerFactory.getLogger(PipelineDirectoryProcessor.class);
+    private static final Logger logger = LoggerFactory.getLogger(PipelineDirectoryProcessor.class);
-    @Autowired
+    @Autowired private ObjectMapper objectMapper;
-    private ObjectMapper objectMapper;
+    @Autowired private ApiDocService apiDocService;
-    @Autowired
+    @Autowired private ApplicationProperties applicationProperties;
-    private ApiDocService apiDocService;
-    @Autowired
-    private ApplicationProperties applicationProperties;
 
     final String watchedFoldersDir = "./pipeline/watchedFolders/";
-	final String finishedFoldersDir = "./pipeline/finishedFolders/";
+    final String finishedFoldersDir = "./pipeline/finishedFolders/";
 
-    @Autowired
+    @Autowired PipelineProcessor processor;
-	PipelineProcessor processor;
 
     @Scheduled(fixedRate = 60000)
-	public void scanFolders() {
+    public void scanFolders() {
-		if (!Boolean.TRUE.equals(applicationProperties.getSystem().getEnableAlphaFunctionality())) {
+        if (!Boolean.TRUE.equals(applicationProperties.getSystem().getEnableAlphaFunctionality())) {
-			return;
+            return;
-		}
+        }
-		Path watchedFolderPath = Paths.get(watchedFoldersDir);
+        Path watchedFolderPath = Paths.get(watchedFoldersDir);
-		if (!Files.exists(watchedFolderPath)) {
+        if (!Files.exists(watchedFolderPath)) {
-			try {
+            try {
-				Files.createDirectories(watchedFolderPath);
+                Files.createDirectories(watchedFolderPath);
-				logger.info("Created directory: {}", watchedFolderPath);
+                logger.info("Created directory: {}", watchedFolderPath);
-			} catch (IOException e) {
+            } catch (IOException e) {
-				logger.error("Error creating directory: {}", watchedFolderPath, e);
+                logger.error("Error creating directory: {}", watchedFolderPath, e);
-				return;
+                return;
-			}
+            }
-		}
+        }
-		try (Stream<Path> paths = Files.walk(watchedFolderPath)) {
+        try (Stream<Path> paths = Files.walk(watchedFolderPath)) {
-			paths.filter(Files::isDirectory).forEach(t -> {
+            paths.filter(Files::isDirectory)
-				try {
+                    .forEach(
-					if (!t.equals(watchedFolderPath) && !t.endsWith("processing")) {
+                            t -> {
-						handleDirectory(t);
+                                try {
-					}
+                                    if (!t.equals(watchedFolderPath) && !t.endsWith("processing")) {
-				} catch (Exception e) {
+                                        handleDirectory(t);
-					logger.error("Error handling directory: {}", t, e);
+                                    }
-				}
+                                } catch (Exception e) {
-			});
+                                    logger.error("Error handling directory: {}", t, e);
-		} catch (Exception e) {
+                                }
-			logger.error("Error walking through directory: {}", watchedFolderPath, e);
+                            });
-		}
+        } catch (Exception e) {
-	}
+            logger.error("Error walking through directory: {}", watchedFolderPath, e);
+        }
+    }
 
     public void handleDirectory(Path dir) throws IOException {
         logger.info("Handling directory: {}", dir);
@@ -113,13 +111,14 @@ public class PipelineDirectoryProcessor {
         return objectMapper.readValue(jsonString, PipelineConfig.class);
     }
 
-    private void processPipelineOperations(Path dir, Path processingDir, Path jsonFile, PipelineConfig config) throws IOException {
+    private void processPipelineOperations(
+            Path dir, Path processingDir, Path jsonFile, PipelineConfig config) throws IOException {
         for (PipelineOperation operation : config.getOperations()) {
             validateOperation(operation);
             File[] files = collectFilesForProcessing(dir, jsonFile, operation);
-            if(files == null || files.length == 0) {
+            if (files == null || files.length == 0) {
-            	logger.debug("No files detected for {} ", dir);
+                logger.debug("No files detected for {} ", dir);
-            	return;
+                return;
             }
             List<File> filesToProcess = prepareFilesForProcessing(files, processingDir);
             runPipelineAgainstFiles(filesToProcess, config, dir, processingDir);
@@ -132,20 +131,22 @@ public class PipelineDirectoryProcessor {
         }
     }
 
-    private File[] collectFilesForProcessing(Path dir, Path jsonFile, PipelineOperation operation) throws IOException {
+    private File[] collectFilesForProcessing(Path dir, Path jsonFile, PipelineOperation operation)
+            throws IOException {
         try (Stream<Path> paths = Files.list(dir)) {
             if ("automated".equals(operation.getParameters().get("fileInput"))) {
                 return paths.filter(path -> !Files.isDirectory(path) && !path.equals(jsonFile))
-                            .map(Path::toFile)
+                        .map(Path::toFile)
-                            .toArray(File[]::new);
+                        .toArray(File[]::new);
             } else {
                 String fileInput = (String) operation.getParameters().get("fileInput");
-                return new File[]{new File(fileInput)};
+                return new File[] {new File(fileInput)};
             }
         }
     }
 
-    private List<File> prepareFilesForProcessing(File[] files, Path processingDir) throws IOException {
+    private List<File> prepareFilesForProcessing(File[] files, Path processingDir)
+            throws IOException {
         List<File> filesToProcess = new ArrayList<>();
         for (File file : files) {
             Path targetPath = resolveUniqueFilePath(processingDir, file.getName());
@@ -173,27 +174,33 @@ public class PipelineDirectoryProcessor {
         if (dotIndex == -1) {
             return originalFileName + suffix;
         } else {
-            return originalFileName.substring(0, dotIndex) + suffix + originalFileName.substring(dotIndex);
+            return originalFileName.substring(0, dotIndex)
+                    + suffix
+                    + originalFileName.substring(dotIndex);
         }
     }
 
-    private void runPipelineAgainstFiles(List<File> filesToProcess, PipelineConfig config, Path dir, Path processingDir) throws IOException {
+    private void runPipelineAgainstFiles(
+            List<File> filesToProcess, PipelineConfig config, Path dir, Path processingDir)
+            throws IOException {
         try {
-            List<Resource> inputFiles = processor.generateInputFiles(filesToProcess.toArray(new File[0]));
+            List<Resource> inputFiles =
-            if(inputFiles == null  || inputFiles.size() == 0) {
+                    processor.generateInputFiles(filesToProcess.toArray(new File[0]));
-            	return;
+            if (inputFiles == null || inputFiles.size() == 0) {
+                return;
             }
-            List<Resource> outputFiles =  processor.runPipelineAgainstFiles(inputFiles, config);
+            List<Resource> outputFiles = processor.runPipelineAgainstFiles(inputFiles, config);
             if (outputFiles == null) return;
             moveAndRenameFiles(outputFiles, config, dir);
             deleteOriginalFiles(filesToProcess, processingDir);
         } catch (Exception e) {
-        	logger.error("error during processing", e);
+            logger.error("error during processing", e);
             moveFilesBack(filesToProcess, processingDir);
         }
     }
 
-    private void moveAndRenameFiles(List<Resource> resources, PipelineConfig config, Path dir) throws IOException {
+    private void moveAndRenameFiles(List<Resource> resources, PipelineConfig config, Path dir)
+            throws IOException {
         for (Resource resource : resources) {
             String outputFileName = createOutputFileName(resource, config);
             Path outputPath = determineOutputPath(config, dir);
@@ -217,26 +224,36 @@ public class PipelineDirectoryProcessor {
         String baseName = resourceName.substring(0, resourceName.lastIndexOf('.'));
         String extension = resourceName.substring(resourceName.lastIndexOf('.') + 1);
 
-        String outputFileName = config.getOutputPattern()
+        String outputFileName =
-            .replace("{filename}", baseName)
+                config.getOutputPattern()
-            .replace("{pipelineName}", config.getName())
+                                .replace("{filename}", baseName)
-            .replace("{date}", LocalDate.now().format(DateTimeFormatter.ofPattern("yyyyMMdd")))
+                                .replace("{pipelineName}", config.getName())
-            .replace("{time}", LocalTime.now().format(DateTimeFormatter.ofPattern("HHmmss")))
+                                .replace(
-            + "." + extension;
+                                        "{date}",
+                                        LocalDate.now()
+                                                .format(DateTimeFormatter.ofPattern("yyyyMMdd")))
+                                .replace(
+                                        "{time}",
+                                        LocalTime.now()
+                                                .format(DateTimeFormatter.ofPattern("HHmmss")))
+                        + "."
+                        + extension;
 
         return outputFileName;
     }
 
     private Path determineOutputPath(PipelineConfig config, Path dir) {
-        String outputDir = config.getOutputDir()
+        String outputDir =
-            .replace("{outputFolder}", finishedFoldersDir)
+                config.getOutputDir()
-            .replace("{folderName}", dir.toString())
+                        .replace("{outputFolder}", finishedFoldersDir)
-            .replaceAll("\\\\?watchedFolders", "");
+                        .replace("{folderName}", dir.toString())
+                        .replaceAll("\\\\?watchedFolders", "");
 
         return Paths.get(outputDir).isAbsolute() ? Paths.get(outputDir) : Paths.get(".", outputDir);
     }
 
-    private void deleteOriginalFiles(List<File> filesToProcess, Path processingDir) throws IOException {
+    private void deleteOriginalFiles(List<File> filesToProcess, Path processingDir)
+            throws IOException {
         for (File file : filesToProcess) {
             Files.deleteIfExists(processingDir.resolve(file.getName()));
             logger.info("Deleted original file: {}", file.getName());
@@ -247,12 +264,13 @@ public class PipelineDirectoryProcessor {
         for (File file : filesToProcess) {
             try {
                 Files.move(processingDir.resolve(file.getName()), file.toPath());
-                logger.info("Moved file back to original location: {} , {}",file.toPath(), file.getName());
+                logger.info(
+                        "Moved file back to original location: {} , {}",
+                        file.toPath(),
+                        file.getName());
             } catch (IOException e) {
                 logger.error("Error moving file back to original location: {}", file.getName(), e);
             }
         }
     }
-
-    
 }

src/main/java/stirling/software/SPDF/controller/api/pipeline/PipelineProcessor.java

@@ -5,6 +5,8 @@ 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;
 import java.nio.file.Path;
 import java.nio.file.Paths;
@@ -34,7 +36,6 @@ import org.springframework.web.client.RestTemplate;
 import org.springframework.web.multipart.MultipartFile;
 
 import jakarta.servlet.ServletContext;
-
 import stirling.software.SPDF.SPdfApplication;
 import stirling.software.SPDF.model.PipelineConfig;
 import stirling.software.SPDF.model.PipelineOperation;
@@ -43,152 +44,161 @@ import stirling.software.SPDF.model.Role;
 @Service
 public class PipelineProcessor {
 
-	private static final Logger logger = LoggerFactory.getLogger(PipelineProcessor.class);
+    private static final Logger logger = LoggerFactory.getLogger(PipelineProcessor.class);
 
+    @Autowired private ApiDocService apiDocService;
 
-	@Autowired
+    @Autowired(required = false)
-	private ApiDocService apiDocService;
-    
-	@Autowired(required=false)
     private UserServiceInterface userService;
 
-	@Autowired
+    @Autowired private ServletContext servletContext;
-    private ServletContext servletContext;
 
+    private String getApiKeyForUser() {
+        if (userService == null) return "";
+        return userService.getApiKeyForUser(Role.INTERNAL_API_USER.getRoleId());
+    }
 
+    private String getBaseUrl() {
+        String contextPath = servletContext.getContextPath();
+        String port = SPdfApplication.getPort();
 
+        return "http://localhost:" + port + contextPath + "/";
+    }
 
-	private String getApiKeyForUser() {
+    List<Resource> runPipelineAgainstFiles(List<Resource> outputFiles, PipelineConfig config)
-		if (userService == null)
+            throws Exception {
-			return "";
-		return userService.getApiKeyForUser(Role.INTERNAL_API_USER.getRoleId());
-	}
 
+        ByteArrayOutputStream logStream = new ByteArrayOutputStream();
+        PrintStream logPrintStream = new PrintStream(logStream);
 
-	private String getBaseUrl() {
+        boolean hasErrors = false;
-		String contextPath = servletContext.getContextPath();
-		String port = SPdfApplication.getPort();
 
-		return "http://localhost:" + port + contextPath + "/";
+        for (PipelineOperation pipelineOperation : config.getOperations()) {
-	}
+            String operation = pipelineOperation.getOperation();
+            boolean isMultiInputOperation = apiDocService.isMultiInput(operation);
 
+            logger.info(
+                    "Running operation: {} isMultiInputOperation {}",
+                    operation,
+                    isMultiInputOperation);
+            Map<String, Object> parameters = pipelineOperation.getParameters();
+            String inputFileExtension = "";
 
+            // TODO
+            // if (operationNode.has("inputFileType")) {
+            //	inputFileExtension = operationNode.get("inputFileType").asText();
+            // } else {
+            inputFileExtension = ".pdf";
+            // }
+            final String finalInputFileExtension = inputFileExtension;
 
-	List<Resource> runPipelineAgainstFiles(List<Resource> outputFiles, PipelineConfig config) throws Exception {
+            String url = getBaseUrl() + operation;
 
-		ByteArrayOutputStream logStream = new ByteArrayOutputStream();
+            List<Resource> newOutputFiles = new ArrayList<>();
-		PrintStream logPrintStream = new PrintStream(logStream);
+            if (!isMultiInputOperation) {
+                for (Resource file : outputFiles) {
+                    boolean hasInputFileType = false;
+                    if (file.getFilename().endsWith(inputFileExtension)) {
+                        hasInputFileType = true;
+                        MultiValueMap<String, Object> body = new LinkedMultiValueMap<>();
+                        body.add("fileInput", file);
 
-		boolean hasErrors = false;
+                        for (Entry<String, Object> entry : parameters.entrySet()) {
+                            body.add(entry.getKey(), entry.getValue());
+                        }
 
-		for (PipelineOperation pipelineOperation : config.getOperations()) {
+                        ResponseEntity<byte[]> response = sendWebRequest(url, body);
-			String operation = pipelineOperation.getOperation();
-			boolean isMultiInputOperation = apiDocService.isMultiInput(operation);
 
-			logger.info("Running operation: {} isMultiInputOperation {}", operation, isMultiInputOperation);
+                        // If the operation is filter and the response body is null or empty, skip
-			Map<String, Object> parameters = pipelineOperation.getParameters();
+                        // this
-			String inputFileExtension = "";
+                        // file
+                        if (operation.startsWith("filter-")
+                                && (response.getBody() == null || response.getBody().length == 0)) {
+                            logger.info("Skipping file due to failing {}", operation);
+                            continue;
+                        }
 
-			//TODO
+                        if (!response.getStatusCode().equals(HttpStatus.OK)) {
-			//if (operationNode.has("inputFileType")) {
+                            logPrintStream.println("Error: " + response.getBody());
-			//	inputFileExtension = operationNode.get("inputFileType").asText();
+                            hasErrors = true;
-			//} else {
+                            continue;
-				inputFileExtension = ".pdf";
+                        }
-			//}
+                        processOutputFiles(operation, file.getFilename(), response, newOutputFiles);
-			final String finalInputFileExtension = inputFileExtension;
+                    }
 
-			String url = getBaseUrl() + operation;
+                    if (!hasInputFileType) {
+                        logPrintStream.println(
+                                "No files with extension "
+                                        + inputFileExtension
+                                        + " found for operation "
+                                        + operation);
+                        hasErrors = true;
+                    }
+                }
 
-			List<Resource> newOutputFiles = new ArrayList<>();
+            } else {
-			if (!isMultiInputOperation) {
+                // Filter and collect all files that match the inputFileExtension
-				for (Resource file : outputFiles) {
+                List<Resource> matchingFiles =
-					boolean hasInputFileType = false;
+                        outputFiles.stream()
-					if (file.getFilename().endsWith(inputFileExtension)) {
+                                .filter(
-						hasInputFileType = true;
+                                        file ->
-						MultiValueMap<String, Object> body = new LinkedMultiValueMap<>();
+                                                file.getFilename()
-						body.add("fileInput", file);
+                                                        .endsWith(finalInputFileExtension))
+                                .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<>();
 
-						for(Entry<String, Object> entry : parameters.entrySet()) {
+                    // Add all matching files to the body
-							body.add(entry.getKey(), entry.getValue());
+                    for (Resource file : matchingFiles) {
-						}
+                        body.add("fileInput", file);
+                    }
 
-						ResponseEntity<byte[]> response = sendWebRequest(url, body);
+                    for (Entry<String, Object> entry : parameters.entrySet()) {
+                        body.add(entry.getKey(), entry.getValue());
+                    }
 
-						// If the operation is filter and the response body is null or empty, skip this
+                    ResponseEntity<byte[]> response = sendWebRequest(url, body);
-						// file
-						if (operation.startsWith("filter-")
-								&& (response.getBody() == null || response.getBody().length == 0)) {
-							logger.info("Skipping file due to failing {}", operation);
-							continue;
-						}
 
-						if (!response.getStatusCode().equals(HttpStatus.OK)) {
+                    // Handle the response
-							logPrintStream.println("Error: " + response.getBody());
+                    if (response.getStatusCode().equals(HttpStatus.OK)) {
-							hasErrors = true;
+                        processOutputFiles(
-							continue;
+                                operation,
-						}
+                                matchingFiles.get(0).getFilename(),
-						processOutputFiles(operation, file.getFilename(), response, newOutputFiles);
+                                response,
+                                newOutputFiles);
+                    } else {
+                        // Log error if the response status is not OK
+                        logPrintStream.println(
+                                "Error in multi-input operation: " + response.getBody());
+                        hasErrors = true;
+                    }
+                } else {
+                    logPrintStream.println(
+                            "No files with extension "
+                                    + inputFileExtension
+                                    + " found for multi-input operation "
+                                    + operation);
+                    hasErrors = true;
+                }
+            }
+            logPrintStream.close();
+            outputFiles = newOutputFiles;
+        }
+        if (hasErrors) {
+            logger.error("Errors occurred during processing. Log: {}", logStream.toString());
+        }
 
-					}
+        return outputFiles;
+    }
 
-					if (!hasInputFileType) {
+    private ResponseEntity<byte[]> sendWebRequest(String url, MultiValueMap<String, Object> body) {
-						logPrintStream.println(
+        RestTemplate restTemplate = new RestTemplate();
-								"No files with extension " + inputFileExtension + " found for operation " + operation);
-						hasErrors = true;
-					}
 
-					outputFiles = newOutputFiles;
+        // Set up headers, including API key
-				}
 
-			} else {
-				 // Filter and collect all files that match the inputFileExtension
-			    List<Resource> matchingFiles = outputFiles.stream()
-			                                              .filter(file -> file.getFilename().endsWith(finalInputFileExtension))
-			                                              .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()) {
-						body.add(entry.getKey(), entry.getValue());
-					}
-		        
-			        ResponseEntity<byte[]> response = sendWebRequest(url, body);
-
-			        // Handle the response
-			        if (response.getStatusCode().equals(HttpStatus.OK)) {
-			        	processOutputFiles(operation, matchingFiles.get(0).getFilename(), response, newOutputFiles);
-			        } else {
-			            // Log error if the response status is not OK
-			            logPrintStream.println("Error in multi-input operation: " + response.getBody());
-			            hasErrors = true;
-			        }
-			    } else {
-			        logPrintStream.println("No files with extension " + inputFileExtension + " found for multi-input operation " + operation);
-			        hasErrors = true;
-			    }
-			}
-			logPrintStream.close();
-
-		}
-		if (hasErrors) {
-			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);
@@ -199,134 +209,164 @@ public class PipelineProcessor {
 
         // Make the request to the REST endpoint
         return restTemplate.exchange(url, HttpMethod.POST, entity, byte[].class);
-	}
+    }
 
-	private List<Resource> processOutputFiles(String operation, String fileName, ResponseEntity<byte[]> response, List<Resource> newOutputFiles) throws IOException{
+    private List<Resource> processOutputFiles(
-		// Define filename
+            String operation,
-		String newFilename;
+            String fileName,
-		if ("auto-rename".equals(operation)) {
+            ResponseEntity<byte[]> response,
-			// If the operation is "auto-rename", generate a new filename.
+            List<Resource> newOutputFiles)
-			// This is a simple example of generating a filename using current timestamp.
+            throws IOException {
-			// Modify as per your needs.
+        // Define filename
-			newFilename = "file_" + System.currentTimeMillis();
+        String newFilename;
-		} else {
+        if (operation.contains("auto-rename")) {
-			// Otherwise, keep the original filename.
+            // If the operation is "auto-rename", generate a new filename.
-			newFilename = fileName;
+            // This is a simple example of generating a filename using current timestamp.
-		}
+            // Modify as per your needs.
 
-		// Check if the response body is a zip file
+            newFilename = extractFilename(response);
-		if (isZip(response.getBody())) {
+        } else {
-			// Unzip the file and add all the files to the new output files
+            // Otherwise, keep the original filename.
-			newOutputFiles.addAll(unzip(response.getBody()));
+            newFilename = fileName;
-		} else {
+        }
-			Resource outputResource = new ByteArrayResource(response.getBody()) {
-				@Override
-				public String getFilename() {
-					return newFilename;
-				}
-			};
-			newOutputFiles.add(outputResource);
-		}
 
-		return newOutputFiles;
+        // 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
+            newOutputFiles.addAll(unzip(response.getBody()));
+        } else {
+            Resource outputResource =
+                    new ByteArrayResource(response.getBody()) {
+                        @Override
+                        public String getFilename() {
+                            return newFilename;
+                        }
+                    };
+            newOutputFiles.add(outputResource);
+        }
 
-	}
+        return newOutputFiles;
-	List<Resource> generateInputFiles(File[] files) throws Exception {
+    }
-		if (files == null || files.length == 0) {
-			logger.info("No files");
-			return null;
-		}
 
+    public String extractFilename(ResponseEntity<byte[]> response) {
+        String filename = "default-filename.ext"; // Default filename if not found
 
-		List<Resource> outputFiles = new ArrayList<>();
+        HttpHeaders headers = response.getHeaders();
+        String contentDisposition = headers.getFirst(HttpHeaders.CONTENT_DISPOSITION);
 
-		for (File file : files) {
+        if (contentDisposition != null && !contentDisposition.isEmpty()) {
-			Path path = Paths.get(file.getAbsolutePath());
+            String[] parts = contentDisposition.split(";");
-			logger.info("Reading file: " + path); // debug statement
+            for (String part : parts) {
+                if (part.trim().startsWith("filename")) {
+                    // Extracts filename and removes quotes if present
+                    filename = part.split("=")[1].trim().replace("\"", "");
+                    filename = URLDecoder.decode(filename, StandardCharsets.UTF_8);
 
-			if (Files.exists(path)) {
+                    break;
-				Resource fileResource = new ByteArrayResource(Files.readAllBytes(path)) {
+                }
-					@Override
+            }
-					public String getFilename() {
+        }
-						return file.getName();
-					}
-				};
-				outputFiles.add(fileResource);
-			} else {
-				logger.info("File not found: " + path);
-			}
-		}
-		logger.info("Files successfully loaded. Starting processing...");
-		return outputFiles;
-	}
 
-	List<Resource> generateInputFiles(MultipartFile[] files) throws Exception {
+        return filename;
-		if (files == null || files.length == 0) {
+    }
-			logger.info("No files");
-			return null;
-		}
 
-		List<Resource> outputFiles = new ArrayList<>();
+    List<Resource> generateInputFiles(File[] files) throws Exception {
+        if (files == null || files.length == 0) {
+            logger.info("No files");
+            return null;
+        }
 
-		for (MultipartFile file : files) {
+        List<Resource> outputFiles = new ArrayList<>();
-			Resource fileResource = new ByteArrayResource(file.getBytes()) {
-				@Override
-				public String getFilename() {
-					return file.getOriginalFilename();
-				}
-			};
-			outputFiles.add(fileResource);
-		}
-		logger.info("Files successfully loaded. Starting processing...");
-		return outputFiles;
-	}
 
-	private boolean isZip(byte[] data) {
+        for (File file : files) {
-		if (data == null || data.length < 4) {
+            Path path = Paths.get(file.getAbsolutePath());
-			return false;
+            logger.info("Reading file: " + path); // debug statement
-		}
 
-		// Check the first four bytes of the data against the standard zip magic number
+            if (Files.exists(path)) {
-		return data[0] == 0x50 && data[1] == 0x4B && data[2] == 0x03 && data[3] == 0x04;
+                Resource fileResource =
-	}
+                        new ByteArrayResource(Files.readAllBytes(path)) {
+                            @Override
+                            public String getFilename() {
+                                return file.getName();
+                            }
+                        };
+                outputFiles.add(fileResource);
+            } else {
+                logger.info("File not found: " + path);
+            }
+        }
+        logger.info("Files successfully loaded. Starting processing...");
+        return outputFiles;
+    }
 
-	private List<Resource> unzip(byte[] data) throws IOException {
+    List<Resource> generateInputFiles(MultipartFile[] files) throws Exception {
-		logger.info("Unzipping data of length: {}", data.length);
+        if (files == null || files.length == 0) {
-		List<Resource> unzippedFiles = new ArrayList<>();
+            logger.info("No files");
+            return null;
+        }
 
-		try (ByteArrayInputStream bais = new ByteArrayInputStream(data);
+        List<Resource> outputFiles = new ArrayList<>();
-				ZipInputStream zis = new ZipInputStream(bais)) {
 
-			ZipEntry entry;
+        for (MultipartFile file : files) {
-			while ((entry = zis.getNextEntry()) != null) {
+            Resource fileResource =
-				ByteArrayOutputStream baos = new ByteArrayOutputStream();
+                    new ByteArrayResource(file.getBytes()) {
-				byte[] buffer = new byte[1024];
+                        @Override
-				int count;
+                        public String getFilename() {
+                            return file.getOriginalFilename();
+                        }
+                    };
+            outputFiles.add(fileResource);
+        }
+        logger.info("Files successfully loaded. Starting processing...");
+        return outputFiles;
+    }
 
-				while ((count = zis.read(buffer)) != -1) {
+    private boolean isZip(byte[] data) {
-					baos.write(buffer, 0, count);
+        if (data == null || data.length < 4) {
-				}
+            return false;
+        }
 
-				final String filename = entry.getName();
+        // Check the first four bytes of the data against the standard zip magic number
-				Resource fileResource = new ByteArrayResource(baos.toByteArray()) {
+        return data[0] == 0x50 && data[1] == 0x4B && data[2] == 0x03 && data[3] == 0x04;
-					@Override
+    }
-					public String getFilename() {
-						return filename;
-					}
-				};
 
-				// If the unzipped file is a zip file, unzip it
+    private List<Resource> unzip(byte[] data) throws IOException {
-				if (isZip(baos.toByteArray())) {
+        logger.info("Unzipping data of length: {}", data.length);
-					logger.info("File {} is a zip file. Unzipping...", filename);
+        List<Resource> unzippedFiles = new ArrayList<>();
-					unzippedFiles.addAll(unzip(baos.toByteArray()));
-				} else {
-					unzippedFiles.add(fileResource);
-				}
-			}
-		}
 
-		logger.info("Unzipping completed. {} files were unzipped.", unzippedFiles.size());
+        try (ByteArrayInputStream bais = new ByteArrayInputStream(data);
-		return unzippedFiles;
+                ZipInputStream zis = new ZipInputStream(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())) {
+                    logger.info("File {} is a zip file. Unzipping...", filename);
+                    unzippedFiles.addAll(unzip(baos.toByteArray()));
+                } else {
+                    unzippedFiles.add(fileResource);
+                }
+            }
+        }
+
+        logger.info("Unzipping completed. {} files were unzipped.", unzippedFiles.size());
+        return unzippedFiles;
+    }
 }

src/main/java/stirling/software/SPDF/controller/api/pipeline/UserServiceInterface.java

@@ -1,4 +1,5 @@
 package stirling.software.SPDF.controller.api.pipeline;
+
 public interface UserServiceInterface {
     String getApiKeyForUser(String username);
 }

src/main/java/stirling/software/SPDF/controller/api/security/CertSignController.java

@@ -53,6 +53,7 @@ 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.SignPDFWithCertRequest;
 import stirling.software.SPDF.utils.WebResponseUtils;
 
@@ -61,198 +62,228 @@ import stirling.software.SPDF.utils.WebResponseUtils;
 @Tag(name = "Security", description = "Security APIs")
 public class CertSignController {
 
-	private static final Logger logger = LoggerFactory.getLogger(CertSignController.class);
+    private static final Logger logger = LoggerFactory.getLogger(CertSignController.class);
 
-	static {
+    static {
-		Security.addProvider(new BouncyCastleProvider());
+        Security.addProvider(new BouncyCastleProvider());
-	}
+    }
 
-	@PostMapping(consumes = "multipart/form-data", value = "/cert-sign")
+    @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:MF-SISO")
+    @Operation(
-	public ResponseEntity<byte[]> signPDFWithCert(@ModelAttribute SignPDFWithCertRequest request) throws Exception {
+            summary = "Sign PDF with a Digital Certificate",
-	    MultipartFile pdf = request.getFileInput();
+            description =
-	    String certType = request.getCertType();
+                    "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:MF-SISO")
-	    MultipartFile privateKeyFile = request.getPrivateKeyFile();
+    public ResponseEntity<byte[]> signPDFWithCert(@ModelAttribute SignPDFWithCertRequest request)
-	    MultipartFile certFile = request.getCertFile();
+            throws Exception {
-	    MultipartFile p12File = request.getP12File();
+        MultipartFile pdf = request.getFileInput();
-	    String password = request.getPassword();
+        String certType = request.getCertType();
-	    Boolean showSignature = request.isShowSignature();
+        MultipartFile privateKeyFile = request.getPrivateKeyFile();
-	    String reason = request.getReason();
+        MultipartFile certFile = request.getCertFile();
-	    String location = request.getLocation();
+        MultipartFile p12File = request.getP12File();
-	    String name = request.getName();
+        String password = request.getPassword();
-	    Integer pageNumber = request.getPageNumber();
+        Boolean showSignature = request.isShowSignature();
+        String reason = request.getReason();
+        String location = request.getLocation();
+        String name = request.getName();
+        Integer pageNumber = request.getPageNumber();
 
-		PrivateKey privateKey = null;
+        PrivateKey privateKey = null;
-		X509Certificate cert = null;
+        X509Certificate cert = null;
 
-		if (certType != null) {
+        if (certType != null) {
-			logger.info("Cert type provided: {}", certType);
+            logger.info("Cert type provided: {}", certType);
-			switch (certType) {
+            switch (certType) {
-			case "PKCS12":
+                case "PKCS12":
-				if (p12File != null) {
+                    if (p12File != null) {
-					KeyStore ks = KeyStore.getInstance("PKCS12");
+                        KeyStore ks = KeyStore.getInstance("PKCS12");
-					ks.load(new ByteArrayInputStream(p12File.getBytes()), password.toCharArray());
+                        ks.load(
-					String alias = ks.aliases().nextElement();
+                                new ByteArrayInputStream(p12File.getBytes()),
-					if (!ks.isKeyEntry(alias)) {
+                                password.toCharArray());
-						throw new IllegalArgumentException("The provided PKCS12 file does not contain a private key.");
+                        String alias = ks.aliases().nextElement();
-					}
+                        if (!ks.isKeyEntry(alias)) {
-					privateKey = (PrivateKey) ks.getKey(alias, password.toCharArray());
+                            throw new IllegalArgumentException(
-					cert = (X509Certificate) ks.getCertificate(alias);
+                                    "The provided PKCS12 file does not contain a private key.");
-				}
+                        }
-				break;
+                        privateKey = (PrivateKey) ks.getKey(alias, password.toCharArray());
-			case "PEM":
+                        cert = (X509Certificate) ks.getCertificate(alias);
-				if (privateKeyFile != null && certFile != null) {
+                    }
-					// Load private key
+                    break;
-					KeyFactory keyFactory = KeyFactory.getInstance("RSA", BouncyCastleProvider.PROVIDER_NAME);
+                case "PEM":
-					if (isPEM(privateKeyFile.getBytes())) {
+                    if (privateKeyFile != null && certFile != null) {
-						privateKey = keyFactory
+                        // Load private key
-								.generatePrivate(new PKCS8EncodedKeySpec(parsePEM(privateKeyFile.getBytes())));
+                        KeyFactory keyFactory =
-					} else {
+                                KeyFactory.getInstance("RSA", BouncyCastleProvider.PROVIDER_NAME);
-						privateKey = keyFactory.generatePrivate(new PKCS8EncodedKeySpec(privateKeyFile.getBytes()));
+                        if (isPEM(privateKeyFile.getBytes())) {
-					}
+                            privateKey =
+                                    keyFactory.generatePrivate(
+                                            new PKCS8EncodedKeySpec(
+                                                    parsePEM(privateKeyFile.getBytes())));
+                        } else {
+                            privateKey =
+                                    keyFactory.generatePrivate(
+                                            new PKCS8EncodedKeySpec(privateKeyFile.getBytes()));
+                        }
 
-					// Load certificate
+                        // Load certificate
-					CertificateFactory certFactory = CertificateFactory.getInstance("X.509",
+                        CertificateFactory certFactory =
-							BouncyCastleProvider.PROVIDER_NAME);
+                                CertificateFactory.getInstance(
-					if (isPEM(certFile.getBytes())) {
+                                        "X.509", BouncyCastleProvider.PROVIDER_NAME);
-						cert = (X509Certificate) certFactory
+                        if (isPEM(certFile.getBytes())) {
-								.generateCertificate(new ByteArrayInputStream(parsePEM(certFile.getBytes())));
+                            cert =
-					} else {
+                                    (X509Certificate)
-						cert = (X509Certificate) certFactory
+                                            certFactory.generateCertificate(
-								.generateCertificate(new ByteArrayInputStream(certFile.getBytes()));
+                                                    new ByteArrayInputStream(
-					}
+                                                            parsePEM(certFile.getBytes())));
-				}
+                        } else {
-				break;
+                            cert =
-			}
+                                    (X509Certificate)
-		}
+                                            certFactory.generateCertificate(
-		PDSignature signature = new PDSignature();
+                                                    new ByteArrayInputStream(certFile.getBytes()));
-		signature.setFilter(PDSignature.FILTER_ADOBE_PPKLITE); // default filter
+                        }
-		signature.setSubFilter(PDSignature.SUBFILTER_ADBE_PKCS7_SHA1);
+                    }
-		signature.setName(name);
+                    break;
-		signature.setLocation(location);
+            }
-		signature.setReason(reason);
+        }
-		signature.setSignDate(Calendar.getInstance());
+        PDSignature signature = new PDSignature();
+        signature.setFilter(PDSignature.FILTER_ADOBE_PPKLITE); // default filter
+        signature.setSubFilter(PDSignature.SUBFILTER_ADBE_PKCS7_SHA1);
+        signature.setName(name);
+        signature.setLocation(location);
+        signature.setReason(reason);
+        signature.setSignDate(Calendar.getInstance());
 
-		// Load the PDF
+        // Load the PDF
-		try (PDDocument document = PDDocument.load(pdf.getBytes())) {
+        try (PDDocument document = PDDocument.load(pdf.getBytes())) {
-			logger.info("Successfully loaded the provided PDF");
+            logger.info("Successfully loaded the provided PDF");
-			SignatureOptions signatureOptions = new SignatureOptions();
+            SignatureOptions signatureOptions = new SignatureOptions();
 
-			// If you want to show the signature
+            // If you want to show the signature
 
-			// ATTEMPT 2
+            // ATTEMPT 2
-			if (showSignature != null && showSignature) {
+            if (showSignature != null && showSignature) {
-				PDPage page = document.getPage(pageNumber - 1);
+                PDPage page = document.getPage(pageNumber - 1);
 
-				PDAcroForm acroForm = document.getDocumentCatalog().getAcroForm();
+                PDAcroForm acroForm = document.getDocumentCatalog().getAcroForm();
-				if (acroForm == null) {
+                if (acroForm == null) {
-					acroForm = new PDAcroForm(document);
+                    acroForm = new PDAcroForm(document);
-					document.getDocumentCatalog().setAcroForm(acroForm);
+                    document.getDocumentCatalog().setAcroForm(acroForm);
-				}
+                }
 
-				// Create a new signature field and widget
+                // Create a new signature field and widget
 
-				PDSignatureField signatureField = new PDSignatureField(acroForm);
+                PDSignatureField signatureField = new PDSignatureField(acroForm);
-				PDAnnotationWidget widget = signatureField.getWidgets().get(0);
+                PDAnnotationWidget widget = signatureField.getWidgets().get(0);
-				PDRectangle rect = new PDRectangle(100, 100, 200, 50); // Define the rectangle size here
+                PDRectangle rect =
-				widget.setRectangle(rect);
+                        new PDRectangle(100, 100, 200, 50); // Define the rectangle size here
-				page.getAnnotations().add(widget);
+                widget.setRectangle(rect);
+                page.getAnnotations().add(widget);
 
-// Set the appearance for the signature field
+                // Set the appearance for the signature field
-				PDAppearanceDictionary appearanceDict = new PDAppearanceDictionary();
+                PDAppearanceDictionary appearanceDict = new PDAppearanceDictionary();
-				PDAppearanceStream appearanceStream = new PDAppearanceStream(document);
+                PDAppearanceStream appearanceStream = new PDAppearanceStream(document);
-				appearanceStream.setResources(new PDResources());
+                appearanceStream.setResources(new PDResources());
-				appearanceStream.setBBox(rect);
+                appearanceStream.setBBox(rect);
-				appearanceDict.setNormalAppearance(appearanceStream);
+                appearanceDict.setNormalAppearance(appearanceStream);
-				widget.setAppearance(appearanceDict);
+                widget.setAppearance(appearanceDict);
 
-				try (PDPageContentStream contentStream = new PDPageContentStream(document, appearanceStream)) {
+                try (PDPageContentStream contentStream =
-					contentStream.beginText();
+                        new PDPageContentStream(document, appearanceStream)) {
-					contentStream.setFont(PDType1Font.HELVETICA_BOLD, 12);
+                    contentStream.beginText();
-					contentStream.newLineAtOffset(110, 130);
+                    contentStream.setFont(PDType1Font.HELVETICA_BOLD, 12);
-					contentStream.showText("Digitally signed by: " + (name != null ? name : "Unknown"));
+                    contentStream.newLineAtOffset(110, 130);
-					contentStream.newLineAtOffset(0, -15);
+                    contentStream.showText(
-					contentStream.showText("Date: " + new SimpleDateFormat("yyyy.MM.dd HH:mm:ss z").format(new Date()));
+                            "Digitally signed by: " + (name != null ? name : "Unknown"));
-					contentStream.newLineAtOffset(0, -15);
+                    contentStream.newLineAtOffset(0, -15);
-					if (reason != null && !reason.isEmpty()) {
+                    contentStream.showText(
-						contentStream.showText("Reason: " + reason);
+                            "Date: "
-						contentStream.newLineAtOffset(0, -15);
+                                    + new SimpleDateFormat("yyyy.MM.dd HH:mm:ss z")
-					}
+                                            .format(new Date()));
-					if (location != null && !location.isEmpty()) {
+                    contentStream.newLineAtOffset(0, -15);
-						contentStream.showText("Location: " + location);
+                    if (reason != null && !reason.isEmpty()) {
-						contentStream.newLineAtOffset(0, -15);
+                        contentStream.showText("Reason: " + reason);
-					}
+                        contentStream.newLineAtOffset(0, -15);
-					contentStream.endText();
+                    }
-				}
+                    if (location != null && !location.isEmpty()) {
+                        contentStream.showText("Location: " + location);
+                        contentStream.newLineAtOffset(0, -15);
+                    }
+                    contentStream.endText();
+                }
 
-				// Add the widget annotation to the page
+                // Add the widget annotation to the page
-				page.getAnnotations().add(widget);
+                page.getAnnotations().add(widget);
 
-				// Add the signature field to the acroform
+                // Add the signature field to the acroform
-				acroForm.getFields().add(signatureField);
+                acroForm.getFields().add(signatureField);
 
-				// Handle multiple signatures by ensuring a unique field name
+                // Handle multiple signatures by ensuring a unique field name
-				String baseFieldName = "Signature";
+                String baseFieldName = "Signature";
-				String signatureFieldName = baseFieldName;
+                String signatureFieldName = baseFieldName;
-				int suffix = 1;
+                int suffix = 1;
-				while (acroForm.getField(signatureFieldName) != null) {
+                while (acroForm.getField(signatureFieldName) != null) {
-					suffix++;
+                    suffix++;
-					signatureFieldName = baseFieldName + suffix;
+                    signatureFieldName = baseFieldName + suffix;
-				}
+                }
-				signatureField.setPartialName(signatureFieldName);
+                signatureField.setPartialName(signatureFieldName);
-			}
+            }
 
-			document.addSignature(signature, signatureOptions);
+            document.addSignature(signature, signatureOptions);
-			logger.info("Signature added to the PDF document");
+            logger.info("Signature added to the PDF document");
-			// External signing
+            // External signing
-			ExternalSigningSupport externalSigning = document
+            ExternalSigningSupport externalSigning =
-					.saveIncrementalForExternalSigning(new ByteArrayOutputStream());
+                    document.saveIncrementalForExternalSigning(new ByteArrayOutputStream());
 
-			byte[] content = IOUtils.toByteArray(externalSigning.getContent());
+            byte[] content = IOUtils.toByteArray(externalSigning.getContent());
 
-			// Using BouncyCastle to sign
+            // Using BouncyCastle to sign
-			CMSTypedData cmsData = new CMSProcessableByteArray(content);
+            CMSTypedData cmsData = new CMSProcessableByteArray(content);
 
-			CMSSignedDataGenerator gen = new CMSSignedDataGenerator();
+            CMSSignedDataGenerator gen = new CMSSignedDataGenerator();
-			ContentSigner signer = new JcaContentSignerBuilder("SHA256withRSA")
+            ContentSigner signer =
-					.setProvider(BouncyCastleProvider.PROVIDER_NAME).build(privateKey);
+                    new JcaContentSignerBuilder("SHA256withRSA")
+                            .setProvider(BouncyCastleProvider.PROVIDER_NAME)
+                            .build(privateKey);
 
-			gen.addSignerInfoGenerator(new JcaSignerInfoGeneratorBuilder(
+            gen.addSignerInfoGenerator(
-					new JcaDigestCalculatorProviderBuilder().setProvider(BouncyCastleProvider.PROVIDER_NAME).build())
+                    new JcaSignerInfoGeneratorBuilder(
-					.build(signer, cert));
+                                    new JcaDigestCalculatorProviderBuilder()
+                                            .setProvider(BouncyCastleProvider.PROVIDER_NAME)
+                                            .build())
+                            .build(signer, cert));
 
-			gen.addCertificates(new JcaCertStore(Collections.singletonList(cert)));
+            gen.addCertificates(new JcaCertStore(Collections.singletonList(cert)));
-			CMSSignedData signedData = gen.generate(cmsData, false);
+            CMSSignedData signedData = gen.generate(cmsData, false);
 
-			byte[] cmsSignature = signedData.getEncoded();
+            byte[] cmsSignature = signedData.getEncoded();
-			logger.info("About to sign content using BouncyCastle");
+            logger.info("About to sign content using BouncyCastle");
-			externalSigning.setSignature(cmsSignature);
+            externalSigning.setSignature(cmsSignature);
-			logger.info("Signature set successfully");
+            logger.info("Signature set successfully");
 
-			// After setting the signature, return the resultant PDF
+            // After setting the signature, return the resultant PDF
-			try (ByteArrayOutputStream signedPdfOutput = new ByteArrayOutputStream()) {
+            try (ByteArrayOutputStream signedPdfOutput = new ByteArrayOutputStream()) {
-				document.save(signedPdfOutput);
+                document.save(signedPdfOutput);
-				return WebResponseUtils.boasToWebResponse(signedPdfOutput,
+                return WebResponseUtils.boasToWebResponse(
-						pdf.getOriginalFilename().replaceFirst("[.][^.]+$", "") + "_signed.pdf");
+                        signedPdfOutput,
+                        pdf.getOriginalFilename().replaceFirst("[.][^.]+$", "") + "_signed.pdf");
 
-			} catch (Exception e) {
+            } catch (Exception e) {
-				e.printStackTrace();
+                e.printStackTrace();
-			}
+            }
-		} catch (Exception e) {
+        } catch (Exception e) {
-			e.printStackTrace();
+            e.printStackTrace();
-		}
+        }
 
-		return null;
+        return null;
-	}
+    }
 
-	private byte[] parsePEM(byte[] content) throws IOException {
+    private byte[] parsePEM(byte[] content) throws IOException {
-		PemReader pemReader = new PemReader(new InputStreamReader(new ByteArrayInputStream(content)));
+        PemReader pemReader =
-		return pemReader.readPemObject().getContent();
+                new PemReader(new InputStreamReader(new ByteArrayInputStream(content)));
-	}
+        return pemReader.readPemObject().getContent();
-
+    }
-	private boolean isPEM(byte[] content) {
-		String contentStr = new String(content);
-		return contentStr.contains("-----BEGIN") && contentStr.contains("-----END");
-	}
 
+    private boolean isPEM(byte[] content) {
+        String contentStr = new String(content);
+        return contentStr.contains("-----BEGIN") && contentStr.contains("-----END");
+    }
 }

src/main/java/stirling/software/SPDF/controller/api/security/GetInfoOnPDF.java

@@ -72,23 +72,22 @@ import com.fasterxml.jackson.databind.node.ObjectNode;
 
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
+
 import stirling.software.SPDF.model.api.PDFFile;
 import stirling.software.SPDF.utils.WebResponseUtils;
+
 @RestController
 @RequestMapping("/api/v1/security")
 @Tag(name = "Security", description = "Security APIs")
 public class GetInfoOnPDF {
 
-	static ObjectMapper objectMapper = new ObjectMapper();
+    static ObjectMapper objectMapper = new ObjectMapper();
 
-	@PostMapping(consumes = "multipart/form-data", value = "/get-info-on-pdf")
+    @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)
+    public ResponseEntity<byte[]> getPdfInfo(@ModelAttribute PDFFile request) throws IOException {
-            throws IOException {
+        MultipartFile inputFile = request.getFileInput();
-		MultipartFile inputFile = request.getFileInput();
+        try (PDDocument pdfBoxDoc = PDDocument.load(inputFile.getInputStream()); ) {
-		try (
-			    PDDocument pdfBoxDoc = PDDocument.load(inputFile.getInputStream());
-			) {
             ObjectMapper objectMapper = new ObjectMapper();
             ObjectNode jsonOutput = objectMapper.createObjectNode();
 
@@ -101,7 +100,6 @@ public class GetInfoOnPDF {
             ObjectNode encryption = objectMapper.createObjectNode();
             ObjectNode other = objectMapper.createObjectNode();
 
-            
             metadata.put("Title", info.getTitle());
             metadata.put("Author", info.getAuthor());
             metadata.put("Subject", info.getSubject());
@@ -112,9 +110,6 @@ public class GetInfoOnPDF {
             metadata.put("ModificationDate", formatDate(info.getModificationDate()));
             jsonOutput.set("Metadata", metadata);
 
-            
-            
-            
             // Total file size of the PDF
             long fileSizeInBytes = inputFile.getSize();
             basicInfo.put("FileSizeInBytes", fileSizeInBytes);
@@ -130,7 +125,6 @@ public class GetInfoOnPDF {
             int charCount = fullText.length();
             basicInfo.put("CharacterCount", charCount);
 
-            
             // Initialize the flags and types
             boolean hasCompression = false;
             String compressionType = "None";
@@ -147,25 +141,20 @@ public class GetInfoOnPDF {
                 }
             }
             basicInfo.put("Compression", hasCompression);
-            if(hasCompression)
+            if (hasCompression) basicInfo.put("CompressionType", compressionType);
-            	basicInfo.put("CompressionType", compressionType);
 
             String language = pdfBoxDoc.getDocumentCatalog().getLanguage();
             basicInfo.put("Language", language);
             basicInfo.put("Number of pages", pdfBoxDoc.getNumberOfPages());
 
-            
             PDDocumentCatalog catalog = pdfBoxDoc.getDocumentCatalog();
             String pageMode = catalog.getPageMode().name();
 
             // Document Information using PDFBox
             docInfoNode.put("PDF version", pdfBoxDoc.getVersion());
             docInfoNode.put("Trapped", info.getTrapped());
-            docInfoNode.put("Page Mode", getPageModeDescription(pageMode));;
+            docInfoNode.put("Page Mode", getPageModeDescription(pageMode));
-            
+            ;
-
-            
-            
 
             PDAcroForm acroForm = pdfBoxDoc.getDocumentCatalog().getAcroForm();
 
@@ -177,41 +166,37 @@ public class GetInfoOnPDF {
             }
             jsonOutput.set("FormFields", formFieldsNode);
 
+            // embeed files TODO size
+            if (catalog.getNames() != null) {
+                PDEmbeddedFilesNameTreeNode efTree = catalog.getNames().getEmbeddedFiles();
 
-            
+                ArrayNode embeddedFilesArray = objectMapper.createArrayNode();
-            
+                if (efTree != null) {
-            
+                    Map<String, PDComplexFileSpecification> efMap = efTree.getNames();
-            
+                    if (efMap != null) {
-            //embeed files TODO size
+                        for (Map.Entry<String, PDComplexFileSpecification> entry :
-            if(catalog.getNames() != null) {
+                                efMap.entrySet()) {
-	            PDEmbeddedFilesNameTreeNode efTree = catalog.getNames().getEmbeddedFiles();
+                            ObjectNode embeddedFileNode = objectMapper.createObjectNode();
-	
+                            embeddedFileNode.put("Name", entry.getKey());
-	            ArrayNode embeddedFilesArray = objectMapper.createArrayNode();
+                            PDEmbeddedFile embeddedFile = entry.getValue().getEmbeddedFile();
-	            if (efTree != null) {
+                            if (embeddedFile != null) {
-	                Map<String, PDComplexFileSpecification> efMap = efTree.getNames();
+                                embeddedFileNode.put(
-	                if (efMap != null) {
+                                        "FileSize", embeddedFile.getLength()); // size in bytes
-	                    for (Map.Entry<String, PDComplexFileSpecification> entry : efMap.entrySet()) {
+                            }
-	                        ObjectNode embeddedFileNode = objectMapper.createObjectNode();
+                            embeddedFilesArray.add(embeddedFileNode);
-	                        embeddedFileNode.put("Name", entry.getKey());
+                        }
-	                        PDEmbeddedFile embeddedFile = entry.getValue().getEmbeddedFile();
+                    }
-	                        if (embeddedFile != null) {
+                }
-	                            embeddedFileNode.put("FileSize", embeddedFile.getLength()); // size in bytes
+                other.set("EmbeddedFiles", embeddedFilesArray);
-	                        }
-	                        embeddedFilesArray.add(embeddedFileNode);
-	                    }
-	                }
-	            }
-	            other.set("EmbeddedFiles", embeddedFilesArray);
             }
 
-
+            // attachments TODO size
-            
-            //attachments TODO size
             ArrayNode attachmentsArray = objectMapper.createArrayNode();
             for (PDPage page : pdfBoxDoc.getPages()) {
                 for (PDAnnotation annotation : page.getAnnotations()) {
                     if (annotation instanceof PDAnnotationFileAttachment) {
-                        PDAnnotationFileAttachment fileAttachmentAnnotation = (PDAnnotationFileAttachment) annotation;
+                        PDAnnotationFileAttachment fileAttachmentAnnotation =
+                                (PDAnnotationFileAttachment) annotation;
 
                         ObjectNode attachmentNode = objectMapper.createObjectNode();
                         attachmentNode.put("Name", fileAttachmentAnnotation.getAttachmentName());
@@ -223,7 +208,7 @@ public class GetInfoOnPDF {
             }
             other.set("Attachments", attachmentsArray);
 
-            //Javascript
+            // Javascript
             PDDocumentNameDictionary namesDict = catalog.getNames();
             ArrayNode javascriptArray = objectMapper.createArrayNode();
 
@@ -254,9 +239,9 @@ public class GetInfoOnPDF {
             }
             other.set("JavaScript", javascriptArray);
 
-            
+            // TODO size
-            //TODO size
+            PDOptionalContentProperties ocProperties =
-            PDOptionalContentProperties ocProperties = pdfBoxDoc.getDocumentCatalog().getOCProperties();
+                    pdfBoxDoc.getDocumentCatalog().getOCProperties();
             ArrayNode layersArray = objectMapper.createArrayNode();
 
             if (ocProperties != null) {
@@ -269,32 +254,36 @@ public class GetInfoOnPDF {
 
             other.set("Layers", layersArray);
 
-            //TODO Security
+            // TODO Security
 
-
+            PDStructureTreeRoot structureTreeRoot =
-
+                    pdfBoxDoc.getDocumentCatalog().getStructureTreeRoot();
-            
-            
-            PDStructureTreeRoot structureTreeRoot = pdfBoxDoc.getDocumentCatalog().getStructureTreeRoot();
             ArrayNode structureTreeArray;
-			try {
+            try {
-				if(structureTreeRoot != null) {
+                if (structureTreeRoot != null) {
-					structureTreeArray = exploreStructureTree(structureTreeRoot.getKids());
+                    structureTreeArray = exploreStructureTree(structureTreeRoot.getKids());
-					other.set("StructureTree", structureTreeArray);
+                    other.set("StructureTree", structureTreeArray);
-				}
+                }
-			} catch (Exception e) {
+            } catch (Exception e) {
-				// TODO Auto-generated catch block
+                // TODO Auto-generated catch block
-				e.printStackTrace();
+                e.printStackTrace();
-			}
+            }
-            
 
             boolean isPdfACompliant = checkForStandard(pdfBoxDoc, "PDF/A");
             boolean isPdfXCompliant = checkForStandard(pdfBoxDoc, "PDF/X");
             boolean isPdfECompliant = checkForStandard(pdfBoxDoc, "PDF/E");
             boolean isPdfVTCompliant = checkForStandard(pdfBoxDoc, "PDF/VT");
             boolean isPdfUACompliant = checkForStandard(pdfBoxDoc, "PDF/UA");
-            boolean isPdfBCompliant = checkForStandard(pdfBoxDoc, "PDF/B"); // If you want to check for PDF/Broadcast, though this isn't an official ISO standard.
+            boolean isPdfBCompliant =
-            boolean isPdfSECCompliant = checkForStandard(pdfBoxDoc, "PDF/SEC"); // This might not be effective since PDF/SEC was under development in 2021.
+                    checkForStandard(
+                            pdfBoxDoc,
+                            "PDF/B"); // If you want to check for PDF/Broadcast, though this isn't
+            // an official ISO standard.
+            boolean isPdfSECCompliant =
+                    checkForStandard(
+                            pdfBoxDoc,
+                            "PDF/SEC"); // This might not be effective since PDF/SEC was under
+            // development in 2021.
 
             compliancy.put("IsPDF/ACompliant", isPdfACompliant);
             compliancy.put("IsPDF/XCompliant", isPdfXCompliant);
@@ -304,10 +293,6 @@ public class GetInfoOnPDF {
             compliancy.put("IsPDF/BCompliant", isPdfBCompliant);
             compliancy.put("IsPDF/SECCompliant", isPdfSECCompliant);
 
-     
-            
-           
-            
             PDOutlineNode root = pdfBoxDoc.getDocumentCatalog().getDocumentOutline();
             ArrayNode bookmarksArray = objectMapper.createArrayNode();
 
@@ -319,32 +304,28 @@ public class GetInfoOnPDF {
 
             other.set("Bookmarks/Outline/TOC", bookmarksArray);
 
+            PDMetadata pdMetadata = pdfBoxDoc.getDocumentCatalog().getMetadata();
 
+            String xmpString = null;
 
-			PDMetadata pdMetadata = pdfBoxDoc.getDocumentCatalog().getMetadata();
+            if (pdMetadata != null) {
-			
+                try {
-			String xmpString = null;
+                    COSInputStream is = pdMetadata.createInputStream();
-			
+                    DomXmpParser domXmpParser = new DomXmpParser();
-			if (pdMetadata != null) {
+                    XMPMetadata xmpMeta = domXmpParser.parse(is);
-			    try {
-			        COSInputStream is = pdMetadata.createInputStream();
-			        DomXmpParser domXmpParser = new DomXmpParser();
-			        XMPMetadata xmpMeta = domXmpParser.parse(is);
-			        
-			        ByteArrayOutputStream os = new ByteArrayOutputStream();
-			        new XmpSerializer().serialize(xmpMeta, os, true);
-			        xmpString = new String(os.toByteArray(), StandardCharsets.UTF_8);
-			    } catch (XmpParsingException | IOException e) {
-			        e.printStackTrace();
-			    }
-			}
-			
-			other.put("XMPMetadata", xmpString);
 
+                    ByteArrayOutputStream os = new ByteArrayOutputStream();
+                    new XmpSerializer().serialize(xmpMeta, os, true);
+                    xmpString = new String(os.toByteArray(), StandardCharsets.UTF_8);
+                } catch (XmpParsingException | IOException e) {
+                    e.printStackTrace();
+                }
+            }
 
+            other.put("XMPMetadata", xmpString);
 
             if (pdfBoxDoc.isEncrypted()) {
-            	encryption.put("IsEncrypted", true);
+                encryption.put("IsEncrypted", true);
 
                 // Retrieve encryption details using getEncryption()
                 PDEncryption pdfEncryption = pdfBoxDoc.getEncryption();
@@ -356,28 +337,27 @@ public class GetInfoOnPDF {
 
                     permissionsNode.put("CanAssembleDocument", ap.canAssembleDocument());
                     permissionsNode.put("CanExtractContent", ap.canExtractContent());
-                    permissionsNode.put("CanExtractForAccessibility", ap.canExtractForAccessibility());
+                    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());
                     permissionsNode.put("CanPrintDegraded", ap.canPrintDegraded());
 
-                    encryption.set("Permissions", permissionsNode);  // set the node under "Permissions"
+                    encryption.set(
+                            "Permissions", permissionsNode); // set the node under "Permissions"
                 }
                 // Add other encryption-related properties as needed
             } else {
-            	encryption.put("IsEncrypted", false);
+                encryption.put("IsEncrypted", false);
             }
 
-            
-            
-
             ObjectNode pageInfoParent = objectMapper.createObjectNode();
             for (int pageNum = 0; pageNum < pdfBoxDoc.getNumberOfPages(); pageNum++) {
                 ObjectNode pageInfo = objectMapper.createObjectNode();
 
-             // Retrieve the page
+                // Retrieve the page
                 PDPage page = pdfBoxDoc.getPage(pageNum);
 
                 // Page-level Information
@@ -396,11 +376,11 @@ public class GetInfoOnPDF {
                 pageInfo.put("Rotation", page.getRotation());
                 pageInfo.put("Page Orientation", getPageOrientation(width, height));
 
-
                 // Boxes
                 pageInfo.put("MediaBox", mediaBox.toString());
 
-                // Assuming the following boxes are defined for your document; if not, you may get null values.
+                // Assuming the following boxes are defined for your document; if not, you may get
+                // null values.
                 PDRectangle cropBox = page.getCropBox();
                 pageInfo.put("CropBox", cropBox == null ? "Undefined" : cropBox.toString());
 
@@ -416,7 +396,7 @@ public class GetInfoOnPDF {
                 // Content Extraction
                 PDFTextStripper textStripper = new PDFTextStripper();
                 textStripper.setStartPage(pageNum + 1);
-                textStripper.setEndPage(pageNum +1);
+                textStripper.setEndPage(pageNum + 1);
                 String pageText = textStripper.getText(pdfBoxDoc);
 
                 pageInfo.put("Text Characters Count", pageText.length()); //
@@ -430,10 +410,10 @@ public class GetInfoOnPDF {
 
                 for (PDAnnotation annotation : annotations) {
                     if (annotation.getSubtype() != null) {
-                        subtypeCount++;  // Increase subtype count
+                        subtypeCount++; // Increase subtype count
                     }
                     if (annotation.getContents() != null) {
-                        contentsCount++;  // Increase contents count
+                        contentsCount++; // Increase contents count
                     }
                 }
 
@@ -443,15 +423,12 @@ public class GetInfoOnPDF {
                 annotationsObject.put("ContentsCount", contentsCount);
                 pageInfo.set("Annotations", annotationsObject);
 
-                
-                
                 // Images (simplified)
                 // This part is non-trivial as images can be embedded in multiple ways in a PDF.
                 // Here is a basic structure to recognize image XObjects on a page.
                 ArrayNode imagesArray = objectMapper.createArrayNode();
                 PDResources resources = page.getResources();
 
-
                 for (COSName name : resources.getXObjectNames()) {
                     PDXObject xObject = resources.getXObject(name);
                     if (xObject instanceof PDImageXObject) {
@@ -460,8 +437,10 @@ public class GetInfoOnPDF {
                         ObjectNode imageNode = objectMapper.createObjectNode();
                         imageNode.put("Width", image.getWidth());
                         imageNode.put("Height", image.getHeight());
-                        if(image.getMetadata() != null && image.getMetadata().getFile() != null &&   image.getMetadata().getFile().getFile() != null) {
+                        if (image.getMetadata() != null
-                        	 imageNode.put("Name", image.getMetadata().getFile().getFile());
+                                && image.getMetadata().getFile() != null
+                                && image.getMetadata().getFile().getFile() != null) {
+                            imageNode.put("Name", image.getMetadata().getFile().getFile());
                         }
                         if (image.getColorSpace() != null) {
                             imageNode.put("ColorSpace", image.getColorSpace().getName());
@@ -472,10 +451,9 @@ public class GetInfoOnPDF {
                 }
                 pageInfo.set("Images", imagesArray);
 
-                
                 // Links
                 ArrayNode linksArray = objectMapper.createArrayNode();
-                Set<String> uniqueURIs = new HashSet<>();  // To store unique URIs
+                Set<String> uniqueURIs = new HashSet<>(); // To store unique URIs
 
                 for (PDAnnotation annotation : annotations) {
                     if (annotation instanceof PDAnnotationLink) {
@@ -483,7 +461,7 @@ public class GetInfoOnPDF {
                         if (linkAnnotation.getAction() instanceof PDActionURI) {
                             PDActionURI uriAction = (PDActionURI) linkAnnotation.getAction();
                             String uri = uriAction.getURI();
-                            uniqueURIs.add(uri);  // Add to set to ensure uniqueness
+                            uniqueURIs.add(uri); // Add to set to ensure uniqueness
                         }
                     }
                 }
@@ -496,7 +474,6 @@ public class GetInfoOnPDF {
                 }
                 pageInfo.set("Links", linksArray);
 
-                
                 // Fonts
                 ArrayNode fontsArray = objectMapper.createArrayNode();
                 Map<String, ObjectNode> uniqueFontsMap = new HashMap<>();
@@ -526,11 +503,11 @@ public class GetInfoOnPDF {
                         fontNode.put("IsNonsymbolic", (flags & 32) != 0);
 
                         fontNode.put("FontFamily", fontDescriptor.getFontFamily());
-                        // Font stretch and BBox are not directly available in PDFBox's API, so these are omitted for simplicity
+                        // Font stretch and BBox are not directly available in PDFBox's API, so
+                        // these are omitted for simplicity
                         fontNode.put("FontWeight", fontDescriptor.getFontWeight());
                     }
 
-
                     // Create a unique key for this font node based on its attributes
                     String uniqueKey = fontNode.toString();
 
@@ -552,16 +529,6 @@ public class GetInfoOnPDF {
 
                 pageInfo.set("Fonts", fontsArray);
 
-                
-                
-                
-                
-                
-                
-                
-                
-                
-                
                 // Access resources dictionary
                 ArrayNode colorSpacesArray = objectMapper.createArrayNode();
 
@@ -581,9 +548,9 @@ public class GetInfoOnPDF {
                 }
                 pageInfo.set("Color Spaces & ICC Profiles", colorSpacesArray);
 
-
                 // Other XObjects
-                Map<String, Integer> xObjectCountMap = new HashMap<>();  // To store the count for each type
+                Map<String, Integer> xObjectCountMap =
+                        new HashMap<>(); // To store the count for each type
                 for (COSName name : resources.getXObjectNames()) {
                     PDXObject xObject = resources.getXObject(name);
                     String xObjectType;
@@ -597,7 +564,8 @@ public class GetInfoOnPDF {
                     }
 
                     // Increment the count for this type in the map
-                    xObjectCountMap.put(xObjectType, xObjectCountMap.getOrDefault(xObjectType, 0) + 1);
+                    xObjectCountMap.put(
+                            xObjectType, xObjectCountMap.getOrDefault(xObjectType, 0) + 1);
                 }
 
                 // Add the count map to pageInfo (or wherever you want to store it)
@@ -607,13 +575,10 @@ public class GetInfoOnPDF {
                 }
                 pageInfo.set("XObjectCounts", xObjectCountNode);
 
-         
-
-
                 ArrayNode multimediaArray = objectMapper.createArrayNode();
 
                 for (PDAnnotation annotation : annotations) {
-                	if ("RichMedia".equals(annotation.getSubtype())) {
+                    if ("RichMedia".equals(annotation.getSubtype())) {
                         ObjectNode multimediaNode = objectMapper.createObjectNode();
                         // Extract details from the annotation as needed
                         multimediaArray.add(multimediaNode);
@@ -622,12 +587,9 @@ public class GetInfoOnPDF {
 
                 pageInfo.set("Multimedia", multimediaArray);
 
-                
+                pageInfoParent.set("Page " + (pageNum + 1), pageInfo);
-
-                pageInfoParent.set("Page " + (pageNum+1), pageInfo);
             }
 
-            
             jsonOutput.set("BasicInfo", basicInfo);
             jsonOutput.set("DocumentInfo", docInfoNode);
             jsonOutput.set("Compliancy", compliancy);
@@ -635,19 +597,19 @@ public class GetInfoOnPDF {
             jsonOutput.set("Other", other);
             jsonOutput.set("PerPageInfo", pageInfoParent);
 
-            
-            
             // Save JSON to file
-            String jsonString = objectMapper.writerWithDefaultPrettyPrinter().writeValueAsString(jsonOutput);
+            String jsonString =
+                    objectMapper.writerWithDefaultPrettyPrinter().writeValueAsString(jsonOutput);
 
-            
+            return WebResponseUtils.bytesToWebResponse(
-            
+                    jsonString.getBytes(StandardCharsets.UTF_8),
-            return WebResponseUtils.bytesToWebResponse(jsonString.getBytes(StandardCharsets.UTF_8), "response.json", MediaType.APPLICATION_JSON);
+                    "response.json",
+                    MediaType.APPLICATION_JSON);
 
         } catch (Exception e) {
             e.printStackTrace();
         }
-		return null;
+        return null;
     }
 
     private static void addOutlinesToArray(PDOutlineItem outline, ArrayNode arrayNode) {
@@ -674,6 +636,7 @@ public class GetInfoOnPDF {
             return "Square";
         }
     }
+
     public String getPageSize(float width, float height) {
         // Define standard page sizes
         Map<String, PDRectangle> standardSizes = new HashMap<>();
@@ -696,12 +659,13 @@ public class GetInfoOnPDF {
         return "Custom";
     }
 
-    private boolean isCloseToSize(float width, float height, float standardWidth, float standardHeight) {
+    private boolean isCloseToSize(
+            float width, float height, float standardWidth, float standardHeight) {
         float tolerance = 1.0f; // You can adjust the tolerance as needed
-        return Math.abs(width - standardWidth) <= tolerance && Math.abs(height - standardHeight) <= tolerance;
+        return Math.abs(width - standardWidth) <= tolerance
+                && Math.abs(height - standardHeight) <= tolerance;
     }
 
-
     public ObjectNode getDimensionInfo(ObjectNode dimensionInfo, float width, float height) {
         float ppi = 72; // Points Per Inch
 
@@ -720,33 +684,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);
 
-public static boolean checkForStandard(PDDocument document, String standardKeyword) {
+                if (xmpString.contains(standardKeyword)) {
-    // Check XMP Metadata
+                    return true;
-    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.
+            e.printStackTrace();
         }
-    } catch (Exception e) { // Catching general exception for brevity, ideally you'd catch specific exceptions.
+
-        e.printStackTrace();
+        return false;
     }
 
-    return false;
-}
-
-    
     public ArrayNode exploreStructureTree(List<Object> nodes) {
         ArrayNode elementsArray = objectMapper.createArrayNode();
         if (nodes != null) {
@@ -773,7 +737,6 @@ public static boolean checkForStandard(PDDocument document, String standardKeywo
         return elementsArray;
     }
 
-
     public String getContent(PDStructureElement structureElement) {
         StringBuilder contentBuilder = new StringBuilder();
 
@@ -791,7 +754,6 @@ public static boolean checkForStandard(PDDocument document, String standardKeywo
         return contentBuilder.toString();
     }
 
-    
     private String formatDate(Calendar calendar) {
         if (calendar != null) {
             SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");

src/main/java/stirling/software/SPDF/controller/api/security/PasswordController.java

@@ -16,9 +16,11 @@ 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.AddPasswordRequest;
 import stirling.software.SPDF.model.api.security.PDFPasswordRequest;
 import stirling.software.SPDF.utils.WebResponseUtils;
+
 @RestController
 @RequestMapping("/api/v1/security")
 @Tag(name = "Security", description = "Security APIs")
@@ -26,29 +28,31 @@ public class PasswordController {
 
     private static final Logger logger = LoggerFactory.getLogger(PasswordController.class);
 
-
     @PostMapping(consumes = "multipart/form-data", value = "/remove-password")
     @Operation(
-        summary = "Remove password from a PDF file",
+            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"
+            description =
-    )
+                    "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 {
+    public ResponseEntity<byte[]> removePassword(@ModelAttribute PDFPasswordRequest request)
+            throws IOException {
         MultipartFile fileInput = request.getFileInput();
         String password = request.getPassword();
 
-    	
-    	
         PDDocument document = PDDocument.load(fileInput.getBytes(), password);
         document.setAllSecurityToBeRemoved(true);
-        return WebResponseUtils.pdfDocToWebResponse(document, fileInput.getOriginalFilename().replaceFirst("[.][^.]+$", "") + "_password_removed.pdf");
+        return WebResponseUtils.pdfDocToWebResponse(
+                document,
+                fileInput.getOriginalFilename().replaceFirst("[.][^.]+$", "")
+                        + "_password_removed.pdf");
     }
 
     @PostMapping(consumes = "multipart/form-data", value = "/add-password")
     @Operation(
-        summary = "Add password to a PDF file",
+            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"
+            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")
-    public ResponseEntity<byte[]> addPassword(@ModelAttribute AddPasswordRequest request) throws IOException {
+    public ResponseEntity<byte[]> addPassword(@ModelAttribute AddPasswordRequest request)
+            throws IOException {
         MultipartFile fileInput = request.getFileInput();
         String ownerPassword = request.getOwnerPassword();
         String password = request.getPassword();
@@ -74,16 +78,19 @@ public class PasswordController {
         ap.setCanPrintFaithful(!canPrintFaithful);
         StandardProtectionPolicy spp = new StandardProtectionPolicy(ownerPassword, password, ap);
 
-        if(!"".equals(ownerPassword) || !"".equals(password)) {
+        if (!"".equals(ownerPassword) || !"".equals(password)) {
-        	spp.setEncryptionKeyLength(keyLength);
+            spp.setEncryptionKeyLength(keyLength);
         }
         spp.setPermissions(ap);
         document.protect(spp);
 
-        if("".equals(ownerPassword) && "".equals(password))
+        if ("".equals(ownerPassword) && "".equals(password))
-        	return WebResponseUtils.pdfDocToWebResponse(document, fileInput.getOriginalFilename().replaceFirst("[.][^.]+$", "") + "_permissions.pdf");
+            return WebResponseUtils.pdfDocToWebResponse(
-        return WebResponseUtils.pdfDocToWebResponse(document, fileInput.getOriginalFilename().replaceFirst("[.][^.]+$", "") + "_passworded.pdf");
+                    document,
+                    fileInput.getOriginalFilename().replaceFirst("[.][^.]+$", "")
+                            + "_permissions.pdf");
+        return WebResponseUtils.pdfDocToWebResponse(
+                document,
+                fileInput.getOriginalFilename().replaceFirst("[.][^.]+$", "") + "_passworded.pdf");
     }
-
-
 }

src/main/java/stirling/software/SPDF/controller/api/security/RedactController.java

@@ -26,10 +26,12 @@ 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.PDFText;
 import stirling.software.SPDF.model.api.security.RedactPdfRequest;
 import stirling.software.SPDF.pdf.TextFinder;
 import stirling.software.SPDF.utils.WebResponseUtils;
+
 @RestController
 @RequestMapping("/api/v1/security")
 @Tag(name = "Security", description = "Security APIs")
@@ -37,11 +39,13 @@ public class RedactController {
 
     private static final Logger logger = LoggerFactory.getLogger(RedactController.class);
 
-
     @PostMapping(value = "/auto-redact", consumes = "multipart/form-data")
-    @Operation(summary = "Redacts listOfText in a PDF document", 
+    @Operation(
-               description = "This operation takes an input PDF file and redacts the provided listOfText. Input:PDF, Output:PDF, Type:SISO")
+            summary = "Redacts listOfText in a PDF document",
-    public ResponseEntity<byte[]> redactPdf(@ModelAttribute RedactPdfRequest request) throws Exception {
+            description =
+                    "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();
         String listOfTextString = request.getListOfText();
         boolean useRegex = request.isUseRegex();
@@ -50,14 +54,14 @@ public class RedactController {
         float customPadding = request.getCustomPadding();
         boolean convertPDFToImage = request.isConvertPDFToImage();
 
-    	System.out.println(listOfTextString);
+        System.out.println(listOfTextString);
-    	String[] listOfText = listOfTextString.split("\n");
+        String[] listOfText = listOfTextString.split("\n");
         byte[] bytes = file.getBytes();
         PDDocument document = PDDocument.load(new ByteArrayInputStream(bytes));
 
         Color redactColor;
         try {
-        	if (!colorString.startsWith("#")) {
+            if (!colorString.startsWith("#")) {
                 colorString = "#" + colorString;
             }
             redactColor = Color.decode(colorString);
@@ -66,18 +70,14 @@ public class RedactController {
             redactColor = Color.BLACK;
         }
 
-
-        
         for (String text : listOfText) {
-        	text = text.trim();
+            text = text.trim();
-        	System.out.println(text);
+            System.out.println(text);
-        	TextFinder textFinder = new TextFinder(text, useRegex, wholeWordSearchBool);
+            TextFinder textFinder = new TextFinder(text, useRegex, wholeWordSearchBool);
             List<PDFText> foundTexts = textFinder.getTextLocations(document);
-            redactFoundText(document, foundTexts, customPadding,redactColor);
+            redactFoundText(document, foundTexts, customPadding, redactColor);
         }
 
-        
-        
         if (convertPDFToImage) {
             PDDocument imageDocument = new PDDocument();
             PDFRenderer pdfRenderer = new PDFRenderer(document);
@@ -99,25 +99,31 @@ public class RedactController {
         document.close();
 
         byte[] pdfContent = baos.toByteArray();
-        return WebResponseUtils.bytesToWebResponse(pdfContent,
+        return WebResponseUtils.bytesToWebResponse(
+                pdfContent,
                 file.getOriginalFilename().replaceFirst("[.][^.]+$", "") + "_redacted.pdf");
     }
 
-    
+    private void redactFoundText(
-    private void redactFoundText(PDDocument document, List<PDFText> blocks, float customPadding, Color redactColor) throws IOException {
+            PDDocument document, List<PDFText> blocks, float customPadding, Color redactColor)
+            throws IOException {
         var allPages = document.getDocumentCatalog().getPages();
 
         for (PDFText block : blocks) {
             var page = allPages.get(block.getPageIndex());
-            PDPageContentStream contentStream = new PDPageContentStream(document, page, PDPageContentStream.AppendMode.APPEND, true, true);
+            PDPageContentStream contentStream =
+                    new PDPageContentStream(
+                            document, page, PDPageContentStream.AppendMode.APPEND, true, true);
             contentStream.setNonStrokingColor(redactColor);
             float padding = (block.getY2() - block.getY1()) * 0.3f + customPadding;
             PDRectangle pageBox = page.getBBox();
-            contentStream.addRect(block.getX1(), pageBox.getHeight() - block.getY1() - padding, block.getX2() - block.getX1(), block.getY2() - block.getY1() + 2 * padding);
+            contentStream.addRect(
+                    block.getX1(),
+                    pageBox.getHeight() - block.getY1() - padding,
+                    block.getX2() - block.getX1(),
+                    block.getY2() - block.getY1() + 2 * padding);
             contentStream.fill();
             contentStream.close();
         }
     }
-
-
 }

src/main/java/stirling/software/SPDF/controller/api/security/SanitizeController.java

@@ -1,4 +1,5 @@
 package stirling.software.SPDF.controller.api.security;
+
 import java.io.IOException;
 
 import org.apache.pdfbox.cos.COSDictionary;
@@ -28,6 +29,7 @@ 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.SanitizePdfRequest;
 import stirling.software.SPDF.utils.WebResponseUtils;
 
@@ -36,59 +38,68 @@ import stirling.software.SPDF.utils.WebResponseUtils;
 @Tag(name = "Security", description = "Security APIs")
 public class SanitizeController {
 
-	@PostMapping(consumes = "multipart/form-data", value = "/sanitize-pdf")
+    @PostMapping(consumes = "multipart/form-data", value = "/sanitize-pdf")
-	@Operation(summary = "Sanitize a PDF file",
+    @Operation(
-	        description = "This endpoint processes a PDF file and removes specific elements based on the provided options. Input:PDF Output:PDF Type:SISO")
+            summary = "Sanitize a PDF file",
-	public ResponseEntity<byte[]> sanitizePDF(@ModelAttribute SanitizePdfRequest request) throws IOException {
+            description =
-	    MultipartFile inputFile = request.getFileInput();
+                    "This endpoint processes a PDF file and removes specific elements based on the provided options. Input:PDF Output:PDF Type:SISO")
-	    boolean removeJavaScript = request.isRemoveJavaScript();
+    public ResponseEntity<byte[]> sanitizePDF(@ModelAttribute SanitizePdfRequest request)
-	    boolean removeEmbeddedFiles = request.isRemoveEmbeddedFiles();
+            throws IOException {
-	    boolean removeMetadata = request.isRemoveMetadata();
+        MultipartFile inputFile = request.getFileInput();
-	    boolean removeLinks = request.isRemoveLinks();
+        boolean removeJavaScript = request.isRemoveJavaScript();
-	    boolean removeFonts = request.isRemoveFonts();
+        boolean removeEmbeddedFiles = request.isRemoveEmbeddedFiles();
+        boolean removeMetadata = request.isRemoveMetadata();
+        boolean removeLinks = request.isRemoveLinks();
+        boolean removeFonts = request.isRemoveFonts();
 
-	    try (PDDocument document = PDDocument.load(inputFile.getInputStream())) {
+        try (PDDocument document = PDDocument.load(inputFile.getInputStream())) {
-	        if (removeJavaScript) {
+            if (removeJavaScript) {
-	            sanitizeJavaScript(document);
+                sanitizeJavaScript(document);
-	        }
+            }
 
-	        if (removeEmbeddedFiles) {
+            if (removeEmbeddedFiles) {
-	            sanitizeEmbeddedFiles(document);
+                sanitizeEmbeddedFiles(document);
-	        }
+            }
 
-	        if (removeMetadata) {
+            if (removeMetadata) {
-	            sanitizeMetadata(document);
+                sanitizeMetadata(document);
-	        }
+            }
 
-	        if (removeLinks) {
+            if (removeLinks) {
-	            sanitizeLinks(document);
+                sanitizeLinks(document);
-	        }
+            }
 
-	        if (removeFonts) {
+            if (removeFonts) {
-	            sanitizeFonts(document);
+                sanitizeFonts(document);
-	        }
+            }
 
-	        return WebResponseUtils.pdfDocToWebResponse(document, inputFile.getOriginalFilename().replaceFirst("[.][^.]+$", "") + "_sanitized.pdf");
+            return WebResponseUtils.pdfDocToWebResponse(
-	    }
+                    document,
-	}
+                    inputFile.getOriginalFilename().replaceFirst("[.][^.]+$", "")
-	private void sanitizeJavaScript(PDDocument document) throws IOException {
+                            + "_sanitized.pdf");
-		// Get the root dictionary (catalog) of the PDF
+        }
-	    PDDocumentCatalog catalog = document.getDocumentCatalog();
+    }
 
-	    // Get the Names dictionary
+    private void sanitizeJavaScript(PDDocument document) throws IOException {
-	    COSDictionary namesDict = (COSDictionary) catalog.getCOSObject().getDictionaryObject(COSName.NAMES);
+        // Get the root dictionary (catalog) of the PDF
+        PDDocumentCatalog catalog = document.getDocumentCatalog();
 
-	    if (namesDict != null) {
+        // Get the Names dictionary
-	        // Get the JavaScript dictionary
+        COSDictionary namesDict =
-	        COSDictionary javaScriptDict = (COSDictionary) namesDict.getDictionaryObject(COSName.getPDFName("JavaScript"));
+                (COSDictionary) catalog.getCOSObject().getDictionaryObject(COSName.NAMES);
 
-	        if (javaScriptDict != null) {
+        if (namesDict != null) {
-	            // Remove the JavaScript dictionary
+            // Get the JavaScript dictionary
-	            namesDict.removeItem(COSName.getPDFName("JavaScript"));
+            COSDictionary javaScriptDict =
-	        }
+                    (COSDictionary) namesDict.getDictionaryObject(COSName.getPDFName("JavaScript"));
-	    }
 
-	    for (PDPage page : document.getPages()) {
+            if (javaScriptDict != null) {
+                // Remove the JavaScript dictionary
+                namesDict.removeItem(COSName.getPDFName("JavaScript"));
+            }
+        }
+
+        for (PDPage page : document.getPages()) {
             for (PDAnnotation annotation : page.getAnnotations()) {
                 if (annotation instanceof PDAnnotationWidget) {
                     PDAnnotationWidget widget = (PDAnnotationWidget) annotation;
@@ -96,33 +107,30 @@ public class SanitizeController {
                     if (action instanceof PDActionJavaScript) {
                         widget.setAction(null);
                     }
-				}
+                }
-			}
+            }
-	        PDAcroForm acroForm = document.getDocumentCatalog().getAcroForm();
+            PDAcroForm acroForm = document.getDocumentCatalog().getAcroForm();
-	        if (acroForm != null) {
+            if (acroForm != null) {
-	            for (PDField field : acroForm.getFields()) {
+                for (PDField field : acroForm.getFields()) {
-	            	PDFormFieldAdditionalActions actions = field.getActions();
+                    PDFormFieldAdditionalActions actions = field.getActions();
-	            	if(actions != null) {
+                    if (actions != null) {
-	            		if (actions.getC() instanceof PDActionJavaScript) {
+                        if (actions.getC() instanceof PDActionJavaScript) {
-	                        actions.setC(null);
+                            actions.setC(null);
-	                    }
+                        }
-	                    if (actions.getF() instanceof PDActionJavaScript) {
+                        if (actions.getF() instanceof PDActionJavaScript) {
-	                        actions.setF(null);
+                            actions.setF(null);
-	                    }
+                        }
-	                    if (actions.getK() instanceof PDActionJavaScript) {
+                        if (actions.getK() instanceof PDActionJavaScript) {
-	                        actions.setK(null);
+                            actions.setK(null);
-	                    }
+                        }
-	                    if (actions.getV() instanceof PDActionJavaScript) {
+                        if (actions.getV() instanceof PDActionJavaScript) {
-	                        actions.setV(null);
+                            actions.setV(null);
-	                    }
+                        }
-	            	}
+                    }
-	            }
+                }
-	        }
+            }
-	    }
+        }
-	}
+    }
-
-
-
 
     private void sanitizeEmbeddedFiles(PDDocument document) {
         PDPageTree allPages = document.getPages();
@@ -135,7 +143,6 @@ public class SanitizeController {
         }
     }
 
-
     private void sanitizeMetadata(PDDocument document) {
         PDMetadata metadata = document.getDocumentCatalog().getMetadata();
         if (metadata != null) {
@@ -143,8 +150,6 @@ public class SanitizeController {
         }
     }
 
-
-
     private void sanitizeLinks(PDDocument document) throws IOException {
         for (PDPage page : document.getPages()) {
             for (PDAnnotation annotation : page.getAnnotations()) {
@@ -163,5 +168,4 @@ public class SanitizeController {
             page.getResources().getCOSObject().removeItem(COSName.getPDFName("Font"));
         }
     }
-    
 }

src/main/java/stirling/software/SPDF/controller/api/security/WatermarkController.java

@@ -30,6 +30,7 @@ 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.AddWatermarkRequest;
 import stirling.software.SPDF.utils.WebResponseUtils;
 
@@ -38,80 +39,110 @@ import stirling.software.SPDF.utils.WebResponseUtils;
 @Tag(name = "Security", description = "Security APIs")
 public class WatermarkController {
 
-	@PostMapping(consumes = "multipart/form-data", value = "/add-watermark")
+    @PostMapping(consumes = "multipart/form-data", value = "/add-watermark")
-	@Operation(summary = "Add watermark to a PDF file", description = "This endpoint adds a watermark to a given PDF file. Users can specify the watermark type (text or image), rotation, opacity, width spacer, and height spacer. Input:PDF Output:PDF Type:SISO")
+    @Operation(
-	public ResponseEntity<byte[]> addWatermark(@ModelAttribute AddWatermarkRequest request) throws IOException, Exception {
+            summary = "Add watermark to a PDF file",
-	    MultipartFile pdfFile = request.getFileInput();
+            description =
-	    String watermarkType = request.getWatermarkType();
+                    "This endpoint adds a watermark to a given PDF file. Users can specify the watermark type (text or image), rotation, opacity, width spacer, and height spacer. Input:PDF Output:PDF Type:SISO")
-	    String watermarkText = request.getWatermarkText();
+    public ResponseEntity<byte[]> addWatermark(@ModelAttribute AddWatermarkRequest request)
-	    MultipartFile watermarkImage = request.getWatermarkImage();
+            throws IOException, Exception {
-	    String alphabet = request.getAlphabet();
+        MultipartFile pdfFile = request.getFileInput();
-	    float fontSize = request.getFontSize();
+        String watermarkType = request.getWatermarkType();
-	    float rotation = request.getRotation();
+        String watermarkText = request.getWatermarkText();
-	    float opacity = request.getOpacity();
+        MultipartFile watermarkImage = request.getWatermarkImage();
-	    int widthSpacer = request.getWidthSpacer();
+        String alphabet = request.getAlphabet();
-	    int heightSpacer = request.getHeightSpacer();
+        float fontSize = request.getFontSize();
+        float rotation = request.getRotation();
+        float opacity = request.getOpacity();
+        int widthSpacer = request.getWidthSpacer();
+        int heightSpacer = request.getHeightSpacer();
 
-		// Load the input PDF
+        // Load the input PDF
-		PDDocument document = PDDocument.load(pdfFile.getInputStream());
+        PDDocument document = PDDocument.load(pdfFile.getInputStream());
 
-		// Create a page in the document
+        // Create a page in the document
-		for (PDPage page : document.getPages()) {
+        for (PDPage page : document.getPages()) {
 
-			// Get the page's content stream
+            // Get the page's content stream
-			PDPageContentStream contentStream = new PDPageContentStream(document, page,
+            PDPageContentStream contentStream =
-					PDPageContentStream.AppendMode.APPEND, true);
+                    new PDPageContentStream(
+                            document, page, PDPageContentStream.AppendMode.APPEND, true);
 
-			// Set transparency
+            // Set transparency
-			PDExtendedGraphicsState graphicsState = new PDExtendedGraphicsState();
+            PDExtendedGraphicsState graphicsState = new PDExtendedGraphicsState();
-			graphicsState.setNonStrokingAlphaConstant(opacity);
+            graphicsState.setNonStrokingAlphaConstant(opacity);
-			contentStream.setGraphicsStateParameters(graphicsState);
+            contentStream.setGraphicsStateParameters(graphicsState);
 
-			if (watermarkType.equalsIgnoreCase("text")) {
+            if (watermarkType.equalsIgnoreCase("text")) {
-				addTextWatermark(contentStream, watermarkText, document, page, rotation, widthSpacer, heightSpacer,
+                addTextWatermark(
-						fontSize, alphabet);
+                        contentStream,
-			} else if (watermarkType.equalsIgnoreCase("image")) {
+                        watermarkText,
-				addImageWatermark(contentStream, watermarkImage, document, page, rotation, widthSpacer, heightSpacer,
+                        document,
-						fontSize);
+                        page,
-			}
+                        rotation,
+                        widthSpacer,
+                        heightSpacer,
+                        fontSize,
+                        alphabet);
+            } else if (watermarkType.equalsIgnoreCase("image")) {
+                addImageWatermark(
+                        contentStream,
+                        watermarkImage,
+                        document,
+                        page,
+                        rotation,
+                        widthSpacer,
+                        heightSpacer,
+                        fontSize);
+            }
 
-			// Close the content stream
+            // Close the content stream
-			contentStream.close();
+            contentStream.close();
-		}
+        }
 
-		return WebResponseUtils.pdfDocToWebResponse(document,
+        return WebResponseUtils.pdfDocToWebResponse(
-				pdfFile.getOriginalFilename().replaceFirst("[.][^.]+$", "") + "_watermarked.pdf");
+                document,
-	}
+                pdfFile.getOriginalFilename().replaceFirst("[.][^.]+$", "") + "_watermarked.pdf");
+    }
 
-	private void addTextWatermark(PDPageContentStream contentStream, String watermarkText, PDDocument document,
+    private void addTextWatermark(
-			PDPage page, float rotation, int widthSpacer, int heightSpacer, float fontSize, String alphabet) throws IOException {
+            PDPageContentStream contentStream,
-		String resourceDir = "";
+            String watermarkText,
-	    PDFont font = PDType1Font.HELVETICA_BOLD;
+            PDDocument document,
-	    switch (alphabet) {
+            PDPage page,
-	        case "arabic":
+            float rotation,
-	            resourceDir = "static/fonts/NotoSansArabic-Regular.ttf";
+            int widthSpacer,
-	            break;
+            int heightSpacer,
-	        case "japanese":
+            float fontSize,
-	            resourceDir = "static/fonts/Meiryo.ttf";
+            String alphabet)
-	            break;
+            throws IOException {
-	        case "korean":
+        String resourceDir = "";
-	            resourceDir = "static/fonts/malgun.ttf";
+        PDFont font = PDType1Font.HELVETICA_BOLD;
-	            break;
+        switch (alphabet) {
-	        case "chinese":
+            case "arabic":
-	            resourceDir = "static/fonts/SimSun.ttf";
+                resourceDir = "static/fonts/NotoSansArabic-Regular.ttf";
-	            break;
+                break;
-	        case "roman":
+            case "japanese":
-	        default:
+                resourceDir = "static/fonts/Meiryo.ttf";
-	            resourceDir = "static/fonts/NotoSans-Regular.ttf";
+                break;
-	            break;
+            case "korean":
-	    }
+                resourceDir = "static/fonts/malgun.ttf";
+                break;
+            case "chinese":
+                resourceDir = "static/fonts/SimSun.ttf";
+                break;
+            case "roman":
+            default:
+                resourceDir = "static/fonts/NotoSans-Regular.ttf";
+                break;
+        }
 
-        
+        if (!resourceDir.equals("")) {
-        if(!resourceDir.equals("")) {
             ClassPathResource classPathResource = new ClassPathResource(resourceDir);
             String fileExtension = resourceDir.substring(resourceDir.lastIndexOf("."));
             File tempFile = File.createTempFile("NotoSansFont", fileExtension);
-            try (InputStream is = classPathResource.getInputStream(); FileOutputStream os = new FileOutputStream(tempFile)) {
+            try (InputStream is = classPathResource.getInputStream();
+                    FileOutputStream os = new FileOutputStream(tempFile)) {
                 IOUtils.copy(is, os);
             }
 
@@ -119,73 +150,87 @@ public class WatermarkController {
             tempFile.deleteOnExit();
         }
 
-		contentStream.setFont(font, fontSize);
+        contentStream.setFont(font, fontSize);
-		contentStream.setNonStrokingColor(Color.LIGHT_GRAY);
+        contentStream.setNonStrokingColor(Color.LIGHT_GRAY);
 
-		// Set size and location of text watermark
+        // Set size and location of text watermark
-		float watermarkWidth = widthSpacer + font.getStringWidth(watermarkText) * fontSize / 1000;
+        float watermarkWidth = widthSpacer + font.getStringWidth(watermarkText) * fontSize / 1000;
-		float watermarkHeight = heightSpacer + fontSize;
+        float watermarkHeight = heightSpacer + fontSize;
-		float pageWidth = page.getMediaBox().getWidth();
+        float pageWidth = page.getMediaBox().getWidth();
-		float pageHeight = page.getMediaBox().getHeight();
+        float pageHeight = page.getMediaBox().getHeight();
-		int watermarkRows = (int) (pageHeight / watermarkHeight + 1);
+        int watermarkRows = (int) (pageHeight / watermarkHeight + 1);
-		int watermarkCols = (int) (pageWidth / watermarkWidth + 1);
+        int watermarkCols = (int) (pageWidth / watermarkWidth + 1);
 
-		// Add the text watermark
+        // Add the text watermark
-		for (int i = 0; i < watermarkRows; i++) {
+        for (int i = 0; i < watermarkRows; i++) {
-			for (int j = 0; j < watermarkCols; j++) {
+            for (int j = 0; j < watermarkCols; j++) {
-				contentStream.beginText();
+                contentStream.beginText();
-				contentStream.setTextMatrix(Matrix.getRotateInstance((float) Math.toRadians(rotation),
+                contentStream.setTextMatrix(
-						j * watermarkWidth, i * watermarkHeight));
+                        Matrix.getRotateInstance(
-				contentStream.showText(watermarkText);
+                                (float) Math.toRadians(rotation),
-				contentStream.endText();
+                                j * watermarkWidth,
-			}
+                                i * watermarkHeight));
-		}
+                contentStream.showText(watermarkText);
-	}
+                contentStream.endText();
+            }
+        }
+    }
 
-	private void addImageWatermark(PDPageContentStream contentStream, MultipartFile watermarkImage, PDDocument document, PDPage page, float rotation,
+    private void addImageWatermark(
-            int widthSpacer, int heightSpacer, float fontSize) throws IOException {
+            PDPageContentStream contentStream,
+            MultipartFile watermarkImage,
+            PDDocument document,
+            PDPage page,
+            float rotation,
+            int widthSpacer,
+            int heightSpacer,
+            float fontSize)
+            throws IOException {
 
-// Load the watermark image
+        // Load the watermark image
-BufferedImage image = ImageIO.read(watermarkImage.getInputStream());
+        BufferedImage image = ImageIO.read(watermarkImage.getInputStream());
 
-// Compute width based on original aspect ratio
+        // Compute width based on original aspect ratio
-float aspectRatio = (float) image.getWidth() / (float) image.getHeight();
+        float aspectRatio = (float) image.getWidth() / (float) image.getHeight();
 
-// Desired physical height (in PDF points)
+        // Desired physical height (in PDF points)
-float desiredPhysicalHeight = fontSize ;
+        float desiredPhysicalHeight = fontSize;
 
-// Desired physical width based on the aspect ratio
+        // Desired physical width based on the aspect ratio
-float desiredPhysicalWidth = desiredPhysicalHeight * aspectRatio;
+        float desiredPhysicalWidth = desiredPhysicalHeight * aspectRatio;
 
-// Convert the BufferedImage to PDImageXObject
+        // Convert the BufferedImage to PDImageXObject
-PDImageXObject xobject = LosslessFactory.createFromImage(document, image);
+        PDImageXObject xobject = LosslessFactory.createFromImage(document, image);
 
-// Calculate the number of rows and columns for watermarks
+        // Calculate the number of rows and columns for watermarks
-float pageWidth = page.getMediaBox().getWidth();
+        float pageWidth = page.getMediaBox().getWidth();
-float pageHeight = page.getMediaBox().getHeight();
+        float pageHeight = page.getMediaBox().getHeight();
-int watermarkRows = (int) ((pageHeight + heightSpacer) / (desiredPhysicalHeight + heightSpacer));
+        int watermarkRows =
-int watermarkCols = (int) ((pageWidth + widthSpacer) / (desiredPhysicalWidth + widthSpacer));
+                (int) ((pageHeight + heightSpacer) / (desiredPhysicalHeight + heightSpacer));
+        int watermarkCols =
+                (int) ((pageWidth + widthSpacer) / (desiredPhysicalWidth + widthSpacer));
 
-for (int i = 0; i < watermarkRows; i++) {
+        for (int i = 0; i < watermarkRows; i++) {
-for (int j = 0; j < watermarkCols; j++) {
+            for (int j = 0; j < watermarkCols; j++) {
-float x = j * (desiredPhysicalWidth + widthSpacer);
+                float x = j * (desiredPhysicalWidth + widthSpacer);
-float y = i * (desiredPhysicalHeight + heightSpacer);
+                float y = i * (desiredPhysicalHeight + heightSpacer);
 
-// Save the graphics state
+                // Save the graphics state
-contentStream.saveGraphicsState();
+                contentStream.saveGraphicsState();
 
-// Create rotation matrix and rotate
+                // Create rotation matrix and rotate
-contentStream.transform(Matrix.getTranslateInstance(x + desiredPhysicalWidth / 2, y + desiredPhysicalHeight / 2));
+                contentStream.transform(
-contentStream.transform(Matrix.getRotateInstance(Math.toRadians(rotation), 0, 0));
+                        Matrix.getTranslateInstance(
-contentStream.transform(Matrix.getTranslateInstance(-desiredPhysicalWidth / 2, -desiredPhysicalHeight / 2));
+                                x + desiredPhysicalWidth / 2, y + desiredPhysicalHeight / 2));
-
+                contentStream.transform(Matrix.getRotateInstance(Math.toRadians(rotation), 0, 0));
-// Draw the image and restore the graphics state
+                contentStream.transform(
-contentStream.drawImage(xobject, 0, 0, desiredPhysicalWidth, desiredPhysicalHeight);
+                        Matrix.getTranslateInstance(
-contentStream.restoreGraphicsState();
+                                -desiredPhysicalWidth / 2, -desiredPhysicalHeight / 2));
-}
-
-}
-
-	}
 
+                // Draw the image and restore the graphics state
+                contentStream.drawImage(xobject, 0, 0, desiredPhysicalWidth, desiredPhysicalHeight);
+                contentStream.restoreGraphicsState();
+            }
+        }
+    }
 }

src/main/java/stirling/software/SPDF/controller/api/strippers/PDFTableStripper.java

@@ -24,91 +24,79 @@ import org.apache.pdfbox.text.PDFTextStripperByArea;
 import org.apache.pdfbox.text.TextPosition;
 
 /**
+ * Class to extract tabular data from a PDF. Works by making a first pass of the page to group all
+ * nearby text items together, and then inferring a 2D grid from these regions. Each table cell is
+ * then extracted using a PDFTextStripperByArea object.
  *
- * Class to extract tabular data from a PDF.
+ * <p>Works best when headers are included in the detected region, to ensure representative text in
- * Works by making a first pass of the page to group all nearby text items
+ * every column.
- * together, and then inferring a 2D grid from these regions. Each table cell
- * is then extracted using a PDFTextStripperByArea object.
  *
- * Works best when
+ * <p>Based upon DrawPrintTextLocations PDFBox example
- * headers are included in the detected region, to ensure representative text
- * in every column.
- *
- * Based upon DrawPrintTextLocations PDFBox example
  * (https://svn.apache.org/viewvc/pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/util/DrawPrintTextLocations.java)
  *
  * @author Beldaz
  */
-public class PDFTableStripper extends PDFTextStripper
+public class PDFTableStripper extends PDFTextStripper {
-{
 
     /**
      * This will print the documents data, for each table cell.
      *
      * @param args The command line arguments.
-     *
      * @throws IOException If there is an error parsing the document.
      */
     /*
      *  Used in methods derived from DrawPrintTextLocations
      */
     private AffineTransform flipAT;
+
     private AffineTransform rotateAT;
 
-    /**
+    /** Regions updated by calls to writeString */
-     *  Regions updated by calls to writeString
-     */
     private Set<Rectangle2D> boxes;
 
     // Border to allow when finding intersections
     private double dx = 1.0; // This value works for me, feel free to tweak (or add setter)
     private double dy = 0.000; // Rows of text tend to overlap, so need to extend
 
-    /**
+    /** Region in which to find table (otherwise whole page) */
-     *  Region in which to find table (otherwise whole page)
-     */
     private Rectangle2D regionArea;
 
-    /**
+    /** Number of rows in inferred table */
-     * Number of rows in inferred table
+    private int nRows = 0;
-     */
-    private int nRows=0;
 
-    /**
+    /** Number of columns in inferred table */
-     * Number of columns in inferred table
+    private int nCols = 0;
-     */
-    private int nCols=0;
 
-    /**
+    /** This is the object that does the text extraction */
-     * This is the object that does the text extraction
-     */
     private PDFTextStripperByArea regionStripper;
 
     /**
      * 1D intervals - used for calculateTableRegions()
-     * @author Beldaz
      *
+     * @author Beldaz
      */
     public static class Interval {
         double start;
         double end;
+
         public Interval(double start, double end) {
-            this.start=start; this.end = end;
+            this.start = start;
+            this.end = end;
         }
+
         public void add(Interval col) {
-            if(col.start<start)
+            if (col.start < start) start = col.start;
-                start = col.start;
+            if (col.end > end) end = col.end;
-            if(col.end>end)
-                end = col.end;
         }
+
         public static void addTo(Interval x, LinkedList<Interval> columns) {
             int p = 0;
             Iterator<Interval> it = columns.iterator();
             // Find where x should go
-            while(it.hasNext()) {
+            while (it.hasNext()) {
                 Interval col = it.next();
-                if(x.end>=col.start) {
+                if (x.end >= col.start) {
-                    if(x.start<=col.end) { // overlaps
+                    if (x.start <= col.end) { // overlaps
                         x.add(col);
                         it.remove();
                     }
@@ -116,30 +104,26 @@ public class PDFTableStripper extends PDFTextStripper
                 }
                 ++p;
             }
-            while(it.hasNext()) {
+            while (it.hasNext()) {
                 Interval col = it.next();
-                if(x.start>col.end)
+                if (x.start > col.end) break;
-                    break;
                 x.add(col);
                 it.remove();
             }
             columns.add(p, x);
         }
-
     }
 
-
     /**
      * Instantiate a new PDFTableStripper object.
      *
      * @param document
      * @throws IOException If there is an error loading the properties.
      */
-    public PDFTableStripper() throws IOException
+    public PDFTableStripper() throws IOException {
-    {
         super.setShouldSeparateByBeads(false);
         regionStripper = new PDFTextStripperByArea();
-        regionStripper.setSortByPosition( true );
+        regionStripper.setSortByPosition(true);
     }
 
     /**
@@ -147,18 +131,15 @@ public class PDFTableStripper extends PDFTextStripper
      *
      * @param rect The rectangle area to retrieve the text from.
      */
-    public void setRegion(Rectangle2D rect )
+    public void setRegion(Rectangle2D rect) {
-    {
         regionArea = rect;
     }
 
-    public int getRows()
+    public int getRows() {
-    {
         return nRows;
     }
 
-    public int getColumns()
+    public int getColumns() {
-    {
         return nCols;
     }
 
@@ -167,13 +148,11 @@ public class PDFTableStripper extends PDFTextStripper
      *
      * @return The text that was identified in that region.
      */
-    public String getText(int row, int col)
+    public String getText(int row, int col) {
-    {
+        return regionStripper.getTextForRegion("el" + col + "x" + row);
-        return regionStripper.getTextForRegion("el"+col+"x"+row);
     }
 
-    public void extractTable(PDPage pdPage) throws IOException
+    public void extractTable(PDPage pdPage) throws IOException {
-    {
         setStartPage(getCurrentPageNo());
         setEndPage(getCurrentPageNo());
 
@@ -186,11 +165,9 @@ public class PDFTableStripper extends PDFTextStripper
         // page may be rotated
         rotateAT = new AffineTransform();
         int rotation = pdPage.getRotation();
-        if (rotation != 0)
+        if (rotation != 0) {
-        {
             PDRectangle mediaBox = pdPage.getMediaBox();
-            switch (rotation)
+            switch (rotation) {
-            {
                 case 90:
                     rotateAT.translate(mediaBox.getHeight(), 0);
                     break;
@@ -213,11 +190,12 @@ public class PDFTableStripper extends PDFTextStripper
 
         Rectangle2D[][] regions = calculateTableRegions();
 
-//        System.err.println("Drawing " + nCols + "x" + nRows + "="+ nRows*nCols + " regions");
+        //        System.err.println("Drawing " + nCols + "x" + nRows + "="+ nRows*nCols + "
-        for(int i=0; i<nCols; ++i) {
+        // regions");
-            for(int j=0; j<nRows; ++j) {
+        for (int i = 0; i < nCols; ++i) {
+            for (int j = 0; j < nRows; ++j) {
                 final Rectangle2D region = regions[i][j];
-                regionStripper.addRegion("el"+i+"x"+j, region);
+                regionStripper.addRegion("el" + i + "x" + j, region);
             }
         }
 
@@ -227,8 +205,8 @@ public class PDFTableStripper extends PDFTextStripper
     /**
      * Infer a rectangular grid of regions from the boxes field.
      *
-     * @return 2D array of table regions (as Rectangle2D objects). Note that
+     * @return 2D array of table regions (as Rectangle2D objects). Note that some of these regions
-     * some of these regions may have no content.
+     *     may have no content.
      */
     private Rectangle2D[][] calculateTableRegions() {
 
@@ -238,7 +216,7 @@ public class PDFTableStripper extends PDFTextStripper
         LinkedList<Interval> columns = new LinkedList<Interval>();
         LinkedList<Interval> rows = new LinkedList<Interval>();
 
-        for(Rectangle2D box: boxes) {
+        for (Rectangle2D box : boxes) {
             Interval x = new Interval(box.getMinX(), box.getMaxX());
             Interval y = new Interval(box.getMinY(), box.getMaxY());
 
@@ -249,12 +227,17 @@ public class PDFTableStripper extends PDFTextStripper
         nRows = rows.size();
         nCols = columns.size();
         Rectangle2D[][] regions = new Rectangle2D[nCols][nRows];
-        int i=0;
+        int i = 0;
         // Label regions from top left, rather than the transformed orientation
-        for(Interval column: columns) {
+        for (Interval column : columns) {
-            int j=0;
+            int j = 0;
-            for(Interval row: rows) {
+            for (Interval row : rows) {
-                regions[nCols-i-1][nRows-j-1] = new Rectangle2D.Double(column.start, row.start, column.end - column.start, row.end - row.start);
+                regions[nCols - i - 1][nRows - j - 1] =
+                        new Rectangle2D.Double(
+                                column.start,
+                                row.start,
+                                column.end - column.start,
+                                row.end - row.start);
                 ++j;
             }
             ++i;
@@ -264,18 +247,15 @@ public class PDFTableStripper extends PDFTextStripper
     }
 
     /**
-     * Register each character's bounding box, updating boxes field to maintain
+     * Register each character's bounding box, updating boxes field to maintain a list of all
-     * a list of all distinct groups of characters.
+     * distinct groups of characters.
      *
-     * Overrides the default functionality of PDFTextStripper.
+     * <p>Overrides the default functionality of PDFTextStripper. Most of this is taken from
-     * Most of this is taken from DrawPrintTextLocations.java, with extra steps
+     * DrawPrintTextLocations.java, with extra steps at end of main loop
-     * at end of main loop
      */
     @Override
-    protected void writeString(String string, List<TextPosition> textPositions) throws IOException
+    protected void writeString(String string, List<TextPosition> textPositions) throws IOException {
-    {
+        for (TextPosition text : textPositions) {
-        for (TextPosition text : textPositions)
-        {
             // glyph space -> user space
             // note: text.getTextMatrix() is *not* the Text Matrix, it's the Text Rendering Matrix
             AffineTransform at = text.getTextMatrix().createAffineTransform();
@@ -283,37 +263,35 @@ public class PDFTableStripper extends PDFTextStripper
             BoundingBox bbox = font.getBoundingBox();
 
             // advance width, bbox height (glyph space)
-            float xadvance = font.getWidth(text.getCharacterCodes()[0]); // todo: should iterate all chars
+            float xadvance =
-            Rectangle2D.Float rect = new Rectangle2D.Float(0, bbox.getLowerLeftY(), xadvance, bbox.getHeight());
+                    font.getWidth(text.getCharacterCodes()[0]); // todo: should iterate all chars
+            Rectangle2D.Float rect =
+                    new Rectangle2D.Float(0, bbox.getLowerLeftY(), xadvance, bbox.getHeight());
 
-            if (font instanceof PDType3Font)
+            if (font instanceof PDType3Font) {
-            {
                 // bbox and font matrix are unscaled
                 at.concatenate(font.getFontMatrix().createAffineTransform());
-            }
+            } else {
-            else
-            {
                 // bbox and font matrix are already scaled to 1000
-                at.scale(1/1000f, 1/1000f);
+                at.scale(1 / 1000f, 1 / 1000f);
             }
             Shape s = at.createTransformedShape(rect);
             s = flipAT.createTransformedShape(s);
             s = rotateAT.createTransformedShape(s);
 
-
             //
             // Merge character's bounding box with boxes field
             //
             Rectangle2D bounds = s.getBounds2D();
             // Pad sides to detect almost touching boxes
             Rectangle2D hitbox = bounds.getBounds2D();
-            hitbox.add(bounds.getMinX() - dx , bounds.getMinY() - dy);
+            hitbox.add(bounds.getMinX() - dx, bounds.getMinY() - dy);
-            hitbox.add(bounds.getMaxX() + dx , bounds.getMaxY() + dy);
+            hitbox.add(bounds.getMaxX() + dx, bounds.getMaxY() + dy);
 
             // Find all overlapping boxes
             List<Rectangle2D> intersectList = new ArrayList<Rectangle2D>();
-            for(Rectangle2D box: boxes) {
+            for (Rectangle2D box : boxes) {
-                if(box.intersects(hitbox)) {
+                if (box.intersects(hitbox)) {
                     intersectList.add(box);
                 }
             }
@@ -321,38 +299,30 @@ public class PDFTableStripper extends PDFTextStripper
             // Combine all touching boxes and update
             // (NOTE: Potentially this could leave some overlapping boxes un-merged,
             // but it's sufficient for now and get's fixed up in calculateTableRegions)
-            for(Rectangle2D box: intersectList) {
+            for (Rectangle2D box : intersectList) {
                 bounds.add(box);
                 boxes.remove(box);
             }
             boxes.add(bounds);
-
         }
-
     }
 
     /**
-     * This method does nothing in this derived class, because beads and regions are incompatible. Beads are
+     * This method does nothing in this derived class, because beads and regions are incompatible.
-     * ignored when stripping by area.
+     * Beads are ignored when stripping by area.
      *
      * @param aShouldSeparateByBeads The new grouping of beads.
      */
     @Override
-    public final void setShouldSeparateByBeads(boolean aShouldSeparateByBeads)
+    public final void setShouldSeparateByBeads(boolean aShouldSeparateByBeads) {}
-    {
-    }
 
-    /**
+    /** Adapted from PDFTextStripperByArea {@inheritDoc} */
-     * Adapted from PDFTextStripperByArea
-     * {@inheritDoc}
-     */
     @Override
-    protected void processTextPosition( TextPosition text )
+    protected void processTextPosition(TextPosition text) {
-    {
+        if (regionArea != null && !regionArea.contains(text.getX(), text.getY())) {
-        if(regionArea!=null && !regionArea.contains( text.getX(), text.getY() ) ) {
             // skip character
         } else {
-            super.processTextPosition( text );
+            super.processTextPosition(text);
         }
     }
 }

src/main/java/stirling/software/SPDF/controller/web/AccountWebController.java

@@ -1,4 +1,5 @@
 package stirling.software.SPDF.controller.web;
+
 import java.util.Iterator;
 import java.util.List;
 import java.util.Optional;
@@ -15,138 +16,140 @@ import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 
 import io.swagger.v3.oas.annotations.tags.Tag;
+
 import jakarta.servlet.http.HttpServletRequest;
 import stirling.software.SPDF.model.Authority;
 import stirling.software.SPDF.model.Role;
 import stirling.software.SPDF.model.User;
 import stirling.software.SPDF.repository.UserRepository;
+
 @Controller
 @Tag(name = "Account Security", description = "Account Security APIs")
 public class AccountWebController {
 
-
+    @GetMapping("/login")
-	@GetMapping("/login")
+    public String login(HttpServletRequest request, Model model, Authentication authentication) {
-	public String login(HttpServletRequest request, Model model, Authentication authentication) {
+        if (authentication != null && authentication.isAuthenticated()) {
-		if (authentication != null && authentication.isAuthenticated()) {
             return "redirect:/";
         }
 
-		if (request.getParameter("error") != null) {
+        if (request.getParameter("error") != null) {
 
-	        model.addAttribute("error", request.getParameter("error"));
+            model.addAttribute("error", request.getParameter("error"));
-	    }
+        }
-	    if (request.getParameter("logout") != null) {
+        if (request.getParameter("logout") != null) {
 
-	        model.addAttribute("logoutMessage", "You have been logged out.");
+            model.addAttribute("logoutMessage", "You have been logged out.");
-	    }
+        }
 
-	    return "login";
+        return "login";
-	}
+    }
-	@Autowired
-	private UserRepository userRepository;  // Assuming you have a repository for user operations
 
+    @Autowired
+    private UserRepository userRepository; // Assuming you have a repository for user operations
 
-	@PreAuthorize("hasRole('ROLE_ADMIN')")
+    @PreAuthorize("hasRole('ROLE_ADMIN')")
-	@GetMapping("/addUsers")
+    @GetMapping("/addUsers")
-	public String showAddUserForm(Model model,  Authentication authentication) {
+    public String showAddUserForm(Model model, Authentication authentication) {
-		List<User> allUsers = userRepository.findAll();
+        List<User> allUsers = userRepository.findAll();
-		Iterator<User> iterator = allUsers.iterator();
+        Iterator<User> iterator = allUsers.iterator();
 
-		while(iterator.hasNext()) {
+        while (iterator.hasNext()) {
-		    User user = iterator.next();
+            User user = iterator.next();
-		    if(user != null) {
+            if (user != null) {
-		    	 for (Authority authority : user.getAuthorities()) {
+                for (Authority authority : user.getAuthorities()) {
-		             if (authority.getAuthority().equals(Role.INTERNAL_API_USER.getRoleId())) {
+                    if (authority.getAuthority().equals(Role.INTERNAL_API_USER.getRoleId())) {
-		                 iterator.remove();
+                        iterator.remove();
-		                 break; // Break out of the inner loop once the user is removed
+                        break; // Break out of the inner loop once the user is removed
-		             }
+                    }
-		         }
+                }
-		    }
+            }
-		}
+        }
 
-	    model.addAttribute("users", allUsers);
+        model.addAttribute("users", allUsers);
-	    model.addAttribute("currentUsername", authentication.getName());
+        model.addAttribute("currentUsername", authentication.getName());
-	    return "addUsers";
+        return "addUsers";
-	}
+    }
 
-	
+    @PreAuthorize("!hasAuthority('ROLE_DEMO_USER')")
-	@PreAuthorize("!hasAuthority('ROLE_DEMO_USER')")
+    @GetMapping("/account")
-	@GetMapping("/account")
+    public String account(HttpServletRequest request, Model model, Authentication authentication) {
-	public String account(HttpServletRequest request, Model model, Authentication authentication) {
+        if (authentication == null || !authentication.isAuthenticated()) {
-		if (authentication == null || !authentication.isAuthenticated()) {
             return "redirect:/";
         }
-		if (authentication != null && authentication.isAuthenticated()) {
+        if (authentication != null && authentication.isAuthenticated()) {
-	        Object principal = authentication.getPrincipal();
+            Object principal = authentication.getPrincipal();
 
-	        if (principal instanceof UserDetails) {
+            if (principal instanceof UserDetails) {
-	            // Cast the principal object to UserDetails
+                // Cast the principal object to UserDetails
-	            UserDetails userDetails = (UserDetails) principal;
+                UserDetails userDetails = (UserDetails) principal;
 
-	            // Retrieve username and other attributes
+                // Retrieve username and other attributes
-	            String username = userDetails.getUsername();
+                String username = userDetails.getUsername();
 
-	            // Fetch user details from the database
+                // Fetch user details from the database
-	            Optional<User> user = userRepository.findByUsername(username);  // Assuming findByUsername method exists
+                Optional<User> user =
-	            if (!user.isPresent()) {
+                        userRepository.findByUsername(
-	                // Handle error appropriately
+                                username); // Assuming findByUsername method exists
-	                return "redirect:/error";  // Example redirection in case of error
+                if (!user.isPresent()) {
-	            }
+                    // Handle error appropriately
+                    return "redirect:/error"; // Example redirection in case of error
+                }
 
-	            // Convert settings map to JSON string
+                // Convert settings map to JSON string
-	            ObjectMapper objectMapper = new ObjectMapper();
+                ObjectMapper objectMapper = new ObjectMapper();
-	            String settingsJson;
+                String settingsJson;
-	            try {
+                try {
-	                settingsJson = objectMapper.writeValueAsString(user.get().getSettings());
+                    settingsJson = objectMapper.writeValueAsString(user.get().getSettings());
-	            } catch (JsonProcessingException e) {
+                } catch (JsonProcessingException e) {
-	                // Handle JSON conversion error
+                    // Handle JSON conversion error
-	                e.printStackTrace();
+                    e.printStackTrace();
-	                return "redirect:/error";  // Example redirection in case of error
+                    return "redirect:/error"; // Example redirection in case of error
-	            }
+                }
 
-	            // Add attributes to the model
+                // Add attributes to the model
-	            model.addAttribute("username", username);
+                model.addAttribute("username", username);
-	            model.addAttribute("role", user.get().getRolesAsString());
+                model.addAttribute("role", user.get().getRolesAsString());
-	            model.addAttribute("settings", settingsJson);
+                model.addAttribute("settings", settingsJson);
-	            model.addAttribute("changeCredsFlag", user.get().isFirstLogin());
+                model.addAttribute("changeCredsFlag", user.get().isFirstLogin());
-	        }
+            }
-		} else {
+        } else {
-	        	return "redirect:/";
-	        }
-	    return "account";
-	}
-	 
-	
-	@PreAuthorize("!hasAuthority('ROLE_DEMO_USER')")
-	@GetMapping("/change-creds")
-	public String changeCreds(HttpServletRequest request, Model model, Authentication authentication) {
-		if (authentication == null || !authentication.isAuthenticated()) {
             return "redirect:/";
         }
-		if (authentication != null && authentication.isAuthenticated()) {
+        return "account";
-	        Object principal = authentication.getPrincipal();
+    }
 
-	        if (principal instanceof UserDetails) {
+    @PreAuthorize("!hasAuthority('ROLE_DEMO_USER')")
-	            // Cast the principal object to UserDetails
+    @GetMapping("/change-creds")
-	            UserDetails userDetails = (UserDetails) principal;
+    public String changeCreds(
+            HttpServletRequest request, Model model, Authentication authentication) {
+        if (authentication == null || !authentication.isAuthenticated()) {
+            return "redirect:/";
+        }
+        if (authentication != null && authentication.isAuthenticated()) {
+            Object principal = authentication.getPrincipal();
 
-	            // Retrieve username and other attributes
+            if (principal instanceof UserDetails) {
-	            String username = userDetails.getUsername();
+                // Cast the principal object to UserDetails
-
+                UserDetails userDetails = (UserDetails) principal;
-	            // Fetch user details from the database
-	            Optional<User> user = userRepository.findByUsername(username);  // Assuming findByUsername method exists
-	            if (!user.isPresent()) {
-	                // Handle error appropriately
-	                return "redirect:/error";  // Example redirection in case of error
-	            }
-	            // Add attributes to the model
-	            model.addAttribute("username", username);
-	        }
-		} else {
-	        	return "redirect:/";
-	        }
-	    return "change-creds";
-	}
 
+                // Retrieve username and other attributes
+                String username = userDetails.getUsername();
 
+                // Fetch user details from the database
+                Optional<User> user =
+                        userRepository.findByUsername(
+                                username); // Assuming findByUsername method exists
+                if (!user.isPresent()) {
+                    // Handle error appropriately
+                    return "redirect:/error"; // Example redirection in case of error
+                }
+                // Add attributes to the model
+                model.addAttribute("username", username);
+            }
+        } else {
+            return "redirect:/";
+        }
+        return "change-creds";
+    }
 }

src/main/java/stirling/software/SPDF/controller/web/ConverterWebController.java

@@ -25,6 +25,7 @@ public class ConverterWebController {
         model.addAttribute("currentPage", "html-to-pdf");
         return "convert/html-to-pdf";
     }
+
     @GetMapping("/markdown-to-pdf")
     @Hidden
     public String convertMarkdownToPdfForm(Model model) {
@@ -32,7 +33,6 @@ public class ConverterWebController {
         return "convert/markdown-to-pdf";
     }
 
-    
     @GetMapping("/url-to-pdf")
     @Hidden
     public String convertURLToPdfForm(Model model) {
@@ -40,7 +40,6 @@ public class ConverterWebController {
         return "convert/url-to-pdf";
     }
 
-    
     @GetMapping("/pdf-to-img")
     @Hidden
     public String pdfToimgForm(Model model) {
@@ -55,9 +54,7 @@ public class ConverterWebController {
         return "convert/file-to-pdf";
     }
 
-
+    // PDF TO......
-    
-    //PDF TO......
 
     @GetMapping("/pdf-to-html")
     @Hidden
@@ -107,7 +104,6 @@ public class ConverterWebController {
         return modelAndView;
     }
 
-
     @GetMapping("/pdf-to-pdfa")
     @Hidden
     public String pdfToPdfAForm(Model model) {

src/main/java/stirling/software/SPDF/controller/web/GeneralWebController.java

@@ -33,61 +33,62 @@ import io.swagger.v3.oas.annotations.tags.Tag;
 @Tag(name = "General", description = "General APIs")
 public class GeneralWebController {
 
+    @GetMapping("/pipeline")
+    @Hidden
+    public String pipelineForm(Model model) {
+        model.addAttribute("currentPage", "pipeline");
 
+        List<String> pipelineConfigs = new ArrayList<>();
+        List<Map<String, String>> pipelineConfigsWithNames = new ArrayList<>();
 
+        if (new File("./pipeline/defaultWebUIConfigs/").exists()) {
+            try (Stream<Path> paths = Files.walk(Paths.get("./pipeline/defaultWebUIConfigs/"))) {
+                List<Path> jsonFiles =
+                        paths.filter(Files::isRegularFile)
+                                .filter(p -> p.toString().endsWith(".json"))
+                                .collect(Collectors.toList());
 
-	@GetMapping("/pipeline")
+                for (Path jsonFile : jsonFiles) {
-	@Hidden
+                    String content = Files.readString(jsonFile, StandardCharsets.UTF_8);
-	public String pipelineForm(Model model) {
+                    pipelineConfigs.add(content);
-	    model.addAttribute("currentPage", "pipeline");
+                }
 
-	    List<String> pipelineConfigs = new ArrayList<>();
+                for (String config : pipelineConfigs) {
-	    List<Map<String, String>> pipelineConfigsWithNames = new ArrayList<>();
+                    Map<String, Object> jsonContent =
+                            new ObjectMapper()
+                                    .readValue(config, new TypeReference<Map<String, Object>>() {});
 
-	    if(new File("./pipeline/defaultWebUIConfigs/").exists()) {
+                    String name = (String) jsonContent.get("name");
-		    try (Stream<Path> paths = Files.walk(Paths.get("./pipeline/defaultWebUIConfigs/"))) {
+                    if (name == null || name.length() < 1) {
-		        List<Path> jsonFiles = paths
+                        String filename =
-		            .filter(Files::isRegularFile)
+                                jsonFiles
-		            .filter(p -> p.toString().endsWith(".json"))
+                                        .get(pipelineConfigs.indexOf(config))
-		            .collect(Collectors.toList());
+                                        .getFileName()
-	
+                                        .toString();
-		        for (Path jsonFile : jsonFiles) {
+                        name = filename.substring(0, filename.lastIndexOf('.'));
-		            String content = Files.readString(jsonFile, StandardCharsets.UTF_8);
+                    }
-		            pipelineConfigs.add(content);
+                    Map<String, String> configWithName = new HashMap<>();
-		        }
+                    configWithName.put("json", config);
-		        
+                    configWithName.put("name", name);
-		        for (String config : pipelineConfigs) {
+                    pipelineConfigsWithNames.add(configWithName);
-		        	Map<String, Object> jsonContent = new ObjectMapper().readValue(config, new TypeReference<Map<String, Object>>(){});
+                }
-	
-		            String name = (String) jsonContent.get("name");
-		            Map<String, String> configWithName = new HashMap<>();
-		            configWithName.put("json", config);
-		            configWithName.put("name", name);
-		            pipelineConfigsWithNames.add(configWithName);
-		        }
-		        
-		        
-		        
-	
-		    } catch (IOException e) {
-		        e.printStackTrace();
-		    }
-		}
-	    if(pipelineConfigsWithNames.size() == 0) {
-	    	 Map<String, String> configWithName = new HashMap<>();
-	            configWithName.put("json", "");
-	            configWithName.put("name", "No preloaded configs found");
-	            pipelineConfigsWithNames.add(configWithName);
-	    }
-	    model.addAttribute("pipelineConfigsWithNames", pipelineConfigsWithNames);
-
-	    model.addAttribute("pipelineConfigs", pipelineConfigs);
-
-	    return "pipeline";
-	}
 
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+        }
+        if (pipelineConfigsWithNames.size() == 0) {
+            Map<String, String> configWithName = new HashMap<>();
+            configWithName.put("json", "");
+            configWithName.put("name", "No preloaded configs found");
+            pipelineConfigsWithNames.add(configWithName);
+        }
+        model.addAttribute("pipelineConfigsWithNames", pipelineConfigsWithNames);
 
+        model.addAttribute("pipelineConfigs", pipelineConfigs);
 
+        return "pipeline";
+    }
 
     @GetMapping("/merge-pdfs")
     @Hidden
@@ -117,7 +118,6 @@ public class GeneralWebController {
         return "multi-tool";
     }
 
-    
     @GetMapping("/remove-pages")
     @Hidden
     public String pageDeleter(Model model) {
@@ -175,7 +175,6 @@ public class GeneralWebController {
         return "multi-page-layout";
     }
 
-    
     @GetMapping("/scale-pages")
     @Hidden
     public String scalePagesFrom(Model model) {
@@ -183,7 +182,6 @@ public class GeneralWebController {
         return "scale-pages";
     }
 
-
     @GetMapping("/split-by-size-or-count")
     @Hidden
     public String splitBySizeOrCount(Model model) {
@@ -198,9 +196,7 @@ public class GeneralWebController {
         return "overlay-pdf";
     }
 
-    
+    @Autowired private ResourceLoader resourceLoader;
-    @Autowired
-    private ResourceLoader resourceLoader;
 
     private List<FontResource> getFontNames() {
         List<FontResource> fontNames = new ArrayList<>();
@@ -216,25 +212,27 @@ public class GeneralWebController {
 
     private List<FontResource> getFontNamesFromLocation(String locationPattern) {
         try {
-            Resource[] resources = ResourcePatternUtils.getResourcePatternResolver(resourceLoader)
+            Resource[] resources =
-                    .getResources(locationPattern);
+                    ResourcePatternUtils.getResourcePatternResolver(resourceLoader)
+                            .getResources(locationPattern);
             return Arrays.stream(resources)
-                    .map(resource -> {
+                    .map(
-                        try {
+                            resource -> {
-                            String filename = resource.getFilename();
+                                try {
-                            if (filename != null) {
+                                    String filename = resource.getFilename();
-                                int lastDotIndex = filename.lastIndexOf('.');
+                                    if (filename != null) {
-                                if (lastDotIndex != -1) {
+                                        int lastDotIndex = filename.lastIndexOf('.');
-                                    String name = filename.substring(0, lastDotIndex);
+                                        if (lastDotIndex != -1) {
-                                    String extension = filename.substring(lastDotIndex + 1);
+                                            String name = filename.substring(0, lastDotIndex);
-                                    return new FontResource(name, extension);
+                                            String extension = filename.substring(lastDotIndex + 1);
+                                            return new FontResource(name, extension);
+                                        }
+                                    }
+                                    return null;
+                                } catch (Exception e) {
+                                    throw new RuntimeException("Error processing filename", e);
                                 }
-                            }
+                            })
-                            return null;
-                        } catch (Exception e) {
-                            throw new RuntimeException("Error processing filename", e);
-                        }
-                    })
                     .filter(Objects::nonNull)
                     .collect(Collectors.toList());
         } catch (Exception e) {
@@ -242,57 +240,59 @@ public class GeneralWebController {
         }
     }
 
-
     public String getFormatFromExtension(String extension) {
         switch (extension) {
-            case "ttf": return "truetype";
+            case "ttf":
-            case "woff": return "woff";
+                return "truetype";
-            case "woff2": return "woff2";
+            case "woff":
-            case "eot": return "embedded-opentype";
+                return "woff";
-            case "svg": return "svg";
+            case "woff2":
-            default: return ""; // or throw an exception if an unexpected extension is encountered
+                return "woff2";
+            case "eot":
+                return "embedded-opentype";
+            case "svg":
+                return "svg";
+            default:
+                return ""; // or throw an exception if an unexpected extension is encountered
         }
     }
 
-    
     public class FontResource {
         private String name;
         private String extension;
         private String type;
+
         public FontResource(String name, String extension) {
             this.name = name;
             this.extension = extension;
             this.type = getFormatFromExtension(extension);
         }
 
-		public String getName() {
+        public String getName() {
-			return name;
+            return name;
-		}
+        }
 
-		public void setName(String name) {
+        public void setName(String name) {
-			this.name = name;
+            this.name = name;
-		}
+        }
 
-		public String getExtension() {
+        public String getExtension() {
-			return extension;
+            return extension;
-		}
+        }
 
-		public void setExtension(String extension) {
+        public void setExtension(String extension) {
-			this.extension = extension;
+            this.extension = extension;
-		}
+        }
-
-		public String getType() {
-			return type;
-		}
-
-		public void setType(String type) {
-			this.type = type;
-		}
 
+        public String getType() {
+            return type;
+        }
 
+        public void setType(String type) {
+            this.type = type;
+        }
     }
 
-
     @GetMapping("/crop")
     @Hidden
     public String cropForm(Model model) {
@@ -300,7 +300,6 @@ public class GeneralWebController {
         return "crop";
     }
 
-
     @GetMapping("/auto-split-pdf")
     @Hidden
     public String autoSPlitPDFForm(Model model) {

src/main/java/stirling/software/SPDF/controller/web/HomeWebController.java

@@ -8,6 +8,7 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 
 import io.swagger.v3.oas.annotations.Hidden;
+
 import stirling.software.SPDF.model.ApplicationProperties;
 
 @Controller
@@ -20,8 +21,6 @@ public class HomeWebController {
         return "about";
     }
 
-   
-    
     @GetMapping("/")
     public String home(Model model) {
         model.addAttribute("currentPage", "home");
@@ -33,20 +32,17 @@ public class HomeWebController {
         return "redirect:/";
     }
 
-    @Autowired
+    @Autowired ApplicationProperties applicationProperties;
-	ApplicationProperties applicationProperties;
-
 
     @GetMapping(value = "/robots.txt", produces = MediaType.TEXT_PLAIN_VALUE)
     @ResponseBody
     @Hidden
     public String getRobotsTxt() {
         Boolean allowGoogle = applicationProperties.getSystem().getGooglevisibility();
-    	if(Boolean.TRUE.equals(allowGoogle)) {
+        if (Boolean.TRUE.equals(allowGoogle)) {
             return "User-agent: Googlebot\nAllow: /\n\nUser-agent: *\nAllow: /";
         } else {
             return "User-agent: Googlebot\nDisallow: /\n\nUser-agent: *\nDisallow: /";
         }
     }
-    
 }

src/main/java/stirling/software/SPDF/controller/web/MetricsController.java

@@ -1,4 +1,5 @@
 package stirling.software.SPDF.controller.web;
+
 import java.time.Duration;
 import java.time.LocalDateTime;
 import java.util.Comparator;
@@ -22,6 +23,7 @@ import io.micrometer.core.instrument.MeterRegistry;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
+
 import jakarta.annotation.PostConstruct;
 import stirling.software.SPDF.config.StartupApplicationListener;
 import stirling.software.SPDF.model.ApplicationProperties;
@@ -31,10 +33,7 @@ import stirling.software.SPDF.model.ApplicationProperties;
 @Tag(name = "Info", description = "Info APIs")
 public class MetricsController {
 
-	
+    @Autowired ApplicationProperties applicationProperties;
-	@Autowired
-	ApplicationProperties applicationProperties;
-	
 
     private final MeterRegistry meterRegistry;
 
@@ -42,9 +41,8 @@ public class MetricsController {
 
     @PostConstruct
     public void init() {
-    	Boolean metricsEnabled = applicationProperties.getMetrics().getEnabled();
+        Boolean metricsEnabled = applicationProperties.getMetrics().getEnabled();
-    	if(metricsEnabled == null)
+        if (metricsEnabled == null) metricsEnabled = true;
-    		metricsEnabled = true;
         this.metricsEnabled = metricsEnabled;
     }
 
@@ -53,8 +51,10 @@ public class MetricsController {
     }
 
     @GetMapping("/status")
-    @Operation(summary = "Application status and version",
+    @Operation(
-            description = "This endpoint returns the status of the application and its version number.")
+            summary = "Application status and version",
+            description =
+                    "This endpoint returns the status of the application and its version number.")
     public ResponseEntity<?> getStatus() {
         if (!metricsEnabled) {
             return ResponseEntity.status(HttpStatus.FORBIDDEN).body("This endpoint is disabled.");
@@ -67,13 +67,17 @@ public class MetricsController {
     }
 
     @GetMapping("/loads")
-    @Operation(summary = "GET request count",
+    @Operation(
-            description = "This endpoint returns the total count of GET requests or the count of GET requests for a specific endpoint.")
+            summary = "GET request count",
-    public ResponseEntity<?> getPageLoads(@RequestParam(required = false,  name = "endpoint") @Parameter(description = "endpoint") Optional<String> endpoint) {
+            description =
-    	if (!metricsEnabled) {
+                    "This endpoint returns the total count of GET requests or the count of GET requests for a specific endpoint.")
+    public ResponseEntity<?> getPageLoads(
+            @RequestParam(required = false, name = "endpoint") @Parameter(description = "endpoint")
+                    Optional<String> endpoint) {
+        if (!metricsEnabled) {
             return ResponseEntity.status(HttpStatus.FORBIDDEN).body("This endpoint is disabled.");
         }
-    	try {
+        try {
 
             double count = 0.0;
 
@@ -82,21 +86,25 @@ public class MetricsController {
                     String method = meter.getId().getTag("method");
                     if (method != null && method.equals("GET")) {
 
-                    	if (endpoint.isPresent() && !endpoint.get().isBlank()) {
+                        if (endpoint.isPresent() && !endpoint.get().isBlank()) {
-                    		if(!endpoint.get().startsWith("/")) {
+                            if (!endpoint.get().startsWith("/")) {
-                    			endpoint =  Optional.of("/" + endpoint.get());
+                                endpoint = Optional.of("/" + endpoint.get());
-                    		}
+                            }
-                    		System.out.println("loads " + endpoint.get() +  " vs " + meter.getId().getTag("uri"));
+                            System.out.println(
-                    		if(endpoint.get().equals(meter.getId().getTag("uri"))){
+                                    "loads "
-                    			if (meter instanceof Counter) {
+                                            + endpoint.get()
-    	                            count += ((Counter) meter).count();
+                                            + " vs "
-    	                        }
+                                            + meter.getId().getTag("uri"));
-                    		}
+                            if (endpoint.get().equals(meter.getId().getTag("uri"))) {
-                    	} else {
+                                if (meter instanceof Counter) {
-	                        if (meter instanceof Counter) {
+                                    count += ((Counter) meter).count();
-	                            count += ((Counter) meter).count();
+                                }
-	                        }
+                            }
-                    	}
+                        } else {
+                            if (meter instanceof Counter) {
+                                count += ((Counter) meter).count();
+                            }
+                        }
                     }
                 }
             }
@@ -108,10 +116,11 @@ public class MetricsController {
     }
 
     @GetMapping("/loads/all")
-    @Operation(summary = "GET requests count for all endpoints",
+    @Operation(
+            summary = "GET requests count for all endpoints",
             description = "This endpoint returns the count of GET requests for each endpoint.")
     public ResponseEntity<?> getAllEndpointLoads() {
-    	if (!metricsEnabled) {
+        if (!metricsEnabled) {
             return ResponseEntity.status(HttpStatus.FORBIDDEN).body("This endpoint is disabled.");
         }
         try {
@@ -133,10 +142,11 @@ public class MetricsController {
                 }
             }
 
-            List<EndpointCount> results = counts.entrySet().stream()
+            List<EndpointCount> results =
-                .map(entry -> new EndpointCount(entry.getKey(), entry.getValue()))
+                    counts.entrySet().stream()
-                .sorted(Comparator.comparing(EndpointCount::getCount).reversed())
+                            .map(entry -> new EndpointCount(entry.getKey(), entry.getValue()))
-                .collect(Collectors.toList());
+                            .sorted(Comparator.comparing(EndpointCount::getCount).reversed())
+                            .collect(Collectors.toList());
 
             return ResponseEntity.ok(results);
         } catch (Exception e) {
@@ -149,33 +159,39 @@ public class MetricsController {
         private double count;
 
         public EndpointCount(String endpoint, double count) {
-        	this.endpoint = endpoint;
+            this.endpoint = endpoint;
-        	this.count = count;
+            this.count = count;
         }
-		public String getEndpoint() {
-			return endpoint;
-		}
-		public void setEndpoint(String endpoint) {
-			this.endpoint = endpoint;
-		}
-		public double getCount() {
-			return count;
-		}
-		public void setCount(double count) {
-			this.count = count;
-		}
 
+        public String getEndpoint() {
+            return endpoint;
+        }
+
+        public void setEndpoint(String endpoint) {
+            this.endpoint = endpoint;
+        }
+
+        public double getCount() {
+            return count;
+        }
+
+        public void setCount(double count) {
+            this.count = count;
+        }
     }
 
-
     @GetMapping("/requests")
-    @Operation(summary = "POST request count",
+    @Operation(
-            description = "This endpoint returns the total count of POST requests or the count of POST requests for a specific endpoint.")
+            summary = "POST request count",
-    public ResponseEntity<?> getTotalRequests(@RequestParam(required = false, name = "endpoint") @Parameter(description = "endpoint") Optional<String> endpoint) {
+            description =
-    	if (!metricsEnabled) {
+                    "This endpoint returns the total count of POST requests or the count of POST requests for a specific endpoint.")
+    public ResponseEntity<?> getTotalRequests(
+            @RequestParam(required = false, name = "endpoint") @Parameter(description = "endpoint")
+                    Optional<String> endpoint) {
+        if (!metricsEnabled) {
             return ResponseEntity.status(HttpStatus.FORBIDDEN).body("This endpoint is disabled.");
         }
-    	try {
+        try {
             double count = 0.0;
 
             for (Meter meter : meterRegistry.getMeters()) {
@@ -201,16 +217,16 @@ public class MetricsController {
             }
             return ResponseEntity.ok(count);
         } catch (Exception e) {
-        	return ResponseEntity.ok(-1);
+            return ResponseEntity.ok(-1);
         }
     }
 
-
     @GetMapping("/requests/all")
-    @Operation(summary = "POST requests count for all endpoints",
+    @Operation(
+            summary = "POST requests count for all endpoints",
             description = "This endpoint returns the count of POST requests for each endpoint.")
     public ResponseEntity<?> getAllPostRequests() {
-    	if (!metricsEnabled) {
+        if (!metricsEnabled) {
             return ResponseEntity.status(HttpStatus.FORBIDDEN).body("This endpoint is disabled.");
         }
         try {
@@ -232,10 +248,11 @@ public class MetricsController {
                 }
             }
 
-            List<EndpointCount> results = counts.entrySet().stream()
+            List<EndpointCount> results =
-                .map(entry -> new EndpointCount(entry.getKey(), entry.getValue()))
+                    counts.entrySet().stream()
-                .sorted(Comparator.comparing(EndpointCount::getCount).reversed())
+                            .map(entry -> new EndpointCount(entry.getKey(), entry.getValue()))
-                .collect(Collectors.toList());
+                            .sorted(Comparator.comparing(EndpointCount::getCount).reversed())
+                            .collect(Collectors.toList());
 
             return ResponseEntity.ok(results);
         } catch (Exception e) {
@@ -243,7 +260,6 @@ public class MetricsController {
         }
     }
 
-    
     @GetMapping("/uptime")
     public ResponseEntity<?> getUptime() {
         if (!metricsEnabled) {

src/main/java/stirling/software/SPDF/controller/web/OtherWebController.java

@@ -39,7 +39,6 @@ public class OtherWebController {
         return "misc/show-javascript";
     }
 
-    
     @GetMapping("/add-page-numbers")
     @Hidden
     public String addPageNumbersForm(Model model) {
@@ -61,8 +60,6 @@ public class OtherWebController {
         return "misc/flatten";
     }
 
-    
-
     @GetMapping("/change-metadata")
     @Hidden
     public String addWatermarkForm(Model model) {
@@ -83,8 +80,11 @@ public class OtherWebController {
         if (files == null) {
             return Collections.emptyList();
         }
-        return Arrays.stream(files).filter(file -> file.getName().endsWith(".traineddata")).map(file -> file.getName().replace(".traineddata", ""))
+        return Arrays.stream(files)
-                .filter(lang -> !lang.equalsIgnoreCase("osd")).collect(Collectors.toList());
+                .filter(file -> file.getName().endsWith(".traineddata"))
+                .map(file -> file.getName().replace(".traineddata", ""))
+                .filter(lang -> !lang.equalsIgnoreCase("osd"))
+                .collect(Collectors.toList());
     }
 
     @GetMapping("/ocr-pdf")
@@ -98,7 +98,6 @@ public class OtherWebController {
         return modelAndView;
     }
 
-    
     @GetMapping("/add-image")
     @Hidden
     public String overlayImage(Model model) {
@@ -147,7 +146,4 @@ public class OtherWebController {
         model.addAttribute("currentPage", "auto-rename");
         return "misc/auto-rename";
     }
-    
-
-    
 }

src/main/java/stirling/software/SPDF/controller/web/SecurityWebController.java

@@ -11,7 +11,7 @@ import io.swagger.v3.oas.annotations.tags.Tag;
 @Tag(name = "Security", description = "Security APIs")
 public class SecurityWebController {
 
-	@GetMapping("/auto-redact")
+    @GetMapping("/auto-redact")
     @Hidden
     public String autoRedactForm(Model model) {
         model.addAttribute("currentPage", "auto-redact");
@@ -24,6 +24,7 @@ public class SecurityWebController {
         model.addAttribute("currentPage", "add-password");
         return "security/add-password";
     }
+
     @GetMapping("/change-permissions")
     @Hidden
     public String permissionsForm(Model model) {

src/main/java/stirling/software/SPDF/model/ApiEndpoint.java

@@ -13,10 +13,12 @@ public class ApiEndpoint {
     public ApiEndpoint(String name, JsonNode postNode) {
         this.name = name;
         this.parameters = new HashMap<>();
-        postNode.path("parameters").forEach(paramNode -> {
+        postNode.path("parameters")
-            String paramName = paramNode.path("name").asText();
+                .forEach(
-            parameters.put(paramName, paramNode);
+                        paramNode -> {
-        });
+                            String paramName = paramNode.path("name").asText();
+                            parameters.put(paramName, paramNode);
+                        });
         this.description = postNode.path("description").asText();
     }
 
@@ -33,10 +35,8 @@ public class ApiEndpoint {
         return description;
     }
 
-	@Override
+    @Override
-	public String toString() {
+    public String toString() {
-		return "ApiEndpoint [name=" + name + ", parameters=" + parameters + "]";
+        return "ApiEndpoint [name=" + name + ", parameters=" + parameters + "]";
-	}
+    }
-    
-    
 }

src/main/java/stirling/software/SPDF/model/ApiKeyAuthenticationToken.java

@@ -1,4 +1,5 @@
 package stirling.software.SPDF.model;
+
 import java.util.Collection;
 
 import org.springframework.security.authentication.AbstractAuthenticationToken;
@@ -16,9 +17,10 @@ public class ApiKeyAuthenticationToken extends AbstractAuthenticationToken {
         setAuthenticated(false);
     }
 
-    public ApiKeyAuthenticationToken(Object principal, String apiKey, Collection<? extends GrantedAuthority> authorities) {
+    public ApiKeyAuthenticationToken(
+            Object principal, String apiKey, Collection<? extends GrantedAuthority> authorities) {
         super(authorities);
-        this.principal = principal;  // principal can be a UserDetails object
+        this.principal = principal; // principal can be a UserDetails object
         this.credentials = apiKey;
         super.setAuthenticated(true); // this authentication is trusted
     }
@@ -36,7 +38,8 @@ public class ApiKeyAuthenticationToken extends AbstractAuthenticationToken {
     @Override
     public void setAuthenticated(boolean isAuthenticated) throws IllegalArgumentException {
         if (isAuthenticated) {
-            throw new IllegalArgumentException("Cannot set this token to trusted. Use constructor which takes a GrantedAuthority list instead.");
+            throw new IllegalArgumentException(
+                    "Cannot set this token to trusted. Use constructor which takes a GrantedAuthority list instead.");
         }
         super.setAuthenticated(false);
     }

src/main/java/stirling/software/SPDF/model/ApplicationProperties.java

@@ -12,357 +12,376 @@ import stirling.software.SPDF.config.YamlPropertySourceFactory;
 @ConfigurationProperties(prefix = "")
 @PropertySource(value = "file:./configs/settings.yml", factory = YamlPropertySourceFactory.class)
 public class ApplicationProperties {
-	private Security security;
+    private Security security;
-	private System system;
+    private System system;
-	private Ui ui;
+    private Ui ui;
-	private Endpoints endpoints;
+    private Endpoints endpoints;
-	private Metrics metrics;
+    private Metrics metrics;
-	private AutomaticallyGenerated automaticallyGenerated;
+    private AutomaticallyGenerated automaticallyGenerated;
-	private AutoPipeline autoPipeline;
+    private AutoPipeline autoPipeline;
-
+
-	public AutoPipeline getAutoPipeline() {
+    public AutoPipeline getAutoPipeline() {
-		return autoPipeline != null ? autoPipeline : new AutoPipeline();
+        return autoPipeline != null ? autoPipeline : new AutoPipeline();
-	}
+    }
-
+
-	public void setAutoPipeline(AutoPipeline autoPipeline) {
+    public void setAutoPipeline(AutoPipeline autoPipeline) {
-		this.autoPipeline = autoPipeline;
+        this.autoPipeline = autoPipeline;
-	}
+    }
-
+
-	public Security getSecurity() {
+    public Security getSecurity() {
-		return security != null ? security : new Security();
+        return security != null ? security : new Security();
-	}
+    }
-
+
-	public void setSecurity(Security security) {
+    public void setSecurity(Security security) {
-		this.security = security;
+        this.security = security;
-	}
+    }
-
+
-	public System getSystem() {
+    public System getSystem() {
-		return system != null ? system : new System();
+        return system != null ? system : new System();
-	}
+    }
-
+
-	public void setSystem(System system) {
+    public void setSystem(System system) {
-		this.system = system;
+        this.system = system;
-	}
+    }
-
+
-	public Ui getUi() {
+    public Ui getUi() {
-		return ui != null ? ui : new Ui();
+        return ui != null ? ui : new Ui();
-	}
+    }
-
+
-	public void setUi(Ui ui) {
+    public void setUi(Ui ui) {
-		this.ui = ui;
+        this.ui = ui;
-	}
+    }
-
+
-	public Endpoints getEndpoints() {
+    public Endpoints getEndpoints() {
-		return endpoints != null ? endpoints : new Endpoints();
+        return endpoints != null ? endpoints : new Endpoints();
-	}
+    }
-
+
-	public void setEndpoints(Endpoints endpoints) {
+    public void setEndpoints(Endpoints endpoints) {
-		this.endpoints = endpoints;
+        this.endpoints = endpoints;
-	}
+    }
-
+
-	public Metrics getMetrics() {
+    public Metrics getMetrics() {
-		return metrics != null ? metrics : new Metrics();
+        return metrics != null ? metrics : new Metrics();
-	}
+    }
-
+
-	public void setMetrics(Metrics metrics) {
+    public void setMetrics(Metrics metrics) {
-		this.metrics = metrics;
+        this.metrics = metrics;
-	}
+    }
-
+
-	public AutomaticallyGenerated getAutomaticallyGenerated() {
+    public AutomaticallyGenerated getAutomaticallyGenerated() {
-		return automaticallyGenerated != null ? automaticallyGenerated : new AutomaticallyGenerated();
+        return automaticallyGenerated != null
-	}
+                ? automaticallyGenerated
-
+                : new AutomaticallyGenerated();
-	public void setAutomaticallyGenerated(AutomaticallyGenerated automaticallyGenerated) {
+    }
-		this.automaticallyGenerated = automaticallyGenerated;
+
-	}
+    public void setAutomaticallyGenerated(AutomaticallyGenerated automaticallyGenerated) {
-
+        this.automaticallyGenerated = automaticallyGenerated;
-	@Override
+    }
-	public String toString() {
+
-		return "ApplicationProperties [security=" + security + ", system=" + system + ", ui=" + ui + ", endpoints="
+    @Override
-				+ endpoints + ", metrics=" + metrics + ", automaticallyGenerated=" + automaticallyGenerated
+    public String toString() {
-				+ ", autoPipeline=" + autoPipeline + "]";
+        return "ApplicationProperties [security="
-	}
+                + security
-
+                + ", system="
-	public static class AutoPipeline {
+                + system
-		private String outputFolder;
+                + ", ui="
-
+                + ui
-		public String getOutputFolder() {
+                + ", endpoints="
-			return outputFolder;
+                + endpoints
-		}
+                + ", metrics="
-
+                + metrics
-		public void setOutputFolder(String outputFolder) {
+                + ", automaticallyGenerated="
-			this.outputFolder = outputFolder;
+                + automaticallyGenerated
-		}
+                + ", autoPipeline="
-
+                + autoPipeline
-		@Override
+                + "]";
-		public String toString() {
+    }
-			return "AutoPipeline [outputFolder=" + outputFolder + "]";
+
-		}
+    public static class AutoPipeline {
-		
+        private String outputFolder;
-		
+
-		
+        public String getOutputFolder() {
-	}
+            return outputFolder;
-	public static class Security {
+        }
-		private Boolean enableLogin;
+
-		private Boolean csrfDisabled;
+        public void setOutputFolder(String outputFolder) {
-		private InitialLogin initialLogin;
+            this.outputFolder = outputFolder;
-		private int loginAttemptCount;
+        }
-		private long loginResetTimeMinutes;
+
-
+        @Override
-		
+        public String toString() {
-		public int getLoginAttemptCount() {
+            return "AutoPipeline [outputFolder=" + outputFolder + "]";
-			return loginAttemptCount;
+        }
-		}
+    }
-
+
-		public void setLoginAttemptCount(int loginAttemptCount) {
+    public static class Security {
-			this.loginAttemptCount = loginAttemptCount;
+        private Boolean enableLogin;
-		}
+        private Boolean csrfDisabled;
-
+        private InitialLogin initialLogin;
-		public long getLoginResetTimeMinutes() {
+        private int loginAttemptCount;
-			return loginResetTimeMinutes;
+        private long loginResetTimeMinutes;
-		}
+
-
+        public int getLoginAttemptCount() {
-		public void setLoginResetTimeMinutes(long loginResetTimeMinutes) {
+            return loginAttemptCount;
-			this.loginResetTimeMinutes = loginResetTimeMinutes;
+        }
-		}
+
-
+        public void setLoginAttemptCount(int loginAttemptCount) {
-		public InitialLogin getInitialLogin() {
+            this.loginAttemptCount = loginAttemptCount;
-			return initialLogin != null ? initialLogin : new InitialLogin();
+        }
-		}
+
-
+        public long getLoginResetTimeMinutes() {
-		public void setInitialLogin(InitialLogin initialLogin) {
+            return loginResetTimeMinutes;
-			this.initialLogin = initialLogin;
+        }
-		}
+
-		
+        public void setLoginResetTimeMinutes(long loginResetTimeMinutes) {
-		public Boolean getEnableLogin() {
+            this.loginResetTimeMinutes = loginResetTimeMinutes;
-			return enableLogin;
+        }
-		}
+
-
+        public InitialLogin getInitialLogin() {
-		public void setEnableLogin(Boolean enableLogin) {
+            return initialLogin != null ? initialLogin : new InitialLogin();
-			this.enableLogin = enableLogin;
+        }
-		}
+
-
+        public void setInitialLogin(InitialLogin initialLogin) {
-		public Boolean getCsrfDisabled() {
+            this.initialLogin = initialLogin;
-			return csrfDisabled;
+        }
-		}
+
-
+        public Boolean getEnableLogin() {
-		public void setCsrfDisabled(Boolean csrfDisabled) {
+            return enableLogin;
-			this.csrfDisabled = csrfDisabled;
+        }
-		}
+
-
+        public void setEnableLogin(Boolean enableLogin) {
-		
+            this.enableLogin = enableLogin;
-		@Override
+        }
-		public String toString() {
+
-			return "Security [enableLogin=" + enableLogin + ", initialLogin=" + initialLogin + ",  csrfDisabled="
+        public Boolean getCsrfDisabled() {
-					+ csrfDisabled + "]";
+            return csrfDisabled;
-		}
+        }
-		
+
-		public static class InitialLogin {
+        public void setCsrfDisabled(Boolean csrfDisabled) {
-
+            this.csrfDisabled = csrfDisabled;
-			private String username;
+        }
-			private String password;
+
-
+        @Override
-			public String getUsername() {
+        public String toString() {
-				return username;
+            return "Security [enableLogin="
-			}
+                    + enableLogin
-
+                    + ", initialLogin="
-			public void setUsername(String username) {
+                    + initialLogin
-				this.username = username;
+                    + ",  csrfDisabled="
-			}
+                    + csrfDisabled
-
+                    + "]";
-			public String getPassword() {
+        }
-				return password;
+
-			}
+        public static class InitialLogin {
-
+
-			public void setPassword(String password) {
+            private String username;
-				this.password = password;
+            private String password;
-			}
+
-
+            public String getUsername() {
-			@Override
+                return username;
-			public String toString() {
+            }
-				return "InitialLogin [username=" + username + ", password=" + (password != null && !password.isEmpty() ? "MASKED" : "NULL") + "]";
+
-			}
+            public void setUsername(String username) {
-
+                this.username = username;
-
+            }
-
+
-		}
+            public String getPassword() {
-	}
+                return password;
-
+            }
-	public static class System {
+
-		private String defaultLocale;
+            public void setPassword(String password) {
-		private Boolean googlevisibility;
+                this.password = password;
-		private String rootURIPath;
+            }
-		private String customStaticFilePath;
+
-		private Integer maxFileSize;
+            @Override
-		
+            public String toString() {
-		private Boolean  enableAlphaFunctionality;
+                return "InitialLogin [username="
-		
+                        + username
-		
+                        + ", password="
-		
+                        + (password != null && !password.isEmpty() ? "MASKED" : "NULL")
-
+                        + "]";
-		public Boolean getEnableAlphaFunctionality() {
+            }
-			return enableAlphaFunctionality;
+        }
-		}
+    }
-
+
-		public void setEnableAlphaFunctionality(Boolean enableAlphaFunctionality) {
+    public static class System {
-			this.enableAlphaFunctionality = enableAlphaFunctionality;
+        private String defaultLocale;
-		}
+        private Boolean googlevisibility;
-
+        private String rootURIPath;
-		public String getDefaultLocale() {
+        private String customStaticFilePath;
-			return defaultLocale;
+        private Integer maxFileSize;
-		}
+
-
+        private Boolean enableAlphaFunctionality;
-		public void setDefaultLocale(String defaultLocale) {
+
-			this.defaultLocale = defaultLocale;
+        public Boolean getEnableAlphaFunctionality() {
-		}
+            return enableAlphaFunctionality;
-
+        }
-		public Boolean getGooglevisibility() {
+
-			return googlevisibility;
+        public void setEnableAlphaFunctionality(Boolean enableAlphaFunctionality) {
-		}
+            this.enableAlphaFunctionality = enableAlphaFunctionality;
-
+        }
-		public void setGooglevisibility(Boolean googlevisibility) {
+
-			this.googlevisibility = googlevisibility;
+        public String getDefaultLocale() {
-		}
+            return defaultLocale;
-
+        }
-		public String getRootURIPath() {
+
-			return rootURIPath;
+        public void setDefaultLocale(String defaultLocale) {
-		}
+            this.defaultLocale = defaultLocale;
-
+        }
-		public void setRootURIPath(String rootURIPath) {
+
-			this.rootURIPath = rootURIPath;
+        public Boolean getGooglevisibility() {
-		}
+            return googlevisibility;
-
+        }
-		public String getCustomStaticFilePath() {
+
-			return customStaticFilePath;
+        public void setGooglevisibility(Boolean googlevisibility) {
-		}
+            this.googlevisibility = googlevisibility;
-
+        }
-		public void setCustomStaticFilePath(String customStaticFilePath) {
+
-			this.customStaticFilePath = customStaticFilePath;
+        public String getRootURIPath() {
-		}
+            return rootURIPath;
-
+        }
-		public Integer getMaxFileSize() {
+
-			return maxFileSize;
+        public void setRootURIPath(String rootURIPath) {
-		}
+            this.rootURIPath = rootURIPath;
-
+        }
-		public void setMaxFileSize(Integer maxFileSize) {
+
-			this.maxFileSize = maxFileSize;
+        public String getCustomStaticFilePath() {
-		}
+            return customStaticFilePath;
-
+        }
-		@Override
+
-		public String toString() {
+        public void setCustomStaticFilePath(String customStaticFilePath) {
-			return "System [defaultLocale=" + defaultLocale + ", googlevisibility=" + googlevisibility
+            this.customStaticFilePath = customStaticFilePath;
-					+ ", rootURIPath=" + rootURIPath + ", customStaticFilePath=" + customStaticFilePath
+        }
-					+ ", maxFileSize=" + maxFileSize + ", enableAlphaFunctionality=" + enableAlphaFunctionality + "]";
+
-		}
+        public Integer getMaxFileSize() {
-
+            return maxFileSize;
-		
+        }
-		
+
-	}
+        public void setMaxFileSize(Integer maxFileSize) {
-
+            this.maxFileSize = maxFileSize;
-	public static class Ui {
+        }
-	    private String appName;
+
-	    private String homeDescription;
+        @Override
-	    private String appNameNavbar;
+        public String toString() {
-
+            return "System [defaultLocale="
-	    public String getAppName() {
+                    + defaultLocale
-	    	if(appName != null && appName.trim().length() == 0)
+                    + ", googlevisibility="
-	    		return null;
+                    + googlevisibility
-	        return appName;
+                    + ", rootURIPath="
-	    }
+                    + rootURIPath
-
+                    + ", customStaticFilePath="
-	    public void setAppName(String appName) {
+                    + customStaticFilePath
-	        this.appName = appName;
+                    + ", maxFileSize="
-	    }
+                    + maxFileSize
-
+                    + ", enableAlphaFunctionality="
-	    public String getHomeDescription() {
+                    + enableAlphaFunctionality
-	    	if(homeDescription != null && homeDescription.trim().length() == 0)
+                    + "]";
-	    		return null;
+        }
-	        return homeDescription;
+    }
-	    }
+
-
+    public static class Ui {
-	    public void setHomeDescription(String homeDescription) {
+        private String appName;
-	        this.homeDescription = homeDescription;
+        private String homeDescription;
-	    }
+        private String appNameNavbar;
-
+
-	    public String getAppNameNavbar() {
+        public String getAppName() {
-	    	if(appNameNavbar != null && appNameNavbar.trim().length() == 0)
+            if (appName != null && appName.trim().length() == 0) return null;
-	    		return null;
+            return appName;
-	        return appNameNavbar;
+        }
-	    }
+
-
+        public void setAppName(String appName) {
-	    public void setAppNameNavbar(String appNameNavbar) {
+            this.appName = appName;
-	        this.appNameNavbar = appNameNavbar;
+        }
-	    }
+
-
+        public String getHomeDescription() {
-	    @Override
+            if (homeDescription != null && homeDescription.trim().length() == 0) return null;
-	    public String toString() {
+            return homeDescription;
-	        return "UserInterface [appName=" + appName + ", homeDescription=" + homeDescription + ", appNameNavbar=" + appNameNavbar + "]";
+        }
-	    }
+
-	}
+        public void setHomeDescription(String homeDescription) {
-
+            this.homeDescription = homeDescription;
-
+        }
-	public static class Endpoints {
+
-		private List<String> toRemove;
+        public String getAppNameNavbar() {
-		private List<String> groupsToRemove;
+            if (appNameNavbar != null && appNameNavbar.trim().length() == 0) return null;
-
+            return appNameNavbar;
-		public List<String> getToRemove() {
+        }
-			return toRemove;
+
-		}
+        public void setAppNameNavbar(String appNameNavbar) {
-
+            this.appNameNavbar = appNameNavbar;
-		public void setToRemove(List<String> toRemove) {
+        }
-			this.toRemove = toRemove;
+
-		}
+        @Override
-
+        public String toString() {
-		public List<String> getGroupsToRemove() {
+            return "UserInterface [appName="
-			return groupsToRemove;
+                    + appName
-		}
+                    + ", homeDescription="
-
+                    + homeDescription
-		public void setGroupsToRemove(List<String> groupsToRemove) {
+                    + ", appNameNavbar="
-			this.groupsToRemove = groupsToRemove;
+                    + appNameNavbar
-		}
+                    + "]";
-
+        }
-		@Override
+    }
-		public String toString() {
+
-			return "Endpoints [toRemove=" + toRemove + ", groupsToRemove=" + groupsToRemove + "]";
+    public static class Endpoints {
-		}
+        private List<String> toRemove;
-
+        private List<String> groupsToRemove;
-		
+
-	}
+        public List<String> getToRemove() {
-
+            return toRemove;
-	public static class Metrics {
+        }
-		private Boolean enabled;
+
-
+        public void setToRemove(List<String> toRemove) {
-		public Boolean getEnabled() {
+            this.toRemove = toRemove;
-			return enabled;
+        }
-		}
+
-
+        public List<String> getGroupsToRemove() {
-		public void setEnabled(Boolean enabled) {
+            return groupsToRemove;
-			this.enabled = enabled;
+        }
-		}
+
-
+        public void setGroupsToRemove(List<String> groupsToRemove) {
-		@Override
+            this.groupsToRemove = groupsToRemove;
-		public String toString() {
+        }
-			return "Metrics [enabled=" + enabled + "]";
+
-		}
+        @Override
-
+        public String toString() {
-		
+            return "Endpoints [toRemove=" + toRemove + ", groupsToRemove=" + groupsToRemove + "]";
-	}
+        }
-
+    }
-	public static class AutomaticallyGenerated {
+
-		private String key;
+    public static class Metrics {
-
+        private Boolean enabled;
-		public String getKey() {
+
-			return key;
+        public Boolean getEnabled() {
-		}
+            return enabled;
-
+        }
-		public void setKey(String key) {
+
-			this.key = key;
+        public void setEnabled(Boolean enabled) {
-		}
+            this.enabled = enabled;
-
+        }
-		@Override
+
-		public String toString() {
+        @Override
-			return "AutomaticallyGenerated [key=" + (key != null && !key.isEmpty() ? "MASKED" : "NULL") + "]";
+        public String toString() {
-		}
+            return "Metrics [enabled=" + enabled + "]";
-		
+        }
-	}
+    }
+
+    public static class AutomaticallyGenerated {
+        private String key;
+
+        public String getKey() {
+            return key;
+        }
+
+        public void setKey(String key) {
+            this.key = key;
+        }
+
+        @Override
+        public String toString() {
+            return "AutomaticallyGenerated [key="
+                    + (key != null && !key.isEmpty() ? "MASKED" : "NULL")
+                    + "]";
+        }
+    }
 }

src/main/java/stirling/software/SPDF/model/AttemptCounter.java

@@ -1,4 +1,5 @@
 package stirling.software.SPDF.model;
+
 public class AttemptCounter {
     private int attemptCount;
     private long lastAttemptTime;