camers scan init

test
fix
2026-09-03 05:10:16 +03:00 · 2025-06-04 15:45:50 +01:00 · 2025-06-03 13:41:24 +01:00 · 2025-06-03 13:19:42 +01:00 · 2025-06-03 13:15:02 +01:00 · 2025-06-03 13:08:32 +01:00
2032 changed files with 15674 additions and 215454 deletions
@@ -0,0 +1,21 @@
+{
+  "permissions": {
+    "allow": [
+      "Bash(mkdir:*)",
+      "Bash(./gradlew:*)",
+      "Bash(grep:*)",
+      "Bash(find:*)",
+      "Bash(chmod:*)",
+      "Bash(rm:*)",
+      "Bash(cat:*)",
+      "Bash(if [ -d logs ])",
+      "Bash(then ls -la logs/)",
+      "Bash(fi)",
+      "Bash(ls:*)",
+      "Bash(./testing/cucumber/features/environment.py -v)",
+      "Bash(./testing/cucumber/features/autojob.feature -v)",
+      "Bash(git rev-parse:*)"
+    ],
+    "deny": []
+  }
+}
@@ -49,7 +49,7 @@
                "java.configuration.updateBuildConfiguration": "interactive",
                "java.format.enabled": true,
                "java.format.settings.profile": "GoogleStyle",
-                "java.format.settings.google.version": "1.28.0",
+                "java.format.settings.google.version": "1.26.0",
                "java.format.settings.google.extra": "--aosp --skip-sorting-imports --skip-javadoc-formatting",
                "java.saveActions.cleanup": true,
                "java.cleanup.actions": [
@@ -79,17 +79,9 @@
                    ".venv*/",
                    ".vscode/",
                    "bin/",
-                    "app/core/bin/",
-                    "app/common/bin/",
-                    "app/proprietary/bin/",
                    "build/",
-                    "app/core/build/",
-                    "app/common/build/",
-                    "app/proprietary/build/",
                    "configs/",
-                    "app/core/configs/",
                    "customFiles/",
-                    "app/core/customFiles/",
                    "docs/",
                    "exampleYmlFiles",
                    "gradle/",
@@ -101,9 +93,6 @@
                    ".git-blame-ignore-revs",
                    ".gitattributes",
                    ".gitignore",
-                    "app/core/.gitignore",
-                    "app/common/.gitignore",
-                    "app/proprietary/.gitignore",
                    ".pre-commit-config.yaml"
                ],
                "java.signatureHelp.enabled": true,
@@ -130,9 +119,7 @@
                "EditorConfig.EditorConfig", // EditorConfig support for maintaining consistent coding styles
                "ms-azuretools.vscode-docker", // Docker extension for Visual Studio Code
                "charliermarsh.ruff", // Ruff extension for Ruff language support
-                "github.vscode-github-actions", // GitHub Actions extension for Visual Studio Code
-                "stylelint.vscode-stylelint", // Stylelint extension for CSS and SCSS linting
-                "redhat.vscode-yaml" // YAML extension for Visual Studio Code
+                "github.vscode-github-actions" // GitHub Actions extension for Visual Studio Code
            ]
        }
    },
@@ -1,7 +1,6 @@
 root = true

 [*]
-charset = utf-8
 indent_style = space
 indent_size = 4
 end_of_line = lf
@@ -24,23 +23,9 @@ indent_size = 2
 insert_final_newline = false
 trim_trailing_whitespace = false

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

-[*.css]
-# CSS files typically use an indent size of 2 spaces for better readability and alignment with community standards.
-indent_size = 2
-
-[*.{yml,yaml}]
-# YAML files use an indent size of 2 spaces to maintain consistency with common YAML formatting practices.
-indent_size = 2
+[*.yaml]
 insert_final_newline = false
 trim_trailing_whitespace = false
-
-[*.json]
-# JSON files use an indent size of 2 spaces, which is the standard for JSON formatting.
-indent_size = 2
-
-[*.jsonc]
-# JSONC (JSON with comments) files also follow the standard JSON formatting with an indent size of 2 spaces.
-indent_size = 2
@@ -1,9 +1,5 @@
 # Formatting
 5f771b785130154ed47952635b7acef371ffe0ec
-7fa5e130d99227c2202ebddfdd91348176ec0c7b
-14d4fbb2a36195eedb034785e5a5ff6a47f268c6
-ee8030c1c4148062cde15c49c67d04ef03930c55
-fcd41924f5f261febfa9d9a92994671f3ebc97d6

 # Normalize files
 55d4fda01b2f39f5b7d7b4fda5214bd7ff0fd5dd
@@ -1,10 +1,10 @@
 * text=auto eol=lf

 # Ignore all JavaScript files in a directory
-app/core/src/main/resources/static/pdfjs/* linguist-vendored
-app/core/src/main/resources/static/pdfjs/** linguist-vendored
-app/core/src/main/resources/static/pdfjs-legacy/* linguist-vendored
-app/core/src/main/resources/static/pdfjs-legacy/** linguist-vendored
-app/core/src/main/resources/static/css/bootstrap-icons.css linguist-vendored
-app/core/src/main/resources/static/css/bootstrap.min.css linguist-vendored
-app/core/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
@@ -1,21 +1,2 @@
-# All PRs must be approved by Frooodle or Ludy87
-* @Frooodle @Ludy87 @jbrunton96 @ConnorYoh
-
-# Backend
-/app/** @DarioGii @Frooodle @Ludy87 @jbrunton96 @ConnorYoh
-
-#V1 frontend
-/app/core/src/main/resources/static/** @reecebrowne @ConnorYoh @EthanHealy01 @jbrunton96 @Frooodle @Ludy87
-/app/core/src/main/resources/templates/** @reecebrowne @ConnorYoh @EthanHealy01 @jbrunton96 @Frooodle @Ludy87
-
-#V2 frontend
-/frontend/** @reecebrowne @ConnorYoh @EthanHealy01 @jbrunton96 @Frooodle
-
-#V2 docker
-/docker/backend/** @Frooodle @Ludy87 @DarioGii @Ludy87
-/docker/frontend/** @reecebrowne @ConnorYoh @EthanHealy01 @jbrunton96 @Frooodle @Ludy87
-/docker/compose/** @reecebrowne @ConnorYoh @EthanHealy01 @DarioGii @jbrunton96 @Frooodle @Ludy87
-
-
-#GHA (All users)
-/.github/** @reecebrowne @ConnorYoh @EthanHealy01 @DarioGii @jbrunton96 @Frooodle @Ludy87
+# All PRs to V1 must be approved by Frooodle
+* @Frooodle @reecebrowne @Ludy87 @DarioGii @ConnorYoh
@@ -1,31 +0,0 @@
-build: &build
-  - build.gradle
-  - app/(common|core|proprietary)/build.gradle
-
-app: &app
-  - app/(common|core|proprietary)/src/main/java/**
-
-openapi: &openapi
-  - build.gradle
-  - app/(common|core|proprietary)/build.gradle
-  - app/(common|core|proprietary)/src/main/java/**
-
-project: &project
-  - app/(common|core|proprietary)/src/(main|test)/java/**
-  - app/(common|core|proprietary)/build.gradle
-  - 'app/(common|core|proprietary)/src/(main|test)/resources/**/!(messages_*.properties|*.md)*'
-  - exampleYmlFiles/**
-  - gradle/**
-  - libs/**
-  - testing/**
-  - build.gradle
-  - Dockerfile
-  - Dockerfile.fat
-  - Dockerfile.ultra-lite
-  - gradle.properties
-  - gradlew
-  - gradlew.bat
-  - launch4jConfig.xml
-  - settings.gradle
-  - frontend/**
-  - docker/**
@@ -1,13 +0,0 @@
-{
-  "repo_devs": [
-    "Frooodle",
-    "sf298",
-    "Ludy87",
-    "LaserKaspar",
-    "sbplat",
-    "reecebrowne",
-    "DarioGii",
-    "ConnorYoh",
-    "EthanHealy01"
-  ]
-}
@@ -1,13 +0,0 @@
-You are a professional software engineer specializing in reviewing pull request titles.
-
-Your job is to analyze a git diff and an existing PR title, then evaluate and improve the PR title.
-
-You must:
- Always return valid JSON
- Only return the JSON response (no Markdown, no formatting)
- Use one of these conventional commit types at the beginning of the title: build, chore, ci, docs, feat, fix, perf, refactor, revert, style, test
- Use lowercase only, no emojis, no trailing period
- Ensure the title is between 5 and 72 printable ASCII characters
- Never let spelling or grammar errors affect the rating
- If the PR title is rated 6 or higher and only contains spelling or grammar mistakes, correct it - do not rephrase it
- If the PR title is rated below 6, generate a new, better title based on the diff
@@ -1,162 +0,0 @@
-version: 1
-labels:
-
-  - label: "Bugfix"
-    title: '^fix(\([^)]*\))?:|^fix:.*'
-
-  - label: "enhancement"
-    title: '^feat(\([^)]*\))?:|^feat:.*'
-
-  - label: "build"
-    title: '^build(\([^)]*\))?:|^build:.*'
-
-  - label: "chore"
-    title: '^chore(\([^)]*\))?:|^chore:.*'
-
-  - label: "ci"
-    title: '^ci(\([^)]*\))?:|^ci:.*'
-
-  - label: "ci"
-    title: '^.*\(ci\):.*'
-
-  - label: "perf"
-    title: '^perf(\([^)]*\))?:|^perf:.*'
-
-  - label: "refactor"
-    title: '^refactor(\([^)]*\))?:|^refactor:.*'
-
-  - label: "revert"
-    title: '^revert(\([^)]*\))?:|^revert:.*'
-
-  - label: "style"
-    title: '^style(\([^)]*\))?:|^style:.*'
-
-  - label: "Documentation"
-    title: '^docs(\([^)]*\))?:|^docs:.*'
-
-  - label: "Documentation"
-    title: '^.*\(docs\):.*'
-
-  - label: "dependencies"
-    title: '^deps(\([^)]*\))?:|^deps:.*'
-
-  - label: "dependencies"
-    title: '^.*\(deps\):.*'
-
-  - label: 'API'
-    title: '.*openapi.*|.*swagger.*|.*api.*'
-
-  - label: 'v2'
-    base-branch: 'V2'
-
-  - label: 'Translation'
-    files:
-      - 'app/core/src/main/resources/messages_[a-zA-Z_]{2}_[a-zA-Z_]{2,7}.properties'
-      - 'scripts/ignore_translation.toml'
-      - 'app/core/src/main/resources/templates/fragments/languages.html'
-      - '.github/scripts/check_language_properties.py'
-
-  - label: 'Front End'
-    files:
-      - 'app/core/src/main/resources/templates/.*'
-      - 'app/proprietary/src/main/resources/templates/.*'
-      - 'app/core/src/main/resources/static/.*'
-      - 'app/proprietary/src/main/resources/static/.*'
-      - 'app/core/src/main/java/stirling/software/SPDF/controller/web/.*'
-      - 'app/core/src/main/java/stirling/software/SPDF/UI/.*'
-      - 'app/proprietary/src/main/java/stirling/software/proprietary/security/controller/web/.*'
-      - 'frontend/**'
-
-  - label: 'Java'
-    files:
-      - 'app/common/src/main/java/.*.java'
-      - 'app/proprietary/src/main/java/.*.java'
-      - 'app/core/src/main/java/.*.java'
-
-  - label: 'Back End'
-    files:
-      - 'app/core/src/main/java/stirling/software/SPDF/config/.*'
-      - 'app/core/src/main/java/stirling/software/SPDF/controller/.*'
-      - 'app/core/src/main/resources/settings.yml.template'
-      - 'app/core/src/main/resources/application.properties'
-      - 'app/core/src/main/resources/banner.txt'
-      - 'app/core/src/main/resources/static/python/png_to_webp.py'
-      - 'app/core/src/main/resources/static/python/split_photos.py'
-      - 'app/core/src/main/resources/static/pipeline/defaultWebUIConfigs/**'
-      - 'application.properties'
-
-  - label: 'Security'
-    files:
-      - 'app/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:
-      - 'app/core/src/main/java/stirling/software/SPDF/config/OpenApiConfig.java'
-      - 'app/core/src/main/java/stirling/software/SPDF/controller/web/MetricsController.java'
-      - 'app/core/src/main/java/stirling/software/SPDF/controller/api/.*'
-      - 'app/core/src/main/java/stirling/software/SPDF/model/api/.*'
-      - 'app/core/src/main/java/stirling/software/SPDF/service/ApiDocService.java'
-      - 'app/proprietary/src/main/java/stirling/software/proprietary/security/controller/api/.*'
-      - 'app/core/src/main/resources/static/python/png_to_webp.py'
-      - 'app/core/src/main/resources/static/python/split_photos.py'
-      - '.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'
-      - 'docker/**'
-
-  - label: 'Devtools'
-    files:
-      - '.devcontainer/.*'
-      - 'Dockerfile.dev'
-      - '.vscode/.*'
-      - '.editorconfig'
-      - '.pre-commit-config'
-      - '.github/workflows/pre_commit.yml'
-      - 'devGuide/.*'
-      - 'devTools/.*'
-
-  - label: 'Test'
-    files:
-      - 'app/common/src/test/.*'
-      - 'app/proprietary/src/test/.*'
-      - 'app/core/src/test/.*'
-      - 'testing/.*'
-      - '.github/workflows/scorecards.yml'
-      - 'exampleYmlFiles/test_cicd.yml'
-
-  - label: 'Github'
-    files:
-      - '.github/.*'
-
-  - label: 'Gradle'
-    files:
-      - 'gradle/.*'
-      - 'gradlew'
-      - 'gradlew.bat'
-      - 'settings.gradle'
-      - 'build.gradle'
-      - 'app/common/build.gradle'
-      - 'app/proprietary/build.gradle'
-      - 'app/core/build.gradle'
@@ -0,0 +1,99 @@
+Translation:
+  - changed-files:
+    - any-glob-to-any-file: 'src/main/resources/messages_*_*.properties'
+    - any-glob-to-any-file: 'scripts/ignore_translation.toml'
+    - any-glob-to-any-file: 'src/main/resources/templates/fragments/languages.html'
+
+Front End:
+  - changed-files:
+    - 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: 'src/main/java/**/*.java'
+
+Back End:
+  - changed-files:
+    - 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: '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: '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'
+
+Documentation:
+  - changed-files:
+    - any-glob-to-any-file: '**/*.md'
+    - any-glob-to-any-file: 'scripts/counter_translation.py'
+    - any-glob-to-any-file: 'scripts/ignore_translation.toml'
+
+Docker:
+  - changed-files:
+    - any-glob-to-any-file: '.github/workflows/build.yml'
+    - any-glob-to-any-file: '.github/workflows/push-docker.yml'
+    - any-glob-to-any-file: 'Dockerfile'
+    - any-glob-to-any-file: 'Dockerfile.fat'
+    - any-glob-to-any-file: 'Dockerfile.ultra-lite'
+    - any-glob-to-any-file: 'exampleYmlFiles/*.yml'
+    - any-glob-to-any-file: 'scripts/download-security-jar.sh'
+    - any-glob-to-any-file: 'scripts/init.sh'
+    - any-glob-to-any-file: 'scripts/init-without-ocr.sh'
+    - any-glob-to-any-file: 'scripts/installFonts.sh'
+    - any-glob-to-any-file: 'test.sh'
+    - any-glob-to-any-file: 'test2.sh'
+
+Devtools:
+  - changed-files:
+    - any-glob-to-any-file: '.devcontainer/**/*'
+    - any-glob-to-any-file: 'Dockerfile.dev'
+
+Test:
+  - changed-files:
+    - any-glob-to-any-file: 'cucumber/**/*'
+    - any-glob-to-any-file: 'src/test/**/*'
+    - any-glob-to-any-file: 'src/testing/**/*'
+    - any-glob-to-any-file: '.pre-commit-config'
+    - any-glob-to-any-file: '.github/workflows/pre_commit.yml'
+    - any-glob-to-any-file: '.github/workflows/scorecards.yml'
+
+Github:
+  - changed-files:
+    - any-glob-to-any-file: '.github/**/*'
@@ -42,7 +42,6 @@
 - name: "Front End"
  color: "BBD2F1"
  description: "Issues or pull requests related to front-end development"
-  from_name: "frontend"
 - name: "github-actions"
  description: "Pull requests that update GitHub Actions code"
  color: "999999"
@@ -78,12 +77,10 @@
 - name: "Translation"
  color: "9FABF9"
  from_name: "translation"
-  description: "Issues or pull requests related to translation"
 - name: "upstream"
  color: "DEDEDE"
 - name: "v2"
  color: "FFFF00"
-  description: "Issues or pull requests related to the v2 branch"
 - name: "wontfix"
  description: "This will not be worked on"
  color: "FFFFFF"
@@ -114,73 +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"
- name: "pr-deployed"
-  color: "00FF00"
-  description: "Pull request has been deployed to a test environment"
- name: "codex"
-  color: "ededed"
-  description: "chatgpt AI generated code"
@@ -1,6 +1,5 @@
 # Description of Changes

-<!--
 Please provide a summary of the changes, including:

 - What was changed
@@ -8,7 +7,6 @@ Please provide a summary of the changes, including:
 - Any challenges encountered

 Closes #(issue_number)
-->

 ---

@@ -17,15 +15,15 @@ Closes #(issue_number)
 ### General

 - [ ] I have read the [Contribution Guidelines](https://github.com/Stirling-Tools/Stirling-PDF/blob/main/CONTRIBUTING.md)
- [ ] I have read the [Stirling-PDF Developer Guide](https://github.com/Stirling-Tools/Stirling-PDF/blob/main/devGuide/DeveloperGuide.md) (if applicable)
- [ ] I have read the [How to add new languages to Stirling-PDF](https://github.com/Stirling-Tools/Stirling-PDF/blob/main/devGuide/HowToAddNewLanguage.md) (if applicable)
+- [ ] I have read the [Stirling-PDF Developer Guide](https://github.com/Stirling-Tools/Stirling-PDF/blob/main/DeveloperGuide.md) (if applicable)
+- [ ] I have read the [How to add new languages to Stirling-PDF](https://github.com/Stirling-Tools/Stirling-PDF/blob/main/HowToAddNewLanguage.md) (if applicable)
 - [ ] I have performed a self-review of my own code
 - [ ] My changes generate no new warnings

 ### Documentation

 - [ ] I have updated relevant docs on [Stirling-PDF's doc repo](https://github.com/Stirling-Tools/Stirling-Tools.github.io/blob/main/docs/) (if functionality has heavily changed)
- [ ] I have read the section [Add New Translation Tags](https://github.com/Stirling-Tools/Stirling-PDF/blob/main/devGuide/HowToAddNewLanguage.md#add-new-translation-tags) (for new translation tags only)
+- [ ] I have read the section [Add New Translation Tags](https://github.com/Stirling-Tools/Stirling-PDF/blob/main/HowToAddNewLanguage.md#add-new-translation-tags) (for new translation tags only)

 ### UI Changes (if applicable)

@@ -33,4 +31,4 @@ Closes #(issue_number)

 ### Testing (if applicable)

- [ ] I have tested my changes locally. Refer to the [Testing Guide](https://github.com/Stirling-Tools/Stirling-PDF/blob/main/devGuide/DeveloperGuide.md#6-testing) for more details.
+- [ ] I have tested my changes locally. Refer to the [Testing Guide](https://github.com/Stirling-Tools/Stirling-PDF/blob/main/DeveloperGuide.md#6-testing) for more details.
@@ -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(), "app", "core", "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,20 +216,10 @@ def check_for_differences(reference_file, file_list, branch, actor):
            or (
                # only local windows command
                not file_normpath.startswith(
-                    os.path.join(
-                        "", "app", "core", "src", "main", "resources", "messages_"
-                    )
+                    os.path.join("", "src", "main", "resources", "messages_")
                )
                and not file_normpath.startswith(
-                    os.path.join(
-                        os.getcwd(),
-                        "app",
-                        "core",
-                        "src",
-                        "main",
-                        "resources",
-                        "messages_",
-                    )
+                    os.path.join(os.getcwd(), "src", "main", "resources", "messages_")
                )
            )
            or not file_normpath.endswith(".properties")
@@ -329,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/app/core/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_**")
@@ -389,13 +377,7 @@ if __name__ == "__main__":
        else:
            file_list = glob.glob(
                os.path.join(
-                    os.getcwd(),
-                    "app",
-                    "core",
-                    "src",
-                    "main",
-                    "resources",
-                    "messages_*.properties",
+                    os.getcwd(), "src", "main", "resources", "messages_*.properties"
                )
            )
        update_missing_keys(args.reference_file, file_list)
@@ -2,7 +2,7 @@
 # This file is autogenerated by pip-compile with Python 3.10
 # by the following command:
 #
-#    pip-compile --generate-hashes --output-file='.github\scripts\requirements_pre_commit.txt' --strip-extras '.github\scripts\requirements_pre_commit.in'
+#    pip-compile --generate-hashes --output-file='.github\scripts\requirements_pre_commit.txt' '.github\scripts\requirements_pre_commit.in'
 #
 cfgv==3.4.0 \
    --hash=sha256:b7265b1f29fd3316bfcd2b330d63d024f2bfd8bcb8b0272f8e19a504856c48f9 \
@@ -12,25 +12,25 @@ distlib==0.3.9 \
    --hash=sha256:47f8c22fd27c27e25a65601af709b38e4f0a45ea4fc2e710f65755fa8caaaf87 \
    --hash=sha256:a60f20dea646b8a33f3e7772f74dc0b2d0772d2837ee1342a00645c81edf9403
    # via virtualenv
-filelock==3.18.0 \
-    --hash=sha256:adbc88eabb99d2fec8c9c1b229b171f18afa655400173ddc653d5d01501fb9f2 \
-    --hash=sha256:c401f4f8377c4464e6db25fff06205fd89bdd83b65eb0488ed1b160f780e21de
+filelock==3.16.1 \
+    --hash=sha256:2082e5703d51fbf98ea75855d9d5527e33d8ff23099bec374a134febee6946b0 \
+    --hash=sha256:c249fbfcd5db47e5e2d6d62198e565475ee65e4831e2561c8e313fa7eb961435
    # via virtualenv
-identify==2.6.12 \
-    --hash=sha256:ad9672d5a72e0d2ff7c5c8809b62dfa60458626352fb0eb7b55e69bdc45334a2 \
-    --hash=sha256:d8de45749f1efb108badef65ee8386f0f7bb19a7f26185f74de6367bffbaf0e6
+identify==2.6.5 \
+    --hash=sha256:14181a47091eb75b337af4c23078c9d09225cd4c48929f521f3bf16b09d02566 \
+    --hash=sha256:c10b33f250e5bba374fae86fb57f3adcebf1161bce7cdf92031915fd480c13bc
    # via pre-commit
 nodeenv==1.9.1 \
    --hash=sha256:6ec12890a2dab7946721edbfbcd91f3319c6ccc9aec47be7c7e6b7011ee6645f \
    --hash=sha256:ba11c9782d29c27c70ffbdda2d7415098754709be8a7056d79a737cd901155c9
    # via pre-commit
-platformdirs==4.3.8 \
-    --hash=sha256:3d512d96e16bcb959a814c9f348431070822a6496326a4be0911c40b5a74c2bc \
-    --hash=sha256:ff7059bb7eb1179e2685604f4aaf157cfd9535242bd23742eadc3c13542139b4
+platformdirs==4.3.6 \
+    --hash=sha256:357fb2acbc885b0419afd3ce3ed34564c13c9b95c89360cd9563f73aa5e2b907 \
+    --hash=sha256:73e575e1408ab8103900836b97580d5307456908a03e92031bab39e4554cc3fb
    # via virtualenv
-pre-commit==4.2.0 \
-    --hash=sha256:601283b9757afd87d40c4c4a9b2b5de9637a8ea02eaff7adc2d0fb4e04841146 \
-    --hash=sha256:a009ca7205f1eb497d10b845e52c838a98b6cdd2102a6c8e4540e94ee75c58bd
+pre-commit==4.0.1 \
+    --hash=sha256:80905ac375958c0444c65e9cebebd948b3cdb518f335a091a670a89d652139d2 \
+    --hash=sha256:efde913840816312445dc98787724647c65473daefe420785f885e8ed9a06878
    # via -r .github\scripts\requirements_pre_commit.in
 pyyaml==6.0.2 \
    --hash=sha256:01179a4a8559ab5de078078f37e5c1a30d76bb88519906844fd7bdea1b7729ff \
@@ -87,7 +87,7 @@ pyyaml==6.0.2 \
    --hash=sha256:f753120cb8181e736c57ef7636e83f31b9c0d1722c516f7e86cf15b7aa57ff12 \
    --hash=sha256:ff3824dc5261f50c9b0dfb3be22b4567a6f938ccce4587b38952d85fd9e9afe4
    # via pre-commit
-virtualenv==20.31.2 \
-    --hash=sha256:36efd0d9650ee985f0cad72065001e66d49a6f24eb44d98980f630686243cf11 \
-    --hash=sha256:e10c0a9d02835e592521be48b332b6caee6887f332c111aa79a09b9e79efc2af
+virtualenv==20.28.1 \
+    --hash=sha256:412773c85d4dab0409b83ec36f7a6499e72eaf08c80e81e9576bca61831c71cb \
+    --hash=sha256:5d34ab240fdb5d21549b76f9e8ff3af28252f5499fb6d6f031adac4e5a8c5329
    # via pre-commit
@@ -2,9 +2,9 @@
 # This file is autogenerated by pip-compile with Python 3.10
 # by the following command:
 #
-#    pip-compile --generate-hashes --output-file='.github\scripts\requirements_sync_readme.txt' --strip-extras '.github\scripts\requirements_sync_readme.in'
+#    pip-compile --generate-hashes --output-file='.github\scripts\requirements_sync_readme.txt' '.github\scripts\requirements_sync_readme.in'
 #
-tomlkit==0.13.3 \
-    --hash=sha256:430cf247ee57df2b94ee3fbe588e71d362a941ebb545dec29b53961d61add2a1 \
-    --hash=sha256:c89c649d79ee40629a9fda55f8ace8c6a1b42deb912b2a8fd8d942ddadb606b0
+tomlkit==0.13.2 \
+    --hash=sha256:7a974427f6e119197f670fbbbeae7bef749a6c14e793db934baefc1b5f03efde \
+    --hash=sha256:fff5fe59a87295b278abd31bec92c15d9bc4a06885ab12bcea52c71119392e79
    # via -r .github\scripts\requirements_sync_readme.in
@@ -1,501 +0,0 @@
-name: Auto PR V2 Deployment
-
-on:
-  pull_request:
-    types: [opened, synchronize, reopened, closed]
-  workflow_dispatch:
-    inputs:
-      pr:
-        description: "PR number to deploy"
-        required: true
-      allow_fork:
-        description: "Allow deploying fork PR?"
-        required: false
-        default: "false"
-
-permissions:
-  contents: read
-  issues: write
-  pull-requests: write
-
-jobs:
-  check-pr:
-    if: (github.event_name == 'pull_request' && github.event.action != 'closed') || github.event_name == 'workflow_dispatch'
-    runs-on: ubuntu-latest
-    outputs:
-      should_deploy: ${{ steps.decide.outputs.should_deploy }}
-      is_fork: ${{ steps.resolve.outputs.is_fork }}
-      allow_fork: ${{ steps.decide.outputs.allow_fork }}
-      pr_number: ${{ steps.resolve.outputs.pr_number }}
-      pr_repository: ${{ steps.resolve.outputs.repository }}
-      pr_ref: ${{ steps.resolve.outputs.ref }}
-    steps:
-      - name: Harden Runner
-        uses: step-security/harden-runner@6c439dc8bdf85cadbbce9ed30d1c7b959517bc49 # v2.12.2
-        with:
-          egress-policy: audit
-
-      - name: Resolve PR info
-        id: resolve
-        uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
-        with:
-          script: |
-            const { owner, repo } = context.repo;
-            let prNumber = context.eventName === 'workflow_dispatch'
-              ? parseInt(process.env.INPUT_PR, 10)
-              : context.payload.number;
-
-            if (!Number.isInteger(prNumber)) { core.setFailed('Invalid PR number'); return; }
-
-            const { data: pr } = await github.rest.pulls.get({ owner, repo, pull_number: prNumber });
-            core.setOutput('pr_number', String(prNumber));
-            core.setOutput('repository', pr.head.repo.full_name);
-            core.setOutput('ref', pr.head.ref);
-            core.setOutput('is_fork', String(pr.head.repo.fork));
-            core.setOutput('base_ref', pr.base.ref);
-            core.setOutput('author', pr.user.login);
-            core.setOutput('state', pr.state);
-
-      - name: Decide deploy
-        id: decide
-        shell: bash
-        env:
-          EVENT_NAME: ${{ github.event_name }}
-          STATE: ${{ steps.resolve.outputs.state }}
-          IS_FORK: ${{ steps.resolve.outputs.is_fork }}
-          # nur bei workflow_dispatch gesetzt:
-          ALLOW_FORK_INPUT: ${{ inputs.allow_fork }}
-          # für Auto-PR-Logik:
-          PR_TITLE: ${{ github.event.pull_request.title }}
-          PR_BRANCH: ${{ github.event.pull_request.head.ref }}
-          PR_BASE: ${{ steps.resolve.outputs.base_ref }}
-          PR_AUTHOR: ${{ steps.resolve.outputs.author }}
-        run: |
-          set -e
-          # Standard: nichts deployen
-          should=false
-          allow_fork="$(echo "${ALLOW_FORK_INPUT:-false}" | tr '[:upper:]' '[:lower:]')"
-
-          if [ "$EVENT_NAME" = "workflow_dispatch" ]; then
-            if [ "$STATE" != "open" ]; then
-              echo "PR not open -> skip"
-            else
-              if [ "$IS_FORK" = "true" ] && [ "$allow_fork" != "true" ]; then
-                echo "Fork PR and allow_fork=false -> skip"
-              else
-                should=true
-              fi
-            fi
-          else
-            auth_users=("Frooodle" "sf298" "Ludy87" "LaserKaspar" "sbplat" "reecebrowne" "DarioGii" "ConnorYoh" "EthanHealy01" "jbrunton96")
-            is_auth=false; for u in "${auth_users[@]}"; do [ "$u" = "$PR_AUTHOR" ] && is_auth=true && break; done
-            if [ "$PR_BASE" = "V2" ] && [ "$is_auth" = true ]; then
-              should=true
-            else
-              title_has_v2=false; echo "$PR_TITLE" | grep -qiE 'v2|version.?2|version.?two' && title_has_v2=true
-              branch_has_kw=false; echo "$PR_BRANCH" | grep -qiE 'v2|react' && branch_has_kw=true
-              if [ "$is_auth" = true ] && { [ "$title_has_v2" = true ] || [ "$branch_has_kw" = true ]; }; then
-                should=true
-              fi
-            fi
-          fi
-
-          echo "should_deploy=$should" >> $GITHUB_OUTPUT
-          echo "allow_fork=${allow_fork:-false}" >> $GITHUB_OUTPUT
-
-  deploy-v2-pr:
-    needs: check-pr
-    runs-on: ubuntu-latest
-    if: needs.check-pr.outputs.should_deploy == 'true' && (needs.check-pr.outputs.is_fork == 'false' || needs.check-pr.outputs.allow_fork == 'true')
-    # Concurrency control - only one deployment per PR at a time
-    concurrency:
-      group: v2-deploy-pr-${{ needs.check-pr.outputs.pr_number }}
-      cancel-in-progress: true
-    permissions:
-      contents: read
-      issues: write
-      pull-requests: write
-
-    steps:
-      - name: Harden Runner
-        uses: step-security/harden-runner@6c439dc8bdf85cadbbce9ed30d1c7b959517bc49 # v2.12.2
-        with:
-          egress-policy: audit
-
-      - name: Checkout main repository
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-        with:
-          repository: ${{ github.repository }}
-          ref: main
-
-      - name: Setup GitHub App Bot
-        if: github.actor != 'dependabot[bot]'
-        id: setup-bot
-        uses: ./.github/actions/setup-bot
-        continue-on-error: true
-        with:
-          app-id: ${{ secrets.GH_APP_ID }}
-          private-key: ${{ secrets.GH_APP_PRIVATE_KEY }}
-
-      - name: Add deployment started comment
-        id: deployment-started
-        uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
-        with:
-          github-token: ${{ steps.setup-bot.outputs.token }}
-          script: |
-            const { owner, repo } = context.repo;
-            const prNumber = ${{ needs.check-pr.outputs.pr_number }};
-            
-            // Delete previous V2 deployment comments to avoid clutter
-            const { data: comments } = await github.rest.issues.listComments({
-              owner,
-              repo,
-              issue_number: prNumber,
-              per_page: 100
-            });
-
-            const v2Comments = comments.filter(comment => 
-              comment.body.includes('🚀 **Auto-deploying V2 version**') ||
-              comment.body.includes('## 🚀 V2 Auto-Deployment Complete!') ||
-              comment.body.includes('❌ **V2 Auto-deployment failed**')
-            );
-
-            for (const comment of v2Comments) {
-              console.log(`Deleting old V2 comment: ${comment.id}`);
-              await github.rest.issues.deleteComment({
-                owner,
-                repo,
-                comment_id: comment.id
-              });
-            }
-            
-            // Create new deployment started comment
-            const { data: newComment } = await github.rest.issues.createComment({
-              owner,
-              repo,
-              issue_number: prNumber,
-              body: `🚀 **Auto-deploying V2 version** for PR #${prNumber}...\n\n_This is an automated deployment triggered by V2/version2 keywords in the PR title or V2/React keywords in the branch name._\n\n⚠️ **Note:** If new commits are pushed during deployment, this build will be cancelled and replaced with the latest version.`
-            });
-            return newComment.id;
-
-      - name: Checkout PR
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-        with:
-          repository: ${{ needs.check-pr.outputs.pr_repository }}
-          ref: ${{ needs.check-pr.outputs.pr_ref }}
-          token: ${{ secrets.GITHUB_TOKEN }}
-          fetch-depth: 0  # Fetch full history for commit hash detection
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@e468171a9de216ec08956ac3ada2f0791b6bd435 # v3.11.1
-
-      - name: Get version number
-        id: versionNumber
-        run: |
-          VERSION=$(grep "^version =" build.gradle | awk -F'"' '{print $2}')
-          echo "versionNumber=$VERSION" >> $GITHUB_OUTPUT
-
-      - name: Login to Docker Hub
-        uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v3.4.0
-        with:
-          username: ${{ secrets.DOCKER_HUB_USERNAME }}
-          password: ${{ secrets.DOCKER_HUB_API }}
-
-      - name: Get commit hashes for frontend and backend
-        id: commit-hashes
-        run: |
-          # Get last commit that touched the frontend folder, docker/frontend, or docker/compose
-          FRONTEND_HASH=$(git log -1 --format="%H" -- frontend/ docker/frontend/ docker/compose/ 2>/dev/null || echo "")
-          if [ -z "$FRONTEND_HASH" ]; then
-            FRONTEND_HASH="no-frontend-changes"
-          fi
-
-          # Get last commit that touched backend code, docker/backend, or docker/compose
-          BACKEND_HASH=$(git log -1 --format="%H" -- app/ docker/backend/ docker/compose/ 2>/dev/null || echo "")
-          if [ -z "$BACKEND_HASH" ]; then
-            BACKEND_HASH="no-backend-changes"
-          fi
-          
-          echo "Frontend hash: $FRONTEND_HASH"
-          echo "Backend hash: $BACKEND_HASH"
-          
-          echo "frontend_hash=$FRONTEND_HASH" >> $GITHUB_OUTPUT
-          echo "backend_hash=$BACKEND_HASH" >> $GITHUB_OUTPUT
-          
-          # Short hashes for tags
-          if [ "$FRONTEND_HASH" = "no-frontend-changes" ]; then
-            echo "frontend_short=no-frontend" >> $GITHUB_OUTPUT
-          else
-            echo "frontend_short=${FRONTEND_HASH:0:8}" >> $GITHUB_OUTPUT
-          fi
-          
-          if [ "$BACKEND_HASH" = "no-backend-changes" ]; then
-            echo "backend_short=no-backend" >> $GITHUB_OUTPUT
-          else
-            echo "backend_short=${BACKEND_HASH:0:8}" >> $GITHUB_OUTPUT
-          fi
-
-      - name: Check if frontend image exists
-        id: check-frontend
-        run: |
-          if docker manifest inspect ${{ secrets.DOCKER_HUB_USERNAME }}/test:v2-frontend-${{ steps.commit-hashes.outputs.frontend_short }} >/dev/null 2>&1; then
-            echo "exists=true" >> $GITHUB_OUTPUT
-            echo "Frontend image already exists, skipping build"
-          else
-            echo "exists=false" >> $GITHUB_OUTPUT
-            echo "Frontend image needs to be built"
-          fi
-
-      - name: Check if backend image exists
-        id: check-backend
-        run: |
-          if docker manifest inspect ${{ secrets.DOCKER_HUB_USERNAME }}/test:v2-backend-${{ steps.commit-hashes.outputs.backend_short }} >/dev/null 2>&1; then
-            echo "exists=true" >> $GITHUB_OUTPUT
-            echo "Backend image already exists, skipping build"
-          else
-            echo "exists=false" >> $GITHUB_OUTPUT
-            echo "Backend image needs to be built"
-          fi
-
-      - name: Build and push V2 frontend image
-        if: steps.check-frontend.outputs.exists == 'false'
-        uses: docker/build-push-action@263435318d21b8e681c14492fe198d362a7d2c83 # v6.18.0
-        with:
-          context: .
-          file: ./docker/frontend/Dockerfile
-          push: true
-          tags: ${{ secrets.DOCKER_HUB_USERNAME }}/test:v2-frontend-${{ steps.commit-hashes.outputs.frontend_short }}
-          build-args: VERSION_TAG=v2-alpha
-          platforms: linux/amd64
-
-      - name: Build and push V2 backend image
-        if: steps.check-backend.outputs.exists == 'false'
-        uses: docker/build-push-action@263435318d21b8e681c14492fe198d362a7d2c83 # v6.18.0
-        with:
-          context: .
-          file: ./docker/backend/Dockerfile
-          push: true
-          tags: ${{ secrets.DOCKER_HUB_USERNAME }}/test:v2-backend-${{ steps.commit-hashes.outputs.backend_short }}
-          build-args: VERSION_TAG=v2-alpha
-          platforms: linux/amd64
-
-      - name: Set up SSH
-        run: |
-          mkdir -p ~/.ssh/
-          echo "${{ secrets.VPS_SSH_KEY }}" > ../private.key
-          sudo chmod 600 ../private.key
-
-      - name: Deploy V2 to VPS
-        id: deploy
-        run: |
-          # Use same port strategy as regular PRs - just the PR number
-          V2_PORT=${{ needs.check-pr.outputs.pr_number }}
-          BACKEND_PORT=$((V2_PORT + 10000))  # Backend on higher port to avoid conflicts
-          
-          # Create docker-compose for V2 with separate frontend and backend
-          cat > docker-compose.yml << EOF
-          version: '3.3'
-          services:
-            stirling-pdf-v2-backend:
-              container_name: stirling-pdf-v2-backend-pr-${{ needs.check-pr.outputs.pr_number }}
-              image: ${{ secrets.DOCKER_HUB_USERNAME }}/test:v2-backend-${{ steps.commit-hashes.outputs.backend_short }}
-              ports:
-                - "${BACKEND_PORT}:8080"    # Backend API port
-              volumes:
-                - /stirling/V2-PR-${{ needs.check-pr.outputs.pr_number }}/data:/usr/share/tessdata:rw
-                - /stirling/V2-PR-${{ needs.check-pr.outputs.pr_number }}/config:/configs:rw
-                - /stirling/V2-PR-${{ needs.check-pr.outputs.pr_number }}/logs:/logs:rw
-              environment:
-                DISABLE_ADDITIONAL_FEATURES: "true"
-                SECURITY_ENABLELOGIN: "false"
-                SYSTEM_DEFAULTLOCALE: en-GB
-                UI_APPNAME: "Stirling-PDF V2 PR#${{ needs.check-pr.outputs.pr_number }}"
-                UI_HOMEDESCRIPTION: "V2 PR#${{ needs.check-pr.outputs.pr_number }} - Frontend/Backend Split Architecture"
-                UI_APPNAMENAVBAR: "V2 PR#${{ needs.check-pr.outputs.pr_number }}"
-                SYSTEM_MAXFILESIZE: "100"
-                METRICS_ENABLED: "true"
-                SYSTEM_GOOGLEVISIBILITY: "false"
-                SWAGGER_SERVER_URL: "https://${V2_PORT}.ssl.stirlingpdf.cloud"
-                baseUrl: "https://${V2_PORT}.ssl.stirlingpdf.cloud"
-              restart: on-failure:5
-
-            stirling-pdf-v2-frontend:
-              container_name: stirling-pdf-v2-frontend-pr-${{ needs.check-pr.outputs.pr_number }}
-              image: ${{ secrets.DOCKER_HUB_USERNAME }}/test:v2-frontend-${{ steps.commit-hashes.outputs.frontend_short }}
-              ports:
-                - "${V2_PORT}:80"          # Frontend port (same as regular PRs)
-              environment:
-                VITE_API_BASE_URL: "http://${{ secrets.VPS_HOST }}:${BACKEND_PORT}"
-              depends_on:
-                - stirling-pdf-v2-backend
-              restart: on-failure:5
-          EOF
-
-          # Deploy to VPS
-          scp -i ../private.key -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null docker-compose.yml ${{ secrets.VPS_USERNAME }}@${{ secrets.VPS_HOST }}:/tmp/docker-compose-v2.yml
-
-          ssh -i ../private.key -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -T ${{ secrets.VPS_USERNAME }}@${{ secrets.VPS_HOST }} << ENDSSH
-            # Create V2 PR-specific directories
-            mkdir -p /stirling/V2-PR-${{ needs.check-pr.outputs.pr_number }}/{data,config,logs}
-
-            # Move docker-compose file to correct location
-            mv /tmp/docker-compose-v2.yml /stirling/V2-PR-${{ needs.check-pr.outputs.pr_number }}/docker-compose.yml
-
-            # Stop any existing container and clean up
-            cd /stirling/V2-PR-${{ needs.check-pr.outputs.pr_number }}
-            docker-compose down --remove-orphans 2>/dev/null || true
-            
-            # Start the new container
-            docker-compose pull
-            docker-compose up -d
-            
-            # Clean up unused Docker resources to save space
-            docker system prune -af --volumes || true
-
-            # Clean up old backend/frontend images (older than 2 weeks)
-            docker image prune -af --filter "until=336h" --filter "label!=keep=true" || true
-          ENDSSH
-
-          # Set port for output
-          echo "v2_port=${V2_PORT}" >> $GITHUB_OUTPUT
-
-      - name: Post V2 deployment URL to PR
-        if: success()
-        uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
-        with:
-          github-token: ${{ steps.setup-bot.outputs.token }}
-          script: |
-            const { owner, repo } = context.repo;
-            const prNumber = ${{ needs.check-pr.outputs.pr_number }};
-            const v2Port = ${{ steps.deploy.outputs.v2_port }};
-            
-            // Delete the "deploying..." comment since we're posting the final result
-            const deploymentStartedId = ${{ steps.deployment-started.outputs.result }};
-            if (deploymentStartedId) {
-              console.log(`Deleting deployment started comment: ${deploymentStartedId}`);
-              try {
-                await github.rest.issues.deleteComment({
-                  owner,
-                  repo,
-                  comment_id: deploymentStartedId
-                });
-              } catch (error) {
-                console.log(`Could not delete deployment started comment: ${error.message}`);
-              }
-            }
-            
-            const deploymentUrl = `http://${{ secrets.VPS_HOST }}:${v2Port}`;
-            const httpsUrl = `https://${v2Port}.ssl.stirlingpdf.cloud`;
-
-            const commentBody = `## 🚀 V2 Auto-Deployment Complete!\n\n` +
-                              `Your V2 PR with the new frontend/backend split architecture has been deployed!\n\n` +
-                              `🔗 **Direct Test URL (non-SSL)** [${deploymentUrl}](${deploymentUrl})\n\n` +
-                              `🔐 **Secure HTTPS URL**: [${httpsUrl}](${httpsUrl})\n\n` +
-                              `_This deployment will be automatically cleaned up when the PR is closed._\n\n` +
-                              `🔄 **Auto-deployed** because PR title or branch name contains V2/version2/React keywords.`;
-
-            await github.rest.issues.createComment({
-              owner,
-              repo,
-              issue_number: prNumber,
-              body: commentBody
-            });
-
-  cleanup-v2-deployment:
-    if: github.event.action == 'closed'
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-      issues: write
-      pull-requests: write
-
-    steps:
-      - name: Harden Runner
-        uses: step-security/harden-runner@6c439dc8bdf85cadbbce9ed30d1c7b959517bc49 # v2.12.2
-        with:
-          egress-policy: audit
-
-      - name: Checkout repository
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-
-      - name: Setup GitHub App Bot
-        if: github.actor != 'dependabot[bot]'
-        id: setup-bot
-        uses: ./.github/actions/setup-bot
-        continue-on-error: true
-        with:
-          app-id: ${{ secrets.GH_APP_ID }}
-          private-key: ${{ secrets.GH_APP_PRIVATE_KEY }}
-
-      - name: Clean up V2 deployment comments
-        uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
-        with:
-          github-token: ${{ steps.setup-bot.outputs.token }}
-          script: |
-            const { owner, repo } = context.repo;
-            const prNumber = ${{ github.event.pull_request.number }};
-            
-            // Find and delete V2 deployment comments
-            const { data: comments } = await github.rest.issues.listComments({
-              owner,
-              repo,
-              issue_number: prNumber
-            });
-            
-            const v2Comments = comments.filter(c =>
-              c.body?.includes("## 🚀 V2 Auto-Deployment Complete!") &&
-              c.user?.type === "Bot"
-            );
-            
-            for (const comment of v2Comments) {
-              await github.rest.issues.deleteComment({
-                owner,
-                repo,
-                comment_id: comment.id
-              });
-              console.log(`Deleted V2 deployment comment (ID: ${comment.id})`);
-            }
-
-      - name: Set up SSH
-        run: |
-          mkdir -p ~/.ssh/
-          echo "${{ secrets.VPS_SSH_KEY }}" > ../private.key
-          sudo chmod 600 ../private.key
-
-      - name: Cleanup V2 deployment
-        run: |
-          ssh -i ../private.key -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -T ${{ secrets.VPS_USERNAME }}@${{ secrets.VPS_HOST }} << 'ENDSSH'
-            if [ -d "/stirling/V2-PR-${{ github.event.pull_request.number }}" ]; then
-              echo "Found V2 PR directory, proceeding with cleanup..."
-
-              # Stop and remove V2 containers
-              cd /stirling/V2-PR-${{ github.event.pull_request.number }}
-              docker-compose down || true
-
-              # Go back to root before removal
-              cd /
-
-              # Remove V2 PR-specific directories
-              rm -rf /stirling/V2-PR-${{ github.event.pull_request.number }}
-
-              # Clean up V2 containers by name (in case compose cleanup missed them)
-              docker rm -f stirling-pdf-v2-frontend-pr-${{ github.event.pull_request.number }} || true
-              docker rm -f stirling-pdf-v2-backend-pr-${{ github.event.pull_request.number }} || true
-
-              echo "V2 cleanup completed"
-            else
-              echo "V2 PR directory not found, nothing to clean up"
-            fi
-            
-            # Clean up old unused images (older than 2 weeks) but keep recent ones for reuse
-            docker image prune -af --filter "until=336h" --filter "label!=keep=true" || true
-
-            # Note: We don't remove the commit-based images since they can be reused across PRs
-            # Only remove PR-specific containers and directories
-          ENDSSH
-
-      - name: Cleanup temporary files
-        if: always()
-        run: |
-          rm -f ../private.key
-        continue-on-error: true
@@ -6,18 +6,20 @@ on:

 permissions:
  contents: read
-  pull-requests: read
+  issues: write      # Required for adding reactions to comments
+  pull-requests: read # Required for reading PR information

 jobs:
  check-comment:
    runs-on: ubuntu-latest
    permissions:
      issues: write
+      pull-requests: read
    if: |
      github.event.issue.pull_request &&
      (
-        contains(github.event.comment.body, 'prdeploy') ||
-        contains(github.event.comment.body, 'deploypr')
+      contains(github.event.comment.body, 'prdeploy') ||
+      contains(github.event.comment.body, 'deploypr')
      )
      &&
      (
@@ -28,8 +30,6 @@ jobs:
        github.event.comment.user.login == 'sbplat' ||
        github.event.comment.user.login == 'reecebrowne' ||
        github.event.comment.user.login == 'DarioGii' ||
-        github.event.comment.user.login == 'EthanHealy01' ||
-        github.event.comment.user.login == 'jbrunton96' ||
        github.event.comment.user.login == 'ConnorYoh'
      )
    outputs:
@@ -37,23 +37,18 @@ 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@ec9f2d5744a09debf3a187a3f4f675c53b671911 # v2.13.0
+        uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
        with:
          egress-policy: audit

-      - name: Checkout PR
-        uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0
-
-      - name: Setup GitHub App Bot
-        if: github.actor != 'dependabot[bot]'
-        id: setup-bot
-        uses: ./.github/actions/setup-bot
-        continue-on-error: true
+      # Generate GitHub App token
+      - name: Generate GitHub App Token
+        id: generate-token
+        uses: actions/create-github-app-token@df432ceedc7162793a195dd1713ff69aefc7379e # v2.0.6
        with:
          app-id: ${{ secrets.GH_APP_ID }}
          private-key: ${{ secrets.GH_APP_PRIVATE_KEY }}
@@ -89,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:
@@ -97,36 +92,17 @@ 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
        id: add-eyes-reaction
        uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
        with:
-          github-token: ${{ steps.setup-bot.outputs.token }}
+          github-token: ${{ steps.generate-token.outputs.token }}
          script: |
            console.log(`Adding eyes reaction to comment ID: ${context.payload.comment.id}`);
            try {
@@ -148,33 +124,28 @@ jobs:
    needs: check-comment
    runs-on: ubuntu-latest
    permissions:
+      contents: read
      issues: write
-      pull-requests: write

    steps:
      - name: Harden Runner
-        uses: step-security/harden-runner@ec9f2d5744a09debf3a187a3f4f675c53b671911 # v2.13.0
+        uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
        with:
          egress-policy: audit

-      - name: Checkout PR
-        uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0
-
-      - name: Setup GitHub App Bot
-        if: github.actor != 'dependabot[bot]'
-        id: setup-bot
-        uses: ./.github/actions/setup-bot
-        continue-on-error: true
+      - name: Generate GitHub App Token
+        id: generate-token
+        uses: actions/create-github-app-token@df432ceedc7162793a195dd1713ff69aefc7379e # v2.0.6
        with:
          app-id: ${{ secrets.GH_APP_ID }}
          private-key: ${{ secrets.GH_APP_PRIVATE_KEY }}

      - name: Checkout PR
-        uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
        with:
          repository: ${{ needs.check-comment.outputs.pr_repository }}
          ref: ${{ needs.check-comment.outputs.pr_ref }}
-          token: ${{ steps.setup-bot.outputs.token }}
+          token: ${{ secrets.GITHUB_TOKEN }}

      - name: Set up JDK
        uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
@@ -184,20 +155,26 @@ 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
+        run: |
+          VERSION=$(grep "^version =" build.gradle | awk -F'"' '{print $2}')
+          echo "versionNumber=$VERSION" >> $GITHUB_OUTPUT

      - name: Login to Docker Hub
-        uses: docker/login-action@184bdaa0721073962dff0199f1fb9940f07167d1 # v3.5.0
+        uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v3.4.0
        with:
          username: ${{ secrets.DOCKER_HUB_USERNAME }}
          password: ${{ secrets.DOCKER_HUB_API }}
@@ -222,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'
@@ -261,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 }}"
@@ -270,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

@@ -291,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

@@ -299,7 +258,7 @@ jobs:
        if: success()
        uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
        with:
-          github-token: ${{ steps.setup-bot.outputs.token }}
+          github-token: ${{ steps.generate-token.outputs.token }}
          script: |
            console.log(`Adding rocket reaction to comment ID: ${{ needs.check-comment.outputs.comment_id }}`);
            try {
@@ -315,26 +274,11 @@ jobs:
              console.error(error);
            }

-            // add label to PR
-            const prNumber = ${{ needs.check-comment.outputs.pr_number }};
-            try {
-              await github.rest.issues.addLabels({
-                owner: context.repo.owner,
-                repo: context.repo.repo,
-                issue_number: prNumber,
-                labels: ['pr-deployed']
-              });
-              console.log(`Added 'pr-deployed' label to PR #${prNumber}`);
-            } catch (error) {
-              console.error(`Failed to add label to PR: ${error.message}`);
-              console.error(error);
-            }
-
      - name: Add failure reaction to comment
        if: failure()
        uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
        with:
-          github-token: ${{ steps.setup-bot.outputs.token }}
+          github-token: ${{ steps.generate-token.outputs.token }}
          script: |
            console.log(`Adding -1 reaction to comment ID: ${{ needs.check-comment.outputs.comment_id }}`);
            try {
@@ -354,7 +298,7 @@ jobs:
        if: success()
        uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
        with:
-          github-token: ${{ steps.setup-bot.outputs.token }}
+          github-token: ${{ steps.generate-token.outputs.token }}
          script: |
            const { GITHUB_REPOSITORY } = process.env;
            const [repoOwner, repoName] = GITHUB_REPOSITORY.split('/');
@@ -374,11 +318,3 @@ jobs:
              issue_number: prNumber,
              body: commentBody
            });
-
-      - name: Cleanup temporary files
-        if: always()
-        run: |
-          echo "Cleaning up temporary files..."
-          rm -f ../private.key docker-compose.yml
-          echo "Cleanup complete."
-        continue-on-error: true
@@ -1,7 +1,7 @@
 name: PR Deployment cleanup

 on:
-  pull_request_target:
+  pull_request:
    types: [opened, synchronize, reopened, closed]

 permissions:
@@ -13,99 +13,25 @@ env:

 jobs:
  cleanup:
-    if: github.event.action == 'closed'
    runs-on: ubuntu-latest
    permissions:
+      contents: write
      pull-requests: write
-      issues: write
+    if: github.event.action == 'closed'

    steps:
      - name: Harden Runner
-        uses: step-security/harden-runner@ec9f2d5744a09debf3a187a3f4f675c53b671911 # v2.13.0
+        uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
        with:
          egress-policy: audit

-      - name: Checkout PR
-        uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0
-
-      - name: Setup GitHub App Bot
-        if: github.actor != 'dependabot[bot]'
-        id: setup-bot
-        uses: ./.github/actions/setup-bot
-        continue-on-error: true
-        with:
-          app-id: ${{ secrets.GH_APP_ID }}
-          private-key: ${{ secrets.GH_APP_PRIVATE_KEY }}
-
-      - name: Remove 'pr-deployed' label if present
-        id: remove-label-comment
-        uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
-        with:
-          github-token: ${{ steps.setup-bot.outputs.token }}
-          script: |
-            const prNumber = ${{ github.event.pull_request.number }};
-            const owner = context.repo.owner;
-            const repo = context.repo.repo;
-
-            // Get all labels on the PR
-            const { data: labels } = await github.rest.issues.listLabelsOnIssue({
-              owner,
-              repo,
-              issue_number: prNumber
-            });
-
-            const hasLabel = labels.some(label => label.name === 'pr-deployed');
-
-            if (hasLabel) {
-              console.log("Label 'pr-deployed' found. Removing...");
-              await github.rest.issues.removeLabel({
-                owner,
-                repo,
-                issue_number: prNumber,
-                name: 'pr-deployed'
-              });
-            } else {
-              console.log("Label 'pr-deployed' not found. Nothing to do.");
-            }
-
-            // Find existing bot comments about the deployment
-            const { data: comments } = await github.rest.issues.listComments({
-              owner,
-              repo,
-              issue_number: prNumber
-            });
-            const deploymentComments = comments.filter(c =>
-              c.body?.includes("## 🚀 PR Test Deployment") &&
-              c.user?.type === "Bot"
-            );
-
-            if (deploymentComments.length > 0) {
-              for (const comment of deploymentComments) {
-                await github.rest.issues.deleteComment({
-                  owner,
-                  repo,
-                  comment_id: comment.id
-                });
-                console.log(`Deleted deployment comment (ID: ${comment.id})`);
-              }
-            } else {
-              console.log("No matching deployment comments found.");
-            }
-
-            // Set flag if either label or comment was present
-            const hasDeploymentComment = deploymentComments.length > 0;
-            core.setOutput('present', (hasLabel || hasDeploymentComment) ? 'true' : 'false');
-
-
      - name: Set up SSH
-        if: steps.remove-label-comment.outputs.present == 'true'
        run: |
          mkdir -p ~/.ssh/
          echo "${{ secrets.VPS_SSH_KEY }}" > ../private.key
          sudo chmod 600 ../private.key

      - name: Cleanup PR deployment
-        if: steps.remove-label-comment.outputs.present == 'true'
        id: cleanup
        run: |
          ssh -i ../private.key -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -T ${{ secrets.VPS_USERNAME }}@${{ secrets.VPS_HOST }} << 'ENDSSH'
@@ -131,11 +57,3 @@ jobs:
              echo "NO_CLEANUP_NEEDED"
            fi
          ENDSSH
-
-      - name: Cleanup temporary files
-        if: always()
-        run: |
-          echo "Cleaning up temporary files..."
-          rm -f ../private.key
-          echo "Cleanup complete."
-        continue-on-error: true
@@ -1,228 +0,0 @@
-name: AI - PR Title Review
-
-on:
-  pull_request:
-    types: [opened, edited]
-    branches: [main]
-
-permissions:  # required for secure-repo hardening
-  contents: read
-
-jobs:
-  ai-title-review:
-    permissions:
-      contents: read
-      pull-requests: write
-      models: read
-
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Harden Runner
-        uses: step-security/harden-runner@ec9f2d5744a09debf3a187a3f4f675c53b671911 # v2.13.0
-        with:
-          egress-policy: audit
-
-      - uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0
-        with:
-          fetch-depth: 0
-
-      - name: Configure Git to suppress detached HEAD warning
-        run: git config --global advice.detachedHead false
-
-      - name: Setup GitHub App Bot
-        if: github.actor != 'dependabot[bot]'
-        id: setup-bot
-        uses: ./.github/actions/setup-bot
-        continue-on-error: true
-        with:
-          app-id: ${{ secrets.GH_APP_ID }}
-          private-key: ${{ secrets.GH_APP_PRIVATE_KEY }}
-
-      - name: Check if actor is repo developer
-        id: actor
-        run: |
-          if [[ "${{ github.actor }}" == *"[bot]" ]]; then
-            echo "PR opened by a bot – skipping AI title review."
-            echo "is_repo_dev=false" >> $GITHUB_OUTPUT
-            exit 0
-          fi
-          if [ ! -f .github/config/repo_devs.json ]; then
-            echo "Error: .github/config/repo_devs.json not found" >&2
-            exit 1
-          fi
-          # Validate JSON and extract repo_devs
-          REPO_DEVS=$(jq -r '.repo_devs[]' .github/config/repo_devs.json 2>/dev/null || { echo "Error: Invalid JSON in repo_devs.json" >&2; exit 1; })
-          # Convert developer list into Bash array
-          mapfile -t DEVS_ARRAY <<< "$REPO_DEVS"
-          if [[ " ${DEVS_ARRAY[*]} " == *" ${{ github.actor }} "* ]]; then
-            echo "is_repo_dev=true" >> $GITHUB_OUTPUT
-          else
-            echo "is_repo_dev=false" >> $GITHUB_OUTPUT
-          fi
-
-      - name: Get PR diff
-        if: steps.actor.outputs.is_repo_dev == 'true'
-        id: get_diff
-        run: |
-          git fetch origin ${{ github.base_ref }}
-          git diff origin/${{ github.base_ref }}...HEAD | head -n 10000 | grep -vP '[\x00-\x08\x0B\x0C\x0E-\x1F\x7F\x{202E}\x{200B}]' > pr.diff
-          echo "diff<<EOF" >> $GITHUB_OUTPUT
-          cat pr.diff >> $GITHUB_OUTPUT
-          echo "EOF" >> $GITHUB_OUTPUT
-
-      - name: Check and sanitize PR title
-        if: steps.actor.outputs.is_repo_dev == 'true'
-        id: sanitize_pr_title
-        env:
-          PR_TITLE_RAW: ${{ github.event.pull_request.title }}
-        run: |
-          # Sanitize PR title: max 72 characters, only printable characters
-          PR_TITLE=$(echo "$PR_TITLE_RAW" | tr -d '\n\r' | head -c 72 | sed 's/[^[:print:]]//g')
-          if [[ ${#PR_TITLE} -lt 5 ]]; then
-            echo "PR title is too short. Must be at least 5 characters." >&2
-          fi
-          echo "pr_title=$PR_TITLE" >> $GITHUB_OUTPUT
-
-      - name: AI PR Title Analysis
-        if: steps.actor.outputs.is_repo_dev == 'true'
-        id: ai-title-analysis
-        uses: actions/ai-inference@b81b2afb8390ee6839b494a404766bef6493c7d9 # v1.2.8
-        with:
-          model: openai/gpt-4o
-          system-prompt-file: ".github/config/system-prompt.txt"
-          prompt: |
-            Based on the following input data:
-
-            {
-              "diff": "${{ steps.get_diff.outputs.diff }}",
-              "pr_title": "${{ steps.sanitize_pr_title.outputs.pr_title }}"
-            }
-
-            Respond ONLY with valid JSON in the format:
-            {
-              "improved_rating": <0-10>,
-              "improved_ai_title_rating": <0-10>,
-              "improved_title": "<ai generated title>"
-            }
-
-      - name: Validate and set SCRIPT_OUTPUT
-        if: steps.actor.outputs.is_repo_dev == 'true'
-        run: |
-          cat <<EOF > ai_response.json
-          ${{ steps.ai-title-analysis.outputs.response }}
-          EOF
-
-          # Validate JSON structure
-          jq -e '
-            (keys | sort) == ["improved_ai_title_rating", "improved_rating", "improved_title"] and
-            (.improved_rating | type == "number" and . >= 0 and . <= 10) and
-            (.improved_ai_title_rating | type == "number" and . >= 0 and . <= 10) and
-            (.improved_title | type == "string")
-          ' ai_response.json
-          if [ $? -ne 0 ]; then
-            echo "Invalid AI response format" >&2
-            cat ai_response.json >&2
-            exit 1
-          fi
-          # Parse JSON fields
-          IMPROVED_RATING=$(jq -r '.improved_rating' ai_response.json)
-          IMPROVED_TITLE=$(jq -r '.improved_title' ai_response.json)
-          # Limit comment length to 1000 characters
-          COMMENT=$(cat <<EOF
-          ## 🤖 AI PR Title Suggestion
-
-          **PR-Title Rating**: $IMPROVED_RATING/10
-
-          ### ⬇️ Suggested Title (copy & paste):
-
-          \`\`\`
-          $IMPROVED_TITLE
-          \`\`\`
-
-          ---
-          *Generated by GitHub Models AI*
-          EOF
-          )
-          echo "$COMMENT" > /tmp/ai-title-comment.md
-          # Log input and output to the GitHub Step Summary
-          echo "### 🤖 AI PR Title Analysis" >> $GITHUB_STEP_SUMMARY
-          echo "### Input PR Title" >> $GITHUB_STEP_SUMMARY
-          echo '```bash' >> $GITHUB_STEP_SUMMARY
-          echo "${{ steps.sanitize_pr_title.outputs.pr_title }}" >> $GITHUB_STEP_SUMMARY
-          echo '```' >> $GITHUB_STEP_SUMMARY
-          echo '### AI Response (raw JSON)' >> $GITHUB_STEP_SUMMARY
-          echo '```json' >> $GITHUB_STEP_SUMMARY
-          cat ai_response.json >> $GITHUB_STEP_SUMMARY
-          echo '```' >> $GITHUB_STEP_SUMMARY
-
-      - name: Post comment on PR if needed
-        if: steps.actor.outputs.is_repo_dev == 'true'
-        uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
-        continue-on-error: true
-        with:
-          github-token: ${{ steps.setup-bot.outputs.token }}
-          script: |
-            const fs = require('fs');
-            const body = fs.readFileSync('/tmp/ai-title-comment.md', 'utf8');
-            const { GITHUB_REPOSITORY } = process.env;
-            const [owner, repo] = GITHUB_REPOSITORY.split('/');
-            const issue_number = context.issue.number;
-
-            const ratingMatch = body.match(/\*\*PR-Title Rating\*\*: (\d+)\/10/);
-            const rating = ratingMatch ? parseInt(ratingMatch[1], 10) : null;
-
-            const expectedActor = "${{ steps.setup-bot.outputs.app-slug }}[bot]";
-            const comments = await github.rest.issues.listComments({ owner, repo, issue_number });
-
-            const existing = comments.data.find(c =>
-              c.user?.login === expectedActor &&
-              c.body.includes("## 🤖 AI PR Title Suggestion")
-            );
-
-            if (rating === null) {
-              console.log("No rating found in AI response – skipping.");
-              return;
-            }
-
-            if (rating <= 5) {
-              if (existing) {
-                await github.rest.issues.updateComment({
-                  owner, repo,
-                  comment_id: existing.id,
-                  body
-                });
-                console.log("Updated existing suggestion comment.");
-              } else {
-                await github.rest.issues.createComment({
-                  owner, repo, issue_number,
-                  body
-                });
-                console.log("Created new suggestion comment.");
-              }
-            } else {
-              const praise = `## 🤖 AI PR Title Suggestion\n\nGreat job! The current PR title is clear and well-structured.\n\n✅ No suggestions needed.\n\n---\n*Generated by GitHub Models AI*`;
-
-              if (existing) {
-                await github.rest.issues.updateComment({
-                  owner, repo,
-                  comment_id: existing.id,
-                  body: praise
-                });
-                console.log("Replaced suggestion with praise.");
-              } else {
-                console.log("Rating > 5 and no existing comment – skipping comment.");
-              }
-            }
-
-      - name: is not repo dev
-        if: steps.actor.outputs.is_repo_dev != 'true'
-        run: |
-          exit 0 # Skip the AI title review for non-repo developers
-
-      - name: Clean up
-        if: always()
-        run: |
-          rm -f pr.diff ai_response.json /tmp/ai-title-comment.md
-          echo "Cleaned up temporary files."
-        continue-on-error: true # Ensure cleanup runs even if previous steps fail
@@ -0,0 +1,27 @@
+name: "Pull Request Labeler"
+on:
+  pull_request_target:
+    types: [opened, synchronize]
+
+permissions:
+  contents: read
+
+jobs:
+  labeler:
+    runs-on: ubuntu-latest
+    permissions:
+      pull-requests: write
+    steps:
+      - name: Harden Runner
+        uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
+        with:
+          egress-policy: audit
+
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+
+      - name: Apply Labels
+        uses: actions/labeler@8558fd74291d67161a8a78ce36a881fa63b766a9 # v5.0.0
+        with:
+          repo-token: ${{ secrets.GITHUB_TOKEN }}
+          configuration-path: .github/labeler-config.yml
+          sync-labels: true
@@ -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@ec9f2d5744a09debf3a187a3f4f675c53b671911 # v2.13.0
-        with:
-          egress-policy: audit
-
-      - uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.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 }}
-
-      - 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 }}"
@@ -1,194 +1,96 @@
-name: Build and Test Workflow
+name: Build repo

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

 permissions:
  contents: read

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

      - name: Set up JDK ${{ matrix.jdk-version }}
-        uses: actions/setup-java@v4.7.1
+        uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
        with:
          java-version: ${{ matrix.jdk-version }}
          distribution: "temurin"
-      - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@v4.4.2
-        with:
-          gradle-version: 8.14
-      - name: Build with Gradle and spring security ${{ matrix.spring-security }}
-        run: ./gradlew clean build -PnoSpotless
+
+      - name: Build with Gradle and no spring security
+        run: ./gradlew clean build
        env:
-          DISABLE_ADDITIONAL_FEATURES: ${{ matrix.spring-security }}
-      - name: Check Test Reports Exist
-        if: always()
-        run: |
-          declare -a dirs=(
-            "app/core/build/reports/tests/"
-            "app/core/build/test-results/"
-            "app/common/build/reports/tests/"
-            "app/common/build/test-results/"
-            "app/proprietary/build/reports/tests/"
-            "app/proprietary/build/test-results/"
-          )
-          for dir in "${dirs[@]}"; do
-            if [ ! -d "$dir" ]; then
-              echo "Missing $dir"
-              exit 1
-            fi
-          done
+          DOCKER_ENABLE_SECURITY: false
+
+      - name: Build with Gradle and with spring security
+        run: ./gradlew clean build
+        env:
+          DOCKER_ENABLE_SECURITY: true
+
      - name: Upload Test Reports
        if: always()
-        uses: actions/upload-artifact@v4.6.2
+        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: |
-            app/**/build/reports/tests/
-            app/**/build/test-results/
-            app/**/build/reports/problems/
+            build/reports/tests/
+            build/test-results/
            build/reports/problems/
-          retention-days: 3
-          if-no-files-found: warn
-
-  check-generateOpenApiDocs:
-    if: needs.files-changed.outputs.openapi == 'true'
-    needs: [files-changed]
-    runs-on: ubuntu-latest
-    steps:
-      - name: Harden Runner
-        uses: step-security/harden-runner@v2.13.0
-        with:
-          egress-policy: audit
-
-      - name: Checkout repository
-        uses: actions/checkout@v4.3.0
-
-      - name: Set up JDK 17
-        uses: actions/setup-java@v4.7.1
-        with:
-          java-version: "17"
-          distribution: "temurin"
-      - uses: gradle/actions/setup-gradle@v4.4.2
-      - name: Generate OpenAPI documentation
-        run: ./gradlew :stirling-pdf:generateOpenApiDocs
-        env:
-          DISABLE_ADDITIONAL_FEATURES: true
-      
-      - name: Upload OpenAPI Documentation
-        uses: actions/upload-artifact@v4.6.2
-        with:
-          name: openapi-docs
-          path: ./SwaggerDoc.json
-
-  frontend-validation:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Harden Runner
-        uses: step-security/harden-runner@v2.12.2
-        with:
-          egress-policy: audit
-      - name: Checkout repository
-        uses: actions/checkout@v4.2.2
-      - name: Set up Node.js
-        uses: actions/setup-node@v4.1.0
-        with:
-          node-version: '20'
-          cache: 'npm'
-          cache-dependency-path: frontend/package-lock.json
-      - name: Install frontend dependencies
-        run: cd frontend && npm ci
-      - name: Lint frontend
-        run: cd frontend && npm run lint
-      - name: Build frontend
-        run: cd frontend && npm run build
-      - name: Run frontend tests
-        run: cd frontend && npm run test -- --run
-      - name: Upload frontend build artifacts
-        uses: actions/upload-artifact@v4.6.2
-        with:
-          name: frontend-build
-          path: frontend/dist/
+            common/build/reports/tests/
+            common/build/test-results/
+            common/build/reports/problems/
          retention-days: 3

  check-licence:
-    if: needs.files-changed.outputs.build == 'true'
-    needs: [files-changed, build]
    runs-on: ubuntu-latest
    steps:
      - name: Harden Runner
-        uses: step-security/harden-runner@ec9f2d5744a09debf3a187a3f4f675c53b671911 # v2.13.0
+        uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
        with:
          egress-policy: audit
+
      - name: Checkout repository
-        uses: actions/checkout@v4.3.0
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+
      - name: Set up JDK 17
-        uses: actions/setup-java@v4.7.1
+        uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
        with:
          java-version: "17"
-          distribution: "temurin"
+          distribution: "adopt"
+
      - name: check the licenses for compatibility
        run: ./gradlew clean checkLicense
+
      - name: FAILED - check the licenses for compatibility
        if: failure()
-        uses: actions/upload-artifact@v4.6.2
+        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
        with:
          name: dependencies-without-allowed-license.json
-          path: build/reports/dependency-license/dependencies-without-allowed-license.json
+          path: |
+            build/reports/dependency-license/dependencies-without-allowed-license.json
          retention-days: 3

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

    steps:
      - name: Harden Runner
-        uses: step-security/harden-runner@ec9f2d5744a09debf3a187a3f4f675c53b671911 # v2.13.0
+        uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
        with:
          egress-policy: audit

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

      - name: Set up Java 17
        uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
        with:
          java-version: "17"
-          distribution: "temurin"
+          distribution: "adopt"

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

      - name: Install Docker Compose
        run: |
-          sudo curl -SL "https://github.com/docker/compose/releases/download/v2.37.2/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose
+          sudo curl -SL "https://github.com/docker/compose/releases/download/v2.32.4/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose
          sudo chmod +x /usr/local/bin/docker-compose

      - name: Set up Python
@@ -233,7 +135,6 @@ jobs:
        with:
          python-version: "3.12"
          cache: 'pip' # caching pip dependencies
-          cache-dependency-path: ./testing/cucumber/requirements.txt

      - name: Pip requirements
        run: |
@@ -245,69 +146,3 @@ jobs:
          chmod +x ./testing/test.sh
          chmod +x ./testing/test_disabledEndpoints.sh
          ./testing/test.sh
-
-  test-build-docker-images:
-    if: github.event_name == 'pull_request' && needs.files-changed.outputs.project == 'true'
-    needs: [files-changed, build, check-generateOpenApiDocs, check-licence]
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        docker-rev: ["Dockerfile", "Dockerfile.ultra-lite", "Dockerfile.fat"]
-    steps:
-      - name: Harden Runner
-        uses: step-security/harden-runner@ec9f2d5744a09debf3a187a3f4f675c53b671911 # v2.13.0
-        with:
-          egress-policy: audit
-
-      - name: Checkout Repository
-        uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0
-
-      - name: Set up JDK 17
-        uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
-        with:
-          java-version: "17"
-          distribution: "temurin"
-
-      - name: Set up Gradle
-        uses: gradle/actions/setup-gradle@017a9effdb900e5b5b2fddfb590a105619dca3c3 # v4.4.2
-        with:
-          gradle-version: 8.14
-
-      - name: Build application
-        run: ./gradlew clean build
-        env:
-          DISABLE_ADDITIONAL_FEATURES: true
-          STIRLING_PDF_DESKTOP_UI: false
-
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@29109295f81e9208d7d86ff1c6c12d2833863392 # v3.6.0
-
-      - name: Set up Docker Buildx
-        id: buildx
-        uses: docker/setup-buildx-action@e468171a9de216ec08956ac3ada2f0791b6bd435 # v3.11.1
-
-      - name: Build ${{ matrix.docker-rev }}
-        uses: docker/build-push-action@263435318d21b8e681c14492fe198d362a7d2c83 # v6.18.0
-        with:
-          builder: ${{ steps.buildx.outputs.name }}
-          context: .
-          file: ./docker/backend/${{ matrix.docker-rev }}
-          push: false
-          cache-from: type=gha
-          cache-to: type=gha,mode=max
-          platforms: linux/amd64,linux/arm64/v8
-          provenance: true
-          sbom: true
-
-      - name: Upload Reports
-        if: always()
-        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
-        with:
-          name: reports-docker-${{ matrix.docker-rev }}
-          path: |
-            build/reports/tests/
-            build/test-results/
-            build/reports/problems/
-          retention-days: 3
-          if-no-files-found: warn
@@ -4,19 +4,7 @@ on:
  pull_request_target:
    types: [opened, synchronize, reopened]
    paths:
-      - "app/core/src/main/resources/messages_*.properties"
-
-# cancel in-progress jobs if a new job is triggered
-# This is useful to avoid running multiple builds for the same branch if a new commit is pushed
-# or a pull request is updated.
-# It helps to save resources and time by ensuring that only the latest commit is built and tested
-# This is particularly useful for long-running jobs that may take a while to complete.
-# The `group` is set to a combination of the workflow name, event name, and branch name.
-# This ensures that jobs are grouped by the workflow and branch, allowing for cancellation of
-# in-progress jobs when a new commit is pushed to the same branch or a new pull request is opened.
-concurrency:
-  group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.event.pull_request.number || github.ref_name || github.ref }}
-  cancel-in-progress: true
+      - "src/main/resources/messages_*.properties"

 permissions:
  contents: read # Allow read access to repository content
@@ -30,12 +18,12 @@ jobs:
      pull-requests: write # Allow writing to pull requests
    steps:
      - name: Harden Runner
-        uses: step-security/harden-runner@ec9f2d5744a09debf3a187a3f4f675c53b671911 # v2.13.0
+        uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
        with:
          egress-policy: audit

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

      - name: Setup GitHub App Bot
        id: setup-bot
@@ -73,20 +61,7 @@ jobs:
        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 '^app/core/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
@@ -127,11 +102,8 @@ jobs:

            // Filter for relevant files based on the PR changes
            const changedFiles = files
-              .filter(file =>
-                file.status !== "removed" &&
-                /^app\/core\/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);

@@ -169,12 +141,12 @@ jobs:

            // Determine reference file
            let referenceFilePath;
-            if (changedFiles.includes("app/core/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: "app/core/src/main/resources/messages_en_GB.properties",
+                path: "src/main/resources/messages_en_GB.properties",
                ref: branch,
              });

@@ -186,7 +158,7 @@ jobs:
              const { data: fileContent } = await github.rest.repos.getContent({
                owner: repoOwner,
                repo: repoName,
-                path: "app/core/src/main/resources/messages_en_GB.properties",
+                path: "src/main/resources/messages_en_GB.properties",
                ref: "main",
              });

@@ -281,12 +253,3 @@ jobs:
        run: |
          echo "Failing the job because errors were detected."
          exit 1
-
-      - name: Cleanup temporary files
-        if: always()
-        run: |
-          echo "Cleaning up temporary files..."
-          rm -rf pr-branch
-          rm -f pr-branch-messages_en_GB.properties main-branch-messages_en_GB.properties changed_files.txt result.txt
-          echo "Cleanup complete."
-        continue-on-error: true # Ensure cleanup runs even if previous steps fail
@@ -17,11 +17,11 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Harden Runner
-        uses: step-security/harden-runner@ec9f2d5744a09debf3a187a3f4f675c53b671911 # v2.13.0
+        uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
        with:
          egress-policy: audit

      - name: "Checkout Repository"
-        uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
      - name: "Dependency Review"
        uses: actions/dependency-review-action@da24556b548a50705dd671f47852072ea4c105d9 # v4.7.1
@@ -1,189 +0,0 @@
-name: Auto V2 Deploy on Push
-
-on:
-  push:
-    branches:
-      - V2
-      - deploy-on-v2-commit
-
-permissions:
-  contents: read
-
-jobs:
-  deploy-v2-on-push:
-    runs-on: ubuntu-latest
-    concurrency:
-      group: deploy-v2-push-V2
-      cancel-in-progress: true
-
-    steps:
-      - name: Harden Runner
-        uses: step-security/harden-runner@002fdce3c6a235733a90a27c80493a3241e56863 # v2.12.1
-        with:
-          egress-policy: audit
-
-      - name: Checkout code
-        uses: actions/checkout@v4
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-
-      - name: Get commit hashes for frontend and backend
-        id: commit-hashes
-        run: |
-          # Get last commit that touched the frontend folder, docker/frontend, or docker/compose
-          FRONTEND_HASH=$(git log -1 --format="%H" -- frontend/ docker/frontend/ docker/compose/ 2>/dev/null || echo "")
-          if [ -z "$FRONTEND_HASH" ]; then
-            FRONTEND_HASH="no-frontend-changes"
-          fi
-          
-          # Get last commit that touched backend code, docker/backend, or docker/compose
-          BACKEND_HASH=$(git log -1 --format="%H" -- app/ docker/backend/ docker/compose/ 2>/dev/null || echo "")
-          if [ -z "$BACKEND_HASH" ]; then
-            BACKEND_HASH="no-backend-changes"
-          fi
-          
-          echo "Frontend hash: $FRONTEND_HASH"
-          echo "Backend hash: $BACKEND_HASH"
-          
-          echo "frontend_hash=$FRONTEND_HASH" >> $GITHUB_OUTPUT
-          echo "backend_hash=$BACKEND_HASH" >> $GITHUB_OUTPUT
-          
-          # Short hashes for tags
-          if [ "$FRONTEND_HASH" = "no-frontend-changes" ]; then
-            echo "frontend_short=no-frontend" >> $GITHUB_OUTPUT
-          else
-            echo "frontend_short=${FRONTEND_HASH:0:8}" >> $GITHUB_OUTPUT
-          fi
-          
-          if [ "$BACKEND_HASH" = "no-backend-changes" ]; then
-            echo "backend_short=no-backend" >> $GITHUB_OUTPUT
-          else
-            echo "backend_short=${BACKEND_HASH:0:8}" >> $GITHUB_OUTPUT
-          fi
-
-      - name: Check if frontend image exists
-        id: check-frontend
-        run: |
-          if docker manifest inspect ${{ secrets.DOCKER_HUB_USERNAME }}/test:v2-frontend-${{ steps.commit-hashes.outputs.frontend_short }} >/dev/null 2>&1; then
-            echo "exists=true" >> $GITHUB_OUTPUT
-            echo "Frontend image already exists, skipping build"
-          else
-            echo "exists=false" >> $GITHUB_OUTPUT
-            echo "Frontend image needs to be built"
-          fi
-
-      - name: Check if backend image exists
-        id: check-backend
-        run: |
-          if docker manifest inspect ${{ secrets.DOCKER_HUB_USERNAME }}/test:v2-backend-${{ steps.commit-hashes.outputs.backend_short }} >/dev/null 2>&1; then
-            echo "exists=true" >> $GITHUB_OUTPUT
-            echo "Backend image already exists, skipping build"
-          else
-            echo "exists=false" >> $GITHUB_OUTPUT
-            echo "Backend image needs to be built"
-          fi
-
-
-      - name: Login to Docker Hub
-        uses: docker/login-action@v3
-        with:
-          username: ${{ secrets.DOCKER_HUB_USERNAME }}
-          password: ${{ secrets.DOCKER_HUB_API }}
-
-      - name: Build and push frontend image
-        if: steps.check-frontend.outputs.exists == 'false'
-        uses: docker/build-push-action@v6
-        with:
-          context: .
-          file: ./docker/frontend/Dockerfile
-          push: true
-          tags: |
-            ${{ secrets.DOCKER_HUB_USERNAME }}/test:v2-frontend-${{ steps.commit-hashes.outputs.frontend_short }}
-            ${{ secrets.DOCKER_HUB_USERNAME }}/test:v2-frontend-latest
-          build-args: VERSION_TAG=v2-alpha
-          platforms: linux/amd64
-      
-      - name: Build and push backend image
-        if: steps.check-backend.outputs.exists == 'false'
-        uses: docker/build-push-action@v6
-        with:
-          context: .
-          file: ./docker/backend/Dockerfile
-          push: true
-          tags: |
-            ${{ secrets.DOCKER_HUB_USERNAME }}/test:v2-backend-${{ steps.commit-hashes.outputs.backend_short }}
-            ${{ secrets.DOCKER_HUB_USERNAME }}/test:v2-backend-latest
-          build-args: VERSION_TAG=v2-alpha
-          platforms: linux/amd64
-
-
-      - name: Set up SSH
-        run: |
-          mkdir -p ~/.ssh/
-          echo "${{ secrets.VPS_SSH_KEY }}" > ../private.key
-          chmod 600 ../private.key
-
-
-      - name: Deploy to VPS on port 3000
-        run: |
-          export UNIQUE_NAME=docker-compose-v2-$GITHUB_RUN_ID.yml
-      
-          cat > $UNIQUE_NAME << EOF
-          version: '3.3'
-          services:
-            backend:
-              container_name: stirling-v2-backend
-              image: ${{ secrets.DOCKER_HUB_USERNAME }}/test:v2-backend-${{ steps.commit-hashes.outputs.backend_short }}
-              ports:
-                - "13000:8080"
-              volumes:
-                - /stirling/V2/data:/usr/share/tessdata:rw
-                - /stirling/V2/config:/configs:rw
-                - /stirling/V2/logs:/logs:rw
-              environment:
-                DISABLE_ADDITIONAL_FEATURES: "true"
-                SECURITY_ENABLELOGIN: "false"
-                SYSTEM_DEFAULTLOCALE: en-GB
-                UI_APPNAME: "Stirling-PDF V2"
-                UI_HOMEDESCRIPTION: "V2 Frontend/Backend Split"
-                UI_APPNAMENAVBAR: "V2 Deployment"
-                SYSTEM_MAXFILESIZE: "100"
-                METRICS_ENABLED: "true"
-                SYSTEM_GOOGLEVISIBILITY: "false"
-                SWAGGER_SERVER_URL: "https://demo.stirlingpdf.cloud"
-                baseUrl: "https://demo.stirlingpdf.cloud"
-              restart: on-failure:5
-      
-            frontend:
-              container_name: stirling-v2-frontend
-              image: ${{ secrets.DOCKER_HUB_USERNAME }}/test:v2-frontend-${{ steps.commit-hashes.outputs.frontend_short }}
-              ports:
-                - "3000:80"
-              environment:
-                VITE_API_BASE_URL: "http://${{ secrets.VPS_HOST }}:13000"
-              depends_on:
-                - backend
-              restart: on-failure:5
-          EOF
-      
-          # Copy to remote with unique name
-          scp -i ../private.key -o StrictHostKeyChecking=no $UNIQUE_NAME ${{ secrets.VPS_USERNAME }}@${{ secrets.VPS_HOST }}:/tmp/$UNIQUE_NAME
-      
-          # SSH and rename/move atomically to avoid interference
-          ssh -i ../private.key -o StrictHostKeyChecking=no ${{ secrets.VPS_USERNAME }}@${{ secrets.VPS_HOST }} << ENDSSH
-            mkdir -p /stirling/V2/{data,config,logs}
-            mv /tmp/$UNIQUE_NAME /stirling/V2/docker-compose.yml
-            cd /stirling/V2
-            docker-compose down || true
-            docker-compose pull
-            docker-compose up -d
-            docker system prune -af --volumes || true
-            docker image prune -af --filter "until=336h" --filter "label!=keep=true" || true
-          ENDSSH
-
-      - name: Cleanup temporary files
-        if: always()
-        run: |
-          rm -f ../private.key
-
@@ -1,281 +0,0 @@
-name: Frontend License Report Workflow
-
-on:
-  push:
-    branches:
-      - V2
-    paths:
-      - "frontend/package.json"
-      - "frontend/package-lock.json"
-      - "frontend/scripts/generate-licenses.js"
-  pull_request:
-    branches:
-      - V2
-    paths:
-      - "frontend/package.json"
-      - "frontend/package-lock.json"
-      - "frontend/scripts/generate-licenses.js"
-
-permissions:
-  contents: read
-
-jobs:
-  generate-frontend-license-report:
-    runs-on: ubuntu-latest
-    permissions:
-      contents: write
-      pull-requests: write
-      repository-projects: write # Required for enabling automerge
-    steps:
-      - name: Harden Runner
-        uses: step-security/harden-runner@6c439dc8bdf85cadbbce9ed30d1c7b959517bc49 # v2.12.2
-        with:
-          egress-policy: audit
-
-      - name: Checkout PR head (default)
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-        with:
-          fetch-depth: 0
-          persist-credentials: false
-
-      - name: Setup GitHub App Bot
-        if: github.event_name == 'push' || (github.event_name == 'pull_request' && github.event.pull_request.head.repo.fork == false)
-        id: setup-bot
-        uses: ./.github/actions/setup-bot
-        with:
-          app-id: ${{ secrets.GH_APP_ID }}
-          private-key: ${{ secrets.GH_APP_PRIVATE_KEY }}
-
-      - name: Checkout BASE branch (safe script)
-        if: github.event_name == 'pull_request'
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-        with:
-          ref: ${{ github.event.pull_request.base.sha }}
-          path: base
-          fetch-depth: 1
-          persist-credentials: false
-
-      - name: Set up Node.js
-        uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4.1.0
-        with:
-          node-version: '18'
-          cache: 'npm'
-          cache-dependency-path: frontend/package-lock.json
-
-      - name: Install frontend dependencies
-        working-directory: frontend
-        env:
-          NPM_CONFIG_IGNORE_SCRIPTS: "true"
-        run: npm ci --ignore-scripts --audit=false --fund=false
-
-      - name: Generate frontend license report (internal PR)
-        if: github.event_name == 'pull_request' && github.event.pull_request.head.repo.fork == false
-        working-directory: frontend
-        env:
-          PR_IS_FORK: "false"
-        run: npm run generate-licenses
-
-      - name: Generate frontend license report (fork PRs, pinned)
-        if: github.event_name == 'pull_request' && github.event.pull_request.head.repo.fork == true
-        env:
-          NPM_CONFIG_IGNORE_SCRIPTS: "true"
-        working-directory: frontend
-        run: |
-          mkdir -p src/assets
-          npx --yes license-report --only=prod --output=json > src/assets/3rdPartyLicenses.json
-
-      - name: Postprocess with project script (BASE version)
-        if: github.event_name == 'pull_request' && github.event.pull_request.head.repo.fork == true
-        env:
-          PR_IS_FORK: "true"
-        run: |
-          node base/frontend/scripts/generate-licenses.js \
-            --input frontend/src/assets/3rdPartyLicenses.json
-
-      - name: Copy postprocessed artifacts back (fork PRs)
-        if: github.event_name == 'pull_request' && github.event.pull_request.head.repo.fork == true
-        run: |
-          mkdir -p frontend/src/assets
-          if [ -f "base/frontend/src/assets/3rdPartyLicenses.json" ]; then
-            cp base/frontend/src/assets/3rdPartyLicenses.json frontend/src/assets/3rdPartyLicenses.json
-          fi
-          if [ -f "base/frontend/src/assets/license-warnings.json" ]; then
-            cp base/frontend/src/assets/license-warnings.json frontend/src/assets/license-warnings.json
-          fi
-
-      - name: Check for license warnings
-        run: |
-          if [ -f "frontend/src/assets/license-warnings.json" ]; then
-            echo "LICENSE_WARNINGS_EXIST=true" >> $GITHUB_ENV
-          else
-            echo "LICENSE_WARNINGS_EXIST=false" >> $GITHUB_ENV
-          fi
-
-      # PR Event: Check licenses and comment on PR
-      - name: Delete previous license check comments
-        if: github.event_name == 'pull_request' && github.event.pull_request.head.repo.fork == false
-        uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
-        with:
-          github-token: ${{ steps.setup-bot.outputs.token }}
-          script: |
-            const { owner, repo } = context.repo;
-            const prNumber = context.issue.number;
-            
-            // Get all comments on the PR
-            const { data: comments } = await github.rest.issues.listComments({
-              owner,
-              repo,
-              issue_number: prNumber,
-              per_page: 100
-            });
-            
-            // Filter for license check comments
-            const licenseComments = comments.filter(comment => 
-              comment.body.includes('## ✅ Frontend License Check Passed') ||
-              comment.body.includes('## ❌ Frontend License Check Failed')
-            );
-            
-            // Delete old license check comments
-            for (const comment of licenseComments) {
-              console.log(`Deleting old license check comment: ${comment.id}`);
-              await github.rest.issues.deleteComment({
-                owner,
-                repo,
-                comment_id: comment.id
-              });
-            }
-
-      - name: Summarize results (fork PRs)
-        if: github.event_name == 'pull_request' && github.event.pull_request.head.repo.fork == true
-        run: |
-          {
-            echo "## Frontend License Check"
-            echo ""
-            if [ "${LICENSE_WARNINGS_EXIST}" = "true" ]; then
-              echo "❌ **Failed** – incompatible or unknown licenses found."
-              if [ -f "frontend/src/assets/license-warnings.json" ]; then
-                echo ""
-                echo "### Warnings"
-                jq -r '.warnings[] | "- \(.message)"' frontend/src/assets/license-warnings.json || true
-              fi
-            else
-              echo "✅ **Passed** – no license warnings detected."
-            fi
-            echo ""
-            echo "_Note: This is a fork PR. PR comments are disabled; use this summary._"
-          } >> "$GITHUB_STEP_SUMMARY"
-
-      - name: Comment on PR - License Check Results
-        if: github.event_name == 'pull_request' && github.event.pull_request.head.repo.fork == false
-        uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
-        with:
-          github-token: ${{ steps.setup-bot.outputs.token }}
-          script: |
-            const { owner, repo } = context.repo;
-            const prNumber = context.issue.number;
-            const hasWarnings = process.env.LICENSE_WARNINGS_EXIST === 'true';
-            
-            let commentBody;
-            
-            if (hasWarnings) {
-              // Read warnings file to get specific issues
-              const fs = require('fs');
-              let warningDetails = '';
-              try {
-                const warnings = JSON.parse(fs.readFileSync('frontend/src/assets/license-warnings.json', 'utf8'));
-                warningDetails = warnings.warnings.map(w => `- ${w.message}`).join('\n');
-              } catch (e) {
-                warningDetails = 'Unable to read warning details';
-              }
-              
-              commentBody = `## ❌ Frontend License Check Failed
-              
-              The frontend license check has detected compatibility warnings that require review:
-
-              ${warningDetails}
-
-              **Action Required:** Please review these licenses to ensure they are acceptable for your use case before merging.
-
-              _This check will fail the PR until license issues are resolved._`;
-            } else {
-              commentBody = `## ✅ Frontend License Check Passed
-              
-              All frontend licenses have been validated and no compatibility warnings were detected.
-
-              The frontend license report has been updated successfully.`;
-            }
-            
-            await github.rest.issues.createComment({
-              owner,
-              repo,
-              issue_number: prNumber,
-              body: commentBody
-            });
-
-      - name: Fail workflow if license warnings exist (PR only)
-        if: github.event_name == 'pull_request' && env.LICENSE_WARNINGS_EXIST == 'true'
-        run: |
-          echo "❌ License warnings detected. Failing the workflow."
-          exit 1
-
-      # Push Event: Commit license files and create PR
-      - name: Commit changes (Push only)
-        if: github.event_name == 'push'
-        run: |
-          git add frontend/src/assets/3rdPartyLicenses.json
-          # Note: Do NOT commit license-warnings.json - it's only for PR review
-          git diff --staged --quiet || echo "CHANGES_DETECTED=true" >> $GITHUB_ENV
-
-      - name: Prepare PR body (Push only)
-        if: github.event_name == 'push'
-        run: |
-          PR_BODY="Auto-generated by ${{ steps.setup-bot.outputs.app-slug }}[bot]
-
-          This PR updates the frontend license report based on changes to package.json dependencies."
-          
-          if [ "${{ env.LICENSE_WARNINGS_EXIST }}" = "true" ]; then
-            PR_BODY="$PR_BODY
-
-          ## ⚠️ License Compatibility Warnings
-
-          The following licenses may require review for corporate compatibility:
-
-          $(cat frontend/src/assets/license-warnings.json | jq -r '.warnings[].message')
-
-          Please review these licenses to ensure they are acceptable for your use case."
-          fi
-          
-          echo "PR_BODY<<EOF" >> $GITHUB_ENV
-          echo "$PR_BODY" >> $GITHUB_ENV
-          echo "EOF" >> $GITHUB_ENV
-
-      - name: Create Pull Request (Push only)
-        id: cpr
-        if: github.event_name == 'push' && env.CHANGES_DETECTED == 'true'
-        uses: peter-evans/create-pull-request@271a8d0340265f705b14b6d32b9829c1cb33d45e # v7.0.8
-        with:
-          token: ${{ steps.setup-bot.outputs.token }}
-          commit-message: "Update Frontend 3rd Party Licenses"
-          committer: ${{ steps.setup-bot.outputs.committer }}
-          author: ${{ steps.setup-bot.outputs.committer }}
-          signoff: true
-          branch: update-frontend-3rd-party-licenses
-          base: V2
-          title: "Update Frontend 3rd Party Licenses"
-          body: ${{ env.PR_BODY }}
-          labels: Licenses,github-actions,frontend
-          draft: false
-          delete-branch: true
-          sign-commits: true
-
-      - name: Enable Pull Request Automerge (Push only)
-        if: github.event_name == 'push' && steps.cpr.outputs.pull-request-operation == 'created' && env.LICENSE_WARNINGS_EXIST == 'false'
-        run: gh pr merge --squash --auto "${{ steps.cpr.outputs.pull-request-number }}"
-        env:
-          GH_TOKEN: ${{ steps.setup-bot.outputs.token }}
-
-      - name: Add review required label (Push only)
-        if: github.event_name == 'push' && steps.cpr.outputs.pull-request-operation == 'created' && env.LICENSE_WARNINGS_EXIST == 'true'
-        run: gh pr edit "${{ steps.cpr.outputs.pull-request-number }}" --add-label "license-review-required"
-        env:
-          GH_TOKEN: ${{ steps.setup-bot.outputs.token }}
@@ -7,18 +7,6 @@ on:
    paths:
      - "build.gradle"

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

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

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

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

      - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@017a9effdb900e5b5b2fddfb590a105619dca3c3 # v4.4.2
+        uses: gradle/actions/setup-gradle@8379f6a1328ee0e06e2bb424dadb7b159856a326 # v4.4.0

      - name: Check licenses for compatibility
        run: ./gradlew clean checkLicense
@@ -69,11 +57,11 @@ jobs:

      - name: Move and rename license file
        run: |
-          mv build/reports/dependency-license/index.json app/core/src/main/resources/static/3rdPartyLicenses.json
+          mv build/reports/dependency-license/index.json src/main/resources/static/3rdPartyLicenses.json

      - name: Commit changes
        run: |
-          git add app/core/src/main/resources/static/3rdPartyLicenses.json
+          git add src/main/resources/static/3rdPartyLicenses.json
          git diff --staged --quiet || echo "CHANGES_DETECTED=true" >> $GITHUB_ENV

      - name: Create Pull Request
@@ -90,7 +78,7 @@ jobs:
          title: "Update 3rd Party Licenses"
          body: |
            Auto-generated by ${{ steps.setup-bot.outputs.app-slug }}[bot]
-          labels: Licenses,github-actions
+          labels: licenses,github-actions
          draft: false
          delete-branch: true
          sign-commits: true
@@ -15,12 +15,12 @@ jobs:
      issues: write
    steps:
      - name: Harden Runner
-        uses: step-security/harden-runner@ec9f2d5744a09debf3a187a3f4f675c53b671911 # v2.13.0
+        uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
        with:
          egress-policy: audit

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

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

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

-      - name: Set up JDK
-        uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
-        with:
-          distribution: 'temurin'
-          java-version: '21'
-
-      # ✅ Get version from Gradle
+      # Get version number
      - name: Get version number
        id: versionNumber
        run: |
-          VERSION=$(./gradlew printVersion --quiet | tail -1)
+          VERSION=$(grep "^version =" build.gradle | awk -F'"' '{print $2}')
          echo "versionNumber=$VERSION" >> $GITHUB_OUTPUT

-      # ✅ Get Mac-specific version from Gradle
      - name: Get version number mac
        id: versionNumberMac
        run: |
-          VERSION_MAC=$(./gradlew printMacVersion --quiet | tail -1)
-          echo "versionNumberMac=$VERSION_MAC" >> $GITHUB_OUTPUT
+          VERSION=$(grep "^version =" build.gradle | awk -F'"' '{print $2}')
+          CURRENT_YEAR=$(date +'%Y')
+          IFS='.' read -r -a VERSION_PARTS <<< "$VERSION"
+          MAC_VERSION="$CURRENT_YEAR.${VERSION_PARTS[1]:-0}.${VERSION_PARTS[2]:-0}"
+          echo "versionNumberMac=$MAC_VERSION" >> $GITHUB_OUTPUT

  build-portable:
    needs: read_versions
    runs-on: ubuntu-latest
    strategy:
      matrix:
-        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@ec9f2d5744a09debf3a187a3f4f675c53b671911 # v2.13.0
+        uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
        with:
          egress-policy: audit

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

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

-      - uses: gradle/actions/setup-gradle@017a9effdb900e5b5b2fddfb590a105619dca3c3 # v4.4.2
+      - uses: gradle/actions/setup-gradle@8379f6a1328ee0e06e2bb424dadb7b159856a326 # v4.4.0
        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
        run: |
          mkdir ./binaries
          mv ./build/launch4j/Stirling-PDF.exe ./binaries/win-Stirling-PDF-portable-Server${{ matrix.file_suffix }}.exe
-          mv ./app/core/build/libs/stirling-pdf-${{ needs.read_versions.outputs.version }}.jar ./binaries/Stirling-PDF${{ matrix.file_suffix }}.jar
+          mv ./build/libs/Stirling-PDF-${{ needs.read_versions.outputs.version }}.jar ./binaries/Stirling-PDF${{ matrix.file_suffix }}.jar

      - name: Upload build artifacts
        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
@@ -102,20 +98,20 @@ 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@ec9f2d5744a09debf3a187a3f4f675c53b671911 # v2.13.0
+        uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
        with:
          egress-policy: audit

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

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

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

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

-      - uses: gradle/actions/setup-gradle@017a9effdb900e5b5b2fddfb590a105619dca3c3 # v4.4.2
+      - uses: gradle/actions/setup-gradle@8379f6a1328ee0e06e2bb424dadb7b159856a326 # v4.4.0
        with:
          gradle-version: 8.14

@@ -175,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

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

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

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

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

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

      - name: Download signed artifacts
-        uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
+        uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
      - name: Display structure of downloaded files
        run: ls -R
      - name: Upload binaries, attestations and signatures to Release and create GitHub Release
-        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
@@ -2,9 +2,8 @@ name: Pre-commit

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

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

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

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

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

-      - name: Set up JDK
-        uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
-        with:
-          java-version: 17
-          distribution: "temurin"
-
-      - name: Build with Gradle
-        run: ./gradlew clean build
-
      - name: git add
        run: |
          git add .
@@ -7,18 +7,6 @@ on:
      - master
      - main

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

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

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

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

-      - uses: gradle/actions/setup-gradle@017a9effdb900e5b5b2fddfb590a105619dca3c3 # v4.4.2
+      - uses: gradle/actions/setup-gradle@8379f6a1328ee0e06e2bb424dadb7b159856a326 # v4.4.0
        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@d58896d6a1865668819e1d91763c7751a165e159 # v3.9.2
+        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
        run: echo "versionNumber=$(./gradlew printVersion --quiet | tail -1)" >> $GITHUB_OUTPUT

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

      - name: Login to GitHub Container Registry
-        uses: docker/login-action@184bdaa0721073962dff0199f1fb9940f07167d1 # v3.5.0
+        uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v3.4.0
        with:
          registry: ghcr.io
          username: ${{ github.actor }}
@@ -88,8 +76,7 @@ jobs:

      - name: Generate tags
        id: meta
-        uses: docker/metadata-action@c1e51972afc2121e065aed6d45c65596fe445f3f # v5.8.0
-        if: github.ref != 'refs/heads/main'
+        uses: docker/metadata-action@902fa8ec7d6ecbf8d84d538b9b233a880e428804 # v5.7.0
        with:
          images: |
            ${{ secrets.DOCKER_HUB_USERNAME }}/s-pdf
@@ -99,11 +86,11 @@ jobs:
          tags: |
            type=raw,value=${{ steps.versionNumber.outputs.versionNumber }},enable=${{ github.ref == 'refs/heads/master' }}
            type=raw,value=latest,enable=${{ github.ref == 'refs/heads/master' }}
+            type=raw,value=alpha,enable=${{ github.ref == 'refs/heads/main' }}

      - name: Build and push main Dockerfile
        id: build-push-regular
        uses: docker/build-push-action@263435318d21b8e681c14492fe198d362a7d2c83 # v6.18.0
-        if: github.ref != 'refs/heads/main'
        with:
          builder: ${{ steps.buildx.outputs.name }}
          context: .
@@ -134,7 +121,7 @@ jobs:

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

      - name: Generate tags fat
        id: meta3
-        uses: docker/metadata-action@c1e51972afc2121e065aed6d45c65596fe445f3f # v5.8.0
+        uses: docker/metadata-action@902fa8ec7d6ecbf8d84d538b9b233a880e428804 # v5.7.0
+        if: github.ref != 'refs/heads/main'
        with:
          images: |
            ${{ secrets.DOCKER_HUB_USERNAME }}/s-pdf
@@ -175,11 +163,11 @@ jobs:
          tags: |
            type=raw,value=${{ steps.versionNumber.outputs.versionNumber }}-fat,enable=${{ github.ref == 'refs/heads/master' }}
            type=raw,value=latest-fat,enable=${{ github.ref == 'refs/heads/master' }}
-            type=raw,value=alpha,enable=${{ github.ref == 'refs/heads/main' }}

      - name: Build and push main Dockerfile fat
        id: build-push-fat
        uses: docker/build-push-action@263435318d21b8e681c14492fe198d362a7d2c83 # v6.18.0
+        if: github.ref != 'refs/heads/main'
        with:
          builder: ${{ steps.buildx.outputs.name }}
          context: .
@@ -13,21 +13,21 @@ 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@ec9f2d5744a09debf3a187a3f4f675c53b671911 # v2.13.0
+        uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
        with:
          egress-policy: audit

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

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

-      - uses: gradle/actions/setup-gradle@017a9effdb900e5b5b2fddfb590a105619dca3c3 # v4.4.2
+      - uses: gradle/actions/setup-gradle@8379f6a1328ee0e06e2bb424dadb7b159856a326 # v4.4.0
        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,27 +75,27 @@ 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@ec9f2d5744a09debf3a187a3f4f675c53b671911 # v2.13.0
+        uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
        with:
          egress-policy: audit

      - name: Download build artifacts
-        uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
+        uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
        with:
          name: binaries${{ matrix.file_suffix }}
      - name: Display structure of downloaded files
        run: ls -R

      - name: Install Cosign
-        uses: sigstore/cosign-installer@d58896d6a1865668819e1d91763c7751a165e159 # v3.9.2
+        uses: sigstore/cosign-installer@3454372f43399081ed03b604cb2d021dabca52bb # v3.8.2

      - name: Generate key pair
        run: cosign generate-key-pair
@@ -153,25 +153,25 @@ 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@ec9f2d5744a09debf3a187a3f4f675c53b671911 # v2.13.0
+        uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
        with:
          egress-policy: audit

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

      - 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
@@ -34,12 +34,12 @@ jobs:

    steps:
      - name: Harden Runner
-        uses: step-security/harden-runner@ec9f2d5744a09debf3a187a3f4f675c53b671911 # v2.13.0
+        uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
        with:
          egress-policy: audit

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

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

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

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

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

      - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@017a9effdb900e5b5b2fddfb590a105619dca3c3 # v4.4.2
+        uses: gradle/actions/setup-gradle@8379f6a1328ee0e06e2bb424dadb7b159856a326 # v4.4.0

      - 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 \
@@ -16,7 +16,7 @@ jobs:
      pull-requests: write
    steps:
      - name: Harden Runner
-        uses: step-security/harden-runner@ec9f2d5744a09debf3a187a3f4f675c53b671911 # v2.13.0
+        uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
        with:
          egress-policy: audit

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

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

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

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

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

-      - uses: gradle/actions/setup-gradle@017a9effdb900e5b5b2fddfb590a105619dca3c3 # v4.4.2
+      - uses: gradle/actions/setup-gradle@8379f6a1328ee0e06e2bb424dadb7b159856a326 # v4.4.0

      - name: Generate Swagger documentation
-        run: ./gradlew :stirling-pdf:generateOpenApiDocs
+        run: ./gradlew generateOpenApiDocs

      - name: Upload Swagger Documentation to SwaggerHub
        run: ./gradlew swaggerhubUpload
@@ -8,22 +8,10 @@ on:
    paths:
      - "build.gradle"
      - "README.md"
-      - "app/core/src/main/resources/messages_*.properties"
-      - "app/core/src/main/resources/static/3rdPartyLicenses.json"
+      - "src/main/resources/messages_*.properties"
+      - "src/main/resources/static/3rdPartyLicenses.json"
      - "scripts/ignore_translation.toml"

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

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

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

      - name: Setup GitHub App Bot
        id: setup-bot
@@ -53,11 +41,11 @@ jobs:

      - name: Sync translation property files
        run: |
-          python .github/scripts/check_language_properties.py --reference-file "app/core/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
        run: |
-          git add app/core/src/main/resources/messages_*.properties
+          git add src/main/resources/messages_*.properties
          git diff --staged --quiet || git commit -m ":memo: Sync translation files" || echo "No changes detected"

      - name: Install dependencies
@@ -69,8 +57,8 @@ jobs:

      - name: Run git add
        run: |
-          git add README.md scripts/ignore_translation.toml
-          git diff --staged --quiet || git commit -m ":memo: Sync README.md & scripts/ignore_translation.toml" || echo "No changes detected"
+          git add README.md
+          git diff --staged --quiet || git commit -m ":memo: Sync README.md" || echo "No changes detected"

      - name: Create Pull Request
        if: always()
@@ -113,4 +101,4 @@ jobs:
          sign-commits: true
          add-paths: |
            README.md
-            app/core/src/main/resources/messages_*.properties
+            src/main/resources/messages_*.properties
@@ -4,18 +4,6 @@ on:
  push:
    branches: ["master", "UITest", "testdriver"]

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

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

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

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

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

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

    steps:
      - name: Harden Runner
-        uses: step-security/harden-runner@ec9f2d5744a09debf3a187a3f4f675c53b671911 # v2.13.0
+        uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
        with:
          egress-policy: audit

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

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

    steps:
      - name: Harden Runner
-        uses: step-security/harden-runner@ec9f2d5744a09debf3a187a3f4f675c53b671911 # v2.13.0
+        uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
        with:
          egress-policy: audit

@@ -13,7 +13,6 @@ local.properties
 .recommenders
 .classpath
 .project
-*.local.json
 version.properties

 #### Stirling-PDF Files ###
@@ -27,7 +26,6 @@ clientWebUI/
 !cucumber/exampleFiles/
 !cucumber/exampleFiles/example_html.zip
 exampleYmlFiles/stirling/
-/stirling/
 /testing/file_snapshots
 SwaggerDoc.json

@@ -125,13 +123,7 @@ SwaggerDoc.json
 *.tar.gz
 *.rar
 *.db
-build
-app/core/build
-app/common/build
-app/proprietary/build
-common/build
-proprietary/build
-stirling-pdf/build
+/build

 # Byte-compiled / optimized / DLL files
 __pycache__/
@@ -197,16 +189,8 @@ id_ed25519.pub
 .pytest_cache
 .ipynb_checkpoints

-
-
 **/jcef-bundle/

 # node_modules
 node_modules/
-
-# Translation temp files
-*_compact.json
-*compact*.json
-test_batch.json
-*.backup.*.json
-frontend/public/locales/*/translation.backup*.json
+*.mjs
@@ -1,28 +1,28 @@
 repos:
  - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.12.7
+    rev: v0.11.11
    hooks:
      - id: ruff
        args:
          - --fix
          - --line-length=127
-        files: ^((\.github/scripts|scripts|app/core/src/main/resources/static/python)/.+)?[^/]+\.py$
+        files: ^((\.github/scripts|scripts)/.+)?[^/]+\.py$
        exclude: (split_photos.py)
      - id: ruff-format
-        files: ^((\.github/scripts|scripts|app/core/src/main/resources/static/python)/.+)?[^/]+\.py$
+        files: ^((\.github/scripts|scripts)/.+)?[^/]+\.py$
        exclude: (split_photos.py)
  - repo: https://github.com/codespell-project/codespell
    rev: v2.4.1
    hooks:
      - id: codespell
        args:
-          - --ignore-words-list=thirdParty,tabEl,tabEls
+          - --ignore-words-list=
          - --skip="./.*,*.csv,*.json,*.ambr"
          - --quiet-level=2
        files: \.(html|css|js|py|md)$
-        exclude: (.vscode|.devcontainer|app/core/src/main/resources|app/proprietary/src/main/resources|Dockerfile|.*/pdfjs.*|.*/thirdParty.*|bootstrap.*|.*\.min\..*|.*diff\.js)
+        exclude: (.vscode|.devcontainer|src/main/resources|Dockerfile|.*/pdfjs.*|.*/thirdParty.*|bootstrap.*|.*\.min\..*|.*diff\.js)
  - repo: https://github.com/gitleaks/gitleaks
-    rev: v8.28.0
+    rev: v8.26.0
    hooks:
      - id: gitleaks
  - repo: https://github.com/pre-commit/pre-commit-hooks
@@ -34,13 +34,3 @@ repos:
      - id: trailing-whitespace
        files: ^.*(\.js|\.java|\.py|\.yml)$
        exclude: ^(.*/pdfjs.*|.*/thirdParty.*|bootstrap.*|.*\.min\..*|.*diff\.js|\.github/workflows/.*$)
-  # - repo: https://github.com/thibaudcolas/pre-commit-stylelint
-  #   rev: v16.21.1
-  #   hooks:
-  #     - id: stylelint
-  #       additional_dependencies:
-  #         - stylelint@16.21.1
-  #         - stylelint-config-standard@38.0.0
-  #         - "@stylistic/stylelint-plugin@3.1.3"
-  #       files: \.(css)$
-  #       args: [--fix]
@@ -15,10 +15,6 @@
    "ms-azuretools.vscode-docker", // Docker extension for Visual Studio Code
    "GitHub.copilot", // GitHub Copilot AI pair programmer for Visual Studio Code
    "GitHub.vscode-pull-request-github", // GitHub Pull Requests extension for Visual Studio Code
-    "charliermarsh.ruff", // Ruff code formatter for Python to follow the Ruff Style Guide
-    "yzhang.markdown-all-in-one", // Markdown All-in-One extension for enhanced Markdown editing
-    "stylelint.vscode-stylelint", // Stylelint extension for CSS and SCSS linting
-    "redhat.vscode-yaml", // YAML extension for Visual Studio Code
-    "dbaeumer.vscode-eslint", // ESLint extension for TypeScript linting
+    "charliermarsh.ruff" // Ruff code formatter for Python to follow the Ruff Style Guide
  ]
 }
@@ -2,46 +2,15 @@
  "editor.wordSegmenterLocales": "",
  "editor.guides.bracketPairs": "active",
  "editor.guides.bracketPairsHorizontal": "active",
-  "editor.defaultFormatter": "EditorConfig.EditorConfig",
  "cSpell.enabled": false,
-  "[feature]": {
-    "editor.defaultFormatter": "alexkrechik.cucumberautocomplete"
-  },
  "[java]": {
    "editor.defaultFormatter": "josevseb.google-java-format-for-vs-code"
  },
-  "[jsonc]": {
-    "editor.defaultFormatter": "vscode.json-language-features"
-  },
-  "[css]": {
-    "editor.defaultFormatter": "stylelint.vscode-stylelint"
-  },
-  "[json]": {
-    "editor.defaultFormatter": "vscode.json-language-features"
-  },
-  "[python]": {
-    "editor.defaultFormatter": "ms-python.black-formatter"
-  },
-  "[gradle-kotlin-dsl]": {
-    "editor.defaultFormatter": "vscjava.vscode-gradle"
-  },
-  "[markdown]": {
-    "editor.defaultFormatter": "yzhang.markdown-all-in-one"
-  },
-  "[gradle-build]": {
-    "editor.defaultFormatter": "vscjava.vscode-gradle"
-  },
-  "[gradle]": {
-    "editor.defaultFormatter": "vscjava.vscode-gradle"
-  },
-  "[yaml]": {
-    "editor.defaultFormatter": "redhat.vscode-yaml"
-  },
  "java.compile.nullAnalysis.mode": "automatic",
  "java.configuration.updateBuildConfiguration": "interactive",
  "java.format.enabled": true,
  "java.format.settings.profile": "GoogleStyle",
-  "java.format.settings.google.version": "1.28.0",
+  "java.format.settings.google.version": "1.27.0",
  "java.format.settings.google.extra": "--aosp --skip-sorting-imports --skip-javadoc-formatting",
  // (DE) Aktiviert Kommentare im Java-Format.
  // (EN) Enables comments in Java formatting.
@@ -80,17 +49,11 @@
    ".venv*/",
    ".vscode/",
    "bin/",
-    "app/core/bin/",
-    "app/common/bin/",
-    "app/proprietary/bin/",
+    "common/bin/",
    "build/",
-    "app/core/build/",
-    "app/common/build/",
-    "app/proprietary/build/",
+    "common/build/",
    "configs/",
-    "app/core/configs/",
    "customFiles/",
-    "app/core/customFiles/",
    "docs/",
    "exampleYmlFiles",
    "gradle/",
@@ -102,9 +65,7 @@
    ".git-blame-ignore-revs",
    ".gitattributes",
    ".gitignore",
-    "app/core/.gitignore",
-    "app/common/.gitignore",
-    "app/proprietary/.gitignore",
+    "common/.gitignore",
    ".pre-commit-config.yaml",
  ],
  // Enables signature help in Java.
@@ -122,25 +83,4 @@
  "spring.initializr.defaultLanguage": "Java",
  "spring.initializr.defaultGroupId": "stirling.software.SPDF",
  "spring.initializr.defaultArtifactId": "SPDF",
-  "java.jdt.ls.lombokSupport.enabled": true,
-  "html.format.wrapLineLength": 127,
-  "html.format.enable": true,
-  "html.format.indentInnerHtml": true,
-  "html.format.unformatted": "script,style,textarea",
-  "html.format.contentUnformatted": "pre,code",
-  "html.format.extraLiners": "head,body,/html",
-  "html.format.wrapAttributes": "force",
-  "html.format.wrapAttributesIndentSize": 2,
-  "html.format.indentHandlebars": true,
-  "html.format.preserveNewLines": true,
-  "html.format.maxPreserveNewLines": 2,
-  "stylelint.configFile": "devTools/.stylelintrc.json",
-  "java.project.sourcePaths": [
-    "app/core/src/main/java",
-    "app/common/src/main/java",
-    "app/proprietary/src/main/java"
-  ],
-  "[typescript]": {
-    "editor.defaultFormatter": "vscode.typescript-language-features"
-  }
 }
@@ -1,300 +0,0 @@
-# Adding New React Tools to Stirling PDF
-
-This guide covers how to add new PDF tools to the React frontend, either by migrating existing Thymeleaf templates or creating entirely new tools.
-
-## Overview
-
-When adding tools, follow this systematic approach using the established patterns and architecture.
-
-## 1. Create Tool Structure
-
-Create these files in the correct directories:
-```
-frontend/src/hooks/tools/[toolName]/
-  ├── use[ToolName]Parameters.ts     # Parameter definitions and validation
-  └── use[ToolName]Operation.ts      # Tool operation logic using useToolOperation
-
-frontend/src/components/tools/[toolName]/
-  └── [ToolName]Settings.tsx         # Settings UI component (if needed)
-
-frontend/src/tools/
-  └── [ToolName].tsx                 # Main tool component
-```
-
-## 2. Implementation Pattern
-
-Use `useBaseTool` for simplified hook management. This is the recommended approach for all new tools:
-
-**Parameters Hook** (`use[ToolName]Parameters.ts`):
-```typescript
-import { BaseParameters } from '../../../types/parameters';
-import { useBaseParameters, BaseParametersHook } from '../shared/useBaseParameters';
-
-export interface [ToolName]Parameters extends BaseParameters {
-  // Define your tool-specific parameters here
-  someOption: boolean;
-}
-
-export const defaultParameters: [ToolName]Parameters = {
-  someOption: false,
-};
-
-export const use[ToolName]Parameters = (): BaseParametersHook<[ToolName]Parameters> => {
-  return useBaseParameters({
-    defaultParameters,
-    endpointName: 'your-endpoint-name',
-    validateFn: (params) => true, // Add validation logic
-  });
-};
-```
-
-**Operation Hook** (`use[ToolName]Operation.ts`):
-```typescript
-import { useTranslation } from 'react-i18next';
-import { ToolType, useToolOperation } from '../shared/useToolOperation';
-import { createStandardErrorHandler } from '../../../utils/toolErrorHandler';
-
-export const build[ToolName]FormData = (parameters: [ToolName]Parameters, file: File): FormData => {
-  const formData = new FormData();
-  formData.append('fileInput', file);
-  // Add parameters to formData
-  return formData;
-};
-
-export const [toolName]OperationConfig = {
-  toolType: ToolType.singleFile, // or ToolType.multiFile (buildFormData's file parameter will need to be updated)
-  buildFormData: build[ToolName]FormData,
-  operationType: '[toolName]',
-  endpoint: '/api/v1/category/endpoint-name',
-  filePrefix: 'processed_', // Will be overridden with translation
-  defaultParameters,
-} as const;
-
-export const use[ToolName]Operation = () => {
-  const { t } = useTranslation();
-  return useToolOperation({
-    ...[toolName]OperationConfig,
-    filePrefix: t('[toolName].filenamePrefix', 'processed') + '_',
-    getErrorMessage: createStandardErrorHandler(t('[toolName].error.failed', 'Operation failed'))
-  });
-};
-```
-
-**Main Component** (`[ToolName].tsx`):
-```typescript
-import { useTranslation } from "react-i18next";
-import { createToolFlow } from "../components/tools/shared/createToolFlow";
-import { use[ToolName]Parameters } from "../hooks/tools/[toolName]/use[ToolName]Parameters";
-import { use[ToolName]Operation } from "../hooks/tools/[toolName]/use[ToolName]Operation";
-import { useBaseTool } from "../hooks/tools/shared/useBaseTool";
-import { BaseToolProps, ToolComponent } from "../types/tool";
-
-const [ToolName] = (props: BaseToolProps) => {
-  const { t } = useTranslation();
-  const base = useBaseTool('[toolName]', use[ToolName]Parameters, use[ToolName]Operation, props);
-
-  return createToolFlow({
-    files: {
-      selectedFiles: base.selectedFiles,
-      isCollapsed: base.hasResults,
-      placeholder: t("[toolName].files.placeholder", "Select files to get started"),
-    },
-    steps: [
-      // Add settings steps if needed
-    ],
-    executeButton: {
-      text: t("[toolName].submit", "Process"),
-      isVisible: !base.hasResults,
-      loadingText: t("loading"),
-      onClick: base.handleExecute,
-      disabled: !base.params.validateParameters() || !base.hasFiles || !base.endpointEnabled,
-    },
-    review: {
-      isVisible: base.hasResults,
-      operation: base.operation,
-      title: t("[toolName].results.title", "Results"),
-      onFileClick: base.handleThumbnailClick,
-      onUndo: base.handleUndo,
-    },
-  });
-};
-
-[ToolName].tool = () => use[ToolName]Operation;
-export default [ToolName] as ToolComponent;
-```
-
-**Note**: Some existing tools (like AddPassword, Compress) use a legacy pattern with manual hook management. **Always use the Modern Pattern above for new tools** - it's cleaner, more maintainable, and includes automation support.
-
-## 3. Register Tool in System
-Update these files to register your new tool:
-
-**Tool Registry** (`frontend/src/data/useTranslatedToolRegistry.tsx`):
-1. Add imports at the top:
-```typescript
-import [ToolName] from "../tools/[ToolName]";
-import { [toolName]OperationConfig } from "../hooks/tools/[toolName]/use[ToolName]Operation";
-import [ToolName]Settings from "../components/tools/[toolName]/[ToolName]Settings";
-```
-
-2. Add tool entry in the `allTools` object:
-```typescript
-[toolName]: {
-  icon: <LocalIcon icon="your-icon-name" width="1.5rem" height="1.5rem" />,
-  name: t("home.[toolName].title", "Tool Name"),
-  component: [ToolName],
-  description: t("home.[toolName].desc", "Tool description"),
-  categoryId: ToolCategoryId.STANDARD_TOOLS, // or appropriate category
-  subcategoryId: SubcategoryId.APPROPRIATE_SUBCATEGORY,
-  maxFiles: -1, // or specific number
-  endpoints: ["endpoint-name"],
-  operationConfig: [toolName]OperationConfig,
-  settingsComponent: [ToolName]Settings, // if settings exist
-},
-```
-
-## 4. Add Tooltips (Optional but Recommended)
-Create user-friendly tooltips to help non-technical users understand your tool. **Use simple, clear language - avoid technical jargon:**
-
-**Tooltip Hook** (`frontend/src/components/tooltips/use[ToolName]Tips.ts`):
-```typescript
-import { useTranslation } from 'react-i18next';
-import { TooltipContent } from '../../types/tips';
-
-export const use[ToolName]Tips = (): TooltipContent => {
-  const { t } = useTranslation();
-
-  return {
-    header: {
-      title: t("[toolName].tooltip.header.title", "Tool Overview")
-    },
-    tips: [
-      {
-        title: t("[toolName].tooltip.description.title", "What does this tool do?"),
-        description: t("[toolName].tooltip.description.text", "Simple explanation in everyday language that non-technical users can understand."),
-        bullets: [
-          t("[toolName].tooltip.description.bullet1", "Easy-to-understand benefit 1"),
-          t("[toolName].tooltip.description.bullet2", "Easy-to-understand benefit 2")
-        ]
-      }
-      // Add more tip sections as needed
-    ]
-  };
-};
-```
-
-**Add tooltip to your main component:**
-```typescript
-import { use[ToolName]Tips } from "../components/tooltips/use[ToolName]Tips";
-
-const [ToolName] = (props: BaseToolProps) => {
-  const tips = use[ToolName]Tips();
-  
-  // In your steps array:
-  steps: [
-    {
-      title: t("[toolName].steps.settings", "Settings"),
-      tooltip: tips, // Add this line
-      content: <[ToolName]Settings ... />
-    }
-  ]
-```
-
-## 5. Add Translations
-Update translation files. **Important: Only update `en-GB` files** - other languages are handled separately.
-
-**File to update:** `frontend/public/locales/en-GB/translation.json`
-
-**Required Translation Keys**:
-```json
-{
-  "home": {
-    "[toolName]": {
-      "title": "Tool Name",
-      "desc": "Tool description"
-    }
-  },
-  "[toolName]": {
-    "title": "Tool Name",
-    "submit": "Process",
-    "filenamePrefix": "processed",
-    "files": {
-      "placeholder": "Select files to get started"
-    },
-    "steps": {
-      "settings": "Settings"
-    },
-    "options": {
-      "title": "Tool Options",
-      "someOption": "Option Label",
-      "someOption.desc": "Option description",
-      "note": "General information about the tool."
-    },
-    "results": {
-      "title": "Results"
-    },
-    "error": {
-      "failed": "Operation failed"
-    },
-    "tooltip": {
-      "header": {
-        "title": "Tool Overview"
-      },
-      "description": {
-        "title": "What does this tool do?",
-        "text": "Simple explanation in everyday language",
-        "bullet1": "Easy-to-understand benefit 1",
-        "bullet2": "Easy-to-understand benefit 2"
-      }
-    }
-  }
-}
-```
-
-**Translation Notes:**
- **Only update `en-GB/translation.json`** - other locale files are managed separately
- Use descriptive keys that match your component's `t()` calls
- Include tooltip translations if you created tooltip hooks
- Add `options.*` keys if your tool has settings with descriptions
-
-**Tooltip Writing Guidelines:**
- **Use simple, everyday language** - avoid technical terms like "converts interactive elements" 
- **Focus on benefits** - explain what the user gains, not how it works internally
- **Use concrete examples** - "text boxes become regular text" vs "form fields are flattened"
- **Answer user questions** - "What does this do?", "When should I use this?", "What's this option for?"
- **Keep descriptions concise** - 1-2 sentences maximum per section
- **Use bullet points** for multiple benefits or features
-
-## 6. Migration from Thymeleaf
-When migrating existing Thymeleaf templates:
-
-1. **Identify Form Parameters**: Look at the original `<form>` inputs to determine parameter structure
-2. **Extract Translation Keys**: Find `#{key.name}` references and add them to JSON translations (For many tools these translations will already exist but some parts will be missing)
-3. **Map API Endpoint**: Note the `th:action` URL for the operation hook
-4. **Preserve Functionality**: Ensure all original form behaviour is replicated which is applicable to V2 react UI
-
-## 7. Testing Your Tool
- Verify tool appears in UI with correct icon and description
- Test with various file sizes and types
- Confirm translations work
- Check error handling
- Test undo functionality
- Verify results display correctly
-
-## Tool Development Patterns
-
-### Three Tool Patterns:
-
-**Pattern 1: Single-File Tools** (Individual processing)
- Backend processes one file per API call
- Set `multiFileEndpoint: false`
- Examples: Compress, Rotate
-
-**Pattern 2: Multi-File Tools** (Batch processing)
- Backend accepts `MultipartFile[]` arrays in single API call
- Set `multiFileEndpoint: true`
- Examples: Split, Merge, Overlay
-
-**Pattern 3: Complex Tools** (Custom processing)
- Tools with complex routing logic or non-standard processing
- Provide `customProcessor` for full control
- Examples: Convert, OCR
@@ -1,223 +0,0 @@
-# CLAUDE.md
-
-This file provides guidance to Claude Code (claude.ai/code) when working with code in this repository.
-
-## Common Development Commands
-
-### Build and Test
- **Build project**: `./gradlew clean build`
- **Run locally**: `./gradlew bootRun`
- **Full test suite**: `./test.sh` (builds all Docker variants and runs comprehensive tests)
- **Code formatting**: `./gradlew spotlessApply` (runs automatically before compilation)
-
-### Docker Development
- **Build ultra-lite**: `docker build -t stirlingtools/stirling-pdf:latest-ultra-lite -f ./Dockerfile.ultra-lite .`
- **Build standard**: `docker build -t stirlingtools/stirling-pdf:latest -f ./Dockerfile .`
- **Build fat version**: `docker build -t stirlingtools/stirling-pdf:latest-fat -f ./Dockerfile.fat .`
- **Example compose files**: Located in `exampleYmlFiles/` directory
-
-### Security Mode Development
-Set `DOCKER_ENABLE_SECURITY=true` environment variable to enable security features during development. This is required for testing the full version locally.
-
-### Frontend Development
- **Frontend dev server**: `cd frontend && npm run dev` (requires backend on localhost:8080)
- **Tech Stack**: Vite + React + TypeScript + Mantine UI + TailwindCSS
- **Proxy Configuration**: Vite proxies `/api/*` calls to backend (localhost:8080)
- **Build Process**: DO NOT run build scripts manually - builds are handled by CI/CD pipelines
- **Package Installation**: DO NOT run npm install commands - package management handled separately
- **Deployment Options**:
-  - **Desktop App**: `npm run tauri-build` (native desktop application)
-  - **Web Server**: `npm run build` then serve dist/ folder
-  - **Development**: `npm run tauri-dev` for desktop dev mode
-
-#### Multi-Tool Workflow Architecture
-Frontend designed for **stateful document processing**:
- Users upload PDFs once, then chain tools (split → merge → compress → view)
- File state and processing results persist across tool switches
- No file reloading between tools - performance critical for large PDFs (up to 100GB+)
-
-#### FileContext - Central State Management
-**Location**: `src/contexts/FileContext.tsx`
- **Active files**: Currently loaded PDFs and their variants
- **Tool navigation**: Current mode (viewer/pageEditor/fileEditor/toolName)
- **Memory management**: PDF document cleanup, blob URL lifecycle, Web Worker management
- **IndexedDB persistence**: File storage with thumbnail caching
- **Preview system**: Tools can preview results (e.g., Split → Viewer → back to Split) without context pollution
-
-**Critical**: All file operations go through FileContext. Don't bypass with direct file handling.
-
-#### Processing Services
- **enhancedPDFProcessingService**: Background PDF parsing and manipulation
- **thumbnailGenerationService**: Web Worker-based with main-thread fallback
- **fileStorage**: IndexedDB with LRU cache management
-
-#### Memory Management Strategy
-**Why manual cleanup exists**: Large PDFs (up to 100GB+) through multiple tools accumulate:
- PDF.js documents that need explicit .destroy() calls
- Blob URLs from tool outputs that need revocation
- Web Workers that need termination
-Without cleanup: browser crashes with memory leaks.
-
-#### Tool Development
-
-**Architecture**: Modular hook-based system with clear separation of concerns:
-
- **useToolOperation** (`frontend/src/hooks/tools/shared/useToolOperation.ts`): Main orchestrator hook
-  - Coordinates all tool operations with consistent interface
-  - Integrates with FileContext for operation tracking
-  - Handles validation, error handling, and UI state management
-
- **Supporting Hooks**:
-  - **useToolState**: UI state management (loading, progress, error, files)
-  - **useToolApiCalls**: HTTP requests and file processing
-  - **useToolResources**: Blob URLs, thumbnails, ZIP downloads
-
- **Utilities**:
-  - **toolErrorHandler**: Standardized error extraction and i18n support
-  - **toolResponseProcessor**: API response handling (single/zip/custom)
-  - **toolOperationTracker**: FileContext integration utilities
-
-**Three Tool Patterns**:
-
-**Pattern 1: Single-File Tools** (Individual processing)
- Backend processes one file per API call
- Set `multiFileEndpoint: false`
- Examples: Compress, Rotate
-```typescript
-return useToolOperation({
-  operationType: 'compress',
-  endpoint: '/api/v1/misc/compress-pdf',
-  buildFormData: (params, file: File) => { /* single file */ },
-  multiFileEndpoint: false,
-});
-```
-
-**Pattern 2: Multi-File Tools** (Batch processing)
- Backend accepts `MultipartFile[]` arrays in single API call
- Set `multiFileEndpoint: true`
- Examples: Split, Merge, Overlay
-```typescript
-return useToolOperation({
-  operationType: 'split',
-  endpoint: '/api/v1/general/split-pages',
-  buildFormData: (params, files: File[]) => { /* all files */ },
-  multiFileEndpoint: true,
-  filePrefix: 'split_',
-});
-```
-
-**Pattern 3: Complex Tools** (Custom processing)
- Tools with complex routing logic or non-standard processing
- Provide `customProcessor` for full control
- Examples: Convert, OCR
-```typescript
-return useToolOperation({
-  operationType: 'convert',
-  customProcessor: async (params, files) => { /* custom logic */ },
-});
-```
-
-**Benefits**:
- **No Timeouts**: Operations run until completion (supports 100GB+ files)
- **Consistent**: All tools follow same pattern and interface
- **Maintainable**: Single responsibility hooks, easy to test and modify
- **i18n Ready**: Built-in internationalization support
- **Type Safe**: Full TypeScript support with generic interfaces
- **Memory Safe**: Automatic resource cleanup and blob URL management
-
-## Architecture Overview
-
-### Project Structure
- **Backend**: Spring Boot application with Thymeleaf templating
- **Frontend**: React-based SPA in `/frontend` directory (Thymeleaf templates fully replaced)
-  - **File Storage**: IndexedDB for client-side file persistence and thumbnails
-  - **Internationalization**: JSON-based translations (converted from backend .properties)
- **PDF Processing**: PDFBox for core PDF operations, LibreOffice for conversions, PDF.js for client-side rendering
- **Security**: Spring Security with optional authentication (controlled by `DOCKER_ENABLE_SECURITY`)
- **Configuration**: YAML-based configuration with environment variable overrides
-
-### Controller Architecture
- **API Controllers** (`src/main/java/.../controller/api/`): REST endpoints for PDF operations
-  - Organized by function: converters, security, misc, pipeline
-  - Follow pattern: `@RestController` + `@RequestMapping("/api/v1/...")`
- **Web Controllers** (`src/main/java/.../controller/web/`): Serve Thymeleaf templates
-  - Pattern: `@Controller` + return template names
-
-### Key Components
- **SPDFApplication.java**: Main application class with desktop UI and browser launching logic
- **ConfigInitializer**: Handles runtime configuration and settings files
- **Pipeline System**: Automated PDF processing workflows via `PipelineController`
- **Security Layer**: Authentication, authorization, and user management (when enabled)
-
-### Component Architecture
- **React Components**: Located in `frontend/src/components/` and `frontend/src/tools/`
- **Static Assets**: CSS, JS, and resources in `src/main/resources/static/` (legacy) + `frontend/public/` (modern)
- **Internationalization**:
-  - Backend: `messages_*.properties` files
-  - Frontend: JSON files in `frontend/public/locales/` (converted from .properties)
-  - Conversion Script: `scripts/convert_properties_to_json.py`
-
-### Configuration Modes
- **Ultra-lite**: Basic PDF operations only
- **Standard**: Full feature set
- **Fat**: Pre-downloaded dependencies for air-gapped environments
- **Security Mode**: Adds authentication, user management, and enterprise features
-
-### Testing Strategy
- **Integration Tests**: Cucumber tests in `testing/cucumber/`
- **Docker Testing**: `test.sh` validates all Docker variants
- **Manual Testing**: No unit tests currently - relies on UI and API testing
-
-## Development Workflow
-
-1. **Local Development**:
-   - Backend: `./gradlew bootRun` (runs on localhost:8080)
-   - Frontend: `cd frontend && npm run dev` (runs on localhost:5173, proxies to backend)
-2. **Docker Testing**: Use `./test.sh` before submitting PRs
-3. **Code Style**: Spotless enforces Google Java Format automatically
-4. **Translations**:
-   - Backend: Use helper scripts in `/scripts` for multi-language updates
-   - Frontend: Update JSON files in `frontend/public/locales/` or use conversion script
-5. **Documentation**: API docs auto-generated and available at `/swagger-ui/index.html`
-
-## Frontend Architecture Status
-
- **Core Status**: React SPA architecture complete with multi-tool workflow support
- **State Management**: FileContext handles all file operations and tool navigation
- **File Processing**: Production-ready with memory management for large PDF workflows (up to 100GB+)
- **Tool Integration**: Modular hook architecture with `useToolOperation` orchestrator
-  - Individual hooks: `useToolState`, `useToolApiCalls`, `useToolResources`
-  - Utilities: `toolErrorHandler`, `toolResponseProcessor`, `toolOperationTracker`
-  - Pattern: Each tool creates focused operation hook, UI consumes state/actions
- **Preview System**: Tool results can be previewed without polluting file context (Split tool example)
- **Performance**: Web Worker thumbnails, IndexedDB persistence, background processing
-
-## Important Notes
-
- **Java Version**: Minimum JDK 17, supports and recommends JDK 21
- **Lombok**: Used extensively - ensure IDE plugin is installed
- **Desktop Mode**: Set `STIRLING_PDF_DESKTOP_UI=true` for desktop application mode
- **File Persistence**:
-  - **Backend**: Designed to be stateless - files are processed in memory/temp locations only
-  - **Frontend**: Uses IndexedDB for client-side file storage and caching (with thumbnails)
- **Security**: When `DOCKER_ENABLE_SECURITY=false`, security-related classes are excluded from compilation
- **FileContext**: All file operations MUST go through FileContext - never bypass with direct File handling
- **Memory Management**: Manual cleanup required for PDF.js documents and blob URLs - don't remove cleanup code
- **Tool Development**: New tools should follow `useToolOperation` hook pattern (see `useCompressOperation.ts`)
- **Performance Target**: Must handle PDFs up to 100GB+ without browser crashes
- **Preview System**: Tools can preview results without polluting main file context (see Split tool implementation)
- **Adding Tools**: See `ADDING_TOOLS.md` for complete guide to creating new PDF tools
-
-## Communication Style
- Be direct and to the point
- No apologies or conversational filler
- Answer questions directly without preamble
- Explain reasoning concisely when asked
- Avoid unnecessary elaboration
-
-## Decision Making
- Ask clarifying questions before making assumptions
- Stop and ask when uncertain about project-specific details
- Confirm approach before making structural changes
- Request guidance on preferences (cross-platform vs specific tools, etc.)
- Verify understanding of requirements before proceeding
@@ -25,7 +25,7 @@ Please make sure your Pull Request adheres to the following guidelines:

 ## Translations

-If you would like to add or modify a translation, please see [How to add new languages to Stirling-PDF](devGuide/HowToAddNewLanguage.md). Also, please create a Pull Request so others can use it!
+If you would like to add or modify a translation, please see [How to add new languages to Stirling-PDF](HowToAddNewLanguage.md). Also, please create a Pull Request so others can use it!

 ## Docs

@@ -37,18 +37,7 @@ First, make sure you've read the section [Pull Requests](#pull-requests).

 If, at any point in time, you have a question, please feel free to ask in the same issue thread or in our [Discord](https://discord.gg/FJUSXUSYec).

-## Developer Documentation
-
-For technical guides, setup instructions, and development resources, please see our [Developer Documentation](devGuide/) which includes:
-
- [Developer Guide](devGuide/DeveloperGuide.md) - Main setup and architecture guide
- [Exception Handling Guide](devGuide/EXCEPTION_HANDLING_GUIDE.md) - Error handling patterns and i18n
- [Translation Guide](devGuide/HowToAddNewLanguage.md) - Adding new languages
- And more in the [devGuide folder](devGuide/)
-
-For configuration and usage guides, see:
- [Database Guide](DATABASE.md) - Database setup and configuration
- [OCR Guide](HowToUseOCR.md) - OCR setup and configuration
+Developers should review our [Developer Guide](DeveloperGuide.md)

 ## License

@@ -2,38 +2,21 @@

 ## 1. Introduction

-Stirling-PDF is a robust, locally hosted, web-based PDF manipulation tool. **Stirling 2.0** represents a complete frontend rewrite, replacing the legacy Thymeleaf-based UI with a modern React SPA (Single Page Application).
-
-This guide focuses on developing for Stirling 2.0, including both the React frontend and Spring Boot backend development workflows.
+Stirling-PDF is a robust, locally hosted, web-based PDF manipulation tool. This guide focuses on Docker-based development and testing, which is the recommended approach for working with the full version of Stirling-PDF.

 ## 2. Project Overview

-**Stirling 2.0** is built using:
+Stirling-PDF is built using:

-**Backend:**
- Spring Boot (Java 17+, JDK 21 recommended)
- PDFBox for core PDF operations
- LibreOffice for document conversions
- qpdf for PDF optimization
- Spring Security (optional, controlled by `DOCKER_ENABLE_SECURITY`)
- Lombok for reducing boilerplate code
-
-**Frontend (React SPA):**
- React + TypeScript
- Vite for build tooling and development server
- Mantine UI component library
- TailwindCSS for styling
- PDF.js for client-side PDF rendering
- PDF-LIB.js for client-side PDF manipulation
- IndexedDB for client-side file storage and thumbnails
- i18next for internationalization
-
-**Infrastructure:**
- Docker for containerization
- Gradle for build management
-
-**Legacy (reference only during development):**
- Thymeleaf templates (being completely replaced in 2.0)
+- Spring Boot + Thymeleaf
+- PDFBox
+- LibreOffice
+- qpdf
+- HTML, CSS, JavaScript
+- Docker
+- PDF.js
+- PDF-LIB.js
+- Lombok

 ## 3. Development Environment Setup

@@ -41,8 +24,7 @@ This guide focuses on developing for Stirling 2.0, including both the React fron

 - Docker
 - Git
- Java JDK 17 or later (JDK 21 recommended)
- Node.js 18+ and npm (required for frontend development)
+- Java JDK 17 or later
 - Gradle 7.0 or later (Included within the repo)

 ### Setup Steps
@@ -73,46 +55,16 @@ 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.
-5. **Frontend Setup (Required for Stirling 2.0)**
-   Navigate to the frontend directory and install dependencies using npm.
+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. Stirling 2.0 Development Workflow
-
-### Frontend Development (React)
-The frontend is a React SPA that runs independently during development:
-
-1. **Start the backend**: Run the Spring Boot application (serves API endpoints on localhost:8080)
-2. **Start the frontend dev server**: Navigate to the frontend directory and run the development server (serves UI on localhost:5173)
-3. **Development flow**: The Vite dev server automatically proxies API calls to the backend
-
-### File Storage Architecture
-Stirling 2.0 uses client-side file storage:
- **IndexedDB**: Stores files locally in the browser with automatic thumbnail generation
- **PDF.js**: Handles client-side PDF rendering and processing
- **URL Parameters**: Support for deep linking and tool state persistence
-
-### Legacy Code Reference
-The existing Thymeleaf templates remain in the codebase during development as reference material but will be completely removed for the 2.0 release.
-
-## 5. Project Structure
+## 4. Project Structure

 ```bash
 Stirling-PDF/
 ├── .github/               # GitHub-specific files (workflows, issue templates)
 ├── configs/               # Configuration files used by stirling at runtime (generated at runtime)
-├── frontend/              # React SPA frontend (Stirling 2.0)
-│   ├── src/
-│   │   ├── components/    # React components
-│   │   ├── tools/         # Tool-specific React components
-│   │   ├── hooks/         # Custom React hooks
-│   │   ├── services/      # API and utility services
-│   │   ├── types/         # TypeScript type definitions
-│   │   └── utils/         # Utility functions
-│   ├── public/
-│   │   └── locales/       # Internationalization files (JSON)
-│   ├── package.json       # Frontend dependencies
-│   └── vite.config.ts     # Vite configuration
+├── cucumber/              # Cucumber test files
+│   ├── features/
 ├── customFiles/           # Custom static files and templates (generated at runtime used to replace existing files)
 ├── docs/                  # Documentation files
 ├── exampleYmlFiles/       # Example YAML configuration files
@@ -132,14 +84,16 @@ Stirling-PDF/
 │   │   │               ├── service/
 │   │   │               └── utils/
 │   │   └── resources/
-│   │       ├── static/            # Legacy static assets (reference only)
+│   │       ├── static/
 │   │       │   ├── css/
 │   │       │   ├── js/
 │   │       │   └── pdfjs/
-│   │       └── templates/         # Legacy Thymeleaf templates (reference only)
+│   │       └── templates/
 │   └── test/
-├── testing/               # Cucumber and integration tests
-│   └── cucumber/          # Cucumber test files
+│       └── java/
+│           └── stirling/
+│               └── software/
+│                   └── SPDF/
 ├── build.gradle           # Gradle build configuration
 ├── Dockerfile             # Main Dockerfile
 ├── Dockerfile.ultra-lite  # Dockerfile for ultra-lite version
@@ -148,7 +102,7 @@ Stirling-PDF/
 └── test.sh                # Test script to deploy all docker versions and run cuke tests
 ```

-## 6. Docker-based Development
+## 5. Docker-based Development

 Stirling-PDF offers several Docker versions:

@@ -160,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`:

@@ -183,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
@@ -216,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:
@@ -239,16 +193,16 @@ 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 .
   ```

 Note: The `--no-cache` and `--pull` flags ensure that the build process uses the latest base images and doesn't use cached layers, which is useful for testing and ensuring reproducible builds. however to improve build times these can often be removed depending on your usecase

-## 7. Testing
+## 6. Testing

 ### Comprehensive Testing Script

@@ -274,15 +228,6 @@ Note: The `test.sh` script will run automatically when you raise a PR. However,

 2. Access the application at `http://localhost:8080` and manually test all features developed.

-### Frontend Development Testing (Stirling 2.0)
-
-For React frontend development:
-
-1. Start the backend: Run the Spring Boot application to serve API endpoints on localhost:8080
-2. Start the frontend dev server: Navigate to the frontend directory and run the development server on localhost:5173
-3. The Vite dev server automatically proxies API calls to the backend
-4. Test React components, UI interactions, and IndexedDB file operations using browser developer tools
-
 ### Local Testing (Java and UI Components)

 For quick iterations and development of Java backend, JavaScript, and UI components, you can run and test Stirling-PDF locally without Docker. This approach allows you to work on and verify changes to:
@@ -313,7 +258,7 @@ Important notes:
 - There are currently no automated unit tests. All testing is done manually through the UI or API calls. (You are welcome to add JUnits!)
 - Always verify your changes in the full Docker environment before submitting pull requests, as some integrations and features will only work in the complete setup.

-## 8. Contributing
+## 7. Contributing

 1. Fork the repository on GitHub.
 2. Create a new branch for your feature or bug fix.
@@ -338,11 +283,11 @@ When you raise a PR:

 Address any issues that arise from these checks before finalizing your pull request.

-## 9. API Documentation
+## 8. API Documentation

 API documentation is available at `/swagger-ui/index.html` when running the application. You can also view the latest API documentation [here](https://app.swaggerhub.com/apis-docs/Stirling-Tools/Stirling-PDF/).

-## 10. Customization
+## 9. Customization

 Stirling-PDF can be customized through environment variables or a `settings.yml` file. Key customization options include:

@@ -361,7 +306,7 @@ docker run -p 8080:8080 -e APP_NAME="My PDF Tool" stirling-pdf:full

 Refer to the main README for a full list of customization options.

-## 11. Language Translations
+## 10. Language Translations

 For managing language translations that affect multiple files, Stirling-PDF provides a helper script:

@@ -381,62 +326,13 @@ Remember to test your changes thoroughly to ensure they don't break any existing

 ## Code examples

-### React Component Development (Stirling 2.0)
-
-For Stirling 2.0, new features are built as React components instead of Thymeleaf templates:
-
-#### Creating a New Tool Component
-
-1. **Create the React Component:**
-   ```typescript
-   // frontend/src/tools/NewTool.tsx
-   import { useState } from 'react';
-   import { Button, FileInput, Container } from '@mantine/core';
-   
-   interface NewToolProps {
-     params: Record<string, any>;
-     updateParams: (updates: Record<string, any>) => void;
-   }
-   
-   export default function NewTool({ params, updateParams }: NewToolProps) {
-     const [files, setFiles] = useState<File[]>([]);
-     
-     const handleProcess = async () => {
-       // Process files using API or client-side logic
-     };
-     
-     return (
-       <Container>
-         <FileInput 
-           multiple 
-           accept="application/pdf"
-           onChange={setFiles}
-         />
-         <Button onClick={handleProcess}>Process</Button>
-       </Container>
-     );
-   }
-   ```
-
-2. **Add API Integration:**
-   ```typescript
-   // Use existing API endpoints or create new ones
-   const response = await fetch('/api/v1/new-tool', {
-     method: 'POST',
-     body: formData
-   });
-   ```
-
-3. **Register in Tool Picker:**
-   Update the tool picker component to include the new tool with proper routing and URL parameter support.
-
-### Legacy Reference: Overview of Thymeleaf
+### Overview of Thymeleaf

 Thymeleaf is a server-side Java HTML template engine. It is used in Stirling-PDF to render dynamic web pages. Thymeleaf integrates heavily with Spring Boot.

 ### 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:

@@ -488,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")`.

@@ -515,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
@@ -567,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.

@@ -611,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
@@ -641,7 +537,7 @@ 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">
@@ -655,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`
@@ -1,40 +1,17 @@
-# Backend Dockerfile - Java Spring Boot with all dependencies and build stage
-# Build the application
-FROM gradle:8.14-jdk21 AS build
-
-COPY build.gradle .
-COPY settings.gradle .
-COPY gradlew .
-COPY gradle gradle/
-COPY app/core/build.gradle core/.
-COPY app/common/build.gradle common/.
-COPY app/proprietary/build.gradle proprietary/.
-RUN ./gradlew build -x spotlessApply -x spotlessCheck -x test -x sonarqube || return 0
-
-# Set the working directory
-WORKDIR /app
-
-# Copy the entire project to the working directory
-COPY . .
-
-# Build the application with DISABLE_ADDITIONAL_FEATURES=false
-RUN DISABLE_ADDITIONAL_FEATURES=false \
-    STIRLING_PDF_DESKTOP_UI=false \
-    ./gradlew clean build -x spotlessApply -x spotlessCheck -x test -x sonarqube
-
 # Main stage
-FROM alpine:3.22.1@sha256:4bcff63911fcb4448bd4fdacec207030997caf25e9bea4045fa6c8c44de311d1
+FROM alpine:3.22.0@sha256:8a1f59ffb675680d47db6337b49d22281a139e9d709335b492be023728e11715

 # Copy necessary files
 COPY scripts /scripts
-COPY app/core/src/main/resources/static/fonts/*.ttf /usr/share/fonts/opentype/noto/
-# first /app directory is for the build stage, second is for the final image
-COPY --from=build /app/app/core/build/libs/*.jar app.jar
+COPY pipeline /pipeline
+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

-LABEL org.opencontainers.image.title="Stirling-PDF Backend"
-LABEL org.opencontainers.image.description="Backend service for Stirling-PDF - Java Spring Boot with PDF processing capabilities"
+LABEL org.opencontainers.image.title="Stirling-PDF"
+LABEL org.opencontainers.image.description="A powerful locally hosted web-based PDF manipulation tool supporting 50+ operations including merging, splitting, conversion, OCR, watermarking, and more."
 LABEL org.opencontainers.image.source="https://github.com/Stirling-Tools/Stirling-PDF"
 LABEL org.opencontainers.image.licenses="MIT"
 LABEL org.opencontainers.image.vendor="Stirling-Tools"
@@ -43,10 +20,10 @@ LABEL org.opencontainers.image.documentation="https://docs.stirlingpdf.com"
 LABEL maintainer="Stirling-Tools"
 LABEL org.opencontainers.image.authors="Stirling-Tools"
 LABEL org.opencontainers.image.version="${VERSION_TAG}"
-LABEL org.opencontainers.image.keywords="PDF, manipulation, backend, API, Spring Boot"
+LABEL org.opencontainers.image.keywords="PDF, manipulation, merge, split, convert, OCR, watermark"

 # Set Environment Variables
-ENV DISABLE_ADDITIONAL_FEATURES=false \
+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="" \
@@ -57,13 +34,10 @@ ENV DISABLE_ADDITIONAL_FEATURES=false \
    PYTHONPATH=/usr/lib/libreoffice/program:/opt/venv/lib/python3.12/site-packages \
    UNO_PATH=/usr/lib/libreoffice/program \
    URE_BOOTSTRAP=file:///usr/lib/libreoffice/program/fundamentalrc \
-    PATH=$PATH:/opt/venv/bin \
-    STIRLING_TEMPFILES_DIRECTORY=/tmp/stirling-pdf \
-    TMPDIR=/tmp/stirling-pdf \
-    TEMP=/tmp/stirling-pdf \
-    TMP=/tmp/stirling-pdf
+    PATH=$PATH:/opt/venv/bin

-# JDK for app and all dependencies
+
+# JDK for app
 RUN echo "@main https://dl-cdn.alpinelinux.org/alpine/edge/main" | tee -a /etc/apk/repositories && \
    echo "@community https://dl-cdn.alpinelinux.org/alpine/edge/community" | tee -a /etc/apk/repositories && \
    echo "@testing https://dl-cdn.alpinelinux.org/alpine/edge/testing" | tee -a /etc/apk/repositories && \
@@ -74,6 +48,7 @@ RUN echo "@main https://dl-cdn.alpinelinux.org/alpine/edge/main" | tee -a /etc/a
    tini \
    bash \
    curl \
+    qpdf \
    shadow \
    su-exec \
    openssl \
@@ -86,13 +61,11 @@ RUN echo "@main https://dl-cdn.alpinelinux.org/alpine/edge/main" | tee -a /etc/a
    # pdftohtml
    poppler-utils \
    # OCR MY PDF (unpaper for descew and other advanced features)
-    unpaper \
    tesseract-ocr-data-eng \
    tesseract-ocr-data-chi_sim \
 	tesseract-ocr-data-deu \
 	tesseract-ocr-data-fra \
 	tesseract-ocr-data-por \
-    ocrmypdf \
    # CV
    py3-opencv \
    python3 \
@@ -106,17 +79,17 @@ RUN echo "@main https://dl-cdn.alpinelinux.org/alpine/edge/main" | tee -a /etc/a
    ln -s /usr/lib/libreoffice/program/unohelper.py /opt/venv/lib/python3.12/site-packages/ && \
    ln -s /usr/lib/libreoffice/program /opt/venv/lib/python3.12/site-packages/LibreOffice && \
    mv /usr/share/tessdata /usr/share/tessdata-original && \
-    mkdir -p $HOME /configs /logs /customFiles /pipeline/watchedFolders /pipeline/finishedFolders /tmp/stirling-pdf /pipeline/watchedFolders /pipeline/finishedFolders && \
+    mkdir -p $HOME /configs /logs /customFiles /pipeline/watchedFolders /pipeline/finishedFolders && \
    fc-cache -f -v && \
    chmod +x /scripts/* && \
    chmod +x /scripts/init.sh && \
    # User permissions
    addgroup -S stirlingpdfgroup && adduser -S stirlingpdfuser -G stirlingpdfgroup && \
-    chown -R stirlingpdfuser:stirlingpdfgroup $HOME /scripts /pipeline /usr/share/fonts/opentype/noto /configs /customFiles /pipeline /tmp/stirling-pdf && \
+    chown -R stirlingpdfuser:stirlingpdfgroup $HOME /scripts /usr/share/fonts/opentype/noto /configs /customFiles /pipeline && \
    chown stirlingpdfuser:stirlingpdfgroup /app.jar

 EXPOSE 8080/tcp

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

@@ -6,9 +5,6 @@ COPY build.gradle .
 COPY settings.gradle .
 COPY gradlew .
 COPY gradle gradle/
-COPY app/core/build.gradle core/.
-COPY app/common/build.gradle common/.
-COPY app/proprietary/build.gradle proprietary/.
 RUN ./gradlew build -x spotlessApply -x spotlessCheck -x test -x sonarqube || return 0

 # Set the working directory
@@ -17,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.1@sha256:4bcff63911fcb4448bd4fdacec207030997caf25e9bea4045fa6c8c44de311d1
+FROM alpine:3.22.0@sha256:8a1f59ffb675680d47db6337b49d22281a139e9d709335b492be023728e11715

 # Copy necessary files
 COPY scripts /scripts
-COPY app/core/src/main/resources/static/fonts/*.ttf /usr/share/fonts/opentype/noto/
-# first /app directory is for the build stage, second is for the final image
-COPY --from=build /app/app/core/build/libs/*.jar app.jar
+COPY pipeline /pipeline
+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="" \
@@ -47,11 +43,8 @@ ENV DISABLE_ADDITIONAL_FEATURES=true \
    PYTHONPATH=/usr/lib/libreoffice/program:/opt/venv/lib/python3.12/site-packages \
    UNO_PATH=/usr/lib/libreoffice/program \
    URE_BOOTSTRAP=file:///usr/lib/libreoffice/program/fundamentalrc \
-    PATH=$PATH:/opt/venv/bin \
-    STIRLING_TEMPFILES_DIRECTORY=/tmp/stirling-pdf \
-    TMPDIR=/tmp/stirling-pdf \
-    TEMP=/tmp/stirling-pdf \
-    TMP=/tmp/stirling-pdf
+    PATH=$PATH:/opt/venv/bin
+

 # JDK for app
 RUN echo "@main https://dl-cdn.alpinelinux.org/alpine/edge/main" | tee -a /etc/apk/repositories && \
@@ -76,13 +69,12 @@ RUN echo "@main https://dl-cdn.alpinelinux.org/alpine/edge/main" | tee -a /etc/a
    # pdftohtml
    poppler-utils \
    # OCR MY PDF (unpaper for descew and other advanced featues)
-    unpaper \
+    qpdf \
    tesseract-ocr-data-eng \
    tesseract-ocr-data-chi_sim \
 	tesseract-ocr-data-deu \
 	tesseract-ocr-data-fra \
 	tesseract-ocr-data-por \
-    ocrmypdf \
    font-terminus font-dejavu font-noto font-noto-cjk font-awesome font-noto-extra font-liberation font-linux-libertine \
    # CV
    py3-opencv \
@@ -97,16 +89,16 @@ RUN echo "@main https://dl-cdn.alpinelinux.org/alpine/edge/main" | tee -a /etc/a
    ln -s /usr/lib/libreoffice/program/unohelper.py /opt/venv/lib/python3.12/site-packages/ && \
    ln -s /usr/lib/libreoffice/program /opt/venv/lib/python3.12/site-packages/LibreOffice && \
    mv /usr/share/tessdata /usr/share/tessdata-original && \
-    mkdir -p $HOME /configs /logs /customFiles /pipeline/watchedFolders /pipeline/finishedFolders /tmp/stirling-pdf /pipeline/watchedFolders /pipeline/finishedFolders && \
+    mkdir -p $HOME /configs /logs /customFiles /pipeline/watchedFolders /pipeline/finishedFolders && \
    fc-cache -f -v && \
    chmod +x /scripts/* && \
    chmod +x /scripts/init.sh && \
    # User permissions
    addgroup -S stirlingpdfgroup && adduser -S stirlingpdfuser -G stirlingpdfgroup && \
-    chown -R stirlingpdfuser:stirlingpdfgroup $HOME /scripts /pipeline /usr/share/fonts/opentype/noto /configs /customFiles /pipeline /tmp/stirling-pdf && \
+    chown -R stirlingpdfuser:stirlingpdfgroup $HOME /scripts /usr/share/fonts/opentype/noto /configs /customFiles /pipeline && \
    chown stirlingpdfuser:stirlingpdfgroup /app.jar

 EXPOSE 8080/tcp
 # Set user and run command
 ENTRYPOINT ["tini", "--", "/scripts/init.sh"]
-CMD ["sh", "-c", "java -Dfile.encoding=UTF-8 -Djava.io.tmpdir=/tmp/stirling-pdf -jar /app.jar & /opt/venv/bin/unoserver --port 2003 --interface 127.0.0.1"]
+CMD ["sh", "-c", "java -Dfile.encoding=UTF-8 -jar /app.jar & /opt/venv/bin/unoserver --port 2003 --interface 127.0.0.1"]
@@ -1,50 +1,24 @@
-# Backend ultra-lite Dockerfile - Java Spring Boot with minimal dependencies and build stage
-# Build the application
-FROM gradle:8.14-jdk21 AS build
-
-COPY build.gradle .
-COPY settings.gradle .
-COPY gradlew .
-COPY gradle gradle/
-COPY app/core/build.gradle core/.
-COPY app/common/build.gradle common/.
-COPY app/proprietary/build.gradle proprietary/.
-RUN ./gradlew build -x spotlessApply -x spotlessCheck -x test -x sonarqube || return 0
-
-# Set the working directory
-WORKDIR /app
-
-# Copy the entire project to the working directory
-COPY . .
-
-# Build the application with DISABLE_ADDITIONAL_FEATURES=true
-RUN DISABLE_ADDITIONAL_FEATURES=true \
-    STIRLING_PDF_DESKTOP_UI=false \
-    ./gradlew clean build -x spotlessApply -x spotlessCheck -x test -x sonarqube
-
-# Main stage
-FROM alpine:3.22.1@sha256:4bcff63911fcb4448bd4fdacec207030997caf25e9bea4045fa6c8c44de311d1
+# use alpine
+FROM alpine:3.22.0@sha256:8a1f59ffb675680d47db6337b49d22281a139e9d709335b492be023728e11715

 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" \
    JAVA_CUSTOM_OPTS="" \
    PUID=1000 \
    PGID=1000 \
-    UMASK=022 \
-    STIRLING_TEMPFILES_DIRECTORY=/tmp/stirling-pdf \
-    TMPDIR=/tmp/stirling-pdf \
-    TEMP=/tmp/stirling-pdf \
-    TMP=/tmp/stirling-pdf
+    UMASK=022

 # Copy necessary files
+COPY scripts/download-security-jar.sh /scripts/download-security-jar.sh
 COPY scripts/init-without-ocr.sh /scripts/init-without-ocr.sh
 COPY scripts/installFonts.sh /scripts/installFonts.sh
-COPY --from=build /app/app/core/build/libs/*.jar app.jar
+COPY pipeline /pipeline
+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 && \
@@ -61,10 +35,10 @@ RUN echo "@testing https://dl-cdn.alpinelinux.org/alpine/edge/main" | tee -a /et
        su-exec \
        openjdk21-jre && \
    # User permissions
-    mkdir -p /configs /logs /customFiles /usr/share/fonts/opentype/noto /tmp/stirling-pdf /pipeline/watchedFolders /pipeline/finishedFolders && \
+    mkdir -p /configs /logs /customFiles /usr/share/fonts/opentype/noto && \
    chmod +x /scripts/*.sh && \
    addgroup -S stirlingpdfgroup && adduser -S stirlingpdfuser -G stirlingpdfgroup && \
-    chown -R stirlingpdfuser:stirlingpdfgroup $HOME /scripts /pipeline /configs /customFiles /pipeline /tmp/stirling-pdf && \
+    chown -R stirlingpdfuser:stirlingpdfgroup $HOME /scripts  /configs /customFiles /pipeline && \
    chown stirlingpdfuser:stirlingpdfgroup /app.jar

 # Set environment variables
@@ -74,4 +48,4 @@ EXPOSE 8080/tcp

 # Run the application
 ENTRYPOINT ["tini", "--", "/scripts/init-without-ocr.sh"]
-CMD ["java", "-Dfile.encoding=UTF-8", "-Djava.io.tmpdir=/tmp/stirling-pdf", "-jar", "/app.jar"]
+CMD ["java", "-Dfile.encoding=UTF-8", "-jar", "/app.jar"]
@@ -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/app/core/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/app/core/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 app\core\src\main\resources\messages_en_GB.properties --branch "" --files app\core\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 app\core\src\main\resources\messages_en_GB.properties --branch "" --check-file app\core\src\main\resources\messages_pl_PL.properties
-```
-
-#### Linux command
-
-```bash
-python3 .github/scripts/check_language_properties.py --reference-file app/core/src/main/resources/messages_en_GB.properties --branch "" --files app/core/src/main/resources/messages_pl_PL.properties
-
-python3 .github/scripts/check_language_properties.py --reference-file app/core/src/main/resources/messages_en_GB.properties --branch "" --check-file app/core/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
 ```
@@ -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 "app/proprietary/" directory of this repository,
-if that directory exists, is licensed under the license defined in "app/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
@@ -29,7 +29,7 @@ All documentation available at [https://docs.stirlingpdf.com/](https://docs.stir
 - API for integration with external scripts
 - Optional Login and Authentication support (see [here](https://docs.stirlingpdf.com/Advanced%20Configuration/System%20and%20Security) for documentation)
 - Database Backup and Import (see [here](https://docs.stirlingpdf.com/Advanced%20Configuration/DATABASE) for documentation)
- Enterprise features like SSO (see [here](https://docs.stirlingpdf.com/Advanced%20Configuration/Single%20Sign-On%20Configuration) for documentation)
+- Enterprise features like SSO see [here](https://docs.stirlingpdf.com/Enterprise%20Edition)

 ## PDF Features

@@ -116,47 +116,47 @@ Stirling-PDF currently supports 40 languages!

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

 ## Stirling PDF Enterprise

@@ -168,7 +168,7 @@ Check out our [Enterprise docs](https://docs.stirlingpdf.com/Pro)

 Join our community:
 - [Contribution Guidelines](CONTRIBUTING.md)
- [Translation Guide (How to add custom languages)](devGuide/HowToAddNewLanguage.md)
- [Developer Guide](devGuide/DeveloperGuide.md)
+- [Translation Guide (How to add custom languages)](HowToAddNewLanguage.md)
 - [Issue Tracker](https://github.com/Stirling-Tools/Stirling-PDF/issues)
 - [Discord Community](https://discord.gg/HYmhKj45pU)
+- [Developer Guide](DeveloperGuide.md)
@@ -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"
@@ -1,45 +0,0 @@
-// Configure bootRun to disable it or point to a main class
-bootRun {
-    enabled = false
-}
-spotless {
-    java {
-        target 'src/**/java/**/*.java'
-        googleJavaFormat(googleJavaFormatVersion).aosp().reorderImports(false)
-
-        importOrder("java", "javax", "org", "com", "net", "io", "jakarta", "lombok", "me", "stirling")
-        toggleOffOn()
-        trimTrailingWhitespace()
-        leadingTabsToSpaces()
-        endWithNewline()
-    }
-    yaml {
-        target '**/*.yml', '**/*.yaml'
-        trimTrailingWhitespace()
-        leadingTabsToSpaces()
-        endWithNewline()
-    }
-    format 'gradle', {
-        target '**/gradle/*.gradle', '**/*.gradle'
-        trimTrailingWhitespace()
-        leadingTabsToSpaces()
-        endWithNewline()
-    }
-}
-dependencies {
-    api 'org.springframework.boot:spring-boot-starter-web'
-    api 'org.springframework.boot:spring-boot-starter-aop'
-    // api 'org.springframework.boot:spring-boot-starter-thymeleaf' // Deprecated - UI moved to React frontend
-    api '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.18.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.10'
-    api "org.springdoc:springdoc-openapi-starter-webmvc-ui:2.8.9"
-    api 'jakarta.mail:jakarta.mail-api:2.1.3'
-    runtimeOnly 'org.eclipse.angus:angus-mail:2.0.4'
-}
@@ -1,81 +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;
-
-import io.swagger.v3.oas.annotations.parameters.RequestBody;
-
-/**
- * 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>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>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>.
- * </ul>
- *
- * <p>Unless stated otherwise an attribute only affects <em>async</em> execution.
- */
-@Target(ElementType.METHOD)
-@Retention(RetentionPolicy.RUNTIME)
-@Documented
-@RequestMapping(method = RequestMethod.POST)
-@RequestBody(required = true)
-public @interface AutoJobPostMapping {
-
-    /** Alias for {@link RequestMapping#value} – the path mapping of the endpoint. */
-    @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}.
-     */
-    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}.
-     */
-    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}.
-     */
-    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}.
-     */
-    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;
-}
@@ -1,48 +0,0 @@
-package stirling.software.common.annotations.api;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import io.swagger.v3.oas.annotations.tags.Tag;
-
-/**
- * Combined annotation for Account Security API controllers.
- * Includes @RestController, @RequestMapping("/api/v1/account"), and OpenAPI @Tag.
- */
-@Target(ElementType.TYPE)
-@Retention(RetentionPolicy.RUNTIME)
-@RestController
-@RequestMapping("/api/v1/account")
-@Tag(
-        name = "Account Security",
-        description =
-                """
-                Account security and protection services for user safety and organizational compliance.
-
-                This endpoint group provides account security capabilities for organizations requiring
-                enhanced protection against unauthorized access, security threats, and compliance violations.
-
-                Common use cases:
-                • Corporate security policy compliance and SOX, HIPAA, GDPR requirements
-                • Fraud prevention, identity theft protection, and account compromise recovery
-                • Multi-factor authentication implementation and insider threat mitigation
-                • Account recovery and emergency access procedures
-
-                Business applications:
-                • Enterprise risk management, security governance, and customer trust protection
-                • Legal liability reduction and insurance requirement fulfillment
-                • Audit preparation, compliance reporting, and business continuity management
-
-                Operational scenarios:
-                • Security incident response, forensic investigation, and user training
-                • Emergency account lockdown, suspicious activity monitoring, and compliance documentation
-
-                Target users: Security administrators, compliance officers, and organizations
-                prioritizing account security and regulatory compliance.
-                """)
-public @interface AccountSecurityApi {}
@@ -1,48 +0,0 @@
-package stirling.software.common.annotations.api;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import io.swagger.v3.oas.annotations.tags.Tag;
-
-/**
- * Combined annotation for Admin Settings API controllers.
- * Includes @RestController, @RequestMapping("/api/v1/admin/settings"), and OpenAPI @Tag.
- */
-@Target(ElementType.TYPE)
-@Retention(RetentionPolicy.RUNTIME)
-@RestController
-@RequestMapping("/api/v1/admin/settings")
-@Tag(
-        name = "Admin Settings",
-        description =
-                """
-                System administration and configuration management for enterprise deployments.
-
-                This endpoint group provides administrative control for organizations deploying
-                Stirling PDF in production environments with multi-user scenarios.
-
-                Common use cases:
-                • Enterprise deployment configuration and multi-tenant environment management
-                • Security policy enforcement, compliance monitoring, and capacity planning
-                • Operational maintenance, troubleshooting, and enterprise infrastructure integration
-                • Disaster recovery and business continuity preparation
-
-                Business applications:
-                • Corporate IT governance, policy enforcement, and compliance reporting
-                • Cost optimization, SLA monitoring, and vendor management oversight
-                • Risk management and security incident response
-
-                Operational scenarios:
-                • 24/7 production monitoring, scheduled maintenance, and system updates
-                • Emergency response, change management, and performance optimization
-
-                Target users: IT administrators, system engineers, and operations teams
-                responsible for enterprise-grade document processing infrastructure.
-                """)
-public @interface AdminApi {}
@@ -1,46 +0,0 @@
-package stirling.software.common.annotations.api;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import io.swagger.v3.oas.annotations.tags.Tag;
-
-/**
- * Combined annotation for Admin Server Certificate API controllers.
- * Includes @RestController, @RequestMapping("/api/v1/admin/server-certificate"), and OpenAPI @Tag.
- */
-@Target(ElementType.TYPE)
-@Retention(RetentionPolicy.RUNTIME)
-@RestController
-@RequestMapping("/api/v1/admin/server-certificate")
-@Tag(
-        name = "Admin - Server Certificate",
-        description =
-                """
-                Server certificate management for secure enterprise deployments and encrypted communications.
-
-                This endpoint group provides certificate lifecycle management for organizations
-                requiring secure communications in document processing infrastructure.
-
-                Common use cases:
-                • Corporate security compliance and encrypted communications for healthcare/finance
-                • Customer data protection, internal audits, and multi-environment standardization
-                • Third-party security assessments and disaster recovery security measures
-
-                Business applications:
-                • Enterprise security governance, client trust protection, and secure B2B exchange
-                • Legal requirement fulfillment, liability reduction, and M&A security preparation
-
-                Operational scenarios:
-                • Certificate renewal, emergency replacement, and security incident response
-                • Multi-site deployment coordination and cloud migration preparation
-
-                Target users: Security administrators, compliance officers, and IT infrastructure
-                teams requiring enterprise-grade security for document processing systems.
-                """)
-public @interface AdminServerCertificateApi {}
@@ -1,46 +0,0 @@
-package stirling.software.common.annotations.api;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import io.swagger.v3.oas.annotations.tags.Tag;
-
-/**
- * Combined annotation for Analysis API controllers.
- * Includes @RestController, @RequestMapping("/api/v1/analysis"), and OpenAPI @Tag.
- */
-@Target(ElementType.TYPE)
-@Retention(RetentionPolicy.RUNTIME)
-@RestController
-@RequestMapping("/api/v1/analysis")
-@Tag(
-        name = "Analysis",
-        description =
-                """
-                Document analysis and information extraction services for content intelligence and insights.
-
-                This endpoint group provides analytical capabilities to understand document structure,
-                extract information, and generate insights from PDF content for automated processing.
-
-                Common use cases:
-                • Document inventory management and content audit for compliance verification
-                • Quality assurance workflows and business intelligence analytics
-                • Migration planning, accessibility evaluation, and document forensics
-
-                Business applications:
-                • Legal discovery, financial document review, and healthcare records analysis
-                • Academic research, government processing, and publishing optimization
-
-                Operational scenarios:
-                • Large-scale profiling, migration assessment, and performance optimization
-                • Automated quality control and content strategy development
-
-                Target users: Data analysts, QA teams, administrators, and business intelligence
-                professionals requiring detailed document insights.
-                """)
-public @interface AnalysisApi {}
@@ -1,46 +0,0 @@
-package stirling.software.common.annotations.api;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import io.swagger.v3.oas.annotations.tags.Tag;
-
-/**
- * Combined annotation for Configuration API controllers.
- * Includes @RestController, @RequestMapping("/api/v1/config"), and OpenAPI @Tag.
- */
-@Target(ElementType.TYPE)
-@Retention(RetentionPolicy.RUNTIME)
-@RestController
-@RequestMapping("/api/v1/config")
-@Tag(
-        name = "Config",
-        description =
-                """
-                System configuration management for deployment optimization and operational control.
-
-                This endpoint group provides system configuration capabilities for organizations
-                deploying and operating Stirling PDF in various environments.
-
-                Common use cases:
-                • Environment-specific deployment and performance tuning for varying workloads
-                • Resource optimization, cost management, and infrastructure integration
-                • Compliance configuration, disaster recovery, and multi-environment standardization
-
-                Business applications:
-                • Operational cost optimization, SLA compliance, and risk management
-                • Vendor integration, change management, and capacity planning
-
-                Operational scenarios:
-                • System deployment, performance troubleshooting, and emergency changes
-                • Planned maintenance and multi-site deployment coordination
-
-                Target users: System administrators, DevOps engineers, and IT operations teams
-                responsible for deployment configuration and system optimization.
-                """)
-public @interface ConfigApi {}
@@ -1,46 +0,0 @@
-package stirling.software.common.annotations.api;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import io.swagger.v3.oas.annotations.tags.Tag;
-
-/**
- * Combined annotation for Convert API controllers.
- * Includes @RestController, @RequestMapping("/api/v1/convert"), and OpenAPI @Tag.
- */
-@Target(ElementType.TYPE)
-@Retention(RetentionPolicy.RUNTIME)
-@RestController
-@RequestMapping("/api/v1/convert")
-@Tag(
-        name = "Convert",
-        description =
-                """
-                Document format transformation services for cross-platform compatibility and workflow integration.
-
-                This endpoint group enables transformation between various formats, supporting
-                diverse business workflows and system integrations for mixed document ecosystems.
-
-                Common use cases:
-                • Legacy system integration, document migration, and cross-platform sharing
-                • Archive standardization, publishing preparation, and content adaptation
-                • Accessibility compliance and mobile-friendly document preparation
-
-                Business applications:
-                • Enterprise content management, digital publishing, and educational platforms
-                • Legal document processing, healthcare interoperability, and government standardization
-
-                Integration scenarios:
-                • API-driven pipelines, automated workflow preparation, and batch conversions
-                • Real-time format adaptation for user requests
-
-                Target users: System integrators, content managers, digital archivists, and
-                organizations requiring flexible document format interoperability.
-                """)
-public @interface ConvertApi {}
@@ -1,46 +0,0 @@
-package stirling.software.common.annotations.api;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import io.swagger.v3.oas.annotations.tags.Tag;
-
-/**
- * Combined annotation for Database Management API controllers.
- * Includes @RestController, @RequestMapping("/api/v1/database"), and OpenAPI @Tag.
- */
-@Target(ElementType.TYPE)
-@Retention(RetentionPolicy.RUNTIME)
-@RestController
-@RequestMapping("/api/v1/database")
-@Tag(
-        name = "Database",
-        description =
-                """
-                Database operations for data protection and business continuity management.
-
-                This endpoint group provides essential database operations for organizations requiring
-                reliable data protection and recovery capabilities.
-
-                Common use cases:
-                • Regular data backup, disaster recovery, and business continuity planning
-                • System migration, compliance management, and development environment support
-                • Operational troubleshooting and scheduled maintenance operations
-
-                Business applications:
-                • Risk management, regulatory compliance, and operational resilience
-                • Data governance, change management, and quality assurance support
-
-                Operational scenarios:
-                • Routine backup, emergency recovery, and system maintenance preparation
-                • Data migration projects and performance monitoring
-
-                Target users: Operations teams, system administrators, and organizations requiring
-                reliable data protection and operational database management.
-                """)
-public @interface DatabaseApi {}
@@ -1,46 +0,0 @@
-package stirling.software.common.annotations.api;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import io.swagger.v3.oas.annotations.tags.Tag;
-
-/**
- * Combined annotation for Database Management API controllers.
- * Includes @RestController, @RequestMapping("/api/v1/admin/database"), and OpenAPI @Tag.
- */
-@Target(ElementType.TYPE)
-@Retention(RetentionPolicy.RUNTIME)
-@RestController
-@RequestMapping("/api/v1/admin/database")
-@Tag(
-        name = "Database Management",
-        description =
-                """
-                Enterprise database administration for production data management and business continuity.
-
-                This endpoint group provides database administration capabilities for organizations
-                operating Stirling PDF in production environments.
-
-                Common use cases:
-                • Business continuity, disaster recovery, and regulatory compliance requirements
-                • Performance optimization, data security, and system migration projects
-                • Audit preparation, compliance reporting, and cost optimization
-
-                Business applications:
-                • Enterprise risk management, regulatory compliance, and SLA monitoring
-                • Data retention policies, security incident response, and vendor oversight
-
-                Operational scenarios:
-                • Scheduled maintenance, emergency recovery, and capacity planning
-                • Performance troubleshooting and multi-environment deployment coordination
-
-                Target users: Database administrators, IT operations teams, and enterprise
-                administrators responsible for production data management and system reliability.
-                """)
-public @interface DatabaseManagementApi {}
@@ -1,46 +0,0 @@
-package stirling.software.common.annotations.api;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import io.swagger.v3.oas.annotations.tags.Tag;
-
-/**
- * Combined annotation for Filter API controllers.
- * Includes @RestController, @RequestMapping("/api/v1/filter"), and OpenAPI @Tag.
- */
-@Target(ElementType.TYPE)
-@Retention(RetentionPolicy.RUNTIME)
-@RestController
-@RequestMapping("/api/v1/filter")
-@Tag(
-        name = "Filter",
-        description =
-                """
-                Document content filtering and search operations for information discovery and organization.
-
-                This endpoint group enables intelligent content discovery and organization within
-                document collections for content-based processing and information extraction.
-
-                Common use cases:
-                • Legal discovery, research organization, and compliance auditing
-                • Content moderation, academic research, and business intelligence
-                • Quality assurance and content validation workflows
-
-                Business applications:
-                • Contract analysis, financial review, and healthcare records organization
-                • Government processing, educational curation, and IP protection
-
-                Workflow scenarios:
-                • Large-scale processing, automated classification, and information extraction
-                • Document preparation for further processing or analysis
-
-                Target users: Legal professionals, researchers, compliance officers, and
-                organizations requiring intelligent document content discovery and organization.
-                """)
-public @interface FilterApi {}
@@ -1,42 +0,0 @@
-package stirling.software.common.annotations.api;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import io.swagger.v3.oas.annotations.tags.Tag;
-
-/**
- * Combined annotation for General PDF processing API controllers.
- * Includes @RestController, @RequestMapping("/api/v1/general"), and OpenAPI @Tag.
- */
-@Target(ElementType.TYPE)
-@Retention(RetentionPolicy.RUNTIME)
-@RestController
-@RequestMapping("/api/v1/general")
-@Tag(
-        name = "General",
-        description =
-                """
-                Core PDF processing operations for fundamental document manipulation workflows.
-
-                This endpoint group provides essential PDF functionality that forms the foundation
-                of most document processing workflows across various industries.
-
-                Common use cases:
-                • Document preparation for archival systems and content organization
-                • File preparation for distribution, accessibility compliance, and batch processing
-                • Document consolidation for reporting and legal compliance workflows
-
-                Typical applications:
-                • Content management, publishing workflows, and educational content distribution
-                • Business process automation and archive management
-
-                Target users: Content managers, document processors, and organizations requiring
-                reliable foundational PDF manipulation capabilities.
-                """)
-public @interface GeneralApi {}
@@ -1,46 +0,0 @@
-package stirling.software.common.annotations.api;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import io.swagger.v3.oas.annotations.tags.Tag;
-
-/**
- * Combined annotation for Info API controllers.
- * Includes @RestController, @RequestMapping("/api/v1/info"), and OpenAPI @Tag.
- */
-@Target(ElementType.TYPE)
-@Retention(RetentionPolicy.RUNTIME)
-@RestController
-@RequestMapping("/api/v1/info")
-@Tag(
-        name = "Info",
-        description =
-                """
-                System information and operational insights for monitoring and performance management.
-
-                This endpoint group provides system information and operational metrics for organizations
-                operating Stirling PDF in production environments.
-
-                Common use cases:
-                • System health monitoring, performance optimization, and capacity planning
-                • Troubleshooting, compliance monitoring, and SLA reporting
-                • Cost optimization, usage analysis, and security monitoring
-
-                Business applications:
-                • Operational cost management, business continuity monitoring, and vendor management
-                • Compliance reporting, strategic planning, and customer service tracking
-
-                Operational scenarios:
-                • 24/7 monitoring, scheduled maintenance, and emergency response coordination
-                • System upgrade planning and capacity scaling decisions
-
-                Target users: Operations teams, system administrators, and management teams requiring
-                operational insights and system performance visibility.
-                """)
-public @interface InfoApi {}
@@ -1,46 +0,0 @@
-package stirling.software.common.annotations.api;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import io.swagger.v3.oas.annotations.tags.Tag;
-
-/**
- * Combined annotation for Miscellaneous API controllers.
- * Includes @RestController, @RequestMapping("/api/v1/misc"), and OpenAPI @Tag.
- */
-@Target(ElementType.TYPE)
-@Retention(RetentionPolicy.RUNTIME)
-@RestController
-@RequestMapping("/api/v1/misc")
-@Tag(
-        name = "Misc",
-        description =
-                """
-                Specialized utilities and supplementary tools for enhanced document processing workflows.
-
-                This endpoint group provides utility operations that support core document processing
-                tasks and address specific workflow needs in real-world scenarios.
-
-                Common use cases:
-                • Document optimization for bandwidth-limited environments and storage cost management
-                • Document repair, content extraction, and validation for quality assurance
-                • Accessibility improvement and custom processing for specialized needs
-
-                Business applications:
-                • Web publishing optimization, email attachment management, and archive efficiency
-                • Mobile compatibility, print production, and legacy document recovery
-
-                Operational scenarios:
-                • Batch processing, quality control, and performance optimization
-                • Troubleshooting and recovery of problematic documents
-
-                Target users: System administrators, document specialists, and organizations requiring
-                specialized document processing and optimization tools.
-                """)
-public @interface MiscApi {}
@@ -1,46 +0,0 @@
-package stirling.software.common.annotations.api;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import io.swagger.v3.oas.annotations.tags.Tag;
-
-/**
- * Combined annotation for Pipeline API controllers.
- * Includes @RestController, @RequestMapping("/api/v1/pipeline"), and OpenAPI @Tag.
- */
-@Target(ElementType.TYPE)
-@Retention(RetentionPolicy.RUNTIME)
-@RestController
-@RequestMapping("/api/v1/pipeline")
-@Tag(
-        name = "Pipeline",
-        description =
-                """
-                Automated document processing workflows for complex multi-stage business operations.
-
-                This endpoint group enables organizations to create sophisticated document processing
-                workflows that combine multiple operations into streamlined, repeatable processes.
-
-                Common use cases:
-                • Invoice processing, legal document review, and healthcare records standardization
-                • Government processing, educational content preparation, and publishing automation
-                • Contract lifecycle management and approval processes
-
-                Business applications:
-                • Automated compliance reporting, large-scale migration, and quality assurance
-                • Archive preparation, content delivery, and document approval workflows
-
-                Operational scenarios:
-                • Scheduled batch processing and event-driven document processing
-                • Multi-department coordination and business system integration
-
-                Target users: Business process managers, IT automation specialists, and organizations
-                requiring consistent, repeatable document processing workflows.
-                """)
-public @interface PipelineApi {}
@@ -1,47 +0,0 @@
-package stirling.software.common.annotations.api;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import io.swagger.v3.oas.annotations.tags.Tag;
-
-/**
- * Combined annotation for Proprietary UI Data API controllers.
- * Includes @RestController, @RequestMapping("/api/v1/proprietary/ui-data"), and OpenAPI @Tag. Note:
- * Controllers using this annotation should also add @EnterpriseEndpoint.
- */
-@Target(ElementType.TYPE)
-@Retention(RetentionPolicy.RUNTIME)
-@RestController
-@RequestMapping("/api/v1/proprietary/ui-data")
-@Tag(
-        name = "Proprietary UI Data",
-        description =
-                """
-                Enterprise user interface data services for commercial deployments and advanced business features.
-
-                This endpoint group provides enhanced data services for commercial and enterprise features,
-                supporting advanced business workflows and professional-grade functionality.
-
-                Common use cases:
-                • Enterprise-grade dashboards, multi-tenant deployment, and business intelligence
-                • Organizational hierarchy management and commercial feature licensing
-                • Professional support integration and advanced workflow automation
-
-                Business applications:
-                • ERP integration, CRM development, and executive reporting dashboards
-                • Multi-subsidiary management, professional service delivery, and compliance interfaces
-
-                Operational scenarios:
-                • Large-scale deployment management and white-label solution development
-                • Advanced system integration and commercial feature rollout
-
-                Target users: Enterprise administrators, business analysts, and organizations utilizing
-                commercial features and advanced business capabilities.
-                """)
-public @interface ProprietaryUiDataApi {}
@@ -1,46 +0,0 @@
-package stirling.software.common.annotations.api;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import io.swagger.v3.oas.annotations.tags.Tag;
-
-/**
- * Combined annotation for Security API controllers.
- * Includes @RestController, @RequestMapping("/api/v1/security"), and OpenAPI @Tag.
- */
-@Target(ElementType.TYPE)
-@Retention(RetentionPolicy.RUNTIME)
-@RestController
-@RequestMapping("/api/v1/security")
-@Tag(
-        name = "Security",
-        description =
-                """
-                Document security and protection services for confidential and sensitive content.
-
-                This endpoint group provides essential security operations for organizations handling
-                sensitive documents and materials requiring controlled access.
-
-                Common use cases:
-                • Legal confidentiality, healthcare privacy (HIPAA), and financial regulatory compliance
-                • Government classified handling, corporate IP protection, and educational privacy (FERPA)
-                • Contract security for business transactions
-
-                Business applications:
-                • Document authentication, confidential sharing, and secure archiving
-                • Content watermarking, access control, and privacy protection through redaction
-
-                Industry scenarios:
-                • Legal discovery, medical records exchange, financial audit documentation
-                • Enterprise policy enforcement and data governance
-
-                Target users: Legal professionals, healthcare administrators, compliance officers,
-                government agencies, and enterprises handling sensitive content.
-                """)
-public @interface SecurityApi {}
@@ -1,46 +0,0 @@
-package stirling.software.common.annotations.api;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import io.swagger.v3.oas.annotations.tags.Tag;
-
-/**
- * Combined annotation for Settings API controllers.
- * Includes @RestController, @RequestMapping("/api/v1/settings"), and OpenAPI @Tag.
- */
-@Target(ElementType.TYPE)
-@Retention(RetentionPolicy.RUNTIME)
-@RestController
-@RequestMapping("/api/v1/settings")
-@Tag(
-        name = "Settings",
-        description =
-                """
-                User preferences and application customization for personalized workflow optimization.
-
-                This endpoint group provides preference management capabilities for users and
-                organizations to customize their document processing experience.
-
-                Common use cases:
-                • Workflow optimization, accessibility compliance, and corporate branding
-                • Multi-language support, user personalization, and business system integration
-                • Organizational policy compliance
-
-                Business applications:
-                • Corporate branding, productivity optimization, and accessibility compliance
-                • Change management facilitation and training efficiency improvement
-
-                Operational scenarios:
-                • User onboarding, department-specific customization, and system migration
-                • Multi-tenant customization and project-based configuration adjustments
-
-                Target users: End users, department managers, and organizations focused on optimizing
-                user experience and workflow efficiency through personalization.
-                """)
-public @interface SettingsApi {}
@@ -1,46 +0,0 @@
-package stirling.software.common.annotations.api;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import io.swagger.v3.oas.annotations.tags.Tag;
-
-/**
- * Combined annotation for Team Management API controllers.
- * Includes @RestController, @RequestMapping("/api/v1/team"), and OpenAPI @Tag.
- */
-@Target(ElementType.TYPE)
-@Retention(RetentionPolicy.RUNTIME)
-@RestController
-@RequestMapping("/api/v1/team")
-@Tag(
-        name = "Team",
-        description =
-                """
-                Team management and collaboration services for organized document processing workflows.
-
-                This endpoint group enables organizations to structure collaborative document processing
-                activities through team-based organization and resource management.
-
-                Common use cases:
-                • Department-based processing, project collaboration, and cross-functional coordination
-                • Client-specific team isolation, temporary project teams, and training coordination
-                • Compliance team coordination for regulatory processing
-
-                Business applications:
-                • Matrix organization support, client service delivery, and cost center allocation
-                • Scalable collaboration, knowledge management, and team-based quality assurance
-
-                Operational scenarios:
-                • Large-scale processing coordination and temporary team formation
-                • M&A integration, remote collaboration, and knowledge transfer management
-
-                Target users: Team leaders, project managers, and organizations requiring structured
-                collaborative environments for document processing activities.
-                """)
-public @interface TeamApi {}
@@ -1,46 +0,0 @@
-package stirling.software.common.annotations.api;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import io.swagger.v3.oas.annotations.tags.Tag;
-
-/**
- * Combined annotation for UI Data API controllers.
- * Includes @RestController, @RequestMapping("/api/v1/ui-data"), and OpenAPI @Tag.
- */
-@Target(ElementType.TYPE)
-@Retention(RetentionPolicy.RUNTIME)
-@RestController
-@RequestMapping("/api/v1/ui-data")
-@Tag(
-        name = "UI Data",
-        description =
-                """
-                User interface data services for dynamic frontend applications and user experience customization.
-
-                This endpoint group provides data services for frontend applications to render personalized
-                interfaces and deliver optimized experiences based on system configuration.
-
-                Common use cases:
-                • Dynamic UI customization, multi-language support, and feature configuration
-                • Real-time status delivery, corporate branding, and mobile optimization
-                • Progressive web application (PWA) configuration
-
-                Business applications:
-                • Brand customization, user experience optimization, and accessibility compliance
-                • Multi-tenant customization, training support, and performance optimization
-
-                Operational scenarios:
-                • Frontend deployment, UI A/B testing, and system integration
-                • Mobile synchronization and offline capability enhancement
-
-                Target users: Frontend developers, UI/UX designers, and organizations requiring
-                customizable user interfaces and optimized user experiences.
-                """)
-public @interface UiDataApi {}
@@ -1,46 +0,0 @@
-package stirling.software.common.annotations.api;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import io.swagger.v3.oas.annotations.tags.Tag;
-
-/**
- * Combined annotation for User Management API controllers.
- * Includes @RestController, @RequestMapping("/api/v1/user"), and OpenAPI @Tag.
- */
-@Target(ElementType.TYPE)
-@Retention(RetentionPolicy.RUNTIME)
-@RestController
-@RequestMapping("/api/v1/user")
-@Tag(
-        name = "User",
-        description =
-                """
-                User management and authentication services for multi-user and enterprise environments.
-
-                This endpoint group provides user lifecycle management capabilities for organizations
-                deploying Stirling PDF in multi-user scenarios.
-
-                Common use cases:
-                • Employee onboarding/offboarding and corporate access control
-                • Department-based permissions, regulatory compliance, and SSO integration
-                • Multi-tenant deployment and guest user access management
-
-                Business applications:
-                • Enterprise IAM integration, security governance, and cost allocation
-                • Compliance reporting, workflow management, and partner collaboration
-
-                Operational scenarios:
-                • Large-scale provisioning, automated HR integration, and emergency access
-                • User migration and self-service profile maintenance
-
-                Target users: IT administrators, HR departments, and organizations requiring
-                structured user management and enterprise identity integration.
-                """)
-public @interface UserApi {}
@@ -1,289 +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"));
-        log.debug(
-                "AutoJobAspect: Processing {} {} with async={}",
-                request.getMethod(),
-                request.getRequestURI(),
-                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);
-
-        // Process arguments in-place to avoid type mismatch issues
-        Object[] args = processArgsInPlace(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);
-    }
-
-    /**
-     * Processes arguments in-place to handle file resolution and async file persistence. This
-     * approach avoids type mismatch issues by modifying the original objects directly.
-     *
-     * @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;
-        }
-    }
-}
@@ -1,59 +0,0 @@
-package stirling.software.common.config;
-
-import java.nio.file.Files;
-import java.nio.file.Path;
-
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-import jakarta.annotation.PostConstruct;
-
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-
-import stirling.software.common.model.ApplicationProperties;
-import stirling.software.common.util.TempFileRegistry;
-
-/**
- * Configuration for the temporary file management system. Sets up the necessary beans and
- * configures system properties.
- */
-@Slf4j
-@Configuration
-@RequiredArgsConstructor
-public class TempFileConfiguration {
-
-    private final ApplicationProperties applicationProperties;
-
-    /**
-     * Create the TempFileRegistry bean.
-     *
-     * @return A new TempFileRegistry instance
-     */
-    @Bean
-    public TempFileRegistry tempFileRegistry() {
-        return new TempFileRegistry();
-    }
-
-    @PostConstruct
-    public void initTempFileConfig() {
-        try {
-            ApplicationProperties.TempFileManagement tempFiles =
-                    applicationProperties.getSystem().getTempFileManagement();
-            String customTempDirectory = tempFiles.getBaseTmpDir();
-
-            // Create the temp directory if it doesn't exist
-            Path tempDir = Path.of(customTempDirectory);
-            if (!Files.exists(tempDir)) {
-                Files.createDirectories(tempDir);
-                log.info("Created temporary directory: {}", tempDir);
-            }
-
-            log.debug("Temporary file configuration initialized");
-            log.debug("Using temp directory: {}", customTempDirectory);
-            log.debug("Temp file prefix: {}", tempFiles.getPrefix());
-        } catch (Exception e) {
-            log.error("Failed to initialize temporary file configuration", e);
-        }
-    }
-}
@@ -1,82 +0,0 @@
-package stirling.software.common.config;
-
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.Set;
-
-import org.springframework.beans.factory.DisposableBean;
-import org.springframework.stereotype.Component;
-
-import lombok.extern.slf4j.Slf4j;
-
-import stirling.software.common.util.GeneralUtils;
-import stirling.software.common.util.TempFileRegistry;
-
-/**
- * Handles cleanup of temporary files on application shutdown. Implements Spring's DisposableBean
- * interface to ensure cleanup happens during normal application shutdown.
- */
-@Slf4j
-@Component
-public class TempFileShutdownHook implements DisposableBean {
-
-    private final TempFileRegistry registry;
-
-    public TempFileShutdownHook(TempFileRegistry registry) {
-        this.registry = registry;
-
-        // Register a JVM shutdown hook as a backup in case Spring's
-        // DisposableBean mechanism doesn't trigger (e.g., during a crash)
-        Runtime.getRuntime().addShutdownHook(new Thread(this::cleanupTempFiles));
-    }
-
-    /** Spring's DisposableBean interface method. Called during normal application shutdown. */
-    @Override
-    public void destroy() {
-        log.info("Application shutting down, cleaning up temporary files");
-        cleanupTempFiles();
-    }
-
-    /** Clean up all registered temporary files and directories. */
-    private void cleanupTempFiles() {
-        try {
-            // Clean up all registered files
-            Set<Path> files = registry.getAllRegisteredFiles();
-            int deletedCount = 0;
-
-            for (Path file : files) {
-                try {
-                    if (Files.exists(file)) {
-                        Files.deleteIfExists(file);
-                        deletedCount++;
-                    }
-                } catch (IOException e) {
-                    log.warn("Failed to delete temp file during shutdown: {}", file, e);
-                }
-            }
-
-            // Clean up all registered directories
-            Set<Path> directories = registry.getTempDirectories();
-            for (Path dir : directories) {
-                try {
-                    if (Files.exists(dir)) {
-                        GeneralUtils.deleteDirectory(dir);
-                        deletedCount++;
-                    }
-                } catch (IOException e) {
-                    log.warn("Failed to delete temp directory during shutdown: {}", dir, e);
-                }
-            }
-
-            log.info(
-                    "Shutdown cleanup complete. Deleted {} temporary files/directories",
-                    deletedCount);
-
-            // Clear the registry
-            registry.clear();
-        } catch (Exception e) {
-            log.error("Error during shutdown cleanup", e);
-        }
-    }
-}
@@ -1,32 +0,0 @@
-package stirling.software.common.model.api;
-
-import org.springframework.web.multipart.MultipartFile;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import jakarta.validation.constraints.AssertTrue;
-
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.NoArgsConstructor;
-
-@Data
-@NoArgsConstructor
-@EqualsAndHashCode
-@Schema(description = "PDF file input - either upload a file or provide a server-side file ID")
-public class PDFFile {
-    @Schema(description = "The input PDF file", format = "binary")
-    private MultipartFile fileInput;
-
-    @Schema(
-            description =
-                    "File ID for server-side files (can be used instead of fileInput if job was previously done on file in async mode)")
-    private String fileId;
-
-    @AssertTrue(message = "Either fileInput or fileId must be provided")
-    @Schema(hidden = true)
-    private boolean isValid() {
-        return (fileInput != null && (fileId == null || fileId.trim().isEmpty()))
-                || (fileId != null && !fileId.trim().isEmpty() && fileInput == null);
-    }
-}
@@ -1,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;
-}
@@ -1,164 +0,0 @@
-package stirling.software.common.model.job;
-
-import java.time.LocalDateTime;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.concurrent.CopyOnWriteArrayList;
-
-import com.fasterxml.jackson.annotation.JsonIgnore;
-
-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;
-
-    /** List of result files for jobs that produce files */
-    @JsonIgnore private List<ResultFile> resultFiles;
-
-    /** 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 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();
-    }
-
-    /**
-     * Mark this job as complete with multiple file results
-     *
-     * @param resultFiles The list of result files
-     */
-    public void completeWithFiles(List<ResultFile> resultFiles) {
-        this.complete = true;
-        this.resultFiles = new ArrayList<>(resultFiles);
-        this.completedAt = LocalDateTime.now();
-    }
-
-    /**
-     * Mark this job as complete with a single file result (convenience method)
-     *
-     * @param fileId The file ID of the result
-     * @param fileName The file name
-     * @param contentType The content type of the file
-     * @param fileSize The size of the file in bytes
-     */
-    public void completeWithSingleFile(
-            String fileId, String fileName, String contentType, long fileSize) {
-        ResultFile resultFile =
-                ResultFile.builder()
-                        .fileId(fileId)
-                        .fileName(fileName)
-                        .contentType(contentType)
-                        .fileSize(fileSize)
-                        .build();
-        completeWithFiles(List.of(resultFile));
-    }
-
-    /**
-     * Check if this job has file results
-     *
-     * @return true if this job has file results, false otherwise
-     */
-    public boolean hasFiles() {
-        return resultFiles != null && !resultFiles.isEmpty();
-    }
-
-    /**
-     * Check if this job has multiple file results
-     *
-     * @return true if this job has multiple file results, false otherwise
-     */
-    public boolean hasMultipleFiles() {
-        return resultFiles != null && resultFiles.size() > 1;
-    }
-
-    /**
-     * Get all result files
-     *
-     * @return List of result files
-     */
-    public List<ResultFile> getAllResultFiles() {
-        if (resultFiles != null && !resultFiles.isEmpty()) {
-            return Collections.unmodifiableList(resultFiles);
-        }
-        return Collections.emptyList();
-    }
-
-    /**
-     * 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);
-    }
-}
@@ -1,26 +0,0 @@
-package stirling.software.common.model.job;
-
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-/** Represents a single file result from a job execution */
-@Data
-@Builder
-@NoArgsConstructor
-@AllArgsConstructor
-public class ResultFile {
-
-    /** The file ID for accessing the file */
-    private String fileId;
-
-    /** The original file name */
-    private String fileName;
-
-    /** MIME type of the file */
-    private String contentType;
-
-    /** Size of the file in bytes */
-    private long fileSize;
-}
@@ -1,42 +0,0 @@
-package stirling.software.common.service;
-
-import java.io.InputStream;
-import java.security.KeyStore;
-import java.security.cert.X509Certificate;
-import java.util.Date;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-public interface ServerCertificateServiceInterface {
-
-    boolean isEnabled();
-
-    boolean hasServerCertificate();
-
-    void initializeServerCertificate();
-
-    KeyStore getServerKeyStore() throws Exception;
-
-    String getServerCertificatePassword();
-
-    X509Certificate getServerCertificate() throws Exception;
-
-    byte[] getServerCertificatePublicKey() throws Exception;
-
-    void uploadServerCertificate(InputStream p12Stream, String password) throws Exception;
-
-    void deleteServerCertificate() throws Exception;
-
-    ServerCertificateInfo getServerCertificateInfo() throws Exception;
-
-    @Getter
-    @AllArgsConstructor
-    class ServerCertificateInfo {
-        private final boolean exists;
-        private final String subject;
-        private final String issuer;
-        private final Date validFrom;
-        private final Date validTo;
-    }
-}
@@ -1,208 +0,0 @@
-package stirling.software.common.service;
-
-import java.net.InetAddress;
-import java.net.URI;
-import java.net.UnknownHostException;
-import java.util.regex.Pattern;
-
-import org.springframework.stereotype.Service;
-
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-
-import stirling.software.common.model.ApplicationProperties;
-
-@Service
-@RequiredArgsConstructor
-@Slf4j
-public class SsrfProtectionService {
-
-    private final ApplicationProperties applicationProperties;
-
-    private static final Pattern DATA_URL_PATTERN =
-            Pattern.compile("^data:.*", Pattern.CASE_INSENSITIVE);
-    private static final Pattern FRAGMENT_PATTERN = Pattern.compile("^#.*");
-
-    public enum SsrfProtectionLevel {
-        OFF, // No SSRF protection - allows all URLs
-        MEDIUM, // Block internal networks but allow external URLs
-        MAX // Block all external URLs - only data: and fragments
-    }
-
-    public boolean isUrlAllowed(String url) {
-        ApplicationProperties.Html.UrlSecurity config =
-                applicationProperties.getSystem().getHtml().getUrlSecurity();
-
-        if (!config.isEnabled()) {
-            return true;
-        }
-
-        if (url == null || url.trim().isEmpty()) {
-            return false;
-        }
-
-        String trimmedUrl = url.trim();
-
-        // Always allow data URLs and fragments
-        if (DATA_URL_PATTERN.matcher(trimmedUrl).matches()
-                || FRAGMENT_PATTERN.matcher(trimmedUrl).matches()) {
-            return true;
-        }
-
-        SsrfProtectionLevel level = parseProtectionLevel(config.getLevel());
-
-        switch (level) {
-            case OFF:
-                return true;
-            case MAX:
-                return isMaxSecurityAllowed(trimmedUrl, config);
-            case MEDIUM:
-                return isMediumSecurityAllowed(trimmedUrl, config);
-            default:
-                return false;
-        }
-    }
-
-    private SsrfProtectionLevel parseProtectionLevel(String level) {
-        try {
-            return SsrfProtectionLevel.valueOf(level.toUpperCase());
-        } catch (IllegalArgumentException e) {
-            log.warn("Invalid SSRF protection level '{}', defaulting to MEDIUM", level);
-            return SsrfProtectionLevel.MEDIUM;
-        }
-    }
-
-    private boolean isMaxSecurityAllowed(
-            String url, ApplicationProperties.Html.UrlSecurity config) {
-        // MAX security: only allow explicitly whitelisted domains
-        try {
-            URI uri = new URI(url);
-            String host = uri.getHost();
-
-            if (host == null) {
-                return false;
-            }
-
-            return config.getAllowedDomains().contains(host.toLowerCase());
-
-        } catch (Exception e) {
-            log.debug("Failed to parse URL for MAX security check: {}", url, e);
-            return false;
-        }
-    }
-
-    private boolean isMediumSecurityAllowed(
-            String url, ApplicationProperties.Html.UrlSecurity config) {
-        try {
-            URI uri = new URI(url);
-            String host = uri.getHost();
-
-            if (host == null) {
-                return false;
-            }
-
-            String hostLower = host.toLowerCase();
-
-            // Check explicit blocked domains
-            if (config.getBlockedDomains().contains(hostLower)) {
-                log.debug("URL blocked by explicit domain blocklist: {}", url);
-                return false;
-            }
-
-            // Check internal TLD patterns
-            for (String tld : config.getInternalTlds()) {
-                if (hostLower.endsWith(tld.toLowerCase())) {
-                    log.debug("URL blocked by internal TLD pattern '{}': {}", tld, url);
-                    return false;
-                }
-            }
-
-            // If allowedDomains is specified, only allow those
-            if (!config.getAllowedDomains().isEmpty()) {
-                boolean isAllowed =
-                        config.getAllowedDomains().stream()
-                                .anyMatch(
-                                        domain ->
-                                                hostLower.equals(domain.toLowerCase())
-                                                        || hostLower.endsWith(
-                                                                "." + domain.toLowerCase()));
-
-                if (!isAllowed) {
-                    log.debug("URL not in allowed domains list: {}", url);
-                    return false;
-                }
-            }
-
-            // Resolve hostname to IP address for network-based checks
-            try {
-                InetAddress address = InetAddress.getByName(host);
-
-                if (config.isBlockPrivateNetworks() && isPrivateAddress(address)) {
-                    log.debug("URL blocked - private network address: {}", url);
-                    return false;
-                }
-
-                if (config.isBlockLocalhost() && address.isLoopbackAddress()) {
-                    log.debug("URL blocked - localhost address: {}", url);
-                    return false;
-                }
-
-                if (config.isBlockLinkLocal() && address.isLinkLocalAddress()) {
-                    log.debug("URL blocked - link-local address: {}", url);
-                    return false;
-                }
-
-                if (config.isBlockCloudMetadata()
-                        && isCloudMetadataAddress(address.getHostAddress())) {
-                    log.debug("URL blocked - cloud metadata endpoint: {}", url);
-                    return false;
-                }
-
-            } catch (UnknownHostException e) {
-                log.debug("Failed to resolve hostname for SSRF check: {}", host, e);
-                return false;
-            }
-
-            return true;
-
-        } catch (Exception e) {
-            log.debug("Failed to parse URL for MEDIUM security check: {}", url, e);
-            return false;
-        }
-    }
-
-    private boolean isPrivateAddress(InetAddress address) {
-        return address.isSiteLocalAddress()
-                || address.isAnyLocalAddress()
-                || isPrivateIPv4Range(address.getHostAddress());
-    }
-
-    private boolean isPrivateIPv4Range(String ip) {
-        return ip.startsWith("10.")
-                || ip.startsWith("192.168.")
-                || (ip.startsWith("172.") && isInRange172(ip))
-                || ip.startsWith("127.")
-                || "0.0.0.0".equals(ip);
-    }
-
-    private boolean isInRange172(String ip) {
-        String[] parts = ip.split("\\.");
-        if (parts.length >= 2) {
-            try {
-                int secondOctet = Integer.parseInt(parts[1]);
-                return secondOctet >= 16 && secondOctet <= 31;
-            } catch (NumberFormatException e) {
-                return false;
-            }
-        }
-        return false;
-    }
-
-    private boolean isCloudMetadataAddress(String ip) {
-        // Cloud metadata endpoints for AWS, GCP, Azure, Oracle Cloud, and IBM Cloud
-        return ip.startsWith("169.254.169.254") // AWS/GCP/Azure
-                || ip.startsWith("fd00:ec2::254") // AWS IPv6
-                || ip.startsWith("169.254.169.253") // Oracle Cloud
-                || ip.startsWith("169.254.169.250"); // IBM Cloud
-    }
-}
@@ -1,449 +0,0 @@
-package stirling.software.common.service;
-
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.Arrays;
-import java.util.Set;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicInteger;
-import java.util.function.Consumer;
-import java.util.function.Predicate;
-import java.util.stream.Stream;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.scheduling.annotation.Scheduled;
-import org.springframework.stereotype.Service;
-
-import jakarta.annotation.PostConstruct;
-
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-
-import stirling.software.common.model.ApplicationProperties;
-import stirling.software.common.util.GeneralUtils;
-import stirling.software.common.util.TempFileManager;
-import stirling.software.common.util.TempFileRegistry;
-
-/**
- * Service to periodically clean up temporary files. Runs scheduled tasks to delete old temp files
- * and directories.
- */
-@Slf4j
-@Service
-@RequiredArgsConstructor
-public class TempFileCleanupService {
-
-    private final TempFileRegistry registry;
-    private final TempFileManager tempFileManager;
-    private final ApplicationProperties applicationProperties;
-
-    @Autowired
-    @Qualifier("machineType")
-    private String machineType;
-
-    // Maximum recursion depth for directory traversal
-    private static final int MAX_RECURSION_DEPTH = 5;
-
-    // File patterns that identify our temp files
-    private static final Predicate<String> IS_OUR_TEMP_FILE =
-            fileName ->
-                    fileName.startsWith("stirling-pdf-")
-                            || fileName.startsWith("output_")
-                            || fileName.startsWith("compressedPDF")
-                            || fileName.startsWith("pdf-save-")
-                            || fileName.startsWith("pdf-stream-")
-                            || fileName.startsWith("PDFBox")
-                            || fileName.startsWith("input_")
-                            || fileName.startsWith("overlay-");
-
-    // File patterns that identify common system temp files
-    private static final Predicate<String> IS_SYSTEM_TEMP_FILE =
-            fileName ->
-                    fileName.matches("lu\\d+[a-z0-9]*\\.tmp")
-                            || fileName.matches("ocr_process\\d+")
-                            || (fileName.startsWith("tmp") && !fileName.contains("jetty"))
-                            || fileName.startsWith("OSL_PIPE_")
-                            || (fileName.endsWith(".tmp") && !fileName.contains("jetty"));
-
-    // File patterns that should be excluded from cleanup
-    private static final Predicate<String> SHOULD_SKIP =
-            fileName ->
-                    fileName.contains("jetty")
-                            || fileName.startsWith("jetty-")
-                            || "proc".equals(fileName)
-                            || "sys".equals(fileName)
-                            || "dev".equals(fileName)
-                            || "hsperfdata_stirlingpdfuser".equals(fileName)
-                            || fileName.startsWith("hsperfdata_")
-                            || ".pdfbox.cache".equals(fileName);
-
-    @PostConstruct
-    public void init() {
-        // Create necessary directories
-        ensureDirectoriesExist();
-
-        // Perform startup cleanup if enabled
-        if (applicationProperties.getSystem().getTempFileManagement().isStartupCleanup()) {
-            runStartupCleanup();
-        }
-    }
-
-    /** Ensure that all required temp directories exist */
-    private void ensureDirectoriesExist() {
-        try {
-            ApplicationProperties.TempFileManagement tempFiles =
-                    applicationProperties.getSystem().getTempFileManagement();
-
-            // Create the main temp directory
-            String customTempDirectory = tempFiles.getBaseTmpDir();
-            if (customTempDirectory != null && !customTempDirectory.isEmpty()) {
-                Path tempDir = Path.of(customTempDirectory);
-                if (!Files.exists(tempDir)) {
-                    Files.createDirectories(tempDir);
-                    log.info("Created temp directory: {}", tempDir);
-                }
-            }
-
-            // Create LibreOffice temp directory
-            String libreOfficeTempDir = tempFiles.getLibreofficeDir();
-            if (libreOfficeTempDir != null && !libreOfficeTempDir.isEmpty()) {
-                Path loTempDir = Path.of(libreOfficeTempDir);
-                if (!Files.exists(loTempDir)) {
-                    Files.createDirectories(loTempDir);
-                    log.info("Created LibreOffice temp directory: {}", loTempDir);
-                }
-            }
-        } catch (IOException e) {
-            log.error("Error creating temp directories", e);
-        }
-    }
-
-    /** Scheduled task to clean up old temporary files. Runs at the configured interval. */
-    @Scheduled(
-            fixedDelayString =
-                    "#{applicationProperties.system.tempFileManagement.cleanupIntervalMinutes}",
-            timeUnit = TimeUnit.MINUTES)
-    public void scheduledCleanup() {
-        log.info("Running scheduled temporary file cleanup");
-        long maxAgeMillis = tempFileManager.getMaxAgeMillis();
-
-        // Clean up registered temp files (managed by TempFileRegistry)
-        int registeredDeletedCount = tempFileManager.cleanupOldTempFiles(maxAgeMillis);
-        log.info("Cleaned up {} registered temporary files", registeredDeletedCount);
-
-        // Clean up registered temp directories
-        int directoriesDeletedCount = 0;
-        for (Path directory : registry.getTempDirectories()) {
-            try {
-                if (Files.exists(directory)) {
-                    GeneralUtils.deleteDirectory(directory);
-                    directoriesDeletedCount++;
-                    log.debug("Cleaned up temporary directory: {}", directory);
-                }
-            } catch (IOException e) {
-                log.warn("Failed to clean up temporary directory: {}", directory, e);
-            }
-        }
-
-        // Clean up PDFBox cache file
-        cleanupPDFBoxCache();
-
-        // Clean up unregistered temp files based on our cleanup strategy
-        boolean containerMode = isContainerMode();
-        int unregisteredDeletedCount = cleanupUnregisteredFiles(containerMode, true, maxAgeMillis);
-
-        if (registeredDeletedCount > 0
-                || unregisteredDeletedCount > 0
-                || directoriesDeletedCount > 0) {
-            log.info(
-                    "Scheduled cleanup complete. Deleted {} registered files, {} unregistered files, {} directories",
-                    registeredDeletedCount,
-                    unregisteredDeletedCount,
-                    directoriesDeletedCount);
-        }
-    }
-
-    /**
-     * Perform startup cleanup of stale temporary files from previous runs. This is especially
-     * important in Docker environments where temp files persist between container restarts.
-     */
-    private void runStartupCleanup() {
-        boolean containerMode = isContainerMode();
-
-        log.info(
-                "Running in {} mode, using {} cleanup strategy",
-                machineType,
-                containerMode ? "aggressive" : "conservative");
-
-        // For startup cleanup, we use a longer timeout for non-container environments
-        long maxAgeMillis = containerMode ? 0 : 24 * 60 * 60 * 1000; // 0 or 24 hours
-
-        int totalDeletedCount = cleanupUnregisteredFiles(containerMode, false, maxAgeMillis);
-        log.info(
-                "Startup cleanup complete. Deleted {} temporary files/directories",
-                totalDeletedCount);
-    }
-
-    /**
-     * Clean up unregistered temporary files across all configured temp directories.
-     *
-     * @param containerMode Whether we're in container mode (more aggressive cleanup)
-     * @param isScheduled Whether this is a scheduled cleanup or startup cleanup
-     * @param maxAgeMillis Maximum age of files to clean in milliseconds
-     * @return Number of files deleted
-     */
-    private int cleanupUnregisteredFiles(
-            boolean containerMode, boolean isScheduled, long maxAgeMillis) {
-        AtomicInteger totalDeletedCount = new AtomicInteger(0);
-
-        try {
-            ApplicationProperties.TempFileManagement tempFiles =
-                    applicationProperties.getSystem().getTempFileManagement();
-            Path[] dirsToScan;
-            if (tempFiles.isCleanupSystemTemp()
-                    && tempFiles.getSystemTempDir() != null
-                    && !tempFiles.getSystemTempDir().isEmpty()) {
-                Path systemTempPath = getSystemTempPath();
-                dirsToScan =
-                        new Path[] {
-                            systemTempPath,
-                            Path.of(tempFiles.getBaseTmpDir()),
-                            Path.of(tempFiles.getLibreofficeDir())
-                        };
-            } else {
-                dirsToScan =
-                        new Path[] {
-                            Path.of(tempFiles.getBaseTmpDir()),
-                            Path.of(tempFiles.getLibreofficeDir())
-                        };
-            }
-
-            // Process each directory
-            Arrays.stream(dirsToScan)
-                    .filter(Files::exists)
-                    .forEach(
-                            tempDir -> {
-                                try {
-                                    String phase = isScheduled ? "scheduled" : "startup";
-                                    log.debug(
-                                            "Scanning directory for {} cleanup: {}",
-                                            phase,
-                                            tempDir);
-
-                                    AtomicInteger dirDeletedCount = new AtomicInteger(0);
-                                    cleanupDirectoryStreaming(
-                                            tempDir,
-                                            containerMode,
-                                            0,
-                                            maxAgeMillis,
-                                            isScheduled,
-                                            path -> {
-                                                dirDeletedCount.incrementAndGet();
-                                                if (log.isDebugEnabled()) {
-                                                    log.debug(
-                                                            "Deleted temp file during {} cleanup: {}",
-                                                            phase,
-                                                            path);
-                                                }
-                                            });
-
-                                    int count = dirDeletedCount.get();
-                                    totalDeletedCount.addAndGet(count);
-                                    if (count > 0) {
-                                        log.info(
-                                                "Cleaned up {} files/directories in {}",
-                                                count,
-                                                tempDir);
-                                    }
-                                } catch (IOException e) {
-                                    log.error("Error during cleanup of directory: {}", tempDir, e);
-                                }
-                            });
-        } catch (Exception e) {
-            log.error("Error during cleanup of unregistered files", e);
-        }
-
-        return totalDeletedCount.get();
-    }
-
-    /** Get the system temp directory path based on configuration or system property. */
-    private Path getSystemTempPath() {
-        String systemTempDir =
-                applicationProperties.getSystem().getTempFileManagement().getSystemTempDir();
-        if (systemTempDir != null && !systemTempDir.isEmpty()) {
-            return Path.of(systemTempDir);
-        } else {
-            return Path.of(System.getProperty("java.io.tmpdir"));
-        }
-    }
-
-    /** Determine if we're running in a container environment. */
-    private boolean isContainerMode() {
-        return "Docker".equals(machineType) || "Kubernetes".equals(machineType);
-    }
-
-    /**
-     * Recursively clean up a directory using a streaming approach to reduce memory usage.
-     *
-     * @param directory The directory to clean
-     * @param containerMode Whether we're in container mode (more aggressive cleanup)
-     * @param depth Current recursion depth
-     * @param maxAgeMillis Maximum age of files to delete
-     * @param isScheduled Whether this is a scheduled cleanup (vs startup)
-     * @param onDeleteCallback Callback function when a file is deleted
-     * @throws IOException If an I/O error occurs
-     */
-    private void cleanupDirectoryStreaming(
-            Path directory,
-            boolean containerMode,
-            int depth,
-            long maxAgeMillis,
-            boolean isScheduled,
-            Consumer<Path> onDeleteCallback)
-            throws IOException {
-
-        if (depth > MAX_RECURSION_DEPTH) {
-            log.debug("Maximum directory recursion depth reached for: {}", directory);
-            return;
-        }
-
-        java.util.List<Path> subdirectories = new java.util.ArrayList<>();
-
-        try (Stream<Path> pathStream = Files.list(directory)) {
-            pathStream.forEach(
-                    path -> {
-                        try {
-                            String fileName = path.getFileName().toString();
-
-                            if (SHOULD_SKIP.test(fileName)) {
-                                return;
-                            }
-
-                            if (Files.isDirectory(path)) {
-                                subdirectories.add(path);
-                                return;
-                            }
-
-                            if (registry.contains(path.toFile())) {
-                                return;
-                            }
-
-                            if (shouldDeleteFile(path, fileName, containerMode, maxAgeMillis)) {
-                                try {
-                                    Files.deleteIfExists(path);
-                                    onDeleteCallback.accept(path);
-                                } catch (IOException e) {
-                                    if (e.getMessage() != null
-                                            && e.getMessage()
-                                                    .contains("being used by another process")) {
-                                        log.debug("File locked, skipping delete: {}", path);
-                                    } else {
-                                        log.warn("Failed to delete temp file: {}", path, e);
-                                    }
-                                }
-                            }
-                        } catch (Exception e) {
-                            log.warn("Error processing path: {}", path, e);
-                        }
-                    });
-        }
-
-        for (Path subdirectory : subdirectories) {
-            try {
-                cleanupDirectoryStreaming(
-                        subdirectory,
-                        containerMode,
-                        depth + 1,
-                        maxAgeMillis,
-                        isScheduled,
-                        onDeleteCallback);
-            } catch (IOException e) {
-                log.warn("Error processing subdirectory: {}", subdirectory, e);
-            }
-        }
-    }
-
-    /** Determine if a file should be deleted based on its name, age, and other criteria. */
-    private boolean shouldDeleteFile(
-            Path path, String fileName, boolean containerMode, long maxAgeMillis) {
-        // First check if it matches our known temp file patterns
-        boolean isOurTempFile = IS_OUR_TEMP_FILE.test(fileName);
-        boolean isSystemTempFile = IS_SYSTEM_TEMP_FILE.test(fileName);
-
-        // Normal operation - check against temp file patterns
-        boolean shouldDelete = isOurTempFile || (containerMode && isSystemTempFile);
-
-        // Get file info for age checks
-        long lastModified = 0;
-        long currentTime = System.currentTimeMillis();
-        boolean isEmptyFile = false;
-
-        try {
-            lastModified = Files.getLastModifiedTime(path).toMillis();
-            // Special case for zero-byte files - these are often corrupted temp files
-            if (Files.size(path) == 0) {
-                isEmptyFile = true;
-                // For empty files, use a shorter timeout (5 minutes)
-                // Delete empty files older than 5 minutes
-                if ((currentTime - lastModified) > 5 * 60 * 1000) {
-                    shouldDelete = true;
-                }
-            }
-        } catch (IOException e) {
-            log.debug("Could not check file info, skipping: {}", path);
-        }
-
-        // Check file age against maxAgeMillis only if it's not an empty file that we've already
-        // decided to delete
-        if (!isEmptyFile && shouldDelete && maxAgeMillis > 0) {
-            // In normal mode, check age against maxAgeMillis
-            shouldDelete = (currentTime - lastModified) > maxAgeMillis;
-        }
-
-        return shouldDelete;
-    }
-
-    /** Clean up LibreOffice temporary files. This method is called after LibreOffice operations. */
-    public void cleanupLibreOfficeTempFiles() {
-        // Cleanup known LibreOffice temp directories
-        try {
-            Set<Path> directories = registry.getTempDirectories();
-            for (Path dir : directories) {
-                if (dir.getFileName().toString().contains("libreoffice") && Files.exists(dir)) {
-                    // For directories containing "libreoffice", delete all contents
-                    // but keep the directory itself for future use
-                    cleanupDirectoryStreaming(
-                            dir,
-                            isContainerMode(),
-                            0,
-                            0, // age doesn't matter for LibreOffice cleanup
-                            false,
-                            path -> log.debug("Cleaned up LibreOffice temp file: {}", path));
-                    log.debug("Cleaned up LibreOffice temp directory contents: {}", dir);
-                }
-            }
-        } catch (IOException e) {
-            log.warn("Failed to clean up LibreOffice temp files", e);
-        }
-    }
-
-    /**
-     * Clean up PDFBox cache file from user home directory. This cache file can grow large and
-     * should be periodically cleaned.
-     */
-    private void cleanupPDFBoxCache() {
-        try {
-            Path userHome = Path.of(System.getProperty("user.home"));
-            Path pdfboxCache = userHome.resolve(".pdfbox.cache");
-
-            if (Files.exists(pdfboxCache)) {
-                Files.deleteIfExists(pdfboxCache);
-                log.debug("Cleaned up PDFBox cache file: {}", pdfboxCache);
-            }
-        } catch (IOException e) {
-            log.warn("Failed to clean up PDFBox cache file", e);
-        }
-    }
-}
@@ -1,76 +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;
-
-/**
- * Helper class that provides access to the ApplicationContext. Useful for getting beans in classes
- * that are not managed by Spring.
- */
-@Component
-public class ApplicationContextProvider implements ApplicationContextAware {
-
-    private static ApplicationContext applicationContext;
-
-    @Override
-    public void setApplicationContext(ApplicationContext context) throws BeansException {
-        applicationContext = context;
-    }
-
-    /**
-     * Get a bean by class type.
-     *
-     * @param <T> The type of the bean
-     * @param beanClass The class of the bean
-     * @return The bean instance, or null if not found
-     */
-    public static <T> T getBean(Class<T> beanClass) {
-        if (applicationContext == null) {
-            return null;
-        }
-        try {
-            return applicationContext.getBean(beanClass);
-        } catch (BeansException e) {
-            return null;
-        }
-    }
-
-    /**
-     * Get a bean by name and class type.
-     *
-     * @param <T> The type of the bean
-     * @param name The name of the bean
-     * @param beanClass The class of the bean
-     * @return The bean instance, or null if not found
-     */
-    public static <T> T getBean(String name, Class<T> beanClass) {
-        if (applicationContext == null) {
-            return null;
-        }
-        try {
-            return applicationContext.getBean(name, beanClass);
-        } catch (BeansException e) {
-            return null;
-        }
-    }
-
-    /**
-     * Check if a bean of the specified type exists.
-     *
-     * @param beanClass The class of the bean
-     * @return true if the bean exists, false otherwise
-     */
-    public static boolean containsBean(Class<?> beanClass) {
-        if (applicationContext == null) {
-            return false;
-        }
-        try {
-            applicationContext.getBean(beanClass);
-            return true;
-        } catch (BeansException e) {
-            return false;
-        }
-    }
-}
@@ -1,50 +0,0 @@
-package stirling.software.common.util;
-
-import org.apache.pdfbox.cos.COSDictionary;
-import org.apache.pdfbox.cos.COSName;
-import org.apache.pdfbox.pdmodel.PDDocument;
-import org.apache.pdfbox.pdmodel.PDDocumentCatalog;
-import org.apache.pdfbox.pdmodel.PageMode;
-
-import lombok.extern.slf4j.Slf4j;
-
-@Slf4j
-public class AttachmentUtils {
-
-    /**
-     * Sets the PDF catalog viewer preferences to display attachments in the viewer.
-     *
-     * @param document The <code>PDDocument</code> to modify.
-     * @param pageMode The <code>PageMode</code> to set for the PDF viewer. <code>PageMode</code>
-     *     values: <code>UseNone</code>, <code>UseOutlines</code>, <code>UseThumbs</code>, <code>
-     *     FullScreen</code>, <code>UseOC</code>, <code>UseAttachments</code>.
-     */
-    public static void setCatalogViewerPreferences(PDDocument document, PageMode pageMode) {
-        try {
-            PDDocumentCatalog catalog = document.getDocumentCatalog();
-            if (catalog != null) {
-                COSDictionary catalogDict = catalog.getCOSObject();
-
-                catalog.setPageMode(pageMode);
-                catalogDict.setName(COSName.PAGE_MODE, pageMode.stringValue());
-
-                COSDictionary viewerPrefs =
-                        (COSDictionary) catalogDict.getDictionaryObject(COSName.VIEWER_PREFERENCES);
-                if (viewerPrefs == null) {
-                    viewerPrefs = new COSDictionary();
-                    catalogDict.setItem(COSName.VIEWER_PREFERENCES, viewerPrefs);
-                }
-
-                viewerPrefs.setName(
-                        COSName.getPDFName("NonFullScreenPageMode"), pageMode.stringValue());
-
-                viewerPrefs.setBoolean(COSName.getPDFName("DisplayDocTitle"), true);
-
-                log.info(
-                        "Set PDF PageMode to UseAttachments to automatically show attachments pane");
-            }
-        } catch (Exception e) {
-            log.error("Failed to set catalog viewer preferences for attachments", e);
-        }
-    }
-}
@@ -1,71 +0,0 @@
-package stirling.software.common.util;
-
-import org.owasp.html.AttributePolicy;
-import org.owasp.html.HtmlPolicyBuilder;
-import org.owasp.html.PolicyFactory;
-import org.owasp.html.Sanitizers;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-import stirling.software.common.model.ApplicationProperties;
-import stirling.software.common.service.SsrfProtectionService;
-
-@Component
-public class CustomHtmlSanitizer {
-
-    private final SsrfProtectionService ssrfProtectionService;
-    private final ApplicationProperties applicationProperties;
-
-    @Autowired
-    public CustomHtmlSanitizer(
-            SsrfProtectionService ssrfProtectionService,
-            ApplicationProperties applicationProperties) {
-        this.ssrfProtectionService = ssrfProtectionService;
-        this.applicationProperties = applicationProperties;
-    }
-
-    private final AttributePolicy SSRF_SAFE_URL_POLICY =
-            new AttributePolicy() {
-                @Override
-                public String apply(String elementName, String attributeName, String value) {
-                    if (value == null || value.trim().isEmpty()) {
-                        return null;
-                    }
-
-                    String trimmedValue = value.trim();
-
-                    // Use the SSRF protection service to validate the URL
-                    if (ssrfProtectionService != null
-                            && !ssrfProtectionService.isUrlAllowed(trimmedValue)) {
-                        return null;
-                    }
-
-                    return trimmedValue;
-                }
-            };
-
-    private final PolicyFactory SSRF_SAFE_IMAGES_POLICY =
-            new HtmlPolicyBuilder()
-                    .allowElements("img")
-                    .allowAttributes("alt", "width", "height", "title")
-                    .onElements("img")
-                    .allowAttributes("src")
-                    .matching(SSRF_SAFE_URL_POLICY)
-                    .onElements("img")
-                    .toFactory();
-
-    private final PolicyFactory POLICY =
-            Sanitizers.FORMATTING
-                    .and(Sanitizers.BLOCKS)
-                    .and(Sanitizers.STYLES)
-                    .and(Sanitizers.LINKS)
-                    .and(Sanitizers.TABLES)
-                    .and(SSRF_SAFE_IMAGES_POLICY)
-                    .and(new HtmlPolicyBuilder().disallowElements("noscript").toFactory());
-
-    public String sanitize(String html) {
-        boolean disableSanitize =
-                Boolean.TRUE.equals(applicationProperties.getSystem().getDisableSanitize());
-        return disableSanitize ? html : POLICY.sanitize(html);
-    }
-}
@@ -1,652 +0,0 @@
-package stirling.software.common.util;
-
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.lang.reflect.Constructor;
-import java.lang.reflect.Method;
-import java.nio.charset.StandardCharsets;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Properties;
-import java.util.regex.Pattern;
-
-import lombok.Data;
-import lombok.experimental.UtilityClass;
-
-import stirling.software.common.model.api.converters.EmlToPdfRequest;
-
-@UtilityClass
-public class EmlParser {
-
-    private static volatile Boolean jakartaMailAvailable = null;
-    private static volatile Method mimeUtilityDecodeTextMethod = null;
-    private static volatile boolean mimeUtilityChecked = false;
-
-    private static final Pattern MIME_ENCODED_PATTERN =
-            Pattern.compile("=\\?([^?]+)\\?([BbQq])\\?([^?]*)\\?=");
-
-    private static final String DISPOSITION_ATTACHMENT = "attachment";
-    private static final String TEXT_PLAIN = "text/plain";
-    private static final String TEXT_HTML = "text/html";
-    private static final String MULTIPART_PREFIX = "multipart/";
-
-    private static final String HEADER_CONTENT_TYPE = "content-type:";
-    private static final String HEADER_CONTENT_DISPOSITION = "content-disposition:";
-    private static final String HEADER_CONTENT_TRANSFER_ENCODING = "content-transfer-encoding:";
-    private static final String HEADER_CONTENT_ID = "Content-ID";
-    private static final String HEADER_SUBJECT = "Subject:";
-    private static final String HEADER_FROM = "From:";
-    private static final String HEADER_TO = "To:";
-    private static final String HEADER_CC = "Cc:";
-    private static final String HEADER_BCC = "Bcc:";
-    private static final String HEADER_DATE = "Date:";
-
-    private static synchronized boolean isJakartaMailAvailable() {
-        if (jakartaMailAvailable == null) {
-            try {
-                Class.forName("jakarta.mail.internet.MimeMessage");
-                Class.forName("jakarta.mail.Session");
-                Class.forName("jakarta.mail.internet.MimeUtility");
-                Class.forName("jakarta.mail.internet.MimePart");
-                Class.forName("jakarta.mail.internet.MimeMultipart");
-                Class.forName("jakarta.mail.Multipart");
-                Class.forName("jakarta.mail.Part");
-                jakartaMailAvailable = true;
-            } catch (ClassNotFoundException e) {
-                jakartaMailAvailable = false;
-            }
-        }
-        return jakartaMailAvailable;
-    }
-
-    public static EmailContent extractEmailContent(
-            byte[] emlBytes, EmlToPdfRequest request, CustomHtmlSanitizer customHtmlSanitizer)
-            throws IOException {
-        EmlProcessingUtils.validateEmlInput(emlBytes);
-
-        if (isJakartaMailAvailable()) {
-            return extractEmailContentAdvanced(emlBytes, request, customHtmlSanitizer);
-        } else {
-            return extractEmailContentBasic(emlBytes, request, customHtmlSanitizer);
-        }
-    }
-
-    private static EmailContent extractEmailContentBasic(
-            byte[] emlBytes, EmlToPdfRequest request, CustomHtmlSanitizer customHtmlSanitizer) {
-        String emlContent = new String(emlBytes, StandardCharsets.UTF_8);
-        EmailContent content = new EmailContent();
-
-        content.setSubject(extractBasicHeader(emlContent, HEADER_SUBJECT));
-        content.setFrom(extractBasicHeader(emlContent, HEADER_FROM));
-        content.setTo(extractBasicHeader(emlContent, HEADER_TO));
-        content.setCc(extractBasicHeader(emlContent, HEADER_CC));
-        content.setBcc(extractBasicHeader(emlContent, HEADER_BCC));
-
-        String dateStr = extractBasicHeader(emlContent, HEADER_DATE);
-        if (!dateStr.isEmpty()) {
-            content.setDateString(dateStr);
-        }
-
-        String htmlBody = extractHtmlBody(emlContent);
-        if (htmlBody != null) {
-            content.setHtmlBody(htmlBody);
-        } else {
-            String textBody = extractTextBody(emlContent);
-            content.setTextBody(textBody != null ? textBody : "Email content could not be parsed");
-        }
-
-        content.getAttachments().addAll(extractAttachmentsBasic(emlContent));
-
-        return content;
-    }
-
-    private static EmailContent extractEmailContentAdvanced(
-            byte[] emlBytes, EmlToPdfRequest request, CustomHtmlSanitizer customHtmlSanitizer) {
-        try {
-            Class<?> sessionClass = Class.forName("jakarta.mail.Session");
-            Class<?> mimeMessageClass = Class.forName("jakarta.mail.internet.MimeMessage");
-
-            Method getDefaultInstance =
-                    sessionClass.getMethod("getDefaultInstance", Properties.class);
-            Object session = getDefaultInstance.invoke(null, new Properties());
-
-            Class<?>[] constructorArgs = new Class<?>[] {sessionClass, InputStream.class};
-            Constructor<?> mimeMessageConstructor =
-                    mimeMessageClass.getConstructor(constructorArgs);
-            Object message =
-                    mimeMessageConstructor.newInstance(session, new ByteArrayInputStream(emlBytes));
-
-            return extractFromMimeMessage(message, request, customHtmlSanitizer);
-
-        } catch (ReflectiveOperationException e) {
-            return extractEmailContentBasic(emlBytes, request, customHtmlSanitizer);
-        }
-    }
-
-    private static EmailContent extractFromMimeMessage(
-            Object message, EmlToPdfRequest request, CustomHtmlSanitizer customHtmlSanitizer) {
-        EmailContent content = new EmailContent();
-
-        try {
-            Class<?> messageClass = message.getClass();
-
-            Method getSubject = messageClass.getMethod("getSubject");
-            String subject = (String) getSubject.invoke(message);
-            content.setSubject(subject != null ? safeMimeDecode(subject) : "No Subject");
-
-            Method getFrom = messageClass.getMethod("getFrom");
-            Object[] fromAddresses = (Object[]) getFrom.invoke(message);
-            content.setFrom(buildAddressString(fromAddresses));
-
-            extractRecipients(message, messageClass, content);
-
-            Method getSentDate = messageClass.getMethod("getSentDate");
-            content.setDate((Date) getSentDate.invoke(message));
-
-            Method getContent = messageClass.getMethod("getContent");
-            Object messageContent = getContent.invoke(message);
-
-            processMessageContent(message, messageContent, content, request, customHtmlSanitizer);
-
-        } catch (ReflectiveOperationException | RuntimeException e) {
-            content.setSubject("Email Conversion");
-            content.setFrom("Unknown");
-            content.setTo("Unknown");
-            content.setCc("");
-            content.setBcc("");
-            content.setTextBody("Email content could not be parsed with advanced processing");
-        }
-
-        return content;
-    }
-
-    private static void extractRecipients(
-            Object message, Class<?> messageClass, EmailContent content) {
-        try {
-            Method getRecipients =
-                    messageClass.getMethod(
-                            "getRecipients", Class.forName("jakarta.mail.Message$RecipientType"));
-            Class<?> recipientTypeClass = Class.forName("jakarta.mail.Message$RecipientType");
-
-            Object toType = recipientTypeClass.getField("TO").get(null);
-            Object[] toRecipients = (Object[]) getRecipients.invoke(message, toType);
-            content.setTo(buildAddressString(toRecipients));
-
-            Object ccType = recipientTypeClass.getField("CC").get(null);
-            Object[] ccRecipients = (Object[]) getRecipients.invoke(message, ccType);
-            content.setCc(buildAddressString(ccRecipients));
-
-            Object bccType = recipientTypeClass.getField("BCC").get(null);
-            Object[] bccRecipients = (Object[]) getRecipients.invoke(message, bccType);
-            content.setBcc(buildAddressString(bccRecipients));
-
-        } catch (ReflectiveOperationException e) {
-            try {
-                Method getAllRecipients = messageClass.getMethod("getAllRecipients");
-                Object[] recipients = (Object[]) getAllRecipients.invoke(message);
-                content.setTo(buildAddressString(recipients));
-                content.setCc("");
-                content.setBcc("");
-            } catch (ReflectiveOperationException ex) {
-                content.setTo("");
-                content.setCc("");
-                content.setBcc("");
-            }
-        }
-    }
-
-    private static String buildAddressString(Object[] addresses) {
-        if (addresses == null || addresses.length == 0) {
-            return "";
-        }
-
-        StringBuilder builder = new StringBuilder();
-        for (int i = 0; i < addresses.length; i++) {
-            if (i > 0) builder.append(", ");
-            builder.append(safeMimeDecode(addresses[i].toString()));
-        }
-        return builder.toString();
-    }
-
-    private static void processMessageContent(
-            Object message,
-            Object messageContent,
-            EmailContent content,
-            EmlToPdfRequest request,
-            CustomHtmlSanitizer customHtmlSanitizer) {
-        try {
-            if (messageContent instanceof String stringContent) {
-                Method getContentType = message.getClass().getMethod("getContentType");
-                String contentType = (String) getContentType.invoke(message);
-
-                if (contentType != null && contentType.toLowerCase().contains(TEXT_HTML)) {
-                    content.setHtmlBody(stringContent);
-                } else {
-                    content.setTextBody(stringContent);
-                }
-            } else {
-                Class<?> multipartClass = Class.forName("jakarta.mail.Multipart");
-                if (multipartClass.isInstance(messageContent)) {
-                    processMultipart(messageContent, content, request, customHtmlSanitizer, 0);
-                }
-            }
-        } catch (ReflectiveOperationException | ClassCastException e) {
-            content.setTextBody("Email content could not be parsed with advanced processing");
-        }
-    }
-
-    private static void processMultipart(
-            Object multipart,
-            EmailContent content,
-            EmlToPdfRequest request,
-            CustomHtmlSanitizer customHtmlSanitizer,
-            int depth) {
-
-        final int MAX_MULTIPART_DEPTH = 10;
-        if (depth > MAX_MULTIPART_DEPTH) {
-            content.setHtmlBody("<div class=\"error\">Maximum multipart depth exceeded</div>");
-            return;
-        }
-
-        try {
-            Class<?> multipartClass = multipart.getClass();
-            Method getCount = multipartClass.getMethod("getCount");
-            int count = (Integer) getCount.invoke(multipart);
-
-            Method getBodyPart = multipartClass.getMethod("getBodyPart", int.class);
-
-            for (int i = 0; i < count; i++) {
-                Object part = getBodyPart.invoke(multipart, i);
-                processPart(part, content, request, customHtmlSanitizer, depth + 1);
-            }
-
-        } catch (ReflectiveOperationException | ClassCastException e) {
-            content.setHtmlBody("<div class=\"error\">Error processing multipart content</div>");
-        }
-    }
-
-    private static void processPart(
-            Object part,
-            EmailContent content,
-            EmlToPdfRequest request,
-            CustomHtmlSanitizer customHtmlSanitizer,
-            int depth) {
-        try {
-            Class<?> partClass = part.getClass();
-
-            Method isMimeType = partClass.getMethod("isMimeType", String.class);
-            Method getContent = partClass.getMethod("getContent");
-            Method getDisposition = partClass.getMethod("getDisposition");
-            Method getFileName = partClass.getMethod("getFileName");
-            Method getContentType = partClass.getMethod("getContentType");
-            Method getHeader = partClass.getMethod("getHeader", String.class);
-
-            Object disposition = getDisposition.invoke(part);
-            String filename = (String) getFileName.invoke(part);
-            String contentType = (String) getContentType.invoke(part);
-
-            String normalizedDisposition =
-                    disposition != null ? ((String) disposition).toLowerCase() : null;
-
-            if ((Boolean) isMimeType.invoke(part, TEXT_PLAIN) && normalizedDisposition == null) {
-                Object partContent = getContent.invoke(part);
-                if (partContent instanceof String stringContent) {
-                    content.setTextBody(stringContent);
-                }
-            } else if ((Boolean) isMimeType.invoke(part, TEXT_HTML)
-                    && normalizedDisposition == null) {
-                Object partContent = getContent.invoke(part);
-                if (partContent instanceof String stringContent) {
-                    String htmlBody =
-                            customHtmlSanitizer != null
-                                    ? customHtmlSanitizer.sanitize(stringContent)
-                                    : stringContent;
-                    content.setHtmlBody(htmlBody);
-                }
-            } else if ((normalizedDisposition != null
-                            && normalizedDisposition.contains(DISPOSITION_ATTACHMENT))
-                    || (filename != null && !filename.trim().isEmpty())) {
-
-                processAttachment(
-                        part, content, request, getHeader, getContent, filename, contentType);
-            } else if ((Boolean) isMimeType.invoke(part, "multipart/*")) {
-                Object multipartContent = getContent.invoke(part);
-                if (multipartContent != null) {
-                    Class<?> multipartClass = Class.forName("jakarta.mail.Multipart");
-                    if (multipartClass.isInstance(multipartContent)) {
-                        processMultipart(
-                                multipartContent, content, request, customHtmlSanitizer, depth + 1);
-                    }
-                }
-            }
-
-        } catch (ReflectiveOperationException | RuntimeException e) {
-            // Continue processing other parts if one fails
-        }
-    }
-
-    private static void processAttachment(
-            Object part,
-            EmailContent content,
-            EmlToPdfRequest request,
-            Method getHeader,
-            Method getContent,
-            String filename,
-            String contentType) {
-
-        content.setAttachmentCount(content.getAttachmentCount() + 1);
-
-        if (filename != null && !filename.trim().isEmpty()) {
-            EmailAttachment attachment = new EmailAttachment();
-            attachment.setFilename(safeMimeDecode(filename));
-            attachment.setContentType(contentType);
-
-            try {
-                String[] contentIdHeaders = (String[]) getHeader.invoke(part, HEADER_CONTENT_ID);
-                if (contentIdHeaders != null) {
-                    for (String contentIdHeader : contentIdHeaders) {
-                        if (contentIdHeader != null && !contentIdHeader.trim().isEmpty()) {
-                            attachment.setEmbedded(true);
-                            String contentId = contentIdHeader.trim().replaceAll("[<>]", "");
-                            attachment.setContentId(contentId);
-                            break;
-                        }
-                    }
-                }
-            } catch (ReflectiveOperationException e) {
-            }
-
-            if ((request != null && request.isIncludeAttachments()) || attachment.isEmbedded()) {
-                extractAttachmentData(part, attachment, getContent, request);
-            }
-
-            content.getAttachments().add(attachment);
-        }
-    }
-
-    private static void extractAttachmentData(
-            Object part, EmailAttachment attachment, Method getContent, EmlToPdfRequest request) {
-        try {
-            Object attachmentContent = getContent.invoke(part);
-            byte[] attachmentData = null;
-
-            if (attachmentContent instanceof InputStream inputStream) {
-                try (InputStream stream = inputStream) {
-                    attachmentData = stream.readAllBytes();
-                } catch (IOException e) {
-                    if (attachment.isEmbedded()) {
-                        attachmentData = new byte[0];
-                    } else {
-                        throw new RuntimeException(e);
-                    }
-                }
-            } else if (attachmentContent instanceof byte[] byteArray) {
-                attachmentData = byteArray;
-            } else if (attachmentContent instanceof String stringContent) {
-                attachmentData = stringContent.getBytes(StandardCharsets.UTF_8);
-            }
-
-            if (attachmentData != null) {
-                long maxSizeMB = request != null ? request.getMaxAttachmentSizeMB() : 10L;
-                long maxSizeBytes = maxSizeMB * 1024 * 1024;
-
-                if (attachmentData.length <= maxSizeBytes || attachment.isEmbedded()) {
-                    attachment.setData(attachmentData);
-                    attachment.setSizeBytes(attachmentData.length);
-                } else {
-                    attachment.setSizeBytes(attachmentData.length);
-                }
-            }
-        } catch (ReflectiveOperationException | RuntimeException e) {
-            // Continue without attachment data
-        }
-    }
-
-    private static String extractBasicHeader(String emlContent, String headerName) {
-        try {
-            String[] lines = emlContent.split("\r?\n");
-            for (int i = 0; i < lines.length; i++) {
-                String line = lines[i];
-                if (line.toLowerCase().startsWith(headerName.toLowerCase())) {
-                    StringBuilder value =
-                            new StringBuilder(line.substring(headerName.length()).trim());
-                    for (int j = i + 1; j < lines.length; j++) {
-                        if (lines[j].startsWith(" ") || lines[j].startsWith("\t")) {
-                            value.append(" ").append(lines[j].trim());
-                        } else {
-                            break;
-                        }
-                    }
-                    return safeMimeDecode(value.toString());
-                }
-                if (line.trim().isEmpty()) break;
-            }
-        } catch (RuntimeException e) {
-            // Ignore errors in header extraction
-        }
-        return "";
-    }
-
-    private static String extractHtmlBody(String emlContent) {
-        try {
-            String lowerContent = emlContent.toLowerCase();
-            int htmlStart = lowerContent.indexOf(HEADER_CONTENT_TYPE + " " + TEXT_HTML);
-            if (htmlStart == -1) return null;
-
-            int bodyStart = emlContent.indexOf("\r\n\r\n", htmlStart);
-            if (bodyStart == -1) bodyStart = emlContent.indexOf("\n\n", htmlStart);
-            if (bodyStart == -1) return null;
-
-            bodyStart += (emlContent.charAt(bodyStart + 1) == '\r') ? 4 : 2;
-            int bodyEnd = findPartEnd(emlContent, bodyStart);
-
-            return emlContent.substring(bodyStart, bodyEnd).trim();
-        } catch (Exception e) {
-            return null;
-        }
-    }
-
-    private static String extractTextBody(String emlContent) {
-        try {
-            String lowerContent = emlContent.toLowerCase();
-            int textStart = lowerContent.indexOf(HEADER_CONTENT_TYPE + " " + TEXT_PLAIN);
-            if (textStart == -1) {
-                int bodyStart = emlContent.indexOf("\r\n\r\n");
-                if (bodyStart == -1) bodyStart = emlContent.indexOf("\n\n");
-                if (bodyStart != -1) {
-                    bodyStart += (emlContent.charAt(bodyStart + 1) == '\r') ? 4 : 2;
-                    int bodyEnd = findPartEnd(emlContent, bodyStart);
-                    return emlContent.substring(bodyStart, bodyEnd).trim();
-                }
-                return null;
-            }
-
-            int bodyStart = emlContent.indexOf("\r\n\r\n", textStart);
-            if (bodyStart == -1) bodyStart = emlContent.indexOf("\n\n", textStart);
-            if (bodyStart == -1) return null;
-
-            bodyStart += (emlContent.charAt(bodyStart + 1) == '\r') ? 4 : 2;
-            int bodyEnd = findPartEnd(emlContent, bodyStart);
-
-            return emlContent.substring(bodyStart, bodyEnd).trim();
-        } catch (RuntimeException e) {
-            return null;
-        }
-    }
-
-    private static int findPartEnd(String content, int start) {
-        String[] lines = content.substring(start).split("\r?\n");
-        StringBuilder result = new StringBuilder();
-
-        for (String line : lines) {
-            if (line.startsWith("--") && line.length() > 10) break;
-            result.append(line).append("\n");
-        }
-
-        return start + result.length();
-    }
-
-    private static List<EmailAttachment> extractAttachmentsBasic(String emlContent) {
-        List<EmailAttachment> attachments = new ArrayList<>();
-        try {
-            String[] lines = emlContent.split("\r?\n");
-            boolean inHeaders = true;
-            String currentContentType = "";
-            String currentDisposition = "";
-            String currentFilename = "";
-            String currentEncoding = "";
-
-            for (String line : lines) {
-                String lowerLine = line.toLowerCase().trim();
-
-                if (line.trim().isEmpty()) {
-                    inHeaders = false;
-                    if (isAttachment(currentDisposition, currentFilename, currentContentType)) {
-                        EmailAttachment attachment = new EmailAttachment();
-                        attachment.setFilename(currentFilename);
-                        attachment.setContentType(currentContentType);
-                        attachment.setTransferEncoding(currentEncoding);
-                        attachments.add(attachment);
-                    }
-                    currentContentType = "";
-                    currentDisposition = "";
-                    currentFilename = "";
-                    currentEncoding = "";
-                    inHeaders = true;
-                    continue;
-                }
-
-                if (!inHeaders) continue;
-
-                if (lowerLine.startsWith(HEADER_CONTENT_TYPE)) {
-                    currentContentType = line.substring(HEADER_CONTENT_TYPE.length()).trim();
-                } else if (lowerLine.startsWith(HEADER_CONTENT_DISPOSITION)) {
-                    currentDisposition = line.substring(HEADER_CONTENT_DISPOSITION.length()).trim();
-                    currentFilename = extractFilenameFromDisposition(currentDisposition);
-                } else if (lowerLine.startsWith(HEADER_CONTENT_TRANSFER_ENCODING)) {
-                    currentEncoding =
-                            line.substring(HEADER_CONTENT_TRANSFER_ENCODING.length()).trim();
-                }
-            }
-        } catch (RuntimeException e) {
-            // Continue with empty list
-        }
-        return attachments;
-    }
-
-    private static boolean isAttachment(String disposition, String filename, String contentType) {
-        return (disposition.toLowerCase().contains(DISPOSITION_ATTACHMENT) && !filename.isEmpty())
-                || (!filename.isEmpty() && !contentType.toLowerCase().startsWith("text/"))
-                || (contentType.toLowerCase().contains("application/") && !filename.isEmpty());
-    }
-
-    private static String extractFilenameFromDisposition(String disposition) {
-        if (disposition == null || !disposition.contains("filename=")) {
-            return "";
-        }
-
-        // Handle filename*= (RFC 2231 encoded filename)
-        if (disposition.toLowerCase().contains("filename*=")) {
-            int filenameStarStart = disposition.toLowerCase().indexOf("filename*=") + 10;
-            int filenameStarEnd = disposition.indexOf(";", filenameStarStart);
-            if (filenameStarEnd == -1) filenameStarEnd = disposition.length();
-            String extendedFilename =
-                    disposition.substring(filenameStarStart, filenameStarEnd).trim();
-            extendedFilename = extendedFilename.replaceAll("^\"|\"$", "");
-
-            if (extendedFilename.contains("'")) {
-                String[] parts = extendedFilename.split("'", 3);
-                if (parts.length == 3) {
-                    return EmlProcessingUtils.decodeUrlEncoded(parts[2]);
-                }
-            }
-        }
-
-        // Handle regular filename=
-        int filenameStart = disposition.toLowerCase().indexOf("filename=") + 9;
-        int filenameEnd = disposition.indexOf(";", filenameStart);
-        if (filenameEnd == -1) filenameEnd = disposition.length();
-        String filename = disposition.substring(filenameStart, filenameEnd).trim();
-        filename = filename.replaceAll("^\"|\"$", "");
-        return safeMimeDecode(filename);
-    }
-
-    public static String safeMimeDecode(String headerValue) {
-        if (headerValue == null || headerValue.trim().isEmpty()) {
-            return "";
-        }
-
-        if (!mimeUtilityChecked) {
-            synchronized (EmlParser.class) {
-                if (!mimeUtilityChecked) {
-                    initializeMimeUtilityDecoding();
-                }
-            }
-        }
-
-        if (mimeUtilityDecodeTextMethod != null) {
-            try {
-                return (String) mimeUtilityDecodeTextMethod.invoke(null, headerValue.trim());
-            } catch (ReflectiveOperationException | RuntimeException e) {
-                // Fall through to custom implementation
-            }
-        }
-
-        return EmlProcessingUtils.decodeMimeHeader(headerValue.trim());
-    }
-
-    private static void initializeMimeUtilityDecoding() {
-        try {
-            Class<?> mimeUtilityClass = Class.forName("jakarta.mail.internet.MimeUtility");
-            mimeUtilityDecodeTextMethod = mimeUtilityClass.getMethod("decodeText", String.class);
-        } catch (ClassNotFoundException | NoSuchMethodException e) {
-            mimeUtilityDecodeTextMethod = null;
-        }
-        mimeUtilityChecked = true;
-    }
-
-    @Data
-    public static class EmailContent {
-        private String subject;
-        private String from;
-        private String to;
-        private String cc;
-        private String bcc;
-        private Date date;
-        private String dateString; // For basic parsing fallback
-        private String htmlBody;
-        private String textBody;
-        private int attachmentCount;
-        private List<EmailAttachment> attachments = new ArrayList<>();
-
-        public void setHtmlBody(String htmlBody) {
-            this.htmlBody = htmlBody != null ? htmlBody.replaceAll("\r", "") : null;
-        }
-
-        public void setTextBody(String textBody) {
-            this.textBody = textBody != null ? textBody.replaceAll("\r", "") : null;
-        }
-    }
-
-    @Data
-    public static class EmailAttachment {
-        private String filename;
-        private String contentType;
-        private byte[] data;
-        private boolean embedded;
-        private String embeddedFilename;
-        private long sizeBytes;
-        private String contentId;
-        private String disposition;
-        private String transferEncoding;
-
-        public void setData(byte[] data) {
-            this.data = data;
-            if (data != null) {
-                this.sizeBytes = data.length;
-            }
-        }
-    }
-}
@@ -1,601 +0,0 @@
-package stirling.software.common.util;
-
-import java.nio.charset.Charset;
-import java.nio.charset.StandardCharsets;
-import java.util.Base64;
-import java.util.Locale;
-import java.util.Map;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import lombok.experimental.UtilityClass;
-
-import stirling.software.common.model.api.converters.EmlToPdfRequest;
-import stirling.software.common.model.api.converters.HTMLToPdfRequest;
-
-@UtilityClass
-public class EmlProcessingUtils {
-
-    // Style constants
-    private static final int DEFAULT_FONT_SIZE = 12;
-    private static final String DEFAULT_FONT_FAMILY = "Helvetica, sans-serif";
-    private static final float DEFAULT_LINE_HEIGHT = 1.4f;
-    private static final String DEFAULT_ZOOM = "1.0";
-    private static final String DEFAULT_TEXT_COLOR = "#202124";
-    private static final String DEFAULT_BACKGROUND_COLOR = "#ffffff";
-    private static final String DEFAULT_BORDER_COLOR = "#e8eaed";
-    private static final String ATTACHMENT_BACKGROUND_COLOR = "#f9f9f9";
-    private static final String ATTACHMENT_BORDER_COLOR = "#eeeeee";
-
-    private static final int EML_CHECK_LENGTH = 8192;
-    private static final int MIN_HEADER_COUNT_FOR_VALID_EML = 2;
-
-    // MIME type detection
-    private static final Map<String, String> EXTENSION_TO_MIME_TYPE =
-            Map.of(
-                    ".png", "image/png",
-                    ".jpg", "image/jpeg",
-                    ".jpeg", "image/jpeg",
-                    ".gif", "image/gif",
-                    ".bmp", "image/bmp",
-                    ".webp", "image/webp",
-                    ".svg", "image/svg+xml",
-                    ".ico", "image/x-icon",
-                    ".tiff", "image/tiff",
-                    ".tif", "image/tiff");
-
-    public static void validateEmlInput(byte[] emlBytes) {
-        if (emlBytes == null || emlBytes.length == 0) {
-            throw new IllegalArgumentException("EML file is empty or null");
-        }
-
-        if (isInvalidEmlFormat(emlBytes)) {
-            throw new IllegalArgumentException("Invalid EML file format");
-        }
-    }
-
-    private static boolean isInvalidEmlFormat(byte[] emlBytes) {
-        try {
-            int checkLength = Math.min(emlBytes.length, EML_CHECK_LENGTH);
-            String content;
-
-            try {
-                content = new String(emlBytes, 0, checkLength, StandardCharsets.UTF_8);
-                if (content.contains("\uFFFD")) {
-                    content = new String(emlBytes, 0, checkLength, StandardCharsets.ISO_8859_1);
-                }
-            } catch (Exception e) {
-                content = new String(emlBytes, 0, checkLength, StandardCharsets.ISO_8859_1);
-            }
-
-            String lowerContent = content.toLowerCase(Locale.ROOT);
-
-            boolean hasFrom =
-                    lowerContent.contains("from:") || lowerContent.contains("return-path:");
-            boolean hasSubject = lowerContent.contains("subject:");
-            boolean hasMessageId = lowerContent.contains("message-id:");
-            boolean hasDate = lowerContent.contains("date:");
-            boolean hasTo =
-                    lowerContent.contains("to:")
-                            || lowerContent.contains("cc:")
-                            || lowerContent.contains("bcc:");
-            boolean hasMimeStructure =
-                    lowerContent.contains("multipart/")
-                            || lowerContent.contains("text/plain")
-                            || lowerContent.contains("text/html")
-                            || lowerContent.contains("boundary=");
-
-            int headerCount = 0;
-            if (hasFrom) headerCount++;
-            if (hasSubject) headerCount++;
-            if (hasMessageId) headerCount++;
-            if (hasDate) headerCount++;
-            if (hasTo) headerCount++;
-
-            return headerCount < MIN_HEADER_COUNT_FOR_VALID_EML && !hasMimeStructure;
-
-        } catch (RuntimeException e) {
-            return false;
-        }
-    }
-
-    public static String generateEnhancedEmailHtml(
-            EmlParser.EmailContent content,
-            EmlToPdfRequest request,
-            CustomHtmlSanitizer customHtmlSanitizer) {
-        StringBuilder html = new StringBuilder();
-
-        html.append(
-                String.format(
-                        """
-                <!DOCTYPE html>
-                <html lang="en"><head><meta charset="UTF-8">
-                <title>%s</title>
-                <style>
-                """,
-                        sanitizeText(content.getSubject(), customHtmlSanitizer)));
-
-        appendEnhancedStyles(html);
-
-        html.append(
-                """
-                </style>
-                </head><body>
-                """);
-
-        html.append(
-                String.format(
-                        """
-                <div class="email-container">
-                <div class="email-header">
-                <h1>%s</h1>
-                <div class="email-meta">
-                <div><strong>From:</strong> %s</div>
-                <div><strong>To:</strong> %s</div>
-                """,
-                        sanitizeText(content.getSubject(), customHtmlSanitizer),
-                        sanitizeText(content.getFrom(), customHtmlSanitizer),
-                        sanitizeText(content.getTo(), customHtmlSanitizer)));
-
-        if (content.getCc() != null && !content.getCc().trim().isEmpty()) {
-            html.append(
-                    String.format(
-                            "<div><strong>CC:</strong> %s</div>\n",
-                            sanitizeText(content.getCc(), customHtmlSanitizer)));
-        }
-
-        if (content.getBcc() != null && !content.getBcc().trim().isEmpty()) {
-            html.append(
-                    String.format(
-                            "<div><strong>BCC:</strong> %s</div>\n",
-                            sanitizeText(content.getBcc(), customHtmlSanitizer)));
-        }
-
-        if (content.getDate() != null) {
-            html.append(
-                    String.format(
-                            "<div><strong>Date:</strong> %s</div>\n",
-                            PdfAttachmentHandler.formatEmailDate(content.getDate())));
-        } else if (content.getDateString() != null && !content.getDateString().trim().isEmpty()) {
-            html.append(
-                    String.format(
-                            "<div><strong>Date:</strong> %s</div>\n",
-                            sanitizeText(content.getDateString(), customHtmlSanitizer)));
-        }
-
-        html.append("</div></div>\n");
-
-        html.append("<div class=\"email-body\">\n");
-        if (content.getHtmlBody() != null && !content.getHtmlBody().trim().isEmpty()) {
-            String processedHtml =
-                    processEmailHtmlBody(content.getHtmlBody(), content, customHtmlSanitizer);
-            html.append(processedHtml);
-        } else if (content.getTextBody() != null && !content.getTextBody().trim().isEmpty()) {
-            html.append(
-                    String.format(
-                            "<div class=\"text-body\">%s</div>",
-                            convertTextToHtml(content.getTextBody(), customHtmlSanitizer)));
-        } else {
-            html.append("<div class=\"no-content\"><p><em>No content available</em></p></div>");
-        }
-        html.append("</div>\n");
-
-        if (content.getAttachmentCount() > 0 || !content.getAttachments().isEmpty()) {
-            appendAttachmentsSection(html, content, request, customHtmlSanitizer);
-        }
-
-        html.append("</div>\n</body></html>");
-        return html.toString();
-    }
-
-    public static String processEmailHtmlBody(
-            String htmlBody,
-            EmlParser.EmailContent emailContent,
-            CustomHtmlSanitizer customHtmlSanitizer) {
-        if (htmlBody == null) return "";
-
-        String processed =
-                customHtmlSanitizer != null ? customHtmlSanitizer.sanitize(htmlBody) : htmlBody;
-
-        processed = processed.replaceAll("(?i)\\s*position\\s*:\\s*fixed[^;]*;?", "");
-        processed = processed.replaceAll("(?i)\\s*position\\s*:\\s*absolute[^;]*;?", "");
-
-        if (emailContent != null && !emailContent.getAttachments().isEmpty()) {
-            processed = PdfAttachmentHandler.processInlineImages(processed, emailContent);
-        }
-
-        return processed;
-    }
-
-    public static String convertTextToHtml(
-            String textBody, CustomHtmlSanitizer customHtmlSanitizer) {
-        if (textBody == null) return "";
-
-        String html =
-                customHtmlSanitizer != null
-                        ? customHtmlSanitizer.sanitize(textBody)
-                        : escapeHtml(textBody);
-
-        html = html.replace("\r\n", "\n").replace("\r", "\n");
-        html = html.replace("\n", "<br>\n");
-
-        html =
-                html.replaceAll(
-                        "(https?://[\\w\\-._~:/?#\\[\\]@!$&'()*+,;=%]+)",
-                        "<a href=\"$1\" style=\"color: #1a73e8; text-decoration: underline;\">$1</a>");
-
-        html =
-                html.replaceAll(
-                        "([a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\\.[a-zA-Z]{2,63})",
-                        "<a href=\"mailto:$1\" style=\"color: #1a73e8; text-decoration: underline;\">$1</a>");
-
-        return html;
-    }
-
-    private static void appendEnhancedStyles(StringBuilder html) {
-        String css =
-                String.format(
-                        """
-                body {
-                  font-family: %s;
-                  font-size: %dpx;
-                  line-height: %s;
-                  color: %s;
-                  margin: 0;
-                  padding: 16px;
-                  background-color: %s;
-                }
-
-                .email-container {
-                  width: 100%%;
-                  max-width: 100%%;
-                  margin: 0 auto;
-                }
-
-                .email-header {
-                  padding-bottom: 10px;
-                  border-bottom: 1px solid %s;
-                  margin-bottom: 10px;
-                }
-
-                .email-header h1 {
-                  margin: 0 0 10px 0;
-                  font-size: %dpx;
-                  font-weight: bold;
-                }
-
-                .email-meta div {
-                  margin-bottom: 2px;
-                  font-size: %dpx;
-                }
-
-                .email-body {
-                  word-wrap: break-word;
-                }
-
-                .attachment-section {
-                  margin-top: 15px;
-                  padding: 10px;
-                  background-color: %s;
-                  border: 1px solid %s;
-                  border-radius: 3px;
-                }
-
-                .attachment-section h3 {
-                  margin: 0 0 8px 0;
-                  font-size: %dpx;
-                }
-
-                .attachment-item {
-                  padding: 5px 0;
-                }
-
-                .attachment-icon {
-                  margin-right: 5px;
-                }
-
-                .attachment-details, .attachment-type {
-                  font-size: %dpx;
-                  color: #555555;
-                }
-
-                .attachment-inclusion-note, .attachment-info-note {
-                  margin-top: 8px;
-                  padding: 6px;
-                  font-size: %dpx;
-                  border-radius: 3px;
-                }
-
-                .attachment-inclusion-note {
-                  background-color: #e6ffed;
-                  border: 1px solid #d4f7dc;
-                  color: #006420;
-                }
-
-                .attachment-info-note {
-                  background-color: #fff9e6;
-                  border: 1px solid #fff0c2;
-                  color: #664d00;
-                }
-
-                .attachment-link-container {
-                  display: flex;
-                  align-items: center;
-                  padding: 8px;
-                  background-color: #f8f9fa;
-                  border: 1px solid #dee2e6;
-                  border-radius: 4px;
-                  margin: 4px 0;
-                }
-
-                .attachment-link-container:hover {
-                  background-color: #e9ecef;
-                }
-
-                .attachment-note {
-                  font-size: %dpx;
-                  color: #6c757d;
-                  font-style: italic;
-                  margin-left: 8px;
-                }
-
-                .no-content {
-                  padding: 20px;
-                  text-align: center;
-                  color: #666;
-                  font-style: italic;
-                }
-
-                .text-body {
-                  white-space: pre-wrap;
-                }
-
-                img {
-                  max-width: 100%%;
-                  height: auto;
-                  display: block;
-                }
-                """,
-                        DEFAULT_FONT_FAMILY,
-                        DEFAULT_FONT_SIZE,
-                        DEFAULT_LINE_HEIGHT,
-                        DEFAULT_TEXT_COLOR,
-                        DEFAULT_BACKGROUND_COLOR,
-                        DEFAULT_BORDER_COLOR,
-                        DEFAULT_FONT_SIZE + 4,
-                        DEFAULT_FONT_SIZE - 1,
-                        ATTACHMENT_BACKGROUND_COLOR,
-                        ATTACHMENT_BORDER_COLOR,
-                        DEFAULT_FONT_SIZE + 1,
-                        DEFAULT_FONT_SIZE - 2,
-                        DEFAULT_FONT_SIZE - 2,
-                        DEFAULT_FONT_SIZE - 3);
-
-        html.append(css);
-    }
-
-    private static void appendAttachmentsSection(
-            StringBuilder html,
-            EmlParser.EmailContent content,
-            EmlToPdfRequest request,
-            CustomHtmlSanitizer customHtmlSanitizer) {
-        html.append("<div class=\"attachment-section\">\n");
-        int displayedAttachmentCount =
-                content.getAttachmentCount() > 0
-                        ? content.getAttachmentCount()
-                        : content.getAttachments().size();
-        html.append("<h3>Attachments (").append(displayedAttachmentCount).append(")</h3>\n");
-
-        if (!content.getAttachments().isEmpty()) {
-            for (int i = 0; i < content.getAttachments().size(); i++) {
-                EmlParser.EmailAttachment attachment = content.getAttachments().get(i);
-
-                String embeddedFilename =
-                        attachment.getFilename() != null
-                                ? attachment.getFilename()
-                                : ("attachment_" + i);
-                attachment.setEmbeddedFilename(embeddedFilename);
-
-                String sizeStr = GeneralUtils.formatBytes(attachment.getSizeBytes());
-                String contentType =
-                        attachment.getContentType() != null
-                                        && !attachment.getContentType().isEmpty()
-                                ? ", " + escapeHtml(attachment.getContentType())
-                                : "";
-
-                String attachmentId = "attachment_" + i;
-                html.append(
-                        String.format(
-                                """
-                        <div class="attachment-item" id="%s">
-                        <span class="attachment-icon" data-filename="%s">@</span>
-                        <span class="attachment-name">%s</span>
-                        <span class="attachment-details">(%s%s)</span>
-                        </div>
-                        """,
-                                attachmentId,
-                                escapeHtml(embeddedFilename),
-                                escapeHtml(EmlParser.safeMimeDecode(attachment.getFilename())),
-                                sizeStr,
-                                contentType));
-            }
-        }
-
-        if (request != null && request.isIncludeAttachments()) {
-            html.append(
-                    """
-                    <div class="attachment-info-note">
-                    <p><em>Attachments are embedded in the file.</em></p>
-                    </div>
-                    """);
-        } else {
-            html.append(
-                    """
-                    <div class="attachment-info-note">
-                    <p><em>Attachment information displayed - files not included in PDF.</em></p>
-                    </div>
-                    """);
-        }
-        html.append("</div>\n");
-    }
-
-    public static HTMLToPdfRequest createHtmlRequest(EmlToPdfRequest request) {
-        HTMLToPdfRequest htmlRequest = new HTMLToPdfRequest();
-
-        if (request != null) {
-            htmlRequest.setFileInput(request.getFileInput());
-        }
-
-        htmlRequest.setZoom(Float.parseFloat(DEFAULT_ZOOM));
-        return htmlRequest;
-    }
-
-    public static String detectMimeType(String filename, String existingMimeType) {
-        if (existingMimeType != null && !existingMimeType.isEmpty()) {
-            return existingMimeType;
-        }
-
-        if (filename != null) {
-            String lowerFilename = filename.toLowerCase();
-            for (Map.Entry<String, String> entry : EXTENSION_TO_MIME_TYPE.entrySet()) {
-                if (lowerFilename.endsWith(entry.getKey())) {
-                    return entry.getValue();
-                }
-            }
-        }
-
-        return "image/png";
-    }
-
-    public static String decodeUrlEncoded(String encoded) {
-        try {
-            return java.net.URLDecoder.decode(encoded, StandardCharsets.UTF_8);
-        } catch (Exception e) {
-            return encoded; // Return original if decoding fails
-        }
-    }
-
-    public static String decodeMimeHeader(String encodedText) {
-        if (encodedText == null || encodedText.trim().isEmpty()) {
-            return encodedText;
-        }
-
-        try {
-            StringBuilder result = new StringBuilder();
-            Pattern concatenatedPattern =
-                    Pattern.compile(
-                            "(=\\?[^?]+\\?[BbQq]\\?[^?]*\\?=)(\\s*=\\?[^?]+\\?[BbQq]\\?[^?]*\\?=)+");
-            Matcher concatenatedMatcher = concatenatedPattern.matcher(encodedText);
-            String processedText =
-                    concatenatedMatcher.replaceAll(
-                            match -> match.group().replaceAll("\\s+(?==\\?)", ""));
-
-            Pattern mimePattern = Pattern.compile("=\\?([^?]+)\\?([BbQq])\\?([^?]*)\\?=");
-            Matcher matcher = mimePattern.matcher(processedText);
-            int lastEnd = 0;
-
-            while (matcher.find()) {
-                result.append(processedText, lastEnd, matcher.start());
-
-                String charset = matcher.group(1);
-                String encoding = matcher.group(2).toUpperCase();
-                String encodedValue = matcher.group(3);
-
-                try {
-                    String decodedValue =
-                            switch (encoding) {
-                                case "B" -> {
-                                    String cleanBase64 = encodedValue.replaceAll("\\s", "");
-                                    byte[] decodedBytes = Base64.getDecoder().decode(cleanBase64);
-                                    Charset targetCharset;
-                                    try {
-                                        targetCharset = Charset.forName(charset);
-                                    } catch (Exception e) {
-                                        targetCharset = StandardCharsets.UTF_8;
-                                    }
-                                    yield new String(decodedBytes, targetCharset);
-                                }
-                                case "Q" -> decodeQuotedPrintable(encodedValue, charset);
-                                default -> matcher.group(0); // Return original if unknown encoding
-                            };
-                    result.append(decodedValue);
-                } catch (RuntimeException e) {
-                    result.append(matcher.group(0)); // Keep original on decode error
-                }
-
-                lastEnd = matcher.end();
-            }
-
-            result.append(processedText.substring(lastEnd));
-            return result.toString();
-        } catch (Exception e) {
-            return encodedText; // Return original on any parsing error
-        }
-    }
-
-    private static String decodeQuotedPrintable(String encodedText, String charset) {
-        StringBuilder result = new StringBuilder();
-        for (int i = 0; i < encodedText.length(); i++) {
-            char c = encodedText.charAt(i);
-            switch (c) {
-                case '=' -> {
-                    if (i + 2 < encodedText.length()) {
-                        String hex = encodedText.substring(i + 1, i + 3);
-                        try {
-                            int value = Integer.parseInt(hex, 16);
-                            result.append((char) value);
-                            i += 2;
-                        } catch (NumberFormatException e) {
-                            result.append(c);
-                        }
-                    } else if (i + 1 == encodedText.length()
-                            || (i + 2 == encodedText.length()
-                                    && encodedText.charAt(i + 1) == '\n')) {
-                        if (i + 1 < encodedText.length() && encodedText.charAt(i + 1) == '\n') {
-                            i++; // Skip the newline too
-                        }
-                    } else {
-                        result.append(c);
-                    }
-                }
-                case '_' -> result.append(' '); // Space encoding in Q encoding
-                default -> result.append(c);
-            }
-        }
-
-        byte[] bytes = result.toString().getBytes(StandardCharsets.ISO_8859_1);
-        try {
-            Charset targetCharset = Charset.forName(charset);
-            return new String(bytes, targetCharset);
-        } catch (Exception e) {
-            try {
-                return new String(bytes, StandardCharsets.UTF_8);
-            } catch (Exception fallbackException) {
-                return new String(bytes, StandardCharsets.ISO_8859_1);
-            }
-        }
-    }
-
-    public static String escapeHtml(String text) {
-        if (text == null) return "";
-        return text.replace("&", "&amp;")
-                .replace("<", "&lt;")
-                .replace(">", "&gt;")
-                .replace("\"", "&quot;")
-                .replace("'", "&#39;");
-    }
-
-    public static String sanitizeText(String text, CustomHtmlSanitizer customHtmlSanitizer) {
-        if (customHtmlSanitizer != null) {
-            return customHtmlSanitizer.sanitize(text);
-        } else {
-            return escapeHtml(text);
-        }
-    }
-
-    public static String simplifyHtmlContent(String htmlContent) {
-        String simplified = htmlContent.replaceAll("(?i)<script[^>]*>.*?</script>", "");
-        simplified = simplified.replaceAll("(?i)<style[^>]*>.*?</style>", "");
-        return simplified;
-    }
-}
@@ -1,103 +0,0 @@
-package stirling.software.common.util;
-
-import java.io.IOException;
-import java.nio.charset.StandardCharsets;
-
-import lombok.experimental.UtilityClass;
-
-import stirling.software.common.model.api.converters.EmlToPdfRequest;
-import stirling.software.common.service.CustomPDFDocumentFactory;
-
-@UtilityClass
-public class EmlToPdf {
-
-    public static String convertEmlToHtml(byte[] emlBytes, EmlToPdfRequest request)
-            throws IOException {
-        EmlProcessingUtils.validateEmlInput(emlBytes);
-
-        EmlParser.EmailContent emailContent =
-                EmlParser.extractEmailContent(emlBytes, request, null);
-        return EmlProcessingUtils.generateEnhancedEmailHtml(emailContent, request, null);
-    }
-
-    public static byte[] convertEmlToPdf(
-            String weasyprintPath,
-            EmlToPdfRequest request,
-            byte[] emlBytes,
-            String fileName,
-            CustomPDFDocumentFactory pdfDocumentFactory,
-            TempFileManager tempFileManager,
-            CustomHtmlSanitizer customHtmlSanitizer)
-            throws IOException, InterruptedException {
-
-        EmlProcessingUtils.validateEmlInput(emlBytes);
-
-        try {
-            EmlParser.EmailContent emailContent =
-                    EmlParser.extractEmailContent(emlBytes, request, customHtmlSanitizer);
-
-            String htmlContent =
-                    EmlProcessingUtils.generateEnhancedEmailHtml(
-                            emailContent, request, customHtmlSanitizer);
-
-            byte[] pdfBytes =
-                    convertHtmlToPdf(
-                            weasyprintPath,
-                            request,
-                            htmlContent,
-                            tempFileManager,
-                            customHtmlSanitizer);
-
-            if (shouldAttachFiles(emailContent, request)) {
-                pdfBytes =
-                        PdfAttachmentHandler.attachFilesToPdf(
-                                pdfBytes, emailContent.getAttachments(), pdfDocumentFactory);
-            }
-
-            return pdfBytes;
-
-        } catch (IOException | InterruptedException e) {
-            throw e;
-        } catch (Exception e) {
-            throw new IOException("Error converting EML to PDF", e);
-        }
-    }
-
-    private static boolean shouldAttachFiles(
-            EmlParser.EmailContent emailContent, EmlToPdfRequest request) {
-        return emailContent != null
-                && request != null
-                && request.isIncludeAttachments()
-                && !emailContent.getAttachments().isEmpty();
-    }
-
-    private static byte[] convertHtmlToPdf(
-            String weasyprintPath,
-            EmlToPdfRequest request,
-            String htmlContent,
-            TempFileManager tempFileManager,
-            CustomHtmlSanitizer customHtmlSanitizer)
-            throws IOException, InterruptedException {
-
-        var htmlRequest = EmlProcessingUtils.createHtmlRequest(request);
-
-        try {
-            return FileToPdf.convertHtmlToPdf(
-                    weasyprintPath,
-                    htmlRequest,
-                    htmlContent.getBytes(StandardCharsets.UTF_8),
-                    "email.html",
-                    tempFileManager,
-                    customHtmlSanitizer);
-        } catch (IOException | InterruptedException e) {
-            String simplifiedHtml = EmlProcessingUtils.simplifyHtmlContent(htmlContent);
-            return FileToPdf.convertHtmlToPdf(
-                    weasyprintPath,
-                    htmlRequest,
-                    simplifiedHtml.getBytes(StandardCharsets.UTF_8),
-                    "email.html",
-                    tempFileManager,
-                    customHtmlSanitizer);
-        }
-    }
-}
@@ -1,327 +0,0 @@
-package stirling.software.common.util;
-
-import java.io.IOException;
-import java.text.MessageFormat;
-
-import lombok.extern.slf4j.Slf4j;
-
-/**
- * Utility class for handling exceptions with internationalized error messages. Provides consistent
- * error handling and user-friendly messages across the application.
- */
-@Slf4j
-public class ExceptionUtils {
-
-    /**
-     * Create an IOException with internationalized message for PDF corruption.
-     *
-     * @param cause the original exception
-     * @return IOException with user-friendly message
-     */
-    public static IOException createPdfCorruptedException(Exception cause) {
-        return createPdfCorruptedException(null, cause);
-    }
-
-    /**
-     * Create an IOException with internationalized message for PDF corruption with context.
-     *
-     * @param context additional context (e.g., "during merge", "during image extraction")
-     * @param cause the original exception
-     * @return IOException with user-friendly message
-     */
-    public static IOException createPdfCorruptedException(String context, Exception cause) {
-        String message;
-        if (context != null && !context.isEmpty()) {
-            message =
-                    String.format(
-                            "Error %s: PDF file appears to be corrupted or damaged. Please try using the 'Repair PDF' feature first to fix the file before proceeding with this operation.",
-                            context);
-        } else {
-            message =
-                    "PDF file appears to be corrupted or damaged. Please try using the 'Repair PDF' feature first to fix the file before proceeding with this operation.";
-        }
-        return new IOException(message, cause);
-    }
-
-    /**
-     * Create an IOException with internationalized message for multiple corrupted PDFs.
-     *
-     * @param cause the original exception
-     * @return IOException with user-friendly message
-     */
-    public static IOException createMultiplePdfCorruptedException(Exception cause) {
-        String message =
-                "One or more PDF files appear to be corrupted or damaged. Please try using the 'Repair PDF' feature on each file first before attempting to merge them.";
-        return new IOException(message, cause);
-    }
-
-    /**
-     * Create an IOException with internationalized message for PDF encryption issues.
-     *
-     * @param cause the original exception
-     * @return IOException with user-friendly message
-     */
-    public static IOException createPdfEncryptionException(Exception cause) {
-        String message =
-                "The PDF appears to have corrupted encryption data. This can happen when the PDF was created with incompatible encryption methods. Please try using the 'Repair PDF' feature first, or contact the document creator for a new copy.";
-        return new IOException(message, cause);
-    }
-
-    /**
-     * Create an IOException with internationalized message for PDF password issues.
-     *
-     * @param cause the original exception
-     * @return IOException with user-friendly message
-     */
-    public static IOException createPdfPasswordException(Exception cause) {
-        String message =
-                "The PDF Document is passworded and either the password was not provided or was incorrect";
-        return new IOException(message, cause);
-    }
-
-    /**
-     * Create an IOException with internationalized message for file processing errors.
-     *
-     * @param operation the operation being performed (e.g., "merge", "split", "convert")
-     * @param cause the original exception
-     * @return IOException with user-friendly message
-     */
-    public static IOException createFileProcessingException(String operation, Exception cause) {
-        String message =
-                String.format(
-                        "An error occurred while processing the file during %s operation: %s",
-                        operation, cause.getMessage());
-        return new IOException(message, cause);
-    }
-
-    /**
-     * Create a generic IOException with internationalized message.
-     *
-     * @param messageKey the i18n message key
-     * @param defaultMessage the default message if i18n is not available
-     * @param cause the original exception
-     * @param args optional arguments for the message
-     * @return IOException with user-friendly message
-     */
-    public static IOException createIOException(
-            String messageKey, String defaultMessage, Exception cause, Object... args) {
-        String message = MessageFormat.format(defaultMessage, args);
-        return new IOException(message, cause);
-    }
-
-    /**
-     * Create a generic RuntimeException with internationalized message.
-     *
-     * @param messageKey the i18n message key
-     * @param defaultMessage the default message if i18n is not available
-     * @param cause the original exception
-     * @param args optional arguments for the message
-     * @return RuntimeException with user-friendly message
-     */
-    public static RuntimeException createRuntimeException(
-            String messageKey, String defaultMessage, Exception cause, Object... args) {
-        String message = MessageFormat.format(defaultMessage, args);
-        return new RuntimeException(message, cause);
-    }
-
-    /**
-     * Create an IllegalArgumentException with internationalized message.
-     *
-     * @param messageKey the i18n message key
-     * @param defaultMessage the default message if i18n is not available
-     * @param args optional arguments for the message
-     * @return IllegalArgumentException with user-friendly message
-     */
-    public static IllegalArgumentException createIllegalArgumentException(
-            String messageKey, String defaultMessage, Object... args) {
-        String message = MessageFormat.format(defaultMessage, args);
-        return new IllegalArgumentException(message);
-    }
-
-    /** Create file validation exceptions. */
-    public static IllegalArgumentException createHtmlFileRequiredException() {
-        return createIllegalArgumentException(
-                "error.fileFormatRequired", "File must be in {0} format", "HTML or ZIP");
-    }
-
-    public static IllegalArgumentException createPdfFileRequiredException() {
-        return createIllegalArgumentException(
-                "error.fileFormatRequired", "File must be in {0} format", "PDF");
-    }
-
-    public static IllegalArgumentException createInvalidPageSizeException(String size) {
-        return createIllegalArgumentException(
-                "error.invalidFormat", "Invalid {0} format: {1}", "page size", size);
-    }
-
-    /** Create OCR-related exceptions. */
-    public static IOException createOcrLanguageRequiredException() {
-        return createIOException(
-                "error.optionsNotSpecified", "{0} options are not specified", null, "OCR language");
-    }
-
-    public static IOException createOcrInvalidLanguagesException() {
-        return createIOException(
-                "error.invalidFormat",
-                "Invalid {0} format: {1}",
-                null,
-                "OCR languages",
-                "none of the selected languages are valid");
-    }
-
-    public static IOException createOcrToolsUnavailableException() {
-        return createIOException(
-                "error.toolNotInstalled", "{0} is not installed", null, "OCR tools");
-    }
-
-    /** Create system requirement exceptions. */
-    public static IOException createPythonRequiredForWebpException() {
-        return createIOException(
-                "error.toolRequired", "{0} is required for {1}", null, "Python", "WebP conversion");
-    }
-
-    /** Create file operation exceptions. */
-    public static IOException createFileNotFoundException(String fileId) {
-        return createIOException("error.fileNotFound", "File not found with ID: {0}", null, fileId);
-    }
-
-    public static RuntimeException createPdfaConversionFailedException() {
-        return createRuntimeException(
-                "error.conversionFailed", "{0} conversion failed", null, "PDF/A");
-    }
-
-    public static IllegalArgumentException createInvalidComparatorException() {
-        return createIllegalArgumentException(
-                "error.invalidFormat",
-                "Invalid {0} format: {1}",
-                "comparator",
-                "only 'greater', 'equal', and 'less' are supported");
-    }
-
-    /** Create compression-related exceptions. */
-    public static RuntimeException createMd5AlgorithmException(Exception cause) {
-        return createRuntimeException(
-                "error.algorithmNotAvailable", "{0} algorithm not available", cause, "MD5");
-    }
-
-    public static IllegalArgumentException createCompressionOptionsException() {
-        return createIllegalArgumentException(
-                "error.optionsNotSpecified",
-                "{0} options are not specified",
-                "compression (expected output size and optimize level)");
-    }
-
-    public static IOException createGhostscriptCompressionException() {
-        return createIOException(
-                "error.commandFailed", "{0} command failed", null, "Ghostscript compression");
-    }
-
-    public static IOException createGhostscriptCompressionException(Exception cause) {
-        return createIOException(
-                "error.commandFailed", "{0} command failed", cause, "Ghostscript compression");
-    }
-
-    public static IOException createQpdfCompressionException(Exception cause) {
-        return createIOException("error.commandFailed", "{0} command failed", cause, "QPDF");
-    }
-
-    /**
-     * Check if an exception indicates a corrupted PDF and wrap it with appropriate message.
-     *
-     * @param e the exception to check
-     * @return the original exception if not PDF corruption, or a new IOException with user-friendly
-     *     message
-     */
-    public static IOException handlePdfException(IOException e) {
-        return handlePdfException(e, null);
-    }
-
-    /**
-     * Check if an exception indicates a corrupted PDF and wrap it with appropriate message.
-     *
-     * @param e the exception to check
-     * @param context additional context for the error
-     * @return the original exception if not PDF corruption, or a new IOException with user-friendly
-     *     message
-     */
-    public static IOException handlePdfException(IOException e, String context) {
-        if (PdfErrorUtils.isCorruptedPdfError(e)) {
-            return createPdfCorruptedException(context, e);
-        }
-
-        if (isEncryptionError(e)) {
-            return createPdfEncryptionException(e);
-        }
-
-        if (isPasswordError(e)) {
-            return createPdfPasswordException(e);
-        }
-
-        return e; // Return original exception if no specific handling needed
-    }
-
-    /**
-     * Check if an exception indicates a PDF encryption/decryption error.
-     *
-     * @param e the exception to check
-     * @return true if it's an encryption error, false otherwise
-     */
-    public static boolean isEncryptionError(IOException e) {
-        String message = e.getMessage();
-        if (message == null) return false;
-
-        return message.contains("BadPaddingException")
-                || message.contains("Given final block not properly padded")
-                || message.contains("AES initialization vector not fully read")
-                || message.contains("Failed to decrypt");
-    }
-
-    /**
-     * Check if an exception indicates a PDF password error.
-     *
-     * @param e the exception to check
-     * @return true if it's a password error, false otherwise
-     */
-    public static boolean isPasswordError(IOException e) {
-        String message = e.getMessage();
-        if (message == null) return false;
-
-        return message.contains("password is incorrect")
-                || message.contains("Password is not provided")
-                || message.contains("PDF contains an encryption dictionary");
-    }
-
-    /**
-     * Log an exception with appropriate level based on its type.
-     *
-     * @param operation the operation being performed
-     * @param e the exception that occurred
-     */
-    public static void logException(String operation, Exception e) {
-        if (PdfErrorUtils.isCorruptedPdfError(e)) {
-            log.warn("PDF corruption detected during {}: {}", operation, e.getMessage());
-        } else if (e instanceof IOException
-                && (isEncryptionError((IOException) e) || isPasswordError((IOException) e))) {
-            log.info("PDF security issue during {}: {}", operation, e.getMessage());
-        } else {
-            log.error("Unexpected error during {}", operation, e);
-        }
-    }
-
-    /** Create common validation exceptions. */
-    public static IllegalArgumentException createInvalidArgumentException(String argumentName) {
-        return createIllegalArgumentException(
-                "error.invalidArgument", "Invalid argument: {0}", argumentName);
-    }
-
-    public static IllegalArgumentException createInvalidArgumentException(
-            String argumentName, String value) {
-        return createIllegalArgumentException(
-                "error.invalidFormat", "Invalid {0} format: {1}", argumentName, value);
-    }
-
-    public static IllegalArgumentException createNullArgumentException(String argumentName) {
-        return createIllegalArgumentException(
-                "error.argumentRequired", "{0} must not be null", argumentName);
-    }
-}
@@ -1,680 +0,0 @@
-package stirling.software.common.util;
-
-import static stirling.software.common.util.AttachmentUtils.setCatalogViewerPreferences;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Base64;
-import java.util.Date;
-import java.util.GregorianCalendar;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-import java.util.Set;
-import java.util.TimeZone;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import org.apache.pdfbox.pdmodel.PDDocument;
-import org.apache.pdfbox.pdmodel.PDDocumentCatalog;
-import org.apache.pdfbox.pdmodel.PDDocumentNameDictionary;
-import org.apache.pdfbox.pdmodel.PDEmbeddedFilesNameTreeNode;
-import org.apache.pdfbox.pdmodel.PDPage;
-import org.apache.pdfbox.pdmodel.PageMode;
-import org.apache.pdfbox.pdmodel.common.PDRectangle;
-import org.apache.pdfbox.pdmodel.common.filespecification.PDComplexFileSpecification;
-import org.apache.pdfbox.pdmodel.common.filespecification.PDEmbeddedFile;
-import org.apache.pdfbox.pdmodel.interactive.annotation.PDAnnotationFileAttachment;
-import org.apache.pdfbox.pdmodel.interactive.annotation.PDAppearanceDictionary;
-import org.apache.pdfbox.pdmodel.interactive.annotation.PDAppearanceStream;
-import org.apache.pdfbox.text.PDFTextStripper;
-import org.apache.pdfbox.text.TextPosition;
-import org.jetbrains.annotations.NotNull;
-import org.springframework.web.multipart.MultipartFile;
-
-import lombok.Data;
-import lombok.Getter;
-import lombok.experimental.UtilityClass;
-
-import stirling.software.common.service.CustomPDFDocumentFactory;
-
-@UtilityClass
-public class PdfAttachmentHandler {
-    // Note: This class is designed for EML attachments, not general PDF attachments.
-
-    private static final String ATTACHMENT_MARKER = "@";
-    private static final float ATTACHMENT_ICON_WIDTH = 12f;
-    private static final float ATTACHMENT_ICON_HEIGHT = 14f;
-    private static final float ANNOTATION_X_OFFSET = 2f;
-    private static final float ANNOTATION_Y_OFFSET = 10f;
-
-    public static byte[] attachFilesToPdf(
-            byte[] pdfBytes,
-            List<EmlParser.EmailAttachment> attachments,
-            CustomPDFDocumentFactory pdfDocumentFactory)
-            throws IOException {
-
-        if (attachments == null || attachments.isEmpty()) {
-            return pdfBytes;
-        }
-
-        try (PDDocument document = pdfDocumentFactory.load(pdfBytes);
-                ByteArrayOutputStream outputStream = new ByteArrayOutputStream()) {
-
-            List<MultipartFile> multipartAttachments = new ArrayList<>(attachments.size());
-            for (int i = 0; i < attachments.size(); i++) {
-                EmlParser.EmailAttachment attachment = attachments.get(i);
-                if (attachment.getData() != null && attachment.getData().length > 0) {
-                    String embeddedFilename =
-                            attachment.getFilename() != null
-                                    ? attachment.getFilename()
-                                    : ("attachment_" + i);
-                    attachment.setEmbeddedFilename(embeddedFilename);
-                    multipartAttachments.add(createMultipartFile(attachment));
-                }
-            }
-
-            if (!multipartAttachments.isEmpty()) {
-                Map<Integer, String> indexToFilenameMap =
-                        addAttachmentsToDocumentWithMapping(
-                                document, multipartAttachments, attachments);
-                setCatalogViewerPreferences(document, PageMode.USE_ATTACHMENTS);
-                addAttachmentAnnotationsToDocumentWithMapping(
-                        document, attachments, indexToFilenameMap);
-            }
-
-            document.save(outputStream);
-            return outputStream.toByteArray();
-        } catch (RuntimeException e) {
-            throw new IOException(
-                    "Invalid PDF structure or processing error: " + e.getMessage(), e);
-        } catch (Exception e) {
-            throw new IOException("Error attaching files to PDF: " + e.getMessage(), e);
-        }
-    }
-
-    private static MultipartFile createMultipartFile(EmlParser.EmailAttachment attachment) {
-        return new MultipartFile() {
-            @Override
-            public @NotNull String getName() {
-                return "attachment";
-            }
-
-            @Override
-            public String getOriginalFilename() {
-                return attachment.getFilename() != null
-                        ? attachment.getFilename()
-                        : "attachment_" + System.currentTimeMillis();
-            }
-
-            @Override
-            public String getContentType() {
-                return attachment.getContentType() != null
-                        ? attachment.getContentType()
-                        : "application/octet-stream";
-            }
-
-            @Override
-            public boolean isEmpty() {
-                return attachment.getData() == null || attachment.getData().length == 0;
-            }
-
-            @Override
-            public long getSize() {
-                return attachment.getData() != null ? attachment.getData().length : 0;
-            }
-
-            @Override
-            public byte @NotNull [] getBytes() {
-                return attachment.getData() != null ? attachment.getData() : new byte[0];
-            }
-
-            @Override
-            public @NotNull InputStream getInputStream() {
-                byte[] data = attachment.getData();
-                return new ByteArrayInputStream(data != null ? data : new byte[0]);
-            }
-
-            @Override
-            public void transferTo(@NotNull File dest) throws IOException, IllegalStateException {
-                try (FileOutputStream fos = new FileOutputStream(dest)) {
-                    byte[] data = attachment.getData();
-                    if (data != null) {
-                        fos.write(data);
-                    }
-                }
-            }
-        };
-    }
-
-    private static String ensureUniqueFilename(String filename, Set<String> existingNames) {
-        if (!existingNames.contains(filename)) {
-            return filename;
-        }
-
-        String baseName;
-        String extension = "";
-        int lastDot = filename.lastIndexOf('.');
-        if (lastDot > 0) {
-            baseName = filename.substring(0, lastDot);
-            extension = filename.substring(lastDot);
-        } else {
-            baseName = filename;
-        }
-
-        int counter = 1;
-        String uniqueName;
-        do {
-            uniqueName = baseName + "_" + counter + extension;
-            counter++;
-        } while (existingNames.contains(uniqueName));
-
-        return uniqueName;
-    }
-
-    private static @NotNull PDRectangle calculateAnnotationRectangle(
-            PDPage page, float x, float y) {
-        PDRectangle cropBox = page.getCropBox();
-
-        // ISO 32000-1:2008 Section 8.3: PDF coordinate system transforms
-        int rotation = page.getRotation();
-        float pdfX = x;
-        float pdfY = cropBox.getHeight() - y;
-
-        switch (rotation) {
-            case 90 -> {
-                float temp = pdfX;
-                pdfX = pdfY;
-                pdfY = cropBox.getWidth() - temp;
-            }
-            case 180 -> {
-                pdfX = cropBox.getWidth() - pdfX;
-                pdfY = y;
-            }
-            case 270 -> {
-                float temp = pdfX;
-                pdfX = cropBox.getHeight() - pdfY;
-                pdfY = temp;
-            }
-            default -> {}
-        }
-
-        float iconHeight = ATTACHMENT_ICON_HEIGHT;
-        float paddingX = 2.0f;
-        float paddingY = 2.0f;
-
-        PDRectangle rect =
-                new PDRectangle(
-                        pdfX + ANNOTATION_X_OFFSET + paddingX,
-                        pdfY - iconHeight + ANNOTATION_Y_OFFSET + paddingY,
-                        ATTACHMENT_ICON_WIDTH,
-                        iconHeight);
-
-        PDRectangle mediaBox = page.getMediaBox();
-        if (rect.getLowerLeftX() < mediaBox.getLowerLeftX()
-                || rect.getLowerLeftY() < mediaBox.getLowerLeftY()
-                || rect.getUpperRightX() > mediaBox.getUpperRightX()
-                || rect.getUpperRightY() > mediaBox.getUpperRightY()) {
-
-            float adjustedX =
-                    Math.max(
-                            mediaBox.getLowerLeftX(),
-                            Math.min(
-                                    rect.getLowerLeftX(),
-                                    mediaBox.getUpperRightX() - rect.getWidth()));
-            float adjustedY =
-                    Math.max(
-                            mediaBox.getLowerLeftY(),
-                            Math.min(
-                                    rect.getLowerLeftY(),
-                                    mediaBox.getUpperRightY() - rect.getHeight()));
-            rect = new PDRectangle(adjustedX, adjustedY, rect.getWidth(), rect.getHeight());
-        }
-
-        return rect;
-    }
-
-    public static String processInlineImages(
-            String htmlContent, EmlParser.EmailContent emailContent) {
-        if (htmlContent == null || emailContent == null) return htmlContent;
-
-        Map<String, EmlParser.EmailAttachment> contentIdMap = new HashMap<>();
-        for (EmlParser.EmailAttachment attachment : emailContent.getAttachments()) {
-            if (attachment.isEmbedded()
-                    && attachment.getContentId() != null
-                    && attachment.getData() != null) {
-                contentIdMap.put(attachment.getContentId(), attachment);
-            }
-        }
-
-        if (contentIdMap.isEmpty()) return htmlContent;
-
-        Pattern cidPattern =
-                Pattern.compile(
-                        "(?i)<img[^>]*\\ssrc\\s*=\\s*['\"]cid:([^'\"]+)['\"][^>]*>",
-                        Pattern.CASE_INSENSITIVE);
-        Matcher matcher = cidPattern.matcher(htmlContent);
-
-        StringBuilder result = new StringBuilder();
-        while (matcher.find()) {
-            String contentId = matcher.group(1);
-            EmlParser.EmailAttachment attachment = contentIdMap.get(contentId);
-
-            if (attachment != null && attachment.getData() != null) {
-                String mimeType =
-                        EmlProcessingUtils.detectMimeType(
-                                attachment.getFilename(), attachment.getContentType());
-
-                String base64Data = Base64.getEncoder().encodeToString(attachment.getData());
-                String dataUri = "data:" + mimeType + ";base64," + base64Data;
-
-                String replacement =
-                        matcher.group(0).replaceFirst("cid:" + Pattern.quote(contentId), dataUri);
-                matcher.appendReplacement(result, Matcher.quoteReplacement(replacement));
-            } else {
-                matcher.appendReplacement(result, Matcher.quoteReplacement(matcher.group(0)));
-            }
-        }
-        matcher.appendTail(result);
-
-        return result.toString();
-    }
-
-    public static String formatEmailDate(Date date) {
-        if (date == null) return "";
-
-        SimpleDateFormat formatter =
-                new SimpleDateFormat("EEE, MMM d, yyyy 'at' h:mm a z", Locale.ENGLISH);
-        formatter.setTimeZone(TimeZone.getTimeZone("UTC"));
-        return formatter.format(date);
-    }
-
-    @Data
-    public static class MarkerPosition {
-        private int pageIndex;
-        private float x;
-        private float y;
-        private String character;
-        private String filename;
-
-        public MarkerPosition(int pageIndex, float x, float y, String character, String filename) {
-            this.pageIndex = pageIndex;
-            this.x = x;
-            this.y = y;
-            this.character = character;
-            this.filename = filename;
-        }
-    }
-
-    public static class AttachmentMarkerPositionFinder extends PDFTextStripper {
-        @Getter private final List<MarkerPosition> positions = new ArrayList<>();
-        private int currentPageIndex;
-        protected boolean sortByPosition;
-        private boolean isInAttachmentSection;
-        private boolean attachmentSectionFound;
-        private final StringBuilder currentText = new StringBuilder();
-
-        private static final Pattern ATTACHMENT_SECTION_PATTERN =
-                Pattern.compile("attachments\\s*\\(\\d+\\)", Pattern.CASE_INSENSITIVE);
-
-        private static final Pattern FILENAME_PATTERN =
-                Pattern.compile("@\\s*([^\\s\\(]+(?:\\.[a-zA-Z0-9]+)?)");
-
-        public AttachmentMarkerPositionFinder() {
-            super();
-            this.currentPageIndex = 0;
-            this.sortByPosition = false; // Disable sorting to preserve document order
-            this.isInAttachmentSection = false;
-            this.attachmentSectionFound = false;
-        }
-
-        @Override
-        public String getText(PDDocument document) throws IOException {
-            super.getText(document);
-
-            if (sortByPosition) {
-                positions.sort(
-                        (a, b) -> {
-                            int pageCompare = Integer.compare(a.getPageIndex(), b.getPageIndex());
-                            if (pageCompare != 0) return pageCompare;
-                            return Float.compare(
-                                    b.getY(), a.getY()); // Descending Y per PDF coordinate system
-                        });
-            }
-
-            return ""; // Return empty string as we only need positions
-        }
-
-        @Override
-        protected void startPage(PDPage page) throws IOException {
-            super.startPage(page);
-        }
-
-        @Override
-        protected void endPage(PDPage page) throws IOException {
-            currentPageIndex++;
-            super.endPage(page);
-        }
-
-        @Override
-        protected void writeString(String string, List<TextPosition> textPositions)
-                throws IOException {
-            String lowerString = string.toLowerCase();
-
-            if (ATTACHMENT_SECTION_PATTERN.matcher(lowerString).find()) {
-                isInAttachmentSection = true;
-                attachmentSectionFound = true;
-            }
-
-            if (isInAttachmentSection
-                    && (lowerString.contains("</body>")
-                            || lowerString.contains("</html>")
-                            || (attachmentSectionFound
-                                    && lowerString.trim().isEmpty()
-                                    && string.length() > 50))) {
-                isInAttachmentSection = false;
-            }
-
-            if (isInAttachmentSection) {
-                currentText.append(string);
-
-                for (int i = 0; (i = string.indexOf(ATTACHMENT_MARKER, i)) != -1; i++) {
-                    if (i < textPositions.size()) {
-                        TextPosition textPosition = textPositions.get(i);
-
-                        String filename = extractFilenameAfterMarker(string, i);
-
-                        MarkerPosition position =
-                                new MarkerPosition(
-                                        currentPageIndex,
-                                        textPosition.getXDirAdj(),
-                                        textPosition.getYDirAdj(),
-                                        ATTACHMENT_MARKER,
-                                        filename);
-                        positions.add(position);
-                    }
-                }
-            }
-            super.writeString(string, textPositions);
-        }
-
-        @Override
-        public void setSortByPosition(boolean sortByPosition) {
-            this.sortByPosition = sortByPosition;
-        }
-
-        private String extractFilenameAfterMarker(String text, int markerIndex) {
-            String afterMarker = text.substring(markerIndex + 1);
-
-            Matcher matcher = FILENAME_PATTERN.matcher("@" + afterMarker);
-            if (matcher.find()) {
-                return matcher.group(1);
-            }
-
-            String[] parts = afterMarker.split("[\\s\\(\\)]+");
-            for (String part : parts) {
-                part = part.trim();
-                if (part.length() > 3 && part.contains(".")) {
-                    return part;
-                }
-            }
-
-            return null;
-        }
-    }
-
-    private static Map<Integer, String> addAttachmentsToDocumentWithMapping(
-            PDDocument document,
-            List<MultipartFile> attachments,
-            List<EmlParser.EmailAttachment> originalAttachments)
-            throws IOException {
-
-        PDDocumentCatalog catalog = document.getDocumentCatalog();
-
-        if (catalog == null) {
-            throw new IOException("PDF document catalog is not accessible");
-        }
-
-        PDDocumentNameDictionary documentNames = catalog.getNames();
-        if (documentNames == null) {
-            documentNames = new PDDocumentNameDictionary(catalog);
-            catalog.setNames(documentNames);
-        }
-
-        PDEmbeddedFilesNameTreeNode embeddedFilesTree = documentNames.getEmbeddedFiles();
-        if (embeddedFilesTree == null) {
-            embeddedFilesTree = new PDEmbeddedFilesNameTreeNode();
-            documentNames.setEmbeddedFiles(embeddedFilesTree);
-        }
-
-        Map<String, PDComplexFileSpecification> existingNames = embeddedFilesTree.getNames();
-        if (existingNames == null) {
-            existingNames = new HashMap<>();
-        }
-
-        Map<Integer, String> indexToFilenameMap = new HashMap<>();
-
-        for (int i = 0; i < attachments.size(); i++) {
-            MultipartFile attachment = attachments.get(i);
-            String filename = attachment.getOriginalFilename();
-            if (filename == null || filename.trim().isEmpty()) {
-                filename = "attachment_" + i;
-            }
-
-            String normalizedFilename =
-                    isAscii(filename)
-                            ? filename
-                            : java.text.Normalizer.normalize(
-                                    filename, java.text.Normalizer.Form.NFC);
-            String uniqueFilename =
-                    ensureUniqueFilename(normalizedFilename, existingNames.keySet());
-
-            indexToFilenameMap.put(i, uniqueFilename);
-
-            PDEmbeddedFile embeddedFile = new PDEmbeddedFile(document, attachment.getInputStream());
-            embeddedFile.setSize((int) attachment.getSize());
-
-            GregorianCalendar currentTime = new GregorianCalendar();
-            embeddedFile.setCreationDate(currentTime);
-            embeddedFile.setModDate(currentTime);
-
-            String contentType = attachment.getContentType();
-            if (contentType != null && !contentType.trim().isEmpty()) {
-                embeddedFile.setSubtype(contentType);
-            }
-
-            PDComplexFileSpecification fileSpecification = new PDComplexFileSpecification();
-            fileSpecification.setFile(uniqueFilename);
-            fileSpecification.setFileUnicode(uniqueFilename);
-            fileSpecification.setEmbeddedFile(embeddedFile);
-            fileSpecification.setEmbeddedFileUnicode(embeddedFile);
-
-            existingNames.put(uniqueFilename, fileSpecification);
-        }
-
-        embeddedFilesTree.setNames(existingNames);
-        documentNames.setEmbeddedFiles(embeddedFilesTree);
-        catalog.setNames(documentNames);
-
-        return indexToFilenameMap;
-    }
-
-    private static void addAttachmentAnnotationsToDocumentWithMapping(
-            PDDocument document,
-            List<EmlParser.EmailAttachment> attachments,
-            Map<Integer, String> indexToFilenameMap)
-            throws IOException {
-
-        if (document.getNumberOfPages() == 0 || attachments == null || attachments.isEmpty()) {
-            return;
-        }
-
-        AttachmentMarkerPositionFinder finder = new AttachmentMarkerPositionFinder();
-        finder.setSortByPosition(false); // Keep document order to maintain pairing
-        finder.getText(document);
-        List<MarkerPosition> markerPositions = finder.getPositions();
-
-        int annotationsToAdd = Math.min(markerPositions.size(), attachments.size());
-
-        for (int i = 0; i < annotationsToAdd; i++) {
-            MarkerPosition position = markerPositions.get(i);
-
-            String filenameNearMarker = position.getFilename();
-
-            EmlParser.EmailAttachment matchingAttachment =
-                    findAttachmentByFilename(attachments, filenameNearMarker);
-
-            if (matchingAttachment != null) {
-                String embeddedFilename =
-                        findEmbeddedFilenameForAttachment(matchingAttachment, indexToFilenameMap);
-
-                if (embeddedFilename != null) {
-                    PDPage page = document.getPage(position.getPageIndex());
-                    addAttachmentAnnotationToPageWithMapping(
-                            document,
-                            page,
-                            matchingAttachment,
-                            embeddedFilename,
-                            position.getX(),
-                            position.getY(),
-                            i);
-                } else {
-                    // No embedded filename found for attachment
-                }
-            } else {
-                // No matching attachment found for filename near marker
-            }
-        }
-    }
-
-    private static EmlParser.EmailAttachment findAttachmentByFilename(
-            List<EmlParser.EmailAttachment> attachments, String targetFilename) {
-        if (targetFilename == null || targetFilename.trim().isEmpty()) {
-            return null;
-        }
-
-        String normalizedTarget = normalizeFilename(targetFilename);
-
-        // First try exact match
-        for (EmlParser.EmailAttachment attachment : attachments) {
-            if (attachment.getFilename() != null) {
-                String normalizedAttachment = normalizeFilename(attachment.getFilename());
-                if (normalizedAttachment.equals(normalizedTarget)) {
-                    return attachment;
-                }
-            }
-        }
-
-        // Then try contains match
-        for (EmlParser.EmailAttachment attachment : attachments) {
-            if (attachment.getFilename() != null) {
-                String normalizedAttachment = normalizeFilename(attachment.getFilename());
-                if (normalizedAttachment.contains(normalizedTarget)
-                        || normalizedTarget.contains(normalizedAttachment)) {
-                    return attachment;
-                }
-            }
-        }
-
-        return null;
-    }
-
-    private static String findEmbeddedFilenameForAttachment(
-            EmlParser.EmailAttachment attachment, Map<Integer, String> indexToFilenameMap) {
-
-        String attachmentFilename = attachment.getFilename();
-        if (attachmentFilename == null) {
-            return null;
-        }
-
-        for (Map.Entry<Integer, String> entry : indexToFilenameMap.entrySet()) {
-            String embeddedFilename = entry.getValue();
-            if (embeddedFilename != null
-                    && (embeddedFilename.equals(attachmentFilename)
-                            || embeddedFilename.contains(attachmentFilename)
-                            || attachmentFilename.contains(embeddedFilename))) {
-                return embeddedFilename;
-            }
-        }
-
-        return null;
-    }
-
-    private static String normalizeFilename(String filename) {
-        if (filename == null) return "";
-        return filename.toLowerCase()
-                .trim()
-                .replaceAll("\\s+", " ")
-                .replaceAll("[^a-zA-Z0-9._-]", "");
-    }
-
-    private static void addAttachmentAnnotationToPageWithMapping(
-            PDDocument document,
-            PDPage page,
-            EmlParser.EmailAttachment attachment,
-            String embeddedFilename,
-            float x,
-            float y,
-            int attachmentIndex)
-            throws IOException {
-
-        PDAnnotationFileAttachment fileAnnotation = new PDAnnotationFileAttachment();
-
-        PDRectangle rect = calculateAnnotationRectangle(page, x, y);
-        fileAnnotation.setRectangle(rect);
-
-        fileAnnotation.setPrinted(false);
-        fileAnnotation.setHidden(false);
-        fileAnnotation.setNoView(false);
-        fileAnnotation.setNoZoom(true);
-        fileAnnotation.setNoRotate(true);
-
-        try {
-            PDAppearanceDictionary appearance = new PDAppearanceDictionary();
-            PDAppearanceStream normalAppearance = new PDAppearanceStream(document);
-            normalAppearance.setBBox(new PDRectangle(0, 0, rect.getWidth(), rect.getHeight()));
-            appearance.setNormalAppearance(normalAppearance);
-            fileAnnotation.setAppearance(appearance);
-        } catch (RuntimeException e) {
-            fileAnnotation.setAppearance(null);
-        }
-
-        PDEmbeddedFilesNameTreeNode efTree =
-                document.getDocumentCatalog().getNames().getEmbeddedFiles();
-        if (efTree != null) {
-            Map<String, PDComplexFileSpecification> efMap = efTree.getNames();
-            if (efMap != null) {
-                PDComplexFileSpecification fileSpec = efMap.get(embeddedFilename);
-                if (fileSpec != null) {
-                    fileAnnotation.setFile(fileSpec);
-                } else {
-                    // Could not find embedded file
-                }
-            }
-        }
-
-        fileAnnotation.setContents(
-                "Attachment " + (attachmentIndex + 1) + ": " + attachment.getFilename());
-        fileAnnotation.setAnnotationName(
-                "EmbeddedFile_" + attachmentIndex + "_" + embeddedFilename);
-
-        page.getAnnotations().add(fileAnnotation);
-    }
-
-    private static boolean isAscii(String str) {
-        if (str == null) return true;
-        for (int i = 0; i < str.length(); i++) {
-            if (str.charAt(i) > 127) {
-                return false;
-            }
-        }
-        return true;
-    }
-}
@@ -1,55 +0,0 @@
-package stirling.software.common.util;
-
-import java.io.IOException;
-
-/** Utility class for detecting and handling PDF-related errors. */
-public class PdfErrorUtils {
-
-    /**
-     * Checks if an IOException indicates a corrupted PDF file.
-     *
-     * @param e the IOException to check
-     * @return true if the error indicates PDF corruption, false otherwise
-     */
-    public static boolean isCorruptedPdfError(IOException e) {
-        return isCorruptedPdfError(e.getMessage());
-    }
-
-    /**
-     * Checks if any Exception indicates a corrupted PDF file.
-     *
-     * @param e the Exception to check
-     * @return true if the error indicates PDF corruption, false otherwise
-     */
-    public static boolean isCorruptedPdfError(Exception e) {
-        return isCorruptedPdfError(e.getMessage());
-    }
-
-    /**
-     * Checks if an error message indicates a corrupted PDF file.
-     *
-     * @param message the error message to check
-     * @return true if the message indicates PDF corruption, false otherwise
-     */
-    private static boolean isCorruptedPdfError(String message) {
-        if (message == null) return false;
-
-        // Check for common corruption indicators
-        return message.contains("Missing root object specification")
-                || message.contains("Header doesn't contain versioninfo")
-                || message.contains("Expected trailer")
-                || message.contains("Invalid PDF")
-                || message.contains("Corrupted")
-                || message.contains("damaged")
-                || message.contains("Unknown dir object")
-                || message.contains("Can't dereference COSObject")
-                || message.contains("parseCOSString string should start with")
-                || message.contains("ICCBased colorspace array must have a stream")
-                || message.contains("1-based index not found")
-                || message.contains("Invalid dictionary, found:")
-                || message.contains("AES initialization vector not fully read")
-                || message.contains("BadPaddingException")
-                || message.contains("Given final block not properly padded")
-                || message.contains("End-of-File, expected line");
-    }
-}
@@ -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;
-    }
-}
@@ -1,44 +0,0 @@
-package stirling.software.common.util;
-
-import java.io.IOException;
-import java.nio.file.Path;
-
-import lombok.extern.slf4j.Slf4j;
-
-/**
- * A wrapper class for a temporary directory that implements AutoCloseable. Can be used with
- * try-with-resources for automatic cleanup.
- */
-@Slf4j
-public class TempDirectory implements AutoCloseable {
-
-    private final TempFileManager manager;
-    private final Path directory;
-
-    public TempDirectory(TempFileManager manager) throws IOException {
-        this.manager = manager;
-        this.directory = manager.createTempDirectory();
-    }
-
-    public Path getPath() {
-        return directory;
-    }
-
-    public String getAbsolutePath() {
-        return directory.toAbsolutePath().toString();
-    }
-
-    public boolean exists() {
-        return java.nio.file.Files.exists(directory);
-    }
-
-    @Override
-    public void close() {
-        manager.deleteTempDirectory(directory);
-    }
-
-    @Override
-    public String toString() {
-        return "TempDirectory{" + directory.toAbsolutePath() + "}";
-    }
-}
@@ -1,49 +0,0 @@
-package stirling.software.common.util;
-
-import java.io.File;
-import java.io.IOException;
-import java.nio.file.Path;
-
-import lombok.extern.slf4j.Slf4j;
-
-/**
- * A wrapper class for a temporary file that implements AutoCloseable. Can be used with
- * try-with-resources for automatic cleanup.
- */
-@Slf4j
-public class TempFile implements AutoCloseable {
-
-    private final TempFileManager manager;
-    private final File file;
-
-    public TempFile(TempFileManager manager, String suffix) throws IOException {
-        this.manager = manager;
-        this.file = manager.createTempFile(suffix);
-    }
-
-    public File getFile() {
-        return file;
-    }
-
-    public Path getPath() {
-        return file.toPath();
-    }
-
-    public String getAbsolutePath() {
-        return file.getAbsolutePath();
-    }
-
-    public boolean exists() {
-        return file.exists();
-    }
-
-    @Override
-    public void close() {
-        manager.deleteTempFile(file);
-    }
-
-    @Override
-    public String toString() {
-        return "TempFile{" + file.getAbsolutePath() + "}";
-    }
-}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Anthony Stirling	a187f0599b	camers scan init	2025-06-04 15:45:50 +01:00
Anthony Stirling	488fe253aa	test	2025-06-03 13:41:24 +01:00
Anthony Stirling	7874d18f32	fix	2025-06-03 13:19:42 +01:00
a	1e968c79f6	Merge branch 'websocketSupportFun' of git@github.com:Stirling-Tools/Stirling-PDF.git into websocketSupportFun	2025-06-03 13:15:02 +01:00
Anthony Stirling	e2b88cf8b4	fix tests	2025-06-03 13:08:32 +01:00
Anthony Stirling	da49b50d27	Update build.yml	2025-06-03 13:04:02 +01:00
Anthony Stirling	970679640d	Merge branch 'main' into websocketSupportFun	2025-06-03 13:01:35 +01:00
Anthony Stirling	18f571291b	extra result	2025-06-03 12:40:33 +01:00
Anthony Stirling	0abcc0ccb8	test fix	2025-06-03 12:36:00 +01:00
Anthony Stirling	a99c104053	jdk17 support	2025-06-03 12:01:28 +01:00
Anthony Stirling	95fbd4647d	log changing	2025-06-03 10:34:47 +01:00
Anthony Stirling	8d4f5f16cb	Queue, timeouts, retries, tests!	2025-06-03 01:18:07 +01:00
Anthony Stirling	2ee43b2070	update all endpoints	2025-06-02 22:49:46 +01:00
Anthony Stirling	02aad40aa0	Tests cleanup and stuff	2025-06-02 11:06:20 +01:00
Anthony Stirling	0328333d81	websocket fun!	2025-06-02 01:19:54 +01:00