.gitattributes

@@ -1,10 +1,10 @@
 * text=auto eol=lf
 
 # Ignore all JavaScript files in a directory
-stirling-pdf/src/main/resources/static/pdfjs/* linguist-vendored
-stirling-pdf/src/main/resources/static/pdfjs/** linguist-vendored
-stirling-pdf/src/main/resources/static/pdfjs-legacy/* linguist-vendored
-stirling-pdf/src/main/resources/static/pdfjs-legacy/** linguist-vendored
-stirling-pdf/src/main/resources/static/css/bootstrap-icons.css linguist-vendored
-stirling-pdf/src/main/resources/static/css/bootstrap.min.css linguist-vendored
-stirling-pdf/src/main/resources/static/css/fonts/* linguist-vendored
+src/main/resources/static/pdfjs/* linguist-vendored
+src/main/resources/static/pdfjs/** linguist-vendored
+src/main/resources/static/pdfjs-legacy/* linguist-vendored
+src/main/resources/static/pdfjs-legacy/** linguist-vendored
+src/main/resources/static/css/bootstrap-icons.css linguist-vendored
+src/main/resources/static/css/bootstrap.min.css linguist-vendored
+src/main/resources/static/css/fonts/* linguist-vendored

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

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

.github/labeler-config-srvaroa.yml

@@ -1,139 +0,0 @@
-version: 1
-labels:
-
-  - label: "Bugfix"
-    title: '^fix:.*'
-
-  - label: "enhancement"
-    title: '^feat:.*'
-
-  - label: "build"
-    title: '^build:.*'
-
-  - label: "chore"
-    title: '^chore:.*'
-
-  - label: "ci"
-    title: '^ci:.*'
-
-  - label: "perf"
-    title: '^perf:.*'
-
-  - label: "refactor"
-    title: '^refactor:.*'
-
-  - label: "revert"
-    title: '^revert:.*'
-
-  - label: "style"
-    title: '^style:.*'
-
-  - label: "Documentation"
-    title: '^docs:.*'
-
-  - label: 'API'
-    title: '.*openapi.*'
-
-  - label: 'Translation'
-    files:
-      - 'stirling-pdf/src/main/resources/messages_[a-zA-Z_]{2}_[a-zA-Z_]{2,7}.properties'
-      - 'scripts/ignore_translation.toml'
-      - 'stirling-pdf/src/main/resources/templates/fragments/languages.html'
-      - '.github/scripts/check_language_properties.py'
-
-  - label: 'Front End'
-    files:
-      - 'stirling-pdf/src/main/resources/templates/.*'
-      - 'proprietary/src/main/resources/templates/.*'
-      - 'stirling-pdf/src/main/resources/static/.*'
-      - 'proprietary/src/main/resources/static/.*'
-      - 'stirling-pdf/src/main/java/stirling/software/SPDF/controller/web/.*'
-      - 'stirling-pdf/src/main/java/stirling/software/SPDF/UI/.*'
-
-  - label: 'Java'
-    files:
-      - 'common/src/main/java/.*.java'
-      - 'proprietary/src/main/java/.*.java'
-      - 'stirling-pdf/src/main/java/.*.java'
-
-  - label: 'Back End'
-    files:
-      - 'stirling-pdf/src/main/java/stirling/software/SPDF/config/.*'
-      - 'stirling-pdf/src/main/java/stirling/software/SPDF/controller/.*'
-      - 'stirling-pdf/src/main/resources/settings.yml.template'
-      - 'stirling-pdf/src/main/resources/application.properties'
-      - 'stirling-pdf/src/main/resources/banner.txt'
-      - 'scripts/png_to_webp.py'
-      - 'split_photos.py'
-      - 'application.properties'
-
-  - label: 'Security'
-    files:
-      - 'proprietary/src/main/java/stirling/software/proprietary/security/.*'
-      - 'scripts/download-security-jar.sh'
-      - '.github/workflows/dependency-review.yml'
-      - '.github/workflows/scorecards.yml'
-
-  - label: 'API'
-    files:
-      - 'stirling-pdf/src/main/java/stirling/software/SPDF/config/OpenApiConfig.java'
-      - 'stirling-pdf/src/main/java/stirling/software/SPDF/controller/web/MetricsController.java'
-      - 'stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/.*'
-      - 'stirling-pdf/src/main/java/stirling/software/SPDF/model/api/.*'
-      - 'scripts/png_to_webp.py'
-      - 'split_photos.py'
-      - '.github/workflows/swagger.yml'
-
-  - label: 'Documentation'
-    files:
-      - '.*.md'
-      - 'scripts/counter_translation.py'
-      - 'scripts/ignore_translation.toml'
-
-  - label: 'Docker'
-    files:
-      - '.github/workflows/build.yml'
-      - '.github/workflows/push-docker.yml'
-      - 'Dockerfile'
-      - 'Dockerfile.fat'
-      - 'Dockerfile.ultra-lite'
-      - 'exampleYmlFiles/*.yml'
-      - 'scripts/download-security-jar.sh'
-      - 'scripts/init.sh'
-      - 'scripts/init-without-ocr.sh'
-      - 'scripts/installFonts.sh'
-      - 'test.sh'
-      - 'test2.sh'
-
-  - label: 'Devtools'
-    files:
-      - '.devcontainer/.*'
-      - 'Dockerfile.dev'
-      - '.vscode/.*'
-      - '.editorconfig'
-      - '.pre-commit-config'
-      - '.github/workflows/pre_commit.yml'
-      - 'HowToAddNewLanguage.md'
-
-  - label: 'Test'
-    files:
-      - 'common/src/test/.*'
-      - 'proprietary/src/test/.*'
-      - 'stirling-pdf/src/test/.*'
-      - 'testing/.*'
-      - '.github/workflows/scorecards.yml'
-
-  - label: 'Github'
-    files:
-      - '.github/.*'
-
-  - label: 'Gradle'
-    files:
-      - 'gradle/.*'
-      - 'gradlew'
-      - 'gradlew.bat'
-      - 'settings.gradle'
-      - 'build.gradle'
-      - 'common/build.gradle'
-      - 'proprietary/build.gradle'
-      - 'stirling-pdf/build.gradle'

.github/labeler-config.yml

@@ -1,45 +1,60 @@
 Translation:
   - changed-files:
-    - any-glob-to-any-file: 'stirling-pdf/src/main/resources/messages_*_*.properties'
+    - any-glob-to-any-file: 'src/main/resources/messages_*_*.properties'
     - any-glob-to-any-file: 'scripts/ignore_translation.toml'
-    - any-glob-to-any-file: 'stirling-pdf/src/main/resources/templates/fragments/languages.html'
+    - any-glob-to-any-file: 'src/main/resources/templates/fragments/languages.html'
 
 Front End:
   - changed-files:
-    - any-glob-to-any-file: 'stirling-pdf/src/main/resources/templates/**/*'
-    - any-glob-to-any-file: 'stirling-pdf/src/main/resources/static/**/*'
-    - any-glob-to-any-file: 'stirling-pdf/src/main/java/stirling/software/SPDF/controller/web/**'
-    - any-glob-to-any-file: 'stirling-pdf/src/main/java/stirling/software/SPDF/UI/**/*'
+    - any-glob-to-any-file: 'src/main/resources/templates/**/*'
+    - any-glob-to-any-file: 'src/main/resources/static/**/*'
+    - any-glob-to-any-file: 'src/main/java/stirling/software/SPDF/controller/web/**'
+    - any-glob-to-any-file: 'src/main/java/stirling/software/SPDF/UI/**/*'
 
 Java:
   - changed-files:
-    - any-glob-to-any-file: 'common/src/main/java/**/*.java'
-    - any-glob-to-any-file: 'proprietary/src/main/java/**/*.java'
-    - any-glob-to-any-file: 'stirling-pdf/src/main/java/**/*.java'
+    - any-glob-to-any-file: 'src/main/java/**/*.java'
 
 Back End:
   - changed-files:
-    - any-glob-to-any-file: 'stirling-pdf/src/main/java/stirling/software/SPDF/config/**/*'
-    - any-glob-to-any-file: 'stirling-pdf/src/main/java/stirling/software/SPDF/controller/**/*'
-    - any-glob-to-any-file: 'stirling-pdf/src/main/resources/settings.yml.template'
-    - any-glob-to-any-file: 'stirling-pdf/src/main/resources/application.properties'
-    - any-glob-to-any-file: 'stirling-pdf/src/main/resources/banner.txt'
+    - any-glob-to-any-file: 'src/main/java/stirling/software/SPDF/config/**/*'
+    - any-glob-to-any-file: 'src/main/java/stirling/software/SPDF/controller/**/*'
+    - any-glob-to-any-file: 'src/main/resources/settings.yml.template'
+    - any-glob-to-any-file: 'src/main/resources/application.properties'
+    - any-glob-to-any-file: 'src/main/resources/banner.txt'
     - any-glob-to-any-file: 'scripts/png_to_webp.py'
     - any-glob-to-any-file: 'split_photos.py'
 
 Security:
   - changed-files:
-    - any-glob-to-any-file: 'proprietary/src/main/java/stirling/software/proprietary/security/**/*'
+    - any-glob-to-any-file: 'src/main/java/stirling/software/SPDF/config/interfaces/DatabaseInterface.java'
+    - any-glob-to-any-file: 'src/main/java/stirling/software/SPDF/config/security/**/*'
+    - any-glob-to-any-file: 'src/main/java/stirling/software/SPDF/controller/api/DatabaseController.java'
+    - any-glob-to-any-file: 'src/main/java/stirling/software/SPDF/controller/api/EmailController.java'
+    - any-glob-to-any-file: 'src/main/java/stirling/software/SPDF/controller/api/H2SQLController.java'
+    - any-glob-to-any-file: 'src/main/java/stirling/software/SPDF/controller/web/AccountWebController.java'
+    - any-glob-to-any-file: 'src/main/java/stirling/software/SPDF/controller/web/DatabaseWebController.java'
+    - any-glob-to-any-file: 'src/main/java/stirling/software/SPDF/controller/api/UserController.java'
+    - any-glob-to-any-file: 'src/main/java/stirling/software/SPDF/model/api/Email.java'
+    - any-glob-to-any-file: 'src/main/java/stirling/software/SPDF/model/exception/BackupNotFoundException.java'
+    - any-glob-to-any-file: 'src/main/java/stirling/software/SPDF/model/exception/NoProviderFoundExceptionjava'
+    - any-glob-to-any-file: 'src/main/java/stirling/software/SPDF/model/provider/**/*'
+    - any-glob-to-any-file: 'src/main/java/stirling/software/SPDF/model/AuthenticationType.java'
+    - any-glob-to-any-file: 'src/main/java/stirling/software/SPDF/model/ApiKeyAuthenticationToken.java'
+    - any-glob-to-any-file: 'src/main/java/stirling/software/SPDF/model/AttemptCounter.java'
+    - any-glob-to-any-file: 'src/main/java/stirling/software/SPDF/model/Authority.java'
+    - any-glob-to-any-file: 'src/main/java/stirling/software/SPDF/model/PersistentLogin.java'
+    - any-glob-to-any-file: 'src/main/java/stirling/software/SPDF/model/SessionEntity.java'
     - any-glob-to-any-file: 'scripts/download-security-jar.sh'
     - any-glob-to-any-file: '.github/workflows/dependency-review.yml'
     - any-glob-to-any-file: '.github/workflows/scorecards.yml'
 
 API:
   - changed-files:
-    - any-glob-to-any-file: 'stirling-pdf/src/main/java/stirling/software/SPDF/config/OpenApiConfig.java'
-    - any-glob-to-any-file: 'stirling-pdf/src/main/java/stirling/software/SPDF/controller/web/MetricsController.java'
-    - any-glob-to-any-file: 'stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/**/*'
-    - any-glob-to-any-file: 'stirling-pdf/src/main/java/stirling/software/SPDF/model/api/**/*'
+    - any-glob-to-any-file: 'src/main/java/stirling/software/SPDF/config/OpenApiConfig.java'
+    - any-glob-to-any-file: 'src/main/java/stirling/software/SPDF/controller/web/MetricsController.java'
+    - any-glob-to-any-file: 'src/main/java/stirling/software/SPDF/controller/api/**/*'
+    - any-glob-to-any-file: 'src/main/java/stirling/software/SPDF/model/api/**/*'
     - any-glob-to-any-file: 'scripts/png_to_webp.py'
     - any-glob-to-any-file: 'split_photos.py'
     - any-glob-to-any-file: '.github/workflows/swagger.yml'
@@ -73,9 +88,7 @@ Devtools:
 Test:
   - changed-files:
     - any-glob-to-any-file: 'cucumber/**/*'
-    - any-glob-to-any-file: 'common/src/test/**/*'
-    - any-glob-to-any-file: 'proprietary/src/test/**/*'
-    - any-glob-to-any-file: 'stirling-pdf/src/test/**/*'
+    - any-glob-to-any-file: 'src/test/**/*'
     - any-glob-to-any-file: 'src/testing/**/*'
     - any-glob-to-any-file: '.pre-commit-config'
     - any-glob-to-any-file: '.github/workflows/pre_commit.yml'

.github/labels.yml

@@ -111,67 +111,3 @@
 - name: "Devtools"
   color: "FF9E1F"
   description: "Development tools"
-- name: "Bugfix"
-  color: "FF9E1F"
-  description: "Pull requests that fix bugs"
-- name: "Gradle"
-  color: "FF9E1F"
-  description: "Pull requests that update Gradle code"
-- name: "build"
-  color: "1E90FF"
-  description: "Changes that affect the build system or external dependencies"
-- name: "chore"
-  color: "FFD700"
-  description: "Routine tasks or maintenance that don't modify src or test files"
-- name: "ci"
-  color: "4682B4"
-  description: "Changes to CI configuration files and scripts"
-- name: "perf"
-  color: "FF69B4"
-  description: "Changes that improve performance"
-- name: "refactor"
-  color: "9932CC"
-  description: "Code changes that neither fix a bug nor add a feature"
-- name: "revert"
-  color: "DC143C"
-  description: "Reverts a previous commit"
-- name: "style"
-  color: "FFA500"
-  description: "Changes that do not affect the meaning of the code (formatting, etc.)"
-- name: "admin"
-  color: "195055"
-- name: "codex"
-  color: "ededed"
-  description: null
-- name: "Github"
-  color: "0052CC"
-- name: "github_actions"
-  color: "000000"
-  description: "Pull requests that update GitHub Actions code"
-- name: "needs-changes"
-  color: "A65A86"
-- name: "on-hold"
-  color: "2526F9"
-- name: "python"
-  color: "2b67c6"
-  description: "Pull requests that update Python code"
-- name: "size:L"
-  color: "eb9500"
-  description: "This PR changes 100-499 lines ignoring generated files."
-- name: "size:M"
-  color: "ebb800"
-  description: "This PR changes 30-99 lines ignoring generated files."
-- name: "size:S"
-  color: "77b800"
-  description: "This PR changes 10-29 lines ignoring generated files."
-- name: "size:XL"
-  color: "ff823f"
-  description: "This PR changes 500-999 lines ignoring generated files."
-- name: "size:XS"
-  color: "00ff00"
-  description: "This PR changes 0-9 lines ignoring generated files."
-- name: "size:XXL"
-  color: "ffb8b8"
-  description: "This PR changes 1000+ lines ignoring generated files."
-- name: "to research"
-  color: "FBCA04"

.github/scripts/check_language_properties.py

@@ -196,9 +196,7 @@ def check_for_differences(reference_file, file_list, branch, actor):
 
     if len(file_list) == 1:
         file_arr = file_list[0].split()
-    base_dir = os.path.abspath(
-        os.path.join(os.getcwd(), "stirling-pdf", "src", "main", "resources")
-    )
+    base_dir = os.path.abspath(os.path.join(os.getcwd(), "src", "main", "resources"))
 
     for file_path in file_arr:
         file_normpath = os.path.normpath(file_path)
@@ -218,19 +216,10 @@ def check_for_differences(reference_file, file_list, branch, actor):
             or (
                 # only local windows command
                 not file_normpath.startswith(
-                    os.path.join(
-                        "", "stirling-pdf", "src", "main", "resources", "messages_"
-                    )
+                    os.path.join("", "src", "main", "resources", "messages_")
                 )
                 and not file_normpath.startswith(
-                    os.path.join(
-                        os.getcwd(),
-                        "stirling-pdf",
-                        "src",
-                        "main",
-                        "resources",
-                        "messages_",
-                    )
+                    os.path.join(os.getcwd(), "src", "main", "resources", "messages_")
                 )
             )
             or not file_normpath.endswith(".properties")
@@ -328,7 +317,7 @@ def check_for_differences(reference_file, file_list, branch, actor):
         report.append("## ❌ Overall Check Status: **_Failed_**")
         report.append("")
         report.append(
-            f"@{actor} please check your translation if it conforms to the standard. Follow the format of [messages_en_GB.properties](https://github.com/Stirling-Tools/Stirling-PDF/blob/main/stirling-pdf/src/main/resources/messages_en_GB.properties)"
+            f"@{actor} please check your translation if it conforms to the standard. Follow the format of [messages_en_GB.properties](https://github.com/Stirling-Tools/Stirling-PDF/blob/main/src/main/resources/messages_en_GB.properties)"
         )
     else:
         report.append("## ✅ Overall Check Status: **_Success_**")
@@ -388,12 +377,7 @@ if __name__ == "__main__":
         else:
             file_list = glob.glob(
                 os.path.join(
-                    os.getcwd(),
-                    "stirling-pdf",
-                    "src",
-                    "main",
-                    "resources",
-                    "messages_*.properties",
+                    os.getcwd(), "src", "main", "resources", "messages_*.properties"
                 )
             )
         update_missing_keys(args.reference_file, file_list)

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

@@ -37,12 +37,11 @@ jobs:
       pr_repository: ${{ steps.get-pr-info.outputs.repository }}
       pr_ref: ${{ steps.get-pr-info.outputs.ref }}
       comment_id: ${{ github.event.comment.id }}
-      disable_security: ${{ steps.check-security-flag.outputs.disable_security }}
-      enable_pro: ${{ steps.check-pro-flag.outputs.enable_pro }}
-      enable_enterprise: ${{ steps.check-pro-flag.outputs.enable_enterprise }}
+      enable_security: ${{ steps.check-security-flag.outputs.enable_security }}
+
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@002fdce3c6a235733a90a27c80493a3241e56863 # v2.12.1
+        uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
         with:
           egress-policy: audit
 
@@ -85,7 +84,7 @@ jobs:
 
             core.setOutput('repository', repository);
             core.setOutput('ref', pr.head.ref);
-
+      
       - name: Check for security/login flag
         id: check-security-flag
         env:
@@ -93,29 +92,10 @@ jobs:
         run: |
           if [[ "$COMMENT_BODY" == *"security"* ]] || [[ "$COMMENT_BODY" == *"login"* ]]; then
             echo "Security flags detected in comment"
-            echo "disable_security=false" >> $GITHUB_OUTPUT
+            echo "enable_security=true" >> $GITHUB_OUTPUT
           else
             echo "No security flags detected in comment"
-            echo "disable_security=true" >> $GITHUB_OUTPUT
-          fi
-
-      - name: Check for pro flag
-        id: check-pro-flag
-        env:
-          COMMENT_BODY: ${{ github.event.comment.body }}
-        run: |
-          if [[ "$COMMENT_BODY" == *"pro"* ]] || [[ "$COMMENT_BODY" == *"premium"* ]]; then
-            echo "pro flags detected in comment"
-            echo "enable_pro=true" >> $GITHUB_OUTPUT
-            echo "enable_enterprise=false" >> $GITHUB_OUTPUT
-          elif [[ "$COMMENT_BODY" == *"enterprise"* ]]; then
-            echo "enterprise flags detected in comment"
-            echo "enable_enterprise=true" >> $GITHUB_OUTPUT
-            echo "enable_pro=true" >> $GITHUB_OUTPUT
-          else
-            echo "No pro or enterprise flags detected in comment"
-            echo "enable_pro=false" >> $GITHUB_OUTPUT
-            echo "enable_enterprise=false" >> $GITHUB_OUTPUT
+            echo "enable_security=false" >> $GITHUB_OUTPUT
           fi
 
       - name: Add 'in_progress' reaction to comment
@@ -149,7 +129,7 @@ jobs:
 
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@002fdce3c6a235733a90a27c80493a3241e56863 # v2.12.1
+        uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
         with:
           egress-policy: audit
 
@@ -175,17 +155,17 @@ jobs:
 
       - name: Run Gradle Command
         run: |
-          if [ "${{ needs.check-comment.outputs.disable_security }}" == "true" ]; then
-            export DISABLE_ADDITIONAL_FEATURES=true
+          if [ "${{ needs.check-comment.outputs.enable_security }}" == "true" ]; then
+            export DOCKER_ENABLE_SECURITY=true
           else
-            export DISABLE_ADDITIONAL_FEATURES=false
+            export DOCKER_ENABLE_SECURITY=false
           fi
           ./gradlew clean build
         env:
           STIRLING_PDF_DESKTOP_UI: false
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@e468171a9de216ec08956ac3ada2f0791b6bd435 # v3.11.1
+        uses: docker/setup-buildx-action@b5ca514318bd6ebac0fb2aedd5d36ec1b5c232a2 # v3.10.0
 
       - name: Get version number
         id: versionNumber
@@ -200,7 +180,7 @@ jobs:
           password: ${{ secrets.DOCKER_HUB_API }}
 
       - name: Build and push PR-specific image
-        uses: docker/build-push-action@263435318d21b8e681c14492fe198d362a7d2c83 # v6.18.0
+        uses: docker/build-push-action@14487ce63c7a62a4a324b0bfb37086795e31c6c1 # v6.16.0
         with:
           context: .
           file: ./Dockerfile
@@ -219,31 +199,16 @@ jobs:
         id: deploy
         run: |
           # Set security settings based on flags
-          if [ "${{ needs.check-comment.outputs.disable_security }}" == "false" ]; then
-            DISABLE_ADDITIONAL_FEATURES="false"
+          if [ "${{ needs.check-comment.outputs.enable_security }}" == "true" ]; then
+            DOCKER_SECURITY="true"
             LOGIN_SECURITY="true"
             SECURITY_STATUS="🔒 Security Enabled"
           else
-            DISABLE_ADDITIONAL_FEATURES="true"
+            DOCKER_SECURITY="false"
             LOGIN_SECURITY="false"
             SECURITY_STATUS="Security Disabled"
           fi
 
-          # Set pro/enterprise settings (enterprise implies pro)
-          if [ "${{ needs.check-comment.outputs.enable_enterprise }}" == "true" ]; then
-            PREMIUM_ENABLED="true"
-            PREMIUM_KEY="${{ secrets.ENTERPRISE_KEY }}"
-            PREMIUM_PROFEATURES_AUDIT_ENABLED="true"
-          elif [ "${{ needs.check-comment.outputs.enable_pro }}" == "true" ]; then
-            PREMIUM_ENABLED="true"
-            PREMIUM_KEY="${{ secrets.PREMIUM_KEY }}"
-            PREMIUM_PROFEATURES_AUDIT_ENABLED="true"
-          else
-            PREMIUM_ENABLED="false"
-            PREMIUM_KEY=""
-            PREMIUM_PROFEATURES_AUDIT_ENABLED="false"
-          fi
-
           # First create the docker-compose content locally
           cat > docker-compose.yml << EOF
           version: '3.3'
@@ -258,7 +223,7 @@ jobs:
                 - /stirling/PR-${{ needs.check-comment.outputs.pr_number }}/config:/configs:rw
                 - /stirling/PR-${{ needs.check-comment.outputs.pr_number }}/logs:/logs:rw
               environment:
-                DISABLE_ADDITIONAL_FEATURES: "${DISABLE_ADDITIONAL_FEATURES}"
+                DOCKER_ENABLE_SECURITY: "${DOCKER_SECURITY}"
                 SECURITY_ENABLELOGIN: "${LOGIN_SECURITY}"
                 SYSTEM_DEFAULTLOCALE: en-GB
                 UI_APPNAME: "Stirling-PDF PR#${{ needs.check-comment.outputs.pr_number }}"
@@ -267,9 +232,6 @@ jobs:
                 SYSTEM_MAXFILESIZE: "100"
                 METRICS_ENABLED: "true"
                 SYSTEM_GOOGLEVISIBILITY: "false"
-                PREMIUM_KEY:                         "${PREMIUM_KEY}"
-                PREMIUM_ENABLED:                     "${PREMIUM_ENABLED}"
-                PREMIUM_PROFEATURES_AUDIT_ENABLED:   "${PREMIUM_PROFEATURES_AUDIT_ENABLED}"
               restart: on-failure:5
           EOF
 
@@ -288,7 +250,7 @@ jobs:
             docker-compose pull
             docker-compose up -d
           ENDSSH
-
+          
           # Set output for use in PR comment
           echo "security_status=${SECURITY_STATUS}" >> $GITHUB_ENV
 

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

@@ -21,7 +21,7 @@ jobs:
 
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@002fdce3c6a235733a90a27c80493a3241e56863 # v2.12.1
+        uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
         with:
           egress-policy: audit
 

.github/workflows/auto-labeler.yml

@@ -13,7 +13,7 @@ jobs:
       pull-requests: write
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@002fdce3c6a235733a90a27c80493a3241e56863 # v2.12.1
+        uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
         with:
           egress-policy: audit
 

.github/workflows/auto-labelerV2.yml

@@ -1,35 +0,0 @@
-name: "Auto Pull Request Labeler V2"
-on:
-  pull_request_target:
-    types: [opened, synchronize]
-
-permissions:
-  contents: read
-
-jobs:
-  labeler:
-    runs-on: ubuntu-latest
-    permissions:
-      pull-requests: write
-    steps:
-      - name: Harden Runner
-        uses: step-security/harden-runner@002fdce3c6a235733a90a27c80493a3241e56863 # v2.12.1
-        with:
-          egress-policy: audit
-
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-
-      - name: Setup GitHub App Bot
-        id: setup-bot
-        uses: ./.github/actions/setup-bot
-        with:
-          app-id: ${{ secrets.GH_APP_ID }}
-          private-key: ${{ secrets.GH_APP_PRIVATE_KEY }}
-
-      - uses: srvaroa/labeler@0a20eccb8c94a1ee0bed5f16859aece1c45c3e55 # v1.13.0
-        with:
-          config_path: .github/labeler-config-srvaroa.yml
-          use_local_config: false
-          fail_on_error: true
-        env:
-          GITHUB_TOKEN: "${{ steps.setup-bot.outputs.token }}"

.github/workflows/build.yml

@@ -21,11 +21,10 @@ jobs:
       fail-fast: false
       matrix:
         jdk-version: [17, 21]
-        spring-security: [true, false]
 
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@002fdce3c6a235733a90a27c80493a3241e56863 # v2.12.1
+        uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
         with:
           egress-policy: audit
 
@@ -38,59 +37,32 @@ jobs:
           java-version: ${{ matrix.jdk-version }}
           distribution: "temurin"
 
-      - name: Build with Gradle and spring security ${{ matrix.spring-security }}
+      - name: Build with Gradle and no spring security
         run: ./gradlew clean build
         env:
-          DISABLE_ADDITIONAL_FEATURES: ${{ matrix.spring-security }}
+          DOCKER_ENABLE_SECURITY: false
 
-      - name: Check Test Reports Exist
-        id: check-reports
-        if: always()
-        run: |
-          declare -a dirs=(
-            "stirling-pdf/build/reports/tests/"
-            "stirling-pdf/build/test-results/"
-            "common/build/reports/tests/"
-            "common/build/test-results/"
-            "proprietary/build/reports/tests/"
-            "proprietary/build/test-results/"
-          )
-          missing_reports=()
-          for dir in "${dirs[@]}"; do
-            if [ ! -d "$dir" ]; then
-              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: Build with Gradle and with spring security
+        run: ./gradlew clean build
+        env:
+          DOCKER_ENABLE_SECURITY: true
 
       - name: Upload Test Reports
         if: always()
         uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
         with:
-          name: test-reports-jdk-${{ matrix.jdk-version }}-spring-security-${{ matrix.spring-security }}
+          name: test-reports-jdk-${{ matrix.jdk-version }}
           path: |
-            stirling-pdf/build/reports/tests/
-            stirling-pdf/build/test-results/
-            stirling-pdf/build/reports/problems/
-            common/build/reports/tests/
-            common/build/test-results/
-            common/build/reports/problems/
-            proprietary/build/reports/tests/
-            proprietary/build/test-results/
-            proprietary/build/reports/problems/
+            build/reports/tests/
+            build/test-results/
+            build/reports/problems/
           retention-days: 3
-          if-no-files-found: warn
 
   check-licence:
     runs-on: ubuntu-latest
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@002fdce3c6a235733a90a27c80493a3241e56863 # v2.12.1
+        uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
         with:
           egress-policy: audit
 
@@ -134,7 +106,7 @@ jobs:
 
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@002fdce3c6a235733a90a27c80493a3241e56863 # v2.12.1
+        uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
         with:
           egress-policy: audit
 
@@ -148,7 +120,7 @@ jobs:
           distribution: "adopt"
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@e468171a9de216ec08956ac3ada2f0791b6bd435 # v3.11.1
+        uses: docker/setup-buildx-action@b5ca514318bd6ebac0fb2aedd5d36ec1b5c232a2 # v3.10.0
 
       - name: Install Docker Compose
         run: |

.github/workflows/check_properties.yml

@@ -4,7 +4,7 @@ on:
   pull_request_target:
     types: [opened, synchronize, reopened]
     paths:
-      - "stirling-pdf/src/main/resources/messages_*.properties"
+      - "src/main/resources/messages_*.properties"
 
 permissions:
   contents: read # Allow read access to repository content
@@ -15,28 +15,25 @@ jobs:
     runs-on: ubuntu-latest
     permissions:
       issues: write # Allow posting comments on issues/PRs
-      pull-requests: write # Allow writing to pull requests
+      pull-requests: write
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@002fdce3c6a235733a90a27c80493a3241e56863 # v2.12.1
+        uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
         with:
           egress-policy: audit
 
       - name: Checkout main branch first
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
 
-      - name: Setup GitHub App Bot
-        id: setup-bot
-        uses: ./.github/actions/setup-bot
+      - name: Set up Python
+        uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
         with:
-          app-id: ${{ secrets.GH_APP_ID }}
-          private-key: ${{ secrets.GH_APP_PRIVATE_KEY }}
+          python-version: "3.12"
 
       - name: Get PR data
         id: get-pr-data
         uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
         with:
-          github-token: ${{ steps.setup-bot.outputs.token }}
           script: |
             const prNumber = context.payload.pull_request.number;
             const repoOwner = context.payload.repository.owner.login;
@@ -57,30 +54,16 @@ jobs:
       - name: Fetch PR changed files
         id: fetch-pr-changes
         env:
-          GH_TOKEN: ${{ steps.setup-bot.outputs.token }}
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
           echo "Fetching PR changed files..."
           echo "Getting list of changed files from PR..."
-                   # Check if PR number exists
-            if [ -z "${{ steps.get-pr-data.outputs.pr_number }}" ]; then
-              echo "Error: PR number is empty"
-              exit 1
-            fi
-            # Get changed files and filter for properties files, handle case where no matches are found
-            gh pr view ${{ steps.get-pr-data.outputs.pr_number }} --json files -q ".files[].path" | grep -E '^stirling-pdf/src/main/resources/messages_[a-zA-Z_]{2}_[a-zA-Z_]{2,7}\.properties$' > changed_files.txt || echo "No matching properties files found in PR"
-            # Check if any files were found
-            if [ ! -s changed_files.txt ]; then
-              echo "No properties files changed in this PR"
-              echo "Workflow will exit early as no relevant files to check"
-              exit 0
-            fi
-            echo "Found $(wc -l < changed_files.txt) matching properties files"
+          gh pr view ${{ steps.get-pr-data.outputs.pr_number }} --json files -q ".files[].path" | grep -E '^src/main/resources/messages_[a-zA-Z_]{2}_[a-zA-Z_]{2,7}\.properties$' > changed_files.txt # Filter only matching property files
 
       - name: Determine reference file test
         id: determine-file
         uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
         with:
-          github-token: ${{ steps.setup-bot.outputs.token }}
           script: |
             const fs = require("fs");
             const path = require("path");
@@ -115,11 +98,8 @@ jobs:
 
             // Filter for relevant files based on the PR changes
             const changedFiles = files
-              .filter(file => 
-                file.status !== "removed" &&
-                /^stirling-pdf\/src\/main\/resources\/messages_[a-zA-Z_]{2}_[a-zA-Z_]{2,7}\.properties$/.test(file.filename)
-              )
-              .map(file => file.filename);
+              .map(file => file.filename)
+              .filter(file => /^src\/main\/resources\/messages_[a-zA-Z_]{2}_[a-zA-Z_]{2,7}\.properties$/.test(file));
 
             console.log("Changed files:", changedFiles);
 
@@ -157,12 +137,12 @@ jobs:
 
             // Determine reference file
             let referenceFilePath;
-            if (changedFiles.includes("stirling-pdf/src/main/resources/messages_en_GB.properties")) {
+            if (changedFiles.includes("src/main/resources/messages_en_GB.properties")) {
               console.log("Using PR branch reference file.");
               const { data: fileContent } = await github.rest.repos.getContent({
                 owner: prRepoOwner,
                 repo: prRepoName,
-                path: "stirling-pdf/src/main/resources/messages_en_GB.properties",
+                path: "src/main/resources/messages_en_GB.properties",
                 ref: branch,
               });
 
@@ -174,7 +154,7 @@ jobs:
               const { data: fileContent } = await github.rest.repos.getContent({
                 owner: repoOwner,
                 repo: repoName,
-                path: "stirling-pdf/src/main/resources/messages_en_GB.properties",
+                path: "src/main/resources/messages_en_GB.properties",
                 ref: "main",
               });
 
@@ -224,7 +204,6 @@ jobs:
         if: env.SCRIPT_OUTPUT != ''
         uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
         with:
-          github-token: ${{ steps.setup-bot.outputs.token }}
           script: |
             const { GITHUB_REPOSITORY, SCRIPT_OUTPUT } = process.env;
             const [repoOwner, repoName] = GITHUB_REPOSITORY.split('/');
@@ -240,7 +219,7 @@ jobs:
             const comment = comments.data.find(c => c.body.includes("## 🚀 Translation Verification Summary"));
 
             // Only update or create comments by the action user
-            const expectedActor = "${{ steps.setup-bot.outputs.app-slug }}[bot]";
+            const expectedActor = "github-actions[bot]";
 
             if (comment && comment.user.login === expectedActor) {
               // Update existing comment

.github/workflows/dependency-review.yml

@@ -17,11 +17,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@002fdce3c6a235733a90a27c80493a3241e56863 # v2.12.1
+        uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
         with:
           egress-policy: audit
 
       - name: "Checkout Repository"
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
       - name: "Dependency Review"
-        uses: actions/dependency-review-action@da24556b548a50705dd671f47852072ea4c105d9 # v4.7.1
+        uses: actions/dependency-review-action@ce3cf9537a52e8119d91fd484ab5b8a807627bf8 # v4.6.0

.github/workflows/licenses-update.yml

@@ -16,52 +16,54 @@ jobs:
     permissions:
       contents: write
       pull-requests: write
-      repository-projects: write # Required for enabling automerge
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@002fdce3c6a235733a90a27c80493a3241e56863 # v2.12.1
+        uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
         with:
           egress-policy: audit
 
-      - name: Check out code
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-        with:
-          fetch-depth: 0
-
-      - name: Setup GitHub App Bot
-        id: setup-bot
-        uses: ./.github/actions/setup-bot
+      - name: Generate GitHub App Token
+        id: generate-token
+        uses: actions/create-github-app-token@df432ceedc7162793a195dd1713ff69aefc7379e # v2.0.6
         with:
           app-id: ${{ secrets.GH_APP_ID }}
           private-key: ${{ secrets.GH_APP_PRIVATE_KEY }}
 
+      - name: Check out code
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+
       - name: Set up JDK 17
         uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
         with:
           java-version: "17"
           distribution: "adopt"
 
-      - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@ac638b010cf58a27ee6c972d7336334ccaf61c96 # v4.4.1
+      - uses: gradle/actions/setup-gradle@06832c7b30a0129d7fb559bcc6e43d26f6374244 # v4.3.1
 
-      - name: Check licenses for compatibility
+      - name: check the licenses for compatibility
         run: ./gradlew clean checkLicense
 
-      - name: Upload artifact on failure
+      - name: FAILED - check the licenses for compatibility
         if: failure()
         uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
         with:
           name: dependencies-without-allowed-license.json
-          path: build/reports/dependency-license/dependencies-without-allowed-license.json
+          path: |
+            build/reports/dependency-license/dependencies-without-allowed-license.json
           retention-days: 3
 
-      - name: Move and rename license file
+      - name: Move and Rename License File
         run: |
-          mv build/reports/dependency-license/index.json stirling-pdf/src/main/resources/static/3rdPartyLicenses.json
+          mv build/reports/dependency-license/index.json src/main/resources/static/3rdPartyLicenses.json
 
-      - name: Commit changes
+      - name: Set up git config
         run: |
-          git add stirling-pdf/src/main/resources/static/3rdPartyLicenses.json
+          git config --global user.name "stirlingbot[bot]"
+          git config --global user.email "1113334+stirlingbot[bot]@users.noreply.github.com"
+
+      - name: Run git add
+        run: |
+          git add src/main/resources/static/3rdPartyLicenses.json
           git diff --staged --quiet || echo "CHANGES_DETECTED=true" >> $GITHUB_ENV
 
       - name: Create Pull Request
@@ -69,16 +71,16 @@ jobs:
         if: env.CHANGES_DETECTED == 'true'
         uses: peter-evans/create-pull-request@271a8d0340265f705b14b6d32b9829c1cb33d45e # v7.0.8
         with:
-          token: ${{ steps.setup-bot.outputs.token }}
+          token: ${{ steps.generate-token.outputs.token }}
           commit-message: "Update 3rd Party Licenses"
-          committer: ${{ steps.setup-bot.outputs.committer }}
-          author: ${{ steps.setup-bot.outputs.committer }}
+          committer: "stirlingbot[bot] <1113334+stirlingbot[bot]@users.noreply.github.com>"
+          author: "stirlingbot[bot] <1113334+stirlingbot[bot]@users.noreply.github.com>"
           signoff: true
           branch: update-3rd-party-licenses
           title: "Update 3rd Party Licenses"
           body: |
-            Auto-generated by ${{ steps.setup-bot.outputs.app-slug }}[bot]
-          labels: Licenses,github-actions
+            Auto-generated by StirlingBot
+          labels: licenses,github-actions
           draft: false
           delete-branch: true
           sign-commits: true
@@ -87,4 +89,4 @@ jobs:
         if: steps.cpr.outputs.pull-request-operation == 'created'
         run: gh pr merge --squash --auto "${{ steps.cpr.outputs.pull-request-number }}"
         env:
-          GH_TOKEN: ${{ steps.setup-bot.outputs.token }}
+          GH_TOKEN: ${{ steps.generate-token.outputs.token }}

.github/workflows/manage-label.yml

@@ -15,7 +15,7 @@ jobs:
       issues: write
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@002fdce3c6a235733a90a27c80493a3241e56863 # v2.12.1
+        uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
         with:
           egress-policy: audit
 

.github/workflows/multiOSReleases.yml

@@ -21,7 +21,7 @@ jobs:
       versionMac: ${{ steps.versionNumberMac.outputs.versionNumberMac }}
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@002fdce3c6a235733a90a27c80493a3241e56863 # v2.12.1
+        uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
         with:
           egress-policy: audit
 
@@ -48,15 +48,15 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        disable_security: [true, false]
+        enable_security: [true, false]
         include:
-          - disable_security: false
+          - enable_security: true
             file_suffix: "-with-login"
-          - disable_security: true
+          - enable_security: false
             file_suffix: ""
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@002fdce3c6a235733a90a27c80493a3241e56863 # v2.12.1
+        uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
         with:
           egress-policy: audit
 
@@ -68,14 +68,14 @@ jobs:
           java-version: "21"
           distribution: "temurin"
 
-      - uses: gradle/actions/setup-gradle@ac638b010cf58a27ee6c972d7336334ccaf61c96 # v4.4.1
+      - uses: gradle/actions/setup-gradle@06832c7b30a0129d7fb559bcc6e43d26f6374244 # v4.3.1
         with:
           gradle-version: 8.14
 
-      - name: Generate jar (Disable Security=${{ matrix.disable_security }})
+      - name: Generate jar (With Security=${{ matrix.enable_security }})
         run: ./gradlew clean createExe
         env:
-          DISABLE_ADDITIONAL_FEATURES: ${{ matrix.disable_security }}
+          DOCKER_ENABLE_SECURITY: ${{ matrix.enable_security }}
           STIRLING_PDF_DESKTOP_UI: false
 
       - name: Rename binaries
@@ -98,15 +98,15 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        disable_security: [true, false]
+        enable_security: [true, false]
         include:
-          - disable_security: false
+          - enable_security: true
             file_suffix: "with-login-"
-          - disable_security: true
+          - enable_security: false
             file_suffix: ""
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@002fdce3c6a235733a90a27c80493a3241e56863 # v2.12.1
+        uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
         with:
           egress-policy: audit
 
@@ -144,7 +144,7 @@ jobs:
       contents: write
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@002fdce3c6a235733a90a27c80493a3241e56863 # v2.12.1
+        uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
         with:
           egress-policy: audit
 
@@ -156,7 +156,7 @@ jobs:
           java-version: "21"
           distribution: "temurin"
 
-      - uses: gradle/actions/setup-gradle@ac638b010cf58a27ee6c972d7336334ccaf61c96 # v4.4.1
+      - uses: gradle/actions/setup-gradle@06832c7b30a0129d7fb559bcc6e43d26f6374244 # v4.3.1
         with:
           gradle-version: 8.14
 
@@ -171,7 +171,7 @@ jobs:
       - name: Build Installer
         run: ./gradlew build jpackage -x test --info
         env:
-          DISABLE_ADDITIONAL_FEATURES: true
+          DOCKER_ENABLE_SECURITY: false
           STIRLING_PDF_DESKTOP_UI: true
           BROWSER_OPEN: true
 
@@ -234,7 +234,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@002fdce3c6a235733a90a27c80493a3241e56863 # v2.12.1
+        uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
         with:
           egress-policy: audit
 
@@ -248,7 +248,7 @@ jobs:
 
       - name: Install Cosign
         if: matrix.os == 'windows-latest'
-        uses: sigstore/cosign-installer@fb28c2b6339dcd94da6e4cbcbc5e888961f6f8c3 # v3.9.0
+        uses: sigstore/cosign-installer@3454372f43399081ed03b604cb2d021dabca52bb # v3.8.2
 
       - name: Generate key pair
         if: matrix.os == 'windows-latest'
@@ -297,7 +297,7 @@ jobs:
       contents: write
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@002fdce3c6a235733a90a27c80493a3241e56863 # v2.12.1
+        uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
         with:
           egress-policy: audit
 
@@ -306,7 +306,7 @@ jobs:
       - name: Display structure of downloaded files
         run: ls -R
       - name: Upload binaries, attestations and signatures to Release and create GitHub Release
-        uses: softprops/action-gh-release@72f2c25fcb47643c292f7107632f7a47c1df5cd8 # v2.3.2
+        uses: softprops/action-gh-release@01570a1f39cb168c169c802c3bceb9e93fb10974 # v2.1.0
         with:
           tag_name: v${{ needs.read_versions.outputs.version }}
           generate_release_notes: true

.github/workflows/pre_commit.yml

@@ -16,53 +16,62 @@ jobs:
       pull-requests: write
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@002fdce3c6a235733a90a27c80493a3241e56863 # v2.12.1
+        uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
         with:
           egress-policy: audit
 
+      - name: Generate GitHub App Token
+        id: generate-token
+        uses: actions/create-github-app-token@df432ceedc7162793a195dd1713ff69aefc7379e # v2.0.6
+        with:
+          app-id: ${{ secrets.GH_APP_ID }}
+          private-key: ${{ secrets.GH_APP_PRIVATE_KEY }}
+
+      - name: Get GitHub App User ID
+        id: get-user-id
+        run: echo "user-id=$(gh api "/users/${{ steps.generate-token.outputs.app-slug }}[bot]" --jq .id)" >> $GITHUB_OUTPUT
+        env:
+          GH_TOKEN: ${{ steps.generate-token.outputs.token }}
+
+      - id: committer
+        run: |
+          echo "string=${{ steps.generate-token.outputs.app-slug }}[bot] <${{ steps.get-user-id.outputs.user-id }}+${{ steps.generate-token.outputs.app-slug }}[bot]@users.noreply.github.com>"  >> "$GITHUB_OUTPUT"
+
       - name: Checkout repository
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           fetch-depth: 0
-
-      - name: Setup GitHub App Bot
-        id: setup-bot
-        uses: ./.github/actions/setup-bot
-        with:
-          app-id: ${{ secrets.GH_APP_ID }}
-          private-key: ${{ secrets.GH_APP_PRIVATE_KEY }}
-
       - name: Set up Python
         uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
         with:
           python-version: 3.12
           cache: 'pip' # caching pip dependencies
-
       - name: Run Pre-Commit Hooks
         run: |
           pip install --require-hashes -r ./.github/scripts/requirements_pre_commit.txt
-
       - run: pre-commit run --all-files -c .pre-commit-config.yaml
         continue-on-error: true
-
+      - name: Set up git config
+        run: |
+          git config --global user.name ${{ steps.generate-token.outputs.app-slug }}[bot]
+          git config --global user.email "${{ steps.get-user-id.outputs.user-id }}+${{ steps.generate-token.outputs.app-slug }}[bot]@users.noreply.github.com"
       - name: git add
         run: |
           git add .
           git diff --staged --quiet || echo "CHANGES_DETECTED=true" >> $GITHUB_ENV
-
       - name: Create Pull Request
         if: env.CHANGES_DETECTED == 'true'
         uses: peter-evans/create-pull-request@271a8d0340265f705b14b6d32b9829c1cb33d45e # v7.0.8
         with:
-          token: ${{ steps.setup-bot.outputs.token }}
+          token: ${{ steps.generate-token.outputs.token }}
           commit-message: ":file_folder: pre-commit"
-          committer: ${{ steps.setup-bot.outputs.committer }}
-          author: ${{ steps.setup-bot.outputs.committer }}
+          committer: ${{ steps.committer.outputs.string }}
+          author: ${{ steps.committer.outputs.string }}
           signoff: true
           branch: pre-commit
-          title: "🤖 format everything with pre-commit by ${{ steps.setup-bot.outputs.app-slug }}"
+          title: "🤖 format everything with pre-commit by <${{ steps.generate-token.outputs.app-slug }}>"
           body: |
-            Auto-generated by [create-pull-request][1] with **${{ steps.setup-bot.outputs.app-slug }}**
+            Auto-generated by [create-pull-request][1] with **${{ steps.generate-token.outputs.app-slug }}**
 
             [1]: https://github.com/peter-evans/create-pull-request
           draft: false

.github/workflows/push-docker.yml

@@ -18,7 +18,7 @@ jobs:
       id-token: write
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@002fdce3c6a235733a90a27c80493a3241e56863 # v2.12.1
+        uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
         with:
           egress-policy: audit
 
@@ -30,25 +30,25 @@ jobs:
           java-version: "17"
           distribution: "temurin"
 
-      - uses: gradle/actions/setup-gradle@ac638b010cf58a27ee6c972d7336334ccaf61c96 # v4.4.1
+      - uses: gradle/actions/setup-gradle@06832c7b30a0129d7fb559bcc6e43d26f6374244 # v4.3.1
         with:
           gradle-version: 8.14
 
       - name: Run Gradle Command
         run: ./gradlew clean build
         env:
-          DISABLE_ADDITIONAL_FEATURES: true
+          DOCKER_ENABLE_SECURITY: false
           STIRLING_PDF_DESKTOP_UI: false
 
       - name: Install cosign
         if: github.ref == 'refs/heads/master'
-        uses: sigstore/cosign-installer@fb28c2b6339dcd94da6e4cbcbc5e888961f6f8c3 # v3.9.0
+        uses: sigstore/cosign-installer@3454372f43399081ed03b604cb2d021dabca52bb # v3.8.2
         with:
           cosign-release: "v2.4.1"
 
       - name: Set up Docker Buildx
         id: buildx
-        uses: docker/setup-buildx-action@e468171a9de216ec08956ac3ada2f0791b6bd435 # v3.11.1
+        uses: docker/setup-buildx-action@b5ca514318bd6ebac0fb2aedd5d36ec1b5c232a2 # v3.10.0
 
       - name: Get version number
         id: versionNumber
@@ -90,7 +90,7 @@ jobs:
 
       - name: Build and push main Dockerfile
         id: build-push-regular
-        uses: docker/build-push-action@263435318d21b8e681c14492fe198d362a7d2c83 # v6.18.0
+        uses: docker/build-push-action@14487ce63c7a62a4a324b0bfb37086795e31c6c1 # v6.16.0
         with:
           builder: ${{ steps.buildx.outputs.name }}
           context: .
@@ -135,7 +135,7 @@ jobs:
 
       - name: Build and push Dockerfile-ultra-lite
         id: build-push-lite
-        uses: docker/build-push-action@263435318d21b8e681c14492fe198d362a7d2c83 # v6.18.0
+        uses: docker/build-push-action@14487ce63c7a62a4a324b0bfb37086795e31c6c1 # v6.16.0
         if: github.ref != 'refs/heads/main'
         with:
           context: .
@@ -166,7 +166,7 @@ jobs:
 
       - name: Build and push main Dockerfile fat
         id: build-push-fat
-        uses: docker/build-push-action@263435318d21b8e681c14492fe198d362a7d2c83 # v6.18.0
+        uses: docker/build-push-action@14487ce63c7a62a4a324b0bfb37086795e31c6c1 # v6.16.0
         if: github.ref != 'refs/heads/main'
         with:
           builder: ${{ steps.buildx.outputs.name }}

.github/workflows/releaseArtifacts.yml

@@ -13,17 +13,17 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        disable_security: [true, false]
+        enable_security: [true, false]
         include:
-          - disable_security: false
+          - enable_security: true
             file_suffix: "-with-login"
-          - disable_security: true
+          - enable_security: false
             file_suffix: ""
     outputs:
       version: ${{ steps.versionNumber.outputs.versionNumber }}
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@002fdce3c6a235733a90a27c80493a3241e56863 # v2.12.1
+        uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
         with:
           egress-policy: audit
 
@@ -35,14 +35,14 @@ jobs:
           java-version: "17"
           distribution: "temurin"
 
-      - uses: gradle/actions/setup-gradle@ac638b010cf58a27ee6c972d7336334ccaf61c96 # v4.4.1
+      - uses: gradle/actions/setup-gradle@06832c7b30a0129d7fb559bcc6e43d26f6374244 # v4.3.1
         with:
           gradle-version: 8.14
 
-      - name: Generate jar (Disable Security=${{ matrix.disable_security }})
+      - name: Generate jar (With Security=${{ matrix.enable_security }})
         run: ./gradlew clean createExe
         env:
-          DISABLE_ADDITIONAL_FEATURES: ${{ matrix.disable_security }}
+          DOCKER_ENABLE_SECURITY: ${{ matrix.enable_security }}
           STIRLING_PDF_DESKTOP_UI: false
 
       - name: Get version number
@@ -75,15 +75,15 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        disable_security: [true, false]
+        enable_security: [true, false]
         include:
-          - disable_security: false
+          - enable_security: true
             file_suffix: "-with-login"
-          - disable_security: true
+          - enable_security: false
             file_suffix: ""
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@002fdce3c6a235733a90a27c80493a3241e56863 # v2.12.1
+        uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
         with:
           egress-policy: audit
 
@@ -95,7 +95,7 @@ jobs:
         run: ls -R
 
       - name: Install Cosign
-        uses: sigstore/cosign-installer@fb28c2b6339dcd94da6e4cbcbc5e888961f6f8c3 # v3.9.0
+        uses: sigstore/cosign-installer@3454372f43399081ed03b604cb2d021dabca52bb # v3.8.2
 
       - name: Generate key pair
         run: cosign generate-key-pair
@@ -153,15 +153,15 @@ jobs:
       contents: write
     strategy:
       matrix:
-        disable_security: [true, false]
+        enable_security: [true, false]
         include:
-          - disable_security: false
+          - enable_security: true
             file_suffix: "-with-login"
-          - disable_security: true
+          - enable_security: false
             file_suffix: ""
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@002fdce3c6a235733a90a27c80493a3241e56863 # v2.12.1
+        uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
         with:
           egress-policy: audit
 
@@ -171,7 +171,7 @@ jobs:
           name: signed${{ matrix.file_suffix }}
 
       - name: Upload binaries, attestations and signatures to Release and create GitHub Release
-        uses: softprops/action-gh-release@72f2c25fcb47643c292f7107632f7a47c1df5cd8 # v2.3.2
+        uses: softprops/action-gh-release@01570a1f39cb168c169c802c3bceb9e93fb10974 # v2.1.0
         with:
           tag_name: v${{ needs.build.outputs.version }}
           generate_release_notes: true

.github/workflows/scorecards.yml

@@ -34,7 +34,7 @@ jobs:
 
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@002fdce3c6a235733a90a27c80493a3241e56863 # v2.12.1
+        uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
         with:
           egress-policy: audit
 
@@ -44,7 +44,7 @@ jobs:
           persist-credentials: false
 
       - name: "Run analysis"
-        uses: ossf/scorecard-action@05b42c624433fc40578a4040d5cf5e36ddca8cde # v2.4.2
+        uses: ossf/scorecard-action@f49aabe0b5af0936a0987cfb85d86b75731b0186 # v2.4.1
         with:
           results_file: results.sarif
           results_format: sarif
@@ -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@ce28f5bb42b7a9f2c824e633a3f6ee835bab6858 # v3.29.0
+        uses: github/codeql-action/upload-sarif@60168efe1c415ce0f5521ea06d5c2062adbeed1b # v3.28.17
         with:
           sarif_file: results.sarif

.github/workflows/sonarqube.yml

@@ -18,7 +18,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@002fdce3c6a235733a90a27c80493a3241e56863 # v2.12.1
+        uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
         with:
           egress-policy: audit
 
@@ -27,13 +27,13 @@ jobs:
           fetch-depth: 0
 
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@ac638b010cf58a27ee6c972d7336334ccaf61c96 # v4.4.1
+        uses: gradle/actions/setup-gradle@06832c7b30a0129d7fb559bcc6e43d26f6374244 # v4.3.1
 
       - name: Build and analyze with Gradle
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
-          DISABLE_ADDITIONAL_FEATURES: false
+          DOCKER_ENABLE_SECURITY: true
           STIRLING_PDF_DESKTOP_UI: true
         run: |
           ./gradlew clean build sonar \

.github/workflows/stale.yml

@@ -16,7 +16,7 @@ jobs:
       pull-requests: write
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@002fdce3c6a235733a90a27c80493a3241e56863 # v2.12.1
+        uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
         with:
           egress-policy: audit
 

.github/workflows/swagger.yml

@@ -14,7 +14,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@002fdce3c6a235733a90a27c80493a3241e56863 # v2.12.1
+        uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
         with:
           egress-policy: audit
 
@@ -26,7 +26,7 @@ jobs:
           java-version: "17"
           distribution: "temurin"
 
-      - uses: gradle/actions/setup-gradle@ac638b010cf58a27ee6c972d7336334ccaf61c96 # v4.4.1
+      - uses: gradle/actions/setup-gradle@06832c7b30a0129d7fb559bcc6e43d26f6374244 # v4.3.1
 
       - name: Generate Swagger documentation
         run: ./gradlew generateOpenApiDocs

.github/workflows/sync_files.yml

@@ -8,45 +8,87 @@ on:
     paths:
       - "build.gradle"
       - "README.md"
-      - "stirling-pdf/src/main/resources/messages_*.properties"
-      - "stirling-pdf/src/main/resources/static/3rdPartyLicenses.json"
+      - "src/main/resources/messages_*.properties"
+      - "src/main/resources/static/3rdPartyLicenses.json"
       - "scripts/ignore_translation.toml"
 
 permissions:
   contents: read
 
 jobs:
-  sync-files:
+  read_bot_entries:
     runs-on: ubuntu-latest
+    outputs:
+      userName: ${{ steps.get-user-id.outputs.user_name }}
+      userEmail: ${{ steps.get-user-id.outputs.user_email }}
+      committer: ${{ steps.committer.outputs.committer }}
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@002fdce3c6a235733a90a27c80493a3241e56863 # v2.12.1
+        uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
         with:
           egress-policy: audit
 
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-
-      - name: Setup GitHub App Bot
-        id: setup-bot
-        uses: ./.github/actions/setup-bot
+      - name: Generate GitHub App Token
+        id: generate-token
+        uses: actions/create-github-app-token@df432ceedc7162793a195dd1713ff69aefc7379e # v2.0.6
         with:
           app-id: ${{ secrets.GH_APP_ID }}
           private-key: ${{ secrets.GH_APP_PRIVATE_KEY }}
 
+      - name: Get GitHub App User ID
+        id: get-user-id
+        run: |
+          USER_NAME="${{ steps.generate-token.outputs.app-slug }}[bot]"
+          USER_ID=$(gh api "/users/$USER_NAME" --jq .id)
+          USER_EMAIL="$USER_ID+$USER_NAME@users.noreply.github.com"
+          echo "user_name=$USER_NAME" >> "$GITHUB_OUTPUT"
+          echo "user_email=$USER_EMAIL" >> "$GITHUB_OUTPUT"
+          echo "user-id=$USER_ID" >> "$GITHUB_OUTPUT"
+        env:
+          GH_TOKEN: ${{ steps.generate-token.outputs.token }}
+
+      - id: committer
+        run: |
+          COMMITTER="${{ steps.get-user-id.outputs.user_name }} <${{ steps.get-user-id.outputs.user_email }}>"
+          echo "committer=$COMMITTER" >> "$GITHUB_OUTPUT"
+
+  sync-files:
+    needs: ["read_bot_entries"]
+    runs-on: ubuntu-latest
+    steps:
+      - name: Harden Runner
+        uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
+        with:
+          egress-policy: audit
+
+      - name: Generate GitHub App Token
+        id: generate-token
+        uses: actions/create-github-app-token@df432ceedc7162793a195dd1713ff69aefc7379e # v2.0.6
+        with:
+          app-id: ${{ vars.GH_APP_ID }}
+          private-key: ${{ secrets.GH_APP_PRIVATE_KEY }}
+
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+
       - name: Set up Python
         uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
         with:
           python-version: "3.12"
-          cache: "pip" # caching pip dependencies
+          cache: 'pip' # caching pip dependencies
 
       - name: Sync translation property files
         run: |
-          python .github/scripts/check_language_properties.py --reference-file "stirling-pdf/src/main/resources/messages_en_GB.properties" --branch main
+          python .github/scripts/check_language_properties.py --reference-file "src/main/resources/messages_en_GB.properties" --branch main
 
-      - name: Commit translation files
+      - name: Set up git config
         run: |
-          git add stirling-pdf/src/main/resources/messages_*.properties
-          git diff --staged --quiet || git commit -m ":memo: Sync translation files" || echo "No changes detected"
+          git config --global user.name ${{ needs.read_bot_entries.outputs.userName }}
+          git config --global user.email ${{ needs.read_bot_entries.outputs.userEmail }}
+
+      - name: Run git add
+        run: |
+          git add src/main/resources/messages_*.properties
+          git diff --staged --quiet || git commit -m ":memo: Sync translation files" || echo "no changes"
 
       - name: Install dependencies
         run: pip install --require-hashes -r ./.github/scripts/requirements_sync_readme.txt
@@ -58,16 +100,15 @@ jobs:
       - name: Run git add
         run: |
           git add README.md
-          git diff --staged --quiet || git commit -m ":memo: Sync README.md" || echo "No changes detected"
+          git diff --staged --quiet || git commit -m ":memo: Sync README.md" || echo "no changes"
 
       - name: Create Pull Request
-        if: always()
         uses: peter-evans/create-pull-request@271a8d0340265f705b14b6d32b9829c1cb33d45e # v7.0.8
         with:
-          token: ${{ steps.setup-bot.outputs.token }}
+          token: ${{ steps.generate-token.outputs.token }}
           commit-message: Update files
-          committer: ${{ steps.setup-bot.outputs.committer }}
-          author: ${{ steps.setup-bot.outputs.committer }}
+          committer: ${{ needs.read_bot_entries.outputs.committer }}
+          author: ${{ needs.read_bot_entries.outputs.committer }}
           signoff: true
           branch: sync_readme
           title: ":globe_with_meridians: Sync Translations + Update README Progress Table"
@@ -101,4 +142,4 @@ jobs:
           sign-commits: true
           add-paths: |
             README.md
-              stirling-pdf/src/main/resources/messages_*.properties
+            src/main/resources/messages_*.properties

.github/workflows/testdriver.yml

@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@002fdce3c6a235733a90a27c80493a3241e56863 # v2.12.1
+        uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
         with:
           egress-policy: audit
 
@@ -28,10 +28,10 @@ jobs:
       - name: Build with Gradle
         run: ./gradlew clean build
         env:
-          DISABLE_ADDITIONAL_FEATURES: true
+          DOCKER_ENABLE_SECURITY: false
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@e468171a9de216ec08956ac3ada2f0791b6bd435 # v3.11.1
+        uses: docker/setup-buildx-action@b5ca514318bd6ebac0fb2aedd5d36ec1b5c232a2 # v3.10.0
 
       - name: Get version number
         id: versionNumber
@@ -46,7 +46,7 @@ jobs:
           password: ${{ secrets.DOCKER_HUB_API }}
 
       - name: Build and push test image
-        uses: docker/build-push-action@263435318d21b8e681c14492fe198d362a7d2c83 # v6.18.0
+        uses: docker/build-push-action@14487ce63c7a62a4a324b0bfb37086795e31c6c1 # v6.16.0
         with:
           context: .
           file: ./Dockerfile
@@ -76,7 +76,7 @@ jobs:
                 - /stirling/test-${{ github.sha }}/config:/configs:rw
                 - /stirling/test-${{ github.sha }}/logs:/logs:rw
               environment:
-                DISABLE_ADDITIONAL_FEATURES: "true"
+                DOCKER_ENABLE_SECURITY: "false"
                 SECURITY_ENABLELOGIN: "false"
                 SYSTEM_DEFAULTLOCALE: en-GB
                 UI_APPNAME: "Stirling-PDF Test"
@@ -105,7 +105,7 @@ jobs:
 
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@002fdce3c6a235733a90a27c80493a3241e56863 # v2.12.1
+        uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
         with:
           egress-policy: audit
 
@@ -134,7 +134,7 @@ jobs:
 
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@002fdce3c6a235733a90a27c80493a3241e56863 # v2.12.1
+        uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
         with:
           egress-policy: audit
 

.gitignore

@@ -13,7 +13,6 @@ local.properties
 .recommenders
 .classpath
 .project
-*.local.json
 version.properties
 
 #### Stirling-PDF Files ###
@@ -125,9 +124,6 @@ SwaggerDoc.json
 *.rar
 *.db
 /build
-/stirling-pdf/build
-/common/build
-/proprietary/build
 
 # Byte-compiled / optimized / DLL files
 __pycache__/
@@ -197,3 +193,4 @@ id_ed25519.pub
 
 # node_modules
 node_modules/
+*.mjs

.pre-commit-config.yaml

@@ -1,6 +1,6 @@
 repos:
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.11.11
+    rev: v0.11.6
     hooks:
       - id: ruff
         args:
@@ -20,9 +20,9 @@ repos:
           - --skip="./.*,*.csv,*.json,*.ambr"
           - --quiet-level=2
         files: \.(html|css|js|py|md)$
-        exclude: (.vscode|.devcontainer|stirling-pdf/src/main/resources|Dockerfile|.*/pdfjs.*|.*/thirdParty.*|bootstrap.*|.*\.min\..*|.*diff\.js)
+        exclude: (.vscode|.devcontainer|src/main/resources|Dockerfile|.*/pdfjs.*|.*/thirdParty.*|bootstrap.*|.*\.min\..*|.*diff\.js)
   - repo: https://github.com/gitleaks/gitleaks
-    rev: v8.26.0
+    rev: v8.24.3
     hooks:
       - id: gitleaks
   - repo: https://github.com/pre-commit/pre-commit-hooks

.vscode/settings.json

@@ -10,7 +10,7 @@
   "java.configuration.updateBuildConfiguration": "interactive",
   "java.format.enabled": true,
   "java.format.settings.profile": "GoogleStyle",
-  "java.format.settings.google.version": "1.27.0",
+  "java.format.settings.google.version": "1.26.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.
@@ -49,11 +49,7 @@
     ".venv*/",
     ".vscode/",
     "bin/",
-    "common/bin/",
-    "proprietary/bin/",
     "build/",
-    "common/build/",
-    "proprietary/build/",
     "configs/",
     "customFiles/",
     "docs/",
@@ -67,8 +63,6 @@
     ".git-blame-ignore-revs",
     ".gitattributes",
     ".gitignore",
-    "common/.gitignore",
-    "proprietary/.gitignore",
     ".pre-commit-config.yaml",
   ],
   // Enables signature help in Java.
@@ -86,9 +80,4 @@
   "spring.initializr.defaultLanguage": "Java",
   "spring.initializr.defaultGroupId": "stirling.software.SPDF",
   "spring.initializr.defaultArtifactId": "SPDF",
-  "java.project.sourcePaths": [
-    "stirling-pdf/src/main/java",
-    "common/src/main/java",
-    "proprietary/src/main/java"
-  ],
 }

AGENTS.md

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

DeveloperGuide.md

@@ -55,7 +55,7 @@ Stirling-PDF uses Lombok to reduce boilerplate code. Some IDEs, like Eclipse, do
 Visit the [Lombok website](https://projectlombok.org/setup/) for installation instructions specific to your IDE.
 
 5. Add environment variable
-For local testing, you should generally be testing the full 'Security' version of Stirling PDF. To do this, you must add the environment flag DISABLE_ADDITIONAL_FEATURES=false to your system and/or IDE build/run step.
+For local testing, you should generally be testing the full 'Security' version of Stirling-PDF. To do this, you must add the environment flag DOCKER_ENABLE_SECURITY=true to your system and/or IDE build/run step.
 
 ## 4. Project Structure
 
@@ -114,9 +114,9 @@ Stirling-PDF offers several Docker versions:
 
 Stirling-PDF provides several example Docker Compose files in the `exampleYmlFiles` directory, such as:
 
-- `docker-compose-latest.yml`: Latest version without login and security features
-- `docker-compose-latest-security.yml`: Latest version with login and security features enabled
-- `docker-compose-latest-fat-security.yml`: Fat version with login and security features enabled
+- `docker-compose-latest.yml`: Latest version without security features
+- `docker-compose-latest-security.yml`: Latest version with security features enabled
+- `docker-compose-latest-fat-security.yml`: Fat version with security features enabled
 
 These files provide pre-configured setups for different scenarios. For example, here's a snippet from `docker-compose-latest-security.yml`:
 
@@ -137,11 +137,11 @@ services:
     ports:
       - "8080:8080"
     volumes:
-      - ./stirling/latest/data:/usr/share/tessdata:rw
-      - ./stirling/latest/config:/configs:rw
-      - ./stirling/latest/logs:/logs:rw
+      - /stirling/latest/data:/usr/share/tessdata:rw
+      - /stirling/latest/config:/configs:rw
+      - /stirling/latest/logs:/logs:rw
     environment:
-      DISABLE_ADDITIONAL_FEATURES: "false"
+      DOCKER_ENABLE_SECURITY: "true"
       SECURITY_ENABLELOGIN: "true"
       PUID: 1002
       PGID: 1002
@@ -170,7 +170,7 @@ Stirling-PDF uses different Docker images for various configurations. The build
 1. Set the security environment variable:
 
    ```bash
-   export DISABLE_ADDITIONAL_FEATURES=true  # or false for to enable login and security features for builds
+   export DOCKER_ENABLE_SECURITY=false  # or true for security-enabled builds
    ```
 
 2. Build the project with Gradle:
@@ -193,10 +193,10 @@ Stirling-PDF uses different Docker images for various configurations. The build
    docker build --no-cache --pull --build-arg VERSION_TAG=alpha -t stirlingtools/stirling-pdf:latest-ultra-lite -f ./Dockerfile.ultra-lite .
    ```
 
-   For the fat version (with login and security features enabled):
+   For the fat version (with security enabled):
 
    ```bash
-   export DISABLE_ADDITIONAL_FEATURES=false
+   export DOCKER_ENABLE_SECURITY=true
    docker build --no-cache --pull --build-arg VERSION_TAG=alpha -t stirlingtools/stirling-pdf:latest-fat -f ./Dockerfile.fat .
    ```
 
@@ -332,7 +332,7 @@ Thymeleaf is a server-side Java HTML template engine. It is used in Stirling-PDF
 
 ### Thymeleaf overview
 
-In Stirling-PDF, Thymeleaf is used to create HTML templates that are rendered on the server side. These templates are located in the `stirling-pdf/src/main/resources/templates` directory. Thymeleaf templates use a combination of HTML and special Thymeleaf attributes to dynamically generate content.
+In Stirling-PDF, Thymeleaf is used to create HTML templates that are rendered on the server side. These templates are located in the `src/main/resources/templates` directory. Thymeleaf templates use a combination of HTML and special Thymeleaf attributes to dynamically generate content.
 
 Some examples of this are:
 
@@ -384,7 +384,7 @@ This would generate n entries of tr for each person in exampleData
 ### Adding a New Feature to the Backend (API)
 
 1. **Create a New Controller:**
-   - Create a new Java class in the `stirling-pdf/src/main/java/stirling/software/SPDF/controller/api` directory.
+   - Create a new Java class in the `src/main/java/stirling/software/SPDF/controller/api` directory.
    - Annotate the class with `@RestController` and `@RequestMapping` to define the API endpoint.
    - Ensure to add API documentation annotations like `@Tag(name = "General", description = "General APIs")` and `@Operation(summary = "Crops a PDF document", description = "This operation takes an input PDF file and crops it according to the given coordinates. Input:PDF Output:PDF Type:SISO")`.
 
@@ -411,7 +411,7 @@ This would generate n entries of tr for each person in exampleData
    ```
 
 2. **Define the Service Layer:** (Not required but often useful)
-   - Create a new service class in the `stirling-pdf/src/main/java/stirling/software/SPDF/service` directory.
+   - Create a new service class in the `src/main/java/stirling/software/SPDF/service` directory.
    - Implement the business logic for the new feature.
 
    ```java
@@ -463,7 +463,7 @@ This would generate n entries of tr for each person in exampleData
 ### Adding a New Feature to the Frontend (UI)
 
 1. **Create a New Thymeleaf Template:**
-   - Create a new HTML file in the `stirling-pdf/src/main/resources/templates` directory.
+   - Create a new HTML file in the `src/main/resources/templates` directory.
    - Use Thymeleaf attributes to dynamically generate content.
    - Use `extract-page.html` as a base example for the HTML template, which is useful to ensure importing of the general layout, navbar, and footer.
 
@@ -507,7 +507,7 @@ This would generate n entries of tr for each person in exampleData
    ```
 
 2. **Create a New Controller for the UI:**
-   - Create a new Java class in the `stirling-pdf/src/main/java/stirling/software/SPDF/controller/ui` directory.
+   - Create a new Java class in the `src/main/java/stirling/software/SPDF/controller/ui` directory.
    - Annotate the class with `@Controller` and `@RequestMapping` to define the UI endpoint.
 
    ```java
@@ -537,11 +537,11 @@ This would generate n entries of tr for each person in exampleData
 
 3. **Update the Navigation Bar:**
    - Add a link to the new feature page in the navigation bar.
-   - Update the `stirling-pdf/src/main/resources/templates/fragments/navbar.html` file.
+   - Update the `src/main/resources/templates/fragments/navbar.html` file.
 
    ```html
    <li class="nav-item">
-       <a class="nav-link" th:href="@{'/new-feature'}">New Feature</a>
+       <a class="nav-link" th:href="@{/new-feature}">New Feature</a>
    </li>
    ```
 
@@ -551,7 +551,7 @@ When adding a new feature or modifying existing ones in Stirling-PDF, you'll nee
 
 ### 1. Locate Existing Language Files
 
-Find the existing `messages.properties` files in the `stirling-pdf/src/main/resources` directory. You'll see files like:
+Find the existing `messages.properties` files in the `src/main/resources` directory. You'll see files like:
 
 - `messages.properties` (default, usually English)
 - `messages_en_GB.properties`

Dockerfile

@@ -1,11 +1,12 @@
 # Main stage
-FROM alpine:3.22.0@sha256:8a1f59ffb675680d47db6337b49d22281a139e9d709335b492be023728e11715
+FROM alpine:3.21.3@sha256:a8560b36e8b8210634f77d9f7f9efd7ffa463e380b75e2e74aff4511df3ef88c
 
 # Copy necessary files
 COPY scripts /scripts
 COPY pipeline /pipeline
-COPY stirling-pdf/src/main/resources/static/fonts/*.ttf /usr/share/fonts/opentype/noto/
-COPY stirling-pdf/build/libs/*.jar app.jar
+COPY src/main/resources/static/fonts/*.ttf /usr/share/fonts/opentype/noto/
+#COPY src/main/resources/static/fonts/*.otf /usr/share/fonts/opentype/noto/
+COPY build/libs/*.jar app.jar
 
 ARG VERSION_TAG
 
@@ -22,7 +23,7 @@ LABEL org.opencontainers.image.version="${VERSION_TAG}"
 LABEL org.opencontainers.image.keywords="PDF, manipulation, merge, split, convert, OCR, watermark"
 
 # Set Environment Variables
-ENV DISABLE_ADDITIONAL_FEATURES=true \
+ENV DOCKER_ENABLE_SECURITY=false \
     VERSION_TAG=$VERSION_TAG \
     JAVA_BASE_OPTS="-XX:+UnlockExperimentalVMOptions -XX:MaxRAMPercentage=75 -XX:InitiatingHeapOccupancyPercent=20 -XX:+G1PeriodicGCInvokesConcurrent -XX:G1PeriodicGCInterval=10000 -XX:+UseStringDeduplication -XX:G1PeriodicGCSystemLoadThreshold=70" \
     JAVA_CUSTOM_OPTS="" \
@@ -72,7 +73,7 @@ RUN echo "@main https://dl-cdn.alpinelinux.org/alpine/edge/main" | tee -a /etc/a
     py3-pillow@testing \
     py3-pdf2image@testing && \
     python3 -m venv /opt/venv && \
-    /opt/venv/bin/pip install --upgrade pip setuptools && \
+    /opt/venv/bin/pip install --upgrade pip && \
     /opt/venv/bin/pip install --no-cache-dir --upgrade unoserver weasyprint && \
     ln -s /usr/lib/libreoffice/program/uno.py /opt/venv/lib/python3.12/site-packages/ && \
     ln -s /usr/lib/libreoffice/program/unohelper.py /opt/venv/lib/python3.12/site-packages/ && \

Dockerfile.dev

@@ -32,7 +32,6 @@ ENV SETUPTOOLS_USE_DISTUTILS=local
 # Installation der benötigten Python-Pakete
 RUN python3 -m venv --system-site-packages /opt/venv \
   && . /opt/venv/bin/activate \
-  && pip install --upgrade pip setuptools \
   && pip install --no-cache-dir WeasyPrint pdf2image pillow unoserver opencv-python-headless pre-commit
 
 # Füge den venv-Pfad zur globalen PATH-Variable hinzu, damit die Tools verfügbar sind

Dockerfile.fat

@@ -5,9 +5,6 @@ COPY build.gradle .
 COPY settings.gradle .
 COPY gradlew .
 COPY gradle gradle/
-COPY stirling-pdf/build.gradle stirling-pdf/.
-COPY common/build.gradle common/.
-COPY proprietary/build.gradle proprietary/.
 RUN ./gradlew build -x spotlessApply -x spotlessCheck -x test -x sonarqube || return 0
 
 # Set the working directory
@@ -16,24 +13,24 @@ WORKDIR /app
 # Copy the entire project to the working directory
 COPY . .
 
-# Build the application with DISABLE_ADDITIONAL_FEATURES=false
-RUN DISABLE_ADDITIONAL_FEATURES=false \
+# Build the application with DOCKER_ENABLE_SECURITY=false
+RUN DOCKER_ENABLE_SECURITY=true \
     STIRLING_PDF_DESKTOP_UI=false \
     ./gradlew clean build -x spotlessApply -x spotlessCheck -x test -x sonarqube
 
 # Main stage
-FROM alpine:3.22.0@sha256:8a1f59ffb675680d47db6337b49d22281a139e9d709335b492be023728e11715
+FROM alpine:3.21.3@sha256:a8560b36e8b8210634f77d9f7f9efd7ffa463e380b75e2e74aff4511df3ef88c
 
 # Copy necessary files
 COPY scripts /scripts
 COPY pipeline /pipeline
-COPY stirling-pdf/src/main/resources/static/fonts/*.ttf /usr/share/fonts/opentype/noto/
-COPY --from=build /app/stirling-pdf/build/libs/*.jar app.jar
+COPY src/main/resources/static/fonts/*.ttf /usr/share/fonts/opentype/noto/
+COPY --from=build /app/build/libs/*.jar app.jar
 
 ARG VERSION_TAG
 
 # Set Environment Variables
-ENV DISABLE_ADDITIONAL_FEATURES=true \
+ENV DOCKER_ENABLE_SECURITY=false \
     VERSION_TAG=$VERSION_TAG \
     JAVA_BASE_OPTS="-XX:+UnlockExperimentalVMOptions -XX:MaxRAMPercentage=75 -XX:InitiatingHeapOccupancyPercent=20 -XX:+G1PeriodicGCInvokesConcurrent -XX:G1PeriodicGCInterval=10000 -XX:+UseStringDeduplication -XX:G1PeriodicGCSystemLoadThreshold=70" \
     JAVA_CUSTOM_OPTS="" \
@@ -86,7 +83,7 @@ RUN echo "@main https://dl-cdn.alpinelinux.org/alpine/edge/main" | tee -a /etc/a
     py3-pillow@testing \
     py3-pdf2image@testing && \
     python3 -m venv /opt/venv && \
-    /opt/venv/bin/pip install --upgrade pip setuptools && \
+    /opt/venv/bin/pip install --upgrade pip && \
     /opt/venv/bin/pip install --no-cache-dir --upgrade unoserver weasyprint && \
     ln -s /usr/lib/libreoffice/program/uno.py /opt/venv/lib/python3.12/site-packages/ && \
     ln -s /usr/lib/libreoffice/program/unohelper.py /opt/venv/lib/python3.12/site-packages/ && \

Dockerfile.ultra-lite

@@ -1,10 +1,10 @@
 # use alpine
-FROM alpine:3.22.0@sha256:8a1f59ffb675680d47db6337b49d22281a139e9d709335b492be023728e11715
+FROM alpine:3.21.3@sha256:a8560b36e8b8210634f77d9f7f9efd7ffa463e380b75e2e74aff4511df3ef88c
 
 ARG VERSION_TAG
 
 # Set Environment Variables
-ENV DISABLE_ADDITIONAL_FEATURES=true \
+ENV DOCKER_ENABLE_SECURITY=false \
     HOME=/home/stirlingpdfuser \
     VERSION_TAG=$VERSION_TAG \
     JAVA_BASE_OPTS="-XX:+UnlockExperimentalVMOptions -XX:MaxRAMPercentage=75 -XX:InitiatingHeapOccupancyPercent=20 -XX:+G1PeriodicGCInvokesConcurrent -XX:G1PeriodicGCInterval=10000 -XX:+UseStringDeduplication -XX:G1PeriodicGCSystemLoadThreshold=70" \
@@ -18,7 +18,7 @@ COPY scripts/download-security-jar.sh /scripts/download-security-jar.sh
 COPY scripts/init-without-ocr.sh /scripts/init-without-ocr.sh
 COPY scripts/installFonts.sh /scripts/installFonts.sh
 COPY pipeline /pipeline
-COPY stirling-pdf/build/libs/*.jar app.jar
+COPY build/libs/*.jar app.jar
 
 # Set up necessary directories and permissions
 RUN echo "@testing https://dl-cdn.alpinelinux.org/alpine/edge/main" | tee -a /etc/apk/repositories && \

HowToAddNewLanguage.md

@@ -10,7 +10,7 @@ Fork Stirling-PDF and create a new branch out of `main`.
 
 Then add a reference to the language in the navbar by adding a new language entry to the dropdown:
 
-- Edit the file: [languages.html](https://github.com/Stirling-Tools/Stirling-PDF/blob/main/stirling-pdf/src/main/resources/templates/fragments/languages.html)
+- Edit the file: [languages.html](https://github.com/Stirling-Tools/Stirling-PDF/blob/main/src/main/resources/templates/fragments/languages.html)
 
 
 For example, to add Polish, you would add:
@@ -25,7 +25,7 @@ The `data-bs-language-code` is the code used to reference the file in the next s
 
 Start by copying the existing English property file:
 
-- [messages_en_GB.properties](https://github.com/Stirling-Tools/Stirling-PDF/blob/main/stirling-pdf/src/main/resources/messages_en_GB.properties)
+- [messages_en_GB.properties](https://github.com/Stirling-Tools/Stirling-PDF/blob/main/src/main/resources/messages_en_GB.properties)
 
 Copy and rename it to `messages_{your data-bs-language-code here}.properties`. In the Polish example, you would set the name to `messages_pl_PL.properties`.
 
@@ -61,16 +61,8 @@ Make sure to place the entry under the correct language section. This helps main
 
 #### Windows command
 
-```powershell
-python .github/scripts/check_language_properties.py --reference-file stirling-pdf\src\main\resources\messages_en_GB.properties --branch "" --files stirling-pdf\src\main\resources\messages_pl_PL.properties
+```ps
+python .github/scripts/check_language_properties.py --reference-file src\main\resources\messages_en_GB.properties --branch "" --files src\main\resources\messages_pl_PL.properties
 
-python .github/scripts/check_language_properties.py --reference-file stirling-pdf\src\main\resources\messages_en_GB.properties --branch "" --check-file stirling-pdf\src\main\resources\messages_pl_PL.properties
-```
-
-#### Linux command
-
-```bash
-python3 .github/scripts/check_language_properties.py --reference-file stirling-pdf/src/main/resources/messages_en_GB.properties --branch "" --files stirling-pdf/src/main/resources/messages_pl_PL.properties
-
-python3 .github/scripts/check_language_properties.py --reference-file stirling-pdf/src/main/resources/messages_en_GB.properties --branch "" --check-file stirling-pdf/src/main/resources/messages_pl_PL.properties
+python .github/scripts/check_language_properties.py --reference-file src\main\resources\messages_en_GB.properties --branch "" --check-file src\main\resources\messages_pl_PL.properties
 ```

LICENSE

@@ -1,13 +1,6 @@
 MIT License
 
-Copyright (c) 2025 Stirling PDF Inc.
-
-Portions of this software are licensed as follows:
-
-* All content that resides under the "proprietary/" directory of this repository,
-if that directory exists, is licensed under the license defined in "proprietary/LICENSE".
-* Content outside of the above mentioned directories or restrictions above is
-available under the MIT License as defined below.
+Copyright (c) 2024 Stirling Tools
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

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

allowed-licenses.json

@@ -124,18 +124,10 @@
       "moduleName": ".*",
       "moduleLicense": "COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0"
     },
-    {
-      "moduleName": ".*",
-      "moduleLicense": "Eclipse Public License 1.0"
-    },
     {
       "moduleName": ".*",
       "moduleLicense": "Eclipse Public License - v 1.0"
     },
-    {
-      "moduleName": ".*",
-      "moduleLicense": "Eclipse Public License v2.0"
-    },
     {
       "moduleName": ".*",
       "moduleLicense": "Eclipse Public License v. 2.0"

build.gradle

@@ -1,16 +1,15 @@
 plugins {
     id "java"
-    id "jacoco"
+    id "org.springframework.boot" version "3.4.5"
     id "io.spring.dependency-management" version "1.1.7"
-    id "org.springframework.boot" version "3.5.3"
     id "org.springdoc.openapi-gradle-plugin" version "1.9.0"
     id "io.swagger.swaggerhub" version "1.3.2"
     id "edu.sc.seis.launch4j" version "3.0.6"
-    id "com.diffplug.spotless" version "7.0.4"
+    id "com.diffplug.spotless" version "7.0.3"
     id "com.github.jk1.dependency-license-report" version "2.9"
     //id "nebula.lint" version "19.0.3"
-    id "org.panteleyev.jpackageplugin" version "1.6.1"
-    id "org.sonarqube" version "6.2.0.5505"
+    id("org.panteleyev.jpackageplugin") version "1.6.1"
+    id "org.sonarqube" version "6.1.0.5360"
 }
 
 import com.github.jk1.license.render.*
@@ -19,166 +18,28 @@ import java.nio.file.Files
 import java.time.Year
 
 ext {
-    springBootVersion = "3.5.3"
+    springBootVersion = "3.4.5"
     pdfboxVersion = "3.0.5"
     imageioVersion = "3.12.0"
     lombokVersion = "1.18.38"
-    bouncycastleVersion = "1.81"
-    springSecuritySamlVersion = "6.5.1"
+    bouncycastleVersion = "1.80"
+    springSecuritySamlVersion = "6.4.5"
     openSamlVersion = "4.3.2"
-    commonmarkVersion = "0.24.0"
-    googleJavaFormatVersion = "1.27.0"
     tempJrePath = null
 }
 
-jar {
-    enabled = false
-    manifest {
-        attributes "Implementation-Title": "Stirling-PDF",
-            "Implementation-Version": project.version
-    }
+group = "stirling.software"
+version = "0.46.1"
+
+java {
+    // 17 is lowest but we support and recommend 21
+    sourceCompatibility = JavaVersion.VERSION_17
 }
 
-bootJar {
-    enabled = false
-}
-
-sourceSets {
-    main {
-        java {
-            if (System.getenv('DOCKER_ENABLE_SECURITY') == 'false' || System.getenv('DISABLE_ADDITIONAL_FEATURES') == 'true'
-                || (project.hasProperty('DISABLE_ADDITIONAL_FEATURES')
-                && System.getProperty('DISABLE_ADDITIONAL_FEATURES') == 'true')) {
-                exclude 'stirling/software/proprietary/security/**'
-            }
-            if (System.getenv('STIRLING_PDF_DESKTOP_UI') == 'false') {
-                exclude 'stirling/software/SPDF/UI/impl/**'
-            }
-
-        }
-    }
-
-    test {
-        java {
-            if (System.getenv('DOCKER_ENABLE_SECURITY') == 'false' || System.getenv('DISABLE_ADDITIONAL_FEATURES') == 'true'
-                || (project.hasProperty('DISABLE_ADDITIONAL_FEATURES')
-                && System.getProperty('DISABLE_ADDITIONAL_FEATURES') == 'true')) {
-                exclude 'stirling/software/proprietary/security/**'
-            }
-
-            if (System.getenv('STIRLING_PDF_DESKTOP_UI') == 'false') {
-                exclude 'stirling/software/SPDF/UI/impl/**'
-            }
-        }
-    }
-}
-
-allprojects {
-    group = 'stirling.software'
-    version = '1.0.0'
-
-    configurations.configureEach {
-        exclude group: 'commons-logging', module: 'commons-logging'
-        exclude group: "org.springframework.boot", module: "spring-boot-starter-tomcat"
-    }
-}
-
-
-tasks.register('writeVersion') {
-    def propsFile = file("$projectDir/common/src/main/resources/version.properties")
-    def propsDir = propsFile.parentFile
-
-    doLast {
-        if (propsDir.exists()) {
-            if (propsFile.exists()) {
-                println "File exists: $propsFile"
-            } else {
-                println "$propsFile does not exist. Creating file."
-                propsFile.createNewFile()
-            }
-        } else {
-            println "Creating directory: $propsDir"
-            propsDir.mkdirs()
-            propsFile.createNewFile()
-        }
-
-        def props = new Properties()
-        props.setProperty("version", version)
-        props.store(propsFile.newWriter(), null)
-    }
-}
-
-subprojects {
-    apply plugin: 'java'
-    apply plugin: 'java-library'
-    apply plugin: 'com.diffplug.spotless'
-    apply plugin: 'org.springframework.boot'
-    apply plugin: 'io.spring.dependency-management'
-
-    java {
-        // 17 is lowest but we support and recommend 21
-        sourceCompatibility = JavaVersion.VERSION_17
-    }
-
-    bootJar {
-        enabled = false
-    }
-
-    repositories {
-        mavenCentral()
-    }
-
-    configurations.configureEach {
-        exclude group: 'commons-logging', module: 'commons-logging'
-        exclude group: 'org.springframework.boot', module: 'spring-boot-starter-tomcat'
-        // Exclude vulnerable BouncyCastle version used in tableau
-        exclude group: 'org.bouncycastle', module: 'bcpkix-jdk15on'
-        exclude group: 'org.bouncycastle', module: 'bcutil-jdk15on'
-        exclude group: 'org.bouncycastle', module: 'bcmail-jdk15on'
-    }
-
-    dependencyManagement {
-        imports {
-            mavenBom "org.springframework.boot:spring-boot-dependencies:$springBootVersion"
-        }
-    }
-
-    dependencies {
-        implementation 'org.springframework.boot:spring-boot-starter-actuator'
-        implementation 'io.github.pixee:java-security-toolkit:1.2.2'
-
-        //tmp for security bumps
-        implementation 'ch.qos.logback:logback-core:1.5.18'
-        implementation 'ch.qos.logback:logback-classic:1.5.18'
-        compileOnly "org.projectlombok:lombok:$lombokVersion"
-        annotationProcessor "org.projectlombok:lombok:$lombokVersion"
-
-        testImplementation 'org.springframework.boot:spring-boot-starter-test'
-        testRuntimeOnly 'org.mockito:mockito-inline:5.2.0'
-        testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.12.2'
-    }
-
-    tasks.withType(JavaCompile).configureEach {
-        options.encoding = "UTF-8"
-        dependsOn "spotlessApply"
-    }
-
-    compileJava {
-        options.compilerArgs << "-parameters"
-    }
-
-    test {
-        useJUnitPlatform()
-    }
-    
-	tasks.named("processResources") {
-	  dependsOn(rootProject.tasks.writeVersion)
-	}
-}
-
-tasks.withType(JavaCompile).configureEach {
-    options.encoding = "UTF-8"
-    dependsOn "spotlessApply"
+repositories {
+    mavenCentral()
+    maven { url = "https://build.shibboleth.net/maven/releases" }
+    maven { url = "https://maven.pkg.github.com/jcefmaven/jcefmaven" }
 }
 
 licenseReport {
@@ -189,14 +50,29 @@ licenseReport {
 sourceSets {
     main {
         java {
-            if (System.getenv('DOCKER_ENABLE_SECURITY') == 'false' || System.getenv('DISABLE_ADDITIONAL_FEATURES') == 'true'
-                || (project.hasProperty('DISABLE_ADDITIONAL_FEATURES')
-                && System.getProperty('DISABLE_ADDITIONAL_FEATURES') == 'true')) {
-                exclude 'stirling/software/proprietary/security/**'
+            if (System.getenv("DOCKER_ENABLE_SECURITY") == "false") {
+                exclude "stirling/software/SPDF/config/interfaces/DatabaseInterface.java"
+                exclude "stirling/software/SPDF/config/security/**"
+                exclude "stirling/software/SPDF/controller/api/DatabaseController.java"
+                exclude "stirling/software/SPDF/controller/api/EmailController.java"
+                exclude "stirling/software/SPDF/controller/api/H2SQLCondition.java"
+                exclude "stirling/software/SPDF/controller/api/UserController.java"
+                exclude "stirling/software/SPDF/controller/web/AccountWebController.java"
+                exclude "stirling/software/SPDF/controller/web/DatabaseWebController.java"
+                exclude "stirling/software/SPDF/model/api/Email.java"
+                exclude "stirling/software/SPDF/model/ApiKeyAuthenticationToken.java"
+                exclude "stirling/software/SPDF/model/AttemptCounter.java"
+                exclude "stirling/software/SPDF/model/Authority.java"
+                exclude "stirling/software/SPDF/model/exception/BackupNotFoundException.java"
+                exclude "stirling/software/SPDF/model/exception/NoProviderFoundException.java"
+                exclude "stirling/software/SPDF/model/PersistentLogin.java"
+                exclude "stirling/software/SPDF/model/SessionEntity.java"
+                exclude "stirling/software/SPDF/model/User.java"
+                exclude "stirling/software/SPDF/repository/**"
             }
 
-            if (System.getenv('STIRLING_PDF_DESKTOP_UI') == 'false') {
-                exclude 'stirling/software/SPDF/UI/impl/**'
+            if (System.getenv("STIRLING_PDF_DESKTOP_UI") == "false") {
+                exclude "stirling/software/SPDF/UI/impl/**"
             }
 
         }
@@ -204,14 +80,15 @@ sourceSets {
 
     test {
         java {
-            if (System.getenv('DOCKER_ENABLE_SECURITY') == 'false' || System.getenv('DISABLE_ADDITIONAL_FEATURES') == 'true'
-                || (project.hasProperty('DISABLE_ADDITIONAL_FEATURES')
-                && System.getProperty('DISABLE_ADDITIONAL_FEATURES') == 'true')) {
-                exclude 'stirling/software/proprietary/security/**'
+            if (System.getenv("DOCKER_ENABLE_SECURITY") == "false") {
+                exclude "stirling/software/SPDF/config/security/**"
+                exclude "stirling/software/SPDF/model/ApiKeyAuthenticationTokenTest.java"
+                exclude "stirling/software/SPDF/controller/api/EmailControllerTest.java"
+                exclude "stirling/software/SPDF/repository/**"
             }
 
-            if (System.getenv('STIRLING_PDF_DESKTOP_UI') == 'false') {
-                exclude 'stirling/software/SPDF/UI/impl/**'
+            if (System.getenv("STIRLING_PDF_DESKTOP_UI") == "false") {
+                exclude "stirling/software/SPDF/UI/impl/**"
             }
         }
     }
@@ -237,9 +114,10 @@ jpackage {
     mainJar = "Stirling-PDF-${project.version}.jar"
     appName = "Stirling PDF"
     appVersion = project.version
+//    appVersion = "2005.45.1"
     vendor = "Stirling PDF Inc"
     appDescription = "Stirling PDF - Your Local PDF Editor"
-    icon = "stirling-pdf/src/main/resources/static/favicon.ico"
+    icon = "src/main/resources/static/favicon.ico"
     verbose = true
 //    mainClass = "org.springframework.boot.loader.launch.JarLauncher"
 
@@ -247,7 +125,6 @@ jpackage {
     javaOptions = [
         "-DBROWSER_OPEN=true",
         "-DSTIRLING_PDF_DESKTOP_UI=true",
-        "-DDISABLE_ADDITIONAL_FEATURES=false",
         "-Djava.awt.headless=false",
         "-Dapple.awt.UIElement=true",
         "--add-opens=java.base/java.lang=ALL-UNNAMED",
@@ -278,10 +155,10 @@ jpackage {
         installDir = "C:/Program Files/Stirling-PDF"
     }
 
-    // MacOS-specific configuration
+    // macOS-specific configuration
     mac {
         appVersion = getMacVersion(project.version.toString())
-        icon = "stirling-pdf/src/main/resources/static/favicon.icns"
+        icon = "src/main/resources/static/favicon.icns"
         type = "dmg"
         macPackageIdentifier = "Stirling PDF"
         macPackageName = "Stirling PDF"
@@ -303,7 +180,7 @@ jpackage {
     // Linux-specific configuration
     linux {
         appVersion = project.version
-        icon = "stirling-pdf/src/main/resources/static/favicon.png"
+        icon = "src/main/resources/static/favicon.png"
         type = "deb" // Can also use "rpm" for Red Hat-based systems
 
         // Debian package configuration
@@ -339,15 +216,10 @@ jpackage {
     ]*/
 
     // Add copyright and license information
-    copyright = "Copyright © 2025 Stirling PDF Inc."
+    copyright = "Copyright © 2024 Stirling Software"
     licenseFile = "LICENSE"
 }
 
-//tasks.wrapper {
-//    gradleVersion = "8.14"
-//    distributionType = Wrapper.DistributionType.ALL
-//}
-
 tasks.register('jpackageMacX64') {
     group = 'distribution'
     description = 'Packages app for MacOS x86_64'
@@ -380,7 +252,7 @@ tasks.register('jpackageMacX64') {
                 '--main-class', 'org.springframework.boot.loader.launch.JarLauncher',
                 '--runtime-image', file(jrePath + "/zulu-17.jre/Contents/Home"),
                 '--dest', 'build/jpackage/x86_64',
-                '--icon', 'stirling-pdf/src/main/resources/static/favicon.icns',
+                '--icon', 'src/main/resources/static/favicon.icns',
                 '--app-version', getMacVersion(project.version.toString()),
                 '--mac-package-name', 'Stirling PDF (x86_64)',
                 '--mac-package-identifier', 'Stirling PDF (x86_64)',
@@ -389,7 +261,6 @@ tasks.register('jpackageMacX64') {
                 // Java options
                 '--java-options', '-DBROWSER_OPEN=true',
                 '--java-options', '-DSTIRLING_PDF_DESKTOP_UI=true',
-                '--java-options', '-DDISABLE_ADDITIONAL_FEATURES=false',
                 '--java-options', '-Djava.awt.headless=false',
                 '--java-options', '-Dapple.awt.UIElement=true',
                 '--java-options', '--add-opens=java.base/java.lang=ALL-UNNAMED',
@@ -418,6 +289,8 @@ tasks.register('jpackageMacX64') {
     }
 }
 
+//jpackage.finalizedBy(jpackageMacX64)
+
 tasks.register('downloadTempJre') {
     group = 'distribution'
     description = 'Downloads and extracts a temporary JRE'
@@ -429,18 +302,18 @@ tasks.register('downloadTempJre') {
             def jreArchive = new File(tmpDir, 'jre.tar.gz')
             def jreDir = new File(tmpDir, 'jre')
 
-            println "Downloading JRE to $jreArchive"
+            println "🔽 Downloading JRE to $jreArchive..."
             jreArchive.withOutputStream { out ->
                 new URI(jreUrl).toURL().withInputStream { from -> out << from }
             }
 
-            println "Extracting JRE to $jreDir"
+            println "📦 Extracting JRE to $jreDir..."
             jreDir.mkdirs()
             providers.exec {
                 commandLine 'tar', '-xzf', jreArchive.absolutePath, '-C', jreDir.absolutePath, '--strip-components=1'
             }.result.get()
 
-            println "JRE ready at: $jreDir"
+            println "✅ JRE ready at: $jreDir"
             ext.tempJrePath = jreDir.absolutePath
             project.ext.tempJrePath = jreDir.absolutePath
         } catch (Exception e) {
@@ -466,7 +339,7 @@ tasks.register('cleanTempJre') {
 }
 
 launch4j {
-    icon = "${projectDir}/stirling-pdf/src/main/resources/static/favicon.ico"
+    icon = "${projectDir}/src/main/resources/static/favicon.ico"
 
     outfile="Stirling-PDF.exe"
 
@@ -477,7 +350,7 @@ launch4j {
     }
     jarTask = tasks.bootJar
 
-    errTitle="Encountered error, do you have Java 21?"
+    errTitle="Encountered error, Do you have Java 21?"
     downloadUrl="https://download.oracle.com/java/21/latest/jdk-21_windows-x64_bin.exe"
 
     if(System.getenv("STIRLING_PDF_DESKTOP_UI") == 'true') {
@@ -500,12 +373,9 @@ launch4j {
 
 spotless {
     java {
-        target sourceSets.main.allJava
-        target project(':common').sourceSets.main.allJava
-        target project(':proprietary').sourceSets.main.allJava
-        target project(':stirling-pdf').sourceSets.main.allJava
+        target project.fileTree('src').include('**/*.java')
 
-        googleJavaFormat(googleJavaFormatVersion).aosp().reorderImports(false)
+        googleJavaFormat("1.26.0").aosp().reorderImports(false)
 
         importOrder("java", "javax", "org", "com", "net", "io", "jakarta", "lombok", "me", "stirling")
         toggleOffOn()
@@ -520,12 +390,186 @@ sonar {
         property "sonar.projectKey", "Stirling-Tools_Stirling-PDF"
         property "sonar.organization", "stirling-tools"
 
-        property "sonar.exclusions", "**/build-wrapper-dump.json, **/src/main/java/org/apache/**, **/src/main/resources/static/pdfjs/**, **/src/main/resources/static/pdfjs-legacy/**, **/src/main/resources/static/js/thirdParty/**"
-        property "sonar.coverage.exclusions", "**/src/main/java/org/apache/**, **/src/main/resources/static/pdfjs/**, **/src/main/resources/static/pdfjs-legacy/**, **/src/main/resources/static/js/thirdParty/**"
-        property "sonar.cpd.exclusions", "**/src/main/java/org/apache/**, **/src/main/resources/static/pdfjs/**, **/src/main/resources/static/pdfjs-legacy/**, **/src/main/resources/static/js/thirdParty/**"
+        property "sonar.exclusions", "**/build-wrapper-dump.json, src/main/java/org/apache/**, src/main/resources/static/pdfjs/**, src/main/resources/static/pdfjs-legacy/**, src/main/resources/static/js/thirdParty/**"
+        property "sonar.coverage.exclusions", "src/main/java/org/apache/**, src/main/resources/static/pdfjs/**, src/main/resources/static/pdfjs-legacy/**, src/main/resources/static/js/thirdParty/**"
+        property "sonar.cpd.exclusions", "src/main/java/org/apache/**, src/main/resources/static/pdfjs/**, src/main/resources/static/pdfjs-legacy/**, src/main/resources/static/js/thirdParty/**"
     }
 }
 
+//gradleLint {
+//        rules=['unused-dependency']
+//    }
+tasks.wrapper {
+    gradleVersion = "8.14"
+    distributionType = Wrapper.DistributionType.ALL
+}
+//tasks.withType(JavaCompile) {
+//    options.compilerArgs << "-Xlint:deprecation"
+//}
+configurations.all {
+    // Remove all commons-logging dependencies so that only spring-jcl is used
+    exclude group: 'commons-logging', module: 'commons-logging'
+    // Exclude Tomcat
+    exclude group: "org.springframework.boot", module: "spring-boot-starter-tomcat"
+}
+dependencies {
+
+    //tmp for security bumps
+    implementation 'ch.qos.logback:logback-core:1.5.18'
+    implementation 'ch.qos.logback:logback-classic:1.5.18'
+
+
+    // Exclude vulnerable BouncyCastle version used in tableau
+    configurations.all {
+        exclude group: 'org.bouncycastle', module: 'bcpkix-jdk15on'
+        exclude group: 'org.bouncycastle', module: 'bcutil-jdk15on'
+        exclude group: 'org.bouncycastle', module: 'bcmail-jdk15on'
+    }
+
+    if (System.getenv("STIRLING_PDF_DESKTOP_UI") != "false") {
+        implementation "me.friwi:jcefmaven:132.3.1"
+        implementation "org.openjfx:javafx-controls:21"
+        implementation "org.openjfx:javafx-swing:21"
+    }
+
+    //security updates
+    implementation "org.springframework:spring-webmvc:6.2.6"
+
+    implementation("io.github.pixee:java-security-toolkit:1.2.1")
+
+    // Exclude Tomcat and include Jetty
+    implementation("org.springframework.boot:spring-boot-starter-web:$springBootVersion")
+    implementation "org.springframework.boot:spring-boot-starter-jetty:$springBootVersion"
+
+    implementation "org.springframework.boot:spring-boot-starter-thymeleaf:$springBootVersion"
+    implementation 'com.posthog.java:posthog:1.2.0'
+    implementation 'com.googlecode.owasp-java-html-sanitizer:owasp-java-html-sanitizer:20240325.1'
+
+
+    if (System.getenv("DOCKER_ENABLE_SECURITY") != "false") {
+
+	    implementation 'org.springframework.boot:spring-boot-starter-actuator'
+	    implementation 'io.micrometer:micrometer-registry-prometheus'
+
+        implementation "org.springframework.boot:spring-boot-starter-security:$springBootVersion"
+        implementation "org.thymeleaf.extras:thymeleaf-extras-springsecurity5:3.1.3.RELEASE"
+        implementation "org.springframework.boot:spring-boot-starter-data-jpa:$springBootVersion"
+        implementation "org.springframework.boot:spring-boot-starter-oauth2-client:$springBootVersion"
+        implementation "org.springframework.boot:spring-boot-starter-mail:$springBootVersion"
+
+        implementation "org.springframework.session:spring-session-core:3.4.3"
+        implementation "org.springframework:spring-jdbc:6.2.6"
+
+        implementation 'com.unboundid.product.scim2:scim2-sdk-client:2.3.5'
+        // Don't upgrade h2database
+        runtimeOnly "com.h2database:h2:2.3.232"
+        runtimeOnly "org.postgresql:postgresql:42.7.5"
+        constraints {
+            implementation "org.opensaml:opensaml-core:$openSamlVersion"
+            implementation "org.opensaml:opensaml-saml-api:$openSamlVersion"
+            implementation "org.opensaml:opensaml-saml-impl:$openSamlVersion"
+        }
+        implementation "org.springframework.security:spring-security-saml2-service-provider:$springSecuritySamlVersion"
+        // implementation 'org.springframework.security:spring-security-core:$springSecuritySamlVersion'
+        implementation 'com.coveo:saml-client:5.0.0'
+
+    }
+    implementation 'org.snakeyaml:snakeyaml-engine:2.9'
+
+    testImplementation "org.springframework.boot:spring-boot-starter-test:$springBootVersion"
+
+    // Batik
+    implementation "org.apache.xmlgraphics:batik-all:1.18"
+
+    // TwelveMonkeys
+    runtimeOnly "com.twelvemonkeys.imageio:imageio-batik:$imageioVersion"
+    runtimeOnly "com.twelvemonkeys.imageio:imageio-bmp:$imageioVersion"
+    // runtimeOnly "com.twelvemonkeys.imageio:imageio-hdr:$imageioVersion"
+    // runtimeOnly "com.twelvemonkeys.imageio:imageio-icns:$imageioVersion"
+    // runtimeOnly "com.twelvemonkeys.imageio:imageio-iff:$imageioVersion"
+    runtimeOnly "com.twelvemonkeys.imageio:imageio-jpeg:$imageioVersion"
+    // runtimeOnly "com.twelvemonkeys.imageio:imageio-pcx:$imageioVersion@
+    // runtimeOnly "com.twelvemonkeys.imageio:imageio-pict:$imageioVersion"
+    // runtimeOnly "com.twelvemonkeys.imageio:imageio-pnm:$imageioVersion"
+    // runtimeOnly "com.twelvemonkeys.imageio:imageio-psd:$imageioVersion"
+    // runtimeOnly "com.twelvemonkeys.imageio:imageio-sgi:$imageioVersion"
+    // runtimeOnly "com.twelvemonkeys.imageio:imageio-tga:$imageioVersion"
+    // runtimeOnly "com.twelvemonkeys.imageio:imageio-thumbsdb:$imageioVersion"
+    runtimeOnly "com.twelvemonkeys.imageio:imageio-tiff:$imageioVersion"
+    runtimeOnly "com.twelvemonkeys.imageio:imageio-webp:$imageioVersion"
+    // runtimeOnly "com.twelvemonkeys.imageio:imageio-xwd:$imageioVersion"
+
+    // Image metadata extractor
+    implementation "com.drewnoakes:metadata-extractor:2.19.0"
+
+    implementation "commons-io:commons-io:2.19.0"
+    implementation "org.springdoc:springdoc-openapi-starter-webmvc-ui:2.8.8"
+    //general PDF
+
+    // https://mvnrepository.com/artifact/com.opencsv/opencsv
+    implementation ("com.opencsv:opencsv:5.11")
+
+    implementation ("org.apache.pdfbox:pdfbox:$pdfboxVersion")
+    implementation "org.apache.pdfbox:preflight:$pdfboxVersion"
+
+
+    implementation ("org.apache.pdfbox:xmpbox:$pdfboxVersion")
+
+    // https://mvnrepository.com/artifact/technology.tabula/tabula
+    implementation ('technology.tabula:tabula:1.0.5')  {
+        exclude group: "org.slf4j", module: "slf4j-simple"
+        exclude group: "org.bouncycastle", module: "bcprov-jdk15on"
+        exclude group: "com.google.code.gson", module: "gson"
+    }
+
+    implementation 'org.apache.pdfbox:jbig2-imageio:3.0.4'
+
+    implementation "org.bouncycastle:bcprov-jdk18on:$bouncycastleVersion"
+    implementation "org.bouncycastle:bcpkix-jdk18on:$bouncycastleVersion"
+    implementation "org.springframework.boot:spring-boot-starter-actuator:$springBootVersion"
+    implementation "io.micrometer:micrometer-core:1.14.6"
+    implementation group: "com.google.zxing", name: "core", version: "3.5.3"
+    // https://mvnrepository.com/artifact/org.commonmark/commonmark
+    implementation "org.commonmark:commonmark:0.24.0"
+    implementation "org.commonmark:commonmark-ext-gfm-tables:0.24.0"
+    // https://mvnrepository.com/artifact/com.bucket4j/bucket4j_jdk17
+    implementation "com.bucket4j:bucket4j_jdk17-core:8.14.0"
+    implementation "com.fathzer:javaluator:3.0.6"
+
+    implementation 'com.vladsch.flexmark:flexmark-html2md-converter:0.64.8'
+
+    developmentOnly("org.springframework.boot:spring-boot-devtools:$springBootVersion")
+    compileOnly "org.projectlombok:lombok:$lombokVersion"
+    annotationProcessor "org.projectlombok:lombok:$lombokVersion"
+
+    testRuntimeOnly 'org.mockito:mockito-inline:5.2.0'
+}
+
+tasks.withType(JavaCompile).configureEach {
+    options.encoding = "UTF-8"
+    dependsOn "spotlessApply"
+}
+compileJava {
+    options.compilerArgs << "-parameters"
+}
+
+task writeVersion {
+    def propsFile = file("$projectDir/src/main/resources/version.properties")
+    def propsDir = propsFile.parentFile
+
+    doLast {
+        if (!propsDir.exists()) {
+            propsDir.mkdirs()
+        }
+
+        def props = new Properties()
+        props.setProperty("version", version)
+        props.store(propsFile.newWriter(), null)
+    }
+}
+
+processResources.dependsOn(writeVersion)
+
 swaggerhubUpload {
     // dependsOn = generateOpenApiDocs  // Depends on your task generating Swagger docs
     api = "Stirling-PDF"  // The name of your API on SwaggerHub
@@ -536,26 +580,25 @@ swaggerhubUpload {
     oas = "3.0.0"  // The version of the OpenAPI Specification you"re using
 }
 
-dependencies {
-    testImplementation 'org.springframework.boot:spring-boot-starter-test'
-    testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.12.2'
+jar {
+    enabled = false
+    manifest {
+        attributes "Implementation-Title": "Stirling-PDF",
+                   "Implementation-Version": project.version
+    }
 }
 
 tasks.named("test") {
     useJUnitPlatform()
 }
 
-
-// Make sure all relevant processes depend on writeVersion
-processResources.dependsOn(writeVersion)
-
-tasks.register('printVersion') {
+task printVersion {
     doLast {
         println project.version
     }
 }
 
-tasks.register('printMacVersion') {
+task printMacVersion {
     doLast {
         println getMacVersion(project.version.toString())
     }
@@ -564,22 +607,3 @@ tasks.register('printMacVersion') {
 tasks.named('generateOpenApiDocs') {
     doNotTrackState("Tracking state is not supported for this task")
 }
-tasks.named('bootRun') {
-    group = 'application'
-    description = 'Delegates to :stirling-pdf:bootRun'
-    dependsOn ':stirling-pdf:bootRun'
-
-    doFirst {
-        println "Delegating to :stirling-pdf:bootRun"
-    }
-}
-
-tasks.named('build') {
-    group = 'build'
-    description = 'Delegates to :stirling-pdf:bootJar'
-    dependsOn ':stirling-pdf:bootJar'
-
-    doFirst {
-        println "Delegating to :stirling-pdf:bootJar"
-    }
-}

common/.gitignore

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

common/build.gradle

@@ -1,32 +0,0 @@
-// Configure bootRun to disable it or point to a main class
-bootRun {
-    enabled = false
-}
-spotless {
-    java {
-        target sourceSets.main.allJava
-        googleJavaFormat(googleJavaFormatVersion).aosp().reorderImports(false)
-
-        importOrder("java", "javax", "org", "com", "net", "io", "jakarta", "lombok", "me", "stirling")
-        toggleOffOn()
-        trimTrailingWhitespace()
-        leadingTabsToSpaces()
-        endWithNewline()
-    }
-}
-dependencies {
-    api 'org.springframework.boot:spring-boot-starter-web'
-    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'
-    api 'org.apache.commons:commons-lang3:3.17.0'
-    api 'com.drewnoakes:metadata-extractor:2.19.0' // Image metadata extractor
-    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.9'
-    api "org.springdoc:springdoc-openapi-starter-webmvc-ui:2.8.9"
-    api 'jakarta.mail:jakarta.mail-api:2.1.3'
-    api 'org.springframework.boot:spring-boot-starter-aop'
-}

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

@@ -1,78 +0,0 @@
-package stirling.software.common.annotations;
-
-import java.lang.annotation.*;
-
-import org.springframework.core.annotation.AliasFor;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-
-/**
- * Shortcut for a POST endpoint that is executed through the Stirling "auto‑job" framework.
- * <p>
- * Behaviour notes:
- * <ul>
- *   <li>The endpoint is registered with {@code POST} and, by default, consumes
- *       {@code multipart/form-data} unless you override {@link #consumes()}.</li>
- *   <li>When the client supplies {@code ?async=true} the call is handed to
- *       {@link stirling.software.common.service.JobExecutorService JobExecutorService} where it may
- *       be queued, retried, tracked and subject to time‑outs. For synchronous (default)
- *       invocations these advanced options are ignored.</li>
- *   <li>Progress information (see {@link #trackProgress()}) is stored in
- *       {@link stirling.software.common.service.TaskManager TaskManager} and can be
- *       polled via <code>GET /api/v1/general/job/{id}</code>.</li>
- * </ul>
- * </p>
- *
- * <p>Unless stated otherwise an attribute only affects <em>async</em> execution.</p>
- */
-@Target(ElementType.METHOD)
-@Retention(RetentionPolicy.RUNTIME)
-@Documented
-@RequestMapping(method = RequestMethod.POST)
-public @interface AutoJobPostMapping {
-
-    /**
-     * Alias for {@link RequestMapping#value} – the path mapping of the endpoint.
-     */
-    @AliasFor(annotation = RequestMapping.class, attribute = "value")
-    String[] value() default {};
-
-    /**
-     * MIME types this endpoint accepts. Defaults to {@code multipart/form-data}.
-     */
-    @AliasFor(annotation = RequestMapping.class, attribute = "consumes")
-    String[] consumes() default {"multipart/form-data"};
-
-    /**
-     * Maximum execution time in milliseconds before the job is aborted.
-     * A negative value means "use the application default".
-     * <p>Only honoured when {@code async=true}.</p>
-     */
-    long timeout() default -1;
-
-    /**
-     * Total number of attempts (initial + retries). Must be at least&nbsp;1.
-     * Retries are executed with exponential back‑off.
-     * <p>Only honoured when {@code async=true}.</p>
-     */
-    int retryCount() default 1;
-
-    /**
-     * Record percentage / note updates so they can be retrieved via the REST status endpoint.
-     * <p>Only honoured when {@code async=true}.</p>
-     */
-    boolean trackProgress() default true;
-
-    /**
-     * If {@code true} the job may be placed in a queue instead of being rejected when resources
-     * are scarce.
-     * <p>Only honoured when {@code async=true}.</p>
-     */
-    boolean queueable() default false;
-
-    /**
-     * Relative resource weight (1–100) used by the scheduler to prioritise / throttle jobs. Values
-     * below 1 are clamped to&nbsp;1, values above 100 to&nbsp;100.
-     */
-    int resourceWeight() default 50;
-}

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

@@ -1,365 +0,0 @@
-package stirling.software.common.aop;
-
-import java.io.IOException;
-import java.time.Duration;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicReference;
-
-import org.aspectj.lang.ProceedingJoinPoint;
-import org.aspectj.lang.annotation.*;
-import org.springframework.core.annotation.Order;
-import org.springframework.stereotype.Component;
-import org.springframework.web.multipart.MultipartFile;
-
-import jakarta.servlet.http.HttpServletRequest;
-
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-
-import stirling.software.common.annotations.AutoJobPostMapping;
-import stirling.software.common.model.api.PDFFile;
-import stirling.software.common.service.FileOrUploadService;
-import stirling.software.common.service.FileStorage;
-import stirling.software.common.service.JobExecutorService;
-
-@Aspect
-@Component
-@RequiredArgsConstructor
-@Slf4j
-@Order(0) // Highest precedence - executes before audit aspects
-public class AutoJobAspect {
-
-    private static final Duration RETRY_BASE_DELAY = Duration.ofMillis(100);
-
-    private final JobExecutorService jobExecutorService;
-    private final HttpServletRequest request;
-    private final FileOrUploadService fileOrUploadService;
-    private final FileStorage fileStorage;
-
-    @Around("@annotation(autoJobPostMapping)")
-    public Object wrapWithJobExecution(
-            ProceedingJoinPoint joinPoint, AutoJobPostMapping autoJobPostMapping) {
-        // This aspect will run before any audit aspects due to @Order(0)
-        // Extract parameters from the request and annotation
-        boolean async = Boolean.parseBoolean(request.getParameter("async"));
-        long timeout = autoJobPostMapping.timeout();
-        int retryCount = autoJobPostMapping.retryCount();
-        boolean trackProgress = autoJobPostMapping.trackProgress();
-
-        log.debug(
-                "AutoJobPostMapping execution with async={}, timeout={}, retryCount={}, trackProgress={}",
-                async,
-                timeout > 0 ? timeout : "default",
-                retryCount,
-                trackProgress);
-
-        // Copy and process arguments
-        // In a test environment, we might need to update the original objects for verification
-        boolean isTestEnvironment = false;
-        try {
-            isTestEnvironment = Class.forName("org.junit.jupiter.api.Test") != null;
-        } catch (ClassNotFoundException e) {
-            // Not in a test environment
-        }
-
-        Object[] args =
-                isTestEnvironment
-                        ? processArgsInPlace(joinPoint.getArgs(), async)
-                        : copyAndProcessArgs(joinPoint.getArgs(), async);
-
-        // Extract queueable and resourceWeight parameters and validate
-        boolean queueable = autoJobPostMapping.queueable();
-        int resourceWeight = Math.max(1, Math.min(100, autoJobPostMapping.resourceWeight()));
-
-        // Integrate with the JobExecutorService
-        if (retryCount <= 1) {
-            // No retries needed, simple execution
-            return jobExecutorService.runJobGeneric(
-                    async,
-                    () -> {
-                        try {
-                            // Note: Progress tracking is handled in TaskManager/JobExecutorService
-                            // The trackProgress flag controls whether detailed progress is stored
-                            // for REST API queries, not WebSocket notifications
-                            return joinPoint.proceed(args);
-                        } catch (Throwable ex) {
-                            log.error(
-                                    "AutoJobAspect caught exception during job execution: {}",
-                                    ex.getMessage(),
-                                    ex);
-                            throw new RuntimeException(ex);
-                        }
-                    },
-                    timeout,
-                    queueable,
-                    resourceWeight);
-        } else {
-            // Use retry logic
-            return executeWithRetries(
-                    joinPoint,
-                    args,
-                    async,
-                    timeout,
-                    retryCount,
-                    trackProgress,
-                    queueable,
-                    resourceWeight);
-        }
-    }
-
-    private Object executeWithRetries(
-            ProceedingJoinPoint joinPoint,
-            Object[] args,
-            boolean async,
-            long timeout,
-            int maxRetries,
-            boolean trackProgress,
-            boolean queueable,
-            int resourceWeight) {
-
-        // Keep jobId reference for progress tracking in TaskManager
-        AtomicReference<String> jobIdRef = new AtomicReference<>();
-
-        return jobExecutorService.runJobGeneric(
-                async,
-                () -> {
-                    // Use iterative approach instead of recursion to avoid stack overflow
-                    Throwable lastException = null;
-
-                    // Attempt counter starts at 1 for first try
-                    for (int currentAttempt = 1; currentAttempt <= maxRetries; currentAttempt++) {
-                        try {
-                            if (trackProgress && async) {
-                                // Get jobId for progress tracking in TaskManager
-                                // This enables REST API progress queries, not WebSocket
-                                if (jobIdRef.get() == null) {
-                                    jobIdRef.set(getJobIdFromContext());
-                                }
-                                String jobId = jobIdRef.get();
-                                if (jobId != null) {
-                                    log.debug(
-                                            "Tracking progress for job {} (attempt {}/{})",
-                                            jobId,
-                                            currentAttempt,
-                                            maxRetries);
-                                    // Progress is tracked in TaskManager for REST API access
-                                    // No WebSocket notifications sent here
-                                }
-                            }
-
-                            // Attempt to execute the operation
-                            return joinPoint.proceed(args);
-
-                        } catch (Throwable ex) {
-                            lastException = ex;
-                            log.error(
-                                    "AutoJobAspect caught exception during job execution (attempt {}/{}): {}",
-                                    currentAttempt,
-                                    maxRetries,
-                                    ex.getMessage(),
-                                    ex);
-
-                            // Check if we should retry
-                            if (currentAttempt < maxRetries) {
-                                log.info(
-                                        "Retrying operation, attempt {}/{}",
-                                        currentAttempt + 1,
-                                        maxRetries);
-
-                                if (trackProgress && async) {
-                                    String jobId = jobIdRef.get();
-                                    if (jobId != null) {
-                                        log.debug(
-                                                "Recording retry attempt for job {} in TaskManager",
-                                                jobId);
-                                        // Retry info is tracked in TaskManager for REST API access
-                                    }
-                                }
-
-                                // Use non-blocking delay for all retry attempts to avoid blocking
-                                // threads
-                                // For sync jobs this avoids starving the tomcat thread pool under
-                                // load
-                                long delayMs = RETRY_BASE_DELAY.toMillis() * currentAttempt;
-
-                                // Execute the retry after a delay through the JobExecutorService
-                                // rather than blocking the current thread with sleep
-                                CompletableFuture<Object> delayedRetry = new CompletableFuture<>();
-
-                                // Use a delayed executor for non-blocking delay
-                                CompletableFuture.delayedExecutor(delayMs, TimeUnit.MILLISECONDS)
-                                        .execute(
-                                                () -> {
-                                                    // Continue the retry loop in the next iteration
-                                                    // We can't return from here directly since
-                                                    // we're in a Runnable
-                                                    delayedRetry.complete(null);
-                                                });
-
-                                // Wait for the delay to complete before continuing
-                                try {
-                                    delayedRetry.join();
-                                } catch (Exception e) {
-                                    Thread.currentThread().interrupt();
-                                    break;
-                                }
-                            } else {
-                                // No more retries, we'll throw the exception after the loop
-                                break;
-                            }
-                        }
-                    }
-
-                    // If we get here, all retries failed
-                    if (lastException != null) {
-                        throw new RuntimeException(
-                                "Job failed after "
-                                        + maxRetries
-                                        + " attempts: "
-                                        + lastException.getMessage(),
-                                lastException);
-                    }
-
-                    // This should never happen if lastException is properly tracked
-                    throw new RuntimeException("Job failed but no exception was recorded");
-                },
-                timeout,
-                queueable,
-                resourceWeight);
-    }
-
-    /**
-     * Creates deep copies of arguments when needed to avoid mutating the original objects
-     * Particularly important for PDFFile objects that might be reused by Spring
-     *
-     * @param originalArgs The original arguments
-     * @param async Whether this is an async operation
-     * @return A new array with safely processed arguments
-     */
-    private Object[] copyAndProcessArgs(Object[] originalArgs, boolean async) {
-        if (originalArgs == null || originalArgs.length == 0) {
-            return originalArgs;
-        }
-
-        Object[] processedArgs = new Object[originalArgs.length];
-
-        // Copy all arguments
-        for (int i = 0; i < originalArgs.length; i++) {
-            Object arg = originalArgs[i];
-
-            if (arg instanceof PDFFile pdfFile) {
-                // Create a copy of PDFFile to avoid mutating the original
-                // Using direct property access instead of reflection for better performance
-                PDFFile pdfFileCopy = new PDFFile();
-                pdfFileCopy.setFileId(pdfFile.getFileId());
-                pdfFileCopy.setFileInput(pdfFile.getFileInput());
-
-                // Case 1: fileId is provided but no fileInput
-                if (pdfFileCopy.getFileInput() == null && pdfFileCopy.getFileId() != null) {
-                    try {
-                        log.debug("Using fileId {} to get file content", pdfFileCopy.getFileId());
-                        MultipartFile file = fileStorage.retrieveFile(pdfFileCopy.getFileId());
-                        pdfFileCopy.setFileInput(file);
-                    } catch (Exception e) {
-                        throw new RuntimeException(
-                                "Failed to resolve file by ID: " + pdfFileCopy.getFileId(), e);
-                    }
-                }
-                // Case 2: For async requests, we need to make a copy of the MultipartFile
-                else if (async && pdfFileCopy.getFileInput() != null) {
-                    try {
-                        log.debug("Making persistent copy of uploaded file for async processing");
-                        MultipartFile originalFile = pdfFileCopy.getFileInput();
-                        String fileId = fileStorage.storeFile(originalFile);
-
-                        // Store the fileId for later reference
-                        pdfFileCopy.setFileId(fileId);
-
-                        // Replace the original MultipartFile with our persistent copy
-                        MultipartFile persistentFile = fileStorage.retrieveFile(fileId);
-                        pdfFileCopy.setFileInput(persistentFile);
-
-                        log.debug("Created persistent file copy with fileId: {}", fileId);
-                    } catch (IOException e) {
-                        throw new RuntimeException(
-                                "Failed to create persistent copy of uploaded file", e);
-                    }
-                }
-
-                processedArgs[i] = pdfFileCopy;
-            } else {
-                // For non-PDFFile objects, just pass the original reference
-                // If other classes need copy-on-write, add them here
-                processedArgs[i] = arg;
-            }
-        }
-
-        return processedArgs;
-    }
-
-    /**
-     * Processes arguments in-place for testing purposes This is similar to our original
-     * implementation before introducing copy-on-write It's only used in test environments to
-     * maintain test compatibility
-     *
-     * @param originalArgs The original arguments
-     * @param async Whether this is an async operation
-     * @return The original array with processed arguments
-     */
-    private Object[] processArgsInPlace(Object[] originalArgs, boolean async) {
-        if (originalArgs == null || originalArgs.length == 0) {
-            return originalArgs;
-        }
-
-        // Process all arguments in-place
-        for (int i = 0; i < originalArgs.length; i++) {
-            Object arg = originalArgs[i];
-
-            if (arg instanceof PDFFile pdfFile) {
-                // Case 1: fileId is provided but no fileInput
-                if (pdfFile.getFileInput() == null && pdfFile.getFileId() != null) {
-                    try {
-                        log.debug("Using fileId {} to get file content", pdfFile.getFileId());
-                        MultipartFile file = fileStorage.retrieveFile(pdfFile.getFileId());
-                        pdfFile.setFileInput(file);
-                    } catch (Exception e) {
-                        throw new RuntimeException(
-                                "Failed to resolve file by ID: " + pdfFile.getFileId(), e);
-                    }
-                }
-                // Case 2: For async requests, we need to make a copy of the MultipartFile
-                else if (async && pdfFile.getFileInput() != null) {
-                    try {
-                        log.debug("Making persistent copy of uploaded file for async processing");
-                        MultipartFile originalFile = pdfFile.getFileInput();
-                        String fileId = fileStorage.storeFile(originalFile);
-
-                        // Store the fileId for later reference
-                        pdfFile.setFileId(fileId);
-
-                        // Replace the original MultipartFile with our persistent copy
-                        MultipartFile persistentFile = fileStorage.retrieveFile(fileId);
-                        pdfFile.setFileInput(persistentFile);
-
-                        log.debug("Created persistent file copy with fileId: {}", fileId);
-                    } catch (IOException e) {
-                        throw new RuntimeException(
-                                "Failed to create persistent copy of uploaded file", e);
-                    }
-                }
-            }
-        }
-
-        return originalArgs;
-    }
-
-    private String getJobIdFromContext() {
-        try {
-            return (String) request.getAttribute("jobId");
-        } catch (Exception e) {
-            log.debug("Could not retrieve job ID from context: {}", e.getMessage());
-            return null;
-        }
-    }
-}

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

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

common/src/main/java/stirling/software/common/model/api/converters/EmlToPdfRequest.java

@@ -1,41 +0,0 @@
-package stirling.software.common.model.api.converters;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import stirling.software.common.model.api.PDFFile;
-
-@Data
-@EqualsAndHashCode(callSuper = true)
-public class EmlToPdfRequest extends PDFFile {
-
-    // fileInput is inherited from PDFFile
-
-    @Schema(
-            description = "Include email attachments in the PDF output",
-            requiredMode = Schema.RequiredMode.NOT_REQUIRED,
-            example = "false")
-    private boolean includeAttachments = false;
-
-    @Schema(
-            description = "Maximum attachment size in MB to include (default 10MB, range: 1-100)",
-            requiredMode = Schema.RequiredMode.NOT_REQUIRED,
-            example = "10",
-            minimum = "1",
-            maximum = "100")
-    private int maxAttachmentSizeMB = 10;
-
-    @Schema(
-            description = "Download HTML intermediate file instead of PDF",
-            requiredMode = Schema.RequiredMode.NOT_REQUIRED,
-            example = "false")
-    private boolean downloadHtml = false;
-
-    @Schema(
-            description = "Include CC and BCC recipients in header (if available)",
-            requiredMode = Schema.RequiredMode.NOT_REQUIRED,
-            example = "true")
-    private boolean includeAllRecipients = true;
-}

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

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

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

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

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

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

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

@@ -1,121 +0,0 @@
-package stirling.software.common.model.job;
-
-import java.time.LocalDateTime;
-import java.util.Collections;
-import java.util.List;
-import java.util.concurrent.CopyOnWriteArrayList;
-
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-/** Represents the result of a job execution. Used by the TaskManager to store job results. */
-@Data
-@Builder
-@NoArgsConstructor
-@AllArgsConstructor
-public class JobResult {
-
-    /** The job ID */
-    private String jobId;
-
-    /** Flag indicating if the job is complete */
-    private boolean complete;
-
-    /** Error message if the job failed */
-    private String error;
-
-    /** The file ID of the result file, if applicable */
-    private String fileId;
-
-    /** Original file name, if applicable */
-    private String originalFileName;
-
-    /** MIME type of the result, if applicable */
-    private String contentType;
-
-    /** Time when the job was created */
-    private LocalDateTime createdAt;
-
-    /** Time when the job was completed */
-    private LocalDateTime completedAt;
-
-    /** The actual result object, if not a file */
-    private Object result;
-
-    /**
-     * Notes attached to this job for tracking purposes. Uses CopyOnWriteArrayList for thread safety
-     * when notes are added concurrently.
-     */
-    private final List<String> notes = new CopyOnWriteArrayList<>();
-
-    /**
-     * Create a new JobResult with the given job ID
-     *
-     * @param jobId The job ID
-     * @return A new JobResult
-     */
-    public static JobResult createNew(String jobId) {
-        return JobResult.builder()
-                .jobId(jobId)
-                .complete(false)
-                .createdAt(LocalDateTime.now())
-                .build();
-    }
-
-    /**
-     * Mark this job as complete with a file result
-     *
-     * @param fileId The file ID of the result
-     * @param originalFileName The original file name
-     * @param contentType The content type of the file
-     */
-    public void completeWithFile(String fileId, String originalFileName, String contentType) {
-        this.complete = true;
-        this.fileId = fileId;
-        this.originalFileName = originalFileName;
-        this.contentType = contentType;
-        this.completedAt = LocalDateTime.now();
-    }
-
-    /**
-     * Mark this job as complete with a general result
-     *
-     * @param result The result object
-     */
-    public void completeWithResult(Object result) {
-        this.complete = true;
-        this.result = result;
-        this.completedAt = LocalDateTime.now();
-    }
-
-    /**
-     * Mark this job as failed with an error message
-     *
-     * @param error The error message
-     */
-    public void failWithError(String error) {
-        this.complete = true;
-        this.error = error;
-        this.completedAt = LocalDateTime.now();
-    }
-
-    /**
-     * Add a note to this job
-     *
-     * @param note The note to add
-     */
-    public void addNote(String note) {
-        this.notes.add(note);
-    }
-
-    /**
-     * Get all notes attached to this job
-     *
-     * @return An unmodifiable view of the notes list
-     */
-    public List<String> getNotes() {
-        return Collections.unmodifiableList(notes);
-    }
-}

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

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

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

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

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

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

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

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

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

@@ -1,495 +0,0 @@
-package stirling.software.common.service;
-
-import java.time.Instant;
-import java.util.Map;
-import java.util.concurrent.*;
-import java.util.function.Supplier;
-
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.context.SmartLifecycle;
-import org.springframework.http.ResponseEntity;
-import org.springframework.stereotype.Service;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.Getter;
-import lombok.extern.slf4j.Slf4j;
-
-import stirling.software.common.util.ExecutorFactory;
-import stirling.software.common.util.SpringContextHolder;
-
-/**
- * Manages a queue of jobs with dynamic sizing based on system resources. Used when system resources
- * are limited to prevent overloading.
- */
-@Service
-@Slf4j
-public class JobQueue implements SmartLifecycle {
-
-    private volatile boolean running = false;
-
-    private final ResourceMonitor resourceMonitor;
-
-    @Value("${stirling.job.queue.base-capacity:10}")
-    private int baseQueueCapacity = 10;
-
-    @Value("${stirling.job.queue.min-capacity:2}")
-    private int minQueueCapacity = 2;
-
-    @Value("${stirling.job.queue.check-interval-ms:1000}")
-    private long queueCheckIntervalMs = 1000;
-
-    @Value("${stirling.job.queue.max-wait-time-ms:600000}")
-    private long maxWaitTimeMs = 600000; // 10 minutes
-
-    private volatile BlockingQueue<QueuedJob> jobQueue;
-    private final Map<String, QueuedJob> jobMap = new ConcurrentHashMap<>();
-    private final ScheduledExecutorService scheduler = Executors.newSingleThreadScheduledExecutor();
-    private final ExecutorService jobExecutor = ExecutorFactory.newVirtualOrCachedThreadExecutor();
-    private final Object queueLock = new Object(); // Lock for synchronizing queue operations
-
-    private boolean shuttingDown = false;
-
-    @Getter private int rejectedJobs = 0;
-
-    @Getter private int totalQueuedJobs = 0;
-
-    @Getter private int currentQueueSize = 0;
-
-    /** Represents a job waiting in the queue. */
-    @Data
-    @AllArgsConstructor
-    private static class QueuedJob {
-        private final String jobId;
-        private final int resourceWeight;
-        private final Supplier<Object> work;
-        private final long timeoutMs;
-        private final Instant queuedAt;
-        private CompletableFuture<ResponseEntity<?>> future;
-        private volatile boolean cancelled = false;
-    }
-
-    public JobQueue(ResourceMonitor resourceMonitor) {
-        this.resourceMonitor = resourceMonitor;
-
-        // Initialize with dynamic capacity
-        int capacity =
-                resourceMonitor.calculateDynamicQueueCapacity(baseQueueCapacity, minQueueCapacity);
-        this.jobQueue = new LinkedBlockingQueue<>(capacity);
-    }
-
-    // Remove @PostConstruct to let SmartLifecycle control startup
-    private void initializeSchedulers() {
-        log.debug(
-                "Starting job queue with base capacity {}, min capacity {}",
-                baseQueueCapacity,
-                minQueueCapacity);
-
-        // Periodically process the job queue
-        scheduler.scheduleWithFixedDelay(
-                this::processQueue, 0, queueCheckIntervalMs, TimeUnit.MILLISECONDS);
-
-        // Periodically update queue capacity based on resource usage
-        scheduler.scheduleWithFixedDelay(
-                this::updateQueueCapacity,
-                10000, // Initial delay
-                30000, // 30 second interval
-                TimeUnit.MILLISECONDS);
-    }
-
-    // Remove @PreDestroy to let SmartLifecycle control shutdown
-    private void shutdownSchedulers() {
-        log.info("Shutting down job queue");
-        shuttingDown = true;
-
-        // Complete any futures that are still waiting
-        jobMap.forEach(
-                (id, job) -> {
-                    if (!job.future.isDone()) {
-                        job.future.completeExceptionally(
-                                new RuntimeException("Server shutting down, job cancelled"));
-                    }
-                });
-
-        // Shutdown schedulers and wait for termination
-        try {
-            scheduler.shutdown();
-            if (!scheduler.awaitTermination(5, TimeUnit.SECONDS)) {
-                scheduler.shutdownNow();
-            }
-
-            jobExecutor.shutdown();
-            if (!jobExecutor.awaitTermination(5, TimeUnit.SECONDS)) {
-                jobExecutor.shutdownNow();
-            }
-        } catch (InterruptedException e) {
-            Thread.currentThread().interrupt();
-            scheduler.shutdownNow();
-            jobExecutor.shutdownNow();
-        }
-
-        log.info(
-                "Job queue shutdown complete. Stats: total={}, rejected={}",
-                totalQueuedJobs,
-                rejectedJobs);
-    }
-
-    // SmartLifecycle methods
-
-    @Override
-    public void start() {
-        log.info("Starting JobQueue lifecycle");
-        if (!running) {
-            initializeSchedulers();
-            running = true;
-        }
-    }
-
-    @Override
-    public void stop() {
-        log.info("Stopping JobQueue lifecycle");
-        shutdownSchedulers();
-        running = false;
-    }
-
-    @Override
-    public boolean isRunning() {
-        return running;
-    }
-
-    @Override
-    public int getPhase() {
-        // Start earlier than most components, but shutdown later
-        return 10;
-    }
-
-    @Override
-    public boolean isAutoStartup() {
-        return true;
-    }
-
-    /**
-     * Queues a job for execution when resources permit.
-     *
-     * @param jobId The job ID
-     * @param resourceWeight The resource weight of the job (1-100)
-     * @param work The work to be done
-     * @param timeoutMs The timeout in milliseconds
-     * @return A CompletableFuture that will complete when the job is executed
-     */
-    public CompletableFuture<ResponseEntity<?>> queueJob(
-            String jobId, int resourceWeight, Supplier<Object> work, long timeoutMs) {
-
-        // Create a CompletableFuture to track this job's completion
-        CompletableFuture<ResponseEntity<?>> future = new CompletableFuture<>();
-
-        // Create the queued job
-        QueuedJob job =
-                new QueuedJob(jobId, resourceWeight, work, timeoutMs, Instant.now(), future, false);
-
-        // Store in our map for lookup
-        jobMap.put(jobId, job);
-
-        // Update stats
-        totalQueuedJobs++;
-
-        // Synchronize access to the queue
-        synchronized (queueLock) {
-            currentQueueSize = jobQueue.size();
-
-            // Try to add to the queue
-            try {
-                boolean added = jobQueue.offer(job, 5, TimeUnit.SECONDS);
-                if (!added) {
-                    log.warn("Queue full, rejecting job {}", jobId);
-                    rejectedJobs++;
-                    future.completeExceptionally(
-                            new RuntimeException("Job queue full, please try again later"));
-                    jobMap.remove(jobId);
-                    return future;
-                }
-
-                log.debug(
-                        "Job {} queued for execution (weight: {}, queue size: {})",
-                        jobId,
-                        resourceWeight,
-                        jobQueue.size());
-
-                return future;
-            } catch (InterruptedException e) {
-                Thread.currentThread().interrupt();
-                future.completeExceptionally(new RuntimeException("Job queue interrupted"));
-                jobMap.remove(jobId);
-                return future;
-            }
-        }
-    }
-
-    /**
-     * Gets the current capacity of the job queue.
-     *
-     * @return The current capacity
-     */
-    public int getQueueCapacity() {
-        synchronized (queueLock) {
-            return ((LinkedBlockingQueue<QueuedJob>) jobQueue).remainingCapacity()
-                    + jobQueue.size();
-        }
-    }
-
-    /** Updates the capacity of the job queue based on available system resources. */
-    private void updateQueueCapacity() {
-        try {
-            // Calculate new capacity once and cache the result
-            int newCapacity =
-                    resourceMonitor.calculateDynamicQueueCapacity(
-                            baseQueueCapacity, minQueueCapacity);
-
-            int currentCapacity = getQueueCapacity();
-            if (newCapacity != currentCapacity) {
-                log.debug(
-                        "Updating job queue capacity from {} to {}", currentCapacity, newCapacity);
-
-                synchronized (queueLock) {
-                    // Double-check that capacity still needs to be updated
-                    // Use the cached currentCapacity to avoid calling getQueueCapacity() again
-                    if (newCapacity != currentCapacity) {
-                        // Create new queue with updated capacity
-                        BlockingQueue<QueuedJob> newQueue = new LinkedBlockingQueue<>(newCapacity);
-
-                        // Transfer jobs from old queue to new queue
-                        jobQueue.drainTo(newQueue);
-                        jobQueue = newQueue;
-
-                        currentQueueSize = jobQueue.size();
-                    }
-                }
-            }
-        } catch (Exception e) {
-            log.error("Error updating queue capacity: {}", e.getMessage(), e);
-        }
-    }
-
-    /** Processes jobs in the queue, executing them when resources permit. */
-    private void processQueue() {
-        // Jobs to execute after releasing the lock
-        java.util.List<QueuedJob> jobsToExecute = new java.util.ArrayList<>();
-
-        // First synchronized block: poll jobs from the queue and prepare them for execution
-        synchronized (queueLock) {
-            if (shuttingDown || jobQueue.isEmpty()) {
-                return;
-            }
-
-            try {
-                // Get current resource status
-                ResourceMonitor.ResourceStatus status = resourceMonitor.getCurrentStatus().get();
-
-                // Check if we should execute any jobs
-                boolean canExecuteJobs = (status != ResourceMonitor.ResourceStatus.CRITICAL);
-
-                if (!canExecuteJobs) {
-                    // Under critical load, don't execute any jobs
-                    log.debug("System under critical load, delaying job execution");
-                    return;
-                }
-
-                // Get jobs from the queue, up to a limit based on resource availability
-                int jobsToProcess =
-                        Math.max(
-                                1,
-                                switch (status) {
-                                    case OK -> 3;
-                                    case WARNING -> 1;
-                                    case CRITICAL -> 0;
-                                });
-
-                for (int i = 0; i < jobsToProcess && !jobQueue.isEmpty(); i++) {
-                    QueuedJob job = jobQueue.poll();
-                    if (job == null) break;
-
-                    // Check if it's been waiting too long
-                    long waitTimeMs = Instant.now().toEpochMilli() - job.queuedAt.toEpochMilli();
-                    if (waitTimeMs > maxWaitTimeMs) {
-                        log.warn(
-                                "Job {} exceeded maximum wait time ({} ms), executing anyway",
-                                job.jobId,
-                                waitTimeMs);
-
-                        // Add a specific status to the job context that can be tracked
-                        // This will be visible in the job status API
-                        try {
-                            TaskManager taskManager =
-                                    SpringContextHolder.getBean(TaskManager.class);
-                            if (taskManager != null) {
-                                taskManager.addNote(
-                                        job.jobId,
-                                        "QUEUED_TIMEOUT: Job waited in queue for "
-                                                + (waitTimeMs / 1000)
-                                                + " seconds, exceeding the maximum wait time of "
-                                                + (maxWaitTimeMs / 1000)
-                                                + " seconds.");
-                            }
-                        } catch (Exception e) {
-                            log.error(
-                                    "Failed to add timeout note to job {}: {}",
-                                    job.jobId,
-                                    e.getMessage());
-                        }
-                    }
-
-                    // Remove from our map
-                    jobMap.remove(job.jobId);
-                    currentQueueSize = jobQueue.size();
-
-                    // Add to the list of jobs to execute outside the synchronized block
-                    jobsToExecute.add(job);
-                }
-            } catch (Exception e) {
-                log.error("Error processing job queue: {}", e.getMessage(), e);
-            }
-        }
-
-        // Now execute the jobs outside the synchronized block to avoid holding the lock
-        for (QueuedJob job : jobsToExecute) {
-            executeJob(job);
-        }
-    }
-
-    /**
-     * Executes a job from the queue.
-     *
-     * @param job The job to execute
-     */
-    private void executeJob(QueuedJob job) {
-        if (job.cancelled) {
-            log.debug("Job {} was cancelled, not executing", job.jobId);
-            return;
-        }
-
-        jobExecutor.execute(
-                () -> {
-                    log.debug("Executing queued job {} (queued at {})", job.jobId, job.queuedAt);
-
-                    try {
-                        // Execute with timeout
-                        Object result = executeWithTimeout(job.work, job.timeoutMs);
-
-                        // Process the result
-                        if (result instanceof ResponseEntity) {
-                            job.future.complete((ResponseEntity<?>) result);
-                        } else {
-                            job.future.complete(ResponseEntity.ok(result));
-                        }
-
-                    } catch (Exception e) {
-                        log.error(
-                                "Error executing queued job {}: {}", job.jobId, e.getMessage(), e);
-                        job.future.completeExceptionally(e);
-                    }
-                });
-    }
-
-    /**
-     * Execute a supplier with a timeout.
-     *
-     * @param supplier The supplier to execute
-     * @param timeoutMs The timeout in milliseconds
-     * @return The result from the supplier
-     * @throws Exception If there is an execution error
-     */
-    private <T> T executeWithTimeout(Supplier<T> supplier, long timeoutMs) throws Exception {
-        CompletableFuture<T> future = CompletableFuture.supplyAsync(supplier);
-
-        try {
-            if (timeoutMs <= 0) {
-                // No timeout
-                return future.join();
-            } else {
-                // With timeout
-                return future.get(timeoutMs, TimeUnit.MILLISECONDS);
-            }
-        } catch (TimeoutException e) {
-            future.cancel(true);
-            throw new TimeoutException("Job timed out after " + timeoutMs + "ms");
-        } catch (ExecutionException e) {
-            throw (Exception) e.getCause();
-        } catch (InterruptedException e) {
-            Thread.currentThread().interrupt();
-            throw new InterruptedException("Job was interrupted");
-        }
-    }
-
-    /**
-     * Checks if a job is queued.
-     *
-     * @param jobId The job ID
-     * @return true if the job is queued
-     */
-    public boolean isJobQueued(String jobId) {
-        return jobMap.containsKey(jobId);
-    }
-
-    /**
-     * Gets the current position of a job in the queue.
-     *
-     * @param jobId The job ID
-     * @return The position (0-based) or -1 if not found
-     */
-    public int getJobPosition(String jobId) {
-        if (!jobMap.containsKey(jobId)) {
-            return -1;
-        }
-
-        // Count positions
-        int position = 0;
-        for (QueuedJob job : jobQueue) {
-            if (job.jobId.equals(jobId)) {
-                return position;
-            }
-            position++;
-        }
-
-        // If we didn't find it in the queue but it's in the map,
-        // it might be executing already
-        return -1;
-    }
-
-    /**
-     * Cancels a queued job.
-     *
-     * @param jobId The job ID
-     * @return true if the job was cancelled, false if not found
-     */
-    public boolean cancelJob(String jobId) {
-        QueuedJob job = jobMap.remove(jobId);
-        if (job != null) {
-            job.cancelled = true;
-            job.future.completeExceptionally(new RuntimeException("Job cancelled by user"));
-
-            // Try to remove from queue if it's still there
-            jobQueue.remove(job);
-            currentQueueSize = jobQueue.size();
-
-            log.debug("Job {} cancelled", jobId);
-
-            return true;
-        }
-
-        return false;
-    }
-
-    /**
-     * Get queue statistics.
-     *
-     * @return A map containing queue statistics
-     */
-    public Map<String, Object> getQueueStats() {
-        return Map.of(
-                "queuedJobs", jobQueue.size(),
-                "queueCapacity", getQueueCapacity(),
-                "totalQueuedJobs", totalQueuedJobs,
-                "rejectedJobs", rejectedJobs,
-                "resourceStatus", resourceMonitor.getCurrentStatus().get().name());
-    }
-}

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

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

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

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

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

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

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

@@ -1,82 +0,0 @@
-package stirling.software.common.util;
-
-import org.springframework.beans.BeansException;
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.ApplicationContextAware;
-import org.springframework.stereotype.Component;
-
-import lombok.extern.slf4j.Slf4j;
-
-/**
- * Utility class to access Spring managed beans from non-Spring managed classes. This is especially
- * useful for classes that are instantiated by frameworks or created dynamically.
- */
-@Component
-@Slf4j
-public class SpringContextHolder implements ApplicationContextAware {
-
-    private static ApplicationContext applicationContext;
-
-    @Override
-    public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
-        SpringContextHolder.applicationContext = applicationContext;
-        log.debug("Spring context holder initialized");
-    }
-
-    /**
-     * Get a Spring bean by class type
-     *
-     * @param <T> The bean type
-     * @param beanClass The bean class
-     * @return The bean instance, or null if not found
-     */
-    public static <T> T getBean(Class<T> beanClass) {
-        if (applicationContext == null) {
-            log.warn(
-                    "Application context not initialized when attempting to get bean of type {}",
-                    beanClass.getName());
-            return null;
-        }
-
-        try {
-            return applicationContext.getBean(beanClass);
-        } catch (BeansException e) {
-            log.error("Error getting bean of type {}: {}", beanClass.getName(), e.getMessage());
-            return null;
-        }
-    }
-
-    /**
-     * Get a Spring bean by name
-     *
-     * @param <T> The bean type
-     * @param beanName The bean name
-     * @return The bean instance, or null if not found
-     */
-    public static <T> T getBean(String beanName) {
-        if (applicationContext == null) {
-            log.warn(
-                    "Application context not initialized when attempting to get bean '{}'",
-                    beanName);
-            return null;
-        }
-
-        try {
-            @SuppressWarnings("unchecked")
-            T bean = (T) applicationContext.getBean(beanName);
-            return bean;
-        } catch (BeansException e) {
-            log.error("Error getting bean '{}': {}", beanName, e.getMessage());
-            return null;
-        }
-    }
-
-    /**
-     * Check if the application context is initialized
-     *
-     * @return true if initialized, false otherwise
-     */
-    public static boolean isInitialized() {
-        return applicationContext != null;
-    }
-}

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,125 +0,0 @@
-package stirling.software.common.util;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
-import java.awt.Color;
-import java.awt.Graphics2D;
-import java.awt.image.BufferedImage;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Set;
-
-import org.apache.pdfbox.cos.COSName;
-import org.apache.pdfbox.pdmodel.PDDocument;
-import org.apache.pdfbox.pdmodel.PDPage;
-import org.apache.pdfbox.pdmodel.PDResources;
-import org.apache.pdfbox.pdmodel.common.PDRectangle;
-import org.apache.pdfbox.pdmodel.graphics.image.PDImageXObject;
-import org.junit.jupiter.api.Test;
-import org.mockito.Mockito;
-
-import stirling.software.common.model.ApplicationProperties;
-import stirling.software.common.service.CustomPDFDocumentFactory;
-import stirling.software.common.service.PdfMetadataService;
-
-public class PdfUtilsTest {
-
-    @Test
-    void testTextToPageSize() {
-        assertEquals(PDRectangle.A4, PdfUtils.textToPageSize("A4"));
-        assertEquals(PDRectangle.LETTER, PdfUtils.textToPageSize("LETTER"));
-        assertThrows(IllegalArgumentException.class, () -> PdfUtils.textToPageSize("INVALID"));
-    }
-
-    @Test
-    void testHasImagesOnPage() throws IOException {
-        // Mock a PDPage and its resources
-        PDPage page = Mockito.mock(PDPage.class);
-        PDResources resources = Mockito.mock(PDResources.class);
-        Mockito.when(page.getResources()).thenReturn(resources);
-
-        // Case 1: No images in resources
-        Mockito.when(resources.getXObjectNames()).thenReturn(Collections.emptySet());
-        assertFalse(PdfUtils.hasImagesOnPage(page));
-
-        // Case 2: Resources with an image
-        Set<COSName> xObjectNames = new HashSet<>();
-        COSName cosName = Mockito.mock(COSName.class);
-        xObjectNames.add(cosName);
-
-        PDImageXObject imageXObject = Mockito.mock(PDImageXObject.class);
-        Mockito.when(resources.getXObjectNames()).thenReturn(xObjectNames);
-        Mockito.when(resources.getXObject(cosName)).thenReturn(imageXObject);
-
-        assertTrue(PdfUtils.hasImagesOnPage(page));
-    }
-
-    @Test
-    void testPageCountComparators() throws Exception {
-        PDDocument doc1 = new PDDocument();
-        doc1.addPage(new PDPage());
-        doc1.addPage(new PDPage());
-        doc1.addPage(new PDPage());
-        PdfUtils utils = new PdfUtils();
-        assertTrue(utils.pageCount(doc1, 2, "greater"));
-
-        PDDocument doc2 = new PDDocument();
-        doc2.addPage(new PDPage());
-        doc2.addPage(new PDPage());
-        doc2.addPage(new PDPage());
-        assertTrue(utils.pageCount(doc2, 3, "equal"));
-
-        PDDocument doc3 = new PDDocument();
-        doc3.addPage(new PDPage());
-        doc3.addPage(new PDPage());
-        assertTrue(utils.pageCount(doc3, 5, "less"));
-
-        PDDocument doc4 = new PDDocument();
-        doc4.addPage(new PDPage());
-        assertThrows(IllegalArgumentException.class, () -> utils.pageCount(doc4, 1, "bad"));
-    }
-
-    @Test
-    void testPageSize() throws Exception {
-        PDDocument doc = new PDDocument();
-        PDPage page = new PDPage(PDRectangle.A4);
-        doc.addPage(page);
-        PDRectangle rect = page.getMediaBox();
-        String expected = rect.getWidth() + "x" + rect.getHeight();
-        PdfUtils utils = new PdfUtils();
-        assertTrue(utils.pageSize(doc, expected));
-    }
-
-    @Test
-    void testOverlayImage() throws Exception {
-        PDDocument doc = new PDDocument();
-        doc.addPage(new PDPage(PDRectangle.A4));
-        ByteArrayOutputStream pdfOut = new ByteArrayOutputStream();
-        doc.save(pdfOut);
-        doc.close();
-
-        BufferedImage image = new BufferedImage(10, 10, BufferedImage.TYPE_INT_RGB);
-        Graphics2D g = image.createGraphics();
-        g.setColor(Color.RED);
-        g.fillRect(0, 0, 10, 10);
-        g.dispose();
-        ByteArrayOutputStream imgOut = new ByteArrayOutputStream();
-        javax.imageio.ImageIO.write(image, "png", imgOut);
-
-        PdfMetadataService meta =
-                new PdfMetadataService(new ApplicationProperties(), "label", false, null);
-        CustomPDFDocumentFactory factory = new CustomPDFDocumentFactory(meta);
-
-        byte[] result =
-                PdfUtils.overlayImage(
-                        factory, pdfOut.toByteArray(), imgOut.toByteArray(), 0, 0, false);
-        try (PDDocument resultDoc = factory.load(result)) {
-            assertEquals(1, resultDoc.getNumberOfPages());
-        }
-    }
-}

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

@@ -1,311 +0,0 @@
-package stirling.software.common.util;
-
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.params.ParameterizedTest;
-import org.junit.jupiter.params.provider.ValueSource;
-
-public class RequestUriUtilsTest {
-
-    @Test
-    void testIsStaticResource() {
-        // Test static resources without context path
-        assertTrue(
-                RequestUriUtils.isStaticResource("/css/styles.css"), "CSS files should be static");
-        assertTrue(RequestUriUtils.isStaticResource("/js/script.js"), "JS files should be static");
-        assertTrue(
-                RequestUriUtils.isStaticResource("/images/logo.png"),
-                "Image files should be static");
-        assertTrue(
-                RequestUriUtils.isStaticResource("/public/index.html"),
-                "Public files should be static");
-        assertTrue(
-                RequestUriUtils.isStaticResource("/pdfjs/pdf.worker.js"),
-                "PDF.js files should be static");
-        assertTrue(
-                RequestUriUtils.isStaticResource("/api/v1/info/status"),
-                "API status should be static");
-        assertTrue(
-                RequestUriUtils.isStaticResource("/some-path/icon.svg"),
-                "SVG files should be static");
-        assertTrue(RequestUriUtils.isStaticResource("/login"), "Login page should be static");
-        assertTrue(RequestUriUtils.isStaticResource("/error"), "Error page should be static");
-
-        // Test non-static resources
-        assertFalse(
-                RequestUriUtils.isStaticResource("/api/v1/users"),
-                "API users should not be static");
-        assertFalse(
-                RequestUriUtils.isStaticResource("/api/v1/orders"),
-                "API orders should not be static");
-        assertFalse(RequestUriUtils.isStaticResource("/"), "Root path should not be static");
-        assertFalse(
-                RequestUriUtils.isStaticResource("/register"),
-                "Register page should not be static");
-        assertFalse(
-                RequestUriUtils.isStaticResource("/api/v1/products"),
-                "API products should not be static");
-    }
-
-    @Test
-    void testIsStaticResourceWithContextPath() {
-        String contextPath = "/myapp";
-
-        // Test static resources with context path
-        assertTrue(
-                RequestUriUtils.isStaticResource(contextPath, contextPath + "/css/styles.css"),
-                "CSS with context path should be static");
-        assertTrue(
-                RequestUriUtils.isStaticResource(contextPath, contextPath + "/js/script.js"),
-                "JS with context path should be static");
-        assertTrue(
-                RequestUriUtils.isStaticResource(contextPath, contextPath + "/images/logo.png"),
-                "Images with context path should be static");
-        assertTrue(
-                RequestUriUtils.isStaticResource(contextPath, contextPath + "/login"),
-                "Login with context path should be static");
-
-        // Test non-static resources with context path
-        assertFalse(
-                RequestUriUtils.isStaticResource(contextPath, contextPath + "/api/v1/users"),
-                "API users with context path should not be static");
-        assertFalse(
-                RequestUriUtils.isStaticResource(contextPath, "/"),
-                "Root path with context path should not be static");
-    }
-
-    @ParameterizedTest
-    @ValueSource(
-            strings = {
-                "robots.txt",
-                "/favicon.ico",
-                "/icon.svg",
-                "/image.png",
-                "/site.webmanifest",
-                "/app/logo.svg",
-                "/downloads/document.png",
-                "/assets/brand.ico",
-                "/any/path/with/image.svg",
-                "/deep/nested/folder/icon.png"
-            })
-    void testIsStaticResourceWithFileExtensions(String path) {
-        assertTrue(
-                RequestUriUtils.isStaticResource(path),
-                "Files with specific extensions should be static regardless of path");
-    }
-
-    @Test
-    void testIsTrackableResource() {
-        // Test non-trackable resources (returns false)
-        assertFalse(
-                RequestUriUtils.isTrackableResource("/js/script.js"),
-                "JS files should not be trackable");
-        assertFalse(
-                RequestUriUtils.isTrackableResource("/v1/api-docs"),
-                "API docs should not be trackable");
-        assertFalse(
-                RequestUriUtils.isTrackableResource("robots.txt"),
-                "robots.txt should not be trackable");
-        assertFalse(
-                RequestUriUtils.isTrackableResource("/images/logo.png"),
-                "Images should not be trackable");
-        assertFalse(
-                RequestUriUtils.isTrackableResource("/styles.css"),
-                "CSS files should not be trackable");
-        assertFalse(
-                RequestUriUtils.isTrackableResource("/script.js.map"),
-                "Map files should not be trackable");
-        assertFalse(
-                RequestUriUtils.isTrackableResource("/icon.svg"),
-                "SVG files should not be trackable");
-        assertFalse(
-                RequestUriUtils.isTrackableResource("/popularity.txt"),
-                "Popularity file should not be trackable");
-        assertFalse(
-                RequestUriUtils.isTrackableResource("/script.js"),
-                "JS files should not be trackable");
-        assertFalse(
-                RequestUriUtils.isTrackableResource("/swagger/index.html"),
-                "Swagger files should not be trackable");
-        assertFalse(
-                RequestUriUtils.isTrackableResource("/api/v1/info/status"),
-                "API info should not be trackable");
-        assertFalse(
-                RequestUriUtils.isTrackableResource("/site.webmanifest"),
-                "Webmanifest should not be trackable");
-        assertFalse(
-                RequestUriUtils.isTrackableResource("/fonts/font.woff"),
-                "Fonts should not be trackable");
-        assertFalse(
-                RequestUriUtils.isTrackableResource("/pdfjs/viewer.js"),
-                "PDF.js files should not be trackable");
-
-        // Test trackable resources (returns true)
-        assertTrue(RequestUriUtils.isTrackableResource("/login"), "Login page should be trackable");
-        assertTrue(
-                RequestUriUtils.isTrackableResource("/register"),
-                "Register page should be trackable");
-        assertTrue(
-                RequestUriUtils.isTrackableResource("/api/v1/users"),
-                "API users should be trackable");
-        assertTrue(RequestUriUtils.isTrackableResource("/"), "Root path should be trackable");
-        assertTrue(
-                RequestUriUtils.isTrackableResource("/some-other-path"),
-                "Other paths should be trackable");
-    }
-
-    @Test
-    void testIsTrackableResourceWithContextPath() {
-        String contextPath = "/myapp";
-
-        // Test with context path
-        assertFalse(
-                RequestUriUtils.isTrackableResource(contextPath, "/js/script.js"),
-                "JS files should not be trackable with context path");
-        assertTrue(
-                RequestUriUtils.isTrackableResource(contextPath, "/login"),
-                "Login page should be trackable with context path");
-
-        // Additional tests with context path
-        assertFalse(
-                RequestUriUtils.isTrackableResource(contextPath, "/fonts/custom.woff"),
-                "Font files should not be trackable with context path");
-        assertFalse(
-                RequestUriUtils.isTrackableResource(contextPath, "/images/header.png"),
-                "Images should not be trackable with context path");
-        assertFalse(
-                RequestUriUtils.isTrackableResource(contextPath, "/swagger/ui.html"),
-                "Swagger UI should not be trackable with context path");
-        assertTrue(
-                RequestUriUtils.isTrackableResource(contextPath, "/account/profile"),
-                "Account page should be trackable with context path");
-        assertTrue(
-                RequestUriUtils.isTrackableResource(contextPath, "/pdf/view"),
-                "PDF view page should be trackable with context path");
-    }
-
-    @ParameterizedTest
-    @ValueSource(
-            strings = {
-                "/js/util.js",
-                "/v1/api-docs/swagger.json",
-                "/robots.txt",
-                "/images/header/logo.png",
-                "/styles/theme.css",
-                "/build/app.js.map",
-                "/assets/icon.svg",
-                "/data/popularity.txt",
-                "/bundle.js",
-                "/api/swagger-ui.html",
-                "/api/v1/info/health",
-                "/site.webmanifest",
-                "/fonts/roboto.woff",
-                "/pdfjs/viewer.js"
-            })
-    void testNonTrackableResources(String path) {
-        assertFalse(
-                RequestUriUtils.isTrackableResource(path),
-                "Resources matching patterns should not be trackable: " + path);
-    }
-
-    @ParameterizedTest
-    @ValueSource(
-            strings = {
-                "/",
-                "/home",
-                "/login",
-                "/register",
-                "/pdf/merge",
-                "/pdf/split",
-                "/api/v1/users/1",
-                "/api/v1/documents/process",
-                "/settings",
-                "/account/profile",
-                "/dashboard",
-                "/help",
-                "/about"
-            })
-    void testTrackableResources(String path) {
-        assertTrue(
-                RequestUriUtils.isTrackableResource(path),
-                "App routes should be trackable: " + path);
-    }
-
-    @Test
-    void testEdgeCases() {
-        // Test with empty strings
-        assertFalse(RequestUriUtils.isStaticResource("", ""), "Empty path should not be static");
-        assertTrue(RequestUriUtils.isTrackableResource("", ""), "Empty path should be trackable");
-
-        // Test with null-like behavior (would actually throw NPE in real code)
-        // These are not actual null tests but shows handling of odd cases
-        assertFalse(RequestUriUtils.isStaticResource("null"), "String 'null' should not be static");
-
-        // Test String "null" as a path
-        boolean isTrackable = RequestUriUtils.isTrackableResource("null");
-        assertTrue(isTrackable, "String 'null' should be trackable");
-
-        // Mixed case extensions test - note that Java's endsWith() is case-sensitive
-        // We'll check actual behavior and document it rather than asserting
-
-        // Always test the lowercase versions which should definitely work
-        assertTrue(
-                RequestUriUtils.isStaticResource("/logo.png"), "PNG (lowercase) should be static");
-        assertTrue(
-                RequestUriUtils.isStaticResource("/icon.svg"), "SVG (lowercase) should be static");
-
-        // Path with query parameters
-        assertFalse(
-                RequestUriUtils.isStaticResource("/api/users?page=1"),
-                "Path with query params should respect base path");
-        assertTrue(
-                RequestUriUtils.isStaticResource("/images/logo.png?v=123"),
-                "Static resource with query params should still be static");
-
-        // Paths with fragments
-        assertTrue(
-                RequestUriUtils.isStaticResource("/css/styles.css#section1"),
-                "CSS with fragment should be static");
-
-        // Multiple dots in filename
-        assertTrue(
-                RequestUriUtils.isStaticResource("/js/jquery.min.js"),
-                "JS with multiple dots should be static");
-
-        // Special characters in path
-        assertTrue(
-                RequestUriUtils.isStaticResource("/images/user's-photo.png"),
-                "Path with special chars should be handled correctly");
-    }
-
-    @Test
-    void testComplexPaths() {
-        // Test complex static resource paths
-        assertTrue(
-                RequestUriUtils.isStaticResource("/css/theme/dark/styles.css"),
-                "Nested CSS should be static");
-        assertTrue(
-                RequestUriUtils.isStaticResource("/fonts/open-sans/bold/font.woff"),
-                "Nested font should be static");
-        assertTrue(
-                RequestUriUtils.isStaticResource("/js/vendor/jquery/3.5.1/jquery.min.js"),
-                "Versioned JS should be static");
-
-        // Test complex paths with context
-        String contextPath = "/app";
-        assertTrue(
-                RequestUriUtils.isStaticResource(
-                        contextPath, contextPath + "/css/theme/dark/styles.css"),
-                "Nested CSS with context should be static");
-
-        // Test boundary cases for isTrackableResource
-        assertFalse(
-                RequestUriUtils.isTrackableResource("/js-framework/components"),
-                "Path starting with js- should not be treated as JS resource");
-        assertFalse(
-                RequestUriUtils.isTrackableResource("/fonts-selection"),
-                "Path starting with fonts- should not be treated as font resource");
-    }
-}

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

@@ -1,73 +0,0 @@
-package stirling.software.common.util;
-
-import static org.junit.jupiter.api.Assertions.*;
-import static org.mockito.Mockito.*;
-
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.springframework.context.ApplicationContext;
-
-class SpringContextHolderTest {
-
-    private ApplicationContext mockApplicationContext;
-    private SpringContextHolder contextHolder;
-
-    @BeforeEach
-    void setUp() {
-        mockApplicationContext = mock(ApplicationContext.class);
-        contextHolder = new SpringContextHolder();
-    }
-
-    @Test
-    void testSetApplicationContext() {
-        // Act
-        contextHolder.setApplicationContext(mockApplicationContext);
-        
-        // Assert
-        assertTrue(SpringContextHolder.isInitialized());
-    }
-
-    @Test
-    void testGetBean_ByType() {
-        // Arrange
-        contextHolder.setApplicationContext(mockApplicationContext);
-        TestBean expectedBean = new TestBean();
-        when(mockApplicationContext.getBean(TestBean.class)).thenReturn(expectedBean);
-        
-        // Act
-        TestBean result = SpringContextHolder.getBean(TestBean.class);
-        
-        // Assert
-        assertSame(expectedBean, result);
-        verify(mockApplicationContext).getBean(TestBean.class);
-    }
-
-
-    @Test
-    void testGetBean_ApplicationContextNotSet() {
-        // Don't set application context
-        
-        // Act
-        TestBean result = SpringContextHolder.getBean(TestBean.class);
-        
-        // Assert
-        assertNull(result);
-    }
-
-    @Test
-    void testGetBean_BeanNotFound() {
-        // Arrange
-        contextHolder.setApplicationContext(mockApplicationContext);
-        when(mockApplicationContext.getBean(TestBean.class)).thenThrow(new org.springframework.beans.BeansException("Bean not found") {});
-        
-        // Act
-        TestBean result = SpringContextHolder.getBean(TestBean.class);
-        
-        // Assert
-        assertNull(result);
-    }
-
-    // Simple test class
-    private static class TestBean {
-    }
-}

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

@@ -1,345 +0,0 @@
-package stirling.software.common.util;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertNull;
-import static org.mockito.ArgumentMatchers.anyInt;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.mockStatic;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import java.awt.Dimension;
-import java.awt.Font;
-import java.awt.Image;
-import java.awt.Insets;
-import java.awt.Toolkit;
-
-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;
-
-class UIScalingTest {
-
-    private MockedStatic<Toolkit> mockedToolkit;
-    private Toolkit mockedDefaultToolkit;
-
-    @BeforeEach
-    void setUp() {
-        // Set up mocking of Toolkit
-        mockedToolkit = mockStatic(Toolkit.class);
-        mockedDefaultToolkit = Mockito.mock(Toolkit.class);
-
-        // Return mocked toolkit when Toolkit.getDefaultToolkit() is called
-        mockedToolkit.when(Toolkit::getDefaultToolkit).thenReturn(mockedDefaultToolkit);
-    }
-
-    @AfterEach
-    void tearDown() {
-        if (mockedToolkit != null) {
-            mockedToolkit.close();
-        }
-    }
-
-    @Test
-    void testGetWidthScaleFactor() {
-        // Arrange
-        Dimension screenSize = new Dimension(3840, 2160); // 4K resolution
-        when(mockedDefaultToolkit.getScreenSize()).thenReturn(screenSize);
-
-        // Act
-        double scaleFactor = UIScaling.getWidthScaleFactor();
-
-        // Assert
-        assertEquals(2.0, scaleFactor, 0.001, "Scale factor should be 2.0 for 4K width");
-        verify(mockedDefaultToolkit, times(1)).getScreenSize();
-    }
-
-    @Test
-    void testGetHeightScaleFactor() {
-        // Arrange
-        Dimension screenSize = new Dimension(3840, 2160); // 4K resolution
-        when(mockedDefaultToolkit.getScreenSize()).thenReturn(screenSize);
-
-        // Act
-        double scaleFactor = UIScaling.getHeightScaleFactor();
-
-        // Assert
-        assertEquals(2.0, scaleFactor, 0.001, "Scale factor should be 2.0 for 4K height");
-        verify(mockedDefaultToolkit, times(1)).getScreenSize();
-    }
-
-    @Test
-    void testGetWidthScaleFactor_HD() {
-        // Arrange - HD resolution
-        Dimension screenSize = new Dimension(1920, 1080);
-        when(mockedDefaultToolkit.getScreenSize()).thenReturn(screenSize);
-
-        // Act
-        double scaleFactor = UIScaling.getWidthScaleFactor();
-
-        // Assert
-        assertEquals(1.0, scaleFactor, 0.001, "Scale factor should be 1.0 for HD width");
-    }
-
-    @Test
-    void testGetHeightScaleFactor_HD() {
-        // Arrange - HD resolution
-        Dimension screenSize = new Dimension(1920, 1080);
-        when(mockedDefaultToolkit.getScreenSize()).thenReturn(screenSize);
-
-        // Act
-        double scaleFactor = UIScaling.getHeightScaleFactor();
-
-        // Assert
-        assertEquals(1.0, scaleFactor, 0.001, "Scale factor should be 1.0 for HD height");
-    }
-
-    @Test
-    void testGetWidthScaleFactor_SmallScreen() {
-        // Arrange - Small screen
-        Dimension screenSize = new Dimension(1366, 768);
-        when(mockedDefaultToolkit.getScreenSize()).thenReturn(screenSize);
-
-        // Act
-        double scaleFactor = UIScaling.getWidthScaleFactor();
-
-        // Assert
-        assertEquals(0.711, scaleFactor, 0.001, "Scale factor should be ~0.711 for 1366x768 width");
-    }
-
-    @Test
-    void testGetHeightScaleFactor_SmallScreen() {
-        // Arrange - Small screen
-        Dimension screenSize = new Dimension(1366, 768);
-        when(mockedDefaultToolkit.getScreenSize()).thenReturn(screenSize);
-
-        // Act
-        double scaleFactor = UIScaling.getHeightScaleFactor();
-
-        // Assert
-        assertEquals(
-                0.711, scaleFactor, 0.001, "Scale factor should be ~0.711 for 1366x768 height");
-    }
-
-    @Test
-    void testScaleWidth() {
-        // Arrange
-        Dimension screenSize = new Dimension(3840, 2160); // 4K resolution
-        when(mockedDefaultToolkit.getScreenSize()).thenReturn(screenSize);
-
-        // Act
-        int scaledWidth = UIScaling.scaleWidth(100);
-
-        // Assert
-        assertEquals(200, scaledWidth, "Width should be scaled by factor of 2");
-    }
-
-    @Test
-    void testScaleHeight() {
-        // Arrange
-        Dimension screenSize = new Dimension(3840, 2160); // 4K resolution
-        when(mockedDefaultToolkit.getScreenSize()).thenReturn(screenSize);
-
-        // Act
-        int scaledHeight = UIScaling.scaleHeight(100);
-
-        // Assert
-        assertEquals(200, scaledHeight, "Height should be scaled by factor of 2");
-    }
-
-    @Test
-    void testScaleWidth_SmallScreen() {
-        // Arrange - Small screen
-        Dimension screenSize = new Dimension(960, 540); // Half of HD
-        when(mockedDefaultToolkit.getScreenSize()).thenReturn(screenSize);
-
-        // Act
-        int scaledWidth = UIScaling.scaleWidth(100);
-
-        // Assert
-        assertEquals(50, scaledWidth, "Width should be scaled by factor of 0.5");
-    }
-
-    @Test
-    void testScaleHeight_SmallScreen() {
-        // Arrange - Small screen
-        Dimension screenSize = new Dimension(960, 540); // Half of HD
-        when(mockedDefaultToolkit.getScreenSize()).thenReturn(screenSize);
-
-        // Act
-        int scaledHeight = UIScaling.scaleHeight(100);
-
-        // Assert
-        assertEquals(50, scaledHeight, "Height should be scaled by factor of 0.5");
-    }
-
-    @Test
-    void testScaleDimension() {
-        // Arrange
-        Dimension screenSize = new Dimension(3840, 2160); // 4K resolution
-        when(mockedDefaultToolkit.getScreenSize()).thenReturn(screenSize);
-        Dimension originalDim = new Dimension(200, 150);
-
-        // Act
-        Dimension scaledDim = UIScaling.scale(originalDim);
-
-        // Assert
-        assertEquals(400, scaledDim.width, "Width should be scaled by factor of 2");
-        assertEquals(300, scaledDim.height, "Height should be scaled by factor of 2");
-        // Verify the original dimension is not modified
-        assertEquals(200, originalDim.width, "Original width should remain unchanged");
-        assertEquals(150, originalDim.height, "Original height should remain unchanged");
-    }
-
-    @Test
-    void testScaleInsets() {
-        // Arrange
-        Dimension screenSize = new Dimension(3840, 2160); // 4K resolution
-        when(mockedDefaultToolkit.getScreenSize()).thenReturn(screenSize);
-        Insets originalInsets = new Insets(10, 20, 30, 40);
-
-        // Act
-        Insets scaledInsets = UIScaling.scale(originalInsets);
-
-        // Assert
-        assertEquals(20, scaledInsets.top, "Top inset should be scaled by factor of 2");
-        assertEquals(40, scaledInsets.left, "Left inset should be scaled by factor of 2");
-        assertEquals(60, scaledInsets.bottom, "Bottom inset should be scaled by factor of 2");
-        assertEquals(80, scaledInsets.right, "Right inset should be scaled by factor of 2");
-        // Verify the original insets are not modified
-        assertEquals(10, originalInsets.top, "Original top inset should remain unchanged");
-        assertEquals(20, originalInsets.left, "Original left inset should remain unchanged");
-        assertEquals(30, originalInsets.bottom, "Original bottom inset should remain unchanged");
-        assertEquals(40, originalInsets.right, "Original right inset should remain unchanged");
-    }
-
-    @Test
-    void testScaleFont() {
-        // Arrange
-        Dimension screenSize = new Dimension(3840, 2160); // 4K resolution
-        when(mockedDefaultToolkit.getScreenSize()).thenReturn(screenSize);
-        Font originalFont = new Font("Arial", Font.PLAIN, 12);
-
-        // Act
-        Font scaledFont = UIScaling.scaleFont(originalFont);
-
-        // Assert
-        assertEquals(
-                24.0f, scaledFont.getSize2D(), 0.001f, "Font size should be scaled by factor of 2");
-        // Font family might be substituted by the system, so we don't test it
-        assertEquals(Font.PLAIN, scaledFont.getStyle(), "Font style should remain unchanged");
-    }
-
-    @Test
-    void testScaleFont_DifferentWidthHeightScales() {
-        // Arrange - Different width and height scaling factors
-        Dimension screenSize =
-                new Dimension(2560, 1440); // 1.33x width, 1.33x height of base resolution
-        when(mockedDefaultToolkit.getScreenSize()).thenReturn(screenSize);
-        Font originalFont = new Font("Arial", Font.PLAIN, 12);
-
-        // Act
-        Font scaledFont = UIScaling.scaleFont(originalFont);
-
-        // Assert
-        // Should use the smaller of the two scale factors, which is the same in this case
-        assertEquals(
-                16.0f,
-                scaledFont.getSize2D(),
-                0.001f,
-                "Font size should be scaled by factor of 1.33");
-    }
-
-    @Test
-    void testScaleFont_UnevenScales() {
-        // Arrange - different width and height scale factors
-        Dimension screenSize = new Dimension(3840, 1080); // 2x width, 1x height
-        when(mockedDefaultToolkit.getScreenSize()).thenReturn(screenSize);
-        Font originalFont = new Font("Arial", Font.PLAIN, 12);
-
-        // Act
-        Font scaledFont = UIScaling.scaleFont(originalFont);
-
-        // Assert - should use the smaller of the two scale factors (height in this case)
-        assertEquals(
-                12.0f,
-                scaledFont.getSize2D(),
-                0.001f,
-                "Font size should be scaled by the smaller factor (1.0)");
-    }
-
-    @Test
-    void testScaleIcon_NullIcon() {
-        // Act
-        Image result = UIScaling.scaleIcon(null, 100, 100);
-
-        // Assert
-        assertNull(result, "Should return null for null input");
-    }
-
-    @Test
-    void testScaleIcon_SquareImage() {
-        // Arrange
-        Dimension screenSize = new Dimension(3840, 2160); // 4K resolution
-        when(mockedDefaultToolkit.getScreenSize()).thenReturn(screenSize);
-
-        // Create a mock square image
-        Image mockImage = Mockito.mock(Image.class);
-        when(mockImage.getWidth(null)).thenReturn(100);
-        when(mockImage.getHeight(null)).thenReturn(100);
-        when(mockImage.getScaledInstance(anyInt(), anyInt(), anyInt())).thenReturn(mockImage);
-
-        // Act
-        Image result = UIScaling.scaleIcon(mockImage, 100, 100);
-
-        // Assert
-        assertNotNull(result, "Should return a non-null result");
-        verify(mockImage).getScaledInstance(eq(200), eq(200), eq(Image.SCALE_SMOOTH));
-    }
-
-    @Test
-    void testScaleIcon_WideImage() {
-        // Arrange
-        Dimension screenSize = new Dimension(3840, 2160); // 4K resolution
-        when(mockedDefaultToolkit.getScreenSize()).thenReturn(screenSize);
-
-        // Create a mock image with a 2:1 aspect ratio (wide)
-        Image mockImage = Mockito.mock(Image.class);
-        when(mockImage.getWidth(null)).thenReturn(200);
-        when(mockImage.getHeight(null)).thenReturn(100);
-        when(mockImage.getScaledInstance(anyInt(), anyInt(), anyInt())).thenReturn(mockImage);
-
-        // Act
-        Image result = UIScaling.scaleIcon(mockImage, 100, 100);
-
-        // Assert
-        assertNotNull(result, "Should return a non-null result");
-        // For a wide image (2:1), the width should be twice the height to maintain aspect ratio
-        verify(mockImage).getScaledInstance(anyInt(), anyInt(), eq(Image.SCALE_SMOOTH));
-    }
-
-    @Test
-    void testScaleIcon_TallImage() {
-        // Arrange
-        Dimension screenSize = new Dimension(3840, 2160); // 4K resolution
-        when(mockedDefaultToolkit.getScreenSize()).thenReturn(screenSize);
-
-        // Create a mock image with a 1:2 aspect ratio (tall)
-        Image mockImage = Mockito.mock(Image.class);
-        when(mockImage.getWidth(null)).thenReturn(100);
-        when(mockImage.getHeight(null)).thenReturn(200);
-        when(mockImage.getScaledInstance(anyInt(), anyInt(), anyInt())).thenReturn(mockImage);
-
-        // Act
-        Image result = UIScaling.scaleIcon(mockImage, 100, 100);
-
-        // Assert
-        assertNotNull(result, "Should return a non-null result");
-        // For a tall image (1:2), the height should be twice the width to maintain aspect ratio
-        verify(mockImage).getScaledInstance(anyInt(), anyInt(), eq(Image.SCALE_SMOOTH));
-    }
-}

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

@@ -1,279 +0,0 @@
-package stirling.software.common.util;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertNotEquals;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.mockito.Mockito.when;
-
-import java.io.IOException;
-import java.net.ServerSocket;
-
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
-import org.mockito.Mock;
-import org.mockito.junit.jupiter.MockitoExtension;
-
-import jakarta.servlet.http.HttpServletRequest;
-
-@ExtendWith(MockitoExtension.class)
-class UrlUtilsTest {
-
-    @Mock private HttpServletRequest request;
-
-    @Test
-    void testGetOrigin() {
-        // Arrange
-        when(request.getScheme()).thenReturn("http");
-        when(request.getServerName()).thenReturn("localhost");
-        when(request.getServerPort()).thenReturn(8080);
-        when(request.getContextPath()).thenReturn("/myapp");
-
-        // Act
-        String origin = UrlUtils.getOrigin(request);
-
-        // Assert
-        assertEquals(
-                "http://localhost:8080/myapp", origin, "Origin URL should be correctly formatted");
-    }
-
-    @Test
-    void testGetOriginWithHttps() {
-        // Arrange
-        when(request.getScheme()).thenReturn("https");
-        when(request.getServerName()).thenReturn("example.com");
-        when(request.getServerPort()).thenReturn(443);
-        when(request.getContextPath()).thenReturn("");
-
-        // Act
-        String origin = UrlUtils.getOrigin(request);
-
-        // Assert
-        assertEquals(
-                "https://example.com:443",
-                origin,
-                "HTTPS origin URL should be correctly formatted");
-    }
-
-    @Test
-    void testGetOriginWithEmptyContextPath() {
-        // Arrange
-        when(request.getScheme()).thenReturn("http");
-        when(request.getServerName()).thenReturn("localhost");
-        when(request.getServerPort()).thenReturn(8080);
-        when(request.getContextPath()).thenReturn("");
-
-        // Act
-        String origin = UrlUtils.getOrigin(request);
-
-        // Assert
-        assertEquals(
-                "http://localhost:8080",
-                origin,
-                "Origin URL with empty context path should be correct");
-    }
-
-    @Test
-    void testGetOriginWithSpecialCharacters() {
-        // Arrange - Test with server name containing special characters
-        when(request.getScheme()).thenReturn("https");
-        when(request.getServerName()).thenReturn("internal-server.example-domain.com");
-        when(request.getServerPort()).thenReturn(8443);
-        when(request.getContextPath()).thenReturn("/app-v1.2");
-
-        // Act
-        String origin = UrlUtils.getOrigin(request);
-
-        // Assert
-        assertEquals(
-                "https://internal-server.example-domain.com:8443/app-v1.2",
-                origin,
-                "Origin URL with special characters should be correctly formatted");
-    }
-
-    @Test
-    void testGetOriginWithIPv4Address() {
-        // Arrange
-        when(request.getScheme()).thenReturn("http");
-        when(request.getServerName()).thenReturn("192.168.1.100");
-        when(request.getServerPort()).thenReturn(8080);
-        when(request.getContextPath()).thenReturn("/app");
-
-        // Act
-        String origin = UrlUtils.getOrigin(request);
-
-        // Assert
-        assertEquals(
-                "http://192.168.1.100:8080/app",
-                origin,
-                "Origin URL with IPv4 address should be correctly formatted");
-    }
-
-    @Test
-    void testGetOriginWithNonStandardPort() {
-        // Arrange
-        when(request.getScheme()).thenReturn("https");
-        when(request.getServerName()).thenReturn("example.org");
-        when(request.getServerPort()).thenReturn(8443);
-        when(request.getContextPath()).thenReturn("/api");
-
-        // Act
-        String origin = UrlUtils.getOrigin(request);
-
-        // Assert
-        assertEquals(
-                "https://example.org:8443/api",
-                origin,
-                "Origin URL with non-standard port should be correctly formatted");
-    }
-
-    @Test
-    void testIsPortAvailable() {
-        // We'll use a real server socket for this test
-        ServerSocket socket = null;
-        int port = 12345; // Choose a port unlikely to be in use
-
-        try {
-            // First check the port is available
-            boolean initialAvailability = UrlUtils.isPortAvailable(port);
-
-            // Then occupy the port
-            socket = new ServerSocket(port);
-
-            // Now check the port is no longer available
-            boolean afterSocketCreation = UrlUtils.isPortAvailable(port);
-
-            // Assert
-            assertTrue(initialAvailability, "Port should be available initially");
-            assertFalse(
-                    afterSocketCreation, "Port should not be available after socket is created");
-
-        } catch (IOException e) {
-            // This might happen if the port is already in use by another process
-            // We'll just verify the behavior of isPortAvailable matches what we expect
-            assertFalse(
-                    UrlUtils.isPortAvailable(port),
-                    "Port should not be available if exception is thrown");
-        } finally {
-            if (socket != null && !socket.isClosed()) {
-                try {
-                    socket.close();
-                } catch (IOException e) {
-                    // Ignore cleanup exceptions
-                }
-            }
-        }
-    }
-
-    @Test
-    void testFindAvailablePort() {
-        // We'll create a socket on a port and ensure findAvailablePort returns a different port
-        ServerSocket socket = null;
-        int startPort = 12346; // Choose a port unlikely to be in use
-
-        try {
-            // Occupy the start port
-            socket = new ServerSocket(startPort);
-
-            // Find an available port
-            String availablePort = UrlUtils.findAvailablePort(startPort);
-
-            // Assert the returned port is not the occupied one
-            assertNotEquals(
-                    String.valueOf(startPort),
-                    availablePort,
-                    "findAvailablePort should not return an occupied port");
-
-            // Verify the returned port is actually available
-            int portNumber = Integer.parseInt(availablePort);
-
-            // Close our test socket before checking the found port
-            socket.close();
-            socket = null;
-
-            // The port should now be available
-            assertTrue(
-                    UrlUtils.isPortAvailable(portNumber),
-                    "The port returned by findAvailablePort should be available");
-
-        } catch (IOException e) {
-            // If we can't create the socket, skip this assertion
-        } finally {
-            if (socket != null && !socket.isClosed()) {
-                try {
-                    socket.close();
-                } catch (IOException e) {
-                    // Ignore cleanup exceptions
-                }
-            }
-        }
-    }
-
-    @Test
-    void testFindAvailablePortWithAvailableStartPort() {
-        // Find an available port without occupying any
-        int startPort = 23456; // Choose a different unlikely-to-be-used port
-
-        // Make sure the port is available first
-        if (UrlUtils.isPortAvailable(startPort)) {
-            // Find an available port
-            String availablePort = UrlUtils.findAvailablePort(startPort);
-
-            // Assert the returned port is the start port since it's available
-            assertEquals(
-                    String.valueOf(startPort),
-                    availablePort,
-                    "findAvailablePort should return the start port if it's available");
-        }
-    }
-
-    @Test
-    void testFindAvailablePortWithSequentialUsedPorts() {
-        // This test checks that findAvailablePort correctly skips multiple occupied ports
-        ServerSocket socket1 = null;
-        ServerSocket socket2 = null;
-        int startPort = 34567; // Another unlikely-to-be-used port
-
-        try {
-            // First verify the port is available
-            if (!UrlUtils.isPortAvailable(startPort)) {
-                return;
-            }
-
-            // Occupy two sequential ports
-            socket1 = new ServerSocket(startPort);
-            socket2 = new ServerSocket(startPort + 1);
-
-            // Find an available port starting from our occupied range
-            String availablePort = UrlUtils.findAvailablePort(startPort);
-            int foundPort = Integer.parseInt(availablePort);
-
-            // Should have skipped the two occupied ports
-            assertTrue(
-                    foundPort >= startPort + 2,
-                    "findAvailablePort should skip sequential occupied ports");
-
-            // Verify the found port is actually available
-            try (ServerSocket testSocket = new ServerSocket(foundPort)) {
-                assertTrue(testSocket.isBound(), "The found port should be bindable");
-            }
-
-        } catch (IOException e) {
-            // Skip test if we encounter IO exceptions
-        } finally {
-            // Clean up resources
-            try {
-                if (socket1 != null && !socket1.isClosed()) socket1.close();
-                if (socket2 != null && !socket2.isClosed()) socket2.close();
-            } catch (IOException e) {
-                // Ignore cleanup exceptions
-            }
-        }
-    }
-
-    @Test
-    void testIsPortAvailableWithPrivilegedPorts() {
-        // Skip tests for privileged ports as they typically require root access
-        // and results are environment-dependent
-    }
-}

common/src/test/java/stirling/software/common/util/misc/CustomColorReplaceStrategyTest.java

@@ -1,108 +0,0 @@
-package stirling.software.common.util.misc;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-
-import java.io.IOException;
-import java.lang.reflect.Method;
-
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.springframework.mock.web.MockMultipartFile;
-import org.springframework.web.multipart.MultipartFile;
-
-import stirling.software.common.model.api.misc.HighContrastColorCombination;
-import stirling.software.common.model.api.misc.ReplaceAndInvert;
-
-class CustomColorReplaceStrategyTest {
-
-    private CustomColorReplaceStrategy strategy;
-    private MultipartFile mockFile;
-
-    @BeforeEach
-    void setUp() {
-        // Create a mock file
-        mockFile =
-                new MockMultipartFile(
-                        "file", "test.pdf", "application/pdf", "test pdf content".getBytes());
-
-        // Initialize strategy with custom colors
-        strategy =
-                new CustomColorReplaceStrategy(
-                        mockFile,
-                        ReplaceAndInvert.CUSTOM_COLOR,
-                        "000000", // Black text color
-                        "FFFFFF", // White background color
-                        null); // Not using high contrast combination for CUSTOM_COLOR
-    }
-
-    @Test
-    void testConstructor() {
-        // Test the constructor sets values correctly
-        assertNotNull(strategy, "Strategy should be initialized");
-        assertEquals(mockFile, strategy.getFileInput(), "File input should be set correctly");
-        assertEquals(
-                ReplaceAndInvert.CUSTOM_COLOR,
-                strategy.getReplaceAndInvert(),
-                "ReplaceAndInvert should be set correctly");
-    }
-
-    @Test
-    void testCheckSupportedFontForCharacter() throws Exception {
-        // Use reflection to access private method
-        Method method =
-                CustomColorReplaceStrategy.class.getDeclaredMethod(
-                        "checkSupportedFontForCharacter", String.class);
-        method.setAccessible(true);
-
-        // Test with ASCII character which should be supported by standard fonts
-        Object result = method.invoke(strategy, "A");
-        assertNotNull(result, "Standard font should support ASCII character");
-    }
-
-    @Test
-    void testHighContrastColors() {
-        // Create a new strategy with HIGH_CONTRAST_COLOR setting
-        CustomColorReplaceStrategy highContrastStrategy =
-                new CustomColorReplaceStrategy(
-                        mockFile,
-                        ReplaceAndInvert.HIGH_CONTRAST_COLOR,
-                        null, // These will be overridden by the high contrast settings
-                        null,
-                        HighContrastColorCombination.BLACK_TEXT_ON_WHITE);
-
-        // Verify the colors after replace() is called
-        try {
-            // Call replace (but we don't need the actual result for this test)
-            // This will throw IOException because we're using a mock file without actual PDF
-            // content
-            // but it will still set the colors according to the high contrast setting
-            try {
-                highContrastStrategy.replace();
-            } catch (IOException e) {
-                // Expected exception due to mock file
-            }
-
-            // Use reflection to access private fields
-            java.lang.reflect.Field textColorField =
-                    CustomColorReplaceStrategy.class.getDeclaredField("textColor");
-            textColorField.setAccessible(true);
-            java.lang.reflect.Field backgroundColorField =
-                    CustomColorReplaceStrategy.class.getDeclaredField("backgroundColor");
-            backgroundColorField.setAccessible(true);
-
-            String textColor = (String) textColorField.get(highContrastStrategy);
-            String backgroundColor = (String) backgroundColorField.get(highContrastStrategy);
-
-            // For BLACK_TEXT_ON_WHITE, text color should be "0" and background color should be
-            // "16777215"
-            assertEquals("0", textColor, "Text color should be black (0)");
-            assertEquals(
-                    "16777215", backgroundColor, "Background color should be white (16777215)");
-
-        } catch (Exception e) {
-            // If we get here, the test failed
-            org.junit.jupiter.api.Assertions.fail("Exception occurred: " + e.getMessage());
-        }
-    }
-}

common/src/test/java/stirling/software/common/util/misc/HighContrastColorReplaceDeciderTest.java

@@ -1,109 +0,0 @@
-package stirling.software.common.util.misc;
-
-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 {
-
-    @Test
-    void testGetColors_BlackTextOnWhite() {
-        // Arrange
-        ReplaceAndInvert replaceAndInvert = ReplaceAndInvert.HIGH_CONTRAST_COLOR;
-        HighContrastColorCombination combination = HighContrastColorCombination.BLACK_TEXT_ON_WHITE;
-
-        // Act
-        String[] colors = HighContrastColorReplaceDecider.getColors(replaceAndInvert, combination);
-
-        // Assert
-        assertArrayEquals(
-                new String[] {"0", "16777215"},
-                colors,
-                "Should return black (0) for text and white (16777215) for background");
-    }
-
-    @Test
-    void testGetColors_GreenTextOnBlack() {
-        // Arrange
-        ReplaceAndInvert replaceAndInvert = ReplaceAndInvert.HIGH_CONTRAST_COLOR;
-        HighContrastColorCombination combination = HighContrastColorCombination.GREEN_TEXT_ON_BLACK;
-
-        // Act
-        String[] colors = HighContrastColorReplaceDecider.getColors(replaceAndInvert, combination);
-
-        // Assert
-        assertArrayEquals(
-                new String[] {"65280", "0"},
-                colors,
-                "Should return green (65280) for text and black (0) for background");
-    }
-
-    @Test
-    void testGetColors_WhiteTextOnBlack() {
-        // Arrange
-        ReplaceAndInvert replaceAndInvert = ReplaceAndInvert.HIGH_CONTRAST_COLOR;
-        HighContrastColorCombination combination = HighContrastColorCombination.WHITE_TEXT_ON_BLACK;
-
-        // Act
-        String[] colors = HighContrastColorReplaceDecider.getColors(replaceAndInvert, combination);
-
-        // Assert
-        assertArrayEquals(
-                new String[] {"16777215", "0"},
-                colors,
-                "Should return white (16777215) for text and black (0) for background");
-    }
-
-    @Test
-    void testGetColors_YellowTextOnBlack() {
-        // Arrange
-        ReplaceAndInvert replaceAndInvert = ReplaceAndInvert.HIGH_CONTRAST_COLOR;
-        HighContrastColorCombination combination =
-                HighContrastColorCombination.YELLOW_TEXT_ON_BLACK;
-
-        // Act
-        String[] colors = HighContrastColorReplaceDecider.getColors(replaceAndInvert, combination);
-
-        // Assert
-        assertArrayEquals(
-                new String[] {"16776960", "0"},
-                colors,
-                "Should return yellow (16776960) for text and black (0) for background");
-    }
-
-    @Test
-    void testGetColors_NullForInvalidCombination() {
-        // Arrange - use null for combination
-        ReplaceAndInvert replaceAndInvert = ReplaceAndInvert.HIGH_CONTRAST_COLOR;
-
-        // Act
-        String[] colors = HighContrastColorReplaceDecider.getColors(replaceAndInvert, null);
-
-        // Assert
-        assertNull(colors, "Should return null for invalid combination");
-    }
-
-    @Test
-    void testGetColors_ReplaceAndInvertParameterIsIgnored() {
-        // Arrange - use different ReplaceAndInvert values with the same combination
-        HighContrastColorCombination combination = HighContrastColorCombination.BLACK_TEXT_ON_WHITE;
-
-        // Act
-        String[] colors1 =
-                HighContrastColorReplaceDecider.getColors(
-                        ReplaceAndInvert.HIGH_CONTRAST_COLOR, combination);
-        String[] colors2 =
-                HighContrastColorReplaceDecider.getColors(
-                        ReplaceAndInvert.CUSTOM_COLOR, combination);
-        String[] colors3 =
-                HighContrastColorReplaceDecider.getColors(
-                        ReplaceAndInvert.FULL_INVERSION, combination);
-
-        // Assert - all should return the same colors, showing that the ReplaceAndInvert parameter
-        // isn't used
-        assertArrayEquals(colors1, colors2, "ReplaceAndInvert parameter should be ignored");
-        assertArrayEquals(colors1, colors3, "ReplaceAndInvert parameter should be ignored");
-    }
-}

common/src/test/java/stirling/software/common/util/misc/InvertFullColorStrategyTest.java

@@ -1,152 +0,0 @@
-package stirling.software.common.util.misc;
-
-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 java.awt.Color;
-import java.awt.image.BufferedImage;
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.IOException;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.nio.file.Files;
-
-import javax.imageio.ImageIO;
-
-import org.apache.pdfbox.pdmodel.PDDocument;
-import org.apache.pdfbox.pdmodel.PDPage;
-import org.apache.pdfbox.pdmodel.PDPageContentStream;
-import org.apache.pdfbox.pdmodel.common.PDRectangle;
-import org.apache.pdfbox.pdmodel.graphics.color.PDColor;
-import org.apache.pdfbox.pdmodel.graphics.color.PDDeviceRGB;
-import org.junit.jupiter.api.BeforeEach;
-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 {
-
-    private InvertFullColorStrategy strategy;
-    private MultipartFile mockPdfFile;
-
-    @BeforeEach
-    void setUp() throws Exception {
-        // Create a simple PDF document for testing
-        byte[] pdfBytes = createSimplePdfWithRectangle();
-        mockPdfFile = new MockMultipartFile("file", "test.pdf", "application/pdf", pdfBytes);
-
-        // Create the strategy instance
-        strategy = new InvertFullColorStrategy(mockPdfFile, ReplaceAndInvert.FULL_INVERSION);
-    }
-
-    /** Helper method to create a simple PDF with a colored rectangle for testing */
-    private byte[] createSimplePdfWithRectangle() throws IOException {
-        PDDocument document = new PDDocument();
-        PDPage page = new PDPage(PDRectangle.A4);
-        document.addPage(page);
-
-        // Add a filled rectangle with a specific color
-        PDPageContentStream contentStream = new PDPageContentStream(document, page);
-        contentStream.setNonStrokingColor(
-                new PDColor(new float[] {0.8f, 0.2f, 0.2f}, PDDeviceRGB.INSTANCE));
-        contentStream.addRect(100, 100, 400, 400);
-        contentStream.fill();
-        contentStream.close();
-
-        ByteArrayOutputStream baos = new ByteArrayOutputStream();
-        document.save(baos);
-        document.close();
-
-        return baos.toByteArray();
-    }
-
-    @Test
-    void testReplace() throws IOException {
-        // Test the replace method
-        InputStreamResource result = strategy.replace();
-
-        // Verify that the result is not null
-        assertNotNull(result, "The result should not be null");
-    }
-
-    @Test
-    void testInvertImageColors()
-            throws NoSuchMethodException, InvocationTargetException, IllegalAccessException {
-        // Create a test image with known colors
-        BufferedImage image = new BufferedImage(10, 10, BufferedImage.TYPE_INT_ARGB);
-        java.awt.Graphics graphics = image.getGraphics();
-        graphics.setColor(new Color(200, 100, 50)); // RGB color to be inverted
-        graphics.fillRect(0, 0, 10, 10);
-        graphics.dispose();
-
-        // Get the color of a pixel before inversion
-        Color originalColor = new Color(image.getRGB(5, 5), true);
-
-        // Access private method using reflection
-        Method invertMethodRef =
-                InvertFullColorStrategy.class.getDeclaredMethod(
-                        "invertImageColors", BufferedImage.class);
-        invertMethodRef.setAccessible(true);
-
-        // Invoke the private method
-        invertMethodRef.invoke(strategy, image);
-
-        // Get the color of the same pixel after inversion
-        Color invertedColor = new Color(image.getRGB(5, 5), true);
-
-        // Assert that the inversion worked correctly
-        assertEquals(
-                255 - originalColor.getRed(),
-                invertedColor.getRed(),
-                "Red channel should be inverted");
-        assertEquals(
-                255 - originalColor.getGreen(),
-                invertedColor.getGreen(),
-                "Green channel should be inverted");
-        assertEquals(
-                255 - originalColor.getBlue(),
-                invertedColor.getBlue(),
-                "Blue channel should be inverted");
-    }
-
-    @Test
-    void testConvertToBufferedImageTpFile()
-            throws NoSuchMethodException,
-                    InvocationTargetException,
-                    IllegalAccessException,
-                    IOException {
-        // Create a test image
-        BufferedImage image = new BufferedImage(10, 10, BufferedImage.TYPE_INT_ARGB);
-
-        // Access private method using reflection
-        Method convertMethodRef =
-                InvertFullColorStrategy.class.getDeclaredMethod(
-                        "convertToBufferedImageTpFile", BufferedImage.class);
-        convertMethodRef.setAccessible(true);
-
-        // Invoke the private method
-        File result = (File) convertMethodRef.invoke(strategy, image);
-
-        try {
-            // Assert that the file exists and is not empty
-            assertNotNull(result, "Result should not be null");
-            assertTrue(result.exists(), "File should exist");
-            assertTrue(result.length() > 0, "File should not be empty");
-
-            // Check that the file can be read back as an image
-            BufferedImage readBack = ImageIO.read(result);
-            assertNotNull(readBack, "Should be able to read back the image");
-            assertEquals(10, readBack.getWidth(), "Image width should match");
-            assertEquals(10, readBack.getHeight(), "Image height should match");
-        } finally {
-            // Clean up
-            if (result != null && result.exists()) {
-                Files.delete(result.toPath());
-            }
-        }
-    }
-}

common/src/test/java/stirling/software/common/util/misc/PdfTextStripperCustomTest.java

@@ -1,56 +0,0 @@
-package stirling.software.common.util.misc;
-
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
-import java.io.IOException;
-
-import org.apache.pdfbox.pdmodel.PDPage;
-import org.apache.pdfbox.pdmodel.common.PDRectangle;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-
-class PdfTextStripperCustomTest {
-
-    private PdfTextStripperCustom stripper;
-    private PDPage mockPage;
-    private PDRectangle mockMediaBox;
-
-    @BeforeEach
-    void setUp() throws IOException {
-        // Create the stripper instance
-        stripper = new PdfTextStripperCustom();
-
-        // Create mock objects
-        mockPage = mock(PDPage.class);
-        mockMediaBox = mock(PDRectangle.class);
-
-        // Configure mock behavior
-        when(mockPage.getMediaBox()).thenReturn(mockMediaBox);
-        when(mockMediaBox.getLowerLeftX()).thenReturn(0f);
-        when(mockMediaBox.getLowerLeftY()).thenReturn(0f);
-        when(mockMediaBox.getWidth()).thenReturn(612f);
-        when(mockMediaBox.getHeight()).thenReturn(792f);
-    }
-
-    @Test
-    void testConstructor() throws IOException {
-        // Verify that constructor doesn't throw an exception
-        PdfTextStripperCustom newStripper = new PdfTextStripperCustom();
-        assertNotNull(newStripper, "Constructor should create a non-null instance");
-    }
-
-    @Test
-    void testBasicFunctionality() throws IOException {
-        // Simply test that the method runs without exceptions
-        try {
-            stripper.addRegion("testRegion", new java.awt.geom.Rectangle2D.Float(0, 0, 100, 100));
-            stripper.extractRegions(mockPage);
-            assertTrue(true, "Should execute without errors");
-        } catch (Exception e) {
-            assertTrue(false, "Method should not throw exception: " + e.getMessage());
-        }
-    }
-}

common/src/test/java/stirling/software/common/util/misc/ReplaceAndInvertColorStrategyTest.java

@@ -1,97 +0,0 @@
-package stirling.software.common.util.misc;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-
-import java.io.IOException;
-
-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 {
-
-    // A concrete implementation of the abstract class for testing
-    private static class ConcreteReplaceAndInvertColorStrategy
-            extends ReplaceAndInvertColorStrategy {
-
-        public ConcreteReplaceAndInvertColorStrategy(
-                MultipartFile file, ReplaceAndInvert replaceAndInvert) {
-            super(file, replaceAndInvert);
-        }
-
-        @Override
-        public InputStreamResource replace() throws IOException {
-            // Simple implementation for testing purposes
-            return new InputStreamResource(getFileInput().getInputStream());
-        }
-    }
-
-    @Test
-    void testConstructor() {
-        // Arrange
-        MultipartFile mockFile =
-                new MockMultipartFile(
-                        "file", "test.pdf", "application/pdf", "test content".getBytes());
-        ReplaceAndInvert replaceAndInvert = ReplaceAndInvert.CUSTOM_COLOR;
-
-        // Act
-        ReplaceAndInvertColorStrategy strategy =
-                new ConcreteReplaceAndInvertColorStrategy(mockFile, replaceAndInvert);
-
-        // Assert
-        assertNotNull(strategy, "Strategy should be initialized");
-        assertEquals(mockFile, strategy.getFileInput(), "File input should be set correctly");
-        assertEquals(
-                replaceAndInvert,
-                strategy.getReplaceAndInvert(),
-                "ReplaceAndInvert option should be set correctly");
-    }
-
-    @Test
-    void testReplace() throws IOException {
-        // Arrange
-        byte[] content = "test pdf content".getBytes();
-        MultipartFile mockFile =
-                new MockMultipartFile("file", "test.pdf", "application/pdf", content);
-        ReplaceAndInvert replaceAndInvert = ReplaceAndInvert.CUSTOM_COLOR;
-
-        ReplaceAndInvertColorStrategy strategy =
-                new ConcreteReplaceAndInvertColorStrategy(mockFile, replaceAndInvert);
-
-        // Act
-        InputStreamResource result = strategy.replace();
-
-        // Assert
-        assertNotNull(result, "Result should not be null");
-    }
-
-    @Test
-    void testGettersAndSetters() {
-        // Arrange
-        MultipartFile mockFile1 =
-                new MockMultipartFile(
-                        "file1", "test1.pdf", "application/pdf", "content1".getBytes());
-        MultipartFile mockFile2 =
-                new MockMultipartFile(
-                        "file2", "test2.pdf", "application/pdf", "content2".getBytes());
-
-        // Act
-        ReplaceAndInvertColorStrategy strategy =
-                new ConcreteReplaceAndInvertColorStrategy(mockFile1, ReplaceAndInvert.CUSTOM_COLOR);
-
-        // Test initial values
-        assertEquals(mockFile1, strategy.getFileInput());
-        assertEquals(ReplaceAndInvert.CUSTOM_COLOR, strategy.getReplaceAndInvert());
-
-        // Test setters
-        strategy.setFileInput(mockFile2);
-        strategy.setReplaceAndInvert(ReplaceAndInvert.FULL_INVERSION);
-
-        // Assert new values
-        assertEquals(mockFile2, strategy.getFileInput());
-        assertEquals(ReplaceAndInvert.FULL_INVERSION, strategy.getReplaceAndInvert());
-    }
-}

common/src/test/java/stirling/software/common/util/propertyeditor/StringToArrayListPropertyEditorTest.java

@@ -1,153 +0,0 @@
-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;
-
-class StringToArrayListPropertyEditorTest {
-
-    private StringToArrayListPropertyEditor editor;
-
-    @BeforeEach
-    void setUp() {
-        editor = new StringToArrayListPropertyEditor();
-    }
-
-    @Test
-    void testSetAsText_ValidJson() {
-        // Arrange
-        String json =
-                "[{\"x\":10.5,\"y\":20.5,\"width\":100.0,\"height\":50.0,\"page\":1,\"color\":\"#FF0000\"}]";
-
-        // Act
-        editor.setAsText(json);
-        Object value = editor.getValue();
-
-        // Assert
-        assertNotNull(value, "Value should not be null");
-        assertTrue(value instanceof List, "Value should be a List");
-
-        @SuppressWarnings("unchecked")
-        List<RedactionArea> list = (List<RedactionArea>) value;
-        assertEquals(1, list.size(), "List should have 1 entry");
-
-        RedactionArea area = list.get(0);
-        assertEquals(10.5, area.getX(), "X should be 10.5");
-        assertEquals(20.5, area.getY(), "Y should be 20.5");
-        assertEquals(100.0, area.getWidth(), "Width should be 100.0");
-        assertEquals(50.0, area.getHeight(), "Height should be 50.0");
-        assertEquals(1, area.getPage(), "Page should be 1");
-        assertEquals("#FF0000", area.getColor(), "Color should be #FF0000");
-    }
-
-    @Test
-    void testSetAsText_MultipleItems() {
-        // Arrange
-        String json =
-                "["
-                        + "{\"x\":10.0,\"y\":20.0,\"width\":100.0,\"height\":50.0,\"page\":1,\"color\":\"#FF0000\"},"
-                        + "{\"x\":30.0,\"y\":40.0,\"width\":200.0,\"height\":150.0,\"page\":2,\"color\":\"#00FF00\"}"
-                        + "]";
-
-        // Act
-        editor.setAsText(json);
-        Object value = editor.getValue();
-
-        // Assert
-        assertNotNull(value, "Value should not be null");
-        assertTrue(value instanceof List, "Value should be a List");
-
-        @SuppressWarnings("unchecked")
-        List<RedactionArea> list = (List<RedactionArea>) value;
-        assertEquals(2, list.size(), "List should have 2 entries");
-
-        RedactionArea area1 = list.get(0);
-        assertEquals(10.0, area1.getX(), "X should be 10.0");
-        assertEquals(20.0, area1.getY(), "Y should be 20.0");
-        assertEquals(1, area1.getPage(), "Page should be 1");
-
-        RedactionArea area2 = list.get(1);
-        assertEquals(30.0, area2.getX(), "X should be 30.0");
-        assertEquals(40.0, area2.getY(), "Y should be 40.0");
-        assertEquals(2, area2.getPage(), "Page should be 2");
-    }
-
-    @Test
-    void testSetAsText_EmptyString() {
-        // Arrange
-        String json = "";
-
-        // Act
-        editor.setAsText(json);
-        Object value = editor.getValue();
-
-        // Assert
-        assertNotNull(value, "Value should not be null");
-        assertTrue(value instanceof List, "Value should be a List");
-
-        @SuppressWarnings("unchecked")
-        List<RedactionArea> list = (List<RedactionArea>) value;
-        assertTrue(list.isEmpty(), "List should be empty");
-    }
-
-    @Test
-    void testSetAsText_NullString() {
-        // Act
-        editor.setAsText(null);
-        Object value = editor.getValue();
-
-        // Assert
-        assertNotNull(value, "Value should not be null");
-        assertTrue(value instanceof List, "Value should be a List");
-
-        @SuppressWarnings("unchecked")
-        List<RedactionArea> list = (List<RedactionArea>) value;
-        assertTrue(list.isEmpty(), "List should be empty");
-    }
-
-    @Test
-    void testSetAsText_SingleItemAsArray() {
-        // Arrange - note this is a single object, not an array
-        String json =
-                "{\"x\":10.0,\"y\":20.0,\"width\":100.0,\"height\":50.0,\"page\":1,\"color\":\"#FF0000\"}";
-
-        // Act
-        editor.setAsText(json);
-        Object value = editor.getValue();
-
-        // Assert
-        assertNotNull(value, "Value should not be null");
-        assertTrue(value instanceof List, "Value should be a List");
-
-        @SuppressWarnings("unchecked")
-        List<RedactionArea> list = (List<RedactionArea>) value;
-        assertEquals(1, list.size(), "List should have 1 entry");
-
-        RedactionArea area = list.get(0);
-        assertEquals(10.0, area.getX(), "X should be 10.0");
-        assertEquals(20.0, area.getY(), "Y should be 20.0");
-    }
-
-    @Test
-    void testSetAsText_InvalidJson() {
-        // Arrange
-        String json = "invalid json";
-
-        // Act & Assert
-        assertThrows(IllegalArgumentException.class, () -> editor.setAsText(json));
-    }
-
-    @Test
-    void testSetAsText_InvalidStructure() {
-        // Arrange - this JSON doesn't match RedactionArea structure
-        String json = "[{\"invalid\":\"structure\"}]";
-
-        // Act & Assert
-        assertThrows(IllegalArgumentException.class, () -> editor.setAsText(json));
-    }
-}

common/src/test/java/stirling/software/common/util/propertyeditor/StringToMapPropertyEditorTest.java

@@ -1,122 +0,0 @@
-package stirling.software.common.util.propertyeditor;
-
-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.Map;
-
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-
-class StringToMapPropertyEditorTest {
-
-    private StringToMapPropertyEditor editor;
-
-    @BeforeEach
-    void setUp() {
-        editor = new StringToMapPropertyEditor();
-    }
-
-    @Test
-    void testSetAsText_ValidJson() {
-        // Arrange
-        String json = "{\"key1\":\"value1\",\"key2\":\"value2\"}";
-
-        // Act
-        editor.setAsText(json);
-        Object value = editor.getValue();
-
-        // Assert
-        assertNotNull(value, "Value should not be null");
-        assertTrue(value instanceof Map, "Value should be a Map");
-
-        @SuppressWarnings("unchecked")
-        Map<String, String> map = (Map<String, String>) value;
-        assertEquals(2, map.size(), "Map should have 2 entries");
-        assertEquals("value1", map.get("key1"), "First entry should be key1=value1");
-        assertEquals("value2", map.get("key2"), "Second entry should be key2=value2");
-    }
-
-    @Test
-    void testSetAsText_EmptyJson() {
-        // Arrange
-        String json = "{}";
-
-        // Act
-        editor.setAsText(json);
-        Object value = editor.getValue();
-
-        // Assert
-        assertNotNull(value, "Value should not be null");
-        assertTrue(value instanceof Map, "Value should be a Map");
-
-        @SuppressWarnings("unchecked")
-        Map<String, String> map = (Map<String, String>) value;
-        assertTrue(map.isEmpty(), "Map should be empty");
-    }
-
-    @Test
-    void testSetAsText_WhitespaceJson() {
-        // Arrange
-        String json = "  {  \"key1\" : \"value1\"  }  ";
-
-        // Act
-        editor.setAsText(json);
-        Object value = editor.getValue();
-
-        // Assert
-        assertNotNull(value, "Value should not be null");
-        assertTrue(value instanceof Map, "Value should be a Map");
-
-        @SuppressWarnings("unchecked")
-        Map<String, String> map = (Map<String, String>) value;
-        assertEquals(1, map.size(), "Map should have 1 entry");
-        assertEquals("value1", map.get("key1"), "Entry should be key1=value1");
-    }
-
-    @Test
-    void testSetAsText_NestedJson() {
-        // Arrange
-        String json = "{\"key1\":\"value1\",\"key2\":\"{\\\"nestedKey\\\":\\\"nestedValue\\\"}\"}";
-
-        // Act
-        editor.setAsText(json);
-        Object value = editor.getValue();
-
-        // Assert
-        assertNotNull(value, "Value should not be null");
-        assertTrue(value instanceof Map, "Value should be a Map");
-
-        @SuppressWarnings("unchecked")
-        Map<String, String> map = (Map<String, String>) value;
-        assertEquals(2, map.size(), "Map should have 2 entries");
-        assertEquals("value1", map.get("key1"), "First entry should be key1=value1");
-        assertEquals(
-                "{\"nestedKey\":\"nestedValue\"}",
-                map.get("key2"),
-                "Second entry should be the nested JSON as a string");
-    }
-
-    @Test
-    void testSetAsText_InvalidJson() {
-        // Arrange
-        String json = "{invalid json}";
-
-        // Act & Assert
-        IllegalArgumentException exception =
-                assertThrows(IllegalArgumentException.class, () -> editor.setAsText(json));
-
-        assertEquals(
-                "Failed to convert java.lang.String to java.util.Map",
-                exception.getMessage(),
-                "Exception message should match expected error");
-    }
-
-    @Test
-    void testSetAsText_Null() {
-        // Act & Assert
-        assertThrows(IllegalArgumentException.class, () -> editor.setAsText(null));
-    }
-}

exampleYmlFiles/docker-compose-latest-fat-endpoints-disabled.yml

@@ -20,7 +20,7 @@ services:
       - ./stirling/latest/logs:/logs:rw
       - ../testing/allEndpointsRemovedSettings.yml:/configs/settings.yml:rw
     environment:
-      DISABLE_ADDITIONAL_FEATURES: "false"
+      DOCKER_ENABLE_SECURITY: "true"
       SECURITY_ENABLELOGIN: "false"
       PUID: 1002
       PGID: 1002

exampleYmlFiles/docker-compose-latest-fat-security-postgres.yml

@@ -20,7 +20,7 @@ services:
       - ./stirling/latest/config:/configs:rw
       - ./stirling/latest/logs:/logs:rw
     environment:
-      DISABLE_ADDITIONAL_FEATURES: "false"
+      DOCKER_ENABLE_SECURITY: "true"
       SECURITY_ENABLELOGIN: "false"
       PUID: 1002
       PGID: 1002

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

@@ -18,7 +18,7 @@ services:
       - ./stirling/latest/config:/configs:rw
       - ./stirling/latest/logs:/logs:rw
     environment:
-      DISABLE_ADDITIONAL_FEATURES: "false"
+      DOCKER_ENABLE_SECURITY: "true"
       SECURITY_ENABLELOGIN: "false"
       PUID: 1002
       PGID: 1002

exampleYmlFiles/docker-compose-latest-security-with-sso.yml

@@ -14,11 +14,11 @@ services:
     ports:
       - "8080:8080"
     volumes:
-      - ./stirling/latest/data:/usr/share/tessdata:rw
-      - ./stirling/latest/config:/configs:rw
-      - ./stirling/latest/logs:/logs:rw
+      - /stirling/latest/data:/usr/share/tessdata:rw
+      - /stirling/latest/config:/configs:rw
+      - /stirling/latest/logs:/logs:rw
     environment:
-      DISABLE_ADDITIONAL_FEATURES: "false"
+      DOCKER_ENABLE_SECURITY: "true"
       SECURITY_ENABLELOGIN: "true"
       SECURITY_OAUTH2_ENABLED: "true"
       SECURITY_OAUTH2_AUTOCREATEUSER: "true" # This is set to true to allow auto-creation of non-existing users in Stirling-PDF

exampleYmlFiles/docker-compose-latest-security.yml

@@ -18,7 +18,7 @@ services:
       - ./stirling/latest/config:/configs:rw
       - ./stirling/latest/logs:/logs:rw
     environment:
-      DISABLE_ADDITIONAL_FEATURES: "false"
+      DOCKER_ENABLE_SECURITY: "true"
       SECURITY_ENABLELOGIN: "true"
       PUID: 1002
       PGID: 1002

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

@@ -14,11 +14,11 @@ services:
     ports:
       - "8080:8080"
     volumes:
-      - ./stirling/latest/data:/usr/share/tessdata:rw
-      - ./stirling/latest/config:/configs:rw
-      - ./stirling/latest/logs:/logs:rw
+      - /stirling/latest/data:/usr/share/tessdata:rw
+      - /stirling/latest/config:/configs:rw
+      - /stirling/latest/logs:/logs:rw
     environment:
-      DISABLE_ADDITIONAL_FEATURES: "false"
+      DOCKER_ENABLE_SECURITY: "true"
       SECURITY_ENABLELOGIN: "true"
       SYSTEM_DEFAULTLOCALE: en-US
       UI_APPNAME: Stirling-PDF-Lite

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

@@ -14,10 +14,10 @@ services:
     ports:
       - "8080:8080"
     volumes:
-      - ./stirling/latest/config:/configs:rw
-      - ./stirling/latest/logs:/logs:rw
+      - /stirling/latest/config:/configs:rw
+      - /stirling/latest/logs:/logs:rw
     environment:
-      DISABLE_ADDITIONAL_FEATURES: "true"
+      DOCKER_ENABLE_SECURITY: "false"
       SECURITY_ENABLELOGIN: "false"
       SYSTEM_DEFAULTLOCALE: en-US
       UI_APPNAME: Stirling-PDF-Ultra-lite

exampleYmlFiles/docker-compose-latest.yml

@@ -14,11 +14,11 @@ services:
     ports:
       - "8080:8080"
     volumes:
-      - ./stirling/latest/data:/usr/share/tessdata:rw
-      - ./stirling/latest/config:/configs:rw
-      - ./stirling/latest/logs:/logs:rw
+      - /stirling/latest/data:/usr/share/tessdata:rw
+      - /stirling/latest/config:/configs:rw
+      - /stirling/latest/logs:/logs:rw
     environment:
-      DISABLE_ADDITIONAL_FEATURES: "true"
+      DOCKER_ENABLE_SECURITY: "false"
       SECURITY_ENABLELOGIN: "false"
       LANGS: "en_GB,en_US,ar_AR,de_DE,fr_FR,es_ES,zh_CN,zh_TW,ca_CA,it_IT,sv_SE,pl_PL,ro_RO,ko_KR,pt_BR,ru_RU,el_GR,hi_IN,hu_HU,tr_TR,id_ID"
       SYSTEM_DEFAULTLOCALE: en-US

exampleYmlFiles/test_cicd.yml

@@ -14,11 +14,11 @@ services:
     ports:
       - 8080:8080
     volumes:
-      - ./stirling/latest/data:/usr/share/tessdata:rw
-      - ./stirling/latest/config:/configs:rw
-      - ./stirling/latest/logs:/logs:rw
+      - /stirling/latest/data:/usr/share/tessdata:rw
+      - /stirling/latest/config:/configs:rw
+      - /stirling/latest/logs:/logs:rw
     environment:
-      DISABLE_ADDITIONAL_FEATURES: "false"
+      DOCKER_ENABLE_SECURITY: "true"
       SECURITY_ENABLELOGIN: "true"
       PUID: 1002
       PGID: 1002

proprietary/.gitignore

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

proprietary/LICENSE

@@ -1,51 +0,0 @@
-Stirling PDF User License
-
-Copyright (c) 2025 Stirling PDF Inc.
-
-License Scope & Usage Rights
-
-Production use of the Stirling PDF Software is only permitted with a valid Stirling PDF User License.
-
-For purposes of this license, “the Software” refers to the Stirling PDF application and any associated documentation files
-provided by Stirling PDF Inc. You or your organization may not use the Software in production, at scale, or for business-critical
-processes unless you have agreed to, and remain in compliance with, the Stirling PDF Subscription Terms of Service
-(https://www.stirlingpdf.com/terms) or another valid agreement with Stirling PDF, and hold an active User License subscription
-covering the appropriate number of licensed users.
-
-Trial and Minimal Use
-
-You may use the Software without a paid subscription for the sole purposes of internal trial, evaluation, or minimal use, provided that:
-* Use is limited to the capabilities and restrictions defined by the Software itself;
-* You do not copy, distribute, sublicense, reverse-engineer, or use the Software in client-facing or commercial contexts.
-
-Continued use beyond this scope requires a valid Stirling PDF User License.
-
-Modifications and Derivative Works
-
-You may modify the Software only for development or internal testing purposes. Any such modifications or derivative works:
-
-* May not be deployed in production environments without a valid User License;
-* May not be distributed or sublicensed;
-* Remain the intellectual property of Stirling PDF and/or its licensors;
-* May only be used, copied, or exploited in accordance with the terms of a valid Stirling PDF User License subscription.
-
-Prohibited Actions
-
-Unless explicitly permitted by a paid license or separate agreement, you may not:
-
-* Use the Software in production environments;
-* Copy, merge, distribute, sublicense, or sell the Software;
-* Remove or alter any licensing or copyright notices;
-* Circumvent access restrictions or licensing requirements.
-
-Third-Party Components
-
-The Stirling PDF Software may include components subject to separate open source licenses. Such components remain governed by
-their original license terms as provided by their respective owners.
-
-Disclaimer
-
-THE SOFTWARE IS PROVIDED “AS IS,” WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, OR NON-INFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES, OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT, OR OTHERWISE, ARISING FROM, OUT OF, OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

proprietary/build.gradle

@@ -1,51 +0,0 @@
-repositories {
-    maven { url = "https://build.shibboleth.net/maven/releases" }
-}
-bootRun {
-    enabled = false
-}
-spotless {
-    java {
-        target sourceSets.main.allJava
-        googleJavaFormat(googleJavaFormatVersion).aosp().reorderImports(false)
-
-        importOrder("java", "javax", "org", "com", "net", "io", "jakarta", "lombok", "me", "stirling")
-        toggleOffOn()
-        trimTrailingWhitespace()
-        leadingTabsToSpaces()
-        endWithNewline()
-    }
-}
-dependencies {
-    implementation project(':common')
-
-    api 'org.springframework:spring-jdbc'
-    api 'org.springframework:spring-webmvc'
-    api 'org.springframework.session:spring-session-core'
-    api "org.springframework.security:spring-security-core:$springSecuritySamlVersion"
-    api "org.springframework.security:spring-security-saml2-service-provider:$springSecuritySamlVersion"
-    api 'org.springframework.boot:spring-boot-starter-jetty'
-    api 'org.springframework.boot:spring-boot-starter-security'
-    api 'org.springframework.boot:spring-boot-starter-data-jpa'
-    api 'org.springframework.boot:spring-boot-starter-oauth2-client'
-    api 'org.springframework.boot:spring-boot-starter-mail'
-    api 'io.swagger.core.v3:swagger-core-jakarta:2.2.33'
-    implementation 'com.bucket4j:bucket4j_jdk17-core:8.14.0'
-
-    // https://mvnrepository.com/artifact/com.bucket4j/bucket4j_jdk17
-    implementation 'org.bouncycastle:bcprov-jdk18on:1.81'
-
-    implementation 'org.thymeleaf.extras:thymeleaf-extras-springsecurity5:3.1.3.RELEASE'
-    api 'io.micrometer:micrometer-registry-prometheus'
-    implementation 'com.unboundid.product.scim2:scim2-sdk-client:2.3.5'
-    runtimeOnly 'com.h2database:h2:2.3.232' // Don't upgrade h2database
-    runtimeOnly 'org.postgresql:postgresql:42.7.7'
-    constraints {
-        implementation "org.opensaml:opensaml-core:$openSamlVersion"
-        implementation "org.opensaml:opensaml-saml-api:$openSamlVersion"
-        implementation "org.opensaml:opensaml-saml-impl:$openSamlVersion"
-    }
-    implementation 'com.coveo:saml-client:5.0.0'
-}
-
-tasks.register('prepareKotlinBuildScriptModel') {}

proprietary/src/main/java/stirling/software/proprietary/audit/AuditAspect.java

@@ -1,139 +0,0 @@
-package stirling.software.proprietary.audit;
-
-import java.lang.reflect.Method;
-import java.util.Map;
-
-import org.apache.commons.lang3.StringUtils;
-import org.aspectj.lang.ProceedingJoinPoint;
-import org.aspectj.lang.annotation.Around;
-import org.aspectj.lang.annotation.Aspect;
-import org.aspectj.lang.reflect.MethodSignature;
-import org.springframework.stereotype.Component;
-import org.springframework.web.context.request.RequestContextHolder;
-import org.springframework.web.context.request.ServletRequestAttributes;
-
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpServletResponse;
-
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-
-import stirling.software.proprietary.config.AuditConfigurationProperties;
-import stirling.software.proprietary.service.AuditService;
-
-/** Aspect for processing {@link Audited} annotations. */
-@Aspect
-@Component
-@Slf4j
-@RequiredArgsConstructor
-@org.springframework.core.annotation.Order(
-        10) // Lower precedence (higher number) - executes after AutoJobAspect
-public class AuditAspect {
-
-    private final AuditService auditService;
-    private final AuditConfigurationProperties auditConfig;
-
-    @Around("@annotation(stirling.software.proprietary.audit.Audited)")
-    public Object auditMethod(ProceedingJoinPoint joinPoint) throws Throwable {
-        MethodSignature signature = (MethodSignature) joinPoint.getSignature();
-        Method method = signature.getMethod();
-        Audited auditedAnnotation = method.getAnnotation(Audited.class);
-
-        // Fast path: use unified check to determine if we should audit
-        // This avoids all data collection if auditing is disabled
-        if (!AuditUtils.shouldAudit(method, auditConfig)) {
-            return joinPoint.proceed();
-        }
-
-        // Only create the map once we know we'll use it
-        Map<String, Object> auditData =
-                AuditUtils.createBaseAuditData(joinPoint, auditedAnnotation.level());
-
-        // Add HTTP information if we're in a web context
-        ServletRequestAttributes attrs =
-                (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
-        if (attrs != null) {
-            HttpServletRequest req = attrs.getRequest();
-            String path = req.getRequestURI();
-            String httpMethod = req.getMethod();
-            AuditUtils.addHttpData(auditData, httpMethod, path, auditedAnnotation.level());
-            AuditUtils.addFileData(auditData, joinPoint, auditedAnnotation.level());
-        }
-
-        // Add arguments if requested and if at VERBOSE level, or if specifically requested
-        boolean includeArgs =
-                auditedAnnotation.includeArgs()
-                        && (auditedAnnotation.level() == AuditLevel.VERBOSE
-                                || auditConfig.getAuditLevel() == AuditLevel.VERBOSE);
-
-        if (includeArgs) {
-            AuditUtils.addMethodArguments(auditData, joinPoint, AuditLevel.VERBOSE);
-        }
-
-        // Record start time for latency calculation
-        long startTime = System.currentTimeMillis();
-        Object result;
-        try {
-            // Execute the method
-            result = joinPoint.proceed();
-
-            // Add success status
-            auditData.put("status", "success");
-
-            // Add result if requested and if at VERBOSE level
-            boolean includeResult =
-                    auditedAnnotation.includeResult()
-                            && (auditedAnnotation.level() == AuditLevel.VERBOSE
-                                    || auditConfig.getAuditLevel() == AuditLevel.VERBOSE);
-
-            if (includeResult && result != null) {
-                // Use safe string conversion with size limiting
-                auditData.put("result", AuditUtils.safeToString(result, 1000));
-            }
-
-            return result;
-        } catch (Throwable ex) {
-            // Always add failure information regardless of level
-            auditData.put("status", "failure");
-            auditData.put("errorType", ex.getClass().getName());
-            auditData.put("errorMessage", ex.getMessage());
-
-            // Re-throw the exception
-            throw ex;
-        } finally {
-            // Add timing information - use isHttpRequest=false to ensure we get timing for non-HTTP
-            // methods
-            HttpServletResponse resp = attrs != null ? attrs.getResponse() : null;
-            boolean isHttpRequest = attrs != null;
-            AuditUtils.addTimingData(
-                    auditData, startTime, resp, auditedAnnotation.level(), isHttpRequest);
-
-            // Resolve the event type based on annotation and context
-            String httpMethod = null;
-            String path = null;
-            if (attrs != null) {
-                HttpServletRequest req = attrs.getRequest();
-                httpMethod = req.getMethod();
-                path = req.getRequestURI();
-            }
-
-            AuditEventType eventType =
-                    AuditUtils.resolveEventType(
-                            method,
-                            joinPoint.getTarget().getClass(),
-                            path,
-                            httpMethod,
-                            auditedAnnotation);
-
-            // Check if we should use string type instead
-            String typeString = auditedAnnotation.typeString();
-            if (eventType == AuditEventType.HTTP_REQUEST && StringUtils.isNotEmpty(typeString)) {
-                // Use the string type (for backward compatibility)
-                auditService.audit(typeString, auditData, auditedAnnotation.level());
-            } else {
-                // Use the enum type (preferred)
-                auditService.audit(eventType, auditData, auditedAnnotation.level());
-            }
-        }
-    }
-}