Delete .github/workflows directory

.claude/settings.local.json

@@ -1,20 +0,0 @@
-{
-  "permissions": {
-    "allow": [
-      "Bash(mkdir:*)",
-      "Bash(./gradlew:*)",
-      "Bash(grep:*)",
-      "Bash(find:*)",
-      "Bash(chmod:*)",
-      "Bash(rm:*)",
-      "Bash(cat:*)",
-      "Bash(if [ -d logs ])",
-      "Bash(then ls -la logs/)",
-      "Bash(fi)",
-      "Bash(ls:*)",
-      "Bash(./testing/cucumber/features/environment.py -v)",
-      "Bash(./testing/cucumber/features/autojob.feature -v)"
-    ],
-    "deny": []
-  }
-}

.devcontainer/devcontainer.json

@@ -1,131 +0,0 @@
-// For format details, see https://aka.ms/devcontainer.json. For config options, see the
-// README at: https://github.com/devcontainers/templates/tree/main/src/docker-existing-dockerfile
-{
-    "name": "Stirling-PDF Dev Container",
-    "build": {
-        // Sets the run context to one level up instead of the .devcontainer folder.
-        "context": "..",
-        // Update the 'dockerFile' property if you aren't using the standard 'Dockerfile' filename.
-        "dockerfile": "../Dockerfile.dev"
-    },
-    "runArgs": [
-      "-e",
-      "GIT_EDITOR=code --wait",
-      "--security-opt",
-      "label=disable"
-    ],
-    // Use 'forwardPorts' to make a list of ports inside the container available locally.
-    "forwardPorts": [8080, 2002, 2003],
-    "portsAttributes": {
-        "8080": {
-            "label": "Stirling-PDF Dev Port"
-        },
-        "2002": {
-            "label": "unoserver Port"
-        },
-        "2003": {
-            "label": "UnoConvert Port"
-        }
-    },
-    "workspaceMount": "source=${localWorkspaceFolder},target=/workspace,type=bind,consistency=delegated",
-    "mounts": [
-      "source=logs-volume,target=/workspace/logs,type=volume",
-      "source=build-volume,target=/workspace/build,type=volume"
-    ],
-    "workspaceFolder": "/workspace",
-    // Configure tool-specific properties.
-    "customizations": {
-        "vscode": {
-            "settings": {
-                "terminal.integrated.shell.linux": "/bin/bash",
-                "editor.wordSegmenterLocales": "",
-                "editor.guides.bracketPairs": "active",
-                "editor.guides.bracketPairsHorizontal": "active",
-                "cSpell.enabled": false,
-                "[java]": {
-                    "editor.defaultFormatter": "josevseb.google-java-format-for-vs-code"
-                },
-                "java.compile.nullAnalysis.mode": "automatic",
-                "java.configuration.updateBuildConfiguration": "interactive",
-                "java.format.enabled": true,
-                "java.format.settings.profile": "GoogleStyle",
-                "java.format.settings.google.version": "1.26.0",
-                "java.format.settings.google.extra": "--aosp --skip-sorting-imports --skip-javadoc-formatting",
-                "java.saveActions.cleanup": true,
-                "java.cleanup.actions": [
-                    "invertEquals",
-                    "instanceofPatternMatch"
-                ],
-                "java.completion.engine": "dom",
-                "java.completion.enabled": true,
-                "java.completion.importOrder": [
-                    "java",
-                    "javax",
-                    "org",
-                    "com",
-                    "net",
-                    "io",
-                    "jakarta",
-                    "lombok",
-                    "me",
-                    "stirling"
-                ],
-                "java.project.resourceFilters": [
-                    ".devcontainer/",
-                    ".git/",
-                    ".github/",
-                    ".gradle/",
-                    ".venv/",
-                    ".venv*/",
-                    ".vscode/",
-                    "bin/",
-                    "build/",
-                    "configs/",
-                    "customFiles/",
-                    "docs/",
-                    "exampleYmlFiles",
-                    "gradle/",
-                    "images/",
-                    "logs/",
-                    "pipeline/",
-                    "scripts/",
-                    "testings/",
-                    ".git-blame-ignore-revs",
-                    ".gitattributes",
-                    ".gitignore",
-                    ".pre-commit-config.yaml"
-                ],
-                "java.signatureHelp.enabled": true,
-                "java.signatureHelp.description.enabled": true,
-                "java.maven.downloadSources": true,
-                "java.import.gradle.enabled": true,
-                "java.eclipse.downloadSources": true,
-                "java.import.gradle.wrapper.enabled": true,
-                "spring.initializr.defaultLanguage": "Java",
-                "spring.initializr.defaultGroupId": "stirling.software.SPDF",
-                "spring.initializr.defaultArtifactId": "SPDF"
-            },
-            "extensions": [
-                "elagil.pre-commit-helper", // Support for pre-commit hooks to enforce code quality
-                "josevseb.google-java-format-for-vs-code", // Google Java code formatter to follow the Google Java Style Guide
-                "ms-python.black-formatter", // Python code formatter using Black
-                "ms-python.flake8", // Flake8 linter for Python to enforce code quality
-                "ms-python.python", // Official Microsoft Python extension with IntelliSense, debugging, and Jupyter support
-                "ms-vscode-remote.vscode-remote-extensionpack", // Remote Development Pack for SSH, WSL, and Containers
-                // "Oracle.oracle-java", // Oracle Java extension with additional features for Java development
-                "streetsidesoftware.code-spell-checker", // Spell checker for code to avoid typos
-                "vmware.vscode-boot-dev-pack", // Developer tools for Spring Boot by VMware
-                "vscjava.vscode-java-pack", // Java Extension Pack with essential Java tools for VS Code
-                "EditorConfig.EditorConfig", // EditorConfig support for maintaining consistent coding styles
-                "ms-azuretools.vscode-docker", // Docker extension for Visual Studio Code
-                "charliermarsh.ruff", // Ruff extension for Ruff language support
-                "github.vscode-github-actions" // GitHub Actions extension for Visual Studio Code
-            ]
-        }
-    },
-    // Uncomment to connect as an existing user other than the container default. More info: https://aka.ms/dev-containers-non-root.
-    "remoteUser": "devuser",
-    "shutdownAction": "stopContainer",
-    "initializeCommand": "bash ./.devcontainer/git-init.sh",
-    "postStartCommand": "./.devcontainer/init-setup.sh"
-}

.devcontainer/git-init.sh

@@ -1,19 +0,0 @@
-#!/usr/bin/env bash
-
-GIT_USER=$(git config --get user.name)
-GIT_EMAIL=$(git config --get user.email)
-
-# Exit if GIT_USER or GIT_EMAIL is empty
-if [ -z "$GIT_USER" ] || [ -z "$GIT_EMAIL" ]; then
-  echo "GIT_USER or GIT_EMAIL is not set. Exiting."
-  exit 1
-fi
-
-git config --local user.name "$GIT_USER"
-git config --local user.email "$GIT_EMAIL"
-
-# This directory should contain custom Git hooks for the repository
-# Set the path for Git hooks to /workspace/hooks
-git config --local core.hooksPath '%(prefix)/workspace/hooks'
-# Set the safe directory to the workspace path
-git config --local --add safe.directory /workspace

.devcontainer/init-setup.sh

@@ -1,75 +0,0 @@
-#!/usr/bin/env bash
-set -e
-
-# =============================================================================
-# Dev Container Initialization Script (init-setup.sh)
-#
-# This script runs when the Dev Container starts and provides guidance on
-# how to interact with the project. It prints an ASCII logo, displays the
-# current user, changes to the project root, and then shows helpful command
-# instructions.
-#
-# Instructions for future developers:
-#
-# - To start the application, use:
-#     ./gradlew bootRun --no-daemon -Dspring-boot.run.fork=true -Dserver.address=0.0.0.0
-#
-# - To run tests, use:
-#     ./gradlew test
-#
-# - To build the project, use:
-#     ./gradlew build
-#
-# - For running pre-commit hooks (if configured), use:
-#     pre-commit run --all-files
-#
-# Make sure you are in the project root directory after this script executes.
-# =============================================================================
-
-echo "Devcontainer started successfully!"
-
-VERSION=$(grep "^version =" build.gradle | awk -F'"' '{print $2}')
-GRADLE_VERSION=$(gradle -version | grep "^Gradle " | awk '{print $2}')
-GRADLE_PATH=$(which gradle)
-JAVA_VERSION=$(java -version 2>&1 | awk -F '"' '/version/ {print $2}')
-JAVA_PATH=$(which java)
-
-echo """
- ____ _____ ___ ____  _     ___ _   _  ____       ____  ____  _____
-/ ___|_   _|_ _|  _ \| |   |_ _| \ | |/ ___|     |  _ \|  _ \|  ___|
-\___ \ | |  | || |_) | |    | ||  \| | |  _ _____| |_) | | | | |_
- ___) || |  | ||  _ <| |___ | || |\  | |_| |_____|  __/| |_| |  _|
-|____/ |_| |___|_| \_\_____|___|_| \_|\____|     |_|   |____/|_|
-"""
-echo -e "Stirling-PDF Version: \e[32m$VERSION\e[0m"
-echo -e "Gradle Version: \e[32m$GRADLE_VERSION\e[0m"
-echo -e "Gradle Path: \e[32m$GRADLE_PATH\e[0m"
-echo -e "Java Version: \e[32m$JAVA_VERSION\e[0m"
-echo -e "Java Path: \e[32m$JAVA_PATH\e[0m"
-
-# Display current active user (for permission/debugging purposes)
-echo -e "Current user: \e[32m$(whoami)\e[0m"
-
-# Change directory to the project root (parent directory of the script)
-cd "$(dirname "$0")/.."
-echo -e "Changed to project root: \e[32m$(pwd)\e[0m"
-
-# Display available commands for developers
-echo "=================================================================="
-echo "Available commands:"
-echo ""
-echo "  To start unoserver: "
-echo -e "\e[34m    nohup /opt/venv/bin/unoserver --port 2003 --interface 0.0.0.0 > /tmp/unoserver.log 2>&1 &\e[0m"
-echo
-echo "  To start the application: "
-echo -e "\e[34m    gradle bootRun\e[0m"
-echo ""
-echo "  To run tests: "
-echo -e "\e[34m    gradle test\e[0m"
-echo ""
-echo "  To build the project: "
-echo -e "\e[34m    gradle build\e[0m"
-echo ""
-echo "  To run pre-commit hooks (if configured):"
-echo -e "\e[34m    pre-commit run --all-files -c .pre-commit-config.yaml\e[0m"
-echo "=================================================================="

.do/deploy.template.yaml

@@ -0,0 +1,29 @@
+spec:
+  name: stirling-pdf
+  services:
+    - name: stirling-pdf
+      git:
+        branch: digitalOcean
+        repo_clone_url: https://github.com/Stirling-Tools/Stirling-PDF.git
+      dockerfile_path: Dockerfile2
+      envs:
+        - key: APP_HOME_NAME
+          value: "Stirling PDF"
+        - key: APP_HOME_DESCRIPTION
+          value: "Your locally hosted one-stop-shop for all your PDF needs."
+        - key: APP_NAVBAR_NAME
+          value: "Stirling PDF"
+        - key: ALLOW_GOOGLE_VISIBILITY
+          value: "false"
+        - key: APP_ROOT_PATH
+          value: "/"
+        - key: APP_LOCALE
+          value: "en_GB"
+        - key: TESSERACT_LANGS
+          value: "eng"   
+      routes:
+        - path: /
+      http_port: 8080
+      instance_count: 1
+      instance_size_slug: basic-xxs
+      source_dir: "/"

.editorconfig

@@ -1,31 +0,0 @@
-root = true
-
-[*]
-indent_style = space
-indent_size = 4
-end_of_line = lf
-max_line_length = 127
-insert_final_newline = true
-trim_trailing_whitespace = true
-
-[*.java]
-indent_size = 4
-max_line_length = 100
-
-[*.py]
-indent_size = 2
-
-[*.gradle]
-indent_size = 4
-
-[*.html]
-indent_size = 2
-insert_final_newline = false
-trim_trailing_whitespace = false
-
-[*.js]
-indent_size = 2
-
-[*.yaml]
-insert_final_newline = false
-trim_trailing_whitespace = false

.github/actions/setup-bot/action.yml

@@ -1,33 +0,0 @@
-name: 'Setup GitHub App Bot'
-description: 'Generates a GitHub App Token and configures Git for a bot'
-inputs:
-  app-id:
-    description: 'GitHub App ID'
-    required: True
-  private-key:
-    description: 'GitHub App Private Key'
-    required: True
-outputs:
-  token:
-    description: 'Generated GitHub App Token'
-    value: ${{ steps.generate-token.outputs.token }}
-  committer:
-    description: 'Committer string for Git'
-    value: "${{ steps.generate-token.outputs.app-slug }}[bot] <${{ steps.generate-token.outputs.app-slug }}[bot]@users.noreply.github.com>"
-  app-slug:
-    description: 'GitHub App slug'
-    value: ${{ steps.generate-token.outputs.app-slug }}
-runs:
-  using: 'composite'
-  steps:
-    - name: Generate a GitHub App Token
-      id: generate-token
-      uses: actions/create-github-app-token@df432ceedc7162793a195dd1713ff69aefc7379e # v2.0.6
-      with:
-        app-id: ${{ inputs.app-id }}
-        private-key: ${{ inputs.private-key }}
-    - name: Configure Git
-      run: |
-        git config --global user.name "${{ steps.generate-token.outputs.app-slug }}[bot]"
-        git config --global user.email "${{ steps.generate-token.outputs.app-slug }}[bot]@users.noreply.github.com"
-      shell: bash

.github/labeler-config.yml

@@ -27,34 +27,18 @@ Back End:
 
 Security:
   - changed-files:
-    - any-glob-to-any-file: 'src/main/java/stirling/software/SPDF/config/interfaces/DatabaseInterface.java'
     - any-glob-to-any-file: 'src/main/java/stirling/software/SPDF/config/security/**/*'
-    - any-glob-to-any-file: 'src/main/java/stirling/software/SPDF/controller/api/DatabaseController.java'
-    - any-glob-to-any-file: 'src/main/java/stirling/software/SPDF/controller/api/EmailController.java'
-    - any-glob-to-any-file: 'src/main/java/stirling/software/SPDF/controller/api/H2SQLController.java'
-    - any-glob-to-any-file: 'src/main/java/stirling/software/SPDF/controller/web/AccountWebController.java'
-    - any-glob-to-any-file: 'src/main/java/stirling/software/SPDF/controller/web/DatabaseWebController.java'
-    - any-glob-to-any-file: 'src/main/java/stirling/software/SPDF/controller/api/UserController.java'
-    - any-glob-to-any-file: 'src/main/java/stirling/software/SPDF/model/api/Email.java'
-    - any-glob-to-any-file: 'src/main/java/stirling/software/SPDF/model/exception/BackupNotFoundException.java'
-    - any-glob-to-any-file: 'src/main/java/stirling/software/SPDF/model/exception/NoProviderFoundExceptionjava'
     - any-glob-to-any-file: 'src/main/java/stirling/software/SPDF/model/provider/**/*'
     - any-glob-to-any-file: 'src/main/java/stirling/software/SPDF/model/AuthenticationType.java'
-    - any-glob-to-any-file: 'src/main/java/stirling/software/SPDF/model/ApiKeyAuthenticationToken.java'
-    - any-glob-to-any-file: 'src/main/java/stirling/software/SPDF/model/AttemptCounter.java'
-    - any-glob-to-any-file: 'src/main/java/stirling/software/SPDF/model/Authority.java'
-    - any-glob-to-any-file: 'src/main/java/stirling/software/SPDF/model/PersistentLogin.java'
-    - any-glob-to-any-file: 'src/main/java/stirling/software/SPDF/model/SessionEntity.java'
+    - any-glob-to-any-file: 'src/main/java/stirling/software/SPDF/model/BackupNotFoundException.java'
     - any-glob-to-any-file: 'scripts/download-security-jar.sh'
     - any-glob-to-any-file: '.github/workflows/dependency-review.yml'
     - any-glob-to-any-file: '.github/workflows/scorecards.yml'
 
 API:
   - changed-files:
-    - any-glob-to-any-file: 'src/main/java/stirling/software/SPDF/config/OpenApiConfig.java'
     - any-glob-to-any-file: 'src/main/java/stirling/software/SPDF/controller/web/MetricsController.java'
     - any-glob-to-any-file: 'src/main/java/stirling/software/SPDF/controller/api/**/*'
-    - any-glob-to-any-file: 'src/main/java/stirling/software/SPDF/model/api/**/*'
     - any-glob-to-any-file: 'scripts/png_to_webp.py'
     - any-glob-to-any-file: 'split_photos.py'
     - any-glob-to-any-file: '.github/workflows/swagger.yml'
@@ -70,8 +54,7 @@ Docker:
     - any-glob-to-any-file: '.github/workflows/build.yml'
     - any-glob-to-any-file: '.github/workflows/push-docker.yml'
     - any-glob-to-any-file: 'Dockerfile'
-    - any-glob-to-any-file: 'Dockerfile.fat'
-    - any-glob-to-any-file: 'Dockerfile.ultra-lite'
+    - any-glob-to-any-file: 'Dockerfile.*'
     - any-glob-to-any-file: 'exampleYmlFiles/*.yml'
     - any-glob-to-any-file: 'scripts/download-security-jar.sh'
     - any-glob-to-any-file: 'scripts/init.sh'
@@ -80,16 +63,10 @@ Docker:
     - any-glob-to-any-file: 'test.sh'
     - any-glob-to-any-file: 'test2.sh'
 
-Devtools:
-  - changed-files:
-    - any-glob-to-any-file: '.devcontainer/**/*'
-    - any-glob-to-any-file: 'Dockerfile.dev'
-
 Test:
   - changed-files:
     - any-glob-to-any-file: 'cucumber/**/*'
-    - any-glob-to-any-file: 'src/test/**/*'
-    - any-glob-to-any-file: 'src/testing/**/*'
+    - any-glob-to-any-file: 'src/test**/*'
     - any-glob-to-any-file: '.pre-commit-config'
     - any-glob-to-any-file: '.github/workflows/pre_commit.yml'
     - any-glob-to-any-file: '.github/workflows/scorecards.yml'

.github/labels.yml

@@ -108,6 +108,3 @@
 - name: "Priority: Low"
   color: "00FF00"
   description: "Issues or pull requests with low priority"
-- name: "Devtools"
-  color: "FF9E1F"
-  description: "Development tools"

.github/release.yml

@@ -21,10 +21,6 @@ changelog:
       labels:
         - Translation
 
-    - title: Development Tools
-      labels:
-        - Devtools
-
     - title: Other Changes
       labels:
         - "*"

.github/scripts/check_language_properties.py

@@ -164,7 +164,7 @@ def update_missing_keys(reference_file, file_list, branch=""):
                 if current_entry["type"] == "entry":
                     if ref_entry_copy["type"] != "entry":
                         continue
-                    if ref_entry_copy["key"].lower() == current_entry["key"].lower():
+                    if ref_entry_copy["key"] == current_entry["key"]:
                         ref_entry_copy["value"] = current_entry["value"]
             updated_properties.append(ref_entry_copy)
         write_json_file(os.path.join(branch, file_path), updated_properties)
@@ -199,30 +199,29 @@ def check_for_differences(reference_file, file_list, branch, actor):
     base_dir = os.path.abspath(os.path.join(os.getcwd(), "src", "main", "resources"))
 
     for file_path in file_arr:
-        file_normpath = os.path.normpath(file_path)
-        absolute_path = os.path.abspath(file_normpath)
+        absolute_path = os.path.abspath(file_path)
         # Verify that file is within the expected directory
         if not absolute_path.startswith(base_dir):
-            raise ValueError(f"Unsafe file found: {file_normpath}")
+            raise ValueError(f"Unsafe file found: {file_path}")
         # Verify file size before processing
-        if os.path.getsize(os.path.join(branch, file_normpath)) > MAX_FILE_SIZE:
+        if os.path.getsize(os.path.join(branch, file_path)) > MAX_FILE_SIZE:
             raise ValueError(
-                f"The file {file_normpath} is too large and could pose a security risk."
+                f"The file {file_path} is too large and could pose a security risk."
             )
 
-        basename_current_file = os.path.basename(os.path.join(branch, file_normpath))
+        basename_current_file = os.path.basename(os.path.join(branch, file_path))
         if (
             basename_current_file == basename_reference_file
             or (
                 # only local windows command
-                not file_normpath.startswith(
+                not file_path.startswith(
                     os.path.join("", "src", "main", "resources", "messages_")
                 )
-                and not file_normpath.startswith(
+                and not file_path.startswith(
                     os.path.join(os.getcwd(), "src", "main", "resources", "messages_")
                 )
             )
-            or not file_normpath.endswith(".properties")
+            or not file_path.endswith(".properties")
             or not basename_current_file.startswith("messages_")
         ):
             continue
@@ -293,13 +292,13 @@ def check_for_differences(reference_file, file_list, branch, actor):
         else:
             report.append("2. **Test Status:** ✅ **_Passed_**")
 
-        if find_duplicate_keys(os.path.join(branch, file_normpath)):
+        if find_duplicate_keys(os.path.join(branch, file_path)):
             has_differences = True
             output = "\n".join(
                 [
                     f"      - `{key}`: first at line {first}, duplicate at `line {duplicate}`"
                     for key, first, duplicate in find_duplicate_keys(
-                        os.path.join(branch, file_normpath)
+                        os.path.join(branch, file_path)
                     )
                 ]
             )

.github/workflows/PR-Demo-Comment-with-react.yml

@@ -1,320 +0,0 @@
-name: PR Deployment via Comment
-
-on:
-  issue_comment:
-    types: [created]
-
-permissions:
-  contents: read
-  issues: write      # Required for adding reactions to comments
-  pull-requests: read # Required for reading PR information
-
-jobs:
-  check-comment:
-    runs-on: ubuntu-latest
-    permissions:
-      issues: write
-      pull-requests: read
-    if: |
-      github.event.issue.pull_request &&
-      (
-      contains(github.event.comment.body, 'prdeploy') ||
-      contains(github.event.comment.body, 'deploypr')
-      )
-      &&
-      (
-        github.event.comment.user.login == 'frooodle' ||
-        github.event.comment.user.login == 'sf298' ||
-        github.event.comment.user.login == 'Ludy87' ||
-        github.event.comment.user.login == 'LaserKaspar' ||
-        github.event.comment.user.login == 'sbplat' ||
-        github.event.comment.user.login == 'reecebrowne' ||
-        github.event.comment.user.login == 'DarioGii' ||
-        github.event.comment.user.login == 'ConnorYoh'
-      )
-    outputs:
-      pr_number: ${{ steps.get-pr.outputs.pr_number }}
-      pr_repository: ${{ steps.get-pr-info.outputs.repository }}
-      pr_ref: ${{ steps.get-pr-info.outputs.ref }}
-      comment_id: ${{ github.event.comment.id }}
-      enable_security: ${{ steps.check-security-flag.outputs.enable_security }}
-
-    steps:
-      - name: Harden Runner
-        uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
-        with:
-          egress-policy: audit
-
-      # Generate GitHub App token
-      - name: Generate GitHub App Token
-        id: generate-token
-        uses: actions/create-github-app-token@df432ceedc7162793a195dd1713ff69aefc7379e # v2.0.6
-        with:
-          app-id: ${{ secrets.GH_APP_ID }}
-          private-key: ${{ secrets.GH_APP_PRIVATE_KEY }}
-
-      - name: Get PR data
-        id: get-pr
-        uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
-        with:
-          script: |
-            const prNumber = context.payload.issue.number;
-            console.log(`PR Number: ${prNumber}`);
-            core.setOutput('pr_number', prNumber);
-
-      - name: Get PR repository and ref
-        id: get-pr-info
-        uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
-        with:
-          script: |
-            const { owner, repo } = context.repo;
-            const prNumber = context.payload.issue.number;
-
-            const { data: pr } = await github.rest.pulls.get({
-              owner,
-              repo,
-              pull_number: prNumber,
-            });
-
-            // For forks, use the full repository name, for internal PRs use the current repo
-            const repository = pr.head.repo.fork ? pr.head.repo.full_name : `${owner}/${repo}`;
-
-            console.log(`PR Repository: ${repository}`);
-            console.log(`PR Branch: ${pr.head.ref}`);
-
-            core.setOutput('repository', repository);
-            core.setOutput('ref', pr.head.ref);
-      
-      - name: Check for security/login flag
-        id: check-security-flag
-        env:
-          COMMENT_BODY: ${{ github.event.comment.body }}
-        run: |
-          if [[ "$COMMENT_BODY" == *"security"* ]] || [[ "$COMMENT_BODY" == *"login"* ]]; then
-            echo "Security flags detected in comment"
-            echo "enable_security=true" >> $GITHUB_OUTPUT
-          else
-            echo "No security flags detected in comment"
-            echo "enable_security=false" >> $GITHUB_OUTPUT
-          fi
-
-      - name: Add 'in_progress' reaction to comment
-        id: add-eyes-reaction
-        uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
-        with:
-          github-token: ${{ steps.generate-token.outputs.token }}
-          script: |
-            console.log(`Adding eyes reaction to comment ID: ${context.payload.comment.id}`);
-            try {
-              const { data: reaction } = await github.rest.reactions.createForIssueComment({
-                owner: context.repo.owner,
-                repo: context.repo.repo,
-                comment_id: context.payload.comment.id,
-                content: 'eyes'
-              });
-              console.log(`Added reaction with ID: ${reaction.id}`);
-              return { success: true, id: reaction.id };
-            } catch (error) {
-              console.error(`Failed to add reaction: ${error.message}`);
-              console.error(error);
-              return { success: false, error: error.message };
-            }
-
-  deploy-pr:
-    needs: check-comment
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-      issues: write
-
-    steps:
-      - name: Harden Runner
-        uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
-        with:
-          egress-policy: audit
-
-      - name: Generate GitHub App Token
-        id: generate-token
-        uses: actions/create-github-app-token@df432ceedc7162793a195dd1713ff69aefc7379e # v2.0.6
-        with:
-          app-id: ${{ secrets.GH_APP_ID }}
-          private-key: ${{ secrets.GH_APP_PRIVATE_KEY }}
-
-      - name: Checkout PR
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-        with:
-          repository: ${{ needs.check-comment.outputs.pr_repository }}
-          ref: ${{ needs.check-comment.outputs.pr_ref }}
-          token: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Set up JDK
-        uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
-        with:
-          java-version: "17"
-          distribution: "temurin"
-
-      - name: Run Gradle Command
-        run: |
-          if [ "${{ needs.check-comment.outputs.enable_security }}" == "true" ]; then
-            export DOCKER_ENABLE_SECURITY=true
-          else
-            export DOCKER_ENABLE_SECURITY=false
-          fi
-          ./gradlew clean build
-        env:
-          STIRLING_PDF_DESKTOP_UI: false
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@b5ca514318bd6ebac0fb2aedd5d36ec1b5c232a2 # v3.10.0
-
-      - name: Get version number
-        id: versionNumber
-        run: |
-          VERSION=$(grep "^version =" build.gradle | awk -F'"' '{print $2}')
-          echo "versionNumber=$VERSION" >> $GITHUB_OUTPUT
-
-      - name: Login to Docker Hub
-        uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v3.4.0
-        with:
-          username: ${{ secrets.DOCKER_HUB_USERNAME }}
-          password: ${{ secrets.DOCKER_HUB_API }}
-
-      - name: Build and push PR-specific image
-        uses: docker/build-push-action@263435318d21b8e681c14492fe198d362a7d2c83 # v6.18.0
-        with:
-          context: .
-          file: ./Dockerfile
-          push: true
-          tags: ${{ secrets.DOCKER_HUB_USERNAME }}/test:pr-${{ needs.check-comment.outputs.pr_number }}
-          build-args: VERSION_TAG=alpha
-          platforms: linux/amd64
-
-      - name: Set up SSH
-        run: |
-          mkdir -p ~/.ssh/
-          echo "${{ secrets.VPS_SSH_KEY }}" > ../private.key
-          sudo chmod 600 ../private.key
-
-      - name: Deploy to VPS
-        id: deploy
-        run: |
-          # Set security settings based on flags
-          if [ "${{ needs.check-comment.outputs.enable_security }}" == "true" ]; then
-            DOCKER_SECURITY="true"
-            LOGIN_SECURITY="true"
-            SECURITY_STATUS="🔒 Security Enabled"
-          else
-            DOCKER_SECURITY="false"
-            LOGIN_SECURITY="false"
-            SECURITY_STATUS="Security Disabled"
-          fi
-
-          # First create the docker-compose content locally
-          cat > docker-compose.yml << EOF
-          version: '3.3'
-          services:
-            stirling-pdf:
-              container_name: stirling-pdf-pr-${{ needs.check-comment.outputs.pr_number }}
-              image: ${{ secrets.DOCKER_HUB_USERNAME }}/test:pr-${{ needs.check-comment.outputs.pr_number }}
-              ports:
-                - "${{ needs.check-comment.outputs.pr_number }}:8080"
-              volumes:
-                - /stirling/PR-${{ needs.check-comment.outputs.pr_number }}/data:/usr/share/tessdata:rw
-                - /stirling/PR-${{ needs.check-comment.outputs.pr_number }}/config:/configs:rw
-                - /stirling/PR-${{ needs.check-comment.outputs.pr_number }}/logs:/logs:rw
-              environment:
-                DOCKER_ENABLE_SECURITY: "${DOCKER_SECURITY}"
-                SECURITY_ENABLELOGIN: "${LOGIN_SECURITY}"
-                SYSTEM_DEFAULTLOCALE: en-GB
-                UI_APPNAME: "Stirling-PDF PR#${{ needs.check-comment.outputs.pr_number }}"
-                UI_HOMEDESCRIPTION: "PR#${{ needs.check-comment.outputs.pr_number }} for Stirling-PDF Latest"
-                UI_APPNAMENAVBAR: "PR#${{ needs.check-comment.outputs.pr_number }}"
-                SYSTEM_MAXFILESIZE: "100"
-                METRICS_ENABLED: "true"
-                SYSTEM_GOOGLEVISIBILITY: "false"
-              restart: on-failure:5
-          EOF
-
-          # Then copy the file and execute commands
-          scp -i ../private.key -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null docker-compose.yml ${{ secrets.VPS_USERNAME }}@${{ secrets.VPS_HOST }}:/tmp/docker-compose.yml
-
-          ssh -i ../private.key -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -T ${{ secrets.VPS_USERNAME }}@${{ secrets.VPS_HOST }} << ENDSSH
-            # Create PR-specific directories
-            mkdir -p /stirling/PR-${{ needs.check-comment.outputs.pr_number }}/{data,config,logs}
-
-            # Move docker-compose file to correct location
-            mv /tmp/docker-compose.yml /stirling/PR-${{ needs.check-comment.outputs.pr_number }}/docker-compose.yml
-
-            # Start or restart the container
-            cd /stirling/PR-${{ needs.check-comment.outputs.pr_number }}
-            docker-compose pull
-            docker-compose up -d
-          ENDSSH
-          
-          # Set output for use in PR comment
-          echo "security_status=${SECURITY_STATUS}" >> $GITHUB_ENV
-
-      - name: Add success reaction to comment
-        if: success()
-        uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
-        with:
-          github-token: ${{ steps.generate-token.outputs.token }}
-          script: |
-            console.log(`Adding rocket reaction to comment ID: ${{ needs.check-comment.outputs.comment_id }}`);
-            try {
-              const { data: reaction } = await github.rest.reactions.createForIssueComment({
-                owner: context.repo.owner,
-                repo: context.repo.repo,
-                comment_id: ${{ needs.check-comment.outputs.comment_id }},
-                content: 'rocket'
-              });
-              console.log(`Added rocket reaction with ID: ${reaction.id}`);
-            } catch (error) {
-              console.error(`Failed to add reaction: ${error.message}`);
-              console.error(error);
-            }
-
-      - name: Add failure reaction to comment
-        if: failure()
-        uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
-        with:
-          github-token: ${{ steps.generate-token.outputs.token }}
-          script: |
-            console.log(`Adding -1 reaction to comment ID: ${{ needs.check-comment.outputs.comment_id }}`);
-            try {
-              const { data: reaction } = await github.rest.reactions.createForIssueComment({
-                owner: context.repo.owner,
-                repo: context.repo.repo,
-                comment_id: ${{ needs.check-comment.outputs.comment_id }},
-                content: '-1'
-              });
-              console.log(`Added -1 reaction with ID: ${reaction.id}`);
-            } catch (error) {
-              console.error(`Failed to add reaction: ${error.message}`);
-              console.error(error);
-            }
-
-      - name: Post deployment URL to PR
-        if: success()
-        uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
-        with:
-          github-token: ${{ steps.generate-token.outputs.token }}
-          script: |
-            const { GITHUB_REPOSITORY } = process.env;
-            const [repoOwner, repoName] = GITHUB_REPOSITORY.split('/');
-            const prNumber = ${{ needs.check-comment.outputs.pr_number }};
-            const securityStatus = process.env.security_status || "Security Disabled";
-
-            const deploymentUrl = `http://${{ secrets.VPS_HOST }}:${prNumber}`;
-            const commentBody = `## 🚀 PR Test Deployment\n\n` +
-                              `Your PR has been deployed for testing!\n\n` +
-                              `🔗 **Test URL:** [${deploymentUrl}](${deploymentUrl})\n` +
-                              `${securityStatus}\n\n` +
-                              `This deployment will be automatically cleaned up when the PR is closed.\n\n`;
-
-            await github.rest.issues.createComment({
-              owner: repoOwner,
-              repo: repoName,
-              issue_number: prNumber,
-              body: commentBody
-            });

.github/workflows/PR-Demo-cleanup.yml

@@ -1,59 +0,0 @@
-name: PR Deployment cleanup
-
-on:
-  pull_request:
-    types: [opened, synchronize, reopened, closed]
-
-permissions:
-  contents: read
-
-env:
-  SERVER_IP: ${{ secrets.VPS_IP }} # Add this to your GitHub secrets
-  CLEANUP_PERFORMED: "false" # Add flag to track if cleanup occurred
-
-jobs:
-  cleanup:
-    runs-on: ubuntu-latest
-    permissions:
-      contents: write
-      pull-requests: write
-    if: github.event.action == 'closed'
-
-    steps:
-      - name: Harden Runner
-        uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
-        with:
-          egress-policy: audit
-
-      - name: Set up SSH
-        run: |
-          mkdir -p ~/.ssh/
-          echo "${{ secrets.VPS_SSH_KEY }}" > ../private.key
-          sudo chmod 600 ../private.key
-
-      - name: Cleanup PR deployment
-        id: cleanup
-        run: |
-          ssh -i ../private.key -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -T ${{ secrets.VPS_USERNAME }}@${{ secrets.VPS_HOST }} << 'ENDSSH'
-            if [ -d "/stirling/PR-${{ github.event.pull_request.number }}" ]; then
-              echo "Found PR directory, proceeding with cleanup..."
-
-              # Stop and remove containers
-              cd /stirling/PR-${{ github.event.pull_request.number }}
-              docker-compose down || true
-
-              # Go back to root before removal
-              cd /
-
-              # Remove PR-specific directories
-              rm -rf /stirling/PR-${{ github.event.pull_request.number }}
-
-              # Remove the Docker image
-              docker rmi --no-prune ${{ secrets.DOCKER_HUB_USERNAME }}/test:pr-${{ github.event.pull_request.number }} || true
-
-              echo "PERFORMED_CLEANUP"
-            else
-              echo "PR directory not found, nothing to clean up"
-              echo "NO_CLEANUP_NEEDED"
-            fi
-          ENDSSH

.github/workflows/auto-labeler.yml

@@ -1,27 +0,0 @@
-name: "Pull Request Labeler"
-on:
-  pull_request_target:
-    types: [opened, synchronize]
-
-permissions:
-  contents: read
-
-jobs:
-  labeler:
-    runs-on: ubuntu-latest
-    permissions:
-      pull-requests: write
-    steps:
-      - name: Harden Runner
-        uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
-        with:
-          egress-policy: audit
-
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-
-      - name: Apply Labels
-        uses: actions/labeler@8558fd74291d67161a8a78ce36a881fa63b766a9 # v5.0.0
-        with:
-          repo-token: ${{ secrets.GITHUB_TOKEN }}
-          configuration-path: .github/labeler-config.yml
-          sync-labels: true

.github/workflows/build.yml

@@ -1,148 +0,0 @@
-name: Build repo
-
-on:
-  push:
-    branches: ["main"]
-  pull_request:
-    branches: ["main"]
-
-permissions:
-  contents: read
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-
-    permissions:
-      actions: read
-      security-events: write
-
-    strategy:
-      fail-fast: false
-      matrix:
-        jdk-version: [17, 21]
-
-    steps:
-      - name: Harden Runner
-        uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
-        with:
-          egress-policy: audit
-
-      - name: Checkout repository
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-
-      - name: Set up JDK ${{ matrix.jdk-version }}
-        uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
-        with:
-          java-version: ${{ matrix.jdk-version }}
-          distribution: "temurin"
-
-      - name: Build with Gradle and no spring security
-        run: ./gradlew clean build
-        env:
-          DOCKER_ENABLE_SECURITY: false
-
-      - name: Build with Gradle and with spring security
-        run: ./gradlew clean build
-        env:
-          DOCKER_ENABLE_SECURITY: true
-
-      - name: Upload Test Reports
-        if: always()
-        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
-        with:
-          name: test-reports-jdk-${{ matrix.jdk-version }}
-          path: |
-            build/reports/tests/
-            build/test-results/
-            build/reports/problems/
-            common/build/reports/tests/
-            common/build/test-results/
-            common/build/reports/problems/
-          retention-days: 3
-
-  check-licence:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Harden Runner
-        uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
-        with:
-          egress-policy: audit
-
-      - name: Checkout repository
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-
-      - name: Set up JDK 17
-        uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
-        with:
-          java-version: "17"
-          distribution: "adopt"
-
-      - name: check the licenses for compatibility
-        run: ./gradlew clean checkLicense
-
-      - name: FAILED - check the licenses for compatibility
-        if: failure()
-        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
-        with:
-          name: dependencies-without-allowed-license.json
-          path: |
-            build/reports/dependency-license/dependencies-without-allowed-license.json
-          retention-days: 3
-
-  docker-compose-tests:
-    # if: github.event_name == 'push' && github.ref == 'refs/heads/main' ||
-    #     (github.event_name == 'pull_request' &&
-    #     contains(github.event.pull_request.labels.*.name, 'licenses') == false &&
-    #     (
-    #       contains(github.event.pull_request.labels.*.name, 'Front End') ||
-    #       contains(github.event.pull_request.labels.*.name, 'Java') ||
-    #       contains(github.event.pull_request.labels.*.name, 'Back End') ||
-    #       contains(github.event.pull_request.labels.*.name, 'Security') ||
-    #       contains(github.event.pull_request.labels.*.name, 'API') ||
-    #       contains(github.event.pull_request.labels.*.name, 'Docker') ||
-    #       contains(github.event.pull_request.labels.*.name, 'Test')
-    #     )
-    #     )
-
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Harden Runner
-        uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
-        with:
-          egress-policy: audit
-
-      - name: Checkout Repository
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-
-      - name: Set up Java 17
-        uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
-        with:
-          java-version: "17"
-          distribution: "adopt"
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@b5ca514318bd6ebac0fb2aedd5d36ec1b5c232a2 # v3.10.0
-
-      - name: Install Docker Compose
-        run: |
-          sudo curl -SL "https://github.com/docker/compose/releases/download/v2.32.4/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose
-          sudo chmod +x /usr/local/bin/docker-compose
-
-      - name: Set up Python
-        uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
-        with:
-          python-version: "3.12"
-          cache: 'pip' # caching pip dependencies
-
-      - name: Pip requirements
-        run: |
-          pip install --require-hashes -r ./testing/cucumber/requirements.txt
-
-      - name: Run Docker Compose Tests
-        run: |
-          chmod +x ./testing/test_webpages.sh
-          chmod +x ./testing/test.sh
-          chmod +x ./testing/test_disabledEndpoints.sh
-          ./testing/test.sh

.github/workflows/check_properties.yml

@@ -1,255 +0,0 @@
-name: Check Properties Files on PR
-
-on:
-  pull_request_target:
-    types: [opened, synchronize, reopened]
-    paths:
-      - "src/main/resources/messages_*.properties"
-
-permissions:
-  contents: read # Allow read access to repository content
-
-jobs:
-  check-files:
-    if: github.event_name == 'pull_request_target'
-    runs-on: ubuntu-latest
-    permissions:
-      issues: write # Allow posting comments on issues/PRs
-      pull-requests: write # Allow writing to pull requests
-    steps:
-      - name: Harden Runner
-        uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
-        with:
-          egress-policy: audit
-
-      - name: Checkout main branch first
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-
-      - name: Setup GitHub App Bot
-        id: setup-bot
-        uses: ./.github/actions/setup-bot
-        with:
-          app-id: ${{ secrets.GH_APP_ID }}
-          private-key: ${{ secrets.GH_APP_PRIVATE_KEY }}
-
-      - name: Get PR data
-        id: get-pr-data
-        uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
-        with:
-          github-token: ${{ steps.setup-bot.outputs.token }}
-          script: |
-            const prNumber = context.payload.pull_request.number;
-            const repoOwner = context.payload.repository.owner.login;
-            const repoName = context.payload.repository.name;
-            const branch = context.payload.pull_request.head.ref;
-
-            console.log(`PR Number: ${prNumber}`);
-            console.log(`Repo Owner: ${repoOwner}`);
-            console.log(`Repo Name: ${repoName}`);
-            console.log(`Branch: ${branch}`);
-
-            core.setOutput("pr_number", prNumber);
-            core.setOutput("repo_owner", repoOwner);
-            core.setOutput("repo_name", repoName);
-            core.setOutput("branch", branch);
-        continue-on-error: true
-
-      - name: Fetch PR changed files
-        id: fetch-pr-changes
-        env:
-          GH_TOKEN: ${{ steps.setup-bot.outputs.token }}
-        run: |
-          echo "Fetching PR changed files..."
-          echo "Getting list of changed files from PR..."
-          gh pr view ${{ steps.get-pr-data.outputs.pr_number }} --json files -q ".files[].path" | grep -E '^src/main/resources/messages_[a-zA-Z_]{2}_[a-zA-Z_]{2,7}\.properties$' > changed_files.txt # Filter only matching property files
-
-      - name: Determine reference file test
-        id: determine-file
-        uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
-        with:
-          github-token: ${{ steps.setup-bot.outputs.token }}
-          script: |
-            const fs = require("fs");
-            const path = require("path");
-
-            const prNumber = ${{ steps.get-pr-data.outputs.pr_number }};
-            const repoOwner = "${{ steps.get-pr-data.outputs.repo_owner }}";
-            const repoName = "${{ steps.get-pr-data.outputs.repo_name }}";
-
-            const prRepoOwner = "${{ github.event.pull_request.head.repo.owner.login }}";
-            const prRepoName = "${{ github.event.pull_request.head.repo.name }}";
-            const branch = "${{ steps.get-pr-data.outputs.branch }}";
-
-            console.log(`Determining reference file for PR #${prNumber}`);
-
-            // Validate inputs
-            const validateInput = (input, regex, name) => {
-              if (!regex.test(input)) {
-                throw new Error(`Invalid ${name}: ${input}`);
-              }
-            };
-
-            validateInput(repoOwner, /^[a-zA-Z0-9_-]+$/, "repository owner");
-            validateInput(repoName, /^[a-zA-Z0-9._-]+$/, "repository name");
-            validateInput(branch, /^[a-zA-Z0-9._/-]+$/, "branch name");
-
-            // Get the list of changed files in the PR
-            const { data: files } = await github.rest.pulls.listFiles({
-              owner: repoOwner,
-              repo: repoName,
-              pull_number: prNumber,
-            });
-
-            // Filter for relevant files based on the PR changes
-            const changedFiles = files
-              .map(file => file.filename)
-              .filter(file => /^src\/main\/resources\/messages_[a-zA-Z_]{2}_[a-zA-Z_]{2,7}\.properties$/.test(file));
-
-            console.log("Changed files:", changedFiles);
-
-            // Create a temporary directory for PR files
-            const tempDir = "pr-branch";
-            if (!fs.existsSync(tempDir)) {
-              fs.mkdirSync(tempDir, { recursive: true });
-            }
-
-            // Download and save each changed file
-            for (const file of changedFiles) {
-              const { data: fileContent } = await github.rest.repos.getContent({
-                owner: prRepoOwner,
-                repo: prRepoName,
-                path: file,
-                ref: branch,
-              });
-
-              const content = Buffer.from(fileContent.content, "base64").toString("utf-8");
-              const filePath = path.join(tempDir, file);
-              const dirPath = path.dirname(filePath);
-
-              if (!fs.existsSync(dirPath)) {
-                fs.mkdirSync(dirPath, { recursive: true });
-              }
-
-              fs.writeFileSync(filePath, content);
-              console.log(`Saved file: ${filePath}`);
-            }
-
-            // Output the list of changed files for further processing
-            const fileList = changedFiles.join(" ");
-            core.exportVariable("FILES_LIST", fileList);
-            console.log("Files saved and listed in FILES_LIST.");
-
-            // Determine reference file
-            let referenceFilePath;
-            if (changedFiles.includes("src/main/resources/messages_en_GB.properties")) {
-              console.log("Using PR branch reference file.");
-              const { data: fileContent } = await github.rest.repos.getContent({
-                owner: prRepoOwner,
-                repo: prRepoName,
-                path: "src/main/resources/messages_en_GB.properties",
-                ref: branch,
-              });
-
-              referenceFilePath = "pr-branch-messages_en_GB.properties";
-              const content = Buffer.from(fileContent.content, "base64").toString("utf-8");
-              fs.writeFileSync(referenceFilePath, content);
-            } else {
-              console.log("Using main branch reference file.");
-              const { data: fileContent } = await github.rest.repos.getContent({
-                owner: repoOwner,
-                repo: repoName,
-                path: "src/main/resources/messages_en_GB.properties",
-                ref: "main",
-              });
-
-              referenceFilePath = "main-branch-messages_en_GB.properties";
-              const content = Buffer.from(fileContent.content, "base64").toString("utf-8");
-              fs.writeFileSync(referenceFilePath, content);
-            }
-
-            console.log(`Reference file path: ${referenceFilePath}`);
-            core.exportVariable("REFERENCE_FILE", referenceFilePath);
-
-      - name: Run Python script to check files
-        id: run-check
-        run: |
-          echo "Running Python script to check files..."
-          python .github/scripts/check_language_properties.py \
-            --actor ${{ github.event.pull_request.user.login }} \
-            --reference-file "${REFERENCE_FILE}" \
-            --branch "pr-branch" \
-            --files "${FILES_LIST[@]}" > result.txt
-        continue-on-error: true # Continue the job even if this step fails
-
-      - name: Capture output
-        id: capture-output
-        run: |
-          if [ -f result.txt ] && [ -s result.txt ]; then
-            echo "Test, capturing output..."
-            SCRIPT_OUTPUT=$(cat result.txt)
-            echo "SCRIPT_OUTPUT<<EOF" >> $GITHUB_ENV
-            echo "$SCRIPT_OUTPUT" >> $GITHUB_ENV
-            echo "EOF" >> $GITHUB_ENV
-            echo "${SCRIPT_OUTPUT}"
-
-            # Determine job failure based on script output
-            if [[ "$SCRIPT_OUTPUT" == *"❌"* ]]; then
-              echo "FAIL_JOB=true" >> $GITHUB_ENV
-            else
-              echo "FAIL_JOB=false" >> $GITHUB_ENV
-            fi
-          else
-            echo "No update found."
-            echo "SCRIPT_OUTPUT=" >> $GITHUB_ENV
-            echo "FAIL_JOB=false" >> $GITHUB_ENV
-          fi
-
-      - name: Post comment on PR
-        if: env.SCRIPT_OUTPUT != ''
-        uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
-        with:
-          github-token: ${{ steps.setup-bot.outputs.token }}
-          script: |
-            const { GITHUB_REPOSITORY, SCRIPT_OUTPUT } = process.env;
-            const [repoOwner, repoName] = GITHUB_REPOSITORY.split('/');
-            const issueNumber = context.issue.number;
-
-            // Find existing comment
-            const comments = await github.rest.issues.listComments({
-              owner: repoOwner,
-              repo: repoName,
-              issue_number: issueNumber
-            });
-
-            const comment = comments.data.find(c => c.body.includes("## 🚀 Translation Verification Summary"));
-
-            // Only update or create comments by the action user
-            const expectedActor = "${{ steps.setup-bot.outputs.app-slug }}[bot]";
-
-            if (comment && comment.user.login === expectedActor) {
-              // Update existing comment
-              await github.rest.issues.updateComment({
-                owner: repoOwner,
-                repo: repoName,
-                comment_id: comment.id,
-                body: `## 🚀 Translation Verification Summary\n\n\n${SCRIPT_OUTPUT}\n`
-              });
-              console.log("Updated existing comment.");
-            } else if (!comment) {
-              // Create new comment if no existing comment is found
-              await github.rest.issues.createComment({
-                owner: repoOwner,
-                repo: repoName,
-                issue_number: issueNumber,
-                body: `## 🚀 Translation Verification Summary\n\n\n${SCRIPT_OUTPUT}\n`
-              });
-              console.log("Created new comment.");
-            } else {
-              console.log("Comment update attempt denied. Actor does not match.");
-            }
-
-      - name: Fail job if errors found
-        if: env.FAIL_JOB == 'true'
-        run: |
-          echo "Failing the job because errors were detected."
-          exit 1

.github/workflows/codeql.yml-disabled

@@ -1,79 +0,0 @@
-# For most projects, this workflow file will not need changing; you simply need
-# to commit it to your repository.
-#
-# You may wish to alter this file to override the set of languages analyzed,
-# or to provide custom queries or build logic.
-#
-# ******** NOTE ********
-# We have attempted to detect the languages in your repository. Please check
-# the `language` matrix defined below to confirm you have the correct set of
-# supported CodeQL languages.
-#
-name: "CodeQL"
-
-#disable for now
-#on:
-#  push:
-#    branches: ["main"]
-#  pull_request:
-    # The branches below must be a subset of the branches above
-#    branches: ["main"]
-#  schedule:
-#    - cron: "0 0 * * 1"
-
-permissions:
-  contents: read
-
-jobs:
-  analyze:
-    name: Analyze
-    runs-on: ubuntu-latest
-    permissions:
-      actions: read
-      contents: read
-      security-events: write
-
-    strategy:
-      fail-fast: false
-      matrix:
-        language: ["java"]
-        # CodeQL supports [ $supported-codeql-languages ]
-        # Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support
-
-    steps:
-      - name: Harden Runner
-        uses: step-security/harden-runner@c95a14d0e5bab51a9f56296a4eb0e416910cd350 # v2.10.3
-        with:
-          egress-policy: audit
-
-      - name: Checkout repository
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-
-      # Initializes the CodeQL tools for scanning.
-      - name: Initialize CodeQL
-        uses: github/codeql-action/init@48ab28a6f5dbc2a99bf1e0131198dd8f1df78169 # v3.28.0
-        with:
-          languages: ${{ matrix.language }}
-          # If you wish to specify custom queries, you can do so here or in a config file.
-          # By default, queries listed here will override any specified in a config file.
-          # Prefix the list here with "+" to use these queries and those in the config file.
-
-      # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
-      # If this step fails, then you should remove it and run the build manually (see below)
-      - name: Autobuild
-        uses: github/codeql-action/autobuild@48ab28a6f5dbc2a99bf1e0131198dd8f1df78169 # v3.28.0
-
-      # ℹ️ Command-line programs to run using the OS shell.
-      # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
-
-      #   If the Autobuild fails above, remove it and uncomment the following three lines.
-      #   modify them (or add more) to build your code if your project, please refer to the EXAMPLE below for guidance.
-
-      # - run: |
-      #   echo "Run, Build Application using script"
-      #   ./location_of_script_within_repo/buildscript.sh
-
-      - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@48ab28a6f5dbc2a99bf1e0131198dd8f1df78169 # v3.28.0
-        with:
-          category: "/language:${{matrix.language}}"

.github/workflows/dependency-review.yml

@@ -1,27 +0,0 @@
-# Dependency Review Action
-#
-# This Action will scan dependency manifest files that change as part of a Pull Request,
-# surfacing known-vulnerable versions of the packages declared or updated in the PR.
-# Once installed, if the workflow run is marked as required,
-# PRs introducing known-vulnerable packages will be blocked from merging.
-#
-# Source repository: https://github.com/actions/dependency-review-action
-name: "Dependency Review"
-on: [pull_request]
-
-permissions:
-  contents: read
-
-jobs:
-  dependency-review:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Harden Runner
-        uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
-        with:
-          egress-policy: audit
-
-      - name: "Checkout Repository"
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-      - name: "Dependency Review"
-        uses: actions/dependency-review-action@da24556b548a50705dd671f47852072ea4c105d9 # v4.7.1

.github/workflows/licenses-update.yml

@@ -1,90 +0,0 @@
-name: License Report Workflow
-
-on:
-  push:
-    branches:
-      - main
-    paths:
-      - "build.gradle"
-
-permissions:
-  contents: read
-
-jobs:
-  generate-license-report:
-    runs-on: ubuntu-latest
-    permissions:
-      contents: write
-      pull-requests: write
-      repository-projects: write # Required for enabling automerge
-    steps:
-      - name: Harden Runner
-        uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
-        with:
-          egress-policy: audit
-
-      - name: Check out code
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-        with:
-          fetch-depth: 0
-
-      - name: Setup GitHub App Bot
-        id: setup-bot
-        uses: ./.github/actions/setup-bot
-        with:
-          app-id: ${{ secrets.GH_APP_ID }}
-          private-key: ${{ secrets.GH_APP_PRIVATE_KEY }}
-
-      - name: Set up JDK 17
-        uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
-        with:
-          java-version: "17"
-          distribution: "adopt"
-
-      - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@8379f6a1328ee0e06e2bb424dadb7b159856a326 # v4.4.0
-
-      - name: Check licenses for compatibility
-        run: ./gradlew clean checkLicense
-
-      - name: Upload artifact on failure
-        if: failure()
-        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
-        with:
-          name: dependencies-without-allowed-license.json
-          path: build/reports/dependency-license/dependencies-without-allowed-license.json
-          retention-days: 3
-
-      - name: Move and rename license file
-        run: |
-          mv build/reports/dependency-license/index.json src/main/resources/static/3rdPartyLicenses.json
-
-      - name: Commit changes
-        run: |
-          git add src/main/resources/static/3rdPartyLicenses.json
-          git diff --staged --quiet || echo "CHANGES_DETECTED=true" >> $GITHUB_ENV
-
-      - name: Create Pull Request
-        id: cpr
-        if: env.CHANGES_DETECTED == 'true'
-        uses: peter-evans/create-pull-request@271a8d0340265f705b14b6d32b9829c1cb33d45e # v7.0.8
-        with:
-          token: ${{ steps.setup-bot.outputs.token }}
-          commit-message: "Update 3rd Party Licenses"
-          committer: ${{ steps.setup-bot.outputs.committer }}
-          author: ${{ steps.setup-bot.outputs.committer }}
-          signoff: true
-          branch: update-3rd-party-licenses
-          title: "Update 3rd Party Licenses"
-          body: |
-            Auto-generated by ${{ steps.setup-bot.outputs.app-slug }}[bot]
-          labels: licenses,github-actions
-          draft: false
-          delete-branch: true
-          sign-commits: true
-
-      - name: Enable Pull Request Automerge
-        if: steps.cpr.outputs.pull-request-operation == 'created'
-        run: gh pr merge --squash --auto "${{ steps.cpr.outputs.pull-request-number }}"
-        env:
-          GH_TOKEN: ${{ steps.setup-bot.outputs.token }}

.github/workflows/manage-label.yml

@@ -1,30 +0,0 @@
-name: Manage labels
-
-on:
-  schedule:
-    - cron: "30 20 * * *"
-
-permissions:
-  contents: read
-
-jobs:
-  labeler:
-    name: Labeler
-    runs-on: ubuntu-latest
-    permissions:
-      issues: write
-    steps:
-      - name: Harden Runner
-        uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
-        with:
-          egress-policy: audit
-
-      - name: Check out the repository
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-
-      - name: Run Labeler
-        uses: crazy-max/ghaction-github-labeler@24d110aa46a59976b8a7f35518cb7f14f434c916 # v5.3.0
-        with:
-          github-token: ${{ secrets.GITHUB_TOKEN }}
-          yaml-file: .github/labels.yml
-          skip-delete: true

.github/workflows/multiOSReleases.yml

@@ -1,314 +0,0 @@
-name: Test Installers Build
-
-on:
-  workflow_dispatch:
-    inputs:
-      test_mode:
-        description: "Run in test mode (skip release step)"
-        required: false
-        default: "false"
-  release:
-    types: [created]
-
-permissions:
-  contents: read
-
-jobs:
-  read_versions:
-    runs-on: ubuntu-latest
-    outputs:
-      version: ${{ steps.versionNumber.outputs.versionNumber }}
-      versionMac: ${{ steps.versionNumberMac.outputs.versionNumberMac }}
-    steps:
-      - name: Harden Runner
-        uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
-        with:
-          egress-policy: audit
-
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-
-      # Get version number
-      - name: Get version number
-        id: versionNumber
-        run: |
-          VERSION=$(grep "^version =" build.gradle | awk -F'"' '{print $2}')
-          echo "versionNumber=$VERSION" >> $GITHUB_OUTPUT
-
-      - name: Get version number mac
-        id: versionNumberMac
-        run: |
-          VERSION=$(grep "^version =" build.gradle | awk -F'"' '{print $2}')
-          CURRENT_YEAR=$(date +'%Y')
-          IFS='.' read -r -a VERSION_PARTS <<< "$VERSION"
-          MAC_VERSION="$CURRENT_YEAR.${VERSION_PARTS[1]:-0}.${VERSION_PARTS[2]:-0}"
-          echo "versionNumberMac=$MAC_VERSION" >> $GITHUB_OUTPUT
-
-  build-portable:
-    needs: read_versions
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        enable_security: [true, false]
-        include:
-          - enable_security: true
-            file_suffix: "-with-login"
-          - enable_security: false
-            file_suffix: ""
-    steps:
-      - name: Harden Runner
-        uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
-        with:
-          egress-policy: audit
-
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-
-      - name: Set up JDK 21
-        uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
-        with:
-          java-version: "21"
-          distribution: "temurin"
-
-      - uses: gradle/actions/setup-gradle@8379f6a1328ee0e06e2bb424dadb7b159856a326 # v4.4.0
-        with:
-          gradle-version: 8.14
-
-      - name: Generate jar (With Security=${{ matrix.enable_security }})
-        run: ./gradlew clean createExe
-        env:
-          DOCKER_ENABLE_SECURITY: ${{ matrix.enable_security }}
-          STIRLING_PDF_DESKTOP_UI: false
-
-      - name: Rename binaries
-        run: |
-          mkdir ./binaries
-          mv ./build/launch4j/Stirling-PDF.exe ./binaries/win-Stirling-PDF-portable-Server${{ matrix.file_suffix }}.exe
-          mv ./build/libs/Stirling-PDF-${{ needs.read_versions.outputs.version }}.jar ./binaries/Stirling-PDF${{ matrix.file_suffix }}.jar
-
-      - name: Upload build artifacts
-        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
-        with:
-          retention-days: 1
-          if-no-files-found: error
-          name: stirling${{ matrix.file_suffix }}-binaries
-          path: |
-            ./binaries/*
-
-  sign_verify-portable:
-    needs: [build-portable, read_versions]
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        enable_security: [true, false]
-        include:
-          - enable_security: true
-            file_suffix: "with-login-"
-          - enable_security: false
-            file_suffix: ""
-    steps:
-      - name: Harden Runner
-        uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
-        with:
-          egress-policy: audit
-
-      - name: Download build artifacts
-        uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
-        with:
-          name: stirling-${{ matrix.file_suffix }}binaries
-
-      - name: Display structure of downloaded files
-        run: ls -R
-
-      - name: Upload signed artifacts
-        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
-        with:
-          retention-days: 1
-          if-no-files-found: error
-          name: stirling-${{ matrix.file_suffix }}signed
-          path: |
-            ./*
-            !cosign.*
-
-  build-installers:
-    needs: read_versions
-    strategy:
-      matrix:
-        include:
-          - os: windows-latest
-            platform: win-
-          - os: macos-latest
-            platform: mac-
-          # - os: ubuntu-latest
-          #   platform: linux-
-    runs-on: ${{ matrix.os }}
-    permissions:
-      contents: write
-    steps:
-      - name: Harden Runner
-        uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
-        with:
-          egress-policy: audit
-
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-
-      - name: Set up JDK 21
-        uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
-        with:
-          java-version: "21"
-          distribution: "temurin"
-
-      - uses: gradle/actions/setup-gradle@8379f6a1328ee0e06e2bb424dadb7b159856a326 # v4.4.0
-        with:
-          gradle-version: 8.14
-
-      # Install Windows dependencies
-      - name: Install WiX Toolset
-        if: matrix.os == 'windows-latest'
-        run: |
-          curl -L -o wix.exe https://github.com/wixtoolset/wix3/releases/download/wix3141rtm/wix314.exe
-          .\wix.exe /install /quiet
-
-      # Build installer
-      - name: Build Installer
-        run: ./gradlew build jpackage -x test --info
-        env:
-          DOCKER_ENABLE_SECURITY: false
-          STIRLING_PDF_DESKTOP_UI: true
-          BROWSER_OPEN: true
-
-      - name: Set up JDK (x86_64)
-        if: matrix.os == 'macos-latest'
-        run: |
-          curl -L -o jdk.tar.gz https://cdn.azul.com/zulu/bin/zulu17.56.15-ca-jdk17.0.14-macosx_x64.tar.gz
-          mkdir -p zulu17
-          tar -xzf jdk.tar.gz -C zulu17 --strip-components=1
-          echo "JAVA_HOME=$PWD/zulu17" >> $GITHUB_ENV
-          echo "$PWD/zulu17/bin" >> $GITHUB_PATH
-
-      -   name: Verify JDK architecture
-          if: matrix.os == 'macos-latest'
-          run: file $JAVA_HOME/bin/java
-
-      -   name: Build project and run jpackage (x86_64)
-          if: matrix.os == 'macos-latest'
-          run: arch -x86_64 ./gradlew jpackageMacX64
-
-      # Rename and collect artifacts based on OS
-      - name: Prepare artifacts
-        id: prepare
-        shell: bash
-        run: |
-          ls -lah ./build/jpackage/
-          mkdir ./binaries
-          if [ "${{ matrix.os }}" = "windows-latest" ]; then
-            mv "./build/jpackage/Stirling PDF-${{ needs.read_versions.outputs.version }}.exe" "./binaries/Stirling-PDF-win-installer.exe"
-          elif [ "${{ matrix.os }}" = "macos-latest" ]; then
-            mv "./build/jpackage/Stirling PDF-${{ needs.read_versions.outputs.versionMac }}.dmg" "./binaries/Stirling-PDF-mac-installer.dmg"
-            mv "./build/jpackage/x86_64/Stirling PDF (x86_64)-${{ needs.read_versions.outputs.versionMac }}.dmg" "./binaries/Stirling-PDF-mac-x86_64-installer.dmg"
-          else
-            mv "./build/jpackage/stirling-pdf_${{ needs.read_versions.outputs.version }}-1_amd64.deb" "./binaries/Stirling-PDF-linux-installer.deb"
-          fi
-
-      - name: Display structure of downloaded files
-        run: ls -R ./binaries
-
-      - name: Upload build artifacts
-        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
-        with:
-          retention-days: 1
-          if-no-files-found: error
-          name: ${{ matrix.platform }}binaries
-          path: |
-            ./binaries/*
-
-  sign_verify:
-    needs: [read_versions, build-installers]
-    strategy:
-      matrix:
-        include:
-          - os: windows-latest
-            platform: win-
-          - os: macos-latest
-            platform: mac-
-          # - os: ubuntu-latest
-          #   platform: linux-
-    runs-on: ubuntu-latest
-    steps:
-      - name: Harden Runner
-        uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
-        with:
-          egress-policy: audit
-
-      - name: Download build artifacts
-        uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
-        with:
-          name: ${{ matrix.platform }}binaries
-
-      - name: Display structure of downloaded files
-        run: ls -R
-
-      - name: Install Cosign
-        if: matrix.os == 'windows-latest'
-        uses: sigstore/cosign-installer@3454372f43399081ed03b604cb2d021dabca52bb # v3.8.2
-
-      - name: Generate key pair
-        if: matrix.os == 'windows-latest'
-        run: cosign generate-key-pair
-
-      - name: Sign and generate attestations
-        if: matrix.os == 'windows-latest'
-        run: |
-          cosign sign-blob \
-            --key ./cosign.key \
-            --yes \
-            --output-signature ./Stirling-PDF-win-installer.exe.sig \
-            ./Stirling-PDF-win-installer.exe
-
-          cosign attest-blob \
-            --predicate - \
-            --key ./cosign.key \
-            --yes \
-            --output-attestation ./Stirling-PDF-win-installer.exe.intoto.jsonl \
-            ./Stirling-PDF-win-installer.exe
-
-          cosign verify-blob \
-            --key ./cosign.pub \
-            --signature ./Stirling-PDF-win-installer.exe.sig \
-            ./Stirling-PDF-win-installer.exe
-
-      - name: Display structure of downloaded files
-        run: ls -R
-
-      - name: Upload signed artifacts
-        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
-        with:
-          retention-days: 1
-          if-no-files-found: error
-          name: ${{ matrix.platform }}signed
-          path: |
-            ./Stirling-PDF-${{ matrix.platform }}installer.*
-            ./Stirling-PDF-${{ matrix.platform }}x86_64-installer.*
-            !cosign.*
-
-  create-release:
-    if: github.event_name != 'workflow_dispatch' || github.event.inputs.test_mode != 'true'
-    needs: [read_versions, sign_verify, sign_verify-portable]
-    runs-on: ubuntu-latest
-    permissions:
-      contents: write
-    steps:
-      - name: Harden Runner
-        uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
-        with:
-          egress-policy: audit
-
-      - name: Download signed artifacts
-        uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
-      - name: Display structure of downloaded files
-        run: ls -R
-      - name: Upload binaries, attestations and signatures to Release and create GitHub Release
-        uses: softprops/action-gh-release@01570a1f39cb168c169c802c3bceb9e93fb10974 # v2.1.0
-        with:
-          tag_name: v${{ needs.read_versions.outputs.version }}
-          generate_release_notes: true
-          files: |
-            ./*signed/*

.github/workflows/pre_commit.yml

@@ -1,71 +0,0 @@
-name: Pre-commit
-
-on:
-  workflow_dispatch:
-  schedule:
-    - cron: "0 0 * * 1"
-
-permissions:
-  contents: read
-
-jobs:
-  pre-commit:
-    runs-on: ubuntu-latest
-    permissions:
-      contents: write
-      pull-requests: write
-    steps:
-      - name: Harden Runner
-        uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
-        with:
-          egress-policy: audit
-
-      - name: Checkout repository
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-        with:
-          fetch-depth: 0
-
-      - name: Setup GitHub App Bot
-        id: setup-bot
-        uses: ./.github/actions/setup-bot
-        with:
-          app-id: ${{ secrets.GH_APP_ID }}
-          private-key: ${{ secrets.GH_APP_PRIVATE_KEY }}
-
-      - name: Set up Python
-        uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
-        with:
-          python-version: 3.12
-          cache: 'pip' # caching pip dependencies
-
-      - name: Run Pre-Commit Hooks
-        run: |
-          pip install --require-hashes -r ./.github/scripts/requirements_pre_commit.txt
-
-      - run: pre-commit run --all-files -c .pre-commit-config.yaml
-        continue-on-error: true
-
-      - name: git add
-        run: |
-          git add .
-          git diff --staged --quiet || echo "CHANGES_DETECTED=true" >> $GITHUB_ENV
-
-      - name: Create Pull Request
-        if: env.CHANGES_DETECTED == 'true'
-        uses: peter-evans/create-pull-request@271a8d0340265f705b14b6d32b9829c1cb33d45e # v7.0.8
-        with:
-          token: ${{ steps.setup-bot.outputs.token }}
-          commit-message: ":file_folder: pre-commit"
-          committer: ${{ steps.setup-bot.outputs.committer }}
-          author: ${{ steps.setup-bot.outputs.committer }}
-          signoff: true
-          branch: pre-commit
-          title: "🤖 format everything with pre-commit by ${{ steps.setup-bot.outputs.app-slug }}"
-          body: |
-            Auto-generated by [create-pull-request][1] with **${{ steps.setup-bot.outputs.app-slug }}**
-
-            [1]: https://github.com/peter-evans/create-pull-request
-          draft: false
-          delete-branch: true
-          labels: github-actions
-          sign-commits: true

.github/workflows/push-docker.yml

@@ -1,195 +0,0 @@
-name: Push Docker Image with VersionNumber
-
-on:
-  workflow_dispatch:
-  push:
-    branches:
-      - master
-      - main
-
-permissions:
-  contents: read
-
-jobs:
-  push:
-    runs-on: ubuntu-latest
-    permissions:
-      packages: write
-      id-token: write
-    steps:
-      - name: Harden Runner
-        uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
-        with:
-          egress-policy: audit
-
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-
-      - name: Set up JDK 17
-        uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
-        with:
-          java-version: "17"
-          distribution: "temurin"
-
-      - uses: gradle/actions/setup-gradle@8379f6a1328ee0e06e2bb424dadb7b159856a326 # v4.4.0
-        with:
-          gradle-version: 8.14
-
-      - name: Run Gradle Command
-        run: ./gradlew clean build
-        env:
-          DOCKER_ENABLE_SECURITY: false
-          STIRLING_PDF_DESKTOP_UI: false
-
-      - name: Install cosign
-        if: github.ref == 'refs/heads/master'
-        uses: sigstore/cosign-installer@3454372f43399081ed03b604cb2d021dabca52bb # v3.8.2
-        with:
-          cosign-release: "v2.4.1"
-
-      - name: Set up Docker Buildx
-        id: buildx
-        uses: docker/setup-buildx-action@b5ca514318bd6ebac0fb2aedd5d36ec1b5c232a2 # v3.10.0
-
-      - name: Get version number
-        id: versionNumber
-        run: echo "versionNumber=$(./gradlew printVersion --quiet | tail -1)" >> $GITHUB_OUTPUT
-
-      - name: Login to Docker Hub
-        uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v3.4.0
-        with:
-          username: ${{ secrets.DOCKER_HUB_USERNAME }}
-          password: ${{ secrets.DOCKER_HUB_API }}
-
-      - name: Login to GitHub Container Registry
-        uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v3.4.0
-        with:
-          registry: ghcr.io
-          username: ${{ github.actor }}
-          password: ${{ github.token }}
-
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@29109295f81e9208d7d86ff1c6c12d2833863392 # v3.6.0
-
-      - name: Convert repository owner to lowercase
-        id: repoowner
-        run: echo "lowercase=$(echo ${{ github.repository_owner }} | awk '{print tolower($0)}')" >> $GITHUB_OUTPUT
-
-      - name: Generate tags
-        id: meta
-        uses: docker/metadata-action@902fa8ec7d6ecbf8d84d538b9b233a880e428804 # v5.7.0
-        with:
-          images: |
-            ${{ secrets.DOCKER_HUB_USERNAME }}/s-pdf
-            ghcr.io/${{ steps.repoowner.outputs.lowercase }}/s-pdf
-            ghcr.io/${{ steps.repoowner.outputs.lowercase }}/stirling-pdf
-            ${{ secrets.DOCKER_HUB_ORG_USERNAME }}/stirling-pdf
-          tags: |
-            type=raw,value=${{ steps.versionNumber.outputs.versionNumber }},enable=${{ github.ref == 'refs/heads/master' }}
-            type=raw,value=latest,enable=${{ github.ref == 'refs/heads/master' }}
-            type=raw,value=alpha,enable=${{ github.ref == 'refs/heads/main' }}
-
-      - name: Build and push main Dockerfile
-        id: build-push-regular
-        uses: docker/build-push-action@263435318d21b8e681c14492fe198d362a7d2c83 # v6.18.0
-        with:
-          builder: ${{ steps.buildx.outputs.name }}
-          context: .
-          file: ./Dockerfile
-          push: true
-          cache-from: type=gha
-          cache-to: type=gha,mode=max
-          tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}
-          build-args: VERSION_TAG=${{ steps.versionNumber.outputs.versionNumber }}
-          platforms: linux/amd64,linux/arm64/v8
-          provenance: true
-          sbom: true
-
-      - name: Sign regular images
-        if: github.ref == 'refs/heads/master'
-        env:
-          DIGEST: ${{ steps.build-push-regular.outputs.digest }}
-          TAGS: ${{ steps.meta.outputs.tags }}
-          COSIGN_PRIVATE_KEY: ${{ secrets.COSIGN_PRIVATE_KEY }}
-          COSIGN_PASSWORD: ${{ secrets.COSIGN_PASSWORD }}
-        run: |
-          echo "$TAGS" | tr ',' '\n' | while read -r tag; do
-            cosign sign --yes \
-              --key env://COSIGN_PRIVATE_KEY \
-              "${tag}@${DIGEST}"
-          done
-
-      - name: Generate tags ultra-lite
-        id: meta2
-        uses: docker/metadata-action@902fa8ec7d6ecbf8d84d538b9b233a880e428804 # v5.7.0
-        if: github.ref != 'refs/heads/main'
-        with:
-          images: |
-            ${{ secrets.DOCKER_HUB_USERNAME }}/s-pdf
-            ghcr.io/${{ steps.repoowner.outputs.lowercase }}/s-pdf
-            ghcr.io/${{ steps.repoowner.outputs.lowercase }}/stirling-pdf
-            ${{ secrets.DOCKER_HUB_ORG_USERNAME }}/stirling-pdf
-          tags: |
-            type=raw,value=${{ steps.versionNumber.outputs.versionNumber }}-ultra-lite,enable=${{ github.ref == 'refs/heads/master' }}
-            type=raw,value=latest-ultra-lite,enable=${{ github.ref == 'refs/heads/master' }}
-
-      - name: Build and push Dockerfile-ultra-lite
-        id: build-push-lite
-        uses: docker/build-push-action@263435318d21b8e681c14492fe198d362a7d2c83 # v6.18.0
-        if: github.ref != 'refs/heads/main'
-        with:
-          context: .
-          file: ./Dockerfile.ultra-lite
-          push: true
-          cache-from: type=gha
-          cache-to: type=gha,mode=max
-          tags: ${{ steps.meta2.outputs.tags }}
-          labels: ${{ steps.meta2.outputs.labels }}
-          build-args: VERSION_TAG=${{ steps.versionNumber.outputs.versionNumber }}
-          platforms: linux/amd64,linux/arm64/v8
-          provenance: true
-          sbom: true
-
-      - name: Generate tags fat
-        id: meta3
-        uses: docker/metadata-action@902fa8ec7d6ecbf8d84d538b9b233a880e428804 # v5.7.0
-        if: github.ref != 'refs/heads/main'
-        with:
-          images: |
-            ${{ secrets.DOCKER_HUB_USERNAME }}/s-pdf
-            ghcr.io/${{ steps.repoowner.outputs.lowercase }}/s-pdf
-            ghcr.io/${{ steps.repoowner.outputs.lowercase }}/stirling-pdf
-            ${{ secrets.DOCKER_HUB_ORG_USERNAME }}/stirling-pdf
-          tags: |
-            type=raw,value=${{ steps.versionNumber.outputs.versionNumber }}-fat,enable=${{ github.ref == 'refs/heads/master' }}
-            type=raw,value=latest-fat,enable=${{ github.ref == 'refs/heads/master' }}
-
-      - name: Build and push main Dockerfile fat
-        id: build-push-fat
-        uses: docker/build-push-action@263435318d21b8e681c14492fe198d362a7d2c83 # v6.18.0
-        if: github.ref != 'refs/heads/main'
-        with:
-          builder: ${{ steps.buildx.outputs.name }}
-          context: .
-          file: ./Dockerfile.fat
-          push: true
-          cache-from: type=gha
-          cache-to: type=gha,mode=max
-          tags: ${{ steps.meta3.outputs.tags }}
-          labels: ${{ steps.meta3.outputs.labels }}
-          build-args: VERSION_TAG=${{ steps.versionNumber.outputs.versionNumber }}
-          platforms: linux/amd64,linux/arm64/v8
-          provenance: true
-          sbom: true
-
-      - name: Sign fat images
-        if: github.ref == 'refs/heads/master'
-        env:
-          DIGEST: ${{ steps.build-push-fat.outputs.digest }}
-          TAGS: ${{ steps.meta3.outputs.tags }}
-          COSIGN_PRIVATE_KEY: ${{ secrets.COSIGN_PRIVATE_KEY }}
-          COSIGN_PASSWORD: ${{ secrets.COSIGN_PASSWORD }}
-        run: |
-          echo "$TAGS" | tr ',' '\n' | while read -r tag; do
-            cosign sign --key env://COSIGN_PRIVATE_KEY --yes "${tag}@${DIGEST}"
-          done

.github/workflows/releaseArtifacts.yml

@@ -1,180 +0,0 @@
-name: Release Artifacts
-
-on:
-  workflow_dispatch:
-  release:
-    types: [created]
-
-permissions:
-  contents: read
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        enable_security: [true, false]
-        include:
-          - enable_security: true
-            file_suffix: "-with-login"
-          - enable_security: false
-            file_suffix: ""
-    outputs:
-      version: ${{ steps.versionNumber.outputs.versionNumber }}
-    steps:
-      - name: Harden Runner
-        uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
-        with:
-          egress-policy: audit
-
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-
-      - name: Set up JDK 17
-        uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
-        with:
-          java-version: "17"
-          distribution: "temurin"
-
-      - uses: gradle/actions/setup-gradle@8379f6a1328ee0e06e2bb424dadb7b159856a326 # v4.4.0
-        with:
-          gradle-version: 8.14
-
-      - name: Generate jar (With Security=${{ matrix.enable_security }})
-        run: ./gradlew clean createExe
-        env:
-          DOCKER_ENABLE_SECURITY: ${{ matrix.enable_security }}
-          STIRLING_PDF_DESKTOP_UI: false
-
-      - name: Get version number
-        id: versionNumber
-        run: |
-          VERSION=$(grep "^version =" build.gradle | awk -F'"' '{print $2}')
-          echo "versionNumber=$VERSION" >> $GITHUB_OUTPUT
-
-      - name: Rename binaries
-        run: |
-          mv ./build/launch4j/Stirling-PDF.exe ./build/launch4j/Stirling-PDF-Server${{ matrix.file_suffix }}.exe
-          mv ./build/libs/Stirling-PDF-${{ steps.versionNumber.outputs.versionNumber }}.jar ./build/libs/Stirling-PDF${{ matrix.file_suffix }}.jar
-
-      - name: Debug build artifacts
-        run: |
-          echo "Current Directory: $(pwd)"
-          ls -R ./build/libs
-          ls -R ./build/launch4j
-
-      - name: Upload build artifacts
-        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
-        with:
-          name: binaries${{ matrix.file_suffix }}
-          path: |
-            ./build/launch4j/Stirling-PDF-Server${{ matrix.file_suffix }}.*
-            ./build/libs/Stirling-PDF${{ matrix.file_suffix }}.*
-
-  sign_verify:
-    needs: build
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        enable_security: [true, false]
-        include:
-          - enable_security: true
-            file_suffix: "-with-login"
-          - enable_security: false
-            file_suffix: ""
-    steps:
-      - name: Harden Runner
-        uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
-        with:
-          egress-policy: audit
-
-      - name: Download build artifacts
-        uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
-        with:
-          name: binaries${{ matrix.file_suffix }}
-      - name: Display structure of downloaded files
-        run: ls -R
-
-      - name: Install Cosign
-        uses: sigstore/cosign-installer@3454372f43399081ed03b604cb2d021dabca52bb # v3.8.2
-
-      - name: Generate key pair
-        run: cosign generate-key-pair
-
-      - name: Sign and generate attestations
-        run: |
-          cosign sign-blob \
-            --key ./cosign.key \
-            --yes \
-            --output-signature ./libs/Stirling-PDF${{ matrix.file_suffix }}.jar.sig \
-            ./libs/Stirling-PDF${{ matrix.file_suffix }}.jar
-
-          cosign attest-blob \
-            --predicate - \
-            --key ./cosign.key \
-            --yes \
-            --output-attestation ./libs/Stirling-PDF${{ matrix.file_suffix }}.jar.intoto.jsonl \
-            ./libs/Stirling-PDF${{ matrix.file_suffix }}.jar
-
-          cosign verify-blob \
-            --key ./cosign.pub \
-            --signature ./libs/Stirling-PDF${{ matrix.file_suffix }}.jar.sig \
-            ./libs/Stirling-PDF${{ matrix.file_suffix }}.jar
-
-          cosign sign-blob \
-            --key ./cosign.key \
-            --yes \
-            --output-signature ./launch4j/Stirling-PDF-Server${{ matrix.file_suffix }}.exe.sig \
-            ./launch4j/Stirling-PDF-Server${{ matrix.file_suffix }}.exe
-
-          cosign attest-blob \
-            --predicate - \
-            --key ./cosign.key \
-            --yes \
-            --output-attestation ./launch4j/Stirling-PDF-Server${{ matrix.file_suffix }}.exe.intoto.jsonl \
-            ./launch4j/Stirling-PDF-Server${{ matrix.file_suffix }}.exe
-
-          cosign verify-blob \
-            --key ./cosign.pub \
-            --signature ./launch4j/Stirling-PDF-Server${{ matrix.file_suffix }}.exe.sig \
-            ./launch4j/Stirling-PDF-Server${{ matrix.file_suffix }}.exe
-
-      - name: Upload signed artifacts
-        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
-        with:
-          name: signed${{ matrix.file_suffix }}
-          path: |
-            ./libs/Stirling-PDF${{ matrix.file_suffix }}.*
-            ./launch4j/Stirling-PDF-Server${{ matrix.file_suffix }}.*
-
-  release:
-    needs: [build, sign_verify]
-    runs-on: ubuntu-latest
-    permissions:
-      contents: write
-    strategy:
-      matrix:
-        enable_security: [true, false]
-        include:
-          - enable_security: true
-            file_suffix: "-with-login"
-          - enable_security: false
-            file_suffix: ""
-    steps:
-      - name: Harden Runner
-        uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
-        with:
-          egress-policy: audit
-
-      - name: Download signed artifacts
-        uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
-        with:
-          name: signed${{ matrix.file_suffix }}
-
-      - name: Upload binaries, attestations and signatures to Release and create GitHub Release
-        uses: softprops/action-gh-release@01570a1f39cb168c169c802c3bceb9e93fb10974 # v2.1.0
-        with:
-          tag_name: v${{ needs.build.outputs.version }}
-          generate_release_notes: true
-          files: |
-            ./libs/Stirling-PDF*
-            ./launch4j/Stirling-PDF-Server*

.github/workflows/scorecards.yml

@@ -1,79 +0,0 @@
-# This workflow uses actions that are not certified by GitHub. They are provided
-# by a third-party and are governed by separate terms of service, privacy
-# policy, and support documentation.
-
-name: Scorecard supply-chain security
-on:
-  # For Branch-Protection check. Only the default branch is supported. See
-  # https://github.com/ossf/scorecard/blob/main/docs/checks.md#branch-protection
-  branch_protection_rule:
-  # To guarantee Maintained check is occasionally updated. See
-  # https://github.com/ossf/scorecard/blob/main/docs/checks.md#maintained
-  schedule:
-    - cron: "20 7 * * 2"
-  push:
-    branches: ["main"]
-permissions: read-all
-
-jobs:
-  analysis:
-    name: Scorecard analysis
-    runs-on: ubuntu-latest
-    permissions:
-      # Needed to upload the results to code-scanning dashboard.
-      security-events: write
-      # Needed to publish results and get a badge (see publish_results below).
-      id-token: write
-      contents: read
-      actions: read
-      # To allow GraphQL ListCommits to work
-      issues: read
-      pull-requests: read
-      # To detect SAST tools
-      checks: read
-
-    steps:
-      - name: Harden Runner
-        uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
-        with:
-          egress-policy: audit
-
-      - name: "Checkout code"
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-        with:
-          persist-credentials: false
-
-      - name: "Run analysis"
-        uses: ossf/scorecard-action@05b42c624433fc40578a4040d5cf5e36ddca8cde # v2.4.2
-        with:
-          results_file: results.sarif
-          results_format: sarif
-          # (Optional) "write" PAT token. Uncomment the `repo_token` line below if:
-          # - you want to enable the Branch-Protection check on a *public* repository, or
-          # - you are installing Scorecards on a *private* repository
-          # To create the PAT, follow the steps in https://github.com/ossf/scorecard-action#authentication-with-pat.
-          # repo_token: ${{ secrets.SCORECARD_TOKEN }}
-
-          # Public repositories:
-          #   - Publish results to OpenSSF REST API for easy access by consumers
-          #   - Allows the repository to include the Scorecard badge.
-          #   - See https://github.com/ossf/scorecard-action#publishing-results.
-          # For private repositories:
-          #   - `publish_results` will always be set to `false`, regardless
-          #     of the value entered here.
-          publish_results: true
-
-      # Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF
-      # format to the repository Actions tab.
-      - name: "Upload artifact"
-        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
-        with:
-          name: SARIF file
-          path: results.sarif
-          retention-days: 5
-
-      # Upload the results to GitHub's code scanning dashboard.
-      - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@ff0a06e83cb2de871e5a09832bc6a81e7276941f # v3.28.18
-        with:
-          sarif_file: results.sarif

.github/workflows/sonarqube.yml

@@ -1,63 +0,0 @@
-name: Run Sonarqube
-
-on:
-  push:
-    branches:
-      - master
-  pull_request_target:
-    branches:
-      - main
-  workflow_dispatch:
-
-permissions:
-  pull-requests: read
-  actions: read
-
-jobs:
-  sonarqube:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Harden Runner
-        uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
-        with:
-          egress-policy: audit
-
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-        with:
-          fetch-depth: 0
-
-      - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@8379f6a1328ee0e06e2bb424dadb7b159856a326 # v4.4.0
-
-      - name: Build and analyze with Gradle
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
-          DOCKER_ENABLE_SECURITY: true
-          STIRLING_PDF_DESKTOP_UI: true
-        run: |
-          ./gradlew clean build sonar \
-            -Dsonar.projectKey=Stirling-Tools_Stirling-PDF \
-            -Dsonar.organization=stirling-tools \
-            -Dsonar.host.url=https://sonarcloud.io \
-            -Dsonar.login=${SONAR_TOKEN} \
-            -Dsonar.log.level=DEBUG \
-            --info
-
-      - name: Upload Problems Report on Failure
-        if: failure()
-        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
-        with:
-          name: gradle-problems-report
-          path: build/reports/problems/problems-report.html
-          retention-days: 7
-
-      - name: Upload Sonar Logs on Failure
-        if: failure()
-        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
-        with:
-          name: sonar-logs
-          path: |
-            .scannerwork/report-task.txt
-            build/sonar/
-          retention-days: 7

.github/workflows/stale.yml

@@ -1,40 +0,0 @@
-name: Close stale issues
-
-on:
-  schedule:
-    - cron: "30 0 * * *"
-  workflow_dispatch:
-
-permissions:
-  contents: read
-
-jobs:
-  stale:
-    runs-on: ubuntu-latest
-    permissions:
-      issues: write
-      pull-requests: write
-    steps:
-      - name: Harden Runner
-        uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
-        with:
-          egress-policy: audit
-
-      - name: 30 days stale issues
-        uses: actions/stale@5bef64f19d7facfb25b37b414482c7164d639639 # v9.1.0
-        with:
-          repo-token: ${{ secrets.GITHUB_TOKEN }}
-          days-before-stale: 30
-          days-before-close: 7
-          stale-issue-message: >
-            This issue has been automatically marked as stale because it has had no recent activity.
-            It will be closed if no further activity occurs. Thank you for your contributions.
-          close-issue-message: >
-            This issue has been automatically closed because it has had no recent activity after being marked as stale.
-            Please reopen if you need further assistance.
-          stale-issue-label: "Stale"
-          remove-stale-when-updated: true
-          only-issue-labels: "more-info-needed"
-          days-before-pr-stale: -1 # Prevents PRs from being marked as stale
-          days-before-pr-close: -1 # Prevents PRs from being closed
-          start-date: "2024-07-06T00:00:00Z" # ISO 8601 Format

.github/workflows/swagger.yml

@@ -1,49 +0,0 @@
-name: Update Swagger
-
-on:
-  workflow_dispatch:
-  push:
-    branches:
-      - master
-
-permissions:
-  contents: read
-
-jobs:
-  push:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Harden Runner
-        uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
-        with:
-          egress-policy: audit
-
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-
-      - name: Set up JDK 17
-        uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
-        with:
-          java-version: "17"
-          distribution: "temurin"
-
-      - uses: gradle/actions/setup-gradle@8379f6a1328ee0e06e2bb424dadb7b159856a326 # v4.4.0
-
-      - name: Generate Swagger documentation
-        run: ./gradlew generateOpenApiDocs
-
-      - name: Upload Swagger Documentation to SwaggerHub
-        run: ./gradlew swaggerhubUpload
-        env:
-          SWAGGERHUB_API_KEY: ${{ secrets.SWAGGERHUB_API_KEY }}
-          SWAGGERHUB_USER: "Frooodle"
-
-      - name: Get version number
-        id: versionNumber
-        run: echo "versionNumber=$(./gradlew printVersion --quiet | tail -1)" >> $GITHUB_OUTPUT
-
-      - name: Set API version as published and default on SwaggerHub
-        run: |
-          curl -X PUT -H "Authorization: ${SWAGGERHUB_API_KEY}" "https://api.swaggerhub.com/apis/${SWAGGERHUB_USER}/Stirling-PDF/${{ steps.versionNumber.outputs.versionNumber }}/settings/lifecycle" -H  "accept: application/json" -H  "Content-Type: application/json" -d "{\"published\":true,\"default\":true}"
-        env:
-          SWAGGERHUB_API_KEY: ${{ secrets.SWAGGERHUB_API_KEY }}
-          SWAGGERHUB_USER: "Frooodle"

.github/workflows/sync_files.yml

@@ -1,104 +0,0 @@
-name: Sync Files
-
-on:
-  workflow_dispatch:
-  push:
-    branches:
-      - main
-    paths:
-      - "build.gradle"
-      - "README.md"
-      - "src/main/resources/messages_*.properties"
-      - "src/main/resources/static/3rdPartyLicenses.json"
-      - "scripts/ignore_translation.toml"
-
-permissions:
-  contents: read
-
-jobs:
-  sync-files:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Harden Runner
-        uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
-        with:
-          egress-policy: audit
-
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-
-      - name: Setup GitHub App Bot
-        id: setup-bot
-        uses: ./.github/actions/setup-bot
-        with:
-          app-id: ${{ secrets.GH_APP_ID }}
-          private-key: ${{ secrets.GH_APP_PRIVATE_KEY }}
-
-      - name: Set up Python
-        uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
-        with:
-          python-version: "3.12"
-          cache: "pip" # caching pip dependencies
-
-      - name: Sync translation property files
-        run: |
-          python .github/scripts/check_language_properties.py --reference-file "src/main/resources/messages_en_GB.properties" --branch main
-
-      - name: Commit translation files
-        run: |
-          git add src/main/resources/messages_*.properties
-          git diff --staged --quiet || git commit -m ":memo: Sync translation files" || echo "No changes detected"
-
-      - name: Install dependencies
-        run: pip install --require-hashes -r ./.github/scripts/requirements_sync_readme.txt
-
-      - name: Sync README.md
-        run: |
-          python scripts/counter_translation.py
-
-      - name: Run git add
-        run: |
-          git add README.md
-          git diff --staged --quiet || git commit -m ":memo: Sync README.md" || echo "No changes detected"
-
-      - name: Create Pull Request
-        if: always()
-        uses: peter-evans/create-pull-request@271a8d0340265f705b14b6d32b9829c1cb33d45e # v7.0.8
-        with:
-          token: ${{ steps.setup-bot.outputs.token }}
-          commit-message: Update files
-          committer: ${{ steps.setup-bot.outputs.committer }}
-          author: ${{ steps.setup-bot.outputs.committer }}
-          signoff: true
-          branch: sync_readme
-          title: ":globe_with_meridians: Sync Translations + Update README Progress Table"
-          body: |
-            ### Description of Changes
-
-            This Pull Request was automatically generated to synchronize updates to translation files and documentation. Below are the details of the changes made:
-
-            #### **1. Synchronization of Translation Files**
-            - Updated translation files (`messages_*.properties`) to reflect changes in the reference file `messages_en_GB.properties`.
-            - Ensured consistency and synchronization across all supported language files.
-            - Highlighted any missing or incomplete translations.
-
-            #### **2. Update README.md**
-            - Generated the translation progress table in `README.md`.
-            - Added a summary of the current translation status for all supported languages.
-            - Included up-to-date statistics on translation coverage.
-
-            #### **Why these changes are necessary**
-            - Keeps translation files aligned with the latest reference updates.
-            - Ensures the documentation reflects the current translation progress.
-
-            ---
-
-            Auto-generated by [create-pull-request][1].
-
-            [1]: https://github.com/peter-evans/create-pull-request
-          draft: false
-          delete-branch: true
-          labels: github-actions
-          sign-commits: true
-          add-paths: |
-            README.md
-            src/main/resources/messages_*.properties

.github/workflows/testdriver.yml

@@ -1,154 +0,0 @@
-name: UI test with TestDriverAI
-
-on:
-  push:
-    branches: ["master", "UITest", "testdriver"]
-
-permissions:
-  contents: read
-
-jobs:
-  deploy:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Harden Runner
-        uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
-        with:
-          egress-policy: audit
-
-      - name: Checkout repository
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-
-      - name: Set up JDK
-        uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
-        with:
-          java-version: '17'
-          distribution: 'temurin'
-
-      - name: Build with Gradle
-        run: ./gradlew clean build
-        env:
-          DOCKER_ENABLE_SECURITY: false
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@b5ca514318bd6ebac0fb2aedd5d36ec1b5c232a2 # v3.10.0
-
-      - name: Get version number
-        id: versionNumber
-        run: |
-          VERSION=$(grep "^version =" build.gradle | awk -F'"' '{print $2}')
-          echo "versionNumber=$VERSION" >> $GITHUB_OUTPUT
-
-      - name: Login to Docker Hub
-        uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v3.4.0
-        with:
-          username: ${{ secrets.DOCKER_HUB_USERNAME }}
-          password: ${{ secrets.DOCKER_HUB_API }}
-
-      - name: Build and push test image
-        uses: docker/build-push-action@263435318d21b8e681c14492fe198d362a7d2c83 # v6.18.0
-        with:
-          context: .
-          file: ./Dockerfile
-          push: true
-          tags: ${{ secrets.DOCKER_HUB_USERNAME }}/test:test-${{ github.sha }}
-          build-args: VERSION_TAG=${{ steps.versionNumber.outputs.versionNumber }}
-          platforms: linux/amd64
-
-      - name: Set up SSH
-        run: |
-          mkdir -p ~/.ssh/
-          echo "${{ secrets.VPS_SSH_KEY }}" > ../private.key
-          sudo chmod 600 ../private.key
-
-      - name: Deploy to VPS
-        run: |
-          cat > docker-compose.yml << EOF
-          version: '3.3'
-          services:
-            stirling-pdf:
-              container_name: stirling-pdf-test-${{ github.sha }}
-              image: ${{ secrets.DOCKER_HUB_USERNAME }}/test:test-${{ github.sha }}
-              ports:
-                - "1337:8080"
-              volumes:
-                - /stirling/test-${{ github.sha }}/data:/usr/share/tessdata:rw
-                - /stirling/test-${{ github.sha }}/config:/configs:rw
-                - /stirling/test-${{ github.sha }}/logs:/logs:rw
-              environment:
-                DOCKER_ENABLE_SECURITY: "false"
-                SECURITY_ENABLELOGIN: "false"
-                SYSTEM_DEFAULTLOCALE: en-GB
-                UI_APPNAME: "Stirling-PDF Test"
-                UI_HOMEDESCRIPTION: "Test Deployment"
-                UI_APPNAMENAVBAR: "Test"
-                SYSTEM_MAXFILESIZE: "100"
-                METRICS_ENABLED: "true"
-                SYSTEM_GOOGLEVISIBILITY: "false"
-                SYSTEM_ENABLEANALYTICS: "false"
-              restart: on-failure:5
-          EOF
-
-          scp -i ../private.key -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null docker-compose.yml ${{ secrets.VPS_USERNAME }}@${{ secrets.VPS_HOST }}:/tmp/docker-compose.yml
-
-          ssh -i ../private.key -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null ${{ secrets.VPS_USERNAME }}@${{ secrets.VPS_HOST }} << EOF
-            mkdir -p /stirling/test-${{ github.sha }}/{data,config,logs}
-            mv /tmp/docker-compose.yml /stirling/test-${{ github.sha }}/docker-compose.yml
-            cd /stirling/test-${{ github.sha }}
-            docker-compose pull
-            docker-compose up -d
-          EOF
-
-  test:
-    needs: deploy
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Harden Runner
-        uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
-        with:
-          egress-policy: audit
-
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-
-      - name: Run TestDriver.ai
-        uses: testdriverai/action@f0d0f45fdd684db628baa843fe9313f3ca3a8aa8 #1.1.3
-        with:
-          key: ${{secrets.TESTDRIVER_API_KEY}}
-          prerun: |
-            npm install
-            npm run build
-            npm install dashcam-chrome --save
-            Start-Process "C:/Program Files/Google/Chrome/Application/chrome.exe" -ArgumentList "--start-maximized", "--load-extension=$(pwd)/node_modules/dashcam-chrome/build", "http://${{ secrets.VPS_HOST }}:1337"
-            Start-Sleep -Seconds 20
-          prompt: |
-            1. /run testing/testdriver/test.yml
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          FORCE_COLOR: "3"
-
-  cleanup:
-    needs: [deploy, test]
-    runs-on: ubuntu-latest
-    if: always()
-
-    steps:
-      - name: Harden Runner
-        uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
-        with:
-          egress-policy: audit
-
-      - name: Set up SSH
-        run: |
-          mkdir -p ~/.ssh/
-          echo "${{ secrets.VPS_SSH_KEY }}" > ../private.key
-          sudo chmod 600 ../private.key
-
-      - name: Cleanup deployment
-        run: |
-          ssh -i ../private.key -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null ${{ secrets.VPS_USERNAME }}@${{ secrets.VPS_HOST }} << EOF
-            cd /stirling/test-${{ github.sha }}
-            docker-compose down
-            cd /stirling
-            rm -rf test-${{ github.sha }}
-          EOF

.gitignore

@@ -26,8 +26,6 @@ clientWebUI/
 !cucumber/exampleFiles/
 !cucumber/exampleFiles/example_html.zip
 exampleYmlFiles/stirling/
-/testing/file_snapshots
-SwaggerDoc.json
 
 # Gradle
 .gradle
@@ -190,7 +188,3 @@ id_ed25519.pub
 .ipynb_checkpoints
 
 **/jcef-bundle/
-
-# node_modules
-node_modules/
-*.mjs

.pre-commit-config.yaml

@@ -1,6 +1,6 @@
 repos:
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.11.11
+    rev: v0.8.4
     hooks:
       - id: ruff
         args:
@@ -12,7 +12,7 @@ repos:
         files: ^((\.github/scripts|scripts)/.+)?[^/]+\.py$
         exclude: (split_photos.py)
   - repo: https://github.com/codespell-project/codespell
-    rev: v2.4.1
+    rev: v2.3.0
     hooks:
       - id: codespell
         args:
@@ -22,7 +22,7 @@ repos:
         files: \.(html|css|js|py|md)$
         exclude: (.vscode|.devcontainer|src/main/resources|Dockerfile|.*/pdfjs.*|.*/thirdParty.*|bootstrap.*|.*\.min\..*|.*diff\.js)
   - repo: https://github.com/gitleaks/gitleaks
-    rev: v8.26.0
+    rev: v8.22.0
     hooks:
       - id: gitleaks
   - repo: https://github.com/pre-commit/pre-commit-hooks

.vscode/extensions.json

@@ -5,16 +5,20 @@
     "ms-python.black-formatter", // Python code formatter using Black
     "ms-python.flake8", // Flake8 linter for Python to enforce code quality
     "ms-python.python", // Official Microsoft Python extension with IntelliSense, debugging, and Jupyter support
-    "ms-vscode-remote.vscode-remote-extensionpack", // Remote Development Pack for SSH, WSL, and Containers
-    // "Oracle.oracle-java", // Oracle Java extension with additional features for Java development
+    // "ms-vscode-remote.remote-containers", // Support for remote development with containers (Docker, Dev Containers)
+    // "ms-vscode-remote.vscode-remote-extensionpack", // Remote Development Pack for SSH, WSL, and Containers
+    "Oracle.oracle-java", // Oracle Java extension with additional features for Java development
+    "redhat.java", // Java support by Red Hat with IntelliSense, debugging, and code navigation
+    "shengchen.vscode-checkstyle", // Checkstyle integration for Java code quality checks
     "streetsidesoftware.code-spell-checker", // Spell checker for code to avoid typos
     "vmware.vscode-boot-dev-pack", // Developer tools for Spring Boot by VMware
+    "vmware.vscode-spring-boot", // Spring Boot tools by VMware for enhanced Spring development
+    "vscjava.vscode-gradle", // Gradle extension for build and automation support
+    "vscjava.vscode-java-debug", // Debugging support for Java projects
+    "vscjava.vscode-java-dependency", // Java dependency management within VS Code
     "vscjava.vscode-java-pack", // Java Extension Pack with essential Java tools for VS Code
+    "vscjava.vscode-java-test", // Java test framework for running and debugging tests in VS Code
     "vscjava.vscode-spring-boot-dashboard", // Spring Boot dashboard for managing and visualizing Spring Boot applications
-    "EditorConfig.EditorConfig", // EditorConfig support for maintaining consistent coding styles
-    "ms-azuretools.vscode-docker", // Docker extension for Visual Studio Code
-    "GitHub.copilot", // GitHub Copilot AI pair programmer for Visual Studio Code
-    "GitHub.vscode-pull-request-github", // GitHub Pull Requests extension for Visual Studio Code
-    "charliermarsh.ruff" // Ruff code formatter for Python to follow the Ruff Style Guide
+    "vscjava.vscode-spring-initializr" // Support for Spring Initializr to create new Spring projects
   ]
 }

.vscode/settings.json

@@ -1,86 +1,55 @@
 {
-  "editor.wordSegmenterLocales": "",
+  "java.compile.nullAnalysis.mode": "automatic",
+  "files.eol": "auto",
+  "java.configuration.updateBuildConfiguration": "interactive",
+  "black-formatter.args": ["--line-length", "127"],
+  "flake8.args": ["--max-line-length", "127"],
+  "pylint.args": ["max-line-length", "127"],
+  "[java]": {
+    "editor.tabSize": 4,
+    "editor.detectIndentation": false,
+    "editor.rulers": [127]
+  },
+  "[python]": {
+    "editor.tabSize": 2,
+    "editor.detectIndentation": false,
+    "editor.rulers": [127]
+  },
+  "[gradle-build]": {
+    "editor.tabSize": 4,
+    "editor.detectIndentation": false,
+    "editor.rulers": [127]
+  },
+  "[gradle]": {
+    "editor.tabSize": 4,
+    "editor.detectIndentation": false,
+    "editor.rulers": [127]
+  },
+  "[html]": {
+    "editor.tabSize": 2,
+    "editor.rulers": [127],
+    "files.trimFinalNewlines": false,
+    "files.insertFinalNewline": false
+  },
+  "[javascript]": {
+    "editor.tabSize": 2,
+    "editor.rulers": [127]
+  },
+  "[yaml]": {
+    "files.trimFinalNewlines": false,
+    "files.insertFinalNewline": false
+  },
+  "diffEditor.maxComputationTime": 0,
+  "editor.wordSegmenterLocales": null,
   "editor.guides.bracketPairs": "active",
   "editor.guides.bracketPairsHorizontal": "active",
-  "cSpell.enabled": false,
-  "[java]": {
-    "editor.defaultFormatter": "josevseb.google-java-format-for-vs-code"
-  },
-  "java.compile.nullAnalysis.mode": "automatic",
-  "java.configuration.updateBuildConfiguration": "interactive",
-  "java.format.enabled": true,
-  "java.format.settings.profile": "GoogleStyle",
-  "java.format.settings.google.version": "1.27.0",
-  "java.format.settings.google.extra": "--aosp --skip-sorting-imports --skip-javadoc-formatting",
-  // (DE) Aktiviert Kommentare im Java-Format.
-  // (EN) Enables comments in Java formatting.
-  // "java.format.comments.enabled": true,
-  // (DE) Generiert automatisch Kommentare im Code.
-  // (EN) Automatically generates comments in code.
-  // "java.codeGeneration.generateComments": true,
-  // https://github.com/redhat-developer/vscode-java/blob/master/document/_java.learnMoreAboutCleanUps.md#java-clean-ups
-  "java.saveActions.cleanup": true,
-  "java.cleanup.actions": [
-    "invertEquals", // Inverts calls to Object.equals(Object) and String.equalsIgnoreCase(String) to avoid useless null pointer exception.
-    "instanceofPatternMatch" // Replaces instanceof checks with pattern matching.
-  ],
-  // (DE) Aktiviert die Code-Vervollständigung für Java.
-  // (EN) Enables code completion for Java.
-  "java.completion.engine": "dom",
-  "java.completion.enabled": true,
-  "java.completion.importOrder": [
-    "java",
-    "javax",
-    "org",
-    "com",
-    "net",
-    "io",
-    "jakarta",
-    "lombok",
-    "me",
-    "stirling",
-  ],
-  "java.project.resourceFilters": [
-    ".devcontainer/",
-    ".git/",
-    ".github/",
-    ".gradle/",
-    ".venv/",
-    ".venv*/",
-    ".vscode/",
-    "bin/",
-    "common/bin/",
-    "build/",
-    "common/build/",
-    "configs/",
-    "customFiles/",
-    "docs/",
-    "exampleYmlFiles",
-    "gradle/",
-    "images/",
-    "logs/",
-    "pipeline/",
-    "scripts/",
-    "testings/",
-    ".git-blame-ignore-revs",
-    ".gitattributes",
-    ".gitignore",
-    "common/.gitignore",
-    ".pre-commit-config.yaml",
-  ],
-  // Enables signature help in Java.
-  "java.signatureHelp.enabled": true,
-  // Enables detailed signature help descriptions.
-  "java.signatureHelp.description.enabled": true,
-  // Downloads sources for Maven dependencies.
-  "java.maven.downloadSources": true,
-  // Enables Gradle project import.
-  "java.import.gradle.enabled": true,
-  // Downloads sources for Eclipse projects.
-  "java.eclipse.downloadSources": true,
-  // Enables import of the Gradle wrapper.
-  "java.import.gradle.wrapper.enabled": true,
-  "spring.initializr.defaultLanguage": "Java",
-  "spring.initializr.defaultGroupId": "stirling.software.SPDF",
-  "spring.initializr.defaultArtifactId": "SPDF",
+  "files.insertFinalNewline": true,
+  "files.trimFinalNewlines": true,
+  "files.trimTrailingWhitespace": true,
+  "editor.indentSize": "tabSize",
+  "editor.stickyScroll.enabled": false,
+  "editor.minimap.enabled": false,
+  "editor.formatOnSave": true,
+  "java.format.settings.google.mode": "jar-file",
+  "java.format.settings.google.extra": "--aosp --skip-sorting-imports"
 }

AGENTS.md

@@ -1,24 +0,0 @@
-# Codex Contribution Guidelines for Stirling-PDF
-
-This file provides high-level instructions for Codex when modifying any files within this repository. Follow these rules to ensure changes remain consistent with the existing project structure.
-
-## 1. Code Style and Formatting
-- Respect the `.editorconfig` settings located in the repository root. Java files use 4 spaces; HTML, JS, and Python generally use 2 spaces. Lines should end with `LF`.
-- Format Java code with `./gradlew spotlessApply` before committing.
-- Review `DeveloperGuide.md` for project structure and design details before making significant changes.
-
-## 2. Testing
-- Run `./gradlew build` before committing changes to ensure the project compiles.
-- If the build cannot complete due to environment restrictions, DO NOT COMMIT THE CHANGE
-
-## 3. Commits
-- Keep commits focused. Group related changes together and provide concise commit messages.
-- Ensure the working tree is clean (`git status`) before concluding your work.
-
-## 4. Pull Requests
-- Summarize what was changed and why. Include build results from `./gradlew build` in the PR description.
-- Note that the code was generated with the assistance of AI.
-
-## 5. Translations
-- Only modify `messages_en_GB.properties` when adding or updating translations.
-

DeveloperGuide.md

@@ -124,7 +124,7 @@ These files provide pre-configured setups for different scenarios. For example,
 services:
   stirling-pdf:
     container_name: Stirling-PDF-Security
-    image: docker.stirlingpdf.com/stirlingtools/stirling-pdf:latest
+    image: stirlingtools/stirling-pdf:latest
     deploy:
       resources:
         limits:
@@ -153,7 +153,6 @@ services:
       SYSTEM_MAXFILESIZE: "100"
       METRICS_ENABLED: "true"
       SYSTEM_GOOGLEVISIBILITY: "true"
-      SHOW_SURVEY: "true"
     restart: on-failure:5
 ```
 
@@ -541,7 +540,7 @@ This would generate n entries of tr for each person in exampleData
 
    ```html
    <li class="nav-item">
-       <a class="nav-link" th:href="@{'/new-feature'}">New Feature</a>
+       <a class="nav-link" th:href="@{/new-feature}">New Feature</a>
    </li>
    ```
 

Dockerfile

@@ -1,5 +1,5 @@
 # Main stage
-FROM alpine:3.22.0@sha256:8a1f59ffb675680d47db6337b49d22281a139e9d709335b492be023728e11715
+FROM alpine:3.21.2@sha256:56fa17d2a7e7f168a043a2712e63aed1f8543aeafdcee47c58dcffe38ed51099
 
 # Copy necessary files
 COPY scripts /scripts
@@ -25,65 +25,57 @@ LABEL org.opencontainers.image.keywords="PDF, manipulation, merge, split, conver
 # Set Environment Variables
 ENV DOCKER_ENABLE_SECURITY=false \
     VERSION_TAG=$VERSION_TAG \
-    JAVA_BASE_OPTS="-XX:+UnlockExperimentalVMOptions -XX:MaxRAMPercentage=75 -XX:InitiatingHeapOccupancyPercent=20 -XX:+G1PeriodicGCInvokesConcurrent -XX:G1PeriodicGCInterval=10000 -XX:+UseStringDeduplication -XX:G1PeriodicGCSystemLoadThreshold=70" \
-    JAVA_CUSTOM_OPTS="" \
+    JAVA_TOOL_OPTIONS="-XX:+UnlockExperimentalVMOptions \
+    -XX:MaxRAMPercentage=75 \
+    -XX:InitiatingHeapOccupancyPercent=20 \
+    -XX:+G1PeriodicGCInvokesConcurrent \
+    -XX:G1PeriodicGCInterval=10000 \
+    -XX:+UseStringDeduplication \
+    -XX:G1PeriodicGCSystemLoadThreshold=70" \
     HOME=/home/stirlingpdfuser \
     PUID=1000 \
     PGID=1000 \
-    UMASK=022 \
-    PYTHONPATH=/usr/lib/libreoffice/program:/opt/venv/lib/python3.12/site-packages \
-    UNO_PATH=/usr/lib/libreoffice/program \
-    URE_BOOTSTRAP=file:///usr/lib/libreoffice/program/fundamentalrc \
-    PATH=$PATH:/opt/venv/bin
+    UMASK=022
 
 
 # JDK for app
-RUN echo "@main https://dl-cdn.alpinelinux.org/alpine/edge/main" | tee -a /etc/apk/repositories && \
-    echo "@community https://dl-cdn.alpinelinux.org/alpine/edge/community" | tee -a /etc/apk/repositories && \
+RUN echo "@testing https://dl-cdn.alpinelinux.org/alpine/edge/main" | tee -a /etc/apk/repositories && \
+    echo "@testing https://dl-cdn.alpinelinux.org/alpine/edge/community" | tee -a /etc/apk/repositories && \
     echo "@testing https://dl-cdn.alpinelinux.org/alpine/edge/testing" | tee -a /etc/apk/repositories && \
     apk upgrade --no-cache -a && \
     apk add --no-cache \
-    ca-certificates \
-    tzdata \
-    tini \
-    bash \
-    curl \
-    qpdf \
-    shadow \
-    su-exec \
-    openssl \
-    openssl-dev \
-    openjdk21-jre \
-    # Doc conversion
-    gcompat \
-    libc6-compat \
-    libreoffice \
-    # pdftohtml
-    poppler-utils \
-    # OCR MY PDF (unpaper for descew and other advanced features)
-    tesseract-ocr-data-eng \
-    tesseract-ocr-data-chi_sim \
-	tesseract-ocr-data-deu \
-	tesseract-ocr-data-fra \
-	tesseract-ocr-data-por \
-    # CV
-    py3-opencv \
-    python3 \
-    py3-pip \
-    py3-pillow@testing \
-    py3-pdf2image@testing && \
-    python3 -m venv /opt/venv && \
-    /opt/venv/bin/pip install --upgrade pip setuptools && \
-    /opt/venv/bin/pip install --no-cache-dir --upgrade unoserver weasyprint && \
-    ln -s /usr/lib/libreoffice/program/uno.py /opt/venv/lib/python3.12/site-packages/ && \
-    ln -s /usr/lib/libreoffice/program/unohelper.py /opt/venv/lib/python3.12/site-packages/ && \
-    ln -s /usr/lib/libreoffice/program /opt/venv/lib/python3.12/site-packages/LibreOffice && \
+        ca-certificates \
+        tzdata \
+        tini \
+        bash \
+        curl \
+        qpdf \
+        shadow \
+        su-exec \
+        openssl \
+        openssl-dev \
+        openjdk21-jre \
+# Doc conversion
+		gcompat \
+    	libc6-compat \
+        libreoffice \
+# pdftohtml
+        poppler-utils \
+# OCR MY PDF (unpaper for descew and other advanced features)
+        tesseract-ocr-data-eng \
+# CV
+		py3-opencv \
+# python3/pip
+        python3 \
+        py3-pip && \
+# uno unoconv and HTML
+    pip install --break-system-packages --no-cache-dir --upgrade unoconv WeasyPrint pdf2image pillow && \
     mv /usr/share/tessdata /usr/share/tessdata-original && \
     mkdir -p $HOME /configs /logs /customFiles /pipeline/watchedFolders /pipeline/finishedFolders && \
     fc-cache -f -v && \
     chmod +x /scripts/* && \
     chmod +x /scripts/init.sh && \
-    # User permissions
+# User permissions
     addgroup -S stirlingpdfgroup && adduser -S stirlingpdfuser -G stirlingpdfgroup && \
     chown -R stirlingpdfuser:stirlingpdfgroup $HOME /scripts /usr/share/fonts/opentype/noto /configs /customFiles /pipeline && \
     chown stirlingpdfuser:stirlingpdfgroup /app.jar
@@ -92,4 +84,4 @@ EXPOSE 8080/tcp
 
 # Set user and run command
 ENTRYPOINT ["tini", "--", "/scripts/init.sh"]
-CMD ["sh", "-c", "java -Dfile.encoding=UTF-8 -jar /app.jar & /opt/venv/bin/unoserver --port 2003 --interface 127.0.0.1"]
+CMD ["java", "-Dfile.encoding=UTF-8", "-jar", "/app.jar"]

Dockerfile.dev

@@ -1,55 +0,0 @@
-# dockerfile.dev
-
-# Basisimage: Gradle mit JDK 17 (Debian-basiert)
-FROM gradle:8.14-jdk17
-
-# Als Root-Benutzer arbeiten, um benötigte Pakete zu installieren
-USER root
-
-# Set GRADLE_HOME und füge Gradle zum PATH hinzu
-ENV GRADLE_HOME=/opt/gradle
-ENV PATH="$GRADLE_HOME/bin:$PATH"
-
-# Update und Installation zusätzlicher Pakete (Debian/Ubuntu-basiert)
-RUN apt-get update && apt-get install -y \
-  sudo \
-  libreoffice \
-  poppler-utils \
-  qpdf \
-# settings.yml | tessdataDir: /usr/share/tesseract-ocr/5/tessdata
-  tesseract-ocr \
-  tesseract-ocr-eng \
-  fonts-terminus fonts-dejavu fonts-font-awesome fonts-noto fonts-noto-core fonts-noto-cjk fonts-noto-extra fonts-liberation fonts-linuxlibertine \
-  python3-uno \
-  python3-venv \
-# ss -tln
-  iproute2 \
-  && apt-get clean && rm -rf /var/lib/apt/lists/*
-
-# Setze die Environment Variable für setuptools
-ENV SETUPTOOLS_USE_DISTUTILS=local
-
-# Installation der benötigten Python-Pakete
-RUN python3 -m venv --system-site-packages /opt/venv \
-  && . /opt/venv/bin/activate \
-  && pip install --upgrade pip setuptools \
-  && pip install --no-cache-dir WeasyPrint pdf2image pillow unoserver opencv-python-headless pre-commit
-
-# Füge den venv-Pfad zur globalen PATH-Variable hinzu, damit die Tools verfügbar sind
-ENV PATH="/opt/venv/bin:$PATH"
-
-COPY . /workspace
-
-RUN adduser --disabled-password --gecos '' devuser \
-  && chown -R devuser:devuser /home/devuser /workspace
-RUN echo "devuser ALL=(ALL) NOPASSWD:ALL" > /etc/sudoers.d/devuser \
-  && chmod 0440 /etc/sudoers.d/devuser
-
-# Setze das Arbeitsverzeichnis (wird später per Bind-Mount überschrieben)
-WORKDIR /workspace
-
-RUN chmod +x /workspace/.devcontainer/git-init.sh
-RUN sudo chmod +x /workspace/.devcontainer/init-setup.sh
-
-# Wechsel zum Nicht‑Root Benutzer
-USER devuser

Dockerfile.fat

@@ -1,11 +1,5 @@
 # Build the application
-FROM gradle:8.14-jdk21 AS build
-
-COPY build.gradle .
-COPY settings.gradle .
-COPY gradlew .
-COPY gradle gradle/
-RUN ./gradlew build -x spotlessApply -x spotlessCheck -x test -x sonarqube || return 0
+FROM gradle:8.12-jdk17 AS build
 
 # Set the working directory
 WORKDIR /app
@@ -15,11 +9,10 @@ COPY . .
 
 # Build the application with DOCKER_ENABLE_SECURITY=false
 RUN DOCKER_ENABLE_SECURITY=true \
-    STIRLING_PDF_DESKTOP_UI=false \
-    ./gradlew clean build -x spotlessApply -x spotlessCheck -x test -x sonarqube
+./gradlew clean build
 
 # Main stage
-FROM alpine:3.22.0@sha256:8a1f59ffb675680d47db6337b49d22281a139e9d709335b492be023728e11715
+FROM alpine:3.21.2@sha256:56fa17d2a7e7f168a043a2712e63aed1f8543aeafdcee47c58dcffe38ed51099
 
 # Copy necessary files
 COPY scripts /scripts
@@ -32,73 +25,66 @@ ARG VERSION_TAG
 # Set Environment Variables
 ENV DOCKER_ENABLE_SECURITY=false \
     VERSION_TAG=$VERSION_TAG \
-    JAVA_BASE_OPTS="-XX:+UnlockExperimentalVMOptions -XX:MaxRAMPercentage=75 -XX:InitiatingHeapOccupancyPercent=20 -XX:+G1PeriodicGCInvokesConcurrent -XX:G1PeriodicGCInterval=10000 -XX:+UseStringDeduplication -XX:G1PeriodicGCSystemLoadThreshold=70" \
-    JAVA_CUSTOM_OPTS="" \
+    JAVA_TOOL_OPTIONS="-XX:+UnlockExperimentalVMOptions \
+    -XX:MaxRAMPercentage=75 \
+    -XX:InitiatingHeapOccupancyPercent=20 \
+    -XX:+G1PeriodicGCInvokesConcurrent \
+    -XX:G1PeriodicGCInterval=10000 \
+    -XX:+UseStringDeduplication \
+    -XX:G1PeriodicGCSystemLoadThreshold=70" \
     HOME=/home/stirlingpdfuser \
     PUID=1000 \
     PGID=1000 \
     UMASK=022 \
     FAT_DOCKER=true \
-    INSTALL_BOOK_AND_ADVANCED_HTML_OPS=false \
-    PYTHONPATH=/usr/lib/libreoffice/program:/opt/venv/lib/python3.12/site-packages \
-    UNO_PATH=/usr/lib/libreoffice/program \
-    URE_BOOTSTRAP=file:///usr/lib/libreoffice/program/fundamentalrc \
-    PATH=$PATH:/opt/venv/bin
+    INSTALL_BOOK_AND_ADVANCED_HTML_OPS=false
 
 
 # JDK for app
-RUN echo "@main https://dl-cdn.alpinelinux.org/alpine/edge/main" | tee -a /etc/apk/repositories && \
-    echo "@community https://dl-cdn.alpinelinux.org/alpine/edge/community" | tee -a /etc/apk/repositories && \
+RUN echo "@testing https://dl-cdn.alpinelinux.org/alpine/edge/main" | tee -a /etc/apk/repositories && \
+    echo "@testing https://dl-cdn.alpinelinux.org/alpine/edge/community" | tee -a /etc/apk/repositories && \
     echo "@testing https://dl-cdn.alpinelinux.org/alpine/edge/testing" | tee -a /etc/apk/repositories && \
     apk upgrade --no-cache -a && \
     apk add --no-cache \
-    ca-certificates \
-    tzdata \
-    tini \
-    bash \
-    curl \
-    shadow \
-    su-exec \
-    openssl \
-    openssl-dev \
-    openjdk21-jre \
-    # Doc conversion
-    gcompat \
-    libc6-compat \
-    libreoffice \
-    # pdftohtml
-    poppler-utils \
-    # OCR MY PDF (unpaper for descew and other advanced featues)
-    qpdf \
-    tesseract-ocr-data-eng \
-    tesseract-ocr-data-chi_sim \
-	tesseract-ocr-data-deu \
-	tesseract-ocr-data-fra \
-	tesseract-ocr-data-por \
-    font-terminus font-dejavu font-noto font-noto-cjk font-awesome font-noto-extra font-liberation font-linux-libertine \
-    # CV
-    py3-opencv \
-    python3 \
-    py3-pip \
-    py3-pillow@testing \
-    py3-pdf2image@testing && \
-    python3 -m venv /opt/venv && \
-    /opt/venv/bin/pip install --upgrade pip setuptools && \
-    /opt/venv/bin/pip install --no-cache-dir --upgrade unoserver weasyprint && \
-    ln -s /usr/lib/libreoffice/program/uno.py /opt/venv/lib/python3.12/site-packages/ && \
-    ln -s /usr/lib/libreoffice/program/unohelper.py /opt/venv/lib/python3.12/site-packages/ && \
-    ln -s /usr/lib/libreoffice/program /opt/venv/lib/python3.12/site-packages/LibreOffice && \
+        ca-certificates \
+        tzdata \
+        tini \
+        bash \
+        curl \
+        shadow \
+        su-exec \
+        openssl \
+        openssl-dev \
+        openjdk21-jre \
+# Doc conversion
+		gcompat \
+    	libc6-compat \
+        libreoffice \
+# pdftohtml
+        poppler-utils \
+# OCR MY PDF (unpaper for descew and other advanced featues)
+        qpdf \
+        tesseract-ocr-data-eng \
+        font-terminus font-dejavu font-noto font-noto-cjk font-awesome font-noto-extra \
+# CV
+		py3-opencv \
+# python3/pip
+        python3 \
+    py3-pip && \
+# uno unoconv and HTML
+    pip install --break-system-packages --no-cache-dir --upgrade unoconv WeasyPrint pdf2image pillow && \
     mv /usr/share/tessdata /usr/share/tessdata-original && \
     mkdir -p $HOME /configs /logs /customFiles /pipeline/watchedFolders /pipeline/finishedFolders && \
     fc-cache -f -v && \
     chmod +x /scripts/* && \
     chmod +x /scripts/init.sh && \
-    # User permissions
+# User permissions
     addgroup -S stirlingpdfgroup && adduser -S stirlingpdfuser -G stirlingpdfgroup && \
     chown -R stirlingpdfuser:stirlingpdfgroup $HOME /scripts /usr/share/fonts/opentype/noto /configs /customFiles /pipeline && \
     chown stirlingpdfuser:stirlingpdfgroup /app.jar
 
 EXPOSE 8080/tcp
+
 # Set user and run command
 ENTRYPOINT ["tini", "--", "/scripts/init.sh"]
-CMD ["sh", "-c", "java -Dfile.encoding=UTF-8 -jar /app.jar & /opt/venv/bin/unoserver --port 2003 --interface 127.0.0.1"]
+CMD ["java", "-Dfile.encoding=UTF-8", "-jar", "/app.jar"]

Dockerfile.ultra-lite

@@ -1,5 +1,5 @@
 # use alpine
-FROM alpine:3.22.0@sha256:8a1f59ffb675680d47db6337b49d22281a139e9d709335b492be023728e11715
+FROM alpine:3.21.2@sha256:56fa17d2a7e7f168a043a2712e63aed1f8543aeafdcee47c58dcffe38ed51099
 
 ARG VERSION_TAG
 
@@ -7,8 +7,13 @@ ARG VERSION_TAG
 ENV DOCKER_ENABLE_SECURITY=false \
     HOME=/home/stirlingpdfuser \
     VERSION_TAG=$VERSION_TAG \
-    JAVA_BASE_OPTS="-XX:+UnlockExperimentalVMOptions -XX:MaxRAMPercentage=75 -XX:InitiatingHeapOccupancyPercent=20 -XX:+G1PeriodicGCInvokesConcurrent -XX:G1PeriodicGCInterval=10000 -XX:+UseStringDeduplication -XX:G1PeriodicGCSystemLoadThreshold=70" \
-    JAVA_CUSTOM_OPTS="" \
+    JAVA_TOOL_OPTIONS="-XX:+UnlockExperimentalVMOptions \
+    -XX:MaxRAMPercentage=75 \
+    -XX:InitiatingHeapOccupancyPercent=20 \
+    -XX:+G1PeriodicGCInvokesConcurrent \
+    -XX:G1PeriodicGCInterval=10000 \
+    -XX:+UseStringDeduplication \
+    -XX:G1PeriodicGCSystemLoadThreshold=70" \
     PUID=1000 \
     PGID=1000 \
     UMASK=022

Dockerfile2

@@ -0,0 +1,108 @@
+# Intermediate stage for running dos2unix
+FROM alpine:3.14 AS dos2unix-converter
+
+# Install dos2unix
+RUN apk add --no-cache dos2unix
+
+# Copy script files
+COPY ./scripts/* /dos2unix-scripts/
+
+# Convert line endings
+RUN dos2unix /dos2unix-scripts/*
+
+
+
+# Build stage
+FROM alpine:3.14 AS downloader
+
+# Install necessary utilities
+RUN apk add --no-cache curl jq 
+
+# Set work directory
+WORKDIR /downloader
+
+# Fetch the latest release jar from GitHub
+RUN curl -s https://api.github.com/repos/Stirling-Tools/Stirling-PDF/releases/latest \
+    | jq -r ".assets[] | select(.name == \"Stirling-PDF.jar\") | .browser_download_url" \
+    | xargs curl -L -o Stirling-PDF.jar
+
+
+# Main stage
+FROM alpine:3.21.2@sha256:56fa17d2a7e7f168a043a2712e63aed1f8543aeafdcee47c58dcffe38ed51099
+
+# Copy necessary files
+COPY scripts /scripts
+COPY pipeline /pipeline
+COPY src/main/resources/static/fonts/*.ttf /usr/share/fonts/opentype/noto/
+
+# Copy the application JAR file from the download stage
+COPY --from=downloader /downloader/Stirling-PDF.jar /app.jar
+
+ARG VERSION_TAG
+
+# Set Environment Variables
+ENV DOCKER_ENABLE_SECURITY=false \
+    VERSION_TAG=$VERSION_TAG \
+    JAVA_TOOL_OPTIONS="-XX:+UnlockExperimentalVMOptions \
+    -XX:MaxRAMPercentage=75 \
+    -XX:InitiatingHeapOccupancyPercent=20 \
+    -XX:+G1PeriodicGCInvokesConcurrent \
+    -XX:G1PeriodicGCInterval=10000 \
+    -XX:+UseStringDeduplication \
+    -XX:G1PeriodicGCSystemLoadThreshold=70" \
+    HOME=/home/stirlingpdfuser \
+    PUID=1000 \
+    PGID=1000 \
+    UMASK=022 \
+    FAT_DOCKER=true \
+    INSTALL_BOOK_AND_ADVANCED_HTML_OPS=false
+
+
+# JDK for app
+RUN echo "@testing https://dl-cdn.alpinelinux.org/alpine/edge/main" | tee -a /etc/apk/repositories && \
+    echo "@testing https://dl-cdn.alpinelinux.org/alpine/edge/community" | tee -a /etc/apk/repositories && \
+    echo "@testing https://dl-cdn.alpinelinux.org/alpine/edge/testing" | tee -a /etc/apk/repositories && \
+    apk upgrade --no-cache -a && \
+    apk add --no-cache \
+        ca-certificates \
+        tzdata \
+        tini \
+        bash \
+        curl \
+        shadow \
+        su-exec \
+        openssl \
+        openssl-dev \
+        openjdk21-jre \
+# Doc conversion
+		gcompat \
+    	libc6-compat \
+        libreoffice \
+# pdftohtml
+        poppler-utils \
+# OCR MY PDF (unpaper for descew and other advanced featues)
+        qpdf \
+        tesseract-ocr-data-eng \
+        font-terminus font-dejavu font-noto font-noto-cjk font-awesome font-noto-extra \
+# CV
+# py3-opencv \
+# python3/pip
+        python3 \
+    py3-pip && \
+# uno unoconv and HTML
+    pip install --break-system-packages --no-cache-dir --upgrade unoconv WeasyPrint pdf2image pillow && \
+    mv /usr/share/tessdata /usr/share/tessdata-original && \
+    mkdir -p $HOME /configs /logs /customFiles /pipeline/watchedFolders /pipeline/finishedFolders && \
+    fc-cache -f -v && \
+    chmod +x /scripts/* && \
+    chmod +x /scripts/init.sh && \
+# User permissions
+    addgroup -S stirlingpdfgroup && adduser -S stirlingpdfuser -G stirlingpdfgroup && \
+    chown -R stirlingpdfuser:stirlingpdfgroup $HOME /scripts /usr/share/fonts/opentype/noto /configs /customFiles /pipeline && \
+    chown stirlingpdfuser:stirlingpdfgroup /app.jar
+
+EXPOSE 8080/tcp
+
+# Set user and run command
+ENTRYPOINT ["tini", "--", "/scripts/init.sh"]
+CMD ["java", "-Dfile.encoding=UTF-8", "-jar", "/app.jar"]

HowToAddNewLanguage.md

@@ -11,12 +11,14 @@ Fork Stirling-PDF and create a new branch out of `main`.
 Then add a reference to the language in the navbar by adding a new language entry to the dropdown:
 
 - Edit the file: [languages.html](https://github.com/Stirling-Tools/Stirling-PDF/blob/main/src/main/resources/templates/fragments/languages.html)
+- Add a flag SVG file to: [flags directory](https://github.com/Stirling-Tools/Stirling-PDF/tree/main/src/main/resources/static/images/flags)
 
+Any SVG flags are fine; most of the current ones were sourced from [here](https://flagicons.lipis.dev/). If your language isn't represented by a flag, choose a similar one, such as Saudi Arabia's flag for Arabic.
 
 For example, to add Polish, you would add:
 
 ```html
-<div th:replace="~{fragments/languageEntry :: languageEntry ('pl_PL', 'Polski')}" ></div>
+<a th:if="${#lists.isEmpty(@languages) or #lists.contains(@languages, 'pl_PL')}" class="dropdown-item lang_dropdown-item" href="" data-bs-language-code="pl_PL"> <img th:src="@{'/images/flags/pl.svg'}" alt="icon" width="20" height="15"> Polski</a>
 ```
 
 The `data-bs-language-code` is the code used to reference the file in the next step.

README.md

@@ -3,6 +3,7 @@
 
 [![Docker Pulls](https://img.shields.io/docker/pulls/frooodle/s-pdf)](https://hub.docker.com/r/frooodle/s-pdf)
 [![Discord](https://img.shields.io/discord/1068636748814483718?label=Discord)](https://discord.gg/HYmhKj45pU)
+[![Docker Image Version (tag latest semver)](https://img.shields.io/docker/v/frooodle/s-pdf/latest)](https://github.com/Stirling-Tools/Stirling-PDF/)
 [![OpenSSF Scorecard](https://api.scorecard.dev/projects/github.com/Stirling-Tools/Stirling-PDF/badge)](https://scorecard.dev/viewer/?uri=github.com/Stirling-Tools/Stirling-PDF)
 [![GitHub Repo stars](https://img.shields.io/github/stars/stirling-tools/stirling-pdf?style=social)](https://github.com/Stirling-Tools/stirling-pdf)
 
@@ -112,56 +113,56 @@ Visit our comprehensive documentation at [docs.stirlingpdf.com](https://docs.sti
 
 ## Supported Languages
 
-Stirling-PDF currently supports 40 languages!
+Stirling-PDF currently supports 39 languages!
 
 | Language                                     | Progress                               |
 | -------------------------------------------- | -------------------------------------- |
-| Arabic (العربية) (ar_AR)                        | ![73%](https://geps.dev/progress/73)   |
-| Azerbaijani (Azərbaycan Dili) (az_AZ)        | ![74%](https://geps.dev/progress/74)   |
-| Basque (Euskara) (eu_ES)                     | ![43%](https://geps.dev/progress/43)   |
-| Bulgarian (Български) (bg_BG)                | ![81%](https://geps.dev/progress/81)   |
-| Catalan (Català) (ca_CA)                     | ![81%](https://geps.dev/progress/81)   |
-| Croatian (Hrvatski) (hr_HR)                  | ![72%](https://geps.dev/progress/72)   |
-| Czech (Česky) (cs_CZ)                        | ![83%](https://geps.dev/progress/83)   |
-| Danish (Dansk) (da_DK)                       | ![73%](https://geps.dev/progress/73)   |
-| Dutch (Nederlands) (nl_NL)                   | ![71%](https://geps.dev/progress/71)   |
+| Arabic (العربية) (ar_AR)                        | ![89%](https://geps.dev/progress/89)   |
+| Azerbaijani (Azərbaycan Dili) (az_AZ)        | ![88%](https://geps.dev/progress/88)   |
+| Basque (Euskara) (eu_ES)                     | ![51%](https://geps.dev/progress/51)   |
+| Bulgarian (Български) (bg_BG)                | ![85%](https://geps.dev/progress/85)   |
+| Catalan (Català) (ca_CA)                     | ![80%](https://geps.dev/progress/80)   |
+| Croatian (Hrvatski) (hr_HR)                  | ![87%](https://geps.dev/progress/87)   |
+| Czech (Česky) (cs_CZ)                        | ![98%](https://geps.dev/progress/98)   |
+| Danish (Dansk) (da_DK)                       | ![86%](https://geps.dev/progress/86)   |
+| Dutch (Nederlands) (nl_NL)                   | ![85%](https://geps.dev/progress/85)   |
 | English (English) (en_GB)                    | ![100%](https://geps.dev/progress/100) |
 | English (US) (en_US)                         | ![100%](https://geps.dev/progress/100) |
-| French (Français) (fr_FR)                    | ![82%](https://geps.dev/progress/82)   |
-| German (Deutsch) (de_DE)                     | ![89%](https://geps.dev/progress/89)   |
-| Greek (Ελληνικά) (el_GR)                     | ![80%](https://geps.dev/progress/80)   |
-| Hindi (हिंदी) (hi_IN)                          | ![80%](https://geps.dev/progress/80)   |
-| Hungarian (Magyar) (hu_HU)                   | ![87%](https://geps.dev/progress/87)   |
-| Indonesian (Bahasa Indonesia) (id_ID)        | ![74%](https://geps.dev/progress/74)   |
-| Irish (Gaeilge) (ga_IE)                      | ![81%](https://geps.dev/progress/81)   |
-| Italian (Italiano) (it_IT)                   | ![95%](https://geps.dev/progress/95)   |
-| Japanese (日本語) (ja_JP)                    | ![82%](https://geps.dev/progress/82)   |
-| Korean (한국어) (ko_KR)                      | ![80%](https://geps.dev/progress/80)   |
-| Norwegian (Norsk) (no_NB)                    | ![78%](https://geps.dev/progress/78)   |
-| Persian (فارسی) (fa_IR)                      | ![76%](https://geps.dev/progress/76)   |
+| French (Français) (fr_FR)                    | ![96%](https://geps.dev/progress/96)   |
+| German (Deutsch) (de_DE)                     | ![99%](https://geps.dev/progress/99)   |
+| Greek (Ελληνικά) (el_GR)                     | ![98%](https://geps.dev/progress/98)   |
+| Hindi (हिंदी) (hi_IN)                          | ![98%](https://geps.dev/progress/98)   |
+| Hungarian (Magyar) (hu_HU)                   | ![95%](https://geps.dev/progress/95)   |
+| Indonesian (Bahasa Indonesia) (id_ID)        | ![86%](https://geps.dev/progress/86)   |
+| Irish (Gaeilge) (ga_IE)                      | ![98%](https://geps.dev/progress/98)   |
+| Italian (Italiano) (it_IT)                   | ![99%](https://geps.dev/progress/99)   |
+| Japanese (日本語) (ja_JP)                    | ![93%](https://geps.dev/progress/93)   |
+| Korean (한국어) (ko_KR)                      | ![99%](https://geps.dev/progress/99)   |
+| Norwegian (Norsk) (no_NB)                    | ![79%](https://geps.dev/progress/79)   |
+| Persian (فارسی) (fa_IR)                      | ![94%](https://geps.dev/progress/94)   |
 | Polish (Polski) (pl_PL)                      | ![86%](https://geps.dev/progress/86)   |
-| Portuguese (Português) (pt_PT)               | ![82%](https://geps.dev/progress/82)   |
-| Portuguese Brazilian (Português) (pt_BR)     | ![87%](https://geps.dev/progress/87)   |
-| Romanian (Română) (ro_RO)                    | ![68%](https://geps.dev/progress/68)   |
-| Russian (Русский) (ru_RU)                    | ![87%](https://geps.dev/progress/87)   |
-| Serbian Latin alphabet (Srpski) (sr_LATN_RS) | ![52%](https://geps.dev/progress/52)   |
-| Simplified Chinese (简体中文) (zh_CN)         | ![86%](https://geps.dev/progress/86)   |
-| Slovakian (Slovensky) (sk_SK)                | ![61%](https://geps.dev/progress/61)   |
-| Slovenian (Slovenščina) (sl_SI)              | ![85%](https://geps.dev/progress/85)   |
-| Spanish (Español) (es_ES)                    | ![88%](https://geps.dev/progress/88)   |
-| Swedish (Svenska) (sv_SE)                    | ![78%](https://geps.dev/progress/78)   |
-| Thai (ไทย) (th_TH)                           | ![70%](https://geps.dev/progress/70)   |
-| Tibetan (བོད་ཡིག་) (bo_CN)                     | ![77%](https://geps.dev/progress/77) |
-| Traditional Chinese (繁體中文) (zh_TW)        | ![87%](https://geps.dev/progress/87)   |
-| Turkish (Türkçe) (tr_TR)                     | ![87%](https://geps.dev/progress/87)   |
-| Ukrainian (Українська) (uk_UA)               | ![87%](https://geps.dev/progress/87)   |
-| Vietnamese (Tiếng Việt) (vi_VN)              | ![68%](https://geps.dev/progress/68)   |
-| Malayalam (മലയാളം) (ml_IN)              | ![87%](https://geps.dev/progress/87)   |
+| Portuguese (Português) (pt_PT)               | ![97%](https://geps.dev/progress/97)   |
+| Portuguese Brazilian (Português) (pt_BR)     | ![98%](https://geps.dev/progress/98)   |
+| Romanian (Română) (ro_RO)                    | ![81%](https://geps.dev/progress/81)   |
+| Russian (Русский) (ru_RU)                    | ![98%](https://geps.dev/progress/98)   |
+| Serbian Latin alphabet (Srpski) (sr_LATN_RS) | ![64%](https://geps.dev/progress/64)   |
+| Simplified Chinese (简体中文) (zh_CN)         | ![89%](https://geps.dev/progress/89)   |
+| Slovakian (Slovensky) (sk_SK)                | ![74%](https://geps.dev/progress/74)   |
+| Slovenian (Slovenščina) (sl_SI)              | ![97%](https://geps.dev/progress/97)   |
+| Spanish (Español) (es_ES)                    | ![87%](https://geps.dev/progress/87)   |
+| Swedish (Svenska) (sv_SE)                    | ![87%](https://geps.dev/progress/87)   |
+| Thai (ไทย) (th_TH)                           | ![86%](https://geps.dev/progress/86)   |
+| Tibetan (བོད་ཡིག་) (zh_BO)                     | ![95%](https://geps.dev/progress/95) |
+| Traditional Chinese (繁體中文) (zh_TW)        | ![98%](https://geps.dev/progress/98)   |
+| Turkish (Türkçe) (tr_TR)                     | ![82%](https://geps.dev/progress/82)   |
+| Ukrainian (Українська) (uk_UA)               | ![72%](https://geps.dev/progress/72)   |
+| Vietnamese (Tiếng Việt) (vi_VN)              | ![79%](https://geps.dev/progress/79)   |
+
 
 ## Stirling PDF Enterprise
 
 Stirling PDF offers an Enterprise edition of its software. This is the same great software but with added features, support and comforts.
-Check out our [Enterprise docs](https://docs.stirlingpdf.com/Pro)
+Check out our [Enterprise docs](https://docs.stirlingpdf.com/Enterprise%20Edition)
 
 
 ## 🤝 Looking to contribute?

build.gradle

@@ -1,36 +1,32 @@
 plugins {
     id "java"
-    id "jacoco"
-    id "org.springframework.boot" version "3.5.0"
+    id "org.springframework.boot" version "3.4.1"
     id "io.spring.dependency-management" version "1.1.7"
-    id "org.springdoc.openapi-gradle-plugin" version "1.9.0"
+    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.6"
-    id "com.diffplug.spotless" version "7.0.4"
+    id "com.diffplug.spotless" version "7.0.2"
     id "com.github.jk1.dependency-license-report" version "2.9"
     //id "nebula.lint" version "19.0.3"
     id("org.panteleyev.jpackageplugin") version "1.6.1"
-    id "org.sonarqube" version "6.2.0.5505"
+    id "org.sonarqube" version "6.0.1.5171"
 }
 
 import com.github.jk1.license.render.*
-import org.gradle.internal.os.OperatingSystem
-import java.nio.file.Files
-import java.time.Year
 
 ext {
-    springBootVersion = "3.5.0"
-    pdfboxVersion = "3.0.5"
+    springBootVersion = "3.4.1"
+    pdfboxVersion = "3.0.4"
+    logbackVersion = "1.5.7"
     imageioVersion = "3.12.0"
-    lombokVersion = "1.18.38"
+    lombokVersion = "1.18.36"
     bouncycastleVersion = "1.80"
-    springSecuritySamlVersion = "6.5.0"
+    springSecuritySamlVersion = "6.4.2"
     openSamlVersion = "4.3.2"
-    tempJrePath = null
 }
 
 group = "stirling.software"
-version = "0.46.2"
+version = "0.41.0"
 
 java {
     // 17 is lowest but we support and recommend 21
@@ -52,20 +48,16 @@ sourceSets {
     main {
         java {
             if (System.getenv("DOCKER_ENABLE_SECURITY") == "false") {
-                exclude "stirling/software/SPDF/config/interfaces/DatabaseInterface.java"
                 exclude "stirling/software/SPDF/config/security/**"
                 exclude "stirling/software/SPDF/controller/api/DatabaseController.java"
-                exclude "stirling/software/SPDF/controller/api/EmailController.java"
-                exclude "stirling/software/SPDF/controller/api/H2SQLCondition.java"
                 exclude "stirling/software/SPDF/controller/api/UserController.java"
+                exclude "stirling/software/SPDF/controller/api/H2SQLCondition.java"
                 exclude "stirling/software/SPDF/controller/web/AccountWebController.java"
                 exclude "stirling/software/SPDF/controller/web/DatabaseWebController.java"
-                exclude "stirling/software/SPDF/model/api/Email.java"
                 exclude "stirling/software/SPDF/model/ApiKeyAuthenticationToken.java"
                 exclude "stirling/software/SPDF/model/AttemptCounter.java"
                 exclude "stirling/software/SPDF/model/Authority.java"
-                exclude "stirling/software/SPDF/model/exception/BackupNotFoundException.java"
-                exclude "stirling/software/SPDF/model/exception/NoProviderFoundException.java"
+                exclude "stirling/software/SPDF/model/BackupNotFoundException.java"
                 exclude "stirling/software/SPDF/model/PersistentLogin.java"
                 exclude "stirling/software/SPDF/model/SessionEntity.java"
                 exclude "stirling/software/SPDF/model/User.java"
@@ -83,8 +75,16 @@ sourceSets {
         java {
             if (System.getenv("DOCKER_ENABLE_SECURITY") == "false") {
                 exclude "stirling/software/SPDF/config/security/**"
+                exclude "stirling/software/SPDF/controller/api/UserControllerTest.java"
+                exclude "stirling/software/SPDF/controller/api/DatabaseControllerTest.java"
+                exclude "stirling/software/SPDF/controller/web/AccountWebControllerTest.java"
+                exclude "stirling/software/SPDF/controller/web/DatabaseWebControllerTest.java"
                 exclude "stirling/software/SPDF/model/ApiKeyAuthenticationTokenTest.java"
-                exclude "stirling/software/SPDF/controller/api/EmailControllerTest.java"
+                exclude "stirling/software/SPDF/model/AttemptCounterTest.java"
+                exclude "stirling/software/SPDF/model/AuthorityTest.java"
+                exclude "stirling/software/SPDF/model/PersistentLoginTest.java"
+                exclude "stirling/software/SPDF/model/SessionEntityTest.java"
+                exclude "stirling/software/SPDF/model/UserTest.java"
                 exclude "stirling/software/SPDF/repository/**"
             }
 
@@ -99,12 +99,11 @@ openApi {
     apiDocsUrl = "http://localhost:8080/v1/api-docs"
     outputDir = file("$projectDir")
     outputFileName = "SwaggerDoc.json"
-    waitTimeInSeconds = 60 // Increase the wait time to 60 seconds
 }
 
 //0.11.5 to 2024.11.5
-static def getMacVersion(String version) {
-    def currentYear = Year.now().getValue()
+def getMacVersion(String version) {
+    def currentYear = java.time.Year.now().getValue()
     def versionParts = version.split("\\.", 2)
     return "${currentYear}.${versionParts.length > 1 ? versionParts[1] : versionParts[0]}"
 }
@@ -113,10 +112,9 @@ jpackage {
     input = "build/libs"
     destination = "${projectDir}/build/jpackage"
     mainJar = "Stirling-PDF-${project.version}.jar"
-    appName = "Stirling PDF"
+    appName = "Stirling-PDF"
     appVersion = project.version
-//    appVersion = "2005.45.1"
-    vendor = "Stirling PDF Inc"
+    vendor = "Stirling-Software"
     appDescription = "Stirling PDF - Your Local PDF Editor"
     icon = "src/main/resources/static/favicon.ico"
     verbose = true
@@ -148,7 +146,7 @@ jpackage {
         winShortcutPrompt = true  // Lets user choose whether to create shortcuts
         winDirChooser = true  // Allows users to choose installation directory
         winPerUserInstall = false
-        winMenuGroup = "Stirling PDF"
+        winMenuGroup = "Stirling Software"
         winUpgradeUuid = "2a43ed0c-b8c2-40cf-89e1-751129b87641" // Unique identifier for updates
         winHelpUrl = "https://github.com/Stirling-Tools/Stirling-PDF"
         winUpdateUrl = "https://github.com/Stirling-Tools/Stirling-PDF/releases"
@@ -161,21 +159,23 @@ jpackage {
         appVersion = getMacVersion(project.version.toString())
         icon = "src/main/resources/static/favicon.icns"
         type = "dmg"
-        macPackageIdentifier = "Stirling PDF"
-        macPackageName = "Stirling PDF"
+        macPackageIdentifier = "com.stirling.software.pdf"
+        macPackageName = "Stirling-PDF"
         macAppCategory = "public.app-category.productivity"
         macSign = false // Enable signing
         macAppStore = false // Not targeting App Store initially
 
-//        // Add license and other documentation to DMG
-//        /*macDmgContent = [
-//            "README.md",
-//            "LICENSE",
-//            "CHANGELOG.md"
-//        ]*/
-//
-//        // Enable Mac-specific entitlements
-//        //macEntitlements = "entitlements.plist" // You'll need to create this file
+        //installDir = "Applications"
+
+        // Add license and other documentation to DMG
+        /*macDmgContent = [
+            "README.md",
+            "LICENSE",
+            "CHANGELOG.md"
+        ]*/
+
+        // Enable Mac-specific entitlements
+        //macEntitlements = "entitlements.plist" // You'll need to create this file
     }
 
     // Linux-specific configuration
@@ -221,123 +221,6 @@ jpackage {
     licenseFile = "LICENSE"
 }
 
-tasks.register('jpackageMacX64') {
-    group = 'distribution'
-    description = 'Packages app for MacOS x86_64'
-
-    println "Running jpackageMacX64 task"
-
-    if (OperatingSystem.current().isMacOsX()) {
-        println "MacOS detected. Downloading temp JRE."
-        dependsOn("downloadTempJre")
-    } else {
-        return
-    }
-
-    doLast {
-        def jrePath = project.ext.tempJrePath
-
-        if (!jrePath) {
-            throw new GradleException("JRE path not found.")
-        }
-
-        def outputStream = new ByteArrayOutputStream()
-        def errorStream = new ByteArrayOutputStream()
-
-        def result = exec {
-            commandLine 'jpackage',
-                '--type', 'dmg',
-                '--name', 'Stirling PDF (x86_64)',
-                '--input', 'build/libs',
-                '--main-jar', "Stirling-PDF-${project.version}.jar",
-                '--main-class', 'org.springframework.boot.loader.launch.JarLauncher',
-                '--runtime-image', file(jrePath + "/zulu-17.jre/Contents/Home"),
-                '--dest', 'build/jpackage/x86_64',
-                '--icon', 'src/main/resources/static/favicon.icns',
-                '--app-version', getMacVersion(project.version.toString()),
-                '--mac-package-name', 'Stirling PDF (x86_64)',
-                '--mac-package-identifier', 'Stirling PDF (x86_64)',
-                '--mac-app-category', 'public.app-category.productivity',
-
-                // Java options
-                '--java-options', '-DBROWSER_OPEN=true',
-                '--java-options', '-DSTIRLING_PDF_DESKTOP_UI=true',
-                '--java-options', '-Djava.awt.headless=false',
-                '--java-options', '-Dapple.awt.UIElement=true',
-                '--java-options', '--add-opens=java.base/java.lang=ALL-UNNAMED',
-                '--java-options', '--add-opens=java.desktop/java.awt.event=ALL-UNNAMED',
-                '--java-options', '--add-opens=java.desktop/sun.awt=ALL-UNNAMED',
-                '--java-options', '--add-opens=java.desktop/sun.awt.X11=ALL-UNNAMED',
-                '--java-options', '--add-opens=java.desktop/sun.awt.windows=ALL-UNNAMED',
-                '--java-options', '--add-opens=java.desktop/sun.lwawt=ALL-UNNAMED',
-                '--java-options', '--add-opens=java.desktop/sun.lwawt.macosx=ALL-UNNAMED'
-
-            standardOutput = outputStream
-            errorOutput = errorStream
-            ignoreExitValue = true
-        }
-
-        def stdout = outputStream.toString("UTF-8")
-        def stderr = errorStream.toString("UTF-8")
-
-        if (!stdout.isBlank()) {
-            println "jpackage stdout:\n$stdout"
-        }
-
-        if (result.exitValue != 0) {
-            throw new GradleException("jpackage failed with exit code ${result.exitValue}.\n\n$stderr")
-        }
-    }
-}
-
-//jpackage.finalizedBy(jpackageMacX64)
-
-tasks.register('downloadTempJre') {
-    group = 'distribution'
-    description = 'Downloads and extracts a temporary JRE'
-
-    doLast {
-        try {
-            def jreUrl = 'https://cdn.azul.com/zulu/bin/zulu17.56.15-ca-jre17.0.14-macosx_x64.tar.gz'
-            def tmpDir = Files.createTempDirectory('zulu-jre').toFile()
-            def jreArchive = new File(tmpDir, 'jre.tar.gz')
-            def jreDir = new File(tmpDir, 'jre')
-
-            println "🔽 Downloading JRE to $jreArchive..."
-            jreArchive.withOutputStream { out ->
-                new URI(jreUrl).toURL().withInputStream { from -> out << from }
-            }
-
-            println "📦 Extracting JRE to $jreDir..."
-            jreDir.mkdirs()
-            providers.exec {
-                commandLine 'tar', '-xzf', jreArchive.absolutePath, '-C', jreDir.absolutePath, '--strip-components=1'
-            }.result.get()
-
-            println "✅ JRE ready at: $jreDir"
-            ext.tempJrePath = jreDir.absolutePath
-            project.ext.tempJrePath = jreDir.absolutePath
-        } catch (Exception e) {
-            println "Failed to download JRE. ${e.getLocalizedMessage()}"
-            cleanTempJre
-        }
-    }
-}
-
-tasks.register('cleanTempJre') {
-    dependsOn('jpackageMacX64')
-    group = 'distribution'
-    description = 'Deletes the temporary JRE'
-
-    doLast {
-        def path = project.ext.tempJrePath
-
-        if (path && new File("$path").exists()) {
-            println "Cleaning up temporary JRE: $path"
-            new File("$path").parentFile.deleteDir()
-        }
-    }
-}
 
 launch4j {
     icon = "${projectDir}/src/main/resources/static/favicon.ico"
@@ -374,12 +257,11 @@ launch4j {
 
 spotless {
     java {
-        target sourceSets.main.allJava
-        target project(':common').sourceSets.main.allJava
+        target project.fileTree('src/main/java')
 
-        googleJavaFormat("1.27.0").aosp().reorderImports(false)
+        googleJavaFormat("1.25.2").aosp().reorderImports(false)
 
-        importOrder("java", "javax", "org", "com", "net", "io", "jakarta", "lombok", "me", "stirling")
+        importOrder("java", "javax", "org", "com", "net", "io")
         toggleOffOn()
         trimTrailingWhitespace()
         leadingTabsToSpaces()
@@ -391,7 +273,7 @@ sonar {
     properties {
         property "sonar.projectKey", "Stirling-Tools_Stirling-PDF"
         property "sonar.organization", "stirling-tools"
-
+        
         property "sonar.exclusions", "**/build-wrapper-dump.json, src/main/java/org/apache/**, src/main/resources/static/pdfjs/**, src/main/resources/static/pdfjs-legacy/**, src/main/resources/static/js/thirdParty/**"
         property "sonar.coverage.exclusions", "src/main/java/org/apache/**, src/main/resources/static/pdfjs/**, src/main/resources/static/pdfjs-legacy/**, src/main/resources/static/js/thirdParty/**"
         property "sonar.cpd.exclusions", "src/main/java/org/apache/**, src/main/resources/static/pdfjs/**, src/main/resources/static/pdfjs-legacy/**, src/main/resources/static/js/thirdParty/**"
@@ -402,41 +284,24 @@ sonar {
 //        rules=['unused-dependency']
 //    }
 tasks.wrapper {
-    gradleVersion = "8.14"
-    distributionType = Wrapper.DistributionType.ALL
+    gradleVersion = "8.12"
 }
 //tasks.withType(JavaCompile) {
 //    options.compilerArgs << "-Xlint:deprecation"
 //}
 configurations.all {
-    // Remove all commons-logging dependencies so that only spring-jcl is used
-    exclude group: 'commons-logging', module: 'commons-logging'
-    // Exclude Tomcat
     exclude group: "org.springframework.boot", module: "spring-boot-starter-tomcat"
 }
-
 dependencies {
-    implementation project(':common')
-
-    //tmp for security bumps
-    implementation 'ch.qos.logback:logback-core:1.5.18'
-    implementation 'ch.qos.logback:logback-classic:1.5.18'
-
-    // Exclude vulnerable BouncyCastle version used in tableau
-    configurations.all {
-        exclude group: 'org.bouncycastle', module: 'bcpkix-jdk15on'
-        exclude group: 'org.bouncycastle', module: 'bcutil-jdk15on'
-        exclude group: 'org.bouncycastle', module: 'bcmail-jdk15on'
-    }
 
     if (System.getenv("STIRLING_PDF_DESKTOP_UI") != "false") {
-        implementation "me.friwi:jcefmaven:135.0.20"
+        implementation "me.friwi:jcefmaven:127.3.1"
         implementation "org.openjfx:javafx-controls:21"
         implementation "org.openjfx:javafx-swing:21"
     }
 
     //security updates
-    implementation "org.springframework:spring-webmvc:6.2.7"
+    implementation "org.springframework:spring-webmvc:6.2.2"
 
     implementation("io.github.pixee:java-security-toolkit:1.2.1")
 
@@ -450,21 +315,18 @@ dependencies {
 
 
     if (System.getenv("DOCKER_ENABLE_SECURITY") != "false") {
-	    implementation 'io.micrometer:micrometer-registry-prometheus'
-
         implementation "org.springframework.boot:spring-boot-starter-security:$springBootVersion"
         implementation "org.thymeleaf.extras:thymeleaf-extras-springsecurity5:3.1.3.RELEASE"
         implementation "org.springframework.boot:spring-boot-starter-data-jpa:$springBootVersion"
         implementation "org.springframework.boot:spring-boot-starter-oauth2-client:$springBootVersion"
-        implementation "org.springframework.boot:spring-boot-starter-mail:$springBootVersion"
 
-        implementation "org.springframework.session:spring-session-core:3.5.0"
-        implementation "org.springframework:spring-jdbc:6.2.7"
+        implementation "org.springframework.session:spring-session-core:$springBootVersion"
+        implementation "org.springframework:spring-jdbc:6.2.2"
 
         implementation 'com.unboundid.product.scim2:scim2-sdk-client:2.3.5'
         // Don't upgrade h2database
         runtimeOnly "com.h2database:h2:2.3.232"
-        runtimeOnly "org.postgresql:postgresql:42.7.6"
+        runtimeOnly "org.postgresql:postgresql:42.7.5"
         constraints {
             implementation "org.opensaml:opensaml-core:$openSamlVersion"
             implementation "org.opensaml:opensaml-saml-api:$openSamlVersion"
@@ -474,13 +336,13 @@ dependencies {
         // implementation 'org.springframework.security:spring-security-core:$springSecuritySamlVersion'
         implementation 'com.coveo:saml-client:5.0.0'
 
+
     }
-    implementation 'org.snakeyaml:snakeyaml-engine:2.9'
 
     testImplementation "org.springframework.boot:spring-boot-starter-test:$springBootVersion"
 
     // Batik
-    implementation "org.apache.xmlgraphics:batik-all:1.19"
+    implementation "org.apache.xmlgraphics:batik-all:1.18"
 
     // TwelveMonkeys
     runtimeOnly "com.twelvemonkeys.imageio:imageio-batik:$imageioVersion"
@@ -503,25 +365,30 @@ dependencies {
     // Image metadata extractor
     implementation "com.drewnoakes:metadata-extractor:2.19.0"
 
-    implementation "commons-io:commons-io:2.19.0"
-    implementation "org.springdoc:springdoc-openapi-starter-webmvc-ui:2.8.8"
+    implementation "commons-io:commons-io:2.18.0"
+    implementation "org.springdoc:springdoc-openapi-starter-webmvc-ui:2.2.0"
     //general PDF
 
     // https://mvnrepository.com/artifact/com.opencsv/opencsv
-    implementation ("com.opencsv:opencsv:5.11")
+    implementation ("com.opencsv:opencsv:5.10") {
+        exclude group: "commons-logging", module: "commons-logging"
+    }
 
-    implementation ("org.apache.pdfbox:pdfbox:$pdfboxVersion")
+    implementation ("org.apache.pdfbox:pdfbox:$pdfboxVersion") {
+        exclude group: "commons-logging", module: "commons-logging"
+    }
     implementation "org.apache.pdfbox:preflight:$pdfboxVersion"
 
 
-    implementation ("org.apache.pdfbox:xmpbox:$pdfboxVersion")
+    implementation ("org.apache.pdfbox:xmpbox:$pdfboxVersion") {
+        exclude group: "commons-logging", module: "commons-logging"
+    }
 
     // https://mvnrepository.com/artifact/technology.tabula/tabula
     implementation ('technology.tabula:tabula:1.0.5')  {
         exclude group: "org.slf4j", module: "slf4j-simple"
         exclude group: "org.bouncycastle", module: "bcprov-jdk15on"
         exclude group: "com.google.code.gson", module: "gson"
-        exclude group: "commons-io", module: "commons-io"
     }
 
     implementation 'org.apache.pdfbox:jbig2-imageio:3.0.4'
@@ -529,14 +396,14 @@ dependencies {
     implementation "org.bouncycastle:bcprov-jdk18on:$bouncycastleVersion"
     implementation "org.bouncycastle:bcpkix-jdk18on:$bouncycastleVersion"
     implementation "org.springframework.boot:spring-boot-starter-actuator:$springBootVersion"
-    implementation "io.micrometer:micrometer-core:1.15.0"
+    implementation "io.micrometer:micrometer-core:1.14.3"
     implementation group: "com.google.zxing", name: "core", version: "3.5.3"
     // https://mvnrepository.com/artifact/org.commonmark/commonmark
     implementation "org.commonmark:commonmark:0.24.0"
     implementation "org.commonmark:commonmark-ext-gfm-tables:0.24.0"
     // https://mvnrepository.com/artifact/com.bucket4j/bucket4j_jdk17
     implementation "com.bucket4j:bucket4j_jdk17-core:8.14.0"
-    implementation "com.fathzer:javaluator:3.0.6"
+    implementation "com.fathzer:javaluator:3.0.5"
 
     implementation 'com.vladsch.flexmark:flexmark-html2md-converter:0.64.8'
 
@@ -544,8 +411,6 @@ dependencies {
     compileOnly "org.projectlombok:lombok:$lombokVersion"
     annotationProcessor "org.projectlombok:lombok:$lombokVersion"
 
-    // Mockito (core)
-    testImplementation 'org.mockito:mockito-core:5.18.0'
     testRuntimeOnly 'org.mockito:mockito-inline:5.2.0'
 }
 
@@ -558,28 +423,18 @@ compileJava {
 }
 
 task writeVersion {
-    def propsFile = file("$projectDir/src/main/resources/version.properties")
-    def propsDir = propsFile.parentFile
-
-    doLast {
-        if (!propsDir.exists()) {
-            propsDir.mkdirs()
-        }
-
-        def props = new Properties()
-        props.setProperty("version", version)
-        props.store(propsFile.newWriter(), null)
-    }
+    def propsFile = file("src/main/resources/version.properties")
+    def props = new Properties()
+    props.setProperty("version", version)
+    props.store(propsFile.newWriter(), null)
 }
 
-processResources.dependsOn(writeVersion)
-
 swaggerhubUpload {
     // dependsOn = generateOpenApiDocs  // Depends on your task generating Swagger docs
     api = "Stirling-PDF"  // The name of your API on SwaggerHub
-    owner = "${System.getenv().getOrDefault('SWAGGERHUB_USER', 'Frooodle')}"  // Your SwaggerHub username (or organization name)
+    owner = "Frooodle"  // Your SwaggerHub username (or organization name)
     version = project.version  // The version of your API
-    inputFile = file("SwaggerDoc.json")  // The path to your Swagger docs
+    inputFile = "./SwaggerDoc.json"  // The path to your Swagger docs
     token = "${System.getenv("SWAGGERHUB_API_KEY")}"  // Your SwaggerHub API key, passed as an environment variable
     oas = "3.0.0"  // The version of the OpenAPI Specification you"re using
 }
@@ -590,12 +445,12 @@ jar {
         attributes "Implementation-Title": "Stirling-PDF",
                    "Implementation-Version": project.version
     }
+
 }
 
 tasks.named("test") {
     useJUnitPlatform()
 }
-
 task printVersion {
     doLast {
         println project.version
@@ -607,7 +462,3 @@ task printMacVersion {
         println getMacVersion(project.version.toString())
     }
 }
-
-tasks.named('generateOpenApiDocs') {
-    doNotTrackState("Tracking state is not supported for this task")
-}

common/.gitignore

@@ -1,196 +0,0 @@
-### Eclipse ###
-.metadata
-bin/
-tmp/
-*.tmp
-*.bak
-*.exe
-*.swp
-*~.nib
-local.properties
-.settings/
-.loadpath
-.recommenders
-.classpath
-.project
-version.properties
-
-#### Stirling-PDF Files ###
-pipeline/watchedFolders/
-pipeline/finishedFolders/
-customFiles/
-configs/
-watchedFolders/
-clientWebUI/
-!cucumber/
-!cucumber/exampleFiles/
-!cucumber/exampleFiles/example_html.zip
-exampleYmlFiles/stirling/
-/testing/file_snapshots
-SwaggerDoc.json
-
-# Gradle
-.gradle
-.lock
-
-# External tool builders
-.externalToolBuilders/
-
-# Locally stored "Eclipse launch configurations"
-*.launch
-
-# PyDev specific (Python IDE for Eclipse)
-*.pydevproject
-
-# CDT-specific (C/C++ Development Tooling)
-.cproject
-
-# CDT- autotools
-.autotools
-
-# Java annotation processor (APT)
-.factorypath
-
-# PDT-specific (PHP Development Tools)
-.buildpath
-
-# sbteclipse plugin
-.target
-
-# Tern plugin
-.tern-project
-
-# TeXlipse plugin
-.texlipse
-
-# STS (Spring Tool Suite)
-.springBeans
-
-# Code Recommenders
-.recommenders/
-
-# Annotation Processing
-.apt_generated/
-.apt_generated_test/
-
-# Scala IDE specific (Scala & Java development for Eclipse)
-.cache-main
-.scala_dependencies
-.worksheet
-
-# Uncomment this line if you wish to ignore the project description file.
-# Typically, this file would be tracked if it contains build/dependency configurations:
-#.project
-
-### Eclipse Patch ###
-# Spring Boot Tooling
-.sts4-cache/
-
-### Git ###
-# Created by git for backups. To disable backups in Git:
-# $ git config --global mergetool.keepBackup false
-*.orig
-
-# Created by git when using merge tools for conflicts
-*.BACKUP.*
-*.BASE.*
-*.LOCAL.*
-*.REMOTE.*
-*_BACKUP_*.txt
-*_BASE_*.txt
-*_LOCAL_*.txt
-*_REMOTE_*.txt
-
-### Java ###
-# Compiled class file
-*.class
-
-# Log file
-*.log
-
-# BlueJ files
-*.ctxt
-
-# Mobile Tools for Java (J2ME)
-.mtj.tmp/
-
-# Package Files #
-*.jar
-*.war
-*.nar
-*.ear
-*.zip
-*.tar.gz
-*.rar
-*.db
-/build
-
-# Byte-compiled / optimized / DLL files
-__pycache__/
-*.py[cod]
-*.pyo
-
-# Virtual environments
-.env*
-.venv*
-env*/
-venv*/
-ENV/
-env.bak/
-venv.bak/
-
-# VS Code
-/.vscode/**/*
-!/.vscode/settings.json
-!/.vscode/extensions.json
-
-# IntelliJ IDEA
-.idea/
-*.iml
-out/
-
-# Ignore Mac DS_Store files
-.DS_Store
-**/.DS_Store
-
-# cucumber
-/cucumber/reports/**
-
-# Certs and Security Files
-*.p12
-*.pk8
-*.pem
-*.crt
-*.cer
-*.cert
-*.der
-*.key
-*.csr
-*.kdbx
-*.jks
-*.asc
-
-# SSH Keys
-*.pub
-*.priv
-id_rsa
-id_rsa.pub
-id_ecdsa
-id_ecdsa.pub
-id_ed25519
-id_ed25519.pub
-.ssh/
-*ssh
-
-# cache
-.cache
-.ruff_cache
-.mypy_cache
-.pytest_cache
-.ipynb_checkpoints
-
-**/jcef-bundle/
-
-# node_modules
-node_modules/
-*.mjs

common/build.gradle

@@ -1,64 +0,0 @@
-plugins {
-    id 'java-library'
-    id 'io.spring.dependency-management' version '1.1.7'
-}
-
-group = 'stirling.software'
-version = '0.46.2'
-
-ext {
-    lombokVersion = "1.18.38"
-}
-
-java {
-    sourceCompatibility = JavaVersion.VERSION_17
-}
-
-repositories {
-    mavenCentral()
-}
-
-configurations.all {
-    exclude group: 'commons-logging', module: 'commons-logging'
-    exclude group: "org.springframework.boot", module: "spring-boot-starter-tomcat"
-}
-
-dependencyManagement {
-    imports {
-        mavenBom 'org.springframework.boot:spring-boot-dependencies:3.5.0'
-    }
-}
-
-dependencies {
-    implementation 'org.springframework.boot:spring-boot-starter-web'
-    implementation 'org.springframework.boot:spring-boot-starter-thymeleaf'
-    implementation 'org.springframework.boot:spring-boot-starter-aop'
-    implementation 'org.springframework.boot:spring-boot-starter-websocket'
-    implementation 'org.springframework.boot:spring-boot-starter-test'
-    implementation 'com.googlecode.owasp-java-html-sanitizer:owasp-java-html-sanitizer:20240325.1'
-    implementation 'com.fathzer:javaluator:3.0.6'
-    implementation 'com.posthog.java:posthog:1.2.0'
-    implementation 'io.github.pixee:java-security-toolkit:1.2.1'
-    implementation 'org.apache.commons:commons-lang3:3.17.0'
-    implementation 'com.drewnoakes:metadata-extractor:2.19.0' // Image metadata extractor
-    implementation 'com.vladsch.flexmark:flexmark-html2md-converter:0.64.8'
-    implementation "org.apache.pdfbox:pdfbox:$pdfboxVersion"
-    implementation 'jakarta.servlet:jakarta.servlet-api:6.1.0'
-    implementation 'org.snakeyaml:snakeyaml-engine:2.9'
-    implementation "org.springdoc:springdoc-openapi-starter-webmvc-ui:2.8.8"
-
-    compileOnly "org.projectlombok:lombok:$lombokVersion"
-    annotationProcessor "org.projectlombok:lombok:$lombokVersion"
-
-    testImplementation "org.springframework.boot:spring-boot-starter-test"
-    testImplementation 'org.mockito:mockito-core:5.18.0'
-    testImplementation 'org.mockito:mockito-junit-jupiter:5.18.0'
-    testRuntimeOnly 'org.mockito:mockito-inline:5.2.0'
-}
-
-test {
-    useJUnitPlatform()
-    testLogging {
-        events "passed", "skipped", "failed"
-    }
-}

common/src/main/java/org/apache/pdfbox/examples/util/DeletingRandomAccessFile.java

@@ -1,39 +0,0 @@
-package org.apache.pdfbox.examples.util;
-
-import java.io.File;
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-
-import org.apache.pdfbox.io.RandomAccessReadBufferedFile;
-
-import lombok.extern.slf4j.Slf4j;
-
-/** A custom RandomAccessRead implementation that deletes the file when closed */
-@Slf4j
-public class DeletingRandomAccessFile extends RandomAccessReadBufferedFile {
-    private final Path tempFilePath;
-
-    public DeletingRandomAccessFile(File file) throws IOException {
-        super(file);
-        this.tempFilePath = file.toPath();
-    }
-
-    @Override
-    public void close() throws IOException {
-        try {
-            super.close();
-        } finally {
-            try {
-                boolean deleted = Files.deleteIfExists(tempFilePath);
-                if (deleted) {
-                    log.info("Successfully deleted temp file: {}", tempFilePath);
-                } else {
-                    log.warn("Failed to delete temp file (may not exist): {}", tempFilePath);
-                }
-            } catch (IOException e) {
-                log.error("Error deleting temp file: {}", tempFilePath, e);
-            }
-        }
-    }
-}

common/src/main/java/stirling/software/common/annotations/AutoJobPostMapping.java

@@ -1,47 +0,0 @@
-package stirling.software.common.annotations;
-
-import java.lang.annotation.*;
-
-import org.springframework.core.annotation.AliasFor;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-
-@Target(ElementType.METHOD)
-@Retention(RetentionPolicy.RUNTIME)
-@Documented
-@RequestMapping(method = RequestMethod.POST)
-public @interface AutoJobPostMapping {
-    @AliasFor(annotation = RequestMapping.class, attribute = "value")
-    String[] value() default {};
-
-    @AliasFor(annotation = RequestMapping.class, attribute = "consumes")
-    String[] consumes() default {"multipart/form-data"};
-
-    /**
-     * Custom timeout in milliseconds for this specific job. If not specified, the default system
-     * timeout will be used.
-     */
-    long timeout() default -1;
-
-    /** Maximum number of times to retry the job on failure. Default is 1 (no retries). */
-    int retryCount() default 1;
-
-    /**
-     * Whether to track and report progress for this job. If enabled, the job will send progress
-     * updates through WebSocket.
-     */
-    boolean trackProgress() default true;
-
-    /**
-     * Whether this job can be queued when system resources are limited. If enabled, jobs will be
-     * queued instead of rejected when the system is under high load. The queue size is dynamically
-     * adjusted based on available memory and CPU resources.
-     */
-    boolean queueable() default false;
-
-    /**
-     * Optional resource weight of this job (1-100). Higher values indicate more resource-intensive
-     * jobs that may need stricter queuing. Default is 50 (medium weight).
-     */
-    int resourceWeight() default 50;
-}

common/src/main/java/stirling/software/common/aop/AutoJobAspect.java

@@ -1,249 +0,0 @@
-package stirling.software.common.aop;
-
-import java.io.IOException;
-import java.util.concurrent.atomic.AtomicInteger;
-import java.util.concurrent.atomic.AtomicReference;
-
-import org.aspectj.lang.ProceedingJoinPoint;
-import org.aspectj.lang.annotation.*;
-import org.springframework.stereotype.Component;
-import org.springframework.web.multipart.MultipartFile;
-
-import jakarta.servlet.http.HttpServletRequest;
-
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-
-import stirling.software.common.annotations.AutoJobPostMapping;
-import stirling.software.common.controller.WebSocketProgressController;
-import stirling.software.common.model.api.PDFFile;
-import stirling.software.common.model.job.JobProgress;
-import stirling.software.common.service.FileOrUploadService;
-import stirling.software.common.service.FileStorage;
-import stirling.software.common.service.JobExecutorService;
-
-@Aspect
-@Component
-@RequiredArgsConstructor
-@Slf4j
-public class AutoJobAspect {
-
-    private final JobExecutorService jobExecutorService;
-    private final HttpServletRequest request;
-    private final FileOrUploadService fileOrUploadService;
-    private final FileStorage fileStorage;
-    private final WebSocketProgressController webSocketSender;
-
-    @Around("@annotation(autoJobPostMapping)")
-    public Object wrapWithJobExecution(
-            ProceedingJoinPoint joinPoint, AutoJobPostMapping autoJobPostMapping) {
-        // Extract parameters from the request and annotation
-        boolean async = Boolean.parseBoolean(request.getParameter("async"));
-        long timeout = autoJobPostMapping.timeout();
-        int retryCount = autoJobPostMapping.retryCount();
-        boolean trackProgress = autoJobPostMapping.trackProgress();
-
-        log.debug(
-                "AutoJobPostMapping execution with async={}, timeout={}, retryCount={}, trackProgress={}",
-                async,
-                timeout > 0 ? timeout : "default",
-                retryCount,
-                trackProgress);
-
-        // Inspect and possibly mutate arguments
-        Object[] args = joinPoint.getArgs();
-
-        for (int i = 0; i < args.length; i++) {
-            Object arg = args[i];
-
-            if (arg instanceof PDFFile pdfFile) {
-                // Case 1: fileId is provided but no fileInput
-                if (pdfFile.getFileInput() == null && pdfFile.getFileId() != null) {
-                    try {
-                        log.debug("Using fileId {} to get file content", pdfFile.getFileId());
-                        MultipartFile file = fileStorage.retrieveFile(pdfFile.getFileId());
-                        pdfFile.setFileInput(file);
-                    } catch (Exception e) {
-                        throw new RuntimeException(
-                                "Failed to resolve file by ID: " + pdfFile.getFileId(), e);
-                    }
-                }
-                // Case 2: For async requests, we need to make a copy of the MultipartFile
-                else if (async && pdfFile.getFileInput() != null) {
-                    try {
-                        log.debug("Making persistent copy of uploaded file for async processing");
-                        MultipartFile originalFile = pdfFile.getFileInput();
-                        String fileId = fileStorage.storeFile(originalFile);
-
-                        // Store the fileId for later reference
-                        pdfFile.setFileId(fileId);
-
-                        // Replace the original MultipartFile with our persistent copy
-                        MultipartFile persistentFile = fileStorage.retrieveFile(fileId);
-                        pdfFile.setFileInput(persistentFile);
-
-                        log.debug("Created persistent file copy with fileId: {}", fileId);
-                    } catch (IOException e) {
-                        throw new RuntimeException(
-                                "Failed to create persistent copy of uploaded file", e);
-                    }
-                }
-            }
-        }
-
-        // Extract queueable and resourceWeight parameters
-        boolean queueable = autoJobPostMapping.queueable();
-        int resourceWeight = autoJobPostMapping.resourceWeight();
-
-        // Integrate with the enhanced JobExecutorService
-        if (retryCount <= 1) {
-            // No retries needed, simple execution
-            return jobExecutorService.runJobGeneric(
-                    async,
-                    () -> {
-                        try {
-                            if (trackProgress && async) {
-                                String jobId = (String) request.getAttribute("jobId");
-                                if (jobId != null) {
-                                    webSocketSender.sendProgress(
-                                            jobId,
-                                            new JobProgress(
-                                                    jobId,
-                                                    "Processing",
-                                                    50,
-                                                    "Executing operation"));
-                                }
-                            }
-                            return joinPoint.proceed(args);
-                        } catch (Throwable ex) {
-                            log.error(
-                                    "AutoJobAspect caught exception during job execution: {}",
-                                    ex.getMessage(),
-                                    ex);
-                            throw new RuntimeException(ex);
-                        }
-                    },
-                    timeout,
-                    queueable,
-                    resourceWeight);
-        } else {
-            // Use retry logic
-            return executeWithRetries(
-                    joinPoint,
-                    args,
-                    async,
-                    timeout,
-                    retryCount,
-                    trackProgress,
-                    queueable,
-                    resourceWeight);
-        }
-    }
-
-    private Object executeWithRetries(
-            ProceedingJoinPoint joinPoint,
-            Object[] args,
-            boolean async,
-            long timeout,
-            int maxRetries,
-            boolean trackProgress,
-            boolean queueable,
-            int resourceWeight) {
-
-        AtomicInteger attempts = new AtomicInteger(0);
-        // Use AtomicReference to make the jobId effectively final for lambda usage
-        AtomicReference<String> jobIdRef = new AtomicReference<>();
-
-        return jobExecutorService.runJobGeneric(
-                async,
-                () -> {
-                    int currentAttempt = attempts.incrementAndGet();
-                    try {
-                        if (trackProgress && async) {
-                            // Only get the jobId once and store it in the AtomicReference
-                            if (jobIdRef.get() == null) {
-                                jobIdRef.set(getJobIdFromContext());
-                            }
-                            String jobId = jobIdRef.get();
-                            if (jobId != null) {
-                                webSocketSender.sendProgress(
-                                        jobId,
-                                        new JobProgress(
-                                                jobId,
-                                                "Started",
-                                                0,
-                                                "Executing (attempt "
-                                                        + currentAttempt
-                                                        + " of "
-                                                        + Math.max(1, maxRetries)
-                                                        + ")"));
-                            }
-                        }
-
-                        return joinPoint.proceed(args);
-                    } catch (Throwable ex) {
-                        log.error(
-                                "AutoJobAspect caught exception during job execution (attempt {}/{}): {}",
-                                currentAttempt,
-                                Math.max(1, maxRetries),
-                                ex.getMessage(),
-                                ex);
-
-                        // Check if we should retry
-                        if (currentAttempt < maxRetries) {
-                            log.info(
-                                    "Retrying operation, attempt {}/{}",
-                                    currentAttempt + 1,
-                                    maxRetries);
-                            String jobId = jobIdRef.get();
-                            if (trackProgress && async && jobId != null) {
-                                webSocketSender.sendProgress(
-                                        jobId,
-                                        new JobProgress(
-                                                jobId,
-                                                "Retrying",
-                                                (int) (currentAttempt * 100.0 / maxRetries),
-                                                "Retry attempt "
-                                                        + (currentAttempt + 1)
-                                                        + " of "
-                                                        + maxRetries));
-                            }
-
-                            try {
-                                // Simple exponential backoff
-                                Thread.sleep(100 * currentAttempt);
-                            } catch (InterruptedException ie) {
-                                Thread.currentThread().interrupt();
-                            }
-
-                            // Recursive call to retry
-                            return executeWithRetries(
-                                    joinPoint,
-                                    args,
-                                    async,
-                                    timeout,
-                                    maxRetries,
-                                    trackProgress,
-                                    queueable,
-                                    resourceWeight);
-                        }
-
-                        // No more retries, throw the exception
-                        throw new RuntimeException("Job failed: " + ex.getMessage(), ex);
-                    }
-                },
-                timeout,
-                queueable,
-                resourceWeight);
-    }
-
-    // Try to get the job ID from the context (if this is an async job)
-    private String getJobIdFromContext() {
-        try {
-            return (String) request.getAttribute("jobId");
-        } catch (Exception e) {
-            log.debug("Could not retrieve job ID from context: {}", e.getMessage());
-            return null;
-        }
-    }
-}

common/src/main/java/stirling/software/common/config/WebSocketConfig.java

@@ -1,23 +0,0 @@
-package stirling.software.common.config;
-
-import org.springframework.context.annotation.Configuration;
-import org.springframework.messaging.simp.config.MessageBrokerRegistry;
-import org.springframework.web.socket.config.annotation.EnableWebSocketMessageBroker;
-import org.springframework.web.socket.config.annotation.StompEndpointRegistry;
-import org.springframework.web.socket.config.annotation.WebSocketMessageBrokerConfigurer;
-
-@Configuration
-@EnableWebSocketMessageBroker
-public class WebSocketConfig implements WebSocketMessageBrokerConfigurer {
-
-    @Override
-    public void configureMessageBroker(MessageBrokerRegistry config) {
-        config.enableSimpleBroker("/topic");
-        config.setApplicationDestinationPrefixes("/app");
-    }
-
-    @Override
-    public void registerStompEndpoints(StompEndpointRegistry registry) {
-        registry.addEndpoint("/ws").setAllowedOriginPatterns("*").withSockJS();
-    }
-}

common/src/main/java/stirling/software/common/configuration/ConfigInitializer.java

@@ -1,126 +0,0 @@
-package stirling.software.common.configuration;
-
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URISyntaxException;
-import java.net.URL;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.nio.file.StandardCopyOption;
-import java.util.List;
-
-import lombok.extern.slf4j.Slf4j;
-
-import stirling.software.common.util.YamlHelper;
-
-/**
- * A naive, line-based approach to merging "settings.yml" with "settings.yml.template" while
- * preserving exact whitespace, blank lines, and inline comments -- but we only rewrite the file if
- * the merged content actually differs.
- */
-@Slf4j
-public class ConfigInitializer {
-
-    public void ensureConfigExists() throws IOException, URISyntaxException {
-        // 1) If settings file doesn't exist, create from template
-        Path destPath = Paths.get(InstallationPathConfig.getSettingsPath());
-        if (Files.notExists(destPath)) {
-            Files.createDirectories(destPath.getParent());
-            try (InputStream in =
-                    getClass().getClassLoader().getResourceAsStream("settings.yml.template")) {
-                if (in == null) {
-                    throw new FileNotFoundException(
-                            "Resource file not found: settings.yml.template");
-                }
-                Files.copy(in, destPath);
-            }
-            log.info("Created settings file from template");
-        } else {
-            // 2) Merge existing file with the template
-            URL templateResource = getClass().getClassLoader().getResource("settings.yml.template");
-            if (templateResource == null) {
-                throw new IOException("Resource not found: settings.yml.template");
-            }
-
-            // Copy template to a temp location so we can read lines
-            Path tempTemplatePath = Files.createTempFile("settings.yml", ".template");
-            try (InputStream in = templateResource.openStream()) {
-                Files.copy(in, tempTemplatePath, StandardCopyOption.REPLACE_EXISTING);
-            }
-
-            // Copy setting.yaml to a temp location so we can read lines
-            Path settingTempPath = Files.createTempFile("settings", ".yaml");
-            try (InputStream in = Files.newInputStream(destPath)) {
-                Files.copy(in, settingTempPath, StandardCopyOption.REPLACE_EXISTING);
-            }
-
-            YamlHelper settingsTemplateFile = new YamlHelper(tempTemplatePath);
-            YamlHelper settingsFile = new YamlHelper(settingTempPath);
-
-            migrateEnterpriseEditionToPremium(settingsFile, settingsTemplateFile);
-
-            boolean changesMade =
-                    settingsTemplateFile.updateValuesFromYaml(settingsFile, settingsTemplateFile);
-            if (changesMade) {
-                settingsTemplateFile.save(destPath);
-                log.info("Settings file updated based on template changes.");
-            } else {
-                log.info("No changes detected; settings file left as-is.");
-            }
-
-            Files.deleteIfExists(tempTemplatePath);
-            Files.deleteIfExists(settingTempPath);
-        }
-
-        // 3) Ensure custom settings file exists
-        Path customSettingsPath = Paths.get(InstallationPathConfig.getCustomSettingsPath());
-        if (Files.notExists(customSettingsPath)) {
-            Files.createFile(customSettingsPath);
-            log.info("Created custom_settings file: {}", customSettingsPath);
-        }
-    }
-
-    // TODO: Remove post migration
-    private void migrateEnterpriseEditionToPremium(YamlHelper yaml, YamlHelper template) {
-        if (yaml.getValueByExactKeyPath("enterpriseEdition", "enabled") != null) {
-            template.updateValue(
-                    List.of("premium", "enabled"),
-                    yaml.getValueByExactKeyPath("enterpriseEdition", "enabled"));
-        }
-        if (yaml.getValueByExactKeyPath("enterpriseEdition", "key") != null) {
-            template.updateValue(
-                    List.of("premium", "key"),
-                    yaml.getValueByExactKeyPath("enterpriseEdition", "key"));
-        }
-        if (yaml.getValueByExactKeyPath("enterpriseEdition", "SSOAutoLogin") != null) {
-            template.updateValue(
-                    List.of("premium", "proFeatures", "SSOAutoLogin"),
-                    yaml.getValueByExactKeyPath("enterpriseEdition", "SSOAutoLogin"));
-        }
-        if (yaml.getValueByExactKeyPath("enterpriseEdition", "CustomMetadata", "autoUpdateMetadata")
-                != null) {
-            template.updateValue(
-                    List.of("premium", "proFeatures", "CustomMetadata", "autoUpdateMetadata"),
-                    yaml.getValueByExactKeyPath(
-                            "enterpriseEdition", "CustomMetadata", "autoUpdateMetadata"));
-        }
-        if (yaml.getValueByExactKeyPath("enterpriseEdition", "CustomMetadata", "author") != null) {
-            template.updateValue(
-                    List.of("premium", "proFeatures", "CustomMetadata", "author"),
-                    yaml.getValueByExactKeyPath("enterpriseEdition", "CustomMetadata", "author"));
-        }
-        if (yaml.getValueByExactKeyPath("enterpriseEdition", "CustomMetadata", "creator") != null) {
-            template.updateValue(
-                    List.of("premium", "proFeatures", "CustomMetadata", "creator"),
-                    yaml.getValueByExactKeyPath("enterpriseEdition", "CustomMetadata", "creator"));
-        }
-        if (yaml.getValueByExactKeyPath("enterpriseEdition", "CustomMetadata", "producer")
-                != null) {
-            template.updateValue(
-                    List.of("premium", "proFeatures", "CustomMetadata", "producer"),
-                    yaml.getValueByExactKeyPath("enterpriseEdition", "CustomMetadata", "producer"));
-        }
-    }
-}

common/src/main/java/stirling/software/common/configuration/RuntimePathConfig.java

@@ -1,79 +0,0 @@
-package stirling.software.common.configuration;
-
-import java.nio.file.Files;
-import java.nio.file.Path;
-
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.context.annotation.Configuration;
-
-import lombok.Getter;
-import lombok.extern.slf4j.Slf4j;
-
-import stirling.software.common.model.ApplicationProperties;
-import stirling.software.common.model.ApplicationProperties.CustomPaths.Operations;
-import stirling.software.common.model.ApplicationProperties.CustomPaths.Pipeline;
-
-@Slf4j
-@Configuration
-@Getter
-public class RuntimePathConfig {
-    private final ApplicationProperties properties;
-    private final String basePath;
-    private final String weasyPrintPath;
-    private final String unoConvertPath;
-
-    // Pipeline paths
-    private final String pipelineWatchedFoldersPath;
-    private final String pipelineFinishedFoldersPath;
-    private final String pipelineDefaultWebUiConfigs;
-    private final String pipelinePath;
-
-    public RuntimePathConfig(ApplicationProperties properties) {
-        this.properties = properties;
-        this.basePath = InstallationPathConfig.getPath();
-
-        this.pipelinePath = Path.of(basePath, "pipeline").toString();
-        String defaultWatchedFolders = Path.of(this.pipelinePath, "watchedFolders").toString();
-        String defaultFinishedFolders = Path.of(this.pipelinePath, "finishedFolders").toString();
-        String defaultWebUIConfigs = Path.of(this.pipelinePath, "defaultWebUIConfigs").toString();
-
-        Pipeline pipeline = properties.getSystem().getCustomPaths().getPipeline();
-
-        this.pipelineWatchedFoldersPath =
-                resolvePath(
-                        defaultWatchedFolders,
-                        pipeline != null ? pipeline.getWatchedFoldersDir() : null);
-        this.pipelineFinishedFoldersPath =
-                resolvePath(
-                        defaultFinishedFolders,
-                        pipeline != null ? pipeline.getFinishedFoldersDir() : null);
-        this.pipelineDefaultWebUiConfigs =
-                resolvePath(
-                        defaultWebUIConfigs,
-                        pipeline != null ? pipeline.getWebUIConfigsDir() : null);
-
-        boolean isDocker = isRunningInDocker();
-
-        // Initialize Operation paths
-        String defaultWeasyPrintPath = isDocker ? "/opt/venv/bin/weasyprint" : "weasyprint";
-        String defaultUnoConvertPath = isDocker ? "/opt/venv/bin/unoconvert" : "unoconvert";
-
-        Operations operations = properties.getSystem().getCustomPaths().getOperations();
-        this.weasyPrintPath =
-                resolvePath(
-                        defaultWeasyPrintPath,
-                        operations != null ? operations.getWeasyprint() : null);
-        this.unoConvertPath =
-                resolvePath(
-                        defaultUnoConvertPath,
-                        operations != null ? operations.getUnoconvert() : null);
-    }
-
-    private String resolvePath(String defaultPath, String customPath) {
-        return StringUtils.isNotBlank(customPath) ? customPath : defaultPath;
-    }
-
-    private boolean isRunningInDocker() {
-        return Files.exists(Path.of("/.dockerenv"));
-    }
-}

common/src/main/java/stirling/software/common/configuration/interfaces/ShowAdminInterface.java

@@ -1,7 +0,0 @@
-package stirling.software.common.configuration.interfaces;
-
-public interface ShowAdminInterface {
-    default boolean getShowUpdateOnlyAdmins() {
-        return true;
-    }
-}

common/src/main/java/stirling/software/common/controller/JobController.java

@@ -1,114 +0,0 @@
-package stirling.software.common.controller;
-
-import java.util.Map;
-
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-
-import stirling.software.common.model.job.JobResult;
-import stirling.software.common.model.job.JobStats;
-import stirling.software.common.service.FileStorage;
-import stirling.software.common.service.TaskManager;
-
-/** REST controller for job-related endpoints */
-@RestController
-@RequiredArgsConstructor
-@Slf4j
-public class JobController {
-
-    private final TaskManager taskManager;
-    private final FileStorage fileStorage;
-
-    /**
-     * Get the status of a job
-     *
-     * @param jobId The job ID
-     * @return The job result
-     */
-    @GetMapping("/api/v1/general/job/{jobId}")
-    public ResponseEntity<?> getJobStatus(@PathVariable("jobId") String jobId) {
-        JobResult result = taskManager.getJobResult(jobId);
-        if (result == null) {
-            return ResponseEntity.notFound().build();
-        }
-        return ResponseEntity.ok(result);
-    }
-
-    /**
-     * Get the result of a job
-     *
-     * @param jobId The job ID
-     * @return The job result
-     */
-    @GetMapping("/api/v1/general/job/{jobId}/result")
-    public ResponseEntity<?> getJobResult(@PathVariable("jobId") String jobId) {
-        JobResult result = taskManager.getJobResult(jobId);
-        if (result == null) {
-            return ResponseEntity.notFound().build();
-        }
-
-        if (!result.isComplete()) {
-            return ResponseEntity.badRequest().body("Job is not complete yet");
-        }
-
-        if (result.getError() != null) {
-            return ResponseEntity.badRequest().body("Job failed: " + result.getError());
-        }
-
-        if (result.getFileId() != null) {
-            try {
-                byte[] fileContent = fileStorage.retrieveBytes(result.getFileId());
-                return ResponseEntity.ok()
-                        .header("Content-Type", result.getContentType())
-                        .header(
-                                "Content-Disposition",
-                                "form-data; name=\"attachment\"; filename=\""
-                                        + result.getOriginalFileName()
-                                        + "\"")
-                        .body(fileContent);
-            } catch (Exception e) {
-                log.error("Error retrieving file for job {}: {}", jobId, e.getMessage(), e);
-                return ResponseEntity.internalServerError()
-                        .body("Error retrieving file: " + e.getMessage());
-            }
-        }
-
-        return ResponseEntity.ok(result.getResult());
-    }
-
-    /**
-     * Get statistics about jobs in the system
-     *
-     * @return Job statistics
-     */
-    @GetMapping("/api/v1/general/job/stats")
-    public ResponseEntity<JobStats> getJobStats() {
-        JobStats stats = taskManager.getJobStats();
-        return ResponseEntity.ok(stats);
-    }
-
-    /**
-     * Manually trigger cleanup of old jobs
-     *
-     * @return A response indicating how many jobs were cleaned up
-     */
-    @PostMapping("/api/v1/general/job/cleanup")
-    public ResponseEntity<?> cleanupOldJobs() {
-        int beforeCount = taskManager.getJobStats().getTotalJobs();
-        taskManager.cleanupOldJobs();
-        int afterCount = taskManager.getJobStats().getTotalJobs();
-        int removedCount = beforeCount - afterCount;
-
-        return ResponseEntity.ok(
-                Map.of(
-                        "message", "Cleanup complete",
-                        "removedJobs", removedCount,
-                        "remainingJobs", afterCount));
-    }
-}

common/src/main/java/stirling/software/common/controller/WebSocketProgressController.java

@@ -1,27 +0,0 @@
-package stirling.software.common.controller;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.messaging.simp.SimpMessagingTemplate;
-import org.springframework.stereotype.Controller;
-
-import lombok.NoArgsConstructor;
-
-import stirling.software.common.model.job.JobProgress;
-
-@Controller
-@NoArgsConstructor
-public class WebSocketProgressController {
-
-    private SimpMessagingTemplate messagingTemplate;
-
-    @Autowired(required = false)
-    public void setMessagingTemplate(SimpMessagingTemplate messagingTemplate) {
-        this.messagingTemplate = messagingTemplate;
-    }
-
-    public void sendProgress(String jobId, JobProgress progress) {
-        if (messagingTemplate != null) {
-            messagingTemplate.convertAndSend("/topic/progress/" + jobId, progress);
-        }
-    }
-}

common/src/main/java/stirling/software/common/model/PdfMetadata.java

@@ -1,19 +0,0 @@
-package stirling.software.common.model;
-
-import java.util.Calendar;
-
-import lombok.Builder;
-import lombok.Data;
-
-@Data
-@Builder
-public class PdfMetadata {
-    private String author;
-    private String producer;
-    private String title;
-    private String creator;
-    private String subject;
-    private String keywords;
-    private Calendar creationDate;
-    private Calendar modificationDate;
-}

common/src/main/java/stirling/software/common/model/api/PDFFile.java

@@ -1,25 +0,0 @@
-package stirling.software.common.model.api;
-
-import org.springframework.web.multipart.MultipartFile;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.NoArgsConstructor;
-
-@Data
-@NoArgsConstructor
-@EqualsAndHashCode
-public class PDFFile {
-    @Schema(
-            description = "The input PDF file",
-            contentMediaType = "application/pdf",
-            format = "binary")
-    private MultipartFile fileInput;
-
-    @Schema(
-            description = "File ID for server-side files (can be used instead of fileInput)",
-            example = "a1b2c3d4-5678-90ab-cdef-ghijklmnopqr")
-    private String fileId;
-}

common/src/main/java/stirling/software/common/model/api/security/RedactionArea.java

@@ -1,28 +0,0 @@
-package stirling.software.common.model.api.security;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-@Data
-@EqualsAndHashCode
-public class RedactionArea {
-    @Schema(description = "The left edge point of the area to be redacted.")
-    private Double x;
-
-    @Schema(description = "The top edge point of the area to be redacted.")
-    private Double y;
-
-    @Schema(description = "The height of the area to be redacted.")
-    private Double height;
-
-    @Schema(description = "The width of the area to be redacted.")
-    private Double width;
-
-    @Schema(description = "The page on which the area should be redacted.")
-    private Integer page;
-
-    @Schema(description = "The color used to redact the specified area.")
-    private String color;
-}

common/src/main/java/stirling/software/common/model/enumeration/Role.java

@@ -1,66 +0,0 @@
-package stirling.software.common.model.enumeration;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-
-import lombok.Getter;
-import lombok.RequiredArgsConstructor;
-
-@Getter
-@RequiredArgsConstructor
-public enum Role {
-
-    // Unlimited access
-    ADMIN("ROLE_ADMIN", Integer.MAX_VALUE, Integer.MAX_VALUE, "adminUserSettings.admin"),
-
-    // Unlimited access
-    USER("ROLE_USER", Integer.MAX_VALUE, Integer.MAX_VALUE, "adminUserSettings.user"),
-
-    // 40 API calls Per Day, 40 web calls
-    LIMITED_API_USER("ROLE_LIMITED_API_USER", 40, 40, "adminUserSettings.apiUser"),
-
-    // 20 API calls Per Day, 20 web calls
-    EXTRA_LIMITED_API_USER("ROLE_EXTRA_LIMITED_API_USER", 20, 20, "adminUserSettings.extraApiUser"),
-
-    // 0 API calls per day and 20 web calls
-    WEB_ONLY_USER("ROLE_WEB_ONLY_USER", 0, 20, "adminUserSettings.webOnlyUser"),
-
-    INTERNAL_API_USER(
-            "STIRLING-PDF-BACKEND-API-USER",
-            Integer.MAX_VALUE,
-            Integer.MAX_VALUE,
-            "adminUserSettings.internalApiUser"),
-
-    DEMO_USER("ROLE_DEMO_USER", 100, 100, "adminUserSettings.demoUser");
-
-    private final String roleId;
-    private final int apiCallsPerDay;
-    private final int webCallsPerDay;
-    private final String roleName;
-
-    public static String getRoleNameByRoleId(String roleId) {
-        // Using the fromString method to get the Role enum based on the roleId
-        Role role = fromString(roleId);
-        // Return the roleName of the found Role enum
-        return role.getRoleName();
-    }
-
-    // Method to retrieve all role IDs and role names
-    public static Map<String, String> getAllRoleDetails() {
-        // Using LinkedHashMap to preserve order
-        Map<String, String> roleDetails = new LinkedHashMap<>();
-        for (Role role : Role.values()) {
-            roleDetails.put(role.getRoleId(), role.getRoleName());
-        }
-        return roleDetails;
-    }
-
-    public static Role fromString(String roleId) {
-        for (Role role : Role.values()) {
-            if (role.getRoleId().equalsIgnoreCase(roleId)) {
-                return role;
-            }
-        }
-        throw new IllegalArgumentException("No Role defined for id: " + roleId);
-    }
-}

common/src/main/java/stirling/software/common/model/enumeration/UsernameAttribute.java

@@ -1,26 +0,0 @@
-package stirling.software.common.model.enumeration;
-
-import lombok.Getter;
-
-@Getter
-public enum UsernameAttribute {
-    MAIL("mail"),
-    EMAIL("email"),
-    LOGIN("login"),
-    PROFILE("profile"),
-    NAME("name"),
-    UID("uid"),
-    USERNAME("username"),
-    NICKNAME("nickname"),
-    GIVEN_NAME("given_name"),
-    MIDDLE_NAME("middle_name"),
-    FAMILY_NAME("family_name"),
-    PREFERRED_NAME("preferred_name"),
-    PREFERRED_USERNAME("preferred_username");
-
-    private final String name;
-
-    UsernameAttribute(final String name) {
-        this.name = name;
-    }
-}

common/src/main/java/stirling/software/common/model/exception/UnsupportedClaimException.java

@@ -1,7 +0,0 @@
-package stirling.software.common.model.exception;
-
-public class UnsupportedClaimException extends RuntimeException {
-    public UnsupportedClaimException(String message) {
-        super(message);
-    }
-}

common/src/main/java/stirling/software/common/model/job/JobProgress.java

@@ -1,15 +0,0 @@
-package stirling.software.common.model.job;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-@Data
-@NoArgsConstructor
-@AllArgsConstructor
-public class JobProgress {
-    private String jobId;
-    private String status;
-    private int percentComplete;
-    private String message;
-}

common/src/main/java/stirling/software/common/model/job/JobResponse.java

@@ -1,14 +0,0 @@
-package stirling.software.common.model.job;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-@Data
-@NoArgsConstructor
-@AllArgsConstructor
-public class JobResponse<T> {
-    private boolean async;
-    private String jobId;
-    private T result;
-}

common/src/main/java/stirling/software/common/model/job/JobResult.java

@@ -1,94 +0,0 @@
-package stirling.software.common.model.job;
-
-import java.time.LocalDateTime;
-
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-/** Represents the result of a job execution. Used by the TaskManager to store job results. */
-@Data
-@Builder
-@NoArgsConstructor
-@AllArgsConstructor
-public class JobResult {
-
-    /** The job ID */
-    private String jobId;
-
-    /** Flag indicating if the job is complete */
-    private boolean complete;
-
-    /** Error message if the job failed */
-    private String error;
-
-    /** The file ID of the result file, if applicable */
-    private String fileId;
-
-    /** Original file name, if applicable */
-    private String originalFileName;
-
-    /** MIME type of the result, if applicable */
-    private String contentType;
-
-    /** Time when the job was created */
-    private LocalDateTime createdAt;
-
-    /** Time when the job was completed */
-    private LocalDateTime completedAt;
-
-    /** The actual result object, if not a file */
-    private Object result;
-
-    /**
-     * Create a new JobResult with the given job ID
-     *
-     * @param jobId The job ID
-     * @return A new JobResult
-     */
-    public static JobResult createNew(String jobId) {
-        return JobResult.builder()
-                .jobId(jobId)
-                .complete(false)
-                .createdAt(LocalDateTime.now())
-                .build();
-    }
-
-    /**
-     * Mark this job as complete with a file result
-     *
-     * @param fileId The file ID of the result
-     * @param originalFileName The original file name
-     * @param contentType The content type of the file
-     */
-    public void completeWithFile(String fileId, String originalFileName, String contentType) {
-        this.complete = true;
-        this.fileId = fileId;
-        this.originalFileName = originalFileName;
-        this.contentType = contentType;
-        this.completedAt = LocalDateTime.now();
-    }
-
-    /**
-     * Mark this job as complete with a general result
-     *
-     * @param result The result object
-     */
-    public void completeWithResult(Object result) {
-        this.complete = true;
-        this.result = result;
-        this.completedAt = LocalDateTime.now();
-    }
-
-    /**
-     * Mark this job as failed with an error message
-     *
-     * @param error The error message
-     */
-    public void failWithError(String error) {
-        this.complete = true;
-        this.error = error;
-        this.completedAt = LocalDateTime.now();
-    }
-}

common/src/main/java/stirling/software/common/model/job/JobStats.java

@@ -1,43 +0,0 @@
-package stirling.software.common.model.job;
-
-import java.time.LocalDateTime;
-
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-/** Represents statistics about jobs in the system */
-@Data
-@Builder
-@NoArgsConstructor
-@AllArgsConstructor
-public class JobStats {
-
-    /** Total number of jobs (active and completed) */
-    private int totalJobs;
-
-    /** Number of active (incomplete) jobs */
-    private int activeJobs;
-
-    /** Number of completed jobs */
-    private int completedJobs;
-
-    /** Number of failed jobs */
-    private int failedJobs;
-
-    /** Number of successful jobs */
-    private int successfulJobs;
-
-    /** Number of jobs with file results */
-    private int fileResultJobs;
-
-    /** The oldest active job's creation timestamp */
-    private LocalDateTime oldestActiveJobTime;
-
-    /** The newest active job's creation timestamp */
-    private LocalDateTime newestActiveJobTime;
-
-    /** The average processing time for completed jobs in milliseconds */
-    private long averageProcessingTimeMs;
-}

common/src/main/java/stirling/software/common/model/oauth2/GitHubProvider.java

@@ -1,86 +0,0 @@
-package stirling.software.common.model.oauth2;
-
-import java.util.ArrayList;
-import java.util.Collection;
-
-import lombok.NoArgsConstructor;
-
-import stirling.software.common.model.enumeration.UsernameAttribute;
-
-@NoArgsConstructor
-public class GitHubProvider extends Provider {
-
-    private static final String NAME = "github";
-    private static final String CLIENT_NAME = "GitHub";
-    private static final String AUTHORIZATION_URI = "https://github.com/login/oauth/authorize";
-    private static final String TOKEN_URI = "https://github.com/login/oauth/access_token";
-    private static final String USER_INFO_URI = "https://api.github.com/user";
-
-    public GitHubProvider(
-            String clientId,
-            String clientSecret,
-            Collection<String> scopes,
-            UsernameAttribute useAsUsername) {
-        super(
-                null,
-                NAME,
-                CLIENT_NAME,
-                clientId,
-                clientSecret,
-                scopes,
-                useAsUsername != null ? useAsUsername : UsernameAttribute.LOGIN,
-                AUTHORIZATION_URI,
-                TOKEN_URI,
-                USER_INFO_URI);
-    }
-
-    @Override
-    public String getAuthorizationUri() {
-        return AUTHORIZATION_URI;
-    }
-
-    @Override
-    public String getTokenUri() {
-        return TOKEN_URI;
-    }
-
-    @Override
-    public String getUserInfoUri() {
-        return USER_INFO_URI;
-    }
-
-    @Override
-    public String getName() {
-        return NAME;
-    }
-
-    @Override
-    public String getClientName() {
-        return CLIENT_NAME;
-    }
-
-    @Override
-    public Collection<String> getScopes() {
-        Collection<String> scopes = super.getScopes();
-
-        if (scopes == null || scopes.isEmpty()) {
-            scopes = new ArrayList<>();
-            scopes.add("read:user");
-        }
-
-        return scopes;
-    }
-
-    @Override
-    public String toString() {
-        return "GitHub [clientId="
-                + getClientId()
-                + ", clientSecret="
-                + (getClientSecret() != null && !getClientSecret().isEmpty() ? "*****" : "NULL")
-                + ", scopes="
-                + getScopes()
-                + ", useAsUsername="
-                + getUseAsUsername()
-                + "]";
-    }
-}

common/src/main/java/stirling/software/common/model/oauth2/GoogleProvider.java

@@ -1,85 +0,0 @@
-package stirling.software.common.model.oauth2;
-
-import java.util.ArrayList;
-import java.util.Collection;
-
-import lombok.NoArgsConstructor;
-
-import stirling.software.common.model.enumeration.UsernameAttribute;
-
-@NoArgsConstructor
-public class GoogleProvider extends Provider {
-
-    private static final String NAME = "google";
-    private static final String CLIENT_NAME = "Google";
-    private static final String AUTHORIZATION_URI = "https://accounts.google.com/o/oauth2/v2/auth";
-    private static final String TOKEN_URI = "https://www.googleapis.com/oauth2/v4/token";
-    private static final String USER_INFO_URI =
-            "https://www.googleapis.com/oauth2/v3/userinfo?alt=json";
-
-    public GoogleProvider(
-            String clientId,
-            String clientSecret,
-            Collection<String> scopes,
-            UsernameAttribute useAsUsername) {
-        super(
-                null,
-                NAME,
-                CLIENT_NAME,
-                clientId,
-                clientSecret,
-                scopes,
-                useAsUsername,
-                AUTHORIZATION_URI,
-                TOKEN_URI,
-                USER_INFO_URI);
-    }
-
-    public String getAuthorizationUri() {
-        return AUTHORIZATION_URI;
-    }
-
-    public String getTokenUri() {
-        return TOKEN_URI;
-    }
-
-    public String getUserinfoUri() {
-        return USER_INFO_URI;
-    }
-
-    @Override
-    public String getName() {
-        return NAME;
-    }
-
-    @Override
-    public String getClientName() {
-        return CLIENT_NAME;
-    }
-
-    @Override
-    public Collection<String> getScopes() {
-        Collection<String> scopes = super.getScopes();
-
-        if (scopes == null || scopes.isEmpty()) {
-            scopes = new ArrayList<>();
-            scopes.add("https://www.googleapis.com/auth/userinfo.email");
-            scopes.add("https://www.googleapis.com/auth/userinfo.profile");
-        }
-
-        return scopes;
-    }
-
-    @Override
-    public String toString() {
-        return "Google [clientId="
-                + getClientId()
-                + ", clientSecret="
-                + (getClientSecret() != null && !getClientSecret().isEmpty() ? "*****" : "NULL")
-                + ", scopes="
-                + getScopes()
-                + ", useAsUsername="
-                + getUseAsUsername()
-                + "]";
-    }
-}

common/src/main/java/stirling/software/common/model/oauth2/KeycloakProvider.java

@@ -1,72 +0,0 @@
-package stirling.software.common.model.oauth2;
-
-import java.util.ArrayList;
-import java.util.Collection;
-
-import lombok.NoArgsConstructor;
-
-import stirling.software.common.model.enumeration.UsernameAttribute;
-
-@NoArgsConstructor
-public class KeycloakProvider extends Provider {
-
-    private static final String NAME = "keycloak";
-    private static final String CLIENT_NAME = "Keycloak";
-
-    public KeycloakProvider(
-            String issuer,
-            String clientId,
-            String clientSecret,
-            Collection<String> scopes,
-            UsernameAttribute useAsUsername) {
-        super(
-                issuer,
-                NAME,
-                CLIENT_NAME,
-                clientId,
-                clientSecret,
-                scopes,
-                useAsUsername,
-                null,
-                null,
-                null);
-    }
-
-    @Override
-    public String getName() {
-        return NAME;
-    }
-
-    @Override
-    public String getClientName() {
-        return CLIENT_NAME;
-    }
-
-    @Override
-    public Collection<String> getScopes() {
-        Collection<String> scopes = super.getScopes();
-
-        if (scopes == null || scopes.isEmpty()) {
-            scopes = new ArrayList<>();
-            scopes.add("profile");
-            scopes.add("email");
-        }
-
-        return scopes;
-    }
-
-    @Override
-    public String toString() {
-        return "Keycloak [issuer="
-                + getIssuer()
-                + ", clientId="
-                + getClientId()
-                + ", clientSecret="
-                + (getClientSecret() != null && !getClientSecret().isBlank() ? "*****" : "NULL")
-                + ", scopes="
-                + getScopes()
-                + ", useAsUsername="
-                + getUseAsUsername()
-                + "]";
-    }
-}

common/src/main/java/stirling/software/common/model/oauth2/Provider.java

@@ -1,129 +0,0 @@
-package stirling.software.common.model.oauth2;
-
-import static stirling.software.common.model.enumeration.UsernameAttribute.EMAIL;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import stirling.software.common.model.enumeration.UsernameAttribute;
-import stirling.software.common.model.exception.UnsupportedClaimException;
-
-@Data
-@NoArgsConstructor
-public class Provider {
-
-    public static final String EXCEPTION_MESSAGE = "The attribute %s is not supported for %s.";
-
-    private String issuer;
-    private String name;
-    private String clientName;
-    private String clientId;
-    private String clientSecret;
-    private Collection<String> scopes;
-    private UsernameAttribute useAsUsername;
-    private String authorizationUri;
-    private String tokenUri;
-    private String userInfoUri;
-
-    public Provider(
-            String issuer,
-            String name,
-            String clientName,
-            String clientId,
-            String clientSecret,
-            Collection<String> scopes,
-            UsernameAttribute useAsUsername,
-            String authorizationUri,
-            String tokenUri,
-            String userInfoUri) {
-        this.issuer = issuer;
-        this.name = name;
-        this.clientName = clientName;
-        this.clientId = clientId;
-        this.clientSecret = clientSecret;
-        this.scopes = scopes == null ? new ArrayList<>() : scopes;
-        this.useAsUsername =
-                useAsUsername != null ? validateUsernameAttribute(useAsUsername) : EMAIL;
-        this.authorizationUri = authorizationUri;
-        this.tokenUri = tokenUri;
-        this.userInfoUri = userInfoUri;
-    }
-
-    public void setScopes(String scopes) {
-        if (scopes != null && !scopes.isBlank()) {
-            this.scopes = Arrays.stream(scopes.split(",")).map(String::trim).toList();
-        }
-    }
-
-    private UsernameAttribute validateUsernameAttribute(UsernameAttribute usernameAttribute) {
-        switch (name) {
-            case "google" -> {
-                return validateGoogleUsernameAttribute(usernameAttribute);
-            }
-            case "github" -> {
-                return validateGitHubUsernameAttribute(usernameAttribute);
-            }
-            case "keycloak" -> {
-                return validateKeycloakUsernameAttribute(usernameAttribute);
-            }
-            default -> {
-                return usernameAttribute;
-            }
-        }
-    }
-
-    private UsernameAttribute validateKeycloakUsernameAttribute(
-            UsernameAttribute usernameAttribute) {
-        switch (usernameAttribute) {
-            case EMAIL, NAME, GIVEN_NAME, FAMILY_NAME, PREFERRED_USERNAME -> {
-                return usernameAttribute;
-            }
-            default ->
-                    throw new UnsupportedClaimException(
-                            String.format(EXCEPTION_MESSAGE, usernameAttribute, clientName));
-        }
-    }
-
-    private UsernameAttribute validateGoogleUsernameAttribute(UsernameAttribute usernameAttribute) {
-        switch (usernameAttribute) {
-            case EMAIL, NAME, GIVEN_NAME, FAMILY_NAME -> {
-                return usernameAttribute;
-            }
-            default ->
-                    throw new UnsupportedClaimException(
-                            String.format(EXCEPTION_MESSAGE, usernameAttribute, clientName));
-        }
-    }
-
-    private UsernameAttribute validateGitHubUsernameAttribute(UsernameAttribute usernameAttribute) {
-        switch (usernameAttribute) {
-            case LOGIN, EMAIL, NAME -> {
-                return usernameAttribute;
-            }
-            default ->
-                    throw new UnsupportedClaimException(
-                            String.format(EXCEPTION_MESSAGE, usernameAttribute, clientName));
-        }
-    }
-
-    @Override
-    public String toString() {
-        return "Provider [name="
-                + getName()
-                + ", clientName="
-                + getClientName()
-                + ", clientId="
-                + getClientId()
-                + ", clientSecret="
-                + (getClientSecret() != null && !getClientSecret().isEmpty() ? "*****" : "NULL")
-                + ", scopes="
-                + getScopes()
-                + ", useAsUsername="
-                + getUseAsUsername()
-                + "]";
-    }
-}

common/src/main/java/stirling/software/common/service/CustomPDFDocumentFactory.java

@@ -1,474 +0,0 @@
-package stirling.software.common.service;
-
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.StandardCopyOption;
-import java.util.concurrent.atomic.AtomicLong;
-
-import org.apache.pdfbox.Loader;
-import org.apache.pdfbox.examples.util.DeletingRandomAccessFile;
-import org.apache.pdfbox.io.IOUtils;
-import org.apache.pdfbox.io.MemoryUsageSetting;
-import org.apache.pdfbox.io.RandomAccessStreamCache.StreamCacheCreateFunction;
-import org.apache.pdfbox.io.ScratchFile;
-import org.apache.pdfbox.pdmodel.PDDocument;
-import org.springframework.stereotype.Component;
-import org.springframework.web.multipart.MultipartFile;
-
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-
-import stirling.software.common.model.api.PDFFile;
-
-/**
- * Adaptive PDF document factory that optimizes memory usage based on file size and available system
- * resources.
- */
-@Component
-@Slf4j
-@RequiredArgsConstructor
-public class CustomPDFDocumentFactory {
-
-    private final PdfMetadataService pdfMetadataService;
-
-    // Memory thresholds and limits
-
-    private static final long SMALL_FILE_THRESHOLD = 10 * 1024 * 1024; // 10 MB
-    // Files smaller than this threshold are loaded entirely in memory for better performance.
-    // These files use IOUtils.createMemoryOnlyStreamCache() which keeps all document data in RAM.
-    // No temp files are created for document data, reducing I/O operations but consuming more
-    // memory.
-
-    private static final long LARGE_FILE_THRESHOLD = 50 * 1024 * 1024; // 50 MB
-    // Files between SMALL and LARGE thresholds use file-based caching with ScratchFile,
-    // but are loaded directly from byte arrays if provided that way.
-    // When loading from byte arrays, once size exceeds this threshold, bytes are first
-    // written to temp files before loading to reduce memory pressure.
-
-    private static final long LARGE_FILE_USAGE = 10 * 1024 * 1024;
-
-    private static final long EXTREMELY_LARGE_THRESHOLD = 100 * 1024 * 1024; // 100 MB
-    // Files exceeding this threshold use specialized loading with RandomAccessReadBufferedFile
-    // which provides buffered access to the file without loading the entire content at once.
-    // These files are always processed using file-based caching with minimal memory footprint,
-    // trading some performance for significantly reduced memory usage.
-    // For extremely large PDFs, this prevents OutOfMemoryErrors at the cost of being more I/O
-    // bound.
-
-    private static final double MIN_FREE_MEMORY_PERCENTAGE = 30.0; // 30%
-    private static final long MIN_FREE_MEMORY_BYTES = 4L * 1024 * 1024 * 1024; // 4 GB
-
-    // Counter for tracking temporary resources
-    private static final AtomicLong tempCounter = new AtomicLong(0);
-
-    /**
-     * Main entry point for loading a PDF document from a file. Automatically selects the most
-     * appropriate loading strategy.
-     */
-    public PDDocument load(File file) throws IOException {
-        return load(file, false);
-    }
-
-    /**
-     * Main entry point for loading a PDF document from a file with read-only option. Automatically
-     * selects the most appropriate loading strategy.
-     */
-    public PDDocument load(File file, boolean readOnly) throws IOException {
-        if (file == null) {
-            throw new IllegalArgumentException("File cannot be null");
-        }
-
-        long fileSize = file.length();
-        log.debug("Loading PDF from file, size: {}MB", fileSize / (1024 * 1024));
-
-        PDDocument doc = loadAdaptively(file, fileSize);
-        if (!readOnly) {
-            postProcessDocument(doc);
-        }
-        return doc;
-    }
-
-    /**
-     * Main entry point for loading a PDF document from a Path. Automatically selects the most
-     * appropriate loading strategy.
-     */
-    public PDDocument load(Path path) throws IOException {
-        return load(path, false);
-    }
-
-    /**
-     * Main entry point for loading a PDF document from a Path with read-only option. Automatically
-     * selects the most appropriate loading strategy.
-     */
-    public PDDocument load(Path path, boolean readOnly) throws IOException {
-        if (path == null) {
-            throw new IllegalArgumentException("File cannot be null");
-        }
-
-        long fileSize = Files.size(path);
-        log.debug("Loading PDF from file, size: {}MB", fileSize / (1024 * 1024));
-
-        PDDocument doc = loadAdaptively(path.toFile(), fileSize);
-        if (!readOnly) {
-            postProcessDocument(doc);
-        }
-        return doc;
-    }
-
-    /** Load a PDF from byte array with automatic optimization. */
-    public PDDocument load(byte[] input) throws IOException {
-        return load(input, false);
-    }
-
-    /** Load a PDF from byte array with automatic optimization and read-only option. */
-    public PDDocument load(byte[] input, boolean readOnly) throws IOException {
-        if (input == null) {
-            throw new IllegalArgumentException("Input bytes cannot be null");
-        }
-
-        long dataSize = input.length;
-        log.debug("Loading PDF from byte array, size: {}MB", dataSize / (1024 * 1024));
-
-        PDDocument doc = loadAdaptively(input, dataSize);
-        if (!readOnly) {
-            postProcessDocument(doc);
-        }
-        return doc;
-    }
-
-    /** Load a PDF from InputStream with automatic optimization. */
-    public PDDocument load(InputStream input) throws IOException {
-        return load(input, false);
-    }
-
-    /** Load a PDF from InputStream with automatic optimization and read-only option. */
-    public PDDocument load(InputStream input, boolean readOnly) throws IOException {
-        if (input == null) {
-            throw new IllegalArgumentException("InputStream cannot be null");
-        }
-
-        // Since we don't know the size upfront, buffer to a temp file
-        Path tempFile = createTempFile("pdf-stream-");
-
-        Files.copy(input, tempFile, StandardCopyOption.REPLACE_EXISTING);
-        PDDocument doc = loadAdaptively(tempFile.toFile(), Files.size(tempFile));
-        if (!readOnly) {
-            postProcessDocument(doc);
-        }
-        return doc;
-    }
-
-    /** Load with password from InputStream */
-    public PDDocument load(InputStream input, String password) throws IOException {
-        return load(input, password, false);
-    }
-
-    /** Load with password from InputStream and read-only option */
-    public PDDocument load(InputStream input, String password, boolean readOnly)
-            throws IOException {
-        if (input == null) {
-            throw new IllegalArgumentException("InputStream cannot be null");
-        }
-
-        // Since we don't know the size upfront, buffer to a temp file
-        Path tempFile = createTempFile("pdf-stream-");
-
-        Files.copy(input, tempFile, StandardCopyOption.REPLACE_EXISTING);
-        PDDocument doc =
-                loadAdaptivelyWithPassword(tempFile.toFile(), Files.size(tempFile), password);
-        if (!readOnly) {
-            postProcessDocument(doc);
-        }
-        return doc;
-    }
-
-    /** Load from a file path string */
-    public PDDocument load(String path) throws IOException {
-        return load(path, false);
-    }
-
-    /** Load from a file path string with read-only option */
-    public PDDocument load(String path, boolean readOnly) throws IOException {
-        return load(new File(path), readOnly);
-    }
-
-    /** Load from a PDFFile object */
-    public PDDocument load(PDFFile pdfFile) throws IOException {
-        return load(pdfFile, false);
-    }
-
-    /** Load from a PDFFile object with read-only option */
-    public PDDocument load(PDFFile pdfFile, boolean readOnly) throws IOException {
-        return load(pdfFile.getFileInput(), readOnly);
-    }
-
-    /** Load from a MultipartFile */
-    public PDDocument load(MultipartFile pdfFile) throws IOException {
-        return load(pdfFile, false);
-    }
-
-    /** Load from a MultipartFile with read-only option */
-    public PDDocument load(MultipartFile pdfFile, boolean readOnly) throws IOException {
-        return load(pdfFile.getInputStream(), readOnly);
-    }
-
-    /** Load with password from MultipartFile */
-    public PDDocument load(MultipartFile fileInput, String password) throws IOException {
-        return load(fileInput, password, false);
-    }
-
-    /** Load with password from MultipartFile with read-only option */
-    public PDDocument load(MultipartFile fileInput, String password, boolean readOnly)
-            throws IOException {
-        return load(fileInput.getInputStream(), password, readOnly);
-    }
-
-    /**
-     * Determine the appropriate caching strategy based on file size and available memory. This
-     * common method is used by both password and non-password loading paths.
-     */
-    public StreamCacheCreateFunction getStreamCacheFunction(long contentSize) {
-        long maxMemory = Runtime.getRuntime().maxMemory();
-        long freeMemory = Runtime.getRuntime().freeMemory();
-        long totalMemory = Runtime.getRuntime().totalMemory();
-        long usedMemory = totalMemory - freeMemory;
-
-        // Calculate percentage of free memory
-        double freeMemoryPercent = (double) (maxMemory - usedMemory) / maxMemory * 100;
-        long actualFreeMemory = maxMemory - usedMemory;
-
-        // Log memory status
-        log.debug(
-                "Memory status - Free: {}MB ({}%), Used: {}MB, Max: {}MB",
-                actualFreeMemory / (1024 * 1024),
-                String.format("%.2f", freeMemoryPercent),
-                usedMemory / (1024 * 1024),
-                maxMemory / (1024 * 1024));
-
-        // If free memory is critically low, always use file-based caching
-        if (freeMemoryPercent < MIN_FREE_MEMORY_PERCENTAGE
-                || actualFreeMemory < MIN_FREE_MEMORY_BYTES) {
-            log.debug(
-                    "Low memory detected ({}%), forcing file-based cache",
-                    String.format("%.2f", freeMemoryPercent));
-            return createScratchFileCacheFunction(MemoryUsageSetting.setupTempFileOnly());
-        } else if (contentSize < SMALL_FILE_THRESHOLD) {
-            log.debug("Using memory-only cache for small document ({}KB)", contentSize / 1024);
-            return IOUtils.createMemoryOnlyStreamCache();
-        } else if (contentSize < LARGE_FILE_THRESHOLD) {
-            // For medium files (10-50MB), use a mixed approach
-            log.debug(
-                    "Using mixed memory/file cache for medium document ({}MB)",
-                    contentSize / (1024 * 1024));
-            return createScratchFileCacheFunction(MemoryUsageSetting.setupMixed(LARGE_FILE_USAGE));
-        } else {
-            log.debug("Using file-based cache for large document");
-            return createScratchFileCacheFunction(MemoryUsageSetting.setupTempFileOnly());
-        }
-    }
-
-    /** Update the existing loadAdaptively method to use the common function */
-    private PDDocument loadAdaptively(Object source, long contentSize) throws IOException {
-        // Get the appropriate caching strategy
-        StreamCacheCreateFunction cacheFunction = getStreamCacheFunction(contentSize);
-
-        // If small handle as bytes and remove original file
-        if (contentSize <= SMALL_FILE_THRESHOLD && source instanceof File file) {
-            source = Files.readAllBytes(file.toPath());
-            file.delete();
-        }
-        PDDocument document;
-        if (source instanceof File file) {
-            document = loadFromFile(file, contentSize, cacheFunction);
-        } else if (source instanceof byte[] bytes) {
-            document = loadFromBytes(bytes, contentSize, cacheFunction);
-        } else {
-            throw new IllegalArgumentException("Unsupported source type: " + source.getClass());
-        }
-        return document;
-    }
-
-    /** Load a PDF with password protection using adaptive loading strategies */
-    private PDDocument loadAdaptivelyWithPassword(Object source, long contentSize, String password)
-            throws IOException {
-        // Get the appropriate caching strategy
-        StreamCacheCreateFunction cacheFunction = getStreamCacheFunction(contentSize);
-        // If small handle as bytes and remove original file
-        if (contentSize <= SMALL_FILE_THRESHOLD && source instanceof File file) {
-            source = Files.readAllBytes(file.toPath());
-            file.delete();
-        }
-        PDDocument document;
-        if (source instanceof File file) {
-            document = loadFromFileWithPassword(file, contentSize, cacheFunction, password);
-        } else if (source instanceof byte[] bytes) {
-            document = loadFromBytesWithPassword(bytes, contentSize, cacheFunction, password);
-        } else {
-            throw new IllegalArgumentException("Unsupported source type: " + source.getClass());
-        }
-        return document;
-    }
-
-    /** Load a file with password */
-    private PDDocument loadFromFileWithPassword(
-            File file, long size, StreamCacheCreateFunction cache, String password)
-            throws IOException {
-        return Loader.loadPDF(new DeletingRandomAccessFile(file), password, null, null, cache);
-    }
-
-    /** Load bytes with password */
-    private PDDocument loadFromBytesWithPassword(
-            byte[] bytes, long size, StreamCacheCreateFunction cache, String password)
-            throws IOException {
-        if (size >= SMALL_FILE_THRESHOLD) {
-            log.debug("Writing large byte array to temp file for password-protected PDF");
-            Path tempFile = createTempFile("pdf-bytes-");
-
-            Files.write(tempFile, bytes);
-            return Loader.loadPDF(tempFile.toFile(), password, null, null, cache);
-        }
-        return Loader.loadPDF(bytes, password, null, null, cache);
-    }
-
-    private StreamCacheCreateFunction createScratchFileCacheFunction(MemoryUsageSetting settings) {
-        return () -> {
-            try {
-                return new ScratchFile(settings);
-            } catch (IOException e) {
-                throw new RuntimeException("ScratchFile initialization failed", e);
-            }
-        };
-    }
-
-    private void postProcessDocument(PDDocument doc) throws IOException {
-        pdfMetadataService.setDefaultMetadata(doc);
-        removePassword(doc);
-    }
-
-    private PDDocument loadFromFile(File file, long size, StreamCacheCreateFunction cache)
-            throws IOException {
-        return Loader.loadPDF(new DeletingRandomAccessFile(file), "", null, null, cache);
-    }
-
-    private PDDocument loadFromBytes(byte[] bytes, long size, StreamCacheCreateFunction cache)
-            throws IOException {
-        if (size >= SMALL_FILE_THRESHOLD) {
-            log.debug("Writing large byte array to temp file");
-            Path tempFile = createTempFile("pdf-bytes-");
-
-            Files.write(tempFile, bytes);
-            return loadFromFile(tempFile.toFile(), size, cache);
-        }
-        return Loader.loadPDF(bytes, "", null, null, cache);
-    }
-
-    public PDDocument createNewDocument(MemoryUsageSetting settings) throws IOException {
-        PDDocument doc = new PDDocument(createScratchFileCacheFunction(settings));
-        pdfMetadataService.setDefaultMetadata(doc);
-        return doc;
-    }
-
-    public PDDocument createNewDocument() throws IOException {
-        return createNewDocument(MemoryUsageSetting.setupTempFileOnly());
-    }
-
-    public byte[] saveToBytes(PDDocument document) throws IOException {
-        if (document.getNumberOfPages() < 10) { // Simple heuristic
-            try (ByteArrayOutputStream baos = new ByteArrayOutputStream()) {
-                document.save(baos);
-                return baos.toByteArray();
-            }
-        } else {
-            Path tempFile = createTempFile("pdf-save-");
-
-            document.save(tempFile.toFile());
-            return Files.readAllBytes(tempFile);
-        }
-    }
-
-    // Improved password handling
-    private void removePassword(PDDocument document) throws IOException {
-        if (document.isEncrypted()) {
-            try {
-                document.setAllSecurityToBeRemoved(true);
-            } catch (Exception e) {
-                log.error("Decryption failed", e);
-                throw new IOException("PDF decryption failed", e);
-            }
-        }
-    }
-
-    // Temp file handling with enhanced logging
-    private Path createTempFile(String prefix) throws IOException {
-        Path file = Files.createTempFile(prefix + tempCounter.incrementAndGet() + "-", ".tmp");
-        log.debug("Created temp file: {}", file);
-        return file;
-    }
-
-    /** Create a uniquely named temporary directory */
-    private Path createTempDirectory(String prefix) throws IOException {
-        return Files.createTempDirectory(prefix + tempCounter.incrementAndGet() + "-");
-    }
-
-    /** Create new document bytes based on an existing document */
-    public byte[] createNewBytesBasedOnOldDocument(byte[] oldDocument) throws IOException {
-        try (PDDocument document = load(oldDocument)) {
-            return saveToBytes(document);
-        }
-    }
-
-    /** Create new document bytes based on an existing document file */
-    public byte[] createNewBytesBasedOnOldDocument(File oldDocument) throws IOException {
-        try (PDDocument document = load(oldDocument)) {
-            return saveToBytes(document);
-        }
-    }
-
-    /** Create new document bytes based on an existing PDDocument */
-    public byte[] createNewBytesBasedOnOldDocument(PDDocument oldDocument) throws IOException {
-        pdfMetadataService.setMetadataToPdf(
-                oldDocument, pdfMetadataService.extractMetadataFromPdf(oldDocument), true);
-        return saveToBytes(oldDocument);
-    }
-
-    /** Create a new document based on an existing document bytes */
-    public PDDocument createNewDocumentBasedOnOldDocument(byte[] oldDocument) throws IOException {
-        try (PDDocument document = load(oldDocument)) {
-            return createNewDocumentBasedOnOldDocument(document);
-        }
-    }
-
-    /** Create a new document based on an existing document file */
-    public PDDocument createNewDocumentBasedOnOldDocument(File oldDocument) throws IOException {
-        try (PDDocument document = load(oldDocument)) {
-            return createNewDocumentBasedOnOldDocument(document);
-        }
-    }
-
-    /** Create a new document based on an existing PDDocument */
-    public PDDocument createNewDocumentBasedOnOldDocument(PDDocument oldDocument)
-            throws IOException {
-        PDDocument document = createNewDocument();
-        pdfMetadataService.setMetadataToPdf(
-                document, pdfMetadataService.extractMetadataFromPdf(oldDocument), true);
-        return document;
-    }
-
-    /** Load document from a file and convert it to bytes */
-    public byte[] loadToBytes(File file) throws IOException {
-        try (PDDocument document = load(file)) {
-            return saveToBytes(document);
-        }
-    }
-
-    /** Load document from bytes and convert it back to bytes */
-    public byte[] loadToBytes(byte[] bytes) throws IOException {
-        try (PDDocument document = load(bytes)) {
-            return saveToBytes(document);
-        }
-    }
-}

common/src/main/java/stirling/software/common/service/FileOrUploadService.java

@@ -1,78 +0,0 @@
-package stirling.software.common.service;
-
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.nio.file.*;
-
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Service;
-import org.springframework.web.multipart.MultipartFile;
-
-import lombok.RequiredArgsConstructor;
-
-@Service
-@RequiredArgsConstructor
-public class FileOrUploadService {
-
-    @Value("${stirling.tempDir:/tmp/stirling-files}")
-    private String tempDirPath;
-
-    public Path resolveFilePath(String fileId) {
-        return Path.of(tempDirPath).resolve(fileId);
-    }
-
-    public MultipartFile toMockMultipartFile(String name, byte[] data) throws IOException {
-        return new CustomMultipartFile(name, data);
-    }
-
-    // Custom implementation of MultipartFile
-    private static class CustomMultipartFile implements MultipartFile {
-        private final String name;
-        private final byte[] content;
-
-        public CustomMultipartFile(String name, byte[] content) {
-            this.name = name;
-            this.content = content;
-        }
-
-        @Override
-        public String getName() {
-            return name;
-        }
-
-        @Override
-        public String getOriginalFilename() {
-            return name;
-        }
-
-        @Override
-        public String getContentType() {
-            return "application/pdf";
-        }
-
-        @Override
-        public boolean isEmpty() {
-            return content == null || content.length == 0;
-        }
-
-        @Override
-        public long getSize() {
-            return content.length;
-        }
-
-        @Override
-        public byte[] getBytes() throws IOException {
-            return content;
-        }
-
-        @Override
-        public java.io.InputStream getInputStream() throws IOException {
-            return new ByteArrayInputStream(content);
-        }
-
-        @Override
-        public void transferTo(java.io.File dest) throws IOException, IllegalStateException {
-            Files.write(dest.toPath(), content);
-        }
-    }
-}

common/src/main/java/stirling/software/common/service/FileStorage.java

@@ -1,152 +0,0 @@
-package stirling.software.common.service;
-
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.UUID;
-
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Service;
-import org.springframework.web.multipart.MultipartFile;
-
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-
-/**
- * Service for storing and retrieving files with unique file IDs. Used by the AutoJobPostMapping
- * system to handle file references.
- */
-@Service
-@RequiredArgsConstructor
-@Slf4j
-public class FileStorage {
-
-    @Value("${stirling.tempDir:/tmp/stirling-files}")
-    private String tempDirPath;
-
-    private final FileOrUploadService fileOrUploadService;
-
-    /**
-     * Store a file and return its unique ID
-     *
-     * @param file The file to store
-     * @return The unique ID assigned to the file
-     * @throws IOException If there is an error storing the file
-     */
-    public String storeFile(MultipartFile file) throws IOException {
-        String fileId = generateFileId();
-        Path filePath = getFilePath(fileId);
-
-        // Ensure the directory exists
-        Files.createDirectories(filePath.getParent());
-
-        // Transfer the file to the storage location
-        file.transferTo(filePath.toFile());
-
-        log.debug("Stored file with ID: {}", fileId);
-        return fileId;
-    }
-
-    /**
-     * Store a byte array as a file and return its unique ID
-     *
-     * @param bytes The byte array to store
-     * @param originalName The original name of the file (for extension)
-     * @return The unique ID assigned to the file
-     * @throws IOException If there is an error storing the file
-     */
-    public String storeBytes(byte[] bytes, String originalName) throws IOException {
-        String fileId = generateFileId();
-        Path filePath = getFilePath(fileId);
-
-        // Ensure the directory exists
-        Files.createDirectories(filePath.getParent());
-
-        // Write the bytes to the file
-        Files.write(filePath, bytes);
-
-        log.debug("Stored byte array with ID: {}", fileId);
-        return fileId;
-    }
-
-    /**
-     * Retrieve a file by its ID as a MultipartFile
-     *
-     * @param fileId The ID of the file to retrieve
-     * @return The file as a MultipartFile
-     * @throws IOException If the file doesn't exist or can't be read
-     */
-    public MultipartFile retrieveFile(String fileId) throws IOException {
-        Path filePath = getFilePath(fileId);
-
-        if (!Files.exists(filePath)) {
-            throw new IOException("File not found with ID: " + fileId);
-        }
-
-        byte[] fileData = Files.readAllBytes(filePath);
-        return fileOrUploadService.toMockMultipartFile(fileId, fileData);
-    }
-
-    /**
-     * Retrieve a file by its ID as a byte array
-     *
-     * @param fileId The ID of the file to retrieve
-     * @return The file as a byte array
-     * @throws IOException If the file doesn't exist or can't be read
-     */
-    public byte[] retrieveBytes(String fileId) throws IOException {
-        Path filePath = getFilePath(fileId);
-
-        if (!Files.exists(filePath)) {
-            throw new IOException("File not found with ID: " + fileId);
-        }
-
-        return Files.readAllBytes(filePath);
-    }
-
-    /**
-     * Delete a file by its ID
-     *
-     * @param fileId The ID of the file to delete
-     * @return true if the file was deleted, false otherwise
-     */
-    public boolean deleteFile(String fileId) {
-        try {
-            Path filePath = getFilePath(fileId);
-            return Files.deleteIfExists(filePath);
-        } catch (IOException e) {
-            log.error("Error deleting file with ID: {}", fileId, e);
-            return false;
-        }
-    }
-
-    /**
-     * Check if a file exists by its ID
-     *
-     * @param fileId The ID of the file to check
-     * @return true if the file exists, false otherwise
-     */
-    public boolean fileExists(String fileId) {
-        Path filePath = getFilePath(fileId);
-        return Files.exists(filePath);
-    }
-
-    /**
-     * Get the path for a file ID
-     *
-     * @param fileId The ID of the file
-     * @return The path to the file
-     */
-    private Path getFilePath(String fileId) {
-        return Path.of(tempDirPath).resolve(fileId);
-    }
-
-    /**
-     * Generate a unique file ID
-     *
-     * @return A unique file ID
-     */
-    private String generateFileId() {
-        return UUID.randomUUID().toString();
-    }
-}

common/src/main/java/stirling/software/common/service/JobExecutorService.java

@@ -1,465 +0,0 @@
-package stirling.software.common.service;
-
-import java.io.IOException;
-import java.util.Map;
-import java.util.UUID;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
-import java.util.function.Supplier;
-
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.MediaType;
-import org.springframework.http.ResponseEntity;
-import org.springframework.stereotype.Service;
-import org.springframework.web.multipart.MultipartFile;
-
-import jakarta.servlet.http.HttpServletRequest;
-
-import lombok.extern.slf4j.Slf4j;
-
-import stirling.software.common.controller.WebSocketProgressController;
-import stirling.software.common.model.job.JobProgress;
-import stirling.software.common.model.job.JobResponse;
-import stirling.software.common.util.ExecutorFactory;
-
-/** Service for executing jobs asynchronously or synchronously */
-@Service
-@Slf4j
-public class JobExecutorService {
-
-    private final TaskManager taskManager;
-    private final WebSocketProgressController webSocketSender;
-    private final FileStorage fileStorage;
-    private final HttpServletRequest request;
-    private final ResourceMonitor resourceMonitor;
-    private final JobQueue jobQueue;
-    private final ExecutorService executor = ExecutorFactory.newVirtualOrCachedThreadExecutor();
-    private final long effectiveTimeoutMs;
-
-    public JobExecutorService(
-            TaskManager taskManager,
-            WebSocketProgressController webSocketSender,
-            FileStorage fileStorage,
-            HttpServletRequest request,
-            ResourceMonitor resourceMonitor,
-            JobQueue jobQueue,
-            @Value("${spring.mvc.async.request-timeout:1200000}") long asyncRequestTimeoutMs,
-            @Value("${server.servlet.session.timeout:30m}") String sessionTimeout) {
-        this.taskManager = taskManager;
-        this.webSocketSender = webSocketSender;
-        this.fileStorage = fileStorage;
-        this.request = request;
-        this.resourceMonitor = resourceMonitor;
-        this.jobQueue = jobQueue;
-
-        // Parse session timeout and calculate effective timeout once during initialization
-        long sessionTimeoutMs = parseSessionTimeout(sessionTimeout);
-        this.effectiveTimeoutMs = Math.min(asyncRequestTimeoutMs, sessionTimeoutMs);
-        log.debug(
-                "Job executor configured with effective timeout of {} ms", this.effectiveTimeoutMs);
-    }
-
-    /**
-     * Run a job either asynchronously or synchronously
-     *
-     * @param async Whether to run the job asynchronously
-     * @param work The work to be done
-     * @return The response
-     */
-    public ResponseEntity<?> runJobGeneric(boolean async, Supplier<Object> work) {
-        return runJobGeneric(async, work, -1);
-    }
-
-    /**
-     * Run a job either asynchronously or synchronously with a custom timeout
-     *
-     * @param async Whether to run the job asynchronously
-     * @param work The work to be done
-     * @param customTimeoutMs Custom timeout in milliseconds, or -1 to use the default
-     * @return The response
-     */
-    public ResponseEntity<?> runJobGeneric(
-            boolean async, Supplier<Object> work, long customTimeoutMs) {
-        return runJobGeneric(async, work, customTimeoutMs, false, 50);
-    }
-
-    /**
-     * Run a job either asynchronously or synchronously with custom parameters
-     *
-     * @param async Whether to run the job asynchronously
-     * @param work The work to be done
-     * @param customTimeoutMs Custom timeout in milliseconds, or -1 to use the default
-     * @param queueable Whether this job can be queued when system resources are limited
-     * @param resourceWeight The resource weight of this job (1-100)
-     * @return The response
-     */
-    public ResponseEntity<?> runJobGeneric(
-            boolean async,
-            Supplier<Object> work,
-            long customTimeoutMs,
-            boolean queueable,
-            int resourceWeight) {
-        String jobId = UUID.randomUUID().toString();
-
-        // Store the job ID in the request for potential use by other components
-        if (request != null) {
-            request.setAttribute("jobId", jobId);
-        }
-
-        // Determine which timeout to use
-        long timeoutToUse = customTimeoutMs > 0 ? customTimeoutMs : effectiveTimeoutMs;
-
-        log.debug(
-                "Running job with ID: {}, async: {}, timeout: {}ms, queueable: {}, weight: {}",
-                jobId,
-                async,
-                timeoutToUse,
-                queueable,
-                resourceWeight);
-
-        // Check if we need to queue this job based on resource availability
-        boolean shouldQueue =
-                queueable
-                        && async
-                        && // Only async jobs can be queued
-                        resourceMonitor.shouldQueueJob(resourceWeight);
-
-        if (shouldQueue) {
-            // Queue the job instead of executing immediately
-            log.debug(
-                    "Queueing job {} due to resource constraints (weight: {})",
-                    jobId,
-                    resourceWeight);
-
-            taskManager.createTask(jobId);
-
-            // Create a specialized wrapper that updates the TaskManager
-            Supplier<Object> wrappedWork =
-                    () -> {
-                        try {
-                            Object result = work.get();
-                            processJobResult(jobId, result);
-                            return result;
-                        } catch (Exception e) {
-                            log.error(
-                                    "Error executing queued job {}: {}", jobId, e.getMessage(), e);
-                            taskManager.setError(jobId, e.getMessage());
-                            throw e;
-                        }
-                    };
-
-            // Queue the job and get the future
-            CompletableFuture<ResponseEntity<?>> future =
-                    jobQueue.queueJob(jobId, resourceWeight, wrappedWork, timeoutToUse);
-
-            // Return immediately with job ID
-            return ResponseEntity.ok().body(new JobResponse<>(true, jobId, null));
-        } else if (async) {
-            taskManager.createTask(jobId);
-            webSocketSender.sendProgress(jobId, new JobProgress(jobId, "Started", 0, "Running"));
-
-            executor.execute(
-                    () -> {
-                        try {
-                            log.debug(
-                                    "Running async job {} with timeout {} ms", jobId, timeoutToUse);
-
-                            // Execute with timeout
-                            Object result = executeWithTimeout(() -> work.get(), timeoutToUse);
-                            processJobResult(jobId, result);
-                            webSocketSender.sendProgress(
-                                    jobId, new JobProgress(jobId, "Done", 100, "Complete"));
-                        } catch (TimeoutException te) {
-                            log.error("Job {} timed out after {} ms", jobId, timeoutToUse);
-                            taskManager.setError(jobId, "Job timed out");
-                            webSocketSender.sendProgress(
-                                    jobId, new JobProgress(jobId, "Error", 100, "Job timed out"));
-                        } catch (Exception e) {
-                            log.error("Error executing job {}: {}", jobId, e.getMessage(), e);
-                            taskManager.setError(jobId, e.getMessage());
-                            webSocketSender.sendProgress(
-                                    jobId, new JobProgress(jobId, "Error", 100, e.getMessage()));
-                        }
-                    });
-
-            return ResponseEntity.ok().body(new JobResponse<>(true, jobId, null));
-        } else {
-            try {
-                log.debug("Running sync job with timeout {} ms", timeoutToUse);
-
-                // Execute with timeout
-                Object result = executeWithTimeout(() -> work.get(), timeoutToUse);
-
-                // If the result is already a ResponseEntity, return it directly
-                if (result instanceof ResponseEntity) {
-                    return (ResponseEntity<?>) result;
-                }
-
-                // Process different result types
-                return handleResultForSyncJob(result);
-            } catch (TimeoutException te) {
-                log.error("Synchronous job timed out after {} ms", timeoutToUse);
-                return ResponseEntity.internalServerError()
-                        .body(Map.of("error", "Job timed out after " + timeoutToUse + " ms"));
-            } catch (Exception e) {
-                log.error("Error executing synchronous job: {}", e.getMessage(), e);
-                // Construct a JSON error response
-                return ResponseEntity.internalServerError()
-                        .body(Map.of("error", "Job failed: " + e.getMessage()));
-            }
-        }
-    }
-
-    /**
-     * Process the result of an asynchronous job
-     *
-     * @param jobId The job ID
-     * @param result The result
-     */
-    private void processJobResult(String jobId, Object result) {
-        try {
-            if (result instanceof byte[]) {
-                // Store byte array as a file
-                String fileId = fileStorage.storeBytes((byte[]) result, "result.pdf");
-                taskManager.setFileResult(jobId, fileId, "result.pdf", "application/pdf");
-                log.debug("Stored byte[] result with fileId: {}", fileId);
-            } else if (result instanceof ResponseEntity) {
-                ResponseEntity<?> response = (ResponseEntity<?>) result;
-                Object body = response.getBody();
-
-                if (body instanceof byte[]) {
-                    // Extract filename from content-disposition header if available
-                    String filename = "result.pdf";
-                    String contentType = "application/pdf";
-
-                    if (response.getHeaders().getContentDisposition() != null) {
-                        String disposition =
-                                response.getHeaders().getContentDisposition().toString();
-                        if (disposition.contains("filename=")) {
-                            filename =
-                                    disposition.substring(
-                                            disposition.indexOf("filename=") + 9,
-                                            disposition.lastIndexOf("\""));
-                        }
-                    }
-
-                    if (response.getHeaders().getContentType() != null) {
-                        contentType = response.getHeaders().getContentType().toString();
-                    }
-
-                    String fileId = fileStorage.storeBytes((byte[]) body, filename);
-                    taskManager.setFileResult(jobId, fileId, filename, contentType);
-                    log.debug("Stored ResponseEntity<byte[]> result with fileId: {}", fileId);
-                } else {
-                    // Check if the response body contains a fileId
-                    if (body != null && body.toString().contains("fileId")) {
-                        try {
-                            // Try to extract fileId using reflection
-                            java.lang.reflect.Method getFileId =
-                                    body.getClass().getMethod("getFileId");
-                            String fileId = (String) getFileId.invoke(body);
-
-                            if (fileId != null && !fileId.isEmpty()) {
-                                // Try to get filename and content type
-                                String filename = "result.pdf";
-                                String contentType = "application/pdf";
-
-                                try {
-                                    java.lang.reflect.Method getOriginalFileName =
-                                            body.getClass().getMethod("getOriginalFilename");
-                                    String origName = (String) getOriginalFileName.invoke(body);
-                                    if (origName != null && !origName.isEmpty()) {
-                                        filename = origName;
-                                    }
-                                } catch (Exception e) {
-                                    log.debug(
-                                            "Could not get original filename: {}", e.getMessage());
-                                }
-
-                                try {
-                                    java.lang.reflect.Method getContentType =
-                                            body.getClass().getMethod("getContentType");
-                                    String ct = (String) getContentType.invoke(body);
-                                    if (ct != null && !ct.isEmpty()) {
-                                        contentType = ct;
-                                    }
-                                } catch (Exception e) {
-                                    log.debug("Could not get content type: {}", e.getMessage());
-                                }
-
-                                taskManager.setFileResult(jobId, fileId, filename, contentType);
-                                log.debug("Extracted fileId from response body: {}", fileId);
-
-                                taskManager.setComplete(jobId);
-                                return;
-                            }
-                        } catch (Exception e) {
-                            log.debug(
-                                    "Failed to extract fileId from response body: {}",
-                                    e.getMessage());
-                        }
-                    }
-
-                    // Store generic result
-                    taskManager.setResult(jobId, body);
-                }
-            } else if (result instanceof MultipartFile) {
-                MultipartFile file = (MultipartFile) result;
-                String fileId = fileStorage.storeFile(file);
-                taskManager.setFileResult(
-                        jobId, fileId, file.getOriginalFilename(), file.getContentType());
-                log.debug("Stored MultipartFile result with fileId: {}", fileId);
-            } else {
-                // Check if result has a fileId field
-                if (result != null) {
-                    try {
-                        // Try to extract fileId using reflection
-                        java.lang.reflect.Method getFileId =
-                                result.getClass().getMethod("getFileId");
-                        String fileId = (String) getFileId.invoke(result);
-
-                        if (fileId != null && !fileId.isEmpty()) {
-                            // Try to get filename and content type
-                            String filename = "result.pdf";
-                            String contentType = "application/pdf";
-
-                            try {
-                                java.lang.reflect.Method getOriginalFileName =
-                                        result.getClass().getMethod("getOriginalFilename");
-                                String origName = (String) getOriginalFileName.invoke(result);
-                                if (origName != null && !origName.isEmpty()) {
-                                    filename = origName;
-                                }
-                            } catch (Exception e) {
-                                log.debug("Could not get original filename: {}", e.getMessage());
-                            }
-
-                            try {
-                                java.lang.reflect.Method getContentType =
-                                        result.getClass().getMethod("getContentType");
-                                String ct = (String) getContentType.invoke(result);
-                                if (ct != null && !ct.isEmpty()) {
-                                    contentType = ct;
-                                }
-                            } catch (Exception e) {
-                                log.debug("Could not get content type: {}", e.getMessage());
-                            }
-
-                            taskManager.setFileResult(jobId, fileId, filename, contentType);
-                            log.debug("Extracted fileId from result object: {}", fileId);
-
-                            taskManager.setComplete(jobId);
-                            return;
-                        }
-                    } catch (Exception e) {
-                        log.debug(
-                                "Failed to extract fileId from result object: {}", e.getMessage());
-                    }
-                }
-
-                // Default case: store the result as is
-                taskManager.setResult(jobId, result);
-            }
-
-            taskManager.setComplete(jobId);
-        } catch (Exception e) {
-            log.error("Error processing job result: {}", e.getMessage(), e);
-            taskManager.setError(jobId, "Error processing result: " + e.getMessage());
-        }
-    }
-
-    /**
-     * Handle different result types for synchronous jobs
-     *
-     * @param result The result object
-     * @return The appropriate ResponseEntity
-     * @throws IOException If there is an error processing the result
-     */
-    private ResponseEntity<?> handleResultForSyncJob(Object result) throws IOException {
-        if (result instanceof byte[]) {
-            // Return byte array as PDF
-            return ResponseEntity.ok()
-                    .contentType(MediaType.APPLICATION_PDF)
-                    .header(
-                            HttpHeaders.CONTENT_DISPOSITION,
-                            "form-data; name=\"attachment\"; filename=\"result.pdf\"")
-                    .body(result);
-        } else if (result instanceof MultipartFile) {
-            // Return MultipartFile content
-            MultipartFile file = (MultipartFile) result;
-            return ResponseEntity.ok()
-                    .contentType(MediaType.parseMediaType(file.getContentType()))
-                    .header(
-                            HttpHeaders.CONTENT_DISPOSITION,
-                            "form-data; name=\"attachment\"; filename=\""
-                                    + file.getOriginalFilename()
-                                    + "\"")
-                    .body(file.getBytes());
-        } else {
-            // Default case: return as JSON
-            return ResponseEntity.ok(result);
-        }
-    }
-
-    /**
-     * Parse session timeout string (e.g., "30m", "1h") to milliseconds
-     *
-     * @param timeout The timeout string
-     * @return The timeout in milliseconds
-     */
-    private long parseSessionTimeout(String timeout) {
-        if (timeout == null || timeout.isEmpty()) {
-            return 30 * 60 * 1000; // Default: 30 minutes
-        }
-
-        try {
-            String value = timeout.replaceAll("[^\\d.]", "");
-            String unit = timeout.replaceAll("[\\d.]", "");
-
-            double numericValue = Double.parseDouble(value);
-
-            return switch (unit.toLowerCase()) {
-                case "s" -> (long) (numericValue * 1000);
-                case "m" -> (long) (numericValue * 60 * 1000);
-                case "h" -> (long) (numericValue * 60 * 60 * 1000);
-                case "d" -> (long) (numericValue * 24 * 60 * 60 * 1000);
-                default -> (long) (numericValue * 60 * 1000); // Default to minutes
-            };
-        } catch (Exception e) {
-            log.warn("Could not parse session timeout '{}', using default", timeout);
-            return 30 * 60 * 1000; // Default: 30 minutes
-        }
-    }
-
-    /**
-     * Execute a supplier with a timeout
-     *
-     * @param supplier The supplier to execute
-     * @param timeoutMs The timeout in milliseconds
-     * @return The result from the supplier
-     * @throws TimeoutException If the execution times out
-     * @throws Exception If the supplier throws an exception
-     */
-    private <T> T executeWithTimeout(Supplier<T> supplier, long timeoutMs)
-            throws TimeoutException, Exception {
-        java.util.concurrent.CompletableFuture<T> future =
-                java.util.concurrent.CompletableFuture.supplyAsync(supplier);
-
-        try {
-            return future.get(timeoutMs, TimeUnit.MILLISECONDS);
-        } catch (java.util.concurrent.TimeoutException e) {
-            future.cancel(true);
-            throw new TimeoutException("Execution timed out after " + timeoutMs + " ms");
-        } catch (java.util.concurrent.ExecutionException e) {
-            throw (Exception) e.getCause();
-        } catch (java.util.concurrent.CancellationException e) {
-            throw new Exception("Execution was cancelled", e);
-        } catch (InterruptedException e) {
-            Thread.currentThread().interrupt();
-            throw new Exception("Execution was interrupted", e);
-        }
-    }
-}

common/src/main/java/stirling/software/common/service/JobQueue.java

@@ -1,428 +0,0 @@
-package stirling.software.common.service;
-
-import java.time.Instant;
-import java.util.Map;
-import java.util.concurrent.*;
-import java.util.function.Supplier;
-
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.http.ResponseEntity;
-import org.springframework.stereotype.Service;
-
-import jakarta.annotation.PostConstruct;
-import jakarta.annotation.PreDestroy;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.Getter;
-import lombok.extern.slf4j.Slf4j;
-
-import stirling.software.common.controller.WebSocketProgressController;
-import stirling.software.common.model.job.JobProgress;
-import stirling.software.common.util.ExecutorFactory;
-
-/**
- * Manages a queue of jobs with dynamic sizing based on system resources. Used when system resources
- * are limited to prevent overloading.
- */
-@Service
-@Slf4j
-public class JobQueue {
-
-    private final ResourceMonitor resourceMonitor;
-    private final WebSocketProgressController webSocketSender;
-
-    @Value("${stirling.job.queue.base-capacity:10}")
-    private int baseQueueCapacity = 10;
-
-    @Value("${stirling.job.queue.min-capacity:2}")
-    private int minQueueCapacity = 2;
-
-    @Value("${stirling.job.queue.check-interval-ms:1000}")
-    private long queueCheckIntervalMs = 1000;
-
-    @Value("${stirling.job.queue.max-wait-time-ms:600000}")
-    private long maxWaitTimeMs = 600000; // 10 minutes
-
-    private BlockingQueue<QueuedJob> jobQueue;
-    private final Map<String, QueuedJob> jobMap = new ConcurrentHashMap<>();
-    private final ScheduledExecutorService scheduler = Executors.newSingleThreadScheduledExecutor();
-    private final ExecutorService jobExecutor = ExecutorFactory.newVirtualOrCachedThreadExecutor();
-
-    private boolean shuttingDown = false;
-
-    @Getter private int rejectedJobs = 0;
-
-    @Getter private int totalQueuedJobs = 0;
-
-    @Getter private int currentQueueSize = 0;
-
-    /** Represents a job waiting in the queue. */
-    @Data
-    @AllArgsConstructor
-    private static class QueuedJob {
-        private final String jobId;
-        private final int resourceWeight;
-        private final Supplier<Object> work;
-        private final long timeoutMs;
-        private final Instant queuedAt;
-        private CompletableFuture<ResponseEntity<?>> future;
-        private volatile boolean cancelled = false;
-    }
-
-    public JobQueue(ResourceMonitor resourceMonitor, WebSocketProgressController webSocketSender) {
-        this.resourceMonitor = resourceMonitor;
-        this.webSocketSender = webSocketSender;
-
-        // Initialize with dynamic capacity
-        int capacity =
-                resourceMonitor.calculateDynamicQueueCapacity(baseQueueCapacity, minQueueCapacity);
-        this.jobQueue = new LinkedBlockingQueue<>(capacity);
-    }
-
-    @PostConstruct
-    public void initialize() {
-        log.debug(
-                "Starting job queue with base capacity {}, min capacity {}",
-                baseQueueCapacity,
-                minQueueCapacity);
-
-        // Periodically process the job queue
-        scheduler.scheduleWithFixedDelay(
-                this::processQueue, 0, queueCheckIntervalMs, TimeUnit.MILLISECONDS);
-
-        // Periodically update queue capacity based on resource usage
-        scheduler.scheduleWithFixedDelay(
-                this::updateQueueCapacity,
-                10000, // Initial delay
-                30000, // 30 second interval
-                TimeUnit.MILLISECONDS);
-    }
-
-    @PreDestroy
-    public void shutdown() {
-        log.info("Shutting down job queue");
-        shuttingDown = true;
-
-        // Complete any futures that are still waiting
-        jobMap.forEach(
-                (id, job) -> {
-                    if (!job.future.isDone()) {
-                        job.future.completeExceptionally(
-                                new RuntimeException("Server shutting down, job cancelled"));
-                    }
-                });
-
-        scheduler.shutdownNow();
-        jobExecutor.shutdownNow();
-
-        log.info(
-                "Job queue shutdown complete. Stats: total={}, rejected={}",
-                totalQueuedJobs,
-                rejectedJobs);
-    }
-
-    /**
-     * Queues a job for execution when resources permit.
-     *
-     * @param jobId The job ID
-     * @param resourceWeight The resource weight of the job (1-100)
-     * @param work The work to be done
-     * @param timeoutMs The timeout in milliseconds
-     * @return A CompletableFuture that will complete when the job is executed
-     */
-    public CompletableFuture<ResponseEntity<?>> queueJob(
-            String jobId, int resourceWeight, Supplier<Object> work, long timeoutMs) {
-
-        // Create a CompletableFuture to track this job's completion
-        CompletableFuture<ResponseEntity<?>> future = new CompletableFuture<>();
-
-        // Create the queued job
-        QueuedJob job =
-                new QueuedJob(jobId, resourceWeight, work, timeoutMs, Instant.now(), future, false);
-
-        // Store in our map for lookup
-        jobMap.put(jobId, job);
-
-        // Update stats
-        totalQueuedJobs++;
-        currentQueueSize = jobQueue.size();
-
-        // Try to add to the queue
-        try {
-            boolean added = jobQueue.offer(job, 5, TimeUnit.SECONDS);
-            if (!added) {
-                log.warn("Queue full, rejecting job {}", jobId);
-                rejectedJobs++;
-                future.completeExceptionally(
-                        new RuntimeException("Job queue full, please try again later"));
-                jobMap.remove(jobId);
-                return future;
-            }
-
-            log.debug(
-                    "Job {} queued for execution (weight: {}, queue size: {})",
-                    jobId,
-                    resourceWeight,
-                    jobQueue.size());
-
-            // Notify client via WebSocket that job is queued
-            webSocketSender.sendProgress(
-                    jobId, new JobProgress(jobId, "Queued", 0, "Waiting in queue for resources"));
-
-            return future;
-        } catch (InterruptedException e) {
-            Thread.currentThread().interrupt();
-            future.completeExceptionally(new RuntimeException("Job queue interrupted"));
-            jobMap.remove(jobId);
-            return future;
-        }
-    }
-
-    /**
-     * Gets the current capacity of the job queue.
-     *
-     * @return The current capacity
-     */
-    public int getQueueCapacity() {
-        return ((LinkedBlockingQueue<QueuedJob>) jobQueue).remainingCapacity() + jobQueue.size();
-    }
-
-    /** Updates the capacity of the job queue based on available system resources. */
-    private void updateQueueCapacity() {
-        try {
-            // Calculate new capacity
-            int newCapacity =
-                    resourceMonitor.calculateDynamicQueueCapacity(
-                            baseQueueCapacity, minQueueCapacity);
-
-            int currentCapacity = getQueueCapacity();
-            if (newCapacity != currentCapacity) {
-                log.debug(
-                        "Updating job queue capacity from {} to {}", currentCapacity, newCapacity);
-
-                // Create new queue with updated capacity
-                BlockingQueue<QueuedJob> newQueue = new LinkedBlockingQueue<>(newCapacity);
-
-                // Transfer jobs from old queue to new queue
-                jobQueue.drainTo(newQueue);
-                jobQueue = newQueue;
-
-                currentQueueSize = jobQueue.size();
-            }
-        } catch (Exception e) {
-            log.error("Error updating queue capacity: {}", e.getMessage(), e);
-        }
-    }
-
-    /** Processes jobs in the queue, executing them when resources permit. */
-    private void processQueue() {
-        if (shuttingDown || jobQueue.isEmpty()) {
-            return;
-        }
-
-        try {
-            // Get current resource status
-            ResourceMonitor.ResourceStatus status = resourceMonitor.getCurrentStatus().get();
-
-            // Check if we should execute any jobs
-            boolean canExecuteJobs = (status != ResourceMonitor.ResourceStatus.CRITICAL);
-
-            if (!canExecuteJobs) {
-                // Under critical load, don't execute any jobs
-                log.debug("System under critical load, delaying job execution");
-                return;
-            }
-
-            // Get jobs from the queue, up to a limit based on resource availability
-            int jobsToProcess =
-                    Math.max(
-                            1,
-                            switch (status) {
-                                case OK -> 3;
-                                case WARNING -> 1;
-                                case CRITICAL -> 0;
-                            });
-
-            for (int i = 0; i < jobsToProcess && !jobQueue.isEmpty(); i++) {
-                QueuedJob job = jobQueue.poll();
-                if (job == null) break;
-
-                // Check if it's been waiting too long
-                long waitTimeMs = Instant.now().toEpochMilli() - job.queuedAt.toEpochMilli();
-                if (waitTimeMs > maxWaitTimeMs) {
-                    log.warn(
-                            "Job {} exceeded maximum wait time ({} ms), executing anyway",
-                            job.jobId,
-                            waitTimeMs);
-                }
-
-                // Remove from our map
-                jobMap.remove(job.jobId);
-                currentQueueSize = jobQueue.size();
-
-                // Notify via WebSocket
-                webSocketSender.sendProgress(
-                        job.jobId,
-                        new JobProgress(job.jobId, "Processing", 10, "Starting job execution"));
-
-                // Execute the job
-                executeJob(job);
-            }
-        } catch (Exception e) {
-            log.error("Error processing job queue: {}", e.getMessage(), e);
-        }
-    }
-
-    /**
-     * Executes a job from the queue.
-     *
-     * @param job The job to execute
-     */
-    private void executeJob(QueuedJob job) {
-        if (job.cancelled) {
-            log.debug("Job {} was cancelled, not executing", job.jobId);
-            return;
-        }
-
-        jobExecutor.execute(
-                () -> {
-                    log.debug("Executing queued job {} (queued at {})", job.jobId, job.queuedAt);
-
-                    try {
-                        // Execute with timeout
-                        Object result = executeWithTimeout(job.work, job.timeoutMs);
-
-                        // Process the result
-                        if (result instanceof ResponseEntity) {
-                            job.future.complete((ResponseEntity<?>) result);
-                        } else {
-                            job.future.complete(ResponseEntity.ok(result));
-                        }
-
-                        // Update WebSocket
-                        webSocketSender.sendProgress(
-                                job.jobId,
-                                new JobProgress(
-                                        job.jobId, "Complete", 100, "Job completed successfully"));
-                    } catch (Exception e) {
-                        log.error(
-                                "Error executing queued job {}: {}", job.jobId, e.getMessage(), e);
-                        job.future.completeExceptionally(e);
-
-                        // Update WebSocket
-                        webSocketSender.sendProgress(
-                                job.jobId,
-                                new JobProgress(
-                                        job.jobId, "Error", 100, "Job failed: " + e.getMessage()));
-                    }
-                });
-    }
-
-    /**
-     * Execute a supplier with a timeout.
-     *
-     * @param supplier The supplier to execute
-     * @param timeoutMs The timeout in milliseconds
-     * @return The result from the supplier
-     * @throws Exception If there is an execution error
-     */
-    private <T> T executeWithTimeout(Supplier<T> supplier, long timeoutMs) throws Exception {
-        CompletableFuture<T> future = CompletableFuture.supplyAsync(supplier);
-
-        try {
-            if (timeoutMs <= 0) {
-                // No timeout
-                return future.join();
-            } else {
-                // With timeout
-                return future.get(timeoutMs, TimeUnit.MILLISECONDS);
-            }
-        } catch (TimeoutException e) {
-            future.cancel(true);
-            throw new TimeoutException("Job timed out after " + timeoutMs + "ms");
-        } catch (ExecutionException e) {
-            throw (Exception) e.getCause();
-        } catch (InterruptedException e) {
-            Thread.currentThread().interrupt();
-            throw new InterruptedException("Job was interrupted");
-        }
-    }
-
-    /**
-     * Checks if a job is queued.
-     *
-     * @param jobId The job ID
-     * @return true if the job is queued
-     */
-    public boolean isJobQueued(String jobId) {
-        return jobMap.containsKey(jobId);
-    }
-
-    /**
-     * Gets the current position of a job in the queue.
-     *
-     * @param jobId The job ID
-     * @return The position (0-based) or -1 if not found
-     */
-    public int getJobPosition(String jobId) {
-        if (!jobMap.containsKey(jobId)) {
-            return -1;
-        }
-
-        // Count positions
-        int position = 0;
-        for (QueuedJob job : jobQueue) {
-            if (job.jobId.equals(jobId)) {
-                return position;
-            }
-            position++;
-        }
-
-        // If we didn't find it in the queue but it's in the map,
-        // it might be executing already
-        return -1;
-    }
-
-    /**
-     * Cancels a queued job.
-     *
-     * @param jobId The job ID
-     * @return true if the job was cancelled, false if not found
-     */
-    public boolean cancelJob(String jobId) {
-        QueuedJob job = jobMap.remove(jobId);
-        if (job != null) {
-            job.cancelled = true;
-            job.future.completeExceptionally(new RuntimeException("Job cancelled by user"));
-
-            // Try to remove from queue if it's still there
-            jobQueue.remove(job);
-            currentQueueSize = jobQueue.size();
-
-            log.debug("Job {} cancelled", jobId);
-
-            // Update WebSocket
-            webSocketSender.sendProgress(
-                    jobId, new JobProgress(jobId, "Cancelled", 100, "Job cancelled by user"));
-
-            return true;
-        }
-
-        return false;
-    }
-
-    /**
-     * Get queue statistics.
-     *
-     * @return A map containing queue statistics
-     */
-    public Map<String, Object> getQueueStats() {
-        return Map.of(
-                "queuedJobs", jobQueue.size(),
-                "queueCapacity", getQueueCapacity(),
-                "totalQueuedJobs", totalQueuedJobs,
-                "rejectedJobs", rejectedJobs,
-                "resourceStatus", resourceMonitor.getCurrentStatus().get().name());
-    }
-}

common/src/main/java/stirling/software/common/service/ResourceMonitor.java

@@ -1,277 +0,0 @@
-package stirling.software.common.service;
-
-import java.lang.management.ManagementFactory;
-import java.lang.management.MemoryMXBean;
-import java.lang.management.OperatingSystemMXBean;
-import java.time.Duration;
-import java.time.Instant;
-import java.util.concurrent.Executors;
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicReference;
-
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Service;
-
-import jakarta.annotation.PostConstruct;
-import jakarta.annotation.PreDestroy;
-
-import lombok.Getter;
-import lombok.extern.slf4j.Slf4j;
-
-/**
- * Monitors system resources (CPU, memory) to inform job scheduling decisions. Provides information
- * about available resources to prevent overloading the system.
- */
-@Service
-@Slf4j
-public class ResourceMonitor {
-
-    @Value("${stirling.resource.memory.critical-threshold:0.9}")
-    private double memoryCriticalThreshold = 0.9; // 90% usage is critical
-
-    @Value("${stirling.resource.memory.high-threshold:0.75}")
-    private double memoryHighThreshold = 0.75; // 75% usage is high
-
-    @Value("${stirling.resource.cpu.critical-threshold:0.9}")
-    private double cpuCriticalThreshold = 0.9; // 90% usage is critical
-
-    @Value("${stirling.resource.cpu.high-threshold:0.75}")
-    private double cpuHighThreshold = 0.75; // 75% usage is high
-
-    @Value("${stirling.resource.monitor.interval-ms:60000}")
-    private long monitorIntervalMs = 60000; // 60 seconds
-
-    private final ScheduledExecutorService scheduler = Executors.newSingleThreadScheduledExecutor();
-    private final MemoryMXBean memoryMXBean = ManagementFactory.getMemoryMXBean();
-    private final OperatingSystemMXBean osMXBean = ManagementFactory.getOperatingSystemMXBean();
-
-    @Getter
-    private final AtomicReference<ResourceStatus> currentStatus =
-            new AtomicReference<>(ResourceStatus.OK);
-
-    @Getter
-    private final AtomicReference<ResourceMetrics> latestMetrics =
-            new AtomicReference<>(new ResourceMetrics());
-
-    /** Represents the current status of system resources. */
-    public enum ResourceStatus {
-        /** Resources are available, normal operations can proceed */
-        OK,
-
-        /** Resources are under strain, consider queueing high-resource operations */
-        WARNING,
-
-        /** Resources are critically low, queue all operations */
-        CRITICAL
-    }
-
-    /** Detailed metrics about system resources. */
-    @Getter
-    public static class ResourceMetrics {
-        private final double cpuUsage;
-        private final double memoryUsage;
-        private final long freeMemoryBytes;
-        private final long totalMemoryBytes;
-        private final long maxMemoryBytes;
-        private final Instant timestamp;
-
-        public ResourceMetrics() {
-            this(0, 0, 0, 0, 0, Instant.now());
-        }
-
-        public ResourceMetrics(
-                double cpuUsage,
-                double memoryUsage,
-                long freeMemoryBytes,
-                long totalMemoryBytes,
-                long maxMemoryBytes,
-                Instant timestamp) {
-            this.cpuUsage = cpuUsage;
-            this.memoryUsage = memoryUsage;
-            this.freeMemoryBytes = freeMemoryBytes;
-            this.totalMemoryBytes = totalMemoryBytes;
-            this.maxMemoryBytes = maxMemoryBytes;
-            this.timestamp = timestamp;
-        }
-
-        /**
-         * Gets the age of these metrics.
-         *
-         * @return Duration since these metrics were collected
-         */
-        public Duration getAge() {
-            return Duration.between(timestamp, Instant.now());
-        }
-
-        /**
-         * Check if these metrics are stale (older than threshold).
-         *
-         * @param thresholdMs Staleness threshold in milliseconds
-         * @return true if metrics are stale
-         */
-        public boolean isStale(long thresholdMs) {
-            return getAge().toMillis() > thresholdMs;
-        }
-    }
-
-    @PostConstruct
-    public void initialize() {
-        log.debug("Starting resource monitoring with interval of {}ms", monitorIntervalMs);
-        scheduler.scheduleAtFixedRate(
-                this::updateResourceMetrics, 0, monitorIntervalMs, TimeUnit.MILLISECONDS);
-    }
-
-    @PreDestroy
-    public void shutdown() {
-        log.info("Shutting down resource monitoring");
-        scheduler.shutdownNow();
-    }
-
-    /** Updates the resource metrics by sampling current system state. */
-    private void updateResourceMetrics() {
-        try {
-            // Get CPU usage
-            double cpuUsage = osMXBean.getSystemLoadAverage() / osMXBean.getAvailableProcessors();
-            if (cpuUsage < 0) cpuUsage = getAlternativeCpuLoad(); // Fallback if not available
-
-            // Get memory usage
-            long heapUsed = memoryMXBean.getHeapMemoryUsage().getUsed();
-            long nonHeapUsed = memoryMXBean.getNonHeapMemoryUsage().getUsed();
-            long totalUsed = heapUsed + nonHeapUsed;
-
-            long maxMemory = Runtime.getRuntime().maxMemory();
-            long totalMemory = Runtime.getRuntime().totalMemory();
-            long freeMemory = Runtime.getRuntime().freeMemory();
-
-            double memoryUsage = (double) totalUsed / maxMemory;
-
-            // Create new metrics
-            ResourceMetrics metrics =
-                    new ResourceMetrics(
-                            cpuUsage,
-                            memoryUsage,
-                            freeMemory,
-                            totalMemory,
-                            maxMemory,
-                            Instant.now());
-            latestMetrics.set(metrics);
-
-            // Determine system status
-            ResourceStatus newStatus;
-            if (cpuUsage > cpuCriticalThreshold || memoryUsage > memoryCriticalThreshold) {
-                newStatus = ResourceStatus.CRITICAL;
-            } else if (cpuUsage > cpuHighThreshold || memoryUsage > memoryHighThreshold) {
-                newStatus = ResourceStatus.WARNING;
-            } else {
-                newStatus = ResourceStatus.OK;
-            }
-
-            // Update status if it changed
-            ResourceStatus oldStatus = currentStatus.getAndSet(newStatus);
-            if (oldStatus != newStatus) {
-                log.info("System resource status changed from {} to {}", oldStatus, newStatus);
-                log.info(
-                        "Current metrics - CPU: {:.1f}%, Memory: {:.1f}%, Free Memory: {} MB",
-                        cpuUsage * 100, memoryUsage * 100, freeMemory / (1024 * 1024));
-            }
-        } catch (Exception e) {
-            log.error("Error updating resource metrics: {}", e.getMessage(), e);
-        }
-    }
-
-    /**
-     * Alternative method to estimate CPU load if getSystemLoadAverage() is not available. This is a
-     * fallback and less accurate than the official JMX method.
-     *
-     * @return Estimated CPU load as a value between 0.0 and 1.0
-     */
-    private double getAlternativeCpuLoad() {
-        try {
-            // Try to get CPU time if available through reflection
-            // This is a fallback since we can't directly cast to platform-specific classes
-            try {
-                java.lang.reflect.Method m =
-                        osMXBean.getClass().getDeclaredMethod("getProcessCpuLoad");
-                m.setAccessible(true);
-                return (double) m.invoke(osMXBean);
-            } catch (Exception e) {
-                // Try the older method
-                try {
-                    java.lang.reflect.Method m =
-                            osMXBean.getClass().getDeclaredMethod("getSystemCpuLoad");
-                    m.setAccessible(true);
-                    return (double) m.invoke(osMXBean);
-                } catch (Exception e2) {
-                    log.trace(
-                            "Could not get CPU load through reflection, assuming moderate load (0.5)");
-                    return 0.5;
-                }
-            }
-        } catch (Exception e) {
-            log.trace("Could not get CPU load, assuming moderate load (0.5)");
-            return 0.5; // Default to moderate load
-        }
-    }
-
-    /**
-     * Calculates the dynamic job queue capacity based on current resource usage.
-     *
-     * @param baseCapacity The base capacity when system is under minimal load
-     * @param minCapacity The minimum capacity to maintain even under high load
-     * @return The calculated job queue capacity
-     */
-    public int calculateDynamicQueueCapacity(int baseCapacity, int minCapacity) {
-        ResourceMetrics metrics = latestMetrics.get();
-        ResourceStatus status = currentStatus.get();
-
-        // Simple linear reduction based on memory and CPU load
-        double capacityFactor =
-                switch (status) {
-                    case OK -> 1.0;
-                    case WARNING -> 0.6;
-                    case CRITICAL -> 0.3;
-                };
-
-        // Apply additional reduction based on specific memory pressure
-        if (metrics.memoryUsage > 0.8) {
-            capacityFactor *= 0.5; // Further reduce capacity under memory pressure
-        }
-
-        // Calculate capacity with minimum safeguard
-        int capacity = (int) Math.max(minCapacity, Math.ceil(baseCapacity * capacityFactor));
-
-        log.debug(
-                "Dynamic queue capacity: {} (base: {}, factor: {:.2f}, status: {})",
-                capacity,
-                baseCapacity,
-                capacityFactor,
-                status);
-
-        return capacity;
-    }
-
-    /**
-     * Checks if a job with the given weight can be executed immediately or should be queued based
-     * on current resource availability.
-     *
-     * @param resourceWeight The resource weight of the job (1-100)
-     * @return true if the job should be queued, false if it can run immediately
-     */
-    public boolean shouldQueueJob(int resourceWeight) {
-        ResourceStatus status = currentStatus.get();
-
-        // Always run lightweight jobs (weight < 20) unless critical
-        if (resourceWeight < 20 && status != ResourceStatus.CRITICAL) {
-            return false;
-        }
-
-        // Medium weight jobs run immediately if resources are OK
-        if (resourceWeight < 60 && status == ResourceStatus.OK) {
-            return false;
-        }
-
-        // Heavy jobs (weight >= 60) and any job during WARNING/CRITICAL should be queued
-        return true;
-    }
-}

common/src/main/java/stirling/software/common/service/TaskManager.java

@@ -1,274 +0,0 @@
-package stirling.software.common.service;
-
-import java.time.LocalDateTime;
-import java.time.temporal.ChronoUnit;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.Executors;
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.TimeUnit;
-
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Service;
-
-import jakarta.annotation.PreDestroy;
-
-import lombok.extern.slf4j.Slf4j;
-
-import stirling.software.common.model.job.JobResult;
-import stirling.software.common.model.job.JobStats;
-
-/** Manages async tasks and their results */
-@Service
-@Slf4j
-public class TaskManager {
-    private final Map<String, JobResult> jobResults = new ConcurrentHashMap<>();
-
-    @Value("${stirling.jobResultExpiryMinutes:30}")
-    private int jobResultExpiryMinutes = 30;
-
-    private final FileStorage fileStorage;
-    private final ScheduledExecutorService cleanupExecutor =
-            Executors.newSingleThreadScheduledExecutor();
-
-    /** Initialize the task manager and start the cleanup scheduler */
-    public TaskManager(FileStorage fileStorage) {
-        this.fileStorage = fileStorage;
-
-        // Schedule periodic cleanup of old job results
-        cleanupExecutor.scheduleAtFixedRate(
-                this::cleanupOldJobs,
-                10, // Initial delay
-                10, // Interval
-                TimeUnit.MINUTES);
-
-        log.debug(
-                "Task manager initialized with job result expiry of {} minutes",
-                jobResultExpiryMinutes);
-    }
-
-    /**
-     * Create a new task with the given job ID
-     *
-     * @param jobId The job ID
-     */
-    public void createTask(String jobId) {
-        jobResults.put(jobId, JobResult.createNew(jobId));
-        log.debug("Created task with job ID: {}", jobId);
-    }
-
-    /**
-     * Set the result of a task as a general object
-     *
-     * @param jobId The job ID
-     * @param result The result object
-     */
-    public void setResult(String jobId, Object result) {
-        JobResult jobResult = getOrCreateJobResult(jobId);
-        jobResult.completeWithResult(result);
-        log.debug("Set result for job ID: {}", jobId);
-    }
-
-    /**
-     * Set the result of a task as a file
-     *
-     * @param jobId The job ID
-     * @param fileId The file ID
-     * @param originalFileName The original file name
-     * @param contentType The content type of the file
-     */
-    public void setFileResult(
-            String jobId, String fileId, String originalFileName, String contentType) {
-        JobResult jobResult = getOrCreateJobResult(jobId);
-        jobResult.completeWithFile(fileId, originalFileName, contentType);
-        log.debug("Set file result for job ID: {} with file ID: {}", jobId, fileId);
-    }
-
-    /**
-     * Set an error for a task
-     *
-     * @param jobId The job ID
-     * @param error The error message
-     */
-    public void setError(String jobId, String error) {
-        JobResult jobResult = getOrCreateJobResult(jobId);
-        jobResult.failWithError(error);
-        log.debug("Set error for job ID: {}: {}", jobId, error);
-    }
-
-    /**
-     * Mark a task as complete
-     *
-     * @param jobId The job ID
-     */
-    public void setComplete(String jobId) {
-        JobResult jobResult = getOrCreateJobResult(jobId);
-        if (jobResult.getResult() == null
-                && jobResult.getFileId() == null
-                && jobResult.getError() == null) {
-            // If no result or error has been set, mark it as complete with an empty result
-            jobResult.completeWithResult("Task completed successfully");
-        }
-        log.debug("Marked job ID: {} as complete", jobId);
-    }
-
-    /**
-     * Check if a task is complete
-     *
-     * @param jobId The job ID
-     * @return true if the task is complete, false otherwise
-     */
-    public boolean isComplete(String jobId) {
-        JobResult result = jobResults.get(jobId);
-        return result != null && result.isComplete();
-    }
-
-    /**
-     * Get the result of a task
-     *
-     * @param jobId The job ID
-     * @return The result object, or null if the task doesn't exist or is not complete
-     */
-    public JobResult getJobResult(String jobId) {
-        return jobResults.get(jobId);
-    }
-
-    /**
-     * Get statistics about all jobs in the system
-     *
-     * @return Job statistics
-     */
-    public JobStats getJobStats() {
-        int totalJobs = jobResults.size();
-        int activeJobs = 0;
-        int completedJobs = 0;
-        int failedJobs = 0;
-        int successfulJobs = 0;
-        int fileResultJobs = 0;
-
-        LocalDateTime oldestActiveJobTime = null;
-        LocalDateTime newestActiveJobTime = null;
-        long totalProcessingTimeMs = 0;
-
-        for (JobResult result : jobResults.values()) {
-            if (result.isComplete()) {
-                completedJobs++;
-
-                // Calculate processing time for completed jobs
-                if (result.getCreatedAt() != null && result.getCompletedAt() != null) {
-                    long processingTimeMs =
-                            java.time.Duration.between(
-                                            result.getCreatedAt(), result.getCompletedAt())
-                                    .toMillis();
-                    totalProcessingTimeMs += processingTimeMs;
-                }
-
-                if (result.getError() != null) {
-                    failedJobs++;
-                } else {
-                    successfulJobs++;
-                    if (result.getFileId() != null) {
-                        fileResultJobs++;
-                    }
-                }
-            } else {
-                activeJobs++;
-
-                // Track oldest and newest active jobs
-                if (result.getCreatedAt() != null) {
-                    if (oldestActiveJobTime == null
-                            || result.getCreatedAt().isBefore(oldestActiveJobTime)) {
-                        oldestActiveJobTime = result.getCreatedAt();
-                    }
-
-                    if (newestActiveJobTime == null
-                            || result.getCreatedAt().isAfter(newestActiveJobTime)) {
-                        newestActiveJobTime = result.getCreatedAt();
-                    }
-                }
-            }
-        }
-
-        // Calculate average processing time
-        long averageProcessingTimeMs =
-                completedJobs > 0 ? totalProcessingTimeMs / completedJobs : 0;
-
-        return JobStats.builder()
-                .totalJobs(totalJobs)
-                .activeJobs(activeJobs)
-                .completedJobs(completedJobs)
-                .failedJobs(failedJobs)
-                .successfulJobs(successfulJobs)
-                .fileResultJobs(fileResultJobs)
-                .oldestActiveJobTime(oldestActiveJobTime)
-                .newestActiveJobTime(newestActiveJobTime)
-                .averageProcessingTimeMs(averageProcessingTimeMs)
-                .build();
-    }
-
-    /**
-     * Get or create a job result
-     *
-     * @param jobId The job ID
-     * @return The job result
-     */
-    private JobResult getOrCreateJobResult(String jobId) {
-        return jobResults.computeIfAbsent(jobId, JobResult::createNew);
-    }
-
-    /** Clean up old completed job results */
-    public void cleanupOldJobs() {
-        LocalDateTime expiryThreshold =
-                LocalDateTime.now().minus(jobResultExpiryMinutes, ChronoUnit.MINUTES);
-        int removedCount = 0;
-
-        try {
-            for (Map.Entry<String, JobResult> entry : jobResults.entrySet()) {
-                JobResult result = entry.getValue();
-
-                // Remove completed jobs that are older than the expiry threshold
-                if (result.isComplete()
-                        && result.getCompletedAt() != null
-                        && result.getCompletedAt().isBefore(expiryThreshold)) {
-
-                    // If the job has a file result, delete the file
-                    if (result.getFileId() != null) {
-                        try {
-                            fileStorage.deleteFile(result.getFileId());
-                        } catch (Exception e) {
-                            log.warn(
-                                    "Failed to delete file for job {}: {}",
-                                    entry.getKey(),
-                                    e.getMessage());
-                        }
-                    }
-
-                    // Remove the job result
-                    jobResults.remove(entry.getKey());
-                    removedCount++;
-                }
-            }
-
-            if (removedCount > 0) {
-                log.info("Cleaned up {} expired job results", removedCount);
-            }
-        } catch (Exception e) {
-            log.error("Error during job cleanup: {}", e.getMessage(), e);
-        }
-    }
-
-    /** Shutdown the cleanup executor */
-    @PreDestroy
-    public void shutdown() {
-        try {
-            log.info("Shutting down job result cleanup executor");
-            cleanupExecutor.shutdown();
-            if (!cleanupExecutor.awaitTermination(5, TimeUnit.SECONDS)) {
-                cleanupExecutor.shutdownNow();
-            }
-        } catch (InterruptedException e) {
-            Thread.currentThread().interrupt();
-            cleanupExecutor.shutdownNow();
-        }
-    }
-}

common/src/main/java/stirling/software/common/util/ExecutorFactory.java

@@ -1,31 +0,0 @@
-package stirling.software.common.util;
-
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-
-import lombok.extern.slf4j.Slf4j;
-
-@Slf4j
-public class ExecutorFactory {
-
-    /**
-     * Creates an ExecutorService using virtual threads if available (Java 21+), or falls back to a
-     * cached thread pool on older Java versions.
-     */
-    public static ExecutorService newVirtualOrCachedThreadExecutor() {
-        try {
-            ExecutorService executor =
-                    (ExecutorService)
-                            Executors.class
-                                    .getMethod("newVirtualThreadPerTaskExecutor")
-                                    .invoke(null);
-            return executor;
-        } catch (NoSuchMethodException e) {
-            log.debug("Virtual threads not available; falling back to cached thread pool.");
-        } catch (Exception e) {
-            log.debug("Error initializing virtual thread executor: {}", e.getMessage(), e);
-        }
-
-        return Executors.newCachedThreadPool();
-    }
-}

common/src/main/java/stirling/software/common/util/ProviderUtils.java

@@ -1,29 +0,0 @@
-package stirling.software.common.util;
-
-import static stirling.software.common.util.ValidationUtils.isCollectionEmpty;
-import static stirling.software.common.util.ValidationUtils.isStringEmpty;
-
-import stirling.software.common.model.oauth2.Provider;
-
-public class ProviderUtils {
-
-    public static boolean validateProvider(Provider provider) {
-        if (provider == null) {
-            return false;
-        }
-
-        if (isStringEmpty(provider.getClientId())) {
-            return false;
-        }
-
-        if (isStringEmpty(provider.getClientSecret())) {
-            return false;
-        }
-
-        if (isCollectionEmpty(provider.getScopes())) {
-            return false;
-        }
-
-        return true;
-    }
-}

common/src/main/java/stirling/software/common/util/UIScaling.java

@@ -1,65 +0,0 @@
-package stirling.software.common.util;
-
-import java.awt.*;
-
-public class UIScaling {
-    private static final double BASE_RESOLUTION_WIDTH = 1920.0;
-    private static final double BASE_RESOLUTION_HEIGHT = 1080.0;
-
-    public static double getWidthScaleFactor() {
-        Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize();
-        return screenSize.getWidth() / BASE_RESOLUTION_WIDTH;
-    }
-
-    public static double getHeightScaleFactor() {
-        Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize();
-        return screenSize.getHeight() / BASE_RESOLUTION_HEIGHT;
-    }
-
-    public static int scaleWidth(int value) {
-        return (int) Math.round(value * getWidthScaleFactor());
-    }
-
-    public static int scaleHeight(int value) {
-        return (int) Math.round(value * getHeightScaleFactor());
-    }
-
-    public static Dimension scale(Dimension dim) {
-        return new Dimension(scaleWidth(dim.width), scaleHeight(dim.height));
-    }
-
-    public static Insets scale(Insets insets) {
-        return new Insets(
-                scaleHeight(insets.top),
-                scaleWidth(insets.left),
-                scaleHeight(insets.bottom),
-                scaleWidth(insets.right));
-    }
-
-    public static Font scaleFont(Font font) {
-        // For fonts, we'll use the smaller scale factor to ensure readability
-        double scaleFactor = Math.min(getWidthScaleFactor(), getHeightScaleFactor());
-        return font.deriveFont((float) (font.getSize() * scaleFactor));
-    }
-
-    // Utility method for aspect ratio aware icon scaling
-    public static Image scaleIcon(Image icon, int targetWidth, int targetHeight) {
-        if (icon == null) return null;
-
-        double widthScale = getWidthScaleFactor();
-        double heightScale = getHeightScaleFactor();
-
-        int scaledWidth = (int) Math.round(targetWidth * widthScale);
-        int scaledHeight = (int) Math.round(targetHeight * heightScale);
-
-        // Maintain aspect ratio for icons
-        double aspectRatio = (double) icon.getWidth(null) / icon.getHeight(null);
-        if (scaledWidth / scaledHeight > aspectRatio) {
-            scaledWidth = (int) (scaledHeight * aspectRatio);
-        } else {
-            scaledHeight = (int) (scaledWidth / aspectRatio);
-        }
-
-        return icon.getScaledInstance(scaledWidth, scaledHeight, Image.SCALE_SMOOTH);
-    }
-}

common/src/main/java/stirling/software/common/util/UrlUtils.java

@@ -1,34 +0,0 @@
-package stirling.software.common.util;
-
-import java.io.IOException;
-import java.net.ServerSocket;
-
-import jakarta.servlet.http.HttpServletRequest;
-
-public class UrlUtils {
-
-    public static String getOrigin(HttpServletRequest request) {
-        String scheme = request.getScheme(); // http or https
-        String serverName = request.getServerName(); // localhost
-        int serverPort = request.getServerPort(); // 8080
-        String contextPath = request.getContextPath(); // /myapp
-
-        return scheme + "://" + serverName + ":" + serverPort + contextPath;
-    }
-
-    public static boolean isPortAvailable(int port) {
-        try (ServerSocket socket = new ServerSocket(port)) {
-            return true;
-        } catch (IOException e) {
-            return false;
-        }
-    }
-
-    public static String findAvailablePort(int startPort) {
-        int port = startPort;
-        while (!isPortAvailable(port)) {
-            port++;
-        }
-        return String.valueOf(port);
-    }
-}

common/src/main/java/stirling/software/common/util/ValidationUtils.java

@@ -1,14 +0,0 @@
-package stirling.software.common.util;
-
-import java.util.Collection;
-
-public class ValidationUtils {
-
-    public static boolean isStringEmpty(String input) {
-        return input == null || input.isBlank();
-    }
-
-    public static boolean isCollectionEmpty(Collection<String> input) {
-        return input == null || input.isEmpty();
-    }
-}

common/src/main/java/stirling/software/common/util/YamlHelper.java

@@ -1,479 +0,0 @@
-package stirling.software.common.util;
-
-import java.io.IOException;
-import java.io.StringWriter;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.ArrayDeque;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Deque;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Optional;
-import java.util.Set;
-import java.util.function.Function;
-
-import org.snakeyaml.engine.v2.api.Dump;
-import org.snakeyaml.engine.v2.api.DumpSettings;
-import org.snakeyaml.engine.v2.api.LoadSettings;
-import org.snakeyaml.engine.v2.api.StreamDataWriter;
-import org.snakeyaml.engine.v2.common.FlowStyle;
-import org.snakeyaml.engine.v2.common.ScalarStyle;
-import org.snakeyaml.engine.v2.composer.Composer;
-import org.snakeyaml.engine.v2.nodes.MappingNode;
-import org.snakeyaml.engine.v2.nodes.Node;
-import org.snakeyaml.engine.v2.nodes.NodeTuple;
-import org.snakeyaml.engine.v2.nodes.ScalarNode;
-import org.snakeyaml.engine.v2.nodes.SequenceNode;
-import org.snakeyaml.engine.v2.nodes.Tag;
-import org.snakeyaml.engine.v2.parser.ParserImpl;
-import org.snakeyaml.engine.v2.scanner.StreamReader;
-
-import lombok.extern.slf4j.Slf4j;
-
-@Slf4j
-public class YamlHelper {
-
-    // YAML dump settings with comment support and block flow style
-    private static final DumpSettings DUMP_SETTINGS =
-            DumpSettings.builder()
-                    .setDumpComments(true)
-                    .setWidth(Integer.MAX_VALUE)
-                    .setDefaultFlowStyle(FlowStyle.BLOCK)
-                    .build();
-
-    private final String yamlContent; // Stores the entire YAML content as a string
-
-    private LoadSettings loadSettings =
-            LoadSettings.builder()
-                    .setUseMarks(true)
-                    .setMaxAliasesForCollections(Integer.MAX_VALUE)
-                    .setAllowRecursiveKeys(true)
-                    .setParseComments(true)
-                    .build();
-
-    private Path originalFilePath;
-    private Node updatedRootNode;
-
-    // Constructor with custom LoadSettings and YAML string
-    public YamlHelper(LoadSettings loadSettings, String yamlContent) {
-        this.loadSettings = loadSettings;
-        this.yamlContent = yamlContent;
-    }
-
-    // Constructor that reads YAML from a file path
-    public YamlHelper(Path originalFilePath) throws IOException {
-        this.yamlContent = Files.readString(originalFilePath);
-        this.originalFilePath = originalFilePath;
-    }
-
-    /**
-     * Updates values in the target YAML based on values from the source YAML. It ensures that only
-     * existing keys in the target YAML are updated.
-     *
-     * @return true if at least one key was updated, false otherwise.
-     */
-    public boolean updateValuesFromYaml(YamlHelper sourceYaml, YamlHelper targetYaml) {
-        boolean updated = false;
-        Set<String> sourceKeys = sourceYaml.getAllKeys();
-        Set<String> targetKeys = targetYaml.getAllKeys();
-
-        for (String key : sourceKeys) {
-            String[] keyArray = key.split("\\.");
-
-            Object newValue = sourceYaml.getValueByExactKeyPath(keyArray);
-            Object currentValue = targetYaml.getValueByExactKeyPath(keyArray);
-            if (newValue != null
-                    && (!newValue.equals(currentValue) || !sourceKeys.equals(targetKeys))) {
-                boolean updatedKey = targetYaml.updateValue(Arrays.asList(keyArray), newValue);
-                if (updatedKey) updated = true;
-            }
-        }
-
-        return updated;
-    }
-
-    /**
-     * Updates a value in the YAML structure.
-     *
-     * @param keys The hierarchical keys leading to the value.
-     * @param newValue The new value to set.
-     * @return true if the value was updated, false otherwise.
-     */
-    public boolean updateValue(List<String> keys, Object newValue) {
-        return updateValue(getRootNode(), keys, newValue);
-    }
-
-    private boolean updateValue(Node node, List<String> keys, Object newValue) {
-        if (!(node instanceof MappingNode mappingNode)) return false;
-
-        List<NodeTuple> updatedTuples = new ArrayList<>();
-        boolean updated = false;
-
-        for (NodeTuple tuple : mappingNode.getValue()) {
-            ScalarNode keyNode = (tuple.getKeyNode() instanceof ScalarNode sk) ? sk : null;
-            if (keyNode == null || !keyNode.getValue().equals(keys.get(0))) {
-                updatedTuples.add(tuple);
-                continue;
-            }
-
-            Node valueNode = tuple.getValueNode();
-
-            if (keys.size() == 1) {
-                Tag tag = valueNode.getTag();
-                Node newValueNode = null;
-
-                if (isAnyInteger(newValue)) {
-                    newValueNode =
-                            new ScalarNode(Tag.INT, String.valueOf(newValue), ScalarStyle.PLAIN);
-                } else if (isFloat(newValue)) {
-                    Object floatValue = Float.valueOf(String.valueOf(newValue));
-                    newValueNode =
-                            new ScalarNode(
-                                    Tag.FLOAT, String.valueOf(floatValue), ScalarStyle.PLAIN);
-                } else if ("true".equals(newValue) || "false".equals(newValue)) {
-                    newValueNode =
-                            new ScalarNode(Tag.BOOL, String.valueOf(newValue), ScalarStyle.PLAIN);
-                } else if (newValue instanceof List<?> list) {
-                    List<Node> sequenceNodes = new ArrayList<>();
-                    for (Object item : list) {
-                        Object obj = String.valueOf(item);
-                        if (isAnyInteger(item)) {
-                            tag = Tag.INT;
-                        } else if (isFloat(item)) {
-                            obj = Float.valueOf(String.valueOf(item));
-                            tag = Tag.FLOAT;
-                        } else if ("true".equals(item) || "false".equals(item)) {
-                            tag = Tag.BOOL;
-                        } else if (item == null || "null".equals(item)) {
-                            tag = Tag.NULL;
-                        } else {
-                            tag = Tag.STR;
-                        }
-                        sequenceNodes.add(
-                                new ScalarNode(tag, String.valueOf(obj), ScalarStyle.PLAIN));
-                    }
-                    newValueNode = new SequenceNode(Tag.SEQ, sequenceNodes, FlowStyle.FLOW);
-                } else if (tag == Tag.NULL) {
-                    if ("true".equals(newValue)
-                            || "false".equals(newValue)
-                            || newValue instanceof Boolean) {
-                        tag = Tag.BOOL;
-                    }
-                    newValueNode = new ScalarNode(tag, String.valueOf(newValue), ScalarStyle.PLAIN);
-                } else {
-                    newValueNode = new ScalarNode(tag, String.valueOf(newValue), ScalarStyle.PLAIN);
-                }
-                copyComments(valueNode, newValueNode);
-
-                updatedTuples.add(new NodeTuple(keyNode, newValueNode));
-                updated = true;
-            } else if (valueNode instanceof MappingNode) {
-                updated = updateValue(valueNode, keys.subList(1, keys.size()), newValue);
-                updatedTuples.add(tuple);
-            }
-        }
-
-        if (updated) {
-            mappingNode.getValue().clear();
-            mappingNode.getValue().addAll(updatedTuples);
-        }
-        setNewNode(node);
-
-        return updated;
-    }
-
-    /**
-     * Fetches a value based on an exact key path.
-     *
-     * @param keys The key hierarchy leading to the value.
-     * @return The value if found, otherwise null.
-     */
-    public Object getValueByExactKeyPath(String... keys) {
-        return getValueByExactKeyPath(getRootNode(), new ArrayDeque<>(List.of(keys)));
-    }
-
-    private Object getValueByExactKeyPath(Node node, Deque<String> keyQueue) {
-        if (!(node instanceof MappingNode mappingNode)) return null;
-
-        String currentKey = keyQueue.poll();
-        if (currentKey == null) return null;
-
-        for (NodeTuple tuple : mappingNode.getValue()) {
-            if (tuple.getKeyNode() instanceof ScalarNode keyNode
-                    && keyNode.getValue().equals(currentKey)) {
-                if (keyQueue.isEmpty()) {
-                    Node valueNode = tuple.getValueNode();
-
-                    if (valueNode instanceof ScalarNode scalarValueNode) {
-                        return scalarValueNode.getValue();
-                    } else if (valueNode instanceof MappingNode subMapping) {
-                        return getValueByExactKeyPath(subMapping, keyQueue);
-                    } else if (valueNode instanceof SequenceNode sequenceNode) {
-                        List<Object> valuesList = new ArrayList<>();
-                        for (Node o : sequenceNode.getValue()) {
-                            if (o instanceof ScalarNode scalarValue) {
-                                valuesList.add(scalarValue.getValue());
-                            }
-                        }
-                        return valuesList;
-                    } else {
-                        return null;
-                    }
-                }
-                return getValueByExactKeyPath(tuple.getValueNode(), keyQueue);
-            }
-        }
-        return null;
-    }
-
-    private Set<String> cachedKeys;
-
-    /**
-     * Retrieves the set of all keys present in the YAML structure. Keys are returned as
-     * dot-separated paths for nested keys.
-     *
-     * @return A set containing all keys in dot notation.
-     */
-    public Set<String> getAllKeys() {
-        if (cachedKeys == null) {
-            cachedKeys = getAllKeys(getRootNode());
-        }
-        return cachedKeys;
-    }
-
-    /**
-     * Collects all keys from the YAML node recursively.
-     *
-     * @param node The current YAML node.
-     * @param currentPath The accumulated path of keys.
-     * @param allKeys The set storing all collected keys.
-     */
-    private Set<String> getAllKeys(Node node) {
-        Set<String> allKeys = new LinkedHashSet<>();
-        collectKeys(node, "", allKeys);
-        return allKeys;
-    }
-
-    /**
-     * Recursively traverses the YAML structure to collect all keys.
-     *
-     * @param node The current node in the YAML structure.
-     * @param currentPath The accumulated key path.
-     * @param allKeys The set storing collected keys.
-     */
-    private void collectKeys(Node node, String currentPath, Set<String> allKeys) {
-        if (node instanceof MappingNode mappingNode) {
-            for (NodeTuple tuple : mappingNode.getValue()) {
-                if (tuple.getKeyNode() instanceof ScalarNode keyNode) {
-                    String newPath =
-                            currentPath.isEmpty()
-                                    ? keyNode.getValue()
-                                    : currentPath + "." + keyNode.getValue();
-                    allKeys.add(newPath);
-                    collectKeys(tuple.getValueNode(), newPath, allKeys);
-                }
-            }
-        }
-    }
-
-    /**
-     * Retrieves the root node of the YAML document. If a new node was previously set, it is
-     * returned instead.
-     *
-     * @return The root node of the YAML structure.
-     */
-    private Node getRootNode() {
-        if (this.updatedRootNode != null) {
-            return this.updatedRootNode;
-        }
-        Composer composer = new Composer(loadSettings, getParserImpl());
-        Optional<Node> rootNodeOpt = composer.getSingleNode();
-        if (rootNodeOpt.isPresent()) {
-            return rootNodeOpt.get();
-        }
-        return null;
-    }
-
-    /**
-     * Sets a new root node, allowing modifications to be tracked.
-     *
-     * @param newRootNode The modified root node.
-     */
-    public void setNewNode(Node newRootNode) {
-        this.updatedRootNode = newRootNode;
-    }
-
-    /**
-     * Retrieves the current root node (either the original or the updated one).
-     *
-     * @return The root node.
-     */
-    public Node getUpdatedRootNode() {
-        if (this.updatedRootNode == null) {
-            this.updatedRootNode = getRootNode();
-        }
-        return this.updatedRootNode;
-    }
-
-    /**
-     * Initializes the YAML parser.
-     *
-     * @return The configured parser.
-     */
-    private ParserImpl getParserImpl() {
-        return new ParserImpl(loadSettings, getStreamReader());
-    }
-
-    /**
-     * Creates a stream reader for the YAML content.
-     *
-     * @return The configured stream reader.
-     */
-    private StreamReader getStreamReader() {
-        return new StreamReader(loadSettings, yamlContent);
-    }
-
-    public MappingNode save(Path saveFilePath) throws IOException {
-        if (!saveFilePath.equals(originalFilePath)) {
-            Files.writeString(saveFilePath, convertNodeToYaml(getUpdatedRootNode()));
-        }
-        return (MappingNode) getUpdatedRootNode();
-    }
-
-    public void saveOverride(Path saveFilePath) throws IOException {
-        Files.writeString(saveFilePath, convertNodeToYaml(getUpdatedRootNode()));
-    }
-
-    /**
-     * Converts a YAML node back to a YAML-formatted string.
-     *
-     * @param rootNode The root node to be converted.
-     * @return A YAML-formatted string.
-     */
-    public String convertNodeToYaml(Node rootNode) {
-        StringWriter writer = new StringWriter();
-        StreamDataWriter streamDataWriter =
-                new StreamDataWriter() {
-                    @Override
-                    public void write(String str) {
-                        writer.write(str);
-                    }
-
-                    @Override
-                    public void write(String str, int off, int len) {
-                        writer.write(str, off, len);
-                    }
-                };
-
-        new Dump(DUMP_SETTINGS).dumpNode(rootNode, streamDataWriter);
-        return writer.toString();
-    }
-
-    private static boolean isParsable(String value, Function<String, ?> parser) {
-        try {
-            parser.apply(value);
-            return true;
-        } catch (NumberFormatException e) {
-            return false;
-        }
-    }
-
-    /**
-     * Checks if a given object is an integer.
-     *
-     * @param object The object to check.
-     * @return True if the object represents an integer, false otherwise.
-     */
-    @SuppressWarnings("UnnecessaryTemporaryOnConversionFromString")
-    public static boolean isInteger(Object object) {
-        if (object instanceof Integer
-                || object instanceof Short
-                || object instanceof Byte
-                || object instanceof Long) {
-            return true;
-        }
-        if (object instanceof String str) {
-            return isParsable(str, Integer::parseInt);
-        }
-        return false;
-    }
-
-    /**
-     * Checks if a given object is a floating-point number.
-     *
-     * @param object The object to check.
-     * @return True if the object represents a float, false otherwise.
-     */
-    @SuppressWarnings("UnnecessaryTemporaryOnConversionFromString")
-    public static boolean isFloat(Object object) {
-        return (object instanceof Float || object instanceof Double)
-                || (object instanceof String str && isParsable(str, Float::parseFloat));
-    }
-
-    /**
-     * Checks if a given object is a short integer.
-     *
-     * @param object The object to check.
-     * @return True if the object represents a short integer, false otherwise.
-     */
-    @SuppressWarnings("UnnecessaryTemporaryOnConversionFromString")
-    public static boolean isShort(Object object) {
-        return (object instanceof Long)
-                || (object instanceof String str && isParsable(str, Short::parseShort));
-    }
-
-    /**
-     * Checks if a given object is a byte.
-     *
-     * @param object The object to check.
-     * @return True if the object represents a byte, false otherwise.
-     */
-    @SuppressWarnings("UnnecessaryTemporaryOnConversionFromString")
-    public static boolean isByte(Object object) {
-        return (object instanceof Long)
-                || (object instanceof String str && isParsable(str, Byte::parseByte));
-    }
-
-    /**
-     * Checks if a given object is a long integer.
-     *
-     * @param object The object to check.
-     * @return True if the object represents a long integer, false otherwise.
-     */
-    @SuppressWarnings("UnnecessaryTemporaryOnConversionFromString")
-    public static boolean isLong(Object object) {
-        return (object instanceof Long)
-                || (object instanceof String str && isParsable(str, Long::parseLong));
-    }
-
-    /**
-     * Determines if an object is any type of integer (short, byte, long, or int).
-     *
-     * @param object The object to check.
-     * @return True if the object represents an integer type, false otherwise.
-     */
-    public static boolean isAnyInteger(Object object) {
-        return isInteger(object) || isShort(object) || isByte(object) || isLong(object);
-    }
-
-    /**
-     * Copies comments from an old node to a new one.
-     *
-     * @param oldNode The original node with comments.
-     * @param newValueNode The new node to which comments should be copied.
-     */
-    private void copyComments(Node oldNode, Node newValueNode) {
-        if (oldNode == null || newValueNode == null) return;
-        if (oldNode.getBlockComments() != null) {
-            newValueNode.setBlockComments(oldNode.getBlockComments());
-        }
-        if (oldNode.getInLineComments() != null) {
-            newValueNode.setInLineComments(oldNode.getInLineComments());
-        }
-        if (oldNode.getEndComments() != null) {
-            newValueNode.setEndComments(oldNode.getEndComments());
-        }
-    }
-}

common/src/main/java/stirling/software/common/util/misc/InvertFullColorStrategy.java

@@ -1,122 +0,0 @@
-package stirling.software.common.util.misc;
-
-import java.awt.*;
-import java.awt.image.BufferedImage;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.IOException;
-import java.nio.file.Files;
-
-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;
-import org.apache.pdfbox.pdmodel.graphics.image.PDImageXObject;
-import org.apache.pdfbox.rendering.PDFRenderer;
-import org.springframework.core.io.InputStreamResource;
-import org.springframework.web.multipart.MultipartFile;
-
-import stirling.software.common.model.api.misc.ReplaceAndInvert;
-
-public class InvertFullColorStrategy extends ReplaceAndInvertColorStrategy {
-
-    public InvertFullColorStrategy(MultipartFile file, ReplaceAndInvert replaceAndInvert) {
-        super(file, replaceAndInvert);
-    }
-
-    @Override
-    public InputStreamResource replace() throws IOException {
-
-        File file = null;
-        try {
-            // Create a temporary file, with the original filename from the multipart file
-            file = Files.createTempFile("temp", getFileInput().getOriginalFilename()).toFile();
-
-            // Transfer the content of the multipart file to the file
-            getFileInput().transferTo(file);
-
-            // Load the uploaded PDF
-            PDDocument document = Loader.loadPDF(file);
-
-            // Render each page and invert colors
-            PDFRenderer pdfRenderer = new PDFRenderer(document);
-            for (int page = 0; page < document.getNumberOfPages(); page++) {
-                BufferedImage image =
-                        pdfRenderer.renderImageWithDPI(page, 300); // Render page at 300 DPI
-
-                // Invert the colors
-                invertImageColors(image);
-
-                // Create a new PDPage from the inverted image
-                PDPage pdPage = document.getPage(page);
-                File tempImageFile = null;
-                try {
-                    tempImageFile = convertToBufferedImageTpFile(image);
-                    PDImageXObject pdImage =
-                            PDImageXObject.createFromFileByContent(tempImageFile, document);
-
-                    PDPageContentStream contentStream =
-                            new PDPageContentStream(
-                                    document,
-                                    pdPage,
-                                    PDPageContentStream.AppendMode.OVERWRITE,
-                                    true);
-                    contentStream.drawImage(
-                            pdImage,
-                            0,
-                            0,
-                            pdPage.getMediaBox().getWidth(),
-                            pdPage.getMediaBox().getHeight());
-                    contentStream.close();
-                } finally {
-                    if (tempImageFile != null && tempImageFile.exists()) {
-                        Files.delete(tempImageFile.toPath());
-                    }
-                }
-            }
-
-            // Save the modified PDF to a ByteArrayOutputStream
-            ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
-            document.save(byteArrayOutputStream);
-            document.close();
-
-            // Prepare the modified PDF for download
-            ByteArrayInputStream inputStream =
-                    new ByteArrayInputStream(byteArrayOutputStream.toByteArray());
-            InputStreamResource resource = new InputStreamResource(inputStream);
-            return resource;
-        } finally {
-            if (file != null && file.exists()) {
-                Files.delete(file.toPath());
-            }
-        }
-    }
-
-    // Method to invert image colors
-    private void invertImageColors(BufferedImage image) {
-        int width = image.getWidth();
-        int height = image.getHeight();
-        for (int x = 0; x < width; x++) {
-            for (int y = 0; y < height; y++) {
-                int rgba = image.getRGB(x, y);
-                Color color = new Color(rgba, true);
-                Color invertedColor =
-                        new Color(
-                                255 - color.getRed(),
-                                255 - color.getGreen(),
-                                255 - color.getBlue());
-                image.setRGB(x, y, invertedColor.getRGB());
-            }
-        }
-    }
-
-    // Helper method to convert BufferedImage to InputStream
-    private File convertToBufferedImageTpFile(BufferedImage image) throws IOException {
-        File file = File.createTempFile("image", ".png");
-        ImageIO.write(image, "png", file);
-        return file;
-    }
-}

common/src/test/java/stirling/software/common/annotations/AutoJobPostMappingIntegrationTest.java

@@ -1,214 +0,0 @@
-package stirling.software.common.annotations;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.anyBoolean;
-import static org.mockito.ArgumentMatchers.anyInt;
-import static org.mockito.ArgumentMatchers.anyLong;
-import static org.mockito.ArgumentMatchers.anyString;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import org.junit.jupiter.api.BeforeEach;
-
-import java.util.Arrays;
-import java.util.function.Supplier;
-
-import org.aspectj.lang.ProceedingJoinPoint;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
-import org.mockito.ArgumentCaptor;
-import org.mockito.Captor;
-import org.mockito.InjectMocks;
-import org.mockito.Mock;
-import org.mockito.junit.jupiter.MockitoExtension;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.multipart.MultipartFile;
-
-import jakarta.servlet.http.HttpServletRequest;
-
-import stirling.software.common.aop.AutoJobAspect;
-import stirling.software.common.controller.WebSocketProgressController;
-import stirling.software.common.model.api.PDFFile;
-import stirling.software.common.service.FileOrUploadService;
-import stirling.software.common.service.FileStorage;
-import stirling.software.common.service.JobExecutorService;
-import stirling.software.common.service.JobQueue;
-import stirling.software.common.service.ResourceMonitor;
-
-@ExtendWith(MockitoExtension.class)
-class AutoJobPostMappingIntegrationTest {
-
-    private AutoJobAspect autoJobAspect;
-    
-    @Mock
-    private JobExecutorService jobExecutorService;
-    
-    @Mock
-    private HttpServletRequest request;
-    
-    @Mock
-    private FileOrUploadService fileOrUploadService;
-    
-    @Mock
-    private FileStorage fileStorage;
-    
-    @Mock
-    private WebSocketProgressController webSocketSender;
-    
-    @Mock
-    private ResourceMonitor resourceMonitor;
-    
-    @Mock
-    private JobQueue jobQueue;
-    
-    @BeforeEach
-    void setUp() {
-        autoJobAspect = new AutoJobAspect(
-            jobExecutorService,
-            request,
-            fileOrUploadService,
-            fileStorage,
-            webSocketSender
-        );
-    }
-    
-    @Mock
-    private ProceedingJoinPoint joinPoint;
-    
-    @Mock
-    private AutoJobPostMapping autoJobPostMapping;
-    
-    @Captor
-    private ArgumentCaptor<Supplier<Object>> workCaptor;
-    
-    @Captor
-    private ArgumentCaptor<Boolean> asyncCaptor;
-    
-    @Captor
-    private ArgumentCaptor<Long> timeoutCaptor;
-    
-    @Captor
-    private ArgumentCaptor<Boolean> queueableCaptor;
-    
-    @Captor
-    private ArgumentCaptor<Integer> resourceWeightCaptor;
-    
-    @Test
-    void shouldExecuteWithCustomParameters() throws Throwable {
-        // Given
-        PDFFile pdfFile = new PDFFile();
-        pdfFile.setFileId("test-file-id");
-        Object[] args = new Object[] { pdfFile };
-        
-        when(joinPoint.getArgs()).thenReturn(args);
-        when(request.getParameter("async")).thenReturn("true");
-        when(autoJobPostMapping.timeout()).thenReturn(60000L);
-        when(autoJobPostMapping.retryCount()).thenReturn(3);
-        when(autoJobPostMapping.trackProgress()).thenReturn(true);
-        when(autoJobPostMapping.queueable()).thenReturn(true);
-        when(autoJobPostMapping.resourceWeight()).thenReturn(75);
-        
-        MultipartFile mockFile = mock(MultipartFile.class);
-        when(fileStorage.retrieveFile("test-file-id")).thenReturn(mockFile);
-        
-
-        when(jobExecutorService.runJobGeneric(
-                anyBoolean(), any(Supplier.class), anyLong(), anyBoolean(), anyInt()))
-                .thenReturn(ResponseEntity.ok("success"));
-        
-        // When
-        Object result = autoJobAspect.wrapWithJobExecution(joinPoint, autoJobPostMapping);
-        
-        // Then
-        assertEquals(ResponseEntity.ok("success"), result);
-        
-        verify(jobExecutorService).runJobGeneric(
-                asyncCaptor.capture(),
-                workCaptor.capture(), 
-                timeoutCaptor.capture(),
-                queueableCaptor.capture(),
-                resourceWeightCaptor.capture());
-        
-        assertTrue(asyncCaptor.getValue(), "Async should be true");
-        assertEquals(60000L, timeoutCaptor.getValue(), "Timeout should be 60000ms");
-        assertTrue(queueableCaptor.getValue(), "Queueable should be true");
-        assertEquals(75, resourceWeightCaptor.getValue(), "Resource weight should be 75");
-        
-        // Test that file was resolved
-        assertNotNull(pdfFile.getFileInput(), "File input should be set");
-    }
-    
-    @Test
-    void shouldRetryOnError() throws Throwable {
-        // Given
-        when(joinPoint.getArgs()).thenReturn(new Object[0]);
-        when(request.getParameter("async")).thenReturn("false");
-        when(autoJobPostMapping.timeout()).thenReturn(-1L);
-        when(autoJobPostMapping.retryCount()).thenReturn(2);
-        when(autoJobPostMapping.trackProgress()).thenReturn(false);
-        when(autoJobPostMapping.queueable()).thenReturn(false);
-        when(autoJobPostMapping.resourceWeight()).thenReturn(50);
-        
-        // First call throws exception, second succeeds
-        when(joinPoint.proceed(any()))
-                .thenThrow(new RuntimeException("First attempt failed"))
-                .thenReturn(ResponseEntity.ok("retry succeeded"));
-        
-        // Mock jobExecutorService to execute the work immediately
-        when(jobExecutorService.runJobGeneric(
-                anyBoolean(), any(Supplier.class), anyLong(), anyBoolean(), anyInt()))
-                .thenAnswer(invocation -> {
-                    Supplier<Object> work = invocation.getArgument(1);
-                    return work.get();
-                });
-        
-        // When
-        Object result = autoJobAspect.wrapWithJobExecution(joinPoint, autoJobPostMapping);
-        
-        // Then
-        assertEquals(ResponseEntity.ok("retry succeeded"), result);
-        
-        // Verify that proceed was called twice (initial attempt + 1 retry)
-        verify(joinPoint, times(2)).proceed(any());
-    }
-    
-    @Test
-    void shouldHandlePDFFileWithAsyncRequests() throws Throwable {
-        // Given
-        PDFFile pdfFile = new PDFFile();
-        pdfFile.setFileInput(mock(MultipartFile.class));
-        Object[] args = new Object[] { pdfFile };
-        
-        when(joinPoint.getArgs()).thenReturn(args);
-        when(request.getParameter("async")).thenReturn("true");
-        when(autoJobPostMapping.retryCount()).thenReturn(1);
-        
-        when(fileStorage.storeFile(any(MultipartFile.class))).thenReturn("stored-file-id");
-        when(fileStorage.retrieveFile("stored-file-id")).thenReturn(mock(MultipartFile.class));
-        
-        // Mock job executor to return a successful response
-        when(jobExecutorService.runJobGeneric(
-                anyBoolean(), any(Supplier.class), anyLong(), anyBoolean(), anyInt()))
-                .thenReturn(ResponseEntity.ok("success"));
-        
-        // When
-        autoJobAspect.wrapWithJobExecution(joinPoint, autoJobPostMapping);
-        
-        // Then
-        assertEquals("stored-file-id", pdfFile.getFileId(), 
-                "FileId should be set to the stored file id");
-        assertNotNull(pdfFile.getFileInput(), "FileInput should be replaced with persistent file");
-        
-        // Verify storage operations
-        verify(fileStorage).storeFile(any(MultipartFile.class));
-        verify(fileStorage).retrieveFile("stored-file-id");
-    }
-}
-
-// Move PDFFileTest to its own class file if needed

common/src/test/java/stirling/software/common/controller/JobControllerTest.java

@@ -1,227 +0,0 @@
-package stirling.software.common.controller;
-
-import static org.junit.jupiter.api.Assertions.*;
-import static org.mockito.Mockito.*;
-
-import java.util.Map;
-
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.mockito.InjectMocks;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-
-import stirling.software.common.model.job.JobResult;
-import stirling.software.common.model.job.JobStats;
-import stirling.software.common.service.FileStorage;
-import stirling.software.common.service.TaskManager;
-
-class JobControllerTest {
-
-    @Mock
-    private TaskManager taskManager;
-    
-    @Mock
-    private FileStorage fileStorage;
-    
-    @InjectMocks
-    private JobController controller;
-    
-    @BeforeEach
-    void setUp() {
-        MockitoAnnotations.openMocks(this);
-    }
-    
-    @Test
-    void testGetJobStatus_ExistingJob() {
-        // Arrange
-        String jobId = "test-job-id";
-        JobResult mockResult = new JobResult();
-        mockResult.setJobId(jobId);
-        when(taskManager.getJobResult(jobId)).thenReturn(mockResult);
-        
-        // Act
-        ResponseEntity<?> response = controller.getJobStatus(jobId);
-        
-        // Assert
-        assertEquals(HttpStatus.OK, response.getStatusCode());
-        assertEquals(mockResult, response.getBody());
-    }
-    
-    @Test
-    void testGetJobStatus_NonExistentJob() {
-        // Arrange
-        String jobId = "non-existent-job";
-        when(taskManager.getJobResult(jobId)).thenReturn(null);
-        
-        // Act
-        ResponseEntity<?> response = controller.getJobStatus(jobId);
-        
-        // Assert
-        assertEquals(HttpStatus.NOT_FOUND, response.getStatusCode());
-    }
-    
-    @Test
-    void testGetJobResult_CompletedSuccessfulWithObject() {
-        // Arrange
-        String jobId = "test-job-id";
-        JobResult mockResult = new JobResult();
-        mockResult.setJobId(jobId);
-        mockResult.setComplete(true);
-        String resultObject = "Test result";
-        mockResult.completeWithResult(resultObject);
-        
-        when(taskManager.getJobResult(jobId)).thenReturn(mockResult);
-        
-        // Act
-        ResponseEntity<?> response = controller.getJobResult(jobId);
-        
-        // Assert
-        assertEquals(HttpStatus.OK, response.getStatusCode());
-        assertEquals(resultObject, response.getBody());
-    }
-    
-    @Test
-    void testGetJobResult_CompletedSuccessfulWithFile() throws Exception {
-        // Arrange
-        String jobId = "test-job-id";
-        String fileId = "file-id";
-        String originalFileName = "test.pdf";
-        String contentType = "application/pdf";
-        byte[] fileContent = "Test file content".getBytes();
-        
-        JobResult mockResult = new JobResult();
-        mockResult.setJobId(jobId);
-        mockResult.completeWithFile(fileId, originalFileName, contentType);
-        
-        when(taskManager.getJobResult(jobId)).thenReturn(mockResult);
-        when(fileStorage.retrieveBytes(fileId)).thenReturn(fileContent);
-        
-        // Act
-        ResponseEntity<?> response = controller.getJobResult(jobId);
-        
-        // Assert
-        assertEquals(HttpStatus.OK, response.getStatusCode());
-        assertEquals(contentType, response.getHeaders().getFirst("Content-Type"));
-        assertTrue(response.getHeaders().getFirst("Content-Disposition").contains(originalFileName));
-        assertEquals(fileContent, response.getBody());
-    }
-    
-    @Test
-    void testGetJobResult_CompletedWithError() {
-        // Arrange
-        String jobId = "test-job-id";
-        String errorMessage = "Test error";
-        
-        JobResult mockResult = new JobResult();
-        mockResult.setJobId(jobId);
-        mockResult.failWithError(errorMessage);
-        
-        when(taskManager.getJobResult(jobId)).thenReturn(mockResult);
-        
-        // Act
-        ResponseEntity<?> response = controller.getJobResult(jobId);
-        
-        // Assert
-        assertEquals(HttpStatus.BAD_REQUEST, response.getStatusCode());
-        assertTrue(response.getBody().toString().contains(errorMessage));
-    }
-    
-    @Test
-    void testGetJobResult_IncompleteJob() {
-        // Arrange
-        String jobId = "test-job-id";
-        
-        JobResult mockResult = new JobResult();
-        mockResult.setJobId(jobId);
-        mockResult.setComplete(false);
-        
-        when(taskManager.getJobResult(jobId)).thenReturn(mockResult);
-        
-        // Act
-        ResponseEntity<?> response = controller.getJobResult(jobId);
-        
-        // Assert
-        assertEquals(HttpStatus.BAD_REQUEST, response.getStatusCode());
-        assertTrue(response.getBody().toString().contains("not complete"));
-    }
-    
-    @Test
-    void testGetJobResult_NonExistentJob() {
-        // Arrange
-        String jobId = "non-existent-job";
-        when(taskManager.getJobResult(jobId)).thenReturn(null);
-        
-        // Act
-        ResponseEntity<?> response = controller.getJobResult(jobId);
-        
-        // Assert
-        assertEquals(HttpStatus.NOT_FOUND, response.getStatusCode());
-    }
-    
-    @Test
-    void testGetJobResult_ErrorRetrievingFile() throws Exception {
-        // Arrange
-        String jobId = "test-job-id";
-        String fileId = "file-id";
-        String originalFileName = "test.pdf";
-        String contentType = "application/pdf";
-        
-        JobResult mockResult = new JobResult();
-        mockResult.setJobId(jobId);
-        mockResult.completeWithFile(fileId, originalFileName, contentType);
-        
-        when(taskManager.getJobResult(jobId)).thenReturn(mockResult);
-        when(fileStorage.retrieveBytes(fileId)).thenThrow(new RuntimeException("File not found"));
-        
-        // Act
-        ResponseEntity<?> response = controller.getJobResult(jobId);
-        
-        // Assert
-        assertEquals(HttpStatus.INTERNAL_SERVER_ERROR, response.getStatusCode());
-        assertTrue(response.getBody().toString().contains("Error retrieving file"));
-    }
-    
-    @Test
-    void testGetJobStats() {
-        // Arrange
-        JobStats mockStats = JobStats.builder()
-                .totalJobs(10)
-                .activeJobs(3)
-                .completedJobs(7)
-                .build();
-        
-        when(taskManager.getJobStats()).thenReturn(mockStats);
-        
-        // Act
-        ResponseEntity<JobStats> response = controller.getJobStats();
-        
-        // Assert
-        assertEquals(HttpStatus.OK, response.getStatusCode());
-        assertEquals(mockStats, response.getBody());
-    }
-    
-    @Test
-    void testCleanupOldJobs() {
-        // Arrange
-        when(taskManager.getJobStats())
-            .thenReturn(JobStats.builder().totalJobs(10).build())
-            .thenReturn(JobStats.builder().totalJobs(7).build());
-        
-        // Act
-        ResponseEntity<?> response = controller.cleanupOldJobs();
-        
-        // Assert
-        assertEquals(HttpStatus.OK, response.getStatusCode());
-        
-        @SuppressWarnings("unchecked")
-        Map<String, Object> responseBody = (Map<String, Object>) response.getBody();
-        assertEquals("Cleanup complete", responseBody.get("message"));
-        assertEquals(3, responseBody.get("removedJobs"));
-        assertEquals(7, responseBody.get("remainingJobs"));
-        
-        verify(taskManager).cleanupOldJobs();
-    }
-}

common/src/test/java/stirling/software/common/controller/WebSocketProgressControllerTest.java

@@ -1,69 +0,0 @@
-package stirling.software.common.controller;
-
-import static org.junit.jupiter.api.Assertions.*;
-import static org.mockito.Mockito.*;
-
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.mockito.InjectMocks;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.springframework.messaging.simp.SimpMessagingTemplate;
-
-import stirling.software.common.model.job.JobProgress;
-
-class WebSocketProgressControllerTest {
-
-    @Mock
-    private SimpMessagingTemplate messagingTemplate;
-    
-    @InjectMocks
-    private WebSocketProgressController controller;
-    
-    @BeforeEach
-    void setUp() {
-        MockitoAnnotations.openMocks(this);
-    }
-    
-    @Test
-    void testSendProgress_WithMessagingTemplate() {
-        // Arrange
-        String jobId = "test-job-id";
-        JobProgress progress = new JobProgress(jobId, "In Progress", 50, "Processing");
-        
-        // Act
-        controller.sendProgress(jobId, progress);
-        
-        // Assert
-        verify(messagingTemplate).convertAndSend("/topic/progress/" + jobId, progress);
-    }
-    
-    @Test
-    void testSendProgress_WithNullMessagingTemplate() {
-        // Arrange
-        WebSocketProgressController controllerWithNullTemplate = new WebSocketProgressController();
-        String jobId = "test-job-id";
-        JobProgress progress = new JobProgress(jobId, "In Progress", 50, "Processing");
-        
-        // Act - should not throw exception even with null template
-        controllerWithNullTemplate.sendProgress(jobId, progress);
-        
-        // No assertion needed - test passes if no exception is thrown
-    }
-    
-    @Test
-    void testSetMessagingTemplate() {
-        // Arrange
-        WebSocketProgressController newController = new WebSocketProgressController();
-        SimpMessagingTemplate newTemplate = mock(SimpMessagingTemplate.class);
-        
-        // Act
-        newController.setMessagingTemplate(newTemplate);
-        String jobId = "test-job-id";
-        JobProgress progress = new JobProgress(jobId, "In Progress", 50, "Processing");
-        newController.sendProgress(jobId, progress);
-        
-        // Assert
-        verify(newTemplate).convertAndSend("/topic/progress/" + jobId, progress);
-    }
-}

common/src/test/java/stirling/software/common/service/CustomPDFDocumentFactoryTest.java

@@ -1,223 +0,0 @@
-package stirling.software.common.service;
-
-import static org.junit.jupiter.api.Assertions.*;
-import static org.mockito.Mockito.*;
-import static stirling.software.common.service.SpyPDFDocumentFactory.*;
-
-import java.io.*;
-import java.nio.file.*;
-import java.nio.file.Files;
-import java.util.Arrays;
-
-import org.apache.pdfbox.Loader;
-import org.apache.pdfbox.cos.COSName;
-import org.apache.pdfbox.pdmodel.*;
-import org.apache.pdfbox.pdmodel.common.PDStream;
-import org.junit.jupiter.api.*;
-import org.junit.jupiter.api.parallel.Execution;
-import org.junit.jupiter.api.parallel.ExecutionMode;
-import org.junit.jupiter.params.ParameterizedTest;
-import org.junit.jupiter.params.provider.CsvSource;
-import org.springframework.mock.web.MockMultipartFile;
-
-import stirling.software.common.model.api.PDFFile;
-
-@TestInstance(TestInstance.Lifecycle.PER_CLASS)
-@TestMethodOrder(MethodOrderer.OrderAnnotation.class)
-@Execution(value = ExecutionMode.SAME_THREAD)
-class CustomPDFDocumentFactoryTest {
-
-    private SpyPDFDocumentFactory factory;
-    private byte[] basePdfBytes;
-
-    @BeforeEach
-    void setup() throws IOException {
-        PdfMetadataService mockService = mock(PdfMetadataService.class);
-        factory = new SpyPDFDocumentFactory(mockService);
-
-        try (InputStream is = getClass().getResourceAsStream("/example.pdf")) {
-            assertNotNull(is, "example.pdf must be present in src/test/resources");
-            basePdfBytes = is.readAllBytes();
-        }
-    }
-
-    @ParameterizedTest
-    @CsvSource({"5,MEMORY_ONLY", "20,MIXED", "60,TEMP_FILE"})
-    void testStrategy_FileInput(int sizeMB, StrategyType expected) throws IOException {
-        File file = writeTempFile(inflatePdf(basePdfBytes, sizeMB));
-        try (PDDocument doc = factory.load(file)) {
-            Assertions.assertEquals(expected, factory.lastStrategyUsed);
-        }
-    }
-
-    @ParameterizedTest
-    @CsvSource({"5,MEMORY_ONLY", "20,MIXED", "60,TEMP_FILE"})
-    void testStrategy_ByteArray(int sizeMB, StrategyType expected) throws IOException {
-        byte[] inflated = inflatePdf(basePdfBytes, sizeMB);
-        try (PDDocument doc = factory.load(inflated)) {
-            Assertions.assertEquals(expected, factory.lastStrategyUsed);
-        }
-    }
-
-    @ParameterizedTest
-    @CsvSource({"5,MEMORY_ONLY", "20,MIXED", "60,TEMP_FILE"})
-    void testStrategy_InputStream(int sizeMB, StrategyType expected) throws IOException {
-        byte[] inflated = inflatePdf(basePdfBytes, sizeMB);
-        try (PDDocument doc = factory.load(new ByteArrayInputStream(inflated))) {
-            Assertions.assertEquals(expected, factory.lastStrategyUsed);
-        }
-    }
-
-    @ParameterizedTest
-    @CsvSource({"5,MEMORY_ONLY", "20,MIXED", "60,TEMP_FILE"})
-    void testStrategy_MultipartFile(int sizeMB, StrategyType expected) throws IOException {
-        byte[] inflated = inflatePdf(basePdfBytes, sizeMB);
-        MockMultipartFile multipart =
-                new MockMultipartFile("file", "doc.pdf", "application/pdf", inflated);
-        try (PDDocument doc = factory.load(multipart)) {
-            Assertions.assertEquals(expected, factory.lastStrategyUsed);
-        }
-    }
-
-    @ParameterizedTest
-    @CsvSource({"5,MEMORY_ONLY", "20,MIXED", "60,TEMP_FILE"})
-    void testStrategy_PDFFile(int sizeMB, StrategyType expected) throws IOException {
-        byte[] inflated = inflatePdf(basePdfBytes, sizeMB);
-        MockMultipartFile multipart =
-                new MockMultipartFile("file", "doc.pdf", "application/pdf", inflated);
-        PDFFile pdfFile = new PDFFile();
-        pdfFile.setFileInput(multipart);
-        try (PDDocument doc = factory.load(pdfFile)) {
-            Assertions.assertEquals(expected, factory.lastStrategyUsed);
-        }
-    }
-
-    private byte[] inflatePdf(byte[] input, int sizeInMB) throws IOException {
-        try (PDDocument doc = Loader.loadPDF(input)) {
-            byte[] largeData = new byte[sizeInMB * 1024 * 1024];
-            Arrays.fill(largeData, (byte) 'A');
-
-            PDStream stream = new PDStream(doc, new ByteArrayInputStream(largeData));
-            stream.getCOSObject().setItem(COSName.TYPE, COSName.XOBJECT);
-            stream.getCOSObject().setItem(COSName.SUBTYPE, COSName.IMAGE);
-
-            doc.getDocumentCatalog()
-                    .getCOSObject()
-                    .setItem(COSName.getPDFName("DummyBigStream"), stream.getCOSObject());
-
-            ByteArrayOutputStream out = new ByteArrayOutputStream();
-            doc.save(out);
-            return out.toByteArray();
-        }
-    }
-
-    @Test
-    void testLoadFromPath() throws IOException {
-        File file = writeTempFile(inflatePdf(basePdfBytes, 5));
-        Path path = file.toPath();
-        try (PDDocument doc = factory.load(path)) {
-            assertNotNull(doc);
-        }
-    }
-
-    @Test
-    void testLoadFromStringPath() throws IOException {
-        File file = writeTempFile(inflatePdf(basePdfBytes, 5));
-        try (PDDocument doc = factory.load(file.getAbsolutePath())) {
-            assertNotNull(doc);
-        }
-    }
-
-    // neeed to add password pdf
-    //    @Test
-    //    void testLoadPasswordProtectedPdfFromInputStream() throws IOException {
-    //        try (InputStream is = getClass().getResourceAsStream("/protected.pdf")) {
-    //            assertNotNull(is, "protected.pdf must be present in src/test/resources");
-    //            try (PDDocument doc = factory.load(is, "test123")) {
-    //                assertNotNull(doc);
-    //            }
-    //        }
-    //    }
-    //
-    //    @Test
-    //    void testLoadPasswordProtectedPdfFromMultipart() throws IOException {
-    //        try (InputStream is = getClass().getResourceAsStream("/protected.pdf")) {
-    //            assertNotNull(is, "protected.pdf must be present in src/test/resources");
-    //            byte[] bytes = is.readAllBytes();
-    //            MockMultipartFile file = new MockMultipartFile("file", "protected.pdf",
-    // "application/pdf", bytes);
-    //            try (PDDocument doc = factory.load(file, "test123")) {
-    //                assertNotNull(doc);
-    //            }
-    //        }
-    //    }
-
-    @Test
-    void testLoadReadOnlySkipsPostProcessing() throws IOException {
-        PdfMetadataService mockService = mock(PdfMetadataService.class);
-        CustomPDFDocumentFactory readOnlyFactory = new CustomPDFDocumentFactory(mockService);
-
-        byte[] bytes = inflatePdf(basePdfBytes, 5);
-        try (PDDocument doc = readOnlyFactory.load(bytes, true)) {
-            assertNotNull(doc);
-            verify(mockService, never()).setDefaultMetadata(any());
-        }
-    }
-
-    @Test
-    void testCreateNewDocument() throws IOException {
-        try (PDDocument doc = factory.createNewDocument()) {
-            assertNotNull(doc);
-        }
-    }
-
-    @Test
-    void testCreateNewDocumentBasedOnOldDocument() throws IOException {
-        byte[] inflated = inflatePdf(basePdfBytes, 5);
-        try (PDDocument oldDoc = Loader.loadPDF(inflated);
-                PDDocument newDoc = factory.createNewDocumentBasedOnOldDocument(oldDoc)) {
-            assertNotNull(newDoc);
-        }
-    }
-
-    @Test
-    void testLoadToBytesRoundTrip() throws IOException {
-        byte[] inflated = inflatePdf(basePdfBytes, 5);
-        File file = writeTempFile(inflated);
-
-        byte[] resultBytes = factory.loadToBytes(file);
-        try (PDDocument doc = Loader.loadPDF(resultBytes)) {
-            assertNotNull(doc);
-            assertTrue(doc.getNumberOfPages() > 0);
-        }
-    }
-
-    @Test
-    void testSaveToBytesAndReload() throws IOException {
-        try (PDDocument doc = Loader.loadPDF(basePdfBytes)) {
-            byte[] saved = factory.saveToBytes(doc);
-            try (PDDocument reloaded = Loader.loadPDF(saved)) {
-                assertNotNull(reloaded);
-                assertEquals(doc.getNumberOfPages(), reloaded.getNumberOfPages());
-            }
-        }
-    }
-
-    @Test
-    void testCreateNewBytesBasedOnOldDocument() throws IOException {
-        byte[] newBytes = factory.createNewBytesBasedOnOldDocument(basePdfBytes);
-        assertNotNull(newBytes);
-        assertTrue(newBytes.length > 0);
-    }
-
-    private File writeTempFile(byte[] content) throws IOException {
-        File file = Files.createTempFile("pdf-test-", ".pdf").toFile();
-        Files.write(file.toPath(), content);
-        return file;
-    }
-
-    @BeforeEach
-    void cleanup() {
-        System.gc();
-    }
-}

common/src/test/java/stirling/software/common/service/FileStorageTest.java

@@ -1,190 +0,0 @@
-package stirling.software.common.service;
-
-import static org.junit.jupiter.api.Assertions.*;
-import static org.mockito.Mockito.*;
-import static org.mockito.AdditionalAnswers.*;
-
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.UUID;
-
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.io.TempDir;
-import org.mockito.InjectMocks;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.springframework.test.util.ReflectionTestUtils;
-import org.springframework.web.multipart.MultipartFile;
-
-class FileStorageTest {
-
-    @TempDir
-    Path tempDir;
-    
-    @Mock
-    private FileOrUploadService fileOrUploadService;
-    
-    @InjectMocks
-    private FileStorage fileStorage;
-    
-    private MultipartFile mockFile;
-    
-    @BeforeEach
-    void setUp() {
-        MockitoAnnotations.openMocks(this);
-        ReflectionTestUtils.setField(fileStorage, "tempDirPath", tempDir.toString());
-        
-        // Create a mock MultipartFile
-        mockFile = mock(MultipartFile.class);
-        when(mockFile.getOriginalFilename()).thenReturn("test.pdf");
-        when(mockFile.getContentType()).thenReturn("application/pdf");
-    }
-
-    @Test
-    void testStoreFile() throws IOException {
-        // Arrange
-        byte[] fileContent = "Test PDF content".getBytes();
-        when(mockFile.getBytes()).thenReturn(fileContent);
-        
-        // Set up mock to handle transferTo by writing the file
-        doAnswer(invocation -> {
-            java.io.File file = invocation.getArgument(0);
-            Files.write(file.toPath(), fileContent);
-            return null;
-        }).when(mockFile).transferTo(any(java.io.File.class));
-        
-        // Act
-        String fileId = fileStorage.storeFile(mockFile);
-        
-        // Assert
-        assertNotNull(fileId);
-        assertTrue(Files.exists(tempDir.resolve(fileId)));
-        verify(mockFile).transferTo(any(java.io.File.class));
-    }
-    
-    @Test
-    void testStoreBytes() throws IOException {
-        // Arrange
-        byte[] fileContent = "Test PDF content".getBytes();
-        String originalName = "test.pdf";
-        
-        // Act
-        String fileId = fileStorage.storeBytes(fileContent, originalName);
-        
-        // Assert
-        assertNotNull(fileId);
-        assertTrue(Files.exists(tempDir.resolve(fileId)));
-        assertArrayEquals(fileContent, Files.readAllBytes(tempDir.resolve(fileId)));
-    }
-    
-    @Test
-    void testRetrieveFile() throws IOException {
-        // Arrange
-        byte[] fileContent = "Test PDF content".getBytes();
-        String fileId = UUID.randomUUID().toString();
-        Path filePath = tempDir.resolve(fileId);
-        Files.write(filePath, fileContent);
-        
-        MultipartFile expectedFile = mock(MultipartFile.class);
-        when(fileOrUploadService.toMockMultipartFile(eq(fileId), eq(fileContent)))
-            .thenReturn(expectedFile);
-        
-        // Act
-        MultipartFile result = fileStorage.retrieveFile(fileId);
-        
-        // Assert
-        assertSame(expectedFile, result);
-        verify(fileOrUploadService).toMockMultipartFile(eq(fileId), eq(fileContent));
-    }
-    
-    @Test
-    void testRetrieveBytes() throws IOException {
-        // Arrange
-        byte[] fileContent = "Test PDF content".getBytes();
-        String fileId = UUID.randomUUID().toString();
-        Path filePath = tempDir.resolve(fileId);
-        Files.write(filePath, fileContent);
-        
-        // Act
-        byte[] result = fileStorage.retrieveBytes(fileId);
-        
-        // Assert
-        assertArrayEquals(fileContent, result);
-    }
-    
-    @Test
-    void testRetrieveFile_FileNotFound() {
-        // Arrange
-        String nonExistentFileId = "non-existent-file";
-        
-        // Act & Assert
-        assertThrows(IOException.class, () -> fileStorage.retrieveFile(nonExistentFileId));
-    }
-    
-    @Test
-    void testRetrieveBytes_FileNotFound() {
-        // Arrange
-        String nonExistentFileId = "non-existent-file";
-        
-        // Act & Assert
-        assertThrows(IOException.class, () -> fileStorage.retrieveBytes(nonExistentFileId));
-    }
-    
-    @Test
-    void testDeleteFile() throws IOException {
-        // Arrange
-        byte[] fileContent = "Test PDF content".getBytes();
-        String fileId = UUID.randomUUID().toString();
-        Path filePath = tempDir.resolve(fileId);
-        Files.write(filePath, fileContent);
-        
-        // Act
-        boolean result = fileStorage.deleteFile(fileId);
-        
-        // Assert
-        assertTrue(result);
-        assertFalse(Files.exists(filePath));
-    }
-    
-    @Test
-    void testDeleteFile_FileNotFound() {
-        // Arrange
-        String nonExistentFileId = "non-existent-file";
-        
-        // Act
-        boolean result = fileStorage.deleteFile(nonExistentFileId);
-        
-        // Assert
-        assertFalse(result);
-    }
-    
-    @Test
-    void testFileExists() throws IOException {
-        // Arrange
-        byte[] fileContent = "Test PDF content".getBytes();
-        String fileId = UUID.randomUUID().toString();
-        Path filePath = tempDir.resolve(fileId);
-        Files.write(filePath, fileContent);
-        
-        // Act
-        boolean result = fileStorage.fileExists(fileId);
-        
-        // Assert
-        assertTrue(result);
-    }
-    
-    @Test
-    void testFileExists_FileNotFound() {
-        // Arrange
-        String nonExistentFileId = "non-existent-file";
-        
-        // Act
-        boolean result = fileStorage.fileExists(nonExistentFileId);
-        
-        // Assert
-        assertFalse(result);
-    }
-}

common/src/test/java/stirling/software/common/service/JobExecutorServiceTest.java

@@ -1,208 +0,0 @@
-package stirling.software.common.service;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.anyInt;
-import static org.mockito.ArgumentMatchers.anyLong;
-import static org.mockito.ArgumentMatchers.anyString;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.doAnswer;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import java.util.Map;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.TimeoutException;
-import java.util.function.Supplier;
-
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
-import org.mockito.ArgumentCaptor;
-import org.mockito.Captor;
-import org.mockito.Mock;
-import org.mockito.Mockito;
-import org.mockito.junit.jupiter.MockitoExtension;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.test.util.ReflectionTestUtils;
-
-import jakarta.servlet.http.HttpServletRequest;
-
-import stirling.software.common.controller.WebSocketProgressController;
-import stirling.software.common.model.job.JobProgress;
-import stirling.software.common.model.job.JobResponse;
-
-@ExtendWith(MockitoExtension.class)
-class JobExecutorServiceTest {
-
-    private JobExecutorService jobExecutorService;
-    
-    @Mock
-    private TaskManager taskManager;
-    
-    @Mock
-    private WebSocketProgressController webSocketSender;
-    
-    @Mock
-    private FileStorage fileStorage;
-    
-    @Mock
-    private HttpServletRequest request;
-    
-    @Mock
-    private ResourceMonitor resourceMonitor;
-    
-    @Mock
-    private JobQueue jobQueue;
-    
-    @Captor
-    private ArgumentCaptor<String> jobIdCaptor;
-    
-    @BeforeEach
-    void setUp() {
-        // Initialize the service manually with all its dependencies
-        jobExecutorService = new JobExecutorService(
-                taskManager, 
-                webSocketSender, 
-                fileStorage, 
-                request,
-                resourceMonitor,
-                jobQueue,
-                30000L, // asyncRequestTimeoutMs
-                "30m"   // sessionTimeout
-        );
-    }
-    
-    @Test
-    void shouldRunSyncJobSuccessfully() throws Exception {
-        // Given
-        Supplier<Object> work = () -> "test-result";
-        
-        // When
-        ResponseEntity<?> response = jobExecutorService.runJobGeneric(false, work);
-        
-        // Then
-        assertEquals(HttpStatus.OK, response.getStatusCode());
-        assertEquals("test-result", response.getBody());
-        
-        // Verify request attribute was set with jobId
-        verify(request).setAttribute(eq("jobId"), anyString());
-    }
-    
-    @Test
-    void shouldRunAsyncJobSuccessfully() throws Exception {
-        // Given
-        Supplier<Object> work = () -> "test-result";
-
-        // When
-        ResponseEntity<?> response = jobExecutorService.runJobGeneric(true, work);
-
-        // Then
-        assertEquals(HttpStatus.OK, response.getStatusCode());
-        assertTrue(response.getBody() instanceof JobResponse);
-        JobResponse<?> jobResponse = (JobResponse<?>) response.getBody();
-        assertTrue(jobResponse.isAsync());
-        assertNotNull(jobResponse.getJobId());
-
-        // Verify task manager was called
-        verify(taskManager).createTask(jobIdCaptor.capture());
-        verify(webSocketSender, Mockito.atLeastOnce()).sendProgress(eq(jobIdCaptor.getValue()), any(JobProgress.class));
-    }
-
-    
-    @Test
-    void shouldHandleSyncJobError() {
-        // Given
-        Supplier<Object> work = () -> {
-            throw new RuntimeException("Test error");
-        };
-        
-        // When
-        ResponseEntity<?> response = jobExecutorService.runJobGeneric(false, work);
-        
-        // Then
-        assertEquals(HttpStatus.INTERNAL_SERVER_ERROR, response.getStatusCode());
-        
-        @SuppressWarnings("unchecked")
-        Map<String, String> errorMap = (Map<String, String>) response.getBody();
-        assertEquals("Job failed: Test error", errorMap.get("error"));
-    }
-    
-    @Test
-    void shouldQueueJobWhenResourcesLimited() {
-        // Given
-        Supplier<Object> work = () -> "test-result";
-        CompletableFuture<ResponseEntity<?>> future = new CompletableFuture<>();
-        
-        // Configure resourceMonitor to indicate job should be queued
-        when(resourceMonitor.shouldQueueJob(80)).thenReturn(true);
-        
-        // Configure jobQueue to return our future
-        when(jobQueue.queueJob(anyString(), eq(80), any(), anyLong())).thenReturn(future);
-        
-        // When
-        ResponseEntity<?> response = jobExecutorService.runJobGeneric(
-                true, work, 5000, true, 80);
-        
-        // Then
-        assertEquals(HttpStatus.OK, response.getStatusCode());
-        assertTrue(response.getBody() instanceof JobResponse);
-        
-        // Verify job was queued
-        verify(jobQueue).queueJob(anyString(), eq(80), any(), eq(5000L));
-        verify(taskManager).createTask(anyString());
-    }
-    
-    @Test
-    void shouldUseCustomTimeoutWhenProvided() throws Exception {
-        // Given
-        Supplier<Object> work = () -> "test-result";
-        long customTimeout = 60000L;
-        
-        // Use reflection to access the private executeWithTimeout method
-        java.lang.reflect.Method executeMethod = JobExecutorService.class
-                .getDeclaredMethod("executeWithTimeout", Supplier.class, long.class);
-        executeMethod.setAccessible(true);
-        
-        // Create a spy on the JobExecutorService to verify method calls
-        JobExecutorService spy = Mockito.spy(jobExecutorService);
-        
-        // When
-        spy.runJobGeneric(false, work, customTimeout);
-        
-        // Then
-        verify(spy).runJobGeneric(eq(false), any(Supplier.class), eq(customTimeout));
-    }
-    
-    @Test
-    void shouldHandleTimeout() throws Exception {
-        // Given
-        Supplier<Object> work = () -> {
-            try {
-                Thread.sleep(100); // Simulate long-running job
-                return "test-result";
-            } catch (InterruptedException e) {
-                Thread.currentThread().interrupt();
-                throw new RuntimeException(e);
-            }
-        };
-        
-        // Use reflection to access the private executeWithTimeout method
-        java.lang.reflect.Method executeMethod = JobExecutorService.class
-                .getDeclaredMethod("executeWithTimeout", Supplier.class, long.class);
-        executeMethod.setAccessible(true);
-        
-        // When/Then
-        try {
-            executeMethod.invoke(jobExecutorService, work, 1L); // Very short timeout
-        } catch (Exception e) {
-            assertTrue(e.getCause() instanceof TimeoutException);
-        }
-    }
-}

common/src/test/java/stirling/software/common/service/JobQueueTest.java

@@ -1,107 +0,0 @@
-package stirling.software.common.service;
-
-import static org.junit.jupiter.api.Assertions.*;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.anyInt;
-import static org.mockito.Mockito.lenient;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import java.util.Map;
-import java.util.concurrent.atomic.AtomicReference;
-import java.util.function.Supplier;
-
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
-import org.mockito.Mock;
-import org.mockito.junit.jupiter.MockitoExtension;
-
-import stirling.software.common.controller.WebSocketProgressController;
-import stirling.software.common.model.job.JobProgress;
-import stirling.software.common.service.ResourceMonitor.ResourceStatus;
-
-@ExtendWith(MockitoExtension.class)
-class JobQueueTest {
-
-    private JobQueue jobQueue;
-
-    @Mock
-    private ResourceMonitor resourceMonitor;
-
-    @Mock
-    private WebSocketProgressController webSocketSender;
-
-    private final AtomicReference<ResourceStatus> statusRef = new AtomicReference<>(ResourceStatus.OK);
-
-    @BeforeEach
-    void setUp() {
-        // Mark stubbing as lenient to avoid UnnecessaryStubbingException
-        lenient().when(resourceMonitor.calculateDynamicQueueCapacity(anyInt(), anyInt())).thenReturn(10);
-        lenient().when(resourceMonitor.getCurrentStatus()).thenReturn(statusRef);
-
-        jobQueue = new JobQueue(resourceMonitor, webSocketSender);
-    }
-
-    @Test
-    void shouldQueueJob() {
-        String jobId = "test-job-1";
-        int resourceWeight = 50;
-        Supplier<Object> work = () -> "test-result";
-        long timeoutMs = 1000;
-
-        jobQueue.queueJob(jobId, resourceWeight, work, timeoutMs);
-
-        verify(webSocketSender).sendProgress(
-                org.mockito.ArgumentMatchers.eq(jobId),
-                org.mockito.ArgumentMatchers.any(JobProgress.class));
-
-        assertTrue(jobQueue.isJobQueued(jobId));
-        assertEquals(1, jobQueue.getTotalQueuedJobs());
-    }
-
-    @Test
-    void shouldCancelJob() {
-        String jobId = "test-job-2";
-        Supplier<Object> work = () -> "test-result";
-
-        jobQueue.queueJob(jobId, 50, work, 1000);
-        boolean cancelled = jobQueue.cancelJob(jobId);
-
-        assertTrue(cancelled);
-        assertFalse(jobQueue.isJobQueued(jobId));
-    }
-
-    @Test
-    void shouldGetQueueStats() {
-        when(resourceMonitor.getCurrentStatus()).thenReturn(statusRef);
-
-        jobQueue.queueJob("job1", 50, () -> "ok", 1000);
-        jobQueue.queueJob("job2", 50, () -> "ok", 1000);
-        jobQueue.cancelJob("job2");
-
-        Map<String, Object> stats = jobQueue.getQueueStats();
-
-        assertEquals(2, stats.get("totalQueuedJobs"));
-        assertTrue(stats.containsKey("queuedJobs"));
-        assertTrue(stats.containsKey("resourceStatus"));
-    }
-
-    @Test
-    void shouldCalculateQueueCapacity() {
-        when(resourceMonitor.calculateDynamicQueueCapacity(5, 2)).thenReturn(8);
-        int capacity = resourceMonitor.calculateDynamicQueueCapacity(5, 2);
-        assertEquals(8, capacity);
-    }
-
-    @Test
-    void shouldCheckIfJobIsQueued() {
-        String jobId = "job-123";
-        Supplier<Object> work = () -> "hello";
-
-        jobQueue.queueJob(jobId, 40, work, 500);
-
-        assertTrue(jobQueue.isJobQueued(jobId));
-        assertFalse(jobQueue.isJobQueued("nonexistent"));
-    }
-}

common/src/test/java/stirling/software/common/service/ResourceMonitorTest.java

@@ -1,137 +0,0 @@
-package stirling.software.common.service;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
-import java.lang.management.MemoryMXBean;
-import java.lang.management.MemoryUsage;
-import java.lang.management.OperatingSystemMXBean;
-import java.time.Instant;
-import java.util.concurrent.atomic.AtomicReference;
-
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
-import org.junit.jupiter.params.ParameterizedTest;
-import org.junit.jupiter.params.provider.CsvSource;
-import org.mockito.InjectMocks;
-import org.mockito.Mock;
-import org.mockito.Spy;
-import org.mockito.junit.jupiter.MockitoExtension;
-import org.springframework.test.util.ReflectionTestUtils;
-
-import stirling.software.common.service.ResourceMonitor.ResourceMetrics;
-import stirling.software.common.service.ResourceMonitor.ResourceStatus;
-
-@ExtendWith(MockitoExtension.class)
-class ResourceMonitorTest {
-
-    @InjectMocks
-    private ResourceMonitor resourceMonitor;
-    
-    @Mock
-    private OperatingSystemMXBean osMXBean;
-    
-    @Mock
-    private MemoryMXBean memoryMXBean;
-    
-    @Spy
-    private AtomicReference<ResourceStatus> currentStatus = new AtomicReference<>(ResourceStatus.OK);
-    
-    @Spy
-    private AtomicReference<ResourceMetrics> latestMetrics = new AtomicReference<>(new ResourceMetrics());
-    
-    @BeforeEach
-    void setUp() {
-        // Set thresholds for testing
-        ReflectionTestUtils.setField(resourceMonitor, "memoryCriticalThreshold", 0.9);
-        ReflectionTestUtils.setField(resourceMonitor, "memoryHighThreshold", 0.75);
-        ReflectionTestUtils.setField(resourceMonitor, "cpuCriticalThreshold", 0.9);
-        ReflectionTestUtils.setField(resourceMonitor, "cpuHighThreshold", 0.75);
-        ReflectionTestUtils.setField(resourceMonitor, "osMXBean", osMXBean);
-        ReflectionTestUtils.setField(resourceMonitor, "memoryMXBean", memoryMXBean);
-        ReflectionTestUtils.setField(resourceMonitor, "currentStatus", currentStatus);
-        ReflectionTestUtils.setField(resourceMonitor, "latestMetrics", latestMetrics);
-    }
-    
-    @Test
-    void shouldCalculateDynamicQueueCapacity() {
-        // Given
-        int baseCapacity = 10;
-        int minCapacity = 2;
-        
-        // Mock current status as OK
-        currentStatus.set(ResourceStatus.OK);
-        
-        // When
-        int capacity = resourceMonitor.calculateDynamicQueueCapacity(baseCapacity, minCapacity);
-        
-        // Then
-        assertEquals(baseCapacity, capacity, "With OK status, capacity should equal base capacity");
-        
-        // Given
-        currentStatus.set(ResourceStatus.WARNING);
-        
-        // When
-        capacity = resourceMonitor.calculateDynamicQueueCapacity(baseCapacity, minCapacity);
-        
-        // Then
-        assertEquals(6, capacity, "With WARNING status, capacity should be reduced to 60%");
-        
-        // Given
-        currentStatus.set(ResourceStatus.CRITICAL);
-        
-        // When
-        capacity = resourceMonitor.calculateDynamicQueueCapacity(baseCapacity, minCapacity);
-        
-        // Then
-        assertEquals(3, capacity, "With CRITICAL status, capacity should be reduced to 30%");
-        
-        // Test minimum capacity enforcement
-        assertEquals(minCapacity, resourceMonitor.calculateDynamicQueueCapacity(1, minCapacity),
-                "Should never go below minimum capacity");
-    }
-    
-    @ParameterizedTest
-    @CsvSource({
-        "10, OK, false",      // Light job, OK status
-        "10, WARNING, false", // Light job, WARNING status
-        "10, CRITICAL, true", // Light job, CRITICAL status
-        "30, OK, false",      // Medium job, OK status
-        "30, WARNING, true",  // Medium job, WARNING status
-        "30, CRITICAL, true", // Medium job, CRITICAL status
-        "80, OK, true",       // Heavy job, OK status
-        "80, WARNING, true",  // Heavy job, WARNING status
-        "80, CRITICAL, true"  // Heavy job, CRITICAL status
-    })
-    void shouldQueueJobBasedOnWeightAndStatus(int weight, ResourceStatus status, boolean shouldQueue) {
-        // Given
-        currentStatus.set(status);
-        
-        // When
-        boolean result = resourceMonitor.shouldQueueJob(weight);
-        
-        // Then
-        assertEquals(shouldQueue, result,
-                String.format("For weight %d and status %s, shouldQueue should be %s", 
-                        weight, status, shouldQueue));
-    }
-    
-    @Test
-    void resourceMetricsShouldDetectStaleState() {
-        // Given
-        Instant now = Instant.now();
-        Instant pastInstant = now.minusMillis(6000);
-        
-        ResourceMetrics staleMetrics = new ResourceMetrics(0.5, 0.5, 1024, 2048, 4096, pastInstant);
-        ResourceMetrics freshMetrics = new ResourceMetrics(0.5, 0.5, 1024, 2048, 4096, now);
-        
-        // When/Then
-        assertTrue(staleMetrics.isStale(5000), "Metrics from 6 seconds ago should be stale with 5s threshold");
-        assertFalse(freshMetrics.isStale(5000), "Fresh metrics should not be stale");
-    }
-}

common/src/test/java/stirling/software/common/service/SpyPDFDocumentFactory.java

@@ -1,31 +0,0 @@
-package stirling.software.common.service;
-
-import org.apache.pdfbox.io.RandomAccessStreamCache.StreamCacheCreateFunction;
-
-class SpyPDFDocumentFactory extends CustomPDFDocumentFactory {
-    enum StrategyType {
-        MEMORY_ONLY,
-        MIXED,
-        TEMP_FILE
-    }
-
-    public StrategyType lastStrategyUsed;
-
-    public SpyPDFDocumentFactory(PdfMetadataService service) {
-        super(service);
-    }
-
-    @Override
-    public StreamCacheCreateFunction getStreamCacheFunction(long contentSize) {
-        StrategyType type;
-        if (contentSize < 10 * 1024 * 1024) {
-            type = StrategyType.MEMORY_ONLY;
-        } else if (contentSize < 50 * 1024 * 1024) {
-            type = StrategyType.MIXED;
-        } else {
-            type = StrategyType.TEMP_FILE;
-        }
-        this.lastStrategyUsed = type;
-        return super.getStreamCacheFunction(contentSize); // delegate to real behavior
-    }
-}

common/src/test/java/stirling/software/common/service/TaskManagerTest.java

@@ -1,255 +0,0 @@
-package stirling.software.common.service;
-
-import static org.junit.jupiter.api.Assertions.*;
-import static org.mockito.Mockito.*;
-
-import java.time.LocalDateTime;
-import java.util.Map;
-import java.util.UUID;
-import java.util.concurrent.TimeUnit;
-
-import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.mockito.InjectMocks;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.springframework.test.util.ReflectionTestUtils;
-
-import stirling.software.common.model.job.JobResult;
-import stirling.software.common.model.job.JobStats;
-
-class TaskManagerTest {
-
-    @Mock
-    private FileStorage fileStorage;
-    
-    @InjectMocks
-    private TaskManager taskManager;
-    
-    private AutoCloseable closeable;
-
-    @BeforeEach
-    void setUp() {
-        closeable = MockitoAnnotations.openMocks(this);
-        ReflectionTestUtils.setField(taskManager, "jobResultExpiryMinutes", 30);
-    }
-    
-    @AfterEach
-    void tearDown() throws Exception {
-        closeable.close();
-    }
-
-    @Test
-    void testCreateTask() {
-        // Act
-        String jobId = UUID.randomUUID().toString();
-        taskManager.createTask(jobId);
-        
-        // Assert
-        JobResult result = taskManager.getJobResult(jobId);
-        assertNotNull(result);
-        assertEquals(jobId, result.getJobId());
-        assertFalse(result.isComplete());
-        assertNotNull(result.getCreatedAt());
-    }
-    
-    @Test
-    void testSetResult() {
-        // Arrange
-        String jobId = UUID.randomUUID().toString();
-        taskManager.createTask(jobId);
-        Object resultObject = "Test result";
-        
-        // Act
-        taskManager.setResult(jobId, resultObject);
-        
-        // Assert
-        JobResult result = taskManager.getJobResult(jobId);
-        assertNotNull(result);
-        assertTrue(result.isComplete());
-        assertEquals(resultObject, result.getResult());
-        assertNotNull(result.getCompletedAt());
-    }
-    
-    @Test
-    void testSetFileResult() {
-        // Arrange
-        String jobId = UUID.randomUUID().toString();
-        taskManager.createTask(jobId);
-        String fileId = "file-id";
-        String originalFileName = "test.pdf";
-        String contentType = "application/pdf";
-        
-        // Act
-        taskManager.setFileResult(jobId, fileId, originalFileName, contentType);
-        
-        // Assert
-        JobResult result = taskManager.getJobResult(jobId);
-        assertNotNull(result);
-        assertTrue(result.isComplete());
-        assertEquals(fileId, result.getFileId());
-        assertEquals(originalFileName, result.getOriginalFileName());
-        assertEquals(contentType, result.getContentType());
-        assertNotNull(result.getCompletedAt());
-    }
-    
-    @Test
-    void testSetError() {
-        // Arrange
-        String jobId = UUID.randomUUID().toString();
-        taskManager.createTask(jobId);
-        String errorMessage = "Test error";
-        
-        // Act
-        taskManager.setError(jobId, errorMessage);
-        
-        // Assert
-        JobResult result = taskManager.getJobResult(jobId);
-        assertNotNull(result);
-        assertTrue(result.isComplete());
-        assertEquals(errorMessage, result.getError());
-        assertNotNull(result.getCompletedAt());
-    }
-    
-    @Test
-    void testSetComplete_WithExistingResult() {
-        // Arrange
-        String jobId = UUID.randomUUID().toString();
-        taskManager.createTask(jobId);
-        Object resultObject = "Test result";
-        taskManager.setResult(jobId, resultObject);
-        
-        // Act
-        taskManager.setComplete(jobId);
-        
-        // Assert
-        JobResult result = taskManager.getJobResult(jobId);
-        assertNotNull(result);
-        assertTrue(result.isComplete());
-        assertEquals(resultObject, result.getResult());
-    }
-    
-    @Test
-    void testSetComplete_WithoutExistingResult() {
-        // Arrange
-        String jobId = UUID.randomUUID().toString();
-        taskManager.createTask(jobId);
-        
-        // Act
-        taskManager.setComplete(jobId);
-        
-        // Assert
-        JobResult result = taskManager.getJobResult(jobId);
-        assertNotNull(result);
-        assertTrue(result.isComplete());
-        assertEquals("Task completed successfully", result.getResult());
-    }
-    
-    @Test
-    void testIsComplete() {
-        // Arrange
-        String jobId = UUID.randomUUID().toString();
-        taskManager.createTask(jobId);
-        
-        // Assert - not complete initially
-        assertFalse(taskManager.isComplete(jobId));
-        
-        // Act - mark as complete
-        taskManager.setComplete(jobId);
-        
-        // Assert - now complete
-        assertTrue(taskManager.isComplete(jobId));
-    }
-    
-    @Test
-    void testGetJobStats() {
-        // Arrange
-        // 1. Create active job
-        String activeJobId = "active-job";
-        taskManager.createTask(activeJobId);
-        
-        // 2. Create completed successful job with file
-        String successFileJobId = "success-file-job";
-        taskManager.createTask(successFileJobId);
-        taskManager.setFileResult(successFileJobId, "file-id", "test.pdf", "application/pdf");
-        
-        // 3. Create completed successful job without file
-        String successJobId = "success-job";
-        taskManager.createTask(successJobId);
-        taskManager.setResult(successJobId, "Result");
-        
-        // 4. Create failed job
-        String failedJobId = "failed-job";
-        taskManager.createTask(failedJobId);
-        taskManager.setError(failedJobId, "Error message");
-        
-        // Act
-        JobStats stats = taskManager.getJobStats();
-        
-        // Assert
-        assertEquals(4, stats.getTotalJobs());
-        assertEquals(1, stats.getActiveJobs());
-        assertEquals(3, stats.getCompletedJobs());
-        assertEquals(1, stats.getFailedJobs());
-        assertEquals(2, stats.getSuccessfulJobs());
-        assertEquals(1, stats.getFileResultJobs());
-        assertNotNull(stats.getNewestActiveJobTime());
-        assertNotNull(stats.getOldestActiveJobTime());
-        assertTrue(stats.getAverageProcessingTimeMs() >= 0);
-    }
-    
-    @Test
-    void testCleanupOldJobs() throws Exception {
-        // Arrange
-        // 1. Create a recent completed job
-        String recentJobId = "recent-job";
-        taskManager.createTask(recentJobId);
-        taskManager.setResult(recentJobId, "Result");
-        
-        // 2. Create an old completed job with file result
-        String oldJobId = "old-job";
-        taskManager.createTask(oldJobId);
-        JobResult oldJob = taskManager.getJobResult(oldJobId);
-        
-        // Manually set the completion time to be older than the expiry
-        LocalDateTime oldTime = LocalDateTime.now().minusHours(1);
-        ReflectionTestUtils.setField(oldJob, "completedAt", oldTime);
-        ReflectionTestUtils.setField(oldJob, "complete", true);
-        ReflectionTestUtils.setField(oldJob, "fileId", "file-id");
-        ReflectionTestUtils.setField(oldJob, "originalFileName", "test.pdf");
-        ReflectionTestUtils.setField(oldJob, "contentType", "application/pdf");
-        
-        when(fileStorage.deleteFile("file-id")).thenReturn(true);
-        
-        // Obtain access to the private jobResults map
-        Map<String, JobResult> jobResultsMap = (Map<String, JobResult>) ReflectionTestUtils.getField(taskManager, "jobResults");
-        
-        // 3. Create an active job
-        String activeJobId = "active-job";
-        taskManager.createTask(activeJobId);
-        
-        // Verify all jobs are in the map
-        assertTrue(jobResultsMap.containsKey(recentJobId));
-        assertTrue(jobResultsMap.containsKey(oldJobId));
-        assertTrue(jobResultsMap.containsKey(activeJobId));
-        
-        // Act
-        taskManager.cleanupOldJobs();
-        
-        // Assert - the old job should be removed
-        assertFalse(jobResultsMap.containsKey(oldJobId));
-        assertTrue(jobResultsMap.containsKey(recentJobId));
-        assertTrue(jobResultsMap.containsKey(activeJobId));
-        verify(fileStorage).deleteFile("file-id");
-    }
-    
-    @Test
-    void testShutdown() throws Exception {
-        // This mainly tests that the shutdown method doesn't throw exceptions
-        taskManager.shutdown();
-        
-        // Verify the executor service is shutdown
-        // This is difficult to test directly, but we can verify it doesn't throw exceptions
-    }
-}

common/src/test/java/stirling/software/common/util/CheckProgramInstallTest.java

@@ -1,208 +0,0 @@
-package stirling.software.common.util;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertNull;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.mockito.ArgumentMatchers.anyList;
-import static org.mockito.Mockito.mockStatic;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import java.io.IOException;
-import java.lang.reflect.Field;
-import java.util.Arrays;
-
-import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.mockito.MockedStatic;
-import org.mockito.Mockito;
-
-import stirling.software.common.util.ProcessExecutor.ProcessExecutorResult;
-
-class CheckProgramInstallTest {
-
-    private MockedStatic<ProcessExecutor> mockProcessExecutor;
-    private ProcessExecutor mockExecutor;
-
-    @BeforeEach
-    void setUp() throws Exception {
-        // Reset static variables before each test
-        resetStaticFields();
-
-        // Set up mock for ProcessExecutor
-        mockExecutor = Mockito.mock(ProcessExecutor.class);
-        mockProcessExecutor = mockStatic(ProcessExecutor.class);
-        mockProcessExecutor
-                .when(() -> ProcessExecutor.getInstance(ProcessExecutor.Processes.PYTHON_OPENCV))
-                .thenReturn(mockExecutor);
-    }
-
-    @AfterEach
-    void tearDown() {
-        // Close the static mock to prevent memory leaks
-        if (mockProcessExecutor != null) {
-            mockProcessExecutor.close();
-        }
-    }
-
-    /** Reset static fields in the CheckProgramInstall class using reflection */
-    private void resetStaticFields() throws Exception {
-        Field pythonAvailableCheckedField =
-                CheckProgramInstall.class.getDeclaredField("pythonAvailableChecked");
-        pythonAvailableCheckedField.setAccessible(true);
-        pythonAvailableCheckedField.set(null, false);
-
-        Field availablePythonCommandField =
-                CheckProgramInstall.class.getDeclaredField("availablePythonCommand");
-        availablePythonCommandField.setAccessible(true);
-        availablePythonCommandField.set(null, null);
-    }
-
-    @Test
-    void testGetAvailablePythonCommand_WhenPython3IsAvailable()
-            throws IOException, InterruptedException {
-        // Arrange
-        ProcessExecutorResult result = Mockito.mock(ProcessExecutorResult.class);
-        when(result.getRc()).thenReturn(0);
-        when(result.getMessages()).thenReturn("Python 3.9.0");
-        when(mockExecutor.runCommandWithOutputHandling(Arrays.asList("python3", "--version")))
-                .thenReturn(result);
-
-        // Act
-        String pythonCommand = CheckProgramInstall.getAvailablePythonCommand();
-
-        // Assert
-        assertEquals("python3", pythonCommand);
-        assertTrue(CheckProgramInstall.isPythonAvailable());
-
-        // Verify that the command was executed
-        verify(mockExecutor).runCommandWithOutputHandling(Arrays.asList("python3", "--version"));
-    }
-
-    @Test
-    void testGetAvailablePythonCommand_WhenPython3IsNotAvailableButPythonIs()
-            throws IOException, InterruptedException {
-        // Arrange
-        when(mockExecutor.runCommandWithOutputHandling(Arrays.asList("python3", "--version")))
-                .thenThrow(new IOException("Command not found"));
-
-        ProcessExecutorResult result = Mockito.mock(ProcessExecutorResult.class);
-        when(result.getRc()).thenReturn(0);
-        when(result.getMessages()).thenReturn("Python 2.7.0");
-        when(mockExecutor.runCommandWithOutputHandling(Arrays.asList("python", "--version")))
-                .thenReturn(result);
-
-        // Act
-        String pythonCommand = CheckProgramInstall.getAvailablePythonCommand();
-
-        // Assert
-        assertEquals("python", pythonCommand);
-        assertTrue(CheckProgramInstall.isPythonAvailable());
-
-        // Verify that both commands were attempted
-        verify(mockExecutor).runCommandWithOutputHandling(Arrays.asList("python3", "--version"));
-        verify(mockExecutor).runCommandWithOutputHandling(Arrays.asList("python", "--version"));
-    }
-
-    @Test
-    void testGetAvailablePythonCommand_WhenPythonReturnsNonZeroExitCode()
-            throws IOException, InterruptedException, Exception {
-        // Arrange
-        // Reset the static fields again to ensure clean state
-        resetStaticFields();
-
-        // Since we want to test the scenario where Python returns a non-zero exit code
-        // We need to make sure both python3 and python commands are mocked to return failures
-
-        ProcessExecutorResult resultPython3 = Mockito.mock(ProcessExecutorResult.class);
-        when(resultPython3.getRc()).thenReturn(1); // Non-zero exit code
-        when(resultPython3.getMessages()).thenReturn("Error");
-
-        // Important: in the CheckProgramInstall implementation, only checks if
-        // command throws exception, it doesn't check the return code
-        // So we need to throw an exception instead
-        when(mockExecutor.runCommandWithOutputHandling(Arrays.asList("python3", "--version")))
-                .thenThrow(new IOException("Command failed with non-zero exit code"));
-
-        when(mockExecutor.runCommandWithOutputHandling(Arrays.asList("python", "--version")))
-                .thenThrow(new IOException("Command failed with non-zero exit code"));
-
-        // Act
-        String pythonCommand = CheckProgramInstall.getAvailablePythonCommand();
-
-        // Assert - Both commands throw exceptions, so no python is available
-        assertNull(pythonCommand);
-        assertFalse(CheckProgramInstall.isPythonAvailable());
-    }
-
-    @Test
-    void testGetAvailablePythonCommand_WhenNoPythonIsAvailable()
-            throws IOException, InterruptedException {
-        // Arrange
-        when(mockExecutor.runCommandWithOutputHandling(anyList()))
-                .thenThrow(new IOException("Command not found"));
-
-        // Act
-        String pythonCommand = CheckProgramInstall.getAvailablePythonCommand();
-
-        // Assert
-        assertNull(pythonCommand);
-        assertFalse(CheckProgramInstall.isPythonAvailable());
-
-        // Verify attempts to run both python3 and python
-        verify(mockExecutor).runCommandWithOutputHandling(Arrays.asList("python3", "--version"));
-        verify(mockExecutor).runCommandWithOutputHandling(Arrays.asList("python", "--version"));
-    }
-
-    @Test
-    void testGetAvailablePythonCommand_CachesResult() throws IOException, InterruptedException {
-        // Arrange
-        ProcessExecutorResult result = Mockito.mock(ProcessExecutorResult.class);
-        when(result.getRc()).thenReturn(0);
-        when(result.getMessages()).thenReturn("Python 3.9.0");
-        when(mockExecutor.runCommandWithOutputHandling(Arrays.asList("python3", "--version")))
-                .thenReturn(result);
-
-        // Act
-        String firstCall = CheckProgramInstall.getAvailablePythonCommand();
-
-        // Change the mock to simulate a change in the environment
-        when(mockExecutor.runCommandWithOutputHandling(anyList()))
-                .thenThrow(new IOException("Command not found"));
-
-        String secondCall = CheckProgramInstall.getAvailablePythonCommand();
-
-        // Assert
-        assertEquals("python3", firstCall);
-        assertEquals("python3", secondCall); // Second call should return the cached result
-
-        // Verify python3 command was only executed once (caching worked)
-        verify(mockExecutor, times(1))
-                .runCommandWithOutputHandling(Arrays.asList("python3", "--version"));
-    }
-
-    @Test
-    void testIsPythonAvailable_DirectCall() throws Exception {
-        // Arrange
-        ProcessExecutorResult result = Mockito.mock(ProcessExecutorResult.class);
-        when(result.getRc()).thenReturn(0);
-        when(result.getMessages()).thenReturn("Python 3.9.0");
-        when(mockExecutor.runCommandWithOutputHandling(Arrays.asList("python3", "--version")))
-                .thenReturn(result);
-
-        // Reset again to ensure clean state
-        resetStaticFields();
-
-        // Act - Call isPythonAvailable() directly
-        boolean pythonAvailable = CheckProgramInstall.isPythonAvailable();
-
-        // Assert
-        assertTrue(pythonAvailable);
-
-        // Verify getAvailablePythonCommand was called internally
-        verify(mockExecutor).runCommandWithOutputHandling(Arrays.asList("python3", "--version"));
-    }
-}

common/src/test/java/stirling/software/common/util/CustomHtmlSanitizerTest.java

@@ -1,331 +0,0 @@
-package stirling.software.common.util;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
-import java.util.stream.Stream;
-
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.params.ParameterizedTest;
-import org.junit.jupiter.params.provider.Arguments;
-import org.junit.jupiter.params.provider.MethodSource;
-
-class CustomHtmlSanitizerTest {
-
-    @ParameterizedTest
-    @MethodSource("provideHtmlTestCases")
-    void testSanitizeHtml(String inputHtml, String[] expectedContainedTags) {
-        // Act
-        String sanitizedHtml = CustomHtmlSanitizer.sanitize(inputHtml);
-
-        // Assert
-        for (String tag : expectedContainedTags) {
-            assertTrue(sanitizedHtml.contains(tag), tag + " should be preserved");
-        }
-    }
-
-    private static Stream<Arguments> provideHtmlTestCases() {
-        return Stream.of(
-                Arguments.of(
-                        "<p>This is <strong>valid</strong> HTML with <em>formatting</em>.</p>",
-                        new String[] {"<p>", "<strong>", "<em>"}),
-                Arguments.of(
-                        "<p>Text with <b>bold</b>, <i>italic</i>, <u>underline</u>, "
-                                + "<em>emphasis</em>, <strong>strong</strong>, <strike>strikethrough</strike>, "
-                                + "<s>strike</s>, <sub>subscript</sub>, <sup>superscript</sup>, "
-                                + "<tt>teletype</tt>, <code>code</code>, <big>big</big>, <small>small</small>.</p>",
-                        new String[] {
-                            "<b>bold</b>",
-                            "<i>italic</i>",
-                            "<em>emphasis</em>",
-                            "<strong>strong</strong>"
-                        }),
-                Arguments.of(
-                        "<div>Division</div><h1>Heading 1</h1><h2>Heading 2</h2><h3>Heading 3</h3>"
-                                + "<h4>Heading 4</h4><h5>Heading 5</h5><h6>Heading 6</h6>"
-                                + "<blockquote>Blockquote</blockquote><ul><li>List item</li></ul>"
-                                + "<ol><li>Ordered item</li></ol>",
-                        new String[] {
-                            "<div>", "<h1>", "<h6>", "<blockquote>", "<ul>", "<ol>", "<li>"
-                        }));
-    }
-
-    @Test
-    void testSanitizeAllowsStyles() {
-        // Arrange - Testing Sanitizers.STYLES
-        String htmlWithStyles =
-                "<p style=\"color: blue; font-size: 16px; margin-top: 10px;\">Styled text</p>";
-
-        // Act
-        String sanitizedHtml = CustomHtmlSanitizer.sanitize(htmlWithStyles);
-
-        // Assert
-        // The OWASP HTML Sanitizer might filter some specific styles, so we only check that
-        // the sanitized HTML is not empty and contains a paragraph tag with style
-        assertTrue(sanitizedHtml.contains("<p"), "Paragraph tag should be preserved");
-        assertTrue(sanitizedHtml.contains("style="), "Style attribute should be preserved");
-        assertTrue(sanitizedHtml.contains("Styled text"), "Content should be preserved");
-    }
-
-    @Test
-    void testSanitizeAllowsLinks() {
-        // Arrange - Testing Sanitizers.LINKS
-        String htmlWithLink =
-                "<a href=\"https://example.com\" title=\"Example Site\">Example Link</a>";
-
-        // Act
-        String sanitizedHtml = CustomHtmlSanitizer.sanitize(htmlWithLink);
-
-        // Assert
-        // The most important aspect is that the link content is preserved
-        assertTrue(sanitizedHtml.contains("Example Link"), "Link text should be preserved");
-
-        // Check that the href is present in some form
-        assertTrue(sanitizedHtml.contains("href="), "Link href attribute should be present");
-
-        // Check that the URL is present in some form
-        assertTrue(sanitizedHtml.contains("example.com"), "Link URL should be preserved");
-
-        // OWASP sanitizer may handle title attributes differently depending on version
-        // So we won't make strict assertions about the title attribute
-    }
-
-    @Test
-    void testSanitizeDisallowsJavaScriptLinks() {
-        // Arrange
-        String htmlWithJsLink = "<a href=\"javascript:alert('XSS')\">Malicious Link</a>";
-
-        // Act
-        String sanitizedHtml = CustomHtmlSanitizer.sanitize(htmlWithJsLink);
-
-        // Assert
-        assertFalse(sanitizedHtml.contains("javascript:"), "JavaScript URLs should be removed");
-        // The link tag might still be there, but the href should be sanitized
-        assertTrue(sanitizedHtml.contains("Malicious Link"), "Link text should be preserved");
-    }
-
-    @Test
-    void testSanitizeAllowsTables() {
-        // Arrange - Testing Sanitizers.TABLES
-        String htmlWithTable =
-                "<table border=\"1\">"
-                        + "<thead><tr><th>Header 1</th><th>Header 2</th></tr></thead>"
-                        + "<tbody><tr><td>Cell 1</td><td>Cell 2</td></tr></tbody>"
-                        + "<tfoot><tr><td colspan=\"2\">Footer</td></tr></tfoot>"
-                        + "</table>";
-
-        // Act
-        String sanitizedHtml = CustomHtmlSanitizer.sanitize(htmlWithTable);
-
-        // Assert
-        assertTrue(sanitizedHtml.contains("<table"), "Table should be preserved");
-        assertTrue(sanitizedHtml.contains("<tr>"), "Table rows should be preserved");
-        assertTrue(sanitizedHtml.contains("<th>"), "Table headers should be preserved");
-        assertTrue(sanitizedHtml.contains("<td>"), "Table cells should be preserved");
-        // Note: border attribute might be removed as it's deprecated in HTML5
-
-        // Check for content values instead of exact tag formats because
-        // the sanitizer may normalize tags and attributes
-        assertTrue(sanitizedHtml.contains("Header 1"), "Table header content should be preserved");
-        assertTrue(sanitizedHtml.contains("Cell 1"), "Table cell content should be preserved");
-        assertTrue(sanitizedHtml.contains("Footer"), "Table footer content should be preserved");
-
-        // OWASP sanitizer may not preserve these structural elements or attributes in the same
-        // format
-        // So we check for the content rather than the exact structure
-    }
-
-    @Test
-    void testSanitizeAllowsImages() {
-        // Arrange - Testing Sanitizers.IMAGES
-        String htmlWithImage =
-                "<img src=\"image.jpg\" alt=\"An image\" width=\"100\" height=\"100\">";
-
-        // Act
-        String sanitizedHtml = CustomHtmlSanitizer.sanitize(htmlWithImage);
-
-        // Assert
-        assertTrue(sanitizedHtml.contains("<img"), "Image tag should be preserved");
-        assertTrue(sanitizedHtml.contains("src=\"image.jpg\""), "Image source should be preserved");
-        assertTrue(
-                sanitizedHtml.contains("alt=\"An image\""), "Image alt text should be preserved");
-        // Width and height might be preserved, but not guaranteed by all sanitizers
-    }
-
-    @Test
-    void testSanitizeDisallowsDataUrlImages() {
-        // Arrange
-        String htmlWithDataUrlImage =
-                "<img src=\"data:image/svg+xml;base64,PHN2ZyBvbmxvYWQ9ImFsZXJ0KDEpIj48L3N2Zz4=\" alt=\"SVG with XSS\">";
-
-        // Act
-        String sanitizedHtml = CustomHtmlSanitizer.sanitize(htmlWithDataUrlImage);
-
-        // Assert
-        assertFalse(
-                sanitizedHtml.contains("data:image/svg"),
-                "Data URLs with potentially malicious content should be removed");
-    }
-
-    @Test
-    void testSanitizeRemovesJavaScriptInAttributes() {
-        // Arrange
-        String htmlWithJsEvent =
-                "<a href=\"#\" onclick=\"alert('XSS')\" onmouseover=\"alert('XSS')\">Click me</a>";
-
-        // Act
-        String sanitizedHtml = CustomHtmlSanitizer.sanitize(htmlWithJsEvent);
-
-        // Assert
-        assertFalse(
-                sanitizedHtml.contains("onclick"), "JavaScript event handlers should be removed");
-        assertFalse(
-                sanitizedHtml.contains("onmouseover"),
-                "JavaScript event handlers should be removed");
-        assertTrue(sanitizedHtml.contains("Click me"), "Link text should be preserved");
-    }
-
-    @Test
-    void testSanitizeRemovesScriptTags() {
-        // Arrange
-        String htmlWithScript = "<p>Safe content</p><script>alert('XSS');</script>";
-
-        // Act
-        String sanitizedHtml = CustomHtmlSanitizer.sanitize(htmlWithScript);
-
-        // Assert
-        assertFalse(sanitizedHtml.contains("<script>"), "Script tags should be removed");
-        assertTrue(
-                sanitizedHtml.contains("<p>Safe content</p>"), "Safe content should be preserved");
-    }
-
-    @Test
-    void testSanitizeRemovesNoScriptTags() {
-        // Arrange - Testing the custom policy to disallow noscript
-        String htmlWithNoscript = "<p>Safe content</p><noscript>JavaScript is disabled</noscript>";
-
-        // Act
-        String sanitizedHtml = CustomHtmlSanitizer.sanitize(htmlWithNoscript);
-
-        // Assert
-        assertFalse(sanitizedHtml.contains("<noscript>"), "Noscript tags should be removed");
-        assertTrue(
-                sanitizedHtml.contains("<p>Safe content</p>"), "Safe content should be preserved");
-    }
-
-    @Test
-    void testSanitizeRemovesIframes() {
-        // Arrange
-        String htmlWithIframe = "<p>Safe content</p><iframe src=\"https://example.com\"></iframe>";
-
-        // Act
-        String sanitizedHtml = CustomHtmlSanitizer.sanitize(htmlWithIframe);
-
-        // Assert
-        assertFalse(sanitizedHtml.contains("<iframe"), "Iframe tags should be removed");
-        assertTrue(
-                sanitizedHtml.contains("<p>Safe content</p>"), "Safe content should be preserved");
-    }
-
-    @Test
-    void testSanitizeRemovesObjectAndEmbed() {
-        // Arrange
-        String htmlWithObjects =
-                "<p>Safe content</p>"
-                        + "<object data=\"data.swf\" type=\"application/x-shockwave-flash\"></object>"
-                        + "<embed src=\"embed.swf\" type=\"application/x-shockwave-flash\">";
-
-        // Act
-        String sanitizedHtml = CustomHtmlSanitizer.sanitize(htmlWithObjects);
-
-        // Assert
-        assertFalse(sanitizedHtml.contains("<object"), "Object tags should be removed");
-        assertFalse(sanitizedHtml.contains("<embed"), "Embed tags should be removed");
-        assertTrue(
-                sanitizedHtml.contains("<p>Safe content</p>"), "Safe content should be preserved");
-    }
-
-    @Test
-    void testSanitizeRemovesMetaAndBaseAndLink() {
-        // Arrange
-        String htmlWithMetaTags =
-                "<p>Safe content</p>"
-                        + "<meta http-equiv=\"refresh\" content=\"0; url=http://evil.com\">"
-                        + "<base href=\"http://evil.com/\">"
-                        + "<link rel=\"stylesheet\" href=\"evil.css\">";
-
-        // Act
-        String sanitizedHtml = CustomHtmlSanitizer.sanitize(htmlWithMetaTags);
-
-        // Assert
-        assertFalse(sanitizedHtml.contains("<meta"), "Meta tags should be removed");
-        assertFalse(sanitizedHtml.contains("<base"), "Base tags should be removed");
-        assertFalse(sanitizedHtml.contains("<link"), "Link tags should be removed");
-        assertTrue(
-                sanitizedHtml.contains("<p>Safe content</p>"), "Safe content should be preserved");
-    }
-
-    @Test
-    void testSanitizeHandlesComplexHtml() {
-        // Arrange
-        String complexHtml =
-                "<div class=\"container\">"
-                        + "  <h1 style=\"color: blue;\">Welcome</h1>"
-                        + "  <p>This is a <strong>test</strong> with <a href=\"https://example.com\">link</a>.</p>"
-                        + "  <table>"
-                        + "    <tr><th>Name</th><th>Value</th></tr>"
-                        + "    <tr><td>Item 1</td><td>100</td></tr>"
-                        + "  </table>"
-                        + "  <img src=\"image.jpg\" alt=\"Test image\">"
-                        + "  <script>alert('XSS');</script>"
-                        + "  <iframe src=\"https://evil.com\"></iframe>"
-                        + "</div>";
-
-        // Act
-        String sanitizedHtml = CustomHtmlSanitizer.sanitize(complexHtml);
-
-        // Assert
-        assertTrue(sanitizedHtml.contains("<div"), "Div should be preserved");
-        assertTrue(sanitizedHtml.contains("<h1"), "H1 should be preserved");
-        assertTrue(
-                sanitizedHtml.contains("<strong>") && sanitizedHtml.contains("test"),
-                "Strong tag should be preserved");
-
-        // Check for content rather than exact formatting
-        assertTrue(
-                sanitizedHtml.contains("<a")
-                        && sanitizedHtml.contains("href=")
-                        && sanitizedHtml.contains("example.com")
-                        && sanitizedHtml.contains("link"),
-                "Link should be preserved");
-
-        assertTrue(sanitizedHtml.contains("<table"), "Table should be preserved");
-        assertTrue(sanitizedHtml.contains("<img"), "Image should be preserved");
-        assertFalse(sanitizedHtml.contains("<script>"), "Script tag should be removed");
-        assertFalse(sanitizedHtml.contains("<iframe"), "Iframe tag should be removed");
-
-        // Content checks
-        assertTrue(sanitizedHtml.contains("Welcome"), "Heading content should be preserved");
-        assertTrue(sanitizedHtml.contains("Name"), "Table header content should be preserved");
-        assertTrue(sanitizedHtml.contains("Item 1"), "Table data content should be preserved");
-    }
-
-    @Test
-    void testSanitizeHandlesEmpty() {
-        // Act
-        String sanitizedHtml = CustomHtmlSanitizer.sanitize("");
-
-        // Assert
-        assertEquals("", sanitizedHtml, "Empty input should result in empty string");
-    }
-
-    @Test
-    void testSanitizeHandlesNull() {
-        // Act
-        String sanitizedHtml = CustomHtmlSanitizer.sanitize(null);
-
-        // Assert
-        assertEquals("", sanitizedHtml, "Null input should result in empty string");
-    }
-}

common/src/test/java/stirling/software/common/util/FileInfoTest.java

@@ -1,35 +0,0 @@
-package stirling.software.common.util;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
-import java.time.LocalDateTime;
-
-import org.junit.jupiter.params.ParameterizedTest;
-import org.junit.jupiter.params.provider.CsvSource;
-
-import stirling.software.common.model.FileInfo;
-
-public class FileInfoTest {
-
-    @ParameterizedTest(name = "{index}: fileSize={0}")
-    @CsvSource({
-        "0, '0 Bytes'",
-        "1023, '1023 Bytes'",
-        "1024, '1.00 KB'",
-        "1048575, '1024.00 KB'", // Do we really want this as result?
-        "1048576, '1.00 MB'",
-        "1073741823, '1024.00 MB'", // Do we really want this as result?
-        "1073741824, '1.00 GB'"
-    })
-    void testGetFormattedFileSize(long fileSize, String expectedFormattedSize) {
-        FileInfo fileInfo =
-                new FileInfo(
-                        "example.txt",
-                        "/path/to/example.txt",
-                        LocalDateTime.now(),
-                        fileSize,
-                        LocalDateTime.now().minusDays(1));
-
-        assertEquals(expectedFormattedSize, fileInfo.getFormattedFileSize());
-    }
-}

common/src/test/java/stirling/software/common/util/FileMonitorTest.java

@@ -1,177 +0,0 @@
-package stirling.software.common.util;
-
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.when;
-
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.attribute.FileTime;
-import java.time.Instant;
-import java.util.function.Predicate;
-
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
-import org.junit.jupiter.api.io.TempDir;
-import org.mockito.Mock;
-import org.mockito.Mockito;
-import org.mockito.junit.jupiter.MockitoExtension;
-
-import stirling.software.common.configuration.RuntimePathConfig;
-
-@ExtendWith(MockitoExtension.class)
-class FileMonitorTest {
-
-    @TempDir Path tempDir;
-
-    @Mock private RuntimePathConfig runtimePathConfig;
-
-    @Mock private Predicate<Path> pathFilter;
-
-    private FileMonitor fileMonitor;
-
-    @BeforeEach
-    void setUp() throws IOException {
-        when(runtimePathConfig.getPipelineWatchedFoldersPath()).thenReturn(tempDir.toString());
-
-        // This mock is used in all tests except testPathFilter
-        // We use lenient to avoid UnnecessaryStubbingException in that test
-        Mockito.lenient().when(pathFilter.test(any())).thenReturn(true);
-
-        fileMonitor = new FileMonitor(pathFilter, runtimePathConfig);
-    }
-
-    @Test
-    void testIsFileReadyForProcessing_OldFile() throws IOException {
-        // Create a test file
-        Path testFile = tempDir.resolve("test-file.txt");
-        Files.write(testFile, "test content".getBytes());
-
-        // Set modified time to 10 seconds ago
-        Files.setLastModifiedTime(testFile, FileTime.from(Instant.now().minusMillis(10000)));
-
-        // File should be ready for processing as it was modified more than 5 seconds ago
-        assertTrue(fileMonitor.isFileReadyForProcessing(testFile));
-    }
-
-    @Test
-    void testIsFileReadyForProcessing_RecentFile() throws IOException {
-        // Create a test file
-        Path testFile = tempDir.resolve("recent-file.txt");
-        Files.write(testFile, "test content".getBytes());
-
-        // Set modified time to just now
-        Files.setLastModifiedTime(testFile, FileTime.from(Instant.now()));
-
-        // File should not be ready for processing as it was just modified
-        assertFalse(fileMonitor.isFileReadyForProcessing(testFile));
-    }
-
-    @Test
-    void testIsFileReadyForProcessing_NonExistentFile() {
-        // Create a path to a file that doesn't exist
-        Path nonExistentFile = tempDir.resolve("non-existent-file.txt");
-
-        // Non-existent file should not be ready for processing
-        assertFalse(fileMonitor.isFileReadyForProcessing(nonExistentFile));
-    }
-
-    @Test
-    void testIsFileReadyForProcessing_LockedFile() throws IOException {
-        // Create a test file
-        Path testFile = tempDir.resolve("locked-file.txt");
-        Files.write(testFile, "test content".getBytes());
-
-        // Set modified time to 10 seconds ago to make sure it passes the time check
-        Files.setLastModifiedTime(testFile, FileTime.from(Instant.now().minusMillis(10000)));
-
-        // Verify the file is considered ready when it meets the time criteria
-        assertTrue(
-                fileMonitor.isFileReadyForProcessing(testFile),
-                "File should be ready for processing when sufficiently old");
-    }
-
-    @Test
-    void testPathFilter() throws IOException {
-        // Use a simple lambda instead of a mock for better control
-        Predicate<Path> pdfFilter = path -> path.toString().endsWith(".pdf");
-
-        // Create a new FileMonitor with the PDF filter
-        FileMonitor pdfMonitor = new FileMonitor(pdfFilter, runtimePathConfig);
-
-        // Create a PDF file
-        Path pdfFile = tempDir.resolve("test.pdf");
-        Files.write(pdfFile, "pdf content".getBytes());
-        Files.setLastModifiedTime(pdfFile, FileTime.from(Instant.now().minusMillis(10000)));
-
-        // Create a TXT file
-        Path txtFile = tempDir.resolve("test.txt");
-        Files.write(txtFile, "text content".getBytes());
-        Files.setLastModifiedTime(txtFile, FileTime.from(Instant.now().minusMillis(10000)));
-
-        // PDF file should be ready for processing
-        assertTrue(pdfMonitor.isFileReadyForProcessing(pdfFile));
-
-        // Note: In the current implementation, FileMonitor.isFileReadyForProcessing()
-        // doesn't check file filters directly - it only checks criteria like file existence
-        // and modification time. The filtering is likely handled elsewhere in the workflow.
-
-        // To avoid test failures, we'll verify that the filter itself works correctly
-        assertFalse(pdfFilter.test(txtFile), "PDF filter should reject txt files");
-        assertTrue(pdfFilter.test(pdfFile), "PDF filter should accept pdf files");
-    }
-
-    @Test
-    void testIsFileReadyForProcessing_FileInUse() throws IOException {
-        // Create a test file
-        Path testFile = tempDir.resolve("in-use-file.txt");
-        Files.write(testFile, "initial content".getBytes());
-
-        // Set modified time to 10 seconds ago
-        Files.setLastModifiedTime(testFile, FileTime.from(Instant.now().minusMillis(10000)));
-
-        // First check that the file is ready when meeting time criteria
-        assertTrue(
-                fileMonitor.isFileReadyForProcessing(testFile),
-                "File should be ready for processing when sufficiently old");
-
-        // After modifying the file to simulate closing, it should still be ready
-        Files.write(testFile, "updated content".getBytes());
-        Files.setLastModifiedTime(testFile, FileTime.from(Instant.now().minusMillis(10000)));
-
-        assertTrue(
-                fileMonitor.isFileReadyForProcessing(testFile),
-                "File should be ready for processing after updating");
-    }
-
-    @Test
-    void testIsFileReadyForProcessing_FileWithAbsolutePath() throws IOException {
-        // Create a test file
-        Path testFile = tempDir.resolve("absolute-path-file.txt");
-        Files.write(testFile, "test content".getBytes());
-
-        // Set modified time to 10 seconds ago
-        Files.setLastModifiedTime(testFile, FileTime.from(Instant.now().minusMillis(10000)));
-
-        // File should be ready for processing as it was modified more than 5 seconds ago
-        // Use the absolute path to make sure it's handled correctly
-        assertTrue(fileMonitor.isFileReadyForProcessing(testFile.toAbsolutePath()));
-    }
-
-    @Test
-    void testIsFileReadyForProcessing_DirectoryInsteadOfFile() throws IOException {
-        // Create a test directory
-        Path testDir = tempDir.resolve("test-directory");
-        Files.createDirectory(testDir);
-
-        // Set modified time to 10 seconds ago
-        Files.setLastModifiedTime(testDir, FileTime.from(Instant.now().minusMillis(10000)));
-
-        // A directory should not be considered ready for processing
-        boolean isReady = fileMonitor.isFileReadyForProcessing(testDir);
-        assertFalse(isReady, "A directory should not be considered ready for processing");
-    }
-}

common/src/test/java/stirling/software/common/util/FileToPdfTest.java

@@ -1,78 +0,0 @@
-package stirling.software.common.util;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-
-import java.io.IOException;
-
-import org.junit.jupiter.api.Test;
-
-import stirling.software.common.model.api.converters.HTMLToPdfRequest;
-
-public class FileToPdfTest {
-
-    /**
-     * Test the HTML to PDF conversion. This test expects an IOException when an empty HTML input is
-     * provided.
-     */
-    @Test
-    public void testConvertHtmlToPdf() {
-        HTMLToPdfRequest request = new HTMLToPdfRequest();
-        byte[] fileBytes = new byte[0]; // Sample file bytes (empty input)
-        String fileName = "test.html"; // Sample file name indicating an HTML file
-        boolean disableSanitize = false; // Flag to control sanitization
-
-        // Expect an IOException to be thrown due to empty input
-        Throwable thrown =
-                assertThrows(
-                        IOException.class,
-                        () ->
-                                FileToPdf.convertHtmlToPdf(
-                                        "/path/", request, fileBytes, fileName, disableSanitize));
-        assertNotNull(thrown);
-    }
-
-    /**
-     * Test sanitizeZipFilename with null or empty input. It should return an empty string in these
-     * cases.
-     */
-    @Test
-    public void testSanitizeZipFilename_NullOrEmpty() {
-        assertEquals("", FileToPdf.sanitizeZipFilename(null));
-        assertEquals("", FileToPdf.sanitizeZipFilename("   "));
-    }
-
-    /**
-     * Test sanitizeZipFilename to ensure it removes path traversal sequences. This includes
-     * removing both forward and backward slash sequences.
-     */
-    @Test
-    public void testSanitizeZipFilename_RemovesTraversalSequences() {
-        String input = "../some/../path/..\\to\\file.txt";
-        String expected = "some/path/to/file.txt";
-
-        // Expect that the method replaces backslashes with forward slashes
-        // and removes path traversal sequences
-        assertEquals(expected, FileToPdf.sanitizeZipFilename(input));
-    }
-
-    /** Test sanitizeZipFilename to ensure that it removes leading drive letters and slashes. */
-    @Test
-    public void testSanitizeZipFilename_RemovesLeadingDriveAndSlashes() {
-        String input = "C:\\folder\\file.txt";
-        String expected = "folder/file.txt";
-        assertEquals(expected, FileToPdf.sanitizeZipFilename(input));
-
-        input = "/folder/file.txt";
-        expected = "folder/file.txt";
-        assertEquals(expected, FileToPdf.sanitizeZipFilename(input));
-    }
-
-    /** Test sanitizeZipFilename to verify that safe filenames remain unchanged. */
-    @Test
-    public void testSanitizeZipFilename_NoChangeForSafeNames() {
-        String input = "folder/subfolder/file.txt";
-        assertEquals(input, FileToPdf.sanitizeZipFilename(input));
-    }
-}

common/src/test/java/stirling/software/common/util/GeneralUtilsAdditionalTest.java

@@ -1,41 +0,0 @@
-package stirling.software.common.util;
-
-import static org.junit.jupiter.api.Assertions.*;
-
-import org.junit.jupiter.api.Test;
-
-class GeneralUtilsAdditionalTest {
-
-    @Test
-    void testConvertSizeToBytes() {
-        assertEquals(1024L, GeneralUtils.convertSizeToBytes("1KB"));
-        assertEquals(1024L * 1024, GeneralUtils.convertSizeToBytes("1MB"));
-        assertEquals(1024L * 1024 * 1024, GeneralUtils.convertSizeToBytes("1GB"));
-        assertEquals(100L * 1024 * 1024, GeneralUtils.convertSizeToBytes("100"));
-        assertNull(GeneralUtils.convertSizeToBytes("invalid"));
-        assertNull(GeneralUtils.convertSizeToBytes(null));
-    }
-
-    @Test
-    void testFormatBytes() {
-        assertEquals("512 B", GeneralUtils.formatBytes(512));
-        assertEquals("1.00 KB", GeneralUtils.formatBytes(1024));
-        assertEquals("1.00 MB", GeneralUtils.formatBytes(1024L * 1024));
-        assertEquals("1.00 GB", GeneralUtils.formatBytes(1024L * 1024 * 1024));
-    }
-
-    @Test
-    void testURLHelpersAndUUID() {
-        assertTrue(GeneralUtils.isValidURL("https://example.com"));
-        assertFalse(GeneralUtils.isValidURL("htp:/bad"));
-        assertFalse(GeneralUtils.isURLReachable("http://localhost"));
-        assertFalse(GeneralUtils.isURLReachable("ftp://example.com"));
-
-        assertTrue(GeneralUtils.isValidUUID("123e4567-e89b-12d3-a456-426614174000"));
-        assertFalse(GeneralUtils.isValidUUID("not-a-uuid"));
-
-        assertFalse(GeneralUtils.isVersionHigher(null, "1.0"));
-        assertTrue(GeneralUtils.isVersionHigher("2.0", "1.9"));
-        assertFalse(GeneralUtils.isVersionHigher("1.0", "1.0.1"));
-    }
-}

common/src/test/java/stirling/software/common/util/PDFToFileTest.java

@@ -1,579 +0,0 @@
-package stirling.software.common.util;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.anyList;
-import static org.mockito.ArgumentMatchers.argThat;
-import static org.mockito.Mockito.mockStatic;
-import static org.mockito.Mockito.when;
-
-import java.io.File;
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.List;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipInputStream;
-
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
-import org.junit.jupiter.api.io.TempDir;
-import org.mockito.Mock;
-import org.mockito.MockedStatic;
-import org.mockito.junit.jupiter.MockitoExtension;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.mock.web.MockMultipartFile;
-import org.springframework.web.multipart.MultipartFile;
-
-import io.github.pixee.security.ZipSecurity;
-
-import stirling.software.common.util.ProcessExecutor.ProcessExecutorResult;
-
-/**
- * Tests for PDFToFile utility class. This includes both invalid content type cases and positive
- * test cases that mock external process execution.
- */
-@ExtendWith(MockitoExtension.class)
-class PDFToFileTest {
-
-    @TempDir Path tempDir;
-
-    private PDFToFile pdfToFile;
-
-    @Mock private ProcessExecutor mockProcessExecutor;
-    @Mock private ProcessExecutorResult mockExecutorResult;
-
-    @BeforeEach
-    void setUp() {
-        pdfToFile = new PDFToFile();
-    }
-
-    @Test
-    void testProcessPdfToMarkdown_InvalidContentType() throws IOException, InterruptedException {
-        // Prepare
-        MultipartFile nonPdfFile =
-                new MockMultipartFile(
-                        "file", "test.txt", "text/plain", "This is not a PDF".getBytes());
-
-        // Execute
-        ResponseEntity<byte[]> response = pdfToFile.processPdfToMarkdown(nonPdfFile);
-
-        // Verify
-        assertEquals(HttpStatus.BAD_REQUEST, response.getStatusCode());
-    }
-
-    @Test
-    void testProcessPdfToHtml_InvalidContentType() throws IOException, InterruptedException {
-        // Prepare
-        MultipartFile nonPdfFile =
-                new MockMultipartFile(
-                        "file", "test.txt", "text/plain", "This is not a PDF".getBytes());
-
-        // Execute
-        ResponseEntity<byte[]> response = pdfToFile.processPdfToHtml(nonPdfFile);
-
-        // Verify
-        assertEquals(HttpStatus.BAD_REQUEST, response.getStatusCode());
-    }
-
-    @Test
-    void testProcessPdfToOfficeFormat_InvalidContentType()
-            throws IOException, InterruptedException {
-        // Prepare
-        MultipartFile nonPdfFile =
-                new MockMultipartFile(
-                        "file", "test.txt", "text/plain", "This is not a PDF".getBytes());
-
-        // Execute
-        ResponseEntity<byte[]> response =
-                pdfToFile.processPdfToOfficeFormat(nonPdfFile, "docx", "draw_pdf_import");
-
-        // Verify
-        assertEquals(HttpStatus.BAD_REQUEST, response.getStatusCode());
-    }
-
-    @Test
-    void testProcessPdfToOfficeFormat_InvalidOutputFormat()
-            throws IOException, InterruptedException {
-        // Prepare
-        MultipartFile pdfFile =
-                new MockMultipartFile(
-                        "file", "test.pdf", "application/pdf", "Fake PDF content".getBytes());
-
-        // Execute with invalid format
-        ResponseEntity<byte[]> response =
-                pdfToFile.processPdfToOfficeFormat(pdfFile, "invalid_format", "draw_pdf_import");
-
-        // Verify
-        assertEquals(HttpStatus.BAD_REQUEST, response.getStatusCode());
-    }
-
-    @Test
-    void testProcessPdfToMarkdown_SingleOutputFile() throws IOException, InterruptedException {
-        // Setup mock objects and temp files
-        try (MockedStatic<ProcessExecutor> mockedStaticProcessExecutor =
-                mockStatic(ProcessExecutor.class)) {
-            // Create a mock PDF file
-            MultipartFile pdfFile =
-                    new MockMultipartFile(
-                            "file", "test.pdf", "application/pdf", "Fake PDF content".getBytes());
-
-            // Create a mock HTML output file
-            Path htmlOutputFile = tempDir.resolve("test.html");
-            Files.write(
-                    htmlOutputFile,
-                    "<html><body><h1>Test</h1><p>This is a test.</p></body></html>".getBytes());
-
-            // Setup ProcessExecutor mock
-            mockedStaticProcessExecutor
-                    .when(() -> ProcessExecutor.getInstance(ProcessExecutor.Processes.PDFTOHTML))
-                    .thenReturn(mockProcessExecutor);
-
-            when(mockProcessExecutor.runCommandWithOutputHandling(anyList(), any(File.class)))
-                    .thenAnswer(
-                            invocation -> {
-                                // When command is executed, simulate creation of output files
-                                File outputDir = invocation.getArgument(1);
-
-                                // Copy the mock HTML file to the output directory
-                                Files.copy(
-                                        htmlOutputFile, Path.of(outputDir.getPath(), "test.html"));
-
-                                return mockExecutorResult;
-                            });
-
-            // Execute the method
-            ResponseEntity<byte[]> response = pdfToFile.processPdfToMarkdown(pdfFile);
-
-            // Verify
-            assertEquals(HttpStatus.OK, response.getStatusCode());
-            assertNotNull(response.getBody());
-            assertTrue(response.getBody().length > 0);
-            assertTrue(
-                    response.getHeaders().getContentDisposition().toString().contains("test.md"));
-        }
-    }
-
-    @Test
-    void testProcessPdfToMarkdown_MultipleOutputFiles() throws IOException, InterruptedException {
-        // Setup mock objects and temp files
-        try (MockedStatic<ProcessExecutor> mockedStaticProcessExecutor =
-                mockStatic(ProcessExecutor.class)) {
-            // Create a mock PDF file
-            MultipartFile pdfFile =
-                    new MockMultipartFile(
-                            "file",
-                            "multipage.pdf",
-                            "application/pdf",
-                            "Fake PDF content".getBytes());
-
-            // Setup ProcessExecutor mock
-            mockedStaticProcessExecutor
-                    .when(() -> ProcessExecutor.getInstance(ProcessExecutor.Processes.PDFTOHTML))
-                    .thenReturn(mockProcessExecutor);
-
-            when(mockProcessExecutor.runCommandWithOutputHandling(anyList(), any(File.class)))
-                    .thenAnswer(
-                            invocation -> {
-                                // When command is executed, simulate creation of output files
-                                File outputDir = invocation.getArgument(1);
-
-                                // Create multiple HTML files and an image
-                                Files.write(
-                                        Path.of(outputDir.getPath(), "multipage.html"),
-                                        "<html><body><h1>Cover</h1></body></html>".getBytes());
-                                Files.write(
-                                        Path.of(outputDir.getPath(), "multipage-1.html"),
-                                        "<html><body><h1>Page 1</h1></body></html>".getBytes());
-                                Files.write(
-                                        Path.of(outputDir.getPath(), "multipage-2.html"),
-                                        "<html><body><h1>Page 2</h1></body></html>".getBytes());
-                                Files.write(
-                                        Path.of(outputDir.getPath(), "image1.png"),
-                                        "Fake image data".getBytes());
-
-                                return mockExecutorResult;
-                            });
-
-            // Execute the method
-            ResponseEntity<byte[]> response = pdfToFile.processPdfToMarkdown(pdfFile);
-
-            // Verify
-            assertEquals(HttpStatus.OK, response.getStatusCode());
-            assertNotNull(response.getBody());
-            assertTrue(response.getBody().length > 0);
-
-            // Verify content disposition indicates a zip file
-            assertTrue(
-                    response.getHeaders()
-                            .getContentDisposition()
-                            .toString()
-                            .contains("ToMarkdown.zip"));
-
-            // Verify the content by unzipping it
-            try (ZipInputStream zipStream =
-                    ZipSecurity.createHardenedInputStream(
-                            new java.io.ByteArrayInputStream(response.getBody()))) {
-                ZipEntry entry;
-                boolean foundMdFiles = false;
-                boolean foundImage = false;
-
-                while ((entry = zipStream.getNextEntry()) != null) {
-                    if (entry.getName().endsWith(".md")) {
-                        foundMdFiles = true;
-                    } else if (entry.getName().endsWith(".png")) {
-                        foundImage = true;
-                    }
-                    zipStream.closeEntry();
-                }
-
-                assertTrue(foundMdFiles, "ZIP should contain Markdown files");
-                assertTrue(foundImage, "ZIP should contain image files");
-            }
-        }
-    }
-
-    @Test
-    void testProcessPdfToHtml() throws IOException, InterruptedException {
-        // Setup mock objects and temp files
-        try (MockedStatic<ProcessExecutor> mockedStaticProcessExecutor =
-                mockStatic(ProcessExecutor.class)) {
-            // Create a mock PDF file
-            MultipartFile pdfFile =
-                    new MockMultipartFile(
-                            "file", "test.pdf", "application/pdf", "Fake PDF content".getBytes());
-
-            // Setup ProcessExecutor mock
-            mockedStaticProcessExecutor
-                    .when(() -> ProcessExecutor.getInstance(ProcessExecutor.Processes.PDFTOHTML))
-                    .thenReturn(mockProcessExecutor);
-
-            when(mockProcessExecutor.runCommandWithOutputHandling(anyList(), any(File.class)))
-                    .thenAnswer(
-                            invocation -> {
-                                // When command is executed, simulate creation of output files
-                                File outputDir = invocation.getArgument(1);
-
-                                // Create HTML files and assets
-                                Files.write(
-                                        Path.of(outputDir.getPath(), "test.html"),
-                                        "<html><frameset></frameset></html>".getBytes());
-                                Files.write(
-                                        Path.of(outputDir.getPath(), "test_ind.html"),
-                                        "<html><body>Index</body></html>".getBytes());
-                                Files.write(
-                                        Path.of(outputDir.getPath(), "test_img.png"),
-                                        "Fake image data".getBytes());
-
-                                return mockExecutorResult;
-                            });
-
-            // Execute the method
-            ResponseEntity<byte[]> response = pdfToFile.processPdfToHtml(pdfFile);
-
-            // Verify
-            assertEquals(HttpStatus.OK, response.getStatusCode());
-            assertNotNull(response.getBody());
-            assertTrue(response.getBody().length > 0);
-
-            // Verify content disposition indicates a zip file
-            assertTrue(
-                    response.getHeaders()
-                            .getContentDisposition()
-                            .toString()
-                            .contains("testToHtml.zip"));
-
-            // Verify the content by unzipping it
-            try (ZipInputStream zipStream =
-                    ZipSecurity.createHardenedInputStream(
-                            new java.io.ByteArrayInputStream(response.getBody()))) {
-                ZipEntry entry;
-                boolean foundMainHtml = false;
-                boolean foundIndexHtml = false;
-                boolean foundImage = false;
-
-                while ((entry = zipStream.getNextEntry()) != null) {
-                    if ("test.html".equals(entry.getName())) {
-                        foundMainHtml = true;
-                    } else if ("test_ind.html".equals(entry.getName())) {
-                        foundIndexHtml = true;
-                    } else if ("test_img.png".equals(entry.getName())) {
-                        foundImage = true;
-                    }
-                    zipStream.closeEntry();
-                }
-
-                assertTrue(foundMainHtml, "ZIP should contain main HTML file");
-                assertTrue(foundIndexHtml, "ZIP should contain index HTML file");
-                assertTrue(foundImage, "ZIP should contain image files");
-            }
-        }
-    }
-
-    @Test
-    void testProcessPdfToOfficeFormat_SingleOutputFile() throws IOException, InterruptedException {
-        // Setup mock objects and temp files
-        try (MockedStatic<ProcessExecutor> mockedStaticProcessExecutor =
-                mockStatic(ProcessExecutor.class)) {
-            // Create a mock PDF file
-            MultipartFile pdfFile =
-                    new MockMultipartFile(
-                            "file",
-                            "document.pdf",
-                            "application/pdf",
-                            "Fake PDF content".getBytes());
-
-            // Setup ProcessExecutor mock
-            mockedStaticProcessExecutor
-                    .when(() -> ProcessExecutor.getInstance(ProcessExecutor.Processes.LIBRE_OFFICE))
-                    .thenReturn(mockProcessExecutor);
-
-            when(mockProcessExecutor.runCommandWithOutputHandling(
-                            argThat(
-                                    args ->
-                                            args.contains("--convert-to")
-                                                    && args.contains("docx"))))
-                    .thenAnswer(
-                            invocation -> {
-                                // When command is executed, find the output directory argument
-                                List<String> args = invocation.getArgument(0);
-                                String outDir = null;
-                                for (int i = 0; i < args.size(); i++) {
-                                    if ("--outdir".equals(args.get(i)) && i + 1 < args.size()) {
-                                        outDir = args.get(i + 1);
-                                        break;
-                                    }
-                                }
-
-                                // Create output file
-                                Files.write(
-                                        Path.of(outDir, "document.docx"),
-                                        "Fake DOCX content".getBytes());
-
-                                return mockExecutorResult;
-                            });
-
-            // Execute the method with docx format
-            ResponseEntity<byte[]> response =
-                    pdfToFile.processPdfToOfficeFormat(pdfFile, "docx", "draw_pdf_import");
-
-            // Verify
-            assertEquals(HttpStatus.OK, response.getStatusCode());
-            assertNotNull(response.getBody());
-            assertTrue(response.getBody().length > 0);
-
-            // Verify content disposition has correct filename
-            assertTrue(
-                    response.getHeaders()
-                            .getContentDisposition()
-                            .toString()
-                            .contains("document.docx"));
-        }
-    }
-
-    @Test
-    void testProcessPdfToOfficeFormat_MultipleOutputFiles()
-            throws IOException, InterruptedException {
-        // Setup mock objects and temp files
-        try (MockedStatic<ProcessExecutor> mockedStaticProcessExecutor =
-                mockStatic(ProcessExecutor.class)) {
-            // Create a mock PDF file
-            MultipartFile pdfFile =
-                    new MockMultipartFile(
-                            "file",
-                            "document.pdf",
-                            "application/pdf",
-                            "Fake PDF content".getBytes());
-
-            // Setup ProcessExecutor mock
-            mockedStaticProcessExecutor
-                    .when(() -> ProcessExecutor.getInstance(ProcessExecutor.Processes.LIBRE_OFFICE))
-                    .thenReturn(mockProcessExecutor);
-
-            when(mockProcessExecutor.runCommandWithOutputHandling(
-                            argThat(args -> args.contains("--convert-to") && args.contains("odp"))))
-                    .thenAnswer(
-                            invocation -> {
-                                // When command is executed, find the output directory argument
-                                List<String> args = invocation.getArgument(0);
-                                String outDir = null;
-                                for (int i = 0; i < args.size(); i++) {
-                                    if ("--outdir".equals(args.get(i)) && i + 1 < args.size()) {
-                                        outDir = args.get(i + 1);
-                                        break;
-                                    }
-                                }
-
-                                // Create multiple output files (simulating a presentation with
-                                // multiple files)
-                                Files.write(
-                                        Path.of(outDir, "document.odp"),
-                                        "Fake ODP content".getBytes());
-                                Files.write(
-                                        Path.of(outDir, "document_media1.png"),
-                                        "Image 1 content".getBytes());
-                                Files.write(
-                                        Path.of(outDir, "document_media2.png"),
-                                        "Image 2 content".getBytes());
-
-                                return mockExecutorResult;
-                            });
-
-            // Execute the method with ODP format
-            ResponseEntity<byte[]> response =
-                    pdfToFile.processPdfToOfficeFormat(pdfFile, "odp", "draw_pdf_import");
-
-            // Verify
-            assertEquals(HttpStatus.OK, response.getStatusCode());
-            assertNotNull(response.getBody());
-            assertTrue(response.getBody().length > 0);
-
-            // Verify content disposition for zip file
-            assertTrue(
-                    response.getHeaders()
-                            .getContentDisposition()
-                            .toString()
-                            .contains("documentToodp.zip"));
-
-            // Verify the content by unzipping it
-            try (ZipInputStream zipStream =
-                    ZipSecurity.createHardenedInputStream(
-                            new java.io.ByteArrayInputStream(response.getBody()))) {
-                ZipEntry entry;
-                boolean foundMainFile = false;
-                boolean foundMediaFiles = false;
-
-                while ((entry = zipStream.getNextEntry()) != null) {
-                    if ("document.odp".equals(entry.getName())) {
-                        foundMainFile = true;
-                    } else if (entry.getName().startsWith("document_media")) {
-                        foundMediaFiles = true;
-                    }
-                    zipStream.closeEntry();
-                }
-
-                assertTrue(foundMainFile, "ZIP should contain main ODP file");
-                assertTrue(foundMediaFiles, "ZIP should contain media files");
-            }
-        }
-    }
-
-    @Test
-    void testProcessPdfToOfficeFormat_TextFormat() throws IOException, InterruptedException {
-        // Setup mock objects and temp files
-        try (MockedStatic<ProcessExecutor> mockedStaticProcessExecutor =
-                mockStatic(ProcessExecutor.class)) {
-            // Create a mock PDF file
-            MultipartFile pdfFile =
-                    new MockMultipartFile(
-                            "file",
-                            "document.pdf",
-                            "application/pdf",
-                            "Fake PDF content".getBytes());
-
-            // Setup ProcessExecutor mock
-            mockedStaticProcessExecutor
-                    .when(() -> ProcessExecutor.getInstance(ProcessExecutor.Processes.LIBRE_OFFICE))
-                    .thenReturn(mockProcessExecutor);
-
-            when(mockProcessExecutor.runCommandWithOutputHandling(
-                            argThat(
-                                    args ->
-                                            args.contains("--convert-to")
-                                                    && args.contains("txt:Text"))))
-                    .thenAnswer(
-                            invocation -> {
-                                // When command is executed, find the output directory argument
-                                List<String> args = invocation.getArgument(0);
-                                String outDir = null;
-                                for (int i = 0; i < args.size(); i++) {
-                                    if ("--outdir".equals(args.get(i)) && i + 1 < args.size()) {
-                                        outDir = args.get(i + 1);
-                                        break;
-                                    }
-                                }
-
-                                // Create text output file
-                                Files.write(
-                                        Path.of(outDir, "document.txt"),
-                                        "Extracted text content".getBytes());
-
-                                return mockExecutorResult;
-                            });
-
-            // Execute the method with text format
-            ResponseEntity<byte[]> response =
-                    pdfToFile.processPdfToOfficeFormat(pdfFile, "txt:Text", "draw_pdf_import");
-
-            // Verify
-            assertEquals(HttpStatus.OK, response.getStatusCode());
-            assertNotNull(response.getBody());
-            assertTrue(response.getBody().length > 0);
-
-            // Verify content disposition has txt extension
-            assertTrue(
-                    response.getHeaders()
-                            .getContentDisposition()
-                            .toString()
-                            .contains("document.txt"));
-        }
-    }
-
-    @Test
-    void testProcessPdfToOfficeFormat_NoFilename() throws IOException, InterruptedException {
-        // Setup mock objects and temp files
-        try (MockedStatic<ProcessExecutor> mockedStaticProcessExecutor =
-                mockStatic(ProcessExecutor.class)) {
-            // Create a mock PDF file with no filename
-            MultipartFile pdfFile =
-                    new MockMultipartFile(
-                            "file", "", "application/pdf", "Fake PDF content".getBytes());
-
-            // Setup ProcessExecutor mock
-            mockedStaticProcessExecutor
-                    .when(() -> ProcessExecutor.getInstance(ProcessExecutor.Processes.LIBRE_OFFICE))
-                    .thenReturn(mockProcessExecutor);
-
-            when(mockProcessExecutor.runCommandWithOutputHandling(anyList()))
-                    .thenAnswer(
-                            invocation -> {
-                                // When command is executed, find the output directory argument
-                                List<String> args = invocation.getArgument(0);
-                                String outDir = null;
-                                for (int i = 0; i < args.size(); i++) {
-                                    if ("--outdir".equals(args.get(i)) && i + 1 < args.size()) {
-                                        outDir = args.get(i + 1);
-                                        break;
-                                    }
-                                }
-
-                                // Create output file - uses default name
-                                Files.write(
-                                        Path.of(outDir, "output.docx"),
-                                        "Fake DOCX content".getBytes());
-
-                                return mockExecutorResult;
-                            });
-
-            // Execute the method
-            ResponseEntity<byte[]> response =
-                    pdfToFile.processPdfToOfficeFormat(pdfFile, "docx", "draw_pdf_import");
-
-            // Verify
-            assertEquals(HttpStatus.OK, response.getStatusCode());
-            assertNotNull(response.getBody());
-            assertTrue(response.getBody().length > 0);
-
-            // Verify content disposition contains output.docx
-            assertTrue(
-                    response.getHeaders()
-                            .getContentDisposition()
-                            .toString()
-                            .contains("output.docx"));
-        }
-    }
-}