Merge remote-tracking branch 'origin/main' into digitalOcean

.gitattributes

@@ -1,5 +1,6 @@
 # Ignore all JavaScript files in a directory
 src/main/resources/static/pdfjs/* linguist-vendored
+src/main/resources/static/pdfjs/** linguist-vendored
 src/main/resources/static/css/bootstrap-icons.css linguist-vendored
 src/main/resources/static/css/bootstrap.min.css linguist-vendored
 src/main/resources/static/css/fonts/* linguist-vendored

.github/pull_request_template.md

@@ -0,0 +1,4 @@
+# License Agreement for Contributions
+By submitting this pull request, I acknowledge and agree that my contributions will be included in Stirling-PDF and that they can be relicensed in the future under MPL 2.0 (Mozilla Public License Version 2.0) license. 
+
+(This does not change the general open-source nature of Stirling-PDF, simply moving from one license to another license)

.github/workflows/pull_request_template.md

@@ -0,0 +1,3 @@
+# License Agreement for Contributions
+By submitting this pull request, I acknowledge and agree that my contributions will be included in Stirling-PDF and that they can be relicensed in the future under MPL 2.0 (Mozilla Public License Version 2.0) license. 
+(This does not change the open-source nature of Stirling-PDF, simply moving from one license to another license)

.github/workflows/push-docker.yml

@@ -21,6 +21,8 @@ jobs:
     
 
     - uses: gradle/gradle-build-action@v2.4.2
+      env:
+        DOCKER_ENABLE_SECURITY: false
       with:
         gradle-version: 7.6
         arguments: clean build
@@ -77,6 +79,8 @@ jobs:
         cache-to: type=gha,mode=max
         tags: ${{ steps.meta.outputs.tags }}
         labels: ${{ steps.meta.outputs.labels }}
+        build-args: 
+          VERSION_TAG=${{ steps.versionNumber.outputs.versionNumber }}
         platforms: linux/amd64,linux/arm64/v8
 
 
@@ -105,6 +109,8 @@ jobs:
         cache-to: type=gha,mode=max
         tags: ${{ steps.meta2.outputs.tags }}
         labels: ${{ steps.meta2.outputs.labels }}
+        build-args: 
+          VERSION_TAG=${{ steps.versionNumber.outputs.versionNumber }}
         platforms: linux/amd64,linux/arm64/v8
 
 
@@ -133,4 +139,10 @@ jobs:
         cache-to: type=gha,mode=max
         tags: ${{ steps.meta3.outputs.tags }}
         labels: ${{ steps.meta3.outputs.labels }}
+        build-args: 
+          VERSION_TAG=${{ steps.versionNumber.outputs.versionNumber }}
         platforms: linux/amd64,linux/arm64/v8
+    - name: Build and Push Helm Chart
+      run: |
+        helm package chart/stirling-pdf
+        helm push stirling-pdf-chart-1.0.0.tgz oci://registry-1.docker.io/frooodle

.github/workflows/releaseArtifacts.yml

@@ -1,10 +1,20 @@
 name: Release Artifacts
+
 on: 
   release: 
     types: [created]
+
 jobs:
   push:
     runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        enable_security: [true, false]
+        include:
+          - enable_security: true
+            file_suffix: '-with-login'
+          - enable_security: false
+            file_suffix: ''
     steps:
     - uses: actions/checkout@v3.5.2
     
@@ -17,15 +27,17 @@ jobs:
     - name: Grant execute permission for gradlew
       run: chmod +x gradlew
 
-    - name: Generate jar
+    - name: Generate jar (With Security=${{ matrix.enable_security }})
       run: ./gradlew clean createExe
+      env:
+        DOCKER_ENABLE_SECURITY: ${{ matrix.enable_security }}
 
     - name: Upload binaries to release
       uses: svenstaro/upload-release-action@v2
       with:
         repo_token: ${{ secrets.GITHUB_TOKEN }}
         file: ./build/launch4j/Stirling-PDF.exe
-        asset_name: Stirling-PDF.exe
+        asset_name: Stirling-PDF${{ matrix.file_suffix }}.exe
         tag: ${{ github.ref }}
         overwrite: true
     
@@ -33,13 +45,11 @@ jobs:
       id: versionNumber
       run: echo "::set-output name=versionNumber::$(./gradlew printVersion --quiet | tail -1)"
       
-    - name: Upload binaries to release
+    - name: Upload jar binaries to release
       uses: svenstaro/upload-release-action@v2
       with:
         repo_token: ${{ secrets.GITHUB_TOKEN }}
         file: ./build/libs/Stirling-PDF-${{ steps.versionNumber.outputs.versionNumber }}.jar
-        asset_name: Stirling-PDF.jar
+        asset_name: Stirling-PDF${{ matrix.file_suffix }}.jar
         tag: ${{ github.ref }}
         overwrite: true
-
-

.gitignore

@@ -19,7 +19,7 @@ pipeline/
 
 #### Stirling-PDF Files ###
 customFiles/
-config/
+configs/
 watchedFolders/
 
 
@@ -116,7 +116,8 @@ watchedFolders/
 *.zip
 *.tar.gz
 *.rar
-
+*.db
 /build
 
 /.vscode
+/.idea

Dockerfile

@@ -1,28 +1,45 @@
-# Build jbig2enc in a separate stage
-FROM frooodle/stirling-pdf-base:beta4
+# Use the base image
+FROM frooodle/stirling-pdf-base:version8
 
-# Create scripts folder and copy local scripts
-RUN mkdir /scripts
+ARG VERSION_TAG
+
+# Set Environment Variables
+ENV DOCKER_ENABLE_SECURITY=false \
+    HOME=/home/stirlingpdfuser \
+    VERSION_TAG=$VERSION_TAG
+#    PUID=1000 \
+#    PGID=1000 \
+#    UMASK=022 \
+    
+
+# Create user and group
+##RUN groupadd -g $PGID stirlingpdfgroup && \
+##    useradd -u $PUID -g stirlingpdfgroup -s /bin/sh stirlingpdfuser && \
+##    mkdir -p $HOME && chown stirlingpdfuser:stirlingpdfgroup $HOME
+
+# Set up necessary directories and permissions
+RUN mkdir -p /scripts /usr/share/fonts/opentype/noto /usr/share/tesseract-ocr /configs /customFiles 
+##&& \
+##    chown -R stirlingpdfuser:stirlingpdfgroup /scripts /usr/share/fonts/opentype/noto /usr/share/tesseract-ocr /configs /customFiles && \
+##    chown -R stirlingpdfuser:stirlingpdfgroup /usr/share/tesseract-ocr-original
+
+# Copy necessary files
 COPY ./scripts/* /scripts/
-
-#Install fonts
-RUN mkdir /usr/share/fonts/opentype/noto/
 COPY src/main/resources/static/fonts/*.ttf /usr/share/fonts/opentype/noto/
 COPY src/main/resources/static/fonts/*.otf /usr/share/fonts/opentype/noto/
-RUN fc-cache -f -v
-
-# Copy the application JAR file
 COPY build/libs/*.jar app.jar
 
-# Expose the application port
+# Set font cache and permissions
+RUN fc-cache -f -v && chmod +x /scripts/*
+
+##&& \
+##    chown stirlingpdfuser:stirlingpdfgroup /app.jar && \
+##    chmod +x /scripts/init.sh
+
+# Expose necessary ports
 EXPOSE 8080
 
-# Set environment variables
-ENV APP_HOME_NAME="Stirling PDF"
-#ENV APP_HOME_DESCRIPTION="Personal PDF Website!"
-#ENV APP_NAVBAR_NAME="Stirling PDF"
-
-# Run the application
-RUN chmod +x /scripts/init.sh
+# Set user and run command
+##USER stirlingpdfuser
 ENTRYPOINT ["/scripts/init.sh"]
 CMD ["java", "-jar", "/app.jar"]

Dockerfile-lite

@@ -1,29 +1,63 @@
 # Build jbig2enc in a separate stage
 FROM bellsoft/liberica-openjdk-debian:17
+
+ARG VERSION_TAG
+
 RUN apt-get update && \
     apt-get install -y --no-install-recommends \
-        libreoffice-core-nogui \
+        libreoffice-core \
         libreoffice-common \
-        libreoffice-writer-nogui \
-        libreoffice-calc-nogui \
-        libreoffice-impress-nogui \
+        libreoffice-writer \
+        libreoffice-calc \
+        libreoffice-impress \
         unoconv && \
     rm -rf /var/lib/apt/lists/*
 
-#Install fonts
-RUN mkdir /usr/share/fonts/opentype/noto/
+
+# Set Environment Variables
+ENV DOCKER_ENABLE_SECURITY=false \
+    HOME=/home/stirlingpdfuser \
+    VERSION_TAG=$VERSION_TAG 
+#	PUID=1000 \
+#   PGID=1000 \
+#   UMASK=022 \
+
+# Create user and group
+#RUN groupadd -g $PGID stirlingpdfgroup && \
+#    useradd -u $PUID -g stirlingpdfgroup -s /bin/sh stirlingpdfuser && \
+#    mkdir -p $HOME && chown stirlingpdfuser:stirlingpdfgroup $HOME
+
+# Set up necessary directories and permissions
+RUN mkdir -p /scripts /usr/share/fonts/opentype/noto /configs /customFiles
+
+#    chown -R stirlingpdfuser:stirlingpdfgroup /usr/share/fonts/opentype/noto /configs /customFiles
+
+# Copy necessary files
+COPY ./scripts/download-security-jar.sh /scripts/download-security-jar.sh
+COPY ./scripts/init-without-ocr.sh /scripts/init-without-ocr.sh
 COPY src/main/resources/static/fonts/*.ttf /usr/share/fonts/opentype/noto/
 COPY src/main/resources/static/fonts/*.otf /usr/share/fonts/opentype/noto/
-RUN fc-cache -f -v
-
-# Copy the application JAR file
 COPY build/libs/*.jar app.jar
 
+# Set font cache and permissions
+RUN fc-cache -f -v && \
+chmod +x /scripts/init-without-ocr.sh && \
+chmod +x /scripts/download-security-jar.sh
+
+
+#    chown stirlingpdfuser:stirlingpdfgroup /app.jar
+
+
+
+
 # Expose the application port
 EXPOSE 8080
 
 # Set environment variables
-ENV GROUPS_TO_REMOVE=Python,OpenCV,OCRmyPDF
+ENV ENDPOINTS_GROUPS_TO_REMOVE=Python,OpenCV,OCRmyPDF
+ENV DOCKER_ENABLE_SECURITY=false
 
 # Run the application
+#USER stirlingpdfuser
+ENTRYPOINT ["/scripts/init-without-ocr.sh"]
 CMD ["java", "-jar", "/app.jar"]

Dockerfile-ultra-lite

@@ -1,14 +1,45 @@
 # Build jbig2enc in a separate stage
 FROM bellsoft/liberica-openjdk-alpine:17
 
-# Copy the application JAR file
+ARG VERSION_TAG
+
+# Set Environment Variables
+ENV DOCKER_ENABLE_SECURITY=false \
+    HOME=/home/stirlingpdfuser \
+    VERSION_TAG=$VERSION_TAG 
+#	PUID=1000 \
+#   PGID=1000 \
+#   UMASK=022 \
+
+# Create user and group using Alpine's addgroup and adduser
+#RUN addgroup -g $PGID stirlingpdfgroup && \
+#    adduser -u $PUID -G stirlingpdfgroup -s /bin/sh -D stirlingpdfuser && \
+#    mkdir -p $HOME && chown stirlingpdfuser:stirlingpdfgroup $HOME
+
+# Set up necessary directories and permissions
+#RUN mkdir -p /scripts /configs /customFiles && \
+#    chown -R stirlingpdfuser:stirlingpdfgroup /scripts /configs /customFiles
+
+RUN mkdir -p /scripts /usr/share/fonts/opentype/noto /configs /customFiles
+COPY ./scripts/download-security-jar.sh /scripts/download-security-jar.sh
+COPY ./scripts/init-without-ocr.sh /scripts/init-without-ocr.sh
+
 COPY build/libs/*.jar app.jar
 
+# Set font cache and permissions
+#RUN chown stirlingpdfuser:stirlingpdfgroup /app.jar
+
+RUN chmod +x /scripts/init-without-ocr.sh && \
+chmod +x /scripts/download-security-jar.sh && \
+apk add --no-cache curl
+
 # Expose the application port
 EXPOSE 8080
 
 # Set environment variables
-ENV GROUPS_TO_REMOVE=CLI
+ENV ENDPOINTS_GROUPS_TO_REMOVE=CLI
+
+ENTRYPOINT ["/scripts/init-without-ocr.sh"]
 
 # Run the application
 CMD ["java", "-jar", "/app.jar"]

DockerfileBase

@@ -1,37 +1,50 @@
 # Main stage
-FROM bellsoft/liberica-openjdk-debian:17 AS base
+FROM ubuntu:latest AS base
+
+
+
+# JDK for app
 RUN apt-get update && \
     apt-get install -y --no-install-recommends \
-        libreoffice-core-nogui \
+    	openjdk-17-jre
+    	
+# Doc conversion
+RUN apt-get update && \
+    apt-get install -y --no-install-recommends \
+    	libreoffice-core \
         libreoffice-common \
-        libreoffice-writer-nogui \
-        libreoffice-calc-nogui \
-        libreoffice-impress-nogui \
-        python3-uno \
+        libreoffice-writer \
+        libreoffice-calc \
+        libreoffice-impress \
+		python3-uno \
+		curl \
+		unoconv
+		
+		
+# OCR MY PDF (unpaper for descew and other advanced featues)
+RUN apt-get update && apt-get install -y --no-install-recommends software-properties-common gnupg2 && \
+add-apt-repository ppa:alex-p/tesseract-ocr5 && apt install -y --no-install-recommends tesseract-ocr && \
+apt-get update && \
+    apt-get install -y --no-install-recommends \
+        ghostscript \
         python3-pip \
-        unoconv \
-        pngquant \
-        unpaper \
-        ocrmypdf && \
-    rm -rf /var/lib/apt/lists/* && \
+        ocrmypdf \
+        unpaper && \
+    pip install --upgrade pip && \
+    pip install --no-cache-dir --upgrade ocrmypdf && \
+    pip install --no-cache-dir --upgrade pillow==10.0.1 reportlab==3.6.13 wheel==0.38.1 setuptools==65.5.1 pyjwt==2.4.0 cryptography==39.0.1
+    
+    
+#CV and HTML   
+RUN pip install --no-cache-dir opencv-python-headless WeasyPrint 
+
+
+# cleanup and etc
+RUN rm -rf /var/lib/apt/lists/* && \
     mkdir /usr/share/tesseract-ocr-original && \
     cp -r /usr/share/tesseract-ocr/* /usr/share/tesseract-ocr-original && \
     rm -rf /usr/share/tesseract-ocr
 
-# Python packages stage
-FROM base AS python-packages
-RUN apt-get update && \
-    apt-get install -y --no-install-recommends \
-        build-essential \
-        libffi-dev \
-        libssl-dev \
-        zlib1g-dev \
-        libjpeg-dev && \
-    pip install --upgrade pip && \
-    pip install --no-cache-dir \
-        opencv-python-headless WeasyPrint && \
-    rm -rf /var/lib/apt/lists/*
 
-# Final stage: Copy necessary files from the previous stage
-FROM base
-COPY --from=python-packages /usr/local /usr/local
+
+    

Endpoint-groups.md

@@ -3,9 +3,11 @@
 | adjust-contrast     |    ✔️    |         |          |       |      |        |        |             |          |           |    ✔️      |
 | auto-split-pdf      |    ✔️    |         |          |       |      |        |        |             |          |    ✔️     |            |
 | crop                |    ✔️    |         |          |       |      |        |        |             |          |    ✔️     |            |
+| extract-page        |    ✔️    |         |          |       |      |        |        |             |          |    ✔️     |            |
 | merge-pdfs          |    ✔️    |         |          |       |      |        |        |             |          |    ✔️     |            |
 | multi-page-layout   |    ✔️    |         |          |       |      |        |        |             |          |    ✔️     |            |
 | pdf-organizer       |    ✔️    |         |          |       |      |        |        |             |          |    ✔️     |    ✔️       |
+| pdf-to-single-page  |    ✔️    |         |          |       |      |        |        |             |          |    ✔️     |            |
 | remove-pages        |    ✔️    |         |          |       |      |        |        |             |          |    ✔️     |            |
 | rotate-pdf          |    ✔️    |         |          |       |      |        |        |             |          |    ✔️     |            |
 | scale-pages         |    ✔️    |         |          |       |      |        |        |             |          |    ✔️     |            |
@@ -15,6 +17,7 @@
 | pdf-to-html         |         |    ✔️    |          |       |  ✔️   |        |        |     ✔️       |          |          |            |
 | pdf-to-img          |         |    ✔️    |          |       |      |        |        |             |          |    ✔️     |            |
 | pdf-to-pdfa         |         |    ✔️    |          |       |  ✔️   |        |        |             |    ✔️     |          |            |
+| pdf-to-markdown     |         |    ✔️    |          |       |      |        |        |             |            |    ✔️      |            |
 | pdf-to-presentation |         |    ✔️    |          |       |  ✔️   |        |        |     ✔️       |          |          |            |
 | pdf-to-text         |         |    ✔️    |          |       |  ✔️   |        |        |     ✔️       |          |          |            |
 | pdf-to-word         |         |    ✔️    |          |       |  ✔️   |        |        |     ✔️       |          |          |            |
@@ -34,8 +37,10 @@
 | compress-pdf        |         |         |          |  ✔️    |  ✔️   |        |        |             |    ✔️     |          |            |
 | extract-image-scans |         |         |          |  ✔️    |  ✔️   |   ✔️    |   ✔️    |             |          |          |            |
 | extract-images      |         |         |          |  ✔️    |      |        |        |             |          |    ✔️     |            |
-| flatten             |         |         |          |  ✔️    |      |        |        |             |          |          |            |
+| flatten             |         |         |          |  ✔️    |      |        |        |             |          |          |      ✔️      |
+| get-info-on-pdf     |         |         |          |  ✔️    |      |        |        |             |          |    ✔️      |            |
 | ocr-pdf             |         |         |          |  ✔️    |  ✔️   |        |        |             |    ✔️     |          |            |
 | remove-blanks       |         |         |          |  ✔️    |  ✔️   |   ✔️    |   ✔️    |             |          |          |            |
 | repair              |         |         |          |  ✔️    |  ✔️   |        |        |     ✔️       |          |          |            |
+| show-javascript     |         |         |          |  ✔️    |      |        |        |             |          |          |    ✔️       |
 | sign                |         |         |          |  ✔️    |      |        |        |             |          |          |    ✔️       |

HowToAddNewLanguage.md

@@ -8,7 +8,7 @@ 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/navbar.html#L306
+https://github.com/Frooodle/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
 Any SVG flags are fine, i got most of mine from [here](https://flagicons.lipis.dev/)
@@ -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/tree/langSetup/src/main/resources/messages_en_GB.properties](https://github.com/Frooodle/Stirling-PDF/blob/main/src/main/resources/messages_en_US.properties)
+[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)
 
 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
 

HowToUseOCR.md

@@ -2,6 +2,9 @@
 
 This document provides instructions on how to add additional language packs for the OCR tab in Stirling-PDF, both inside and outside of Docker.
 
+## My OCR used to work and now doesnt!
+Please update your tesseract docker volume path version from 4.00 to 5
+
 ## How does the OCR Work
 Stirling-PDF uses [OCRmyPDF](https://github.com/ocrmypdf/OCRmyPDF) which in turn uses tesseract for its text recognition.
 All credit goes to them for this awesome work! 
@@ -18,9 +21,9 @@ Depending on your requirements, you can choose the appropriate language pack for
 ### Installing Language Packs
 
 1. Download the desired language pack(s) by selecting the `.traineddata` file(s) for the language(s) you need.
-2. Place the `.traineddata` files in the Tesseract tessdata directory: `/usr/share/tesseract-ocr/4.00/tessdata` (Debian) or `/usr/share/tesseract/tessdata` (Fedora)
+2. Place the `.traineddata` files in the Tesseract tessdata directory: `/usr/share/tesseract-ocr/5/tessdata` (Debian) or `/usr/share/tesseract/tessdata` (Fedora)
 
-# DO NOT REMOVE EXISTING ENG.TRAINEDDATA, ITS REQUIRED.
+# DO NOT REMOVE EXISTING ENG.TRAINEDDATA, IT'S REQUIRED.
 
 #### Docker
 
@@ -34,14 +37,14 @@ services:
   your_service_name:
     image: your_docker_image_name
     volumes:
-      - /location/of/trainingData:/usr/share/tesseract-ocr/4.00/tessdata
+      - /location/of/trainingData:/usr/share/tesseract-ocr/5/tessdata
 ```
 
 
 #### Docker run
 Add the following to your existing docker run command
 ```bash
--v /location/of/trainingData:/usr/share/tesseract-ocr/4.00/tessdata
+-v /location/of/trainingData:/usr/share/tesseract-ocr/5/tessdata
 ```
 
 #### Non-Docker

Jenkinsfile

@@ -22,12 +22,24 @@ pipeline {
                     def appVersion = sh(returnStdout: true, script: './gradlew printVersion -q').trim()
                     def image = "frooodle/s-pdf:$appVersion"
                     withCredentials([string(credentialsId: 'docker_hub_access_token', variable: 'DOCKER_HUB_ACCESS_TOKEN')]) {
-				sh "docker login --username frooodle --password $DOCKER_HUB_ACCESS_TOKEN"
+				        sh "docker login --username frooodle --password $DOCKER_HUB_ACCESS_TOKEN"
                         sh "docker push $image"
                     }
                 }
             }
-    	
-	}
-   }
+        }
+        stage('Helm Push') {
+            steps {
+                script {
+                    //TODO: Read chartVersion from Chart.yaml
+                    def chartVersion = '1.0.0'
+                    withCredentials([string(credentialsId: 'docker_hub_access_token', variable: 'DOCKER_HUB_ACCESS_TOKEN')]) {
+				        sh "docker login --username frooodle --password $DOCKER_HUB_ACCESS_TOKEN"
+				        sh "helm package chart/stirling-pdf"
+                        sh "helm push stirling-pdf-chart-1.0.0.tgz oci://registry-1.docker.io/frooodle"
+                    }
+                }
+            }
+        }
+    }
 }

LocalRunGuide.md

@@ -1,5 +1,5 @@
 
-To run the application without Docker, you will need to manually install all dependencies and build the necessary components.
+To run the application without Docker/Podman, you will need to manually install all dependencies and build the necessary components.
 
 Note that some dependencies might not be available in the standard repositories of all Linux distributions, and may require additional steps to install.
 
@@ -8,6 +8,8 @@ The following guide assumes you have a basic understanding of using a command li
 It should work on most Linux distributions and MacOS. For Windows, you might need to use Windows Subsystem for Linux (WSL) for certain steps.
 The amount of dependencies is to actually reduce overall size, ie installing LibreOffice sub components rather than full LibreOffice package.
 
+You could theoretically use a Distrobox/Toolbox, if your Distribution has old or not all Packages. But you might just as well use the Docker Container then.
+
 ### Step 1: Prerequisites
 
 Install the following software, if not already installed:
@@ -137,7 +139,7 @@ Easiest is to use the langpacks provided by your repositories. Skip the other st
 Manual:
 
 1. Download the desired language pack(s) by selecting the `.traineddata` file(s) for the language(s) you need.
-2. Place the `.traineddata` files in the Tesseract tessdata directory: `/usr/share/tesseract-ocr/4.00/tessdata`
+2. Place the `.traineddata` files in the Tesseract tessdata directory: `/usr/share/tesseract-ocr/5/tessdata`
 3. 
 Please view  [OCRmyPDF install guide](https://ocrmypdf.readthedocs.io/en/latest/installation.html) for more info.
 **IMPORTANT:** DO NOT REMOVE EXISTING `eng.traineddata`, IT'S REQUIRED.

README.md

@@ -21,54 +21,74 @@ Any file which has been downloaded by the user will have already been deleted fr
 
 Feel free to request any features or bug fixes either in github issues or our [Discord](https://discord.gg/Cn8pWhQRxZ)
 
-
 ![stirling-home](images/stirling-home.png)
 
 ## Features
-- Full interactive GUI for merging/splitting/rotating/moving PDFs and their pages.
-- Split PDFs into multiple files at specified page numbers or extract all pages as individual files.
-- Merge multiple PDFs together into a single resultant file
-- Convert PDFs to and from images
-- Reorganize PDF pages into different orders.
-- Add/Generate signatures
-- Format PDFs into a multi-paged page
-- Scale page contents size by set % 
-- Adjust Contrast
-- Crop PDF
-- Auto Split PDF (With physically scanned page dividers)
-- Flatten PDFs
-- Repair PDFs
-- Detect and remove blank pages
-- Compare 2 PDFs and show differences in text
-- Add images to PDFs
-- Rotating PDFs in 90 degree increments.
-- Compressing PDFs to decrease their filesize. (Using OCRMyPDF)
-- Add and remove passwords
-- Set PDF Permissions
-- Add watermark(s)
-- Convert Any common file to PDF (using LibreOffice)
-- Convert PDF to Word/Powerpoint/Others (using LibreOffice)
-- Convert HTML to PDF
-- URL to PDF
-- Extract images from PDF
-- Extract images from Scans
-- Add page numbers
-- Auto rename file by detecting PDF header text
-- OCR on PDF (Using OCRMyPDF)
-- PDF/A conversion (Using OCRMyPDF)
-- Edit metadata
 - Dark mode support.
 - Custom download options (see [here](https://github.com/Frooodle/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)
 
-For a overview of the tasks and the technology each uses please view [groups.md](https://github.com/Frooodle/Stirling-PDF/blob/main/Groups.md)
+
+## **PDF Features**
+
+### **Page Operations**
+- View and modify PDFs - View multi page PDFs with custom viewing sorting and searching. Plus on page edit features like annotate, draw and adding text and images. (Using PDF.js with Joxit and Liberation.Liberation fonts)
+- Full interactive GUI for merging/splitting/rotating/moving PDFs and their pages. 
+- Merge multiple PDFs together into a single resultant file. 
+- Split PDFs into multiple files at specified page numbers or extract all pages as individual files. 
+- Reorganize PDF pages into different orders. 
+- Rotate PDFs in 90-degree increments. 
+- Remove pages. 
+- Multi-page layout (Format PDFs into a multi-paged page). 
+- Scale page contents size by set %. 
+- Adjust Contrast. 
+- Crop PDF. 
+- Auto Split PDF (With physically scanned page dividers). 
+- Extract page(s). 
+- Convert PDF to a single page. 
+
+### **Conversion Operations**
+- Convert PDFs to and from images. 
+- Convert any common file to PDF (using LibreOffice). 
+- Convert PDF to Word/Powerpoint/Others (using LibreOffice). 
+- Convert HTML to PDF. 
+- URL to PDF. 
+- Markdown to PDF. 
+
+### **Security & Permissions**
+- Add and remove passwords. 
+- Change/set PDF Permissions. 
+- Add watermark(s). 
+- Certify/sign PDFs. 
+- Sanitize PDFs. 
+- Auto-redact text. 
+
+### **Other Operations**
+- Add/Generate/Write signatures. 
+- Repair PDFs. 
+- Detect and remove blank pages. 
+- Compare 2 PDFs and show differences in text. 
+- Add images to PDFs. 
+- Compress PDFs to decrease their filesize (Using OCRMyPDF). 
+- Extract images from PDF. 
+- Extract images from Scans. 
+- Add page numbers. 
+- Auto rename file by detecting PDF header text. 
+- OCR on PDF (Using OCRMyPDF). 
+- PDF/A conversion (Using OCRMyPDF). 
+- Edit metadata. 
+- Flatten PDFs. 
+- 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)
 Hosted instance/demo of the app can be seen [here](https://pdf.adminforge.de/) hosted by the team at adminforge.de
 
 ## Technologies used
 - Spring Boot + Thymeleaf
 - PDFBox
-- IText7
 - [LibreOffice](https://www.libreoffice.org/discover/libreoffice/) for advanced conversions
 - [OcrMyPdf](https://github.com/ocrmypdf/OCRmyPDF)
 - HTML, CSS, JavaScript
@@ -81,12 +101,12 @@ Hosted instance/demo of the app can be seen [here](https://pdf.adminforge.de/) h
 ### Locally
 Please view https://github.com/Frooodle/Stirling-PDF/blob/main/LocalRunGuide.md
 
-### Docker
+### 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.
+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)
-For people that dont mind about space optimisation just use latest tag.
+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)
 ![Docker Image Size (tag)](https://img.shields.io/docker/image-size/frooodle/s-pdf/latest-ultra-lite?label=Stirling-PDF%20Ultra-Lite)
@@ -95,20 +115,17 @@ Docker Run
 ```
 docker run -d \
   -p 8080:8080 \
-  -v /location/of/trainingData:/usr/share/tesseract-ocr/4.00/tessdata \
+  -v /location/of/trainingData:/usr/share/tesseract-ocr/5/tessdata \
+  -v /location/of/extraConfigs:/configs \
+  -v /location/of/logs:/logs \
+  -e DOCKER_ENABLE_SECURITY=false \
   --name stirling-pdf \
   frooodle/s-pdf:latest
   
   
   Can also add these for customisation but are not required
-  -v /location/of/extraConfigs:/configs \
+  
   -v /location/of/customFiles:/customFiles \
-  -e APP_HOME_NAME="Stirling PDF" \
-  -e APP_HOME_DESCRIPTION="Your locally hosted one-stop-shop for all your PDF needs." \
-  -e APP_NAVBAR_NAME="Stirling PDF" \
-  -e ALLOW_GOOGLE_VISIBILITY="true" \
-  -e APP_ROOT_PATH="/" \
-  -e APP_LOCALE="en_GB" \
 ```
 Docker Compose
 ```
@@ -119,26 +136,23 @@ services:
     ports:
       - '8080:8080'
     volumes:
-      - /location/of/trainingData:/usr/share/tesseract-ocr/4.00/tessdata #Required for extra OCR languages
-#      - /location/of/extraConfigs:/configs
+      - /location/of/trainingData:/usr/share/tesseract-ocr/5/tessdata #Required for extra OCR languages
+      - /location/of/extraConfigs:/configs
 #      - /location/of/customFiles:/customFiles/
-#    environment:
-#      APP_LOCALE: en_GB
-#      APP_HOME_NAME: Stirling PDF
-#      APP_HOME_DESCRIPTION: Your locally hosted one-stop-shop for all your PDF needs.
-#      APP_NAVBAR_NAME: Stirling PDF
-#      APP_ROOT_PATH: /
-#      ALLOW_GOOGLE_VISIBILITY: true
-
+#      - /location/of/logs:/logs/
+    environment:
+      - DOCKER_ENABLE_SECURITY=false
 ```
 
+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
 
 ## Want to add your own language?
-Stirling PDF currently supports 16!
+Stirling PDF currently supports 20!
 - English (English) (en_GB)
+- English (US) (en_US)
 - Arabic (العربية) (ar_AR)
 - German (Deutsch) (de_DE)
 - French (Français) (fr_FR)
@@ -154,53 +168,108 @@ Stirling PDF currently supports 16!
 - Russian (Русский) (ru_RU)
 - Basque (Euskara) (eu_ES)
 - Japanese (日本語) (ja_JP)
+- Dutch (Nederlands) (nl_NL)
+- Greek (el_GR)
+- Turkish (Türkçe) (tr_TR)
 
 If you want to add your own language to Stirling-PDF please refer
 https://github.com/Frooodle/Stirling-PDF/blob/main/HowToAddNewLanguage.md
 
 And please create a PR to merge it back in so others can use it! 
 
-Also please note as i add new features i will google translate existing languages so that they dont lose support. This could mean that new features need grammer corrections as added.
-
 ## How to View
 1. Open a web browser and navigate to `http://localhost:8080/`
 2. Use the application by following the instructions on the website.
 
 
-## Customize App
-Stirling PDF allows easy customization of the visible application name.
-Simply use environment variables APP_HOME_NAME, APP_HOME_DESCRIPTION and APP_NAVBAR_NAME with Docker or Java. 
-If running Java directly, you can also pass these as properties using -D arguments.
+## Customisation
+Stirling PDF allows easy customization of the app.
+Includes things like
+- Custom application name
+- Custom slogans, icons, images, and even custom HTML (via file overrides)
 
-Using the same method you can also change 
 
-- The default language by providing APP_LOCALE with values like de-DE fr-FR or ar-AR (Note the - character not _ ) to select your default language (Will always default to English on invalid locale) Current accepted locales can be seen above in the Want to add your own language section
-- Enable/Disable search engine visiblility with ALLOW_GOOGLE_VISIBILITY with true / false values. Default disable visiblility.
-- Change root URI for Stirling-PDF ie change server.com/ to server.com/pdf-app by running APP_ROOT_PATH as pdf-app
-- Disable and remove endpoints and functionality from Stirling-PDF. Currently the endpoints ENDPOINTS_TO_REMOVE and GROUPS_TO_REMOVE can include comma seperated 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/groups.md) 
-- Change the max file size allowed through the server with the environment variable MAX_FILE_SIZE. default  2000MB
-- Customise static files such as app logo by placing files in the /customFiles/static/ directory. Example to customise 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
+There are two options for this, either using the generated settings file ``settings.yml``
+This file is located in the ``/configs`` directory and follows standard YAML formatting
+
+Environment variables are also supported and would override the settings file
+For example in the settings.yml you have
+```
+system:
+  defaultLocale: 'en-US'
+```
+
+To have this via an environment variable you would have ``SYSTEM_DEFAULTLOCALE``
+
+The Current list of settings is
+```
+security:
+  enableLogin: false # set to 'true' to enable login
+  csrfDisabled: true
+
+system:
+  defaultLocale: 'en-US' # Set the default language (e.g. 'de-DE', 'fr-FR', etc)
+  googlevisibility: false # 'true' to allow Google visibility (via robots.txt), 'false' to disallow
+  customStaticFilePath: '/customFiles/static/' # Directory path for custom static files
+
+#ui:
+#  appName: exampleAppName # Application's visible name
+#  homeDescription: I am a description # Short description or tagline shown on homepage.
+#  appNameNavbar: navbarName # Name displayed on the navigation bar
+
+endpoints:
+  toRemove: [] # List endpoints to disable (e.g. ['img-to-pdf', 'remove-pages'])
+  groupsToRemove: [] # List groups to disable (e.g. ['LibreOffice'])
+
+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) 
+- 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
+- ``SYSTEM_ROOTURIPATH`` ie set to ``/pdf-app`` to Set the application's root URI to ``localhost:8080/pdf-app``
+- ``SYSTEM_CONNECTIONTIMEOUTMINUTES`` to set custom connection timeout values
+- ``DOCKER_ENABLE_SECURITY`` to tell docker to download security jar (required as true for auth login)
 
 ## 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)
 
 
+## Login authentication
+![stirling-login](images/login-light.png)
+### Prerequisites: 
+- User must have the folder ./configs volumed within docker so that it is retained during updates.
+- Docker uses must download the security jar version by setting ``DOCKER_ENABLE_SECURITY`` to ``true`` in environment variables. 
+- Then either enable login via the settings.yml file or via setting ``SECURITY_ENABLE_LOGIN`` to ``true``
+- Now the initial user will be generated with username ``admin`` and password ``stirling``. On login you will be forced to change the password to a new one. You can also use the environment variables ``SECURITY_INITIALLOGIN_USERNAME`` and  ``SECURITY_INITIALLOGIN_PASSWORD`` to set your own straight away (Recommended to remove them after user creation).
+
+Once the above has been done, on restart, a new stirling-pdf-DB.mv.db will show if everything worked.
+
+When you login to Stirling PDF you will be redirected to /login page to login with those default credentials. After login everything should function as normal
+
+To access your account settings go to Account settings in the settings cog menu (top right in navbar) This Account settings menu is also where you find your API key.
+
+To add new users go to the bottom of Account settings and hit 'Admin Settings', here you can add new users. The different roles mentioned within this are for rate limiting. This is a Work in progress which will be expanding on more in future
+
+For API usage you must provide a header with 'X-API-Key' and the associated API key for that user.
+
+
 ## FAQ
 
-### Q1: Can you add authentication in Stirling PDF?
-There is no Auth within Stirling PDF and there is none planned. This feature will not be added. Instead we recommended you use trusted and secure authentication software like Authentik or Authelia.
-
-### Q2: What are your planned features?
-- Crop
+### Q1: What are your planned features?
 - Progress bar/Tracking
 - Full custom logic pipelines to combine multiple operations together.
 - Folder support with auto scanning to perform operations on
-- Redact sections of pages
-- Add page numbers
-- Auto rename (Renames file based on file title text)
-- URL to PDF
-- Change contrast
+- Redact text (Via UI not just automated way) 
+- Add Forms
+- Multi page layout (Stich PDF pages together) support x rows y columns and custom page sizing 
+- Fill forms mannual and automatic 
 
-### Q3: Why is my application downloading .htm files?
-This is a issue caused commonly by your NGINX congifuration. The default file upload size for NGINX is 1MB, you need to add the following in your Nginx sites-available file. client_max_body_size SIZE; Where "SIZE" is 50M for example for 50MB files.
+### Q2: Why is my application downloading .htm files?
+This is a issue caused commonly by your NGINX congifuration. The default file upload size for NGINX is 1MB, you need to add the following in your Nginx sites-available file. ``client_max_body_size SIZE;`` Where "SIZE" is 50M for example for 50MB files.
+
+### Q3: Why is my download timing out
+NGINX has timeout values by default so if you are running Stirling-PDF behind NGINX you may need to set a timeout value such as adding the config ``proxy_read_timeout 3600;``

Version-groups.md

@@ -15,30 +15,40 @@ Operation           | Ultra-Lite | Lite | Full
 --------------------|------------|------|-----
 add-page-numbers    |     ✔️      |  ✔️   |  ✔️
 add-password        |     ✔️      |  ✔️   |  ✔️
+add-image           |     ✔️      |  ✔️   |  ✔️
 add-watermark       |     ✔️      |  ✔️   |  ✔️
 adjust-contrast     |     ✔️      |  ✔️   |  ✔️
 auto-split-pdf      |     ✔️      |  ✔️   |  ✔️
+auto-redact         |     ✔️      |  ✔️   |  ✔️
 auto-rename         |     ✔️      |  ✔️   |  ✔️
 cert-sign           |     ✔️      |  ✔️   |  ✔️
 crop                |     ✔️      |  ✔️   |  ✔️
 change-metadata     |     ✔️      |  ✔️   |  ✔️
 change-permissions  |     ✔️      |  ✔️   |  ✔️
 compare             |     ✔️      |  ✔️   |  ✔️
+extract-page        |     ✔️      |  ✔️   |  ✔️
 extract-images      |     ✔️      |  ✔️   |  ✔️
 flatten             |     ✔️      |  ✔️   |  ✔️
+get-info-on-pdf     |     ✔️      |  ✔️   |  ✔️
 img-to-pdf          |     ✔️      |  ✔️   |  ✔️
+markdown-to-pdf     |     ✔️      |  ✔️   |  ✔️
 merge-pdfs          |     ✔️      |  ✔️   |  ✔️
 multi-page-layout   |     ✔️      |  ✔️   |  ✔️
+overlay-pdf         |     ✔️      |  ✔️   |  ✔️
 pdf-organizer       |     ✔️      |  ✔️   |  ✔️
+pdf-to-csv          |     ✔️      |  ✔️   |  ✔️
 pdf-to-img          |     ✔️      |  ✔️   |  ✔️
+pdf-to-single-page  |     ✔️      |  ✔️   |  ✔️
 remove-pages        |     ✔️      |  ✔️   |  ✔️
 remove-password     |     ✔️      |  ✔️   |  ✔️
 rotate-pdf          |     ✔️      |  ✔️   |  ✔️
 sanitize-pdf        |     ✔️      |  ✔️   |  ✔️
 scale-pages         |     ✔️      |  ✔️   |  ✔️
 sign                |     ✔️      |  ✔️   |  ✔️
+show-javascript     |     ✔️      |  ✔️   |  ✔️
+split-by-size-or-count |     ✔️      |  ✔️   |  ✔️
+split-pdf-by-sections  |     ✔️      |  ✔️   |  ✔️
 split-pdfs          |     ✔️      |  ✔️   |  ✔️
-add-image           |     ✔️      |  ✔️   |  ✔️
 file-to-pdf         |             |  ✔️   |  ✔️
 pdf-to-html         |             |  ✔️   |  ✔️
 pdf-to-presentation |             |  ✔️   |  ✔️

build.gradle

@@ -1,22 +1,39 @@
 plugins {
 	id 'java'
-	id 'org.springframework.boot' version '3.1.1'
-	id 'io.spring.dependency-management' version '1.1.0'
-	id 'org.springdoc.openapi-gradle-plugin' version '1.6.0'
-	id "io.swagger.swaggerhub" version "1.2.0"
-	id 'edu.sc.seis.launch4j' version '3.0.3'
+	id 'org.springframework.boot' version '3.1.2'
+	id 'io.spring.dependency-management' version '1.1.3'
+	id 'org.springdoc.openapi-gradle-plugin' version '1.8.0'
+	id "io.swagger.swaggerhub" version "1.3.2"
+	id 'edu.sc.seis.launch4j' version '3.0.5'
 }
 
 group = 'stirling.software'
-version = '0.11.2'
+version = '0.17.2'
 sourceCompatibility = '17'
 
 repositories {
 	mavenCentral()
 }
 
+sourceSets {
+    main {
+        java {
+            if (System.getenv('DOCKER_ENABLE_SECURITY') == 'false') {
+                exclude 'stirling/software/SPDF/config/security/**'
+                exclude 'stirling/software/SPDF/controller/api/UserController.java'
+                exclude 'stirling/software/SPDF/controller/web/AccountWebController.java'
+                exclude 'stirling/software/SPDF/model/ApiKeyAuthenticationToken.java'
+                exclude 'stirling/software/SPDF/model/Authority.java'
+                exclude 'stirling/software/SPDF/model/PersistentLogin.java'
+                exclude 'stirling/software/SPDF/model/User.java'
+                exclude 'stirling/software/SPDF/repository/**'
+            }
+        }
+    }
+}
+
 openApi {
-    apiDocsUrl = "http://localhost:8080/v3/api-docs"
+    apiDocsUrl = "http://localhost:8080/v1/api-docs"
     outputDir = file("$projectDir")
     outputFileName = "SwaggerDoc.json"
 }
@@ -45,29 +62,79 @@ launch4j {
 }
 
 dependencies {
-	implementation 'org.springframework.boot:spring-boot-starter-web:3.1.0'
-	implementation 'org.springframework.boot:spring-boot-starter-thymeleaf:3.1.1'
-	testImplementation 'org.springframework.boot:spring-boot-starter-test:3.1.0'
-	// https://mvnrepository.com/artifact/org.apache.pdfbox/jbig2-imageio
-	implementation group: 'org.apache.pdfbox', name: 'jbig2-imageio', version: '3.0.4'
-	implementation 'commons-io:commons-io:2.13.0'
+	//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.0.15'
 	
-    implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.1.0'
+    implementation 'org.yaml:snakeyaml:2.1'
+    implementation 'org.springframework.boot:spring-boot-starter-web:3.1.6'
+    implementation 'org.springframework.boot:spring-boot-starter-thymeleaf:3.1.6'
 
-	//general PDF
-    implementation 'org.apache.pdfbox:pdfbox:2.0.28'
-    implementation 'org.bouncycastle:bcprov-jdk15on:1.70'
-    implementation 'org.bouncycastle:bcpkix-jdk15on:1.70' 
-    implementation 'com.itextpdf:itext7-core:7.2.5'
+    if (System.getenv('DOCKER_ENABLE_SECURITY') != 'false') {
+        implementation 'org.springframework.boot:spring-boot-starter-security:3.1.6'
+        implementation 'org.thymeleaf.extras:thymeleaf-extras-springsecurity5:3.1.2.RELEASE'
+        implementation "org.springframework.boot:spring-boot-starter-data-jpa"
+        implementation "com.h2database:h2"
+    }
+
+    testImplementation 'org.springframework.boot:spring-boot-starter-test:3.1.6'
+
+    // Batik
+    implementation 'org.apache.xmlgraphics:batik-all:1.17'
+
+    // TwelveMonkeys
+    implementation 'com.twelvemonkeys.imageio:imageio-batik:3.10.1'
+    implementation 'com.twelvemonkeys.imageio:imageio-bmp:3.10.1'
+    // implementation 'com.twelvemonkeys.imageio:imageio-hdr:3.10.1'
+    // implementation 'com.twelvemonkeys.imageio:imageio-icns:3.10.1'
+    // implementation 'com.twelvemonkeys.imageio:imageio-iff:3.10.1'
+    implementation 'com.twelvemonkeys.imageio:imageio-jpeg:3.10.1'
+    // implementation 'com.twelvemonkeys.imageio:imageio-pcx:3.10.1'
+    // implementation 'com.twelvemonkeys.imageio:imageio-pict:3.10.1'
+    // implementation 'com.twelvemonkeys.imageio:imageio-pnm:3.10.1'
+    // implementation 'com.twelvemonkeys.imageio:imageio-psd:3.10.1'
+    // implementation 'com.twelvemonkeys.imageio:imageio-sgi:3.10.1'
+    // implementation 'com.twelvemonkeys.imageio:imageio-tga:3.10.1'
+    // implementation 'com.twelvemonkeys.imageio:imageio-thumbsdb:3.10.1'
+    implementation 'com.twelvemonkeys.imageio:imageio-tiff:3.10.1'
+    implementation 'com.twelvemonkeys.imageio:imageio-webp:3.10.1'
+    // implementation 'com.twelvemonkeys.imageio:imageio-xwd:3.10.1'
+
+    implementation 'commons-io:commons-io:2.15.1'
+    implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.2.0'
+
+    //general PDF
+
+    // https://mvnrepository.com/artifact/com.opencsv/opencsv
+    implementation ('com.opencsv:opencsv:5.7.1') {
+        exclude group: 'commons-logging', module: 'commons-logging'
+    }
+    
+    implementation ('org.apache.pdfbox:pdfbox:2.0.29'){
+        exclude group: 'commons-logging', module: 'commons-logging'
+    }
+    
+    implementation ('org.apache.pdfbox:xmpbox:2.0.29'){
+        exclude group: 'commons-logging', module: 'commons-logging'
+    }
+    
+    implementation 'org.bouncycastle:bcprov-jdk18on:1.77'
+    implementation 'org.bouncycastle:bcpkix-jdk18on:1.77'
     implementation 'org.springframework.boot:spring-boot-starter-actuator'
     implementation 'io.micrometer:micrometer-core'
-    
-    implementation group: 'com.google.zxing', name: 'core', version: '3.5.1'
+    implementation group: 'com.google.zxing', name: 'core', version: '3.5.2'
+    // https://mvnrepository.com/artifact/org.commonmark/commonmark
+    implementation 'org.commonmark:commonmark:0.21.0'
+    // https://mvnrepository.com/artifact/com.github.vladimir-bukhtoyarov/bucket4j-core
+    implementation 'com.github.vladimir-bukhtoyarov:bucket4j-core:7.6.0'
 
     developmentOnly("org.springframework.boot:spring-boot-devtools")
-
+    compileOnly 'org.projectlombok:lombok:1.18.30'
+    annotationProcessor 'org.projectlombok:lombok:1.18.28'
 }
 
+
 task writeVersion {
     def propsFile = file('src/main/resources/version.properties')
     def props = new Properties()

chart/stirling-pdf/Chart.yaml

@@ -0,0 +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
+keywords:
+- stirling-pdf
+- helm
+- charts repo
+maintainers:
+- name: Frooodle
+  url: https://github.com/Frooodle/Stirling-PDF
+name: stirling-pdf-chart
+sources:
+- https://github.com/Frooodle/Stirling-PDF
+version: 1.0.0

chart/stirling-pdf/templates/NOTES.txt

@@ -0,0 +1,30 @@
+** Please be patient while the chart is being deployed **
+
+Get the stirlingpdf URL by running:
+
+{{- if contains "NodePort" .Values.service.type }}
+
+  export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ template "stirlingpdf.fullname" . }})
+  export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}")
+  echo http://$NODE_IP:$NODE_PORT/
+
+{{- else if contains "LoadBalancer" .Values.service.type }}
+
+** Please ensure an external IP is associated to the {{ template "stirlingpdf.fullname" . }} service before proceeding **
+** Watch the status using: kubectl get svc --namespace {{ .Release.Namespace }} -w {{ template "stirlingpdf.fullname" . }} **
+
+  export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "stirlingpdf.fullname" . }} -o jsonpath='{.status.loadBalancer.ingress[0].ip}')
+  echo http://$SERVICE_IP:{{ .Values.service.externalPort }}/
+
+OR
+
+  export SERVICE_HOST=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "stirlingpdf.fullname" . }} -o jsonpath='{.status.loadBalancer.ingress[0].hostname}')
+  echo http://$SERVICE_HOST:{{ .Values.service.externalPort }}/
+
+{{- else if contains "ClusterIP"  .Values.service.type }}
+
+  export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app={{ template "stirlingpdf.name" . }}" -l "release={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}")
+  echo http://127.0.0.1:8080/
+  kubectl port-forward $POD_NAME 8080:8080 --namespace {{ .Release.Namespace }}
+
+{{- end }}

chart/stirling-pdf/templates/_helpers.tpl

@@ -0,0 +1,129 @@
+{{/*
+Expand the name of the chart.
+*/}}
+{{- define "stirlingpdf.name" -}}
+{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }}
+{{- end }}
+
+{{/*
+Create a default fully qualified app name.
+We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
+If release name contains chart name it will be used as a full name.
+*/}}
+{{- define "stirlingpdf.fullname" -}}
+{{- if .Values.fullnameOverride }}
+{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }}
+{{- else }}
+{{- $name := default .Chart.Name .Values.nameOverride }}
+{{- if contains $name .Release.Name }}
+{{- .Release.Name | trunc 63 | trimSuffix "-" }}
+{{- else }}
+{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" }}
+{{- end }}
+{{- end }}
+{{- end }}
+
+{{- /*
+Create chart name and version as used by the chart label.
+
+It does minimal escaping for use in Kubernetes labels.
+
+Example output:
+
+stirlingpdf-0.4.5
+*/ -}}
+{{- define "stirlingpdf.chart" -}}
+{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }}
+{{- end -}}
+
+{{/*
+Common labels
+*/}}
+{{- define "stirlingpdf.labels" -}}
+helm.sh/chart: {{ include "stirlingpdf.chart" . }}
+{{ include "stirlingpdf.selectorLabels" . }}
+{{- if .Chart.AppVersion }}
+app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
+{{- end }}
+{{- if .Values.commonLabels}}
+{{ toYaml .Values.commonLabels }}
+{{- end }}
+app.kubernetes.io/managed-by: {{ .Release.Service }}
+{{- end }}
+
+{{/*
+Selector labels
+*/}}
+{{- define "stirlingpdf.selectorLabels" -}}
+app.kubernetes.io/name: {{ include "stirlingpdf.name" . }}
+app.kubernetes.io/instance: {{ .Release.Name }}
+{{- end }}
+
+{{/*
+Create the name of the service account to use
+*/}}
+{{- define "stirlingpdf.serviceAccountName" -}}
+{{- if .Values.serviceAccount.create }}
+{{- default (include "stirlingpdf.fullname" .) .Values.serviceAccount.name }}
+{{- else }}
+{{- default "default" .Values.serviceAccount.name }}
+{{- end }}
+{{- end }}
+
+{{/*
+Return the proper image name to change the volume permissions
+*/}}
+{{- define "stirlingpdf.volumePermissions.image" -}}
+{{- $registryName := .Values.volumePermissions.image.registry -}}
+{{- $repositoryName := .Values.volumePermissions.image.repository -}}
+{{- $tag := .Values.volumePermissions.image.tag | toString -}}
+{{/*
+Helm 2.11 supports the assignment of a value to a variable defined in a different scope,
+but Helm 2.9 and 2.10 doesn't support it, so we need to implement this if-else logic.
+Also, we can't use a single if because lazy evaluation is not an option
+*/}}
+{{- if .Values.global }}
+    {{- if .Values.global.imageRegistry }}
+        {{- printf "%s/%s:%s" .Values.global.imageRegistry $repositoryName $tag -}}
+    {{- else -}}
+        {{- printf "%s/%s:%s" $registryName $repositoryName $tag -}}
+    {{- end -}}
+{{- else -}}
+    {{- printf "%s/%s:%s" $registryName $repositoryName $tag -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Return the proper Docker Image Registry Secret Names
+*/}}
+{{- define "stirlingpdf.imagePullSecrets" -}}
+{{/*
+Helm 2.11 supports the assignment of a value to a variable defined in a different scope,
+but Helm 2.9 and 2.10 does not support it, so we need to implement this if-else logic.
+Also, we can not use a single if because lazy evaluation is not an option
+*/}}
+{{- if .Values.global }}
+{{- if .Values.global.imagePullSecrets }}
+imagePullSecrets:
+{{- range .Values.global.imagePullSecrets }}
+  - name: {{ . }}
+{{- end }}
+{{- else if or .Values.image.pullSecrets .Values.volumePermissions.image.pullSecrets }}
+imagePullSecrets:
+{{- range .Values.image.pullSecrets }}
+  - name: {{ . }}
+{{- end }}
+{{- range .Values.volumePermissions.image.pullSecrets }}
+  - name: {{ . }}
+{{- end }}
+{{- end -}}
+{{- else if or .Values.image.pullSecrets .Values.volumePermissions.image.pullSecrets }}
+imagePullSecrets:
+{{- range .Values.image.pullSecrets }}
+  - name: {{ . }}
+{{- end }}
+{{- range .Values.volumePermissions.image.pullSecrets }}
+  - name: {{ . }}
+{{- end }}
+{{- end -}}
+{{- end -}}

chart/stirling-pdf/templates/deployment.yaml

@@ -0,0 +1,129 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: {{ include "stirlingpdf.fullname" . }}
+  {{- with .Values.deployment.annotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+  labels:
+    {{- include "stirlingpdf.labels" . | nindent 4 }}
+    {{- if .Values.deployment.labels }}
+    {{- toYaml .Values.deployment.labels | nindent 4 }}
+    {{- end }}
+spec:
+  selector:
+    matchLabels:
+      {{- include "stirlingpdf.selectorLabels" . | nindent 6 }}
+  replicas: {{ .Values.replicaCount }}
+  strategy:
+{{ toYaml .Values.strategy | indent 4 }}
+  revisionHistoryLimit: 10
+  template:
+    metadata:
+      {{- with .Values.podAnnotations }}
+      annotations:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      labels:
+        {{- include "stirlingpdf.selectorLabels" . | nindent 8 }}
+        {{- if .Values.podLabels }}
+        {{- toYaml .Values.podLabels | nindent 8 }}
+        {{- end }}
+    spec:
+      {{- if .Values.priorityClassName }}
+      priorityClassName: "{{ .Values.priorityClassName }}"
+      {{- end }}
+      {{- if .Values.securityContext.enabled }}
+      securityContext:
+        fsGroup: {{ .Values.securityContext.fsGroup }}
+        {{- if .Values.securityContext.runAsNonRoot }}
+        runAsNonRoot: {{ .Values.securityContext.runAsNonRoot }}
+        {{- end }}
+        {{- if .Values.securityContext.supplementalGroups }}
+        supplementalGroups: {{ .Values.securityContext.supplementalGroups }}
+        {{- end }}
+      {{- else if .Values.persistence.enabled }}
+      initContainers:
+      - name: volume-permissions
+        image: {{ template "stirlingpdf.volumePermissions.image" . }}
+        imagePullPolicy: "{{ .Values.volumePermissions.image.pullPolicy }}"
+        securityContext:
+          {{- toYaml .Values.containerSecurityContext | nindent 10 }}
+        command: ['sh', '-c', 'chown -R {{ .Values.securityContext.fsGroup }}:{{ .Values.securityContext.fsGroup }} {{ .Values.persistence.path }}']
+        volumeMounts:
+        - mountPath: {{ .Values.persistence.path }}
+          name: storage-volume
+      {{- end }}
+{{- include "stirlingpdf.imagePullSecrets" . | indent 6 }}
+      containers:
+      - name: {{ .Chart.Name }}
+        image: {{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}
+        imagePullPolicy: {{ .Values.image.pullPolicy }}
+        securityContext:
+          {{- toYaml .Values.containerSecurityContext | nindent 10 }}
+{{- if .Values.envs }}
+        env:
+{{ toYaml .Values.envs | indent 8 }}
+{{- end }}
+{{- if .Values.extraArgs }}
+        args:
+{{ toYaml .Values.extraArgs | indent 8 }}
+{{- end }}
+        ports:
+        - name: http
+          containerPort: 8080
+        livenessProbe:
+          httpGet:
+            path: /
+            port: http
+{{ toYaml .Values.probes.livenessHttpGetConfig | indent 12 }}
+{{ toYaml .Values.probes.liveness | indent 10 }}
+        readinessProbe:
+          httpGet:
+            path: /
+            port: http
+{{ toYaml .Values.probes.readinessHttpGetConfig | indent 12 }}
+{{ toYaml .Values.probes.readiness | indent 10 }}
+        volumeMounts:
+{{- if .Values.deployment.extraVolumeMounts }}
+        {{- toYaml .Values.deployment.extraVolumeMounts | nindent 8 }}
+{{- end }}
+{{- if .Values.deployment.sidecarContainers }}
+{{- range $name, $spec :=  .Values.deployment.sidecarContainers }}
+      - name: {{ $name }}
+{{- toYaml $spec | nindent 8 }}
+{{- end }}
+{{- end }}
+      {{- with .Values.resources }}
+        resources:
+{{ toYaml . | indent 10 }}
+      {{- end }}
+    {{- with .Values.nodeSelector }}
+      nodeSelector:
+{{ toYaml . | indent 8 }}
+    {{- end }}
+    {{- with .Values.affinity }}
+      affinity:
+{{ toYaml . | indent 8 }}
+    {{- end }}
+    {{- with .Values.tolerations }}
+      tolerations:
+{{ toYaml . | indent 8 }}
+    {{- end }}
+    {{- if .Values.schedulerName }}
+      schedulerName: {{ .Values.schedulerName }}
+    {{- end }}
+      serviceAccountName: {{ include "stirlingpdf.serviceAccountName" . }}
+      automountServiceAccountToken: {{ .Values.serviceAccount.automountServiceAccountToken }}
+      volumes:
+      {{- if .Values.deployment.extraVolumes }}
+      {{- toYaml .Values.deployment.extraVolumes | nindent 6 }}
+      {{- end }}
+      - name: storage-volume
+      {{- if .Values.persistence.enabled }}
+        persistentVolumeClaim:
+          claimName: {{ .Values.persistence.existingClaim | default (include "stirlingpdf.fullname" .) }}
+      {{- else }}
+        emptyDir: {}
+      {{- end }}

chart/stirling-pdf/templates/ingress.yaml

@@ -0,0 +1,85 @@
+{{- if .Values.ingress.enabled }}
+{{- $servicePort := .Values.service.externalPort -}}
+{{- $serviceName := include "stirlingpdf.fullname" . -}}
+{{- $ingressExtraPaths := .Values.ingress.extraPaths -}}
+---
+{{- if semverCompare "<1.14-0" .Capabilities.KubeVersion.GitVersion }}
+apiVersion: extensions/v1beta1
+{{- else if semverCompare "<1.19-0" .Capabilities.KubeVersion.GitVersion }}
+apiVersion: networking.k8s.io/v1beta1
+{{- else }}
+apiVersion: networking.k8s.io/v1
+{{- end }}
+kind: Ingress
+metadata:
+  name: {{ include "stirlingpdf.fullname" . }}
+  {{- with .Values.ingress.annotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+  labels:
+    {{- include "stirlingpdf.labels" . | nindent 4 }}
+    {{- with .Values.ingress.labels }}
+    {{- toYaml . | nindent 4 }}
+    {{- end }}
+spec:
+  {{- with .Values.ingress.ingressClassName }}
+  ingressClassName: {{ . }}
+  {{- end }}
+  rules:
+  {{- range .Values.ingress.hosts }}
+  - host: {{ .name }}
+    http:
+      paths:
+      {{- range $ingressExtraPaths }}
+      - path: {{ default "/" .path | quote }}
+        backend:
+        {{- if semverCompare "<1.19-0" $.Capabilities.KubeVersion.GitVersion }}
+          {{- if $.Values.service.servicename }}
+          serviceName: {{ $.Values.service.servicename }}
+          {{- else }}
+          serviceName: {{ default $serviceName .service }}
+          {{- end }}
+          servicePort: {{ default $servicePort .port }}
+        {{- else }}
+          service:
+            {{- if $.Values.service.servicename }}
+            name: {{ $.Values.service.servicename }}
+            {{- else }}
+            name: {{ default $serviceName .service }}
+            {{- end }}
+            port:
+              number: {{ default $servicePort .port }}
+        pathType: {{ default $.Values.ingress.pathType .pathType }}
+        {{- end }}
+      {{- end }}
+      - path: {{ default "/" .path | quote }}
+        backend:
+        {{- if semverCompare "<1.19-0" $.Capabilities.KubeVersion.GitVersion }}
+          {{- if $.Values.service.servicename }}
+          serviceName: {{ $.Values.service.servicename }}
+          {{- else }}
+          serviceName: {{ default $serviceName .service }}
+          {{- end }}
+          servicePort: {{ default $servicePort .servicePort }}
+        {{- else }}
+          service:
+            {{- if $.Values.service.servicename }}
+            name: {{ $.Values.service.servicename }}
+            {{- else }}
+            name: {{ default $serviceName .service }}
+            {{- end }}
+            port:
+              number: {{ default $servicePort .port }}
+        pathType: {{ $.Values.ingress.pathType }}
+        {{- end }}
+  {{- end }}
+  tls:
+  {{- range .Values.ingress.hosts }}
+  {{- if .tls }}
+  - hosts:
+    - {{ .name }}
+    secretName: {{ .tlsSecret }}
+  {{- end }}
+  {{- end }}
+{{- end -}}

chart/stirling-pdf/templates/pv.yaml

@@ -0,0 +1,16 @@
+{{- if .Values.persistence.pv.enabled -}}
+apiVersion: v1
+kind: PersistentVolume
+metadata:
+  name: {{ .Values.persistence.pv.pvname | default (include "stirlingpdf.fullname" .) }}
+  labels:
+    {{- include "stirlingpdf.labels" . | nindent 4 }}
+spec:
+  capacity:
+    storage: {{ .Values.persistence.pv.capacity.storage }}
+  accessModes:
+    - {{ .Values.persistence.pv.accessMode | quote }}
+  nfs:
+    server: {{ .Values.persistence.pv.nfs.server }}
+    path: {{ .Values.persistence.pv.nfs.path | quote }}
+{{- end }}

chart/stirling-pdf/templates/pvc.yaml

@@ -0,0 +1,27 @@
+{{- if and .Values.persistence.enabled (not .Values.persistence.existingClaim) -}}
+kind: PersistentVolumeClaim
+apiVersion: v1
+metadata:
+  name: {{ include "stirlingpdf.fullname" . }}
+  labels:
+    {{- include "stirlingpdf.labels" . | nindent 4 }}
+    {{- with .Values.persistence.labels }}
+    {{- toYaml . | nindent 4 }}
+    {{- end }}
+spec:
+  accessModes:
+    - {{ .Values.persistence.accessMode | quote }}
+  resources:
+    requests:
+      storage: {{ .Values.persistence.size | quote }}
+{{- if .Values.persistence.storageClass }}
+{{- if (eq "-" .Values.persistence.storageClass) }}
+  storageClassName: ""
+{{- else }}
+  storageClassName: "{{ .Values.persistence.storageClass }}"
+{{- end }}
+{{- if .Values.persistence.volumeName }}
+  volumeName: "{{ .Values.persistence.volumeName }}"
+{{- end }}
+{{- end }}
+{{- end }}

chart/stirling-pdf/templates/service.yaml

@@ -0,0 +1,48 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ .Values.service.servicename | default (include "stirlingpdf.fullname" .) }}
+  {{- with .Values.service.annotations }}
+  annotations:
+  {{- toYaml . | nindent 4 }}
+  {{- end }}
+  labels:
+    {{- include "stirlingpdf.labels" . | nindent 4 }}
+    {{- with .Values.service.labels }}
+    {{- toYaml . | nindent 4 }}
+    {{- end }}
+spec:
+  type: {{ .Values.service.type }}
+  {{- if (or (eq .Values.service.type "LoadBalancer") (and (eq .Values.service.type "NodePort") (not (empty .Values.service.nodePort)))) }}
+  externalTrafficPolicy: {{ .Values.service.externalTrafficPolicy }}
+  {{- end }}
+  {{- if (and (eq .Values.service.type "LoadBalancer") .Values.service.loadBalancerIP) }}
+  loadBalancerIP: {{ .Values.service.loadBalancerIP }}
+  {{- end }}
+  {{- if (and (eq .Values.service.type "LoadBalancer") .Values.service.loadBalancerSourceRanges) }}
+  loadBalancerSourceRanges:
+  {{- with .Values.service.loadBalancerSourceRanges }}
+{{ toYaml . | indent 2 }}
+  {{- end }}
+  {{- end }}
+  {{- if eq .Values.service.type "ClusterIP" }}
+  {{- if .Values.service.clusterIP }}
+  clusterIP: {{ .Values.service.clusterIP }}
+  {{- end }}
+  {{- end }}
+  ports:
+  - port: {{ .Values.service.externalPort }}
+{{- if (and (eq .Values.service.type "NodePort") (not (empty .Values.service.nodePort))) }}
+    nodePort: {{.Values.service.nodePort}}
+{{- end }}
+{{- if .Values.service.targetPort }}
+    targetPort: {{ .Values.service.targetPort }}
+    name: {{ .Values.service.targetPort }}
+{{- else }}
+    targetPort: http
+    name: http
+{{- end }}
+    protocol: TCP
+    
+  selector:
+    {{- include "stirlingpdf.selectorLabels" . | nindent 4 }}

chart/stirling-pdf/templates/serviceaccount.yaml

@@ -0,0 +1,13 @@
+{{- if .Values.serviceAccount.create -}}
+---
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: {{ include "stirlingpdf.serviceAccountName" . }}
+  {{- with .Values.serviceAccount.annotations }}
+  annotations:
+    {{ toYaml . | nindent 4 }}
+  {{- end }}
+  labels:
+    {{- include "stirlingpdf.labels" . | nindent 4 }}
+{{- end }}

chart/stirling-pdf/templates/servicemonitor.yaml

@@ -0,0 +1,31 @@
+{{- if and ( .Capabilities.APIVersions.Has "monitoring.coreos.com/v1" ) ( .Values.serviceMonitor.enabled ) }}
+apiVersion: monitoring.coreos.com/v1
+kind: ServiceMonitor
+metadata:
+  name: {{ include "stirlingpdf.fullname" . }}
+  namespace: {{ .Values.serviceMonitor.namespace | default .Release.Namespace }}
+  labels:
+    {{- include "stirlingpdf.labels" . | nindent 4 }}
+    {{- with .Values.serviceMonitor.labels }}
+    {{- toYaml . | nindent 4 }}
+    {{- end }}
+spec:
+  endpoints:
+  - targetPort: 8080
+{{- if .Values.serviceMonitor.interval }}
+    interval: {{ .Values.serviceMonitor.interval }}
+{{- end }}
+{{- if .Values.serviceMonitor.metricsPath }}
+    path: {{ .Values.serviceMonitor.metricsPath }}
+{{- end }}
+{{- if .Values.serviceMonitor.timeout }}
+    scrapeTimeout: {{ .Values.serviceMonitor.timeout }}
+{{- end }}
+  jobLabel: {{ include "stirlingpdf.fullname" . }}
+  namespaceSelector:
+    matchNames:
+    - {{ .Release.Namespace }}
+  selector:
+    matchLabels:
+      {{- include "stirlingpdf.selectorLabels" . | nindent 6 }}
+{{- end }}

chart/stirling-pdf/values.yaml

@@ -0,0 +1,239 @@
+extraArgs: []
+  # - --storage-timestamp-tolerance 1s
+replicaCount: 1
+strategy:
+  type: RollingUpdate
+image:
+  repository: frooodle/s-pdf
+  # took Chart appVersion by default
+  tag: ~
+  pullPolicy: IfNotPresent
+secret:
+  labels: {}
+## Labels to apply to all resources
+##
+commonLabels: {}
+# team_name: dev
+
+envs: []
+# - name: PP_HOME_NAME
+#   value: "Stirling PDF"
+# - name: APP_HOME_DESCRIPTION
+#   value: "Your locally hosted one-stop-shop for all your PDF needs."
+# - name: APP_NAVBAR_NAME
+#   value: "Stirling PDF"
+# - name: ALLOW_GOOGLE_VISIBILITY
+#   value: "true"
+# - name: APP_ROOT_PATH
+#   value: "/"
+# - name: APP_LOCALE
+#   value: "en_GB"
+
+deployment:
+  ## stirling-pdf Deployment annotations
+  annotations: {}
+  #   name: value
+  labels: {}
+  #   name: value
+  # additional volumes
+  extraVolumes: []
+  #  - name: nginx-config
+  #    secret:
+  #      secretName: nginx-config
+  # additional volumes to mount
+  extraVolumeMounts: []
+  ## sidecarContainers for the stirling-pdf
+  # Can be used to add a proxy to the pod that does
+  # scanning for secrets, signing, authentication, validation
+  # of the chart's content, send notifications...
+  sidecarContainers: {}
+  ## Example sidecarContainer which uses an extraVolume from above and
+  ## a named port that can be referenced in the service as targetPort.
+  #  proxy:
+  #    image: nginx:latest
+  #    ports:
+  #      - name: proxy
+  #        containerPort: 8081
+  #    volumeMounts:
+  #      - name: nginx-config
+  #        readOnly: true
+  #        mountPath: /etc/nginx
+
+## Pod annotations
+## ref: https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/
+## Read more about kube2iam to provide access to s3 https://github.com/jtblin/kube2iam
+##
+podAnnotations: {}
+  # iam.amazonaws.com/role: role-arn
+
+## Pod labels
+## ref: https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/
+podLabels: {}
+  # name: value
+
+service:
+  servicename:
+  type: ClusterIP
+  externalTrafficPolicy: Local
+  ## Uses pre-assigned IP address from cloud provider
+  ## Only valid if service.type: LoadBalancer
+  loadBalancerIP:
+  ## Limits which cidr blocks can connect to service's load balancer
+  ## Only valid if service.type: LoadBalancer
+  loadBalancerSourceRanges: []
+  # clusterIP: None
+  externalPort: 8080
+  ## targetPort of the container to use. If a sidecar should handle the
+  ## requests first, use the named port from the sidecar. See sidecar example
+  ## from deployment above. Leave empty to use stirling-pdf directly.
+  targetPort:
+  nodePort:
+  annotations: {}
+  labels: {}
+
+serviceMonitor:
+  enabled: false
+  # namespace: prometheus
+  labels: {}
+  metricsPath: "/metrics"
+  # timeout: 60
+  # interval: 60
+
+resources: {}
+#  limits:
+#    cpu: 100m
+#    memory: 128Mi
+#  requests:
+#    cpu: 80m
+#    memory: 64Mi
+
+probes:
+  liveness:
+    initialDelaySeconds: 5
+    periodSeconds: 10
+    timeoutSeconds: 1
+    successThreshold: 1
+    failureThreshold: 3
+  livenessHttpGetConfig:
+    scheme: HTTP
+  readiness:
+    initialDelaySeconds: 5
+    periodSeconds: 10
+    timeoutSeconds: 1
+    successThreshold: 1
+    failureThreshold: 3
+  readinessHttpGetConfig:
+    scheme: HTTP
+
+serviceAccount:
+  create: true
+  name: ""
+  automountServiceAccountToken: false
+  ## Annotations for the Service Account
+  annotations: {}
+
+# UID/GID 1000 is the default user "stirling-pdf" used in
+# the container image starting in v0.8.0 and above. This
+# is required for local persistent storage. If your cluster
+# does not allow this, try setting securityContext: {}
+securityContext:
+  enabled: true
+  fsGroup: 1000
+  ## Optionally, specify supplementalGroups and/or
+  ## runAsNonRoot for security purposes
+  # runAsNonRoot: true
+  # supplementalGroups: [1000]
+
+containerSecurityContext: {}
+
+priorityClassName: ""
+
+nodeSelector: {}
+
+tolerations: []
+
+affinity: {}
+
+persistence:
+  enabled: false
+  accessMode: ReadWriteOnce
+  size: 8Gi
+  labels: {}
+    # name: value
+  path: /tmp
+  ## A manually managed Persistent Volume and Claim
+  ## Requires persistence.enabled: true
+  ## If defined, PVC must be created manually before volume will be bound
+  # existingClaim:
+
+  ## stirling-pdf data Persistent Volume Storage Class
+  ## If defined, storageClassName: <storageClass>
+  ## If set to "-", storageClassName: "", which disables dynamic provisioning
+  ## If undefined (the default) or set to null, no storageClassName spec is
+  ##   set, choosing the default provisioner.  (gp2 on AWS, standard on
+  ##   GKE, AWS & OpenStack)
+  ##
+  # storageClass: "-"
+  # volumeName:
+  pv:
+    enabled: false
+    pvname:
+    capacity:
+      storage: 8Gi
+    accessMode: ReadWriteOnce
+    nfs:
+      server:
+      path:
+
+## Init containers parameters:
+## volumePermissions: Change the owner of the persistent volume mountpoint to RunAsUser:fsGroup
+##
+volumePermissions:
+  image:
+    registry: docker.io
+    repository: bitnami/minideb
+    tag: buster
+    pullPolicy: Always
+    ## Optionally specify an array of imagePullSecrets.
+    ## Secrets must be manually created in the namespace.
+    ## ref: https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/
+    ##
+    # pullSecrets:
+    #   - myRegistryKeySecretName
+
+## Ingress for load balancer
+ingress:
+  enabled: false
+  pathType: "ImplementationSpecific"
+  ## stirling-pdf Ingress labels
+  ##
+  labels: {}
+    # dns: "route53"
+
+  ## stirling-pdf Ingress annotations
+  ##
+  annotations: {}
+    # kubernetes.io/ingress.class: nginx
+    # kubernetes.io/tls-acme: "true"
+
+  ## stirling-pdf Ingress hostnames
+  ## Must be provided if Ingress is enabled
+  ##
+  hosts: []
+    # - name: stirling-pdf.domain1.com
+    #   path: /
+    #   tls: false
+    # - name: stirling-pdf.domain2.com
+    #   path: /
+    #
+    #   ## Set this to true in order to enable TLS on the ingress record
+    #   tls: true
+    #
+    #   ## If TLS is set to true, you must declare what secret will store the key/certificate for TLS
+    #   ## Secrets must be added manually to the namespace
+    #   tlsSecret: stirling-pdf.domain2-tls
+
+  # For Kubernetes >= 1.18 you should specify the ingress-controller via the field ingressClassName
+  # See https://kubernetes.io/blog/2020/04/02/improvements-to-the-ingress-api-in-kubernetes-1.18/#specifying-the-class-of-an-ingress
+  ingressClassName:
+

scripts/detect-blank-pages.py

@@ -1,5 +1,4 @@
 import cv2
-import numpy as np
 import sys
 import argparse
 

scripts/download-security-jar.sh

@@ -0,0 +1,19 @@
+echo "Running Stirling PDF with DOCKER_ENABLE_SECURITY=${DOCKER_ENABLE_SECURITY} and VERSION_TAG=${VERSION_TAG}"
+# 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"
+        curl -L -o app-security.jar https://github.com/Frooodle/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"
+        	curl -L -o app-security.jar https://github.com/Frooodle/Stirling-PDF/releases/download/$VERSION_TAG/Stirling-PDF-with-login.jar
+        fi
+
+        if [ $? -eq 0 ]; then  # checks if curl was successful
+            rm -f app.jar
+            ln -s app-security.jar app.jar
+        fi
+    fi
+fi

scripts/init-without-ocr.sh

@@ -0,0 +1,6 @@
+#!/bin/sh
+
+/scripts/download-security-jar.sh
+
+# Run the main command
+exec "$@"

scripts/init.sh

@@ -5,5 +5,22 @@ echo "Copying original files without overwriting existing files"
 mkdir -p /usr/share/tesseract-ocr
 cp -rn /usr/share/tesseract-ocr-original/* /usr/share/tesseract-ocr 
 
+if [ -d /usr/share/tesseract-ocr/4.00/tessdata ]; then 
+	cp -r /usr/share/tesseract-ocr/4.00/tessdata/* /usr/share/tesseract-ocr/5/tessdata/ || true; 
+fi
+
+# Check if TESSERACT_LANGS environment variable is set and is not empty
+if [[ -n "$TESSERACT_LANGS" ]]; then
+  # Convert comma-separated values to a space-separated list
+  LANGS=$(echo $TESSERACT_LANGS | tr ',' ' ')
+
+  # Install each language pack
+  for LANG in $LANGS; do
+    apt-get install -y "tesseract-ocr-$LANG"
+  done
+fi
+
+/scripts/download-security-jar.sh
+
 # Run the main command
 exec "$@"

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

@@ -1,20 +1,19 @@
 package stirling.software.SPDF;
 
-import java.io.IOException;
 import java.nio.file.Files;
-import java.nio.file.Path;
 import java.nio.file.Paths;
+import java.util.Collections;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.core.env.Environment;
-import org.springframework.scheduling.annotation.EnableScheduling;
 
 import jakarta.annotation.PostConstruct;
+import stirling.software.SPDF.config.ConfigInitializer;
 import stirling.software.SPDF.utils.GeneralUtils;
-
 @SpringBootApplication
+
 //@EnableScheduling
 public class SPdfApplication {
 	
@@ -48,7 +47,15 @@ public class SPdfApplication {
     }
 	
     public static void main(String[] args) {
-        SpringApplication.run(SPdfApplication.class, args);
+    	SpringApplication app = new SpringApplication(SPdfApplication.class);
+    	app.addInitializers(new ConfigInitializer());
+    	if (Files.exists(Paths.get("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.");
+        }
+        app.run(args);
+        
         try {
 			Thread.sleep(1000);
 		} catch (InterruptedException e) {
@@ -58,7 +65,6 @@ public class SPdfApplication {
         
         GeneralUtils.createDir("customFiles/static/");
         GeneralUtils.createDir("customFiles/templates/");
-        GeneralUtils.createDir("config");
         
         
         

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

@@ -1,16 +1,26 @@
 package stirling.software.SPDF.config;
 
+import org.springframework.beans.factory.annotation.Autowired;
 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;
+    
+    @Bean(name = "loginEnabled")
+    public boolean loginEnabled() {
+        return applicationProperties.getSecurity().getEnableLogin();
+    }
+
     @Bean(name = "appName")
     public String appName() {
-        String appName = System.getProperty("APP_HOME_NAME");
-        if (appName == null)
-            appName = System.getenv("APP_HOME_NAME");
-        return (appName != null) ? appName : "Stirling PDF";
+        String homeTitle =  applicationProperties.getUi().getAppName();
+        return (homeTitle != null) ? homeTitle : "Stirling PDF";
     }
 
     @Bean(name = "appVersion")
@@ -21,22 +31,24 @@ public class AppConfig {
 
     @Bean(name = "homeText")
     public String homeText() {
-        String homeText = System.getProperty("APP_HOME_DESCRIPTION");
-        if (homeText == null)
-            homeText = System.getenv("APP_HOME_DESCRIPTION");
-        return (homeText != null) ? homeText : "null";
+    	return (applicationProperties.getUi().getHomeDescription() != null) ? applicationProperties.getUi().getHomeDescription() : "null";
     }
 
+
     @Bean(name = "navBarText")
     public String navBarText() {
-        String navBarText = System.getProperty("APP_NAVBAR_NAME");
-        if (navBarText == null)
-            navBarText = System.getenv("APP_NAVBAR_NAME");
-        if (navBarText == null)
-            navBarText = System.getProperty("APP_HOME_NAME");
-        if (navBarText == null)
-            navBarText = System.getenv("APP_HOME_NAME");
-
-        return (navBarText != null) ? navBarText : "Stirling PDF";
+        String defaultNavBar = applicationProperties.getUi().getAppNameNavbar() != null ? applicationProperties.getUi().getAppNameNavbar() : applicationProperties.getUi().getAppName();
+        return (defaultNavBar != null) ? defaultNavBar : "Stirling PDF";
     }
+	
+	@Bean(name = "rateLimit")
+    public boolean rateLimit() {
+        String appName = System.getProperty("rateLimit");
+        if (appName == null) 
+            appName = System.getenv("rateLimit");
+        System.out.println("rateLimit=" + appName);
+        return (appName != null) ? Boolean.valueOf(appName) : false;
+    }
+	
+	
 }

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

@@ -2,6 +2,7 @@ package stirling.software.SPDF.config;
 
 import java.util.Locale;
 
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.web.servlet.LocaleResolver;
@@ -10,9 +11,14 @@ import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 import org.springframework.web.servlet.i18n.LocaleChangeInterceptor;
 import org.springframework.web.servlet.i18n.SessionLocaleResolver;
 
+import stirling.software.SPDF.model.ApplicationProperties;
+
 @Configuration
 public class Beans implements WebMvcConfigurer {
 	
+	@Autowired
+    ApplicationProperties applicationProperties;
+	
     @Override
     public void addInterceptors(InterceptorRegistry registry) {
         registry.addInterceptor(localeChangeInterceptor());
@@ -30,9 +36,8 @@ public class Beans implements WebMvcConfigurer {
     public LocaleResolver localeResolver() {
         SessionLocaleResolver slr = new SessionLocaleResolver();
         
-        String appLocaleEnv = System.getProperty("APP_LOCALE");
-        if (appLocaleEnv == null)
-            appLocaleEnv = System.getenv("APP_LOCALE");
+        
+        String appLocaleEnv = applicationProperties.getSystem().getDefaultLocale();
         Locale defaultLocale = Locale.UK; // Fallback to UK locale if environment variable is not set
 
         if (appLocaleEnv != null && !appLocaleEnv.isEmpty()) {

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

@@ -1,30 +1,20 @@
 package stirling.software.SPDF.config;
 
-import java.util.List;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import org.springframework.web.servlet.HandlerInterceptor;
-import org.springframework.web.servlet.ModelAndView;
-
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpServletResponse;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
 import java.util.Arrays;
-import java.util.List;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpServletResponse;
-
 import org.springframework.web.servlet.HandlerInterceptor;
 import org.springframework.web.servlet.ModelAndView;
 
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
 public class CleanUrlInterceptor implements HandlerInterceptor {
 
-	private static final List<String> ALLOWED_PARAMS = Arrays.asList("lang", "endpoint", "endpoints");
+	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)
@@ -32,7 +22,6 @@ public class CleanUrlInterceptor implements HandlerInterceptor {
 		String queryString = request.getQueryString();
 		if (queryString != null && !queryString.isEmpty()) {
 			String requestURI = request.getRequestURI();
-
 			Map<String, String> parameters = new HashMap<>();
 
 			// Keep only the allowed parameters

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

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

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

@@ -1,20 +1,28 @@
 package stirling.software.SPDF.config;
 
 import java.util.HashSet;
+import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+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);
     private Map<String, Boolean> endpointStatuses = new ConcurrentHashMap<>();
     private Map<String, Set<String>> endpointGroups = new ConcurrentHashMap<>();
 
-    public EndpointConfiguration() {
+    private final ApplicationProperties applicationProperties;
+
+    @Autowired
+    public EndpointConfiguration(ApplicationProperties applicationProperties) {
+        this.applicationProperties = applicationProperties;
         init();
         processEnvironmentConfigs();
     }
@@ -71,6 +79,12 @@ public class EndpointConfiguration {
         addEndpointToGroup("PageOps", "adjust-contrast");
         addEndpointToGroup("PageOps", "crop");
         addEndpointToGroup("PageOps", "auto-split-pdf");
+        addEndpointToGroup("PageOps", "extract-page");
+        addEndpointToGroup("PageOps", "pdf-to-single-page");
+        addEndpointToGroup("PageOps", "split-by-size-or-count");
+        addEndpointToGroup("PageOps", "overlay-pdf");
+        addEndpointToGroup("PageOps", "split-pdf-by-sections");
+        
         
         // Adding endpoints to "Convert" group
         addEndpointToGroup("Convert", "pdf-to-img");
@@ -85,6 +99,9 @@ public class EndpointConfiguration {
         addEndpointToGroup("Convert", "pdf-to-xml");
         addEndpointToGroup("Convert", "html-to-pdf");
         addEndpointToGroup("Convert", "url-to-pdf");
+        addEndpointToGroup("Convert", "markdown-to-pdf");
+        addEndpointToGroup("Convert", "pdf-to-csv");
+        
         
         // Adding endpoints to "Security" group
         addEndpointToGroup("Security", "add-password");
@@ -93,6 +110,7 @@ public class EndpointConfiguration {
         addEndpointToGroup("Security", "add-watermark");
         addEndpointToGroup("Security", "cert-sign");
         addEndpointToGroup("Security", "sanitize-pdf");
+        addEndpointToGroup("Security", "auto-redact");
         
         
         // Adding endpoints to "Other" group
@@ -106,10 +124,12 @@ public class EndpointConfiguration {
         addEndpointToGroup("Other", "flatten");
         addEndpointToGroup("Other", "repair");
         addEndpointToGroup("Other", "remove-blanks");
+        addEndpointToGroup("Other", "remove-annotations");
         addEndpointToGroup("Other", "compare");
         addEndpointToGroup("Other", "add-page-numbers");
         addEndpointToGroup("Other", "auto-rename");
-        
+        addEndpointToGroup("Other", "get-info-on-pdf");
+        addEndpointToGroup("Other", "show-javascript");
         
         
         
@@ -180,6 +200,16 @@ public class EndpointConfiguration {
         addEndpointToGroup("Java", "auto-split-pdf");
         addEndpointToGroup("Java", "sanitize-pdf");
         addEndpointToGroup("Java", "crop");
+        addEndpointToGroup("Java", "get-info-on-pdf");
+        addEndpointToGroup("Java", "extract-page");
+        addEndpointToGroup("Java", "pdf-to-single-page");
+        addEndpointToGroup("Java", "markdown-to-pdf");
+        addEndpointToGroup("Java", "show-javascript");
+        addEndpointToGroup("Java", "auto-redact");
+        addEndpointToGroup("Java", "pdf-to-csv");
+        addEndpointToGroup("Java", "split-by-size-or-count");
+        addEndpointToGroup("Java", "overlay-pdf");
+        addEndpointToGroup("Java", "split-pdf-by-sections");
         
         //Javascript
         addEndpointToGroup("Javascript", "pdf-organizer");
@@ -191,19 +221,17 @@ public class EndpointConfiguration {
     }
     
     private void processEnvironmentConfigs() {
-        String endpointsToRemove = System.getenv("ENDPOINTS_TO_REMOVE");
-        String groupsToRemove = System.getenv("GROUPS_TO_REMOVE");
+        List<String> endpointsToRemove = applicationProperties.getEndpoints().getToRemove();
+        List<String> groupsToRemove = applicationProperties.getEndpoints().getGroupsToRemove();
 
         if (endpointsToRemove != null) {
-            String[] endpoints = endpointsToRemove.split(",");
-            for (String endpoint : endpoints) {
+            for (String endpoint : endpointsToRemove) {
                 disableEndpoint(endpoint.trim());
             }
         }
 
         if (groupsToRemove != null) {
-            String[] groups = groupsToRemove.split(",");
-            for (String group : groups) {
+            for (String group : groupsToRemove) {
                 disableGroup(group.trim());
             }
         }

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

@@ -30,7 +30,7 @@ public class MetricsFilter extends OncePerRequestFilter {
         
         //System.out.println("uri="+uri + ", method=" + request.getMethod() );
         // Ignore static resources
-        if (!(uri.startsWith("/js") || uri.startsWith("/images") || uri.endsWith(".ico") || uri.endsWith(".css") || uri.endsWith(".svg")|| uri.endsWith(".js") || uri.contains("swagger") || uri.startsWith("/api"))) {
+        if (!(uri.startsWith("/js") || uri.startsWith("api-docs") || uri.endsWith("robots.txt") || uri.startsWith("/images") || uri.endsWith(".png") || uri.endsWith(".ico") || uri.endsWith(".css") || uri.endsWith(".svg")|| uri.endsWith(".js") || uri.contains("swagger") || uri.startsWith("/api"))) {
             Counter counter = Counter.builder("http.requests")
                     .tag("uri", uri)
                     .tag("method", request.getMethod())

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

@@ -1,9 +1,5 @@
 package stirling.software.SPDF.config;
 
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Properties;
-
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
@@ -18,14 +14,9 @@ public class OpenApiConfig {
 	public OpenAPI customOpenAPI() {
 	    String version = getClass().getPackage().getImplementationVersion();
 	    if (version == null) {
-	        Properties props = new Properties();
-	        try (InputStream input = getClass().getClassLoader().getResourceAsStream("version.properties")) {
-	            props.load(input);
-	            version = props.getProperty("version");
-	        } catch (IOException ex) {
-	            ex.printStackTrace();
+	        
 	            version = "1.0.0"; // default version if all else fails
-	        }
+	        
 	    }
 
 	    return new OpenAPI().components(new Components()).info(

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

@@ -0,0 +1,20 @@
+package stirling.software.SPDF.config;
+
+
+import java.time.LocalDateTime;
+
+import org.springframework.context.ApplicationListener;
+import org.springframework.context.event.ContextRefreshedEvent;
+import org.springframework.stereotype.Component;
+
+@Component
+public class StartupApplicationListener implements ApplicationListener<ContextRefreshedEvent> {
+
+    public static LocalDateTime startTime;
+
+    @Override
+    public void onApplicationEvent(ContextRefreshedEvent event) {
+        startTime = LocalDateTime.now();
+    }
+}
+ 

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

@@ -21,7 +21,7 @@ public class WebMvcConfig implements WebMvcConfigurer {
     public void addResourceHandlers(ResourceHandlerRegistry registry) {
         // Handler for external static resources
         registry.addResourceHandler("/**")
-                .addResourceLocations("file:customFiles/static/", "classpath:/static/")
-                .setCachePeriod(0); // Optional: disable caching
+                .addResourceLocations("file:customFiles/static/", "classpath:/static/");
+                //.setCachePeriod(0); // Optional: disable caching
     }
 }

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

@@ -0,0 +1,23 @@
+package stirling.software.SPDF.config;
+
+import java.io.IOException;
+import java.util.Properties;
+
+import org.springframework.beans.factory.config.YamlPropertiesFactoryBean;
+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 {
+        YamlPropertiesFactoryBean factory = new YamlPropertiesFactoryBean();
+        factory.setResources(encodedResource.getResource());
+
+        Properties properties = factory.getObject();
+
+        return new PropertiesPropertySource(encodedResource.getResource().getFilename(), properties);
+    }
+}

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

@@ -0,0 +1,28 @@
+package stirling.software.SPDF.config.security;
+
+import java.io.IOException;
+
+import org.springframework.security.authentication.BadCredentialsException;
+import org.springframework.security.authentication.LockedException;
+import org.springframework.security.core.AuthenticationException;
+import org.springframework.security.web.authentication.SimpleUrlAuthenticationFailureHandler;
+
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
+public class CustomAuthenticationFailureHandler extends SimpleUrlAuthenticationFailureHandler {
+
+    @Override
+    public void onAuthenticationFailure(HttpServletRequest request, HttpServletResponse response, AuthenticationException exception) 
+      throws IOException, ServletException {
+    	String ip = request.getRemoteAddr();
+        logger.error("Failed login attempt from IP: " + ip);
+        if (exception.getClass().isAssignableFrom(BadCredentialsException.class)) {
+        	setDefaultFailureUrl("/login?error=badcredentials");
+        } else if (exception.getClass().isAssignableFrom(LockedException.class)) {
+        	setDefaultFailureUrl("/login?error=locked");
+        }
+        super.onAuthenticationFailure(request, response, exception);
+    }
+}

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

@@ -0,0 +1,45 @@
+package stirling.software.SPDF.config.security;
+
+import java.util.Collection;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.core.GrantedAuthority;
+import org.springframework.security.core.authority.SimpleGrantedAuthority;
+import org.springframework.security.core.userdetails.UserDetails;
+import org.springframework.security.core.userdetails.UserDetailsService;
+import org.springframework.security.core.userdetails.UsernameNotFoundException;
+import org.springframework.stereotype.Service;
+
+import stirling.software.SPDF.model.Authority;
+import stirling.software.SPDF.model.User;
+import stirling.software.SPDF.repository.UserRepository;
+
+@Service
+public class CustomUserDetailsService implements UserDetailsService {
+
+    @Autowired
+    private UserRepository userRepository;
+
+   
+    @Override
+    public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException {
+        User user = userRepository.findByUsername(username)
+            .orElseThrow(() -> new UsernameNotFoundException("No user found with username: " + username));
+
+        return new org.springframework.security.core.userdetails.User(
+            user.getUsername(),
+            user.getPassword(),
+            user.isEnabled(),
+            true, true, true,
+            getAuthorities(user.getAuthorities())
+        );
+    }
+
+    private Collection<? extends GrantedAuthority> getAuthorities(Set<Authority> authorities) {
+        return authorities.stream()
+            .map(authority -> new SimpleGrantedAuthority(authority.getAuthority()))
+            .collect(Collectors.toList());
+    }
+}

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

@@ -0,0 +1,53 @@
+package stirling.software.SPDF.config.security;
+
+import java.io.IOException;
+import java.util.Optional;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.security.core.Authentication;
+import org.springframework.security.core.context.SecurityContextHolder;
+import org.springframework.stereotype.Component;
+import org.springframework.web.filter.OncePerRequestFilter;
+
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import stirling.software.SPDF.model.User;
+
+@Component
+public class FirstLoginFilter extends OncePerRequestFilter {
+	
+    @Autowired
+    @Lazy
+    private UserService userService;
+    
+    @Override
+    protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain filterChain) throws ServletException, IOException {
+    	String method = request.getMethod();
+    	String requestURI = request.getRequestURI(); 
+    	 // Check if the request is for static resources
+        boolean isStaticResource = requestURI.startsWith("/css/") 
+                                || requestURI.startsWith("/js/")
+                                || requestURI.startsWith("/images/")
+                                || requestURI.startsWith("/public/")
+                                || requestURI.endsWith(".svg");
+
+        // If it's a static resource, just continue the filter chain and skip the logic below
+        if (isStaticResource) {
+            filterChain.doFilter(request, response);
+            return;
+        }
+        
+        Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
+        if (authentication != null && authentication.isAuthenticated()) {
+            Optional<User> user = userService.findByUsername(authentication.getName());
+            if ("GET".equalsIgnoreCase(method) && user.isPresent() && user.get().isFirstLogin() && !"/change-creds".equals(requestURI)) {
+                response.sendRedirect("/change-creds");
+                return;
+            }
+        }
+        filterChain.doFilter(request, response);
+    }
+}

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

@@ -0,0 +1,85 @@
+package stirling.software.SPDF.config.security;
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.List;
+import java.util.UUID;
+
+import org.springframework.beans.factory.annotation.Autowired;
+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
+	private UserService userService;
+
+
+	@Autowired
+	ApplicationProperties applicationProperties;
+	
+	@PostConstruct
+	public void init() {
+		if (!userService.hasUsers()) {
+			
+			
+			String initialUsername = applicationProperties.getSecurity().getInitialLogin().getUsername();
+			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);
+			}
+			
+	        
+		}
+	}
+
+
+
+	@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);
+		}
+	}
+
+	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/SecurityConfiguration.java

@@ -0,0 +1,106 @@
+package stirling.software.SPDF.config.security;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.security.authentication.dao.DaoAuthenticationProvider;
+import org.springframework.security.config.annotation.method.configuration.EnableGlobalMethodSecurity;
+import org.springframework.security.config.annotation.web.builders.HttpSecurity;
+import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
+import org.springframework.security.core.userdetails.UserDetailsService;
+import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
+import org.springframework.security.crypto.password.PasswordEncoder;
+import org.springframework.security.web.SecurityFilterChain;
+import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter;
+import org.springframework.security.web.authentication.rememberme.PersistentTokenRepository;
+import org.springframework.security.web.util.matcher.AntPathRequestMatcher;
+
+import stirling.software.SPDF.repository.JPATokenRepositoryImpl;
+@Configuration
+@EnableWebSecurity()
+@EnableGlobalMethodSecurity(prePostEnabled = true)
+public class SecurityConfiguration {
+
+    @Autowired
+    private UserDetailsService userDetailsService;
+
+    @Bean
+    public PasswordEncoder passwordEncoder() {
+        return new BCryptPasswordEncoder();
+    }
+    @Autowired
+    @Lazy
+    private UserService userService;
+    
+    @Autowired
+    @Qualifier("loginEnabled")
+    public boolean loginEnabledValue;
+    
+    @Autowired
+    private UserAuthenticationFilter userAuthenticationFilter;
+    
+    @Autowired
+    private FirstLoginFilter firstLoginFilter;
+    
+    @Bean
+    public SecurityFilterChain filterChain(HttpSecurity http) throws Exception  {
+    	http.addFilterBefore(userAuthenticationFilter, UsernamePasswordAuthenticationFilter.class);
+        
+    	if(loginEnabledValue) {
+    		
+    		http.csrf(csrf -> csrf.disable());
+    		http.addFilterAfter(firstLoginFilter, UsernamePasswordAuthenticationFilter.class);
+	        http
+	            .formLogin(formLogin -> formLogin
+	                .loginPage("/login")
+	                .defaultSuccessUrl("/")
+	                .failureHandler(new CustomAuthenticationFailureHandler())
+	                .permitAll()
+	            )
+	            .logout(logout -> logout
+	            		.logoutRequestMatcher(new AntPathRequestMatcher("/logout"))
+	                    .logoutSuccessUrl("/login?logout=true")
+	                    .invalidateHttpSession(true)        // Invalidate session
+	                    .deleteCookies("JSESSIONID", "remember-me") 
+	            ).rememberMe(rememberMeConfigurer -> rememberMeConfigurer // Use the configurator directly
+                    .key("uniqueAndSecret")
+                    .tokenRepository(persistentTokenRepository())
+                    .tokenValiditySeconds(1209600) // 2 weeks
+                )
+	            .authorizeHttpRequests(authz -> authz
+	                    .requestMatchers(req -> req.getRequestURI().startsWith("/login") || req.getRequestURI().endsWith(".svg") || req.getRequestURI().startsWith("/register") || req.getRequestURI().startsWith("/error") || req.getRequestURI().startsWith("/images/") ||  req.getRequestURI().startsWith("/public/") || req.getRequestURI().startsWith("/css/") || req.getRequestURI().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 DaoAuthenticationProvider authenticationProvider() {
+        DaoAuthenticationProvider authProvider = new DaoAuthenticationProvider();
+        authProvider.setUserDetailsService(userDetailsService);
+        authProvider.setPasswordEncoder(passwordEncoder());
+        return authProvider;
+    }
+    
+    @Bean
+    public PersistentTokenRepository persistentTokenRepository() {
+        return new JPATokenRepositoryImpl();
+    }
+    
+
+    
+}
+

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

@@ -0,0 +1,113 @@
+package stirling.software.SPDF.config.security;
+
+import java.io.IOException;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.http.HttpStatus;
+import org.springframework.security.core.Authentication;
+import org.springframework.security.core.AuthenticationException;
+import org.springframework.security.core.context.SecurityContextHolder;
+import org.springframework.security.core.userdetails.UserDetails;
+import org.springframework.security.core.userdetails.UserDetailsService;
+import org.springframework.stereotype.Component;
+import org.springframework.web.filter.OncePerRequestFilter;
+
+import jakarta.servlet.FilterChain;
+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
+    private UserDetailsService userDetailsService;
+
+    @Autowired
+    @Lazy
+    private UserService userService;
+    
+   
+    @Autowired
+    @Qualifier("loginEnabled")
+    public boolean loginEnabledValue;
+
+    @Override
+    protected void doFilterInternal(HttpServletRequest request,
+                                    HttpServletResponse response,
+                                    FilterChain filterChain) throws ServletException, IOException {
+
+        if (!loginEnabledValue) {
+            // If login is not enabled, just pass all requests without authentication
+            filterChain.doFilter(request, response);
+            return;
+        }
+        String requestURI = request.getRequestURI(); 
+        Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
+
+        // Check for API key in the request headers if no authentication exists
+        if (authentication == null || !authentication.isAuthenticated()) {
+            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.
+                	UserDetails userDetails = userService.loadUserByApiKey(apiKey);
+                	if(userDetails == null)
+                	{
+                		response.setStatus(HttpStatus.UNAUTHORIZED.value());
+                        response.getWriter().write("Invalid API Key.");
+                        return;
+                	}
+                    authentication = new ApiKeyAuthenticationToken(userDetails, apiKey, userDetails.getAuthorities());
+                    SecurityContextHolder.getContext().setAuthentication(authentication);
+                } catch (AuthenticationException e) {
+                    // If API key authentication fails, deny the request
+                    response.setStatus(HttpStatus.UNAUTHORIZED.value());
+                    response.getWriter().write("Invalid API Key.");
+                    return;
+                }
+            }
+        }
+
+        // If we still don't have any authentication, deny the request
+        if (authentication == null || !authentication.isAuthenticated()) {
+        	String method = request.getMethod();
+        	if ("GET".equalsIgnoreCase(method) && !"/login".equals(requestURI)) {
+        		 response.sendRedirect("/login");  // redirect to the login page
+        	     return;
+            } else {
+	            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");
+	            return;
+            }
+        }
+
+        filterChain.doFilter(request, response);
+    }
+    
+    @Override
+    protected boolean shouldNotFilter(HttpServletRequest request) throws ServletException {
+        String uri = request.getRequestURI();
+
+        String[] permitAllPatterns = {
+            "/login",
+            "/register",
+            "/error",
+            "/images/",
+            "/public/",
+            "/css/",
+            "/js/"
+        };
+
+        for (String pattern : permitAllPatterns) {
+            if (uri.startsWith(pattern) || uri.endsWith(".svg")) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+}

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

@@ -0,0 +1,125 @@
+package stirling.software.SPDF.config.security;
+
+import java.io.IOException;
+import java.time.Duration;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.http.HttpStatus;
+import org.springframework.security.core.Authentication;
+import org.springframework.security.core.GrantedAuthority;
+import org.springframework.security.core.context.SecurityContextHolder;
+import org.springframework.security.core.userdetails.UserDetails;
+import org.springframework.security.core.userdetails.UserDetailsService;
+import org.springframework.stereotype.Component;
+import org.springframework.web.filter.OncePerRequestFilter;
+
+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> webBuckets = new ConcurrentHashMap<>();
+
+    @Autowired
+    private UserDetailsService userDetailsService;
+
+    @Autowired
+    @Qualifier("rateLimit")
+    public boolean rateLimit;
+
+    @Override
+    protected void doFilterInternal(HttpServletRequest request,
+                                    HttpServletResponse response,
+                                    FilterChain filterChain) throws ServletException, IOException {
+        if (!rateLimit) {
+            // If rateLimit is not enabled, just pass all requests without rate limiting
+            filterChain.doFilter(request, response);
+            return;
+        }
+
+        String method = request.getMethod();
+        if (!"POST".equalsIgnoreCase(method)) {
+            // If the request is not a POST, just pass it through without rate limiting
+            filterChain.doFilter(request, response);
+            return;
+        }
+
+        String identifier = null;
+
+        // Check for API key in the request headers
+        String apiKey = request.getHeader("X-API-Key");
+        if (apiKey != null && !apiKey.trim().isEmpty()) {
+            identifier = "API_KEY_" + apiKey; // Prefix to distinguish between API keys and usernames
+        } else {
+            Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
+            if (authentication != null && authentication.isAuthenticated()) {
+                UserDetails userDetails = (UserDetails) authentication.getPrincipal();
+                identifier = userDetails.getUsername();
+            }
+        }
+
+        // If neither API key nor an authenticated user is present, use IP address
+        if (identifier == null) {
+            identifier = request.getRemoteAddr();
+        }
+
+        Role userRole = getRoleFromAuthentication(SecurityContextHolder.getContext().getAuthentication());
+
+        if (request.getHeader("X-API-Key") != null) {
+            // It's an API call
+            processRequest(userRole.getApiCallsPerDay(), identifier, apiBuckets, request, response, filterChain);
+        } else {
+            // It's a Web UI call
+            processRequest(userRole.getWebCallsPerDay(), identifier, webBuckets, request, response, filterChain);
+        }
+    }
+
+    private Role getRoleFromAuthentication(Authentication authentication) {
+        if (authentication != null && authentication.isAuthenticated()) {
+            for (GrantedAuthority authority : authentication.getAuthorities()) {
+                try {
+                    return Role.fromString(authority.getAuthority());
+                } catch (IllegalArgumentException ex) {
+                    // Ignore and continue to next authority.
+                }
+            }
+        }
+        throw new IllegalStateException("User does not have a valid role.");
+    }
+
+    private void processRequest(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);
+
+        if (probe.isConsumed()) {
+            response.setHeader("X-Rate-Limit-Remaining", Long.toString(probe.getRemainingTokens()));
+            filterChain.doFilter(request, response);
+        } else {
+            long waitForRefill = probe.getNanosToWaitForRefill() / 1_000_000_000;
+            response.setStatus(HttpStatus.TOO_MANY_REQUESTS.value());
+            response.setHeader("X-Rate-Limit-Retry-After-Seconds", String.valueOf(waitForRefill));
+            response.getWriter().write("Rate limit exceeded for POST requests.");
+        }
+    }
+
+    private Bucket createUserBucket(int limitPerDay) {
+        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

@@ -0,0 +1,191 @@
+package stirling.software.SPDF.config.security;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Optional;
+import java.util.UUID;
+import java.util.stream.Collectors;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
+import org.springframework.security.core.Authentication;
+import org.springframework.security.core.GrantedAuthority;
+import org.springframework.security.core.authority.SimpleGrantedAuthority;
+import org.springframework.security.core.userdetails.UserDetails;
+import org.springframework.security.core.userdetails.UsernameNotFoundException;
+import org.springframework.security.crypto.password.PasswordEncoder;
+import org.springframework.stereotype.Service;
+
+import stirling.software.SPDF.model.Authority;
+import stirling.software.SPDF.model.User;
+import stirling.software.SPDF.repository.UserRepository;
+@Service
+public class UserService {
+    
+    @Autowired
+    private UserRepository userRepository;
+
+    @Autowired
+    private PasswordEncoder passwordEncoder;
+
+    public Authentication getAuthentication(String apiKey) {
+        User user = getUserByApiKey(apiKey);
+        if (user == null) {
+            throw new UsernameNotFoundException("API key is not valid");
+        }
+        
+        // Convert the user into an Authentication object
+        return new UsernamePasswordAuthenticationToken(
+            user,                       // principal (typically the user)
+            null,                       // credentials (we don't expose the password or API key here)
+            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()
+    		    .map((Authority authority) -> new SimpleGrantedAuthority(authority.getAuthority()))
+    		    .collect(Collectors.toList());
+
+
+    }
+    
+    private String generateApiKey() {
+        String apiKey;
+        do {
+            apiKey = UUID.randomUUID().toString();
+        } while (userRepository.findByApiKey(apiKey) != null); // Ensure uniqueness
+        return apiKey;
+    }
+
+    public User addApiKeyToUser(String username) {
+        User user = userRepository.findByUsername(username)
+            .orElseThrow(() -> new UsernameNotFoundException("User not found"));
+        
+        user.setApiKey(generateApiKey());
+        return userRepository.save(user);
+    }
+
+    public User refreshApiKeyForUser(String username) {
+        return addApiKeyToUser(username); // reuse the add API key method for refreshing
+    }
+
+    public String getApiKeyForUser(String username) {
+        User user = userRepository.findByUsername(username)
+            .orElseThrow(() -> new UsernameNotFoundException("User not found"));
+        return user.getApiKey();
+    }
+
+    public boolean isValidApiKey(String apiKey) {
+        return userRepository.findByApiKey(apiKey) != null;
+    }
+
+    public User getUserByApiKey(String apiKey) {
+        return userRepository.findByApiKey(apiKey);
+    }
+    
+    public UserDetails loadUserByApiKey(String apiKey) {
+        User userOptional = userRepository.findByApiKey(apiKey);
+        if (userOptional != null) {
+            User user = userOptional;
+            // Convert your User entity to a UserDetails object with authorities
+            return new org.springframework.security.core.userdetails.User(
+                user.getUsername(),
+                user.getPassword(), // you might not need this for API key auth
+                getAuthorities(user)
+            );
+        }
+        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);
+    }
+    
+    public void saveUser(String username, String password) {
+        User user = new User();
+        user.setUsername(username);
+        user.setPassword(passwordEncoder.encode(password));
+        user.setEnabled(true);
+        userRepository.save(user);
+    }
+
+    public void saveUser(String username, String password, String role, boolean firstLogin) {
+        User user = new User();
+        user.setUsername(username);
+        user.setPassword(passwordEncoder.encode(password));
+        user.addAuthority(new Authority(role, user));
+        user.setEnabled(true);
+        user.setFirstLogin(firstLogin);
+        userRepository.save(user);
+    }
+    
+    public void saveUser(String username, String password, String role) {
+        User user = new User();
+        user.setUsername(username);
+        user.setPassword(passwordEncoder.encode(password));
+        user.addAuthority(new Authority(role, user));
+        user.setEnabled(true);
+        user.setFirstLogin(false);
+        userRepository.save(user);
+    }
+    
+    public void deleteUser(String username) {
+    	 Optional<User> userOpt = userRepository.findByUsername(username);
+         if (userOpt.isPresent()) {
+        	 userRepository.delete(userOpt.get());
+         }
+    }
+    
+    public boolean usernameExists(String username) {
+        return userRepository.findByUsername(username).isPresent();
+    }
+    
+    public boolean hasUsers() {
+        return userRepository.count() > 0;
+    }
+    
+    public void updateUserSettings(String username, Map<String, String> updates) {
+        Optional<User> userOpt = userRepository.findByUsername(username);
+        if (userOpt.isPresent()) {
+            User user = userOpt.get();
+            Map<String, String> settingsMap = user.getSettings();
+
+            if(settingsMap == null) {
+                settingsMap = new HashMap<String,String>();
+            } 
+            settingsMap.clear();
+            settingsMap.putAll(updates);
+            user.setSettings(settingsMap);
+
+            userRepository.save(user);
+        } 
+    }
+
+    public Optional<User> findByUsername(String username) {
+        return userRepository.findByUsername(username);
+    }
+
+    public void changeUsername(User user, String newUsername) {
+        user.setUsername(newUsername);
+        userRepository.save(user);
+    }
+
+    public void changePassword(User user, String newPassword) {
+        user.setPassword(passwordEncoder.encode(newPassword));
+        userRepository.save(user);
+    }
+    
+    public void changeFirstUse(User user, boolean firstUse) {
+        user.setFirstLogin(firstUse);
+        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

@@ -1,132 +1,86 @@
 package stirling.software.SPDF.controller.api;
 
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.stream.Collectors;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipOutputStream;
-
-import org.apache.pdfbox.pdmodel.PDDocument;
-import org.apache.pdfbox.pdmodel.PDPage;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.http.MediaType;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RequestPart;
-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.Parameter;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import stirling.software.SPDF.utils.GeneralUtils;
-import stirling.software.SPDF.utils.WebResponseUtils;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.media.Schema;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.MediaType;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.multipart.MultipartFile;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
 
+import org.apache.pdfbox.multipdf.LayerUtility;
+import org.apache.pdfbox.pdmodel.PDDocument;
+import org.apache.pdfbox.pdmodel.PDPage;
+import org.apache.pdfbox.pdmodel.PDPageContentStream;
+import org.apache.pdfbox.pdmodel.common.PDRectangle;
+import org.apache.pdfbox.pdmodel.graphics.form.PDFormXObject;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.multipart.MultipartFile;
 
-import com.itextpdf.kernel.geom.PageSize;
-import com.itextpdf.kernel.geom.Rectangle;
-import com.itextpdf.kernel.pdf.PdfDocument;
-import com.itextpdf.kernel.pdf.PdfPage;
-import com.itextpdf.kernel.pdf.PdfReader;
-import com.itextpdf.kernel.pdf.PdfWriter;
-import com.itextpdf.kernel.pdf.canvas.PdfCanvas;
-import com.itextpdf.kernel.pdf.canvas.parser.EventType;
-import com.itextpdf.kernel.pdf.canvas.parser.PdfCanvasProcessor;
-import com.itextpdf.kernel.pdf.canvas.parser.data.IEventData;
-import com.itextpdf.kernel.pdf.canvas.parser.data.TextRenderInfo;
-import com.itextpdf.kernel.pdf.canvas.parser.listener.IEventListener;
-import com.itextpdf.kernel.pdf.xobject.PdfFormXObject;
-
-import io.swagger.v3.oas.annotations.Hidden;
 import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.media.Schema;
 import io.swagger.v3.oas.annotations.tags.Tag;
+import stirling.software.SPDF.model.api.general.CropPdfForm;
 import stirling.software.SPDF.utils.WebResponseUtils;
 
 @RestController
+@RequestMapping("/api/v1/general")
 @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")
 	@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")
-	public ResponseEntity<byte[]> cropPdf(
-	        @Parameter(description = "The input PDF file", required = true) @RequestParam("fileInput") MultipartFile file,
-	        @Parameter(description = "The x-coordinate of the top-left corner of the crop area", required = true, schema = @Schema(type = "number")) @RequestParam("x") float x,
-	        @Parameter(description = "The y-coordinate of the top-left corner of the crop area", required = true, schema = @Schema(type = "number")) @RequestParam("y") float y,
-	        @Parameter(description = "The width of the crop area", required = true, schema = @Schema(type = "number")) @RequestParam("width") float width,
-	        @Parameter(description = "The height of the crop area", required = true, schema = @Schema(type = "number")) @RequestParam("height") float height) throws IOException {
-	    byte[] bytes = file.getBytes();
-	    System.out.println("x=" + x + ", " + "y=" + y + ", " + "width=" + width + ", " +"height=" + height  );
-	    PdfReader reader = new PdfReader(new ByteArrayInputStream(bytes));
-	    PdfDocument pdfDoc = new PdfDocument(reader);
-	
-	    ByteArrayOutputStream baos = new ByteArrayOutputStream();
-	    PdfWriter writer = new PdfWriter(baos);
-	    PdfDocument outputPdf = new PdfDocument(writer);
-	
-	    int totalPages = pdfDoc.getNumberOfPages();
-	
-	    for (int i = 1; i <= totalPages; i++) {
-	        PdfPage page = outputPdf.addNewPage(new PageSize(width, height));
-	        PdfCanvas pdfCanvas = new PdfCanvas(page);
-
-	        PdfFormXObject formXObject = pdfDoc.getPage(i).copyAsFormXObject(outputPdf);
-
-	        // Save the graphics state, apply the transformations, add the object, and then
-	        // restore the graphics state
-	        pdfCanvas.saveState();
-	        pdfCanvas.rectangle(x, y, width, height);
-	        pdfCanvas.clip();
-	        pdfCanvas.addXObject(formXObject, -x, -y);
-	        pdfCanvas.restoreState();
-	    }
+	public ResponseEntity<byte[]> cropPdf(@ModelAttribute CropPdfForm form)
+			throws IOException {
 
 
-	    outputPdf.close();
-		byte[] pdfContent = baos.toByteArray();
-		pdfDoc.close();
-		return WebResponseUtils.bytesToWebResponse(pdfContent,
-				file.getOriginalFilename().replaceFirst("[.][^.]+$", "") + "_cropped.pdf");
+		
+
+PDDocument sourceDocument = PDDocument.load(new ByteArrayInputStream(form.getFileInput().getBytes()));
+
+PDDocument newDocument = new PDDocument();
+
+int totalPages = sourceDocument.getNumberOfPages();
+
+LayerUtility layerUtility = new LayerUtility(newDocument);
+
+for (int i = 0; i < totalPages; i++) {
+    PDPage sourcePage = sourceDocument.getPage(i);
+    
+    // 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);
+
+    // Import the source page as a form XObject
+    PDFormXObject formXObject = layerUtility.importPageAsForm(sourceDocument, i);
+
+    contentStream.saveGraphicsState();
+    
+    // Define the crop area
+    contentStream.addRect(form.getX(), form.getY(), form.getWidth(), form.getHeight());
+    contentStream.clip();
+
+    // Draw the entire formXObject
+    contentStream.drawForm(formXObject);
+
+    contentStream.restoreGraphicsState();
+
+    contentStream.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");
 	}
 
 }

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

@@ -1,80 +1,115 @@
 package stirling.software.SPDF.controller.api;
 
 import java.io.IOException;
+import java.io.InputStream;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.nio.file.attribute.BasicFileAttributes;
 import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Comparator;
 import java.util.List;
 
 import org.apache.pdfbox.pdmodel.PDDocument;
 import org.apache.pdfbox.pdmodel.PDPage;
-import org.apache.pdfbox.pdmodel.PDPageTree;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestPart;
+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.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
+import stirling.software.SPDF.model.api.general.MergePdfsRequest;
 import stirling.software.SPDF.utils.WebResponseUtils;
 
 @RestController
+@RequestMapping("/api/v1/general")
 @Tag(name = "General", description = "General APIs")
 public class MergeController {
 
     private static final Logger logger = LoggerFactory.getLogger(MergeController.class);
 
-    private PDDocument mergeDocuments(List<PDDocument> documents) throws IOException {
-        // Create a new empty document
-        PDDocument mergedDoc = new PDDocument();
-
-        // Iterate over the list of documents and add their pages to the merged document
-        for (PDDocument doc : documents) {
-            // Get all pages from the current document
-            PDPageTree pages = doc.getPages();
-            // Iterate over the pages and add them to the merged document
-            for (PDPage page : pages) {
-                mergedDoc.addPage(page);
-            }
-            
 
+private PDDocument mergeDocuments(List<PDDocument> documents) throws IOException {
+	PDDocument mergedDoc = new PDDocument();
+    for (PDDocument doc : documents) {
+        for (PDPage page : doc.getPages()) {
+            mergedDoc.addPage(page);
         }
+    }
+    return mergedDoc;
+}
 
-        // Return the merged document
-        return mergedDoc;
+private Comparator<MultipartFile> getSortComparator(String sortType) {
+    switch (sortType) {
+        case "byFileName":
+            return Comparator.comparing(MultipartFile::getOriginalFilename);
+        case "byDateModified":
+            return (file1, file2) -> {
+                try {
+                    BasicFileAttributes attr1 = 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
+                }
+            };
+        case "byDateCreated":
+            return (file1, file2) -> {
+                try {
+                    BasicFileAttributes attr1 = 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
+                }
+            };
+        case "byPDFTitle":
+            return (file1, file2) -> {
+                try (PDDocument doc1 = PDDocument.load(file1.getInputStream());
+                     PDDocument doc2 = PDDocument.load(file2.getInputStream())) {
+                    String title1 = doc1.getDocumentInformation().getTitle();
+                    String title2 = doc2.getDocumentInformation().getTitle();
+                    return title1.compareTo(title2);
+                } catch (IOException e) {
+                    return 0;
+                }
+            };
+        case "orderProvided":
+        default:
+            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",
+        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 {
+
+	MultipartFile[]  files = form.getFileInput();
+    Arrays.sort(files, getSortComparator(form.getSortType()));
+
+    List<PDDocument> documents = new ArrayList<>();
+    for (MultipartFile file : files) {
+        try (InputStream is = file.getInputStream()) {
+            documents.add(PDDocument.load(is));
+        }
     }
 
-    @PostMapping(consumes = "multipart/form-data", value = "/merge-pdfs")
-    @Operation(
-        summary = "Merge multiple PDF files into one",
-        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(
-        @RequestPart(required = true, value = "fileInput")
-        @Parameter(description = "The input PDF files to be merged into a single file", required = true)
-            MultipartFile[] files) throws IOException {
-    	// Read the input PDF files into PDDocument objects
-        List<PDDocument> documents = new ArrayList<>();
-
-        // Loop through the files array and read each file into a PDDocument
-        for (MultipartFile file : files) {
-            documents.add(PDDocument.load(file.getInputStream()));
-        }
-
-        PDDocument mergedDoc = mergeDocuments(documents);
-
-        
-        // Return the merged PDF as a response
+    try (PDDocument mergedDoc = mergeDocuments(documents)) {
         ResponseEntity<byte[]> response = WebResponseUtils.pdfDocToWebResponse(mergedDoc, files[0].getOriginalFilename().replaceFirst("[.][^.]+$", "") + "_merged.pdf");
-        
-        for (PDDocument doc : documents) {
-            // Close the document after processing
-            doc.close();
-           }
-        
         return response;
+    } finally {
+        for (PDDocument doc : documents) {
+            if (doc != null) {
+                doc.close();
+            }
+        }
     }
+}
 
 }

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

@@ -1,101 +1,124 @@
 package stirling.software.SPDF.controller.api;
 
-import java.io.ByteArrayInputStream;
+
+import java.awt.Color;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 
+import org.apache.pdfbox.multipdf.LayerUtility;
+import org.apache.pdfbox.pdmodel.PDDocument;
+import org.apache.pdfbox.pdmodel.PDPage;
+import org.apache.pdfbox.pdmodel.PDPageContentStream;
+import org.apache.pdfbox.pdmodel.common.PDRectangle;
+import org.apache.pdfbox.pdmodel.graphics.form.PDFormXObject;
+import org.apache.pdfbox.util.Matrix;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
 
-import com.itextpdf.kernel.geom.PageSize;
-import com.itextpdf.kernel.geom.Rectangle;
-import com.itextpdf.kernel.pdf.PdfDocument;
-import com.itextpdf.kernel.pdf.PdfPage;
-import com.itextpdf.kernel.pdf.PdfReader;
-import com.itextpdf.kernel.pdf.PdfWriter;
-import com.itextpdf.kernel.pdf.canvas.PdfCanvas;
-import com.itextpdf.kernel.pdf.xobject.PdfFormXObject;
-
 import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.media.Schema;
 import io.swagger.v3.oas.annotations.tags.Tag;
+import stirling.software.SPDF.model.api.general.MergeMultiplePagesRequest;
 import stirling.software.SPDF.utils.WebResponseUtils;
 
 @RestController
+@RequestMapping("/api/v1/general")
 @Tag(name = "General", description = "General APIs")
 public class MultiPageLayoutController {
 
 	private static final Logger logger = LoggerFactory.getLogger(MultiPageLayoutController.class);
 
 	@PostMapping(value = "/multi-page-layout", consumes = "multipart/form-data")
-	@Operation(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")
-	public ResponseEntity<byte[]> mergeMultiplePagesIntoOne(
-			@Parameter(description = "The input PDF file", required = true) @RequestParam("fileInput") MultipartFile file,
-			@Parameter(description = "The number of pages to fit onto a single sheet in the output PDF. Acceptable values are 2, 3, 4, 9, 16.", required = true, schema = @Schema(type = "integer", allowableValues = {
-					"2", "3", "4", "9", "16" })) @RequestParam("pagesPerSheet") int pagesPerSheet)
-			throws IOException {
+	@Operation(
+	    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"
+	)
+	public ResponseEntity<byte[]> mergeMultiplePagesIntoOne(@ModelAttribute MergeMultiplePagesRequest request)
+	        throws IOException {
 
-		if (pagesPerSheet != 2 && pagesPerSheet != 3
-				&& pagesPerSheet != (int) Math.sqrt(pagesPerSheet) * Math.sqrt(pagesPerSheet)) {
-			throw new IllegalArgumentException("pagesPerSheet must be 2, 3 or a perfect square");
-		}
+	    int pagesPerSheet = request.getPagesPerSheet();
+	    MultipartFile file = request.getFileInput();
+	    boolean addBorder = request.isAddBorder();
 	    
-		int cols = pagesPerSheet == 2 || pagesPerSheet == 3 ? pagesPerSheet : (int) Math.sqrt(pagesPerSheet);
-		int rows = pagesPerSheet == 2 || pagesPerSheet == 3 ? 1 : (int) Math.sqrt(pagesPerSheet);
+	    if (pagesPerSheet != 2 && pagesPerSheet != 3 && pagesPerSheet != (int) Math.sqrt(pagesPerSheet) * Math.sqrt(pagesPerSheet)) {
+	        throw new IllegalArgumentException("pagesPerSheet must be 2, 3 or a perfect square");
+	    }
 
-		byte[] bytes = file.getBytes();
-		PdfReader reader = new PdfReader(new ByteArrayInputStream(bytes));
-		PdfDocument pdfDoc = new PdfDocument(reader);
+	    int cols = pagesPerSheet == 2 || pagesPerSheet == 3 ? pagesPerSheet : (int) Math.sqrt(pagesPerSheet);
+	    int rows = pagesPerSheet == 2 || pagesPerSheet == 3 ? 1 : (int) Math.sqrt(pagesPerSheet);
 
-		ByteArrayOutputStream baos = new ByteArrayOutputStream();
-		PdfWriter writer = new PdfWriter(baos);
-		PdfDocument outputPdf = new PdfDocument(writer);
-		PageSize pageSize = new PageSize(PageSize.A4.rotate());
+	    PDDocument sourceDocument = PDDocument.load(file.getInputStream());
+	    PDDocument newDocument = new PDDocument();
+	    PDPage newPage = new PDPage(PDRectangle.A4);
+	    newDocument.addPage(newPage);
 
-		int totalPages = pdfDoc.getNumberOfPages();
-		float cellWidth = pageSize.getWidth() / cols;
-		float cellHeight = pageSize.getHeight() / rows;
+	    int totalPages = sourceDocument.getNumberOfPages();
+	    float cellWidth = newPage.getMediaBox().getWidth() / cols;
+	    float cellHeight = newPage.getMediaBox().getHeight() / rows;
 
-		for (int i = 1; i <= totalPages; i += pagesPerSheet) {
-			PdfPage page = outputPdf.addNewPage(pageSize);
-			PdfCanvas pdfCanvas = new PdfCanvas(page);
+	    PDPageContentStream contentStream = new PDPageContentStream(newDocument, newPage, PDPageContentStream.AppendMode.APPEND, true, true);
+	    LayerUtility layerUtility = new LayerUtility(newDocument);
 
-			for (int row = 0; row < rows; row++) {
-				for (int col = 0; col < cols; col++) {
-					int index = i + row * cols + col;
-					if (index <= totalPages) {
-						// Get the page and calculate scaling factors
-						Rectangle rect = pdfDoc.getPage(index).getPageSize();
-						float scaleWidth = cellWidth / rect.getWidth();
-						float scaleHeight = cellHeight / rect.getHeight();
-						float scale = Math.min(scaleWidth, scaleHeight);
+	    float borderThickness = 1.5f; // Specify border thickness as required
+	    contentStream.setLineWidth(borderThickness);
+	    contentStream.setStrokingColor(Color.BLACK);
 	    
-						PdfFormXObject formXObject = pdfDoc.getPage(index).copyAsFormXObject(outputPdf);
-						float x = col * cellWidth + (cellWidth - rect.getWidth() * scale) / 2;
-						float y = (rows - 1 - row) * cellHeight + (cellHeight - rect.getHeight() * scale) / 2;
+	    for (int i = 0; i < totalPages; i++) {
+	        if (i != 0 && i % pagesPerSheet == 0) {
+	            // Close the current content stream and create a new page and content stream
+	            contentStream.close();
+	            newPage = new PDPage(PDRectangle.A4);
+	            newDocument.addPage(newPage);
+	            contentStream = new PDPageContentStream(newDocument, newPage, PDPageContentStream.AppendMode.APPEND, true, true);
+	        }
 
-						// Save the graphics state, apply the transformations, add the object, and then
-						// restore the graphics state
-						pdfCanvas.saveState();
-						pdfCanvas.concatMatrix(scale, 0, 0, scale, x, y);
-						pdfCanvas.addXObject(formXObject, 0, 0);
-						pdfCanvas.restoreState();
-					}
-				}
-			}
-		}
+	        PDPage sourcePage = sourceDocument.getPage(i);
+	        PDRectangle rect = sourcePage.getMediaBox();
+	        float scaleWidth = cellWidth / rect.getWidth();
+	        float scaleHeight = cellHeight / rect.getHeight();
+	        float scale = Math.min(scaleWidth, scaleHeight);
 
-		outputPdf.close();
-		byte[] pdfContent = baos.toByteArray();
-		pdfDoc.close();
+	        int adjustedPageIndex = i % pagesPerSheet;  // This will reset the index for every new page
+	        int rowIndex = adjustedPageIndex / cols;
+	        int colIndex = adjustedPageIndex % cols;
 
-		return WebResponseUtils.bytesToWebResponse(pdfContent, file.getOriginalFilename().replaceFirst("[.][^.]+$", "") + "_layoutChanged.pdf");
+	        float x = colIndex * cellWidth + (cellWidth - rect.getWidth() * scale) / 2;
+	        float y = newPage.getMediaBox().getHeight() - ((rowIndex + 1) * cellHeight - (cellHeight - rect.getHeight() * scale) / 2);
+
+	        contentStream.saveGraphicsState();
+	        contentStream.transform(Matrix.getTranslateInstance(x, y));
+	        contentStream.transform(Matrix.getScaleInstance(scale, scale));
+
+	        PDFormXObject formXObject = layerUtility.importPageAsForm(sourceDocument, i);
+	        contentStream.drawForm(formXObject);
+
+	        contentStream.restoreGraphicsState();
+	        
+	        if(addBorder) {
+		        // Draw border around each page
+		        float borderX = colIndex * cellWidth;
+		        float borderY = newPage.getMediaBox().getHeight() - (rowIndex + 1) * cellHeight;
+		        contentStream.addRect(borderX, borderY, cellWidth, cellHeight);
+		        contentStream.stroke();
+	        }
+	    }
+
+
+	    contentStream.close(); // Close the final content stream
+	    sourceDocument.close();
+
+	    ByteArrayOutputStream baos = new ByteArrayOutputStream();
+	    newDocument.save(baos);
+	    newDocument.close();
+
+	    byte[] result = baos.toByteArray();
+	    return WebResponseUtils.bytesToWebResponse(result, file.getOriginalFilename().replaceFirst("[.][^.]+$", "") + "_layoutChanged.pdf");
 	}
 
+
 }

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

@@ -0,0 +1,125 @@
+package stirling.software.SPDF.controller.api;
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.pdfbox.multipdf.Overlay;
+import org.apache.pdfbox.pdmodel.PDDocument;
+import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.multipart.MultipartFile;
+
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import stirling.software.SPDF.model.api.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")
+    @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")
+    public ResponseEntity<byte[]> overlayPdfs(@ModelAttribute OverlayPdfsRequest request) throws IOException {
+        MultipartFile baseFile = request.getFileInput();
+        int overlayPos = request.getOverlayPosition();
+        
+        MultipartFile[] overlayFiles = request.getOverlayFiles();
+        File[] overlayPdfFiles = new File[overlayFiles.length];
+        try{ 
+	        for (int i = 0; i < overlayFiles.length; i++) {
+	            overlayPdfFiles[i] = GeneralUtils.multipartToFile(overlayFiles[i]);
+	        }
+	        
+	        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);
+	            
+	            overlay.setInputPDF(basePdf);
+	            if(overlayPos == 0) {
+	            	overlay.setOverlayPosition(Overlay.Position.FOREGROUND);
+	            } else {
+	            	overlay.setOverlayPosition(Overlay.Position.BACKGROUND);
+	            }
+	
+	            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
+		        
+	            return WebResponseUtils.bytesToWebResponse(data, outputFilename, MediaType.APPLICATION_PDF);
+	        } 
+        } finally {
+            for (File overlayPdfFile : overlayPdfFiles) {
+                if (overlayPdfFile != null) overlayPdfFile.delete();
+            }
+        }
+    }
+
+    private Map<Integer, String> prepareOverlayGuide(int basePageCount, File[] overlayFiles, String mode, int[] counts) throws IOException {
+        Map<Integer, String> overlayGuide = new HashMap<>();
+        switch (mode) {
+            case "SequentialOverlay":
+                sequentialOverlay(overlayGuide, overlayFiles, basePageCount);
+                break;
+            case "InterleavedOverlay":
+                interleavedOverlay(overlayGuide, overlayFiles, basePageCount);
+                break;
+            case "FixedRepeatOverlay":
+                fixedRepeatOverlay(overlayGuide, overlayFiles, counts, basePageCount);
+                break;
+            default:
+                throw new IllegalArgumentException("Invalid overlay mode");
+        }
+        return overlayGuide;
+    }
+
+    private void sequentialOverlay(Map<Integer, String> overlayGuide, File[] overlayFiles, int basePageCount) throws IOException {
+        if (overlayFiles.length != 1 || basePageCount != PDDocument.load(overlayFiles[0]).getNumberOfPages()) {
+            throw new IllegalArgumentException("Overlay file count and base page count must match for sequential overlay.");
+        }
+
+        File overlayFile = overlayFiles[0];
+        try (PDDocument overlayPdf = PDDocument.load(overlayFile)) {
+            for (int i = 1; i <= overlayPdf.getNumberOfPages(); i++) {
+                if (i > basePageCount) break;
+                overlayGuide.put(i, overlayFile.getAbsolutePath());
+            }
+        }
+    }
+
+
+    private void interleavedOverlay(Map<Integer, String> overlayGuide, File[] overlayFiles, int basePageCount) throws IOException {
+        for (int i = 0; i < basePageCount; i++) {
+        	File overlayFile = overlayFiles[i % overlayFiles.length];
+            overlayGuide.put(i + 1, overlayFile.getAbsolutePath());
+        }
+    }
+
+    private void fixedRepeatOverlay(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");
+        }
+        int currentPage = 1;
+        for (int i = 0; i < overlayFiles.length; i++) {
+        	File overlayFile = overlayFiles[i];
+            int repeatCount = counts[i];
+            for (int j = 0; j < repeatCount; j++) {
+                if (currentPage > basePageCount) break;
+                overlayGuide.put(currentPage++, overlayFile.getAbsolutePath());
+            }
+        }
+    }
+}
+
+// Additional classes like OverlayPdfsRequest, WebResponseUtils, etc. are assumed to be defined elsewhere.

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

@@ -9,20 +9,21 @@ import org.apache.pdfbox.pdmodel.PDPage;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RequestPart;
+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.Parameter;
-import io.swagger.v3.oas.annotations.media.Schema;
 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 {
 
@@ -30,11 +31,12 @@ public class RearrangePagesPDFController {
 
 	@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")
-	public ResponseEntity<byte[]> deletePages(
-			@RequestPart(required = true, value = "fileInput") @Parameter(description = "The input PDF file from which pages will be removed") MultipartFile pdfFile,
-			@RequestParam("pagesToDelete") @Parameter(description = "Comma-separated list of pages or page ranges to delete, e.g., '1,3,5-8'") String pagesToDelete)
+	public ResponseEntity<byte[]> deletePages(@ModelAttribute PDFWithPageNums request )
 			throws IOException {
 
+		MultipartFile pdfFile = request.getFileInput();
+		String pagesToDelete = request.getPageNumbers();
+		
 		PDDocument document = PDDocument.load(pdfFile.getBytes());
 
 		// Split the page order string into an array of page numbers or range of numbers
@@ -51,9 +53,7 @@ public class RearrangePagesPDFController {
 
 	}
 
-	private enum CustomMode {
-		REVERSE_ORDER, DUPLEX_SORT, BOOKLET_SORT, ODD_EVEN_SPLIT, REMOVE_FIRST, REMOVE_LAST, REMOVE_FIRST_AND_LAST,
-	}
+	
 
 	private List<Integer> removeFirst(int totalPages) {
 		if (totalPages <= 1)
@@ -114,6 +114,18 @@ public class RearrangePagesPDFController {
 		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) {
 		List<Integer> newPageOrder = new ArrayList<>();
 		for (int i = 1; i <= totalPages; i += 2) {
@@ -125,9 +137,9 @@ public class RearrangePagesPDFController {
 		return newPageOrder;
 	}
 
-	private List<Integer> processCustomMode(String customMode, int totalPages) {
+	private List<Integer> processSortTypes(String sortTypes, int totalPages) {
 		try {
-			CustomMode mode = CustomMode.valueOf(customMode.toUpperCase());
+			SortTypes mode = SortTypes.valueOf(sortTypes.toUpperCase());
 			switch (mode) {
 			case REVERSE_ORDER:
 				return reverseOrder(totalPages);
@@ -135,6 +147,8 @@ public class RearrangePagesPDFController {
 				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:
@@ -154,16 +168,10 @@ public class RearrangePagesPDFController {
 
 	@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(
-			@RequestPart(required = true, value = "fileInput") @Parameter(description = "The input PDF file to rearrange pages") MultipartFile pdfFile,
-			@RequestParam(required = false, value = "pageOrder") @Parameter(description = "The new page order as a comma-separated list of page numbers, page ranges (e.g., '1,3,5-7'), or functions in the format 'an+b' where 'a' is the multiplier of the page number 'n', and 'b' is a constant (e.g., '2n+1', '3n', '6n-5')") String pageOrder,
-			@RequestParam(required = false, value = "customMode") @Parameter(schema = @Schema(implementation = CustomMode.class, description = "The custom mode for page rearrangement. "
-					+ "Valid values are:\n" + "REVERSE_ORDER: Reverses the order of all pages.\n"
-					+ "DUPLEX_SORT: Sorts pages as if all fronts were scanned then all backs in reverse (1, n, 2, n-1, ...). "
-					+ "BOOKLET_SORT: Arranges pages for booklet printing (last, first, second, second last, ...).\n"
-					+ "ODD_EVEN_SPLIT: Splits and arranges pages into odd and even numbered pages.\n"
-					+ "REMOVE_FIRST: Removes the first page.\n" + "REMOVE_LAST: Removes the last page.\n"
-					+ "REMOVE_FIRST_AND_LAST: Removes both the first and the last pages.\n")) String customMode) {
+	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());
@@ -171,15 +179,14 @@ public class RearrangePagesPDFController {
 			// 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();
-			System.out.println("pageOrder=" + pageOrder);
-			System.out.println("customMode length =" + customMode.length());
 			List<Integer> newPageOrder;
-			if (customMode != null && customMode.length() > 0) {
-				newPageOrder = processCustomMode(customMode, totalPages);
+			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++) {

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

@@ -8,18 +8,19 @@ import org.apache.pdfbox.pdmodel.PDPageTree;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RequestPart;
+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.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
+import stirling.software.SPDF.model.api.general.RotatePDFRequest;
 import stirling.software.SPDF.utils.WebResponseUtils;
 
 @RestController
+@RequestMapping("/api/v1/general")
 @Tag(name = "General", description = "General APIs")
 public class RotationController {
 
@@ -31,13 +32,9 @@ public class RotationController {
         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(
-        @RequestPart(required = true, value = "fileInput")
-        @Parameter(description = "The PDF file to be rotated", required = true)
-            MultipartFile pdfFile,
-        @RequestParam("angle")
-        @Parameter(description = "The angle by which to rotate the PDF file. This should be a multiple of 90.", example = "90", required = true)
-            Integer angle) throws IOException {
-    	
+    		@ModelAttribute RotatePDFRequest request) throws IOException {
+        MultipartFile pdfFile = request.getFileInput();
+        Integer angle = request.getAngle();
         // Load the PDF document
         PDDocument document = PDDocument.load(pdfFile.getBytes());
 

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

@@ -1,48 +1,32 @@
 package stirling.software.SPDF.controller.api;
 
-import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
-import java.util.Set;
 
+import org.apache.pdfbox.multipdf.LayerUtility;
+import org.apache.pdfbox.pdmodel.PDDocument;
+import org.apache.pdfbox.pdmodel.PDPage;
+import org.apache.pdfbox.pdmodel.PDPageContentStream;
+import org.apache.pdfbox.pdmodel.common.PDRectangle;
+import org.apache.pdfbox.pdmodel.graphics.form.PDFormXObject;
+import org.apache.pdfbox.util.Matrix;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
 
-import com.itextpdf.kernel.geom.PageSize;
-import com.itextpdf.kernel.geom.Rectangle;
-import com.itextpdf.kernel.pdf.PdfDocument;
-import com.itextpdf.kernel.pdf.PdfPage;
-import com.itextpdf.kernel.pdf.PdfReader;
-import com.itextpdf.kernel.pdf.PdfWriter;
-import com.itextpdf.kernel.pdf.canvas.PdfCanvas;
-import com.itextpdf.kernel.pdf.canvas.parser.EventType;
-import com.itextpdf.kernel.pdf.canvas.parser.PdfCanvasProcessor;
-import com.itextpdf.kernel.pdf.canvas.parser.data.IEventData;
-import com.itextpdf.kernel.pdf.canvas.parser.data.TextRenderInfo;
-import com.itextpdf.kernel.pdf.canvas.parser.listener.IEventListener;
-import com.itextpdf.kernel.pdf.xobject.PdfFormXObject;
-
-import io.swagger.v3.oas.annotations.Hidden;
 import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.media.Schema;
 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 {
 
@@ -50,194 +34,77 @@ public class ScalePagesController {
 
 	@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")
-	public ResponseEntity<byte[]> scalePages(
-			@Parameter(description = "The input PDF file", required = true) @RequestParam("fileInput") MultipartFile file,
-			@Parameter(description = "The scale of pages in the output PDF. Acceptable values are A0-A10, B0-B9, LETTER, TABLOID, LEDGER, LEGAL, EXECUTIVE.", required = true, schema = @Schema(type = "string", allowableValues = {
-					"A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "A8", "A9", "A10", "B0", "B1", "B2", "B3", "B4",
-					"B5", "B6", "B7", "B8", "B9", "LETTER", "TABLOID", "LEDGER", "LEGAL",
-					"EXECUTIVE" })) @RequestParam("pageSize") String targetPageSize,
-			@Parameter(description = "The scale of the content on the pages of the output PDF. Acceptable values are floats.", required = true, schema = @Schema(type = "integer")) @RequestParam("scaleFactor") float scaleFactor)
-			throws IOException {
+	public ResponseEntity<byte[]> scalePages(@ModelAttribute ScalePagesRequest request) throws IOException {
+	    MultipartFile file = request.getFileInput();
+	    String targetPDRectangle = request.getPageSize();
+	    float scaleFactor = request.getScaleFactor();
 
-		Map<String, PageSize> sizeMap = new HashMap<>();
+		Map<String, PDRectangle> sizeMap = new HashMap<>();
 		// Add A0 - A10
-		sizeMap.put("A0", PageSize.A0);
-		sizeMap.put("A1", PageSize.A1);
-		sizeMap.put("A2", PageSize.A2);
-		sizeMap.put("A3", PageSize.A3);
-		sizeMap.put("A4", PageSize.A4);
-		sizeMap.put("A5", PageSize.A5);
-		sizeMap.put("A6", PageSize.A6);
-		sizeMap.put("A7", PageSize.A7);
-		sizeMap.put("A8", PageSize.A8);
-		sizeMap.put("A9", PageSize.A9);
-		sizeMap.put("A10", PageSize.A10);
-		// Add B0 - B9
-		sizeMap.put("B0", PageSize.B0);
-		sizeMap.put("B1", PageSize.B1);
-		sizeMap.put("B2", PageSize.B2);
-		sizeMap.put("B3", PageSize.B3);
-		sizeMap.put("B4", PageSize.B4);
-		sizeMap.put("B5", PageSize.B5);
-		sizeMap.put("B6", PageSize.B6);
-		sizeMap.put("B7", PageSize.B7);
-		sizeMap.put("B8", PageSize.B8);
-		sizeMap.put("B9", PageSize.B9);
+		sizeMap.put("A0", PDRectangle.A0);
+		sizeMap.put("A1", PDRectangle.A1);
+		sizeMap.put("A2", PDRectangle.A2);
+		sizeMap.put("A3", PDRectangle.A3);
+		sizeMap.put("A4", PDRectangle.A4);
+		sizeMap.put("A5", PDRectangle.A5);
+		sizeMap.put("A6", PDRectangle.A6);
+
 		// Add other sizes
-		sizeMap.put("LETTER", PageSize.LETTER);
-		sizeMap.put("TABLOID", PageSize.TABLOID);
-		sizeMap.put("LEDGER", PageSize.LEDGER);
-		sizeMap.put("LEGAL", PageSize.LEGAL);
-		sizeMap.put("EXECUTIVE", PageSize.EXECUTIVE);
+		sizeMap.put("LETTER", PDRectangle.LETTER);
+		sizeMap.put("LEGAL", PDRectangle.LEGAL);
 
-		if (!sizeMap.containsKey(targetPageSize)) {
+		if (!sizeMap.containsKey(targetPDRectangle)) {
 			throw new IllegalArgumentException(
-					"Invalid pageSize. 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");
 		}
 
-		PageSize pageSize = sizeMap.get(targetPageSize);
+		PDRectangle targetSize = sizeMap.get(targetPDRectangle);
 
-		byte[] bytes = file.getBytes();
-		PdfReader reader = new PdfReader(new ByteArrayInputStream(bytes));
-		PdfDocument pdfDoc = new PdfDocument(reader);
+	    PDDocument sourceDocument = PDDocument.load(file.getBytes());
+	    PDDocument outputDocument = new PDDocument();
 
-		ByteArrayOutputStream baos = new ByteArrayOutputStream();
-		PdfWriter writer = new PdfWriter(baos);
-		PdfDocument outputPdf = new PdfDocument(writer);
+	    int totalPages = sourceDocument.getNumberOfPages();
+	    for (int i = 0; i < totalPages; i++) {
+	        PDPage sourcePage = sourceDocument.getPage(i);
+	        PDRectangle sourceSize = sourcePage.getMediaBox();
 	        
-		int totalPages = pdfDoc.getNumberOfPages();
+	        float scaleWidth = targetSize.getWidth() / sourceSize.getWidth();
+	        float scaleHeight = targetSize.getHeight() / sourceSize.getHeight();
+	        float scale = Math.min(scaleWidth, scaleHeight) * scaleFactor;
 	        
-		for (int i = 1; i <= totalPages; i++) {
-			PdfPage page = outputPdf.addNewPage(pageSize);
-			PdfCanvas pdfCanvas = new PdfCanvas(page);
+	        PDPage newPage = new PDPage(targetSize);
+	        outputDocument.addPage(newPage);
 	        
-			// Get the page and calculate scaling factors
-			Rectangle rect = pdfDoc.getPage(i).getPageSize();
-			float scaleWidth = pageSize.getWidth() / rect.getWidth();
-			float scaleHeight = pageSize.getHeight() / rect.getHeight();
-			float scale = Math.min(scaleWidth, scaleHeight) * scaleFactor;
-			System.out.println("Scale: " + scale);
+	        PDPageContentStream contentStream = new PDPageContentStream(outputDocument, newPage, PDPageContentStream.AppendMode.APPEND, true);
 	        
-			PdfFormXObject formXObject = pdfDoc.getPage(i).copyAsFormXObject(outputPdf);
-			float x = (pageSize.getWidth() - rect.getWidth() * scale) / 2; // Center Page
-			float y = (pageSize.getHeight() - rect.getHeight() * scale) / 2;
+	        float x = (targetSize.getWidth() - sourceSize.getWidth() * scale) / 2;
+	        float y = (targetSize.getHeight() - sourceSize.getHeight() * scale) / 2;
 	        
-			// Save the graphics state, apply the transformations, add the object, and then
-			// restore the graphics state
-			pdfCanvas.saveState();
-			pdfCanvas.concatMatrix(scale, 0, 0, scale, x, y);
-			pdfCanvas.addXObject(formXObject, 0, 0);
-			pdfCanvas.restoreState();
-		}
+	        contentStream.saveGraphicsState();
+	        contentStream.transform(Matrix.getTranslateInstance(x, y));
+	        contentStream.transform(Matrix.getScaleInstance(scale, scale));
 	        
-		outputPdf.close();
-		byte[] pdfContent = baos.toByteArray();
-		pdfDoc.close();
-		return WebResponseUtils.bytesToWebResponse(pdfContent,
+	        LayerUtility layerUtility = new LayerUtility(outputDocument);
+	        PDFormXObject form = layerUtility.importPageAsForm(sourceDocument, i);
+	        contentStream.drawForm(form);
+
+	        contentStream.restoreGraphicsState();
+	        contentStream.close();
+	    }
+
+
+
+
+
+	    ByteArrayOutputStream baos = new ByteArrayOutputStream();
+	    outputDocument.save(baos);
+	    outputDocument.close();
+	    sourceDocument.close();
+	    
+	    
+		return WebResponseUtils.bytesToWebResponse(baos.toByteArray(),
 				file.getOriginalFilename().replaceFirst("[.][^.]+$", "") + "_scaled.pdf");
 	}
 
-	//TODO
-	@Hidden
-	@PostMapping(value = "/auto-crop", consumes = "multipart/form-data")
-	public ResponseEntity<byte[]> cropPdf(@RequestParam("fileInput") MultipartFile file) throws IOException {
-		byte[] bytes = file.getBytes();
-		PdfReader reader = new PdfReader(new ByteArrayInputStream(bytes));
-		PdfDocument pdfDoc = new PdfDocument(reader);
-
-		ByteArrayOutputStream baos = new ByteArrayOutputStream();
-		PdfWriter writer = new PdfWriter(baos);
-		PdfDocument outputPdf = new PdfDocument(writer);
-
-		int totalPages = pdfDoc.getNumberOfPages();
-		for (int i = 1; i <= totalPages; i++) {
-			PdfPage page = pdfDoc.getPage(i);
-			Rectangle originalMediaBox = page.getMediaBox();
-
-			Rectangle contentBox = determineContentBox(page);
-
-			// Make sure we don't go outside the original media box.
-			Rectangle intersection = originalMediaBox.getIntersection(contentBox);
-			page.setCropBox(intersection);
-
-			// Copy page to the new document
-			outputPdf.addPage(page.copyTo(outputPdf));
-		}
-
-		outputPdf.close();
-		byte[] pdfContent = baos.toByteArray();
-		pdfDoc.close();
-		return ResponseEntity.ok()
-				.header(HttpHeaders.CONTENT_DISPOSITION, "attachment; filename=\""
-						+ file.getOriginalFilename().replaceFirst("[.][^.]+$", "") + "_cropped.pdf\"")
-				.contentType(MediaType.APPLICATION_PDF).body(pdfContent);
-	}
-
-	private Rectangle determineContentBox(PdfPage page) {
-		// Extract the text from the page and find the bounding box.
-		TextBoundingRectangleFinder finder = new TextBoundingRectangleFinder();
-		PdfCanvasProcessor processor = new PdfCanvasProcessor(finder);
-		processor.processPageContent(page);
-		return finder.getBoundingBox();
-	}
-
-	private static class TextBoundingRectangleFinder implements IEventListener {
-		private List<Rectangle> allTextBoxes = new ArrayList<>();
-
-		public Rectangle getBoundingBox() {
-			// Sort the text boxes based on their vertical position
-			allTextBoxes.sort(Comparator.comparingDouble(Rectangle::getTop));
-
-			// Consider a box an outlier if its top is more than 1.5 times the IQR above the
-			// third quartile.
-			int q1Index = allTextBoxes.size() / 4;
-			int q3Index = 3 * allTextBoxes.size() / 4;
-			double iqr = allTextBoxes.get(q3Index).getTop() - allTextBoxes.get(q1Index).getTop();
-			double threshold = allTextBoxes.get(q3Index).getTop() + 1.5 * iqr;
-
-			// Initialize boundingBox to the first non-outlier box
-			int i = 0;
-			while (i < allTextBoxes.size() && allTextBoxes.get(i).getTop() > threshold) {
-				i++;
-			}
-			if (i == allTextBoxes.size()) {
-				// If all boxes are outliers, just return the first one
-				return allTextBoxes.get(0);
-			}
-			Rectangle boundingBox = allTextBoxes.get(i);
-
-			// Extend the bounding box to include all non-outlier boxes
-			for (; i < allTextBoxes.size(); i++) {
-				Rectangle textBoundingBox = allTextBoxes.get(i);
-				if (textBoundingBox.getTop() > threshold) {
-					// This box is an outlier, skip it
-					continue;
-				}
-				float left = Math.min(boundingBox.getLeft(), textBoundingBox.getLeft());
-				float bottom = Math.min(boundingBox.getBottom(), textBoundingBox.getBottom());
-				float right = Math.max(boundingBox.getRight(), textBoundingBox.getRight());
-				float top = Math.max(boundingBox.getTop(), textBoundingBox.getTop());
-
-				// Add a small padding around the bounding box
-				float padding = 10;
-				boundingBox = new Rectangle(left - padding, bottom - padding, right - left + 2 * padding,
-						top - bottom + 2 * padding);
-			}
-			return boundingBox;
-		}
-
-		@Override
-		public void eventOccurred(IEventData data, EventType type) {
-			if (type == EventType.RENDER_TEXT) {
-				TextRenderInfo renderInfo = (TextRenderInfo) data;
-				allTextBoxes.add(renderInfo.getBaseline().getBoundingRectangle());
-			}
-		}
-
-		@Override
-		public Set<EventType> getSupportedEvents() {
-			return Collections.singleton(EventType.RENDER_TEXT);
-		}
-	}
 
 }

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

@@ -17,19 +17,19 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RequestPart;
+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.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
-import stirling.software.SPDF.utils.GeneralUtils;
+import stirling.software.SPDF.model.api.PDFWithPageNums;
 import stirling.software.SPDF.utils.WebResponseUtils;
 
 @RestController
+@RequestMapping("/api/v1/general")
 @Tag(name = "General", description = "General APIs")
 public class SplitPDFController {
 
@@ -38,35 +38,16 @@ public class SplitPDFController {
     @PostMapping(consumes = "multipart/form-data", value = "/split-pages")
     @Operation(summary = "Split a PDF file into separate documents",
             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")
-    public ResponseEntity<byte[]> splitPdf(
-            @RequestPart(required = true, value = "fileInput")
-            @Parameter(description = "The input PDF file to be split")
-                    MultipartFile file,
-            @RequestParam("pages")
-            @Parameter(description = "The pages to be included in separate documents. Specify individual page numbers (e.g., '1,3,5'), ranges (e.g., '1-3,5-7'), or 'all' for every page.")
-                    String pages) throws IOException {
-        // parse user input
-
+    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 = new ArrayList<>();
-        pages = pages.replaceAll("\\s+", ""); // remove whitespaces
-        if (pages.toLowerCase().equals("all")) {
-            for (int i = 0; i < document.getNumberOfPages(); i++) {
-                pageNumbers.add(i);
-            }
-        } else {
-            String[] splitPoints = pages.split(",");
-            for (String splitPoint : splitPoints) {
-                List<Integer> orderedPages = GeneralUtils.parsePageList(new String[] {splitPoint}, document.getNumberOfPages());
-                pageNumbers.addAll(orderedPages);
-            }
-            // Add the last page as a split point
-            pageNumbers.add(document.getNumberOfPages() - 1);
-        }
-
+        List<Integer> pageNumbers = request.getPageNumbersList(document);
+        if(!pageNumbers.contains(document.getNumberOfPages() - 1))
+        	pageNumbers.add(document.getNumberOfPages()- 1);
         logger.info("Splitting PDF into pages: {}", pageNumbers.stream().map(String::valueOf).collect(Collectors.joining(",")));
 
         // split the document

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

@@ -0,0 +1,135 @@
+package stirling.software.SPDF.controller.api;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipOutputStream;
+
+import org.apache.pdfbox.multipdf.LayerUtility;
+import org.apache.pdfbox.pdmodel.PDDocument;
+import org.apache.pdfbox.pdmodel.PDPage;
+import org.apache.pdfbox.pdmodel.PDPageContentStream;
+import org.apache.pdfbox.pdmodel.common.PDRectangle;
+import org.apache.pdfbox.pdmodel.graphics.form.PDFormXObject;
+import org.apache.pdfbox.util.Matrix;
+import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.multipart.MultipartFile;
+
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import stirling.software.SPDF.model.api.SplitPdfBySectionsRequest;
+import stirling.software.SPDF.utils.WebResponseUtils;
+@RestController
+@RequestMapping("/api/v1/general")
+@Tag(name = "Misc", description = "Miscellaneous APIs")
+public class SplitPdfBySectionsController {
+
+
+	@PostMapping(value = "/split-pdf-by-sections", consumes = "multipart/form-data")
+    @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, Split Parameters. Output: ZIP containing split documents.")
+    public ResponseEntity<byte[]> splitPdf(@ModelAttribute SplitPdfBySectionsRequest request) throws Exception {
+        List<ByteArrayOutputStream> splitDocumentsBoas = new ArrayList<>();
+
+        MultipartFile file = request.getFileInput();
+        PDDocument sourceDocument = PDDocument.load(file.getInputStream());
+
+        // Process the PDF based on split parameters
+        int horiz = request.getHorizontalDivisions() + 1;
+        int verti = request.getVerticalDivisions() + 1;
+
+        List<PDDocument> splitDocuments = splitPdfPages(sourceDocument, verti, horiz);
+        for (PDDocument doc : splitDocuments) {
+            ByteArrayOutputStream baos = new ByteArrayOutputStream();
+            doc.save(baos);
+            doc.close();
+            splitDocumentsBoas.add(baos);
+        }
+
+        sourceDocument.close();
+
+        Path zipFile = Files.createTempFile("split_documents", ".zip");
+        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++) {
+                ByteArrayOutputStream baos = splitDocumentsBoas.get(i);
+                int sectionNum = (i % (horiz * verti)) + 1;
+                String fileName = filename + "_" + pageNum + "_" + sectionNum + ".pdf";
+                byte[] pdf = baos.toByteArray();
+                ZipEntry pdfEntry = new ZipEntry(fileName);
+                zipOut.putNextEntry(pdfEntry);
+                zipOut.write(pdf);
+                zipOut.closeEntry();
+
+                if (sectionNum == horiz * verti) pageNum++;
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        } finally {
+            data = Files.readAllBytes(zipFile);
+            Files.delete(zipFile);
+        }
+
+        return WebResponseUtils.bytesToWebResponse(data, filename + "_split.zip", MediaType.APPLICATION_OCTET_STREAM);
+    }
+    
+    public List<PDDocument> splitPdfPages(PDDocument document, int horizontalDivisions, int verticalDivisions) throws IOException {
+        List<PDDocument> splitDocuments = new ArrayList<>();
+
+        for (PDPage originalPage : document.getPages()) {
+            PDRectangle originalMediaBox = originalPage.getMediaBox();
+            float width = originalMediaBox.getWidth();
+            float height = originalMediaBox.getHeight();
+            float subPageWidth = width / horizontalDivisions;
+            float subPageHeight = height / verticalDivisions;
+
+            LayerUtility layerUtility = new LayerUtility(document);
+
+            for (int i = 0; i < horizontalDivisions; i++) {
+                for (int j = 0; j < verticalDivisions; j++) {
+                    PDDocument subDoc = new PDDocument();
+                    PDPage subPage = new PDPage(new PDRectangle(subPageWidth, subPageHeight));
+                    subDoc.addPage(subPage);
+
+                    PDFormXObject form = layerUtility.importPageAsForm(document, document.getPages().indexOf(originalPage));
+
+                    try (PDPageContentStream contentStream = new PDPageContentStream(subDoc, subPage)) {
+                        // Set clipping area and position
+                        float translateX = -subPageWidth * i;
+                        float translateY = height - subPageHeight * (verticalDivisions - j);
+
+                        contentStream.saveGraphicsState();
+                        contentStream.addRect(0, 0, subPageWidth, subPageHeight);
+                        contentStream.clip();
+                        contentStream.transform(new Matrix(1, 0, 0, 1, translateX, translateY));
+
+                        // Draw the form
+                        contentStream.drawForm(form);
+                        contentStream.restoreGraphicsState();
+                    }
+
+                    splitDocuments.add(subDoc);
+                }
+            }
+        }
+
+        return splitDocuments;
+    }
+
+
+
+    
+
+}

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

@@ -0,0 +1,153 @@
+package stirling.software.SPDF.controller.api;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipOutputStream;
+
+import org.apache.pdfbox.pdmodel.PDDocument;
+import org.apache.pdfbox.pdmodel.PDPage;
+import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.multipart.MultipartFile;
+
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import stirling.software.SPDF.model.api.general.SplitPdfBySizeOrCountRequest;
+import stirling.software.SPDF.utils.GeneralUtils;
+import stirling.software.SPDF.utils.WebResponseUtils;
+
+@RestController
+@RequestMapping("/api/v1/general")
+@Tag(name = "Misc", description = "Miscellaneous 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"
+    		+ " 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 Type:SIMO")
+    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
+        int type = request.getSplitType();
+        String value = request.getSplitValue();
+        
+        if (type == 0) { // Split by size
+            long maxBytes = GeneralUtils.convertSizeToBytes(value);
+            long currentSize = 0;
+            PDDocument currentDoc = new PDDocument();
+
+            for (PDPage page : sourceDocument.getPages()) {
+                ByteArrayOutputStream pageOutputStream = new ByteArrayOutputStream();
+                PDDocument tempDoc = new PDDocument();
+                tempDoc.addPage(page);
+                tempDoc.save(pageOutputStream);
+                tempDoc.close();
+
+                long pageSize = pageOutputStream.size();
+                if (currentSize + pageSize > maxBytes) {
+                    // Save and reset current document
+                    splitDocumentsBoas.add(currentDocToByteArray(currentDoc));
+                    currentDoc = new PDDocument();
+                    currentSize = 0;
+                }
+
+                currentDoc.addPage(page);
+                currentSize += pageSize;
+            }
+            // Add the last document if it contains any pages
+            if (currentDoc.getPages().getCount() != 0) {
+                splitDocumentsBoas.add(currentDocToByteArray(currentDoc));
+            }
+        } else if (type == 1) { // Split by page count
+            int pageCount = Integer.parseInt(value);
+            int currentPageCount = 0;
+            PDDocument currentDoc = new PDDocument();
+
+            for (PDPage page : sourceDocument.getPages()) {
+                currentDoc.addPage(page);
+                currentPageCount++;
+
+                if (currentPageCount == pageCount) {
+                    // Save and reset current document
+                    splitDocumentsBoas.add(currentDocToByteArray(currentDoc));
+                    currentDoc = new PDDocument();
+                    currentPageCount = 0;
+                }
+            }
+            // Add the last document if it contains any pages
+            if (currentDoc.getPages().getCount() != 0) {
+                splitDocumentsBoas.add(currentDocToByteArray(currentDoc));
+            }
+        } else if (type == 2) { // Split by doc count
+        	int documentCount = Integer.parseInt(value);
+            int totalPageCount = sourceDocument.getNumberOfPages();
+            int pagesPerDocument = totalPageCount / documentCount;
+            int extraPages = totalPageCount % documentCount;
+            int currentPageIndex = 0;
+
+            for (int i = 0; i < documentCount; i++) {
+                PDDocument currentDoc = new PDDocument();
+                int pagesToAdd = pagesPerDocument + (i < extraPages ? 1 : 0);
+
+                for (int j = 0; j < pagesToAdd; j++) {
+                    currentDoc.addPage(sourceDocument.getPage(currentPageIndex++));
+                }
+
+                splitDocumentsBoas.add(currentDocToByteArray(currentDoc));
+            }
+        } else {
+            throw new IllegalArgumentException("Invalid argument for split type");
+        }
+
+        sourceDocument.close();
+        
+        
+        
+        Path zipFile = Files.createTempFile("split_documents", ".zip");
+        String filename = file.getOriginalFilename().replaceFirst("[.][^.]+$", "");
+        byte[] data;
+
+        try (ZipOutputStream zipOut = new ZipOutputStream(Files.newOutputStream(zipFile))) {
+            for (int i = 0; i < splitDocumentsBoas.size(); i++) {
+                String fileName = filename + "_" + (i + 1) + ".pdf";
+                ByteArrayOutputStream baos = splitDocumentsBoas.get(i);
+                byte[] pdf = baos.toByteArray();
+
+                ZipEntry pdfEntry = new ZipEntry(fileName);
+                zipOut.putNextEntry(pdfEntry);
+                zipOut.write(pdf);
+                zipOut.closeEntry();
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        } finally {
+        	data = Files.readAllBytes(zipFile);
+            Files.delete(zipFile);
+        }
+
+        return WebResponseUtils.bytesToWebResponse(data, filename + ".zip", MediaType.APPLICATION_OCTET_STREAM);
+    }
+    
+    private ByteArrayOutputStream currentDocToByteArray(PDDocument document) throws IOException {
+        ByteArrayOutputStream baos = new ByteArrayOutputStream();
+        document.save(baos);
+        document.close();
+        return baos;
+    }
+    
+
+}

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

@@ -0,0 +1,86 @@
+package stirling.software.SPDF.controller.api;
+
+import java.awt.geom.AffineTransform;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+
+import org.apache.pdfbox.multipdf.LayerUtility;
+import org.apache.pdfbox.pdmodel.PDDocument;
+import org.apache.pdfbox.pdmodel.PDPage;
+import org.apache.pdfbox.pdmodel.PDPageContentStream;
+import org.apache.pdfbox.pdmodel.common.PDRectangle;
+import org.apache.pdfbox.pdmodel.graphics.form.PDFormXObject;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import 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")
+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",
+        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 {
+
+    	// Load the source document
+    	PDDocument sourceDocument = PDDocument.load(request.getFileInput().getInputStream());
+
+    	// Calculate total height and max width
+    	float totalHeight = 0;
+    	float maxWidth = 0;
+    	for (PDPage page : sourceDocument.getPages()) {
+    	    PDRectangle pageSize = page.getMediaBox();
+    	    totalHeight += pageSize.getHeight();
+    	    maxWidth = Math.max(maxWidth, pageSize.getWidth());
+    	}
+
+    	// Create new document and page with calculated dimensions
+    	PDDocument newDocument = new PDDocument();
+    	PDPage newPage = new PDPage(new PDRectangle(maxWidth, totalHeight));
+    	newDocument.addPage(newPage);
+
+    	// Initialize the content stream of the new page
+    	PDPageContentStream contentStream = new PDPageContentStream(newDocument, newPage);
+    	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");
+
+
+
+       
+    }
+}

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

@@ -0,0 +1,234 @@
+package stirling.software.SPDF.controller.api;
+
+import java.security.Principal;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Optional;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.security.core.Authentication;
+import org.springframework.security.web.authentication.logout.SecurityContextLogoutHandler;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.servlet.mvc.support.RedirectAttributes;
+import org.springframework.web.servlet.view.RedirectView;
+
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import stirling.software.SPDF.config.security.UserService;
+import stirling.software.SPDF.model.User;
+
+@Controller
+@RequestMapping("/api/v1/user")
+public class UserController {
+    
+    @Autowired
+    private UserService userService;
+    
+    @PostMapping("/register")
+    public String register(@RequestParam String username, @RequestParam String password, Model model) {
+        if(userService.usernameExists(username)) {
+            model.addAttribute("error", "Username already exists");
+            return "register";
+        }
+
+        userService.saveUser(username, password);
+        return "redirect:/login?registered=true";
+    }
+    
+    @PostMapping("/change-username-and-password")
+    public RedirectView changeUsernameAndPassword(Principal principal,
+                                                 @RequestParam String currentPassword, 
+                                                 @RequestParam String newUsername, 
+                                                 @RequestParam String newPassword, 
+                                                 HttpServletRequest request, 
+                                                 HttpServletResponse response,
+                                                 RedirectAttributes redirectAttributes) {
+    	if (principal == null) {
+    	    return new RedirectView("/change-creds?messageType=notAuthenticated");
+    	}
+
+    	Optional<User> userOpt = userService.findByUsername(principal.getName());
+
+    	if (userOpt == null || userOpt.isEmpty()) {
+    	    return new RedirectView("/change-creds?messageType=userNotFound");
+    	}
+
+    	User user = userOpt.get();
+
+    	if (!userService.isPasswordCorrect(user, currentPassword)) {
+    	    return new RedirectView("/change-creds?messageType=incorrectPassword");
+    	}
+
+    	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)) {
+            userService.changeUsername(user, newUsername);
+        }
+        userService.changeFirstUse(user, false);
+
+        // Logout using Spring's utility
+        new SecurityContextLogoutHandler().logout(request, response, null);
+
+        return new RedirectView("/login?messageType=credsUpdated");
+    }
+
+
+    
+    @PostMapping("/change-username")
+    public RedirectView changeUsername(Principal principal,
+                                       @RequestParam String currentPassword, 
+                                       @RequestParam String newUsername, 
+                                       HttpServletRequest request, 
+                                       HttpServletResponse response,
+                                       RedirectAttributes redirectAttributes) {
+    	if (principal == null) {
+    	    return new RedirectView("/account?messageType=notAuthenticated");
+    	}
+
+    	Optional<User> userOpt = userService.findByUsername(principal.getName());
+
+    	if (userOpt == null || userOpt.isEmpty()) {
+    	    return new RedirectView("/account?messageType=userNotFound");
+    	}
+
+    	User user = userOpt.get();
+
+    	if (!userService.isPasswordCorrect(user, currentPassword)) {
+    	    return new RedirectView("/account?messageType=incorrectPassword");
+    	}
+
+    	if (!user.getUsername().equals(newUsername) && userService.usernameExists(newUsername)) {
+    	    return new RedirectView("/account?messageType=usernameExists");
+    	}
+
+    	if(newUsername != null && newUsername.length() > 0) {
+            userService.changeUsername(user, newUsername);
+        }
+
+        // Logout using Spring's utility
+        new SecurityContextLogoutHandler().logout(request, response, null);
+
+        return new RedirectView("/login?messageType=credsUpdated");
+    }
+
+    @PostMapping("/change-password")
+    public RedirectView changePassword(Principal principal, 
+                                       @RequestParam String currentPassword, 
+                                       @RequestParam String newPassword, 
+                                       HttpServletRequest request, 
+                                       HttpServletResponse response,
+                                       RedirectAttributes redirectAttributes) {
+    	if (principal == null) {
+    	    return new RedirectView("/account?messageType=notAuthenticated");
+    	}
+
+    	Optional<User> userOpt = userService.findByUsername(principal.getName());
+
+    	if (userOpt == null || userOpt.isEmpty()) {
+    	    return new RedirectView("/account?messageType=userNotFound");
+    	}
+
+    	User user = userOpt.get();
+
+    	if (!userService.isPasswordCorrect(user, currentPassword)) {
+    	    return new RedirectView("/account?messageType=incorrectPassword");
+    	}
+
+        userService.changePassword(user, newPassword);
+
+        // Logout using Spring's utility
+        new SecurityContextLogoutHandler().logout(request, response, null);
+
+        return new RedirectView("/login?messageType=credsUpdated");
+    }
+
+    
+    @PostMapping("/updateUserSettings")
+	public String updateUserSettings(HttpServletRequest request, Principal principal) {
+	    Map<String, String[]> paramMap = request.getParameterMap();
+	    Map<String, String> updates = new HashMap<>();
+
+	    System.out.println("Received parameter map: " + paramMap);
+
+	    for (Map.Entry<String, String[]> entry : paramMap.entrySet()) {
+	        updates.put(entry.getKey(), entry.getValue()[0]);
+	    }
+
+	    System.out.println("Processed updates: " + updates);
+
+	    // Assuming you have a method in userService to update the settings for a user
+	    userService.updateUserSettings(principal.getName(), updates);
+
+	    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, 
+    		@RequestParam(name = "forceChange", required = false, defaultValue = "false") boolean forceChange) {
+    	
+    	if(userService.usernameExists(username)) {
+    		return new RedirectView("/addUsers?messageType=usernameExists");
+    	}
+        userService.saveUser(username, password, role, forceChange);
+        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) {
+    	
+    	// Get the currently authenticated username
+        String currentUsername = authentication.getName();
+
+        // Check if the provided username matches the current session's username
+        if (currentUsername.equals(username)) {
+            throw new IllegalArgumentException("Cannot delete currently logined in user.");
+        }
+        
+    	userService.deleteUser(username); 
+        return "redirect:/addUsers";
+    }
+    
+    @PostMapping("/get-api-key")
+    public ResponseEntity<String> getApiKey(Principal principal) {
+        if (principal == null) {
+            return ResponseEntity.status(HttpStatus.FORBIDDEN).body("User not authenticated.");
+        }
+        String username = principal.getName();
+        String apiKey = userService.getApiKeyForUser(username);
+        if (apiKey == null) {
+            return ResponseEntity.status(HttpStatus.NOT_FOUND).body("API key not found for user.");
+        }
+        return ResponseEntity.ok(apiKey);
+    }
+
+    @PostMapping("/update-api-key")
+    public ResponseEntity<String> updateApiKey(Principal principal) {
+        if (principal == null) {
+            return ResponseEntity.status(HttpStatus.FORBIDDEN).body("User not authenticated.");
+        }
+        String username = principal.getName();
+        User user = userService.refreshApiKeyForUser(username);
+        String apiKey = user.getApiKey();
+        if (apiKey == null) {
+            return ResponseEntity.status(HttpStatus.NOT_FOUND).body("API key not found for user.");
+        }
+        return ResponseEntity.ok(apiKey);
+    }
+    
+    
+}

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

@@ -0,0 +1,130 @@
+package stirling.software.SPDF.controller.api.converters;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.StringReader;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipInputStream;
+
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.multipart.MultipartFile;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.NodeList;
+import org.xml.sax.InputSource;
+
+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.GeneralFile;
+import stirling.software.SPDF.utils.FileToPdf;
+import stirling.software.SPDF.utils.WebResponseUtils;
+
+@RestController
+@RequestMapping("/api/v1/convert")
+@Tag(name = "Convert", description = "Convert APIs")
+public class ConvertEpubToPdf {
+	//TODO
+	@PostMapping(consumes = "multipart/form-data", value = "/epub-to-single-pdf")
+	@Hidden
+	@Operation(
+	    summary = "Convert an EPUB file to a single PDF",
+	    description = "This endpoint takes an EPUB file input and converts it to a single PDF."
+	)
+	public ResponseEntity<byte[]> epubToSinglePdf(
+			@ModelAttribute GeneralFile request) 
+	        throws Exception {
+		MultipartFile fileInput = request.getFileInput();
+	    if (fileInput == null) {
+	        throw new IllegalArgumentException("Please provide an EPUB file for conversion.");
+	    }
+
+	    String originalFilename = fileInput.getOriginalFilename();
+	    if (originalFilename == null || !originalFilename.endsWith(".epub")) {
+	        throw new IllegalArgumentException("File must be in .epub format.");
+	    }
+
+	    Map<String, byte[]> epubContents = extractEpubContent(fileInput);
+	    List<String> htmlFilesOrder = getHtmlFilesOrderFromOpf(epubContents);
+
+	    List<byte[]> individualPdfs = new ArrayList<>();
+
+	    for (String htmlFile : htmlFilesOrder) {
+	        byte[] htmlContent = epubContents.get(htmlFile);
+	        byte[] pdfBytes = FileToPdf.convertHtmlToPdf(htmlContent, htmlFile.replace(".html", ".pdf"));
+	        individualPdfs.add(pdfBytes);
+	    }
+
+	    // Pseudo-code to merge individual PDFs into one.
+	    byte[] mergedPdfBytes = mergeMultiplePdfsIntoOne(individualPdfs);
+
+	    return WebResponseUtils.bytesToWebResponse(mergedPdfBytes, originalFilename.replace(".epub", ".pdf"));
+	}
+
+	// Assuming a pseudo-code function that merges multiple PDFs into one.
+	private byte[] mergeMultiplePdfsIntoOne(List<byte[]> individualPdfs) {
+	    // You can use a library such as  PDFBox to perform the merging here.
+	    // Return the byte[] of the merged PDF.
+		return null;
+	}
+	
+    private Map<String, byte[]> extractEpubContent(MultipartFile fileInput) throws IOException {
+        Map<String, byte[]> contentMap = new HashMap<>();
+
+        try (ZipInputStream zis = new ZipInputStream(fileInput.getInputStream())) {
+            ZipEntry zipEntry = zis.getNextEntry();
+            while (zipEntry != null) {
+                ByteArrayOutputStream baos = new ByteArrayOutputStream();
+                byte[] buffer = new byte[1024];
+                int read = 0;
+                while ((read = zis.read(buffer)) != -1) {
+                    baos.write(buffer, 0, read);
+                }
+                contentMap.put(zipEntry.getName(), baos.toByteArray());
+                zipEntry = zis.getNextEntry();
+            }
+        }
+
+        return contentMap;
+    }
+
+    private List<String> getHtmlFilesOrderFromOpf(Map<String, byte[]> epubContents) throws Exception {
+        String opfContent = new String(epubContents.get("OEBPS/content.opf"));  // Adjusting for given path
+        DocumentBuilderFactory dbFactory = DocumentBuilderFactory.newInstance();
+        DocumentBuilder dBuilder = dbFactory.newDocumentBuilder();
+        InputSource is = new InputSource(new StringReader(opfContent));
+        Document doc = dBuilder.parse(is);
+
+        NodeList itemRefs = doc.getElementsByTagName("itemref");
+        List<String> htmlFilesOrder = new ArrayList<>();
+        
+        for (int i = 0; i < itemRefs.getLength(); i++) {
+            Element itemRef = (Element) itemRefs.item(i);
+            String idref = itemRef.getAttribute("idref");
+            
+            NodeList items = doc.getElementsByTagName("item");
+            for (int j = 0; j < items.getLength(); j++) {
+                Element item = (Element) items.item(j);
+                if (idref.equals(item.getAttribute("id"))) {
+                    htmlFilesOrder.add(item.getAttribute("href"));  // Fetching the actual href
+                    break;
+                }
+            }
+        }
+
+        return htmlFilesOrder;
+    }
+
+
+}

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

@@ -1,40 +1,33 @@
 package stirling.software.SPDF.controller.api.converters;
 
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipInputStream;
-
 import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestPart;
+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.utils.GeneralUtils;
-import stirling.software.SPDF.utils.ProcessExecutor;
+import stirling.software.SPDF.model.api.GeneralFile;
+import stirling.software.SPDF.utils.FileToPdf;
 import stirling.software.SPDF.utils.WebResponseUtils;
 
 @RestController
 @Tag(name = "Convert", description = "Convert APIs")
+@RequestMapping("/api/v1/convert")
 public class ConvertHtmlToPDF {
 
 
-	 @PostMapping(consumes = "multipart/form-data", value = "/html-to-pdf")
+	 @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(
-	            @RequestPart(required = true, value = "fileInput") MultipartFile fileInput) throws IOException, InterruptedException {
+	    		@ModelAttribute GeneralFile request) 
+	    		        throws Exception {
+	    			MultipartFile fileInput = request.getFileInput();
 
 	        if (fileInput == null) {
 	            throw new IllegalArgumentException("Please provide an HTML or ZIP file for conversion.");
@@ -43,85 +36,15 @@ public class ConvertHtmlToPDF {
 	        String originalFilename = fileInput.getOriginalFilename();
 	        if (originalFilename == null || (!originalFilename.endsWith(".html") && !originalFilename.endsWith(".zip"))) {
 	            throw new IllegalArgumentException("File must be either .html or .zip format.");
-	        }
-	        Path tempOutputFile = Files.createTempFile("output_", ".pdf");
-	        Path tempInputFile = null;
-	        byte[] pdfBytes;
-	        try {
-		        if (originalFilename.endsWith(".html")) {
-		            tempInputFile = Files.createTempFile("input_", ".html");
-		            Files.write(tempInputFile, fileInput.getBytes());
-		        } else {
-		            tempInputFile = unzipAndGetMainHtml(fileInput);
-		        }
+	        }byte[] pdfBytes = FileToPdf.convertHtmlToPdf( fileInput.getBytes(), originalFilename);
 	        
-		        List<String> command = new ArrayList<>();
-		        command.add("weasyprint");
-		        command.add(tempInputFile.toString()); 
-		        command.add(tempOutputFile.toString());
-		        int returnCode = 0;
-		        if (originalFilename.endsWith(".zip")) {	        	
-		        	returnCode = ProcessExecutor.getInstance(ProcessExecutor.Processes.WEASYPRINT)
-	                .runCommandWithOutputHandling(command, tempInputFile.getParent().toFile());
-		        } else {
-	
-		        	returnCode = ProcessExecutor.getInstance(ProcessExecutor.Processes.WEASYPRINT)
-		                                        .runCommandWithOutputHandling(command);
-		        }
-	
-		        pdfBytes = Files.readAllBytes(tempOutputFile);
-	        } finally {
-		        // Clean up temporary files
-		        Files.delete(tempOutputFile);
-		        Files.delete(tempInputFile);
-		        
-		        if (originalFilename.endsWith(".zip")) {
-		        	GeneralUtils.deleteDirectory(tempInputFile.getParent());
-		        }
-	        }
 	        String outputFilename = originalFilename.replaceFirst("[.][^.]+$", "") + ".pdf";  // Remove file extension and append .pdf
+	        
 	        return WebResponseUtils.bytesToWebResponse(pdfBytes, outputFilename);
 	    }
 
 	   
 
-	    private Path unzipAndGetMainHtml(MultipartFile zipFile) throws IOException {
-	        Path tempDirectory = Files.createTempDirectory("unzipped_");
-	        try (ZipInputStream zipIn = new ZipInputStream(new ByteArrayInputStream(zipFile.getBytes()))) {
-	            ZipEntry entry = zipIn.getNextEntry();
-	            while (entry != null) {
-	                Path filePath = tempDirectory.resolve(entry.getName());
-	                if (entry.isDirectory()) {
-	                    Files.createDirectories(filePath);  // Explicitly create the directory structure
-	                } else {
-	                    Files.createDirectories(filePath.getParent()); // Create parent directories if they don't exist
-	                    Files.copy(zipIn, filePath);
-	                }
-	                zipIn.closeEntry();
-	                entry = zipIn.getNextEntry();
-	            }
-	        }
-
-	        //search for the main HTML file.
-	        try (Stream<Path> walk = Files.walk(tempDirectory)) {
-	            List<Path> htmlFiles = walk.filter(file -> file.toString().endsWith(".html"))
-	                                       .collect(Collectors.toList());
-
-	            if (htmlFiles.isEmpty()) {
-	                throw new IOException("No HTML files found in the unzipped directory.");
-	            }
-
-	            // Prioritize 'index.html' if it exists, otherwise use the first .html file
-	            for (Path htmlFile : htmlFiles) {
-	                if (htmlFile.getFileName().toString().equals("index.html")) {
-	                    return htmlFile;
-	                }
-	            }
-
-	            return htmlFiles.get(0);
-	        }
-	    }
-
     
    
 	    

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

@@ -1,6 +1,7 @@
 package stirling.software.SPDF.controller.api.converters;
 
 import java.io.IOException;
+import java.net.URLConnection;
 
 import org.apache.pdfbox.rendering.ImageType;
 import org.slf4j.Logger;
@@ -11,43 +12,35 @@ import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RequestPart;
+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.Parameter;
-import io.swagger.v3.oas.annotations.media.Schema;
 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;
 import stirling.software.SPDF.utils.WebResponseUtils;
+
 @RestController
+@RequestMapping("/api/v1/convert")
 @Tag(name = "Convert", description = "Convert APIs")
 public class ConvertImgPDFController {
 
     private static final Logger logger = LoggerFactory.getLogger(ConvertImgPDFController.class);
 
-    @PostMapping(consumes = "multipart/form-data", value = "/pdf-to-img")
+    @PostMapping(consumes = "multipart/form-data", value = "/pdf/img")
     @Operation(summary = "Convert PDF to image(s)",
             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(
-            @RequestPart(required = true, value = "fileInput")
-            @Parameter(description = "The input PDF file to be converted")
-                    MultipartFile file,
-            @RequestParam("imageFormat")
-            @Parameter(description = "The output image format", schema = @Schema(allowableValues = {"png", "jpeg", "jpg", "gif"}))
-                    String imageFormat,
-            @RequestParam("singleOrMultiple")
-            @Parameter(description = "Choose between a single image containing all pages or separate images for each page", schema = @Schema(allowableValues = {"single", "multiple"}))
-                    String singleOrMultiple,
-            @RequestParam("colorType")
-            @Parameter(description = "The color type of the output image(s)", schema = @Schema(allowableValues = {"color", "greyscale", "blackwhite"}))
-                    String colorType,
-            @RequestParam("dpi")
-            @Parameter(description = "The DPI (dots per inch) for the output image(s)")
-                    String dpi) throws IOException {
+    public ResponseEntity<Resource> convertToImage(@ModelAttribute ConvertToImageRequest request) throws IOException {
+        MultipartFile file = request.getFileInput();
+        String imageFormat = request.getImageFormat();
+        String singleOrMultiple = request.getSingleOrMultiple();
+        String colorType = request.getColorType();
+        String dpi = request.getDpi();
         
         byte[] pdfBytes = file.getBytes();
         ImageType colorTypeResult = ImageType.RGB;
@@ -83,37 +76,22 @@ public class ConvertImgPDFController {
         }
     }
 
-    @PostMapping(consumes = "multipart/form-data", value = "/img-to-pdf")
+    @PostMapping(consumes = "multipart/form-data", value = "/img/pdf")
     @Operation(summary = "Convert images to a PDF file",
             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(
-            @RequestPart(required = true, value = "fileInput")
-            @Parameter(description = "The input images to be converted to a PDF file")
-                    MultipartFile[] file,
-            @RequestParam(defaultValue = "false", name = "stretchToFit")
-            @Parameter(description = "Whether to stretch the images to fit the PDF page or maintain the aspect ratio", example = "false")
-                    boolean stretchToFit,
-            @RequestParam("colorType")
-            @Parameter(description = "The color type of the output image(s)", schema = @Schema(allowableValues = {"color", "greyscale", "blackwhite"}))
-                    String colorType,
-            @RequestParam(defaultValue = "false", name = "autoRotate")
-            @Parameter(description = "Whether to automatically rotate the images to better fit the PDF page", example = "true")
-                    boolean autoRotate) throws IOException {
+    public ResponseEntity<byte[]> convertToPdf(@ModelAttribute ConvertToPdfRequest request) throws IOException {
+        MultipartFile[] file = request.getFileInput();
+        String fitOption = request.getFitOption();
+        String colorType = request.getColorType();
+        boolean autoRotate = request.isAutoRotate();
+        
         // Convert the file to PDF and get the resulting bytes
-        byte[] bytes = PdfUtils.imageToPdf(file, stretchToFit, autoRotate, colorType);
+        byte[] bytes = PdfUtils.imageToPdf(file, fitOption, autoRotate, colorType);
         return WebResponseUtils.bytesToWebResponse(bytes, file[0].getOriginalFilename().replaceFirst("[.][^.]+$", "") + "_converted.pdf");
     }
 
     private String getMediaType(String imageFormat) {
-        if (imageFormat.equalsIgnoreCase("PNG"))
-            return "image/png";
-        else if (imageFormat.equalsIgnoreCase("JPEG") || imageFormat.equalsIgnoreCase("JPG"))
-            return "image/jpeg";
-        else if (imageFormat.equalsIgnoreCase("GIF"))
-            return "image/gif";
-        else
-            return "application/octet-stream";
+        String mimeType = URLConnection.guessContentTypeFromName("." + imageFormat);
+        return mimeType.equals("null") ? "application/octet-stream" : mimeType;
     }
-
-
 }

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

@@ -0,0 +1,54 @@
+package stirling.software.SPDF.controller.api.converters;
+
+import org.commonmark.node.Node;
+import org.commonmark.parser.Parser;
+import org.commonmark.renderer.html.HtmlRenderer;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.multipart.MultipartFile;
+
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import stirling.software.SPDF.model.api.GeneralFile;
+import stirling.software.SPDF.utils.FileToPdf;
+import stirling.software.SPDF.utils.WebResponseUtils;
+
+@RestController
+@Tag(name = "Convert", description = "Convert APIs")
+@RequestMapping("/api/v1/convert")
+public class ConvertMarkdownToPdf {
+	
+	@PostMapping(consumes = "multipart/form-data", value = "/markdown/pdf")
+    @Operation(
+        summary = "Convert a Markdown file to PDF",
+        description = "This endpoint takes a Markdown file input, converts it to HTML, and then to PDF format."
+    )
+    public ResponseEntity<byte[]> markdownToPdf(
+    		@ModelAttribute GeneralFile request) 
+    		        throws Exception {
+    			MultipartFile fileInput = request.getFileInput();
+        
+        if (fileInput == null) {
+            throw new IllegalArgumentException("Please provide a Markdown file for conversion.");
+        }
+
+        String originalFilename = fileInput.getOriginalFilename();
+        if (originalFilename == null || !originalFilename.endsWith(".md")) {
+            throw new IllegalArgumentException("File must be in .md format.");
+        }
+
+        // Convert Markdown to HTML using CommonMark
+        Parser parser = Parser.builder().build();
+        Node document = parser.parse(new String(fileInput.getBytes()));
+        HtmlRenderer renderer = HtmlRenderer.builder().build();
+        String htmlContent = renderer.render(document);
+        
+        byte[] pdfBytes = FileToPdf.convertHtmlToPdf(htmlContent.getBytes(), "converted.html"); 
+
+        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

@@ -10,19 +10,22 @@ import java.util.List;
 
 import org.apache.commons.io.FilenameUtils;
 import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestPart;
+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.Parameter;
 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;
 import stirling.software.SPDF.utils.WebResponseUtils;
 
 @RestController
 @Tag(name = "Convert", description = "Convert APIs")
+@RequestMapping("/api/v1/convert")
 public class ConvertOfficeController {
 
     public byte[] convertToPdf(MultipartFile inputFile) throws IOException, InterruptedException {
@@ -41,7 +44,7 @@ public class ConvertOfficeController {
 
         // Run the LibreOffice command
         List<String> command = new ArrayList<>(Arrays.asList("unoconv", "-vvv", "-f", "pdf", "-o", tempOutputFile.toString(), tempInputFile.toString()));
-        int returnCode = ProcessExecutor.getInstance(ProcessExecutor.Processes.LIBRE_OFFICE).runCommandWithOutputHandling(command);
+        ProcessExecutorResult returnCode = ProcessExecutor.getInstance(ProcessExecutor.Processes.LIBRE_OFFICE).runCommandWithOutputHandling(command);
 
         // Read the converted PDF file
         byte[] pdfBytes = Files.readAllBytes(tempOutputFile);
@@ -57,19 +60,14 @@ public class ConvertOfficeController {
         return fileExtension.matches(extensionPattern);
     }
 
-    @PostMapping(consumes = "multipart/form-data", value = "/file-to-pdf")
+    @PostMapping(consumes = "multipart/form-data", value = "/file/pdf")
     @Operation(
         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"
     )
-    public ResponseEntity<byte[]> processPdfWithOCR(
-        @RequestPart(required = true, value = "fileInput")
-        @Parameter(
-            description = "The input file to be converted to a PDF file using OCR",
-            required = true
-        )
-            MultipartFile inputFile
-    ) throws IOException, InterruptedException {
+    public ResponseEntity<byte[]> processFileToPDF(@ModelAttribute GeneralFile request) 
+	        throws Exception {
+		MultipartFile inputFile = request.getFileInput();
         // unused but can start server instance if startup time is to long
         // LibreOfficeListener.getInstance().start();
 

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

@@ -3,69 +3,67 @@ package stirling.software.SPDF.controller.api.converters;
 import java.io.IOException;
 
 import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RequestPart;
+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.Parameter;
-import io.swagger.v3.oas.annotations.media.Schema;
 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;
+import stirling.software.SPDF.model.api.converters.PdfToWordRequest;
 import stirling.software.SPDF.utils.PDFToFile;
 
 @RestController
+@RequestMapping("/api/v1/convert")
 @Tag(name = "Convert", description = "Convert APIs")
 public class ConvertPDFToOffice {
 
-	@PostMapping(consumes = "multipart/form-data", value = "/pdf-to-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")
-	public ResponseEntity<byte[]> processPdfToHTML(
-			@RequestPart(required = true, value = "fileInput") @Parameter(description = "The input PDF file to be converted to HTML format", required = true) MultipartFile inputFile)
-			throws IOException, InterruptedException {
+	public ResponseEntity<byte[]> processPdfToHTML(@ModelAttribute PDFFile request) 
+	        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-to-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")
-	public ResponseEntity<byte[]> processPdfToPresentation(
-			@RequestPart(required = true, value = "fileInput") @Parameter(description = "The input PDF file") MultipartFile inputFile,
-			@RequestParam("outputFormat") @Parameter(description = "The output Presentation format", schema = @Schema(allowableValues = {
-					"ppt", "pptx", "odp" })) String outputFormat)
-			throws IOException, InterruptedException {
+	public ResponseEntity<byte[]> processPdfToPresentation(@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-to-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")
-	public ResponseEntity<byte[]> processPdfToRTForTXT(
-			@RequestPart(required = true, value = "fileInput") @Parameter(description = "The input PDF file") MultipartFile inputFile,
-			@RequestParam("outputFormat") @Parameter(description = "The output Text or RTF format", schema = @Schema(allowableValues = {
-					"rtf", "txt:Text" })) String outputFormat)
-			throws IOException, InterruptedException {
+	public ResponseEntity<byte[]> processPdfToRTForTXT(@ModelAttribute PdfToTextOrRTFRequest request) 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-to-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")
-	public ResponseEntity<byte[]> processPdfToWord(
-			@RequestPart(required = true, value = "fileInput") @Parameter(description = "The input PDF file") MultipartFile inputFile,
-			@RequestParam("outputFormat") @Parameter(description = "The output Word document format", schema = @Schema(allowableValues = {
-					"doc", "docx", "odt" })) String outputFormat)
-			throws IOException, InterruptedException {
+	public ResponseEntity<byte[]> processPdfToWord(@ModelAttribute PdfToWordRequest request) 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-to-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")
-	public ResponseEntity<byte[]> processPdfToXML(
-			@RequestPart(required = true, value = "fileInput") @Parameter(description = "The input PDF file to be converted to an XML file", required = true) MultipartFile inputFile)
-			throws IOException, InterruptedException {
+	public ResponseEntity<byte[]> processPdfToXML(@ModelAttribute PDFFile request) 
+	        throws Exception {
+		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

@@ -1,36 +1,37 @@
 package stirling.software.SPDF.controller.api.converters;
 
-import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.List;
 
 import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestPart;
+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.Parameter;
 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;
 import stirling.software.SPDF.utils.WebResponseUtils;
 
 @RestController
+@RequestMapping("/api/v1/convert")
 @Tag(name = "Convert", description = "Convert APIs")
 public class ConvertPDFToPDFA {
 
-	@PostMapping(consumes = "multipart/form-data", value = "/pdf-to-pdfa")
+	@PostMapping(consumes = "multipart/form-data", value = "/pdf/pdfa")
 	@Operation(
 	    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"
 	)
-	public ResponseEntity<byte[]> pdfToPdfA(
-	    @RequestPart(required = true, value = "fileInput")
-	    @Parameter(description = "The input PDF file to be converted to a PDF/A file", required = true)
-	        MultipartFile inputFile) throws IOException, InterruptedException {
+	public ResponseEntity<byte[]> pdfToPdfA(@ModelAttribute PDFFile request) 
+	        throws Exception {
+		MultipartFile inputFile = request.getFileInput();
 
         // Save the uploaded file to a temporary location
         Path tempInputFile = Files.createTempFile("input_", ".pdf");
@@ -49,7 +50,7 @@ public class ConvertPDFToPDFA {
         command.add(tempInputFile.toString());
         command.add(tempOutputFile.toString());
 
-        int 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);

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

@@ -7,31 +7,31 @@ import java.util.ArrayList;
 import java.util.List;
 
 import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestPart;
+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.Parameter;
 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;
+import stirling.software.SPDF.utils.ProcessExecutor.ProcessExecutorResult;
 import stirling.software.SPDF.utils.WebResponseUtils;
 
 @RestController
 @Tag(name = "Convert", description = "Convert APIs")
+@RequestMapping("/api/v1/convert")
 public class ConvertWebsiteToPDF {
 
-	@PostMapping(consumes = "multipart/form-data", value = "/url-to-pdf")
+	@PostMapping(consumes = "multipart/form-data", value = "/url/pdf")
 	@Operation(
 	    summary = "Convert a URL to a PDF",
 	    description = "This endpoint fetches content from a URL and converts it to a PDF format."
 	)
-	public ResponseEntity<byte[]> urlToPdf(
-	    @RequestPart(required = true, value = "urlInput")
-	    @Parameter(description = "The input URL to be converted to a PDF file", required = true)
-	        String URL) throws IOException, InterruptedException {
+	public ResponseEntity<byte[]> urlToPdf(@ModelAttribute UrlToPdfRequest request) throws IOException, InterruptedException {
+	    String URL = request.getUrlInput();
 
 	    // Validate the URL format
 	    if(!URL.matches("^https?://.*") || !GeneralUtils.isValidURL(URL)) {
@@ -49,7 +49,7 @@ public class ConvertWebsiteToPDF {
 		    command.add(URL);
 		    command.add(tempOutputFile.toString());
 	
-		    int returnCode = ProcessExecutor.getInstance(ProcessExecutor.Processes.WEASYPRINT).runCommandWithOutputHandling(command);
+		    ProcessExecutorResult returnCode = ProcessExecutor.getInstance(ProcessExecutor.Processes.WEASYPRINT).runCommandWithOutputHandling(command);
 	
 		    // Read the optimized PDF file
 		    pdfBytes = Files.readAllBytes(tempOutputFile);

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

@@ -0,0 +1,123 @@
+package stirling.software.SPDF.controller.api.converters;
+
+import java.io.ByteArrayInputStream;
+import java.io.StringWriter;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.pdfbox.pdmodel.PDDocument;
+import org.apache.pdfbox.pdmodel.PDPage;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.http.ContentDisposition;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import 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;
+
+@RestController
+@RequestMapping("/api/v1/convert")
+@Tag(name = "General", description = "General APIs")
+public class ExtractController {
+
+    private static final Logger logger = LoggerFactory.getLogger(CropController.class);
+
+    @PostMapping(value = "/pdf-to-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")
+    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()))) {
+            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) {
+                    tableData.add(stripper.getText(r, c));
+                }
+            }
+        }
+
+        ArrayList<String> notEmptyColumns = new ArrayList<>();
+
+        for (String item: tableData) {
+            if(!item.trim().isEmpty()){
+                notEmptyColumns.add(item);
+            }else{
+                columnsCount--;
+            }
+        }
+
+        List<String> fullTable  =  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> recordList = getRecordsList(rowsCount,fullTable);
+        
+        if(headersList.size() == 0 && recordList.size() == 0) {
+        	throw new Exception("No table detected, no headers or records found");
+        }
+        
+        StringWriter writer = new StringWriter();
+        try (CSVWriter csvWriter = new CSVWriter(writer)) {
+            csvWriter.writeNext(headersList.toArray(new String[0]));
+            for (String record : recordList) {
+                csvWriter.writeNext(record.split("\\|"));
+            }
+        }
+
+        HttpHeaders headers = new HttpHeaders();
+        headers.setContentDisposition(ContentDisposition.builder("attachment").filename(form.getFileInput().getOriginalFilename().replaceFirst("[.][^.]+$", "") + "_extracted.csv").build());
+        headers.setContentType(MediaType.parseMediaType("text/csv"));
+
+        return ResponseEntity.ok()
+                .headers(headers)
+                .body(writer.toString());
+    }
+
+    private ArrayList<String> getRecordsList( int rowsCounts ,List<String> items){
+        ArrayList<String> recordsList = new ArrayList<>();
+
+            for (int b=1; b<rowsCounts;b++) {
+                StringBuilder strbldr = new StringBuilder();
+
+                for (int i=0;i<items.size();i++){
+                    String[] parts = items.get(i).split("\\|");
+                    strbldr.append(parts[b]);
+                    if (i!= items.size()-1){
+                        strbldr.append("|");
+                    }
+                }
+                recordsList.add(strbldr.toString());
+            }
+
+        return recordsList;
+    }
+    private ArrayList<String> getTableHeaders(int columnsCount, List<String> items){
+        ArrayList<String> resultList = new ArrayList<>();
+        for (int i=0;i<columnsCount;i++){
+            String[] parts = items.get(i).split("\\|");
+            resultList.add(parts[0]);
+        }
+
+        return resultList;
+    }
+}

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

@@ -1,39 +1,40 @@
 package stirling.software.SPDF.controller.api.filters;
 
 import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.ArrayList;
-import java.util.List;
 
 import org.apache.pdfbox.pdmodel.PDDocument;
 import org.apache.pdfbox.pdmodel.PDPage;
 import org.apache.pdfbox.pdmodel.common.PDRectangle;
 import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestPart;
+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.Parameter;
 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;
+import stirling.software.SPDF.model.api.filter.FileSizeRequest;
+import stirling.software.SPDF.model.api.filter.PageRotationRequest;
+import stirling.software.SPDF.model.api.filter.PageSizeRequest;
 import stirling.software.SPDF.utils.PdfUtils;
-import stirling.software.SPDF.utils.ProcessExecutor;
 import stirling.software.SPDF.utils.WebResponseUtils;
-import io.swagger.v3.oas.annotations.media.Schema;
 
 @RestController
+@RequestMapping("/api/v1/filter")
 @Tag(name = "Filter", description = "Filter APIs")
 public class FilterController {
 
 	@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")
-	public ResponseEntity<byte[]> containsText(
-			@RequestPart(required = true, value = "fileInput") @Parameter(description = "The input PDF file to be converted to a PDF/A file", required = true) MultipartFile inputFile,
-			@Parameter(description = "The text to check for", required = true) String text,
-			@Parameter(description = "The page number to check for text on accepts 'All', ranges like '1-4'", required = false) String pageNumber)
-			throws IOException, InterruptedException {
+	public ResponseEntity<byte[]> containsText(@ModelAttribute ContainsTextRequest request) throws IOException, InterruptedException {
+	    MultipartFile inputFile = request.getFileInput();
+	    String text = request.getText();
+	    String pageNumber = request.getPageNumbers();
+	    
 		PDDocument pdfDocument = PDDocument.load(inputFile.getInputStream());
 		if (PdfUtils.hasText(pdfDocument, pageNumber, text))
 			return WebResponseUtils.pdfDocToWebResponse(pdfDocument, inputFile.getOriginalFilename());
@@ -43,10 +44,11 @@ public class FilterController {
 	// TODO
 	@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")
-	public ResponseEntity<byte[]> containsImage(
-			@RequestPart(required = true, value = "fileInput") @Parameter(description = "The input PDF file to be converted to a PDF/A file", required = true) MultipartFile inputFile,
-			@Parameter(description = "The page number to check for image on accepts 'All', ranges like '1-4'", required = false) String pageNumber)
+	public ResponseEntity<byte[]> containsImage(@ModelAttribute PDFWithPageNums request)
 			throws IOException, InterruptedException {
+		MultipartFile inputFile = request.getFileInput();
+	    String pageNumber = request.getPageNumbers();
+	    
 		PDDocument pdfDocument = PDDocument.load(inputFile.getInputStream());
 		if (PdfUtils.hasImages(pdfDocument, pageNumber))
 			return WebResponseUtils.pdfDocToWebResponse(pdfDocument, inputFile.getOriginalFilename());
@@ -55,12 +57,10 @@ public class FilterController {
 
 	@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")
-	public ResponseEntity<byte[]> pageCount(
-			@RequestPart(required = true, value = "fileInput") @Parameter(description = "The input PDF file", required = true) MultipartFile inputFile,
-			@Parameter(description = "Page Count", required = true) String pageCount,
-			@Parameter(description = "Comparison type", schema = @Schema(description = "The comparison type, accepts Greater, Equal, Less than", allowableValues = {
-					"Greater", "Equal", "Less" })) String comparator)
-			throws IOException, InterruptedException {
+	public ResponseEntity<byte[]> pageCount(@ModelAttribute PDFComparisonAndCount request) throws IOException, InterruptedException {
+	    MultipartFile inputFile = request.getFileInput();
+	    String pageCount = request.getPageCount();
+	    String comparator = request.getComparator();
 		// Load the PDF
 		PDDocument document = PDDocument.load(inputFile.getInputStream());
 		int actualPageCount = document.getNumberOfPages();
@@ -88,12 +88,10 @@ public class FilterController {
 
 	@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")
-	public ResponseEntity<byte[]> pageSize(
-			@RequestPart(required = true, value = "fileInput") @Parameter(description = "The input PDF file", required = true) MultipartFile inputFile,
-			@Parameter(description = "Standard Page Size", required = true) String standardPageSize,
-			@Parameter(description = "Comparison type", schema = @Schema(description = "The comparison type, accepts Greater, Equal, Less than", allowableValues = {
-					"Greater", "Equal", "Less" })) String comparator)
-			throws IOException, InterruptedException {
+	public ResponseEntity<byte[]> pageSize(@ModelAttribute PageSizeRequest request) throws IOException, InterruptedException {
+	    MultipartFile inputFile = request.getFileInput();
+	    String standardPageSize = request.getStandardPageSize();
+	    String comparator = request.getComparator();
 
 		// Load the PDF
 		PDDocument document = PDDocument.load(inputFile.getInputStream());
@@ -131,12 +129,10 @@ public class FilterController {
 
 	@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")
-	public ResponseEntity<byte[]> fileSize(
-			@RequestPart(required = true, value = "fileInput") @Parameter(description = "The input PDF file", required = true) MultipartFile inputFile,
-			@Parameter(description = "File Size", required = true) String fileSize,
-			@Parameter(description = "Comparison type", schema = @Schema(description = "The comparison type, accepts Greater, Equal, Less than", allowableValues = {
-					"Greater", "Equal", "Less" })) String comparator)
-			throws IOException, InterruptedException {
+	public ResponseEntity<byte[]> fileSize(@ModelAttribute FileSizeRequest request) throws IOException, InterruptedException {
+	    MultipartFile inputFile = request.getFileInput();
+	    String fileSize = request.getFileSize();
+	    String comparator = request.getComparator();
 
 		// Get the file size
 		long actualFileSize = inputFile.getSize();
@@ -164,12 +160,10 @@ public class FilterController {
 
 	@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")
-	public ResponseEntity<byte[]> pageRotation(
-			@RequestPart(required = true, value = "fileInput") @Parameter(description = "The input PDF file", required = true) MultipartFile inputFile,
-			@Parameter(description = "Rotation in degrees", required = true) int rotation,
-			@Parameter(description = "Comparison type", schema = @Schema(description = "The comparison type, accepts Greater, Equal, Less than", allowableValues = {
-					"Greater", "Equal", "Less" })) String comparator)
-			throws IOException, InterruptedException {
+	public ResponseEntity<byte[]> pageRotation(@ModelAttribute PageRotationRequest request) throws IOException, InterruptedException {
+	    MultipartFile inputFile = request.getFileInput();
+	    int rotation = request.getRotation();
+	    String comparator = request.getComparator();
 
 		// Load the PDF
 		PDDocument document = PDDocument.load(inputFile.getInputStream());

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

@@ -1,77 +1,29 @@
-package stirling.software.SPDF.controller.api.other;
+package stirling.software.SPDF.controller.api.misc;
 
 import java.io.IOException;
+import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.List;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
+import org.apache.pdfbox.pdmodel.PDDocument;
+import org.apache.pdfbox.text.PDFTextStripper;
+import org.apache.pdfbox.text.TextPosition;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RequestPart;
+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.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
-import stirling.software.SPDF.utils.GeneralUtils;
-import stirling.software.SPDF.utils.PdfUtils;
+import stirling.software.SPDF.model.api.misc.ExtractHeaderRequest;
 import stirling.software.SPDF.utils.WebResponseUtils;
-import org.apache.pdfbox.pdmodel.*;
-import org.apache.pdfbox.pdmodel.common.*;
-import org.apache.pdfbox.pdmodel.PDPageContentStream.*;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.http.*;
-import org.springframework.web.multipart.MultipartFile;
-import io.swagger.v3.oas.annotations.*;
-import io.swagger.v3.oas.annotations.media.*;
-import io.swagger.v3.oas.annotations.parameters.*;
-import org.apache.pdfbox.pdmodel.font.PDType1Font;
-import org.apache.pdfbox.text.TextPosition;
-import org.apache.tomcat.util.http.ResponseUtil;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.net.URLEncoder;
-import java.util.List;
-import java.util.ArrayList;
-
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.multipart.MultipartFile;
-
-import com.itextpdf.io.font.constants.StandardFonts;
-import com.itextpdf.kernel.font.PdfFont;
-import com.itextpdf.kernel.font.PdfFontFactory;
-import com.itextpdf.kernel.geom.Rectangle;
-import com.itextpdf.kernel.pdf.PdfReader;
-import com.itextpdf.kernel.pdf.PdfWriter;
-import com.itextpdf.kernel.pdf.PdfDocument;
-import com.itextpdf.kernel.pdf.PdfPage;
-import com.itextpdf.kernel.pdf.canvas.PdfCanvas;
-import com.itextpdf.layout.Canvas;
-import com.itextpdf.layout.element.Paragraph;
-import com.itextpdf.layout.properties.TextAlignment;
-
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.io.*;
-import org.apache.pdfbox.pdmodel.*;
-import org.apache.pdfbox.text.*;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-import io.swagger.v3.oas.annotations.*;
-import io.swagger.v3.oas.annotations.media.Schema;
-import org.springframework.http.ResponseEntity;
 @RestController
-@Tag(name = "Other", description = "Other APIs")
+@RequestMapping("/api/v1/misc")
+@Tag(name = "Misc", description = "Miscellaneous APIs")
 public class AutoRenameController {
 
     private static final Logger logger = LoggerFactory.getLogger(AutoRenameController.class);
@@ -81,10 +33,9 @@ public class AutoRenameController {
 
     @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")
-    public ResponseEntity<byte[]> extractHeader(
-    	            @RequestPart(value = "fileInput") @Parameter(description = "The input PDF file from which the header is to be extracted.", required = true) MultipartFile file,
-    	            @RequestParam(required = false, defaultValue = "false") @Parameter(description = "Flag indicating whether to use the first text as a fallback if no suitable title is found. Defaults to false.", required = false) Boolean useFirstTextAsFallback)
-    	            throws Exception {
+    public ResponseEntity<byte[]> extractHeader(@ModelAttribute ExtractHeaderRequest request) throws Exception {
+        MultipartFile file = request.getFileInput();
+        Boolean useFirstTextAsFallback = request.isUseFirstTextAsFallback();
 
     	        PDDocument document = PDDocument.load(file.getInputStream());
     	        PDFTextStripper reader = new PDFTextStripper() {

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

@@ -1,4 +1,4 @@
-package stirling.software.SPDF.controller.api.other;
+package stirling.software.SPDF.controller.api.misc;
 import java.awt.image.BufferedImage;
 import java.awt.image.DataBufferByte;
 import java.awt.image.DataBufferInt;
@@ -16,8 +16,9 @@ import org.apache.pdfbox.pdmodel.PDDocument;
 import org.apache.pdfbox.rendering.PDFRenderer;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -29,21 +30,23 @@ import com.google.zxing.PlanarYUVLuminanceSource;
 import com.google.zxing.Result;
 import com.google.zxing.common.HybridBinarizer;
 
-import stirling.software.SPDF.utils.WebResponseUtils;
 import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import stirling.software.SPDF.model.api.misc.AutoSplitPdfRequest;
+import stirling.software.SPDF.utils.WebResponseUtils;
 
 @RestController
+@RequestMapping("/api/v1/misc")
+@Tag(name = "Misc", description = "Miscellaneous APIs")
 public class AutoSplitPdfController {
 
     private static final String QR_CONTENT = "https://github.com/Frooodle/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 Type:SISO")
-    public ResponseEntity<byte[]> autoSplitPdf(
-        @RequestParam("fileInput") @Parameter(description = "The input PDF file which needs to be split into separate documents based on QR code boundaries.", required = true) MultipartFile file,
-        @RequestParam(value ="duplexMode",defaultValue = "false") @Parameter(description = "Flag indicating if the duplex mode is active, where the page after the divider also gets removed.", required = false) boolean duplexMode)
-        throws IOException {
+    public ResponseEntity<byte[]> autoSplitPdf(@ModelAttribute AutoSplitPdfRequest request) throws IOException {
+        MultipartFile file = request.getFileInput();
+        boolean duplexMode = request.isDuplexMode();
 
         InputStream inputStream = file.getInputStream();
         PDDocument document = PDDocument.load(inputStream);

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

@@ -1,4 +1,4 @@
-package stirling.software.SPDF.controller.api.other;
+package stirling.software.SPDF.controller.api.misc;
 
 import java.awt.image.BufferedImage;
 import java.io.IOException;
@@ -20,21 +20,23 @@ import org.apache.pdfbox.rendering.PDFRenderer;
 import org.apache.pdfbox.text.PDFTextStripper;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RequestPart;
+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.Parameter;
 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;
+import stirling.software.SPDF.utils.ProcessExecutor.ProcessExecutorResult;
 import stirling.software.SPDF.utils.WebResponseUtils;
 
 @RestController
-@Tag(name = "Other", description = "Other APIs")
+@RequestMapping("/api/v1/misc")
+@Tag(name = "Misc", description = "Miscellaneous APIs")
 public class BlankPageController {
 
 	@PostMapping(consumes = "multipart/form-data", value = "/remove-blanks")
@@ -42,16 +44,10 @@ public class BlankPageController {
 	    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"
 	)
-	public ResponseEntity<byte[]> removeBlankPages(
-	    @RequestPart(required = true, value = "fileInput")
-	    @Parameter(description = "The input PDF file from which blank pages will be removed", required = true)
-	        MultipartFile inputFile,
-	    @RequestParam(defaultValue = "10", name = "threshold")
-	    @Parameter(description = "The threshold value to determine blank pages", example = "10")
-	        int threshold,
-	    @RequestParam(defaultValue = "99.9", name = "whitePercent")
-	    @Parameter(description = "The percentage of white color on a page to consider it as blank", example = "99.9")
-	        float whitePercent) throws IOException, InterruptedException {
+	public ResponseEntity<byte[]> removeBlankPages(@ModelAttribute RemoveBlankPagesRequest request) throws IOException, InterruptedException {
+	    MultipartFile inputFile = request.getFileInput();
+	    int threshold = request.getThreshold();
+	    float whitePercent = request.getWhitePercent();
 		
     	PDDocument document = null;
         try {
@@ -86,10 +82,10 @@ public class BlankPageController {
                         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
-                        int returnCode = ProcessExecutor.getInstance(ProcessExecutor.Processes.PYTHON_OPENCV).runCommandWithOutputHandling(command);
+                        ProcessExecutorResult returnCode = ProcessExecutor.getInstance(ProcessExecutor.Processes.PYTHON_OPENCV).runCommandWithOutputHandling(command);
     
                         // does contain data
-                        if (returnCode == 0) {
+                        if (returnCode.getRc() == 0) {
                             System.out.println("page " + pageIndex + " has image which is not blank");
                             pagesToKeepIndex.add(pageIndex);
                         } else {

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

@@ -1,4 +1,4 @@
-package stirling.software.SPDF.controller.api.other;
+package stirling.software.SPDF.controller.api.misc;
 
 import java.awt.Image;
 import java.awt.image.BufferedImage;
@@ -22,34 +22,34 @@ import org.apache.pdfbox.pdmodel.graphics.image.PDImageXObject;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RequestPart;
+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.Parameter;
-import io.swagger.v3.oas.annotations.media.Schema;
 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;
+import stirling.software.SPDF.utils.ProcessExecutor.ProcessExecutorResult;
 import stirling.software.SPDF.utils.WebResponseUtils;
 
 @RestController
-@Tag(name = "Other", description = "Other APIs")
+@RequestMapping("/api/v1/misc")
+@Tag(name = "Misc", description = "Miscellaneous APIs")
 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")
-    public ResponseEntity<byte[]> optimizePdf(
-            @RequestPart(value = "fileInput") @Parameter(description = "The input PDF file to be optimized.", required = true) MultipartFile inputFile,
-            @RequestParam(required = false, value = "optimizeLevel") @Parameter(description = "The level of optimization to apply to the PDF file. Higher values indicate greater compression but may reduce quality.", schema = @Schema(allowableValues = {
-                    "1", "2", "3", "4", "5" })) Integer optimizeLevel,
-            @RequestParam(value = "expectedOutputSize", required = false) @Parameter(description = "The expected output size, e.g. '100MB', '25KB', etc.", required = false) String expectedOutputSizeString)
-            throws Exception {
+    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) {
             throw new Exception("Both expected output size and optimize level are not specified");
@@ -116,7 +116,7 @@ public class CompressController {
             command.add("-sOutputFile=" + tempOutputFile.toString());
             command.add(tempInputFile.toString());
 
-            int 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);

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

@@ -1,4 +1,4 @@
-package stirling.software.SPDF.controller.api.other;
+package stirling.software.SPDF.controller.api.misc;
 
 import java.awt.image.BufferedImage;
 import java.io.ByteArrayInputStream;
@@ -24,19 +24,21 @@ import org.slf4j.LoggerFactory;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RequestPart;
+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.Parameter;
+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
-@Tag(name = "Other", description = "Other APIs")
+@RequestMapping("/api/v1/misc")
+@Tag(name = "Misc", description = "Miscellaneous APIs")
 public class ExtractImageScansController {
 
     private static final Logger logger = LoggerFactory.getLogger(ExtractImageScansController.class);
@@ -45,26 +47,16 @@ public class ExtractImageScansController {
     @Operation(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(
-            @RequestPart(required = true, value = "fileInput")
-            @Parameter(description = "The input file containing image scans")
-                    MultipartFile inputFile,
-            @RequestParam(name = "angle_threshold", defaultValue = "5")
-            @Parameter(description = "The angle threshold for the image scan extraction", example = "5")
-                    int angleThreshold,
-            @RequestParam(name = "tolerance", defaultValue = "20")
-            @Parameter(description = "The tolerance for the image scan extraction", example = "20")
-                    int tolerance,
-            @RequestParam(name = "min_area", defaultValue = "8000")
-            @Parameter(description = "The minimum area for the image scan extraction", example = "8000")
-                    int minArea,
-            @RequestParam(name = "min_contour_area", defaultValue = "500")
-            @Parameter(description = "The minimum contour area for the image scan extraction", example = "500")
-                    int minContourArea,
-            @RequestParam(name = "border_size", defaultValue = "1")
-            @Parameter(description = "The border size for the image scan extraction", example = "1")
-                    int borderSize) throws IOException, InterruptedException {
-
-        String fileName = inputFile.getOriginalFilename();
+    		@RequestBody(
+    	            description = "Form data containing file and extraction parameters",
+    	            required = true,
+    	            content = @Content(
+    	                mediaType = "multipart/form-data",
+    	                schema = @Schema(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);
 
         List<String> images = new ArrayList<>();
@@ -72,7 +64,7 @@ public class ExtractImageScansController {
         // Check if input file is a PDF
         if (extension.equalsIgnoreCase("pdf")) {
             // Load PDF document
-            try (PDDocument document = PDDocument.load(new ByteArrayInputStream(inputFile.getBytes()))) {
+            try (PDDocument document = PDDocument.load(new ByteArrayInputStream(form.getFileInput().getBytes()))) {
                 PDFRenderer pdfRenderer = new PDFRenderer(document);
                 int pageCount = document.getNumberOfPages();
                 images = new ArrayList<>();
@@ -92,7 +84,7 @@ public class ExtractImageScansController {
             }
         } else {
             Path tempInputFile = Files.createTempFile("input_", "." + extension);
-            Files.copy(inputFile.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());
         }
@@ -108,16 +100,16 @@ public class ExtractImageScansController {
                     "./scripts/split_photos.py", 
                     images.get(i), 
                     tempDir.toString(), 
-                    "--angle_threshold", String.valueOf(angleThreshold),
-                    "--tolerance", String.valueOf(tolerance),
-                    "--min_area", String.valueOf(minArea),
-                    "--min_contour_area", String.valueOf(minContourArea),
-                    "--border_size", String.valueOf(borderSize)
+                    "--angle_threshold", String.valueOf(form.getAngleThreshold()),
+                    "--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
-            int 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());

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

@@ -1,11 +1,12 @@
-package stirling.software.SPDF.controller.api.other;
-
+package stirling.software.SPDF.controller.api.misc;
 import java.awt.Graphics2D;
 import java.awt.Image;
 import java.awt.image.BufferedImage;
 import java.awt.image.RenderedImage;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
+import java.util.HashSet;
+import java.util.Set;
 import java.util.zip.Deflater;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipOutputStream;
@@ -20,19 +21,19 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RequestPart;
+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.Parameter;
-import io.swagger.v3.oas.annotations.media.Schema;
 import io.swagger.v3.oas.annotations.tags.Tag;
+import stirling.software.SPDF.model.api.PDFWithImageFormatRequest;
 import stirling.software.SPDF.utils.WebResponseUtils;
 @RestController
-@Tag(name = "Other", description = "Other APIs")
+@RequestMapping("/api/v1/misc")
+@Tag(name = "Misc", description = "Miscellaneous APIs")
 public class ExtractImagesController {
 
     private static final Logger logger = LoggerFactory.getLogger(ExtractImagesController.class);
@@ -40,13 +41,9 @@ public class ExtractImagesController {
     @PostMapping(consumes = "multipart/form-data", value = "/extract-images")
     @Operation(summary = "Extract images from a PDF file",
             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(
-            @RequestPart(required = true, value = "fileInput")
-            @Parameter(description = "The input PDF file containing images")
-                    MultipartFile file,
-            @RequestParam("format")
-            @Parameter(description = "The output image format e.g., 'png', 'jpeg', or 'gif'", schema = @Schema(allowableValues = {"png", "jpeg", "gif"}))
-                    String format) throws IOException {
+    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);
         PDDocument document = PDDocument.load(file.getBytes());
@@ -62,7 +59,8 @@ public class ExtractImagesController {
 
         int imageIndex = 1;
         String filename = file.getOriginalFilename().replaceFirst("[.][^.]+$", "");
-        int pageNum = 1;
+        int pageNum = 0;
+        Set<Integer> processedImages = new HashSet<>();
         // Iterate over each page
         for (PDPage page : document.getPages()) {
             ++pageNum;
@@ -70,6 +68,11 @@ public class ExtractImagesController {
             for (COSName name : page.getResources().getXObjectNames()) {
                 if (page.getResources().isImageXObject(name)) {
                     PDImageXObject image = (PDImageXObject) page.getResources().getXObject(name);
+                    int imageHash = image.hashCode();
+                    if(processedImages.contains(imageHash)) {
+                        continue; // Skip already processed images
+                    }
+                    processedImages.add(imageHash);
                     
                     // Convert image to desired format
                     RenderedImage renderedImage = image.getImage();

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

@@ -1,4 +1,4 @@
-package stirling.software.SPDF.controller.api.other;
+package stirling.software.SPDF.controller.api.misc;
 
 import java.awt.Color;
 import java.awt.geom.AffineTransform;
@@ -9,9 +9,11 @@ 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;
 
@@ -29,21 +31,21 @@ import org.apache.pdfbox.rendering.PDFRenderer;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestPart;
+import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
 
-import com.itextpdf.io.source.ByteArrayOutputStream;
-
 import io.swagger.v3.oas.annotations.Hidden;
 import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
+import stirling.software.SPDF.model.api.PDFFile;
 import stirling.software.SPDF.utils.WebResponseUtils;
 
 @RestController
-@Tag(name = "Other", description = "Other APIs")
+@RequestMapping("/api/v1/misc")
+@Tag(name = "Misc", description = "Miscellaneous APIs")
 public class FakeScanControllerWIP {
 
     private static final Logger logger = LoggerFactory.getLogger(FakeScanControllerWIP.class);
@@ -55,10 +57,8 @@ public class FakeScanControllerWIP {
         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."
     )
-    public ResponseEntity<byte[]> repairPdf(
-        @RequestPart(required = true, value = "fileInput")
-        @Parameter(description = "The input PDF file to be repaired", required = true)
-            MultipartFile inputFile) throws IOException, InterruptedException {
+    public ResponseEntity<byte[]> repairPdf(@ModelAttribute PDFFile request) throws IOException {
+        MultipartFile inputFile = request.getFileInput();
 
     	PDDocument document = PDDocument.load(inputFile.getBytes());
     	PDFRenderer pdfRenderer = new PDFRenderer(document);
@@ -86,7 +86,7 @@ public class FakeScanControllerWIP {
     	op.filter(sourceImage, destinationImage);
 
     	// Apply a rotation effect
-    	double rotationRequired = Math.toRadians((new Random().nextInt(3 - 1) + 1));  // Random angle between 1 and 3 degrees
+    	double rotationRequired = Math.toRadians((new SecureRandom().nextInt(3 - 1) + 1));  // Random angle between 1 and 3 degrees
     	double locationX = destinationImage.getWidth() / 2;
     	double locationY = destinationImage.getHeight() / 2;
     	AffineTransform tx = AffineTransform.getRotateInstance(rotationRequired, locationX, locationY);
@@ -104,7 +104,7 @@ public class FakeScanControllerWIP {
     	destinationImage = blurOp.filter(destinationImage, null);
 
     	// Add noise to the image based on the "dirtiness"
-    	Random random = new Random();
+    	Random random = new SecureRandom();
     	for (int y = 0; y < destinationImage.getHeight(); y++) {
     	    for (int x = 0; x < destinationImage.getWidth(); x++) {
     	        if (random.nextInt(100) < dirtiness) {

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

@@ -1,4 +1,4 @@
-package stirling.software.SPDF.controller.api.other;
+package stirling.software.SPDF.controller.api.misc;
 
 import java.io.IOException;
 import java.text.ParseException;
@@ -11,19 +11,20 @@ import org.apache.pdfbox.cos.COSName;
 import org.apache.pdfbox.pdmodel.PDDocument;
 import org.apache.pdfbox.pdmodel.PDDocumentInformation;
 import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RequestPart;
+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.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
+import stirling.software.SPDF.model.api.misc.MetadataRequest;
 import stirling.software.SPDF.utils.WebResponseUtils;
 
 @RestController
-@Tag(name = "Other", description = "Other APIs")
+@RequestMapping("/api/v1/misc")
+@Tag(name = "Misc", description = "Miscellaneous APIs")
 public class MetadataController {
 
 
@@ -41,44 +42,28 @@ public class MetadataController {
     @PostMapping(consumes = "multipart/form-data", value = "/update-metadata")
     @Operation(summary = "Update metadata of a PDF file",
             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(
-            @RequestPart(required = true, value = "fileInput")
-            @Parameter(description = "The input PDF file to update metadata")
-                    MultipartFile pdfFile,
-            @RequestParam(value = "deleteAll", required = false, defaultValue = "false")
-            @Parameter(description = "Delete all metadata if set to true")
-                    Boolean deleteAll,
-            @RequestParam(value = "author", required = false)
-            @Parameter(description = "The author of the document")
-                    String author,
-            @RequestParam(value = "creationDate", required = false)
-            @Parameter(description = "The creation date of the document (format: yyyy/MM/dd HH:mm:ss)")
-                    String creationDate,
-            @RequestParam(value = "creator", required = false)
-            @Parameter(description = "The creator of the document")
-                    String creator,
-            @RequestParam(value = "keywords", required = false)
-            @Parameter(description = "The keywords for the document")
-                    String keywords,
-            @RequestParam(value = "modificationDate", required = false)
-            @Parameter(description = "The modification date of the document (format: yyyy/MM/dd HH:mm:ss)")
-                    String modificationDate,
-            @RequestParam(value = "producer", required = false)
-            @Parameter(description = "The producer of the document")
-                    String producer,
-            @RequestParam(value = "subject", required = false)
-            @Parameter(description = "The subject of the document")
-                    String subject,
-            @RequestParam(value = "title", required = false)
-            @Parameter(description = "The title of the document")
-                    String title,
-            @RequestParam(value = "trapped", required = false)
-            @Parameter(description = "The trapped status of the document")
-                    String trapped,
-                    @Parameter(description = "Map list of key and value of custom parameters, note these must start with customKey and customValue if they are non standard")
-            @RequestParam Map<String, String> allRequestParams)
-            throws IOException {
+    public ResponseEntity<byte[]> metadata(@ModelAttribute MetadataRequest request) throws IOException {
         
+        // Extract PDF file from the request object
+        MultipartFile pdfFile = request.getFileInput();
+
+        // Extract metadata information
+        Boolean deleteAll = request.isDeleteAll();
+        String author = request.getAuthor();
+        String creationDate = request.getCreationDate();
+        String creator = request.getCreator();
+        String keywords = request.getKeywords();
+        String modificationDate = request.getModificationDate();
+        String producer = request.getProducer();
+        String subject = request.getSubject();
+        String title = request.getTitle();
+        String trapped = request.getTrapped();
+
+        // Extract additional custom parameters
+        Map<String, String> allRequestParams = request.getAllRequestParams();
+        if(allRequestParams == null) {
+        	allRequestParams = new java.util.HashMap<String, String>();
+        }
         // Load the PDF file into a PDDocument
         PDDocument document = PDDocument.load(pdfFile.getBytes());
 

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

@@ -1,4 +1,4 @@
-package stirling.software.SPDF.controller.api.other;
+package stirling.software.SPDF.controller.api.misc;
 
 import java.io.File;
 import java.io.FileOutputStream;
@@ -18,27 +18,28 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RequestPart;
+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.Parameter;
-import io.swagger.v3.oas.annotations.media.Schema;
 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;
 import stirling.software.SPDF.utils.WebResponseUtils;
 
 @RestController
-@Tag(name = "Other", description = "Other APIs")
+@RequestMapping("/api/v1/misc")
+@Tag(name = "Misc", description = "Miscellaneous APIs")
 public class OCRController {
 
     private static final Logger logger = LoggerFactory.getLogger(OCRController.class);
 
     public List<String> getAvailableTesseractLanguages() {
-        String tessdataDir = "/usr/share/tesseract-ocr/4.00/tessdata";
+        String tessdataDir = "/usr/share/tesseract-ocr/5/tessdata";
         File[] files = new File(tessdataDir).listFiles();
         if (files == null) {
             return Collections.emptyList();
@@ -50,35 +51,16 @@ public class OCRController {
     @PostMapping(consumes = "multipart/form-data", value = "/ocr-pdf")
     @Operation(summary = "Process a PDF file with OCR",
             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(
-            @RequestPart(required = true, value = "fileInput")
-            @Parameter(description = "The input PDF file to be processed with OCR")
-                    MultipartFile inputFile,
-            @RequestParam("languages")
-            @Parameter(description = "List of languages to use in OCR processing")
-                    List<String> selectedLanguages,
-            @RequestParam(name = "sidecar", required = false)
-            @Parameter(description = "Include OCR text in a sidecar text file if set to true")
-                    Boolean sidecar,
-            @RequestParam(name = "deskew", required = false)
-            @Parameter(description = "Deskew the input file if set to true")
-                    Boolean deskew,
-            @RequestParam(name = "clean", required = false)
-            @Parameter(description = "Clean the input file if set to true")
-                    Boolean clean,
-            @RequestParam(name = "clean-final", required = false)
-            @Parameter(description = "Clean the final output if set to true")
-                    Boolean cleanFinal,
-            @RequestParam(name = "ocrType", required = false)
-            @Parameter(description = "Specify the OCR type, e.g., 'skip-text', 'force-ocr', or 'Normal'", schema = @Schema(allowableValues = {"skip-text", "force-ocr", "Normal"}))
-                    String ocrType,
-            @RequestParam(name = "ocrRenderType", required = false, defaultValue = "hocr")
-            @Parameter(description = "Specify the OCR render type, either 'hocr' or 'sandwich'", schema = @Schema(allowableValues = {"hocr", "sandwich"}))
-                    String ocrRenderType,
-            @RequestParam(name = "removeImagesAfter", required = false)
-            @Parameter(description = "Remove images from the output PDF if set to true")
-                    Boolean removeImagesAfter) throws IOException, InterruptedException {
-
+    public ResponseEntity<byte[]> processPdfWithOCR(@ModelAttribute ProcessPdfWithOcrRequest request) throws IOException, InterruptedException {
+        MultipartFile inputFile = request.getFileInput();
+        List<String> selectedLanguages = request.getLanguages();
+        Boolean sidecar = request.isSidecar();
+        Boolean deskew = request.isDeskew();
+        Boolean clean = request.isClean();
+        Boolean cleanFinal = request.isCleanFinal();
+        String ocrType = request.getOcrType();
+        String ocrRenderType = request.getOcrRenderType();
+        Boolean removeImagesAfter = request.isRemoveImagesAfter();
         // --output-type pdfa
         if (selectedLanguages == null || selectedLanguages.isEmpty()) {
             throw new IOException("Please select at least one language.");
@@ -141,8 +123,12 @@ public class OCRController {
         command.addAll(Arrays.asList("--language", languageOption, tempInputFile.toString(), tempOutputFile.toString()));
 
         // Run CLI command
-        int returnCode = ProcessExecutor.getInstance(ProcessExecutor.Processes.OCR_MY_PDF).runCommandWithOutputHandling(command);
-
+        ProcessExecutorResult result = ProcessExecutor.getInstance(ProcessExecutor.Processes.OCR_MY_PDF).runCommandWithOutputHandling(command);
+        if(result.getRc() != 0 && 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);
+        }
         
 
         
@@ -153,7 +139,7 @@ public class OCRController {
 
             List<String> gsCommand = Arrays.asList("gs", "-sDEVICE=pdfwrite", "-dFILTERIMAGE", "-o", tempPdfWithoutImages.toString(), tempOutputFile.toString());
 
-            int gsReturnCode = ProcessExecutor.getInstance(ProcessExecutor.Processes.GHOSTSCRIPT).runCommandWithOutputHandling(gsCommand);
+            ProcessExecutor.getInstance(ProcessExecutor.Processes.GHOSTSCRIPT).runCommandWithOutputHandling(gsCommand);
             tempOutputFile = tempPdfWithoutImages;
         }
         // Read the OCR processed PDF file

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

@@ -1,4 +1,4 @@
-package stirling.software.SPDF.controller.api.other;
+package stirling.software.SPDF.controller.api.misc;
 
 import java.io.IOException;
 
@@ -6,20 +6,21 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RequestPart;
+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.Parameter;
 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;
 
 @RestController
-@Tag(name = "Other", description = "Other APIs")
+@RequestMapping("/api/v1/misc")
+@Tag(name = "Misc", description = "Miscellaneous APIs")
 public class OverlayImageController {
 
     private static final Logger logger = LoggerFactory.getLogger(OverlayImageController.class);
@@ -29,22 +30,12 @@ public class OverlayImageController {
         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"
     )
-    public ResponseEntity<byte[]> overlayImage(
-        @RequestPart(required = true, value = "fileInput")
-        @Parameter(description = "The input PDF file to overlay the image onto.", required = true)
-            MultipartFile pdfFile,
-        @RequestParam("fileInput2")
-        @Parameter(description = "The image file to be overlaid onto the PDF.", required = true)
-            MultipartFile imageFile,
-        @RequestParam("x")
-        @Parameter(description = "The x-coordinate at which to place the top-left corner of the image.", example = "0")
-            float x,
-        @RequestParam("y")
-        @Parameter(description = "The y-coordinate at which to place the top-left corner of the image.", example = "0")
-            float y,
-        @RequestParam("everyPage")
-        @Parameter(description = "Whether to overlay the image onto every page of the PDF.", example = "false")
-            boolean everyPage) {
+    public ResponseEntity<byte[]> overlayImage(@ModelAttribute OverlayImageRequest request) {
+        MultipartFile pdfFile = request.getFileInput();
+        MultipartFile imageFile = request.getImageFile();
+        float x = request.getX();
+        float y = request.getY();
+        boolean everyPage = request.isEveryPage();
         try {
             byte[] pdfBytes = pdfFile.getBytes();
             byte[] imageBytes = imageFile.getBytes();

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

@@ -0,0 +1,135 @@
+package stirling.software.SPDF.controller.api.misc;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.util.List;
+
+import org.apache.pdfbox.pdmodel.PDDocument;
+import org.apache.pdfbox.pdmodel.PDPage;
+import org.apache.pdfbox.pdmodel.PDPageContentStream;
+import org.apache.pdfbox.pdmodel.common.PDRectangle;
+import org.apache.pdfbox.pdmodel.font.PDType1Font;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.ModelAttribute;
+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.misc.AddPageNumbersRequest;
+import stirling.software.SPDF.utils.GeneralUtils;
+import stirling.software.SPDF.utils.WebResponseUtils;
+
+@RestController
+@RequestMapping("/api/v1/misc")
+@Tag(name = "Misc", description = "Miscellaneous APIs")
+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")
+    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;
+    	byte[] fileBytes = file.getBytes();
+        PDDocument document = PDDocument.load(fileBytes);
+
+        float marginFactor;
+        switch (customMargin.toLowerCase()) {
+            case "small":
+                marginFactor = 0.02f;
+                break;
+            case "medium":
+                marginFactor = 0.035f;
+                break;
+            case "large":
+                marginFactor = 0.05f;
+                break;
+            case "x-large":
+                marginFactor = 0.075f;
+                break;   
+                
+                
+            default:
+                marginFactor = 0.035f;
+                break;
+        }
+
+        float fontSize = 12.0f;
+        PDType1Font font = PDType1Font.HELVETICA;
+        if(pagesToNumber == null || pagesToNumber.length() == 0) {
+        	pagesToNumber = "all";
+        }
+        if(customText == null || customText.length() == 0) {
+        	customText = "{n}";
+        }
+        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);
+
+            float x, y;
+
+            int xGroup = (position - 1) % 3;
+            int yGroup = 2 - (position - 1) / 3;
+
+            switch (xGroup) {
+                case 0:  // left
+                    x = pageSize.getLowerLeftX() + marginFactor * pageSize.getWidth();
+                    break;
+                case 1:  // center
+                    x = pageSize.getLowerLeftX() + (pageSize.getWidth() / 2);
+                    break;
+                default: // right
+                    x = pageSize.getUpperRightX() - marginFactor * pageSize.getWidth();
+                    break;
+            }
+
+            switch (yGroup) {
+                case 0:  // bottom
+                    y = pageSize.getLowerLeftY() + marginFactor * pageSize.getHeight();
+                    break;
+                case 1:  // middle
+                    y = pageSize.getLowerLeftY() + (pageSize.getHeight() / 2);
+                    break;
+                default: // top
+                    y = pageSize.getUpperRightY() - marginFactor * pageSize.getHeight();
+                    break;
+            }
+
+            PDPageContentStream contentStream = new PDPageContentStream(document, page, PDPageContentStream.AppendMode.APPEND, true);
+            contentStream.beginText();
+            contentStream.setFont(font, fontSize);
+            contentStream.newLineAtOffset(x, y);
+            contentStream.showText(text);
+            contentStream.endText();
+            contentStream.close();
+
+            pageNumber++;
+        }
+
+        ByteArrayOutputStream baos = new ByteArrayOutputStream();
+        document.save(baos);
+        document.close();
+
+        return WebResponseUtils.bytesToWebResponse(baos.toByteArray(), file.getOriginalFilename().replaceFirst("[.][^.]+$", "") + "_numbersAdded.pdf", MediaType.APPLICATION_PDF);
+
+    }
+
+
+
+}

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

@@ -1,4 +1,4 @@
-package stirling.software.SPDF.controller.api.other;
+package stirling.software.SPDF.controller.api.misc;
 
 import java.io.IOException;
 import java.nio.file.Files;
@@ -9,19 +9,22 @@ import java.util.List;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestPart;
+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.Parameter;
 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;
 import stirling.software.SPDF.utils.WebResponseUtils;
 
 @RestController
-@Tag(name = "Other", description = "Other APIs")
+@RequestMapping("/api/v1/misc")
+@Tag(name = "Misc", description = "Miscellaneous APIs")
 public class RepairController {
 
     private static final Logger logger = LoggerFactory.getLogger(RepairController.class);
@@ -31,11 +34,8 @@ public class RepairController {
         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"
     )
-    public ResponseEntity<byte[]> repairPdf(
-        @RequestPart(required = true, value = "fileInput")
-        @Parameter(description = "The input PDF file to be repaired", required = true)
-            MultipartFile inputFile) throws IOException, InterruptedException {
-
+    public ResponseEntity<byte[]> repairPdf(@ModelAttribute PDFFile request) 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());
@@ -51,7 +51,7 @@ public class RepairController {
         command.add(tempInputFile.toString());
 
 
-        int returnCode = ProcessExecutor.getInstance(ProcessExecutor.Processes.GHOSTSCRIPT).runCommandWithOutputHandling(command);
+        ProcessExecutorResult returnCode = ProcessExecutor.getInstance(ProcessExecutor.Processes.GHOSTSCRIPT).runCommandWithOutputHandling(command);
 
         // Read the optimized PDF file
         byte[] pdfBytes = Files.readAllBytes(tempOutputFile);

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

@@ -0,0 +1,61 @@
+package stirling.software.SPDF.controller.api.misc;
+
+import java.nio.charset.StandardCharsets;
+import java.util.Map;
+
+import org.apache.pdfbox.pdmodel.PDDocument;
+import org.apache.pdfbox.pdmodel.common.PDNameTreeNode;
+import org.apache.pdfbox.pdmodel.interactive.action.PDActionJavaScript;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.multipart.MultipartFile;
+
+import io.swagger.v3.oas.annotations.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")
+    public ResponseEntity<byte[]> extractHeader(@ModelAttribute PDFFile request) throws Exception {
+    	MultipartFile inputFile = request.getFileInput();
+        String script = "";
+
+        try (PDDocument document = PDDocument.load(inputFile.getInputStream())) {
+        	
+        	if(document.getDocumentCatalog() != null && document.getDocumentCatalog().getNames() != null) {
+	            PDNameTreeNode<PDActionJavaScript> jsTree = document.getDocumentCatalog().getNames().getJavaScript();
+	
+	            if (jsTree != null) {
+	                Map<String, PDActionJavaScript> jsEntries = jsTree.getNames();
+	
+	                for (Map.Entry<String, PDActionJavaScript> entry : jsEntries.entrySet()) {
+	                    String name = entry.getKey();
+	                    PDActionJavaScript jsAction = entry.getValue();
+	                    String jsCodeStr = jsAction.getAction();
+	
+	                    script += "// File: " + inputFile.getOriginalFilename() + ", Script: " + name + "\n" + jsCodeStr + "\n";
+	                }
+	            }
+        	}
+
+            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/other/PageNumbersController.java

@@ -1,174 +0,0 @@
-package stirling.software.SPDF.controller.api.other;
-
-import java.io.IOException;
-import java.util.List;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RequestPart;
-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.Parameter;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import stirling.software.SPDF.utils.GeneralUtils;
-import stirling.software.SPDF.utils.PdfUtils;
-import stirling.software.SPDF.utils.WebResponseUtils;
-import org.apache.pdfbox.pdmodel.*;
-import org.apache.pdfbox.pdmodel.common.*;
-import org.apache.pdfbox.pdmodel.PDPageContentStream.*;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.http.*;
-import org.springframework.web.multipart.MultipartFile;
-import io.swagger.v3.oas.annotations.*;
-import io.swagger.v3.oas.annotations.media.*;
-import io.swagger.v3.oas.annotations.parameters.*;
-import org.apache.pdfbox.pdmodel.font.PDType1Font;
-import org.apache.tomcat.util.http.ResponseUtil;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.net.URLEncoder;
-import java.util.List;
-
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.multipart.MultipartFile;
-
-import com.itextpdf.io.font.constants.StandardFonts;
-import com.itextpdf.kernel.font.PdfFont;
-import com.itextpdf.kernel.font.PdfFontFactory;
-import com.itextpdf.kernel.geom.Rectangle;
-import com.itextpdf.kernel.pdf.PdfReader;
-import com.itextpdf.kernel.pdf.PdfWriter;
-import com.itextpdf.kernel.pdf.PdfDocument;
-import com.itextpdf.kernel.pdf.PdfPage;
-import com.itextpdf.kernel.pdf.canvas.PdfCanvas;
-import com.itextpdf.layout.Canvas;
-import com.itextpdf.layout.element.Paragraph;
-import com.itextpdf.layout.properties.TextAlignment;
-
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.io.*;
-
-@RestController
-@Tag(name = "Other", description = "Other APIs")
-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")
-    public ResponseEntity<byte[]> addPageNumbers(
-        @Parameter(description = "The input PDF file", required = true) @RequestParam("fileInput") MultipartFile file,
-        @Parameter(description = "Custom margin: small/medium/large", required = true, schema = @Schema(type = "string", allowableValues = {"small", "medium", "large"})) @RequestParam("customMargin") String customMargin,
-        @Parameter(description = "Position: 1 of 9 positions", required = true, schema = @Schema(type = "integer", minimum = "1", maximum = "9")) @RequestParam("position") int position,
-        @Parameter(description = "Starting number", required = true, schema = @Schema(type = "integer", minimum = "1")) @RequestParam("startingNumber") int startingNumber,
-        @Parameter(description = "Which pages to number, default all", required = false, schema = @Schema(type = "string")) @RequestParam(value = "pagesToNumber", required = false) String pagesToNumber,
-        @Parameter(description = "Custom text: defaults to just number but can have things like \"Page {n} of {p}\"", required = false, schema = @Schema(type = "string")) @RequestParam(value = "customText", required = false) String customText)
-        throws IOException {
-
-        byte[] fileBytes = file.getBytes();
-        ByteArrayInputStream bais = new ByteArrayInputStream(fileBytes);
-
-        int pageNumber = startingNumber;
-        float marginFactor;
-        switch (customMargin.toLowerCase()) {
-            case "small":
-                marginFactor = 0.02f;
-                break;
-            case "medium":
-                marginFactor = 0.035f;
-                break;
-            case "large":
-                marginFactor = 0.05f;
-                break;
-            case "x-large":
-                marginFactor = 0.1f;
-                break;
-            default:
-                marginFactor = 0.035f;
-                break;
-        }
-
-        float fontSize = 12.0f;
-
-        PdfReader reader = new PdfReader(bais);
-        ByteArrayOutputStream baos = new ByteArrayOutputStream();
-        PdfWriter writer = new PdfWriter(baos);
-
-        PdfDocument pdfDoc = new PdfDocument(reader, writer);
-
-        List<Integer> pagesToNumberList = GeneralUtils.parsePageList(pagesToNumber.split(","), pdfDoc.getNumberOfPages());
-
-        for (int i : pagesToNumberList) {
-            PdfPage page = pdfDoc.getPage(i+1);
-            Rectangle pageSize = page.getPageSize();
-            PdfCanvas pdfCanvas = new PdfCanvas(page.newContentStreamAfter(), page.getResources(), pdfDoc);
-
-            String text = customText != null ? customText.replace("{n}", String.valueOf(pageNumber)).replace("{total}", String.valueOf(pdfDoc.getNumberOfPages())) : String.valueOf(pageNumber);
-
-            PdfFont font = PdfFontFactory.createFont(StandardFonts.HELVETICA);
-            float textWidth = font.getWidth(text, fontSize);
-            float textHeight = font.getAscent(text, fontSize) - font.getDescent(text, fontSize);
-
-            float x, y;
-            TextAlignment alignment;
-
-            int xGroup = (position - 1) % 3;
-            int yGroup = 2 - (position - 1) / 3;
-
-            switch (xGroup) {
-                case 0:  // left
-                    x = pageSize.getLeft() + marginFactor * pageSize.getWidth();
-                    alignment = TextAlignment.LEFT;
-                    break;
-                case 1:  // center
-                    x = pageSize.getLeft() + (pageSize.getWidth()) / 2;
-                    alignment = TextAlignment.CENTER;
-                    break;
-                default: // right
-                    x = pageSize.getRight() - marginFactor * pageSize.getWidth();
-                    alignment = TextAlignment.RIGHT;
-                    break;
-            }
-
-            switch (yGroup) {
-            case 0:  // bottom
-                y = pageSize.getBottom() +   marginFactor * pageSize.getHeight();
-                break;
-            case 1:  // middle
-                y = pageSize.getBottom() + (pageSize.getHeight() ) / 2;
-                break;
-            default: // top
-                y = pageSize.getTop() - marginFactor * pageSize.getHeight();
-                break;
-        }
-
-            new Canvas(pdfCanvas, page.getPageSize())
-                    .showTextAligned(new Paragraph(text).setFont(font).setFontSize(fontSize), x, y, alignment);
-
-            pageNumber++;
-        }
-
-
-        pdfDoc.close();
-        byte[] resultBytes = baos.toByteArray();
-
-        return WebResponseUtils.bytesToWebResponse(resultBytes, URLEncoder.encode(file.getOriginalFilename().replaceFirst("[.][^.]+$", "") + "_numbersAdded.pdf", "UTF-8"), MediaType.APPLICATION_PDF);
-
-    }
-
-
-
-}

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

@@ -3,8 +3,10 @@ package stirling.software.SPDF.controller.api.pipeline;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.File;
+import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
+import java.io.OutputStream;
 import java.io.PrintStream;
 import java.nio.file.Files;
 import java.nio.file.Path;
@@ -20,8 +22,7 @@ import java.util.stream.Stream;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipInputStream;
 import java.util.zip.ZipOutputStream;
-import java.io.FileOutputStream;
-import java.io.OutputStream;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -36,9 +37,9 @@ import org.springframework.http.ResponseEntity;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.util.LinkedMultiValueMap;
 import org.springframework.util.MultiValueMap;
+import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RequestPart;
+import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.client.RestTemplate;
 import org.springframework.web.multipart.MultipartFile;
@@ -47,11 +48,14 @@ import com.fasterxml.jackson.databind.JsonNode;
 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.PipelineOperation;
+import stirling.software.SPDF.model.api.HandleDataRequest;
 import stirling.software.SPDF.utils.WebResponseUtils;
 
 @RestController
+@RequestMapping("/api/v1/pipeline")
 @Tag(name = "Pipeline", description = "Pipeline APIs")
 public class PipelineController {
 
@@ -91,6 +95,10 @@ public class PipelineController {
 		}
 	}
 
+	@Autowired
+	ApplicationProperties applicationProperties;
+	
+
 	private void handleDirectory(Path dir) throws Exception {
 		logger.info("Handling directory: {}", dir);
 		Path jsonFile = dir.resolve(jsonFileName);
@@ -182,8 +190,7 @@ public class PipelineController {
 						// {filename} {folder} {date} {tmime} {pipeline}
 						String outputDir = config.getOutputDir();
 
-						// Check if the environment variable 'automatedOutputFolder' is set
-						String outputFolder = System.getenv("automatedOutputFolder");
+						String outputFolder = applicationProperties.getAutoPipeline().getOutputFolder();
 
 						if (outputFolder == null || outputFolder.isEmpty()) {
 						    // If the environment variable is not set, use the default value
@@ -413,8 +420,9 @@ public class PipelineController {
 	}
 
 	@PostMapping("/handleData")
-	public ResponseEntity<byte[]> handleData(@RequestPart("fileInput") MultipartFile[] files,
-			@RequestParam("json") String jsonString) {
+	public ResponseEntity<byte[]> handleData(@ModelAttribute HandleDataRequest request) {
+	    MultipartFile[] files = request.getFileInputs();
+	    String jsonString = request.getJsonString();
 		logger.info("Received POST request to /handleData with {} files", files.length);
 		try {
 			List<Resource> outputFiles = handleFiles(files, jsonString);

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

@@ -3,294 +3,256 @@ package stirling.software.SPDF.controller.api.security;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
-import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.security.KeyFactory;
 import java.security.KeyStore;
-import java.security.Principal;
 import java.security.PrivateKey;
 import java.security.Security;
-import java.security.cert.Certificate;
 import java.security.cert.CertificateFactory;
 import java.security.cert.X509Certificate;
 import java.security.spec.PKCS8EncodedKeySpec;
 import java.text.SimpleDateFormat;
-import java.util.Arrays;
+import java.util.Calendar;
+import java.util.Collections;
 import java.util.Date;
-import java.util.List;
 
+import org.apache.commons.io.IOUtils;
+import org.apache.pdfbox.pdmodel.PDDocument;
+import org.apache.pdfbox.pdmodel.PDPage;
+import org.apache.pdfbox.pdmodel.PDPageContentStream;
+import org.apache.pdfbox.pdmodel.PDResources;
+import org.apache.pdfbox.pdmodel.common.PDRectangle;
+import org.apache.pdfbox.pdmodel.font.PDType1Font;
+import org.apache.pdfbox.pdmodel.interactive.annotation.PDAnnotationWidget;
+import org.apache.pdfbox.pdmodel.interactive.annotation.PDAppearanceDictionary;
+import org.apache.pdfbox.pdmodel.interactive.annotation.PDAppearanceStream;
+import org.apache.pdfbox.pdmodel.interactive.digitalsignature.ExternalSigningSupport;
+import org.apache.pdfbox.pdmodel.interactive.digitalsignature.PDSignature;
+import org.apache.pdfbox.pdmodel.interactive.digitalsignature.SignatureOptions;
+import org.apache.pdfbox.pdmodel.interactive.form.PDAcroForm;
+import org.apache.pdfbox.pdmodel.interactive.form.PDSignatureField;
+import org.bouncycastle.cert.jcajce.JcaCertStore;
+import org.bouncycastle.cms.CMSProcessableByteArray;
+import org.bouncycastle.cms.CMSSignedData;
+import org.bouncycastle.cms.CMSSignedDataGenerator;
+import org.bouncycastle.cms.CMSTypedData;
+import org.bouncycastle.cms.jcajce.JcaSignerInfoGeneratorBuilder;
 import org.bouncycastle.jce.provider.BouncyCastleProvider;
+import org.bouncycastle.operator.ContentSigner;
+import org.bouncycastle.operator.jcajce.JcaContentSignerBuilder;
+import org.bouncycastle.operator.jcajce.JcaDigestCalculatorProviderBuilder;
 import org.bouncycastle.util.io.pem.PemReader;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RequestPart;
+import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
 
-import com.itextpdf.io.font.constants.StandardFonts;
-import com.itextpdf.kernel.font.PdfFont;
-import com.itextpdf.kernel.font.PdfFontFactory;
-import com.itextpdf.kernel.geom.Rectangle;
-import com.itextpdf.kernel.pdf.PdfDocument;
-import com.itextpdf.kernel.pdf.PdfPage;
-import com.itextpdf.kernel.pdf.PdfReader;
-import com.itextpdf.kernel.pdf.StampingProperties;
-import com.itextpdf.signatures.BouncyCastleDigest;
-import com.itextpdf.signatures.DigestAlgorithms;
-import com.itextpdf.signatures.IExternalDigest;
-import com.itextpdf.signatures.IExternalSignature;
-import com.itextpdf.signatures.PdfPKCS7;
-import com.itextpdf.signatures.PdfSignatureAppearance;
-import com.itextpdf.signatures.PdfSigner;
-import com.itextpdf.signatures.PrivateKeySignature;
-import com.itextpdf.signatures.SignatureUtil;
-
 import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.media.Schema;
 import io.swagger.v3.oas.annotations.tags.Tag;
+import stirling.software.SPDF.model.api.security.SignPDFWithCertRequest;
 import stirling.software.SPDF.utils.WebResponseUtils;
+
 @RestController
+@RequestMapping("/api/v1/security")
 @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 {
-        Security.addProvider(new BouncyCastleProvider());
-    }
+	static {
+		Security.addProvider(new BouncyCastleProvider());
+	}
 
-    @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")
-    public ResponseEntity<byte[]> signPDF(
-        @RequestPart(required = true, value = "fileInput")
-        @Parameter(description = "The input PDF file to be signed")
-                MultipartFile pdf,
+	@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")
+	public ResponseEntity<byte[]> signPDFWithCert(@ModelAttribute SignPDFWithCertRequest request) throws Exception {
+	    MultipartFile pdf = request.getFileInput();
+	    String certType = request.getCertType();
+	    MultipartFile privateKeyFile = request.getPrivateKeyFile();
+	    MultipartFile certFile = request.getCertFile();
+	    MultipartFile p12File = request.getP12File();
+	    String password = request.getPassword();
+	    Boolean showSignature = request.isShowSignature();
+	    String reason = request.getReason();
+	    String location = request.getLocation();
+	    String name = request.getName();
+	    Integer pageNumber = request.getPageNumber();
 
-        @RequestParam(value = "certType", required = false)
-        @Parameter(description = "The type of the digital certificate", schema = @Schema(allowableValues = {"PKCS12", "PEM"}))
-                String certType,
+		PrivateKey privateKey = null;
+		X509Certificate cert = null;
 
-        @RequestParam(value = "key", required = false)
-        @Parameter(description = "The private key for the digital certificate (required for PEM type certificates)")
-                MultipartFile privateKeyFile,
+		if (certType != null) {
+			logger.info("Cert type provided: {}", certType);
+			switch (certType) {
+			case "PKCS12":
+				if (p12File != null) {
+					KeyStore ks = KeyStore.getInstance("PKCS12");
+					ks.load(new ByteArrayInputStream(p12File.getBytes()), password.toCharArray());
+					String alias = ks.aliases().nextElement();
+					if (!ks.isKeyEntry(alias)) {
+						throw new IllegalArgumentException("The provided PKCS12 file does not contain a private key.");
+					}
+					privateKey = (PrivateKey) ks.getKey(alias, password.toCharArray());
+					cert = (X509Certificate) ks.getCertificate(alias);
+				}
+				break;
+			case "PEM":
+				if (privateKeyFile != null && certFile != null) {
+					// Load private key
+					KeyFactory keyFactory = KeyFactory.getInstance("RSA", BouncyCastleProvider.PROVIDER_NAME);
+					if (isPEM(privateKeyFile.getBytes())) {
+						privateKey = keyFactory
+								.generatePrivate(new PKCS8EncodedKeySpec(parsePEM(privateKeyFile.getBytes())));
+					} else {
+						privateKey = keyFactory.generatePrivate(new PKCS8EncodedKeySpec(privateKeyFile.getBytes()));
+					}
 
-        @RequestParam(value = "cert", required = false)
-        @Parameter(description = "The digital certificate (required for PEM type certificates)")
-                MultipartFile certFile,
+					// Load certificate
+					CertificateFactory certFactory = CertificateFactory.getInstance("X.509",
+							BouncyCastleProvider.PROVIDER_NAME);
+					if (isPEM(certFile.getBytes())) {
+						cert = (X509Certificate) certFactory
+								.generateCertificate(new ByteArrayInputStream(parsePEM(certFile.getBytes())));
+					} else {
+						cert = (X509Certificate) certFactory
+								.generateCertificate(new ByteArrayInputStream(certFile.getBytes()));
+					}
+				}
+				break;
+			}
+		}
+		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());
 		
-        @RequestParam(value = "p12", required = false)
-        @Parameter(description = "The PKCS12 keystore file (required for PKCS12 type certificates)")
-                MultipartFile p12File,
+		// Load the PDF
+		try (PDDocument document = PDDocument.load(pdf.getBytes())) {
+			logger.info("Successfully loaded the provided PDF");
+			SignatureOptions signatureOptions = new SignatureOptions();
 
-        @RequestParam(value = "password", required = false)
-        @Parameter(description = "The password for the keystore or the private key")
-                String password,
+			// If you want to show the signature
 
-        @RequestParam(value = "showSignature", required = false)
-        @Parameter(description = "Whether to visually show the signature in the PDF file")
-                Boolean showSignature,
+			// ATTEMPT 2
+			if (showSignature != null && showSignature) {
+				PDPage page = document.getPage(pageNumber - 1);
 
-        @RequestParam(value = "reason", required = false)
-        @Parameter(description = "The reason for signing the PDF")
-                String reason,
+				PDAcroForm acroForm = document.getDocumentCatalog().getAcroForm();
+				if (acroForm == null) {
+					acroForm = new PDAcroForm(document);
+					document.getDocumentCatalog().setAcroForm(acroForm);
+				}
 
-        @RequestParam(value = "location", required = false)
-        @Parameter(description = "The location where the PDF is signed")
-                String location,
+				// Create a new signature field and widget
 
-        @RequestParam(value = "name", required = false)
-        @Parameter(description = "The name of the signer")
-                String name,
+				PDSignatureField signatureField = new PDSignatureField(acroForm);
+				PDAnnotationWidget widget = signatureField.getWidgets().get(0);
+				PDRectangle rect = new PDRectangle(100, 100, 200, 50); // Define the rectangle size here
+				widget.setRectangle(rect);
+				page.getAnnotations().add(widget);
 
-        @RequestParam(value = "pageNumber", required = false)
-        @Parameter(description = "The page number where the signature should be visible. This is required if showSignature is set to true")
-                Integer pageNumber) throws Exception {
+// Set the appearance for the signature field
+				PDAppearanceDictionary appearanceDict = new PDAppearanceDictionary();
+				PDAppearanceStream appearanceStream = new PDAppearanceStream(document);
+				appearanceStream.setResources(new PDResources());
+				appearanceStream.setBBox(rect);
+				appearanceDict.setNormalAppearance(appearanceStream);
+				widget.setAppearance(appearanceDict);
 
-        BouncyCastleProvider provider = new BouncyCastleProvider();
-        Security.addProvider(provider);
+				try (PDPageContentStream contentStream = new PDPageContentStream(document, appearanceStream)) {
+					contentStream.beginText();
+					contentStream.setFont(PDType1Font.HELVETICA_BOLD, 12);
+					contentStream.newLineAtOffset(110, 130);
+					contentStream.showText("Digitally signed by: " + (name != null ? name : "Unknown"));
+					contentStream.newLineAtOffset(0, -15);
+					contentStream.showText("Date: " + new SimpleDateFormat("yyyy.MM.dd HH:mm:ss z").format(new Date()));
+					contentStream.newLineAtOffset(0, -15);
+					if (reason != null && !reason.isEmpty()) {
+						contentStream.showText("Reason: " + reason);
+						contentStream.newLineAtOffset(0, -15);
+					}
+					if (location != null && !location.isEmpty()) {
+						contentStream.showText("Location: " + location);
+						contentStream.newLineAtOffset(0, -15);
+					}
+					contentStream.endText();
+				}
 
-        PrivateKey privateKey = null;
-        X509Certificate cert = null;
+				// Add the widget annotation to the page
+				page.getAnnotations().add(widget);
 
-        if (certType != null) {
-            switch (certType) {
-                case "PKCS12":
-                    if (p12File != null) {
-                        KeyStore ks = KeyStore.getInstance("PKCS12");
-                        ks.load(new ByteArrayInputStream(p12File.getBytes()), password.toCharArray());
-                        String alias = ks.aliases().nextElement();
-                        privateKey = (PrivateKey) ks.getKey(alias, password.toCharArray());
-                        cert = (X509Certificate) ks.getCertificate(alias);
-                    }
-                    break;
-                case "PEM":
-                    if (privateKeyFile != null && certFile != null) {
-                        // Load private key
-                        KeyFactory keyFactory = KeyFactory.getInstance("RSA", provider);
-                        if (isPEM(privateKeyFile.getBytes())) {
-                            privateKey = keyFactory.generatePrivate(new PKCS8EncodedKeySpec(parsePEM(privateKeyFile.getBytes())));
-                        } else {
-                            privateKey = keyFactory.generatePrivate(new PKCS8EncodedKeySpec(privateKeyFile.getBytes()));
-                        }
+				// Add the signature field to the acroform
+				acroForm.getFields().add(signatureField);
 
-                        // Load certificate
-                        CertificateFactory certFactory = CertificateFactory.getInstance("X.509", provider);
-                        if (isPEM(certFile.getBytes())) {
-                            cert = (X509Certificate) certFactory.generateCertificate(new ByteArrayInputStream(parsePEM(certFile.getBytes())));
-                        } else {
-                            cert = (X509Certificate) certFactory.generateCertificate(new ByteArrayInputStream(certFile.getBytes()));
-                        }
-                    }
-                    break;
-            }
-        }
+				// Handle multiple signatures by ensuring a unique field name
+				String baseFieldName = "Signature";
+				String signatureFieldName = baseFieldName;
+				int suffix = 1;
+				while (acroForm.getField(signatureFieldName) != null) {
+					suffix++;
+					signatureFieldName = baseFieldName + suffix;
+				}
+				signatureField.setPartialName(signatureFieldName);
+			}
 			
-        Principal principal = cert.getSubjectDN();
-        String dn = principal.getName();
+			document.addSignature(signature, signatureOptions);
+			logger.info("Signature added to the PDF document");
+			// External signing
+			ExternalSigningSupport externalSigning = document
+					.saveIncrementalForExternalSigning(new ByteArrayOutputStream());
 
-        // Extract the "CN" (Common Name) field from the distinguished name (if it's present)
-        String cn = null;
-        for (String part : dn.split(",")) {
-            if (part.trim().startsWith("CN=")) {
-                cn = part.trim().substring("CN=".length());
-                break;
-            }
-        }
+			byte[] content = IOUtils.toByteArray(externalSigning.getContent());
 
-        // Set up the PDF reader and stamper
-        PdfReader reader = new PdfReader(new ByteArrayInputStream(pdf.getBytes()));
-        ByteArrayOutputStream signedPdf = new ByteArrayOutputStream();
-        PdfSigner signer = new PdfSigner(reader, signedPdf, new StampingProperties());
+			// Using BouncyCastle to sign
+			CMSTypedData cmsData = new CMSProcessableByteArray(content);
 
-        // Set up the signing appearance
-        PdfSignatureAppearance appearance = signer.getSignatureAppearance()
-                .setReason("Test")
-                .setLocation("TestLocation");
+			CMSSignedDataGenerator gen = new CMSSignedDataGenerator();
+			ContentSigner signer = new JcaContentSignerBuilder("SHA256withRSA")
+					.setProvider(BouncyCastleProvider.PROVIDER_NAME).build(privateKey);
 
-        if (showSignature != null && showSignature) {
-            float fontSize = 4;  // the font size of the signature
-            float marginRight = 36; // Margin from the right
-            float marginBottom = 36; // Margin from the bottom
-            String signingDate = new SimpleDateFormat("yyyy.MM.dd HH:mm:ss z").format(new Date());
+			gen.addSignerInfoGenerator(new JcaSignerInfoGeneratorBuilder(
+					new JcaDigestCalculatorProviderBuilder().setProvider(BouncyCastleProvider.PROVIDER_NAME).build())
+					.build(signer, cert));
 
-            // Prepare the text for the digital signature
-            StringBuilder layer2TextBuilder = new StringBuilder(String.format("Digitally signed by: %s\nDate: %s", 
-            	    name != null ? name : "Unknown", signingDate));
+			gen.addCertificates(new JcaCertStore(Collections.singletonList(cert)));
+			CMSSignedData signedData = gen.generate(cmsData, false);
 
-        	if (reason != null && !reason.isEmpty()) {
-        		layer2TextBuilder.append("\nReason: ").append(reason);
-        	}
+			byte[] cmsSignature = signedData.getEncoded();
+			logger.info("About to sign content using BouncyCastle");
+			externalSigning.setSignature(cmsSignature);
+			logger.info("Signature set successfully");
 
-        	if (location != null && !location.isEmpty()) {
-        		layer2TextBuilder.append("\nLocation: ").append(location);
-        	}
-            String 	layer2Text = layer2TextBuilder.toString();
-            // Get the PDF font and measure the width and height of the text block
-            PdfFont font = PdfFontFactory.createFont(StandardFonts.HELVETICA_BOLD);
-            float textWidth = Arrays.stream(layer2Text.split("\n"))
-                                    .map(line -> font.getWidth(line, fontSize))
-                                    .max(Float::compare)
-                                    .orElse(0f);
-            int numLines = layer2Text.split("\n").length;
-            float textHeight = numLines * fontSize;
-
-            // Calculate the signature rectangle size
-            float sigWidth = textWidth + marginRight * 2;
-            float sigHeight = textHeight + marginBottom * 2;
-
-            // Get the page size
-            PdfPage page = signer.getDocument().getPage(1);
-            Rectangle pageSize = page.getPageSize();
-
-            // Define the position and dimension of the signature field
-            Rectangle rect = new Rectangle(
-                pageSize.getRight() - sigWidth - marginRight,
-                pageSize.getBottom() + marginBottom,
-                sigWidth,
-                sigHeight
-            );
-
-            // Configure the appearance of the digital signature
-            appearance.setPageRect(rect)
-	            .setContact(name != null ? name : "")
-	            .setPageNumber(pageNumber)
-	            .setReason(reason != null ? reason : "")
-	            .setLocation(location != null ? location : "")
-	            .setReuseAppearance(false)
-	            .setLayer2Text(layer2Text.toString());
-
-            signer.setFieldName("sig");
-        } else {
-            appearance.setRenderingMode(PdfSignatureAppearance.RenderingMode.DESCRIPTION);
-        }
-        
-        // Set up the signer
-        PrivateKeySignature pks = new PrivateKeySignature(privateKey, DigestAlgorithms.SHA256, provider.getName());
-        IExternalSignature pss = new PrivateKeySignature(privateKey, DigestAlgorithms.SHA256, provider.getName());
-        IExternalDigest digest = new BouncyCastleDigest();
-
-        // Call iTex7 to sign the PDF
-        signer.signDetached(digest, pks, new Certificate[] {cert}, null, null, null, 0, PdfSigner.CryptoStandard.CMS);
-
-        
-        System.out.println("Signed PDF size: " + signedPdf.size());
-
-        System.out.println("PDF signed = " + isPdfSigned(signedPdf.toByteArray()));
-        return WebResponseUtils.bytesToWebResponse(signedPdf.toByteArray(), "example.pdf");
-    }
-
-public boolean isPdfSigned(byte[] pdfData) throws IOException {
-    InputStream pdfStream = new ByteArrayInputStream(pdfData);
-    PdfDocument pdfDoc = new PdfDocument(new PdfReader(pdfStream));
-    SignatureUtil signatureUtil = new SignatureUtil(pdfDoc);
-    List<String> names = signatureUtil.getSignatureNames();
-
-    boolean isSigned = false;
-
-    for (String name : names) {
-        PdfPKCS7 pkcs7 = signatureUtil.readSignatureData(name);
-        if (pkcs7 != null) {
-            System.out.println("Signature found.");
-
-            // Log certificate details
-            Certificate[] signChain = pkcs7.getSignCertificateChain();
-            for (Certificate cert : signChain) {
-                if (cert instanceof X509Certificate) {
-                    X509Certificate x509 = (X509Certificate) cert;
-                    System.out.println("Certificate Details:");
-                    System.out.println("Subject: " + x509.getSubjectDN());
-                    System.out.println("Issuer: " + x509.getIssuerDN());
-                    System.out.println("Serial: " + x509.getSerialNumber());
-                    System.out.println("Not Before: " + x509.getNotBefore());
-                    System.out.println("Not After: " + x509.getNotAfter());
-                }
-            }
-
-            isSigned = true;
-        }
-    }
-
-    pdfDoc.close();
-
-    return isSigned;
-}
-    private byte[] parsePEM(byte[] content) throws IOException {
-        PemReader pemReader = 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");
-    }
+			// After setting the signature, return the resultant PDF
+			try (ByteArrayOutputStream signedPdfOutput = new ByteArrayOutputStream()) {
+				document.save(signedPdfOutput);
+				return WebResponseUtils.boasToWebResponse(signedPdfOutput,
+						pdf.getOriginalFilename().replaceFirst("[.][^.]+$", "") + "_signed.pdf");
 
+			} catch (Exception e) {
+				e.printStackTrace();
+			}
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
 
+		return null;
+	}
 
+	private byte[] parsePEM(byte[] content) throws IOException {
+		PemReader pemReader = 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");
+	}
 
 }

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

@@ -0,0 +1,807 @@
+package stirling.software.SPDF.controller.api.security;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import org.apache.pdfbox.cos.COSDocument;
+import org.apache.pdfbox.cos.COSInputStream;
+import org.apache.pdfbox.cos.COSName;
+import org.apache.pdfbox.cos.COSObject;
+import org.apache.pdfbox.cos.COSStream;
+import org.apache.pdfbox.cos.COSString;
+import org.apache.pdfbox.pdmodel.PDDocument;
+import org.apache.pdfbox.pdmodel.PDDocumentCatalog;
+import org.apache.pdfbox.pdmodel.PDDocumentInformation;
+import org.apache.pdfbox.pdmodel.PDDocumentNameDictionary;
+import org.apache.pdfbox.pdmodel.PDEmbeddedFilesNameTreeNode;
+import org.apache.pdfbox.pdmodel.PDJavascriptNameTreeNode;
+import org.apache.pdfbox.pdmodel.PDPage;
+import org.apache.pdfbox.pdmodel.PDResources;
+import org.apache.pdfbox.pdmodel.common.PDMetadata;
+import org.apache.pdfbox.pdmodel.common.PDRectangle;
+import org.apache.pdfbox.pdmodel.common.PDStream;
+import org.apache.pdfbox.pdmodel.common.filespecification.PDComplexFileSpecification;
+import org.apache.pdfbox.pdmodel.common.filespecification.PDEmbeddedFile;
+import org.apache.pdfbox.pdmodel.documentinterchange.logicalstructure.PDStructureElement;
+import org.apache.pdfbox.pdmodel.documentinterchange.logicalstructure.PDStructureNode;
+import org.apache.pdfbox.pdmodel.documentinterchange.logicalstructure.PDStructureTreeRoot;
+import org.apache.pdfbox.pdmodel.encryption.AccessPermission;
+import org.apache.pdfbox.pdmodel.encryption.PDEncryption;
+import org.apache.pdfbox.pdmodel.font.PDFont;
+import org.apache.pdfbox.pdmodel.font.PDFontDescriptor;
+import org.apache.pdfbox.pdmodel.graphics.PDXObject;
+import org.apache.pdfbox.pdmodel.graphics.color.PDColorSpace;
+import org.apache.pdfbox.pdmodel.graphics.color.PDICCBased;
+import org.apache.pdfbox.pdmodel.graphics.form.PDFormXObject;
+import org.apache.pdfbox.pdmodel.graphics.image.PDImageXObject;
+import org.apache.pdfbox.pdmodel.graphics.optionalcontent.PDOptionalContentGroup;
+import org.apache.pdfbox.pdmodel.graphics.optionalcontent.PDOptionalContentProperties;
+import org.apache.pdfbox.pdmodel.interactive.action.PDActionJavaScript;
+import org.apache.pdfbox.pdmodel.interactive.action.PDActionURI;
+import org.apache.pdfbox.pdmodel.interactive.annotation.PDAnnotation;
+import org.apache.pdfbox.pdmodel.interactive.annotation.PDAnnotationFileAttachment;
+import org.apache.pdfbox.pdmodel.interactive.annotation.PDAnnotationLink;
+import org.apache.pdfbox.pdmodel.interactive.documentnavigation.outline.PDOutlineItem;
+import org.apache.pdfbox.pdmodel.interactive.documentnavigation.outline.PDOutlineNode;
+import org.apache.pdfbox.pdmodel.interactive.form.PDAcroForm;
+import org.apache.pdfbox.pdmodel.interactive.form.PDField;
+import org.apache.pdfbox.text.PDFTextStripper;
+import org.apache.xmpbox.XMPMetadata;
+import org.apache.xmpbox.xml.DomXmpParser;
+import org.apache.xmpbox.xml.XmpParsingException;
+import org.apache.xmpbox.xml.XmpSerializer;
+import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.multipart.MultipartFile;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.node.ArrayNode;
+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();
+
+	@PostMapping(consumes = "multipart/form-data", value = "/get-info-on-pdf")
+    @Operation(summary = "Summary here", description = "desc. Input:PDF Output:JSON Type:SISO")
+    public ResponseEntity<byte[]> getPdfInfo(@ModelAttribute PDFFile request)
+            throws IOException {
+		MultipartFile inputFile = request.getFileInput();
+		try (
+			    PDDocument pdfBoxDoc = PDDocument.load(inputFile.getInputStream());
+			) {
+            ObjectMapper objectMapper = new ObjectMapper();
+            ObjectNode jsonOutput = objectMapper.createObjectNode();
+
+            // Metadata using PDFBox
+            PDDocumentInformation info = pdfBoxDoc.getDocumentInformation();
+            ObjectNode metadata = objectMapper.createObjectNode();
+            ObjectNode basicInfo = objectMapper.createObjectNode();
+            ObjectNode docInfoNode = objectMapper.createObjectNode();
+            ObjectNode compliancy = objectMapper.createObjectNode();
+            ObjectNode encryption = objectMapper.createObjectNode();
+            ObjectNode other = objectMapper.createObjectNode();
+            
+            
+            metadata.put("Title", info.getTitle());
+            metadata.put("Author", info.getAuthor());
+            metadata.put("Subject", info.getSubject());
+            metadata.put("Keywords", info.getKeywords());
+            metadata.put("Producer", info.getProducer());
+            metadata.put("Creator", info.getCreator());
+            metadata.put("CreationDate", formatDate(info.getCreationDate()));
+            metadata.put("ModificationDate", formatDate(info.getModificationDate()));
+            jsonOutput.set("Metadata", metadata);
+            
+            
+            
+            
+            // Total file size of the PDF
+            long fileSizeInBytes = inputFile.getSize();
+            basicInfo.put("FileSizeInBytes", fileSizeInBytes);
+            
+            // Number of words, paragraphs, and images in the entire document
+            String fullText = new PDFTextStripper().getText(pdfBoxDoc);
+            String[] words = fullText.split("\\s+");
+            int wordCount = words.length;
+            int paragraphCount = fullText.split("\r\n|\r|\n").length;
+            basicInfo.put("WordCount", wordCount);
+            basicInfo.put("ParagraphCount", paragraphCount);
+            // Number of characters in the entire document (including spaces and special characters)
+            int charCount = fullText.length();
+            basicInfo.put("CharacterCount", charCount);
+            
+            
+            // Initialize the flags and types
+            boolean hasCompression = false;
+            String compressionType = "None";
+
+            COSDocument cosDoc = pdfBoxDoc.getDocument();
+            for (COSObject cosObject : cosDoc.getObjects()) {
+                if (cosObject.getObject() instanceof COSStream) {
+                    COSStream cosStream = (COSStream) cosObject.getObject();
+                    if (COSName.OBJ_STM.equals(cosStream.getItem(COSName.TYPE))) {
+                        hasCompression = true;
+                        compressionType = "Object Streams";
+                        break;
+                    }
+                }
+            }
+            basicInfo.put("Compression", hasCompression);
+            if(hasCompression)
+            	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));;
+            
+
+            
+            
+            
+            PDAcroForm acroForm = pdfBoxDoc.getDocumentCatalog().getAcroForm();
+
+            ObjectNode formFieldsNode = objectMapper.createObjectNode();
+            if (acroForm != null) {
+                for (PDField field : acroForm.getFieldTree()) {
+                    formFieldsNode.put(field.getFullyQualifiedName(), field.getValueAsString());
+                }
+            }
+            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) {
+	                    for (Map.Entry<String, PDComplexFileSpecification> entry : efMap.entrySet()) {
+	                        ObjectNode embeddedFileNode = objectMapper.createObjectNode();
+	                        embeddedFileNode.put("Name", entry.getKey());
+	                        PDEmbeddedFile embeddedFile = entry.getValue().getEmbeddedFile();
+	                        if (embeddedFile != null) {
+	                            embeddedFileNode.put("FileSize", embeddedFile.getLength()); // size in bytes
+	                        }
+	                        embeddedFilesArray.add(embeddedFileNode);
+	                    }
+	                }
+	            }
+	            other.set("EmbeddedFiles", embeddedFilesArray);
+            }
+
+
+            
+            //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;
+
+                        ObjectNode attachmentNode = objectMapper.createObjectNode();
+                        attachmentNode.put("Name", fileAttachmentAnnotation.getAttachmentName());
+                        attachmentNode.put("Description", fileAttachmentAnnotation.getContents());
+
+                        attachmentsArray.add(attachmentNode);
+                    }
+                }
+            }
+            other.set("Attachments", attachmentsArray);
+
+            //Javascript
+            PDDocumentNameDictionary namesDict = catalog.getNames();
+            ArrayNode javascriptArray = objectMapper.createArrayNode();
+
+            if (namesDict != null) {
+                PDJavascriptNameTreeNode javascriptDict = namesDict.getJavaScript();
+                if (javascriptDict != null) {
+                    try {
+                        Map<String, PDActionJavaScript> jsEntries = javascriptDict.getNames();
+
+                        for (Map.Entry<String, PDActionJavaScript> entry : jsEntries.entrySet()) {
+                            ObjectNode jsNode = objectMapper.createObjectNode();
+                            jsNode.put("JS Name", entry.getKey());
+
+                            PDActionJavaScript jsAction = entry.getValue();
+                            if (jsAction != null) {
+                                String jsCodeStr = jsAction.getAction();
+                                if (jsCodeStr != null) {
+                                    jsNode.put("JS Script Length", jsCodeStr.length());
+                                }
+                            }
+
+                            javascriptArray.add(jsNode);
+                        }
+                    } catch (IOException e) {
+                        e.printStackTrace();
+                    }
+                }
+            }
+            other.set("JavaScript", javascriptArray);
+
+            
+            //TODO size
+            PDOptionalContentProperties ocProperties = pdfBoxDoc.getDocumentCatalog().getOCProperties();
+            ArrayNode layersArray = objectMapper.createArrayNode();
+
+            if (ocProperties != null) {
+                for (PDOptionalContentGroup ocg : ocProperties.getOptionalContentGroups()) {
+                    ObjectNode layerNode = objectMapper.createObjectNode();
+                    layerNode.put("Name", ocg.getName());
+                    layersArray.add(layerNode);
+                }
+            }
+
+            other.set("Layers", layersArray);
+            
+            //TODO Security
+            
+
+
+            
+            
+            PDStructureTreeRoot structureTreeRoot = pdfBoxDoc.getDocumentCatalog().getStructureTreeRoot();
+            ArrayNode structureTreeArray;
+			try {
+				if(structureTreeRoot != null) {
+					structureTreeArray = exploreStructureTree(structureTreeRoot.getKids());
+					other.set("StructureTree", structureTreeArray);
+				}
+			} catch (Exception e) {
+				// TODO Auto-generated catch block
+				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 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);
+            compliancy.put("IsPDF/ECompliant", isPdfECompliant);
+            compliancy.put("IsPDF/VTCompliant", isPdfVTCompliant);
+            compliancy.put("IsPDF/UACompliant", isPdfUACompliant);
+            compliancy.put("IsPDF/BCompliant", isPdfBCompliant);
+            compliancy.put("IsPDF/SECCompliant", isPdfSECCompliant);
+
+     
+            
+           
+            
+            PDOutlineNode root = pdfBoxDoc.getDocumentCatalog().getDocumentOutline();
+            ArrayNode bookmarksArray = objectMapper.createArrayNode();
+
+            if (root != null) {
+                for (PDOutlineItem child : root.children()) {
+                    addOutlinesToArray(child, bookmarksArray);
+                }
+            }
+
+            other.set("Bookmarks/Outline/TOC", bookmarksArray);
+            
+     
+
+			PDMetadata pdMetadata = pdfBoxDoc.getDocumentCatalog().getMetadata();
+			
+			String xmpString = null;
+			
+			if (pdMetadata != null) {
+			    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);
+
+            
+            
+            if (pdfBoxDoc.isEncrypted()) {
+            	encryption.put("IsEncrypted", true);
+
+                // Retrieve encryption details using getEncryption()
+                PDEncryption pdfEncryption = pdfBoxDoc.getEncryption();
+                encryption.put("EncryptionAlgorithm", pdfEncryption.getFilter());
+                encryption.put("KeyLength", pdfEncryption.getLength());
+                AccessPermission ap = pdfBoxDoc.getCurrentAccessPermission();
+                if (ap != null) {
+                    ObjectNode permissionsNode = objectMapper.createObjectNode();
+                    
+                    permissionsNode.put("CanAssembleDocument", ap.canAssembleDocument());
+                    permissionsNode.put("CanExtractContent", ap.canExtractContent());
+                    permissionsNode.put("CanExtractForAccessibility", ap.canExtractForAccessibility());
+                    permissionsNode.put("CanFillInForm", ap.canFillInForm());
+                    permissionsNode.put("CanModify", ap.canModify());
+                    permissionsNode.put("CanModifyAnnotations", ap.canModifyAnnotations());
+                    permissionsNode.put("CanPrint", ap.canPrint());
+                    permissionsNode.put("CanPrintDegraded", ap.canPrintDegraded());
+
+                    encryption.set("Permissions", permissionsNode);  // set the node under "Permissions"
+                } 
+                // Add other encryption-related properties as needed
+            } else {
+            	encryption.put("IsEncrypted", false);
+            }
+            
+            
+            
+
+            ObjectNode pageInfoParent = objectMapper.createObjectNode();
+            for (int pageNum = 0; pageNum < pdfBoxDoc.getNumberOfPages(); pageNum++) {
+                ObjectNode pageInfo = objectMapper.createObjectNode();
+
+             // Retrieve the page
+                PDPage page = pdfBoxDoc.getPage(pageNum);
+
+                // Page-level Information
+                PDRectangle mediaBox = page.getMediaBox();
+
+                float width = mediaBox.getWidth();
+                float height = mediaBox.getHeight();
+
+                ObjectNode sizeInfo = objectMapper.createObjectNode();
+                
+                getDimensionInfo(sizeInfo, width, height);
+                
+                sizeInfo.put("Standard Page", getPageSize(width, height));
+                pageInfo.set("Size", sizeInfo);
+                		
+                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.
+                PDRectangle cropBox = page.getCropBox();
+                pageInfo.put("CropBox", cropBox == null ? "Undefined" : cropBox.toString());
+
+                PDRectangle bleedBox = page.getBleedBox();
+                pageInfo.put("BleedBox", bleedBox == null ? "Undefined" : bleedBox.toString());
+
+                PDRectangle trimBox = page.getTrimBox();
+                pageInfo.put("TrimBox", trimBox == null ? "Undefined" : trimBox.toString());
+
+                PDRectangle artBox = page.getArtBox();
+                pageInfo.put("ArtBox", artBox == null ? "Undefined" : artBox.toString());
+
+                // Content Extraction
+                PDFTextStripper textStripper = new PDFTextStripper();
+                textStripper.setStartPage(pageNum + 1);
+                textStripper.setEndPage(pageNum +1);
+                String pageText = textStripper.getText(pdfBoxDoc);
+                
+                pageInfo.put("Text Characters Count", pageText.length()); //
+
+                // Annotations
+            
+                List<PDAnnotation> annotations = page.getAnnotations();
+
+                int subtypeCount = 0;
+                int contentsCount = 0;
+
+                for (PDAnnotation annotation : annotations) {
+                    if (annotation.getSubtype() != null) {
+                        subtypeCount++;  // Increase subtype count
+                    }
+                    if (annotation.getContents() != null) {
+                        contentsCount++;  // Increase contents count
+                    }
+                }
+
+                ObjectNode annotationsObject = objectMapper.createObjectNode();
+                annotationsObject.put("AnnotationsCount", annotations.size());
+                annotationsObject.put("SubtypeCount", subtypeCount);
+                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) {
+                        PDImageXObject image = (PDImageXObject) xObject;
+                        
+                        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) {
+                        	 imageNode.put("Name", image.getMetadata().getFile().getFile());
+                        }
+                        if (image.getColorSpace() != null) {
+                            imageNode.put("ColorSpace", image.getColorSpace().getName());
+                        }
+
+                        imagesArray.add(imageNode);
+                    }
+                }
+                pageInfo.set("Images", imagesArray);
+
+                
+                // Links
+                ArrayNode linksArray = objectMapper.createArrayNode();
+                Set<String> uniqueURIs = new HashSet<>();  // To store unique URIs
+
+                for (PDAnnotation annotation : annotations) {
+                    if (annotation instanceof PDAnnotationLink) {
+                        PDAnnotationLink linkAnnotation = (PDAnnotationLink) annotation;
+                        if (linkAnnotation.getAction() instanceof PDActionURI) {
+                            PDActionURI uriAction = (PDActionURI) linkAnnotation.getAction();
+                            String uri = uriAction.getURI();
+                            uniqueURIs.add(uri);  // Add to set to ensure uniqueness
+                        }
+                    }
+                }
+
+                // Add unique URIs to linksArray
+                for (String uri : uniqueURIs) {
+                    ObjectNode linkNode = objectMapper.createObjectNode();
+                    linkNode.put("URI", uri);
+                    linksArray.add(linkNode);
+                }
+                pageInfo.set("Links", linksArray);
+                
+                
+                // Fonts
+                ArrayNode fontsArray = objectMapper.createArrayNode();
+                Map<String, ObjectNode> uniqueFontsMap = new HashMap<>();
+
+                for (COSName fontName : resources.getFontNames()) {
+                    PDFont font = resources.getFont(fontName);
+                    ObjectNode fontNode = objectMapper.createObjectNode();
+
+                    fontNode.put("IsEmbedded", font.isEmbedded());
+
+                    // PDFBox provides Font's BaseFont (i.e., the font name) directly
+                    fontNode.put("Name", font.getName());
+
+                    fontNode.put("Subtype", font.getType());
+
+                    PDFontDescriptor fontDescriptor = font.getFontDescriptor();
+
+                    if (fontDescriptor != null) {
+                        fontNode.put("ItalicAngle", fontDescriptor.getItalicAngle());
+                        int flags = fontDescriptor.getFlags();
+                        fontNode.put("IsItalic", (flags & 1) != 0);
+                        fontNode.put("IsBold", (flags & 64) != 0);
+                        fontNode.put("IsFixedPitch", (flags & 2) != 0);
+                        fontNode.put("IsSerif", (flags & 4) != 0);
+                        fontNode.put("IsSymbolic", (flags & 8) != 0);
+                        fontNode.put("IsScript", (flags & 16) != 0);
+                        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
+                        fontNode.put("FontWeight", fontDescriptor.getFontWeight());
+                    }
+
+
+                    // Create a unique key for this font node based on its attributes
+                    String uniqueKey = fontNode.toString(); 
+
+                    // Increment count if this font exists, or initialize it if new
+                    if (uniqueFontsMap.containsKey(uniqueKey)) {
+                        ObjectNode existingFontNode = uniqueFontsMap.get(uniqueKey);
+                        int count = existingFontNode.get("Count").asInt() + 1;
+                        existingFontNode.put("Count", count);
+                    } else {
+                        fontNode.put("Count", 1);
+                        uniqueFontsMap.put(uniqueKey, fontNode);
+                    }
+                }
+
+                // Add unique font entries to fontsArray
+                for (ObjectNode uniqueFontNode : uniqueFontsMap.values()) {
+                    fontsArray.add(uniqueFontNode);
+                }
+
+                pageInfo.set("Fonts", fontsArray);
+                
+                
+                
+                
+                
+                
+                
+                
+                
+                
+                
+                // Access resources dictionary
+                ArrayNode colorSpacesArray = objectMapper.createArrayNode();
+
+                Iterable<COSName> colorSpaceNames = resources.getColorSpaceNames();
+                for (COSName name : colorSpaceNames) {
+                    PDColorSpace colorSpace = resources.getColorSpace(name);
+                    if (colorSpace instanceof PDICCBased) {
+                        PDICCBased iccBased = (PDICCBased) colorSpace;
+                        PDStream iccData = iccBased.getPDStream();
+                        byte[] iccBytes = iccData.toByteArray();
+                        
+                        // TODO: Further decode and analyze the ICC data if needed
+                        ObjectNode iccProfileNode = objectMapper.createObjectNode();
+                        iccProfileNode.put("ICC Profile Length", iccBytes.length);
+                        colorSpacesArray.add(iccProfileNode);
+                    }
+                }
+                pageInfo.set("Color Spaces & ICC Profiles", colorSpacesArray);
+                
+
+                // Other XObjects
+                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;
+                    
+                    if (xObject instanceof PDImageXObject) {
+                        xObjectType = "Image";
+                    } else if (xObject instanceof PDFormXObject) {
+                        xObjectType = "Form";
+                    } else {
+                        xObjectType = "Other";
+                    }
+
+                    // Increment the count for this type in the map
+                    xObjectCountMap.put(xObjectType, xObjectCountMap.getOrDefault(xObjectType, 0) + 1);
+                }
+
+                // Add the count map to pageInfo (or wherever you want to store it)
+                ObjectNode xObjectCountNode = objectMapper.createObjectNode();
+                for (Map.Entry<String, Integer> entry : xObjectCountMap.entrySet()) {
+                    xObjectCountNode.put(entry.getKey(), entry.getValue());
+                }
+                pageInfo.set("XObjectCounts", xObjectCountNode);
+                
+         
+
+
+                ArrayNode multimediaArray = objectMapper.createArrayNode();
+
+                for (PDAnnotation annotation : annotations) {
+                	if ("RichMedia".equals(annotation.getSubtype())) {
+                        ObjectNode multimediaNode = objectMapper.createObjectNode();
+                        // Extract details from the annotation as needed
+                        multimediaArray.add(multimediaNode);
+                    }
+                }
+
+                pageInfo.set("Multimedia", multimediaArray);
+
+                
+
+                pageInfoParent.set("Page " + (pageNum+1), pageInfo);
+            }
+
+            
+            jsonOutput.set("BasicInfo", basicInfo);
+            jsonOutput.set("DocumentInfo", docInfoNode);
+            jsonOutput.set("Compliancy", compliancy);
+            jsonOutput.set("Encryption", encryption);
+            jsonOutput.set("Other", other);
+            jsonOutput.set("PerPageInfo", pageInfoParent);
+            
+            
+            
+            // Save JSON to file
+            String jsonString = objectMapper.writerWithDefaultPrettyPrinter().writeValueAsString(jsonOutput);
+            
+            
+            
+            return WebResponseUtils.bytesToWebResponse(jsonString.getBytes(StandardCharsets.UTF_8), "response.json", MediaType.APPLICATION_JSON);
+            
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+		return null;
+    }
+
+    private static void addOutlinesToArray(PDOutlineItem outline, ArrayNode arrayNode) {
+        if (outline == null) return;
+
+        ObjectNode outlineNode = objectMapper.createObjectNode();
+        outlineNode.put("Title", outline.getTitle());
+        // You can add other properties if needed
+        arrayNode.add(outlineNode);
+
+        PDOutlineItem child = outline.getFirstChild();
+        while (child != null) {
+            addOutlinesToArray(child, arrayNode);
+            child = child.getNextSibling();
+        }
+    }
+
+    public String getPageOrientation(double width, double height) {        
+        if (width > height) {
+            return "Landscape";
+        } else if (height > width) {
+            return "Portrait";
+        } else {
+            return "Square";
+        }
+    }
+    public String getPageSize(float width, float height) {
+        // Define standard page sizes
+        Map<String, PDRectangle> standardSizes = new HashMap<>();
+        standardSizes.put("Letter", PDRectangle.LETTER);
+        standardSizes.put("LEGAL", PDRectangle.LEGAL);
+        standardSizes.put("A0", PDRectangle.A0);
+        standardSizes.put("A1", PDRectangle.A1);
+        standardSizes.put("A2", PDRectangle.A2);
+        standardSizes.put("A3", PDRectangle.A3);
+        standardSizes.put("A4", PDRectangle.A4);
+        standardSizes.put("A5", PDRectangle.A5);
+        standardSizes.put("A6", PDRectangle.A6);
+
+        for (Map.Entry<String, PDRectangle> entry : standardSizes.entrySet()) {
+            PDRectangle size = entry.getValue();
+            if (isCloseToSize(width, height, size.getWidth(), size.getHeight())) {
+                return entry.getKey();
+            }
+        }
+        return "Custom";
+    }
+
+    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;
+    }
+
+
+    public ObjectNode getDimensionInfo(ObjectNode dimensionInfo, float width, float height) {      
+        float ppi = 72; // Points Per Inch
+        
+        float widthInInches = width / ppi;
+        float heightInInches = height / ppi;
+        
+        float widthInCm = widthInInches * 2.54f;
+        float heightInCm = heightInInches * 2.54f;
+        
+        dimensionInfo.put("Width (px)", String.format("%.2f", width));
+        dimensionInfo.put("Height (px)", String.format("%.2f", height));
+        dimensionInfo.put("Width (in)", String.format("%.2f", widthInInches));
+        dimensionInfo.put("Height (in)", String.format("%.2f", heightInInches));
+        dimensionInfo.put("Width (cm)", String.format("%.2f", widthInCm));
+        dimensionInfo.put("Height (cm)", String.format("%.2f", heightInCm));
+        return dimensionInfo;
+    }
+
+
+
+public static boolean checkForStandard(PDDocument document, String standardKeyword) {
+    // Check XMP Metadata
+    try {
+        PDMetadata pdMetadata = document.getDocumentCatalog().getMetadata();
+        if (pdMetadata != null) {
+            COSInputStream metaStream = pdMetadata.createInputStream();
+            DomXmpParser domXmpParser = new DomXmpParser();
+            XMPMetadata xmpMeta = domXmpParser.parse(metaStream);
+
+            ByteArrayOutputStream baos = new ByteArrayOutputStream();
+            new XmpSerializer().serialize(xmpMeta, baos, true);
+            String xmpString = new String(baos.toByteArray(), StandardCharsets.UTF_8);
+            
+            if (xmpString.contains(standardKeyword)) {
+                return true;
+            }
+        }
+    } catch (Exception e) { // Catching general exception for brevity, ideally you'd catch specific exceptions.
+        e.printStackTrace();
+    }
+    
+    return false;
+}
+
+    
+    public ArrayNode exploreStructureTree(List<Object> nodes) {
+        ArrayNode elementsArray = objectMapper.createArrayNode();
+        if (nodes != null) {
+            for (Object obj : nodes) {
+                if (obj instanceof PDStructureNode) {
+                    PDStructureNode node = (PDStructureNode) obj;
+                    ObjectNode elementNode = objectMapper.createObjectNode();
+
+                    if (node instanceof PDStructureElement) {
+                        PDStructureElement structureElement = (PDStructureElement) node;
+                        elementNode.put("Type", structureElement.getStructureType());
+                        elementNode.put("Content", getContent(structureElement));
+
+                        // Recursively explore child elements
+                        ArrayNode childElements = exploreStructureTree(structureElement.getKids());
+                        if (childElements.size() > 0) {
+                            elementNode.set("Children", childElements);
+                        }
+                    }
+                    elementsArray.add(elementNode);
+                }
+            }
+        }
+        return elementsArray;
+    }
+
+
+    public String getContent(PDStructureElement structureElement) {
+        StringBuilder contentBuilder = new StringBuilder();
+
+        for (Object item : structureElement.getKids()) {
+            if (item instanceof COSString) {
+                COSString cosString = (COSString) item;
+                contentBuilder.append(cosString.getString());
+            } else if (item instanceof PDStructureElement) {
+                // For simplicity, we're handling only COSString and PDStructureElement here
+                // but a more comprehensive method would handle other types too
+                contentBuilder.append(getContent((PDStructureElement) item));
+            }
+        }
+
+        return contentBuilder.toString();
+    }
+    
+    
+    private String formatDate(Calendar calendar) {
+        if (calendar != null) {
+            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+            return sdf.format(calendar.getTime());
+        } else {
+            return null;
+        }
+    }
+
+    private String getPageModeDescription(String pageMode) {
+        return pageMode != null ? pageMode.toString().replaceFirst("/", "") : "Unknown";
+    }
+}

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

@@ -8,18 +8,19 @@ import org.apache.pdfbox.pdmodel.encryption.StandardProtectionPolicy;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RequestPart;
+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.Parameter;
-import io.swagger.v3.oas.annotations.media.Schema;
 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")
 public class PasswordController {
 
@@ -31,13 +32,12 @@ public class PasswordController {
         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"
     )
-    public ResponseEntity<byte[]> removePassword(
-        @RequestPart(required = true, value = "fileInput")
-        @Parameter(description = "The input PDF file from which the password should be removed", required = true)
-            MultipartFile fileInput,
-        @RequestParam(name = "password")
-        @Parameter(description = "The password of the PDF file", required = true)
-            String password) 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");
@@ -48,44 +48,19 @@ public class PasswordController {
         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"
     )
-    public ResponseEntity<byte[]> addPassword(
-        @RequestPart(required = true, value = "fileInput")
-        @Parameter(description = "The input PDF file to which the password should be added", required = true)
-            MultipartFile fileInput,
-        @RequestParam(defaultValue = "", name = "ownerPassword")
-        @Parameter(description = "The owner password to be added to the PDF file (Restricts what can be done with the document once it is opened)")
-            String ownerPassword,
-        @RequestParam(defaultValue = "", name = "password")
-        @Parameter(description = "The password to be added to the PDF file (Restricts the opening of the document itself.)")
-            String password,
-        @RequestParam(defaultValue = "128", name = "keyLength")
-        @Parameter(description = "The length of the encryption key", schema = @Schema(allowableValues = {"40", "128", "256"}))
-            int keyLength,
-        @RequestParam(defaultValue = "false", name = "canAssembleDocument")
-        @Parameter(description = "Whether the document assembly is allowed", example = "false")
-            boolean canAssembleDocument,
-        @RequestParam(defaultValue = "false", name = "canExtractContent")
-        @Parameter(description = "Whether content extraction for accessibility is allowed", example = "false")
-            boolean canExtractContent,
-        @RequestParam(defaultValue = "false", name = "canExtractForAccessibility")
-        @Parameter(description = "Whether content extraction for accessibility is allowed", example = "false")
-            boolean canExtractForAccessibility,
-        @RequestParam(defaultValue = "false", name = "canFillInForm")
-        @Parameter(description = "Whether form filling is allowed", example = "false")
-            boolean canFillInForm,
-        @RequestParam(defaultValue = "false", name = "canModify")
-        @Parameter(description = "Whether the document modification is allowed", example = "false")
-            boolean canModify,
-        @RequestParam(defaultValue = "false", name = "canModifyAnnotations")
-        @Parameter(description = "Whether modification of annotations is allowed", example = "false")
-            boolean canModifyAnnotations,
-        @RequestParam(defaultValue = "false", name = "canPrint")
-        @Parameter(description = "Whether printing of the document is allowed", example = "false")
-            boolean canPrint,
-        @RequestParam(defaultValue = "false", name = "canPrintFaithful")
-        @Parameter(description = "Whether faithful printing is allowed", example = "false")
-            boolean canPrintFaithful
-    ) throws IOException {
+    public ResponseEntity<byte[]> addPassword(@ModelAttribute AddPasswordRequest request) throws IOException {
+        MultipartFile fileInput = request.getFileInput();
+        String ownerPassword = request.getOwnerPassword();
+        String password = request.getPassword();
+        int keyLength = request.getKeyLength();
+        boolean canAssembleDocument = request.isCanAssembleDocument();
+        boolean canExtractContent = request.isCanExtractContent();
+        boolean canExtractForAccessibility = request.isCanExtractForAccessibility();
+        boolean canFillInForm = request.isCanFillInForm();
+        boolean canModify = request.isCanModify();
+        boolean canModifyAnnotations = request.isCanModifyAnnotations();
+        boolean canPrint = request.isCanPrint();
+        boolean canPrintFaithful = request.isCanPrintFaithful();
 
         PDDocument document = PDDocument.load(fileInput.getBytes());
         AccessPermission ap = new AccessPermission();
@@ -99,14 +74,14 @@ public class PasswordController {
         ap.setCanPrintFaithful(!canPrintFaithful);
         StandardProtectionPolicy spp = new StandardProtectionPolicy(ownerPassword, password, ap);
 
-     
-        
-        spp.setEncryptionKeyLength(keyLength);
-
+        if(!"".equals(ownerPassword) || !"".equals(password)) {
+        	spp.setEncryptionKeyLength(keyLength);
+        }
         spp.setPermissions(ap);
-
         document.protect(spp);
 
+        if("".equals(ownerPassword) && "".equals(password))
+        	return WebResponseUtils.pdfDocToWebResponse(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

@@ -0,0 +1,123 @@
+package stirling.software.SPDF.controller.api.security;
+
+import java.awt.Color;
+import java.awt.image.BufferedImage;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.util.List;
+
+import org.apache.pdfbox.pdmodel.PDDocument;
+import org.apache.pdfbox.pdmodel.PDPage;
+import org.apache.pdfbox.pdmodel.PDPageContentStream;
+import org.apache.pdfbox.pdmodel.common.PDRectangle;
+import org.apache.pdfbox.pdmodel.graphics.image.LosslessFactory;
+import org.apache.pdfbox.pdmodel.graphics.image.PDImageXObject;
+import org.apache.pdfbox.rendering.ImageType;
+import org.apache.pdfbox.rendering.PDFRenderer;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.PostMapping;
+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.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")
+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", 
+               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();
+        boolean wholeWordSearchBool = request.isWholeWordSearch();
+        String colorString = request.getRedactColor();
+        float customPadding = request.getCustomPadding();
+        boolean convertPDFToImage = request.isConvertPDFToImage();
+        
+    	System.out.println(listOfTextString);
+    	String[] listOfText = listOfTextString.split("\n");
+        byte[] bytes = file.getBytes();
+        PDDocument document = PDDocument.load(new ByteArrayInputStream(bytes));
+        
+        Color redactColor;
+        try {
+        	if (!colorString.startsWith("#")) {
+                colorString = "#" + colorString;
+            }
+            redactColor = Color.decode(colorString);
+        } catch (NumberFormatException e) {
+            logger.warn("Invalid color string provided. Using default color BLACK for redaction.");
+            redactColor = Color.BLACK;
+        }
+
+
+        
+        for (String text : listOfText) {
+        	text = text.trim();
+        	System.out.println(text);
+        	TextFinder textFinder = new TextFinder(text, useRegex, wholeWordSearchBool);
+            List<PDFText> foundTexts = textFinder.getTextLocations(document);
+            redactFoundText(document, foundTexts, customPadding,redactColor);
+        }
+        
+        
+        
+        if (convertPDFToImage) {
+            PDDocument imageDocument = new PDDocument();
+            PDFRenderer pdfRenderer = new PDFRenderer(document);
+            for (int page = 0; page < document.getNumberOfPages(); ++page) {
+                BufferedImage bim = pdfRenderer.renderImageWithDPI(page, 300, ImageType.RGB);
+                PDPage newPage = new PDPage(new PDRectangle(bim.getWidth(), bim.getHeight()));
+                imageDocument.addPage(newPage);
+                PDImageXObject pdImage = LosslessFactory.createFromImage(imageDocument, bim);
+                PDPageContentStream contentStream = new PDPageContentStream(imageDocument, newPage);
+                contentStream.drawImage(pdImage, 0, 0);
+                contentStream.close();
+            }
+            document.close();
+            document = imageDocument;
+        }
+
+        ByteArrayOutputStream baos = new ByteArrayOutputStream();
+        document.save(baos);
+        document.close();
+        
+        byte[] pdfContent = baos.toByteArray();
+        return WebResponseUtils.bytesToWebResponse(pdfContent,
+                file.getOriginalFilename().replaceFirst("[.][^.]+$", "") + "_redacted.pdf");
+    }
+
+    
+    private void redactFoundText(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);
+            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.fill();
+            contentStream.close();
+        }
+    }
+
+
+}

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

@@ -1,55 +1,51 @@
 package stirling.software.SPDF.controller.api.security;
+import java.io.IOException;
+
+import org.apache.pdfbox.cos.COSDictionary;
 import org.apache.pdfbox.cos.COSName;
 import org.apache.pdfbox.pdmodel.PDDocument;
+import org.apache.pdfbox.pdmodel.PDDocumentCatalog;
 import org.apache.pdfbox.pdmodel.PDPage;
-import org.apache.pdfbox.pdmodel.PDResources;
 import org.apache.pdfbox.pdmodel.PDPageTree;
+import org.apache.pdfbox.pdmodel.PDResources;
 import org.apache.pdfbox.pdmodel.common.PDMetadata;
-import org.apache.pdfbox.pdmodel.common.PDStream;
-import org.apache.pdfbox.pdmodel.interactive.action.*;
+import org.apache.pdfbox.pdmodel.interactive.action.PDAction;
+import org.apache.pdfbox.pdmodel.interactive.action.PDActionJavaScript;
+import org.apache.pdfbox.pdmodel.interactive.action.PDActionLaunch;
+import org.apache.pdfbox.pdmodel.interactive.action.PDActionURI;
+import org.apache.pdfbox.pdmodel.interactive.action.PDFormFieldAdditionalActions;
 import org.apache.pdfbox.pdmodel.interactive.annotation.PDAnnotation;
 import org.apache.pdfbox.pdmodel.interactive.annotation.PDAnnotationLink;
 import org.apache.pdfbox.pdmodel.interactive.annotation.PDAnnotationWidget;
 import org.apache.pdfbox.pdmodel.interactive.form.PDAcroForm;
 import org.apache.pdfbox.pdmodel.interactive.form.PDField;
-import org.apache.pdfbox.pdmodel.interactive.form.PDNonTerminalField;
-import org.apache.pdfbox.pdmodel.interactive.form.PDTerminalField;
 import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
+
 import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import stirling.software.SPDF.model.api.security.SanitizePdfRequest;
 import stirling.software.SPDF.utils.WebResponseUtils;
 
-import java.io.IOException;
-import java.io.InputStream;
-
 @RestController
+@RequestMapping("/api/v1/security")
+@Tag(name = "Security", description = "Security APIs")
 public class SanitizeController {
 
 	@PostMapping(consumes = "multipart/form-data", value = "/sanitize-pdf")
 	@Operation(summary = "Sanitize a PDF file",
 	        description = "This endpoint processes a PDF file and removes specific elements based on the provided options. Input:PDF Output:PDF Type:SISO")
-	public ResponseEntity<byte[]> sanitizePDF(
-	        @RequestPart(required = true, value = "fileInput")
-	        @Parameter(description = "The input PDF file to be sanitized")
-	                MultipartFile inputFile,
-	        @RequestParam(name = "removeJavaScript", required = false, defaultValue = "true")
-	        @Parameter(description = "Remove JavaScript actions from the PDF if set to true")
-	                Boolean removeJavaScript,
-	        @RequestParam(name = "removeEmbeddedFiles", required = false, defaultValue = "true")
-	        @Parameter(description = "Remove embedded files from the PDF if set to true")
-	                Boolean removeEmbeddedFiles,
-	        @RequestParam(name = "removeMetadata", required = false, defaultValue = "true")
-	        @Parameter(description = "Remove metadata from the PDF if set to true")
-	                Boolean removeMetadata,
-	        @RequestParam(name = "removeLinks", required = false, defaultValue = "true")
-	        @Parameter(description = "Remove links from the PDF if set to true")
-	                Boolean removeLinks,
-	        @RequestParam(name = "removeFonts", required = false, defaultValue = "true")
-	        @Parameter(description = "Remove fonts from the PDF if set to true")
-	                Boolean removeFonts) throws IOException {
+	public ResponseEntity<byte[]> sanitizePDF(@ModelAttribute SanitizePdfRequest request) throws IOException {
+	    MultipartFile inputFile = request.getFileInput();
+	    boolean removeJavaScript = request.isRemoveJavaScript();
+	    boolean removeEmbeddedFiles = request.isRemoveEmbeddedFiles();
+	    boolean removeMetadata = request.isRemoveMetadata();
+	    boolean removeLinks = request.isRemoveLinks();
+	    boolean removeFonts = request.isRemoveFonts();
 
 	    try (PDDocument document = PDDocument.load(inputFile.getInputStream())) {
 	        if (removeJavaScript) {
@@ -75,8 +71,24 @@ public class SanitizeController {
 	        return WebResponseUtils.pdfDocToWebResponse(document, inputFile.getOriginalFilename().replaceFirst("[.][^.]+$", "") + "_sanitized.pdf");
 	    }
 	}
-    private void sanitizeJavaScript(PDDocument document) throws IOException {
-    	for (PDPage page : document.getPages()) {
+	private void sanitizeJavaScript(PDDocument document) throws IOException {
+		// Get the root dictionary (catalog) of the PDF
+	    PDDocumentCatalog catalog = document.getDocumentCatalog();
+
+	    // Get the Names dictionary
+	    COSDictionary namesDict = (COSDictionary) catalog.getCOSObject().getDictionaryObject(COSName.NAMES);
+
+	    if (namesDict != null) {
+	        // Get the JavaScript dictionary
+	        COSDictionary javaScriptDict = (COSDictionary) namesDict.getDictionaryObject(COSName.getPDFName("JavaScript"));
+
+	        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;
@@ -89,13 +101,28 @@ public class SanitizeController {
 	        PDAcroForm acroForm = document.getDocumentCatalog().getAcroForm();
 	        if (acroForm != null) {
 	            for (PDField field : acroForm.getFields()) {
-	                if (field.getActions().getF() instanceof PDActionJavaScript) {
-	                    field.getActions().setF(null);
-	                }
+	            	PDFormFieldAdditionalActions actions = field.getActions();
+	            	if(actions != null) {
+	            		if (actions.getC() instanceof PDActionJavaScript) {
+	                        actions.setC(null);
+	                    }
+	                    if (actions.getF() instanceof PDActionJavaScript) {
+	                        actions.setF(null);
+	                    }
+	                    if (actions.getK() instanceof PDActionJavaScript) {
+	                        actions.setK(null);
+	                    }
+	                    if (actions.getV() instanceof PDActionJavaScript) {
+	                        actions.setV(null);
+	                    }
+	            	}
 	            }
 	        }
 	    }
-    }
+	}
+
+
+
 
     private void sanitizeEmbeddedFiles(PDDocument document) {
         PDPageTree allPages = document.getPages();

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

@@ -1,8 +1,6 @@
 package stirling.software.SPDF.controller.api.security;
 
 import java.awt.Color;
-import java.awt.Graphics2D;
-import java.awt.RenderingHints;
 import java.awt.image.BufferedImage;
 import java.io.File;
 import java.io.FileOutputStream;
@@ -24,40 +22,35 @@ import org.apache.pdfbox.pdmodel.graphics.state.PDExtendedGraphicsState;
 import org.apache.pdfbox.util.Matrix;
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RequestPart;
+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.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
+import stirling.software.SPDF.model.api.security.AddWatermarkRequest;
 import stirling.software.SPDF.utils.WebResponseUtils;
-import io.swagger.v3.oas.annotations.media.Schema;
 
 @RestController
+@RequestMapping("/api/v1/security")
 @Tag(name = "Security", description = "Security APIs")
 public class WatermarkController {
 
 	@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")
-	public ResponseEntity<byte[]> addWatermark(
-			@RequestPart(required = true, value = "fileInput") @Parameter(description = "The input PDF file to add a watermark") MultipartFile pdfFile,
-			@RequestPart(required = true) @Parameter(description = "The watermark type (text or image)") String watermarkType,
-			@RequestPart(required = false) @Parameter(description = "The watermark text") String watermarkText,
-			@RequestPart(required = false) @Parameter(description = "The watermark image") MultipartFile watermarkImage,
-			
-			@RequestParam(defaultValue = "roman", name = "alphabet") @Parameter(description = "The selected alphabet", 
-            schema = @Schema(type = "string", 
-                             allowableValues = {"roman","arabic","japanese","korean","chinese"}, 
-                             defaultValue = "roman")) String alphabet,
-			@RequestParam(defaultValue = "30", name = "fontSize") @Parameter(description = "The font size of the watermark text", example = "30") float fontSize,
-			@RequestParam(defaultValue = "0", name = "rotation") @Parameter(description = "The rotation of the watermark in degrees", example = "0") float rotation,
-			@RequestParam(defaultValue = "0.5", name = "opacity") @Parameter(description = "The opacity of the watermark (0.0 - 1.0)", example = "0.5") float opacity,
-			@RequestParam(defaultValue = "50", name = "widthSpacer") @Parameter(description = "The width spacer between watermark elements", example = "50") int widthSpacer,
-			@RequestParam(defaultValue = "50", name = "heightSpacer") @Parameter(description = "The height spacer between watermark elements", example = "50") int heightSpacer)
-			throws IOException, Exception {
+	public ResponseEntity<byte[]> addWatermark(@ModelAttribute AddWatermarkRequest request) throws IOException, Exception {
+	    MultipartFile pdfFile = request.getFileInput();
+	    String watermarkType = request.getWatermarkType();
+	    String watermarkText = request.getWatermarkText();
+	    MultipartFile watermarkImage = request.getWatermarkImage();
+	    String alphabet = request.getAlphabet();
+	    float fontSize = request.getFontSize();
+	    float rotation = request.getRotation();
+	    float opacity = request.getOpacity();
+	    int widthSpacer = request.getWidthSpacer();
+	    int heightSpacer = request.getHeightSpacer();
 
 		// Load the input PDF
 		PDDocument document = PDDocument.load(pdfFile.getInputStream());

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

@@ -0,0 +1,358 @@
+package stirling.software.SPDF.controller.api.strippers;
+
+import java.awt.Shape;
+import java.awt.geom.AffineTransform;
+import java.awt.geom.Rectangle2D;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.OutputStreamWriter;
+import java.io.Writer;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Set;
+
+import org.apache.fontbox.util.BoundingBox;
+import org.apache.pdfbox.pdmodel.PDPage;
+import org.apache.pdfbox.pdmodel.common.PDRectangle;
+import org.apache.pdfbox.pdmodel.font.PDFont;
+import org.apache.pdfbox.pdmodel.font.PDType3Font;
+import org.apache.pdfbox.text.PDFTextStripper;
+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.
+ *
+ * Works best when
+ * 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
+{
+
+    /**
+     * 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
+     */
+    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)
+     */
+    private Rectangle2D regionArea;
+
+    /**
+     * Number of rows in inferred table
+     */
+    private int nRows=0;
+
+    /**
+     * Number of columns in inferred table
+     */
+    private int nCols=0;
+
+    /**
+     * This is the object that does the text extraction
+     */
+    private PDFTextStripperByArea regionStripper;
+
+    /**
+     * 1D intervals - used for calculateTableRegions()
+     * @author Beldaz
+     *
+     */
+    public static class Interval {
+        double start;
+        double end;
+        public Interval(double start, double end) {
+            this.start=start; this.end = end;
+        }
+        public void add(Interval col) {
+            if(col.start<start)
+                start = col.start;
+            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()) {
+                Interval col = it.next();
+                if(x.end>=col.start) {
+                    if(x.start<=col.end) { // overlaps
+                        x.add(col);
+                        it.remove();
+                    }
+                    break;
+                }
+                ++p;
+            }
+            while(it.hasNext()) {
+                Interval col = it.next();
+                if(x.start>col.end)
+                    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
+    {
+        super.setShouldSeparateByBeads(false);
+        regionStripper = new PDFTextStripperByArea();
+        regionStripper.setSortByPosition( true );
+    }
+
+    /**
+     * Define the region to group text by.
+     *
+     * @param rect The rectangle area to retrieve the text from.
+     */
+    public void setRegion(Rectangle2D rect )
+    {
+        regionArea = rect;
+    }
+
+    public int getRows()
+    {
+        return nRows;
+    }
+
+    public int getColumns()
+    {
+        return nCols;
+    }
+
+    /**
+     * Get the text for the region, this should be called after extractTable().
+     *
+     * @return The text that was identified in that region.
+     */
+    public String getText(int row, int col)
+    {
+        return regionStripper.getTextForRegion("el"+col+"x"+row);
+    }
+
+    public void extractTable(PDPage pdPage) throws IOException
+    {
+        setStartPage(getCurrentPageNo());
+        setEndPage(getCurrentPageNo());
+
+        boxes = new HashSet<Rectangle2D>();
+        // flip y-axis
+        flipAT = new AffineTransform();
+        flipAT.translate(0, pdPage.getBBox().getHeight());
+        flipAT.scale(1, -1);
+
+        // page may be rotated
+        rotateAT = new AffineTransform();
+        int rotation = pdPage.getRotation();
+        if (rotation != 0)
+        {
+            PDRectangle mediaBox = pdPage.getMediaBox();
+            switch (rotation)
+            {
+                case 90:
+                    rotateAT.translate(mediaBox.getHeight(), 0);
+                    break;
+                case 270:
+                    rotateAT.translate(0, mediaBox.getWidth());
+                    break;
+                case 180:
+                    rotateAT.translate(mediaBox.getWidth(), mediaBox.getHeight());
+                    break;
+                default:
+                    break;
+            }
+            rotateAT.rotate(Math.toRadians(rotation));
+        }
+        // Trigger processing of the document so that writeString is called.
+        try (Writer dummy = new OutputStreamWriter(new ByteArrayOutputStream())) {
+            super.output = dummy;
+            super.processPage(pdPage);
+        }
+
+        Rectangle2D[][] regions = calculateTableRegions();
+
+//        System.err.println("Drawing " + nCols + "x" + nRows + "="+ nRows*nCols + " regions");
+        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.extractRegions(pdPage);
+    }
+
+    /**
+     * Infer a rectangular grid of regions from the boxes field.
+     *
+     * @return 2D array of table regions (as Rectangle2D objects). Note that
+     * some of these regions may have no content.
+     */
+    private Rectangle2D[][] calculateTableRegions() {
+
+        // Build up a list of all table regions, based upon the populated
+        // regions of boxes field. Treats the horizontal and vertical extents
+        // of each box as distinct
+        LinkedList<Interval> columns = new LinkedList<Interval>();
+        LinkedList<Interval> rows = new LinkedList<Interval>();
+
+        for(Rectangle2D box: boxes) {
+            Interval x = new Interval(box.getMinX(), box.getMaxX());
+            Interval y = new Interval(box.getMinY(), box.getMaxY());
+
+            Interval.addTo(x, columns);
+            Interval.addTo(y, rows);
+        }
+
+        nRows = rows.size();
+        nCols = columns.size();
+        Rectangle2D[][] regions = new Rectangle2D[nCols][nRows];
+        int i=0;
+        // Label regions from top left, rather than the transformed orientation
+        for(Interval column: columns) {
+            int j=0;
+            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);
+                ++j;
+            }
+            ++i;
+        }
+
+        return regions;
+    }
+
+    /**
+     * Register each character's bounding box, updating boxes field to maintain
+     * a list of all distinct groups of characters.
+     *
+     * Overrides the default functionality of PDFTextStripper.
+     * Most of this is taken from DrawPrintTextLocations.java, with extra steps
+     * at end of main loop
+     */
+    @Override
+    protected void writeString(String string, List<TextPosition> textPositions) throws IOException
+    {
+        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();
+            PDFont font = text.getFont();
+            BoundingBox bbox = font.getBoundingBox();
+
+            // advance width, bbox height (glyph space)
+            float xadvance = 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)
+            {
+                // bbox and font matrix are unscaled
+                at.concatenate(font.getFontMatrix().createAffineTransform());
+            }
+            else
+            {
+                // bbox and font matrix are already scaled to 1000
+                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.getMaxX() + dx , bounds.getMaxY() + dy);
+
+            // Find all overlapping boxes
+            List<Rectangle2D> intersectList = new ArrayList<Rectangle2D>();
+            for(Rectangle2D box: boxes) {
+                if(box.intersects(hitbox)) {
+                    intersectList.add(box);
+                }
+            }
+
+            // 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) {
+                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
+     * ignored when stripping by area.
+     *
+     * @param aShouldSeparateByBeads The new grouping of beads.
+     */
+    @Override
+    public final void setShouldSeparateByBeads(boolean aShouldSeparateByBeads)
+    {
+    }
+
+    /**
+     * Adapted from PDFTextStripperByArea
+     * {@inheritDoc}
+     */
+    @Override
+    protected void processTextPosition( TextPosition text )
+    {
+        if(regionArea!=null && !regionArea.contains( text.getX(), text.getY() ) ) {
+            // skip character
+        } else {
+            super.processTextPosition( text );
+        }
+    }
+}

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

@@ -0,0 +1,135 @@
+package stirling.software.SPDF.controller.web;
+import java.util.List;
+import java.util.Optional;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.security.core.Authentication;
+import org.springframework.security.core.userdetails.UserDetails;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.GetMapping;
+
+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.User;
+import stirling.software.SPDF.repository.UserRepository;
+@Controller
+@Tag(name = "Account Security", description = "Account Security APIs")
+public class AccountWebController {
+	
+
+	@GetMapping("/login")
+	public String login(HttpServletRequest request, Model model, Authentication authentication) {
+		if (authentication != null && authentication.isAuthenticated()) {
+            return "redirect:/";
+        }
+		
+		if (request.getParameter("error") != null) {
+
+	        model.addAttribute("error", request.getParameter("error"));
+	    }
+	    if (request.getParameter("logout") != null) {
+
+	        model.addAttribute("logoutMessage", "You have been logged out.");
+	    }
+	    
+	    return "login";
+	}
+	@Autowired
+	private UserRepository userRepository;  // Assuming you have a repository for user operations
+
+
+	@PreAuthorize("hasRole('ROLE_ADMIN')")
+	@GetMapping("/addUsers")
+	public String showAddUserForm(Model model,  Authentication authentication) {
+	    List<User> allUsers = userRepository.findAll();
+	    model.addAttribute("users", allUsers);
+	    model.addAttribute("currentUsername", authentication.getName());
+	    return "addUsers";
+	}
+
+	
+	
+	@GetMapping("/account")
+	public String account(HttpServletRequest request, Model model, Authentication authentication) {
+		if (authentication == null || !authentication.isAuthenticated()) {
+            return "redirect:/";
+        }
+		if (authentication != null && authentication.isAuthenticated()) {
+	        Object principal = authentication.getPrincipal();
+
+	        if (principal instanceof UserDetails) {
+	            // Cast the principal object to UserDetails
+	            UserDetails userDetails = (UserDetails) principal;
+
+	            // 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
+	            }
+
+	            // Convert settings map to JSON string
+	            ObjectMapper objectMapper = new ObjectMapper();
+	            String settingsJson;
+	            try {
+	                settingsJson = objectMapper.writeValueAsString(user.get().getSettings());
+	            } catch (JsonProcessingException e) {
+	                // Handle JSON conversion error
+	                e.printStackTrace();
+	                return "redirect:/error";  // Example redirection in case of error
+	            }
+
+	            // Add attributes to the model
+	            model.addAttribute("username", username);
+	            model.addAttribute("role", user.get().getRolesAsString());
+	            model.addAttribute("settings", settingsJson);
+	            model.addAttribute("changeCredsFlag", user.get().isFirstLogin());
+	        }
+		} else {
+	        	return "redirect:/";
+	        }
+	    return "account";
+	}
+	 
+	
+	
+	@GetMapping("/change-creds")
+	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();
+
+	        if (principal instanceof UserDetails) {
+	            // Cast the principal object to UserDetails
+	            UserDetails userDetails = (UserDetails) principal;
+
+	            // 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";
+	}
+	
+	
+}