Merge branch 'main' into add-elements

.gitattributes

@@ -1,5 +1,3 @@
-* text=auto eol=lf
-
 # Ignore all JavaScript files in a directory
 src/main/resources/static/pdfjs/* linguist-vendored
 src/main/resources/static/pdfjs/** linguist-vendored

.github/dependabot.yml

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

.github/workflows/licenses-update.yml

@@ -1,48 +0,0 @@
-name: License Report Workflow
-
-on:
-  push:
-    branches:
-      - main
-    paths:
-      - 'build.gradle'
-
-permissions:
-  contents: write
-  pull-requests: write
-
-jobs:
-  generate-license-report:
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Check out code
-        uses: actions/checkout@v3
-
-      - name: Set up JDK 17
-        uses: actions/setup-java@v3
-        with:
-          java-version: '17'
-          distribution: 'adopt'
-
-      - name: Run Gradle Command
-        run: ./gradlew clean generateLicenseReport
-
-      - name: Move and Rename License File
-        run: |
-          mv build/reports/dependency-license/index.json src/main/resources/static/3rdPartyLicenses.json
-
-      - name: Check for Changes
-        id: git-check
-        run: |
-          git add src/main/resources/static/3rdPartyLicenses.json
-          git diff --staged --exit-code || echo "changes=true" >> $GITHUB_ENV
-
-      - name: Commit and Push Changes
-        if: env.changes == 'true'
-        run: |
-          git config --global user.name 'Stirling-PDF-Bot'
-          git config --global user.email 'Stirling-PDF-Bot@stirlingtools.com'
-          git commit -m "Update 3rd Party Licenses"
-          git push
-

.github/workflows/push-docker.yml

@@ -6,9 +6,6 @@ on:
     branches: 
       - master
       - main
-permissions:
-  contents: read
-  packages: write
 jobs:
   push:
     runs-on: ubuntu-latest

.github/workflows/releaseArtifacts.yml

@@ -3,9 +3,7 @@ name: Release Artifacts
 on: 
   release: 
     types: [created]
-permissions:
+
-  contents: write
-  packages: write
 jobs:
   push:
     runs-on: ubuntu-latest

.github/workflows/test.yml

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

CNAME

@@ -0,0 +1 @@
+stirlingtools.com

CONTRIBUTING.md

@@ -1,40 +0,0 @@
-# Contributing to Stirling-PDF
-
-Thank you for your interest in contributing to Stirling-PDF! There are many ways to contribute other than writing code. For example, reporting bugs, creating suggestions, and adding or modifying translations.
-
-## Issue Guidelines
-
-Issues can be used to report bugs, request features, or ask questions. If you have a question, you could also ask us in our [Discord](https://discord.gg/FJUSXUSYec).
-
-Before opening an issue, please check to make sure someone hasn't already opened an issue about it.
-
-## Pull Requests
-
-Before you start working on an issue, please comment on (or create) the issue and wait for it to be assigned to you. If someone has already been assigned but didn't have the time to work on it lately, please communicate with them and ask if they're still working on it. This is to avoid multiple people working on the same issue.
-
-Once you have been assigned an issue, you can start working on it. When you are ready to submit your changes, open a pull request.
-For a detailed pull request tutorial, see [this guide](https://www.digitalocean.com/community/tutorials/how-to-create-a-pull-request-on-github).
-
-Please make sure your Pull Request adheres to the following guidelines:
-
-- Use the PR template provided.
-- Keep your Pull Request title succinct, detailed and to the point.
-- Keep commits atomic. One commit should contain one change. If you want to make multiple changes, submit multiple Pull Requests.
-- Commits should be clear, concise and easy to understand.
-- References to the Issue number in the Pull Request and/or Commit message.
-
-## Translations
-
-If you would like to add or modify a translation, please see [How to add new languages to Stirling-PDF](HowToAddNewLanguage.md). Also, please create a Pull Request so others can use it!
-
-## Fixing Bugs or Adding a New Feature
-
-First, make sure you've read the section [Pull Requests](#pull-requests).
-
-To build from source, please follow this [Guide](LocalRunGuide.md).
-
-If, at any point of time, you have a question, please feel free to ask in the same issue thread or in our [Discord](https://discord.gg/FJUSXUSYec).
-
-## License
-
-By contributing to this project, you agree that your contributions will be licensed under the [GPL 3 License](LICENSE). You also acknowledge and agree that your contributions will be included in Stirling-PDF and that they can be relicensed in the future under the MPL 2.0 (Mozilla Public License Version 2.0) license.

DockerfileBase

@@ -6,8 +6,7 @@ FROM ubuntu:latest AS base
 # JDK for app
 RUN apt-get update && \
     apt-get install -y --no-install-recommends \
-    	openjdk-17-jre && \
+    	openjdk-17-jre
-    rm -rf /var/lib/apt/lists/*
     	
 # Doc conversion
 RUN apt-get update && \
@@ -19,8 +18,7 @@ RUN apt-get update && \
         libreoffice-impress \
 		python3-uno \
 		curl \
-		unoconv && \
+		unoconv
-    rm -rf /var/lib/apt/lists/*
 		
 		
 # OCR MY PDF (unpaper for descew and other advanced featues)
@@ -32,12 +30,21 @@ apt-get update && \
         python3-pip \
         ocrmypdf \
         unpaper && \
-    rm -rf /var/lib/apt/lists/* && \
+    pip install --upgrade pip && \
-    mv /usr/share/tesseract-ocr /usr/share/tesseract-ocr-original && \
-    pip install --no-cache-dir --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
+
+
+
+    

FolderScanning.md

@@ -1,41 +0,0 @@
-## User Guide for Local Directory Scanning and File Processing
-
-### Whilst Pipelines are in alpha...
-You must enable this alpha functionality by setting
-```yaml
-system:
-  enableAlphaFunctionality: true
-```
-To true like in the above for your `/config/settings.yml` file, after restarting Stirling-PDF you should see both UI and folder scanning enabled.
-
-### Setting Up Watched Folders:
-- Create a folder where you want your files to be monitored. This is your 'watched folder'.
-- The default directory for this is `./pipeline/watchedFolders/`
-- Place any directories you want to be scanned into this folder, this folder should contain multiple folders each for their own tasks and pipelines.
-
-### Configuring Processing with JSON Files:
-- In each directory you want processed (e.g `./pipeline/watchedFolders/officePrinter`), include a JSON configuration file.
-- This JSON file should specify how you want the files in the directory to be handled (e.g., what operations to perform on them) which can be made, configured and downloaded from Stirling-PDF Pipeline interface.r
-
-### Automatic Scanning and Processing:
-- The system automatically checks the watched folder every minute for new directories and files to process.
-- When a directory with a valid JSON configuration file is found, it begins processing the files inside as per the configuration.
-
-### Processing Steps:
-- Files in each directory are processed according to the instructions in the JSON file.
-- This might involve file conversions, data filtering, renaming files, etc. If the output of a step is a zip, this zip will be automatically unzipped as it passes to next process.
-
-### Results and Output:
-- After processing, the results are saved in a specified output location. This could be a different folder or location as defined in the JSON file or the default location `./pipeline/finishedFolders/`.
-- Each processed file is named and organized according to the rules set in the JSON configuration.
-
-### Completion and Cleanup:
-- Once processing is complete, the original files in the watched folder's directory are removed.
-- You can find the processed files in the designated output location.
-
-### Error Handling:
-- If there's an error during processing, the system will not delete the original files, allowing you to check and retry if necessary.
-
-### User Interaction:
-- As a user, your main tasks are to set up the watched folders, place directories with files for processing, and create the corresponding JSON configuration files.
-- The system handles the rest, including scanning, processing, and outputting results.

HowToAddNewLanguage.md

@@ -1,4 +1,4 @@
-<p align="center"><img src="https://raw.githubusercontent.com/Stirling-Tools/Stirling-PDF/main/docs/stirling.png" width="80" ><br><h1 align="center">Stirling-PDF</h1>
+<p align="center"><img src="https://raw.githubusercontent.com/Frooodle/Stirling-PDF/main/docs/stirling.png" width="80" ><br><h1 align="center">Stirling-PDF</h1>
 </p>
 
 
@@ -8,15 +8,15 @@ 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/Stirling-Tools/Stirling-PDF/blob/main/src/main/resources/templates/fragments/languages.html
+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/Stirling-Tools/Stirling-PDF/tree/main/src/main/resources/static/images/flags
+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/)
 If your language isnt represented by a flag just find whichever closely matches it, such as for Arabic i chose Saudi Arabia
 
 
 For example to add Polish you would add 
-```html
+```
 <a class="dropdown-item lang_dropdown-item" href="" data-language-code="pl_PL">
     <img src="images/flags/pl.svg" alt="icon" width="20" height="15"> Polski
 </a>
@@ -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/Stirling-Tools/Stirling-PDF/blob/main/src/main/resources/messages_en_GB.properties](https://github.com/Stirling-Tools/Stirling-PDF/blob/main/src/main/resources/messages_en_GB.properties)
+[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
 

LocalRunGuide.md

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

PipelineFeature.md

@@ -1,42 +0,0 @@
-# Pipeline Configuration and Usage Tutorial
-
-## Whilst Pipelines are in alpha...
-You must enable this alpha functionality by setting
-```yaml
-system:
-  enableAlphaFunctionality: true
-```
-To true like in the above for your `/config/settings.yml` file, after restarting Stirling-PDF you should see both UI and folder scanning enabled.
-
-
-## Steps to Configure and Use Your Pipeline
-
-1. **Access Configuration**
-   - Upon entering the screen, click on the **Configure** button.
-
-2. **Enter Pipeline Name**
-   - Provide a name for your pipeline in the designated field.
-
-3. **Select Operations**
-   - Choose the operations for your pipeline (e.g., **Split Pages**), then click **Add Operation**.
-
-4. **Configure Operation Settings**
-   - Input the necessary settings for each added operation. Settings are highlighted in yellow if customization is needed.
-
-5. **Add More Operations**
-   - You can add and adjust the order of multiple operations. Ensure each operation's settings are customized.
-
-6. **Save Settings**
-   - Click **Save Operation Settings** after customizing settings for each operation.
-
-7. **Validate Pipeline**
-   - Use the **Validation** button to check your pipeline. A green indicator signifies correct setup; a pop-out error indicates issues.
-
-8. **Download Pipeline Configuration**
-   - To use the configuration for folder scanning (or save it for future use and reupload it), you can also download a JSON file in this menu. You can also pre-load this for future use by placing it in ``/pipeline/defaultWebUIConfigs/``. It will then appear in the dropdown menu for all users to use.
-
-9. **Submit Files for Processing**
-   - If your pipeline is correctly set up close the configure menu, input the files and hit **Submit**.
-
-10. **Note on Web UI Limitations**
-    - The current web UI version does not support operations that require multiple different types of inputs, such as adding a separate image to a PDF.

README.md

@@ -1,14 +1,14 @@
-<p align="center"><img src="https://raw.githubusercontent.com/Stirling-Tools/Stirling-PDF/main/docs/stirling.png" width="80" ><br><h1 align="center">Stirling-PDF</h1>
+<p align="center"><img src="https://raw.githubusercontent.com/Frooodle/Stirling-PDF/main/docs/stirling.png" width="80" ><br><h1 align="center">Stirling-PDF</h1>
 </p>
 
 [![Docker Pulls](https://img.shields.io/docker/pulls/frooodle/s-pdf)](https://hub.docker.com/r/frooodle/s-pdf)
 [![Discord](https://img.shields.io/discord/1068636748814483718?label=Discord)](https://discord.gg/Cn8pWhQRxZ)
-[![Docker Image Version (tag latest semver)](https://img.shields.io/docker/v/frooodle/s-pdf/latest)](https://github.com/Stirling-Tools/Stirling-PDF/)
+[![Docker Image Version (tag latest semver)](https://img.shields.io/docker/v/frooodle/s-pdf/latest)](https://github.com/Frooodle/Stirling-PDF/)
-[![GitHub Repo stars](https://img.shields.io/github/stars/stirling-tools/stirling-pdf?style=social)](https://github.com/Stirling-Tools/stirling-pdf)
+[![GitHub Repo stars](https://img.shields.io/github/stars/frooodle/stirling-pdf?style=social)](https://github.com/Frooodle/stirling-pdf)
 [![Paypal Donate](https://img.shields.io/badge/Paypal%20Donate-yellow?style=flat&logo=paypal)](https://www.paypal.com/paypalme/froodleplex)
 [![Github Sponser](https://img.shields.io/badge/Github%20Sponsor-yellow?style=flat&logo=github)](https://github.com/sponsors/Frooodle)
 
-[![Deploy to DO](https://www.deploytodo.com/do-btn-blue.svg)](https://cloud.digitalocean.com/apps/new?repo=https://github.com/Stirling-Tools/Stirling-PDF/tree/digitalOcean&refcode=c3210994b1af)
+[![Deploy to DO](https://www.deploytodo.com/do-btn-blue.svg)](https://cloud.digitalocean.com/apps/new?repo=https://github.com/Frooodle/Stirling-PDF/tree/digitalOcean&refcode=c3210994b1af)
 
 This is a powerful locally hosted web based PDF manipulation tool using docker that allows you to perform various operations on PDF files, such as splitting merging, converting, reorganizing, adding images, rotating, compressing, and more. This locally hosted web application started as a 100% ChatGPT-made application and has evolved to include a wide range of features to handle all your PDF needs.
 
@@ -16,14 +16,16 @@ Stirling PDF makes no outbound calls for any record keeping or tracking.
 
 All files and PDFs exist either exclusively on the client side, reside in server memory only during task execution, or temporarily reside in a file solely for the execution of the task. Any file downloaded by the user will have been deleted from the server by that point.
 
+Please feel free to submit feature requests or report bugs either through GitHub issues or on our [Discord](https://discord.gg/Cn8pWhQRxZ)
+
 ![stirling-home](images/stirling-home.png)
 
 ## Features
 - Dark mode support.
-- Custom download options (see [here](https://github.com/Stirling-Tools/Stirling-PDF/blob/main/images/settings.png) for example)
+- 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/Stirling-Tools/Stirling-PDF/tree/main#login-authentication) for documentation)
+- Optional Login and Authentication support (see [here](https://github.com/Frooodle/Stirling-PDF/tree/main#login-authentication) for documentation)
 
 
 ## **PDF Features**
@@ -78,36 +80,36 @@ All files and PDFs exist either exclusively on the client side, reside in server
 - 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/Stirling-Tools/Stirling-PDF/blob/main/Endpoint-groups.md)
+For a overview of the tasks and the technology each uses please view [Endpoint-groups.md](https://github.com/Frooodle/Stirling-PDF/blob/main/Endpoint-groups.md)
-Demo of the app is available [here](https://stirlingpdf.io). username: demo, password: demo
+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](https://github.com/apache/pdfbox/tree/trunk)
+- PDFBox
 - [LibreOffice](https://www.libreoffice.org/discover/libreoffice/) for advanced conversions
 - [OcrMyPdf](https://github.com/ocrmypdf/OCRmyPDF)
 - HTML, CSS, JavaScript
 - Docker
-- [PDF.js](https://github.com/mozilla/pdf.js)
+- PDF.js
-- [PDF-LIB.js](https://github.com/Hopding/pdf-lib)
+- PDF-LIB.js
 
 ## How to use
 
 ### Locally
-Please view https://github.com/Stirling-Tools/Stirling-PDF/blob/main/LocalRunGuide.md
+Please view https://github.com/Frooodle/Stirling-PDF/blob/main/LocalRunGuide.md
 
 ### Docker / Podman
 https://hub.docker.com/r/frooodle/s-pdf
 
 Stirling PDF has 3 different versions, a Full version, Lite, and ultra-Lite. Depending on the types of features you use you may want a smaller image to save on space.
-To see what the different versions offer please look at our [version mapping](https://github.com/Stirling-Tools/Stirling-PDF/blob/main/Version-groups.md)
+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 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)
 
 Docker Run
-```bash
+```
 docker run -d \
   -p 8080:8080 \
   -v /location/of/trainingData:/usr/share/tesseract-ocr/5/tessdata \
@@ -123,7 +125,7 @@ docker run -d \
   -v /location/of/customFiles:/customFiles \
 ```
 Docker Compose
-```yaml
+```
 version: '3.3'
 services:
   stirling-pdf:
@@ -142,19 +144,17 @@ services:
 Note: Podman is CLI-compatible with Docker, so simply replace "docker" with "podman".
 
 ## Enable OCR/Compression feature
-Please view https://github.com/Stirling-Tools/Stirling-PDF/blob/main/HowToUseOCR.md
+Please view https://github.com/Frooodle/Stirling-PDF/blob/main/HowToUseOCR.md
 
-## Supported Languages
+## Want to add your own language?
-
+Stirling PDF currently supports 21!
-Stirling PDF currently supports 26!
 - English (English) (en_GB)
 - English (US) (en_US)
 - Arabic (العربية) (ar_AR)
 - German (Deutsch) (de_DE)
 - French (Français) (fr_FR)
 - Spanish (Español) (es_ES)
-- Simplified Chinese (简体中文) (zh_CN)
+- Chinese (简体中文) (zh_CN)
-- Traditional Chinese (繁體中文) (zh_TW)
 - Catalan (Català) (ca_CA)
 - Italian (Italiano) (it_IT)
 - Swedish (Svenska) (sv_SE)
@@ -170,13 +170,16 @@ Stirling PDF currently supports 26!
 - Turkish (Türkçe) (tr_TR)
 - Indonesia (Bahasa Indonesia) (id_ID)
 - Hindi (हिंदी) (hi_IN)
-- Hungarian (Magyar) (hu_HU)
-- Bulgarian (Български) (bg_BG)
-- Sebian Latin alphabet (Srpski) (sr-Latn-RS)
 
-## Contributing (creating issues, translations, fixing bugs, etc.)
+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! 
+
+## 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.
 
-Please see our [Contributing Guide](CONTRIBUTING.md)!
 
 ## Customisation
 Stirling PDF allows easy customization of the app.
@@ -190,7 +193,7 @@ This file is located in the ``/configs`` directory and follows standard YAML for
 
 Environment variables are also supported and would override the settings file
 For example in the settings.yml you have
-```yaml
+```
 system:
   defaultLocale: 'en-US'
 ```
@@ -198,7 +201,7 @@ system:
 To have this via an environment variable you would have ``SYSTEM_DEFAULTLOCALE``
 
 The Current list of settings is
-```yaml
+```
 security:
   enableLogin: false # set to 'true' to enable login
   csrfDisabled: true
@@ -221,7 +224,7 @@ metrics:
   enabled: true # 'true' to enable Info APIs endpoints (view http://localhost:8080/swagger-ui/index.html#/API to learn more), 'false' to disable
 ```
 ### Extra notes
-- Endpoints. Currently, the endpoints ENDPOINTS_TO_REMOVE and GROUPS_TO_REMOVE can include comma separate lists of endpoints and groups to disable as example ENDPOINTS_TO_REMOVE=img-to-pdf,remove-pages would disable both image-to-pdf and remove pages, GROUPS_TO_REMOVE=LibreOffice Would disable all things that use LibreOffice. You can see a list of all endpoints and groups [here](https://github.com/Stirling-Tools/Stirling-PDF/blob/main/Endpoint-groups.md)
+- Endpoints. Currently, the endpoints ENDPOINTS_TO_REMOVE and GROUPS_TO_REMOVE can include comma separate lists of endpoints and groups to disable as example ENDPOINTS_TO_REMOVE=img-to-pdf,remove-pages would disable both image-to-pdf and remove pages, GROUPS_TO_REMOVE=LibreOffice Would disable all things that use LibreOffice. You can see a list of all endpoints and groups [here](https://github.com/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
@@ -231,7 +234,7 @@ metrics:
 
 ## API
 For those wanting to use Stirling-PDFs backend API to link with their own custom scripting to edit PDFs you can view all existing API documentation
-[here](https://app.swaggerhub.com/apis-docs/Stirling-Tools/Stirling-PDF/) or navigate to /swagger-ui/index.html of your stirling-pdf instance for your versions documentation (Or by following the API button in your settings of Stirling-PDF)
+[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

build.gradle

@@ -1,30 +1,21 @@
 plugins {
     id 'java'
-    id 'org.springframework.boot' version '3.2.1'
+    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'
     id 'com.diffplug.spotless' version '6.23.3'
-    id 'com.github.jk1.dependency-license-report' version '2.5'
 }
 
-import com.github.jk1.license.render.*
-
 group = 'stirling.software'
-version = '0.20.0'
+version = '0.18.1'
 sourceCompatibility = '17'
 
 repositories {
     mavenCentral()
 }
 
-
-
-licenseReport {
-    renderers = [new JsonReportRenderer()]
-}
-
 sourceSets {
     main {
         java {
@@ -89,19 +80,17 @@ dependencies {
     //security updates
     implementation 'ch.qos.logback:logback-classic:1.4.14'
     implementation 'ch.qos.logback:logback-core:1.4.14'
-    implementation 'org.springframework:spring-webmvc:6.1.2'
+    implementation 'org.springframework:spring-webmvc:6.0.15'
 
-    implementation 'org.yaml:snakeyaml:2.2'
+    implementation 'org.yaml:snakeyaml:2.1'
     implementation 'org.springframework.boot:spring-boot-starter-web:3.2.1'
     implementation 'org.springframework.boot:spring-boot-starter-thymeleaf:3.2.1'
 
     if (System.getenv('DOCKER_ENABLE_SECURITY') != 'false') {
         implementation 'org.springframework.boot:spring-boot-starter-security:3.2.1'
         implementation 'org.thymeleaf.extras:thymeleaf-extras-springsecurity5:3.1.2.RELEASE'
-        implementation "org.springframework.boot:spring-boot-starter-data-jpa:3.2.1"
+        implementation "org.springframework.boot:spring-boot-starter-data-jpa"
-        
+        implementation "com.h2database:h2"
-        //2.2.x requires rebuild of DB file.. need migration path
-        implementation "com.h2database:h2:2.1.214"
     }
 
     testImplementation 'org.springframework.boot:spring-boot-starter-test:3.2.1'
@@ -133,15 +122,15 @@ dependencies {
     //general PDF
 
     // https://mvnrepository.com/artifact/com.opencsv/opencsv
-    implementation ('com.opencsv:opencsv:5.9') {
+    implementation ('com.opencsv:opencsv:5.7.1') {
         exclude group: 'commons-logging', module: 'commons-logging'
     }
     
-    implementation ('org.apache.pdfbox:pdfbox:3.0.1'){
+    implementation ('org.apache.pdfbox:pdfbox:2.0.29'){
         exclude group: 'commons-logging', module: 'commons-logging'
     }
     
-    implementation ('org.apache.pdfbox:xmpbox:3.0.1'){
+    implementation ('org.apache.pdfbox:xmpbox:2.0.29'){
         exclude group: 'commons-logging', module: 'commons-logging'
     }
     
@@ -152,7 +141,6 @@ dependencies {
     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'
-    implementation 'org.commonmark:commonmark-ext-gfm-tables:0.21.0'
     // https://mvnrepository.com/artifact/com.github.vladimir-bukhtoyarov/bucket4j-core
     implementation 'com.github.vladimir-bukhtoyarov:bucket4j-core:7.6.0'
 
@@ -164,9 +152,6 @@ dependencies {
 tasks.withType(JavaCompile) {
     dependsOn 'spotlessApply'
 }
-compileJava {
-    options.compilerArgs << '-parameters'
-}
 
 task writeVersion {
     def propsFile = file('src/main/resources/version.properties')

chart/stirling-pdf/Chart.yaml

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

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

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

exampleYmlFiles/docker-compose-latest-lite.yml

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

exampleYmlFiles/docker-compose-latest-security.yml

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

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

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

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

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

exampleYmlFiles/docker-compose-latest.yml

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

scripts/download-security-jar.sh

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

src/main/java/org/apache/pdfbox/examples/signature/CMSProcessableInputStream.java

@@ -1,64 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.pdfbox.examples.signature;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.cms.CMSObjectIdentifiers;
-import org.bouncycastle.cms.CMSException;
-import org.bouncycastle.cms.CMSTypedData;
-
-/**
- * Wraps a InputStream into a CMSProcessable object for bouncy castle. It's a memory saving
- * alternative to the {@link org.bouncycastle.cms.CMSProcessableByteArray CMSProcessableByteArray}
- * class.
- *
- * @author Thomas Chojecki
- */
-class CMSProcessableInputStream implements CMSTypedData {
-    private final InputStream in;
-    private final ASN1ObjectIdentifier contentType;
-
-    CMSProcessableInputStream(InputStream is) {
-        this(new ASN1ObjectIdentifier(CMSObjectIdentifiers.data.getId()), is);
-    }
-
-    CMSProcessableInputStream(ASN1ObjectIdentifier type, InputStream is) {
-        contentType = type;
-        in = is;
-    }
-
-    @Override
-    public Object getContent() {
-        return in;
-    }
-
-    @Override
-    public void write(OutputStream out) throws IOException, CMSException {
-        // read the content only one time
-        in.transferTo(out);
-        in.close();
-    }
-
-    @Override
-    public ASN1ObjectIdentifier getContentType() {
-        return contentType;
-    }
-}

src/main/java/org/apache/pdfbox/examples/signature/CreateSignatureBase.java

@@ -1,170 +0,0 @@
-/*
- * Copyright 2015 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.pdfbox.examples.signature;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URISyntaxException;
-import java.security.GeneralSecurityException;
-import java.security.KeyStore;
-import java.security.KeyStoreException;
-import java.security.NoSuchAlgorithmException;
-import java.security.PrivateKey;
-import java.security.UnrecoverableKeyException;
-import java.security.cert.Certificate;
-import java.security.cert.CertificateException;
-import java.security.cert.X509Certificate;
-import java.util.Arrays;
-import java.util.Enumeration;
-
-import org.apache.pdfbox.pdmodel.interactive.digitalsignature.SignatureInterface;
-import org.bouncycastle.cert.jcajce.JcaCertStore;
-import org.bouncycastle.cms.CMSException;
-import org.bouncycastle.cms.CMSSignedData;
-import org.bouncycastle.cms.CMSSignedDataGenerator;
-import org.bouncycastle.cms.jcajce.JcaSignerInfoGeneratorBuilder;
-import org.bouncycastle.operator.ContentSigner;
-import org.bouncycastle.operator.OperatorCreationException;
-import org.bouncycastle.operator.jcajce.JcaContentSignerBuilder;
-import org.bouncycastle.operator.jcajce.JcaDigestCalculatorProviderBuilder;
-
-public abstract class CreateSignatureBase implements SignatureInterface {
-    private PrivateKey privateKey;
-    private Certificate[] certificateChain;
-    private String tsaUrl;
-    private boolean externalSigning;
-
-    /**
-     * Initialize the signature creator with a keystore (pkcs12) and pin that should be used for the
-     * signature.
-     *
-     * @param keystore is a pkcs12 keystore.
-     * @param pin is the pin for the keystore / private key
-     * @throws KeyStoreException if the keystore has not been initialized (loaded)
-     * @throws NoSuchAlgorithmException if the algorithm for recovering the key cannot be found
-     * @throws UnrecoverableKeyException if the given password is wrong
-     * @throws CertificateException if the certificate is not valid as signing time
-     * @throws IOException if no certificate could be found
-     */
-    public CreateSignatureBase(KeyStore keystore, char[] pin)
-            throws KeyStoreException,
-                    UnrecoverableKeyException,
-                    NoSuchAlgorithmException,
-                    IOException,
-                    CertificateException {
-        // grabs the first alias from the keystore and get the private key. An
-        // alternative method or constructor could be used for setting a specific
-        // alias that should be used.
-        Enumeration<String> aliases = keystore.aliases();
-        String alias;
-        Certificate cert = null;
-        while (cert == null && aliases.hasMoreElements()) {
-            alias = aliases.nextElement();
-            setPrivateKey((PrivateKey) keystore.getKey(alias, pin));
-            Certificate[] certChain = keystore.getCertificateChain(alias);
-            if (certChain != null) {
-                setCertificateChain(certChain);
-                cert = certChain[0];
-                if (cert instanceof X509Certificate) {
-                    // avoid expired certificate
-                    ((X509Certificate) cert).checkValidity();
-
-                    //// SigUtils.checkCertificateUsage((X509Certificate) cert);
-                }
-            }
-        }
-
-        if (cert == null) {
-            throw new IOException("Could not find certificate");
-        }
-    }
-
-    public final void setPrivateKey(PrivateKey privateKey) {
-        this.privateKey = privateKey;
-    }
-
-    public final void setCertificateChain(final Certificate[] certificateChain) {
-        this.certificateChain = certificateChain;
-    }
-
-    public Certificate[] getCertificateChain() {
-        return certificateChain;
-    }
-
-    public void setTsaUrl(String tsaUrl) {
-        this.tsaUrl = tsaUrl;
-    }
-
-    /**
-     * SignatureInterface sample implementation.
-     *
-     * <p>This method will be called from inside of the pdfbox and create the PKCS #7 signature. The
-     * given InputStream contains the bytes that are given by the byte range.
-     *
-     * <p>This method is for internal use only.
-     *
-     * <p>Use your favorite cryptographic library to implement PKCS #7 signature creation. If you
-     * want to create the hash and the signature separately (e.g. to transfer only the hash to an
-     * external application), read <a href="https://stackoverflow.com/questions/41767351">this
-     * answer</a> or <a href="https://stackoverflow.com/questions/56867465">this answer</a>.
-     *
-     * @throws IOException
-     */
-    @Override
-    public byte[] sign(InputStream content) throws IOException {
-        // cannot be done private (interface)
-        try {
-            CMSSignedDataGenerator gen = new CMSSignedDataGenerator();
-            X509Certificate cert = (X509Certificate) certificateChain[0];
-            ContentSigner sha1Signer =
-                    new JcaContentSignerBuilder("SHA256WithRSA").build(privateKey);
-            gen.addSignerInfoGenerator(
-                    new JcaSignerInfoGeneratorBuilder(
-                                    new JcaDigestCalculatorProviderBuilder().build())
-                            .build(sha1Signer, cert));
-            gen.addCertificates(new JcaCertStore(Arrays.asList(certificateChain)));
-            CMSProcessableInputStream msg = new CMSProcessableInputStream(content);
-            CMSSignedData signedData = gen.generate(msg, false);
-            if (tsaUrl != null && !tsaUrl.isEmpty()) {
-                ValidationTimeStamp validation = new ValidationTimeStamp(tsaUrl);
-                signedData = validation.addSignedTimeStamp(signedData);
-            }
-            return signedData.getEncoded();
-        } catch (GeneralSecurityException
-                | CMSException
-                | OperatorCreationException
-                | URISyntaxException e) {
-            throw new IOException(e);
-        }
-    }
-
-    /**
-     * Set if external signing scenario should be used. If {@code false}, SignatureInterface would
-     * be used for signing.
-     *
-     * <p>Default: {@code false}
-     *
-     * @param externalSigning {@code true} if external signing should be performed
-     */
-    public void setExternalSigning(boolean externalSigning) {
-        this.externalSigning = externalSigning;
-    }
-
-    public boolean isExternalSigning() {
-        return externalSigning;
-    }
-}

src/main/java/org/apache/pdfbox/examples/signature/TSAClient.java

@@ -1,176 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.pdfbox.examples.signature;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.math.BigInteger;
-import java.net.URL;
-import java.net.URLConnection;
-import java.nio.charset.StandardCharsets;
-import java.security.DigestInputStream;
-import java.security.MessageDigest;
-import java.security.SecureRandom;
-import java.util.Base64;
-import java.util.Random;
-
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.operator.DefaultDigestAlgorithmIdentifierFinder;
-import org.bouncycastle.operator.DigestAlgorithmIdentifierFinder;
-import org.bouncycastle.tsp.TSPException;
-import org.bouncycastle.tsp.TimeStampRequest;
-import org.bouncycastle.tsp.TimeStampRequestGenerator;
-import org.bouncycastle.tsp.TimeStampResponse;
-import org.bouncycastle.tsp.TimeStampToken;
-
-/**
- * Time Stamping Authority (TSA) Client [RFC 3161].
- *
- * @author Vakhtang Koroghlishvili
- * @author John Hewson
- */
-public class TSAClient {
-    private static final Logger LOG = LogManager.getLogger(TSAClient.class);
-
-    private static final DigestAlgorithmIdentifierFinder ALGORITHM_OID_FINDER =
-            new DefaultDigestAlgorithmIdentifierFinder();
-
-    private final URL url;
-    private final String username;
-    private final String password;
-    private final MessageDigest digest;
-
-    // SecureRandom.getInstanceStrong() would be better, but sometimes blocks on Linux
-    private static final Random RANDOM = new SecureRandom();
-
-    /**
-     * @param url the URL of the TSA service
-     * @param username user name of TSA
-     * @param password password of TSA
-     * @param digest the message digest to use
-     */
-    public TSAClient(URL url, String username, String password, MessageDigest digest) {
-        this.url = url;
-        this.username = username;
-        this.password = password;
-        this.digest = digest;
-    }
-
-    /**
-     * @param content
-     * @return the time stamp token
-     * @throws IOException if there was an error with the connection or data from the TSA server, or
-     *     if the time stamp response could not be validated
-     */
-    public TimeStampToken getTimeStampToken(InputStream content) throws IOException {
-        digest.reset();
-        DigestInputStream dis = new DigestInputStream(content, digest);
-        while (dis.read() != -1) {
-            // do nothing
-        }
-        byte[] hash = digest.digest();
-
-        // 32-bit cryptographic nonce
-        int nonce = RANDOM.nextInt();
-
-        // generate TSA request
-        TimeStampRequestGenerator tsaGenerator = new TimeStampRequestGenerator();
-        tsaGenerator.setCertReq(true);
-        ASN1ObjectIdentifier oid = ALGORITHM_OID_FINDER.find(digest.getAlgorithm()).getAlgorithm();
-        TimeStampRequest request = tsaGenerator.generate(oid, hash, BigInteger.valueOf(nonce));
-
-        // get TSA response
-        byte[] tsaResponse = getTSAResponse(request.getEncoded());
-
-        TimeStampResponse response;
-        try {
-            response = new TimeStampResponse(tsaResponse);
-            response.validate(request);
-        } catch (TSPException e) {
-            throw new IOException(e);
-        }
-
-        TimeStampToken timeStampToken = response.getTimeStampToken();
-        if (timeStampToken == null) {
-            // https://www.ietf.org/rfc/rfc3161.html#section-2.4.2
-            throw new IOException(
-                    "Response from "
-                            + url
-                            + " does not have a time stamp token, status: "
-                            + response.getStatus()
-                            + " ("
-                            + response.getStatusString()
-                            + ")");
-        }
-
-        return timeStampToken;
-    }
-
-    // gets response data for the given encoded TimeStampRequest data
-    // throws IOException if a connection to the TSA cannot be established
-    private byte[] getTSAResponse(byte[] request) throws IOException {
-        LOG.debug("Opening connection to TSA server");
-
-        // todo: support proxy servers
-        URLConnection connection = url.openConnection();
-        connection.setDoOutput(true);
-        connection.setDoInput(true);
-        connection.setRequestProperty("Content-Type", "application/timestamp-query");
-
-        LOG.debug("Established connection to TSA server");
-
-        if (username != null && password != null && !username.isEmpty() && !password.isEmpty()) {
-            String contentEncoding = connection.getContentEncoding();
-            if (contentEncoding == null) {
-                contentEncoding = StandardCharsets.UTF_8.name();
-            }
-            connection.setRequestProperty(
-                    "Authorization",
-                    "Basic "
-                            + new String(
-                                    Base64.getEncoder()
-                                            .encode(
-                                                    (username + ":" + password)
-                                                            .getBytes(contentEncoding))));
-        }
-
-        // read response
-        try (OutputStream output = connection.getOutputStream()) {
-            output.write(request);
-        } catch (IOException ex) {
-            LOG.error("Exception when writing to {}", this.url, ex);
-            throw ex;
-        }
-
-        LOG.debug("Waiting for response from TSA server");
-
-        byte[] response;
-        try (InputStream input = connection.getInputStream()) {
-            response = input.readAllBytes();
-        } catch (IOException ex) {
-            LOG.error("Exception when reading from {}", this.url, ex);
-            throw ex;
-        }
-
-        LOG.debug("Received response from TSA server");
-
-        return response;
-    }
-}

src/main/java/org/apache/pdfbox/examples/signature/ValidationTimeStamp.java

@@ -1,134 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.pdfbox.examples.signature;
-
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.MalformedURLException;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.security.MessageDigest;
-import java.security.NoSuchAlgorithmException;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.bouncycastle.asn1.ASN1Encodable;
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.DERSet;
-import org.bouncycastle.asn1.cms.Attribute;
-import org.bouncycastle.asn1.cms.AttributeTable;
-import org.bouncycastle.asn1.cms.Attributes;
-import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers;
-import org.bouncycastle.cms.CMSSignedData;
-import org.bouncycastle.cms.SignerInformation;
-import org.bouncycastle.cms.SignerInformationStore;
-import org.bouncycastle.tsp.TimeStampToken;
-
-/**
- * This class wraps the TSAClient and the work that has to be done with it. Like Adding Signed
- * TimeStamps to a signature, or creating a CMS timestamp attribute (with a signed timestamp)
- *
- * @author Others
- * @author Alexis Suter
- */
-public class ValidationTimeStamp {
-    private TSAClient tsaClient;
-
-    /**
-     * @param tsaUrl The url where TS-Request will be done.
-     * @throws NoSuchAlgorithmException
-     * @throws MalformedURLException
-     * @throws java.net.URISyntaxException
-     */
-    public ValidationTimeStamp(String tsaUrl)
-            throws NoSuchAlgorithmException, MalformedURLException, URISyntaxException {
-        if (tsaUrl != null) {
-            MessageDigest digest = MessageDigest.getInstance("SHA-256");
-            this.tsaClient = new TSAClient(new URI(tsaUrl).toURL(), null, null, digest);
-        }
-    }
-
-    /**
-     * Creates a signed timestamp token by the given input stream.
-     *
-     * @param content InputStream of the content to sign
-     * @return the byte[] of the timestamp token
-     * @throws IOException
-     */
-    public byte[] getTimeStampToken(InputStream content) throws IOException {
-        TimeStampToken timeStampToken = tsaClient.getTimeStampToken(content);
-        return timeStampToken.getEncoded();
-    }
-
-    /**
-     * Extend cms signed data with TimeStamp first or to all signers
-     *
-     * @param signedData Generated CMS signed data
-     * @return CMSSignedData Extended CMS signed data
-     * @throws IOException
-     */
-    public CMSSignedData addSignedTimeStamp(CMSSignedData signedData) throws IOException {
-        SignerInformationStore signerStore = signedData.getSignerInfos();
-        List<SignerInformation> newSigners = new ArrayList<>();
-
-        for (SignerInformation signer : signerStore.getSigners()) {
-            // This adds a timestamp to every signer (into his unsigned attributes) in the
-            // signature.
-            newSigners.add(signTimeStamp(signer));
-        }
-
-        // Because new SignerInformation is created, new SignerInfoStore has to be created
-        // and also be replaced in signedData. Which creates a new signedData object.
-        return CMSSignedData.replaceSigners(signedData, new SignerInformationStore(newSigners));
-    }
-
-    /**
-     * Extend CMS Signer Information with the TimeStampToken into the unsigned Attributes.
-     *
-     * @param signer information about signer
-     * @return information about SignerInformation
-     * @throws IOException
-     */
-    private SignerInformation signTimeStamp(SignerInformation signer) throws IOException {
-        AttributeTable unsignedAttributes = signer.getUnsignedAttributes();
-
-        ASN1EncodableVector vector = new ASN1EncodableVector();
-        if (unsignedAttributes != null) {
-            vector = unsignedAttributes.toASN1EncodableVector();
-        }
-
-        TimeStampToken timeStampToken =
-                tsaClient.getTimeStampToken(new ByteArrayInputStream(signer.getSignature()));
-        byte[] token = timeStampToken.getEncoded();
-        ASN1ObjectIdentifier oid = PKCSObjectIdentifiers.id_aa_signatureTimeStampToken;
-        ASN1Encodable signatureTimeStamp =
-                new Attribute(oid, new DERSet(ASN1Primitive.fromByteArray(token)));
-
-        vector.add(signatureTimeStamp);
-        Attributes signedAttributes = new Attributes(vector);
-
-        // There is no other way changing the unsigned attributes of the signer information.
-        // result is never null, new SignerInformation always returned,
-        // see source code of replaceUnsignedAttributes
-        return SignerInformation.replaceUnsignedAttributes(
-                signer, new AttributeTable(signedAttributes));
-    }
-}

src/main/java/org/apache/pdfbox/examples/util/ConnectedInputStream.java

@@ -1,82 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.pdfbox.examples.util;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.HttpURLConnection;
-
-/**
- * Delegate class to close the connection when the class gets closed.
- *
- * @author Tilman Hausherr
- */
-public class ConnectedInputStream extends InputStream {
-    HttpURLConnection con;
-    InputStream is;
-
-    public ConnectedInputStream(HttpURLConnection con, InputStream is) {
-        this.con = con;
-        this.is = is;
-    }
-
-    @Override
-    public int read() throws IOException {
-        return is.read();
-    }
-
-    @Override
-    public int read(byte[] b) throws IOException {
-        return is.read(b);
-    }
-
-    @Override
-    public int read(byte[] b, int off, int len) throws IOException {
-        return is.read(b, off, len);
-    }
-
-    @Override
-    public long skip(long n) throws IOException {
-        return is.skip(n);
-    }
-
-    @Override
-    public int available() throws IOException {
-        return is.available();
-    }
-
-    @Override
-    public synchronized void mark(int readlimit) {
-        is.mark(readlimit);
-    }
-
-    @Override
-    public synchronized void reset() throws IOException {
-        is.reset();
-    }
-
-    @Override
-    public boolean markSupported() {
-        return is.markSupported();
-    }
-
-    @Override
-    public void close() throws IOException {
-        is.close();
-        con.disconnect();
-    }
-}

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

@@ -1,15 +1,8 @@
 package stirling.software.SPDF.config;
 
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Paths;
-import java.util.Properties;
-
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.core.io.ClassPathResource;
-import org.springframework.core.io.Resource;
 
 import stirling.software.SPDF.model.ApplicationProperties;
 
@@ -31,15 +24,8 @@ public class AppConfig {
 
     @Bean(name = "appVersion")
     public String appVersion() {
-        Resource resource = new ClassPathResource("version.properties");
+        String version = getClass().getPackage().getImplementationVersion();
-        Properties props = new Properties();
+        return (version != null) ? version : "0.0.0";
-        try {
-            props.load(resource.getInputStream());
-            return props.getProperty("version");
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-        return "0.0.0";
     }
 
     @Bean(name = "homeText")
@@ -71,22 +57,4 @@ public class AppConfig {
         if (appName == null) appName = System.getenv("rateLimit");
         return (appName != null) ? Boolean.valueOf(appName) : false;
     }
-
-    @Bean(name = "RunningInDocker")
-    public boolean runningInDocker() {
-        return Files.exists(Paths.get("/.dockerenv"));
-    }
-
-    @Bean(name = "bookFormatsInstalled")
-    public boolean bookFormatsInstalled() {
-        return applicationProperties.getSystem().getCustomApplications().isInstallBookFormats();
-    }
-
-    @Bean(name = "htmlFormatsInstalled")
-    public boolean htmlFormatsInstalled() {
-        return applicationProperties
-                .getSystem()
-                .getCustomApplications()
-                .isInstallAdvancedHtmlToPDF();
-    }
 }

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

@@ -9,14 +9,11 @@ import java.util.concurrent.ConcurrentHashMap;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.context.annotation.DependsOn;
 import org.springframework.stereotype.Service;
 
 import stirling.software.SPDF.model.ApplicationProperties;
 
 @Service
-@DependsOn({"bookFormatsInstalled"})
 public class EndpointConfiguration {
     private static final Logger logger = LoggerFactory.getLogger(EndpointConfiguration.class);
     private Map<String, Boolean> endpointStatuses = new ConcurrentHashMap<>();
@@ -24,14 +21,9 @@ public class EndpointConfiguration {
 
     private final ApplicationProperties applicationProperties;
 
-    private boolean bookFormatsInstalled;
-
     @Autowired
-    public EndpointConfiguration(
+    public EndpointConfiguration(ApplicationProperties applicationProperties) {
-            ApplicationProperties applicationProperties,
-            @Qualifier("bookFormatsInstalled") boolean bookFormatsInstalled) {
         this.applicationProperties = applicationProperties;
-        this.bookFormatsInstalled = bookFormatsInstalled;
         init();
         processEnvironmentConfigs();
     }
@@ -153,12 +145,6 @@ public class EndpointConfiguration {
         addEndpointToGroup("CLI", "ocr-pdf");
         addEndpointToGroup("CLI", "html-to-pdf");
         addEndpointToGroup("CLI", "url-to-pdf");
-        addEndpointToGroup("CLI", "book-to-pdf");
-        addEndpointToGroup("CLI", "pdf-to-book");
-
-        // Calibre
-        addEndpointToGroup("Calibre", "book-to-pdf");
-        addEndpointToGroup("Calibre", "pdf-to-book");
 
         // python
         addEndpointToGroup("Python", "extract-image-scans");
@@ -229,9 +215,7 @@ public class EndpointConfiguration {
     private void processEnvironmentConfigs() {
         List<String> endpointsToRemove = applicationProperties.getEndpoints().getToRemove();
         List<String> groupsToRemove = applicationProperties.getEndpoints().getGroupsToRemove();
-        if (!bookFormatsInstalled) {
+
-            groupsToRemove.add("Calibre");
-        }
         if (endpointsToRemove != null) {
             for (String endpoint : endpointsToRemove) {
                 disableEndpoint(endpoint.trim());

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

@@ -56,7 +56,6 @@ public class MetricsFilter extends OncePerRequestFilter {
                             .register(meterRegistry);
 
             counter.increment();
-            // System.out.println("Counted");
         }
 
         filterChain.doFilter(request, response);

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

@@ -1,98 +0,0 @@
-package stirling.software.SPDF.config;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.stereotype.Component;
-
-import jakarta.annotation.PostConstruct;
-import stirling.software.SPDF.model.ApplicationProperties;
-import stirling.software.SPDF.utils.ProcessExecutor;
-import stirling.software.SPDF.utils.ProcessExecutor.ProcessExecutorResult;
-
-@Component
-public class PostStartupProcesses {
-
-    @Autowired ApplicationProperties applicationProperties;
-
-    @Autowired
-    @Qualifier("RunningInDocker")
-    private boolean runningInDocker;
-
-    @Autowired
-    @Qualifier("bookFormatsInstalled")
-    private boolean bookFormatsInstalled;
-
-    @Autowired
-    @Qualifier("htmlFormatsInstalled")
-    private boolean htmlFormatsInstalled;
-
-    private static final Logger logger = LoggerFactory.getLogger(PostStartupProcesses.class);
-
-    @PostConstruct
-    public void runInstallCommandBasedOnEnvironment() throws IOException, InterruptedException {
-        List<List<String>> commands = new ArrayList<>();
-        // Checking for DOCKER_INSTALL_BOOK_FORMATS environment variable
-        if (bookFormatsInstalled) {
-            List<String> tmpList = new ArrayList<>();
-            // Set up the timezone configuration commands
-            tmpList.addAll(
-                    Arrays.asList(
-                            "sh",
-                            "-c",
-                            "echo 'tzdata tzdata/Areas select Europe' | debconf-set-selections; "
-                                    + "echo 'tzdata tzdata/Zones/Europe select Berlin' | debconf-set-selections"));
-            commands.add(tmpList);
-
-            // Install calibre with DEBIAN_FRONTEND set to noninteractive
-            tmpList = new ArrayList<>();
-            tmpList.addAll(
-                    Arrays.asList(
-                            "sh",
-                            "-c",
-                            "DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends calibre"));
-            commands.add(tmpList);
-        }
-
-        // Checking for DOCKER_INSTALL_HTML_FORMATS environment variable
-        if (htmlFormatsInstalled) {
-            List<String> tmpList = new ArrayList<>();
-            // Add -y flag for automatic yes to prompts and --no-install-recommends to reduce size
-            tmpList.addAll(
-                    Arrays.asList(
-                            "apt-get", "install", "wkhtmltopdf", "-y", "--no-install-recommends"));
-            commands.add(tmpList);
-        }
-
-        if (!commands.isEmpty()) {
-            // Run the command
-            if (runningInDocker) {
-                List<String> tmpList = new ArrayList<>();
-                tmpList.addAll(Arrays.asList("apt-get", "update"));
-                commands.add(0, tmpList);
-
-                for (List<String> list : commands) {
-                    ProcessExecutorResult returnCode =
-                            ProcessExecutor.getInstance(ProcessExecutor.Processes.INSTALL_APP, true)
-                                    .runCommandWithOutputHandling(list);
-                    logger.info("RC for app installs {}", returnCode.getRc());
-                }
-            } else {
-
-                logger.info(
-                        "Not running inside Docker so skipping automated install process with command.");
-            }
-
-        } else {
-            if (runningInDocker) {
-                logger.info("No custom apps to install.");
-            }
-        }
-    }
-}

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

@@ -102,9 +102,7 @@ public class SecurityConfiguration {
                                                                 || trimmedUri.startsWith("/images/")
                                                                 || trimmedUri.startsWith("/public/")
                                                                 || trimmedUri.startsWith("/css/")
-                                                                || trimmedUri.startsWith("/js/")
+                                                                || trimmedUri.startsWith("/js/");
-                                                                || trimmedUri.startsWith(
-                                                                        "/api/v1/info/status");
                                                     })
                                             .permitAll()
                                             .anyRequest()
@@ -115,7 +113,6 @@ public class SecurityConfiguration {
             http.csrf(csrf -> csrf.disable())
                     .authorizeHttpRequests(authz -> authz.anyRequest().permitAll());
         }
-
         return http.build();
     }
 

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

@@ -103,7 +103,6 @@ public class UserAuthenticationFilter extends OncePerRequestFilter {
             contextPath + "/css/",
             contextPath + "/js/",
             contextPath + "/pdfjs/",
-            contextPath + "/api/v1/info/status",
             contextPath + "/site.webmanifest"
         };
 

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

@@ -1,14 +1,13 @@
 package stirling.software.SPDF.controller.api;
 
+import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 
-import org.apache.pdfbox.Loader;
 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.PDPageContentStream.AppendMode;
 import org.apache.pdfbox.pdmodel.common.PDRectangle;
 import org.apache.pdfbox.pdmodel.graphics.form.PDFormXObject;
 import org.slf4j.Logger;
@@ -38,7 +37,9 @@ public class CropController {
             description =
                     "This operation takes an input PDF file and crops it according to the given coordinates. Input:PDF Output:PDF Type:SISO")
     public ResponseEntity<byte[]> cropPdf(@ModelAttribute CropPdfForm form) throws IOException {
-        PDDocument sourceDocument = Loader.loadPDF(form.getFileInput().getBytes());
+
+        PDDocument sourceDocument =
+                PDDocument.load(new ByteArrayInputStream(form.getFileInput().getBytes()));
 
         PDDocument newDocument = new PDDocument();
 
@@ -52,8 +53,7 @@ public class CropController {
             // Create a new page with the size of the source page
             PDPage newPage = new PDPage(sourcePage.getMediaBox());
             newDocument.addPage(newPage);
-            PDPageContentStream contentStream =
+            PDPageContentStream contentStream = new PDPageContentStream(newDocument, newPage);
-                    new PDPageContentStream(newDocument, newPage, AppendMode.OVERWRITE, true, true);
 
             // Import the source page as a form XObject
             PDFormXObject formXObject = layerUtility.importPageAsForm(sourceDocument, i);

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

@@ -1,17 +1,16 @@
 package stirling.software.SPDF.controller.api;
 
+import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
-import java.io.File;
 import java.io.IOException;
 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.Loader;
+import org.apache.pdfbox.io.MemoryUsageSetting;
 import org.apache.pdfbox.multipdf.PDFMergerUtility;
 import org.apache.pdfbox.pdmodel.PDDocument;
 import org.apache.pdfbox.pdmodel.PDPage;
@@ -28,7 +27,6 @@ import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 
 import stirling.software.SPDF.model.api.general.MergePdfsRequest;
-import stirling.software.SPDF.utils.GeneralUtils;
 import stirling.software.SPDF.utils.WebResponseUtils;
 
 @RestController
@@ -86,8 +84,8 @@ public class MergeController {
                 };
             case "byPDFTitle":
                 return (file1, file2) -> {
-                    try (PDDocument doc1 = Loader.loadPDF(file1.getBytes());
+                    try (PDDocument doc1 = PDDocument.load(file1.getInputStream());
-                            PDDocument doc2 = Loader.loadPDF(file2.getBytes())) {
+                            PDDocument doc2 = PDDocument.load(file2.getInputStream())) {
                         String title1 = doc1.getDocumentInformation().getTitle();
                         String title2 = doc2.getDocumentInformation().getTitle();
                         return title1.compareTo(title2);
@@ -108,7 +106,6 @@ public class MergeController {
                     "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 {
-        List<File> filesToDelete = new ArrayList<File>();
         try {
             MultipartFile[] files = form.getFileInput();
             Arrays.sort(files, getSortComparator(form.getSortType()));
@@ -116,27 +113,20 @@ public class MergeController {
             PDFMergerUtility mergedDoc = new PDFMergerUtility();
             ByteArrayOutputStream docOutputstream = new ByteArrayOutputStream();
 
-            for (MultipartFile multipartFile : files) {
+            for (MultipartFile file : files) {
-                File tempFile = GeneralUtils.convertMultipartFileToFile(multipartFile);
+                mergedDoc.addSource(new ByteArrayInputStream(file.getBytes()));
-                filesToDelete.add(tempFile);
-                mergedDoc.addSource(tempFile);
             }
 
             mergedDoc.setDestinationFileName(
                     files[0].getOriginalFilename().replaceFirst("[.][^.]+$", "") + "_merged.pdf");
             mergedDoc.setDestinationStream(docOutputstream);
-
+            mergedDoc.mergeDocuments(MemoryUsageSetting.setupMainMemoryOnly());
-            mergedDoc.mergeDocuments(null);
 
             return WebResponseUtils.bytesToWebResponse(
                     docOutputstream.toByteArray(), mergedDoc.getDestinationFileName());
         } catch (Exception ex) {
             logger.error("Error in merge pdf process", ex);
             throw ex;
-        } finally {
-            for (File file : filesToDelete) {
-                file.delete();
-            }
         }
     }
 }

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

@@ -4,7 +4,6 @@ import java.awt.Color;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 
-import org.apache.pdfbox.Loader;
 import org.apache.pdfbox.multipdf.LayerUtility;
 import org.apache.pdfbox.pdmodel.PDDocument;
 import org.apache.pdfbox.pdmodel.PDPage;
@@ -58,7 +57,7 @@ public class MultiPageLayoutController {
                         : (int) Math.sqrt(pagesPerSheet);
         int rows = pagesPerSheet == 2 || pagesPerSheet == 3 ? 1 : (int) Math.sqrt(pagesPerSheet);
 
-        PDDocument sourceDocument = Loader.loadPDF(file.getBytes());
+        PDDocument sourceDocument = PDDocument.load(file.getInputStream());
         PDDocument newDocument = new PDDocument();
         PDPage newPage = new PDPage(PDRectangle.A4);
         newDocument.addPage(newPage);

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

@@ -8,7 +8,6 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.pdfbox.Loader;
 import org.apache.pdfbox.multipdf.Overlay;
 import org.apache.pdfbox.pdmodel.PDDocument;
 import org.springframework.http.MediaType;
@@ -54,7 +53,7 @@ public class PdfOverlayController {
             // "FixedRepeatOverlay"
             int[] counts = request.getCounts(); // Used for FixedRepeatOverlay mode
 
-            try (PDDocument basePdf = Loader.loadPDF(baseFile.getBytes());
+            try (PDDocument basePdf = PDDocument.load(baseFile.getInputStream());
                     Overlay overlay = new Overlay()) {
                 Map<Integer, String> overlayGuide =
                         prepareOverlayGuide(
@@ -132,7 +131,7 @@ public class PdfOverlayController {
                 overlayFileIndex = (overlayFileIndex + 1) % overlayFiles.length;
             }
 
-            try (PDDocument overlayPdf = Loader.loadPDF(overlayFiles[overlayFileIndex])) {
+            try (PDDocument overlayPdf = PDDocument.load(overlayFiles[overlayFileIndex])) {
                 PDDocument singlePageDocument = new PDDocument();
                 singlePageDocument.addPage(overlayPdf.getPage(pageCountInCurrentOverlay));
                 File tempFile = File.createTempFile("overlay-page-", ".pdf");
@@ -148,7 +147,7 @@ public class PdfOverlayController {
     }
 
     private int getNumberOfPages(File file) throws IOException {
-        try (PDDocument doc = Loader.loadPDF(file)) {
+        try (PDDocument doc = PDDocument.load(file)) {
             return doc.getNumberOfPages();
         }
     }
@@ -160,7 +159,7 @@ public class PdfOverlayController {
             File overlayFile = overlayFiles[(basePageIndex - 1) % overlayFiles.length];
 
             // Load the overlay document to check its page count
-            try (PDDocument overlayPdf = Loader.loadPDF(overlayFile)) {
+            try (PDDocument overlayPdf = PDDocument.load(overlayFile)) {
                 int overlayPageCount = overlayPdf.getNumberOfPages();
                 if ((basePageIndex - 1) % overlayPageCount < overlayPageCount) {
                     overlayGuide.put(basePageIndex, overlayFile.getAbsolutePath());
@@ -182,7 +181,7 @@ public class PdfOverlayController {
             int repeatCount = counts[i];
 
             // Load the overlay document to check its page count
-            try (PDDocument overlayPdf = Loader.loadPDF(overlayFile)) {
+            try (PDDocument overlayPdf = PDDocument.load(overlayFile)) {
                 int overlayPageCount = overlayPdf.getNumberOfPages();
                 for (int j = 0; j < repeatCount; j++) {
                     for (int page = 0; page < overlayPageCount; page++) {

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

@@ -4,7 +4,6 @@ import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.pdfbox.Loader;
 import org.apache.pdfbox.pdmodel.PDDocument;
 import org.apache.pdfbox.pdmodel.PDPage;
 import org.slf4j.Logger;
@@ -43,7 +42,7 @@ public class RearrangePagesPDFController {
         MultipartFile pdfFile = request.getFileInput();
         String pagesToDelete = request.getPageNumbers();
 
-        PDDocument document = Loader.loadPDF(pdfFile.getBytes());
+        PDDocument document = PDDocument.load(pdfFile.getBytes());
 
         // Split the page order string into an array of page numbers or range of numbers
         String[] pageOrderArr = pagesToDelete.split(",");
@@ -180,7 +179,7 @@ public class RearrangePagesPDFController {
         String sortType = request.getCustomMode();
         try {
             // Load the input PDF
-            PDDocument document = Loader.loadPDF(pdfFile.getBytes());
+            PDDocument document = PDDocument.load(pdfFile.getInputStream());
 
             // Split the page order string into an array of page numbers or range of numbers
             String[] pageOrderArr = pageOrder != null ? pageOrder.split(",") : new String[0];

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

@@ -2,7 +2,6 @@ package stirling.software.SPDF.controller.api;
 
 import java.io.IOException;
 
-import org.apache.pdfbox.Loader;
 import org.apache.pdfbox.pdmodel.PDDocument;
 import org.apache.pdfbox.pdmodel.PDPage;
 import org.apache.pdfbox.pdmodel.PDPageTree;
@@ -38,7 +37,7 @@ public class RotationController {
         MultipartFile pdfFile = request.getFileInput();
         Integer angle = request.getAngle();
         // Load the PDF document
-        PDDocument document = Loader.loadPDF(pdfFile.getBytes());
+        PDDocument document = PDDocument.load(pdfFile.getBytes());
 
         // Get the list of pages in the document
         PDPageTree pages = document.getPages();

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

@@ -5,7 +5,6 @@ import java.io.IOException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.pdfbox.Loader;
 import org.apache.pdfbox.multipdf.LayerUtility;
 import org.apache.pdfbox.pdmodel.PDDocument;
 import org.apache.pdfbox.pdmodel.PDPage;
@@ -67,7 +66,7 @@ public class ScalePagesController {
 
         PDRectangle targetSize = sizeMap.get(targetPDRectangle);
 
-        PDDocument sourceDocument = Loader.loadPDF(file.getBytes());
+        PDDocument sourceDocument = PDDocument.load(file.getBytes());
         PDDocument outputDocument = new PDDocument();
 
         int totalPages = sourceDocument.getNumberOfPages();
@@ -84,11 +83,7 @@ public class ScalePagesController {
 
             PDPageContentStream contentStream =
                     new PDPageContentStream(
-                            outputDocument,
+                            outputDocument, newPage, PDPageContentStream.AppendMode.APPEND, true);
-                            newPage,
-                            PDPageContentStream.AppendMode.APPEND,
-                            true,
-                            true);
 
             float x = (targetSize.getWidth() - sourceSize.getWidth() * scale) / 2;
             float y = (targetSize.getHeight() - sourceSize.getHeight() * scale) / 2;

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

@@ -2,6 +2,7 @@ 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;
@@ -10,7 +11,6 @@ import java.util.stream.Collectors;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipOutputStream;
 
-import org.apache.pdfbox.Loader;
 import org.apache.pdfbox.pdmodel.PDDocument;
 import org.apache.pdfbox.pdmodel.PDPage;
 import org.slf4j.Logger;
@@ -46,8 +46,8 @@ public class SplitPDFController {
         MultipartFile file = request.getFileInput();
         String pages = request.getPageNumbers();
         // open the pdf document
-
+        InputStream inputStream = file.getInputStream();
-        PDDocument document = Loader.loadPDF(file.getBytes());
+        PDDocument document = PDDocument.load(inputStream);
 
         List<Integer> pageNumbers = request.getPageNumbersList(document);
         if (!pageNumbers.contains(document.getNumberOfPages() - 1))

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

@@ -9,12 +9,10 @@ import java.util.List;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipOutputStream;
 
-import org.apache.pdfbox.Loader;
 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.PDPageContentStream.AppendMode;
 import org.apache.pdfbox.pdmodel.common.PDRectangle;
 import org.apache.pdfbox.pdmodel.graphics.form.PDFormXObject;
 import org.apache.pdfbox.util.Matrix;
@@ -47,7 +45,7 @@ public class SplitPdfBySectionsController {
         List<ByteArrayOutputStream> splitDocumentsBoas = new ArrayList<>();
 
         MultipartFile file = request.getFileInput();
-        PDDocument sourceDocument = Loader.loadPDF(file.getBytes());
+        PDDocument sourceDocument = PDDocument.load(file.getInputStream());
 
         // Process the PDF based on split parameters
         int horiz = request.getHorizontalDivisions() + 1;
@@ -117,13 +115,10 @@ public class SplitPdfBySectionsController {
                                     document, document.getPages().indexOf(originalPage));
 
                     try (PDPageContentStream contentStream =
-                            new PDPageContentStream(
+                            new PDPageContentStream(subDoc, subPage)) {
-                                    subDoc, subPage, AppendMode.APPEND, true, true)) {
                         // Set clipping area and position
                         float translateX = -subPageWidth * i;
-                       
+                        float translateY = height - subPageHeight * (verticalDivisions - j);
-                        //float translateY = height - subPageHeight * (verticalDivisions - j);
-                        float translateY = -subPageHeight * (verticalDivisions - 1 - j);
 
                         contentStream.saveGraphicsState();
                         contentStream.addRect(0, 0, subPageWidth, subPageHeight);

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

@@ -9,7 +9,6 @@ import java.util.List;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipOutputStream;
 
-import org.apache.pdfbox.Loader;
 import org.apache.pdfbox.pdmodel.PDDocument;
 import org.apache.pdfbox.pdmodel.PDPage;
 import org.springframework.http.MediaType;
@@ -43,7 +42,7 @@ public class SplitPdfBySizeController {
         List<ByteArrayOutputStream> splitDocumentsBoas = new ArrayList<ByteArrayOutputStream>();
 
         MultipartFile file = request.getFileInput();
-        PDDocument sourceDocument = Loader.loadPDF(file.getBytes());
+        PDDocument sourceDocument = PDDocument.load(file.getInputStream());
 
         // 0 = size, 1 = page count, 2 = doc count
         int type = request.getSplitType();

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

@@ -4,7 +4,6 @@ import java.awt.geom.AffineTransform;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 
-import org.apache.pdfbox.Loader;
 import org.apache.pdfbox.multipdf.LayerUtility;
 import org.apache.pdfbox.pdmodel.PDDocument;
 import org.apache.pdfbox.pdmodel.PDPage;
@@ -41,7 +40,7 @@ public class ToSinglePageController {
             throws IOException {
 
         // Load the source document
-        PDDocument sourceDocument = Loader.loadPDF(request.getFileInput().getBytes());
+        PDDocument sourceDocument = PDDocument.load(request.getFileInput().getInputStream());
 
         // Calculate total height and max width
         float totalHeight = 0;

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

@@ -13,7 +13,6 @@ 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.ModelAttribute;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -21,18 +20,13 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.servlet.mvc.support.RedirectAttributes;
 import org.springframework.web.servlet.view.RedirectView;
 
-import io.swagger.v3.oas.annotations.tags.Tag;
-
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
 import stirling.software.SPDF.config.security.UserService;
 import stirling.software.SPDF.model.Role;
 import stirling.software.SPDF.model.User;
-import stirling.software.SPDF.model.api.user.UpdateUserDetails;
-import stirling.software.SPDF.model.api.user.UsernameAndPass;
 
 @Controller
-@Tag(name = "User", description = "User APIs")
 @RequestMapping("/api/v1/user")
 public class UserController {
 
@@ -40,13 +34,14 @@ public class UserController {
 
     @PreAuthorize("!hasAuthority('ROLE_DEMO_USER')")
     @PostMapping("/register")
-    public String register(@ModelAttribute UsernameAndPass requestModel, Model model) {
+    public String register(
-        if (userService.usernameExists(requestModel.getUsername())) {
+            @RequestParam String username, @RequestParam String password, Model model) {
+        if (userService.usernameExists(username)) {
             model.addAttribute("error", "Username already exists");
             return "register";
         }
 
-        userService.saveUser(requestModel.getUsername(), requestModel.getPassword());
+        userService.saveUser(username, password);
         return "redirect:/login?registered=true";
     }
 
@@ -54,15 +49,12 @@ public class UserController {
     @PostMapping("/change-username-and-password")
     public RedirectView changeUsernameAndPassword(
             Principal principal,
-            @ModelAttribute UpdateUserDetails requestModel,
+            @RequestParam String currentPassword,
+            @RequestParam String newUsername,
+            @RequestParam String newPassword,
             HttpServletRequest request,
             HttpServletResponse response,
             RedirectAttributes redirectAttributes) {
-
-        String currentPassword = requestModel.getPassword();
-        String newPassword = requestModel.getNewPassword();
-        String newUsername = requestModel.getNewUsername();
-
         if (principal == null) {
             return new RedirectView("/change-creds?messageType=notAuthenticated");
         }

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

@@ -1,68 +0,0 @@
-package stirling.software.SPDF.controller.api.converters;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.ModelAttribute;
-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 ConvertBookToPDFController {
-
-    @Autowired
-    @Qualifier("bookFormatsInstalled")
-    private boolean bookFormatsInstalled;
-
-    @PostMapping(consumes = "multipart/form-data", value = "/book/pdf")
-    @Operation(
-            summary =
-                    "Convert a BOOK/comic (*.epub | *.mobi | *.azw3 | *.fb2 | *.txt | *.docx) to PDF",
-            description =
-                    "(Requires bookFormatsInstalled flag and Calibre installed) This endpoint takes an BOOK/comic (*.epub | *.mobi | *.azw3 | *.fb2 | *.txt | *.docx)  input and converts it to PDF format.")
-    public ResponseEntity<byte[]> HtmlToPdf(@ModelAttribute GeneralFile request) throws Exception {
-        MultipartFile fileInput = request.getFileInput();
-
-        if (!bookFormatsInstalled) {
-            throw new IllegalArgumentException(
-                    "bookFormatsInstalled flag is False, this functionality is not avaiable");
-        }
-
-        if (fileInput == null) {
-            throw new IllegalArgumentException("Please provide a file for conversion.");
-        }
-
-        String originalFilename = fileInput.getOriginalFilename();
-
-        if (originalFilename != null) {
-            String originalFilenameLower = originalFilename.toLowerCase();
-            if (!originalFilenameLower.endsWith(".epub")
-                    && !originalFilenameLower.endsWith(".mobi")
-                    && !originalFilenameLower.endsWith(".azw3")
-                    && !originalFilenameLower.endsWith(".fb2")
-                    && !originalFilenameLower.endsWith(".txt")
-                    && !originalFilenameLower.endsWith(".docx")) {
-                throw new IllegalArgumentException(
-                        "File must be in .epub, .mobi, .azw3, .fb2, .txt, or .docx format.");
-            }
-        }
-        byte[] pdfBytes = FileToPdf.convertBookTypeToPdf(fileInput.getBytes(), originalFilename);
-
-        String outputFilename =
-                originalFilename.replaceFirst("[.][^.]+$", "")
-                        + ".pdf"; // Remove file extension and append .pdf
-
-        return WebResponseUtils.bytesToWebResponse(pdfBytes, outputFilename);
-    }
-}

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

@@ -1,7 +1,5 @@
 package stirling.software.SPDF.controller.api.converters;
 
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -21,10 +19,6 @@ import stirling.software.SPDF.utils.WebResponseUtils;
 @RequestMapping("/api/v1/convert")
 public class ConvertHtmlToPDF {
 
-    @Autowired
-    @Qualifier("htmlFormatsInstalled")
-    private boolean htmlFormatsInstalled;
-
     @PostMapping(consumes = "multipart/form-data", value = "/html/pdf")
     @Operation(
             summary = "Convert an HTML or ZIP (containing HTML and CSS) to PDF",
@@ -43,9 +37,7 @@ public class ConvertHtmlToPDF {
                 || (!originalFilename.endsWith(".html") && !originalFilename.endsWith(".zip"))) {
             throw new IllegalArgumentException("File must be either .html or .zip format.");
         }
-        byte[] pdfBytes =
+        byte[] pdfBytes = FileToPdf.convertHtmlToPdf(fileInput.getBytes(), originalFilename);
-                FileToPdf.convertHtmlToPdf(
-                        fileInput.getBytes(), originalFilename, htmlFormatsInstalled);
 
         String outputFilename =
                 originalFilename.replaceFirst("[.][^.]+$", "")

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

@@ -1,17 +1,8 @@
 package stirling.software.SPDF.controller.api.converters;
 
-import java.util.List;
-import java.util.Map;
-
-import org.commonmark.Extension;
-import org.commonmark.ext.gfm.tables.TableBlock;
-import org.commonmark.ext.gfm.tables.TablesExtension;
 import org.commonmark.node.Node;
 import org.commonmark.parser.Parser;
-import org.commonmark.renderer.html.AttributeProvider;
 import org.commonmark.renderer.html.HtmlRenderer;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -31,10 +22,6 @@ import stirling.software.SPDF.utils.WebResponseUtils;
 @RequestMapping("/api/v1/convert")
 public class ConvertMarkdownToPdf {
 
-    @Autowired
-    @Qualifier("htmlFormatsInstalled")
-    private boolean htmlFormatsInstalled;
-
     @PostMapping(consumes = "multipart/form-data", value = "/markdown/pdf")
     @Operation(
             summary = "Convert a Markdown file to PDF",
@@ -54,21 +41,12 @@ public class ConvertMarkdownToPdf {
         }
 
         // Convert Markdown to HTML using CommonMark
-        List<Extension> extensions = List.of(TablesExtension.create());
+        Parser parser = Parser.builder().build();
-        Parser parser = Parser.builder().extensions(extensions).build();
-
         Node document = parser.parse(new String(fileInput.getBytes()));
-        HtmlRenderer renderer =
+        HtmlRenderer renderer = HtmlRenderer.builder().build();
-                HtmlRenderer.builder()
-                        .attributeProviderFactory(context -> new TableAttributeProvider())
-                        .extensions(extensions)
-                        .build();
-
         String htmlContent = renderer.render(document);
 
-        byte[] pdfBytes =
+        byte[] pdfBytes = FileToPdf.convertHtmlToPdf(htmlContent.getBytes(), "converted.html");
-                FileToPdf.convertHtmlToPdf(
-                        htmlContent.getBytes(), "converted.html", htmlFormatsInstalled);
 
         String outputFilename =
                 originalFilename.replaceFirst("[.][^.]+$", "")
@@ -76,12 +54,3 @@ public class ConvertMarkdownToPdf {
         return WebResponseUtils.bytesToWebResponse(pdfBytes, outputFilename);
     }
 }
-
-class TableAttributeProvider implements AttributeProvider {
-    @Override
-    public void setAttributes(Node node, String tagName, Map<String, String> attributes) {
-        if (node instanceof TableBlock) {
-            attributes.put("class", "table table-striped");
-        }
-    }
-}

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

@@ -79,7 +79,7 @@ public class ConvertOfficeController {
     @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")
+                    "This endpoint converts a given file to a PDF using LibreOffice API  Input:Any Output:PDF Type:SISO")
     public ResponseEntity<byte[]> processFileToPDF(@ModelAttribute GeneralFile request)
             throws Exception {
         MultipartFile inputFile = request.getFileInput();

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

@@ -1,101 +0,0 @@
-package stirling.software.SPDF.controller.api.converters;
-
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.ModelAttribute;
-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.converters.PdfToBookRequest;
-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 ConvertPDFToBookController {
-
-    @Autowired
-    @Qualifier("bookFormatsInstalled")
-    private boolean bookFormatsInstalled;
-
-    @PostMapping(consumes = "multipart/form-data", value = "/pdf/book")
-    @Operation(
-            summary =
-                    "Convert a PDF to a Book/comic (*.epub | *.mobi | *.azw3 | *.fb2 | *.txt | *.docx .. (others to include by chatgpt) to PDF",
-            description =
-                    "(Requires bookFormatsInstalled flag and Calibre installed) This endpoint Convert a PDF to a Book/comic (*.epub | *.mobi | *.azw3 | *.fb2 | *.txt | *.docx .. (others to include by chatgpt) to PDF")
-    public ResponseEntity<byte[]> HtmlToPdf(@ModelAttribute PdfToBookRequest request)
-            throws Exception {
-        MultipartFile fileInput = request.getFileInput();
-
-        if (!bookFormatsInstalled) {
-            throw new IllegalArgumentException(
-                    "bookFormatsInstalled flag is False, this functionality is not avaiable");
-        }
-
-        if (fileInput == null) {
-            throw new IllegalArgumentException("Please provide a file for conversion.");
-        }
-
-        // Validate the output format
-        String outputFormat = request.getOutputFormat().toLowerCase();
-        List<String> allowedFormats =
-                Arrays.asList(
-                        "epub", "mobi", "azw3", "docx", "rtf", "txt", "html", "lit", "fb2", "pdb",
-                        "lrf");
-        if (!allowedFormats.contains(outputFormat)) {
-            throw new IllegalArgumentException("Invalid output format: " + outputFormat);
-        }
-
-        byte[] outputFileBytes;
-        List<String> command = new ArrayList<>();
-        Path tempOutputFile =
-                Files.createTempFile(
-                        "output_",
-                        "." + outputFormat); // Use the output format for the file extension
-        Path tempInputFile = null;
-
-        try {
-            // Create temp input file from the provided PDF
-            tempInputFile = Files.createTempFile("input_", ".pdf"); // Assuming input is always PDF
-            Files.write(tempInputFile, fileInput.getBytes());
-
-            command.add("ebook-convert");
-            command.add(tempInputFile.toString());
-            command.add(tempOutputFile.toString());
-
-            ProcessExecutorResult returnCode =
-                    ProcessExecutor.getInstance(ProcessExecutor.Processes.CALIBRE)
-                            .runCommandWithOutputHandling(command);
-
-            outputFileBytes = Files.readAllBytes(tempOutputFile);
-        } finally {
-            // Clean up temporary files
-            if (tempInputFile != null) {
-                Files.deleteIfExists(tempInputFile);
-            }
-            Files.deleteIfExists(tempOutputFile);
-        }
-
-        String outputFilename =
-                fileInput.getOriginalFilename().replaceFirst("[.][^.]+$", "")
-                        + "."
-                        + outputFormat; // Remove file extension and append .pdf
-
-        return WebResponseUtils.bytesToWebResponse(outputFileBytes, outputFilename);
-    }
-}

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

@@ -6,8 +6,6 @@ import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -28,10 +26,6 @@ import stirling.software.SPDF.utils.WebResponseUtils;
 @RequestMapping("/api/v1/convert")
 public class ConvertWebsiteToPDF {
 
-    @Autowired
-    @Qualifier("htmlFormatsInstalled")
-    private boolean htmlFormatsInstalled;
-
     @PostMapping(consumes = "multipart/form-data", value = "/url/pdf")
     @Operation(
             summary = "Convert a URL to a PDF",
@@ -53,11 +47,7 @@ public class ConvertWebsiteToPDF {
 
             // Prepare the OCRmyPDF command
             List<String> command = new ArrayList<>();
-            if (!htmlFormatsInstalled) {
+            command.add("weasyprint");
-                command.add("weasyprint");
-            } else {
-                command.add("wkhtmltopdf");
-            }
             command.add(URL);
             command.add(tempOutputFile.toString());
 

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

@@ -1,10 +1,10 @@
 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.Loader;
 import org.apache.pdfbox.pdmodel.PDDocument;
 import org.apache.pdfbox.pdmodel.PDPage;
 import org.slf4j.Logger;
@@ -44,7 +44,8 @@ public class ExtractController {
         ArrayList<String> tableData = new ArrayList<>();
         int columnsCount = 0;
 
-        try (PDDocument document = Loader.loadPDF(form.getFileInput().getBytes())) {
+        try (PDDocument document =
+                PDDocument.load(new ByteArrayInputStream(form.getFileInput().getBytes()))) {
             final double res = 72; // PDF units are at 72 DPI
             PDFTableStripper stripper = new PDFTableStripper();
             PDPage pdPage = document.getPage(form.getPageId() - 1);

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

@@ -2,7 +2,6 @@ package stirling.software.SPDF.controller.api.filters;
 
 import java.io.IOException;
 
-import org.apache.pdfbox.Loader;
 import org.apache.pdfbox.pdmodel.PDDocument;
 import org.apache.pdfbox.pdmodel.PDPage;
 import org.apache.pdfbox.pdmodel.common.PDRectangle;
@@ -40,7 +39,7 @@ public class FilterController {
         String text = request.getText();
         String pageNumber = request.getPageNumbers();
 
-        PDDocument pdfDocument = Loader.loadPDF(inputFile.getBytes());
+        PDDocument pdfDocument = PDDocument.load(inputFile.getInputStream());
         if (PdfUtils.hasText(pdfDocument, pageNumber, text))
             return WebResponseUtils.pdfDocToWebResponse(
                     pdfDocument, inputFile.getOriginalFilename());
@@ -57,7 +56,7 @@ public class FilterController {
         MultipartFile inputFile = request.getFileInput();
         String pageNumber = request.getPageNumbers();
 
-        PDDocument pdfDocument = Loader.loadPDF(inputFile.getBytes());
+        PDDocument pdfDocument = PDDocument.load(inputFile.getInputStream());
         if (PdfUtils.hasImages(pdfDocument, pageNumber))
             return WebResponseUtils.pdfDocToWebResponse(
                     pdfDocument, inputFile.getOriginalFilename());
@@ -74,7 +73,7 @@ public class FilterController {
         String pageCount = request.getPageCount();
         String comparator = request.getComparator();
         // Load the PDF
-        PDDocument document = Loader.loadPDF(inputFile.getBytes());
+        PDDocument document = PDDocument.load(inputFile.getInputStream());
         int actualPageCount = document.getNumberOfPages();
 
         boolean valid = false;
@@ -108,7 +107,7 @@ public class FilterController {
         String comparator = request.getComparator();
 
         // Load the PDF
-        PDDocument document = Loader.loadPDF(inputFile.getBytes());
+        PDDocument document = PDDocument.load(inputFile.getInputStream());
 
         PDPage firstPage = document.getPage(0);
         PDRectangle actualPageSize = firstPage.getMediaBox();
@@ -184,7 +183,7 @@ public class FilterController {
         String comparator = request.getComparator();
 
         // Load the PDF
-        PDDocument document = Loader.loadPDF(inputFile.getBytes());
+        PDDocument document = PDDocument.load(inputFile.getInputStream());
 
         // Get the rotation of the first page
         PDPage firstPage = document.getPage(0);

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

@@ -5,7 +5,6 @@ import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.List;
 
-import org.apache.pdfbox.Loader;
 import org.apache.pdfbox.pdmodel.PDDocument;
 import org.apache.pdfbox.text.PDFTextStripper;
 import org.apache.pdfbox.text.TextPosition;
@@ -44,7 +43,7 @@ public class AutoRenameController {
         MultipartFile file = request.getFileInput();
         Boolean useFirstTextAsFallback = request.isUseFirstTextAsFallback();
 
-        PDDocument document = Loader.loadPDF(file.getBytes());
+        PDDocument document = PDDocument.load(file.getInputStream());
         PDFTextStripper reader =
                 new PDFTextStripper() {
                     class LineInfo {

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

@@ -5,6 +5,7 @@ import java.awt.image.DataBufferByte;
 import java.awt.image.DataBufferInt;
 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;
@@ -12,7 +13,6 @@ import java.util.List;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipOutputStream;
 
-import org.apache.pdfbox.Loader;
 import org.apache.pdfbox.pdmodel.PDDocument;
 import org.apache.pdfbox.rendering.PDFRenderer;
 import org.springframework.http.MediaType;
@@ -42,7 +42,7 @@ import stirling.software.SPDF.utils.WebResponseUtils;
 @Tag(name = "Misc", description = "Miscellaneous APIs")
 public class AutoSplitPdfController {
 
-    private static final String QR_CONTENT = "https://github.com/Stirling-Tools/Stirling-PDF";
+    private static final String QR_CONTENT = "https://github.com/Frooodle/Stirling-PDF";
 
     @PostMapping(value = "/auto-split-pdf", consumes = "multipart/form-data")
     @Operation(
@@ -54,7 +54,8 @@ public class AutoSplitPdfController {
         MultipartFile file = request.getFileInput();
         boolean duplexMode = request.isDuplexMode();
 
-        PDDocument document = Loader.loadPDF(file.getBytes());
+        InputStream inputStream = file.getInputStream();
+        PDDocument document = PDDocument.load(inputStream);
         PDFRenderer pdfRenderer = new PDFRenderer(document);
 
         List<PDDocument> splitDocuments = new ArrayList<>();

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

@@ -13,7 +13,6 @@ import java.util.stream.IntStream;
 
 import javax.imageio.ImageIO;
 
-import org.apache.pdfbox.Loader;
 import org.apache.pdfbox.pdmodel.PDDocument;
 import org.apache.pdfbox.pdmodel.PDPage;
 import org.apache.pdfbox.pdmodel.PDPageTree;
@@ -54,7 +53,7 @@ public class BlankPageController {
 
         PDDocument document = null;
         try {
-            document = Loader.loadPDF(inputFile.getBytes());
+            document = PDDocument.load(inputFile.getInputStream());
             PDPageTree pages = document.getDocumentCatalog().getPages();
             PDFTextStripper textStripper = new PDFTextStripper();
 

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

@@ -13,7 +13,6 @@ import java.util.List;
 import javax.imageio.ImageIO;
 
 import org.apache.commons.io.FileUtils;
-import org.apache.pdfbox.Loader;
 import org.apache.pdfbox.cos.COSName;
 import org.apache.pdfbox.pdmodel.PDDocument;
 import org.apache.pdfbox.pdmodel.PDPage;
@@ -148,7 +147,7 @@ public class CompressController {
         if (expectedOutputSize != null && autoMode) {
             long outputFileSize = Files.size(tempOutputFile);
             if (outputFileSize > expectedOutputSize) {
-                try (PDDocument doc = Loader.loadPDF(new File(tempOutputFile.toString()))) {
+                try (PDDocument doc = PDDocument.load(new File(tempOutputFile.toString()))) {
                     long previousFileSize = 0;
                     double scaleFactor = 1.0;
                     while (true) {

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

@@ -1,6 +1,7 @@
 package stirling.software.SPDF.controller.api.misc;
 
 import java.awt.image.BufferedImage;
+import java.io.ByteArrayInputStream;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.nio.file.Files;
@@ -16,7 +17,6 @@ import java.util.zip.ZipOutputStream;
 import javax.imageio.ImageIO;
 
 import org.apache.commons.io.FileUtils;
-import org.apache.pdfbox.Loader;
 import org.apache.pdfbox.pdmodel.PDDocument;
 import org.apache.pdfbox.rendering.PDFRenderer;
 import org.slf4j.Logger;
@@ -76,7 +76,8 @@ public class ExtractImageScansController {
         // Check if input file is a PDF
         if (extension.equalsIgnoreCase("pdf")) {
             // Load PDF document
-            try (PDDocument document = Loader.loadPDF(form.getFileInput().getBytes())) {
+            try (PDDocument document =
+                    PDDocument.load(new ByteArrayInputStream(form.getFileInput().getBytes()))) {
                 PDFRenderer pdfRenderer = new PDFRenderer(document);
                 int pageCount = document.getNumberOfPages();
                 images = new ArrayList<>();

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

@@ -14,7 +14,6 @@ import java.util.zip.ZipOutputStream;
 
 import javax.imageio.ImageIO;
 
-import org.apache.pdfbox.Loader;
 import org.apache.pdfbox.cos.COSName;
 import org.apache.pdfbox.pdmodel.PDDocument;
 import org.apache.pdfbox.pdmodel.PDPage;
@@ -54,7 +53,7 @@ public class ExtractImagesController {
 
         System.out.println(
                 System.currentTimeMillis() + "file=" + file.getName() + ", format=" + format);
-        PDDocument document = Loader.loadPDF(file.getBytes());
+        PDDocument document = PDDocument.load(file.getBytes());
 
         // Create ByteArrayOutputStream to write zip file to byte array
         ByteArrayOutputStream baos = new ByteArrayOutputStream();

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

@@ -16,7 +16,6 @@ import java.util.Random;
 
 import javax.imageio.ImageIO;
 
-import org.apache.pdfbox.Loader;
 import org.apache.pdfbox.pdmodel.PDDocument;
 import org.apache.pdfbox.pdmodel.PDPage;
 import org.apache.pdfbox.pdmodel.PDPageContentStream;
@@ -58,7 +57,7 @@ public class FakeScanControllerWIP {
     public ResponseEntity<byte[]> repairPdf(@ModelAttribute PDFFile request) throws IOException {
         MultipartFile inputFile = request.getFileInput();
 
-        PDDocument document = Loader.loadPDF(inputFile.getBytes());
+        PDDocument document = PDDocument.load(inputFile.getBytes());
         PDFRenderer pdfRenderer = new PDFRenderer(document);
         for (int page = 0; page < document.getNumberOfPages(); ++page) {
             BufferedImage image = pdfRenderer.renderImageWithDPI(page, 300, ImageType.RGB);

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

@@ -7,7 +7,6 @@ import java.util.Calendar;
 import java.util.Map;
 import java.util.Map.Entry;
 
-import org.apache.pdfbox.Loader;
 import org.apache.pdfbox.cos.COSName;
 import org.apache.pdfbox.pdmodel.PDDocument;
 import org.apache.pdfbox.pdmodel.PDDocumentInformation;
@@ -68,7 +67,7 @@ public class MetadataController {
             allRequestParams = new java.util.HashMap<String, String>();
         }
         // Load the PDF file into a PDDocument
-        PDDocument document = Loader.loadPDF(pdfFile.getBytes());
+        PDDocument document = PDDocument.load(pdfFile.getBytes());
 
         // Get the document information from the PDF
         PDDocumentInformation info = document.getDocumentInformation();

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

@@ -4,13 +4,11 @@ import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.util.List;
 
-import org.apache.pdfbox.Loader;
 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.apache.pdfbox.pdmodel.font.Standard14Fonts;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.http.MediaType;
@@ -50,7 +48,7 @@ public class PageNumbersController {
         String customText = request.getCustomText();
         int pageNumber = startingNumber;
         byte[] fileBytes = file.getBytes();
-        PDDocument document = Loader.loadPDF(fileBytes);
+        PDDocument document = PDDocument.load(fileBytes);
 
         float marginFactor;
         switch (customMargin.toLowerCase()) {
@@ -73,6 +71,7 @@ public class PageNumbersController {
         }
 
         float fontSize = 12.0f;
+        PDType1Font font = PDType1Font.HELVETICA;
         if (pagesToNumber == null || pagesToNumber.length() == 0) {
             pagesToNumber = "all";
         }
@@ -128,9 +127,9 @@ public class PageNumbersController {
 
             PDPageContentStream contentStream =
                     new PDPageContentStream(
-                            document, page, PDPageContentStream.AppendMode.APPEND, true, true);
+                            document, page, PDPageContentStream.AppendMode.APPEND, true);
             contentStream.beginText();
-            contentStream.setFont(new PDType1Font(Standard14Fonts.FontName.HELVETICA), fontSize);
+            contentStream.setFont(font, fontSize);
             contentStream.newLineAtOffset(x, y);
             contentStream.showText(text);
             contentStream.endText();

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

@@ -3,7 +3,6 @@ package stirling.software.SPDF.controller.api.misc;
 import java.nio.charset.StandardCharsets;
 import java.util.Map;
 
-import org.apache.pdfbox.Loader;
 import org.apache.pdfbox.pdmodel.PDDocument;
 import org.apache.pdfbox.pdmodel.common.PDNameTreeNode;
 import org.apache.pdfbox.pdmodel.interactive.action.PDActionJavaScript;
@@ -37,7 +36,7 @@ public class ShowJavascript {
         MultipartFile inputFile = request.getFileInput();
         String script = "";
 
-        try (PDDocument document = Loader.loadPDF(inputFile.getBytes())) {
+        try (PDDocument document = PDDocument.load(inputFile.getInputStream())) {
 
             if (document.getDocumentCatalog() != null
                     && document.getDocumentCatalog().getNames() != null) {

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

@@ -2,9 +2,7 @@ package stirling.software.SPDF.controller.api.pipeline;
 
 import java.io.ByteArrayOutputStream;
 import java.io.InputStream;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipOutputStream;
 
@@ -86,26 +84,9 @@ public class PipelineController {
             ByteArrayOutputStream baos = new ByteArrayOutputStream();
             ZipOutputStream zipOut = new ZipOutputStream(baos);
 
-            // A map to keep track of filenames and their counts
-            Map<String, Integer> filenameCount = new HashMap<>();
-
             // Loop through each file and add it to the zip
             for (Resource file : outputFiles) {
-                String originalFilename = file.getFilename();
+                ZipEntry zipEntry = new ZipEntry(file.getFilename());
-                String filename = originalFilename;
-
-                // Check if the filename already exists, and modify it if necessary
-                if (filenameCount.containsKey(originalFilename)) {
-                    int count = filenameCount.get(originalFilename);
-                    String baseName = originalFilename.replaceAll("\\.[^.]*$", "");
-                    String extension = originalFilename.replaceAll("^.*\\.", "");
-                    filename = baseName + "(" + count + ")." + extension;
-                    filenameCount.put(originalFilename, count + 1);
-                } else {
-                    filenameCount.put(originalFilename, 1);
-                }
-
-                ZipEntry zipEntry = new ZipEntry(filename);
                 zipOut.putNextEntry(zipEntry);
 
                 // Read the file into a byte array

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

@@ -5,8 +5,6 @@ import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.IOException;
 import java.io.PrintStream;
-import java.net.URLDecoder;
-import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
@@ -134,6 +132,8 @@ public class PipelineProcessor {
                                         + operation);
                         hasErrors = true;
                     }
+
+                    outputFiles = newOutputFiles;
                 }
 
             } else {
@@ -185,12 +185,10 @@ public class PipelineProcessor {
                 }
             }
             logPrintStream.close();
-            outputFiles = newOutputFiles;
         }
         if (hasErrors) {
             logger.error("Errors occurred during processing. Log: {}", logStream.toString());
         }
-
         return outputFiles;
     }
 
@@ -198,7 +196,6 @@ public class PipelineProcessor {
         RestTemplate restTemplate = new RestTemplate();
 
         // Set up headers, including API key
-
         HttpHeaders headers = new HttpHeaders();
         String apiKey = getApiKeyForUser();
         headers.add("X-API-Key", apiKey);
@@ -219,12 +216,11 @@ public class PipelineProcessor {
             throws IOException {
         // Define filename
         String newFilename;
-        if (operation.contains("auto-rename")) {
+        if ("auto-rename".equals(operation)) {
             // If the operation is "auto-rename", generate a new filename.
             // This is a simple example of generating a filename using current timestamp.
             // Modify as per your needs.
-
+            newFilename = "file_" + System.currentTimeMillis();
-            newFilename = extractFilename(response);
         } else {
             // Otherwise, keep the original filename.
             newFilename = fileName;
@@ -248,28 +244,6 @@ public class PipelineProcessor {
         return newOutputFiles;
     }
 
-    public String extractFilename(ResponseEntity<byte[]> response) {
-        String filename = "default-filename.ext"; // Default filename if not found
-
-        HttpHeaders headers = response.getHeaders();
-        String contentDisposition = headers.getFirst(HttpHeaders.CONTENT_DISPOSITION);
-
-        if (contentDisposition != null && !contentDisposition.isEmpty()) {
-            String[] parts = contentDisposition.split(";");
-            for (String part : parts) {
-                if (part.trim().startsWith("filename")) {
-                    // Extracts filename and removes quotes if present
-                    filename = part.split("=")[1].trim().replace("\"", "");
-                    filename = URLDecoder.decode(filename, StandardCharsets.UTF_8);
-
-                    break;
-                }
-            }
-        }
-
-        return filename;
-    }
-
     List<Resource> generateInputFiles(File[] files) throws Exception {
         if (files == null || files.length == 0) {
             logger.info("No files");

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

@@ -4,35 +4,44 @@ import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStreamReader;
-import java.io.OutputStream;
+import java.security.KeyFactory;
 import java.security.KeyStore;
-import java.security.KeyStoreException;
-import java.security.NoSuchAlgorithmException;
 import java.security.PrivateKey;
 import java.security.Security;
-import java.security.UnrecoverableKeyException;
-import java.security.cert.Certificate;
-import java.security.cert.CertificateException;
 import java.security.cert.CertificateFactory;
+import java.security.cert.X509Certificate;
+import java.security.spec.PKCS8EncodedKeySpec;
+import java.text.SimpleDateFormat;
 import java.util.Calendar;
+import java.util.Collections;
+import java.util.Date;
 
-import org.apache.pdfbox.Loader;
+import org.apache.commons.io.IOUtils;
-import org.apache.pdfbox.examples.signature.CreateSignatureBase;
 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.bouncycastle.asn1.pkcs.PrivateKeyInfo;
+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.openssl.PEMDecryptorProvider;
+import org.bouncycastle.operator.ContentSigner;
-import org.bouncycastle.openssl.PEMEncryptedKeyPair;
+import org.bouncycastle.operator.jcajce.JcaContentSignerBuilder;
-import org.bouncycastle.openssl.PEMKeyPair;
+import org.bouncycastle.operator.jcajce.JcaDigestCalculatorProviderBuilder;
-import org.bouncycastle.openssl.PEMParser;
+import org.bouncycastle.util.io.pem.PemReader;
-import org.bouncycastle.openssl.jcajce.JcaPEMKeyConverter;
-import org.bouncycastle.openssl.jcajce.JceOpenSSLPKCS8DecryptorProviderBuilder;
-import org.bouncycastle.openssl.jcajce.JcePEMDecryptorProviderBuilder;
-import org.bouncycastle.operator.InputDecryptorProvider;
-import org.bouncycastle.operator.OperatorCreationException;
-import org.bouncycastle.pkcs.PKCS8EncryptedPrivateKeyInfo;
-import org.bouncycastle.pkcs.PKCSException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.http.ResponseEntity;
@@ -59,17 +68,6 @@ public class CertSignController {
         Security.addProvider(new BouncyCastleProvider());
     }
 
-    class CreateSignature extends CreateSignatureBase {
-        public CreateSignature(KeyStore keystore, char[] pin)
-                throws KeyStoreException,
-                        UnrecoverableKeyException,
-                        NoSuchAlgorithmException,
-                        IOException,
-                        CertificateException {
-            super(keystore, pin);
-        }
-    }
-
     @PostMapping(consumes = "multipart/form-data", value = "/cert-sign")
     @Operation(
             summary = "Sign PDF with a Digital Certificate",
@@ -82,7 +80,6 @@ public class CertSignController {
         MultipartFile privateKeyFile = request.getPrivateKeyFile();
         MultipartFile certFile = request.getCertFile();
         MultipartFile p12File = request.getP12File();
-        MultipartFile jksfile = request.getJksFile();
         String password = request.getPassword();
         Boolean showSignature = request.isShowSignature();
         String reason = request.getReason();
@@ -90,94 +87,203 @@ public class CertSignController {
         String name = request.getName();
         Integer pageNumber = request.getPageNumber();
 
-        if (certType == null) {
+        PrivateKey privateKey = null;
-            throw new IllegalArgumentException("Cert type must be provided");
+        X509Certificate cert = null;
+
+        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()));
+                        }
+
+                        // 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());
 
-        KeyStore ks = null;
+        // Load the PDF
+        try (PDDocument document = PDDocument.load(pdf.getBytes())) {
+            logger.info("Successfully loaded the provided PDF");
+            SignatureOptions signatureOptions = new SignatureOptions();
 
-        switch (certType) {
+            // If you want to show the signature
-            case "PEM":
-                ks = KeyStore.getInstance("JKS");
-                ks.load(null);
-                PrivateKey privateKey = getPrivateKeyFromPEM(privateKeyFile.getBytes(), password);
-                Certificate cert = (Certificate) getCertificateFromPEM(certFile.getBytes());
-                ks.setKeyEntry(
-                        "alias", privateKey, password.toCharArray(), new Certificate[] {cert});
-                break;
-            case "PKCS12":
-                ks = KeyStore.getInstance("PKCS12");
-                ks.load(p12File.getInputStream(), password.toCharArray());
-                break;
-            case "JKS":
-                ks = KeyStore.getInstance("JKS");
-                ks.load(jksfile.getInputStream(), password.toCharArray());
-                break;
-            default:
-                throw new IllegalArgumentException("Invalid cert type: " + certType);
-        }
 
-        // TODO: page number
+            // ATTEMPT 2
+            if (showSignature != null && showSignature) {
+                PDPage page = document.getPage(pageNumber - 1);
 
-        CreateSignature createSignature = new CreateSignature(ks, password.toCharArray());
+                PDAcroForm acroForm = document.getDocumentCatalog().getAcroForm();
-        ByteArrayOutputStream baos = new ByteArrayOutputStream();
+                if (acroForm == null) {
-        sign(pdf.getBytes(), baos, createSignature, name, location, reason);
+                    acroForm = new PDAcroForm(document);
-        return WebResponseUtils.boasToWebResponse(
+                    document.getDocumentCatalog().setAcroForm(acroForm);
-                baos, pdf.getOriginalFilename().replaceFirst("[.][^.]+$", "") + "_signed.pdf");
+                }
-    }
 
-    private static void sign(
+                // Create a new signature field and widget
-            byte[] input,
-            OutputStream output,
-            CreateSignature instance,
-            String name,
-            String location,
-            String reason) {
-        try (PDDocument doc = Loader.loadPDF(input)) {
-            PDSignature signature = new PDSignature();
-            signature.setFilter(PDSignature.FILTER_ADOBE_PPKLITE);
-            signature.setSubFilter(PDSignature.SUBFILTER_ADBE_PKCS7_DETACHED);
-            signature.setName(name);
-            signature.setLocation(location);
-            signature.setReason(reason);
-            signature.setSignDate(Calendar.getInstance());
 
-            doc.addSignature(signature, instance);
+                PDSignatureField signatureField = new PDSignatureField(acroForm);
-            doc.saveIncremental(output);
+                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);
+
+                // 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);
+
+                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();
+                }
+
+                // Add the widget annotation to the page
+                page.getAnnotations().add(widget);
+
+                // Add the signature field to the acroform
+                acroForm.getFields().add(signatureField);
+
+                // 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);
+            }
+
+            document.addSignature(signature, signatureOptions);
+            logger.info("Signature added to the PDF document");
+            // External signing
+            ExternalSigningSupport externalSigning =
+                    document.saveIncrementalForExternalSigning(new ByteArrayOutputStream());
+
+            byte[] content = IOUtils.toByteArray(externalSigning.getContent());
+
+            // Using BouncyCastle to sign
+            CMSTypedData cmsData = new CMSProcessableByteArray(content);
+
+            CMSSignedDataGenerator gen = new CMSSignedDataGenerator();
+            ContentSigner signer =
+                    new JcaContentSignerBuilder("SHA256withRSA")
+                            .setProvider(BouncyCastleProvider.PROVIDER_NAME)
+                            .build(privateKey);
+
+            gen.addSignerInfoGenerator(
+                    new JcaSignerInfoGeneratorBuilder(
+                                    new JcaDigestCalculatorProviderBuilder()
+                                            .setProvider(BouncyCastleProvider.PROVIDER_NAME)
+                                            .build())
+                            .build(signer, cert));
+
+            gen.addCertificates(new JcaCertStore(Collections.singletonList(cert)));
+            CMSSignedData signedData = gen.generate(cmsData, false);
+
+            byte[] cmsSignature = signedData.getEncoded();
+            logger.info("About to sign content using BouncyCastle");
+            externalSigning.setSignature(cmsSignature);
+            logger.info("Signature set successfully");
+
+            // 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 PrivateKey getPrivateKeyFromPEM(byte[] pemBytes, String password)
+    private byte[] parsePEM(byte[] content) throws IOException {
-            throws IOException, OperatorCreationException, PKCSException {
+        PemReader pemReader =
-        try (PEMParser pemParser =
+                new PemReader(new InputStreamReader(new ByteArrayInputStream(content)));
-                new PEMParser(new InputStreamReader(new ByteArrayInputStream(pemBytes)))) {
+        return pemReader.readPemObject().getContent();
-            Object pemObject = pemParser.readObject();
-            JcaPEMKeyConverter converter = new JcaPEMKeyConverter().setProvider("BC");
-            PrivateKeyInfo pkInfo;
-            if (pemObject instanceof PKCS8EncryptedPrivateKeyInfo) {
-                InputDecryptorProvider decProv =
-                        new JceOpenSSLPKCS8DecryptorProviderBuilder().build(password.toCharArray());
-                pkInfo = ((PKCS8EncryptedPrivateKeyInfo) pemObject).decryptPrivateKeyInfo(decProv);
-            } else if (pemObject instanceof PEMEncryptedKeyPair) {
-                PEMDecryptorProvider decProv =
-                        new JcePEMDecryptorProviderBuilder().build(password.toCharArray());
-                pkInfo =
-                        ((PEMEncryptedKeyPair) pemObject)
-                                .decryptKeyPair(decProv)
-                                .getPrivateKeyInfo();
-            } else {
-                pkInfo = ((PEMKeyPair) pemObject).getPrivateKeyInfo();
-            }
-            return converter.getPrivateKey(pkInfo);
-        }
     }
 
-    private Certificate getCertificateFromPEM(byte[] pemBytes)
+    private boolean isPEM(byte[] content) {
-            throws IOException, CertificateException {
+        String contentStr = new String(content);
-        try (ByteArrayInputStream bis = new ByteArrayInputStream(pemBytes)) {
+        return contentStr.contains("-----BEGIN") && contentStr.contains("-----END");
-            return CertificateFactory.getInstance("X.509").generateCertificate(bis);
-        }
     }
 }

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

@@ -11,9 +11,11 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import org.apache.pdfbox.Loader;
+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;
@@ -85,7 +87,7 @@ public class GetInfoOnPDF {
     @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 = Loader.loadPDF(inputFile.getBytes()); ) {
+        try (PDDocument pdfBoxDoc = PDDocument.load(inputFile.getInputStream()); ) {
             ObjectMapper objectMapper = new ObjectMapper();
             ObjectNode jsonOutput = objectMapper.createObjectNode();
 
@@ -127,6 +129,17 @@ public class GetInfoOnPDF {
             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);
 
@@ -330,6 +343,7 @@ public class GetInfoOnPDF {
                     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"

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

@@ -2,7 +2,6 @@ package stirling.software.SPDF.controller.api.security;
 
 import java.io.IOException;
 
-import org.apache.pdfbox.Loader;
 import org.apache.pdfbox.pdmodel.PDDocument;
 import org.apache.pdfbox.pdmodel.encryption.AccessPermission;
 import org.apache.pdfbox.pdmodel.encryption.StandardProtectionPolicy;
@@ -39,7 +38,7 @@ public class PasswordController {
         MultipartFile fileInput = request.getFileInput();
         String password = request.getPassword();
 
-        PDDocument document = Loader.loadPDF(fileInput.getBytes(), password);
+        PDDocument document = PDDocument.load(fileInput.getBytes(), password);
         document.setAllSecurityToBeRemoved(true);
         return WebResponseUtils.pdfDocToWebResponse(
                 document,
@@ -67,7 +66,7 @@ public class PasswordController {
         boolean canPrint = request.isCanPrint();
         boolean canPrintFaithful = request.isCanPrintFaithful();
 
-        PDDocument document = Loader.loadPDF(fileInput.getBytes());
+        PDDocument document = PDDocument.load(fileInput.getBytes());
         AccessPermission ap = new AccessPermission();
         ap.setCanAssembleDocument(!canAssembleDocument);
         ap.setCanExtractContent(!canExtractContent);

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

@@ -2,15 +2,14 @@ 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.Loader;
 import org.apache.pdfbox.pdmodel.PDDocument;
 import org.apache.pdfbox.pdmodel.PDPage;
 import org.apache.pdfbox.pdmodel.PDPageContentStream;
-import org.apache.pdfbox.pdmodel.PDPageContentStream.AppendMode;
 import org.apache.pdfbox.pdmodel.common.PDRectangle;
 import org.apache.pdfbox.pdmodel.graphics.image.LosslessFactory;
 import org.apache.pdfbox.pdmodel.graphics.image.PDImageXObject;
@@ -58,7 +57,7 @@ public class RedactController {
         System.out.println(listOfTextString);
         String[] listOfText = listOfTextString.split("\n");
         byte[] bytes = file.getBytes();
-        PDDocument document = Loader.loadPDF(bytes);
+        PDDocument document = PDDocument.load(new ByteArrayInputStream(bytes));
 
         Color redactColor;
         try {
@@ -87,9 +86,7 @@ public class RedactController {
                 PDPage newPage = new PDPage(new PDRectangle(bim.getWidth(), bim.getHeight()));
                 imageDocument.addPage(newPage);
                 PDImageXObject pdImage = LosslessFactory.createFromImage(imageDocument, bim);
-                PDPageContentStream contentStream =
+                PDPageContentStream contentStream = new PDPageContentStream(imageDocument, newPage);
-                        new PDPageContentStream(
-                                imageDocument, newPage, AppendMode.APPEND, true, true);
                 contentStream.drawImage(pdImage, 0, 0);
                 contentStream.close();
             }

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

@@ -2,7 +2,6 @@ package stirling.software.SPDF.controller.api.security;
 
 import java.io.IOException;
 
-import org.apache.pdfbox.Loader;
 import org.apache.pdfbox.cos.COSDictionary;
 import org.apache.pdfbox.cos.COSName;
 import org.apache.pdfbox.pdmodel.PDDocument;
@@ -53,7 +52,7 @@ public class SanitizeController {
         boolean removeLinks = request.isRemoveLinks();
         boolean removeFonts = request.isRemoveFonts();
 
-        try (PDDocument document = Loader.loadPDF(inputFile.getBytes())) {
+        try (PDDocument document = PDDocument.load(inputFile.getInputStream())) {
             if (removeJavaScript) {
                 sanitizeJavaScript(document);
             }

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

@@ -10,14 +10,12 @@ import java.io.InputStream;
 import javax.imageio.ImageIO;
 
 import org.apache.commons.io.IOUtils;
-import org.apache.pdfbox.Loader;
 import org.apache.pdfbox.pdmodel.PDDocument;
 import org.apache.pdfbox.pdmodel.PDPage;
 import org.apache.pdfbox.pdmodel.PDPageContentStream;
 import org.apache.pdfbox.pdmodel.font.PDFont;
 import org.apache.pdfbox.pdmodel.font.PDType0Font;
 import org.apache.pdfbox.pdmodel.font.PDType1Font;
-import org.apache.pdfbox.pdmodel.font.Standard14Fonts;
 import org.apache.pdfbox.pdmodel.graphics.image.LosslessFactory;
 import org.apache.pdfbox.pdmodel.graphics.image.PDImageXObject;
 import org.apache.pdfbox.pdmodel.graphics.state.PDExtendedGraphicsState;
@@ -60,7 +58,7 @@ public class WatermarkController {
         int heightSpacer = request.getHeightSpacer();
 
         // Load the input PDF
-        PDDocument document = Loader.loadPDF(pdfFile.getBytes());
+        PDDocument document = PDDocument.load(pdfFile.getInputStream());
 
         // Create a page in the document
         for (PDPage page : document.getPages()) {
@@ -68,7 +66,7 @@ public class WatermarkController {
             // Get the page's content stream
             PDPageContentStream contentStream =
                     new PDPageContentStream(
-                            document, page, PDPageContentStream.AppendMode.APPEND, true, true);
+                            document, page, PDPageContentStream.AppendMode.APPEND, true);
 
             // Set transparency
             PDExtendedGraphicsState graphicsState = new PDExtendedGraphicsState();
@@ -119,7 +117,7 @@ public class WatermarkController {
             String alphabet)
             throws IOException {
         String resourceDir = "";
-        PDFont font = new PDType1Font(Standard14Fonts.FontName.HELVETICA);
+        PDFont font = PDType1Font.HELVETICA_BOLD;
         switch (alphabet) {
             case "arabic":
                 resourceDir = "static/fonts/NotoSansArabic-Regular.ttf";

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

@@ -1,6 +1,5 @@
 package stirling.software.SPDF.controller.web;
 
-import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -13,22 +12,6 @@ import io.swagger.v3.oas.annotations.tags.Tag;
 @Tag(name = "Convert", description = "Convert APIs")
 public class ConverterWebController {
 
-    @ConditionalOnExpression("#{bookFormatsInstalled}")
-    @GetMapping("/book-to-pdf")
-    @Hidden
-    public String convertBookToPdfForm(Model model) {
-        model.addAttribute("currentPage", "book-to-pdf");
-        return "convert/book-to-pdf";
-    }
-
-    @ConditionalOnExpression("#{bookFormatsInstalled}")
-    @GetMapping("/pdf-to-book")
-    @Hidden
-    public String convertPdfToBookForm(Model model) {
-        model.addAttribute("currentPage", "pdf-to-book");
-        return "convert/pdf-to-book";
-    }
-
     @GetMapping("/img-to-pdf")
     @Hidden
     public String convertImgToPdfForm(Model model) {

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

@@ -59,14 +59,6 @@ public class GeneralWebController {
                                     .readValue(config, new TypeReference<Map<String, Object>>() {});
 
                     String name = (String) jsonContent.get("name");
-                    if (name == null || name.length() < 1) {
-                        String filename =
-                                jsonFiles
-                                        .get(pipelineConfigs.indexOf(config))
-                                        .getFileName()
-                                        .toString();
-                        name = filename.substring(0, filename.lastIndexOf('.'));
-                    }
                     Map<String, String> configWithName = new HashMap<>();
                     configWithName.put("json", config);
                     configWithName.put("name", name);
@@ -168,6 +160,14 @@ public class GeneralWebController {
         return "sign";
     }
 
+    @GetMapping("/add-elements")
+    @Hidden
+    public String addElements(Model model) {
+        model.addAttribute("currentPage", "add-elements");
+        model.addAttribute("fonts", getFontNames());
+        return "add-elements";
+    }
+
     @GetMapping("/multi-page-layout")
     @Hidden
     public String multiPageLayoutForm(Model model) {

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

@@ -1,27 +1,15 @@
 package stirling.software.SPDF.controller.web;
 
-import java.io.IOException;
-import java.io.InputStream;
-import java.nio.charset.StandardCharsets;
-import java.util.List;
-import java.util.Map;
-
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.core.io.ClassPathResource;
-import org.springframework.core.io.Resource;
 import org.springframework.http.MediaType;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 
-import com.fasterxml.jackson.core.type.TypeReference;
-import com.fasterxml.jackson.databind.ObjectMapper;
-
 import io.swagger.v3.oas.annotations.Hidden;
 
 import stirling.software.SPDF.model.ApplicationProperties;
-import stirling.software.SPDF.model.Dependency;
 
 @Controller
 public class HomeWebController {
@@ -33,24 +21,6 @@ public class HomeWebController {
         return "about";
     }
 
-    @GetMapping("/licenses")
-    @Hidden
-    public String licensesForm(Model model) {
-        model.addAttribute("currentPage", "licenses");
-        Resource resource = new ClassPathResource("static/3rdPartyLicenses.json");
-        try {
-            InputStream is = resource.getInputStream();
-            String json = new String(is.readAllBytes(), StandardCharsets.UTF_8);
-            ObjectMapper mapper = new ObjectMapper();
-            Map<String, List<Dependency>> data =
-                    mapper.readValue(json, new TypeReference<Map<String, List<Dependency>>>() {});
-            model.addAttribute("dependencies", data.get("dependencies"));
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-        return "licenses";
-    }
-
     @GetMapping("/")
     public String home(Model model) {
         model.addAttribute("currentPage", "home");

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

@@ -197,6 +197,7 @@ public class MetricsController {
             for (Meter meter : meterRegistry.getMeters()) {
                 if (meter.getId().getName().equals("http.requests")) {
                     String method = meter.getId().getTag("method");
+                    System.out.println("method=" + method + ", endpont=" + endpoint.get());
                     if (method != null && method.equals("POST")) {
                         if (endpoint.isPresent() && !endpoint.get().isBlank()) {
                             if (!endpoint.get().startsWith("/")) {
@@ -233,10 +234,15 @@ public class MetricsController {
             Map<String, Double> counts = new HashMap<>();
 
             for (Meter meter : meterRegistry.getMeters()) {
+            	
+            	System.out.println("meter.getId().getName()=" + meter.getId().getName());
                 if (meter.getId().getName().equals("http.requests")) {
                     String method = meter.getId().getTag("method");
+                    System.out.println("method=" + method );
                     if (method != null && method.equals("POST")) {
                         String uri = meter.getId().getTag("uri");                    	
+                        System.out.println("method=" + method + ", endpont=" + meter.getId());
+
                         if (uri != null) {
                             double currentCount = counts.getOrDefault(uri, 0.0);
                             if (meter instanceof Counter) {

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

@@ -210,7 +210,6 @@ public class ApplicationProperties {
         private String rootURIPath;
         private String customStaticFilePath;
         private Integer maxFileSize;
-        private CustomApplications customApplications;
 
         private Boolean enableAlphaFunctionality;
 
@@ -262,14 +261,6 @@ public class ApplicationProperties {
             this.maxFileSize = maxFileSize;
         }
 
-        public CustomApplications getCustomApplications() {
-            return customApplications != null ? customApplications : new CustomApplications();
-        }
-
-        public void setCustomApplications(CustomApplications customApplications) {
-            this.customApplications = customApplications;
-        }
-
         @Override
         public String toString() {
             return "System [defaultLocale="
@@ -282,42 +273,10 @@ public class ApplicationProperties {
                     + customStaticFilePath
                     + ", maxFileSize="
                     + maxFileSize
-                    + ", customApplications="
-                    + customApplications
                     + ", enableAlphaFunctionality="
                     + enableAlphaFunctionality
                     + "]";
         }
-
-        public static class CustomApplications {
-            private boolean installBookFormats;
-            private boolean installAdvancedHtmlToPDF;
-
-            public boolean isInstallBookFormats() {
-                return installBookFormats;
-            }
-
-            public void setInstallBookFormats(boolean installBookFormats) {
-                this.installBookFormats = installBookFormats;
-            }
-
-            public boolean isInstallAdvancedHtmlToPDF() {
-                return installAdvancedHtmlToPDF;
-            }
-
-            public void setInstallAdvancedHtmlToPDF(boolean installAdvancedHtmlToPDF) {
-                this.installAdvancedHtmlToPDF = installAdvancedHtmlToPDF;
-            }
-
-            @Override
-            public String toString() {
-                return "CustomApplications [installBookFormats="
-                        + installBookFormats
-                        + ", installAdvancedHtmlToPDF="
-                        + installAdvancedHtmlToPDF
-                        + "]";
-            }
-        }
     }
 
     public static class Ui {

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

@@ -1,12 +0,0 @@
-package stirling.software.SPDF.model;
-
-import lombok.Data;
-
-@Data
-public class Dependency {
-    private String moduleName;
-    private String moduleUrl;
-    private String moduleVersion;
-    private String moduleLicense;
-    private String moduleLicenseUrl;
-}

src/main/java/stirling/software/SPDF/model/api/PDFWithPageNums.java

@@ -3,7 +3,6 @@ package stirling.software.SPDF.model.api;
 import java.io.IOException;
 import java.util.List;
 
-import org.apache.pdfbox.Loader;
 import org.apache.pdfbox.pdmodel.PDDocument;
 
 import io.swagger.v3.oas.annotations.Hidden;
@@ -28,7 +27,7 @@ public class PDFWithPageNums extends PDFFile {
     public List<Integer> getPageNumbersList() {
         int pageCount = 0;
         try {
-            pageCount = Loader.loadPDF(getFileInput().getBytes()).getNumberOfPages();
+            pageCount = PDDocument.load(getFileInput().getInputStream()).getNumberOfPages();
         } catch (IOException e) {
             // TODO Auto-generated catch block
             e.printStackTrace();

src/main/java/stirling/software/SPDF/model/api/converters/PdfToBookRequest.java

@@ -1,19 +0,0 @@
-package stirling.software.SPDF.model.api.converters;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import stirling.software.SPDF.model.api.PDFFile;
-
-@Data
-@EqualsAndHashCode(callSuper = true)
-public class PdfToBookRequest extends PDFFile {
-
-    @Schema(
-            description = "The output Ebook format",
-            allowableValues = {
-                "epub", "mobi", "azw3", "docx", "rtf", "txt", "html", "lit", "fb2", "pdb", "lrf"
-            })
-    private String outputFormat;
-}

src/main/java/stirling/software/SPDF/model/api/security/SignPDFWithCertRequest.java

@@ -14,7 +14,7 @@ public class SignPDFWithCertRequest extends PDFFile {
 
     @Schema(
             description = "The type of the digital certificate",
-            allowableValues = {"PEM", "PKCS12", "JKS"})
+            allowableValues = {"PKCS12", "PEM"})
     private String certType;
 
     @Schema(
@@ -28,9 +28,6 @@ public class SignPDFWithCertRequest extends PDFFile {
     @Schema(description = "The PKCS12 keystore file (required for PKCS12 type certificates)")
     private MultipartFile p12File;
 
-    @Schema(description = "The JKS keystore file (Java Key Store)")
-    private MultipartFile jksFile;
-
     @Schema(description = "The password for the keystore or the private key")
     private String password;
 

src/main/java/stirling/software/SPDF/model/api/user/UpdateUserDetails.java

@@ -1,16 +0,0 @@
-package stirling.software.SPDF.model.api.user;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.NoArgsConstructor;
-
-@Data
-@NoArgsConstructor
-@EqualsAndHashCode(callSuper = true)
-public class UpdateUserDetails extends UpdateUserUsername {
-
-    @Schema(description = "new password for user")
-    private String newPassword;
-}

src/main/java/stirling/software/SPDF/model/api/user/UpdateUserUsername.java

@@ -1,16 +0,0 @@
-package stirling.software.SPDF.model.api.user;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.NoArgsConstructor;
-
-@Data
-@NoArgsConstructor
-@EqualsAndHashCode(callSuper = true)
-public class UpdateUserUsername extends UsernameAndPass {
-
-    @Schema(description = "new password for user")
-    private String newUsername;
-}

src/main/java/stirling/software/SPDF/model/api/user/Username.java

@@ -1,16 +0,0 @@
-package stirling.software.SPDF.model.api.user;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.NoArgsConstructor;
-
-@Data
-@EqualsAndHashCode
-@NoArgsConstructor
-public class Username {
-
-    @Schema(description = "username of user")
-    private String username;
-}

src/main/java/stirling/software/SPDF/model/api/user/UsernameAndPass.java

@@ -1,16 +0,0 @@
-package stirling.software.SPDF.model.api.user;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.NoArgsConstructor;
-
-@Data
-@NoArgsConstructor
-@EqualsAndHashCode(callSuper = true)
-public class UsernameAndPass extends Username {
-
-    @Schema(description = "password of user")
-    private String password;
-}

src/main/java/stirling/software/SPDF/utils/FileToPdf.java

@@ -14,9 +14,7 @@ import java.util.zip.ZipInputStream;
 import stirling.software.SPDF.utils.ProcessExecutor.ProcessExecutorResult;
 
 public class FileToPdf {
-
+    public static byte[] convertHtmlToPdf(byte[] fileBytes, String fileName)
-    public static byte[] convertHtmlToPdf(
-            byte[] fileBytes, String fileName, boolean htmlFormatsInstalled)
             throws IOException, InterruptedException {
 
         Path tempOutputFile = Files.createTempFile("output_", ".pdf");
@@ -31,22 +29,11 @@ public class FileToPdf {
             }
 
             List<String> command = new ArrayList<>();
-            if (!htmlFormatsInstalled) {
+            command.add("weasyprint");
-                command.add("weasyprint");
-            } else {
-                command.add("wkhtmltopdf");
-                command.add("--enable-local-file-access");
-            }
-
             command.add(tempInputFile.toString());
             command.add(tempOutputFile.toString());
             ProcessExecutorResult returnCode;
             if (fileName.endsWith(".zip")) {
-
-                if (htmlFormatsInstalled) {
-                    // command.add(1, "--allow");
-                    // command.add(2, tempInputFile.getParent().toString());
-                }
                 returnCode =
                         ProcessExecutor.getInstance(ProcessExecutor.Processes.WEASYPRINT)
                                 .runCommandWithOutputHandling(
@@ -110,38 +97,4 @@ public class FileToPdf {
             return htmlFiles.get(0);
         }
     }
-
-    public static byte[] convertBookTypeToPdf(byte[] bytes, String originalFilename)
-            throws IOException, InterruptedException {
-        if (originalFilename == null || originalFilename.lastIndexOf('.') == -1) {
-            throw new IllegalArgumentException("Invalid original filename.");
-        }
-
-        String fileExtension = originalFilename.substring(originalFilename.lastIndexOf('.'));
-        List<String> command = new ArrayList<>();
-        Path tempOutputFile = Files.createTempFile("output_", ".pdf");
-        Path tempInputFile = null;
-
-        try {
-            // Create temp file with appropriate extension
-            tempInputFile = Files.createTempFile("input_", fileExtension);
-            Files.write(tempInputFile, bytes);
-
-            command.add("ebook-convert");
-            command.add(tempInputFile.toString());
-            command.add(tempOutputFile.toString());
-
-            ProcessExecutorResult returnCode =
-                    ProcessExecutor.getInstance(ProcessExecutor.Processes.CALIBRE)
-                            .runCommandWithOutputHandling(command);
-
-            return Files.readAllBytes(tempOutputFile);
-        } finally {
-            // Clean up temporary files
-            if (tempInputFile != null) {
-                Files.deleteIfExists(tempInputFile);
-            }
-            Files.deleteIfExists(tempOutputFile);
-        }
-    }
 }

src/main/java/stirling/software/SPDF/utils/GeneralUtils.java

@@ -19,14 +19,6 @@ import org.springframework.web.multipart.MultipartFile;
 
 public class GeneralUtils {
 
-    public static File convertMultipartFileToFile(MultipartFile multipartFile) throws IOException {
-        File tempFile = File.createTempFile("temp", null);
-        try (FileOutputStream os = new FileOutputStream(tempFile)) {
-            os.write(multipartFile.getBytes());
-        }
-        return tempFile;
-    }
-
     public static void deleteDirectory(Path path) throws IOException {
         Files.walkFileTree(
                 path,

src/main/java/stirling/software/SPDF/utils/PdfUtils.java

@@ -2,6 +2,7 @@ package stirling.software.SPDF.utils;
 
 import java.awt.Graphics;
 import java.awt.image.BufferedImage;
+import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.util.List;
@@ -15,11 +16,9 @@ import javax.imageio.ImageWriteParam;
 import javax.imageio.ImageWriter;
 import javax.imageio.stream.ImageOutputStream;
 
-import org.apache.pdfbox.Loader;
 import org.apache.pdfbox.pdmodel.PDDocument;
 import org.apache.pdfbox.pdmodel.PDPage;
 import org.apache.pdfbox.pdmodel.PDPageContentStream;
-import org.apache.pdfbox.pdmodel.PDPageContentStream.AppendMode;
 import org.apache.pdfbox.pdmodel.common.PDRectangle;
 import org.apache.pdfbox.pdmodel.graphics.image.JPEGFactory;
 import org.apache.pdfbox.pdmodel.graphics.image.LosslessFactory;
@@ -191,7 +190,7 @@ public class PdfUtils {
             int DPI,
             String filename)
             throws IOException, Exception {
-        try (PDDocument document = Loader.loadPDF(inputStream)) {
+        try (PDDocument document = PDDocument.load(new ByteArrayInputStream(inputStream))) {
             PDFRenderer pdfRenderer = new PDFRenderer(document);
             int pageCount = document.getNumberOfPages();
 
@@ -336,8 +335,7 @@ public class PdfUtils {
         float pageWidth = page.getMediaBox().getWidth();
         float pageHeight = page.getMediaBox().getHeight();
 
-        try (PDPageContentStream contentStream =
+        try (PDPageContentStream contentStream = new PDPageContentStream(doc, page)) {
-                new PDPageContentStream(doc, page, AppendMode.APPEND, true, true)) {
             if ("fillPage".equals(fitOption) || "fitDocumentToImage".equals(fitOption)) {
                 contentStream.drawImage(image, 0, 0, pageWidth, pageHeight);
             } else if ("maintainAspectRatio".equals(fitOption)) {
@@ -370,7 +368,7 @@ public class PdfUtils {
             byte[] pdfBytes, byte[] imageBytes, float x, float y, boolean everyPage)
             throws IOException {
 
-        PDDocument document = Loader.loadPDF(pdfBytes);
+        PDDocument document = PDDocument.load(new ByteArrayInputStream(pdfBytes));
 
         // Get the first page of the PDF
         int pages = document.getNumberOfPages();
@@ -378,7 +376,7 @@ public class PdfUtils {
             PDPage page = document.getPage(i);
             try (PDPageContentStream contentStream =
                     new PDPageContentStream(
-                            document, page, PDPageContentStream.AppendMode.APPEND, true, true)) {
+                            document, page, PDPageContentStream.AppendMode.APPEND, true)) {
                 // Create an image object from the image bytes
                 PDImageXObject image = PDImageXObject.createFromByteArray(document, imageBytes, "");
                 // Draw the image onto the page at the specified x and y coordinates

src/main/java/stirling/software/SPDF/utils/ProcessExecutor.java

@@ -4,39 +4,26 @@ import java.io.BufferedReader;
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStreamReader;
-import java.io.InterruptedIOException;
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.Semaphore;
-import java.util.concurrent.TimeUnit;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 public class ProcessExecutor {
 
-    private static final Logger logger = LoggerFactory.getLogger(ProcessExecutor.class);
-
     public enum Processes {
         LIBRE_OFFICE,
         OCR_MY_PDF,
         PYTHON_OPENCV,
         GHOSTSCRIPT,
-        WEASYPRINT,
+        WEASYPRINT
-        INSTALL_APP,
-        CALIBRE
     }
 
     private static final Map<Processes, ProcessExecutor> instances = new ConcurrentHashMap<>();
 
     public static ProcessExecutor getInstance(Processes processType) {
-        return getInstance(processType, true);
-    }
-
-    public static ProcessExecutor getInstance(Processes processType, boolean liveUpdates) {
         return instances.computeIfAbsent(
                 processType,
                 key -> {
@@ -47,32 +34,15 @@ public class ProcessExecutor {
                                 case PYTHON_OPENCV -> 8;
                                 case GHOSTSCRIPT -> 16;
                                 case WEASYPRINT -> 16;
-                                case INSTALL_APP -> 1;
-                                case CALIBRE -> 1;
                             };
-
+                    return new ProcessExecutor(semaphoreLimit);
-                    long timeoutMinutes =
-                            switch (key) {
-                                case LIBRE_OFFICE -> 30;
-                                case OCR_MY_PDF -> 30;
-                                case PYTHON_OPENCV -> 30;
-                                case GHOSTSCRIPT -> 5;
-                                case WEASYPRINT -> 30;
-                                case INSTALL_APP -> 60;
-                                case CALIBRE -> 30;
-                            };
-                    return new ProcessExecutor(semaphoreLimit, liveUpdates, timeoutMinutes);
                 });
     }
 
     private final Semaphore semaphore;
-    private final boolean liveUpdates;
-    private long timeoutDuration;
 
-    private ProcessExecutor(int semaphoreLimit, boolean liveUpdates, long timeout) {
+    private ProcessExecutor(int semaphoreLimit) {
         this.semaphore = new Semaphore(semaphoreLimit);
-        this.liveUpdates = liveUpdates;
-        this.timeoutDuration = timeout;
     }
 
     public ProcessExecutorResult runCommandWithOutputHandling(List<String> command)
@@ -82,12 +52,12 @@ public class ProcessExecutor {
 
     public ProcessExecutorResult runCommandWithOutputHandling(
             List<String> command, File workingDirectory) throws IOException, InterruptedException {
-        String messages = "";
         int exitCode = 1;
+        String messages = "";
         semaphore.acquire();
         try {
 
-            logger.info("Running command: " + String.join(" ", command));
+            System.out.print("Running command: " + String.join(" ", command));
             ProcessBuilder processBuilder = new ProcessBuilder(command);
 
             // Use the working directory if it's set
@@ -111,11 +81,7 @@ public class ProcessExecutor {
                                     String line;
                                     while ((line = errorReader.readLine()) != null) {
                                         errorLines.add(line);
-                                        if (liveUpdates) logger.info(line);
                                     }
-                                } catch (InterruptedIOException e) {
-                                    logger.warn(
-                                            "Error reader thread was interrupted due to timeout.");
                                 } catch (IOException e) {
                                     e.printStackTrace();
                                 }
@@ -132,11 +98,7 @@ public class ProcessExecutor {
                                     String line;
                                     while ((line = outputReader.readLine()) != null) {
                                         outputLines.add(line);
-                                        if (liveUpdates) logger.info(line);
                                     }
-                                } catch (InterruptedIOException e) {
-                                    logger.warn(
-                                            "Error reader thread was interrupted due to timeout.");
                                 } catch (IOException e) {
                                     e.printStackTrace();
                                 }
@@ -146,42 +108,29 @@ public class ProcessExecutor {
             outputReaderThread.start();
 
             // Wait for the conversion process to complete
-            boolean finished = process.waitFor(timeoutDuration, TimeUnit.MINUTES);
+            exitCode = process.waitFor();
 
-            if (!finished) {
-                // Terminate the process
-                process.destroy();
-                // Interrupt the reader threads
-                errorReaderThread.interrupt();
-                outputReaderThread.interrupt();
-                throw new IOException("Process timeout exceeded.");
-            }
-            exitCode = process.exitValue();
             // Wait for the reader threads to finish
             errorReaderThread.join();
             outputReaderThread.join();
 
-            if (!liveUpdates) {
+            if (outputLines.size() > 0) {
-                if (outputLines.size() > 0) {
+                String outputMessage = String.join("\n", outputLines);
-                    String outputMessage = String.join("\n", outputLines);
+                messages += outputMessage;
-                    messages += outputMessage;
+                System.out.println("Command output:\n" + outputMessage);
-                    logger.info("Command output:\n" + outputMessage);
+            }
-                }
 
-                if (errorLines.size() > 0) {
+            if (errorLines.size() > 0) {
-                    String errorMessage = String.join("\n", errorLines);
+                String errorMessage = String.join("\n", errorLines);
-                    messages += errorMessage;
+                messages += errorMessage;
-                    logger.warn("Command error output:\n" + errorMessage);
+                System.out.println("Command error output:\n" + errorMessage);
-                    if (exitCode != 0) {
+                if (exitCode != 0) {
-                        throw new IOException(
+                    throw new IOException(
-                                "Command process failed with exit code "
+                            "Command process failed with exit code "
-                                        + exitCode
+                                    + exitCode
-                                        + ". Error message: "
+                                    + ". Error message: "
-                                        + errorMessage);
+                                    + errorMessage);
-                    }
                 }
-            } else if (exitCode != 0) {
-                throw new IOException("Command process failed with exit code " + exitCode);
             }
         } finally {
             semaphore.release();

src/main/java/stirling/software/SPDF/utils/RequestUriUtils.java

@@ -9,7 +9,6 @@ public class RequestUriUtils {
                 || requestURI.startsWith("/images/")
                 || requestURI.startsWith("/public/")
                 || requestURI.startsWith("/pdfjs/")
-                || requestURI.endsWith(".svg")
+                || requestURI.endsWith(".svg");
-                || requestURI.startsWith("/api/v1/info/status");
     }
 }

src/main/resources/messages.properties

@@ -1,4 +1,4 @@
-fileToPDF.fileTypesList=Microsoft Word: (DOC, DOCX, DOT, DOTX) <br> \
+fileToPDF.fileTypesList=Microsoft Word: (DOC, DOCX, DOT, DOTX) <br> \
 Microsoft Excel: (CSV, XLS, XLSX, XLT, XLTX, SLK, DIF) <br> \
 Microsoft PowerPoint: (PPT, PPTX) <br> \
 OpenDocument Formats: (ODT, OTT, ODS, OTS, ODP, OTP, ODG, OTG) <br> \

src/main/resources/messages_ar_AR.properties

@@ -1,4 +1,4 @@
-###########
+###########
 # Generic #
 ###########
 # the direction that the language is written (ltr=left to right, rtl = right to left)
@@ -42,8 +42,6 @@ red=Red
 green=Green
 blue=Blue
 custom=Custom...
-WorkInProgess=Work in progress, May not work or be buggy, Please report any ploblems!
-poweredBy=Powered by
 
 changedCredsMessage=Credentials changed!
 notAuthenticatedMessage=User not authenticated.
@@ -52,29 +50,6 @@ incorrectPasswordMessage=Current password is incorrect.
 usernameExistsMessage=New Username already exists.
 
 
-###############
-#   Pipeline  #
-###############
-pipeline.header=Pipeline Menu (Alpha)
-pipeline.uploadButton=Upload Custom
-pipeline.configureButton=Configure
-pipeline.defaultOption=Custom
-pipeline.submitButton=Submit
-
-######################
-#  Pipeline Options  #
-######################
-pipelineOptions.header=Pipeline Configuration
-pipelineOptions.pipelineNameLabel=Pipeline Name
-pipelineOptions.saveSettings=Save Operation Settings
-pipelineOptions.pipelineNamePrompt=Enter pipeline name here
-pipelineOptions.addOperationButton=Add operation
-pipelineOptions.pipelineHeader=Pipeline:
-pipelineOptions.saveButton=Download
-pipelineOptions.validateButton=Validate
-
-
-
 
 #############
 #  NAVBAR   #
@@ -547,11 +522,9 @@ scalePages.submit=Submit
 certSign.title=توقيع الشهادة
 certSign.header=قم بتوقيع ملف PDF بشهادتك (العمل قيد التقدم)
 certSign.selectPDF=حدد ملف PDF للتوقيع:
-certSign.jksNote=Note: If your certificate type is not listed below, please convert it to a Java Keystore (.jks) file using the keytool command line tool. Then, choose the .jks file option below.
 certSign.selectKey=حدد ملف المفتاح الخاص (تنسيق PKCS # 8 ، يمكن أن يكون .pem أو .der):
 certSign.selectCert=حدد ملف الشهادة الخاص بك (تنسيق X.509 ، يمكن أن يكون .pem أو .der):
 certSign.selectP12=حدد ملف تخزين المفاتيح PKCS # 12 (.p12 أو .pfx) (اختياري ، إذا تم توفيره ، يجب أن يحتوي على مفتاحك الخاص وشهادتك):
-certSign.selectJKS=Select Your Java Keystore File (.jks or .keystore):
 certSign.certType=نوع الشهادة
 certSign.password=أدخل ملف تخزين المفاتيح أو كلمة المرور الخاصة (إن وجدت):
 certSign.showSig=إظهار التوقيع
@@ -921,14 +894,3 @@ split-by-sections.vertical.label=Vertical Divisions
 split-by-sections.horizontal.placeholder=Enter number of horizontal divisions
 split-by-sections.vertical.placeholder=Enter number of vertical divisions
 split-by-sections.submit=Split PDF
-
-
-#licenses
-licenses.nav=Licenses
-licenses.title=3rd Party Licenses
-licenses.header=3rd Party Licenses
-licenses.module=Module
-licenses.version=Version
-licenses.license=License
-
-

src/main/resources/messages_bg_BG.properties

@@ -1,4 +1,4 @@
-###########
+###########
 # Generic #
 ###########
 # the direction that the language is written (ltr=left to right, rtl = right to left)
@@ -42,8 +42,6 @@ red=Червено
 green=Зелено
 blue=Синьо
 custom=Персонализиране...
-WorkInProgess=Work in progress, May not work or be buggy, Please report any ploblems!
-poweredBy=Powered by
 
 changedCredsMessage=Идентификационните данни са променени!
 notAuthenticatedMessage=Потребителят не е автентикиран.
@@ -52,29 +50,6 @@ incorrectPasswordMessage=Текущата парола е неправилна.
 usernameExistsMessage=Новият потребител вече съществува.
 
 
-###############
-#   Pipeline  #
-###############
-pipeline.header=Pipeline Menu (Alpha)
-pipeline.uploadButton=Upload Custom
-pipeline.configureButton=Configure
-pipeline.defaultOption=Custom
-pipeline.submitButton=Submit
-
-######################
-#  Pipeline Options  #
-######################
-pipelineOptions.header=Pipeline Configuration
-pipelineOptions.pipelineNameLabel=Pipeline Name
-pipelineOptions.saveSettings=Save Operation Settings
-pipelineOptions.pipelineNamePrompt=Enter pipeline name here
-pipelineOptions.addOperationButton=Add operation
-pipelineOptions.pipelineHeader=Pipeline:
-pipelineOptions.saveButton=Download
-pipelineOptions.validateButton=Validate
-
-
-
 
 #############
 #  NAVBAR   #
@@ -547,11 +522,9 @@ scalePages.submit=Подайте
 certSign.title=Подписване на сертификат
 certSign.header=Подпишете PDF с вашия сертификат (В процес на работа)
 certSign.selectPDF=Изберете PDF файл за подписване:
-certSign.jksNote=Note: If your certificate type is not listed below, please convert it to a Java Keystore (.jks) file using the keytool command line tool. Then, choose the .jks file option below.
 certSign.selectKey=Изберете вашия файл с личен ключ (формат PKCS#8, може да бъде .pem или .der):
 certSign.selectCert=Изберете вашия файл със сертификат (формат X.509, може да бъде .pem или .der):
 certSign.selectP12=Изберете вашия PKCS#12 Keystore файл (.p12 или .pfx) (По избор, ако е предоставен, трябва да съдържа вашия личен ключ и сертификат):
-certSign.selectJKS=Select Your Java Keystore File (.jks or .keystore):
 certSign.certType=Тип сертификат
 certSign.password=Въведете вашата парола за Keystore за ключове или частен ключ (ако има):
 certSign.showSig=Показване на подпис
@@ -921,14 +894,3 @@ split-by-sections.vertical.label=Vertical Divisions
 split-by-sections.horizontal.placeholder=Enter number of horizontal divisions
 split-by-sections.vertical.placeholder=Enter number of vertical divisions
 split-by-sections.submit=Split PDF
-
-
-#licenses
-licenses.nav=Licenses
-licenses.title=3rd Party Licenses
-licenses.header=3rd Party Licenses
-licenses.module=Module
-licenses.version=Version
-licenses.license=License
-
-

src/main/resources/messages_ca_CA.properties

@@ -1,4 +1,4 @@
-###########
+###########
 # Generic #
 ###########
 # the direction that the language is written (ltr=left to right, rtl = right to left)
@@ -42,8 +42,6 @@ red=Vermell
 green=Verd
 blue=Blau
 custom=Personalitzat...
-WorkInProgess=Work in progress, May not work or be buggy, Please report any ploblems!
-poweredBy=Powered by
 
 changedCredsMessage=Credentials changed!
 notAuthenticatedMessage=User not authenticated.
@@ -52,29 +50,6 @@ incorrectPasswordMessage=Current password is incorrect.
 usernameExistsMessage=New Username already exists.
 
 
-###############
-#   Pipeline  #
-###############
-pipeline.header=Pipeline Menu (Alpha)
-pipeline.uploadButton=Upload Custom
-pipeline.configureButton=Configure
-pipeline.defaultOption=Custom
-pipeline.submitButton=Submit
-
-######################
-#  Pipeline Options  #
-######################
-pipelineOptions.header=Pipeline Configuration
-pipelineOptions.pipelineNameLabel=Pipeline Name
-pipelineOptions.saveSettings=Save Operation Settings
-pipelineOptions.pipelineNamePrompt=Enter pipeline name here
-pipelineOptions.addOperationButton=Add operation
-pipelineOptions.pipelineHeader=Pipeline:
-pipelineOptions.saveButton=Download
-pipelineOptions.validateButton=Validate
-
-
-
 
 #############
 #  NAVBAR   #
@@ -547,11 +522,9 @@ scalePages.submit=Submit
 certSign.title=Significació del certificat
 certSign.header=Firmar un PDF amb el vostre certificat (Treball en curs)
 certSign.selectPDF=Seleccioneu un fitxer PDF per signar:
-certSign.jksNote=Note: If your certificate type is not listed below, please convert it to a Java Keystore (.jks) file using the keytool command line tool. Then, choose the .jks file option below.
 certSign.selectKey=Seleccioneu el vostre fitxer de clau privada (format PKCS#8, podria ser .pem o .der):
 certSign.selectCert=Seleccioneu el vostre fitxer de certificat (format X.509, podria ser .pem o .der):
 certSign.selectP12=Seleccioneu el vostre fitxer de magatzem de claus PKCS#12 (.p12 o .pfx) (Opcional, si es proporciona, hauria de contenir la vostra clau privada i certificat):
-certSign.selectJKS=Select Your Java Keystore File (.jks or .keystore):
 certSign.certType=Tipus de certificat
 certSign.password=Introduïu el vostre magatzem de claus o contrasenya de clau privada (si n'hi ha):
 certSign.showSig=Mostra la signatura
@@ -921,14 +894,3 @@ split-by-sections.vertical.label=Vertical Divisions
 split-by-sections.horizontal.placeholder=Enter number of horizontal divisions
 split-by-sections.vertical.placeholder=Enter number of vertical divisions
 split-by-sections.submit=Split PDF
-
-
-#licenses
-licenses.nav=Licenses
-licenses.title=3rd Party Licenses
-licenses.header=3rd Party Licenses
-licenses.module=Module
-licenses.version=Version
-licenses.license=License
-
-

src/main/resources/messages_de_DE.properties

@@ -1,4 +1,4 @@
-###########
+###########
 # Generic #
 ###########
 # the direction that the language is written (ltr=left to right, rtl = right to left)
@@ -42,8 +42,6 @@ red=Rot
 green=Grün
 blue=Blau
 custom=benutzerdefiniert...
-WorkInProgess=Work in progress, May not work or be buggy, Please report any ploblems!
-poweredBy=Powered by
 
 changedCredsMessage=Anmeldedaten geändert!
 notAuthenticatedMessage=Benutzer nicht authentifiziert.
@@ -52,29 +50,6 @@ incorrectPasswordMessage=Das Passwort ist falsch.
 usernameExistsMessage=Neuer Benutzername existiert bereits.
 
 
-###############
-#   Pipeline  #
-###############
-pipeline.header=Pipeline Menu (Alpha)
-pipeline.uploadButton=Upload Custom
-pipeline.configureButton=Configure
-pipeline.defaultOption=Custom
-pipeline.submitButton=Submit
-
-######################
-#  Pipeline Options  #
-######################
-pipelineOptions.header=Pipeline Configuration
-pipelineOptions.pipelineNameLabel=Pipeline Name
-pipelineOptions.saveSettings=Save Operation Settings
-pipelineOptions.pipelineNamePrompt=Enter pipeline name here
-pipelineOptions.addOperationButton=Add operation
-pipelineOptions.pipelineHeader=Pipeline:
-pipelineOptions.saveButton=Download
-pipelineOptions.validateButton=Validate
-
-
-
 
 #############
 #  NAVBAR   #
@@ -547,11 +522,9 @@ scalePages.submit=Abschicken
 certSign.title=Zertifikatsignierung
 certSign.header=Signieren Sie ein PDF mit Ihrem Zertifikat (in Arbeit)
 certSign.selectPDF=Wählen Sie eine PDF-Datei zum Signieren aus:
-certSign.jksNote=Note: If your certificate type is not listed below, please convert it to a Java Keystore (.jks) file using the keytool command line tool. Then, choose the .jks file option below.
 certSign.selectKey=Wählen Sie Ihre private Schlüsseldatei aus (PKCS#8-Format, könnte .pem oder .der sein):
 certSign.selectCert=Wählen Sie Ihre Zertifikatsdatei aus (X.509-Format, könnte .pem oder .der sein):
 certSign.selectP12=Wählen Sie Ihre PKCS#12-Keystore-Datei (.p12 oder .pfx) aus (optional, falls angegeben, sollte sie Ihren privaten Schlüssel und Ihr Zertifikat enthalten):
-certSign.selectJKS=Select Your Java Keystore File (.jks or .keystore):
 certSign.certType=Zertifikattyp
 certSign.password=Geben Sie Ihr Keystore- oder Private-Key-Passwort ein (falls vorhanden):
 certSign.showSig=Signatur anzeigen
@@ -921,14 +894,3 @@ split-by-sections.vertical.label=Vertical Divisions
 split-by-sections.horizontal.placeholder=Enter number of horizontal divisions
 split-by-sections.vertical.placeholder=Enter number of vertical divisions
 split-by-sections.submit=Split PDF
-
-
-#licenses
-licenses.nav=Licenses
-licenses.title=3rd Party Licenses
-licenses.header=3rd Party Licenses
-licenses.module=Module
-licenses.version=Version
-licenses.license=License
-
-

src/main/resources/messages_el_GR.properties

@@ -1,4 +1,4 @@
-###########
+###########
 # Generic #
 ###########
 # the direction that the language is written (ltr=left to right, rtl = right to left)
@@ -42,8 +42,6 @@ red=\u039A\u03CC\u03BA\u03BA\u03B9\u03BD\u03BF
 green=\u03A0\u03C1\u03AC\u03C3\u03B9\u03BD\u03BF
 blue=\u039C\u03C0\u03BB\u03AD
 custom=\u03A0\u03C1\u03BF\u03C3\u03B1\u03C1\u03BC\u03BF\u03B3\u03AE...
-WorkInProgess=Work in progress, May not work or be buggy, Please report any ploblems!
-poweredBy=Powered by
 
 changedCredsMessage=\u03A4\u03B1 \u03B4\u03B9\u03B1\u03C0\u03B9\u03C3\u03C4\u03B5\u03C5\u03C4\u03AE\u03C1\u03B9\u03B1 \u03AD\u03C7\u03BF\u03C5\u03BD \u03B1\u03BB\u03BB\u03AC\u03BE\u03B5\u03B9!
 notAuthenticatedMessage=\u039F \u03C7\u03C1\u03AE\u03C3\u03C4\u03B7\u03C2 \u03B4\u03B5\u03BD \u03AD\u03C7\u03B5\u03B9 \u03B1\u03C5\u03B8\u03B5\u03BD\u03C4\u03B9\u03BA\u03BF\u03C0\u03BF\u03B9\u03B7\u03B8\u03B5\u03AF.
@@ -52,29 +50,6 @@ incorrectPasswordMessage=\u039F \u03C4\u03C1\u03AD\u03C7\u03C9\u03BD \u03BA\u03C
 usernameExistsMessage=\u03A4\u03BF \u03BD\u03AD\u03BF \u03CC\u03BD\u03BF\u03BC\u03B1 \u03C7\u03C1\u03AE\u03C3\u03C4\u03B7 \u03C5\u03C0\u03AC\u03C1\u03C7\u03B5\u03B9 \u03AE\u03B4\u03B7.
 
 
-###############
-#   Pipeline  #
-###############
-pipeline.header=Pipeline Menu (Alpha)
-pipeline.uploadButton=Upload Custom
-pipeline.configureButton=Configure
-pipeline.defaultOption=Custom
-pipeline.submitButton=Submit
-
-######################
-#  Pipeline Options  #
-######################
-pipelineOptions.header=Pipeline Configuration
-pipelineOptions.pipelineNameLabel=Pipeline Name
-pipelineOptions.saveSettings=Save Operation Settings
-pipelineOptions.pipelineNamePrompt=Enter pipeline name here
-pipelineOptions.addOperationButton=Add operation
-pipelineOptions.pipelineHeader=Pipeline:
-pipelineOptions.saveButton=Download
-pipelineOptions.validateButton=Validate
-
-
-
 
 #############
 #  NAVBAR   #
@@ -547,11 +522,9 @@ scalePages.submit=\u03A5\u03C0\u03BF\u03B2\u03BF\u03BB\u03AE
 certSign.title=\u03A5\u03C0\u03BF\u03B3\u03C1\u03B1\u03C6\u03AE \u03A0\u03B9\u03C3\u03C4\u03BF\u03C0\u03BF\u03B9\u03B7\u03C4\u03B9\u03BA\u03BF\u03CD
 certSign.header=\u03A5\u03C0\u03BF\u03B3\u03C1\u03AC\u03C8\u03C4\u03B5 \u03AD\u03BD\u03B1 \u03B1\u03C1\u03C7\u03B5\u03AF\u03BF PDF \u03BC\u03B5 \u03C4\u03BF \u03C0\u03B9\u03C3\u03C4\u03BF\u03C0\u03BF\u03B9\u03B7\u03C4\u03B9\u03BA\u03CC \u03C3\u03B1\u03C2 (\u0395\u03C1\u03B3\u03B1\u03C3\u03AF\u03B1 \u03C3\u03B5 \u03B5\u03BE\u03AD\u03BB\u03B9\u03BE\u03B7)
 certSign.selectPDF=\u0395\u03C0\u03B9\u03BB\u03BF\u03B3\u03AE \u03B1\u03C1\u03C7\u03B5\u03AF\u03BF\u03C5 PDF \u03B3\u03B9\u03B1 \u03C5\u03C0\u03BF\u03B3\u03C1\u03B1\u03C6\u03AE:
-certSign.jksNote=Note: If your certificate type is not listed below, please convert it to a Java Keystore (.jks) file using the keytool command line tool. Then, choose the .jks file option below.
 certSign.selectKey=\u0395\u03C0\u03B9\u03BB\u03AD\u03BE\u03C4\u03B5 \u03C4\u03BF \u03B1\u03C1\u03C7\u03B5\u03AF\u03BF \u03C4\u03BF\u03C5 \u03B9\u03B4\u03B9\u03C9\u03C4\u03B9\u03BA\u03BF\u03CD \u03BA\u03BB\u03B5\u03B9\u03B4\u03B9\u03BF\u03CD \u03C3\u03B1\u03C2 (\u03BC\u03BF\u03C1\u03C6\u03AE PKCS#8, \u03BC\u03C0\u03BF\u03C1\u03B5\u03AF \u03BD\u03B1 \u03B5\u03AF\u03BD\u03B1\u03B9 .pem \u03AE .der):
 certSign.selectCert=\u0395\u03C0\u03B9\u03BB\u03AD\u03BE\u03C4\u03B5 \u03C4\u03BF \u03B1\u03C1\u03C7\u03B5\u03AF\u03BF \u03C0\u03B9\u03C3\u03C4\u03BF\u03C0\u03BF\u03B9\u03B7\u03C4\u03B9\u03BA\u03BF\u03CD \u03C3\u03B1\u03C2 (\u03BC\u03BF\u03C1\u03C6\u03AE X.509, \u03BC\u03C0\u03BF\u03C1\u03B5\u03AF \u03BD\u03B1 \u03B5\u03AF\u03BD\u03B1\u03B9 .pem \u03AE .der):
 certSign.selectP12=\u0395\u03C0\u03B9\u03BB\u03AD\u03BE\u03C4\u03B5 \u03C4\u03BF \u03B1\u03C1\u03C7\u03B5\u03AF\u03BF PKCS#12 Keystore (.p12 \u03AE .pfx) (\u03A0\u03C1\u03BF\u03B1\u03B9\u03C1\u03B5\u03C4\u03B9\u03BA\u03CC, \u03B5\u03AC\u03BD \u03C0\u03B1\u03C1\u03AD\u03C7\u03B5\u03C4\u03B1\u03B9, \u03B8\u03B1 \u03C0\u03C1\u03AD\u03C0\u03B5\u03B9 \u03BD\u03B1 \u03C0\u03B5\u03C1\u03B9\u03AD\u03C7\u03B5\u03B9 \u03C4\u03BF \u03B9\u03B4\u03B9\u03C9\u03C4\u03B9\u03BA\u03CC \u03BA\u03BB\u03B5\u03B9\u03B4\u03AF \u03BA\u03B1\u03B9 \u03C4\u03BF \u03C0\u03B9\u03C3\u03C4\u03BF\u03C0\u03BF\u03B9\u03B7\u03C4\u03B9\u03BA\u03CC \u03C3\u03B1\u03C2):
-certSign.selectJKS=Select Your Java Keystore File (.jks or .keystore):
 certSign.certType=\u03A4\u03CD\u03C0\u03BF\u03C2 \u03A0\u03B9\u03C3\u03C4\u03BF\u03C0\u03BF\u03B9\u03B7\u03C4\u03B9\u03BA\u03BF\u03CD
 certSign.password=\u0395\u03B9\u03C3\u03B1\u03B3\u03AC\u03B3\u03B5\u03C4\u03B5 \u03C4\u03BF\u03BD \u03BA\u03C9\u03B4\u03B9\u03BA\u03CC \u03C4\u03BF\u03C5 Keystore \u03AE \u03C4\u03BF\u03C5 \u0399\u03B4\u03B9\u03C9\u03C4\u03B9\u03BA\u03BF\u03CD \u039A\u03BB\u03B5\u03B9\u03B4\u03B9\u03BF\u03CD (\u03B5\u03AC\u03BD \u03C5\u03C0\u03AC\u03C1\u03C7\u03B5\u03B9):
 certSign.showSig=\u0395\u03BC\u03C6\u03AC\u03BD\u03B9\u03C3\u03B7 \u03A5\u03C0\u03BF\u03B3\u03C1\u03B1\u03C6\u03AE\u03C2
@@ -921,14 +894,3 @@ split-by-sections.vertical.label=Vertical Divisions
 split-by-sections.horizontal.placeholder=Enter number of horizontal divisions
 split-by-sections.vertical.placeholder=Enter number of vertical divisions
 split-by-sections.submit=Split PDF
-
-
-#licenses
-licenses.nav=Licenses
-licenses.title=3rd Party Licenses
-licenses.header=3rd Party Licenses
-licenses.module=Module
-licenses.version=Version
-licenses.license=License
-
-

src/main/resources/messages_en_GB.properties

@@ -1,4 +1,4 @@
-###########
+###########
 # Generic #
 ###########
 # the direction that the language is written (ltr = left to right, rtl = right to left)
@@ -24,6 +24,10 @@ alphabet=Alphabet
 downloadPdf=Download PDF
 text=Text
 font=Font
+element-id=Element ID
+group-id=Group ID
+comma-separated-values=Element values (separated by commas)
+element-value=Element value
 selectFillter=-- Select --
 pageNum=Page Number 
 sizes.small=Small
@@ -42,8 +46,6 @@ red=Red
 green=Green
 blue=Blue
 custom=Custom...
-WorkInProgess=Work in progress, May not work or be buggy, Please report any ploblems!
-poweredBy=Powered by
 
 changedCredsMessage=Credentials changed!
 notAuthenticatedMessage=User not authenticated.
@@ -52,30 +54,6 @@ incorrectPasswordMessage=Current password is incorrect.
 usernameExistsMessage=New Username already exists.
 
 
-###############
-#   Pipeline  #
-###############
-pipeline.header=Pipeline Menu (Alpha)
-pipeline.uploadButton=Upload Custom
-pipeline.configureButton=Configure
-pipeline.defaultOption=Custom
-pipeline.submitButton=Submit
-
-######################
-#  Pipeline Options  #
-######################
-pipelineOptions.header=Pipeline Configuration
-pipelineOptions.pipelineNameLabel=Pipeline Name
-pipelineOptions.saveSettings=Save Operation Settings
-pipelineOptions.pipelineNamePrompt=Enter pipeline name here
-pipelineOptions.selectOperation=Select Operation
-pipelineOptions.addOperationButton=Add operation
-pipelineOptions.pipelineHeader=Pipeline:
-pipelineOptions.saveButton=Download
-pipelineOptions.validateButton=Validate
-
-
-
 
 #############
 #  NAVBAR   #
@@ -548,11 +526,9 @@ scalePages.submit=Submit
 certSign.title=Certificate Signing
 certSign.header=Sign a PDF with your certificate (Work in progress)
 certSign.selectPDF=Select a PDF File for Signing: 
-certSign.jksNote=Note: If your certificate type is not listed below, please convert it to a Java Keystore (.jks) file using the keytool command line tool. Then, choose the .jks file option below.
 certSign.selectKey=Select Your Private Key File (PKCS#8 format, could be .pem or .der): 
 certSign.selectCert=Select Your Certificate File (X.509 format, could be .pem or .der): 
 certSign.selectP12=Select Your PKCS#12 Keystore File (.p12 or .pfx) (Optional, If provided, it should contain your private key and certificate): 
-certSign.selectJKS=Select Your Java Keystore File (.jks or .keystore):
 certSign.certType=Certificate Type
 certSign.password=Enter Your Keystore or Private Key Password (If Any): 
 certSign.showSig=Show Signature
@@ -595,6 +571,20 @@ sign.text=Text Input
 sign.clear=Clear
 sign.add=Add
 
+#add elements
+add-elements.title=Add Elements
+add-elements.header=Add Elements
+add-elements.upload=Upload Image
+add-elements.draw=Draw Signature
+add-elements.text=Text Input
+add-elements.checkbox=Check Box
+add-elements.dropdown=Dropdown
+add-elements.optionList=Option List
+add-elements.radioButton=Radio Button
+add-elements.textbox=Text Box
+add-elements.clear=Clear
+add-elements.add=Add
+
 
 #repair
 repair.title=Repair
@@ -922,14 +912,3 @@ split-by-sections.vertical.label=Vertical Divisions
 split-by-sections.horizontal.placeholder=Enter number of horizontal divisions
 split-by-sections.vertical.placeholder=Enter number of vertical divisions
 split-by-sections.submit=Split PDF
-
-
-#licenses
-licenses.nav=Licenses
-licenses.title=3rd Party Licenses
-licenses.header=3rd Party Licenses
-licenses.module=Module
-licenses.version=Version
-licenses.license=License
-
-

src/main/resources/messages_en_US.properties

@@ -1,4 +1,4 @@
-###########
+###########
 # Generic #
 ###########
 # the direction that the language is written (ltr=left to right, rtl = right to left)
@@ -42,8 +42,6 @@ red=Red
 green=Green
 blue=Blue
 custom=Custom...
-WorkInProgess=Work in progress, May not work or be buggy, Please report any ploblems!
-poweredBy=Powered by
 
 changedCredsMessage=Credentials changed!
 notAuthenticatedMessage=User not authenticated.
@@ -52,29 +50,6 @@ incorrectPasswordMessage=Current password is incorrect.
 usernameExistsMessage=New Username already exists.
 
 
-###############
-#   Pipeline  #
-###############
-pipeline.header=Pipeline Menu (Alpha)
-pipeline.uploadButton=Upload Custom
-pipeline.configureButton=Configure
-pipeline.defaultOption=Custom
-pipeline.submitButton=Submit
-
-######################
-#  Pipeline Options  #
-######################
-pipelineOptions.header=Pipeline Configuration
-pipelineOptions.pipelineNameLabel=Pipeline Name
-pipelineOptions.saveSettings=Save Operation Settings
-pipelineOptions.pipelineNamePrompt=Enter pipeline name here
-pipelineOptions.addOperationButton=Add operation
-pipelineOptions.pipelineHeader=Pipeline:
-pipelineOptions.saveButton=Download
-pipelineOptions.validateButton=Validate
-
-
-
 
 #############
 #  NAVBAR   #
@@ -547,11 +522,9 @@ scalePages.submit=Submit
 certSign.title=Certificate Signing
 certSign.header=Sign a PDF with your certificate (Work in progress)
 certSign.selectPDF=Select a PDF File for Signing:
-certSign.jksNote=Note: If your certificate type is not listed below, please convert it to a Java Keystore (.jks) file using the keytool command line tool. Then, choose the .jks file option below.
 certSign.selectKey=Select Your Private Key File (PKCS#8 format, could be .pem or .der):
 certSign.selectCert=Select Your Certificate File (X.509 format, could be .pem or .der):
 certSign.selectP12=Select Your PKCS#12 Keystore File (.p12 or .pfx) (Optional, If provided, it should contain your private key and certificate):
-certSign.selectJKS=Select Your Java Keystore File (.jks or .keystore):
 certSign.certType=Certificate Type
 certSign.password=Enter Your Keystore or Private Key Password (If Any):
 certSign.showSig=Show Signature
@@ -921,14 +894,3 @@ split-by-sections.vertical.label=Vertical Divisions
 split-by-sections.horizontal.placeholder=Enter number of horizontal divisions
 split-by-sections.vertical.placeholder=Enter number of vertical divisions
 split-by-sections.submit=Split PDF
-
-
-#licenses
-licenses.nav=Licenses
-licenses.title=3rd Party Licenses
-licenses.header=3rd Party Licenses
-licenses.module=Module
-licenses.version=Version
-licenses.license=License
-
-

src/main/resources/messages_es_ES.properties

@@ -1,4 +1,4 @@
-###########
+###########
 # Generic #
 ###########
 # the direction that the language is written (ltr=left to right, rtl = right to left)
@@ -42,8 +42,6 @@ red=Rojo
 green=Verde
 blue=Azul
 custom=Personalizado...
-WorkInProgess=Work in progress, May not work or be buggy, Please report any ploblems!
-poweredBy=Powered by
 
 changedCredsMessage=Se cambiaron las credenciales!
 notAuthenticatedMessage=Usuario no autentificado.
@@ -52,29 +50,6 @@ incorrectPasswordMessage=La contraseña actual no es correcta.
 usernameExistsMessage=El nuevo nombre de usuario está en uso.
 
 
-###############
-#   Pipeline  #
-###############
-pipeline.header=Pipeline Menu (Alpha)
-pipeline.uploadButton=Upload Custom
-pipeline.configureButton=Configure
-pipeline.defaultOption=Custom
-pipeline.submitButton=Submit
-
-######################
-#  Pipeline Options  #
-######################
-pipelineOptions.header=Pipeline Configuration
-pipelineOptions.pipelineNameLabel=Pipeline Name
-pipelineOptions.saveSettings=Save Operation Settings
-pipelineOptions.pipelineNamePrompt=Enter pipeline name here
-pipelineOptions.addOperationButton=Add operation
-pipelineOptions.pipelineHeader=Pipeline:
-pipelineOptions.saveButton=Download
-pipelineOptions.validateButton=Validate
-
-
-
 
 #############
 #  NAVBAR   #
@@ -547,11 +522,9 @@ scalePages.submit=Entregar
 certSign.title=Firma con certificado
 certSign.header=Firmar un PDF con su certificado (en desarrollo)
 certSign.selectPDF=Seleccione un archivo PDF para firmar:
-certSign.jksNote=Note: If your certificate type is not listed below, please convert it to a Java Keystore (.jks) file using the keytool command line tool. Then, choose the .jks file option below.
 certSign.selectKey=Seleccione su archivo de clave privada (formato PKCS#8, podría ser .pem o .der):
 certSign.selectCert=Seleccione su archivo de certificado (formato X.509, podría ser .pem o .der):
 certSign.selectP12=Seleccione su archivo de almacén de claves PKCS#12 (.p12 o .pfx) (Opcional, si se proporciona, debe contener su clave privada y certificado):
-certSign.selectJKS=Select Your Java Keystore File (.jks or .keystore):
 certSign.certType=Tipo de certificado
 certSign.password=Introduzca su almacén de claves o contraseña de clave privada (si corresponde):
 certSign.showSig=Mostrar firma
@@ -921,14 +894,3 @@ split-by-sections.vertical.label=Divisiones Verticales
 split-by-sections.horizontal.placeholder=Introduzca el número de divisiones horizontales
 split-by-sections.vertical.placeholder=Introduzca el número de divisiones verticales
 split-by-sections.submit=Dividir PDF
-
-
-#licenses
-licenses.nav=Licenses
-licenses.title=3rd Party Licenses
-licenses.header=3rd Party Licenses
-licenses.module=Module
-licenses.version=Version
-licenses.license=License
-
-