V2 Navbar Styling

2026-09-03 13:20:08 +03:00 · 2025-07-21 16:48:24 +01:00
970 changed files with 78300 additions and 88583 deletions
@@ -0,0 +1,13 @@
+{
+  "permissions": {
+    "allow": [
+      "Bash(chmod:*)",
+      "Bash(mkdir:*)",
+      "Bash(./gradlew:*)",
+      "Bash(grep:*)",
+      "Bash(cat:*)",
+      "Bash(find:*)"
+    ],
+    "deny": []
+  }
+}
@@ -49,7 +49,7 @@
                "java.configuration.updateBuildConfiguration": "interactive",
                "java.format.enabled": true,
                "java.format.settings.profile": "GoogleStyle",
-                "java.format.settings.google.version": "1.28.0",
+                "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": [
@@ -79,17 +79,9 @@
                    ".venv*/",
                    ".vscode/",
                    "bin/",
-                    "app/core/bin/",
-                    "app/common/bin/",
-                    "app/proprietary/bin/",
                    "build/",
-                    "app/core/build/",
-                    "app/common/build/",
-                    "app/proprietary/build/",
                    "configs/",
-                    "app/core/configs/",
                    "customFiles/",
-                    "app/core/customFiles/",
                    "docs/",
                    "exampleYmlFiles",
                    "gradle/",
@@ -101,9 +93,6 @@
                    ".git-blame-ignore-revs",
                    ".gitattributes",
                    ".gitignore",
-                    "app/core/.gitignore",
-                    "app/common/.gitignore",
-                    "app/proprietary/.gitignore",
                    ".pre-commit-config.yaml"
                ],
                "java.signatureHelp.enabled": true,
@@ -24,19 +24,25 @@ indent_size = 2
 insert_final_newline = false
 trim_trailing_whitespace = false

-[{*.js,*.jsx,*.mjs,*.ts,*.tsx}]
+[*.js]
 indent_size = 2

 [*.css]
 # CSS files typically use an indent size of 2 spaces for better readability and alignment with community standards.
 indent_size = 2

-[*.{yml,yaml}]
+[*.yaml]
 # YAML files use an indent size of 2 spaces to maintain consistency with common YAML formatting practices.
 indent_size = 2
 insert_final_newline = false
 trim_trailing_whitespace = false

+[*.yml]
+# YML files follow the same conventions as YAML files, using an indent size of 2 spaces.
+indent_size = 2
+insert_final_newline = false
+trim_trailing_whitespace = false
+
 [*.json]
 # JSON files use an indent size of 2 spaces, which is the standard for JSON formatting.
 indent_size = 2
@@ -1,21 +1,2 @@
-# All PRs must be approved by Frooodle or Ludy87
-* @Frooodle @Ludy87 @jbrunton96 @ConnorYoh
-
-# Backend
-/app/** @DarioGii @Frooodle @Ludy87 @jbrunton96 @ConnorYoh
-
-#V1 frontend
-/app/core/src/main/resources/static/** @reecebrowne @ConnorYoh @EthanHealy01 @jbrunton96 @Frooodle @Ludy87
-/app/core/src/main/resources/templates/** @reecebrowne @ConnorYoh @EthanHealy01 @jbrunton96 @Frooodle @Ludy87
-
-#V2 frontend
-/frontend/** @reecebrowne @ConnorYoh @EthanHealy01 @jbrunton96 @Frooodle
-
-#V2 docker
-/docker/backend/** @Frooodle @Ludy87 @DarioGii @Ludy87
-/docker/frontend/** @reecebrowne @ConnorYoh @EthanHealy01 @jbrunton96 @Frooodle @Ludy87
-/docker/compose/** @reecebrowne @ConnorYoh @EthanHealy01 @DarioGii @jbrunton96 @Frooodle @Ludy87
-
-
-#GHA (All users)
-/.github/** @reecebrowne @ConnorYoh @EthanHealy01 @DarioGii @jbrunton96 @Frooodle @Ludy87
+# All PRs to V1 must be approved by Frooodle
+* @Frooodle @reecebrowne @Ludy87 @DarioGii @ConnorYoh
@@ -1,31 +0,0 @@
-build: &build
-  - build.gradle
-  - app/(common|core|proprietary)/build.gradle
-
-app: &app
-  - app/(common|core|proprietary)/src/main/java/**
-
-openapi: &openapi
-  - build.gradle
-  - app/(common|core|proprietary)/build.gradle
-  - app/(common|core|proprietary)/src/main/java/**
-
-project: &project
-  - app/(common|core|proprietary)/src/(main|test)/java/**
-  - app/(common|core|proprietary)/build.gradle
-  - 'app/(common|core|proprietary)/src/(main|test)/resources/**/!(messages_*.properties|*.md)*'
-  - exampleYmlFiles/**
-  - gradle/**
-  - libs/**
-  - testing/**
-  - build.gradle
-  - Dockerfile
-  - Dockerfile.fat
-  - Dockerfile.ultra-lite
-  - gradle.properties
-  - gradlew
-  - gradlew.bat
-  - launch4jConfig.xml
-  - settings.gradle
-  - frontend/**
-  - docker/**
@@ -7,7 +7,6 @@
    "sbplat",
    "reecebrowne",
    "DarioGii",
-    "ConnorYoh",
-    "EthanHealy01"
+    "ConnorYoh"
  ]
 }
@@ -46,9 +46,6 @@ labels:
  - label: 'API'
    title: '.*openapi.*|.*swagger.*|.*api.*'

-  - label: 'v2'
-    base-branch: 'V2'
-
  - label: 'Translation'
    files:
      - 'app/core/src/main/resources/messages_[a-zA-Z_]{2}_[a-zA-Z_]{2,7}.properties'
@@ -65,7 +62,6 @@ labels:
      - 'app/core/src/main/java/stirling/software/SPDF/controller/web/.*'
      - 'app/core/src/main/java/stirling/software/SPDF/UI/.*'
      - 'app/proprietary/src/main/java/stirling/software/proprietary/security/controller/web/.*'
-      - 'frontend/**'

  - label: 'Java'
    files:
@@ -80,9 +76,8 @@ labels:
      - 'app/core/src/main/resources/settings.yml.template'
      - 'app/core/src/main/resources/application.properties'
      - 'app/core/src/main/resources/banner.txt'
-      - 'app/core/src/main/resources/static/python/png_to_webp.py'
-      - 'app/core/src/main/resources/static/python/split_photos.py'
-      - 'app/core/src/main/resources/static/pipeline/defaultWebUIConfigs/**'
+      - 'scripts/png_to_webp.py'
+      - 'split_photos.py'
      - 'application.properties'

  - label: 'Security'
@@ -100,8 +95,8 @@ labels:
      - 'app/core/src/main/java/stirling/software/SPDF/model/api/.*'
      - 'app/core/src/main/java/stirling/software/SPDF/service/ApiDocService.java'
      - 'app/proprietary/src/main/java/stirling/software/proprietary/security/controller/api/.*'
-      - 'app/core/src/main/resources/static/python/png_to_webp.py'
-      - 'app/core/src/main/resources/static/python/split_photos.py'
+      - 'scripts/png_to_webp.py'
+      - 'split_photos.py'
      - '.github/workflows/swagger.yml'

  - label: 'Documentation'
@@ -124,7 +119,6 @@ labels:
      - 'scripts/installFonts.sh'
      - 'test.sh'
      - 'test2.sh'
-      - 'docker/**'

  - label: 'Devtools'
    files:
@@ -136,6 +130,7 @@ labels:
      - '.github/workflows/pre_commit.yml'
      - 'devGuide/.*'
      - 'devTools/.*'
+      - 'devTools/.*'

  - label: 'Test'
    files:
@@ -42,7 +42,6 @@
 - name: "Front End"
  color: "BBD2F1"
  description: "Issues or pull requests related to front-end development"
-  from_name: "frontend"
 - name: "github-actions"
  description: "Pull requests that update GitHub Actions code"
  color: "999999"
@@ -78,12 +77,10 @@
 - name: "Translation"
  color: "9FABF9"
  from_name: "translation"
-  description: "Issues or pull requests related to translation"
 - name: "upstream"
  color: "DEDEDE"
 - name: "v2"
  color: "FFFF00"
-  description: "Issues or pull requests related to the v2 branch"
 - name: "wontfix"
  description: "This will not be worked on"
  color: "FFFFFF"
@@ -181,6 +178,3 @@
 - name: "pr-deployed"
  color: "00FF00"
  description: "Pull request has been deployed to a test environment"
- name: "codex"
-  color: "ededed"
-  description: "chatgpt AI generated code"
@@ -3,15 +3,7 @@ name: Auto PR V2 Deployment
 on:
  pull_request:
    types: [opened, synchronize, reopened, closed]
-  workflow_dispatch:
-    inputs:
-      pr:
-        description: "PR number to deploy"
-        required: true
-      allow_fork:
-        description: "Allow deploying fork PR?"
-        required: false
-        default: "false"
+

 permissions:
  contents: read
@@ -20,93 +12,101 @@ permissions:

 jobs:
  check-pr:
-    if: (github.event_name == 'pull_request' && github.event.action != 'closed') || github.event_name == 'workflow_dispatch'
+    if: github.event.action != 'closed'
    runs-on: ubuntu-latest
    outputs:
-      should_deploy: ${{ steps.decide.outputs.should_deploy }}
-      is_fork: ${{ steps.resolve.outputs.is_fork }}
-      allow_fork: ${{ steps.decide.outputs.allow_fork }}
-      pr_number: ${{ steps.resolve.outputs.pr_number }}
-      pr_repository: ${{ steps.resolve.outputs.repository }}
-      pr_ref: ${{ steps.resolve.outputs.ref }}
+      should_deploy: ${{ steps.check-conditions.outputs.should_deploy }}
+      pr_number: ${{ github.event.number }}
+      pr_repository: ${{ steps.get-pr-info.outputs.repository }}
+      pr_ref: ${{ steps.get-pr-info.outputs.ref }}
    steps:
      - name: Harden Runner
-        uses: step-security/harden-runner@6c439dc8bdf85cadbbce9ed30d1c7b959517bc49 # v2.12.2
+        uses: step-security/harden-runner@002fdce3c6a235733a90a27c80493a3241e56863 # v2.12.1
        with:
          egress-policy: audit

-      - name: Resolve PR info
-        id: resolve
-        uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
-        with:
-          script: |
-            const { owner, repo } = context.repo;
-            let prNumber = context.eventName === 'workflow_dispatch'
-              ? parseInt(process.env.INPUT_PR, 10)
-              : context.payload.number;
-
-            if (!Number.isInteger(prNumber)) { core.setFailed('Invalid PR number'); return; }
-
-            const { data: pr } = await github.rest.pulls.get({ owner, repo, pull_number: prNumber });
-            core.setOutput('pr_number', String(prNumber));
-            core.setOutput('repository', pr.head.repo.full_name);
-            core.setOutput('ref', pr.head.ref);
-            core.setOutput('is_fork', String(pr.head.repo.fork));
-            core.setOutput('base_ref', pr.base.ref);
-            core.setOutput('author', pr.user.login);
-            core.setOutput('state', pr.state);
-
-      - name: Decide deploy
-        id: decide
-        shell: bash
+      - name: Check deployment conditions
+        id: check-conditions
        env:
-          EVENT_NAME: ${{ github.event_name }}
-          STATE: ${{ steps.resolve.outputs.state }}
-          IS_FORK: ${{ steps.resolve.outputs.is_fork }}
-          # nur bei workflow_dispatch gesetzt:
-          ALLOW_FORK_INPUT: ${{ inputs.allow_fork }}
-          # für Auto-PR-Logik:
          PR_TITLE: ${{ github.event.pull_request.title }}
+          PR_AUTHOR: ${{ github.event.pull_request.user.login }}
          PR_BRANCH: ${{ github.event.pull_request.head.ref }}
-          PR_BASE: ${{ steps.resolve.outputs.base_ref }}
-          PR_AUTHOR: ${{ steps.resolve.outputs.author }}
        run: |
-          set -e
-          # Standard: nichts deployen
-          should=false
-          allow_fork="$(echo "${ALLOW_FORK_INPUT:-false}" | tr '[:upper:]' '[:lower:]')"
-
-          if [ "$EVENT_NAME" = "workflow_dispatch" ]; then
-            if [ "$STATE" != "open" ]; then
-              echo "PR not open -> skip"
-            else
-              if [ "$IS_FORK" = "true" ] && [ "$allow_fork" != "true" ]; then
-                echo "Fork PR and allow_fork=false -> skip"
-              else
-                should=true
-              fi
+          echo "PR Title: $PR_TITLE"
+          echo "PR Author: $PR_AUTHOR"
+          echo "PR Branch: $PR_BRANCH"
+          echo "PR Base Branch: ${{ github.event.pull_request.base.ref }}"
+          
+          # Define authorized users
+          authorized_users=(
+            "Frooodle"
+            "sf298"
+            "Ludy87"
+            "LaserKaspar"
+            "sbplat"
+            "reecebrowne"
+            "DarioGii"
+            "ConnorYoh"
+            "EthanHealy01"
+          )
+          
+          # Check if author is in the authorized list
+          is_authorized=false
+          for user in "${authorized_users[@]}"; do
+            if [[ "$PR_AUTHOR" == "$user" ]]; then
+              is_authorized=true
+              break
            fi
+          done
+          
+          # If PR is targeting V2 and user is authorized, deploy unconditionally
+          PR_BASE_BRANCH="${{ github.event.pull_request.base.ref }}"
+          if [[ "$PR_BASE_BRANCH" == "V2" && "$is_authorized" == "true" ]]; then
+            echo "✅ Deployment forced: PR targets V2 and author is authorized."
+            echo "should_deploy=true" >> $GITHUB_OUTPUT
+            exit 0
+          fi
+          
+          # Otherwise, continue with original keyword checks
+          has_v2_keyword=false
+          if [[ "$PR_TITLE" =~ [Vv]2 ]] || [[ "$PR_TITLE" =~ [Vv]ersion.?2 ]] || [[ "$PR_TITLE" =~ [Vv]ersion.?[Tt]wo ]]; then
+            has_v2_keyword=true
+          fi
+          
+          has_branch_keyword=false
+          if [[ "$PR_BRANCH" =~ [Vv]2 ]] || [[ "$PR_BRANCH" =~ [Rr]eact ]]; then
+            has_branch_keyword=true
+          fi
+          
+          if [[ "$is_authorized" == "true" && ( "$has_v2_keyword" == "true" || "$has_branch_keyword" == "true" ) ]]; then
+            echo "✅ Deployment conditions met"
+            echo "should_deploy=true" >> $GITHUB_OUTPUT
          else
-            auth_users=("Frooodle" "sf298" "Ludy87" "LaserKaspar" "sbplat" "reecebrowne" "DarioGii" "ConnorYoh" "EthanHealy01" "jbrunton96")
-            is_auth=false; for u in "${auth_users[@]}"; do [ "$u" = "$PR_AUTHOR" ] && is_auth=true && break; done
-            if [ "$PR_BASE" = "V2" ] && [ "$is_auth" = true ]; then
-              should=true
-            else
-              title_has_v2=false; echo "$PR_TITLE" | grep -qiE 'v2|version.?2|version.?two' && title_has_v2=true
-              branch_has_kw=false; echo "$PR_BRANCH" | grep -qiE 'v2|react' && branch_has_kw=true
-              if [ "$is_auth" = true ] && { [ "$title_has_v2" = true ] || [ "$branch_has_kw" = true ]; }; then
-                should=true
-              fi
-            fi
+            echo "❌ Deployment conditions not met"
+            echo "  - Authorized user: $is_authorized"
+            echo "  - Has V2 keyword in title: $has_v2_keyword"
+            echo "  - Has V2/React keyword in branch: $has_branch_keyword"
+            echo "should_deploy=false" >> $GITHUB_OUTPUT
          fi

-          echo "should_deploy=$should" >> $GITHUB_OUTPUT
-          echo "allow_fork=${allow_fork:-false}" >> $GITHUB_OUTPUT
+      - name: Get PR repository and ref
+        id: get-pr-info
+        if: steps.check-conditions.outputs.should_deploy == 'true'
+        run: |
+          # For forks, use the full repository name, for internal PRs use the current repo
+          if [[ "${{ github.event.pull_request.head.repo.fork }}" == "true" ]]; then
+            repository="${{ github.event.pull_request.head.repo.full_name }}"
+          else
+            repository="${{ github.repository }}"
+          fi
+          
+          echo "repository=$repository" >> $GITHUB_OUTPUT
+          echo "ref=${{ github.event.pull_request.head.ref }}" >> $GITHUB_OUTPUT

  deploy-v2-pr:
    needs: check-pr
    runs-on: ubuntu-latest
-    if: needs.check-pr.outputs.should_deploy == 'true' && (needs.check-pr.outputs.is_fork == 'false' || needs.check-pr.outputs.allow_fork == 'true')
+    if: needs.check-pr.outputs.should_deploy == 'true'
    # Concurrency control - only one deployment per PR at a time
    concurrency:
      group: v2-deploy-pr-${{ needs.check-pr.outputs.pr_number }}
@@ -118,7 +118,7 @@ jobs:

    steps:
      - name: Harden Runner
-        uses: step-security/harden-runner@6c439dc8bdf85cadbbce9ed30d1c7b959517bc49 # v2.12.2
+        uses: step-security/harden-runner@002fdce3c6a235733a90a27c80493a3241e56863 # v2.12.1
        with:
          egress-policy: audit

@@ -153,13 +153,13 @@ jobs:
              issue_number: prNumber,
              per_page: 100
            });
-
+            
            const v2Comments = comments.filter(comment => 
              comment.body.includes('🚀 **Auto-deploying V2 version**') ||
              comment.body.includes('## 🚀 V2 Auto-Deployment Complete!') ||
              comment.body.includes('❌ **V2 Auto-deployment failed**')
            );
-
+            
            for (const comment of v2Comments) {
              console.log(`Deleting old V2 comment: ${comment.id}`);
              await github.rest.issues.deleteComment({
@@ -176,6 +176,7 @@ jobs:
              issue_number: prNumber,
              body: `🚀 **Auto-deploying V2 version** for PR #${prNumber}...\n\n_This is an automated deployment triggered by V2/version2 keywords in the PR title or V2/React keywords in the branch name._\n\n⚠️ **Note:** If new commits are pushed during deployment, this build will be cancelled and replaced with the latest version.`
            });
+            
            return newComment.id;

      - name: Checkout PR
@@ -186,6 +187,7 @@ jobs:
          token: ${{ secrets.GITHUB_TOKEN }}
          fetch-depth: 0  # Fetch full history for commit hash detection

+
      - name: Set up Docker Buildx
        uses: docker/setup-buildx-action@e468171a9de216ec08956ac3ada2f0791b6bd435 # v3.11.1

@@ -209,7 +211,7 @@ jobs:
          if [ -z "$FRONTEND_HASH" ]; then
            FRONTEND_HASH="no-frontend-changes"
          fi
-
+          
          # Get last commit that touched backend code, docker/backend, or docker/compose
          BACKEND_HASH=$(git log -1 --format="%H" -- app/ docker/backend/ docker/compose/ 2>/dev/null || echo "")
          if [ -z "$BACKEND_HASH" ]; then
@@ -315,10 +317,8 @@ jobs:
                SYSTEM_MAXFILESIZE: "100"
                METRICS_ENABLED: "true"
                SYSTEM_GOOGLEVISIBILITY: "false"
-                SWAGGER_SERVER_URL: "https://${V2_PORT}.ssl.stirlingpdf.cloud"
-                baseUrl: "https://${V2_PORT}.ssl.stirlingpdf.cloud"
              restart: on-failure:5
-
+              
            stirling-pdf-v2-frontend:
              container_name: stirling-pdf-v2-frontend-pr-${{ needs.check-pr.outputs.pr_number }}
              image: ${{ secrets.DOCKER_HUB_USERNAME }}/test:v2-frontend-${{ steps.commit-hashes.outputs.frontend_short }}
@@ -350,10 +350,10 @@ jobs:
            docker-compose up -d
            
            # Clean up unused Docker resources to save space
-            docker system prune -af --volumes || true
-
+            docker system prune -af --volumes
+            
            # Clean up old backend/frontend images (older than 2 weeks)
-            docker image prune -af --filter "until=336h" --filter "label!=keep=true" || true
+            docker image prune -af --filter "until=336h" --filter "label!=keep=true"
          ENDSSH

          # Set port for output
@@ -385,12 +385,10 @@ jobs:
            }
            
            const deploymentUrl = `http://${{ secrets.VPS_HOST }}:${v2Port}`;
-            const httpsUrl = `https://${v2Port}.ssl.stirlingpdf.cloud`;
-
+            
            const commentBody = `## 🚀 V2 Auto-Deployment Complete!\n\n` +
                              `Your V2 PR with the new frontend/backend split architecture has been deployed!\n\n` +
-                              `🔗 **Direct Test URL (non-SSL)** [${deploymentUrl}](${deploymentUrl})\n\n` +
-                              `🔐 **Secure HTTPS URL**: [${httpsUrl}](${httpsUrl})\n\n` +
+                              `🔗 **V2 Test URL:** [${deploymentUrl}](${deploymentUrl})\n\n` +
                              `_This deployment will be automatically cleaned up when the PR is closed._\n\n` +
                              `🔄 **Auto-deployed** because PR title or branch name contains V2/version2/React keywords.`;

@@ -488,8 +486,8 @@ jobs:
            fi
            
            # Clean up old unused images (older than 2 weeks) but keep recent ones for reuse
-            docker image prune -af --filter "until=336h" --filter "label!=keep=true" || true
-
+            docker image prune -af --filter "until=336h" --filter "label!=keep=true"
+            
            # Note: We don't remove the commit-based images since they can be reused across PRs
            # Only remove PR-specific containers and directories
          ENDSSH
@@ -498,4 +496,5 @@ jobs:
        if: always()
        run: |
          rm -f ../private.key
-        continue-on-error: true
+        continue-on-error: true
+
@@ -29,7 +29,6 @@ jobs:
        github.event.comment.user.login == 'reecebrowne' ||
        github.event.comment.user.login == 'DarioGii' ||
        github.event.comment.user.login == 'EthanHealy01' ||
-        github.event.comment.user.login == 'jbrunton96' ||
        github.event.comment.user.login == 'ConnorYoh'
      )
    outputs:
@@ -42,12 +41,12 @@ jobs:
      enable_enterprise: ${{ steps.check-pro-flag.outputs.enable_enterprise }}
    steps:
      - name: Harden Runner
-        uses: step-security/harden-runner@ec9f2d5744a09debf3a187a3f4f675c53b671911 # v2.13.0
+        uses: step-security/harden-runner@6c439dc8bdf85cadbbce9ed30d1c7b959517bc49 # v2.12.2
        with:
          egress-policy: audit

      - name: Checkout PR
-        uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2

      - name: Setup GitHub App Bot
        if: github.actor != 'dependabot[bot]'
@@ -153,12 +152,12 @@ jobs:

    steps:
      - name: Harden Runner
-        uses: step-security/harden-runner@ec9f2d5744a09debf3a187a3f4f675c53b671911 # v2.13.0
+        uses: step-security/harden-runner@6c439dc8bdf85cadbbce9ed30d1c7b959517bc49 # v2.12.2
        with:
          egress-policy: audit

      - name: Checkout PR
-        uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2

      - name: Setup GitHub App Bot
        if: github.actor != 'dependabot[bot]'
@@ -170,7 +169,7 @@ jobs:
          private-key: ${{ secrets.GH_APP_PRIVATE_KEY }}

      - name: Checkout PR
-        uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
        with:
          repository: ${{ needs.check-comment.outputs.pr_repository }}
          ref: ${{ needs.check-comment.outputs.pr_ref }}
@@ -197,7 +196,7 @@ jobs:
        uses: docker/setup-buildx-action@e468171a9de216ec08956ac3ada2f0791b6bd435 # v3.11.1

      - name: Login to Docker Hub
-        uses: docker/login-action@184bdaa0721073962dff0199f1fb9940f07167d1 # v3.5.0
+        uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v3.4.0
        with:
          username: ${{ secrets.DOCKER_HUB_USERNAME }}
          password: ${{ secrets.DOCKER_HUB_API }}
@@ -21,12 +21,12 @@ jobs:

    steps:
      - name: Harden Runner
-        uses: step-security/harden-runner@ec9f2d5744a09debf3a187a3f4f675c53b671911 # v2.13.0
+        uses: step-security/harden-runner@6c439dc8bdf85cadbbce9ed30d1c7b959517bc49 # v2.12.2
        with:
          egress-policy: audit

      - name: Checkout PR
-        uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2

      - name: Setup GitHub App Bot
        if: github.actor != 'dependabot[bot]'
@@ -19,11 +19,11 @@ jobs:

    steps:
      - name: Harden Runner
-        uses: step-security/harden-runner@ec9f2d5744a09debf3a187a3f4f675c53b671911 # v2.13.0
+        uses: step-security/harden-runner@6c439dc8bdf85cadbbce9ed30d1c7b959517bc49 # v2.12.2
        with:
          egress-policy: audit

-      - uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
        with:
          fetch-depth: 0

@@ -87,7 +87,7 @@ jobs:
      - name: AI PR Title Analysis
        if: steps.actor.outputs.is_repo_dev == 'true'
        id: ai-title-analysis
-        uses: actions/ai-inference@b81b2afb8390ee6839b494a404766bef6493c7d9 # v1.2.8
+        uses: actions/ai-inference@d645f067d89ee1d5d736a5990e327e504d1c5a4a # v1.1.0
        with:
          model: openai/gpt-4o
          system-prompt-file: ".github/config/system-prompt.txt"
@@ -13,11 +13,11 @@ jobs:
      pull-requests: write
    steps:
      - name: Harden Runner
-        uses: step-security/harden-runner@ec9f2d5744a09debf3a187a3f4f675c53b671911 # v2.13.0
+        uses: step-security/harden-runner@6c439dc8bdf85cadbbce9ed30d1c7b959517bc49 # v2.12.2
        with:
          egress-policy: audit

-      - uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2

      - name: Setup GitHub App Bot
        id: setup-bot
@@ -1,76 +1,50 @@
-name: Build and Test Workflow
+name: Build repo

 on:
+  push:
+    branches: ["main", "V2", "V2-gha"]
  pull_request:
    branches: ["main", "V2", "V2-gha"]
-  workflow_dispatch:
-
-# cancel in-progress jobs if a new job is triggered
-# This is useful to avoid running multiple builds for the same branch if a new commit is pushed
-# or a pull request is updated.
-# It helps to save resources and time by ensuring that only the latest commit is built and tested
-# This is particularly useful for long-running jobs that may take a while to complete.
-# The `group` is set to a combination of the workflow name, event name, and branch name.
-# This ensures that jobs are grouped by the workflow and branch, allowing for cancellation of
-# in-progress jobs when a new commit is pushed to the same branch or a new pull request is opened.
-concurrency:
-  group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.event.pull_request.number || github.ref_name || github.ref }}
-  cancel-in-progress: true

 permissions:
  contents: read

 jobs:
-  files-changed:
-    name: detect what files changed
-    runs-on: ubuntu-latest
-    timeout-minutes: 3
-    outputs:
-      build: ${{ steps.changes.outputs.build }}
-      app: ${{ steps.changes.outputs.app }}
-      project: ${{ steps.changes.outputs.project }}
-      openapi: ${{ steps.changes.outputs.openapi }}
-    steps:
-      - uses: actions/checkout@v4.3.0
-
-      - name: Check for file changes
-        uses: dorny/paths-filter@v3.0.2
-        id: changes
-        with:
-          filters: .github/config/.files.yaml
-
  build:
    runs-on: ubuntu-latest
+
    permissions:
      actions: read
      security-events: write
+
    strategy:
      fail-fast: false
      matrix:
        jdk-version: [17, 21]
        spring-security: [true, false]
+
    steps:
      - name: Harden Runner
-        uses: step-security/harden-runner@ec9f2d5744a09debf3a187a3f4f675c53b671911 # v2.13.0
+        uses: step-security/harden-runner@6c439dc8bdf85cadbbce9ed30d1c7b959517bc49 # v2.12.2
        with:
          egress-policy: audit
+
      - name: Checkout repository
-        uses: actions/checkout@v4.3.0
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2

      - name: Set up JDK ${{ matrix.jdk-version }}
-        uses: actions/setup-java@v4.7.1
+        uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
        with:
          java-version: ${{ matrix.jdk-version }}
          distribution: "temurin"
-      - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@v4.4.2
-        with:
-          gradle-version: 8.14
+
      - name: Build with Gradle and spring security ${{ matrix.spring-security }}
-        run: ./gradlew clean build -PnoSpotless
+        run: ./gradlew clean build
        env:
          DISABLE_ADDITIONAL_FEATURES: ${{ matrix.spring-security }}
+
      - name: Check Test Reports Exist
+        id: check-reports
        if: always()
        run: |
          declare -a dirs=(
@@ -81,51 +55,61 @@ jobs:
            "app/proprietary/build/reports/tests/"
            "app/proprietary/build/test-results/"
          )
+          missing_reports=()
          for dir in "${dirs[@]}"; do
            if [ ! -d "$dir" ]; then
-              echo "Missing $dir"
-              exit 1
+              missing_reports+=("$dir")
            fi
          done
+          if [ ${#missing_reports[@]} -gt 0 ]; then
+            echo "ERROR: The following required test report directories are missing:"
+            printf '%s\n' "${missing_reports[@]}"
+            exit 1
+          fi
+          echo "All required test report directories are present"
+
      - name: Upload Test Reports
        if: always()
-        uses: actions/upload-artifact@v4.6.2
+        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
        with:
          name: test-reports-jdk-${{ matrix.jdk-version }}-spring-security-${{ matrix.spring-security }}
          path: |
-            app/**/build/reports/tests/
-            app/**/build/test-results/
-            app/**/build/reports/problems/
+            app/core/build/reports/tests/
+            app/core/build/test-results/
+            app/core/build/reports/problems/
+            app/common/build/reports/tests/
+            app/common/build/test-results/
+            app/common/build/reports/problems/
+            app/proprietary/build/reports/tests/
+            app/proprietary/build/test-results/
+            app/proprietary/build/reports/problems/
            build/reports/problems/
          retention-days: 3
          if-no-files-found: warn

  check-generateOpenApiDocs:
-    if: needs.files-changed.outputs.openapi == 'true'
-    needs: [files-changed]
    runs-on: ubuntu-latest
    steps:
      - name: Harden Runner
-        uses: step-security/harden-runner@v2.13.0
+        uses: step-security/harden-runner@6c439dc8bdf85cadbbce9ed30d1c7b959517bc49 # v2.12.2
        with:
          egress-policy: audit

-      - name: Checkout repository
-        uses: actions/checkout@v4.3.0
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2

      - name: Set up JDK 17
-        uses: actions/setup-java@v4.7.1
+        uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
        with:
          java-version: "17"
          distribution: "temurin"
-      - uses: gradle/actions/setup-gradle@v4.4.2
+
+      - uses: gradle/actions/setup-gradle@ac638b010cf58a27ee6c972d7336334ccaf61c96 # v4.4.1
+
      - name: Generate OpenAPI documentation
        run: ./gradlew :stirling-pdf:generateOpenApiDocs
-        env:
-          DISABLE_ADDITIONAL_FEATURES: true
      
      - name: Upload OpenAPI Documentation
-        uses: actions/upload-artifact@v4.6.2
+        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
        with:
          name: openapi-docs
          path: ./SwaggerDoc.json
@@ -134,61 +118,72 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Harden Runner
-        uses: step-security/harden-runner@v2.12.2
+        uses: step-security/harden-runner@6c439dc8bdf85cadbbce9ed30d1c7b959517bc49 # v2.12.2
        with:
          egress-policy: audit
+
      - name: Checkout repository
-        uses: actions/checkout@v4.2.2
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+
      - name: Set up Node.js
-        uses: actions/setup-node@v4.1.0
+        uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4.1.0
        with:
          node-version: '20'
          cache: 'npm'
          cache-dependency-path: frontend/package-lock.json
-      - name: Clean and install frontend dependencies
-        run: cd frontend && rm -rf node_modules package-lock.json && npm install
-      - name: Lint frontend
-        run: cd frontend && npm run lint
+
+      - name: Install frontend dependencies
+        run: |
+          cd frontend
+          npm ci
+
      - name: Build frontend
-        run: cd frontend && npm run build
-      - name: Run frontend tests
-        run: cd frontend && npm run test -- --run
+        run: |
+          cd frontend
+          npm run build
+
+      - name: Run frontend tests (if available)
+        run: |
+          cd frontend
+          npm test --passWithNoTests --watchAll=false || true
+
      - name: Upload frontend build artifacts
-        uses: actions/upload-artifact@v4.6.2
+        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
        with:
          name: frontend-build
          path: frontend/dist/
          retention-days: 3

  check-licence:
-    if: needs.files-changed.outputs.build == 'true'
-    needs: [files-changed, build]
    runs-on: ubuntu-latest
    steps:
      - name: Harden Runner
-        uses: step-security/harden-runner@ec9f2d5744a09debf3a187a3f4f675c53b671911 # v2.13.0
+        uses: step-security/harden-runner@6c439dc8bdf85cadbbce9ed30d1c7b959517bc49 # v2.12.2
        with:
          egress-policy: audit
+
      - name: Checkout repository
-        uses: actions/checkout@v4.3.0
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+
      - name: Set up JDK 17
-        uses: actions/setup-java@v4.7.1
+        uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
        with:
          java-version: "17"
-          distribution: "temurin"
+          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@v4.6.2
+        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
+          path: |
+            build/reports/dependency-license/dependencies-without-allowed-license.json
          retention-days: 3

  docker-compose-tests:
-    if: needs.files-changed.outputs.project == 'true'
-    needs: files-changed
    # if: github.event_name == 'push' && github.ref == 'refs/heads/main' ||
    #     (github.event_name == 'pull_request' &&
    #     contains(github.event.pull_request.labels.*.name, 'licenses') == false &&
@@ -207,18 +202,18 @@ jobs:

    steps:
      - name: Harden Runner
-        uses: step-security/harden-runner@ec9f2d5744a09debf3a187a3f4f675c53b671911 # v2.13.0
+        uses: step-security/harden-runner@6c439dc8bdf85cadbbce9ed30d1c7b959517bc49 # v2.12.2
        with:
          egress-policy: audit

      - name: Checkout Repository
-        uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0
+        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: "temurin"
+          distribution: "adopt"

      - name: Set up Docker Buildx
        uses: docker/setup-buildx-action@e468171a9de216ec08956ac3ada2f0791b6bd435 # v3.11.1
@@ -233,7 +228,6 @@ jobs:
        with:
          python-version: "3.12"
          cache: 'pip' # caching pip dependencies
-          cache-dependency-path: ./testing/cucumber/requirements.txt

      - name: Pip requirements
        run: |
@@ -245,69 +239,3 @@ jobs:
          chmod +x ./testing/test.sh
          chmod +x ./testing/test_disabledEndpoints.sh
          ./testing/test.sh
-
-  test-build-docker-images:
-    if: github.event_name == 'pull_request' && needs.files-changed.outputs.project == 'true'
-    needs: [files-changed, build, check-generateOpenApiDocs, check-licence]
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        docker-rev: ["Dockerfile", "Dockerfile.ultra-lite", "Dockerfile.fat"]
-    steps:
-      - name: Harden Runner
-        uses: step-security/harden-runner@ec9f2d5744a09debf3a187a3f4f675c53b671911 # v2.13.0
-        with:
-          egress-policy: audit
-
-      - name: Checkout Repository
-        uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0
-
-      - name: Set up JDK 17
-        uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
-        with:
-          java-version: "17"
-          distribution: "temurin"
-
-      - name: Set up Gradle
-        uses: gradle/actions/setup-gradle@017a9effdb900e5b5b2fddfb590a105619dca3c3 # v4.4.2
-        with:
-          gradle-version: 8.14
-
-      - name: Build application
-        run: ./gradlew clean build
-        env:
-          DISABLE_ADDITIONAL_FEATURES: true
-          STIRLING_PDF_DESKTOP_UI: false
-
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@29109295f81e9208d7d86ff1c6c12d2833863392 # v3.6.0
-
-      - name: Set up Docker Buildx
-        id: buildx
-        uses: docker/setup-buildx-action@e468171a9de216ec08956ac3ada2f0791b6bd435 # v3.11.1
-
-      - name: Build ${{ matrix.docker-rev }}
-        uses: docker/build-push-action@263435318d21b8e681c14492fe198d362a7d2c83 # v6.18.0
-        with:
-          builder: ${{ steps.buildx.outputs.name }}
-          context: .
-          file: ./docker/backend/${{ matrix.docker-rev }}
-          push: false
-          cache-from: type=gha
-          cache-to: type=gha,mode=max
-          platforms: linux/amd64,linux/arm64/v8
-          provenance: true
-          sbom: true
-
-      - name: Upload Reports
-        if: always()
-        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
-        with:
-          name: reports-docker-${{ matrix.docker-rev }}
-          path: |
-            build/reports/tests/
-            build/test-results/
-            build/reports/problems/
-          retention-days: 3
-          if-no-files-found: warn
@@ -6,18 +6,6 @@ on:
    paths:
      - "app/core/src/main/resources/messages_*.properties"

-# cancel in-progress jobs if a new job is triggered
-# This is useful to avoid running multiple builds for the same branch if a new commit is pushed
-# or a pull request is updated.
-# It helps to save resources and time by ensuring that only the latest commit is built and tested
-# This is particularly useful for long-running jobs that may take a while to complete.
-# The `group` is set to a combination of the workflow name, event name, and branch name.
-# This ensures that jobs are grouped by the workflow and branch, allowing for cancellation of
-# in-progress jobs when a new commit is pushed to the same branch or a new pull request is opened.
-concurrency:
-  group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.event.pull_request.number || github.ref_name || github.ref }}
-  cancel-in-progress: true
-
 permissions:
  contents: read # Allow read access to repository content

@@ -30,12 +18,12 @@ jobs:
      pull-requests: write # Allow writing to pull requests
    steps:
      - name: Harden Runner
-        uses: step-security/harden-runner@ec9f2d5744a09debf3a187a3f4f675c53b671911 # v2.13.0
+        uses: step-security/harden-runner@6c439dc8bdf85cadbbce9ed30d1c7b959517bc49 # v2.12.2
        with:
          egress-policy: audit

      - name: Checkout main branch first
-        uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2

      - name: Setup GitHub App Bot
        id: setup-bot
@@ -127,7 +115,7 @@ jobs:

            // Filter for relevant files based on the PR changes
            const changedFiles = files
-              .filter(file =>
+              .filter(file => 
                file.status !== "removed" &&
                /^app\/core\/src\/main\/resources\/messages_[a-zA-Z_]{2}_[a-zA-Z_]{2,7}\.properties$/.test(file.filename)
              )
@@ -289,4 +277,4 @@ jobs:
          rm -rf pr-branch
          rm -f pr-branch-messages_en_GB.properties main-branch-messages_en_GB.properties changed_files.txt result.txt
          echo "Cleanup complete."
-        continue-on-error: true # Ensure cleanup runs even if previous steps fail
+        continue-on-error: true # Ensure cleanup runs even if previous steps fail
@@ -17,11 +17,11 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Harden Runner
-        uses: step-security/harden-runner@ec9f2d5744a09debf3a187a3f4f675c53b671911 # v2.13.0
+        uses: step-security/harden-runner@6c439dc8bdf85cadbbce9ed30d1c7b959517bc49 # v2.12.2
        with:
          egress-policy: audit

      - name: "Checkout Repository"
-        uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
      - name: "Dependency Review"
        uses: actions/dependency-review-action@da24556b548a50705dd671f47852072ea4c105d9 # v4.7.1
@@ -1,189 +0,0 @@
-name: Auto V2 Deploy on Push
-
-on:
-  push:
-    branches:
-      - V2
-      - deploy-on-v2-commit
-
-permissions:
-  contents: read
-
-jobs:
-  deploy-v2-on-push:
-    runs-on: ubuntu-latest
-    concurrency:
-      group: deploy-v2-push-V2
-      cancel-in-progress: true
-
-    steps:
-      - name: Harden Runner
-        uses: step-security/harden-runner@002fdce3c6a235733a90a27c80493a3241e56863 # v2.12.1
-        with:
-          egress-policy: audit
-
-      - name: Checkout code
-        uses: actions/checkout@v4
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-
-      - name: Get commit hashes for frontend and backend
-        id: commit-hashes
-        run: |
-          # Get last commit that touched the frontend folder, docker/frontend, or docker/compose
-          FRONTEND_HASH=$(git log -1 --format="%H" -- frontend/ docker/frontend/ docker/compose/ 2>/dev/null || echo "")
-          if [ -z "$FRONTEND_HASH" ]; then
-            FRONTEND_HASH="no-frontend-changes"
-          fi
-          
-          # Get last commit that touched backend code, docker/backend, or docker/compose
-          BACKEND_HASH=$(git log -1 --format="%H" -- app/ docker/backend/ docker/compose/ 2>/dev/null || echo "")
-          if [ -z "$BACKEND_HASH" ]; then
-            BACKEND_HASH="no-backend-changes"
-          fi
-          
-          echo "Frontend hash: $FRONTEND_HASH"
-          echo "Backend hash: $BACKEND_HASH"
-          
-          echo "frontend_hash=$FRONTEND_HASH" >> $GITHUB_OUTPUT
-          echo "backend_hash=$BACKEND_HASH" >> $GITHUB_OUTPUT
-          
-          # Short hashes for tags
-          if [ "$FRONTEND_HASH" = "no-frontend-changes" ]; then
-            echo "frontend_short=no-frontend" >> $GITHUB_OUTPUT
-          else
-            echo "frontend_short=${FRONTEND_HASH:0:8}" >> $GITHUB_OUTPUT
-          fi
-          
-          if [ "$BACKEND_HASH" = "no-backend-changes" ]; then
-            echo "backend_short=no-backend" >> $GITHUB_OUTPUT
-          else
-            echo "backend_short=${BACKEND_HASH:0:8}" >> $GITHUB_OUTPUT
-          fi
-
-      - name: Check if frontend image exists
-        id: check-frontend
-        run: |
-          if docker manifest inspect ${{ secrets.DOCKER_HUB_USERNAME }}/test:v2-frontend-${{ steps.commit-hashes.outputs.frontend_short }} >/dev/null 2>&1; then
-            echo "exists=true" >> $GITHUB_OUTPUT
-            echo "Frontend image already exists, skipping build"
-          else
-            echo "exists=false" >> $GITHUB_OUTPUT
-            echo "Frontend image needs to be built"
-          fi
-
-      - name: Check if backend image exists
-        id: check-backend
-        run: |
-          if docker manifest inspect ${{ secrets.DOCKER_HUB_USERNAME }}/test:v2-backend-${{ steps.commit-hashes.outputs.backend_short }} >/dev/null 2>&1; then
-            echo "exists=true" >> $GITHUB_OUTPUT
-            echo "Backend image already exists, skipping build"
-          else
-            echo "exists=false" >> $GITHUB_OUTPUT
-            echo "Backend image needs to be built"
-          fi
-
-
-      - name: Login to Docker Hub
-        uses: docker/login-action@v3
-        with:
-          username: ${{ secrets.DOCKER_HUB_USERNAME }}
-          password: ${{ secrets.DOCKER_HUB_API }}
-
-      - name: Build and push frontend image
-        if: steps.check-frontend.outputs.exists == 'false'
-        uses: docker/build-push-action@v6
-        with:
-          context: .
-          file: ./docker/frontend/Dockerfile
-          push: true
-          tags: |
-            ${{ secrets.DOCKER_HUB_USERNAME }}/test:v2-frontend-${{ steps.commit-hashes.outputs.frontend_short }}
-            ${{ secrets.DOCKER_HUB_USERNAME }}/test:v2-frontend-latest
-          build-args: VERSION_TAG=v2-alpha
-          platforms: linux/amd64
-      
-      - name: Build and push backend image
-        if: steps.check-backend.outputs.exists == 'false'
-        uses: docker/build-push-action@v6
-        with:
-          context: .
-          file: ./docker/backend/Dockerfile
-          push: true
-          tags: |
-            ${{ secrets.DOCKER_HUB_USERNAME }}/test:v2-backend-${{ steps.commit-hashes.outputs.backend_short }}
-            ${{ secrets.DOCKER_HUB_USERNAME }}/test:v2-backend-latest
-          build-args: VERSION_TAG=v2-alpha
-          platforms: linux/amd64
-
-
-      - name: Set up SSH
-        run: |
-          mkdir -p ~/.ssh/
-          echo "${{ secrets.VPS_SSH_KEY }}" > ../private.key
-          chmod 600 ../private.key
-
-
-      - name: Deploy to VPS on port 3000
-        run: |
-          export UNIQUE_NAME=docker-compose-v2-$GITHUB_RUN_ID.yml
-      
-          cat > $UNIQUE_NAME << EOF
-          version: '3.3'
-          services:
-            backend:
-              container_name: stirling-v2-backend
-              image: ${{ secrets.DOCKER_HUB_USERNAME }}/test:v2-backend-${{ steps.commit-hashes.outputs.backend_short }}
-              ports:
-                - "13000:8080"
-              volumes:
-                - /stirling/V2/data:/usr/share/tessdata:rw
-                - /stirling/V2/config:/configs:rw
-                - /stirling/V2/logs:/logs:rw
-              environment:
-                DISABLE_ADDITIONAL_FEATURES: "true"
-                SECURITY_ENABLELOGIN: "false"
-                SYSTEM_DEFAULTLOCALE: en-GB
-                UI_APPNAME: "Stirling-PDF V2"
-                UI_HOMEDESCRIPTION: "V2 Frontend/Backend Split"
-                UI_APPNAMENAVBAR: "V2 Deployment"
-                SYSTEM_MAXFILESIZE: "100"
-                METRICS_ENABLED: "true"
-                SYSTEM_GOOGLEVISIBILITY: "false"
-                SWAGGER_SERVER_URL: "https://demo.stirlingpdf.cloud"
-                baseUrl: "https://demo.stirlingpdf.cloud"
-              restart: on-failure:5
-      
-            frontend:
-              container_name: stirling-v2-frontend
-              image: ${{ secrets.DOCKER_HUB_USERNAME }}/test:v2-frontend-${{ steps.commit-hashes.outputs.frontend_short }}
-              ports:
-                - "3000:80"
-              environment:
-                VITE_API_BASE_URL: "http://${{ secrets.VPS_HOST }}:13000"
-              depends_on:
-                - backend
-              restart: on-failure:5
-          EOF
-      
-          # Copy to remote with unique name
-          scp -i ../private.key -o StrictHostKeyChecking=no $UNIQUE_NAME ${{ secrets.VPS_USERNAME }}@${{ secrets.VPS_HOST }}:/tmp/$UNIQUE_NAME
-      
-          # SSH and rename/move atomically to avoid interference
-          ssh -i ../private.key -o StrictHostKeyChecking=no ${{ secrets.VPS_USERNAME }}@${{ secrets.VPS_HOST }} << ENDSSH
-            mkdir -p /stirling/V2/{data,config,logs}
-            mv /tmp/$UNIQUE_NAME /stirling/V2/docker-compose.yml
-            cd /stirling/V2
-            docker-compose down || true
-            docker-compose pull
-            docker-compose up -d
-            docker system prune -af --volumes || true
-            docker image prune -af --filter "until=336h" --filter "label!=keep=true" || true
-          ENDSSH
-
-      - name: Cleanup temporary files
-        if: always()
-        run: |
-          rm -f ../private.key
-
@@ -32,29 +32,18 @@ jobs:
        with:
          egress-policy: audit

-      - name: Checkout PR head (default)
+      - name: Check out code
        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
        with:
          fetch-depth: 0
-          persist-credentials: false

      - name: Setup GitHub App Bot
-        if: github.event_name == 'push' || (github.event_name == 'pull_request' && github.event.pull_request.head.repo.fork == false)
        id: setup-bot
        uses: ./.github/actions/setup-bot
        with:
          app-id: ${{ secrets.GH_APP_ID }}
          private-key: ${{ secrets.GH_APP_PRIVATE_KEY }}

-      - name: Checkout BASE branch (safe script)
-        if: github.event_name == 'pull_request'
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-        with:
-          ref: ${{ github.event.pull_request.base.sha }}
-          path: base
-          fetch-depth: 1
-          persist-credentials: false
-
      - name: Set up Node.js
        uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4.1.0
        with:
@@ -64,45 +53,12 @@ jobs:

      - name: Install frontend dependencies
        working-directory: frontend
-        env:
-          NPM_CONFIG_IGNORE_SCRIPTS: "true"
-        run: npm ci --ignore-scripts --audit=false --fund=false
+        run: npm ci

-      - name: Generate frontend license report (internal PR)
-        if: github.event_name == 'pull_request' && github.event.pull_request.head.repo.fork == false
+      - name: Generate frontend license report
        working-directory: frontend
-        env:
-          PR_IS_FORK: "false"
        run: npm run generate-licenses

-      - name: Generate frontend license report (fork PRs, pinned)
-        if: github.event_name == 'pull_request' && github.event.pull_request.head.repo.fork == true
-        env:
-          NPM_CONFIG_IGNORE_SCRIPTS: "true"
-        working-directory: frontend
-        run: |
-          mkdir -p src/assets
-          npx --yes license-report --only=prod --output=json > src/assets/3rdPartyLicenses.json
-
-      - name: Postprocess with project script (BASE version)
-        if: github.event_name == 'pull_request' && github.event.pull_request.head.repo.fork == true
-        env:
-          PR_IS_FORK: "true"
-        run: |
-          node base/frontend/scripts/generate-licenses.js \
-            --input frontend/src/assets/3rdPartyLicenses.json
-
-      - name: Copy postprocessed artifacts back (fork PRs)
-        if: github.event_name == 'pull_request' && github.event.pull_request.head.repo.fork == true
-        run: |
-          mkdir -p frontend/src/assets
-          if [ -f "base/frontend/src/assets/3rdPartyLicenses.json" ]; then
-            cp base/frontend/src/assets/3rdPartyLicenses.json frontend/src/assets/3rdPartyLicenses.json
-          fi
-          if [ -f "base/frontend/src/assets/license-warnings.json" ]; then
-            cp base/frontend/src/assets/license-warnings.json frontend/src/assets/license-warnings.json
-          fi
-
      - name: Check for license warnings
        run: |
          if [ -f "frontend/src/assets/license-warnings.json" ]; then
@@ -113,7 +69,7 @@ jobs:

      # PR Event: Check licenses and comment on PR
      - name: Delete previous license check comments
-        if: github.event_name == 'pull_request' && github.event.pull_request.head.repo.fork == false
+        if: github.event_name == 'pull_request'
        uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
        with:
          github-token: ${{ steps.setup-bot.outputs.token }}
@@ -145,28 +101,8 @@ jobs:
              });
            }

-      - name: Summarize results (fork PRs)
-        if: github.event_name == 'pull_request' && github.event.pull_request.head.repo.fork == true
-        run: |
-          {
-            echo "## Frontend License Check"
-            echo ""
-            if [ "${LICENSE_WARNINGS_EXIST}" = "true" ]; then
-              echo "❌ **Failed** – incompatible or unknown licenses found."
-              if [ -f "frontend/src/assets/license-warnings.json" ]; then
-                echo ""
-                echo "### Warnings"
-                jq -r '.warnings[] | "- \(.message)"' frontend/src/assets/license-warnings.json || true
-              fi
-            else
-              echo "✅ **Passed** – no license warnings detected."
-            fi
-            echo ""
-            echo "_Note: This is a fork PR. PR comments are disabled; use this summary._"
-          } >> "$GITHUB_STEP_SUMMARY"
-
      - name: Comment on PR - License Check Results
-        if: github.event_name == 'pull_request' && github.event.pull_request.head.repo.fork == false
+        if: github.event_name == 'pull_request'
        uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
        with:
          github-token: ${{ steps.setup-bot.outputs.token }}
@@ -190,19 +126,19 @@ jobs:
              
              commentBody = `## ❌ Frontend License Check Failed
              
-              The frontend license check has detected compatibility warnings that require review:
+The frontend license check has detected compatibility warnings that require review:

-              ${warningDetails}
+${warningDetails}

-              **Action Required:** Please review these licenses to ensure they are acceptable for your use case before merging.
+**Action Required:** Please review these licenses to ensure they are acceptable for your use case before merging.

-              _This check will fail the PR until license issues are resolved._`;
+_This check will fail the PR until license issues are resolved._`;
            } else {
              commentBody = `## ✅ Frontend License Check Passed
              
-              All frontend licenses have been validated and no compatibility warnings were detected.
+All frontend licenses have been validated and no compatibility warnings were detected.

-              The frontend license report has been updated successfully.`;
+The frontend license report has been updated successfully.`;
            }
            
            await github.rest.issues.createComment({
@@ -7,18 +7,6 @@ on:
    paths:
      - "build.gradle"

-# cancel in-progress jobs if a new job is triggered
-# This is useful to avoid running multiple builds for the same branch if a new commit is pushed
-# or a pull request is updated.
-# It helps to save resources and time by ensuring that only the latest commit is built and tested
-# This is particularly useful for long-running jobs that may take a while to complete.
-# The `group` is set to a combination of the workflow name, event name, and branch name.
-# This ensures that jobs are grouped by the workflow and branch, allowing for cancellation of
-# in-progress jobs when a new commit is pushed to the same branch or a new pull request is opened.
-concurrency:
-  group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.ref_name || github.ref }}
-  cancel-in-progress: true
-
 permissions:
  contents: read

@@ -31,12 +19,12 @@ jobs:
      repository-projects: write # Required for enabling automerge
    steps:
      - name: Harden Runner
-        uses: step-security/harden-runner@ec9f2d5744a09debf3a187a3f4f675c53b671911 # v2.13.0
+        uses: step-security/harden-runner@6c439dc8bdf85cadbbce9ed30d1c7b959517bc49 # v2.12.2
        with:
          egress-policy: audit

      - name: Check out code
-        uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
        with:
          fetch-depth: 0

@@ -51,10 +39,10 @@ jobs:
        uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
        with:
          java-version: "17"
-          distribution: "temurin"
+          distribution: "adopt"

      - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@017a9effdb900e5b5b2fddfb590a105619dca3c3 # v4.4.2
+        uses: gradle/actions/setup-gradle@ac638b010cf58a27ee6c972d7336334ccaf61c96 # v4.4.1

      - name: Check licenses for compatibility
        run: ./gradlew clean checkLicense
@@ -15,12 +15,12 @@ jobs:
      issues: write
    steps:
      - name: Harden Runner
-        uses: step-security/harden-runner@ec9f2d5744a09debf3a187a3f4f675c53b671911 # v2.13.0
+        uses: step-security/harden-runner@6c439dc8bdf85cadbbce9ed30d1c7b959517bc49 # v2.12.2
        with:
          egress-policy: audit

      - name: Check out the repository
-        uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2

      - name: Run Labeler
        uses: crazy-max/ghaction-github-labeler@24d110aa46a59976b8a7f35518cb7f14f434c916 # v5.3.0
@@ -21,11 +21,11 @@ jobs:
      versionMac: ${{ steps.versionNumberMac.outputs.versionNumberMac }}
    steps:
      - name: Harden Runner
-        uses: step-security/harden-runner@ec9f2d5744a09debf3a187a3f4f675c53b671911 # v2.13.0
+        uses: step-security/harden-runner@6c439dc8bdf85cadbbce9ed30d1c7b959517bc49 # v2.12.2
        with:
          egress-policy: audit

-      - uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2

      - name: Set up JDK
        uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
@@ -60,11 +60,11 @@ jobs:
            file_suffix: ""
    steps:
      - name: Harden Runner
-        uses: step-security/harden-runner@ec9f2d5744a09debf3a187a3f4f675c53b671911 # v2.13.0
+        uses: step-security/harden-runner@6c439dc8bdf85cadbbce9ed30d1c7b959517bc49 # v2.12.2
        with:
          egress-policy: audit

-      - uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2

      - name: Set up JDK 21
        uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
@@ -72,7 +72,7 @@ jobs:
          java-version: "21"
          distribution: "temurin"

-      - uses: gradle/actions/setup-gradle@017a9effdb900e5b5b2fddfb590a105619dca3c3 # v4.4.2
+      - uses: gradle/actions/setup-gradle@ac638b010cf58a27ee6c972d7336334ccaf61c96 # v4.4.1
        with:
          gradle-version: 8.14

@@ -110,12 +110,12 @@ jobs:
            file_suffix: ""
    steps:
      - name: Harden Runner
-        uses: step-security/harden-runner@ec9f2d5744a09debf3a187a3f4f675c53b671911 # v2.13.0
+        uses: step-security/harden-runner@6c439dc8bdf85cadbbce9ed30d1c7b959517bc49 # v2.12.2
        with:
          egress-policy: audit

      - name: Download build artifacts
-        uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
+        uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
        with:
          name: stirling-${{ matrix.file_suffix }}binaries

@@ -148,11 +148,11 @@ jobs:
      contents: write
    steps:
      - name: Harden Runner
-        uses: step-security/harden-runner@ec9f2d5744a09debf3a187a3f4f675c53b671911 # v2.13.0
+        uses: step-security/harden-runner@6c439dc8bdf85cadbbce9ed30d1c7b959517bc49 # v2.12.2
        with:
          egress-policy: audit

-      - uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2

      - name: Set up JDK 21
        uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
@@ -160,7 +160,7 @@ jobs:
          java-version: "21"
          distribution: "temurin"

-      - uses: gradle/actions/setup-gradle@017a9effdb900e5b5b2fddfb590a105619dca3c3 # v4.4.2
+      - uses: gradle/actions/setup-gradle@ac638b010cf58a27ee6c972d7336334ccaf61c96 # v4.4.1
        with:
          gradle-version: 8.14

@@ -238,12 +238,12 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Harden Runner
-        uses: step-security/harden-runner@ec9f2d5744a09debf3a187a3f4f675c53b671911 # v2.13.0
+        uses: step-security/harden-runner@6c439dc8bdf85cadbbce9ed30d1c7b959517bc49 # v2.12.2
        with:
          egress-policy: audit

      - name: Download build artifacts
-        uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
+        uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
        with:
          name: ${{ matrix.platform }}binaries

@@ -252,7 +252,7 @@ jobs:

      - name: Install Cosign
        if: matrix.os == 'windows-latest'
-        uses: sigstore/cosign-installer@d58896d6a1865668819e1d91763c7751a165e159 # v3.9.2
+        uses: sigstore/cosign-installer@398d4b0eeef1380460a10c8013a76f728fb906ac # v3.9.1

      - name: Generate key pair
        if: matrix.os == 'windows-latest'
@@ -301,12 +301,12 @@ jobs:
      contents: write
    steps:
      - name: Harden Runner
-        uses: step-security/harden-runner@ec9f2d5744a09debf3a187a3f4f675c53b671911 # v2.13.0
+        uses: step-security/harden-runner@6c439dc8bdf85cadbbce9ed30d1c7b959517bc49 # v2.12.2
        with:
          egress-policy: audit

      - name: Download signed artifacts
-        uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
+        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
@@ -2,9 +2,8 @@ name: Pre-commit

 on:
  workflow_dispatch:
-  push:
-    branches:
-      - main
+  schedule:
+    - cron: "0 0 * * 1"

 permissions:
  contents: read
@@ -17,12 +16,12 @@ jobs:
      pull-requests: write
    steps:
      - name: Harden Runner
-        uses: step-security/harden-runner@ec9f2d5744a09debf3a187a3f4f675c53b671911 # v2.13.0
+        uses: step-security/harden-runner@6c439dc8bdf85cadbbce9ed30d1c7b959517bc49 # v2.12.2
        with:
          egress-policy: audit

      - name: Checkout repository
-        uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
        with:
          fetch-depth: 0

@@ -38,7 +37,6 @@ jobs:
        with:
          python-version: 3.12
          cache: 'pip' # caching pip dependencies
-          cache-dependency-path: ./.github/scripts/requirements_pre_commit.txt

      - name: Run Pre-Commit Hooks
        run: |
@@ -47,15 +45,6 @@ jobs:
      - run: pre-commit run --all-files -c .pre-commit-config.yaml
        continue-on-error: true

-      - 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
-
      - name: git add
        run: |
          git add .
@@ -7,18 +7,6 @@ on:
      - master
      - main

-# cancel in-progress jobs if a new job is triggered
-# This is useful to avoid running multiple builds for the same branch if a new commit is pushed
-# or a pull request is updated.
-# It helps to save resources and time by ensuring that only the latest commit is built and tested
-# This is particularly useful for long-running jobs that may take a while to complete.
-# The `group` is set to a combination of the workflow name, event name, and branch name.
-# This ensures that jobs are grouped by the workflow and branch, allowing for cancellation of
-# in-progress jobs when a new commit is pushed to the same branch or a new pull request is opened.
-concurrency:
-  group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.ref_name || github.ref }}
-  cancel-in-progress: true
-
 permissions:
  contents: read

@@ -30,11 +18,11 @@ jobs:
      id-token: write
    steps:
      - name: Harden Runner
-        uses: step-security/harden-runner@ec9f2d5744a09debf3a187a3f4f675c53b671911 # v2.13.0
+        uses: step-security/harden-runner@6c439dc8bdf85cadbbce9ed30d1c7b959517bc49 # v2.12.2
        with:
          egress-policy: audit

-      - uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2

      - name: Set up JDK 17
        uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
@@ -42,7 +30,7 @@ jobs:
          java-version: "17"
          distribution: "temurin"

-      - uses: gradle/actions/setup-gradle@017a9effdb900e5b5b2fddfb590a105619dca3c3 # v4.4.2
+      - uses: gradle/actions/setup-gradle@ac638b010cf58a27ee6c972d7336334ccaf61c96 # v4.4.1
        with:
          gradle-version: 8.14

@@ -54,7 +42,7 @@ jobs:

      - name: Install cosign
        if: github.ref == 'refs/heads/master'
-        uses: sigstore/cosign-installer@d58896d6a1865668819e1d91763c7751a165e159 # v3.9.2
+        uses: sigstore/cosign-installer@398d4b0eeef1380460a10c8013a76f728fb906ac # v3.9.1
        with:
          cosign-release: "v2.4.1"

@@ -67,13 +55,13 @@ jobs:
        run: echo "versionNumber=$(./gradlew printVersion --quiet | tail -1)" >> $GITHUB_OUTPUT

      - name: Login to Docker Hub
-        uses: docker/login-action@184bdaa0721073962dff0199f1fb9940f07167d1 # v3.5.0
+        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@184bdaa0721073962dff0199f1fb9940f07167d1 # v3.5.0
+        uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v3.4.0
        with:
          registry: ghcr.io
          username: ${{ github.actor }}
@@ -88,7 +76,7 @@ jobs:

      - name: Generate tags
        id: meta
-        uses: docker/metadata-action@c1e51972afc2121e065aed6d45c65596fe445f3f # v5.8.0
+        uses: docker/metadata-action@902fa8ec7d6ecbf8d84d538b9b233a880e428804 # v5.7.0
        if: github.ref != 'refs/heads/main'
        with:
          images: |
@@ -134,7 +122,7 @@ jobs:

      - name: Generate tags ultra-lite
        id: meta2
-        uses: docker/metadata-action@c1e51972afc2121e065aed6d45c65596fe445f3f # v5.8.0
+        uses: docker/metadata-action@902fa8ec7d6ecbf8d84d538b9b233a880e428804 # v5.7.0
        if: github.ref != 'refs/heads/main'
        with:
          images: |
@@ -165,7 +153,7 @@ jobs:

      - name: Generate tags fat
        id: meta3
-        uses: docker/metadata-action@c1e51972afc2121e065aed6d45c65596fe445f3f # v5.8.0
+        uses: docker/metadata-action@902fa8ec7d6ecbf8d84d538b9b233a880e428804 # v5.7.0
        with:
          images: |
            ${{ secrets.DOCKER_HUB_USERNAME }}/s-pdf
@@ -23,11 +23,11 @@ jobs:
      version: ${{ steps.versionNumber.outputs.versionNumber }}
    steps:
      - name: Harden Runner
-        uses: step-security/harden-runner@ec9f2d5744a09debf3a187a3f4f675c53b671911 # v2.13.0
+        uses: step-security/harden-runner@6c439dc8bdf85cadbbce9ed30d1c7b959517bc49 # v2.12.2
        with:
          egress-policy: audit

-      - uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2

      - name: Set up JDK 17
        uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
@@ -35,7 +35,7 @@ jobs:
          java-version: "17"
          distribution: "temurin"

-      - uses: gradle/actions/setup-gradle@017a9effdb900e5b5b2fddfb590a105619dca3c3 # v4.4.2
+      - uses: gradle/actions/setup-gradle@ac638b010cf58a27ee6c972d7336334ccaf61c96 # v4.4.1
        with:
          gradle-version: 8.14

@@ -83,19 +83,19 @@ jobs:
            file_suffix: ""
    steps:
      - name: Harden Runner
-        uses: step-security/harden-runner@ec9f2d5744a09debf3a187a3f4f675c53b671911 # v2.13.0
+        uses: step-security/harden-runner@6c439dc8bdf85cadbbce9ed30d1c7b959517bc49 # v2.12.2
        with:
          egress-policy: audit

      - name: Download build artifacts
-        uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
+        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@d58896d6a1865668819e1d91763c7751a165e159 # v3.9.2
+        uses: sigstore/cosign-installer@398d4b0eeef1380460a10c8013a76f728fb906ac # v3.9.1

      - name: Generate key pair
        run: cosign generate-key-pair
@@ -161,12 +161,12 @@ jobs:
            file_suffix: ""
    steps:
      - name: Harden Runner
-        uses: step-security/harden-runner@ec9f2d5744a09debf3a187a3f4f675c53b671911 # v2.13.0
+        uses: step-security/harden-runner@6c439dc8bdf85cadbbce9ed30d1c7b959517bc49 # v2.12.2
        with:
          egress-policy: audit

      - name: Download signed artifacts
-        uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
+        uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
        with:
          name: signed${{ matrix.file_suffix }}

@@ -34,12 +34,12 @@ jobs:

    steps:
      - name: Harden Runner
-        uses: step-security/harden-runner@ec9f2d5744a09debf3a187a3f4f675c53b671911 # v2.13.0
+        uses: step-security/harden-runner@6c439dc8bdf85cadbbce9ed30d1c7b959517bc49 # v2.12.2
        with:
          egress-policy: audit

      - name: "Checkout code"
-        uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
        with:
          persist-credentials: false

@@ -74,6 +74,6 @@ jobs:

      # Upload the results to GitHub's code scanning dashboard.
      - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@76621b61decf072c1cee8dd1ce2d2a82d33c17ed # v3.29.5
+        uses: github/codeql-action/upload-sarif@181d5eefc20863364f96762470ba6f862bdef56b # v3.29.2
        with:
          sarif_file: results.sarif
@@ -9,18 +9,6 @@ on:
      - main
  workflow_dispatch:

-# cancel in-progress jobs if a new job is triggered
-# This is useful to avoid running multiple builds for the same branch if a new commit is pushed
-# or a pull request is updated.
-# It helps to save resources and time by ensuring that only the latest commit is built and tested
-# This is particularly useful for long-running jobs that may take a while to complete.
-# The `group` is set to a combination of the workflow name, event name, and branch name.
-# This ensures that jobs are grouped by the workflow and branch, allowing for cancellation of
-# in-progress jobs when a new commit is pushed to the same branch or a new pull request is opened.
-concurrency:
-  group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.event.pull_request.number || github.ref_name || github.ref }}
-  cancel-in-progress: true
-
 permissions:
  pull-requests: read
  actions: read
@@ -30,16 +18,16 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Harden Runner
-        uses: step-security/harden-runner@ec9f2d5744a09debf3a187a3f4f675c53b671911 # v2.13.0
+        uses: step-security/harden-runner@6c439dc8bdf85cadbbce9ed30d1c7b959517bc49 # v2.12.2
        with:
          egress-policy: audit

-      - uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
        with:
          fetch-depth: 0

      - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@017a9effdb900e5b5b2fddfb590a105619dca3c3 # v4.4.2
+        uses: gradle/actions/setup-gradle@ac638b010cf58a27ee6c972d7336334ccaf61c96 # v4.4.1

      - name: Build and analyze with Gradle
        env:
@@ -16,7 +16,7 @@ jobs:
      pull-requests: write
    steps:
      - name: Harden Runner
-        uses: step-security/harden-runner@ec9f2d5744a09debf3a187a3f4f675c53b671911 # v2.13.0
+        uses: step-security/harden-runner@6c439dc8bdf85cadbbce9ed30d1c7b959517bc49 # v2.12.2
        with:
          egress-policy: audit

@@ -6,18 +6,6 @@ on:
    branches:
      - master

-# cancel in-progress jobs if a new job is triggered
-# This is useful to avoid running multiple builds for the same branch if a new commit is pushed
-# or a pull request is updated.
-# It helps to save resources and time by ensuring that only the latest commit is built and tested
-# This is particularly useful for long-running jobs that may take a while to complete.
-# The `group` is set to a combination of the workflow name, event name, and branch name.
-# This ensures that jobs are grouped by the workflow and branch, allowing for cancellation of
-# in-progress jobs when a new commit is pushed to the same branch or a new pull request is opened.
-concurrency:
-  group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.ref_name || github.ref }}
-  cancel-in-progress: true
-
 permissions:
  contents: read

@@ -26,11 +14,11 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Harden Runner
-        uses: step-security/harden-runner@ec9f2d5744a09debf3a187a3f4f675c53b671911 # v2.13.0
+        uses: step-security/harden-runner@6c439dc8bdf85cadbbce9ed30d1c7b959517bc49 # v2.12.2
        with:
          egress-policy: audit

-      - uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2

      - name: Set up JDK 17
        uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
@@ -38,7 +26,7 @@ jobs:
          java-version: "17"
          distribution: "temurin"

-      - uses: gradle/actions/setup-gradle@017a9effdb900e5b5b2fddfb590a105619dca3c3 # v4.4.2
+      - uses: gradle/actions/setup-gradle@ac638b010cf58a27ee6c972d7336334ccaf61c96 # v4.4.1

      - name: Generate Swagger documentation
        run: ./gradlew :stirling-pdf:generateOpenApiDocs
@@ -12,18 +12,6 @@ on:
      - "app/core/src/main/resources/static/3rdPartyLicenses.json"
      - "scripts/ignore_translation.toml"

-# cancel in-progress jobs if a new job is triggered
-# This is useful to avoid running multiple builds for the same branch if a new commit is pushed
-# or a pull request is updated.
-# It helps to save resources and time by ensuring that only the latest commit is built and tested
-# This is particularly useful for long-running jobs that may take a while to complete.
-# The `group` is set to a combination of the workflow name, event name, and branch name.
-# This ensures that jobs are grouped by the workflow and branch, allowing for cancellation of
-# in-progress jobs when a new commit is pushed to the same branch or a new pull request is opened.
-concurrency:
-  group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.ref_name || github.ref }}
-  cancel-in-progress: true
-
 permissions:
  contents: read

@@ -32,11 +20,11 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Harden Runner
-        uses: step-security/harden-runner@ec9f2d5744a09debf3a187a3f4f675c53b671911 # v2.13.0
+        uses: step-security/harden-runner@6c439dc8bdf85cadbbce9ed30d1c7b959517bc49 # v2.12.2
        with:
          egress-policy: audit

-      - uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2

      - name: Setup GitHub App Bot
        id: setup-bot
@@ -4,18 +4,6 @@ on:
  push:
    branches: ["master", "UITest", "testdriver"]

-# cancel in-progress jobs if a new job is triggered
-# This is useful to avoid running multiple builds for the same branch if a new commit is pushed
-# or a pull request is updated.
-# It helps to save resources and time by ensuring that only the latest commit is built and tested
-# This is particularly useful for long-running jobs that may take a while to complete.
-# The `group` is set to a combination of the workflow name, event name, and branch name.
-# This ensures that jobs are grouped by the workflow and branch, allowing for cancellation of
-# in-progress jobs when a new commit is pushed to the same branch or a new pull request is opened.
-concurrency:
-  group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.ref_name || github.ref }}
-  cancel-in-progress: true
-
 permissions:
  contents: read

@@ -24,12 +12,12 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Harden Runner
-        uses: step-security/harden-runner@ec9f2d5744a09debf3a187a3f4f675c53b671911 # v2.13.0
+        uses: step-security/harden-runner@6c439dc8bdf85cadbbce9ed30d1c7b959517bc49 # v2.12.2
        with:
          egress-policy: audit

      - name: Checkout repository
-        uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2

      - name: Set up JDK
        uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
@@ -37,11 +25,6 @@ jobs:
          java-version: '17'
          distribution: 'temurin'

-      - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@017a9effdb900e5b5b2fddfb590a105619dca3c3 # v4.4.2
-        with:
-          gradle-version: 8.14
-
      - name: Build with Gradle
        run: ./gradlew clean build
        env:
@@ -57,7 +40,7 @@ jobs:
          echo "versionNumber=$VERSION" >> $GITHUB_OUTPUT

      - name: Login to Docker Hub
-        uses: docker/login-action@184bdaa0721073962dff0199f1fb9940f07167d1 # v3.5.0
+        uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v3.4.0
        with:
          username: ${{ secrets.DOCKER_HUB_USERNAME }}
          password: ${{ secrets.DOCKER_HUB_API }}
@@ -122,16 +105,11 @@ jobs:

    steps:
      - name: Harden Runner
-        uses: step-security/harden-runner@ec9f2d5744a09debf3a187a3f4f675c53b671911 # v2.13.0
+        uses: step-security/harden-runner@6c439dc8bdf85cadbbce9ed30d1c7b959517bc49 # v2.12.2
        with:
          egress-policy: audit

-      - uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0
-
-      - name: Set up Node
-        uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
-        with:
-          cache: 'npm'
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2

      - name: Run TestDriver.ai
        uses: testdriverai/action@f0d0f45fdd684db628baa843fe9313f3ca3a8aa8 #1.1.3
@@ -156,7 +134,7 @@ jobs:

    steps:
      - name: Harden Runner
-        uses: step-security/harden-runner@ec9f2d5744a09debf3a187a3f4f675c53b671911 # v2.13.0
+        uses: step-security/harden-runner@6c439dc8bdf85cadbbce9ed30d1c7b959517bc49 # v2.12.2
        with:
          egress-policy: audit

@@ -27,7 +27,7 @@ clientWebUI/
 !cucumber/exampleFiles/
 !cucumber/exampleFiles/example_html.zip
 exampleYmlFiles/stirling/
-/stirling/
+stirling/
 /testing/file_snapshots
 SwaggerDoc.json

@@ -125,10 +125,10 @@ SwaggerDoc.json
 *.tar.gz
 *.rar
 *.db
-build
-app/core/build
-app/common/build
-app/proprietary/build
+/build
+/app/core/build
+/app/common/build
+/app/proprietary/build
 common/build
 proprietary/build
 stirling-pdf/build
@@ -1,15 +1,15 @@
 repos:
  - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.12.7
+    rev: v0.12.0
    hooks:
      - id: ruff
        args:
          - --fix
          - --line-length=127
-        files: ^((\.github/scripts|scripts|app/core/src/main/resources/static/python)/.+)?[^/]+\.py$
+        files: ^((\.github/scripts|scripts)/.+)?[^/]+\.py$
        exclude: (split_photos.py)
      - id: ruff-format
-        files: ^((\.github/scripts|scripts|app/core/src/main/resources/static/python)/.+)?[^/]+\.py$
+        files: ^((\.github/scripts|scripts)/.+)?[^/]+\.py$
        exclude: (split_photos.py)
  - repo: https://github.com/codespell-project/codespell
    rev: v2.4.1
@@ -22,7 +22,7 @@ repos:
        files: \.(html|css|js|py|md)$
        exclude: (.vscode|.devcontainer|app/core/src/main/resources|app/proprietary/src/main/resources|Dockerfile|.*/pdfjs.*|.*/thirdParty.*|bootstrap.*|.*\.min\..*|.*diff\.js)
  - repo: https://github.com/gitleaks/gitleaks
-    rev: v8.28.0
+    rev: v8.27.2
    hooks:
      - id: gitleaks
  - repo: https://github.com/pre-commit/pre-commit-hooks
@@ -43,4 +43,4 @@ repos:
  #         - stylelint-config-standard@38.0.0
  #         - "@stylistic/stylelint-plugin@3.1.3"
  #       files: \.(css)$
-  #       args: [--fix]
+  #       args: [--fix]
@@ -19,6 +19,5 @@
    "yzhang.markdown-all-in-one", // Markdown All-in-One extension for enhanced Markdown editing
    "stylelint.vscode-stylelint", // Stylelint extension for CSS and SCSS linting
    "redhat.vscode-yaml", // YAML extension for Visual Studio Code
-    "dbaeumer.vscode-eslint", // ESLint extension for TypeScript linting
  ]
 }
@@ -2,7 +2,6 @@
  "editor.wordSegmenterLocales": "",
  "editor.guides.bracketPairs": "active",
  "editor.guides.bracketPairsHorizontal": "active",
-  "editor.defaultFormatter": "EditorConfig.EditorConfig",
  "cSpell.enabled": false,
  "[feature]": {
    "editor.defaultFormatter": "alexkrechik.cucumberautocomplete"
@@ -41,7 +40,7 @@
  "java.configuration.updateBuildConfiguration": "interactive",
  "java.format.enabled": true,
  "java.format.settings.profile": "GoogleStyle",
-  "java.format.settings.google.version": "1.28.0",
+  "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.
@@ -139,8 +138,5 @@
    "app/core/src/main/java",
    "app/common/src/main/java",
    "app/proprietary/src/main/java"
-  ],
-  "[typescript]": {
-    "editor.defaultFormatter": "vscode.typescript-language-features"
-  }
+  ]
 }
@@ -1,300 +0,0 @@
-# Adding New React Tools to Stirling PDF
-
-This guide covers how to add new PDF tools to the React frontend, either by migrating existing Thymeleaf templates or creating entirely new tools.
-
-## Overview
-
-When adding tools, follow this systematic approach using the established patterns and architecture.
-
-## 1. Create Tool Structure
-
-Create these files in the correct directories:
-```
-frontend/src/hooks/tools/[toolName]/
-  ├── use[ToolName]Parameters.ts     # Parameter definitions and validation
-  └── use[ToolName]Operation.ts      # Tool operation logic using useToolOperation
-
-frontend/src/components/tools/[toolName]/
-  └── [ToolName]Settings.tsx         # Settings UI component (if needed)
-
-frontend/src/tools/
-  └── [ToolName].tsx                 # Main tool component
-```
-
-## 2. Implementation Pattern
-
-Use `useBaseTool` for simplified hook management. This is the recommended approach for all new tools:
-
-**Parameters Hook** (`use[ToolName]Parameters.ts`):
-```typescript
-import { BaseParameters } from '../../../types/parameters';
-import { useBaseParameters, BaseParametersHook } from '../shared/useBaseParameters';
-
-export interface [ToolName]Parameters extends BaseParameters {
-  // Define your tool-specific parameters here
-  someOption: boolean;
-}
-
-export const defaultParameters: [ToolName]Parameters = {
-  someOption: false,
-};
-
-export const use[ToolName]Parameters = (): BaseParametersHook<[ToolName]Parameters> => {
-  return useBaseParameters({
-    defaultParameters,
-    endpointName: 'your-endpoint-name',
-    validateFn: (params) => true, // Add validation logic
-  });
-};
-```
-
-**Operation Hook** (`use[ToolName]Operation.ts`):
-```typescript
-import { useTranslation } from 'react-i18next';
-import { ToolType, useToolOperation } from '../shared/useToolOperation';
-import { createStandardErrorHandler } from '../../../utils/toolErrorHandler';
-
-export const build[ToolName]FormData = (parameters: [ToolName]Parameters, file: File): FormData => {
-  const formData = new FormData();
-  formData.append('fileInput', file);
-  // Add parameters to formData
-  return formData;
-};
-
-export const [toolName]OperationConfig = {
-  toolType: ToolType.singleFile, // or ToolType.multiFile (buildFormData's file parameter will need to be updated)
-  buildFormData: build[ToolName]FormData,
-  operationType: '[toolName]',
-  endpoint: '/api/v1/category/endpoint-name',
-  filePrefix: 'processed_', // Will be overridden with translation
-  defaultParameters,
-} as const;
-
-export const use[ToolName]Operation = () => {
-  const { t } = useTranslation();
-  return useToolOperation({
-    ...[toolName]OperationConfig,
-    filePrefix: t('[toolName].filenamePrefix', 'processed') + '_',
-    getErrorMessage: createStandardErrorHandler(t('[toolName].error.failed', 'Operation failed'))
-  });
-};
-```
-
-**Main Component** (`[ToolName].tsx`):
-```typescript
-import { useTranslation } from "react-i18next";
-import { createToolFlow } from "../components/tools/shared/createToolFlow";
-import { use[ToolName]Parameters } from "../hooks/tools/[toolName]/use[ToolName]Parameters";
-import { use[ToolName]Operation } from "../hooks/tools/[toolName]/use[ToolName]Operation";
-import { useBaseTool } from "../hooks/tools/shared/useBaseTool";
-import { BaseToolProps, ToolComponent } from "../types/tool";
-
-const [ToolName] = (props: BaseToolProps) => {
-  const { t } = useTranslation();
-  const base = useBaseTool('[toolName]', use[ToolName]Parameters, use[ToolName]Operation, props);
-
-  return createToolFlow({
-    files: {
-      selectedFiles: base.selectedFiles,
-      isCollapsed: base.hasResults,
-      placeholder: t("[toolName].files.placeholder", "Select files to get started"),
-    },
-    steps: [
-      // Add settings steps if needed
-    ],
-    executeButton: {
-      text: t("[toolName].submit", "Process"),
-      isVisible: !base.hasResults,
-      loadingText: t("loading"),
-      onClick: base.handleExecute,
-      disabled: !base.params.validateParameters() || !base.hasFiles || !base.endpointEnabled,
-    },
-    review: {
-      isVisible: base.hasResults,
-      operation: base.operation,
-      title: t("[toolName].results.title", "Results"),
-      onFileClick: base.handleThumbnailClick,
-      onUndo: base.handleUndo,
-    },
-  });
-};
-
-[ToolName].tool = () => use[ToolName]Operation;
-export default [ToolName] as ToolComponent;
-```
-
-**Note**: Some existing tools (like AddPassword, Compress) use a legacy pattern with manual hook management. **Always use the Modern Pattern above for new tools** - it's cleaner, more maintainable, and includes automation support.
-
-## 3. Register Tool in System
-Update these files to register your new tool:
-
-**Tool Registry** (`frontend/src/data/useTranslatedToolRegistry.tsx`):
-1. Add imports at the top:
-```typescript
-import [ToolName] from "../tools/[ToolName]";
-import { [toolName]OperationConfig } from "../hooks/tools/[toolName]/use[ToolName]Operation";
-import [ToolName]Settings from "../components/tools/[toolName]/[ToolName]Settings";
-```
-
-2. Add tool entry in the `allTools` object:
-```typescript
-[toolName]: {
-  icon: <LocalIcon icon="your-icon-name" width="1.5rem" height="1.5rem" />,
-  name: t("home.[toolName].title", "Tool Name"),
-  component: [ToolName],
-  description: t("home.[toolName].desc", "Tool description"),
-  categoryId: ToolCategoryId.STANDARD_TOOLS, // or appropriate category
-  subcategoryId: SubcategoryId.APPROPRIATE_SUBCATEGORY,
-  maxFiles: -1, // or specific number
-  endpoints: ["endpoint-name"],
-  operationConfig: [toolName]OperationConfig,
-  settingsComponent: [ToolName]Settings, // if settings exist
-},
-```
-
-## 4. Add Tooltips (Optional but Recommended)
-Create user-friendly tooltips to help non-technical users understand your tool. **Use simple, clear language - avoid technical jargon:**
-
-**Tooltip Hook** (`frontend/src/components/tooltips/use[ToolName]Tips.ts`):
-```typescript
-import { useTranslation } from 'react-i18next';
-import { TooltipContent } from '../../types/tips';
-
-export const use[ToolName]Tips = (): TooltipContent => {
-  const { t } = useTranslation();
-
-  return {
-    header: {
-      title: t("[toolName].tooltip.header.title", "Tool Overview")
-    },
-    tips: [
-      {
-        title: t("[toolName].tooltip.description.title", "What does this tool do?"),
-        description: t("[toolName].tooltip.description.text", "Simple explanation in everyday language that non-technical users can understand."),
-        bullets: [
-          t("[toolName].tooltip.description.bullet1", "Easy-to-understand benefit 1"),
-          t("[toolName].tooltip.description.bullet2", "Easy-to-understand benefit 2")
-        ]
-      }
-      // Add more tip sections as needed
-    ]
-  };
-};
-```
-
-**Add tooltip to your main component:**
-```typescript
-import { use[ToolName]Tips } from "../components/tooltips/use[ToolName]Tips";
-
-const [ToolName] = (props: BaseToolProps) => {
-  const tips = use[ToolName]Tips();
-  
-  // In your steps array:
-  steps: [
-    {
-      title: t("[toolName].steps.settings", "Settings"),
-      tooltip: tips, // Add this line
-      content: <[ToolName]Settings ... />
-    }
-  ]
-```
-
-## 5. Add Translations
-Update translation files. **Important: Only update `en-GB` files** - other languages are handled separately.
-
-**File to update:** `frontend/public/locales/en-GB/translation.json`
-
-**Required Translation Keys**:
-```json
-{
-  "home": {
-    "[toolName]": {
-      "title": "Tool Name",
-      "desc": "Tool description"
-    }
-  },
-  "[toolName]": {
-    "title": "Tool Name",
-    "submit": "Process",
-    "filenamePrefix": "processed",
-    "files": {
-      "placeholder": "Select files to get started"
-    },
-    "steps": {
-      "settings": "Settings"
-    },
-    "options": {
-      "title": "Tool Options",
-      "someOption": "Option Label",
-      "someOption.desc": "Option description",
-      "note": "General information about the tool."
-    },
-    "results": {
-      "title": "Results"
-    },
-    "error": {
-      "failed": "Operation failed"
-    },
-    "tooltip": {
-      "header": {
-        "title": "Tool Overview"
-      },
-      "description": {
-        "title": "What does this tool do?",
-        "text": "Simple explanation in everyday language",
-        "bullet1": "Easy-to-understand benefit 1",
-        "bullet2": "Easy-to-understand benefit 2"
-      }
-    }
-  }
-}
-```
-
-**Translation Notes:**
- **Only update `en-GB/translation.json`** - other locale files are managed separately
- Use descriptive keys that match your component's `t()` calls
- Include tooltip translations if you created tooltip hooks
- Add `options.*` keys if your tool has settings with descriptions
-
-**Tooltip Writing Guidelines:**
- **Use simple, everyday language** - avoid technical terms like "converts interactive elements" 
- **Focus on benefits** - explain what the user gains, not how it works internally
- **Use concrete examples** - "text boxes become regular text" vs "form fields are flattened"
- **Answer user questions** - "What does this do?", "When should I use this?", "What's this option for?"
- **Keep descriptions concise** - 1-2 sentences maximum per section
- **Use bullet points** for multiple benefits or features
-
-## 6. Migration from Thymeleaf
-When migrating existing Thymeleaf templates:
-
-1. **Identify Form Parameters**: Look at the original `<form>` inputs to determine parameter structure
-2. **Extract Translation Keys**: Find `#{key.name}` references and add them to JSON translations (For many tools these translations will already exist but some parts will be missing)
-3. **Map API Endpoint**: Note the `th:action` URL for the operation hook
-4. **Preserve Functionality**: Ensure all original form behaviour is replicated which is applicable to V2 react UI
-
-## 7. Testing Your Tool
- Verify tool appears in UI with correct icon and description
- Test with various file sizes and types
- Confirm translations work
- Check error handling
- Test undo functionality
- Verify results display correctly
-
-## Tool Development Patterns
-
-### Three Tool Patterns:
-
-**Pattern 1: Single-File Tools** (Individual processing)
- Backend processes one file per API call
- Set `multiFileEndpoint: false`
- Examples: Compress, Rotate
-
-**Pattern 2: Multi-File Tools** (Batch processing)
- Backend accepts `MultipartFile[]` arrays in single API call
- Set `multiFileEndpoint: true`
- Examples: Split, Merge, Overlay
-
-**Pattern 3: Complex Tools** (Custom processing)
- Tools with complex routing logic or non-standard processing
- Provide `customProcessor` for full control
- Examples: Convert, OCR
@@ -39,7 +39,7 @@ Frontend designed for **stateful document processing**:
 #### FileContext - Central State Management
 **Location**: `src/contexts/FileContext.tsx`
 - **Active files**: Currently loaded PDFs and their variants
- **Tool navigation**: Current mode (viewer/pageEditor/fileEditor/toolName)
+- **Tool navigation**: Current mode (viewer/pageEditor/fileEditor/toolName)  
 - **Memory management**: PDF document cleanup, blob URL lifecycle, Web Worker management
 - **IndexedDB persistence**: File storage with thumbnail caching
 - **Preview system**: Tools can preview results (e.g., Split → Viewer → back to Split) without context pollution
@@ -59,71 +59,12 @@ Frontend designed for **stateful document processing**:
 Without cleanup: browser crashes with memory leaks.

 #### Tool Development
-
-**Architecture**: Modular hook-based system with clear separation of concerns:
-
- **useToolOperation** (`frontend/src/hooks/tools/shared/useToolOperation.ts`): Main orchestrator hook
-  - Coordinates all tool operations with consistent interface
-  - Integrates with FileContext for operation tracking
-  - Handles validation, error handling, and UI state management
-
- **Supporting Hooks**:
-  - **useToolState**: UI state management (loading, progress, error, files)
-  - **useToolApiCalls**: HTTP requests and file processing
-  - **useToolResources**: Blob URLs, thumbnails, ZIP downloads
-
- **Utilities**:
-  - **toolErrorHandler**: Standardized error extraction and i18n support
-  - **toolResponseProcessor**: API response handling (single/zip/custom)
-  - **toolOperationTracker**: FileContext integration utilities
-
-**Three Tool Patterns**:
-
-**Pattern 1: Single-File Tools** (Individual processing)
- Backend processes one file per API call
- Set `multiFileEndpoint: false`
- Examples: Compress, Rotate
-```typescript
-return useToolOperation({
-  operationType: 'compress',
-  endpoint: '/api/v1/misc/compress-pdf',
-  buildFormData: (params, file: File) => { /* single file */ },
-  multiFileEndpoint: false,
-});
-```
-
-**Pattern 2: Multi-File Tools** (Batch processing)
- Backend accepts `MultipartFile[]` arrays in single API call
- Set `multiFileEndpoint: true`
- Examples: Split, Merge, Overlay
-```typescript
-return useToolOperation({
-  operationType: 'split',
-  endpoint: '/api/v1/general/split-pages',
-  buildFormData: (params, files: File[]) => { /* all files */ },
-  multiFileEndpoint: true,
-  filePrefix: 'split_',
-});
-```
-
-**Pattern 3: Complex Tools** (Custom processing)
- Tools with complex routing logic or non-standard processing
- Provide `customProcessor` for full control
- Examples: Convert, OCR
-```typescript
-return useToolOperation({
-  operationType: 'convert',
-  customProcessor: async (params, files) => { /* custom logic */ },
-});
-```
-
-**Benefits**:
- **No Timeouts**: Operations run until completion (supports 100GB+ files)
- **Consistent**: All tools follow same pattern and interface
- **Maintainable**: Single responsibility hooks, easy to test and modify
- **i18n Ready**: Built-in internationalization support
- **Type Safe**: Full TypeScript support with generic interfaces
- **Memory Safe**: Automatic resource cleanup and blob URL management
+- **Pattern**: Follow `src/tools/Split.tsx` as reference implementation
+- **File Access**: Tools receive `selectedFiles` prop (computed from activeFiles based on user selection)
+- **File Selection**: Users select files in FileEditor (tool mode) → stored as IDs → computed to File objects for tools
+- **Integration**: All files are part of FileContext ecosystem - automatic memory management and operation tracking
+- **Parameters**: Tool parameter handling patterns still being standardized
+- **Preview Integration**: Tools can implement preview functionality (see Split tool's thumbnail preview)

 ## Architecture Overview

@@ -183,12 +124,9 @@ return useToolOperation({
 ## Frontend Architecture Status

 - **Core Status**: React SPA architecture complete with multi-tool workflow support
- **State Management**: FileContext handles all file operations and tool navigation
+- **State Management**: FileContext handles all file operations and tool navigation  
 - **File Processing**: Production-ready with memory management for large PDF workflows (up to 100GB+)
- **Tool Integration**: Modular hook architecture with `useToolOperation` orchestrator
-  - Individual hooks: `useToolState`, `useToolApiCalls`, `useToolResources`
-  - Utilities: `toolErrorHandler`, `toolResponseProcessor`, `toolOperationTracker`
-  - Pattern: Each tool creates focused operation hook, UI consumes state/actions
+- **Tool Integration**: Standardized tool interface - see `src/tools/Split.tsx` as reference
 - **Preview System**: Tool results can be previewed without polluting file context (Split tool example)
 - **Performance**: Web Worker thumbnails, IndexedDB persistence, background processing

@@ -203,10 +141,9 @@ return useToolOperation({
 - **Security**: When `DOCKER_ENABLE_SECURITY=false`, security-related classes are excluded from compilation
 - **FileContext**: All file operations MUST go through FileContext - never bypass with direct File handling
 - **Memory Management**: Manual cleanup required for PDF.js documents and blob URLs - don't remove cleanup code
- **Tool Development**: New tools should follow `useToolOperation` hook pattern (see `useCompressOperation.ts`)
+- **Tool Development**: New tools should follow Split tool pattern (`src/tools/Split.tsx`)
 - **Performance Target**: Must handle PDFs up to 100GB+ without browser crashes
 - **Preview System**: Tools can preview results without polluting main file context (see Split tool implementation)
- **Adding Tools**: See `ADDING_TOOLS.md` for complete guide to creating new PDF tools

 ## Communication Style
 - Be direct and to the point
@@ -116,47 +116,47 @@ Stirling-PDF currently supports 40 languages!

 | Language                                     | Progress                               |
 | -------------------------------------------- | -------------------------------------- |
-| Arabic (العربية) (ar_AR)                        | ![61%](https://geps.dev/progress/61)   |
-| Azerbaijani (Azərbaycan Dili) (az_AZ)        | ![62%](https://geps.dev/progress/62)   |
-| Basque (Euskara) (eu_ES)                     | ![36%](https://geps.dev/progress/36)   |
-| Bulgarian (Български) (bg_BG)                | ![68%](https://geps.dev/progress/68)   |
-| Catalan (Català) (ca_CA)                     | ![68%](https://geps.dev/progress/68)   |
-| Croatian (Hrvatski) (hr_HR)                  | ![60%](https://geps.dev/progress/60)   |
-| Czech (Česky) (cs_CZ)                        | ![70%](https://geps.dev/progress/70)   |
-| Danish (Dansk) (da_DK)                       | ![61%](https://geps.dev/progress/61)   |
-| Dutch (Nederlands) (nl_NL)                   | ![60%](https://geps.dev/progress/60)   |
+| Arabic (العربية) (ar_AR)                        | ![63%](https://geps.dev/progress/63)   |
+| Azerbaijani (Azərbaycan Dili) (az_AZ)        | ![63%](https://geps.dev/progress/63)   |
+| Basque (Euskara) (eu_ES)                     | ![37%](https://geps.dev/progress/37)   |
+| Bulgarian (Български) (bg_BG)                | ![70%](https://geps.dev/progress/70)   |
+| Catalan (Català) (ca_CA)                     | ![69%](https://geps.dev/progress/69)   |
+| Croatian (Hrvatski) (hr_HR)                  | ![62%](https://geps.dev/progress/62)   |
+| Czech (Česky) (cs_CZ)                        | ![71%](https://geps.dev/progress/71)   |
+| Danish (Dansk) (da_DK)                       | ![63%](https://geps.dev/progress/63)   |
+| Dutch (Nederlands) (nl_NL)                   | ![61%](https://geps.dev/progress/61)   |
 | 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)                    | ![89%](https://geps.dev/progress/89)   |
-| German (Deutsch) (de_DE)                     | ![98%](https://geps.dev/progress/98)   |
-| Greek (Ελληνικά) (el_GR)                     | ![67%](https://geps.dev/progress/67)   |
-| Hindi (हिंदी) (hi_IN)                          | ![67%](https://geps.dev/progress/67)   |
+| French (Français) (fr_FR)                    | ![91%](https://geps.dev/progress/91)   |
+| German (Deutsch) (de_DE)                     | ![100%](https://geps.dev/progress/100)   |
+| Greek (Ελληνικά) (el_GR)                     | ![69%](https://geps.dev/progress/69)   |
+| Hindi (हिंदी) (hi_IN)                          | ![68%](https://geps.dev/progress/68)   |
 | Hungarian (Magyar) (hu_HU)                   | ![99%](https://geps.dev/progress/99)   |
-| Indonesian (Bahasa Indonesia) (id_ID)        | ![62%](https://geps.dev/progress/62)   |
-| Irish (Gaeilge) (ga_IE)                      | ![68%](https://geps.dev/progress/68)   |
+| Indonesian (Bahasa Indonesia) (id_ID)        | ![63%](https://geps.dev/progress/63)   |
+| Irish (Gaeilge) (ga_IE)                      | ![70%](https://geps.dev/progress/70)   |
 | Italian (Italiano) (it_IT)                   | ![98%](https://geps.dev/progress/98)   |
-| Japanese (日本語) (ja_JP)                    | ![93%](https://geps.dev/progress/93)   |
-| Korean (한국어) (ko_KR)                      | ![67%](https://geps.dev/progress/67)   |
-| Norwegian (Norsk) (no_NB)                    | ![66%](https://geps.dev/progress/66)   |
-| Persian (فارسی) (fa_IR)                      | ![64%](https://geps.dev/progress/64)   |
-| Polish (Polski) (pl_PL)                      | ![72%](https://geps.dev/progress/72)   |
-| Portuguese (Português) (pt_PT)               | ![69%](https://geps.dev/progress/69)   |
-| Portuguese Brazilian (Português) (pt_BR)     | ![76%](https://geps.dev/progress/76)   |
-| Romanian (Română) (ro_RO)                    | ![57%](https://geps.dev/progress/57)   |
-| Russian (Русский) (ru_RU)                    | ![88%](https://geps.dev/progress/88)   |
-| Serbian Latin alphabet (Srpski) (sr_LATN_RS) | ![95%](https://geps.dev/progress/95)   |
-| Simplified Chinese (简体中文) (zh_CN)         | ![93%](https://geps.dev/progress/93)   |
-| Slovakian (Slovensky) (sk_SK)                | ![51%](https://geps.dev/progress/51)   |
-| Slovenian (Slovenščina) (sl_SI)              | ![71%](https://geps.dev/progress/71)   |
-| Spanish (Español) (es_ES)                    | ![74%](https://geps.dev/progress/74)   |
-| Swedish (Svenska) (sv_SE)                    | ![65%](https://geps.dev/progress/65)   |
-| Thai (ไทย) (th_TH)                           | ![59%](https://geps.dev/progress/59)   |
-| Tibetan (བོད་ཡིག་) (bo_CN)                     | ![65%](https://geps.dev/progress/65) |
-| Traditional Chinese (繁體中文) (zh_TW)        | ![97%](https://geps.dev/progress/97)   |
-| Turkish (Türkçe) (tr_TR)                     | ![80%](https://geps.dev/progress/80)   |
-| Ukrainian (Українська) (uk_UA)               | ![71%](https://geps.dev/progress/71)   |
-| Vietnamese (Tiếng Việt) (vi_VN)              | ![57%](https://geps.dev/progress/57)   |
-| Malayalam (മലയാളം) (ml_IN)              | ![73%](https://geps.dev/progress/73)   |
+| Japanese (日本語) (ja_JP)                    | ![95%](https://geps.dev/progress/95)   |
+| Korean (한국어) (ko_KR)                      | ![69%](https://geps.dev/progress/69)   |
+| Norwegian (Norsk) (no_NB)                    | ![67%](https://geps.dev/progress/67)   |
+| Persian (فارسی) (fa_IR)                      | ![66%](https://geps.dev/progress/66)   |
+| Polish (Polski) (pl_PL)                      | ![73%](https://geps.dev/progress/73)   |
+| Portuguese (Português) (pt_PT)               | ![70%](https://geps.dev/progress/70)   |
+| Portuguese Brazilian (Português) (pt_BR)     | ![77%](https://geps.dev/progress/77)   |
+| Romanian (Română) (ro_RO)                    | ![59%](https://geps.dev/progress/59)   |
+| Russian (Русский) (ru_RU)                    | ![70%](https://geps.dev/progress/70)   |
+| Serbian Latin alphabet (Srpski) (sr_LATN_RS) | ![97%](https://geps.dev/progress/97)   |
+| Simplified Chinese (简体中文) (zh_CN)         | ![95%](https://geps.dev/progress/95)   |
+| Slovakian (Slovensky) (sk_SK)                | ![53%](https://geps.dev/progress/53)   |
+| Slovenian (Slovenščina) (sl_SI)              | ![73%](https://geps.dev/progress/73)   |
+| Spanish (Español) (es_ES)                    | ![75%](https://geps.dev/progress/75)   |
+| Swedish (Svenska) (sv_SE)                    | ![67%](https://geps.dev/progress/67)   |
+| Thai (ไทย) (th_TH)                           | ![60%](https://geps.dev/progress/60)   |
+| Tibetan (བོད་ཡིག་) (bo_CN)                     | ![66%](https://geps.dev/progress/66) |
+| Traditional Chinese (繁體中文) (zh_TW)        | ![77%](https://geps.dev/progress/77)   |
+| 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)              | ![58%](https://geps.dev/progress/58)   |
+| Malayalam (മലയാളം) (ml_IN)              | ![75%](https://geps.dev/progress/75)   |

 ## Stirling PDF Enterprise

@@ -4,7 +4,7 @@ bootRun {
 }
 spotless {
    java {
-        target 'src/**/java/**/*.java'
+        target sourceSets.main.allJava
        googleJavaFormat(googleJavaFormatVersion).aosp().reorderImports(false)

        importOrder("java", "javax", "org", "com", "net", "io", "jakarta", "lombok", "me", "stirling")
@@ -13,23 +13,11 @@ spotless {
        leadingTabsToSpaces()
        endWithNewline()
    }
-    yaml {
-        target '**/*.yml', '**/*.yaml'
-        trimTrailingWhitespace()
-        leadingTabsToSpaces()
-        endWithNewline()
-    }
-    format 'gradle', {
-        target '**/gradle/*.gradle', '**/*.gradle'
-        trimTrailingWhitespace()
-        leadingTabsToSpaces()
-        endWithNewline()
-    }
 }
 dependencies {
    api 'org.springframework.boot:spring-boot-starter-web'
    api 'org.springframework.boot:spring-boot-starter-aop'
-    // api 'org.springframework.boot:spring-boot-starter-thymeleaf' // Deprecated - UI moved to React frontend
+    api 'org.springframework.boot:spring-boot-starter-thymeleaf'
    api 'com.googlecode.owasp-java-html-sanitizer:owasp-java-html-sanitizer:20240325.1'
    api 'com.fathzer:javaluator:3.0.6'
    api 'com.posthog.java:posthog:1.2.0'
@@ -38,8 +26,8 @@ dependencies {
    api 'com.vladsch.flexmark:flexmark-html2md-converter:0.64.8'
    api "org.apache.pdfbox:pdfbox:$pdfboxVersion"
    api 'jakarta.servlet:jakarta.servlet-api:6.1.0'
-    api 'org.snakeyaml:snakeyaml-engine:2.10'
+    api 'org.snakeyaml:snakeyaml-engine:2.9'
    api "org.springdoc:springdoc-openapi-starter-webmvc-ui:2.8.9"
    api 'jakarta.mail:jakarta.mail-api:2.1.3'
-    runtimeOnly 'org.eclipse.angus:angus-mail:2.0.4'
+    runtimeOnly 'org.eclipse.angus:angus-mail:2.0.3'
 }
@@ -6,8 +6,6 @@ import org.springframework.core.annotation.AliasFor;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;

-import io.swagger.v3.oas.annotations.parameters.RequestBody;
-
 /**
 * Shortcut for a POST endpoint that is executed through the Stirling "auto‑job" framework.
 *
@@ -31,7 +29,6 @@ import io.swagger.v3.oas.annotations.parameters.RequestBody;
@Retention(RetentionPolicy.RUNTIME)
@Documented
@RequestMapping(method = RequestMethod.POST)
-@RequestBody(required = true)
 public @interface AutoJobPostMapping {

    /** Alias for {@link RequestMapping#value} – the path mapping of the endpoint. */
@@ -1,48 +0,0 @@
-package stirling.software.common.annotations.api;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import io.swagger.v3.oas.annotations.tags.Tag;
-
-/**
- * Combined annotation for Account Security API controllers.
- * Includes @RestController, @RequestMapping("/api/v1/account"), and OpenAPI @Tag.
- */
-@Target(ElementType.TYPE)
-@Retention(RetentionPolicy.RUNTIME)
-@RestController
-@RequestMapping("/api/v1/account")
-@Tag(
-        name = "Account Security",
-        description =
-                """
-                Account security and protection services for user safety and organizational compliance.
-
-                This endpoint group provides account security capabilities for organizations requiring
-                enhanced protection against unauthorized access, security threats, and compliance violations.
-
-                Common use cases:
-                • Corporate security policy compliance and SOX, HIPAA, GDPR requirements
-                • Fraud prevention, identity theft protection, and account compromise recovery
-                • Multi-factor authentication implementation and insider threat mitigation
-                • Account recovery and emergency access procedures
-
-                Business applications:
-                • Enterprise risk management, security governance, and customer trust protection
-                • Legal liability reduction and insurance requirement fulfillment
-                • Audit preparation, compliance reporting, and business continuity management
-
-                Operational scenarios:
-                • Security incident response, forensic investigation, and user training
-                • Emergency account lockdown, suspicious activity monitoring, and compliance documentation
-
-                Target users: Security administrators, compliance officers, and organizations
-                prioritizing account security and regulatory compliance.
-                """)
-public @interface AccountSecurityApi {}
@@ -1,48 +0,0 @@
-package stirling.software.common.annotations.api;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import io.swagger.v3.oas.annotations.tags.Tag;
-
-/**
- * Combined annotation for Admin Settings API controllers.
- * Includes @RestController, @RequestMapping("/api/v1/admin/settings"), and OpenAPI @Tag.
- */
-@Target(ElementType.TYPE)
-@Retention(RetentionPolicy.RUNTIME)
-@RestController
-@RequestMapping("/api/v1/admin/settings")
-@Tag(
-        name = "Admin Settings",
-        description =
-                """
-                System administration and configuration management for enterprise deployments.
-
-                This endpoint group provides administrative control for organizations deploying
-                Stirling PDF in production environments with multi-user scenarios.
-
-                Common use cases:
-                • Enterprise deployment configuration and multi-tenant environment management
-                • Security policy enforcement, compliance monitoring, and capacity planning
-                • Operational maintenance, troubleshooting, and enterprise infrastructure integration
-                • Disaster recovery and business continuity preparation
-
-                Business applications:
-                • Corporate IT governance, policy enforcement, and compliance reporting
-                • Cost optimization, SLA monitoring, and vendor management oversight
-                • Risk management and security incident response
-
-                Operational scenarios:
-                • 24/7 production monitoring, scheduled maintenance, and system updates
-                • Emergency response, change management, and performance optimization
-
-                Target users: IT administrators, system engineers, and operations teams
-                responsible for enterprise-grade document processing infrastructure.
-                """)
-public @interface AdminApi {}
@@ -1,46 +0,0 @@
-package stirling.software.common.annotations.api;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import io.swagger.v3.oas.annotations.tags.Tag;
-
-/**
- * Combined annotation for Admin Server Certificate API controllers.
- * Includes @RestController, @RequestMapping("/api/v1/admin/server-certificate"), and OpenAPI @Tag.
- */
-@Target(ElementType.TYPE)
-@Retention(RetentionPolicy.RUNTIME)
-@RestController
-@RequestMapping("/api/v1/admin/server-certificate")
-@Tag(
-        name = "Admin - Server Certificate",
-        description =
-                """
-                Server certificate management for secure enterprise deployments and encrypted communications.
-
-                This endpoint group provides certificate lifecycle management for organizations
-                requiring secure communications in document processing infrastructure.
-
-                Common use cases:
-                • Corporate security compliance and encrypted communications for healthcare/finance
-                • Customer data protection, internal audits, and multi-environment standardization
-                • Third-party security assessments and disaster recovery security measures
-
-                Business applications:
-                • Enterprise security governance, client trust protection, and secure B2B exchange
-                • Legal requirement fulfillment, liability reduction, and M&A security preparation
-
-                Operational scenarios:
-                • Certificate renewal, emergency replacement, and security incident response
-                • Multi-site deployment coordination and cloud migration preparation
-
-                Target users: Security administrators, compliance officers, and IT infrastructure
-                teams requiring enterprise-grade security for document processing systems.
-                """)
-public @interface AdminServerCertificateApi {}
@@ -1,46 +0,0 @@
-package stirling.software.common.annotations.api;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import io.swagger.v3.oas.annotations.tags.Tag;
-
-/**
- * Combined annotation for Analysis API controllers.
- * Includes @RestController, @RequestMapping("/api/v1/analysis"), and OpenAPI @Tag.
- */
-@Target(ElementType.TYPE)
-@Retention(RetentionPolicy.RUNTIME)
-@RestController
-@RequestMapping("/api/v1/analysis")
-@Tag(
-        name = "Analysis",
-        description =
-                """
-                Document analysis and information extraction services for content intelligence and insights.
-
-                This endpoint group provides analytical capabilities to understand document structure,
-                extract information, and generate insights from PDF content for automated processing.
-
-                Common use cases:
-                • Document inventory management and content audit for compliance verification
-                • Quality assurance workflows and business intelligence analytics
-                • Migration planning, accessibility evaluation, and document forensics
-
-                Business applications:
-                • Legal discovery, financial document review, and healthcare records analysis
-                • Academic research, government processing, and publishing optimization
-
-                Operational scenarios:
-                • Large-scale profiling, migration assessment, and performance optimization
-                • Automated quality control and content strategy development
-
-                Target users: Data analysts, QA teams, administrators, and business intelligence
-                professionals requiring detailed document insights.
-                """)
-public @interface AnalysisApi {}
@@ -1,46 +0,0 @@
-package stirling.software.common.annotations.api;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import io.swagger.v3.oas.annotations.tags.Tag;
-
-/**
- * Combined annotation for Configuration API controllers.
- * Includes @RestController, @RequestMapping("/api/v1/config"), and OpenAPI @Tag.
- */
-@Target(ElementType.TYPE)
-@Retention(RetentionPolicy.RUNTIME)
-@RestController
-@RequestMapping("/api/v1/config")
-@Tag(
-        name = "Config",
-        description =
-                """
-                System configuration management for deployment optimization and operational control.
-
-                This endpoint group provides system configuration capabilities for organizations
-                deploying and operating Stirling PDF in various environments.
-
-                Common use cases:
-                • Environment-specific deployment and performance tuning for varying workloads
-                • Resource optimization, cost management, and infrastructure integration
-                • Compliance configuration, disaster recovery, and multi-environment standardization
-
-                Business applications:
-                • Operational cost optimization, SLA compliance, and risk management
-                • Vendor integration, change management, and capacity planning
-
-                Operational scenarios:
-                • System deployment, performance troubleshooting, and emergency changes
-                • Planned maintenance and multi-site deployment coordination
-
-                Target users: System administrators, DevOps engineers, and IT operations teams
-                responsible for deployment configuration and system optimization.
-                """)
-public @interface ConfigApi {}
@@ -1,46 +0,0 @@
-package stirling.software.common.annotations.api;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import io.swagger.v3.oas.annotations.tags.Tag;
-
-/**
- * Combined annotation for Convert API controllers.
- * Includes @RestController, @RequestMapping("/api/v1/convert"), and OpenAPI @Tag.
- */
-@Target(ElementType.TYPE)
-@Retention(RetentionPolicy.RUNTIME)
-@RestController
-@RequestMapping("/api/v1/convert")
-@Tag(
-        name = "Convert",
-        description =
-                """
-                Document format transformation services for cross-platform compatibility and workflow integration.
-
-                This endpoint group enables transformation between various formats, supporting
-                diverse business workflows and system integrations for mixed document ecosystems.
-
-                Common use cases:
-                • Legacy system integration, document migration, and cross-platform sharing
-                • Archive standardization, publishing preparation, and content adaptation
-                • Accessibility compliance and mobile-friendly document preparation
-
-                Business applications:
-                • Enterprise content management, digital publishing, and educational platforms
-                • Legal document processing, healthcare interoperability, and government standardization
-
-                Integration scenarios:
-                • API-driven pipelines, automated workflow preparation, and batch conversions
-                • Real-time format adaptation for user requests
-
-                Target users: System integrators, content managers, digital archivists, and
-                organizations requiring flexible document format interoperability.
-                """)
-public @interface ConvertApi {}
@@ -1,46 +0,0 @@
-package stirling.software.common.annotations.api;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import io.swagger.v3.oas.annotations.tags.Tag;
-
-/**
- * Combined annotation for Database Management API controllers.
- * Includes @RestController, @RequestMapping("/api/v1/database"), and OpenAPI @Tag.
- */
-@Target(ElementType.TYPE)
-@Retention(RetentionPolicy.RUNTIME)
-@RestController
-@RequestMapping("/api/v1/database")
-@Tag(
-        name = "Database",
-        description =
-                """
-                Database operations for data protection and business continuity management.
-
-                This endpoint group provides essential database operations for organizations requiring
-                reliable data protection and recovery capabilities.
-
-                Common use cases:
-                • Regular data backup, disaster recovery, and business continuity planning
-                • System migration, compliance management, and development environment support
-                • Operational troubleshooting and scheduled maintenance operations
-
-                Business applications:
-                • Risk management, regulatory compliance, and operational resilience
-                • Data governance, change management, and quality assurance support
-
-                Operational scenarios:
-                • Routine backup, emergency recovery, and system maintenance preparation
-                • Data migration projects and performance monitoring
-
-                Target users: Operations teams, system administrators, and organizations requiring
-                reliable data protection and operational database management.
-                """)
-public @interface DatabaseApi {}
@@ -1,46 +0,0 @@
-package stirling.software.common.annotations.api;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import io.swagger.v3.oas.annotations.tags.Tag;
-
-/**
- * Combined annotation for Database Management API controllers.
- * Includes @RestController, @RequestMapping("/api/v1/admin/database"), and OpenAPI @Tag.
- */
-@Target(ElementType.TYPE)
-@Retention(RetentionPolicy.RUNTIME)
-@RestController
-@RequestMapping("/api/v1/admin/database")
-@Tag(
-        name = "Database Management",
-        description =
-                """
-                Enterprise database administration for production data management and business continuity.
-
-                This endpoint group provides database administration capabilities for organizations
-                operating Stirling PDF in production environments.
-
-                Common use cases:
-                • Business continuity, disaster recovery, and regulatory compliance requirements
-                • Performance optimization, data security, and system migration projects
-                • Audit preparation, compliance reporting, and cost optimization
-
-                Business applications:
-                • Enterprise risk management, regulatory compliance, and SLA monitoring
-                • Data retention policies, security incident response, and vendor oversight
-
-                Operational scenarios:
-                • Scheduled maintenance, emergency recovery, and capacity planning
-                • Performance troubleshooting and multi-environment deployment coordination
-
-                Target users: Database administrators, IT operations teams, and enterprise
-                administrators responsible for production data management and system reliability.
-                """)
-public @interface DatabaseManagementApi {}
@@ -1,46 +0,0 @@
-package stirling.software.common.annotations.api;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import io.swagger.v3.oas.annotations.tags.Tag;
-
-/**
- * Combined annotation for Filter API controllers.
- * Includes @RestController, @RequestMapping("/api/v1/filter"), and OpenAPI @Tag.
- */
-@Target(ElementType.TYPE)
-@Retention(RetentionPolicy.RUNTIME)
-@RestController
-@RequestMapping("/api/v1/filter")
-@Tag(
-        name = "Filter",
-        description =
-                """
-                Document content filtering and search operations for information discovery and organization.
-
-                This endpoint group enables intelligent content discovery and organization within
-                document collections for content-based processing and information extraction.
-
-                Common use cases:
-                • Legal discovery, research organization, and compliance auditing
-                • Content moderation, academic research, and business intelligence
-                • Quality assurance and content validation workflows
-
-                Business applications:
-                • Contract analysis, financial review, and healthcare records organization
-                • Government processing, educational curation, and IP protection
-
-                Workflow scenarios:
-                • Large-scale processing, automated classification, and information extraction
-                • Document preparation for further processing or analysis
-
-                Target users: Legal professionals, researchers, compliance officers, and
-                organizations requiring intelligent document content discovery and organization.
-                """)
-public @interface FilterApi {}
@@ -1,42 +0,0 @@
-package stirling.software.common.annotations.api;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import io.swagger.v3.oas.annotations.tags.Tag;
-
-/**
- * Combined annotation for General PDF processing API controllers.
- * Includes @RestController, @RequestMapping("/api/v1/general"), and OpenAPI @Tag.
- */
-@Target(ElementType.TYPE)
-@Retention(RetentionPolicy.RUNTIME)
-@RestController
-@RequestMapping("/api/v1/general")
-@Tag(
-        name = "General",
-        description =
-                """
-                Core PDF processing operations for fundamental document manipulation workflows.
-
-                This endpoint group provides essential PDF functionality that forms the foundation
-                of most document processing workflows across various industries.
-
-                Common use cases:
-                • Document preparation for archival systems and content organization
-                • File preparation for distribution, accessibility compliance, and batch processing
-                • Document consolidation for reporting and legal compliance workflows
-
-                Typical applications:
-                • Content management, publishing workflows, and educational content distribution
-                • Business process automation and archive management
-
-                Target users: Content managers, document processors, and organizations requiring
-                reliable foundational PDF manipulation capabilities.
-                """)
-public @interface GeneralApi {}
@@ -1,46 +0,0 @@
-package stirling.software.common.annotations.api;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import io.swagger.v3.oas.annotations.tags.Tag;
-
-/**
- * Combined annotation for Info API controllers.
- * Includes @RestController, @RequestMapping("/api/v1/info"), and OpenAPI @Tag.
- */
-@Target(ElementType.TYPE)
-@Retention(RetentionPolicy.RUNTIME)
-@RestController
-@RequestMapping("/api/v1/info")
-@Tag(
-        name = "Info",
-        description =
-                """
-                System information and operational insights for monitoring and performance management.
-
-                This endpoint group provides system information and operational metrics for organizations
-                operating Stirling PDF in production environments.
-
-                Common use cases:
-                • System health monitoring, performance optimization, and capacity planning
-                • Troubleshooting, compliance monitoring, and SLA reporting
-                • Cost optimization, usage analysis, and security monitoring
-
-                Business applications:
-                • Operational cost management, business continuity monitoring, and vendor management
-                • Compliance reporting, strategic planning, and customer service tracking
-
-                Operational scenarios:
-                • 24/7 monitoring, scheduled maintenance, and emergency response coordination
-                • System upgrade planning and capacity scaling decisions
-
-                Target users: Operations teams, system administrators, and management teams requiring
-                operational insights and system performance visibility.
-                """)
-public @interface InfoApi {}
@@ -1,46 +0,0 @@
-package stirling.software.common.annotations.api;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import io.swagger.v3.oas.annotations.tags.Tag;
-
-/**
- * Combined annotation for Miscellaneous API controllers.
- * Includes @RestController, @RequestMapping("/api/v1/misc"), and OpenAPI @Tag.
- */
-@Target(ElementType.TYPE)
-@Retention(RetentionPolicy.RUNTIME)
-@RestController
-@RequestMapping("/api/v1/misc")
-@Tag(
-        name = "Misc",
-        description =
-                """
-                Specialized utilities and supplementary tools for enhanced document processing workflows.
-
-                This endpoint group provides utility operations that support core document processing
-                tasks and address specific workflow needs in real-world scenarios.
-
-                Common use cases:
-                • Document optimization for bandwidth-limited environments and storage cost management
-                • Document repair, content extraction, and validation for quality assurance
-                • Accessibility improvement and custom processing for specialized needs
-
-                Business applications:
-                • Web publishing optimization, email attachment management, and archive efficiency
-                • Mobile compatibility, print production, and legacy document recovery
-
-                Operational scenarios:
-                • Batch processing, quality control, and performance optimization
-                • Troubleshooting and recovery of problematic documents
-
-                Target users: System administrators, document specialists, and organizations requiring
-                specialized document processing and optimization tools.
-                """)
-public @interface MiscApi {}
@@ -1,46 +0,0 @@
-package stirling.software.common.annotations.api;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import io.swagger.v3.oas.annotations.tags.Tag;
-
-/**
- * Combined annotation for Pipeline API controllers.
- * Includes @RestController, @RequestMapping("/api/v1/pipeline"), and OpenAPI @Tag.
- */
-@Target(ElementType.TYPE)
-@Retention(RetentionPolicy.RUNTIME)
-@RestController
-@RequestMapping("/api/v1/pipeline")
-@Tag(
-        name = "Pipeline",
-        description =
-                """
-                Automated document processing workflows for complex multi-stage business operations.
-
-                This endpoint group enables organizations to create sophisticated document processing
-                workflows that combine multiple operations into streamlined, repeatable processes.
-
-                Common use cases:
-                • Invoice processing, legal document review, and healthcare records standardization
-                • Government processing, educational content preparation, and publishing automation
-                • Contract lifecycle management and approval processes
-
-                Business applications:
-                • Automated compliance reporting, large-scale migration, and quality assurance
-                • Archive preparation, content delivery, and document approval workflows
-
-                Operational scenarios:
-                • Scheduled batch processing and event-driven document processing
-                • Multi-department coordination and business system integration
-
-                Target users: Business process managers, IT automation specialists, and organizations
-                requiring consistent, repeatable document processing workflows.
-                """)
-public @interface PipelineApi {}
@@ -1,47 +0,0 @@
-package stirling.software.common.annotations.api;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import io.swagger.v3.oas.annotations.tags.Tag;
-
-/**
- * Combined annotation for Proprietary UI Data API controllers.
- * Includes @RestController, @RequestMapping("/api/v1/proprietary/ui-data"), and OpenAPI @Tag. Note:
- * Controllers using this annotation should also add @EnterpriseEndpoint.
- */
-@Target(ElementType.TYPE)
-@Retention(RetentionPolicy.RUNTIME)
-@RestController
-@RequestMapping("/api/v1/proprietary/ui-data")
-@Tag(
-        name = "Proprietary UI Data",
-        description =
-                """
-                Enterprise user interface data services for commercial deployments and advanced business features.
-
-                This endpoint group provides enhanced data services for commercial and enterprise features,
-                supporting advanced business workflows and professional-grade functionality.
-
-                Common use cases:
-                • Enterprise-grade dashboards, multi-tenant deployment, and business intelligence
-                • Organizational hierarchy management and commercial feature licensing
-                • Professional support integration and advanced workflow automation
-
-                Business applications:
-                • ERP integration, CRM development, and executive reporting dashboards
-                • Multi-subsidiary management, professional service delivery, and compliance interfaces
-
-                Operational scenarios:
-                • Large-scale deployment management and white-label solution development
-                • Advanced system integration and commercial feature rollout
-
-                Target users: Enterprise administrators, business analysts, and organizations utilizing
-                commercial features and advanced business capabilities.
-                """)
-public @interface ProprietaryUiDataApi {}
@@ -1,46 +0,0 @@
-package stirling.software.common.annotations.api;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import io.swagger.v3.oas.annotations.tags.Tag;
-
-/**
- * Combined annotation for Security API controllers.
- * Includes @RestController, @RequestMapping("/api/v1/security"), and OpenAPI @Tag.
- */
-@Target(ElementType.TYPE)
-@Retention(RetentionPolicy.RUNTIME)
-@RestController
-@RequestMapping("/api/v1/security")
-@Tag(
-        name = "Security",
-        description =
-                """
-                Document security and protection services for confidential and sensitive content.
-
-                This endpoint group provides essential security operations for organizations handling
-                sensitive documents and materials requiring controlled access.
-
-                Common use cases:
-                • Legal confidentiality, healthcare privacy (HIPAA), and financial regulatory compliance
-                • Government classified handling, corporate IP protection, and educational privacy (FERPA)
-                • Contract security for business transactions
-
-                Business applications:
-                • Document authentication, confidential sharing, and secure archiving
-                • Content watermarking, access control, and privacy protection through redaction
-
-                Industry scenarios:
-                • Legal discovery, medical records exchange, financial audit documentation
-                • Enterprise policy enforcement and data governance
-
-                Target users: Legal professionals, healthcare administrators, compliance officers,
-                government agencies, and enterprises handling sensitive content.
-                """)
-public @interface SecurityApi {}
@@ -1,46 +0,0 @@
-package stirling.software.common.annotations.api;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import io.swagger.v3.oas.annotations.tags.Tag;
-
-/**
- * Combined annotation for Settings API controllers.
- * Includes @RestController, @RequestMapping("/api/v1/settings"), and OpenAPI @Tag.
- */
-@Target(ElementType.TYPE)
-@Retention(RetentionPolicy.RUNTIME)
-@RestController
-@RequestMapping("/api/v1/settings")
-@Tag(
-        name = "Settings",
-        description =
-                """
-                User preferences and application customization for personalized workflow optimization.
-
-                This endpoint group provides preference management capabilities for users and
-                organizations to customize their document processing experience.
-
-                Common use cases:
-                • Workflow optimization, accessibility compliance, and corporate branding
-                • Multi-language support, user personalization, and business system integration
-                • Organizational policy compliance
-
-                Business applications:
-                • Corporate branding, productivity optimization, and accessibility compliance
-                • Change management facilitation and training efficiency improvement
-
-                Operational scenarios:
-                • User onboarding, department-specific customization, and system migration
-                • Multi-tenant customization and project-based configuration adjustments
-
-                Target users: End users, department managers, and organizations focused on optimizing
-                user experience and workflow efficiency through personalization.
-                """)
-public @interface SettingsApi {}
@@ -1,46 +0,0 @@
-package stirling.software.common.annotations.api;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import io.swagger.v3.oas.annotations.tags.Tag;
-
-/**
- * Combined annotation for Team Management API controllers.
- * Includes @RestController, @RequestMapping("/api/v1/team"), and OpenAPI @Tag.
- */
-@Target(ElementType.TYPE)
-@Retention(RetentionPolicy.RUNTIME)
-@RestController
-@RequestMapping("/api/v1/team")
-@Tag(
-        name = "Team",
-        description =
-                """
-                Team management and collaboration services for organized document processing workflows.
-
-                This endpoint group enables organizations to structure collaborative document processing
-                activities through team-based organization and resource management.
-
-                Common use cases:
-                • Department-based processing, project collaboration, and cross-functional coordination
-                • Client-specific team isolation, temporary project teams, and training coordination
-                • Compliance team coordination for regulatory processing
-
-                Business applications:
-                • Matrix organization support, client service delivery, and cost center allocation
-                • Scalable collaboration, knowledge management, and team-based quality assurance
-
-                Operational scenarios:
-                • Large-scale processing coordination and temporary team formation
-                • M&A integration, remote collaboration, and knowledge transfer management
-
-                Target users: Team leaders, project managers, and organizations requiring structured
-                collaborative environments for document processing activities.
-                """)
-public @interface TeamApi {}
@@ -1,46 +0,0 @@
-package stirling.software.common.annotations.api;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import io.swagger.v3.oas.annotations.tags.Tag;
-
-/**
- * Combined annotation for UI Data API controllers.
- * Includes @RestController, @RequestMapping("/api/v1/ui-data"), and OpenAPI @Tag.
- */
-@Target(ElementType.TYPE)
-@Retention(RetentionPolicy.RUNTIME)
-@RestController
-@RequestMapping("/api/v1/ui-data")
-@Tag(
-        name = "UI Data",
-        description =
-                """
-                User interface data services for dynamic frontend applications and user experience customization.
-
-                This endpoint group provides data services for frontend applications to render personalized
-                interfaces and deliver optimized experiences based on system configuration.
-
-                Common use cases:
-                • Dynamic UI customization, multi-language support, and feature configuration
-                • Real-time status delivery, corporate branding, and mobile optimization
-                • Progressive web application (PWA) configuration
-
-                Business applications:
-                • Brand customization, user experience optimization, and accessibility compliance
-                • Multi-tenant customization, training support, and performance optimization
-
-                Operational scenarios:
-                • Frontend deployment, UI A/B testing, and system integration
-                • Mobile synchronization and offline capability enhancement
-
-                Target users: Frontend developers, UI/UX designers, and organizations requiring
-                customizable user interfaces and optimized user experiences.
-                """)
-public @interface UiDataApi {}
@@ -1,46 +0,0 @@
-package stirling.software.common.annotations.api;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import io.swagger.v3.oas.annotations.tags.Tag;
-
-/**
- * Combined annotation for User Management API controllers.
- * Includes @RestController, @RequestMapping("/api/v1/user"), and OpenAPI @Tag.
- */
-@Target(ElementType.TYPE)
-@Retention(RetentionPolicy.RUNTIME)
-@RestController
-@RequestMapping("/api/v1/user")
-@Tag(
-        name = "User",
-        description =
-                """
-                User management and authentication services for multi-user and enterprise environments.
-
-                This endpoint group provides user lifecycle management capabilities for organizations
-                deploying Stirling PDF in multi-user scenarios.
-
-                Common use cases:
-                • Employee onboarding/offboarding and corporate access control
-                • Department-based permissions, regulatory compliance, and SSO integration
-                • Multi-tenant deployment and guest user access management
-
-                Business applications:
-                • Enterprise IAM integration, security governance, and cost allocation
-                • Compliance reporting, workflow management, and partner collaboration
-
-                Operational scenarios:
-                • Large-scale provisioning, automated HR integration, and emergency access
-                • User migration and self-service profile maintenance
-
-                Target users: IT administrators, HR departments, and organizations requiring
-                structured user management and enterprise identity integration.
-                """)
-public @interface UserApi {}
@@ -8,9 +8,9 @@ import java.util.List;
 import java.util.Locale;
 import java.util.Properties;
 import java.util.function.Predicate;
-import java.util.stream.Stream;

 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Lazy;
@@ -19,7 +19,9 @@ import org.springframework.context.annotation.Scope;
 import org.springframework.core.env.Environment;
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.core.io.Resource;
+import org.springframework.core.io.ResourceLoader;
 import org.springframework.util.ClassUtils;
+import org.thymeleaf.spring6.SpringTemplateEngine;

 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
@@ -49,15 +51,6 @@ public class AppConfig {
    @Value("${server.port:8080}")
    private String serverPort;

-    @Value("${v2}")
-    public boolean v2Enabled;
-
-    @Bean
-    public boolean v2Enabled() {
-        return v2Enabled;
-    }
-
-    /* Commented out Thymeleaf template engine bean - to be removed when frontend migration is complete
    @Bean
    @ConditionalOnProperty(name = "system.customHTMLFiles", havingValue = "true")
    public SpringTemplateEngine templateEngine(ResourceLoader resourceLoader) {
@@ -65,7 +58,6 @@ public class AppConfig {
        templateEngine.addTemplateResolver(new FileFallbackTemplateResolver(resourceLoader));
        return templateEngine;
    }
-    */

    @Bean(name = "loginEnabled")
    public boolean loginEnabled() {
@@ -128,7 +120,7 @@ public class AppConfig {
    public boolean rateLimit() {
        String rateLimit = System.getProperty("rateLimit");
        if (rateLimit == null) rateLimit = System.getenv("rateLimit");
-        return Boolean.parseBoolean(rateLimit);
+        return (rateLimit != null) ? Boolean.valueOf(rateLimit) : false;
    }

    @Bean(name = "RunningInDocker")
@@ -148,8 +140,8 @@ public class AppConfig {
        if (!Files.exists(mountInfo)) {
            return true;
        }
-        try (Stream<String> lines = Files.lines(mountInfo)) {
-            return lines.anyMatch(line -> line.contains(" /configs "));
+        try {
+            return Files.lines(mountInfo).anyMatch(line -> line.contains(" /configs "));
        } catch (IOException e) {
            return false;
        }
@@ -1,8 +1,19 @@
 package stirling.software.common.configuration;

-/* Commented out entire FileFallbackTemplateResolver class - Thymeleaf dependency removed
- * This class will be removed when frontend migration to React is complete
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Map;

+import org.springframework.core.io.Resource;
+import org.springframework.core.io.ResourceLoader;
+import org.thymeleaf.IEngineConfiguration;
+import org.thymeleaf.templateresolver.AbstractConfigurableTemplateResolver;
+import org.thymeleaf.templateresource.FileTemplateResource;
+import org.thymeleaf.templateresource.ITemplateResource;
+
+import lombok.extern.slf4j.Slf4j;
+
+import stirling.software.common.model.InputStreamTemplateResource;

@Slf4j
 public class FileFallbackTemplateResolver extends AbstractConfigurableTemplateResolver {
@@ -46,4 +57,3 @@ public class FileFallbackTemplateResolver extends AbstractConfigurableTemplateRe
        return null;
    }
 }
-*/
@@ -14,8 +14,6 @@ public class InstallationPathConfig {
    private static final String CONFIG_PATH;
    private static final String CUSTOM_FILES_PATH;
    private static final String CLIENT_WEBUI_PATH;
-    private static final String SCRIPTS_PATH;
-    private static final String PIPELINE_PATH;

    // Config paths
    private static final String SETTINGS_PATH;
@@ -25,7 +23,6 @@ public class InstallationPathConfig {
    private static final String STATIC_PATH;
    private static final String TEMPLATES_PATH;
    private static final String SIGNATURES_PATH;
-    private static final String PRIVATE_KEY_PATH;

    static {
        BASE_PATH = initializeBasePath();
@@ -35,18 +32,15 @@ public class InstallationPathConfig {
        CONFIG_PATH = BASE_PATH + "configs" + File.separator;
        CUSTOM_FILES_PATH = BASE_PATH + "customFiles" + File.separator;
        CLIENT_WEBUI_PATH = BASE_PATH + "clientWebUI" + File.separator;
-        PIPELINE_PATH = BASE_PATH + "pipeline" + File.separator;

        // Initialize config paths
        SETTINGS_PATH = CONFIG_PATH + "settings.yml";
        CUSTOM_SETTINGS_PATH = CONFIG_PATH + "custom_settings.yml";
-        SCRIPTS_PATH = CONFIG_PATH + "scripts" + File.separator;

        // Initialize custom file paths
        STATIC_PATH = CUSTOM_FILES_PATH + "static" + File.separator;
        TEMPLATES_PATH = CUSTOM_FILES_PATH + "templates" + File.separator;
        SIGNATURES_PATH = CUSTOM_FILES_PATH + "signatures" + File.separator;
-        PRIVATE_KEY_PATH = CONFIG_PATH + "db" + File.separator + "keys" + File.separator;
    }

    private static String initializeBasePath() {
@@ -95,14 +89,6 @@ public class InstallationPathConfig {
        return CLIENT_WEBUI_PATH;
    }

-    public static String getScriptsPath() {
-        return SCRIPTS_PATH;
-    }
-
-    public static String getPipelinePath() {
-        return PIPELINE_PATH;
-    }
-
    public static String getSettingsPath() {
        return SETTINGS_PATH;
    }
@@ -122,8 +108,4 @@ public class InstallationPathConfig {
    public static String getSignaturesPath() {
        return SIGNATURES_PATH;
    }
-
-    public static String getPrivateKeyPath() {
-        return PRIVATE_KEY_PATH;
-    }
 }
@@ -25,9 +25,6 @@ import org.springframework.core.io.Resource;
 import org.springframework.core.io.support.EncodedResource;
 import org.springframework.stereotype.Component;

-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonProperty;
-
 import lombok.Data;
 import lombok.Getter;
 import lombok.Setter;
@@ -61,10 +58,7 @@ public class ApplicationProperties {
    private Mail mail = new Mail();

    private Premium premium = new Premium();
-
-    @JsonIgnore // Deprecated - completely hidden from JSON serialization
    private EnterpriseEdition enterpriseEdition = new EnterpriseEdition();
-
    private AutoPipeline autoPipeline = new AutoPipeline();
    private ProcessExecutor processExecutor = new ProcessExecutor();

@@ -119,7 +113,6 @@ public class ApplicationProperties {
        private long loginResetTimeMinutes;
        private String loginMethod = "all";
        private String customGlobalAPIKey;
-        private Jwt jwt = new Jwt();

        public Boolean isAltLogin() {
            return saml2.getEnabled() || oauth2.getEnabled();
@@ -175,30 +168,17 @@ public class ApplicationProperties {
            private Boolean autoCreateUser = false;
            private Boolean blockRegistration = false;
            private String registrationId = "stirling";
-
-            @ToString.Exclude
-            @JsonProperty("idpMetadataUri")
-            private String idpMetadataUri;
-
+            @ToString.Exclude private String idpMetadataUri;
            private String idpSingleLogoutUrl;
            private String idpSingleLoginUrl;
            private String idpIssuer;
-
-            @JsonProperty("idpCert")
            private String idpCert;
+            @ToString.Exclude private String privateKey;
+            @ToString.Exclude private String spCert;

-            @ToString.Exclude
-            @JsonProperty("privateKey")
-            private String privateKey;
-
-            @ToString.Exclude
-            @JsonProperty("spCert")
-            private String spCert;
-
-            @JsonIgnore
            public InputStream getIdpMetadataUri() throws IOException {
                if (idpMetadataUri.startsWith("classpath:")) {
-                    return new ClassPathResource(idpMetadataUri.substring("classpath:".length()))
+                    return new ClassPathResource(idpMetadataUri.substring("classpath".length()))
                            .getInputStream();
                }
                try {
@@ -212,7 +192,6 @@ public class ApplicationProperties {
                }
            }

-            @JsonIgnore
            public Resource getSpCert() {
                if (spCert == null) return null;
                if (spCert.startsWith("classpath:")) {
@@ -222,7 +201,6 @@ public class ApplicationProperties {
                }
            }

-            @JsonIgnore
            public Resource getIdpCert() {
                if (idpCert == null) return null;
                if (idpCert.startsWith("classpath:")) {
@@ -232,9 +210,7 @@ public class ApplicationProperties {
                }
            }

-            @JsonIgnore
            public Resource getPrivateKey() {
-                if (privateKey == null) return null;
                if (privateKey.startsWith("classpath:")) {
                    return new ClassPathResource(privateKey.substring("classpath:".length()));
                } else {
@@ -299,15 +275,6 @@ public class ApplicationProperties {
                }
            }
        }
-
-        @Data
-        public static class Jwt {
-            private boolean enableKeystore = true;
-            private boolean enableKeyRotation = false;
-            private boolean enableKeyCleanup = true;
-            private int keyRetentionDays = 7;
-            private boolean secureCookie;
-        }
    }

    @Data
@@ -322,9 +289,7 @@ public class ApplicationProperties {
        private Boolean enableAnalytics;
        private Datasource datasource;
        private Boolean disableSanitize;
-        private int maxDPI;
        private Boolean enableUrlToPDF;
-        private Html html = new Html();
        private CustomPaths customPaths = new CustomPaths();
        private String fileUploadLimit;
        private TempFileManagement tempFileManagement = new TempFileManagement();
@@ -355,12 +320,8 @@ public class ApplicationProperties {

    @Data
    public static class TempFileManagement {
-        @JsonProperty("baseTmpDir")
        private String baseTmpDir = "";
-
-        @JsonProperty("libreofficeDir")
        private String libreofficeDir = "";
-
        private String systemTempDir = "";
        private String prefix = "stirling-pdf-";
        private long maxAgeHours = 24;
@@ -368,15 +329,12 @@ public class ApplicationProperties {
        private boolean startupCleanup = true;
        private boolean cleanupSystemTemp = false;

-        @JsonIgnore
        public String getBaseTmpDir() {
            return baseTmpDir != null && !baseTmpDir.isEmpty()
                    ? baseTmpDir
-                    : java.lang.System.getProperty("java.io.tmpdir").replaceAll("/+$", "")
-                            + "/stirling-pdf";
+                    : java.lang.System.getProperty("java.io.tmpdir") + "/stirling-pdf";
        }

-        @JsonIgnore
        public String getLibreofficeDir() {
            return libreofficeDir != null && !libreofficeDir.isEmpty()
                    ? libreofficeDir
@@ -384,25 +342,6 @@ public class ApplicationProperties {
        }
    }

-    @Data
-    public static class Html {
-        private UrlSecurity urlSecurity = new UrlSecurity();
-
-        @Data
-        public static class UrlSecurity {
-            private boolean enabled = true;
-            private String level = "MEDIUM"; // MAX, MEDIUM, OFF
-            private List<String> allowedDomains = new ArrayList<>();
-            private List<String> blockedDomains = new ArrayList<>();
-            private List<String> internalTlds =
-                    Arrays.asList(".local", ".internal", ".corp", ".home");
-            private boolean blockPrivateNetworks = true;
-            private boolean blockLocalhost = true;
-            private boolean blockLinkLocal = true;
-            private boolean blockCloudMetadata = true;
-        }
-    }
-
    @Data
    public static class Datasource {
        private boolean enableCustomDatabase;
@@ -652,24 +591,12 @@ public class ApplicationProperties {

        @Data
        public static class TimeoutMinutes {
-            @JsonProperty("libreOfficetimeoutMinutes")
            private long libreOfficeTimeoutMinutes;
-
-            @JsonProperty("pdfToHtmltimeoutMinutes")
            private long pdfToHtmlTimeoutMinutes;
-
-            @JsonProperty("pythonOpenCvtimeoutMinutes")
            private long pythonOpenCvTimeoutMinutes;
-
-            @JsonProperty("weasyPrinttimeoutMinutes")
            private long weasyPrintTimeoutMinutes;
-
-            @JsonProperty("installApptimeoutMinutes")
            private long installAppTimeoutMinutes;
-
-            @JsonProperty("calibretimeoutMinutes")
            private long calibreTimeoutMinutes;
-
            private long tesseractTimeoutMinutes;
            private long qpdfTimeoutMinutes;
            private long ghostscriptTimeoutMinutes;
@@ -1,8 +1,11 @@
 package stirling.software.common.model;

-/* Commented out entire InputStreamTemplateResource class - Thymeleaf dependency removed
- * This class will be removed when frontend migration to React is complete
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.Reader;

+import org.thymeleaf.templateresource.ITemplateResource;

 public class InputStreamTemplateResource implements ITemplateResource {
    private InputStream inputStream;
@@ -39,4 +42,3 @@ public class InputStreamTemplateResource implements ITemplateResource {
        return inputStream != null;
    }
 }
-*/
@@ -4,8 +4,6 @@ import org.springframework.web.multipart.MultipartFile;

 import io.swagger.v3.oas.annotations.media.Schema;

-import jakarta.validation.constraints.AssertTrue;
-
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
@@ -13,20 +11,15 @@ import lombok.NoArgsConstructor;
@Data
@NoArgsConstructor
@EqualsAndHashCode
-@Schema(description = "PDF file input - either upload a file or provide a server-side file ID")
 public class PDFFile {
-    @Schema(description = "The input PDF file", format = "binary")
+    @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 if job was previously done on file in async mode)")
+            description = "File ID for server-side files (can be used instead of fileInput)",
+            example = "a1b2c3d4-5678-90ab-cdef-ghijklmnopqr")
    private String fileId;
-
-    @AssertTrue(message = "Either fileInput or fileId must be provided")
-    @Schema(hidden = true)
-    private boolean isValid() {
-        return (fileInput != null && (fileId == null || fileId.trim().isEmpty()))
-                || (fileId != null && !fileId.trim().isEmpty() && fileInput == null);
-    }
 }
@@ -1,42 +0,0 @@
-package stirling.software.common.service;
-
-import java.io.InputStream;
-import java.security.KeyStore;
-import java.security.cert.X509Certificate;
-import java.util.Date;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-public interface ServerCertificateServiceInterface {
-
-    boolean isEnabled();
-
-    boolean hasServerCertificate();
-
-    void initializeServerCertificate();
-
-    KeyStore getServerKeyStore() throws Exception;
-
-    String getServerCertificatePassword();
-
-    X509Certificate getServerCertificate() throws Exception;
-
-    byte[] getServerCertificatePublicKey() throws Exception;
-
-    void uploadServerCertificate(InputStream p12Stream, String password) throws Exception;
-
-    void deleteServerCertificate() throws Exception;
-
-    ServerCertificateInfo getServerCertificateInfo() throws Exception;
-
-    @Getter
-    @AllArgsConstructor
-    class ServerCertificateInfo {
-        private final boolean exists;
-        private final String subject;
-        private final String issuer;
-        private final Date validFrom;
-        private final Date validTo;
-    }
-}
@@ -1,208 +0,0 @@
-package stirling.software.common.service;
-
-import java.net.InetAddress;
-import java.net.URI;
-import java.net.UnknownHostException;
-import java.util.regex.Pattern;
-
-import org.springframework.stereotype.Service;
-
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-
-import stirling.software.common.model.ApplicationProperties;
-
-@Service
-@RequiredArgsConstructor
-@Slf4j
-public class SsrfProtectionService {
-
-    private final ApplicationProperties applicationProperties;
-
-    private static final Pattern DATA_URL_PATTERN =
-            Pattern.compile("^data:.*", Pattern.CASE_INSENSITIVE);
-    private static final Pattern FRAGMENT_PATTERN = Pattern.compile("^#.*");
-
-    public enum SsrfProtectionLevel {
-        OFF, // No SSRF protection - allows all URLs
-        MEDIUM, // Block internal networks but allow external URLs
-        MAX // Block all external URLs - only data: and fragments
-    }
-
-    public boolean isUrlAllowed(String url) {
-        ApplicationProperties.Html.UrlSecurity config =
-                applicationProperties.getSystem().getHtml().getUrlSecurity();
-
-        if (!config.isEnabled()) {
-            return true;
-        }
-
-        if (url == null || url.trim().isEmpty()) {
-            return false;
-        }
-
-        String trimmedUrl = url.trim();
-
-        // Always allow data URLs and fragments
-        if (DATA_URL_PATTERN.matcher(trimmedUrl).matches()
-                || FRAGMENT_PATTERN.matcher(trimmedUrl).matches()) {
-            return true;
-        }
-
-        SsrfProtectionLevel level = parseProtectionLevel(config.getLevel());
-
-        switch (level) {
-            case OFF:
-                return true;
-            case MAX:
-                return isMaxSecurityAllowed(trimmedUrl, config);
-            case MEDIUM:
-                return isMediumSecurityAllowed(trimmedUrl, config);
-            default:
-                return false;
-        }
-    }
-
-    private SsrfProtectionLevel parseProtectionLevel(String level) {
-        try {
-            return SsrfProtectionLevel.valueOf(level.toUpperCase());
-        } catch (IllegalArgumentException e) {
-            log.warn("Invalid SSRF protection level '{}', defaulting to MEDIUM", level);
-            return SsrfProtectionLevel.MEDIUM;
-        }
-    }
-
-    private boolean isMaxSecurityAllowed(
-            String url, ApplicationProperties.Html.UrlSecurity config) {
-        // MAX security: only allow explicitly whitelisted domains
-        try {
-            URI uri = new URI(url);
-            String host = uri.getHost();
-
-            if (host == null) {
-                return false;
-            }
-
-            return config.getAllowedDomains().contains(host.toLowerCase());
-
-        } catch (Exception e) {
-            log.debug("Failed to parse URL for MAX security check: {}", url, e);
-            return false;
-        }
-    }
-
-    private boolean isMediumSecurityAllowed(
-            String url, ApplicationProperties.Html.UrlSecurity config) {
-        try {
-            URI uri = new URI(url);
-            String host = uri.getHost();
-
-            if (host == null) {
-                return false;
-            }
-
-            String hostLower = host.toLowerCase();
-
-            // Check explicit blocked domains
-            if (config.getBlockedDomains().contains(hostLower)) {
-                log.debug("URL blocked by explicit domain blocklist: {}", url);
-                return false;
-            }
-
-            // Check internal TLD patterns
-            for (String tld : config.getInternalTlds()) {
-                if (hostLower.endsWith(tld.toLowerCase())) {
-                    log.debug("URL blocked by internal TLD pattern '{}': {}", tld, url);
-                    return false;
-                }
-            }
-
-            // If allowedDomains is specified, only allow those
-            if (!config.getAllowedDomains().isEmpty()) {
-                boolean isAllowed =
-                        config.getAllowedDomains().stream()
-                                .anyMatch(
-                                        domain ->
-                                                hostLower.equals(domain.toLowerCase())
-                                                        || hostLower.endsWith(
-                                                                "." + domain.toLowerCase()));
-
-                if (!isAllowed) {
-                    log.debug("URL not in allowed domains list: {}", url);
-                    return false;
-                }
-            }
-
-            // Resolve hostname to IP address for network-based checks
-            try {
-                InetAddress address = InetAddress.getByName(host);
-
-                if (config.isBlockPrivateNetworks() && isPrivateAddress(address)) {
-                    log.debug("URL blocked - private network address: {}", url);
-                    return false;
-                }
-
-                if (config.isBlockLocalhost() && address.isLoopbackAddress()) {
-                    log.debug("URL blocked - localhost address: {}", url);
-                    return false;
-                }
-
-                if (config.isBlockLinkLocal() && address.isLinkLocalAddress()) {
-                    log.debug("URL blocked - link-local address: {}", url);
-                    return false;
-                }
-
-                if (config.isBlockCloudMetadata()
-                        && isCloudMetadataAddress(address.getHostAddress())) {
-                    log.debug("URL blocked - cloud metadata endpoint: {}", url);
-                    return false;
-                }
-
-            } catch (UnknownHostException e) {
-                log.debug("Failed to resolve hostname for SSRF check: {}", host, e);
-                return false;
-            }
-
-            return true;
-
-        } catch (Exception e) {
-            log.debug("Failed to parse URL for MEDIUM security check: {}", url, e);
-            return false;
-        }
-    }
-
-    private boolean isPrivateAddress(InetAddress address) {
-        return address.isSiteLocalAddress()
-                || address.isAnyLocalAddress()
-                || isPrivateIPv4Range(address.getHostAddress());
-    }
-
-    private boolean isPrivateIPv4Range(String ip) {
-        return ip.startsWith("10.")
-                || ip.startsWith("192.168.")
-                || (ip.startsWith("172.") && isInRange172(ip))
-                || ip.startsWith("127.")
-                || "0.0.0.0".equals(ip);
-    }
-
-    private boolean isInRange172(String ip) {
-        String[] parts = ip.split("\\.");
-        if (parts.length >= 2) {
-            try {
-                int secondOctet = Integer.parseInt(parts[1]);
-                return secondOctet >= 16 && secondOctet <= 31;
-            } catch (NumberFormatException e) {
-                return false;
-            }
-        }
-        return false;
-    }
-
-    private boolean isCloudMetadataAddress(String ip) {
-        // Cloud metadata endpoints for AWS, GCP, Azure, Oracle Cloud, and IBM Cloud
-        return ip.startsWith("169.254.169.254") // AWS/GCP/Azure
-                || ip.startsWith("fd00:ec2::254") // AWS IPv6
-                || ip.startsWith("169.254.169.253") // Oracle Cloud
-                || ip.startsWith("169.254.169.250"); // IBM Cloud
-    }
-}
@@ -1,71 +1,21 @@
 package stirling.software.common.util;

-import org.owasp.html.AttributePolicy;
 import org.owasp.html.HtmlPolicyBuilder;
 import org.owasp.html.PolicyFactory;
 import org.owasp.html.Sanitizers;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;

-import stirling.software.common.model.ApplicationProperties;
-import stirling.software.common.service.SsrfProtectionService;
-
-@Component
 public class CustomHtmlSanitizer {
-
-    private final SsrfProtectionService ssrfProtectionService;
-    private final ApplicationProperties applicationProperties;
-
-    @Autowired
-    public CustomHtmlSanitizer(
-            SsrfProtectionService ssrfProtectionService,
-            ApplicationProperties applicationProperties) {
-        this.ssrfProtectionService = ssrfProtectionService;
-        this.applicationProperties = applicationProperties;
-    }
-
-    private final AttributePolicy SSRF_SAFE_URL_POLICY =
-            new AttributePolicy() {
-                @Override
-                public String apply(String elementName, String attributeName, String value) {
-                    if (value == null || value.trim().isEmpty()) {
-                        return null;
-                    }
-
-                    String trimmedValue = value.trim();
-
-                    // Use the SSRF protection service to validate the URL
-                    if (ssrfProtectionService != null
-                            && !ssrfProtectionService.isUrlAllowed(trimmedValue)) {
-                        return null;
-                    }
-
-                    return trimmedValue;
-                }
-            };
-
-    private final PolicyFactory SSRF_SAFE_IMAGES_POLICY =
-            new HtmlPolicyBuilder()
-                    .allowElements("img")
-                    .allowAttributes("alt", "width", "height", "title")
-                    .onElements("img")
-                    .allowAttributes("src")
-                    .matching(SSRF_SAFE_URL_POLICY)
-                    .onElements("img")
-                    .toFactory();
-
-    private final PolicyFactory POLICY =
+    private static final PolicyFactory POLICY =
            Sanitizers.FORMATTING
                    .and(Sanitizers.BLOCKS)
                    .and(Sanitizers.STYLES)
                    .and(Sanitizers.LINKS)
                    .and(Sanitizers.TABLES)
-                    .and(SSRF_SAFE_IMAGES_POLICY)
+                    .and(Sanitizers.IMAGES)
                    .and(new HtmlPolicyBuilder().disallowElements("noscript").toFactory());

-    public String sanitize(String html) {
-        boolean disableSanitize =
-                Boolean.TRUE.equals(applicationProperties.getSystem().getDisableSanitize());
-        return disableSanitize ? html : POLICY.sanitize(html);
+    public static String sanitize(String html) {
+        String htmlAfter = POLICY.sanitize(html);
+        return htmlAfter;
    }
 }
@@ -1,652 +0,0 @@
-package stirling.software.common.util;
-
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.lang.reflect.Constructor;
-import java.lang.reflect.Method;
-import java.nio.charset.StandardCharsets;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Properties;
-import java.util.regex.Pattern;
-
-import lombok.Data;
-import lombok.experimental.UtilityClass;
-
-import stirling.software.common.model.api.converters.EmlToPdfRequest;
-
-@UtilityClass
-public class EmlParser {
-
-    private static volatile Boolean jakartaMailAvailable = null;
-    private static volatile Method mimeUtilityDecodeTextMethod = null;
-    private static volatile boolean mimeUtilityChecked = false;
-
-    private static final Pattern MIME_ENCODED_PATTERN =
-            Pattern.compile("=\\?([^?]+)\\?([BbQq])\\?([^?]*)\\?=");
-
-    private static final String DISPOSITION_ATTACHMENT = "attachment";
-    private static final String TEXT_PLAIN = "text/plain";
-    private static final String TEXT_HTML = "text/html";
-    private static final String MULTIPART_PREFIX = "multipart/";
-
-    private static final String HEADER_CONTENT_TYPE = "content-type:";
-    private static final String HEADER_CONTENT_DISPOSITION = "content-disposition:";
-    private static final String HEADER_CONTENT_TRANSFER_ENCODING = "content-transfer-encoding:";
-    private static final String HEADER_CONTENT_ID = "Content-ID";
-    private static final String HEADER_SUBJECT = "Subject:";
-    private static final String HEADER_FROM = "From:";
-    private static final String HEADER_TO = "To:";
-    private static final String HEADER_CC = "Cc:";
-    private static final String HEADER_BCC = "Bcc:";
-    private static final String HEADER_DATE = "Date:";
-
-    private static synchronized boolean isJakartaMailAvailable() {
-        if (jakartaMailAvailable == null) {
-            try {
-                Class.forName("jakarta.mail.internet.MimeMessage");
-                Class.forName("jakarta.mail.Session");
-                Class.forName("jakarta.mail.internet.MimeUtility");
-                Class.forName("jakarta.mail.internet.MimePart");
-                Class.forName("jakarta.mail.internet.MimeMultipart");
-                Class.forName("jakarta.mail.Multipart");
-                Class.forName("jakarta.mail.Part");
-                jakartaMailAvailable = true;
-            } catch (ClassNotFoundException e) {
-                jakartaMailAvailable = false;
-            }
-        }
-        return jakartaMailAvailable;
-    }
-
-    public static EmailContent extractEmailContent(
-            byte[] emlBytes, EmlToPdfRequest request, CustomHtmlSanitizer customHtmlSanitizer)
-            throws IOException {
-        EmlProcessingUtils.validateEmlInput(emlBytes);
-
-        if (isJakartaMailAvailable()) {
-            return extractEmailContentAdvanced(emlBytes, request, customHtmlSanitizer);
-        } else {
-            return extractEmailContentBasic(emlBytes, request, customHtmlSanitizer);
-        }
-    }
-
-    private static EmailContent extractEmailContentBasic(
-            byte[] emlBytes, EmlToPdfRequest request, CustomHtmlSanitizer customHtmlSanitizer) {
-        String emlContent = new String(emlBytes, StandardCharsets.UTF_8);
-        EmailContent content = new EmailContent();
-
-        content.setSubject(extractBasicHeader(emlContent, HEADER_SUBJECT));
-        content.setFrom(extractBasicHeader(emlContent, HEADER_FROM));
-        content.setTo(extractBasicHeader(emlContent, HEADER_TO));
-        content.setCc(extractBasicHeader(emlContent, HEADER_CC));
-        content.setBcc(extractBasicHeader(emlContent, HEADER_BCC));
-
-        String dateStr = extractBasicHeader(emlContent, HEADER_DATE);
-        if (!dateStr.isEmpty()) {
-            content.setDateString(dateStr);
-        }
-
-        String htmlBody = extractHtmlBody(emlContent);
-        if (htmlBody != null) {
-            content.setHtmlBody(htmlBody);
-        } else {
-            String textBody = extractTextBody(emlContent);
-            content.setTextBody(textBody != null ? textBody : "Email content could not be parsed");
-        }
-
-        content.getAttachments().addAll(extractAttachmentsBasic(emlContent));
-
-        return content;
-    }
-
-    private static EmailContent extractEmailContentAdvanced(
-            byte[] emlBytes, EmlToPdfRequest request, CustomHtmlSanitizer customHtmlSanitizer) {
-        try {
-            Class<?> sessionClass = Class.forName("jakarta.mail.Session");
-            Class<?> mimeMessageClass = Class.forName("jakarta.mail.internet.MimeMessage");
-
-            Method getDefaultInstance =
-                    sessionClass.getMethod("getDefaultInstance", Properties.class);
-            Object session = getDefaultInstance.invoke(null, new Properties());
-
-            Class<?>[] constructorArgs = new Class<?>[] {sessionClass, InputStream.class};
-            Constructor<?> mimeMessageConstructor =
-                    mimeMessageClass.getConstructor(constructorArgs);
-            Object message =
-                    mimeMessageConstructor.newInstance(session, new ByteArrayInputStream(emlBytes));
-
-            return extractFromMimeMessage(message, request, customHtmlSanitizer);
-
-        } catch (ReflectiveOperationException e) {
-            return extractEmailContentBasic(emlBytes, request, customHtmlSanitizer);
-        }
-    }
-
-    private static EmailContent extractFromMimeMessage(
-            Object message, EmlToPdfRequest request, CustomHtmlSanitizer customHtmlSanitizer) {
-        EmailContent content = new EmailContent();
-
-        try {
-            Class<?> messageClass = message.getClass();
-
-            Method getSubject = messageClass.getMethod("getSubject");
-            String subject = (String) getSubject.invoke(message);
-            content.setSubject(subject != null ? safeMimeDecode(subject) : "No Subject");
-
-            Method getFrom = messageClass.getMethod("getFrom");
-            Object[] fromAddresses = (Object[]) getFrom.invoke(message);
-            content.setFrom(buildAddressString(fromAddresses));
-
-            extractRecipients(message, messageClass, content);
-
-            Method getSentDate = messageClass.getMethod("getSentDate");
-            content.setDate((Date) getSentDate.invoke(message));
-
-            Method getContent = messageClass.getMethod("getContent");
-            Object messageContent = getContent.invoke(message);
-
-            processMessageContent(message, messageContent, content, request, customHtmlSanitizer);
-
-        } catch (ReflectiveOperationException | RuntimeException e) {
-            content.setSubject("Email Conversion");
-            content.setFrom("Unknown");
-            content.setTo("Unknown");
-            content.setCc("");
-            content.setBcc("");
-            content.setTextBody("Email content could not be parsed with advanced processing");
-        }
-
-        return content;
-    }
-
-    private static void extractRecipients(
-            Object message, Class<?> messageClass, EmailContent content) {
-        try {
-            Method getRecipients =
-                    messageClass.getMethod(
-                            "getRecipients", Class.forName("jakarta.mail.Message$RecipientType"));
-            Class<?> recipientTypeClass = Class.forName("jakarta.mail.Message$RecipientType");
-
-            Object toType = recipientTypeClass.getField("TO").get(null);
-            Object[] toRecipients = (Object[]) getRecipients.invoke(message, toType);
-            content.setTo(buildAddressString(toRecipients));
-
-            Object ccType = recipientTypeClass.getField("CC").get(null);
-            Object[] ccRecipients = (Object[]) getRecipients.invoke(message, ccType);
-            content.setCc(buildAddressString(ccRecipients));
-
-            Object bccType = recipientTypeClass.getField("BCC").get(null);
-            Object[] bccRecipients = (Object[]) getRecipients.invoke(message, bccType);
-            content.setBcc(buildAddressString(bccRecipients));
-
-        } catch (ReflectiveOperationException e) {
-            try {
-                Method getAllRecipients = messageClass.getMethod("getAllRecipients");
-                Object[] recipients = (Object[]) getAllRecipients.invoke(message);
-                content.setTo(buildAddressString(recipients));
-                content.setCc("");
-                content.setBcc("");
-            } catch (ReflectiveOperationException ex) {
-                content.setTo("");
-                content.setCc("");
-                content.setBcc("");
-            }
-        }
-    }
-
-    private static String buildAddressString(Object[] addresses) {
-        if (addresses == null || addresses.length == 0) {
-            return "";
-        }
-
-        StringBuilder builder = new StringBuilder();
-        for (int i = 0; i < addresses.length; i++) {
-            if (i > 0) builder.append(", ");
-            builder.append(safeMimeDecode(addresses[i].toString()));
-        }
-        return builder.toString();
-    }
-
-    private static void processMessageContent(
-            Object message,
-            Object messageContent,
-            EmailContent content,
-            EmlToPdfRequest request,
-            CustomHtmlSanitizer customHtmlSanitizer) {
-        try {
-            if (messageContent instanceof String stringContent) {
-                Method getContentType = message.getClass().getMethod("getContentType");
-                String contentType = (String) getContentType.invoke(message);
-
-                if (contentType != null && contentType.toLowerCase().contains(TEXT_HTML)) {
-                    content.setHtmlBody(stringContent);
-                } else {
-                    content.setTextBody(stringContent);
-                }
-            } else {
-                Class<?> multipartClass = Class.forName("jakarta.mail.Multipart");
-                if (multipartClass.isInstance(messageContent)) {
-                    processMultipart(messageContent, content, request, customHtmlSanitizer, 0);
-                }
-            }
-        } catch (ReflectiveOperationException | ClassCastException e) {
-            content.setTextBody("Email content could not be parsed with advanced processing");
-        }
-    }
-
-    private static void processMultipart(
-            Object multipart,
-            EmailContent content,
-            EmlToPdfRequest request,
-            CustomHtmlSanitizer customHtmlSanitizer,
-            int depth) {
-
-        final int MAX_MULTIPART_DEPTH = 10;
-        if (depth > MAX_MULTIPART_DEPTH) {
-            content.setHtmlBody("<div class=\"error\">Maximum multipart depth exceeded</div>");
-            return;
-        }
-
-        try {
-            Class<?> multipartClass = multipart.getClass();
-            Method getCount = multipartClass.getMethod("getCount");
-            int count = (Integer) getCount.invoke(multipart);
-
-            Method getBodyPart = multipartClass.getMethod("getBodyPart", int.class);
-
-            for (int i = 0; i < count; i++) {
-                Object part = getBodyPart.invoke(multipart, i);
-                processPart(part, content, request, customHtmlSanitizer, depth + 1);
-            }
-
-        } catch (ReflectiveOperationException | ClassCastException e) {
-            content.setHtmlBody("<div class=\"error\">Error processing multipart content</div>");
-        }
-    }
-
-    private static void processPart(
-            Object part,
-            EmailContent content,
-            EmlToPdfRequest request,
-            CustomHtmlSanitizer customHtmlSanitizer,
-            int depth) {
-        try {
-            Class<?> partClass = part.getClass();
-
-            Method isMimeType = partClass.getMethod("isMimeType", String.class);
-            Method getContent = partClass.getMethod("getContent");
-            Method getDisposition = partClass.getMethod("getDisposition");
-            Method getFileName = partClass.getMethod("getFileName");
-            Method getContentType = partClass.getMethod("getContentType");
-            Method getHeader = partClass.getMethod("getHeader", String.class);
-
-            Object disposition = getDisposition.invoke(part);
-            String filename = (String) getFileName.invoke(part);
-            String contentType = (String) getContentType.invoke(part);
-
-            String normalizedDisposition =
-                    disposition != null ? ((String) disposition).toLowerCase() : null;
-
-            if ((Boolean) isMimeType.invoke(part, TEXT_PLAIN) && normalizedDisposition == null) {
-                Object partContent = getContent.invoke(part);
-                if (partContent instanceof String stringContent) {
-                    content.setTextBody(stringContent);
-                }
-            } else if ((Boolean) isMimeType.invoke(part, TEXT_HTML)
-                    && normalizedDisposition == null) {
-                Object partContent = getContent.invoke(part);
-                if (partContent instanceof String stringContent) {
-                    String htmlBody =
-                            customHtmlSanitizer != null
-                                    ? customHtmlSanitizer.sanitize(stringContent)
-                                    : stringContent;
-                    content.setHtmlBody(htmlBody);
-                }
-            } else if ((normalizedDisposition != null
-                            && normalizedDisposition.contains(DISPOSITION_ATTACHMENT))
-                    || (filename != null && !filename.trim().isEmpty())) {
-
-                processAttachment(
-                        part, content, request, getHeader, getContent, filename, contentType);
-            } else if ((Boolean) isMimeType.invoke(part, "multipart/*")) {
-                Object multipartContent = getContent.invoke(part);
-                if (multipartContent != null) {
-                    Class<?> multipartClass = Class.forName("jakarta.mail.Multipart");
-                    if (multipartClass.isInstance(multipartContent)) {
-                        processMultipart(
-                                multipartContent, content, request, customHtmlSanitizer, depth + 1);
-                    }
-                }
-            }
-
-        } catch (ReflectiveOperationException | RuntimeException e) {
-            // Continue processing other parts if one fails
-        }
-    }
-
-    private static void processAttachment(
-            Object part,
-            EmailContent content,
-            EmlToPdfRequest request,
-            Method getHeader,
-            Method getContent,
-            String filename,
-            String contentType) {
-
-        content.setAttachmentCount(content.getAttachmentCount() + 1);
-
-        if (filename != null && !filename.trim().isEmpty()) {
-            EmailAttachment attachment = new EmailAttachment();
-            attachment.setFilename(safeMimeDecode(filename));
-            attachment.setContentType(contentType);
-
-            try {
-                String[] contentIdHeaders = (String[]) getHeader.invoke(part, HEADER_CONTENT_ID);
-                if (contentIdHeaders != null) {
-                    for (String contentIdHeader : contentIdHeaders) {
-                        if (contentIdHeader != null && !contentIdHeader.trim().isEmpty()) {
-                            attachment.setEmbedded(true);
-                            String contentId = contentIdHeader.trim().replaceAll("[<>]", "");
-                            attachment.setContentId(contentId);
-                            break;
-                        }
-                    }
-                }
-            } catch (ReflectiveOperationException e) {
-            }
-
-            if ((request != null && request.isIncludeAttachments()) || attachment.isEmbedded()) {
-                extractAttachmentData(part, attachment, getContent, request);
-            }
-
-            content.getAttachments().add(attachment);
-        }
-    }
-
-    private static void extractAttachmentData(
-            Object part, EmailAttachment attachment, Method getContent, EmlToPdfRequest request) {
-        try {
-            Object attachmentContent = getContent.invoke(part);
-            byte[] attachmentData = null;
-
-            if (attachmentContent instanceof InputStream inputStream) {
-                try (InputStream stream = inputStream) {
-                    attachmentData = stream.readAllBytes();
-                } catch (IOException e) {
-                    if (attachment.isEmbedded()) {
-                        attachmentData = new byte[0];
-                    } else {
-                        throw new RuntimeException(e);
-                    }
-                }
-            } else if (attachmentContent instanceof byte[] byteArray) {
-                attachmentData = byteArray;
-            } else if (attachmentContent instanceof String stringContent) {
-                attachmentData = stringContent.getBytes(StandardCharsets.UTF_8);
-            }
-
-            if (attachmentData != null) {
-                long maxSizeMB = request != null ? request.getMaxAttachmentSizeMB() : 10L;
-                long maxSizeBytes = maxSizeMB * 1024 * 1024;
-
-                if (attachmentData.length <= maxSizeBytes || attachment.isEmbedded()) {
-                    attachment.setData(attachmentData);
-                    attachment.setSizeBytes(attachmentData.length);
-                } else {
-                    attachment.setSizeBytes(attachmentData.length);
-                }
-            }
-        } catch (ReflectiveOperationException | RuntimeException e) {
-            // Continue without attachment data
-        }
-    }
-
-    private static String extractBasicHeader(String emlContent, String headerName) {
-        try {
-            String[] lines = emlContent.split("\r?\n");
-            for (int i = 0; i < lines.length; i++) {
-                String line = lines[i];
-                if (line.toLowerCase().startsWith(headerName.toLowerCase())) {
-                    StringBuilder value =
-                            new StringBuilder(line.substring(headerName.length()).trim());
-                    for (int j = i + 1; j < lines.length; j++) {
-                        if (lines[j].startsWith(" ") || lines[j].startsWith("\t")) {
-                            value.append(" ").append(lines[j].trim());
-                        } else {
-                            break;
-                        }
-                    }
-                    return safeMimeDecode(value.toString());
-                }
-                if (line.trim().isEmpty()) break;
-            }
-        } catch (RuntimeException e) {
-            // Ignore errors in header extraction
-        }
-        return "";
-    }
-
-    private static String extractHtmlBody(String emlContent) {
-        try {
-            String lowerContent = emlContent.toLowerCase();
-            int htmlStart = lowerContent.indexOf(HEADER_CONTENT_TYPE + " " + TEXT_HTML);
-            if (htmlStart == -1) return null;
-
-            int bodyStart = emlContent.indexOf("\r\n\r\n", htmlStart);
-            if (bodyStart == -1) bodyStart = emlContent.indexOf("\n\n", htmlStart);
-            if (bodyStart == -1) return null;
-
-            bodyStart += (emlContent.charAt(bodyStart + 1) == '\r') ? 4 : 2;
-            int bodyEnd = findPartEnd(emlContent, bodyStart);
-
-            return emlContent.substring(bodyStart, bodyEnd).trim();
-        } catch (Exception e) {
-            return null;
-        }
-    }
-
-    private static String extractTextBody(String emlContent) {
-        try {
-            String lowerContent = emlContent.toLowerCase();
-            int textStart = lowerContent.indexOf(HEADER_CONTENT_TYPE + " " + TEXT_PLAIN);
-            if (textStart == -1) {
-                int bodyStart = emlContent.indexOf("\r\n\r\n");
-                if (bodyStart == -1) bodyStart = emlContent.indexOf("\n\n");
-                if (bodyStart != -1) {
-                    bodyStart += (emlContent.charAt(bodyStart + 1) == '\r') ? 4 : 2;
-                    int bodyEnd = findPartEnd(emlContent, bodyStart);
-                    return emlContent.substring(bodyStart, bodyEnd).trim();
-                }
-                return null;
-            }
-
-            int bodyStart = emlContent.indexOf("\r\n\r\n", textStart);
-            if (bodyStart == -1) bodyStart = emlContent.indexOf("\n\n", textStart);
-            if (bodyStart == -1) return null;
-
-            bodyStart += (emlContent.charAt(bodyStart + 1) == '\r') ? 4 : 2;
-            int bodyEnd = findPartEnd(emlContent, bodyStart);
-
-            return emlContent.substring(bodyStart, bodyEnd).trim();
-        } catch (RuntimeException e) {
-            return null;
-        }
-    }
-
-    private static int findPartEnd(String content, int start) {
-        String[] lines = content.substring(start).split("\r?\n");
-        StringBuilder result = new StringBuilder();
-
-        for (String line : lines) {
-            if (line.startsWith("--") && line.length() > 10) break;
-            result.append(line).append("\n");
-        }
-
-        return start + result.length();
-    }
-
-    private static List<EmailAttachment> extractAttachmentsBasic(String emlContent) {
-        List<EmailAttachment> attachments = new ArrayList<>();
-        try {
-            String[] lines = emlContent.split("\r?\n");
-            boolean inHeaders = true;
-            String currentContentType = "";
-            String currentDisposition = "";
-            String currentFilename = "";
-            String currentEncoding = "";
-
-            for (String line : lines) {
-                String lowerLine = line.toLowerCase().trim();
-
-                if (line.trim().isEmpty()) {
-                    inHeaders = false;
-                    if (isAttachment(currentDisposition, currentFilename, currentContentType)) {
-                        EmailAttachment attachment = new EmailAttachment();
-                        attachment.setFilename(currentFilename);
-                        attachment.setContentType(currentContentType);
-                        attachment.setTransferEncoding(currentEncoding);
-                        attachments.add(attachment);
-                    }
-                    currentContentType = "";
-                    currentDisposition = "";
-                    currentFilename = "";
-                    currentEncoding = "";
-                    inHeaders = true;
-                    continue;
-                }
-
-                if (!inHeaders) continue;
-
-                if (lowerLine.startsWith(HEADER_CONTENT_TYPE)) {
-                    currentContentType = line.substring(HEADER_CONTENT_TYPE.length()).trim();
-                } else if (lowerLine.startsWith(HEADER_CONTENT_DISPOSITION)) {
-                    currentDisposition = line.substring(HEADER_CONTENT_DISPOSITION.length()).trim();
-                    currentFilename = extractFilenameFromDisposition(currentDisposition);
-                } else if (lowerLine.startsWith(HEADER_CONTENT_TRANSFER_ENCODING)) {
-                    currentEncoding =
-                            line.substring(HEADER_CONTENT_TRANSFER_ENCODING.length()).trim();
-                }
-            }
-        } catch (RuntimeException e) {
-            // Continue with empty list
-        }
-        return attachments;
-    }
-
-    private static boolean isAttachment(String disposition, String filename, String contentType) {
-        return (disposition.toLowerCase().contains(DISPOSITION_ATTACHMENT) && !filename.isEmpty())
-                || (!filename.isEmpty() && !contentType.toLowerCase().startsWith("text/"))
-                || (contentType.toLowerCase().contains("application/") && !filename.isEmpty());
-    }
-
-    private static String extractFilenameFromDisposition(String disposition) {
-        if (disposition == null || !disposition.contains("filename=")) {
-            return "";
-        }
-
-        // Handle filename*= (RFC 2231 encoded filename)
-        if (disposition.toLowerCase().contains("filename*=")) {
-            int filenameStarStart = disposition.toLowerCase().indexOf("filename*=") + 10;
-            int filenameStarEnd = disposition.indexOf(";", filenameStarStart);
-            if (filenameStarEnd == -1) filenameStarEnd = disposition.length();
-            String extendedFilename =
-                    disposition.substring(filenameStarStart, filenameStarEnd).trim();
-            extendedFilename = extendedFilename.replaceAll("^\"|\"$", "");
-
-            if (extendedFilename.contains("'")) {
-                String[] parts = extendedFilename.split("'", 3);
-                if (parts.length == 3) {
-                    return EmlProcessingUtils.decodeUrlEncoded(parts[2]);
-                }
-            }
-        }
-
-        // Handle regular filename=
-        int filenameStart = disposition.toLowerCase().indexOf("filename=") + 9;
-        int filenameEnd = disposition.indexOf(";", filenameStart);
-        if (filenameEnd == -1) filenameEnd = disposition.length();
-        String filename = disposition.substring(filenameStart, filenameEnd).trim();
-        filename = filename.replaceAll("^\"|\"$", "");
-        return safeMimeDecode(filename);
-    }
-
-    public static String safeMimeDecode(String headerValue) {
-        if (headerValue == null || headerValue.trim().isEmpty()) {
-            return "";
-        }
-
-        if (!mimeUtilityChecked) {
-            synchronized (EmlParser.class) {
-                if (!mimeUtilityChecked) {
-                    initializeMimeUtilityDecoding();
-                }
-            }
-        }
-
-        if (mimeUtilityDecodeTextMethod != null) {
-            try {
-                return (String) mimeUtilityDecodeTextMethod.invoke(null, headerValue.trim());
-            } catch (ReflectiveOperationException | RuntimeException e) {
-                // Fall through to custom implementation
-            }
-        }
-
-        return EmlProcessingUtils.decodeMimeHeader(headerValue.trim());
-    }
-
-    private static void initializeMimeUtilityDecoding() {
-        try {
-            Class<?> mimeUtilityClass = Class.forName("jakarta.mail.internet.MimeUtility");
-            mimeUtilityDecodeTextMethod = mimeUtilityClass.getMethod("decodeText", String.class);
-        } catch (ClassNotFoundException | NoSuchMethodException e) {
-            mimeUtilityDecodeTextMethod = null;
-        }
-        mimeUtilityChecked = true;
-    }
-
-    @Data
-    public static class EmailContent {
-        private String subject;
-        private String from;
-        private String to;
-        private String cc;
-        private String bcc;
-        private Date date;
-        private String dateString; // For basic parsing fallback
-        private String htmlBody;
-        private String textBody;
-        private int attachmentCount;
-        private List<EmailAttachment> attachments = new ArrayList<>();
-
-        public void setHtmlBody(String htmlBody) {
-            this.htmlBody = htmlBody != null ? htmlBody.replaceAll("\r", "") : null;
-        }
-
-        public void setTextBody(String textBody) {
-            this.textBody = textBody != null ? textBody.replaceAll("\r", "") : null;
-        }
-    }
-
-    @Data
-    public static class EmailAttachment {
-        private String filename;
-        private String contentType;
-        private byte[] data;
-        private boolean embedded;
-        private String embeddedFilename;
-        private long sizeBytes;
-        private String contentId;
-        private String disposition;
-        private String transferEncoding;
-
-        public void setData(byte[] data) {
-            this.data = data;
-            if (data != null) {
-                this.sizeBytes = data.length;
-            }
-        }
-    }
-}
@@ -1,601 +0,0 @@
-package stirling.software.common.util;
-
-import java.nio.charset.Charset;
-import java.nio.charset.StandardCharsets;
-import java.util.Base64;
-import java.util.Locale;
-import java.util.Map;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import lombok.experimental.UtilityClass;
-
-import stirling.software.common.model.api.converters.EmlToPdfRequest;
-import stirling.software.common.model.api.converters.HTMLToPdfRequest;
-
-@UtilityClass
-public class EmlProcessingUtils {
-
-    // Style constants
-    private static final int DEFAULT_FONT_SIZE = 12;
-    private static final String DEFAULT_FONT_FAMILY = "Helvetica, sans-serif";
-    private static final float DEFAULT_LINE_HEIGHT = 1.4f;
-    private static final String DEFAULT_ZOOM = "1.0";
-    private static final String DEFAULT_TEXT_COLOR = "#202124";
-    private static final String DEFAULT_BACKGROUND_COLOR = "#ffffff";
-    private static final String DEFAULT_BORDER_COLOR = "#e8eaed";
-    private static final String ATTACHMENT_BACKGROUND_COLOR = "#f9f9f9";
-    private static final String ATTACHMENT_BORDER_COLOR = "#eeeeee";
-
-    private static final int EML_CHECK_LENGTH = 8192;
-    private static final int MIN_HEADER_COUNT_FOR_VALID_EML = 2;
-
-    // MIME type detection
-    private static final Map<String, String> EXTENSION_TO_MIME_TYPE =
-            Map.of(
-                    ".png", "image/png",
-                    ".jpg", "image/jpeg",
-                    ".jpeg", "image/jpeg",
-                    ".gif", "image/gif",
-                    ".bmp", "image/bmp",
-                    ".webp", "image/webp",
-                    ".svg", "image/svg+xml",
-                    ".ico", "image/x-icon",
-                    ".tiff", "image/tiff",
-                    ".tif", "image/tiff");
-
-    public static void validateEmlInput(byte[] emlBytes) {
-        if (emlBytes == null || emlBytes.length == 0) {
-            throw new IllegalArgumentException("EML file is empty or null");
-        }
-
-        if (isInvalidEmlFormat(emlBytes)) {
-            throw new IllegalArgumentException("Invalid EML file format");
-        }
-    }
-
-    private static boolean isInvalidEmlFormat(byte[] emlBytes) {
-        try {
-            int checkLength = Math.min(emlBytes.length, EML_CHECK_LENGTH);
-            String content;
-
-            try {
-                content = new String(emlBytes, 0, checkLength, StandardCharsets.UTF_8);
-                if (content.contains("\uFFFD")) {
-                    content = new String(emlBytes, 0, checkLength, StandardCharsets.ISO_8859_1);
-                }
-            } catch (Exception e) {
-                content = new String(emlBytes, 0, checkLength, StandardCharsets.ISO_8859_1);
-            }
-
-            String lowerContent = content.toLowerCase(Locale.ROOT);
-
-            boolean hasFrom =
-                    lowerContent.contains("from:") || lowerContent.contains("return-path:");
-            boolean hasSubject = lowerContent.contains("subject:");
-            boolean hasMessageId = lowerContent.contains("message-id:");
-            boolean hasDate = lowerContent.contains("date:");
-            boolean hasTo =
-                    lowerContent.contains("to:")
-                            || lowerContent.contains("cc:")
-                            || lowerContent.contains("bcc:");
-            boolean hasMimeStructure =
-                    lowerContent.contains("multipart/")
-                            || lowerContent.contains("text/plain")
-                            || lowerContent.contains("text/html")
-                            || lowerContent.contains("boundary=");
-
-            int headerCount = 0;
-            if (hasFrom) headerCount++;
-            if (hasSubject) headerCount++;
-            if (hasMessageId) headerCount++;
-            if (hasDate) headerCount++;
-            if (hasTo) headerCount++;
-
-            return headerCount < MIN_HEADER_COUNT_FOR_VALID_EML && !hasMimeStructure;
-
-        } catch (RuntimeException e) {
-            return false;
-        }
-    }
-
-    public static String generateEnhancedEmailHtml(
-            EmlParser.EmailContent content,
-            EmlToPdfRequest request,
-            CustomHtmlSanitizer customHtmlSanitizer) {
-        StringBuilder html = new StringBuilder();
-
-        html.append(
-                String.format(
-                        """
-                <!DOCTYPE html>
-                <html lang="en"><head><meta charset="UTF-8">
-                <title>%s</title>
-                <style>
-                """,
-                        sanitizeText(content.getSubject(), customHtmlSanitizer)));
-
-        appendEnhancedStyles(html);
-
-        html.append(
-                """
-                </style>
-                </head><body>
-                """);
-
-        html.append(
-                String.format(
-                        """
-                <div class="email-container">
-                <div class="email-header">
-                <h1>%s</h1>
-                <div class="email-meta">
-                <div><strong>From:</strong> %s</div>
-                <div><strong>To:</strong> %s</div>
-                """,
-                        sanitizeText(content.getSubject(), customHtmlSanitizer),
-                        sanitizeText(content.getFrom(), customHtmlSanitizer),
-                        sanitizeText(content.getTo(), customHtmlSanitizer)));
-
-        if (content.getCc() != null && !content.getCc().trim().isEmpty()) {
-            html.append(
-                    String.format(
-                            "<div><strong>CC:</strong> %s</div>\n",
-                            sanitizeText(content.getCc(), customHtmlSanitizer)));
-        }
-
-        if (content.getBcc() != null && !content.getBcc().trim().isEmpty()) {
-            html.append(
-                    String.format(
-                            "<div><strong>BCC:</strong> %s</div>\n",
-                            sanitizeText(content.getBcc(), customHtmlSanitizer)));
-        }
-
-        if (content.getDate() != null) {
-            html.append(
-                    String.format(
-                            "<div><strong>Date:</strong> %s</div>\n",
-                            PdfAttachmentHandler.formatEmailDate(content.getDate())));
-        } else if (content.getDateString() != null && !content.getDateString().trim().isEmpty()) {
-            html.append(
-                    String.format(
-                            "<div><strong>Date:</strong> %s</div>\n",
-                            sanitizeText(content.getDateString(), customHtmlSanitizer)));
-        }
-
-        html.append("</div></div>\n");
-
-        html.append("<div class=\"email-body\">\n");
-        if (content.getHtmlBody() != null && !content.getHtmlBody().trim().isEmpty()) {
-            String processedHtml =
-                    processEmailHtmlBody(content.getHtmlBody(), content, customHtmlSanitizer);
-            html.append(processedHtml);
-        } else if (content.getTextBody() != null && !content.getTextBody().trim().isEmpty()) {
-            html.append(
-                    String.format(
-                            "<div class=\"text-body\">%s</div>",
-                            convertTextToHtml(content.getTextBody(), customHtmlSanitizer)));
-        } else {
-            html.append("<div class=\"no-content\"><p><em>No content available</em></p></div>");
-        }
-        html.append("</div>\n");
-
-        if (content.getAttachmentCount() > 0 || !content.getAttachments().isEmpty()) {
-            appendAttachmentsSection(html, content, request, customHtmlSanitizer);
-        }
-
-        html.append("</div>\n</body></html>");
-        return html.toString();
-    }
-
-    public static String processEmailHtmlBody(
-            String htmlBody,
-            EmlParser.EmailContent emailContent,
-            CustomHtmlSanitizer customHtmlSanitizer) {
-        if (htmlBody == null) return "";
-
-        String processed =
-                customHtmlSanitizer != null ? customHtmlSanitizer.sanitize(htmlBody) : htmlBody;
-
-        processed = processed.replaceAll("(?i)\\s*position\\s*:\\s*fixed[^;]*;?", "");
-        processed = processed.replaceAll("(?i)\\s*position\\s*:\\s*absolute[^;]*;?", "");
-
-        if (emailContent != null && !emailContent.getAttachments().isEmpty()) {
-            processed = PdfAttachmentHandler.processInlineImages(processed, emailContent);
-        }
-
-        return processed;
-    }
-
-    public static String convertTextToHtml(
-            String textBody, CustomHtmlSanitizer customHtmlSanitizer) {
-        if (textBody == null) return "";
-
-        String html =
-                customHtmlSanitizer != null
-                        ? customHtmlSanitizer.sanitize(textBody)
-                        : escapeHtml(textBody);
-
-        html = html.replace("\r\n", "\n").replace("\r", "\n");
-        html = html.replace("\n", "<br>\n");
-
-        html =
-                html.replaceAll(
-                        "(https?://[\\w\\-._~:/?#\\[\\]@!$&'()*+,;=%]+)",
-                        "<a href=\"$1\" style=\"color: #1a73e8; text-decoration: underline;\">$1</a>");
-
-        html =
-                html.replaceAll(
-                        "([a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\\.[a-zA-Z]{2,63})",
-                        "<a href=\"mailto:$1\" style=\"color: #1a73e8; text-decoration: underline;\">$1</a>");
-
-        return html;
-    }
-
-    private static void appendEnhancedStyles(StringBuilder html) {
-        String css =
-                String.format(
-                        """
-                body {
-                  font-family: %s;
-                  font-size: %dpx;
-                  line-height: %s;
-                  color: %s;
-                  margin: 0;
-                  padding: 16px;
-                  background-color: %s;
-                }
-
-                .email-container {
-                  width: 100%%;
-                  max-width: 100%%;
-                  margin: 0 auto;
-                }
-
-                .email-header {
-                  padding-bottom: 10px;
-                  border-bottom: 1px solid %s;
-                  margin-bottom: 10px;
-                }
-
-                .email-header h1 {
-                  margin: 0 0 10px 0;
-                  font-size: %dpx;
-                  font-weight: bold;
-                }
-
-                .email-meta div {
-                  margin-bottom: 2px;
-                  font-size: %dpx;
-                }
-
-                .email-body {
-                  word-wrap: break-word;
-                }
-
-                .attachment-section {
-                  margin-top: 15px;
-                  padding: 10px;
-                  background-color: %s;
-                  border: 1px solid %s;
-                  border-radius: 3px;
-                }
-
-                .attachment-section h3 {
-                  margin: 0 0 8px 0;
-                  font-size: %dpx;
-                }
-
-                .attachment-item {
-                  padding: 5px 0;
-                }
-
-                .attachment-icon {
-                  margin-right: 5px;
-                }
-
-                .attachment-details, .attachment-type {
-                  font-size: %dpx;
-                  color: #555555;
-                }
-
-                .attachment-inclusion-note, .attachment-info-note {
-                  margin-top: 8px;
-                  padding: 6px;
-                  font-size: %dpx;
-                  border-radius: 3px;
-                }
-
-                .attachment-inclusion-note {
-                  background-color: #e6ffed;
-                  border: 1px solid #d4f7dc;
-                  color: #006420;
-                }
-
-                .attachment-info-note {
-                  background-color: #fff9e6;
-                  border: 1px solid #fff0c2;
-                  color: #664d00;
-                }
-
-                .attachment-link-container {
-                  display: flex;
-                  align-items: center;
-                  padding: 8px;
-                  background-color: #f8f9fa;
-                  border: 1px solid #dee2e6;
-                  border-radius: 4px;
-                  margin: 4px 0;
-                }
-
-                .attachment-link-container:hover {
-                  background-color: #e9ecef;
-                }
-
-                .attachment-note {
-                  font-size: %dpx;
-                  color: #6c757d;
-                  font-style: italic;
-                  margin-left: 8px;
-                }
-
-                .no-content {
-                  padding: 20px;
-                  text-align: center;
-                  color: #666;
-                  font-style: italic;
-                }
-
-                .text-body {
-                  white-space: pre-wrap;
-                }
-
-                img {
-                  max-width: 100%%;
-                  height: auto;
-                  display: block;
-                }
-                """,
-                        DEFAULT_FONT_FAMILY,
-                        DEFAULT_FONT_SIZE,
-                        DEFAULT_LINE_HEIGHT,
-                        DEFAULT_TEXT_COLOR,
-                        DEFAULT_BACKGROUND_COLOR,
-                        DEFAULT_BORDER_COLOR,
-                        DEFAULT_FONT_SIZE + 4,
-                        DEFAULT_FONT_SIZE - 1,
-                        ATTACHMENT_BACKGROUND_COLOR,
-                        ATTACHMENT_BORDER_COLOR,
-                        DEFAULT_FONT_SIZE + 1,
-                        DEFAULT_FONT_SIZE - 2,
-                        DEFAULT_FONT_SIZE - 2,
-                        DEFAULT_FONT_SIZE - 3);
-
-        html.append(css);
-    }
-
-    private static void appendAttachmentsSection(
-            StringBuilder html,
-            EmlParser.EmailContent content,
-            EmlToPdfRequest request,
-            CustomHtmlSanitizer customHtmlSanitizer) {
-        html.append("<div class=\"attachment-section\">\n");
-        int displayedAttachmentCount =
-                content.getAttachmentCount() > 0
-                        ? content.getAttachmentCount()
-                        : content.getAttachments().size();
-        html.append("<h3>Attachments (").append(displayedAttachmentCount).append(")</h3>\n");
-
-        if (!content.getAttachments().isEmpty()) {
-            for (int i = 0; i < content.getAttachments().size(); i++) {
-                EmlParser.EmailAttachment attachment = content.getAttachments().get(i);
-
-                String embeddedFilename =
-                        attachment.getFilename() != null
-                                ? attachment.getFilename()
-                                : ("attachment_" + i);
-                attachment.setEmbeddedFilename(embeddedFilename);
-
-                String sizeStr = GeneralUtils.formatBytes(attachment.getSizeBytes());
-                String contentType =
-                        attachment.getContentType() != null
-                                        && !attachment.getContentType().isEmpty()
-                                ? ", " + escapeHtml(attachment.getContentType())
-                                : "";
-
-                String attachmentId = "attachment_" + i;
-                html.append(
-                        String.format(
-                                """
-                        <div class="attachment-item" id="%s">
-                        <span class="attachment-icon" data-filename="%s">@</span>
-                        <span class="attachment-name">%s</span>
-                        <span class="attachment-details">(%s%s)</span>
-                        </div>
-                        """,
-                                attachmentId,
-                                escapeHtml(embeddedFilename),
-                                escapeHtml(EmlParser.safeMimeDecode(attachment.getFilename())),
-                                sizeStr,
-                                contentType));
-            }
-        }
-
-        if (request != null && request.isIncludeAttachments()) {
-            html.append(
-                    """
-                    <div class="attachment-info-note">
-                    <p><em>Attachments are embedded in the file.</em></p>
-                    </div>
-                    """);
-        } else {
-            html.append(
-                    """
-                    <div class="attachment-info-note">
-                    <p><em>Attachment information displayed - files not included in PDF.</em></p>
-                    </div>
-                    """);
-        }
-        html.append("</div>\n");
-    }
-
-    public static HTMLToPdfRequest createHtmlRequest(EmlToPdfRequest request) {
-        HTMLToPdfRequest htmlRequest = new HTMLToPdfRequest();
-
-        if (request != null) {
-            htmlRequest.setFileInput(request.getFileInput());
-        }
-
-        htmlRequest.setZoom(Float.parseFloat(DEFAULT_ZOOM));
-        return htmlRequest;
-    }
-
-    public static String detectMimeType(String filename, String existingMimeType) {
-        if (existingMimeType != null && !existingMimeType.isEmpty()) {
-            return existingMimeType;
-        }
-
-        if (filename != null) {
-            String lowerFilename = filename.toLowerCase();
-            for (Map.Entry<String, String> entry : EXTENSION_TO_MIME_TYPE.entrySet()) {
-                if (lowerFilename.endsWith(entry.getKey())) {
-                    return entry.getValue();
-                }
-            }
-        }
-
-        return "image/png";
-    }
-
-    public static String decodeUrlEncoded(String encoded) {
-        try {
-            return java.net.URLDecoder.decode(encoded, StandardCharsets.UTF_8);
-        } catch (Exception e) {
-            return encoded; // Return original if decoding fails
-        }
-    }
-
-    public static String decodeMimeHeader(String encodedText) {
-        if (encodedText == null || encodedText.trim().isEmpty()) {
-            return encodedText;
-        }
-
-        try {
-            StringBuilder result = new StringBuilder();
-            Pattern concatenatedPattern =
-                    Pattern.compile(
-                            "(=\\?[^?]+\\?[BbQq]\\?[^?]*\\?=)(\\s*=\\?[^?]+\\?[BbQq]\\?[^?]*\\?=)+");
-            Matcher concatenatedMatcher = concatenatedPattern.matcher(encodedText);
-            String processedText =
-                    concatenatedMatcher.replaceAll(
-                            match -> match.group().replaceAll("\\s+(?==\\?)", ""));
-
-            Pattern mimePattern = Pattern.compile("=\\?([^?]+)\\?([BbQq])\\?([^?]*)\\?=");
-            Matcher matcher = mimePattern.matcher(processedText);
-            int lastEnd = 0;
-
-            while (matcher.find()) {
-                result.append(processedText, lastEnd, matcher.start());
-
-                String charset = matcher.group(1);
-                String encoding = matcher.group(2).toUpperCase();
-                String encodedValue = matcher.group(3);
-
-                try {
-                    String decodedValue =
-                            switch (encoding) {
-                                case "B" -> {
-                                    String cleanBase64 = encodedValue.replaceAll("\\s", "");
-                                    byte[] decodedBytes = Base64.getDecoder().decode(cleanBase64);
-                                    Charset targetCharset;
-                                    try {
-                                        targetCharset = Charset.forName(charset);
-                                    } catch (Exception e) {
-                                        targetCharset = StandardCharsets.UTF_8;
-                                    }
-                                    yield new String(decodedBytes, targetCharset);
-                                }
-                                case "Q" -> decodeQuotedPrintable(encodedValue, charset);
-                                default -> matcher.group(0); // Return original if unknown encoding
-                            };
-                    result.append(decodedValue);
-                } catch (RuntimeException e) {
-                    result.append(matcher.group(0)); // Keep original on decode error
-                }
-
-                lastEnd = matcher.end();
-            }
-
-            result.append(processedText.substring(lastEnd));
-            return result.toString();
-        } catch (Exception e) {
-            return encodedText; // Return original on any parsing error
-        }
-    }
-
-    private static String decodeQuotedPrintable(String encodedText, String charset) {
-        StringBuilder result = new StringBuilder();
-        for (int i = 0; i < encodedText.length(); i++) {
-            char c = encodedText.charAt(i);
-            switch (c) {
-                case '=' -> {
-                    if (i + 2 < encodedText.length()) {
-                        String hex = encodedText.substring(i + 1, i + 3);
-                        try {
-                            int value = Integer.parseInt(hex, 16);
-                            result.append((char) value);
-                            i += 2;
-                        } catch (NumberFormatException e) {
-                            result.append(c);
-                        }
-                    } else if (i + 1 == encodedText.length()
-                            || (i + 2 == encodedText.length()
-                                    && encodedText.charAt(i + 1) == '\n')) {
-                        if (i + 1 < encodedText.length() && encodedText.charAt(i + 1) == '\n') {
-                            i++; // Skip the newline too
-                        }
-                    } else {
-                        result.append(c);
-                    }
-                }
-                case '_' -> result.append(' '); // Space encoding in Q encoding
-                default -> result.append(c);
-            }
-        }
-
-        byte[] bytes = result.toString().getBytes(StandardCharsets.ISO_8859_1);
-        try {
-            Charset targetCharset = Charset.forName(charset);
-            return new String(bytes, targetCharset);
-        } catch (Exception e) {
-            try {
-                return new String(bytes, StandardCharsets.UTF_8);
-            } catch (Exception fallbackException) {
-                return new String(bytes, StandardCharsets.ISO_8859_1);
-            }
-        }
-    }
-
-    public static String escapeHtml(String text) {
-        if (text == null) return "";
-        return text.replace("&", "&amp;")
-                .replace("<", "&lt;")
-                .replace(">", "&gt;")
-                .replace("\"", "&quot;")
-                .replace("'", "&#39;");
-    }
-
-    public static String sanitizeText(String text, CustomHtmlSanitizer customHtmlSanitizer) {
-        if (customHtmlSanitizer != null) {
-            return customHtmlSanitizer.sanitize(text);
-        } else {
-            return escapeHtml(text);
-        }
-    }
-
-    public static String simplifyHtmlContent(String htmlContent) {
-        String simplified = htmlContent.replaceAll("(?i)<script[^>]*>.*?</script>", "");
-        simplified = simplified.replaceAll("(?i)<style[^>]*>.*?</style>", "");
-        return simplified;
-    }
-}
@@ -26,8 +26,8 @@ public class FileToPdf {
            HTMLToPdfRequest request,
            byte[] fileBytes,
            String fileName,
-            TempFileManager tempFileManager,
-            CustomHtmlSanitizer customHtmlSanitizer)
+            boolean disableSanitize,
+            TempFileManager tempFileManager)
            throws IOException, InterruptedException {

        try (TempFile tempOutputFile = new TempFile(tempFileManager, ".pdf")) {
@@ -39,15 +39,14 @@ public class FileToPdf {
                if (fileName.toLowerCase().endsWith(".html")) {
                    String sanitizedHtml =
                            sanitizeHtmlContent(
-                                    new String(fileBytes, StandardCharsets.UTF_8),
-                                    customHtmlSanitizer);
+                                    new String(fileBytes, StandardCharsets.UTF_8), disableSanitize);
                    Files.write(
                            tempInputFile.getPath(),
                            sanitizedHtml.getBytes(StandardCharsets.UTF_8));
                } else if (fileName.toLowerCase().endsWith(".zip")) {
                    Files.write(tempInputFile.getPath(), fileBytes);
                    sanitizeHtmlFilesInZip(
-                            tempInputFile.getPath(), tempFileManager, customHtmlSanitizer);
+                            tempInputFile.getPath(), disableSanitize, tempFileManager);
                } else {
                    throw ExceptionUtils.createHtmlFileRequiredException();
                }
@@ -79,15 +78,12 @@ public class FileToPdf {
        } // tempOutputFile auto-closed
    }

-    private static String sanitizeHtmlContent(
-            String htmlContent, CustomHtmlSanitizer customHtmlSanitizer) {
-        return customHtmlSanitizer.sanitize(htmlContent);
+    private static String sanitizeHtmlContent(String htmlContent, boolean disableSanitize) {
+        return (!disableSanitize) ? CustomHtmlSanitizer.sanitize(htmlContent) : htmlContent;
    }

    private static void sanitizeHtmlFilesInZip(
-            Path zipFilePath,
-            TempFileManager tempFileManager,
-            CustomHtmlSanitizer customHtmlSanitizer)
+            Path zipFilePath, boolean disableSanitize, TempFileManager tempFileManager)
            throws IOException {
        try (TempDirectory tempUnzippedDir = new TempDirectory(tempFileManager)) {
            try (ZipInputStream zipIn =
@@ -103,8 +99,7 @@ public class FileToPdf {
                                || entry.getName().toLowerCase().endsWith(".htm")) {
                            String content =
                                    new String(zipIn.readAllBytes(), StandardCharsets.UTF_8);
-                            String sanitizedContent =
-                                    sanitizeHtmlContent(content, customHtmlSanitizer);
+                            String sanitizedContent = sanitizeHtmlContent(content, disableSanitize);
                            Files.write(
                                    filePath, sanitizedContent.getBytes(StandardCharsets.UTF_8));
                        } else {
@@ -14,10 +14,8 @@ import java.util.Arrays;
 import java.util.Enumeration;
 import java.util.List;
 import java.util.Locale;
-import java.util.Set;
 import java.util.UUID;

-import org.springframework.core.io.ClassPathResource;
 import org.springframework.core.io.Resource;
 import org.springframework.core.io.ResourceLoader;
 import org.springframework.core.io.support.ResourcePatternUtils;
@@ -35,17 +33,6 @@ import stirling.software.common.configuration.InstallationPathConfig;
@Slf4j
 public class GeneralUtils {

-    private static final Set<String> DEFAULT_VALID_SCRIPTS =
-            Set.of("png_to_webp.py", "split_photos.py");
-    private static final Set<String> DEFAULT_VALID_PIPELINE =
-            Set.of(
-                    "OCR images.json",
-                    "Prepare-pdfs-for-email.json",
-                    "split-rotate-auto-rename.json");
-
-    private static final String DEFAULT_WEBUI_CONFIGS_DIR = "defaultWebUIConfigs";
-    private static final String PYTHON_SCRIPTS_DIR = "python";
-
    public static File convertMultipartFileToFile(MultipartFile multipartFile) throws IOException {
        String customTempDir = System.getenv("STIRLING_TEMPFILES_DIRECTORY");
        if (customTempDir == null || customTempDir.isEmpty()) {
@@ -455,124 +442,6 @@ public class GeneralUtils {
        }
    }

-    /**
-     * Extracts the default pipeline configurations from the classpath to the installation path.
-     * Creates directories if needed and copies default JSON files.
-     *
-     * <p>Existing files will be overwritten atomically (when supported). In case of unsupported
-     * atomic moves, falls back to non-atomic replace.
-     *
-     * @throws IOException if an I/O error occurs during file operations
-     */
-    public static void extractPipeline() throws IOException {
-        Path pipelineDir =
-                Paths.get(InstallationPathConfig.getPipelinePath(), DEFAULT_WEBUI_CONFIGS_DIR);
-        Files.createDirectories(pipelineDir);
-
-        for (String name : DEFAULT_VALID_PIPELINE) {
-            if (!Paths.get(name).getFileName().toString().equals(name)) {
-                log.error("Invalid pipeline file name: {}", name);
-                throw new IllegalArgumentException("Invalid pipeline file name: " + name);
-            }
-            Path target = pipelineDir.resolve(name);
-            ClassPathResource res =
-                    new ClassPathResource(
-                            "static/pipeline/" + DEFAULT_WEBUI_CONFIGS_DIR + "/" + name);
-            if (!res.exists()) {
-                log.error("Resource not found: {}", res.getPath());
-                throw new IOException("Resource not found: " + res.getPath());
-            }
-            copyResourceToFile(res, target);
-        }
-    }
-
-    /**
-     * Extracts the specified Python script from the classpath to the installation path. Validates
-     * name and copies file atomically when possible, overwriting existing.
-     *
-     * <p>Existing files will be overwritten atomically (when supported).
-     *
-     * @param scriptName the name of the script to extract
-     * @return the path to the extracted script
-     * @throws IllegalArgumentException if the script name is invalid or not allowed
-     * @throws IOException if an I/O error occurs
-     */
-    public static Path extractScript(String scriptName) throws IOException {
-        // Validate input
-        if (scriptName == null || scriptName.trim().isEmpty()) {
-            throw new IllegalArgumentException("scriptName must not be null or empty");
-        }
-        if (scriptName.contains("..") || scriptName.contains("/")) {
-            throw new IllegalArgumentException(
-                    "scriptName must not contain path traversal characters");
-        }
-        if (!Paths.get(scriptName).getFileName().toString().equals(scriptName)) {
-            throw new IllegalArgumentException(
-                    "scriptName must not contain path traversal characters");
-        }
-
-        if (!DEFAULT_VALID_SCRIPTS.contains(scriptName)) {
-            throw new IllegalArgumentException(
-                    "scriptName must be either 'png_to_webp.py' or 'split_photos.py'");
-        }
-
-        Path scriptsDir = Paths.get(InstallationPathConfig.getScriptsPath(), PYTHON_SCRIPTS_DIR);
-        Files.createDirectories(scriptsDir);
-
-        Path target = scriptsDir.resolve(scriptName);
-        ClassPathResource res =
-                new ClassPathResource("static/" + PYTHON_SCRIPTS_DIR + "/" + scriptName);
-        if (!res.exists()) {
-            log.error("Resource not found: {}", res.getPath());
-            throw new IOException("Resource not found: " + res.getPath());
-        }
-        copyResourceToFile(res, target);
-        return target;
-    }
-
-    /**
-     * Copies a resource from the classpath to a specified target file.
-     *
-     * @param resource the ClassPathResource to copy
-     * @param target the target Path where the resource will be copied
-     * @throws IOException if an I/O error occurs during the copy operation
-     */
-    private static void copyResourceToFile(ClassPathResource resource, Path target)
-            throws IOException {
-        Path dir = target.getParent();
-        Path tmp = Files.createTempFile(dir, target.getFileName().toString(), ".tmp");
-        try (InputStream in = resource.getInputStream()) {
-            Files.copy(in, tmp, StandardCopyOption.REPLACE_EXISTING);
-            try {
-                Files.move(tmp, target, StandardCopyOption.ATOMIC_MOVE);
-            } catch (AtomicMoveNotSupportedException e) {
-                log.warn(
-                        "Atomic move not supported, falling back to non-atomic move for {}",
-                        target,
-                        e);
-                Files.move(tmp, target, StandardCopyOption.REPLACE_EXISTING);
-            }
-        } catch (FileAlreadyExistsException e) {
-            log.debug("File already exists at {}, attempting to replace it.", target);
-            Files.move(tmp, target, StandardCopyOption.REPLACE_EXISTING);
-        } catch (AccessDeniedException e) {
-            log.error("Access denied while attempting to copy resource to {}", target, e);
-            throw e;
-        } catch (FileSystemException e) {
-            log.error("File system error occurred while copying resource to {}", target, e);
-            throw e;
-        } catch (IOException e) {
-            log.error("Failed to copy resource to {}", target, e);
-            throw e;
-        } finally {
-            try {
-                Files.deleteIfExists(tmp);
-            } catch (IOException e) {
-                log.warn("Failed to delete temporary file {}", tmp, e);
-            }
-        }
-    }
-
    public static boolean isVersionHigher(String currentVersion, String compareVersion) {
        if (currentVersion == null || compareVersion == null) {
            return false;
@@ -5,11 +5,8 @@ import java.awt.image.*;
 import java.io.IOException;
 import java.io.InputStream;
 import java.nio.ByteBuffer;
-import java.util.Iterator;

 import javax.imageio.ImageIO;
-import javax.imageio.ImageReader;
-import javax.imageio.stream.ImageInputStream;

 import org.springframework.web.multipart.MultipartFile;

@@ -118,36 +115,7 @@ public class ImageProcessingUtils {

    public static BufferedImage loadImageWithExifOrientation(MultipartFile file)
            throws IOException {
-        BufferedImage image = null;
-        String filename = file.getOriginalFilename();
-
-        if (filename != null && filename.toLowerCase().endsWith(".psd")) {
-            // For PSD files, try explicit ImageReader
-            Iterator<ImageReader> readers = ImageIO.getImageReadersByFormatName("PSD");
-            if (readers.hasNext()) {
-                ImageReader reader = readers.next();
-                try (ImageInputStream iis = ImageIO.createImageInputStream(file.getInputStream())) {
-                    reader.setInput(iis);
-                    image = reader.read(0);
-                } finally {
-                    reader.dispose();
-                }
-            }
-            if (image == null) {
-                throw new IOException(
-                        "Unable to read image from file: "
-                                + filename
-                                + ". Supported PSD formats: RGB/CMYK/Gray 8-32 bit, RLE/ZIP compression");
-            }
-        } else {
-            // For non-PSD files, use standard ImageIO
-            image = ImageIO.read(file.getInputStream());
-        }
-
-        if (image == null) {
-            throw new IOException("Unable to read image from file: " + filename);
-        }
-
+        BufferedImage image = ImageIO.read(file.getInputStream());
        double orientation = extractImageOrientation(file.getInputStream());
        return applyOrientation(image, orientation);
    }
@@ -1,680 +0,0 @@
-package stirling.software.common.util;
-
-import static stirling.software.common.util.AttachmentUtils.setCatalogViewerPreferences;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Base64;
-import java.util.Date;
-import java.util.GregorianCalendar;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-import java.util.Set;
-import java.util.TimeZone;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import org.apache.pdfbox.pdmodel.PDDocument;
-import org.apache.pdfbox.pdmodel.PDDocumentCatalog;
-import org.apache.pdfbox.pdmodel.PDDocumentNameDictionary;
-import org.apache.pdfbox.pdmodel.PDEmbeddedFilesNameTreeNode;
-import org.apache.pdfbox.pdmodel.PDPage;
-import org.apache.pdfbox.pdmodel.PageMode;
-import org.apache.pdfbox.pdmodel.common.PDRectangle;
-import org.apache.pdfbox.pdmodel.common.filespecification.PDComplexFileSpecification;
-import org.apache.pdfbox.pdmodel.common.filespecification.PDEmbeddedFile;
-import org.apache.pdfbox.pdmodel.interactive.annotation.PDAnnotationFileAttachment;
-import org.apache.pdfbox.pdmodel.interactive.annotation.PDAppearanceDictionary;
-import org.apache.pdfbox.pdmodel.interactive.annotation.PDAppearanceStream;
-import org.apache.pdfbox.text.PDFTextStripper;
-import org.apache.pdfbox.text.TextPosition;
-import org.jetbrains.annotations.NotNull;
-import org.springframework.web.multipart.MultipartFile;
-
-import lombok.Data;
-import lombok.Getter;
-import lombok.experimental.UtilityClass;
-
-import stirling.software.common.service.CustomPDFDocumentFactory;
-
-@UtilityClass
-public class PdfAttachmentHandler {
-    // Note: This class is designed for EML attachments, not general PDF attachments.
-
-    private static final String ATTACHMENT_MARKER = "@";
-    private static final float ATTACHMENT_ICON_WIDTH = 12f;
-    private static final float ATTACHMENT_ICON_HEIGHT = 14f;
-    private static final float ANNOTATION_X_OFFSET = 2f;
-    private static final float ANNOTATION_Y_OFFSET = 10f;
-
-    public static byte[] attachFilesToPdf(
-            byte[] pdfBytes,
-            List<EmlParser.EmailAttachment> attachments,
-            CustomPDFDocumentFactory pdfDocumentFactory)
-            throws IOException {
-
-        if (attachments == null || attachments.isEmpty()) {
-            return pdfBytes;
-        }
-
-        try (PDDocument document = pdfDocumentFactory.load(pdfBytes);
-                ByteArrayOutputStream outputStream = new ByteArrayOutputStream()) {
-
-            List<MultipartFile> multipartAttachments = new ArrayList<>(attachments.size());
-            for (int i = 0; i < attachments.size(); i++) {
-                EmlParser.EmailAttachment attachment = attachments.get(i);
-                if (attachment.getData() != null && attachment.getData().length > 0) {
-                    String embeddedFilename =
-                            attachment.getFilename() != null
-                                    ? attachment.getFilename()
-                                    : ("attachment_" + i);
-                    attachment.setEmbeddedFilename(embeddedFilename);
-                    multipartAttachments.add(createMultipartFile(attachment));
-                }
-            }
-
-            if (!multipartAttachments.isEmpty()) {
-                Map<Integer, String> indexToFilenameMap =
-                        addAttachmentsToDocumentWithMapping(
-                                document, multipartAttachments, attachments);
-                setCatalogViewerPreferences(document, PageMode.USE_ATTACHMENTS);
-                addAttachmentAnnotationsToDocumentWithMapping(
-                        document, attachments, indexToFilenameMap);
-            }
-
-            document.save(outputStream);
-            return outputStream.toByteArray();
-        } catch (RuntimeException e) {
-            throw new IOException(
-                    "Invalid PDF structure or processing error: " + e.getMessage(), e);
-        } catch (Exception e) {
-            throw new IOException("Error attaching files to PDF: " + e.getMessage(), e);
-        }
-    }
-
-    private static MultipartFile createMultipartFile(EmlParser.EmailAttachment attachment) {
-        return new MultipartFile() {
-            @Override
-            public @NotNull String getName() {
-                return "attachment";
-            }
-
-            @Override
-            public String getOriginalFilename() {
-                return attachment.getFilename() != null
-                        ? attachment.getFilename()
-                        : "attachment_" + System.currentTimeMillis();
-            }
-
-            @Override
-            public String getContentType() {
-                return attachment.getContentType() != null
-                        ? attachment.getContentType()
-                        : "application/octet-stream";
-            }
-
-            @Override
-            public boolean isEmpty() {
-                return attachment.getData() == null || attachment.getData().length == 0;
-            }
-
-            @Override
-            public long getSize() {
-                return attachment.getData() != null ? attachment.getData().length : 0;
-            }
-
-            @Override
-            public byte @NotNull [] getBytes() {
-                return attachment.getData() != null ? attachment.getData() : new byte[0];
-            }
-
-            @Override
-            public @NotNull InputStream getInputStream() {
-                byte[] data = attachment.getData();
-                return new ByteArrayInputStream(data != null ? data : new byte[0]);
-            }
-
-            @Override
-            public void transferTo(@NotNull File dest) throws IOException, IllegalStateException {
-                try (FileOutputStream fos = new FileOutputStream(dest)) {
-                    byte[] data = attachment.getData();
-                    if (data != null) {
-                        fos.write(data);
-                    }
-                }
-            }
-        };
-    }
-
-    private static String ensureUniqueFilename(String filename, Set<String> existingNames) {
-        if (!existingNames.contains(filename)) {
-            return filename;
-        }
-
-        String baseName;
-        String extension = "";
-        int lastDot = filename.lastIndexOf('.');
-        if (lastDot > 0) {
-            baseName = filename.substring(0, lastDot);
-            extension = filename.substring(lastDot);
-        } else {
-            baseName = filename;
-        }
-
-        int counter = 1;
-        String uniqueName;
-        do {
-            uniqueName = baseName + "_" + counter + extension;
-            counter++;
-        } while (existingNames.contains(uniqueName));
-
-        return uniqueName;
-    }
-
-    private static @NotNull PDRectangle calculateAnnotationRectangle(
-            PDPage page, float x, float y) {
-        PDRectangle cropBox = page.getCropBox();
-
-        // ISO 32000-1:2008 Section 8.3: PDF coordinate system transforms
-        int rotation = page.getRotation();
-        float pdfX = x;
-        float pdfY = cropBox.getHeight() - y;
-
-        switch (rotation) {
-            case 90 -> {
-                float temp = pdfX;
-                pdfX = pdfY;
-                pdfY = cropBox.getWidth() - temp;
-            }
-            case 180 -> {
-                pdfX = cropBox.getWidth() - pdfX;
-                pdfY = y;
-            }
-            case 270 -> {
-                float temp = pdfX;
-                pdfX = cropBox.getHeight() - pdfY;
-                pdfY = temp;
-            }
-            default -> {}
-        }
-
-        float iconHeight = ATTACHMENT_ICON_HEIGHT;
-        float paddingX = 2.0f;
-        float paddingY = 2.0f;
-
-        PDRectangle rect =
-                new PDRectangle(
-                        pdfX + ANNOTATION_X_OFFSET + paddingX,
-                        pdfY - iconHeight + ANNOTATION_Y_OFFSET + paddingY,
-                        ATTACHMENT_ICON_WIDTH,
-                        iconHeight);
-
-        PDRectangle mediaBox = page.getMediaBox();
-        if (rect.getLowerLeftX() < mediaBox.getLowerLeftX()
-                || rect.getLowerLeftY() < mediaBox.getLowerLeftY()
-                || rect.getUpperRightX() > mediaBox.getUpperRightX()
-                || rect.getUpperRightY() > mediaBox.getUpperRightY()) {
-
-            float adjustedX =
-                    Math.max(
-                            mediaBox.getLowerLeftX(),
-                            Math.min(
-                                    rect.getLowerLeftX(),
-                                    mediaBox.getUpperRightX() - rect.getWidth()));
-            float adjustedY =
-                    Math.max(
-                            mediaBox.getLowerLeftY(),
-                            Math.min(
-                                    rect.getLowerLeftY(),
-                                    mediaBox.getUpperRightY() - rect.getHeight()));
-            rect = new PDRectangle(adjustedX, adjustedY, rect.getWidth(), rect.getHeight());
-        }
-
-        return rect;
-    }
-
-    public static String processInlineImages(
-            String htmlContent, EmlParser.EmailContent emailContent) {
-        if (htmlContent == null || emailContent == null) return htmlContent;
-
-        Map<String, EmlParser.EmailAttachment> contentIdMap = new HashMap<>();
-        for (EmlParser.EmailAttachment attachment : emailContent.getAttachments()) {
-            if (attachment.isEmbedded()
-                    && attachment.getContentId() != null
-                    && attachment.getData() != null) {
-                contentIdMap.put(attachment.getContentId(), attachment);
-            }
-        }
-
-        if (contentIdMap.isEmpty()) return htmlContent;
-
-        Pattern cidPattern =
-                Pattern.compile(
-                        "(?i)<img[^>]*\\ssrc\\s*=\\s*['\"]cid:([^'\"]+)['\"][^>]*>",
-                        Pattern.CASE_INSENSITIVE);
-        Matcher matcher = cidPattern.matcher(htmlContent);
-
-        StringBuilder result = new StringBuilder();
-        while (matcher.find()) {
-            String contentId = matcher.group(1);
-            EmlParser.EmailAttachment attachment = contentIdMap.get(contentId);
-
-            if (attachment != null && attachment.getData() != null) {
-                String mimeType =
-                        EmlProcessingUtils.detectMimeType(
-                                attachment.getFilename(), attachment.getContentType());
-
-                String base64Data = Base64.getEncoder().encodeToString(attachment.getData());
-                String dataUri = "data:" + mimeType + ";base64," + base64Data;
-
-                String replacement =
-                        matcher.group(0).replaceFirst("cid:" + Pattern.quote(contentId), dataUri);
-                matcher.appendReplacement(result, Matcher.quoteReplacement(replacement));
-            } else {
-                matcher.appendReplacement(result, Matcher.quoteReplacement(matcher.group(0)));
-            }
-        }
-        matcher.appendTail(result);
-
-        return result.toString();
-    }
-
-    public static String formatEmailDate(Date date) {
-        if (date == null) return "";
-
-        SimpleDateFormat formatter =
-                new SimpleDateFormat("EEE, MMM d, yyyy 'at' h:mm a z", Locale.ENGLISH);
-        formatter.setTimeZone(TimeZone.getTimeZone("UTC"));
-        return formatter.format(date);
-    }
-
-    @Data
-    public static class MarkerPosition {
-        private int pageIndex;
-        private float x;
-        private float y;
-        private String character;
-        private String filename;
-
-        public MarkerPosition(int pageIndex, float x, float y, String character, String filename) {
-            this.pageIndex = pageIndex;
-            this.x = x;
-            this.y = y;
-            this.character = character;
-            this.filename = filename;
-        }
-    }
-
-    public static class AttachmentMarkerPositionFinder extends PDFTextStripper {
-        @Getter private final List<MarkerPosition> positions = new ArrayList<>();
-        private int currentPageIndex;
-        protected boolean sortByPosition;
-        private boolean isInAttachmentSection;
-        private boolean attachmentSectionFound;
-        private final StringBuilder currentText = new StringBuilder();
-
-        private static final Pattern ATTACHMENT_SECTION_PATTERN =
-                Pattern.compile("attachments\\s*\\(\\d+\\)", Pattern.CASE_INSENSITIVE);
-
-        private static final Pattern FILENAME_PATTERN =
-                Pattern.compile("@\\s*([^\\s\\(]+(?:\\.[a-zA-Z0-9]+)?)");
-
-        public AttachmentMarkerPositionFinder() {
-            super();
-            this.currentPageIndex = 0;
-            this.sortByPosition = false; // Disable sorting to preserve document order
-            this.isInAttachmentSection = false;
-            this.attachmentSectionFound = false;
-        }
-
-        @Override
-        public String getText(PDDocument document) throws IOException {
-            super.getText(document);
-
-            if (sortByPosition) {
-                positions.sort(
-                        (a, b) -> {
-                            int pageCompare = Integer.compare(a.getPageIndex(), b.getPageIndex());
-                            if (pageCompare != 0) return pageCompare;
-                            return Float.compare(
-                                    b.getY(), a.getY()); // Descending Y per PDF coordinate system
-                        });
-            }
-
-            return ""; // Return empty string as we only need positions
-        }
-
-        @Override
-        protected void startPage(PDPage page) throws IOException {
-            super.startPage(page);
-        }
-
-        @Override
-        protected void endPage(PDPage page) throws IOException {
-            currentPageIndex++;
-            super.endPage(page);
-        }
-
-        @Override
-        protected void writeString(String string, List<TextPosition> textPositions)
-                throws IOException {
-            String lowerString = string.toLowerCase();
-
-            if (ATTACHMENT_SECTION_PATTERN.matcher(lowerString).find()) {
-                isInAttachmentSection = true;
-                attachmentSectionFound = true;
-            }
-
-            if (isInAttachmentSection
-                    && (lowerString.contains("</body>")
-                            || lowerString.contains("</html>")
-                            || (attachmentSectionFound
-                                    && lowerString.trim().isEmpty()
-                                    && string.length() > 50))) {
-                isInAttachmentSection = false;
-            }
-
-            if (isInAttachmentSection) {
-                currentText.append(string);
-
-                for (int i = 0; (i = string.indexOf(ATTACHMENT_MARKER, i)) != -1; i++) {
-                    if (i < textPositions.size()) {
-                        TextPosition textPosition = textPositions.get(i);
-
-                        String filename = extractFilenameAfterMarker(string, i);
-
-                        MarkerPosition position =
-                                new MarkerPosition(
-                                        currentPageIndex,
-                                        textPosition.getXDirAdj(),
-                                        textPosition.getYDirAdj(),
-                                        ATTACHMENT_MARKER,
-                                        filename);
-                        positions.add(position);
-                    }
-                }
-            }
-            super.writeString(string, textPositions);
-        }
-
-        @Override
-        public void setSortByPosition(boolean sortByPosition) {
-            this.sortByPosition = sortByPosition;
-        }
-
-        private String extractFilenameAfterMarker(String text, int markerIndex) {
-            String afterMarker = text.substring(markerIndex + 1);
-
-            Matcher matcher = FILENAME_PATTERN.matcher("@" + afterMarker);
-            if (matcher.find()) {
-                return matcher.group(1);
-            }
-
-            String[] parts = afterMarker.split("[\\s\\(\\)]+");
-            for (String part : parts) {
-                part = part.trim();
-                if (part.length() > 3 && part.contains(".")) {
-                    return part;
-                }
-            }
-
-            return null;
-        }
-    }
-
-    private static Map<Integer, String> addAttachmentsToDocumentWithMapping(
-            PDDocument document,
-            List<MultipartFile> attachments,
-            List<EmlParser.EmailAttachment> originalAttachments)
-            throws IOException {
-
-        PDDocumentCatalog catalog = document.getDocumentCatalog();
-
-        if (catalog == null) {
-            throw new IOException("PDF document catalog is not accessible");
-        }
-
-        PDDocumentNameDictionary documentNames = catalog.getNames();
-        if (documentNames == null) {
-            documentNames = new PDDocumentNameDictionary(catalog);
-            catalog.setNames(documentNames);
-        }
-
-        PDEmbeddedFilesNameTreeNode embeddedFilesTree = documentNames.getEmbeddedFiles();
-        if (embeddedFilesTree == null) {
-            embeddedFilesTree = new PDEmbeddedFilesNameTreeNode();
-            documentNames.setEmbeddedFiles(embeddedFilesTree);
-        }
-
-        Map<String, PDComplexFileSpecification> existingNames = embeddedFilesTree.getNames();
-        if (existingNames == null) {
-            existingNames = new HashMap<>();
-        }
-
-        Map<Integer, String> indexToFilenameMap = new HashMap<>();
-
-        for (int i = 0; i < attachments.size(); i++) {
-            MultipartFile attachment = attachments.get(i);
-            String filename = attachment.getOriginalFilename();
-            if (filename == null || filename.trim().isEmpty()) {
-                filename = "attachment_" + i;
-            }
-
-            String normalizedFilename =
-                    isAscii(filename)
-                            ? filename
-                            : java.text.Normalizer.normalize(
-                                    filename, java.text.Normalizer.Form.NFC);
-            String uniqueFilename =
-                    ensureUniqueFilename(normalizedFilename, existingNames.keySet());
-
-            indexToFilenameMap.put(i, uniqueFilename);
-
-            PDEmbeddedFile embeddedFile = new PDEmbeddedFile(document, attachment.getInputStream());
-            embeddedFile.setSize((int) attachment.getSize());
-
-            GregorianCalendar currentTime = new GregorianCalendar();
-            embeddedFile.setCreationDate(currentTime);
-            embeddedFile.setModDate(currentTime);
-
-            String contentType = attachment.getContentType();
-            if (contentType != null && !contentType.trim().isEmpty()) {
-                embeddedFile.setSubtype(contentType);
-            }
-
-            PDComplexFileSpecification fileSpecification = new PDComplexFileSpecification();
-            fileSpecification.setFile(uniqueFilename);
-            fileSpecification.setFileUnicode(uniqueFilename);
-            fileSpecification.setEmbeddedFile(embeddedFile);
-            fileSpecification.setEmbeddedFileUnicode(embeddedFile);
-
-            existingNames.put(uniqueFilename, fileSpecification);
-        }
-
-        embeddedFilesTree.setNames(existingNames);
-        documentNames.setEmbeddedFiles(embeddedFilesTree);
-        catalog.setNames(documentNames);
-
-        return indexToFilenameMap;
-    }
-
-    private static void addAttachmentAnnotationsToDocumentWithMapping(
-            PDDocument document,
-            List<EmlParser.EmailAttachment> attachments,
-            Map<Integer, String> indexToFilenameMap)
-            throws IOException {
-
-        if (document.getNumberOfPages() == 0 || attachments == null || attachments.isEmpty()) {
-            return;
-        }
-
-        AttachmentMarkerPositionFinder finder = new AttachmentMarkerPositionFinder();
-        finder.setSortByPosition(false); // Keep document order to maintain pairing
-        finder.getText(document);
-        List<MarkerPosition> markerPositions = finder.getPositions();
-
-        int annotationsToAdd = Math.min(markerPositions.size(), attachments.size());
-
-        for (int i = 0; i < annotationsToAdd; i++) {
-            MarkerPosition position = markerPositions.get(i);
-
-            String filenameNearMarker = position.getFilename();
-
-            EmlParser.EmailAttachment matchingAttachment =
-                    findAttachmentByFilename(attachments, filenameNearMarker);
-
-            if (matchingAttachment != null) {
-                String embeddedFilename =
-                        findEmbeddedFilenameForAttachment(matchingAttachment, indexToFilenameMap);
-
-                if (embeddedFilename != null) {
-                    PDPage page = document.getPage(position.getPageIndex());
-                    addAttachmentAnnotationToPageWithMapping(
-                            document,
-                            page,
-                            matchingAttachment,
-                            embeddedFilename,
-                            position.getX(),
-                            position.getY(),
-                            i);
-                } else {
-                    // No embedded filename found for attachment
-                }
-            } else {
-                // No matching attachment found for filename near marker
-            }
-        }
-    }
-
-    private static EmlParser.EmailAttachment findAttachmentByFilename(
-            List<EmlParser.EmailAttachment> attachments, String targetFilename) {
-        if (targetFilename == null || targetFilename.trim().isEmpty()) {
-            return null;
-        }
-
-        String normalizedTarget = normalizeFilename(targetFilename);
-
-        // First try exact match
-        for (EmlParser.EmailAttachment attachment : attachments) {
-            if (attachment.getFilename() != null) {
-                String normalizedAttachment = normalizeFilename(attachment.getFilename());
-                if (normalizedAttachment.equals(normalizedTarget)) {
-                    return attachment;
-                }
-            }
-        }
-
-        // Then try contains match
-        for (EmlParser.EmailAttachment attachment : attachments) {
-            if (attachment.getFilename() != null) {
-                String normalizedAttachment = normalizeFilename(attachment.getFilename());
-                if (normalizedAttachment.contains(normalizedTarget)
-                        || normalizedTarget.contains(normalizedAttachment)) {
-                    return attachment;
-                }
-            }
-        }
-
-        return null;
-    }
-
-    private static String findEmbeddedFilenameForAttachment(
-            EmlParser.EmailAttachment attachment, Map<Integer, String> indexToFilenameMap) {
-
-        String attachmentFilename = attachment.getFilename();
-        if (attachmentFilename == null) {
-            return null;
-        }
-
-        for (Map.Entry<Integer, String> entry : indexToFilenameMap.entrySet()) {
-            String embeddedFilename = entry.getValue();
-            if (embeddedFilename != null
-                    && (embeddedFilename.equals(attachmentFilename)
-                            || embeddedFilename.contains(attachmentFilename)
-                            || attachmentFilename.contains(embeddedFilename))) {
-                return embeddedFilename;
-            }
-        }
-
-        return null;
-    }
-
-    private static String normalizeFilename(String filename) {
-        if (filename == null) return "";
-        return filename.toLowerCase()
-                .trim()
-                .replaceAll("\\s+", " ")
-                .replaceAll("[^a-zA-Z0-9._-]", "");
-    }
-
-    private static void addAttachmentAnnotationToPageWithMapping(
-            PDDocument document,
-            PDPage page,
-            EmlParser.EmailAttachment attachment,
-            String embeddedFilename,
-            float x,
-            float y,
-            int attachmentIndex)
-            throws IOException {
-
-        PDAnnotationFileAttachment fileAnnotation = new PDAnnotationFileAttachment();
-
-        PDRectangle rect = calculateAnnotationRectangle(page, x, y);
-        fileAnnotation.setRectangle(rect);
-
-        fileAnnotation.setPrinted(false);
-        fileAnnotation.setHidden(false);
-        fileAnnotation.setNoView(false);
-        fileAnnotation.setNoZoom(true);
-        fileAnnotation.setNoRotate(true);
-
-        try {
-            PDAppearanceDictionary appearance = new PDAppearanceDictionary();
-            PDAppearanceStream normalAppearance = new PDAppearanceStream(document);
-            normalAppearance.setBBox(new PDRectangle(0, 0, rect.getWidth(), rect.getHeight()));
-            appearance.setNormalAppearance(normalAppearance);
-            fileAnnotation.setAppearance(appearance);
-        } catch (RuntimeException e) {
-            fileAnnotation.setAppearance(null);
-        }
-
-        PDEmbeddedFilesNameTreeNode efTree =
-                document.getDocumentCatalog().getNames().getEmbeddedFiles();
-        if (efTree != null) {
-            Map<String, PDComplexFileSpecification> efMap = efTree.getNames();
-            if (efMap != null) {
-                PDComplexFileSpecification fileSpec = efMap.get(embeddedFilename);
-                if (fileSpec != null) {
-                    fileAnnotation.setFile(fileSpec);
-                } else {
-                    // Could not find embedded file
-                }
-            }
-        }
-
-        fileAnnotation.setContents(
-                "Attachment " + (attachmentIndex + 1) + ": " + attachment.getFilename());
-        fileAnnotation.setAnnotationName(
-                "EmbeddedFile_" + attachmentIndex + "_" + embeddedFilename);
-
-        page.getAnnotations().add(fileAnnotation);
-    }
-
-    private static boolean isAscii(String str) {
-        if (str == null) return true;
-        for (int i = 0; i < str.length(); i++) {
-            if (str.charAt(i) > 127) {
-                return false;
-            }
-        }
-        return true;
-    }
-}
@@ -35,7 +35,6 @@ import io.github.pixee.security.Filenames;

 import lombok.extern.slf4j.Slf4j;

-import stirling.software.common.model.ApplicationProperties;
 import stirling.software.common.service.CustomPDFDocumentFactory;

@Slf4j
@@ -146,18 +145,13 @@ public class PdfUtils {
            throws IOException, Exception {

        // Validate and limit DPI to prevent excessive memory usage
-        int maxSafeDpi = 500; // Default maximum safe DPI
-        ApplicationProperties properties =
-                ApplicationContextProvider.getBean(ApplicationProperties.class);
-        if (properties != null && properties.getSystem() != null) {
-            maxSafeDpi = properties.getSystem().getMaxDPI();
-        }
-        if (DPI > maxSafeDpi) {
+        final int MAX_SAFE_DPI = 500; // Maximum safe DPI to prevent memory issues
+        if (DPI > MAX_SAFE_DPI) {
            throw ExceptionUtils.createIllegalArgumentException(
                    "error.dpiExceedsLimit",
                    "DPI value {0} exceeds maximum safe limit of {1}. High DPI values can cause memory issues and crashes. Please use a lower DPI value.",
                    DPI,
-                    maxSafeDpi);
+                    MAX_SAFE_DPI);
        }

        try (PDDocument document = pdfDocumentFactory.load(inputStream)) {
@@ -14,10 +14,8 @@ public class RequestUriUtils {
                || requestURI.startsWith(contextPath + "/images/")
                || requestURI.startsWith(contextPath + "/public/")
                || requestURI.startsWith(contextPath + "/pdfjs/")
-                || requestURI.startsWith(contextPath + "/pdfjs-legacy/")
                || requestURI.startsWith(contextPath + "/login")
                || requestURI.startsWith(contextPath + "/error")
-                || requestURI.startsWith(contextPath + "/favicon")
                || requestURI.endsWith(".svg")
                || requestURI.endsWith(".png")
                || requestURI.endsWith(".ico")
@@ -7,19 +7,24 @@ 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.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.InjectMocks;
 import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
 import org.springframework.http.ResponseEntity;
@@ -40,44 +45,62 @@ class AutoJobPostMappingIntegrationTest {

    private AutoJobAspect autoJobAspect;

-    @Mock private JobExecutorService jobExecutorService;
+    @Mock
+    private JobExecutorService jobExecutorService;

-    @Mock private HttpServletRequest request;
+    @Mock
+    private HttpServletRequest request;

-    @Mock private FileOrUploadService fileOrUploadService;
+    @Mock
+    private FileOrUploadService fileOrUploadService;

-    @Mock private FileStorage fileStorage;
+    @Mock
+    private FileStorage fileStorage;

-    @Mock private ResourceMonitor resourceMonitor;

-    @Mock private JobQueue jobQueue;
+    @Mock
+    private ResourceMonitor resourceMonitor;
+
+    @Mock
+    private JobQueue jobQueue;

    @BeforeEach
    void setUp() {
-        autoJobAspect =
-                new AutoJobAspect(jobExecutorService, request, fileOrUploadService, fileStorage);
+        autoJobAspect = new AutoJobAspect(
+            jobExecutorService,
+            request,
+            fileOrUploadService,
+            fileStorage
+        );
    }

-    @Mock private ProceedingJoinPoint joinPoint;
+    @Mock
+    private ProceedingJoinPoint joinPoint;

-    @Mock private AutoJobPostMapping autoJobPostMapping;
+    @Mock
+    private AutoJobPostMapping autoJobPostMapping;

-    @Captor private ArgumentCaptor<Supplier<Object>> workCaptor;
+    @Captor
+    private ArgumentCaptor<Supplier<Object>> workCaptor;

-    @Captor private ArgumentCaptor<Boolean> asyncCaptor;
+    @Captor
+    private ArgumentCaptor<Boolean> asyncCaptor;

-    @Captor private ArgumentCaptor<Long> timeoutCaptor;
+    @Captor
+    private ArgumentCaptor<Long> timeoutCaptor;

-    @Captor private ArgumentCaptor<Boolean> queueableCaptor;
+    @Captor
+    private ArgumentCaptor<Boolean> queueableCaptor;

-    @Captor private ArgumentCaptor<Integer> resourceWeightCaptor;
+    @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};
+        Object[] args = new Object[] { pdfFile };

        when(joinPoint.getArgs()).thenReturn(args);
        when(request.getParameter("async")).thenReturn("true");
@@ -90,8 +113,9 @@ class AutoJobPostMappingIntegrationTest {
        MultipartFile mockFile = mock(MultipartFile.class);
        when(fileStorage.retrieveFile("test-file-id")).thenReturn(mockFile);

+
        when(jobExecutorService.runJobGeneric(
-                        anyBoolean(), any(Supplier.class), anyLong(), anyBoolean(), anyInt()))
+                anyBoolean(), any(Supplier.class), anyLong(), anyBoolean(), anyInt()))
                .thenReturn(ResponseEntity.ok("success"));

        // When
@@ -100,13 +124,12 @@ class AutoJobPostMappingIntegrationTest {
        // Then
        assertEquals(ResponseEntity.ok("success"), result);

-        verify(jobExecutorService)
-                .runJobGeneric(
-                        asyncCaptor.capture(),
-                        workCaptor.capture(),
-                        timeoutCaptor.capture(),
-                        queueableCaptor.capture(),
-                        resourceWeightCaptor.capture());
+        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");
@@ -135,12 +158,11 @@ class AutoJobPostMappingIntegrationTest {

        // 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();
-                        });
+                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);
@@ -157,7 +179,7 @@ class AutoJobPostMappingIntegrationTest {
        // Given
        PDFFile pdfFile = new PDFFile();
        pdfFile.setFileInput(mock(MultipartFile.class));
-        Object[] args = new Object[] {pdfFile};
+        Object[] args = new Object[] { pdfFile };

        when(joinPoint.getArgs()).thenReturn(args);
        when(request.getParameter("async")).thenReturn("true");
@@ -168,16 +190,14 @@ class AutoJobPostMappingIntegrationTest {

        // Mock job executor to return a successful response
        when(jobExecutorService.runJobGeneric(
-                        anyBoolean(), any(Supplier.class), anyLong(), anyBoolean(), anyInt()))
+                anyBoolean(), any(Supplier.class), anyLong(), anyBoolean(), anyInt()))
                .thenReturn(ResponseEntity.ok("success"));

        // When
        autoJobAspect.wrapWithJobExecution(joinPoint, autoJobPostMapping);

        // Then
-        assertEquals(
-                "stored-file-id",
-                pdfFile.getFileId(),
+        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");

@@ -1,59 +0,0 @@
-package stirling.software.common.model;
-
-import static org.junit.jupiter.api.Assertions.*;
-
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-
-import org.junit.jupiter.api.Test;
-import org.mockito.MockedStatic;
-import org.mockito.Mockito;
-import org.springframework.core.env.ConfigurableEnvironment;
-import org.springframework.core.env.StandardEnvironment;
-
-import stirling.software.common.configuration.InstallationPathConfig;
-
-class ApplicationPropertiesDynamicYamlPropertySourceTest {
-
-    @Test
-    void loads_yaml_into_environment() throws Exception {
-        // YAML-Config in Temp-Datei schreiben
-        String yaml =
-                ""
-                        + "ui:\n"
-                        + "  appName: \"My App\"\n"
-                        + "system:\n"
-                        + "  enableAnalytics: true\n";
-        Path tmp = Files.createTempFile("spdf-settings-", ".yml");
-        Files.writeString(tmp, yaml);
-
-        // Pfad per statischem Mock liefern
-        try (MockedStatic<InstallationPathConfig> mocked =
-                Mockito.mockStatic(InstallationPathConfig.class)) {
-            mocked.when(InstallationPathConfig::getSettingsPath).thenReturn(tmp.toString());
-
-            ConfigurableEnvironment env = new StandardEnvironment();
-            ApplicationProperties props = new ApplicationProperties();
-
-            props.dynamicYamlPropertySource(env); // fügt PropertySource an erster Stelle ein
-
-            assertEquals("My App", env.getProperty("ui.appName"));
-            assertEquals("true", env.getProperty("system.enableAnalytics"));
-        }
-    }
-
-    @Test
-    void throws_when_settings_file_missing() throws Exception {
-        String missing = "/path/does/not/exist/spdf.yml";
-        try (MockedStatic<InstallationPathConfig> mocked =
-                Mockito.mockStatic(InstallationPathConfig.class)) {
-            mocked.when(InstallationPathConfig::getSettingsPath).thenReturn(missing);
-
-            ConfigurableEnvironment env = new StandardEnvironment();
-            ApplicationProperties props = new ApplicationProperties();
-
-            assertThrows(IOException.class, () -> props.dynamicYamlPropertySource(env));
-        }
-    }
-}
@@ -1,248 +0,0 @@
-package stirling.software.common.model;
-
-import static org.junit.jupiter.api.Assertions.*;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-import org.junit.jupiter.api.Test;
-
-import stirling.software.common.model.ApplicationProperties.Driver;
-import stirling.software.common.model.ApplicationProperties.Premium;
-import stirling.software.common.model.ApplicationProperties.Security;
-import stirling.software.common.model.exception.UnsupportedProviderException;
-
-class ApplicationPropertiesLogicTest {
-
-    @Test
-    void system_isAnalyticsEnabled_null_false_true() {
-        ApplicationProperties.System sys = new ApplicationProperties.System();
-
-        sys.setEnableAnalytics(null);
-        assertFalse(sys.isAnalyticsEnabled());
-
-        sys.setEnableAnalytics(Boolean.FALSE);
-        assertFalse(sys.isAnalyticsEnabled());
-
-        sys.setEnableAnalytics(Boolean.TRUE);
-        assertTrue(sys.isAnalyticsEnabled());
-    }
-
-    @Test
-    void tempFileManagement_defaults_and_overrides() {
-        ApplicationProperties.TempFileManagement tfm =
-                new ApplicationProperties.TempFileManagement();
-
-        String expectedBase =
-                java.lang.System.getProperty("java.io.tmpdir").replaceAll("/+$", "")
-                        + "/stirling-pdf";
-        assertEquals(expectedBase, tfm.getBaseTmpDir());
-
-        String expectedLibre = expectedBase + "/libreoffice";
-        assertEquals(expectedLibre, tfm.getLibreofficeDir());
-
-        tfm.setBaseTmpDir("/custom/base");
-        assertEquals("/custom/base", tfm.getBaseTmpDir());
-
-        tfm.setLibreofficeDir("/opt/libre");
-        assertEquals("/opt/libre", tfm.getLibreofficeDir());
-    }
-
-    @Test
-    void oauth2_scope_parsing_and_validity() {
-        Security.OAUTH2 oauth2 = new Security.OAUTH2();
-        oauth2.setIssuer("https://issuer");
-        oauth2.setClientId("client");
-        oauth2.setClientSecret("secret");
-        oauth2.setUseAsUsername("email");
-        oauth2.setScopes("openid, profile ,email");
-        assertTrue(oauth2.isSettingsValid());
-    }
-
-    @Test
-    void security_login_method_flags() {
-        Security sec = new Security();
-
-        sec.getOauth2().setEnabled(true);
-        sec.getSaml2().setEnabled(true);
-
-        assertTrue(sec.isUserPass());
-        assertTrue(sec.isOauth2Active());
-        assertTrue(sec.isSaml2Active());
-
-        sec.setLoginMethod(Security.LoginMethods.NORMAL.toString());
-        assertTrue(sec.isUserPass());
-        assertFalse(sec.isOauth2Active());
-        assertFalse(sec.isSaml2Active());
-    }
-
-    @Test
-    void security_isAltLogin_reflects_oauth2_or_saml2() {
-        Security sec = new Security();
-
-        assertFalse(sec.isAltLogin());
-
-        sec.getOauth2().setEnabled(true);
-        sec.getSaml2().setEnabled(false);
-        assertTrue(sec.isAltLogin());
-
-        sec.getOauth2().setEnabled(false);
-        sec.getSaml2().setEnabled(true);
-        assertTrue(sec.isAltLogin());
-
-        sec.getOauth2().setEnabled(true);
-        sec.getSaml2().setEnabled(true);
-        assertTrue(sec.isAltLogin());
-    }
-
-    @Test
-    void oauth2_client_provider_mapping_and_unsupported() throws UnsupportedProviderException {
-        Security.OAUTH2.Client client = new Security.OAUTH2.Client();
-
-        assertNotNull(client.get("google"));
-        assertNotNull(client.get("github"));
-        assertNotNull(client.get("keycloak"));
-
-        UnsupportedProviderException ex =
-                assertThrows(UnsupportedProviderException.class, () -> client.get("unknown"));
-        assertTrue(ex.getMessage().toLowerCase().contains("not supported"));
-    }
-
-    @Test
-    void premium_google_drive_getters_return_empty_string_on_null_or_blank() {
-        Premium.ProFeatures.GoogleDrive gd = new Premium.ProFeatures.GoogleDrive();
-
-        assertEquals("", gd.getClientId());
-        assertEquals("", gd.getApiKey());
-        assertEquals("", gd.getAppId());
-
-        gd.setClientId(" id ");
-        gd.setApiKey(" key ");
-        gd.setAppId(" app ");
-        assertEquals(" id ", gd.getClientId());
-        assertEquals(" key ", gd.getApiKey());
-        assertEquals(" app ", gd.getAppId());
-    }
-
-    @Test
-    void ui_getters_return_null_for_blank() {
-        ApplicationProperties.Ui ui = new ApplicationProperties.Ui();
-        ui.setAppName("   ");
-        ui.setHomeDescription("");
-        ui.setAppNameNavbar(null);
-
-        assertNull(ui.getAppName());
-        assertNull(ui.getHomeDescription());
-        assertNull(ui.getAppNameNavbar());
-
-        ui.setAppName("Stirling-PDF");
-        ui.setHomeDescription("Home");
-        ui.setAppNameNavbar("Nav");
-        assertEquals("Stirling-PDF", ui.getAppName());
-        assertEquals("Home", ui.getHomeDescription());
-        assertEquals("Nav", ui.getAppNameNavbar());
-    }
-
-    @Test
-    void driver_toString_contains_driver_name() {
-        assertTrue(Driver.H2.toString().contains("h2"));
-        assertTrue(Driver.POSTGRESQL.toString().contains("postgresql"));
-    }
-
-    @Test
-    void session_limits_and_timeouts_have_reasonable_defaults() {
-        ApplicationProperties.ProcessExecutor pe = new ApplicationProperties.ProcessExecutor();
-
-        ApplicationProperties.ProcessExecutor.SessionLimit s = pe.getSessionLimit();
-        assertEquals(2, s.getQpdfSessionLimit());
-        assertEquals(1, s.getTesseractSessionLimit());
-        assertEquals(1, s.getLibreOfficeSessionLimit());
-        assertEquals(1, s.getPdfToHtmlSessionLimit());
-        assertEquals(8, s.getPythonOpenCvSessionLimit());
-        assertEquals(16, s.getWeasyPrintSessionLimit());
-        assertEquals(1, s.getInstallAppSessionLimit());
-        assertEquals(1, s.getCalibreSessionLimit());
-        assertEquals(8, s.getGhostscriptSessionLimit());
-        assertEquals(2, s.getOcrMyPdfSessionLimit());
-
-        ApplicationProperties.ProcessExecutor.TimeoutMinutes t = pe.getTimeoutMinutes();
-        assertEquals(30, t.getTesseractTimeoutMinutes());
-        assertEquals(30, t.getQpdfTimeoutMinutes());
-        assertEquals(30, t.getLibreOfficeTimeoutMinutes());
-        assertEquals(20, t.getPdfToHtmlTimeoutMinutes());
-        assertEquals(30, t.getPythonOpenCvTimeoutMinutes());
-        assertEquals(30, t.getWeasyPrintTimeoutMinutes());
-        assertEquals(60, t.getInstallAppTimeoutMinutes());
-        assertEquals(30, t.getCalibreTimeoutMinutes());
-        assertEquals(30, t.getGhostscriptTimeoutMinutes());
-        assertEquals(30, t.getOcrMyPdfTimeoutMinutes());
-    }
-
-    @Deprecated
-    @Test
-    void enterprise_metadata_defaults() {
-        ApplicationProperties.EnterpriseEdition ee = new ApplicationProperties.EnterpriseEdition();
-        ApplicationProperties.EnterpriseEdition.CustomMetadata eMeta = ee.getCustomMetadata();
-        eMeta.setCreator("  ");
-        eMeta.setProducer(null);
-        assertEquals("Stirling-PDF", eMeta.getCreator());
-        assertEquals("Stirling-PDF", eMeta.getProducer());
-    }
-
-    @Test
-    void premium_metadata_defaults() {
-        Premium.ProFeatures pf = new Premium.ProFeatures();
-        Premium.ProFeatures.CustomMetadata pMeta = pf.getCustomMetadata();
-        pMeta.setCreator("");
-        pMeta.setProducer("");
-        assertEquals("Stirling-PDF", pMeta.getCreator());
-        assertEquals("Stirling-PDF", pMeta.getProducer());
-    }
-
-    @Test
-    void premium_metadata_awesome() {
-        Premium.ProFeatures pf = new Premium.ProFeatures();
-        Premium.ProFeatures.CustomMetadata pMeta = pf.getCustomMetadata();
-        pMeta.setCreator("Awesome PDF Tool");
-        pMeta.setProducer("Awesome PDF Tool");
-        assertEquals("Awesome PDF Tool", pMeta.getCreator());
-        assertEquals("Awesome PDF Tool", pMeta.getProducer());
-    }
-
-    @Test
-    void string_isValid_handles_null_empty_blank_and_trimmed() {
-        ApplicationProperties.Security.OAUTH2 oauth2 = new ApplicationProperties.Security.OAUTH2();
-
-        assertFalse(oauth2.isValid((String) null, "issuer"));
-        assertFalse(oauth2.isValid("", "issuer"));
-        assertFalse(oauth2.isValid("   ", "issuer"));
-
-        assertTrue(oauth2.isValid("x", "issuer"));
-        assertTrue(oauth2.isValid("  x  ", "issuer")); // trimmt intern
-    }
-
-    @Test
-    void collection_isValid_handles_null_and_empty() {
-        ApplicationProperties.Security.OAUTH2 oauth2 = new ApplicationProperties.Security.OAUTH2();
-
-        Collection<String> nullColl = null;
-        Collection<String> empty = List.of();
-
-        assertFalse(oauth2.isValid(nullColl, "scopes"));
-        assertFalse(oauth2.isValid(empty, "scopes"));
-    }
-
-    @Test
-    void collection_isValid_true_when_non_empty_even_if_element_is_blank() {
-        ApplicationProperties.Security.OAUTH2 oauth2 = new ApplicationProperties.Security.OAUTH2();
-
-        // Aktuelles Verhalten: prüft NUR !isEmpty(), nicht Inhalt
-        Collection<String> oneBlank = new ArrayList<>();
-        oneBlank.add("   ");
-
-        assertTrue(
-                oauth2.isValid(oneBlank, "scopes"),
-                "Dokumentiert aktuelles Verhalten: nicht-leere Liste gilt als gültig, auch wenn Element leer/blank ist");
-    }
-}
@@ -1,80 +0,0 @@
-package stirling.software.common.model;
-
-import static org.junit.jupiter.api.Assertions.*;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.nio.charset.StandardCharsets;
-import java.nio.file.Files;
-import java.nio.file.Path;
-
-import org.junit.jupiter.api.Test;
-import org.springframework.core.io.FileSystemResource;
-import org.springframework.core.io.Resource;
-
-import okhttp3.mockwebserver.MockResponse;
-import okhttp3.mockwebserver.MockWebServer;
-
-class ApplicationPropertiesSaml2HttpTest {
-
-    @Test
-    void idpMetadataUri_http_is_resolved_via_mockwebserver() throws Exception {
-        try (MockWebServer server = new MockWebServer()) {
-            server.enqueue(
-                    new MockResponse()
-                            .setResponseCode(200)
-                            .addHeader("Content-Type", "application/xml")
-                            .setBody("<EntityDescriptor/>"));
-            server.start();
-
-            String url = server.url("/meta").toString();
-
-            var s = new ApplicationProperties.Security.SAML2();
-            s.setIdpMetadataUri(url);
-
-            try (InputStream in = s.getIdpMetadataUri()) {
-                String body = new String(in.readAllBytes(), StandardCharsets.UTF_8);
-                assertTrue(body.contains("EntityDescriptor"));
-            }
-        }
-    }
-
-    @Test
-    void idpMetadataUri_invalidUri_triggers_catch_and_throwsIOException() {
-        // Ungültige URI -> new URI(...) wirft URISyntaxException -> catch -> IOException
-        var s = new ApplicationProperties.Security.SAML2();
-        s.setIdpMetadataUri("http:##invalid uri"); // absichtlich kaputt (Leerzeichen + ##)
-
-        assertThrows(IOException.class, s::getIdpMetadataUri);
-    }
-
-    @Test
-    void spCert_else_branch_returns_FileSystemResource_for_filesystem_path() throws Exception {
-        var s = new ApplicationProperties.Security.SAML2();
-
-        // temporäre Datei simuliert "Filesystem"-Pfad (-> else-Zweig)
-        Path tmp = Files.createTempFile("spdf-spcert-", ".crt");
-        Files.writeString(tmp, "CERT");
-
-        s.setSpCert(tmp.toString());
-        Resource r = s.getSpCert();
-
-        assertNotNull(r);
-        assertTrue(r instanceof FileSystemResource, "Expected FileSystemResource for FS path");
-        assertTrue(r.exists(), "Temp file should exist");
-    }
-
-    @Test
-    void idpCert_else_branch_returns_FileSystemResource_even_if_missing() {
-        var s = new ApplicationProperties.Security.SAML2();
-
-        // bewusst nicht existierender Pfad -> else-Zweig wird trotzdem genommen
-        String missing = "/this/path/does/not/exist/idp.crt";
-        s.setIdpCert(missing);
-        Resource r = s.getIdpCert();
-
-        assertNotNull(r);
-        assertTrue(r instanceof FileSystemResource, "Expected FileSystemResource for FS path");
-        assertFalse(r.exists(), "Resource should not exist for missing file");
-    }
-}
@@ -1,55 +0,0 @@
-package stirling.software.common.model;
-
-import static org.junit.jupiter.api.Assertions.*;
-
-import java.io.InputStream;
-import java.nio.charset.StandardCharsets;
-import java.nio.file.Files;
-import java.nio.file.Path;
-
-import org.junit.jupiter.api.Test;
-import org.springframework.core.io.Resource;
-
-class ApplicationPropertiesSaml2ResourceTest {
-
-    @Test
-    void idpMetadataUri_classpath_is_resolved() throws Exception {
-        var s = new ApplicationProperties.Security.SAML2();
-        s.setIdpMetadataUri("classpath:saml/dummy.txt");
-
-        try (InputStream in = s.getIdpMetadataUri()) {
-            assertNotNull(in, "Classpath InputStream should not be null");
-            String txt = new String(in.readAllBytes(), StandardCharsets.UTF_8);
-            assertTrue(txt.contains("ok"));
-        }
-    }
-
-    @Test
-    void spCert_idpCert_privateKey_null_classpath_and_filesystem() throws Exception {
-        var s = new ApplicationProperties.Security.SAML2();
-
-        s.setSpCert(null);
-        s.setIdpCert(null);
-        s.setPrivateKey(null);
-        assertNull(s.getSpCert());
-        assertNull(s.getIdpCert());
-        assertNull(s.getPrivateKey());
-
-        s.setSpCert("classpath:saml/dummy.txt");
-        s.setIdpCert("classpath:saml/dummy.txt");
-        s.setPrivateKey("classpath:saml/dummy.txt");
-        Resource sp = s.getSpCert();
-        Resource idp = s.getIdpCert();
-        Resource pk = s.getPrivateKey();
-        assertTrue(sp.exists());
-        assertTrue(idp.exists());
-        assertTrue(pk.exists());
-
-        Path tmp = Files.createTempFile("spdf-key-", ".pem");
-        Files.writeString(tmp, "KEY");
-        s.setPrivateKey(tmp.toString());
-        Resource pkFs = s.getPrivateKey();
-        assertNotNull(pkFs);
-        assertTrue(pkFs.exists());
-    }
-}
@@ -1,9 +1,10 @@
 package stirling.software.common.service;

 import static org.junit.jupiter.api.Assertions.*;
-import static org.mockito.AdditionalAnswers.*;
 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;
@@ -20,11 +21,14 @@ import org.springframework.web.multipart.MultipartFile;

 class FileStorageTest {

-    @TempDir Path tempDir;
+    @TempDir
+    Path tempDir;

-    @Mock private FileOrUploadService fileOrUploadService;
+    @Mock
+    private FileOrUploadService fileOrUploadService;

-    @InjectMocks private FileStorage fileStorage;
+    @InjectMocks
+    private FileStorage fileStorage;

    private MultipartFile mockFile;

@@ -46,14 +50,11 @@ class FileStorageTest {
        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));
+        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);
@@ -89,7 +90,7 @@ class FileStorageTest {

        MultipartFile expectedFile = mock(MultipartFile.class);
        when(fileOrUploadService.toMockMultipartFile(eq(fileId), eq(fileContent)))
-                .thenReturn(expectedFile);
+            .thenReturn(expectedFile);

        // Act
        MultipartFile result = fileStorage.retrieveFile(fileId);
@@ -4,9 +4,14 @@ 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;

@@ -25,9 +30,11 @@ 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.model.job.JobProgress;
 import stirling.software.common.model.job.JobResponse;

@ExtendWith(MockitoExtension.class)
@@ -35,31 +42,36 @@ class JobExecutorServiceTest {

    private JobExecutorService jobExecutorService;

-    @Mock private TaskManager taskManager;
+    @Mock
+    private TaskManager taskManager;

-    @Mock private FileStorage fileStorage;
+    @Mock
+    private FileStorage fileStorage;

-    @Mock private HttpServletRequest request;
+    @Mock
+    private HttpServletRequest request;

-    @Mock private ResourceMonitor resourceMonitor;
+    @Mock
+    private ResourceMonitor resourceMonitor;

-    @Mock private JobQueue jobQueue;
+    @Mock
+    private JobQueue jobQueue;

-    @Captor private ArgumentCaptor<String> jobIdCaptor;
+    @Captor
+    private ArgumentCaptor<String> jobIdCaptor;

    @BeforeEach
    void setUp() {
        // Initialize the service manually with all its dependencies
-        jobExecutorService =
-                new JobExecutorService(
-                        taskManager,
-                        fileStorage,
-                        request,
-                        resourceMonitor,
-                        jobQueue,
-                        30000L, // asyncRequestTimeoutMs
-                        "30m" // sessionTimeout
-                        );
+        jobExecutorService = new JobExecutorService(
+                taskManager,
+                fileStorage,
+                request,
+                resourceMonitor,
+                jobQueue,
+                30000L, // asyncRequestTimeoutMs
+                "30m"   // sessionTimeout
+        );
    }

    @Test
@@ -97,13 +109,13 @@ class JobExecutorServiceTest {
        verify(taskManager).createTask(jobIdCaptor.capture());
    }

+
    @Test
    void shouldHandleSyncJobError() {
        // Given
-        Supplier<Object> work =
-                () -> {
-                    throw new RuntimeException("Test error");
-                };
+        Supplier<Object> work = () -> {
+            throw new RuntimeException("Test error");
+        };

        // When
        ResponseEntity<?> response = jobExecutorService.runJobGeneric(false, work);
@@ -129,7 +141,8 @@ class JobExecutorServiceTest {
        when(jobQueue.queueJob(anyString(), eq(80), any(), anyLong())).thenReturn(future);

        // When
-        ResponseEntity<?> response = jobExecutorService.runJobGeneric(true, work, 5000, true, 80);
+        ResponseEntity<?> response = jobExecutorService.runJobGeneric(
+                true, work, 5000, true, 80);

        // Then
        assertEquals(HttpStatus.OK, response.getStatusCode());
@@ -147,9 +160,8 @@ class JobExecutorServiceTest {
        long customTimeout = 60000L;

        // Use reflection to access the private executeWithTimeout method
-        java.lang.reflect.Method executeMethod =
-                JobExecutorService.class.getDeclaredMethod(
-                        "executeWithTimeout", Supplier.class, long.class);
+        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
@@ -165,21 +177,19 @@ class JobExecutorServiceTest {
    @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);
-                    }
-                };
+        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);
+        java.lang.reflect.Method executeMethod = JobExecutorService.class
+                .getDeclaredMethod("executeWithTimeout", Supplier.class, long.class);
        executeMethod.setAccessible(true);

        // When/Then
@@ -1,8 +1,10 @@
 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;
@@ -15,6 +17,7 @@ import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;

+import stirling.software.common.model.job.JobProgress;
 import stirling.software.common.service.ResourceMonitor.ResourceStatus;

@ExtendWith(MockitoExtension.class)
@@ -22,17 +25,16 @@ class JobQueueTest {

    private JobQueue jobQueue;

-    @Mock private ResourceMonitor resourceMonitor;
+    @Mock
+    private ResourceMonitor resourceMonitor;

-    private final AtomicReference<ResourceStatus> statusRef =
-            new AtomicReference<>(ResourceStatus.OK);
+
+    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.calculateDynamicQueueCapacity(anyInt(), anyInt())).thenReturn(10);
        lenient().when(resourceMonitor.getCurrentStatus()).thenReturn(statusRef);

        // Initialize JobQueue with mocked ResourceMonitor
@@ -48,6 +50,7 @@ class JobQueueTest {

        jobQueue.queueJob(jobId, resourceWeight, work, timeoutMs);

+
        assertTrue(jobQueue.isJobQueued(jobId));
        assertEquals(1, jobQueue.getTotalQueuedJobs());
    }
@@ -1,10 +1,14 @@
 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;
@@ -26,19 +30,20 @@ import stirling.software.common.service.ResourceMonitor.ResourceStatus;
@ExtendWith(MockitoExtension.class)
 class ResourceMonitorTest {

-    @InjectMocks private ResourceMonitor resourceMonitor;
+    @InjectMocks
+    private ResourceMonitor resourceMonitor;

-    @Mock private OperatingSystemMXBean osMXBean;
+    @Mock
+    private OperatingSystemMXBean osMXBean;

-    @Mock private MemoryMXBean memoryMXBean;
+    @Mock
+    private MemoryMXBean memoryMXBean;

    @Spy
-    private AtomicReference<ResourceStatus> currentStatus =
-            new AtomicReference<>(ResourceStatus.OK);
+    private AtomicReference<ResourceStatus> currentStatus = new AtomicReference<>(ResourceStatus.OK);

    @Spy
-    private AtomicReference<ResourceMetrics> latestMetrics =
-            new AtomicReference<>(new ResourceMetrics());
+    private AtomicReference<ResourceMetrics> latestMetrics = new AtomicReference<>(new ResourceMetrics());

    @BeforeEach
    void setUp() {
@@ -87,26 +92,23 @@ class ResourceMonitorTest {
        assertEquals(3, capacity, "With CRITICAL status, capacity should be reduced to 30%");

        // Test minimum capacity enforcement
-        assertEquals(
-                minCapacity,
-                resourceMonitor.calculateDynamicQueueCapacity(1, minCapacity),
+        assertEquals(minCapacity, resourceMonitor.calculateDynamicQueueCapacity(1, minCapacity),
                "Should never go below minimum capacity");
    }

    @ParameterizedTest
    @CsvSource({
-        "10, OK, false", // Light job, OK status
+        "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, 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
+        "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) {
+    void shouldQueueJobBasedOnWeightAndStatus(int weight, ResourceStatus status, boolean shouldQueue) {
        // Given
        currentStatus.set(status);

@@ -114,11 +116,8 @@ class ResourceMonitorTest {
        boolean result = resourceMonitor.shouldQueueJob(weight);

        // Then
-        assertEquals(
-                shouldQueue,
-                result,
-                String.format(
-                        "For weight %d and status %s, shouldQueue should be %s",
+        assertEquals(shouldQueue, result,
+                String.format("For weight %d and status %s, shouldQueue should be %s",
                        weight, status, shouldQueue));
    }

@@ -132,9 +131,7 @@ class ResourceMonitorTest {
        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");
+        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");
    }
 }
@@ -6,6 +6,7 @@ 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;
@@ -21,9 +22,11 @@ import stirling.software.common.model.job.ResultFile;

 class TaskManagerTest {

-    @Mock private FileStorage fileStorage;
+    @Mock
+    private FileStorage fileStorage;

-    @InjectMocks private TaskManager taskManager;
+    @InjectMocks
+    private TaskManager taskManager;

    private AutoCloseable closeable;

@@ -231,20 +234,18 @@ class TaskManagerTest {
        ReflectionTestUtils.setField(oldJob, "complete", true);

        // Create a ResultFile and set it using the new approach
-        ResultFile resultFile =
-                ResultFile.builder()
-                        .fileId("file-id")
-                        .fileName("test.pdf")
-                        .contentType("application/pdf")
-                        .fileSize(1024L)
-                        .build();
+        ResultFile resultFile = ResultFile.builder()
+                .fileId("file-id")
+                .fileName("test.pdf")
+                .contentType("application/pdf")
+                .fileSize(1024L)
+                .build();
        ReflectionTestUtils.setField(oldJob, "resultFiles", java.util.List.of(resultFile));

        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");
+        Map<String, JobResult> jobResultsMap = (Map<String, JobResult>) ReflectionTestUtils.getField(taskManager, "jobResults");

        // 3. Create an active job
        String activeJobId = "active-job";
@@ -12,6 +12,7 @@ import java.nio.file.Path;
 import java.nio.file.attribute.FileTime;
 import java.util.HashSet;
 import java.util.Set;
+import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.function.Consumer;
 import java.util.stream.Stream;
@@ -29,22 +30,31 @@ import stirling.software.common.model.ApplicationProperties;
 import stirling.software.common.util.TempFileManager;
 import stirling.software.common.util.TempFileRegistry;

-/** Tests for the TempFileCleanupService, focusing on its pattern-matching and cleanup logic. */
+/**
+ * Tests for the TempFileCleanupService, focusing on its pattern-matching and cleanup logic.
+ */
 public class TempFileCleanupServiceTest {

-    @TempDir Path tempDir;
+    @TempDir
+    Path tempDir;

-    @Mock private TempFileRegistry registry;
+    @Mock
+    private TempFileRegistry registry;

-    @Mock private TempFileManager tempFileManager;
+    @Mock
+    private TempFileManager tempFileManager;

-    @Mock private ApplicationProperties applicationProperties;
+    @Mock
+    private ApplicationProperties applicationProperties;

-    @Mock private ApplicationProperties.System system;
+    @Mock
+    private ApplicationProperties.System system;

-    @Mock private ApplicationProperties.TempFileManagement tempFileManagement;
+    @Mock
+    private ApplicationProperties.TempFileManagement tempFileManagement;

-    @InjectMocks private TempFileCleanupService cleanupService;
+    @InjectMocks
+    private TempFileCleanupService cleanupService;

    private Path systemTempDir;
    private Path customTempDir;
@@ -114,8 +124,7 @@ public class TempFileCleanupServiceTest {

        // Files that should be preserved
        Path jettyFile1 = Files.createFile(systemTempDir.resolve("jetty-123.tmp"));
-        Path jettyFile2 =
-                Files.createFile(systemTempDir.resolve("something-with-jetty-inside.tmp"));
+        Path jettyFile2 = Files.createFile(systemTempDir.resolve("something-with-jetty-inside.tmp"));
        Path regularFile = Files.createFile(systemTempDir.resolve("important.txt"));

        // Create a nested directory with temp files
@@ -134,29 +143,19 @@ public class TempFileCleanupServiceTest {
        // Use MockedStatic to mock Files operations
        try (MockedStatic<Files> mockedFiles = mockStatic(Files.class)) {
            // Mock Files.list for each directory we'll process
-            mockedFiles
-                    .when(() -> Files.list(eq(systemTempDir)))
-                    .thenReturn(
-                            Stream.of(
-                                    ourTempFile1,
-                                    ourTempFile2,
-                                    oldTempFile,
-                                    sysTempFile1,
-                                    jettyFile1,
-                                    jettyFile2,
-                                    regularFile,
-                                    emptyFile,
-                                    nestedDir));
+            mockedFiles.when(() -> Files.list(eq(systemTempDir)))
+                    .thenReturn(Stream.of(
+                            ourTempFile1, ourTempFile2, oldTempFile, sysTempFile1,
+                            jettyFile1, jettyFile2, regularFile, emptyFile, nestedDir));

-            mockedFiles
-                    .when(() -> Files.list(eq(customTempDir)))
+            mockedFiles.when(() -> Files.list(eq(customTempDir)))
                    .thenReturn(Stream.of(ourTempFile3, ourTempFile4, sysTempFile2, sysTempFile3));

-            mockedFiles
-                    .when(() -> Files.list(eq(libreOfficeTempDir)))
+            mockedFiles.when(() -> Files.list(eq(libreOfficeTempDir)))
                    .thenReturn(Stream.of(ourTempFile5));

-            mockedFiles.when(() -> Files.list(eq(nestedDir))).thenReturn(Stream.of(nestedTempFile));
+            mockedFiles.when(() -> Files.list(eq(nestedDir)))
+                    .thenReturn(Stream.of(nestedTempFile));

            // Configure Files.isDirectory for each path
            mockedFiles.when(() -> Files.isDirectory(eq(nestedDir))).thenReturn(true);
@@ -166,59 +165,48 @@ public class TempFileCleanupServiceTest {
            mockedFiles.when(() -> Files.exists(any(Path.class))).thenReturn(true);

            // Configure Files.getLastModifiedTime to return different times based on file names
-            mockedFiles
-                    .when(() -> Files.getLastModifiedTime(any(Path.class)))
-                    .thenAnswer(
-                            invocation -> {
-                                Path path = invocation.getArgument(0);
-                                String fileName = path.getFileName().toString();
+            mockedFiles.when(() -> Files.getLastModifiedTime(any(Path.class)))
+                    .thenAnswer(invocation -> {
+                        Path path = invocation.getArgument(0);
+                        String fileName = path.getFileName().toString();

-                                // For files with "old" in the name, return a timestamp older than
-                                // maxAgeMillis
-                                if (fileName.contains("old")) {
-                                    return FileTime.fromMillis(
-                                            System.currentTimeMillis() - 5000000);
-                                }
-                                // For empty.tmp file, return a timestamp older than 5 minutes (for
-                                // empty file test)
-                                else if (fileName.equals("empty.tmp")) {
-                                    return FileTime.fromMillis(
-                                            System.currentTimeMillis() - 6 * 60 * 1000);
-                                }
-                                // For all other files, return a recent timestamp
-                                else {
-                                    return FileTime.fromMillis(
-                                            System.currentTimeMillis() - 60000); // 1 minute ago
-                                }
-                            });
+                        // For files with "old" in the name, return a timestamp older than maxAgeMillis
+                        if (fileName.contains("old")) {
+                            return FileTime.fromMillis(System.currentTimeMillis() - 5000000);
+                        }
+                        // For empty.tmp file, return a timestamp older than 5 minutes (for empty file test)
+                        else if (fileName.equals("empty.tmp")) {
+                            return FileTime.fromMillis(System.currentTimeMillis() - 6 * 60 * 1000);
+                        }
+                        // For all other files, return a recent timestamp
+                        else {
+                            return FileTime.fromMillis(System.currentTimeMillis() - 60000); // 1 minute ago
+                        }
+                    });

            // Configure Files.size to return different sizes based on file names
-            mockedFiles
-                    .when(() -> Files.size(any(Path.class)))
-                    .thenAnswer(
-                            invocation -> {
-                                Path path = invocation.getArgument(0);
-                                String fileName = path.getFileName().toString();
+            mockedFiles.when(() -> Files.size(any(Path.class)))
+                    .thenAnswer(invocation -> {
+                        Path path = invocation.getArgument(0);
+                        String fileName = path.getFileName().toString();

-                                // Return 0 bytes for the empty file
-                                if (fileName.equals("empty.tmp")) {
-                                    return 0L;
-                                }
-                                // Return normal size for all other files
-                                else {
-                                    return 1024L; // 1 KB
-                                }
-                            });
+                        // Return 0 bytes for the empty file
+                        if (fileName.equals("empty.tmp")) {
+                            return 0L;
+                        }
+                        // Return normal size for all other files
+                        else {
+                            return 1024L; // 1 KB
+                        }
+                    });

            // For deleteIfExists, track which files would be deleted
-            mockedFiles
-                    .when(() -> Files.deleteIfExists(any(Path.class)))
-                    .thenAnswer(
-                            invocation -> {
-                                Path path = invocation.getArgument(0);
-                                deletedFiles.add(path);
-                                return true;
-                            });
+            mockedFiles.when(() -> Files.deleteIfExists(any(Path.class)))
+                    .thenAnswer(invocation -> {
+                        Path path = invocation.getArgument(0);
+                        deletedFiles.add(path);
+                        return true;
+                    });

            // Act - set containerMode to false for this test
            invokeCleanupDirectoryStreaming(systemTempDir, false, 0, 3600000);
@@ -230,33 +218,20 @@ public class TempFileCleanupServiceTest {
            assertTrue(deletedFiles.contains(emptyFile), "Empty file should be deleted");

            // Regular temp files should not be deleted because they're too new
-            assertFalse(
-                    deletedFiles.contains(ourTempFile1), "Recent temp file should be preserved");
-            assertFalse(
-                    deletedFiles.contains(ourTempFile2), "Recent temp file should be preserved");
-            assertFalse(
-                    deletedFiles.contains(ourTempFile3), "Recent temp file should be preserved");
-            assertFalse(
-                    deletedFiles.contains(ourTempFile4), "Recent temp file should be preserved");
-            assertFalse(
-                    deletedFiles.contains(ourTempFile5), "Recent temp file should be preserved");
+            assertFalse(deletedFiles.contains(ourTempFile1), "Recent temp file should be preserved");
+            assertFalse(deletedFiles.contains(ourTempFile2), "Recent temp file should be preserved");
+            assertFalse(deletedFiles.contains(ourTempFile3), "Recent temp file should be preserved");
+            assertFalse(deletedFiles.contains(ourTempFile4), "Recent temp file should be preserved");
+            assertFalse(deletedFiles.contains(ourTempFile5), "Recent temp file should be preserved");

            // System temp files should not be deleted in non-container mode
-            assertFalse(
-                    deletedFiles.contains(sysTempFile1),
-                    "System temp file should be preserved in non-container mode");
-            assertFalse(
-                    deletedFiles.contains(sysTempFile2),
-                    "System temp file should be preserved in non-container mode");
-            assertFalse(
-                    deletedFiles.contains(sysTempFile3),
-                    "System temp file should be preserved in non-container mode");
+            assertFalse(deletedFiles.contains(sysTempFile1), "System temp file should be preserved in non-container mode");
+            assertFalse(deletedFiles.contains(sysTempFile2), "System temp file should be preserved in non-container mode");
+            assertFalse(deletedFiles.contains(sysTempFile3), "System temp file should be preserved in non-container mode");

            // Jetty files and regular files should never be deleted
            assertFalse(deletedFiles.contains(jettyFile1), "Jetty file should be preserved");
-            assertFalse(
-                    deletedFiles.contains(jettyFile2),
-                    "File with jetty in name should be preserved");
+            assertFalse(deletedFiles.contains(jettyFile2), "File with jetty in name should be preserved");
            assertFalse(deletedFiles.contains(regularFile), "Regular file should be preserved");
        }
    }
@@ -277,8 +252,7 @@ public class TempFileCleanupServiceTest {
        // Use MockedStatic to mock Files operations
        try (MockedStatic<Files> mockedFiles = mockStatic(Files.class)) {
            // Mock Files.list for systemTempDir
-            mockedFiles
-                    .when(() -> Files.list(eq(systemTempDir)))
+            mockedFiles.when(() -> Files.list(eq(systemTempDir)))
                    .thenReturn(Stream.of(ourTempFile, sysTempFile, regularFile));

            // Configure Files.isDirectory
@@ -288,37 +262,28 @@ public class TempFileCleanupServiceTest {
            mockedFiles.when(() -> Files.exists(any(Path.class))).thenReturn(true);

            // Configure Files.getLastModifiedTime to return recent timestamps
-            mockedFiles
-                    .when(() -> Files.getLastModifiedTime(any(Path.class)))
-                    .thenReturn(
-                            FileTime.fromMillis(
-                                    System.currentTimeMillis() - 60000)); // 1 minute ago
+            mockedFiles.when(() -> Files.getLastModifiedTime(any(Path.class)))
+                    .thenReturn(FileTime.fromMillis(System.currentTimeMillis() - 60000)); // 1 minute ago

            // Configure Files.size to return normal size
-            mockedFiles.when(() -> Files.size(any(Path.class))).thenReturn(1024L); // 1 KB
+            mockedFiles.when(() -> Files.size(any(Path.class)))
+                    .thenReturn(1024L); // 1 KB

            // For deleteIfExists, track which files would be deleted
-            mockedFiles
-                    .when(() -> Files.deleteIfExists(any(Path.class)))
-                    .thenAnswer(
-                            invocation -> {
-                                Path path = invocation.getArgument(0);
-                                deletedFiles.add(path);
-                                return true;
-                            });
+            mockedFiles.when(() -> Files.deleteIfExists(any(Path.class)))
+                    .thenAnswer(invocation -> {
+                        Path path = invocation.getArgument(0);
+                        deletedFiles.add(path);
+                        return true;
+                    });

            // Act - set containerMode to true and maxAgeMillis to 0 for container startup cleanup
            invokeCleanupDirectoryStreaming(systemTempDir, true, 0, 0);

-            // Assert - In container mode, both our temp files and system temp files should be
-            // deleted
+            // Assert - In container mode, both our temp files and system temp files should be deleted
            // regardless of age (when maxAgeMillis is 0)
-            assertTrue(
-                    deletedFiles.contains(ourTempFile),
-                    "Our temp file should be deleted in container mode");
-            assertTrue(
-                    deletedFiles.contains(sysTempFile),
-                    "System temp file should be deleted in container mode");
+            assertTrue(deletedFiles.contains(ourTempFile), "Our temp file should be deleted in container mode");
+            assertTrue(deletedFiles.contains(sysTempFile), "System temp file should be deleted in container mode");
            assertFalse(deletedFiles.contains(regularFile), "Regular file should be preserved");
        }
    }
@@ -338,8 +303,7 @@ public class TempFileCleanupServiceTest {
        // Use MockedStatic to mock Files operations
        try (MockedStatic<Files> mockedFiles = mockStatic(Files.class)) {
            // Mock Files.list for systemTempDir
-            mockedFiles
-                    .when(() -> Files.list(eq(systemTempDir)))
+            mockedFiles.when(() -> Files.list(eq(systemTempDir)))
                    .thenReturn(Stream.of(emptyFile, recentEmptyFile));

            // Configure Files.isDirectory
@@ -349,46 +313,39 @@ public class TempFileCleanupServiceTest {
            mockedFiles.when(() -> Files.exists(any(Path.class))).thenReturn(true);

            // Configure Files.getLastModifiedTime to return different times based on file names
-            mockedFiles
-                    .when(() -> Files.getLastModifiedTime(any(Path.class)))
-                    .thenAnswer(
-                            invocation -> {
-                                Path path = invocation.getArgument(0);
-                                String fileName = path.getFileName().toString();
+            mockedFiles.when(() -> Files.getLastModifiedTime(any(Path.class)))
+                    .thenAnswer(invocation -> {
+                        Path path = invocation.getArgument(0);
+                        String fileName = path.getFileName().toString();

-                                if (fileName.equals("empty.tmp")) {
-                                    // More than 5 minutes old
-                                    return FileTime.fromMillis(
-                                            System.currentTimeMillis() - 6 * 60 * 1000);
-                                } else {
-                                    // Less than 5 minutes old
-                                    return FileTime.fromMillis(
-                                            System.currentTimeMillis() - 2 * 60 * 1000);
-                                }
-                            });
+                        if (fileName.equals("empty.tmp")) {
+                            // More than 5 minutes old
+                            return FileTime.fromMillis(System.currentTimeMillis() - 6 * 60 * 1000);
+                        } else {
+                            // Less than 5 minutes old
+                            return FileTime.fromMillis(System.currentTimeMillis() - 2 * 60 * 1000);
+                        }
+                    });

            // Configure Files.size to return 0 for empty files
-            mockedFiles.when(() -> Files.size(any(Path.class))).thenReturn(0L);
+            mockedFiles.when(() -> Files.size(any(Path.class)))
+                    .thenReturn(0L);

            // For deleteIfExists, track which files would be deleted
-            mockedFiles
-                    .when(() -> Files.deleteIfExists(any(Path.class)))
-                    .thenAnswer(
-                            invocation -> {
-                                Path path = invocation.getArgument(0);
-                                deletedFiles.add(path);
-                                return true;
-                            });
+            mockedFiles.when(() -> Files.deleteIfExists(any(Path.class)))
+                    .thenAnswer(invocation -> {
+                        Path path = invocation.getArgument(0);
+                        deletedFiles.add(path);
+                        return true;
+                    });

            // Act
            invokeCleanupDirectoryStreaming(systemTempDir, false, 0, 3600000);

            // Assert
-            assertTrue(
-                    deletedFiles.contains(emptyFile),
+            assertTrue(deletedFiles.contains(emptyFile),
                    "Empty file older than 5 minutes should be deleted");
-            assertFalse(
-                    deletedFiles.contains(recentEmptyFile),
+            assertFalse(deletedFiles.contains(recentEmptyFile),
                    "Empty file newer than 5 minutes should not be deleted");
        }
    }
@@ -413,13 +370,17 @@ public class TempFileCleanupServiceTest {
        // Use MockedStatic to mock Files operations
        try (MockedStatic<Files> mockedFiles = mockStatic(Files.class)) {
            // Mock Files.list for each directory
-            mockedFiles.when(() -> Files.list(eq(systemTempDir))).thenReturn(Stream.of(dir1));
+            mockedFiles.when(() -> Files.list(eq(systemTempDir)))
+                    .thenReturn(Stream.of(dir1));

-            mockedFiles.when(() -> Files.list(eq(dir1))).thenReturn(Stream.of(tempFile1, dir2));
+            mockedFiles.when(() -> Files.list(eq(dir1)))
+                    .thenReturn(Stream.of(tempFile1, dir2));

-            mockedFiles.when(() -> Files.list(eq(dir2))).thenReturn(Stream.of(tempFile2, dir3));
+            mockedFiles.when(() -> Files.list(eq(dir2)))
+                    .thenReturn(Stream.of(tempFile2, dir3));

-            mockedFiles.when(() -> Files.list(eq(dir3))).thenReturn(Stream.of(tempFile3));
+            mockedFiles.when(() -> Files.list(eq(dir3)))
+                    .thenReturn(Stream.of(tempFile3));

            // Configure Files.isDirectory for each path
            mockedFiles.when(() -> Files.isDirectory(eq(dir1))).thenReturn(true);
@@ -433,35 +394,31 @@ public class TempFileCleanupServiceTest {
            mockedFiles.when(() -> Files.exists(any(Path.class))).thenReturn(true);

            // Configure Files.getLastModifiedTime to return different times based on file names
-            mockedFiles
-                    .when(() -> Files.getLastModifiedTime(any(Path.class)))
-                    .thenAnswer(
-                            invocation -> {
-                                Path path = invocation.getArgument(0);
-                                String fileName = path.getFileName().toString();
+            mockedFiles.when(() -> Files.getLastModifiedTime(any(Path.class)))
+                    .thenAnswer(invocation -> {
+                        Path path = invocation.getArgument(0);
+                        String fileName = path.getFileName().toString();

-                                if (fileName.contains("old")) {
-                                    // Old file
-                                    return FileTime.fromMillis(
-                                            System.currentTimeMillis() - 5000000);
-                                } else {
-                                    // Recent file
-                                    return FileTime.fromMillis(System.currentTimeMillis() - 60000);
-                                }
-                            });
+                        if (fileName.contains("old")) {
+                            // Old file
+                            return FileTime.fromMillis(System.currentTimeMillis() - 5000000);
+                        } else {
+                            // Recent file
+                            return FileTime.fromMillis(System.currentTimeMillis() - 60000);
+                        }
+                    });

            // Configure Files.size to return normal size
-            mockedFiles.when(() -> Files.size(any(Path.class))).thenReturn(1024L);
+            mockedFiles.when(() -> Files.size(any(Path.class)))
+                    .thenReturn(1024L);

            // For deleteIfExists, track which files would be deleted
-            mockedFiles
-                    .when(() -> Files.deleteIfExists(any(Path.class)))
-                    .thenAnswer(
-                            invocation -> {
-                                Path path = invocation.getArgument(0);
-                                deletedFiles.add(path);
-                                return true;
-                            });
+            mockedFiles.when(() -> Files.deleteIfExists(any(Path.class)))
+                    .thenAnswer(invocation -> {
+                        Path path = invocation.getArgument(0);
+                        deletedFiles.add(path);
+                        return true;
+                    });

            // Act
            invokeCleanupDirectoryStreaming(systemTempDir, false, 0, 3600000);
@@ -473,15 +430,14 @@ public class TempFileCleanupServiceTest {
            // Assert
            assertFalse(deletedFiles.contains(tempFile1), "Recent temp file should be preserved");
            assertFalse(deletedFiles.contains(tempFile2), "Recent temp file should be preserved");
-            assertTrue(
-                    deletedFiles.contains(tempFile3),
-                    "Old temp file in nested directory should be deleted");
+            assertTrue(deletedFiles.contains(tempFile3), "Old temp file in nested directory should be deleted");
        }
    }

-    /** Helper method to invoke the private cleanupDirectoryStreaming method using reflection */
-    private void invokeCleanupDirectoryStreaming(
-            Path directory, boolean containerMode, int depth, long maxAgeMillis)
+    /**
+     * Helper method to invoke the private cleanupDirectoryStreaming method using reflection
+     */
+    private void invokeCleanupDirectoryStreaming(Path directory, boolean containerMode, int depth, long maxAgeMillis)
            throws IOException {
        try {
            // Create a consumer that tracks deleted files
@@ -489,26 +445,13 @@ public class TempFileCleanupServiceTest {
            Consumer<Path> deleteCallback = path -> deleteCount.incrementAndGet();

            // Get the method with updated signature
-            var method =
-                    TempFileCleanupService.class.getDeclaredMethod(
-                            "cleanupDirectoryStreaming",
-                            Path.class,
-                            boolean.class,
-                            int.class,
-                            long.class,
-                            boolean.class,
-                            Consumer.class);
+            var method = TempFileCleanupService.class.getDeclaredMethod(
+                    "cleanupDirectoryStreaming",
+                    Path.class, boolean.class, int.class, long.class, boolean.class, Consumer.class);
            method.setAccessible(true);

            // Invoke the method with appropriate parameters
-            method.invoke(
-                    cleanupService,
-                    directory,
-                    containerMode,
-                    depth,
-                    maxAgeMillis,
-                    false,
-                    deleteCallback);
+            method.invoke(cleanupService, directory, containerMode, depth, maxAgeMillis, false, deleteCallback);
        } catch (Exception e) {
            throw new RuntimeException("Error invoking cleanupDirectoryStreaming", e);
        }
@@ -1,5 +1,14 @@
 package stirling.software.common.util;

+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;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertNull;
@@ -10,18 +19,6 @@ 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;
@@ -3,46 +3,21 @@ 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 static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;

 import java.util.stream.Stream;

-import org.junit.jupiter.api.BeforeEach;
 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;

-import stirling.software.common.service.SsrfProtectionService;
-
 class CustomHtmlSanitizerTest {

-    private CustomHtmlSanitizer customHtmlSanitizer;
-
-    @BeforeEach
-    void setUp() {
-        SsrfProtectionService mockSsrfProtectionService = mock(SsrfProtectionService.class);
-        stirling.software.common.model.ApplicationProperties mockApplicationProperties =
-                mock(stirling.software.common.model.ApplicationProperties.class);
-        stirling.software.common.model.ApplicationProperties.System mockSystem =
-                mock(stirling.software.common.model.ApplicationProperties.System.class);
-
-        // Allow all URLs by default for basic tests
-        when(mockSsrfProtectionService.isUrlAllowed(org.mockito.ArgumentMatchers.anyString()))
-                .thenReturn(true);
-        when(mockApplicationProperties.getSystem()).thenReturn(mockSystem);
-        when(mockSystem.getDisableSanitize()).thenReturn(false); // Enable sanitization for tests
-
-        customHtmlSanitizer =
-                new CustomHtmlSanitizer(mockSsrfProtectionService, mockApplicationProperties);
-    }
-
    @ParameterizedTest
    @MethodSource("provideHtmlTestCases")
    void testSanitizeHtml(String inputHtml, String[] expectedContainedTags) {
        // Act
-        String sanitizedHtml = customHtmlSanitizer.sanitize(inputHtml);
+        String sanitizedHtml = CustomHtmlSanitizer.sanitize(inputHtml);

        // Assert
        for (String tag : expectedContainedTags) {
@@ -83,7 +58,7 @@ class CustomHtmlSanitizerTest {
                "<p style=\"color: blue; font-size: 16px; margin-top: 10px;\">Styled text</p>";

        // Act
-        String sanitizedHtml = customHtmlSanitizer.sanitize(htmlWithStyles);
+        String sanitizedHtml = CustomHtmlSanitizer.sanitize(htmlWithStyles);

        // Assert
        // The OWASP HTML Sanitizer might filter some specific styles, so we only check that
@@ -100,7 +75,7 @@ class CustomHtmlSanitizerTest {
                "<a href=\"https://example.com\" title=\"Example Site\">Example Link</a>";

        // Act
-        String sanitizedHtml = customHtmlSanitizer.sanitize(htmlWithLink);
+        String sanitizedHtml = CustomHtmlSanitizer.sanitize(htmlWithLink);

        // Assert
        // The most important aspect is that the link content is preserved
@@ -122,7 +97,7 @@ class CustomHtmlSanitizerTest {
        String htmlWithJsLink = "<a href=\"javascript:alert('XSS')\">Malicious Link</a>";

        // Act
-        String sanitizedHtml = customHtmlSanitizer.sanitize(htmlWithJsLink);
+        String sanitizedHtml = CustomHtmlSanitizer.sanitize(htmlWithJsLink);

        // Assert
        assertFalse(sanitizedHtml.contains("javascript:"), "JavaScript URLs should be removed");
@@ -141,7 +116,7 @@ class CustomHtmlSanitizerTest {
                        + "</table>";

        // Act
-        String sanitizedHtml = customHtmlSanitizer.sanitize(htmlWithTable);
+        String sanitizedHtml = CustomHtmlSanitizer.sanitize(htmlWithTable);

        // Assert
        assertTrue(sanitizedHtml.contains("<table"), "Table should be preserved");
@@ -168,7 +143,7 @@ class CustomHtmlSanitizerTest {
                "<img src=\"image.jpg\" alt=\"An image\" width=\"100\" height=\"100\">";

        // Act
-        String sanitizedHtml = customHtmlSanitizer.sanitize(htmlWithImage);
+        String sanitizedHtml = CustomHtmlSanitizer.sanitize(htmlWithImage);

        // Assert
        assertTrue(sanitizedHtml.contains("<img"), "Image tag should be preserved");
@@ -185,7 +160,7 @@ class CustomHtmlSanitizerTest {
                "<img src=\"data:image/svg+xml;base64,PHN2ZyBvbmxvYWQ9ImFsZXJ0KDEpIj48L3N2Zz4=\" alt=\"SVG with XSS\">";

        // Act
-        String sanitizedHtml = customHtmlSanitizer.sanitize(htmlWithDataUrlImage);
+        String sanitizedHtml = CustomHtmlSanitizer.sanitize(htmlWithDataUrlImage);

        // Assert
        assertFalse(
@@ -200,7 +175,7 @@ class CustomHtmlSanitizerTest {
                "<a href=\"#\" onclick=\"alert('XSS')\" onmouseover=\"alert('XSS')\">Click me</a>";

        // Act
-        String sanitizedHtml = customHtmlSanitizer.sanitize(htmlWithJsEvent);
+        String sanitizedHtml = CustomHtmlSanitizer.sanitize(htmlWithJsEvent);

        // Assert
        assertFalse(
@@ -217,7 +192,7 @@ class CustomHtmlSanitizerTest {
        String htmlWithScript = "<p>Safe content</p><script>alert('XSS');</script>";

        // Act
-        String sanitizedHtml = customHtmlSanitizer.sanitize(htmlWithScript);
+        String sanitizedHtml = CustomHtmlSanitizer.sanitize(htmlWithScript);

        // Assert
        assertFalse(sanitizedHtml.contains("<script>"), "Script tags should be removed");
@@ -231,7 +206,7 @@ class CustomHtmlSanitizerTest {
        String htmlWithNoscript = "<p>Safe content</p><noscript>JavaScript is disabled</noscript>";

        // Act
-        String sanitizedHtml = customHtmlSanitizer.sanitize(htmlWithNoscript);
+        String sanitizedHtml = CustomHtmlSanitizer.sanitize(htmlWithNoscript);

        // Assert
        assertFalse(sanitizedHtml.contains("<noscript>"), "Noscript tags should be removed");
@@ -245,7 +220,7 @@ class CustomHtmlSanitizerTest {
        String htmlWithIframe = "<p>Safe content</p><iframe src=\"https://example.com\"></iframe>";

        // Act
-        String sanitizedHtml = customHtmlSanitizer.sanitize(htmlWithIframe);
+        String sanitizedHtml = CustomHtmlSanitizer.sanitize(htmlWithIframe);

        // Assert
        assertFalse(sanitizedHtml.contains("<iframe"), "Iframe tags should be removed");
@@ -262,7 +237,7 @@ class CustomHtmlSanitizerTest {
                        + "<embed src=\"embed.swf\" type=\"application/x-shockwave-flash\">";

        // Act
-        String sanitizedHtml = customHtmlSanitizer.sanitize(htmlWithObjects);
+        String sanitizedHtml = CustomHtmlSanitizer.sanitize(htmlWithObjects);

        // Assert
        assertFalse(sanitizedHtml.contains("<object"), "Object tags should be removed");
@@ -281,7 +256,7 @@ class CustomHtmlSanitizerTest {
                        + "<link rel=\"stylesheet\" href=\"evil.css\">";

        // Act
-        String sanitizedHtml = customHtmlSanitizer.sanitize(htmlWithMetaTags);
+        String sanitizedHtml = CustomHtmlSanitizer.sanitize(htmlWithMetaTags);

        // Assert
        assertFalse(sanitizedHtml.contains("<meta"), "Meta tags should be removed");
@@ -308,7 +283,7 @@ class CustomHtmlSanitizerTest {
                        + "</div>";

        // Act
-        String sanitizedHtml = customHtmlSanitizer.sanitize(complexHtml);
+        String sanitizedHtml = CustomHtmlSanitizer.sanitize(complexHtml);

        // Assert
        assertTrue(sanitizedHtml.contains("<div"), "Div should be preserved");
@@ -339,7 +314,7 @@ class CustomHtmlSanitizerTest {
    @Test
    void testSanitizeHandlesEmpty() {
        // Act
-        String sanitizedHtml = customHtmlSanitizer.sanitize("");
+        String sanitizedHtml = CustomHtmlSanitizer.sanitize("");

        // Assert
        assertEquals("", sanitizedHtml, "Empty input should result in empty string");
@@ -348,7 +323,7 @@ class CustomHtmlSanitizerTest {
    @Test
    void testSanitizeHandlesNull() {
        // Act
-        String sanitizedHtml = customHtmlSanitizer.sanitize(null);
+        String sanitizedHtml = CustomHtmlSanitizer.sanitize(null);

        // Assert
        assertEquals("", sanitizedHtml, "Null input should result in empty string");
@@ -19,7 +19,6 @@ 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)
@@ -3,40 +3,19 @@ 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 static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
+import static org.mockito.ArgumentMatchers.anyString;

+import java.io.File;
 import java.io.IOException;
-import java.nio.file.Files;

-import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;

 import stirling.software.common.model.api.converters.HTMLToPdfRequest;
-import stirling.software.common.service.SsrfProtectionService;

 public class FileToPdfTest {

-    private CustomHtmlSanitizer customHtmlSanitizer;
-
-    @BeforeEach
-    void setUp() {
-        SsrfProtectionService mockSsrfProtectionService = mock(SsrfProtectionService.class);
-        stirling.software.common.model.ApplicationProperties mockApplicationProperties =
-                mock(stirling.software.common.model.ApplicationProperties.class);
-        stirling.software.common.model.ApplicationProperties.System mockSystem =
-                mock(stirling.software.common.model.ApplicationProperties.System.class);
-
-        when(mockSsrfProtectionService.isUrlAllowed(org.mockito.ArgumentMatchers.anyString()))
-                .thenReturn(true);
-        when(mockApplicationProperties.getSystem()).thenReturn(mockSystem);
-        when(mockSystem.getDisableSanitize()).thenReturn(false);
-
-        customHtmlSanitizer =
-                new CustomHtmlSanitizer(mockSsrfProtectionService, mockApplicationProperties);
-    }
-
    /**
     * Test the HTML to PDF conversion. This test expects an IOException when an empty HTML input is
     * provided.
@@ -46,13 +25,14 @@ public class FileToPdfTest {
        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
        TempFileManager tempFileManager = mock(TempFileManager.class); // Mock TempFileManager

        // Mock the temp file creation to return real temp files
        try {
            when(tempFileManager.createTempFile(anyString()))
-                    .thenReturn(Files.createTempFile("test", ".pdf").toFile())
-                    .thenReturn(Files.createTempFile("test", ".html").toFile());
+                .thenReturn(File.createTempFile("test", ".pdf"))
+                .thenReturn(File.createTempFile("test", ".html"));
        } catch (IOException e) {
            throw new RuntimeException(e);
        }
@@ -63,12 +43,7 @@ public class FileToPdfTest {
                        Exception.class,
                        () ->
                                FileToPdf.convertHtmlToPdf(
-                                        "/path/",
-                                        request,
-                                        fileBytes,
-                                        fileName,
-                                        tempFileManager,
-                                        customHtmlSanitizer));
+                                        "/path/", request, fileBytes, fileName, disableSanitize, tempFileManager));
        assertNotNull(thrown);
    }

@@ -1,23 +1,21 @@
 package stirling.software.common.util;

-import static org.junit.jupiter.api.Assertions.*;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
 import java.util.List;
 import java.util.stream.Stream;
-
+import org.junit.jupiter.api.Assertions;
 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.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.junit.jupiter.MockitoExtension;
-
 import stirling.software.common.model.enumeration.UsernameAttribute;
 import stirling.software.common.model.oauth2.GitHubProvider;
 import stirling.software.common.model.oauth2.GoogleProvider;
 import stirling.software.common.model.oauth2.Provider;
+import static org.junit.jupiter.api.Assertions.*;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;

@ExtendWith(MockitoExtension.class)
 class ProviderUtilsTest {
@@ -42,7 +40,7 @@ class ProviderUtilsTest {
    public static Stream<Arguments> providerParams() {
        Provider generic = null;
        var google =
-                new GoogleProvider(null, "clientSecret", List.of("scope"), UsernameAttribute.EMAIL);
+            new GoogleProvider(null, "clientSecret", List.of("scope"), UsernameAttribute.EMAIL);
        var github = new GitHubProvider("clientId", "", List.of("scope"), UsernameAttribute.LOGIN);

        return Stream.of(Arguments.of(generic), Arguments.of(google), Arguments.of(github));
@@ -42,6 +42,7 @@ class SpringContextHolderTest {
        verify(mockApplicationContext).getBean(TestBean.class);
    }

+
    @Test
    void testGetBean_ApplicationContextNotSet() {
        // Don't set application context
@@ -57,8 +58,7 @@ class SpringContextHolderTest {
    void testGetBean_BeanNotFound() {
        // Arrange
        contextHolder.setApplicationContext(mockApplicationContext);
-        when(mockApplicationContext.getBean(TestBean.class))
-                .thenThrow(new org.springframework.beans.BeansException("Bean not found") {});
+        when(mockApplicationContext.getBean(TestBean.class)).thenThrow(new org.springframework.beans.BeansException("Bean not found") {});

        // Act
        TestBean result = SpringContextHolder.getBean(TestBean.class);
@@ -68,5 +68,6 @@ class SpringContextHolderTest {
    }

    // Simple test class
-    private static class TestBean {}
+    private static class TestBean {
+    }
 }
@@ -1,12 +1,10 @@
 package stirling.software.common.util.misc;

-import static org.junit.jupiter.api.Assertions.assertArrayEquals;
-import static org.junit.jupiter.api.Assertions.assertNull;
-
 import org.junit.jupiter.api.Test;
-
 import stirling.software.common.model.api.misc.HighContrastColorCombination;
 import stirling.software.common.model.api.misc.ReplaceAndInvert;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;

 class HighContrastColorReplaceDeciderTest {

@@ -26,7 +26,6 @@ import org.junit.jupiter.api.Test;
 import org.springframework.core.io.InputStreamResource;
 import org.springframework.mock.web.MockMultipartFile;
 import org.springframework.web.multipart.MultipartFile;
-
 import stirling.software.common.model.api.misc.ReplaceAndInvert;

 class InvertFullColorStrategyTest {
@@ -9,7 +9,6 @@ import org.junit.jupiter.api.Test;
 import org.springframework.core.io.InputStreamResource;
 import org.springframework.mock.web.MockMultipartFile;
 import org.springframework.web.multipart.MultipartFile;
-
 import stirling.software.common.model.api.misc.ReplaceAndInvert;

 class ReplaceAndInvertColorStrategyTest {
@@ -1,17 +1,14 @@
 package stirling.software.common.util.propertyeditor;

+import java.util.List;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import stirling.software.common.model.api.security.RedactionArea;
 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 static org.junit.jupiter.api.Assertions.assertTrue;

-import java.util.List;
-
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-
-import stirling.software.common.model.api.security.RedactionArea;
-
 class StringToArrayListPropertyEditorTest {

    private StringToArrayListPropertyEditor editor;
@@ -1 +0,0 @@
-ok
@@ -16,7 +16,8 @@ local.properties
 version.properties

 #### Stirling-PDF Files ###
-pipeline/*
+pipeline/watchedFolders/
+pipeline/finishedFolders/
 customFiles/
 configs/
 watchedFolders/
@@ -193,5 +194,3 @@ id_ed25519.pub

 # node_modules
 node_modules/
-
-scripts/**/*
--- a/Show More
+++ b/Show More